@ducklings/workers 1.4.3-dev.2 → 1.4.3-dev.3

package/README.md

@@ -71,20 +71,19 @@ export default {
 
 ## Vite Plugin
 
-For projects using Vite to build Cloudflare Workers, we provide a plugin that handles WASM file resolution and copying:
+For projects using Vite with `@cloudflare/vite-plugin` to build Cloudflare Workers, we provide a plugin that handles WASM file resolution and copying:
 
 ```typescript
 // vite.config.ts
 import { defineConfig } from 'vite';
+import { cloudflare } from '@cloudflare/vite-plugin';
 import { ducklingsWorkerPlugin } from '@ducklings/workers/vite-plugin';
 
 export default defineConfig({
-  plugins: [ducklingsWorkerPlugin()],
-  build: {
-    rollupOptions: {
-      external: [/\.wasm$/],
-    },
-  },
+  plugins: [
+    ducklingsWorkerPlugin(),
+    cloudflare(),
+  ],
 });
 ```
 
@@ -92,20 +91,14 @@ export default defineConfig({
 
 ```typescript
 ducklingsWorkerPlugin({
-  // Output directory for the build (default: 'dist')
-  outDir: 'dist',
-  
   // Name of the WASM file in the output directory (default: 'duckdb-workers.wasm')
   wasmFileName: 'duckdb-workers.wasm',
-  
-  // Whether to copy the WASM file to the output directory (default: true)
-  copyWasm: true,
 })
 ```
 
 The plugin:
 - Resolves `@ducklings/workers/wasm` imports to a relative path for wrangler
-- Copies the WASM file to your output directory after build
+- Automatically copies the WASM file to the correct output directory (works with Cloudflare vite plugin's nested output structure)
 
 ## Features
 

package/dist/vite-plugin.d.ts

@@ -1,7 +1,8 @@
 /**
  * Vite plugin for @ducklings/workers on Cloudflare Workers
  *
- * This plugin handles WASM file resolution and copying for Cloudflare Workers deployments.
+ * This plugin handles WASM file resolution and emission for Cloudflare Workers deployments.
+ * Designed to work with @cloudflare/vite-plugin.
  *
  * @packageDocumentation
  */
@@ -11,35 +12,30 @@
 interface VitePlugin {
     name: string;
     enforce?: 'pre' | 'post';
-    configResolved?: (config: {
-        root: string;
-    }) => void;
+    configResolved?: (config: ResolvedConfig) => void;
     resolveId?: (id: string) => {
         id: string;
         external: true;
     } | null;
-    closeBundle?: () => void;
+    writeBundle?: (options: {
+        dir?: string;
+    }, bundle: Record<string, unknown>) => void;
+}
+interface ResolvedConfig {
+    root: string;
+    build: {
+        outDir: string;
+    };
 }
 /**
  * Configuration options for the Ducklings Workers Vite plugin.
  */
 interface DucklingsWorkersPluginOptions {
-    /**
-     * Output directory for the build.
-     * @default 'dist'
-     */
-    outDir?: string;
     /**
      * Name of the WASM file in the output directory.
      * @default 'duckdb-workers.wasm'
      */
     wasmFileName?: string;
-    /**
-     * Whether to copy the WASM file to the output directory.
-     * Set to false if you handle WASM file copying separately.
-     * @default true
-     */
-    copyWasm?: boolean;
 }
 /**
  * Resolves the path to the WASM file bundled with @ducklings/workers.
@@ -52,7 +48,11 @@ declare function getWasmPath(): string;
  *
  * This plugin:
  * - Resolves `@ducklings/workers/wasm` imports to a relative path for wrangler
- * - Optionally copies the WASM file to your output directory
+ * - Copies the WASM file to the output directory after the bundle is written
+ *
+ * Designed to work with @cloudflare/vite-plugin. The plugin detects the actual
+ * output directory structure created by the Cloudflare plugin and places the
+ * WASM file in the correct location.
  *
  * @param options - Plugin configuration options
  * @returns Vite plugin
@@ -61,15 +61,14 @@ declare function getWasmPath(): string;
  * ```typescript
  * // vite.config.ts
  * import { defineConfig } from 'vite';
+ * import { cloudflare } from '@cloudflare/vite-plugin';
  * import { ducklingsWorkerPlugin } from '@ducklings/workers/vite-plugin';
  *
  * export default defineConfig({
- *   plugins: [ducklingsWorkerPlugin()],
- *   build: {
- *     rollupOptions: {
- *       external: [/\.wasm$/],
- *     },
- *   },
+ *   plugins: [
+ *     ducklingsWorkerPlugin(),
+ *     cloudflare(),
+ *   ],
  * });
  * ```
  */

package/dist/vite-plugin.js

@@ -1,5 +1,5 @@
-import { dirname, resolve } from 'path';
-import { mkdirSync, copyFileSync } from 'fs';
+import { dirname, resolve, join } from 'path';
+import { existsSync, readdirSync, mkdirSync, copyFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 
 // Ducklings Workers - Vite Plugin for Cloudflare Workers
@@ -9,13 +9,15 @@ function getWasmPath() {
   return resolve(currentDir, "wasm", "duckdb-workers.wasm");
 }
 function ducklingsWorkerPlugin(options = {}) {
-  const { outDir = "dist", wasmFileName = "duckdb-workers.wasm", copyWasm = true } = options;
+  const { wasmFileName = "duckdb-workers.wasm" } = options;
   let projectRoot;
+  let outDir;
   return {
     name: "ducklings-workers-plugin",
     enforce: "pre",
     configResolved(config) {
       projectRoot = config.root;
+      outDir = config.build.outDir;
     },
     // Resolve WASM imports from the package to relative path
     resolveId(id) {
@@ -24,15 +26,32 @@ function ducklingsWorkerPlugin(options = {}) {
       }
       return null;
     },
-    // Copy WASM file to output directory after build
-    closeBundle() {
-      if (!copyWasm) return;
+    // Copy WASM file after bundle is written - handles Cloudflare plugin's nested output
+    writeBundle(options2) {
       const wasmSrcPath = getWasmPath();
-      const wasmDestPath = resolve(projectRoot, outDir, wasmFileName);
+      const baseOutDir = resolve(projectRoot, outDir);
+      let targetDir = options2.dir || baseOutDir;
+      if (options2.dir) {
+        targetDir = options2.dir;
+      } else {
+        if (existsSync(baseOutDir)) {
+          const entries = readdirSync(baseOutDir, { withFileTypes: true });
+          for (const entry of entries) {
+            if (entry.isDirectory()) {
+              const potentialIndexPath = join(baseOutDir, entry.name, "index.js");
+              if (existsSync(potentialIndexPath)) {
+                targetDir = join(baseOutDir, entry.name);
+                break;
+              }
+            }
+          }
+        }
+      }
+      const wasmDestPath = join(targetDir, wasmFileName);
       try {
-        mkdirSync(resolve(projectRoot, outDir), { recursive: true });
+        mkdirSync(targetDir, { recursive: true });
         copyFileSync(wasmSrcPath, wasmDestPath);
-        console.log(`[ducklings] Copied WASM file to ${outDir}/${wasmFileName}`);
+        console.log(`[ducklings] WASM file written to ${wasmDestPath}`);
       } catch (e) {
         console.error("[ducklings] Failed to copy WASM file:", e);
       }

package/dist/vite-plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vite-plugin/index.ts"],"names":[],"mappings":";;;;;;AAoDO,SAAS,WAAA,GAAsB;AAEpC,EAAA,MAAM,UAAA,GAAa,OAAA,CAAQ,aAAA,CAAc,MAAA,CAAA,IAAA,CAAY,GAAG,CAAC,CAAA;AAEzD,EAAA,OAAO,OAAA,CAAQ,UAAA,EAAY,MAAA,EAAQ,qBAAqB,CAAA;AAC1D;AA4BO,SAAS,qBAAA,CAAsB,OAAA,GAAyC,EAAC,EAAe;AAC7F,EAAA,MAAM,EAAE,MAAA,GAAS,MAAA,EAAQ,eAAe,qBAAA,EAAuB,QAAA,GAAW,MAAK,GAAI,OAAA;AAEnF,EAAA,IAAI,WAAA;AAEJ,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,0BAAA;AAAA,IACN,OAAA,EAAS,KAAA;AAAA,IAET,eAAe,MAAA,EAAQ;AACrB,MAAA,WAAA,GAAc,MAAA,CAAO,IAAA;AAAA,IACvB,CAAA;AAAA;AAAA,IAGA,UAAU,EAAA,EAAI;AACZ,MAAA,IAAI,OAAO,yBAAA,EAA2B;AAEpC,QAAA,OAAO,EAAE,EAAA,EAAI,CAAA,EAAA,EAAK,YAAY,CAAA,CAAA,EAAI,UAAU,IAAA,EAAc;AAAA,MAC5D;AACA,MAAA,OAAO,IAAA;AAAA,IACT,CAAA;AAAA;AAAA,IAGA,WAAA,GAAc;AACZ,MAAA,IAAI,CAAC,QAAA,EAAU;AAEf,MAAA,MAAM,cAAc,WAAA,EAAY;AAChC,MAAA,MAAM,YAAA,GAAe,OAAA,CAAQ,WAAA,EAAa,MAAA,EAAQ,YAAY,CAAA;AAE9D,MAAA,IAAI;AACF,QAAA,SAAA,CAAU,QAAQ,WAAA,EAAa,MAAM,GAAG,EAAE,SAAA,EAAW,MAAM,CAAA;AAC3D,QAAA,YAAA,CAAa,aAAa,YAAY,CAAA;AACtC,QAAA,OAAA,CAAQ,GAAA,CAAI,CAAA,gCAAA,EAAmC,MAAM,CAAA,CAAA,EAAI,YAAY,CAAA,CAAE,CAAA;AAAA,MACzE,SAAS,CAAA,EAAG;AACV,QAAA,OAAA,CAAQ,KAAA,CAAM,yCAAyC,CAAC,CAAA;AAAA,MAC1D;AAAA,IACF;AAAA,GACF;AACF;AAEA,IAAO,mBAAA,GAAQ","file":"vite-plugin.js","sourcesContent":["/**\n * Vite plugin for @ducklings/workers on Cloudflare Workers\n *\n * This plugin handles WASM file resolution and copying for Cloudflare Workers deployments.\n *\n * @packageDocumentation\n */\n\nimport { resolve, dirname } from 'node:path';\nimport { copyFileSync, mkdirSync } from 'node:fs';\nimport { fileURLToPath } from 'node:url';\n\n/**\n * Vite Plugin interface (minimal definition to avoid hard dependency on vite types)\n */\ninterface VitePlugin {\n  name: string;\n  enforce?: 'pre' | 'post';\n  configResolved?: (config: { root: string }) => void;\n  resolveId?: (id: string) => { id: string; external: true } | null;\n  closeBundle?: () => void;\n}\n\n/**\n * Configuration options for the Ducklings Workers Vite plugin.\n */\nexport interface DucklingsWorkersPluginOptions {\n  /**\n   * Output directory for the build.\n   * @default 'dist'\n   */\n  outDir?: string;\n\n  /**\n   * Name of the WASM file in the output directory.\n   * @default 'duckdb-workers.wasm'\n   */\n  wasmFileName?: string;\n\n  /**\n   * Whether to copy the WASM file to the output directory.\n   * Set to false if you handle WASM file copying separately.\n   * @default true\n   */\n  copyWasm?: boolean;\n}\n\n/**\n * Resolves the path to the WASM file bundled with @ducklings/workers.\n *\n * @returns The absolute path to the WASM file\n */\nexport function getWasmPath(): string {\n  // Get the directory of this module\n  const currentDir = dirname(fileURLToPath(import.meta.url));\n  // WASM file is in the wasm subdirectory relative to dist\n  return resolve(currentDir, 'wasm', 'duckdb-workers.wasm');\n}\n\n/**\n * Vite plugin for Cloudflare Workers that handles Ducklings Workers WASM integration.\n *\n * This plugin:\n * - Resolves `@ducklings/workers/wasm` imports to a relative path for wrangler\n * - Optionally copies the WASM file to your output directory\n *\n * @param options - Plugin configuration options\n * @returns Vite plugin\n *\n * @example\n * ```typescript\n * // vite.config.ts\n * import { defineConfig } from 'vite';\n * import { ducklingsWorkerPlugin } from '@ducklings/workers/vite-plugin';\n *\n * export default defineConfig({\n *   plugins: [ducklingsWorkerPlugin()],\n *   build: {\n *     rollupOptions: {\n *       external: [/\\.wasm$/],\n *     },\n *   },\n * });\n * ```\n */\nexport function ducklingsWorkerPlugin(options: DucklingsWorkersPluginOptions = {}): VitePlugin {\n  const { outDir = 'dist', wasmFileName = 'duckdb-workers.wasm', copyWasm = true } = options;\n\n  let projectRoot: string;\n\n  return {\n    name: 'ducklings-workers-plugin',\n    enforce: 'pre' as const,\n\n    configResolved(config) {\n      projectRoot = config.root;\n    },\n\n    // Resolve WASM imports from the package to relative path\n    resolveId(id) {\n      if (id === '@ducklings/workers/wasm') {\n        // Return external reference that will be resolved at runtime by wrangler\n        return { id: `./${wasmFileName}`, external: true as const };\n      }\n      return null;\n    },\n\n    // Copy WASM file to output directory after build\n    closeBundle() {\n      if (!copyWasm) return;\n\n      const wasmSrcPath = getWasmPath();\n      const wasmDestPath = resolve(projectRoot, outDir, wasmFileName);\n\n      try {\n        mkdirSync(resolve(projectRoot, outDir), { recursive: true });\n        copyFileSync(wasmSrcPath, wasmDestPath);\n        console.log(`[ducklings] Copied WASM file to ${outDir}/${wasmFileName}`);\n      } catch (e) {\n        console.error('[ducklings] Failed to copy WASM file:', e);\n      }\n    },\n  };\n}\n\nexport default ducklingsWorkerPlugin;\n"]}
+{"version":3,"sources":["../src/vite-plugin/index.ts"],"names":["options"],"mappings":";;;;;;AA+CO,SAAS,WAAA,GAAsB;AAEpC,EAAA,MAAM,UAAA,GAAa,OAAA,CAAQ,aAAA,CAAc,MAAA,CAAA,IAAA,CAAY,GAAG,CAAC,CAAA;AAEzD,EAAA,OAAO,OAAA,CAAQ,UAAA,EAAY,MAAA,EAAQ,qBAAqB,CAAA;AAC1D;AA+BO,SAAS,qBAAA,CAAsB,OAAA,GAAyC,EAAC,EAAe;AAC7F,EAAA,MAAM,EAAE,YAAA,GAAe,qBAAA,EAAsB,GAAI,OAAA;AAEjD,EAAA,IAAI,WAAA;AACJ,EAAA,IAAI,MAAA;AAEJ,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,0BAAA;AAAA,IACN,OAAA,EAAS,KAAA;AAAA,IAET,eAAe,MAAA,EAAQ;AACrB,MAAA,WAAA,GAAc,MAAA,CAAO,IAAA;AACrB,MAAA,MAAA,GAAS,OAAO,KAAA,CAAM,MAAA;AAAA,IACxB,CAAA;AAAA;AAAA,IAGA,UAAU,EAAA,EAAI;AACZ,MAAA,IAAI,OAAO,yBAAA,EAA2B;AAEpC,QAAA,OAAO,EAAE,EAAA,EAAI,CAAA,EAAA,EAAK,YAAY,CAAA,CAAA,EAAI,UAAU,IAAA,EAAc;AAAA,MAC5D;AACA,MAAA,OAAO,IAAA;AAAA,IACT,CAAA;AAAA;AAAA,IAGA,YAAYA,QAAAA,EAAS;AACnB,MAAA,MAAM,cAAc,WAAA,EAAY;AAChC,MAAA,MAAM,UAAA,GAAa,OAAA,CAAQ,WAAA,EAAa,MAAM,CAAA;AAK9C,MAAA,IAAI,SAAA,GAAYA,SAAQ,GAAA,IAAO,UAAA;AAG/B,MAAA,IAAIA,SAAQ,GAAA,EAAK;AACf,QAAA,SAAA,GAAYA,QAAAA,CAAQ,GAAA;AAAA,MACtB,CAAA,MAAO;AAEL,QAAA,IAAI,UAAA,CAAW,UAAU,CAAA,EAAG;AAC1B,UAAA,MAAM,UAAU,WAAA,CAAY,UAAA,EAAY,EAAE,aAAA,EAAe,MAAM,CAAA;AAC/D,UAAA,KAAA,MAAW,SAAS,OAAA,EAAS;AAC3B,YAAA,IAAI,KAAA,CAAM,aAAY,EAAG;AACvB,cAAA,MAAM,kBAAA,GAAqB,IAAA,CAAK,UAAA,EAAY,KAAA,CAAM,MAAM,UAAU,CAAA;AAClE,cAAA,IAAI,UAAA,CAAW,kBAAkB,CAAA,EAAG;AAClC,gBAAA,SAAA,GAAY,IAAA,CAAK,UAAA,EAAY,KAAA,CAAM,IAAI,CAAA;AACvC,gBAAA;AAAA,cACF;AAAA,YACF;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAEA,MAAA,MAAM,YAAA,GAAe,IAAA,CAAK,SAAA,EAAW,YAAY,CAAA;AAEjD,MAAA,IAAI;AACF,QAAA,SAAA,CAAU,SAAA,EAAW,EAAE,SAAA,EAAW,IAAA,EAAM,CAAA;AACxC,QAAA,YAAA,CAAa,aAAa,YAAY,CAAA;AACtC,QAAA,OAAA,CAAQ,GAAA,CAAI,CAAA,iCAAA,EAAoC,YAAY,CAAA,CAAE,CAAA;AAAA,MAChE,SAAS,CAAA,EAAG;AACV,QAAA,OAAA,CAAQ,KAAA,CAAM,yCAAyC,CAAC,CAAA;AAAA,MAC1D;AAAA,IACF;AAAA,GACF;AACF;AAEA,IAAO,mBAAA,GAAQ","file":"vite-plugin.js","sourcesContent":["/**\n * Vite plugin for @ducklings/workers on Cloudflare Workers\n *\n * This plugin handles WASM file resolution and emission for Cloudflare Workers deployments.\n * Designed to work with @cloudflare/vite-plugin.\n *\n * @packageDocumentation\n */\n\nimport { resolve, dirname, join } from 'node:path';\nimport { copyFileSync, mkdirSync, existsSync, readdirSync } from 'node:fs';\nimport { fileURLToPath } from 'node:url';\n\n/**\n * Vite Plugin interface (minimal definition to avoid hard dependency on vite types)\n */\ninterface VitePlugin {\n  name: string;\n  enforce?: 'pre' | 'post';\n  configResolved?: (config: ResolvedConfig) => void;\n  resolveId?: (id: string) => { id: string; external: true } | null;\n  writeBundle?: (options: { dir?: string }, bundle: Record<string, unknown>) => void;\n}\n\ninterface ResolvedConfig {\n  root: string;\n  build: {\n    outDir: string;\n  };\n}\n\n/**\n * Configuration options for the Ducklings Workers Vite plugin.\n */\nexport interface DucklingsWorkersPluginOptions {\n  /**\n   * Name of the WASM file in the output directory.\n   * @default 'duckdb-workers.wasm'\n   */\n  wasmFileName?: string;\n}\n\n/**\n * Resolves the path to the WASM file bundled with @ducklings/workers.\n *\n * @returns The absolute path to the WASM file\n */\nexport function getWasmPath(): string {\n  // Get the directory of this module\n  const currentDir = dirname(fileURLToPath(import.meta.url));\n  // WASM file is in the wasm subdirectory relative to dist\n  return resolve(currentDir, 'wasm', 'duckdb-workers.wasm');\n}\n\n/**\n * Vite plugin for Cloudflare Workers that handles Ducklings Workers WASM integration.\n *\n * This plugin:\n * - Resolves `@ducklings/workers/wasm` imports to a relative path for wrangler\n * - Copies the WASM file to the output directory after the bundle is written\n *\n * Designed to work with @cloudflare/vite-plugin. The plugin detects the actual\n * output directory structure created by the Cloudflare plugin and places the\n * WASM file in the correct location.\n *\n * @param options - Plugin configuration options\n * @returns Vite plugin\n *\n * @example\n * ```typescript\n * // vite.config.ts\n * import { defineConfig } from 'vite';\n * import { cloudflare } from '@cloudflare/vite-plugin';\n * import { ducklingsWorkerPlugin } from '@ducklings/workers/vite-plugin';\n *\n * export default defineConfig({\n *   plugins: [\n *     ducklingsWorkerPlugin(),\n *     cloudflare(),\n *   ],\n * });\n * ```\n */\nexport function ducklingsWorkerPlugin(options: DucklingsWorkersPluginOptions = {}): VitePlugin {\n  const { wasmFileName = 'duckdb-workers.wasm' } = options;\n\n  let projectRoot: string;\n  let outDir: string;\n\n  return {\n    name: 'ducklings-workers-plugin',\n    enforce: 'pre' as const,\n\n    configResolved(config) {\n      projectRoot = config.root;\n      outDir = config.build.outDir;\n    },\n\n    // Resolve WASM imports from the package to relative path\n    resolveId(id) {\n      if (id === '@ducklings/workers/wasm') {\n        // Return external reference that will be resolved at runtime by wrangler\n        return { id: `./${wasmFileName}`, external: true as const };\n      }\n      return null;\n    },\n\n    // Copy WASM file after bundle is written - handles Cloudflare plugin's nested output\n    writeBundle(options) {\n      const wasmSrcPath = getWasmPath();\n      const baseOutDir = resolve(projectRoot, outDir);\n\n      // The Cloudflare vite plugin creates a nested structure like:\n      // dist/{worker_name}/index.js\n      // We need to find where index.js is and put the WASM file there\n      let targetDir = options.dir || baseOutDir;\n\n      // If options.dir is provided, use it directly\n      if (options.dir) {\n        targetDir = options.dir;\n      } else {\n        // Look for subdirectories that contain index.js (Cloudflare plugin structure)\n        if (existsSync(baseOutDir)) {\n          const entries = readdirSync(baseOutDir, { withFileTypes: true });\n          for (const entry of entries) {\n            if (entry.isDirectory()) {\n              const potentialIndexPath = join(baseOutDir, entry.name, 'index.js');\n              if (existsSync(potentialIndexPath)) {\n                targetDir = join(baseOutDir, entry.name);\n                break;\n              }\n            }\n          }\n        }\n      }\n\n      const wasmDestPath = join(targetDir, wasmFileName);\n\n      try {\n        mkdirSync(targetDir, { recursive: true });\n        copyFileSync(wasmSrcPath, wasmDestPath);\n        console.log(`[ducklings] WASM file written to ${wasmDestPath}`);\n      } catch (e) {\n        console.error('[ducklings] Failed to copy WASM file:', e);\n      }\n    },\n  };\n}\n\nexport default ducklingsWorkerPlugin;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ducklings/workers",
-  "version": "1.4.3-dev.2",
+  "version": "1.4.3-dev.3",
   "description": "Minimal DuckDB WASM for Cloudflare Workers and serverless environments",
   "type": "module",
   "main": "./dist/index.cjs",