Fix structure of argon2id-wasm package

Nicolapps · Nicolapps · commit 26b31fd91e2f · 2026-07-10T09:28:14.000-07:00
diff --git a/.github/actions/rust-setup/action.yml b/.github/actions/rust-setup/action.yml
@@ -9,7 +9,7 @@ runs:
     # Reads rust-toolchain.toml and installs the pinned toolchain + targets.
     - name: Install pinned Rust toolchain
       shell: bash
-      working-directory: packages/argon2id-wasm/src/argon2-wasm
+      working-directory: packages/argon2id-wasm/rust
       run: rustup toolchain install
 
     - name: Cache cargo registry and build artifacts
@@ -18,7 +18,7 @@ runs:
         path: |
           ~/.cargo/registry
           ~/.cargo/git
-          packages/argon2id-wasm/src/argon2-wasm/target
-        key: ${{ runner.os }}-cargo-argon2-wasm-${{ hashFiles('packages/argon2id-wasm/src/argon2-wasm/Cargo.lock') }}
+          packages/argon2id-wasm/rust/target
+        key: ${{ runner.os }}-cargo-argon2-wasm-${{ hashFiles('packages/argon2id-wasm/rust/Cargo.lock') }}
         restore-keys: |
           ${{ runner.os }}-cargo-argon2-wasm-
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -7,7 +7,7 @@ concurrency:
 on:
   pull_request:
     paths:
-      - "packages/argon2id-wasm/src/argon2-wasm/**"
+      - "packages/argon2id-wasm/rust/**"
       - ".github/workflows/rust.yml"
       - ".github/actions/rust-setup/**"
   workflow_dispatch:
@@ -21,7 +21,7 @@ jobs:
     timeout-minutes: 20
     defaults:
       run:
-        working-directory: packages/argon2id-wasm/src/argon2-wasm
+        working-directory: packages/argon2id-wasm/rust
 
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml
@@ -21,6 +21,10 @@ jobs:
 
       - uses: ./.github/actions/rust-setup
 
+      - name: Rust codegen (required for argon2id-wasm typechecking)
+        working-directory: packages/argon2id-wasm/rust
+        run: just build
+
       - name: Install pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
 
diff --git a/.prettierignore b/.prettierignore
@@ -5,8 +5,8 @@ dist
 .context
 pnpm-lock.yaml
 .pnpm-store
-packages/argon2id-wasm/src/argon2-wasm/pkg/
-packages/argon2id-wasm/src/argon2-wasm/target/
+packages/argon2id-wasm/rust/pkg/
+packages/argon2id-wasm/rust/target/
 
 # Fumadocs generated output (packages/docs)
 **/.next/
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -14,7 +14,7 @@ export default defineConfig([
       ".agents/**",
       ".context/**",
       ".pnpm-store/**",
-      "packages/argon2id-wasm/src/argon2-wasm/pkg/**",
+      "packages/argon2id-wasm/rust/pkg/**",
       // Generated output in the docs package (Next.js build + Fumadocs MDX).
       "packages/docs/.next/**",
       "packages/docs/.source/**",
diff --git a/packages/argon2id-wasm/package.json b/packages/argon2id-wasm/package.json
@@ -1,20 +1,20 @@
 {
   "name": "argon2id-wasm",
-  "version": "0.0.0-alpha.0",
+  "version": "0.0.0-alpha.1",
   "description": "argon2id password hashing in WASM",
   "license": "Apache-2.0",
   "files": [
     "src/index.ts",
     "src/wasm.d.ts",
-    "src/argon2-wasm/pkg"
+    "rust/pkg"
   ],
   "type": "module",
   "sideEffects": false,
   "exports": {
     ".": "./src/index.ts"
   },
   "scripts": {
-    "build:wasm": "cd src/argon2-wasm && just build",
+    "build:wasm": "cd rust && just build",
     "prepare": "test -f src/argon2-wasm/pkg/argon2_wasm_bg.wasm || pnpm run build:wasm",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/argon2id-wasm/rust/.gitignore b/packages/argon2id-wasm/rust/.gitignore
diff --git a/packages/argon2id-wasm/rust/.npmignore b/packages/argon2id-wasm/rust/.npmignore
diff --git a/packages/argon2id-wasm/rust/Cargo.lock b/packages/argon2id-wasm/rust/Cargo.lock
diff --git a/packages/argon2id-wasm/rust/Cargo.toml b/packages/argon2id-wasm/rust/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "argon2-wasm"
+name = "argon2id-wasm"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/packages/argon2id-wasm/rust/Justfile b/packages/argon2id-wasm/rust/Justfile
@@ -15,6 +15,11 @@ build: install-wasm-pack
     # wasm-pack writes a `.gitignore` (`*`) into pkg/; drop it so npm doesn't
     # exclude the generated bindings when publishing (pkg/ is our shipped output).
     rm -f pkg/.gitignore
+    # Our TypeScript wrapper imports the wasm module as a bundler-provided
+    # default export. Keep wasm-pack's generated binding declarations, but drop
+    # the raw `.wasm.d.ts` that declares low-level named exports and shadows
+    # `src/wasm.d.ts` for downstream typecheckers.
+    rm -f pkg/argon2_wasm_bg.wasm.d.ts
 
 test:
     cargo test --locked
diff --git a/packages/argon2id-wasm/rust/README.md b/packages/argon2id-wasm/rust/README.md
@@ -1,4 +1,4 @@
-# argon2-wasm
+# argon2id-wasm
 
 A tiny Rust crate that wraps [`argon2`](https://docs.rs/argon2) and compiles to WebAssembly
 via `wasm-bindgen`. It backs the `argon2id-wasm` package, which the password
diff --git a/packages/argon2id-wasm/rust/rust-toolchain.toml b/packages/argon2id-wasm/rust/rust-toolchain.toml
diff --git a/packages/argon2id-wasm/rust/src/lib.rs b/packages/argon2id-wasm/rust/src/lib.rs
diff --git a/packages/argon2id-wasm/src/index.ts b/packages/argon2id-wasm/src/index.ts
@@ -1,8 +1,8 @@
 import init, {
   hash_password,
   verify_password,
-} from "./argon2-wasm/pkg/argon2_wasm.js";
-import wasmModule from "./argon2-wasm/pkg/argon2_wasm_bg.wasm";
+} from "../rust/pkg/argon2_wasm.js";
+import wasmModule from "../rust/pkg/argon2_wasm_bg.wasm";
 
 // The wasm-bindgen module must be instantiated once before its exports can be
 // called. Memoize the promise so concurrent calls share a single init.
diff --git a/packages/argon2id-wasm/tsconfig.json b/packages/argon2id-wasm/tsconfig.json
@@ -1,5 +1,5 @@
 {
   "extends": "../../tsconfig.base.json",
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "src/argon2-wasm/target"]
+  "include": ["src/**/*", "rust/pkg/**/*"],
+  "exclude": ["node_modules", "rust/target"]
 }
diff --git a/packages/core/src/components/password/passwordProvider.test.ts b/packages/core/src/components/password/passwordProvider.test.ts
@@ -201,7 +201,7 @@ describe("Unicode normalization", () => {
 });
 
 describe("interoperability with hash-wasm", () => {
-  // Must match the params baked into the Rust argon2 crate (argon2-wasm/src/lib.rs).
+  // Must match the params baked into the Rust argon2 crate (rust/src/lib.rs).
   const ARGON2_PARAMS = {
     iterations: 3,
     parallelism: 1,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
