Update module resolution from bundler to NodeNext

simonklee · inakineitor · simonklee · commit 1393998a1e01 · 2026-03-24T13:59:56.000+01:00
Co-authored-by: Iñaki Arango &lt;arangoinaki@gmail.com&gt;
diff --git a/bench/structs.bench.ts b/bench/structs.bench.ts
@@ -1,5 +1,5 @@
 import { Bench } from "tinybench"
-import { defineStruct, defineEnum } from "../src/structs_ffi"
+import { defineStruct, defineEnum } from "../src/structs_ffi.js"
 
 const SimpleStruct = defineStruct([
   ["id", "u32"],
diff --git a/bun.lock b/bun.lock
diff --git a/examples/01-basic-primitives.ts b/examples/01-basic-primitives.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 1: Basic Primitive Types ===\n")
 
diff --git a/examples/02-enums.ts b/examples/02-enums.ts
@@ -1,4 +1,4 @@
-import { defineEnum, defineStruct } from "../src/structs_ffi"
+import { defineEnum, defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 2: Enums ===\n")
 
diff --git a/examples/03-nested-structs.ts b/examples/03-nested-structs.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 3: Nested Structs ===\n")
 
diff --git a/examples/04-arrays.ts b/examples/04-arrays.ts
@@ -1,4 +1,4 @@
-import { defineEnum, defineStruct } from "../src/structs_ffi"
+import { defineEnum, defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 4: Arrays ===\n")
 
diff --git a/examples/05-defaults-optional.ts b/examples/05-defaults-optional.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 5: Optional Fields and Defaults ===\n")
 
diff --git a/examples/06-transforms.ts b/examples/06-transforms.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 6: Pack and Unpack Transforms ===\n")
 
diff --git a/examples/07-validation.ts b/examples/07-validation.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 7: Field Validation ===\n")
 
diff --git a/examples/08-alloc-struct.ts b/examples/08-alloc-struct.ts
@@ -1,4 +1,4 @@
-import { defineStruct, allocStruct } from "../src/structs_ffi"
+import { defineStruct, allocStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 8: Pre-allocating Structs with Arrays ===\n")
 
diff --git a/examples/09-struct-arrays.ts b/examples/09-struct-arrays.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 9: Arrays of Structs ===\n")
 
diff --git a/examples/10-complex-webgpu.ts b/examples/10-complex-webgpu.ts
@@ -1,4 +1,4 @@
-import { defineEnum, defineStruct } from "../src/structs_ffi"
+import { defineEnum, defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 10: Complex WebGPU-like Structure ===\n")
 
diff --git a/examples/11-object-pointers.ts b/examples/11-object-pointers.ts
@@ -1,4 +1,4 @@
-import { defineStruct, objectPtr } from "../src/structs_ffi"
+import { defineStruct, objectPtr } from "../src/structs_ffi.js"
 
 console.log("=== Example 11: Object Pointers ===\n")
 
diff --git a/examples/12-object-pointer-arrays.ts b/examples/12-object-pointer-arrays.ts
@@ -1,4 +1,4 @@
-import { defineStruct, objectPtr } from "../src/structs_ffi"
+import { defineStruct, objectPtr } from "../src/structs_ffi.js"
 
 console.log("=== Example 12: Arrays of Object Pointers ===\n")
 
diff --git a/examples/13-nested-as-pointer.ts b/examples/13-nested-as-pointer.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 13: Nested Structs as Pointers ===\n")
 
diff --git a/examples/14-field-transforms.ts b/examples/14-field-transforms.ts
@@ -1,4 +1,4 @@
-import { defineEnum, defineStruct } from "../src/structs_ffi"
+import { defineEnum, defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 14: Field-level Transforms ===\n")
 
diff --git a/examples/15-pack-into.ts b/examples/15-pack-into.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 15: packInto for Zero-Copy Writes ===\n")
 
diff --git a/examples/16-cstring-vs-char-star.ts b/examples/16-cstring-vs-char-star.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 16: cstring vs char* ===\n")
 
diff --git a/examples/17-condition-fields.ts b/examples/17-condition-fields.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 17: Conditional Fields ===\n")
 
diff --git a/examples/18-optional-pointer-transforms.ts b/examples/18-optional-pointer-transforms.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 18: Optional Pointer with Type Transforms ===\n")
 
diff --git a/examples/19-pack-list.ts b/examples/19-pack-list.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 19: packList/unpackList for Efficient Batch Operations ===\n")
 
diff --git a/examples/20-list-unpack-char-star.ts b/examples/20-list-unpack-char-star.ts
@@ -1,4 +1,4 @@
-import { defineStruct } from "../src/structs_ffi"
+import { defineStruct } from "../src/structs_ffi.js"
 
 console.log("=== Example 20: List Unpacking with char* and lengthOf ===\n")
 
diff --git a/examples/native/index.ts b/examples/native/index.ts
@@ -1,4 +1,4 @@
-import { PersonStruct, getAge, getHeight, getWeight, getName, calculateBMI } from "./lib"
+import { PersonStruct, getAge, getHeight, getWeight, getName, calculateBMI } from "./lib.js"
 
 console.log("=== Native FFI with Struct Packing ===\n")
 
diff --git a/examples/native/lib.ts b/examples/native/lib.ts
@@ -1,5 +1,5 @@
 import { dlopen, CString, ptr } from "bun:ffi"
-import { defineStruct } from "../../src/structs_ffi"
+import { defineStruct } from "../../src/structs_ffi.js"
 
 const PersonStruct = defineStruct([
   ["age", "u32"],
diff --git a/package.json b/package.json
@@ -1,10 +1,20 @@
 {
   "name": "bun-ffi-structs",
   "version": "0.1.3",
-  "module": "src/index.ts",
-  "main": "src/index.ts",
+  "module": "./dist/index.js",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "license": "MIT",
   "type": "module",
+  "files": [
+    "dist"
+  ],
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/sst/bun-ffi-structs.git"
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -7,18 +7,4 @@ bun build src/index.ts --outdir dist --target node
 echo "Generating TypeScript declarations..."
 bunx tsc --project tsconfig.build.json
 
-echo "Copying package files..."
-cp package.json dist/
-cp README.md dist/
-cp LICENSE dist/ 2>/dev/null || echo "No LICENSE file found"
-
-echo "Updating dist/package.json..."
-cd dist
-cat package.json | \
-  sed 's|"module": "src/index.ts"|"module": "index.js"|' | \
-  sed 's|"main": "src/index.ts"|"main": "index.js"|' | \
-  sed '/"main":/a\
-  "types": "index.d.ts",' > package.json.tmp
-mv package.json.tmp package.json
-
 echo "Build completed successfully!"
diff --git a/src/index.ts b/src/index.ts
@@ -1,2 +1,2 @@
-export * from "./structs_ffi"
-export * from "./types"
+export * from "./structs_ffi.js"
+export * from "./types.js"
diff --git a/src/structs_ffi.ts b/src/structs_ffi.ts
@@ -15,7 +15,7 @@ import type {
   StructDefOptions,
   DefineStructReturnType,
   PrimitiveToTSType,
-} from "./types"
+} from "./types.js"
 
 function fatalError(...args: any[]): never {
   const message = args.join(" ")
diff --git a/src/tests/char-star-unpacking.test.ts b/src/tests/char-star-unpacking.test.ts
@@ -1,5 +1,5 @@
 import { expect, describe, it } from "bun:test"
-import { defineStruct } from "../structs_ffi"
+import { defineStruct } from "../structs_ffi.js"
 import { ptr } from "bun:ffi"
 
 describe("char* automatic unpacking", () => {
diff --git a/src/tests/conditional-fields.test.ts b/src/tests/conditional-fields.test.ts
@@ -1,5 +1,5 @@
 import { expect, describe, it } from "bun:test"
-import { defineEnum, defineStruct } from "../structs_ffi"
+import { defineEnum, defineStruct } from "../structs_ffi.js"
 
 describe("conditional fields", () => {
   it("should include field when condition returns true", () => {
diff --git a/src/tests/example-02-enums.test.ts b/src/tests/example-02-enums.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from "bun:test"
-import { defineEnum, defineStruct } from "../structs_ffi"
+import { defineEnum, defineStruct } from "../structs_ffi.js"
 
 describe("Example 2: Enums (exact reproduction)", () => {
   it("should work exactly like the example", () => {
diff --git a/src/tests/field-validation.test.ts b/src/tests/field-validation.test.ts
@@ -1,6 +1,6 @@
 import { expect, describe, it } from "bun:test"
 import { toArrayBuffer } from "bun:ffi"
-import { defineEnum, defineStruct } from "../structs_ffi"
+import { defineEnum, defineStruct } from "../structs_ffi.js"
 
 describe("field validation", () => {
   it("should validate primitive fields and throw on invalid values", () => {
diff --git a/src/tests/graphemes.test.ts b/src/tests/graphemes.test.ts
@@ -1,6 +1,6 @@
 import { expect, describe, it } from "bun:test"
 import { toArrayBuffer } from "bun:ffi"
-import { defineStruct } from "../structs_ffi"
+import { defineStruct } from "../structs_ffi.js"
 
 describe("string packing with graphemes and emojis", () => {
   it("should pack and unpack char* with byte length (not character count) for ASCII", () => {
diff --git a/src/tests/list-packing.test.ts b/src/tests/list-packing.test.ts
@@ -1,5 +1,5 @@
 import { expect, describe, it } from "bun:test"
-import { defineEnum, defineStruct } from "../structs_ffi"
+import { defineEnum, defineStruct } from "../structs_ffi.js"
 
 describe("packList", () => {
   it("should pack a list of simple structs into a single buffer", () => {
diff --git a/src/tests/native.test.ts b/src/tests/native.test.ts
@@ -3,7 +3,7 @@ import { dlopen, ptr, toArrayBuffer } from "bun:ffi"
 import { execSync } from "child_process"
 import { existsSync } from "fs"
 import { join } from "path"
-import { defineStruct } from "../structs_ffi"
+import { defineStruct } from "../structs_ffi.js"
 
 const testDir = __dirname
 const libPath = join(testDir, "libtest.dylib")
diff --git a/src/tests/struct-complex.test.ts b/src/tests/struct-complex.test.ts
@@ -1,6 +1,6 @@
 import { expect, describe, it } from "bun:test"
 import { toArrayBuffer } from "bun:ffi"
-import { defineEnum, defineStruct } from "../structs_ffi"
+import { defineEnum, defineStruct } from "../structs_ffi.js"
 
 describe("complex struct with length field and nested arrays", () => {
   it("should handle bind group layout-like structure", () => {
diff --git a/src/tests/struct-options.test.ts b/src/tests/struct-options.test.ts
@@ -1,6 +1,6 @@
 import { expect, describe, it } from "bun:test"
 import { toArrayBuffer } from "bun:ffi"
-import { defineStruct } from "../structs_ffi"
+import { defineStruct } from "../structs_ffi.js"
 
 describe("struct options", () => {
   it("should apply mapValue transformation", () => {
diff --git a/src/tests/struct-utils.test.ts b/src/tests/struct-utils.test.ts
@@ -1,5 +1,5 @@
 import { expect, describe, it } from "bun:test"
-import { defineEnum, defineStruct, objectPtr, allocStruct } from "../structs_ffi"
+import { defineEnum, defineStruct, objectPtr, allocStruct } from "../structs_ffi.js"
 
 describe("struct utilities", () => {
   it("should allocate struct buffer", () => {
diff --git a/src/tests/structs.test.ts b/src/tests/structs.test.ts
@@ -1,5 +1,5 @@
 import { expect, describe, it } from "bun:test"
-import { defineEnum, defineStruct, objectPtr, allocStruct, packObjectArray } from "../structs_ffi"
+import { defineEnum, defineStruct, objectPtr, allocStruct, packObjectArray } from "../structs_ffi.js"
 import { toArrayBuffer } from "bun:ffi"
 
 describe("Structs FFI", () => {
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,15 +2,15 @@
   "compilerOptions": {
     // Environment setup & latest features
     "lib": ["ESNext"],
+    "types": ["bun"],
     "target": "ESNext",
-    "module": "Preserve",
+    "module": "NodeNext",
     "moduleDetection": "force",
     "jsx": "react-jsx",
     "allowJs": true,
 
-    // Bundler mode
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
+    // Module resolution
+    "moduleResolution": "NodeNext",
     "verbatimModuleSyntax": true,
     "noEmit": true,
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { defineStruct } from "../src/structs_ffi"`
	`1`	`+import { defineStruct } from "../src/structs_ffi.js"`
`2`	`2`
`3`	`3`	`console.log("=== Example 1: Basic Primitive Types ===\n")`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { defineEnum, defineStruct } from "../src/structs_ffi"`
	`1`	`+import { defineEnum, defineStruct } from "../src/structs_ffi.js"`
`2`	`2`
`3`	`3`	`console.log("=== Example 2: Enums ===\n")`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { defineStruct, allocStruct } from "../src/structs_ffi"`
	`1`	`+import { defineStruct, allocStruct } from "../src/structs_ffi.js"`
`2`	`2`
`3`	`3`	`console.log("=== Example 8: Pre-allocating Structs with Arrays ===\n")`
`4`	`4`