@prisma/internals 7.2.0 → 7.3.0-integration-fix-6-19-0-cloudflare-accelerate-engine.1

package/dist/{chunk-2BXDHSSY.js → chunk-EYVG6XQS.js}

@@ -26,17 +26,16 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_2BXDHSSY_exports = {};
-__export(chunk_2BXDHSSY_exports, {
-  createSchemaPathInput: () => createSchemaPathInput,
-  getCliProvidedSchemaFile: () => getCliProvidedSchemaFile,
-  getConfigProvidedSchemaFile: () => getConfigProvidedSchemaFile,
+var chunk_EYVG6XQS_exports = {};
+__export(chunk_EYVG6XQS_exports, {
+  getSchemaFromPackageJson: () => getSchemaFromPackageJson,
   getSchemaWithPath: () => getSchemaWithPath,
   getSchemaWithPathOptional: () => getSchemaWithPathOptional,
   printSchemaLoadedMessage: () => printSchemaLoadedMessage
 });
-module.exports = __toCommonJS(chunk_2BXDHSSY_exports);
+module.exports = __toCommonJS(chunk_EYVG6XQS_exports);
 var import_chunk_PG5FDKSF = require("./chunk-PG5FDKSF.js");
+var import_config = require("@prisma/config");
 var import_debug = require("@prisma/debug");
 var import_schema_files_loader = require("@prisma/schema-files-loader");
 var import_fs = __toESM(require("fs"));
@@ -45,37 +44,22 @@ var import_util = require("util");
 var readFile = (0, import_util.promisify)(import_fs.default.readFile);
 var stat = (0, import_util.promisify)(import_fs.default.stat);
 var debug = (0, import_debug.Debug)("prisma:getSchema");
-function createSchemaPathInput({
-  schemaPathFromArgs,
-  schemaPathFromConfig,
-  baseDir
-}) {
-  return schemaPathFromArgs ? { cliProvidedPath: schemaPathFromArgs } : schemaPathFromConfig ? { configProvidedPath: schemaPathFromConfig } : { baseDir };
-}
-async function getSchemaWithPath({
-  schemaPath,
-  cwd = process.cwd(),
-  argumentName = "--schema"
-}) {
-  const result = await getSchemaWithPathInternal({ schemaPath, cwd, argumentName });
+async function getSchemaWithPath(schemaPathFromArgs, schemaPathFromConfig, { cwd = process.cwd(), argumentName = "--schema" } = {}) {
+  const result = await getSchemaWithPathInternal(schemaPathFromArgs, schemaPathFromConfig, { cwd, argumentName });
   if (result.ok) {
     return result.schema;
   }
   throw new Error(renderDefaultLookupError(result.error, cwd));
 }
-async function getSchemaWithPathOptional({
-  schemaPath,
-  cwd = process.cwd(),
-  argumentName = "--schema"
-}) {
-  const result = await getSchemaWithPathInternal({ schemaPath, cwd, argumentName });
+async function getSchemaWithPathOptional(schemaPathFromArgs, schemaPathFromConfig, { cwd = process.cwd(), argumentName = "--schema" } = {}) {
+  const result = await getSchemaWithPathInternal(schemaPathFromArgs, schemaPathFromConfig, { cwd, argumentName });
   if (result.ok) {
     return result.schema;
   }
   return null;
 }
 function printSchemaLoadedMessage(schemaPath) {
-  process.stderr.write((0, import_chunk_PG5FDKSF.dim)(`Prisma schema loaded from ${import_path.default.relative(process.cwd(), schemaPath)}.`) + "\n");
+  process.stdout.write((0, import_chunk_PG5FDKSF.dim)(`Prisma schema loaded from ${import_path.default.relative(process.cwd(), schemaPath)}`) + "\n");
 }
 async function readSchemaFromSingleFile(schemaPath) {
   debug("Reading schema from single file", schemaPath);
@@ -117,24 +101,29 @@ async function readSchemaFromFileOrDirectory(schemaPath) {
   }
   return { ok: false, error: { kind: "WrongType", path: schemaPath, expectedTypes: ["file", "directory"] } };
 }
-async function getSchemaWithPathInternal({
-  schemaPath,
-  cwd,
-  argumentName
-}) {
-  if ("cliProvidedPath" in schemaPath) {
-    return {
-      ok: true,
-      schema: await getCliProvidedSchemaFile(schemaPath.cliProvidedPath, cwd, argumentName)
-    };
+async function getSchemaWithPathInternal(schemaPathFromArgs, schemaPathFromConfig, { cwd, argumentName }) {
+  if (schemaPathFromArgs) {
+    const absPath = import_path.default.resolve(cwd, schemaPathFromArgs);
+    const customSchemaResult = await readSchemaFromFileOrDirectory(absPath);
+    if (!customSchemaResult.ok) {
+      const relPath = import_path.default.relative(cwd, absPath);
+      throw new Error(
+        `Could not load \`${argumentName}\` from provided path \`${relPath}\`: ${renderLookupError(
+          customSchemaResult.error
+        )}`
+      );
+    }
+    return customSchemaResult;
   }
-  if ("configProvidedPath" in schemaPath) {
-    return {
-      ok: true,
-      schema: await getConfigProvidedSchemaFile(schemaPath.configProvidedPath)
-    };
+  const prismaConfigResult = await readSchemaFromPrismaConfigBasedLocation(schemaPathFromConfig);
+  if (prismaConfigResult.ok) {
+    return prismaConfigResult;
+  }
+  const pkgJsonResult = await getSchemaFromPackageJson(cwd);
+  if (pkgJsonResult.ok) {
+    return pkgJsonResult;
   }
-  const defaultResult = await getDefaultSchema(schemaPath.baseDir);
+  const defaultResult = await getDefaultSchema(cwd);
   if (defaultResult.ok) {
     return defaultResult;
   }
@@ -173,20 +162,13 @@ function renderDefaultLookupError(error, cwd) {
   parts.push("\nSee also https://pris.ly/d/prisma-schema-location");
   return parts.join("\n");
 }
-async function getCliProvidedSchemaFile(schemaPathFromArgs, cwd = process.cwd(), argumentName = "--schema") {
-  const absPath = import_path.default.resolve(cwd, schemaPathFromArgs);
-  const customSchemaResult = await readSchemaFromFileOrDirectory(absPath);
-  if (!customSchemaResult.ok) {
-    const relPath = import_path.default.relative(cwd, absPath);
-    throw new Error(
-      `Could not load \`${argumentName}\` from provided path \`${relPath}\`: ${renderLookupError(
-        customSchemaResult.error
-      )}`
-    );
+async function readSchemaFromPrismaConfigBasedLocation(schemaPathFromConfig) {
+  if (!schemaPathFromConfig) {
+    return {
+      ok: false,
+      error: { kind: "PrismaConfigNotConfigured" }
+    };
   }
-  return customSchemaResult.schema;
-}
-async function getConfigProvidedSchemaFile(schemaPathFromConfig) {
   const schemaResult = await readSchemaFromFileOrDirectory(schemaPathFromConfig);
   if (!schemaResult.ok) {
     throw new Error(
@@ -195,7 +177,37 @@ async function getConfigProvidedSchemaFile(schemaPathFromConfig) {
       )}`
     );
   }
-  return schemaResult.schema;
+  return schemaResult;
+}
+async function getSchemaFromPackageJson(cwd) {
+  const prismaConfig = await (0, import_config.loadConfigFromPackageJson)(cwd);
+  debug("prismaConfig", prismaConfig);
+  if (!prismaConfig || !prismaConfig.config?.schema) {
+    return { ok: false, error: { kind: "PackageJsonNotConfigured" } };
+  }
+  const schemaPathFromPkgJson = prismaConfig.config.schema;
+  if (typeof schemaPathFromPkgJson !== "string") {
+    throw new Error(
+      `Provided schema path \`${schemaPathFromPkgJson}\` from \`${import_path.default.relative(
+        cwd,
+        prismaConfig.loadedFromFile
+      )}\` must be of type string`
+    );
+  }
+  const absoluteSchemaPath = import_path.default.isAbsolute(schemaPathFromPkgJson) ? schemaPathFromPkgJson : import_path.default.resolve(import_path.default.dirname(prismaConfig.loadedFromFile), schemaPathFromPkgJson);
+  const lookupResult = await readSchemaFromFileOrDirectory(absoluteSchemaPath);
+  if (!lookupResult.ok) {
+    throw new Error(
+      `Could not load schema from \`${import_path.default.relative(
+        cwd,
+        absoluteSchemaPath
+      )}\` provided by "prisma.schema" config of \`${import_path.default.relative(
+        cwd,
+        prismaConfig.loadedFromFile
+      )}\`: ${renderLookupError(lookupResult.error)}`
+    );
+  }
+  return lookupResult;
 }
 async function getDefaultSchema(cwd, failures = []) {
   const lookupPaths = [import_path.default.join(cwd, "schema.prisma"), import_path.default.join(cwd, "prisma", "schema.prisma")];

package/dist/{chunk-GH2WAX5Y.js → chunk-F2OZV76L.js}

@@ -26,13 +26,13 @@ var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create(__g
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_GH2WAX5Y_exports = {};
-__export(chunk_GH2WAX5Y_exports, {
+var chunk_F2OZV76L_exports = {};
+__export(chunk_F2OZV76L_exports, {
   getBinaryPathsByVersion: () => getBinaryPathsByVersion
 });
-module.exports = __toCommonJS(chunk_GH2WAX5Y_exports);
-var import_chunk_GJSFP4V4 = require("./chunk-GJSFP4V4.js");
-var import_chunk_5I4ERIIY = require("./chunk-5I4ERIIY.js");
+module.exports = __toCommonJS(chunk_F2OZV76L_exports);
+var import_chunk_RS2R7COT = require("./chunk-RS2R7COT.js");
+var import_chunk_4CGPN5SR = require("./chunk-4CGPN5SR.js");
 var import_chunk_2SDPW6AX = require("./chunk-2SDPW6AX.js");
 var import_chunk_7B5PXS6N = require("./chunk-7B5PXS6N.js");
 var import_chunk_IDINCQMN = require("./chunk-IDINCQMN.js");
@@ -91,7 +91,7 @@ async function getBinaryPathsByVersion({
     }
     const binariesConfig = neededVersion.engines.reduce((acc, curr) => {
       if (!binaryPathsOverride?.[curr]) {
-        acc[(0, import_chunk_GJSFP4V4.engineTypeToBinaryType)(curr)] = binaryTargetBaseDir;
+        acc[(0, import_chunk_4CGPN5SR.engineTypeToBinaryType)(curr)] = binaryTargetBaseDir;
       }
       return acc;
     }, /* @__PURE__ */ Object.create(null));
@@ -107,7 +107,7 @@ async function getBinaryPathsByVersion({
         skipDownload
       };
       const binaryPathsWithEngineType = await (0, import_fetch_engine.download)(downloadParams);
-      const binaryPaths = (0, import_chunk_7B5PXS6N.mapKeys)(binaryPathsWithEngineType, import_chunk_5I4ERIIY.binaryTypeToEngineType);
+      const binaryPaths = (0, import_chunk_7B5PXS6N.mapKeys)(binaryPathsWithEngineType, import_chunk_RS2R7COT.binaryTypeToEngineType);
       binaryPathsByVersion[currentVersion] = binaryPaths;
     }
     if (binaryPathsOverride) {

package/dist/{chunk-R3J2O23S.js → chunk-FCYHZHVW.js}

@@ -26,13 +26,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_R3J2O23S_exports = {};
-__export(chunk_R3J2O23S_exports, {
+var chunk_FCYHZHVW_exports = {};
+__export(chunk_FCYHZHVW_exports, {
   canPrompt: () => canPrompt
 });
-module.exports = __toCommonJS(chunk_R3J2O23S_exports);
-var import_chunk_ICFLO5JW = require("./chunk-ICFLO5JW.js");
+module.exports = __toCommonJS(chunk_FCYHZHVW_exports);
 var import_chunk_H4NI2RIK = require("./chunk-H4NI2RIK.js");
+var import_chunk_ICFLO5JW = require("./chunk-ICFLO5JW.js");
 var import_prompts = __toESM(require("prompts"));
 var canPrompt = () => {
   const injectedCount = import_prompts.default._injected?.length;

package/dist/{chunk-DQWKFZPY.js → chunk-FYZCPL2Z.js}

@@ -26,17 +26,17 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_DQWKFZPY_exports = {};
-__export(chunk_DQWKFZPY_exports, {
+var chunk_FYZCPL2Z_exports = {};
+__export(chunk_FYZCPL2Z_exports, {
   BinaryType: () => import_fetch_engine.BinaryType,
   engineEnvVarMap: () => import_fetch_engine.engineEnvVarMap,
   maybeCopyToTmp: () => maybeCopyToTmp,
   resolveBinary: () => resolveBinary,
   safeResolveBinary: () => safeResolveBinary
 });
-module.exports = __toCommonJS(chunk_DQWKFZPY_exports);
-var import_chunk_IDINCQMN = require("./chunk-IDINCQMN.js");
+module.exports = __toCommonJS(chunk_FYZCPL2Z_exports);
 var import_chunk_M3GBKLGE = require("./chunk-M3GBKLGE.js");
+var import_chunk_IDINCQMN = require("./chunk-IDINCQMN.js");
 var import_chunk_TWSLDIFL = require("./chunk-TWSLDIFL.js");
 var import_chunk_5DBOS77Y = require("./chunk-5DBOS77Y.js");
 var import_chunk_5VQNKCKW = require("./chunk-5VQNKCKW.js");
@@ -51,6 +51,9 @@ var import_temp_dir = (0, import_chunk_4VNS5WPM.__toESM)((0, import_chunk_5VQNKC
 async function getBinaryName(name) {
   const binaryTarget = await (0, import_get_platform.getBinaryTargetForCurrentPlatform)();
   const extension = binaryTarget === "windows" ? ".exe" : "";
+  if (name === import_fetch_engine.BinaryType.QueryEngineLibrary) {
+    return (0, import_get_platform.getNodeAPIName)(binaryTarget, "fs");
+  }
   return `${name}-${binaryTarget}${extension}`;
 }
 async function resolveBinary(name, proposedPath) {

package/dist/{chunk-2GPDFPDR.js → chunk-GMW36QQF.js}

@@ -26,15 +26,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_2GPDFPDR_exports = {};
-__export(chunk_2GPDFPDR_exports, {
+var chunk_GMW36QQF_exports = {};
+__export(chunk_GMW36QQF_exports, {
   getEnginesInfo: () => getEnginesInfo,
   resolveEngine: () => resolveEngine
 });
-module.exports = __toCommonJS(chunk_2GPDFPDR_exports);
-var import_chunk_Q75TMXCR = require("./chunk-Q75TMXCR.js");
+module.exports = __toCommonJS(chunk_GMW36QQF_exports);
+var import_chunk_OAT7ZJED = require("./chunk-OAT7ZJED.js");
 var import_chunk_R6QH57HZ = require("./chunk-R6QH57HZ.js");
-var import_chunk_DQWKFZPY = require("./chunk-DQWKFZPY.js");
+var import_chunk_FYZCPL2Z = require("./chunk-FYZCPL2Z.js");
 var import_chunk_5DBOS77Y = require("./chunk-5DBOS77Y.js");
 var import_chunk_XKZ6CBLA = require("./chunk-XKZ6CBLA.js");
 var import_chunk_4VNS5WPM = require("./chunk-4VNS5WPM.js");
@@ -131,7 +131,7 @@ async function resolveEngine(binaryName) {
   const enginePathEither = await (0, import_function2.pipe)(
     pathFromEnvOption,
     fold(
-      () => (0, import_chunk_DQWKFZPY.safeResolveBinary)(binaryName),
+      () => (0, import_chunk_FYZCPL2Z.safeResolveBinary)(binaryName),
       (pathFromEnv) => (0, import_chunk_5DBOS77Y.right2)(pathFromEnv.path)
     )
   )();
@@ -139,7 +139,7 @@ async function resolveEngine(binaryName) {
     enginePathEither,
     import_chunk_5DBOS77Y.fromEither,
     (0, import_chunk_5DBOS77Y.chain)((enginePath) => {
-      return (0, import_chunk_Q75TMXCR.safeGetEngineVersion)(enginePath, binaryName);
+      return (0, import_chunk_OAT7ZJED.safeGetEngineVersion)(enginePath, binaryName);
     })
   )();
   const engineInfo = {

package/dist/{chunk-OVTE2A4Y.js → chunk-H43XC5ET.js}

@@ -16,11 +16,11 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_OVTE2A4Y_exports = {};
-__export(chunk_OVTE2A4Y_exports, {
+var chunk_H43XC5ET_exports = {};
+__export(chunk_H43XC5ET_exports, {
   version: () => version
 });
-module.exports = __toCommonJS(chunk_OVTE2A4Y_exports);
-var import_chunk_G7GV3UAA = require("./chunk-G7GV3UAA.js");
-var packageJson = (0, import_chunk_G7GV3UAA.require_package)();
+module.exports = __toCommonJS(chunk_H43XC5ET_exports);
+var import_chunk_7QKLIARO = require("./chunk-7QKLIARO.js");
+var packageJson = (0, import_chunk_7QKLIARO.require_package)();
 var version = packageJson.version;

package/dist/{chunk-YXCPS3WU.js → chunk-HFFWZTVM.js}

@@ -26,11 +26,12 @@ var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create(__g
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_YXCPS3WU_exports = {};
-__export(chunk_YXCPS3WU_exports, {
+var chunk_HFFWZTVM_exports = {};
+__export(chunk_HFFWZTVM_exports, {
   sendPanic: () => sendPanic
 });
-module.exports = __toCommonJS(chunk_YXCPS3WU_exports);
+module.exports = __toCommonJS(chunk_HFFWZTVM_exports);
+var import_chunk_KDHESRKE = require("./chunk-KDHESRKE.js");
 var import_chunk_XKZ6CBLA = require("./chunk-XKZ6CBLA.js");
 var import_chunk_5AI4FIZ3 = require("./chunk-5AI4FIZ3.js");
 var import_chunk_4VNS5WPM = require("./chunk-4VNS5WPM.js");
@@ -1784,7 +1785,14 @@ async function sendPanic({
     }).otherwise(() => void 0);
     dbVersion = await getDatabaseVersionSafe(getDatabaseVersionParams);
   }
-  const migrateRequest = error.request ? JSON.stringify(error.request) : void 0;
+  const migrateRequest = error.request ? JSON.stringify(
+    (0, import_chunk_KDHESRKE.mapScalarValues)(error.request, (value) => {
+      if (typeof value === "string") {
+        return (0, import_chunk_KDHESRKE.maskSchema)(value);
+      }
+      return value;
+    })
+  ) : void 0;
   const params = {
     area: error.area,
     kind: "RUST_PANIC",
@@ -1805,7 +1813,9 @@ async function sendPanic({
   return id;
 }
 function getCommand() {
-  if (process.argv[2] === "db" && process.argv[3] === "pull") {
+  if (process.argv[2] === "introspect") {
+    return "introspect";
+  } else if (process.argv[2] === "db" && process.argv[3] === "pull") {
     return "db pull";
   }
   return process.argv.slice(2).join(" ");

package/dist/chunk-HO5HRHFZ.js

@@ -0,0 +1,30 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var chunk_HO5HRHFZ_exports = {};
+__export(chunk_HO5HRHFZ_exports, {
+  serializeQueryEngineName: () => serializeQueryEngineName
+});
+module.exports = __toCommonJS(chunk_HO5HRHFZ_exports);
+function serializeQueryEngineName(message) {
+  const normalizedName = "query-engine-NORMALIZED";
+  if (process.env.PRISMA_CLI_QUERY_ENGINE_TYPE === "binary") {
+    return message.replace(/query-engine binary/g, normalizedName);
+  }
+  return message.replace(/query-engine-node-api library/g, normalizedName);
+}

package/dist/chunk-HW5RCZSE.js

@@ -0,0 +1 @@
+"use strict";