Merge pull request #311 from swiftwasm/yt/dts-bundle

kateinoigakukun · web-flow · commit 495ba21bb50e · 2025-03-24T17:00:24.000+09:00
PackageToJS: Package TypeScript type definitions for runtime
diff --git a/Makefile b/Makefile
@@ -39,4 +39,4 @@ perf-tester:
 .PHONY: regenerate_swiftpm_resources
 regenerate_swiftpm_resources:
 	npm run build
-	cp Runtime/lib/index.js Runtime/lib/index.mjs Sources/JavaScriptKit/Runtime
+	cp Runtime/lib/index.js Runtime/lib/index.mjs Runtime/lib/index.d.ts Sources/JavaScriptKit/Runtime
diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift
@@ -567,6 +567,7 @@ struct PackagingPlanner {
             ("Plugins/PackageToJS/Templates/platforms/node.js", "platforms/node.js"),
             ("Plugins/PackageToJS/Templates/platforms/node.d.ts", "platforms/node.d.ts"),
             ("Sources/JavaScriptKit/Runtime/index.mjs", "runtime.js"),
+            ("Sources/JavaScriptKit/Runtime/index.d.ts", "runtime.d.ts"),
         ] {
             packageInputs.append(
                 planCopyTemplateFile(
diff --git a/Plugins/PackageToJS/Templates/instantiate.d.ts b/Plugins/PackageToJS/Templates/instantiate.d.ts
@@ -1,6 +1,4 @@
-/* #if USE_SHARED_MEMORY */
-import type { SwiftRuntimeThreadChannel, SwiftRuntime } from "./runtime.js";
-/* #endif */
+import type { /* #if USE_SHARED_MEMORY */SwiftRuntimeThreadChannel, /* #endif */SwiftRuntime } from "./runtime.js";
 
 export type Import = {
     // TODO: Generate type from imported .d.ts files
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_debug.json
@@ -233,6 +233,23 @@
   {
     "attributes" : [
 
+    ],
+    "inputs" : [
+      "$PLANNER_SOURCE_PATH",
+      "$SELF_PACKAGE\/Sources\/JavaScriptKit\/Runtime\/index.d.ts",
+      "$INTERMEDIATES\/wasm-imports.json"
+    ],
+    "output" : "$OUTPUT\/runtime.d.ts",
+    "salt" : "eyJjb25kaXRpb25zIjp7IklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==",
+    "wants" : [
+      "$OUTPUT",
+      "$OUTPUT\/platforms",
+      "$INTERMEDIATES\/wasm-imports.json"
+    ]
+  },
+  {
+    "attributes" : [
+
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
@@ -269,7 +286,8 @@
       "$OUTPUT\/platforms\/browser.worker.js",
       "$OUTPUT\/platforms\/node.js",
       "$OUTPUT\/platforms\/node.d.ts",
-      "$OUTPUT\/runtime.js"
+      "$OUTPUT\/runtime.js",
+      "$OUTPUT\/runtime.d.ts"
     ]
   }
 ]
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release.json
@@ -248,6 +248,23 @@
   {
     "attributes" : [
 
+    ],
+    "inputs" : [
+      "$PLANNER_SOURCE_PATH",
+      "$SELF_PACKAGE\/Sources\/JavaScriptKit\/Runtime\/index.d.ts",
+      "$INTERMEDIATES\/wasm-imports.json"
+    ],
+    "output" : "$OUTPUT\/runtime.d.ts",
+    "salt" : "eyJjb25kaXRpb25zIjp7IklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==",
+    "wants" : [
+      "$OUTPUT",
+      "$OUTPUT\/platforms",
+      "$INTERMEDIATES\/wasm-imports.json"
+    ]
+  },
+  {
+    "attributes" : [
+
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
@@ -284,7 +301,8 @@
       "$OUTPUT\/platforms\/browser.worker.js",
       "$OUTPUT\/platforms\/node.js",
       "$OUTPUT\/platforms\/node.d.ts",
-      "$OUTPUT\/runtime.js"
+      "$OUTPUT\/runtime.js",
+      "$OUTPUT\/runtime.d.ts"
     ]
   }
 ]
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_dwarf.json
@@ -233,6 +233,23 @@
   {
     "attributes" : [
 
+    ],
+    "inputs" : [
+      "$PLANNER_SOURCE_PATH",
+      "$SELF_PACKAGE\/Sources\/JavaScriptKit\/Runtime\/index.d.ts",
+      "$INTERMEDIATES\/wasm-imports.json"
+    ],
+    "output" : "$OUTPUT\/runtime.d.ts",
+    "salt" : "eyJjb25kaXRpb25zIjp7IklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==",
+    "wants" : [
+      "$OUTPUT",
+      "$OUTPUT\/platforms",
+      "$INTERMEDIATES\/wasm-imports.json"
+    ]
+  },
+  {
+    "attributes" : [
+
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
@@ -269,7 +286,8 @@
       "$OUTPUT\/platforms\/browser.worker.js",
       "$OUTPUT\/platforms\/node.js",
       "$OUTPUT\/platforms\/node.d.ts",
-      "$OUTPUT\/runtime.js"
+      "$OUTPUT\/runtime.js",
+      "$OUTPUT\/runtime.d.ts"
     ]
   }
 ]
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_name.json
@@ -248,6 +248,23 @@
   {
     "attributes" : [
 
+    ],
+    "inputs" : [
+      "$PLANNER_SOURCE_PATH",
+      "$SELF_PACKAGE\/Sources\/JavaScriptKit\/Runtime\/index.d.ts",
+      "$INTERMEDIATES\/wasm-imports.json"
+    ],
+    "output" : "$OUTPUT\/runtime.d.ts",
+    "salt" : "eyJjb25kaXRpb25zIjp7IklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==",
+    "wants" : [
+      "$OUTPUT",
+      "$OUTPUT\/platforms",
+      "$INTERMEDIATES\/wasm-imports.json"
+    ]
+  },
+  {
+    "attributes" : [
+
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
@@ -284,7 +301,8 @@
       "$OUTPUT\/platforms\/browser.worker.js",
       "$OUTPUT\/platforms\/node.js",
       "$OUTPUT\/platforms\/node.d.ts",
-      "$OUTPUT\/runtime.js"
+      "$OUTPUT\/runtime.js",
+      "$OUTPUT\/runtime.d.ts"
     ]
   }
 ]
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planBuild_release_no_optimize.json
@@ -233,6 +233,23 @@
   {
     "attributes" : [
 
+    ],
+    "inputs" : [
+      "$PLANNER_SOURCE_PATH",
+      "$SELF_PACKAGE\/Sources\/JavaScriptKit\/Runtime\/index.d.ts",
+      "$INTERMEDIATES\/wasm-imports.json"
+    ],
+    "output" : "$OUTPUT\/runtime.d.ts",
+    "salt" : "eyJjb25kaXRpb25zIjp7IklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==",
+    "wants" : [
+      "$OUTPUT",
+      "$OUTPUT\/platforms",
+      "$INTERMEDIATES\/wasm-imports.json"
+    ]
+  },
+  {
+    "attributes" : [
+
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
@@ -269,7 +286,8 @@
       "$OUTPUT\/platforms\/browser.worker.js",
       "$OUTPUT\/platforms\/node.js",
       "$OUTPUT\/platforms\/node.d.ts",
-      "$OUTPUT\/runtime.js"
+      "$OUTPUT\/runtime.js",
+      "$OUTPUT\/runtime.d.ts"
     ]
   }
 ]
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json b/Plugins/PackageToJS/Tests/__Snapshots__/PackagingPlannerTests/planTestBuild.json
@@ -274,6 +274,23 @@
   {
     "attributes" : [
 
+    ],
+    "inputs" : [
+      "$PLANNER_SOURCE_PATH",
+      "$SELF_PACKAGE\/Sources\/JavaScriptKit\/Runtime\/index.d.ts",
+      "$INTERMEDIATES\/wasm-imports.json"
+    ],
+    "output" : "$OUTPUT\/runtime.d.ts",
+    "salt" : "eyJjb25kaXRpb25zIjp7IklTX1dBU0kiOnRydWUsIlVTRV9TSEFSRURfTUVNT1JZIjpmYWxzZSwiVVNFX1dBU0lfQ0ROIjpmYWxzZX0sInN1YnN0aXR1dGlvbnMiOnsiUEFDS0FHRV9UT19KU19NT0RVTEVfUEFUSCI6Im1haW4ud2FzbSIsIlBBQ0tBR0VfVE9fSlNfUEFDS0FHRV9OQU1FIjoidGVzdCJ9fQ==",
+    "wants" : [
+      "$OUTPUT",
+      "$OUTPUT\/platforms",
+      "$INTERMEDIATES\/wasm-imports.json"
+    ]
+  },
+  {
+    "attributes" : [
+
     ],
     "inputs" : [
       "$PLANNER_SOURCE_PATH",
@@ -356,6 +373,7 @@
       "$OUTPUT\/platforms\/node.js",
       "$OUTPUT\/platforms\/node.d.ts",
       "$OUTPUT\/runtime.js",
+      "$OUTPUT\/runtime.d.ts",
       "$INTERMEDIATES\/npm-install.stamp",
       "$OUTPUT\/bin",
       "$OUTPUT\/test.js",
diff --git a/Runtime/rollup.config.mjs b/Runtime/rollup.config.mjs
@@ -1,20 +1,31 @@
 import typescript from "@rollup/plugin-typescript";
+import dts from "rollup-plugin-dts";
 
 /** @type {import('rollup').RollupOptions} */
-const config = {
-    input: "src/index.ts",
-    output: [
-        {
-            file: "lib/index.mjs",
+const config = [
+    {
+        input: "src/index.ts",
+        output: [
+            {
+                file: "lib/index.mjs",
+                format: "esm",
+            },
+            {
+                file: "lib/index.js",
+                format: "umd",
+                name: "JavaScriptKit",
+            },
+        ],
+        plugins: [typescript()],
+    },
+    {
+        input: "src/index.ts",
+        output: {
+            file: "lib/index.d.ts",
             format: "esm",
         },
-        {
-            dir: "lib",
-            format: "umd",
-            name: "JavaScriptKit",
-        },
-    ],
-    plugins: [typescript()],
-};
+        plugins: [dts()],
+    },
+];
 
 export default config;
diff --git a/Runtime/tsconfig.json b/Runtime/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "compilerOptions": {
-        "declaration": true,
-        "declarationDir": "lib",
+        "declaration": false,
         "importHelpers": true,
         "module": "esnext",
         "noEmit": true,
diff --git a/Sources/JavaScriptKit/Runtime/index.d.ts b/Sources/JavaScriptKit/Runtime/index.d.ts
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`		`- "declaration": true,`
`4`		`- "declarationDir": "lib",`
	`3`	`+ "declaration": false,`
`5`	`4`	`"importHelpers": true,`
`6`	`5`	`"module": "esnext",`
`7`	`6`	`"noEmit": true,`