@prisma/client-generator-ts 6.14.0-dev.12 → 6.14.0-dev.13

package/dist/index.js

@@ -494,11 +494,11 @@ var require_graceful_fs = __commonJS({
         }
       });
     }
-    var debug2 = noop;
+    var debug3 = noop;
     if (util.debuglog)
-      debug2 = util.debuglog("gfs4");
+      debug3 = util.debuglog("gfs4");
     else if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || ""))
-      debug2 = function() {
+      debug3 = function() {
         var m = util.format.apply(util, arguments);
         m = "GFS4: " + m.split(/\n/).join("\nGFS4: ");
         console.error(m);
@@ -533,7 +533,7 @@ var require_graceful_fs = __commonJS({
       }(fs3.closeSync);
       if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || "")) {
         process.on("exit", function() {
-          debug2(fs3[gracefulQueue]);
+          debug3(fs3[gracefulQueue]);
           require("assert").equal(fs3[gracefulQueue].length, 0);
         });
       }
@@ -786,7 +786,7 @@ var require_graceful_fs = __commonJS({
       return fs4;
     }
     function enqueue(elem) {
-      debug2("ENQUEUE", elem[0].name, elem[1]);
+      debug3("ENQUEUE", elem[0].name, elem[1]);
       fs3[gracefulQueue].push(elem);
       retry();
     }
@@ -813,10 +813,10 @@ var require_graceful_fs = __commonJS({
       var startTime = elem[3];
       var lastTime = elem[4];
       if (startTime === void 0) {
-        debug2("RETRY", fn.name, args);
+        debug3("RETRY", fn.name, args);
         fn.apply(null, args);
       } else if (Date.now() - startTime >= 6e4) {
-        debug2("TIMEOUT", fn.name, args);
+        debug3("TIMEOUT", fn.name, args);
         var cb = args.pop();
         if (typeof cb === "function")
           cb.call(null, err);
@@ -825,7 +825,7 @@ var require_graceful_fs = __commonJS({
         var sinceStart = Math.max(lastTime - startTime, 1);
         var desiredDelay = Math.min(sinceStart * 1.2, 100);
         if (sinceAttempt >= desiredDelay) {
-          debug2("RETRY", fn.name, args);
+          debug3("RETRY", fn.name, args);
           fn.apply(null, args.concat([startTime]));
         } else {
           fs3[gracefulQueue].push(elem);
@@ -3444,7 +3444,9 @@ function buildInlineDatasource(ds) {
 var import_node_fs = __toESM(require("node:fs"));
 var import_node_path = __toESM(require("node:path"));
 var import_client_common11 = require("@prisma/client-common");
+var import_debug = require("@prisma/debug");
 var import_ts_pattern = require("ts-pattern");
+var debug = (0, import_debug.Debug)("prisma:client-generator-ts:wasm");
 function buildDynamicRequireFn() {
   return `const dynamicRequireFn = async <const T extends string>(name: T) =>
       typeof globalThis.__non_webpack_require__ === 'function'
@@ -3463,20 +3465,42 @@ function buildGetWasmModule({
   moduleFormat
 }) {
   const capitalizedComponent = (0, import_client_common11.capitalize)(component);
+  const buildNonEdgeLoader = (0, import_ts_pattern.match)(runtimeName).with("library", () => component === "engine" && !!process.env.PRISMA_CLIENT_FORCE_WASM).with("client", () => component === "compiler").otherwise(() => false);
+  const buildNodeJsLoader = (0, import_ts_pattern.match)({ runtimeName, target }).with({ target: "nodejs" }, () => buildNonEdgeLoader).otherwise(() => false);
   const buildEdgeLoader = usesEdgeWasmRuntime(component, runtimeName);
+  let wasmPathBase;
   let wasmBindingsPath;
   let wasmModulePath;
   if (buildEdgeLoader) {
-    const wasmPathBase = `./query_${component}_bg`;
+    wasmPathBase = `./query_${component}_bg`;
     wasmBindingsPath = `${wasmPathBase}.js`;
     wasmModulePath = `${wasmPathBase}.wasm`;
   } else {
-    const wasmPathBase = `${runtimeBase}/query_${component}_bg.${activeProvider}`;
+    wasmPathBase = `${runtimeBase}/query_${component}_bg.${activeProvider}`;
     wasmBindingsPath = `${wasmPathBase}.mjs`;
     wasmModulePath = `${wasmPathBase}.wasm`;
   }
-  const buildNodeLoader = (0, import_ts_pattern.match)(runtimeName).with("library", () => component === "engine" && !!process.env.PRISMA_CLIENT_FORCE_WASM).with("client", () => component === "compiler").otherwise(() => false);
-  if (buildNodeLoader) {
+  if (buildNodeJsLoader) {
+    const extension = (0, import_ts_pattern.match)(moduleFormat).with("esm", () => "mjs").with("cjs", () => "cjs").exhaustive();
+    wasmModulePath = `${wasmPathBase}.wasm-base64.${extension}`;
+    return `
+async function decodeBase64AsWasm(wasmBase64: string): Promise<WebAssembly.Module> {
+  const { Buffer } = await import('node:buffer')
+  const base64Data = wasmBase64.replace('data:application/wasm;base64,', '')
+  const wasmArray = new Uint8Array(Buffer.from(base64Data, 'base64'))
+  return new WebAssembly.Module(wasmArray)
+}
+    
+config.${component}Wasm = {
+  getRuntime: async () => await import(${JSON.stringify(wasmBindingsPath)}),
+
+  getQuery${capitalizedComponent}WasmModule: async () => {
+    const { wasm } = await import(${JSON.stringify(wasmModulePath)})
+    return await decodeBase64AsWasm(wasm)
+  }
+}`;
+  }
+  if (buildNonEdgeLoader) {
     return `config.${component}Wasm = {
   getRuntime: async () => await import(${JSON.stringify(wasmBindingsPath)}),
 
@@ -3514,10 +3538,25 @@ function buildRequire(moduleFormat) {
     const _require = createRequire(import.meta.url)
 `;
 }
-function buildWasmFileMap({ runtimeName, activeProvider }) {
+function readSourceFile(sourceFile) {
+  const bundledLocation = import_node_path.default.join(__dirname, sourceFile);
+  const sourceLocation = import_node_path.default.join(__dirname, "..", "..", "..", "client", "runtime", sourceFile);
+  if (import_node_fs.default.existsSync(bundledLocation)) {
+    debug("We are in the bundled Prisma CLI");
+    return import_node_fs.default.readFileSync(bundledLocation);
+  } else if (import_node_fs.default.existsSync(sourceLocation)) {
+    debug("We are in a dev/test environment");
+    return import_node_fs.default.readFileSync(sourceLocation);
+  } else {
+    throw new Error(`Could not find ${sourceFile} in ${bundledLocation} or ${sourceLocation}`);
+  }
+}
+function buildWasmFileMap({ activeProvider, runtimeName }) {
   const fileMap = {};
+  debug("buildWasmFileMap with", { runtimeName });
   for (const component of ["engine", "compiler"]) {
     if (!usesEdgeWasmRuntime(component, runtimeName)) {
+      debug("Skipping component", component, "for runtime", runtimeName);
       continue;
     }
     const fileNameBase = `query_${component}_bg.${activeProvider}`;
@@ -3526,15 +3565,7 @@ function buildWasmFileMap({ runtimeName, activeProvider }) {
       [`query_${component}_bg.js`]: `${fileNameBase}.mjs`
     };
     for (const [targetFile, sourceFile] of Object.entries(files)) {
-      const bundledLocation = import_node_path.default.join(__dirname, sourceFile);
-      const sourceLocation = import_node_path.default.join(__dirname, "..", "..", "..", "client", "runtime", sourceFile);
-      if (import_node_fs.default.existsSync(bundledLocation)) {
-        fileMap[targetFile] = import_node_fs.default.readFileSync(bundledLocation);
-      } else if (import_node_fs.default.existsSync(sourceLocation)) {
-        fileMap[targetFile] = import_node_fs.default.readFileSync(sourceLocation);
-      } else {
-        throw new Error(`Could not find ${sourceFile} in ${bundledLocation} or ${sourceLocation}`);
-      }
+      fileMap[targetFile] = readSourceFile(sourceFile);
     }
   }
   return fileMap;
@@ -6580,14 +6611,14 @@ async function deleteOutputDir(outputDir) {
 }
 
 // src/generator.ts
-var import_debug = require("@prisma/debug");
+var import_debug2 = require("@prisma/debug");
 var import_engines_version = require("@prisma/engines-version");
 var import_internals10 = require("@prisma/internals");
 var import_get_tsconfig = require("get-tsconfig");
 var import_ts_pattern2 = require("ts-pattern");
 
 // package.json
-var version = "6.14.0-dev.12";
+var version = "6.14.0-dev.13";
 
 // src/module-format.ts
 function parseModuleFormat(format) {
@@ -6664,7 +6695,7 @@ function parseRuntimeTargetFromUnknown(target) {
 }
 
 // src/generator.ts
-var debug = (0, import_debug.Debug)("prisma:client:generator");
+var debug2 = (0, import_debug2.Debug)("prisma:client:generator");
 var missingOutputErrorMessage = `An output path is required for the \`prisma-client\` generator. Please provide an output path in your schema file:
 
 ${dim(`generator client {
@@ -6684,7 +6715,7 @@ var PrismaClientTsGenerator = class {
   name = "prisma-client-ts";
   getManifest(config) {
     const requiresEngines = (0, import_ts_pattern2.match)((0, import_internals10.getClientEngineType)(config)).with(import_internals10.ClientEngineType.Library, () => ["libqueryEngine"]).with(import_internals10.ClientEngineType.Binary, () => ["queryEngine"]).with(import_internals10.ClientEngineType.Client, () => []).exhaustive();
-    debug("requiresEngines", requiresEngines);
+    debug2("requiresEngines", requiresEngines);
     return Promise.resolve({
       defaultOutput: getOutputPath(config),
       prettyName: "Prisma Client",

package/dist/index.mjs

@@ -494,11 +494,11 @@ var require_graceful_fs = __commonJS({
         }
       });
     }
-    var debug2 = noop;
+    var debug3 = noop;
     if (util.debuglog)
-      debug2 = util.debuglog("gfs4");
+      debug3 = util.debuglog("gfs4");
     else if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || ""))
-      debug2 = function() {
+      debug3 = function() {
         var m = util.format.apply(util, arguments);
         m = "GFS4: " + m.split(/\n/).join("\nGFS4: ");
         console.error(m);
@@ -533,7 +533,7 @@ var require_graceful_fs = __commonJS({
       }(fs3.closeSync);
       if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || "")) {
         process.on("exit", function() {
-          debug2(fs3[gracefulQueue]);
+          debug3(fs3[gracefulQueue]);
           __require("assert").equal(fs3[gracefulQueue].length, 0);
         });
       }
@@ -786,7 +786,7 @@ var require_graceful_fs = __commonJS({
       return fs4;
     }
     function enqueue(elem) {
-      debug2("ENQUEUE", elem[0].name, elem[1]);
+      debug3("ENQUEUE", elem[0].name, elem[1]);
       fs3[gracefulQueue].push(elem);
       retry();
     }
@@ -813,10 +813,10 @@ var require_graceful_fs = __commonJS({
       var startTime = elem[3];
       var lastTime = elem[4];
       if (startTime === void 0) {
-        debug2("RETRY", fn.name, args);
+        debug3("RETRY", fn.name, args);
         fn.apply(null, args);
       } else if (Date.now() - startTime >= 6e4) {
-        debug2("TIMEOUT", fn.name, args);
+        debug3("TIMEOUT", fn.name, args);
         var cb = args.pop();
         if (typeof cb === "function")
           cb.call(null, err);
@@ -825,7 +825,7 @@ var require_graceful_fs = __commonJS({
         var sinceStart = Math.max(lastTime - startTime, 1);
         var desiredDelay = Math.min(sinceStart * 1.2, 100);
         if (sinceAttempt >= desiredDelay) {
-          debug2("RETRY", fn.name, args);
+          debug3("RETRY", fn.name, args);
           fn.apply(null, args.concat([startTime]));
         } else {
           fs3[gracefulQueue].push(elem);
@@ -3443,7 +3443,9 @@ function buildInlineDatasource(ds) {
 import fs from "node:fs";
 import path from "node:path";
 import { capitalize as capitalize6 } from "@prisma/client-common";
+import { Debug } from "@prisma/debug";
 import { match } from "ts-pattern";
+var debug = Debug("prisma:client-generator-ts:wasm");
 function buildDynamicRequireFn() {
   return `const dynamicRequireFn = async <const T extends string>(name: T) =>
       typeof globalThis.__non_webpack_require__ === 'function'
@@ -3462,20 +3464,42 @@ function buildGetWasmModule({
   moduleFormat
 }) {
   const capitalizedComponent = capitalize6(component);
+  const buildNonEdgeLoader = match(runtimeName).with("library", () => component === "engine" && !!process.env.PRISMA_CLIENT_FORCE_WASM).with("client", () => component === "compiler").otherwise(() => false);
+  const buildNodeJsLoader = match({ runtimeName, target }).with({ target: "nodejs" }, () => buildNonEdgeLoader).otherwise(() => false);
   const buildEdgeLoader = usesEdgeWasmRuntime(component, runtimeName);
+  let wasmPathBase;
   let wasmBindingsPath;
   let wasmModulePath;
   if (buildEdgeLoader) {
-    const wasmPathBase = `./query_${component}_bg`;
+    wasmPathBase = `./query_${component}_bg`;
     wasmBindingsPath = `${wasmPathBase}.js`;
     wasmModulePath = `${wasmPathBase}.wasm`;
   } else {
-    const wasmPathBase = `${runtimeBase}/query_${component}_bg.${activeProvider}`;
+    wasmPathBase = `${runtimeBase}/query_${component}_bg.${activeProvider}`;
     wasmBindingsPath = `${wasmPathBase}.mjs`;
     wasmModulePath = `${wasmPathBase}.wasm`;
   }
-  const buildNodeLoader = match(runtimeName).with("library", () => component === "engine" && !!process.env.PRISMA_CLIENT_FORCE_WASM).with("client", () => component === "compiler").otherwise(() => false);
-  if (buildNodeLoader) {
+  if (buildNodeJsLoader) {
+    const extension = match(moduleFormat).with("esm", () => "mjs").with("cjs", () => "cjs").exhaustive();
+    wasmModulePath = `${wasmPathBase}.wasm-base64.${extension}`;
+    return `
+async function decodeBase64AsWasm(wasmBase64: string): Promise<WebAssembly.Module> {
+  const { Buffer } = await import('node:buffer')
+  const base64Data = wasmBase64.replace('data:application/wasm;base64,', '')
+  const wasmArray = new Uint8Array(Buffer.from(base64Data, 'base64'))
+  return new WebAssembly.Module(wasmArray)
+}
+    
+config.${component}Wasm = {
+  getRuntime: async () => await import(${JSON.stringify(wasmBindingsPath)}),
+
+  getQuery${capitalizedComponent}WasmModule: async () => {
+    const { wasm } = await import(${JSON.stringify(wasmModulePath)})
+    return await decodeBase64AsWasm(wasm)
+  }
+}`;
+  }
+  if (buildNonEdgeLoader) {
     return `config.${component}Wasm = {
   getRuntime: async () => await import(${JSON.stringify(wasmBindingsPath)}),
 
@@ -3513,10 +3537,25 @@ function buildRequire(moduleFormat) {
     const _require = createRequire(import.meta.url)
 `;
 }
-function buildWasmFileMap({ runtimeName, activeProvider }) {
+function readSourceFile(sourceFile) {
+  const bundledLocation = path.join(__dirname, sourceFile);
+  const sourceLocation = path.join(__dirname, "..", "..", "..", "client", "runtime", sourceFile);
+  if (fs.existsSync(bundledLocation)) {
+    debug("We are in the bundled Prisma CLI");
+    return fs.readFileSync(bundledLocation);
+  } else if (fs.existsSync(sourceLocation)) {
+    debug("We are in a dev/test environment");
+    return fs.readFileSync(sourceLocation);
+  } else {
+    throw new Error(`Could not find ${sourceFile} in ${bundledLocation} or ${sourceLocation}`);
+  }
+}
+function buildWasmFileMap({ activeProvider, runtimeName }) {
   const fileMap = {};
+  debug("buildWasmFileMap with", { runtimeName });
   for (const component of ["engine", "compiler"]) {
     if (!usesEdgeWasmRuntime(component, runtimeName)) {
+      debug("Skipping component", component, "for runtime", runtimeName);
       continue;
     }
     const fileNameBase = `query_${component}_bg.${activeProvider}`;
@@ -3525,15 +3564,7 @@ function buildWasmFileMap({ runtimeName, activeProvider }) {
       [`query_${component}_bg.js`]: `${fileNameBase}.mjs`
     };
     for (const [targetFile, sourceFile] of Object.entries(files)) {
-      const bundledLocation = path.join(__dirname, sourceFile);
-      const sourceLocation = path.join(__dirname, "..", "..", "..", "client", "runtime", sourceFile);
-      if (fs.existsSync(bundledLocation)) {
-        fileMap[targetFile] = fs.readFileSync(bundledLocation);
-      } else if (fs.existsSync(sourceLocation)) {
-        fileMap[targetFile] = fs.readFileSync(sourceLocation);
-      } else {
-        throw new Error(`Could not find ${sourceFile} in ${bundledLocation} or ${sourceLocation}`);
-      }
+      fileMap[targetFile] = readSourceFile(sourceFile);
     }
   }
   return fileMap;
@@ -6579,14 +6610,14 @@ async function deleteOutputDir(outputDir) {
 }
 
 // src/generator.ts
-import { Debug } from "@prisma/debug";
+import { Debug as Debug2 } from "@prisma/debug";
 import { enginesVersion } from "@prisma/engines-version";
 import { ClientEngineType as ClientEngineType4, getClientEngineType as getClientEngineType4, parseEnvValue } from "@prisma/internals";
 import { getTsconfig } from "get-tsconfig";
 import { match as match2 } from "ts-pattern";
 
 // package.json
-var version = "6.14.0-dev.12";
+var version = "6.14.0-dev.13";
 
 // src/module-format.ts
 function parseModuleFormat(format) {
@@ -6663,7 +6694,7 @@ function parseRuntimeTargetFromUnknown(target) {
 }
 
 // src/generator.ts
-var debug = Debug("prisma:client:generator");
+var debug2 = Debug2("prisma:client:generator");
 var missingOutputErrorMessage = `An output path is required for the \`prisma-client\` generator. Please provide an output path in your schema file:
 
 ${dim(`generator client {
@@ -6683,7 +6714,7 @@ var PrismaClientTsGenerator = class {
   name = "prisma-client-ts";
   getManifest(config) {
     const requiresEngines = match2(getClientEngineType4(config)).with(ClientEngineType4.Library, () => ["libqueryEngine"]).with(ClientEngineType4.Binary, () => ["queryEngine"]).with(ClientEngineType4.Client, () => []).exhaustive();
-    debug("requiresEngines", requiresEngines);
+    debug2("requiresEngines", requiresEngines);
     return Promise.resolve({
       defaultOutput: getOutputPath(config),
       prettyName: "Prisma Client",

package/dist/utils/wasm.d.ts

@@ -13,7 +13,7 @@ export type BuildWasmModuleOptions = {
 };
 export declare function buildGetWasmModule({ component, runtimeName, runtimeBase, target, activeProvider, moduleFormat, }: BuildWasmModuleOptions): string;
 export type BuildWasmFileMapOptions = {
-    runtimeName: RuntimeName;
     activeProvider: ActiveConnectorType;
+    runtimeName: RuntimeName;
 };
-export declare function buildWasmFileMap({ runtimeName, activeProvider }: BuildWasmFileMapOptions): FileMap;
+export declare function buildWasmFileMap({ activeProvider, runtimeName }: BuildWasmFileMapOptions): FileMap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-generator-ts",
-  "version": "6.14.0-dev.12",
+  "version": "6.14.0-dev.13",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -34,14 +34,14 @@
     "pkg-up": "3.1.0",
     "pluralize": "8.0.0",
     "ts-pattern": "5.6.2",
-    "@prisma/client-common": "6.14.0-dev.12",
-    "@prisma/fetch-engine": "6.14.0-dev.12",
-    "@prisma/generator": "6.14.0-dev.12",
-    "@prisma/dmmf": "6.14.0-dev.12",
-    "@prisma/get-platform": "6.14.0-dev.12",
-    "@prisma/debug": "6.14.0-dev.12",
-    "@prisma/internals": "6.14.0-dev.12",
-    "@prisma/ts-builders": "6.14.0-dev.12"
+    "@prisma/client-common": "6.14.0-dev.13",
+    "@prisma/debug": "6.14.0-dev.13",
+    "@prisma/dmmf": "6.14.0-dev.13",
+    "@prisma/generator": "6.14.0-dev.13",
+    "@prisma/fetch-engine": "6.14.0-dev.13",
+    "@prisma/get-platform": "6.14.0-dev.13",
+    "@prisma/ts-builders": "6.14.0-dev.13",
+    "@prisma/internals": "6.14.0-dev.13"
   },
   "devDependencies": {
     "@types/pluralize": "0.0.33",