@cedarjs/project-config 2.8.1-next.0 → 2.8.1-next.109

package/dist/cjs/index.js

@@ -46,6 +46,7 @@ __export(src_exports, {
   getEnvVarDefinitions: () => getEnvVarDefinitions,
   getMigrationsPath: () => getMigrationsPath,
   getPaths: () => getPaths,
+  getPrismaSchemas: () => getPrismaSchemas,
   getRawConfig: () => getRawConfig,
   getRouteHookForPage: () => getRouteHookForPage,
   getSchemaPath: () => getSchemaPath,
@@ -470,6 +471,16 @@ async function getSchemaPath(prismaConfigPath) {
   }
   return import_node_path.default.join(configDir, "schema.prisma");
 }
+async function getPrismaSchemas() {
+  const mod = require("@prisma/internals");
+  const { createSchemaPathInput, getSchemaWithPath } = mod.default || mod;
+  const schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
+  const schemaPathInput = createSchemaPathInput({
+    baseDir: import_node_fs4.default.lstatSync(schemaPath).isDirectory() ? schemaPath : import_node_path.default.dirname(schemaPath),
+    schemaPathFromConfig: schemaPath
+  });
+  return getSchemaWithPath({ schemaPath: schemaPathInput });
+}
 async function getMigrationsPath(prismaConfigPath) {
   const config = await loadPrismaConfig(prismaConfigPath);
   const configDir = import_node_path.default.dirname(prismaConfigPath);
@@ -492,17 +503,38 @@ async function getDataMigrationsPath(prismaConfigPath) {
   const migrationsDir = import_node_path.default.dirname(migrationsPath);
   return import_node_path.default.join(migrationsDir, "dataMigrations");
 }
-function resolveGeneratedPrismaClient({ mustExist = false } = {}) {
-  const prismaClientEntry = import_node_path.default.join(
-    getPaths().base,
-    "node_modules/.prisma/client/index.js"
-  );
-  if (mustExist && !import_node_fs4.default.existsSync(prismaClientEntry)) {
-    throw new Error(
-      `Could not find generated Prisma client entry at ${prismaClientEntry}. Run \`yarn cedar prisma generate\` and try again.`
-    );
+async function resolveGeneratedPrismaClient() {
+  let generatorOutputPath;
+  let ext = "ts";
+  try {
+    const prismaInternalsMod = require("@prisma/internals");
+    const { getConfig: getConfig3 } = prismaInternalsMod.default || prismaInternalsMod;
+    const { schemas, schemaRootDir } = await getPrismaSchemas();
+    const config = await getConfig3({ datamodel: schemas });
+    const generator = config.generators.find((entry) => entry.name === "client") ?? config.generators[0];
+    const output = generator?.output?.value;
+    const generatedFileExtension = generator?.config?.generatedFileExtension;
+    const resolvedExtension = Array.isArray(generatedFileExtension) ? generatedFileExtension[0] : generatedFileExtension;
+    if (typeof resolvedExtension === "string" && resolvedExtension.length > 0) {
+      ext = resolvedExtension;
+    }
+    if (output) {
+      generatorOutputPath = import_node_path.default.isAbsolute(output) ? output : import_node_path.default.resolve(schemaRootDir, output);
+    }
+  } catch {
+  }
+  const prismaClientEntry = typeof generatorOutputPath === "string" ? import_node_path.default.join(generatorOutputPath, "client." + ext) : void 0;
+  if (!prismaClientEntry || !import_node_fs4.default.existsSync(prismaClientEntry)) {
+    const checked = prismaClientEntry ?? "(could not determine output path)";
+    return {
+      clientPath: prismaClientEntry,
+      error: `Could not find generated Prisma client entry. Checked: ${checked}. Run \`yarn cedar prisma generate\` and try again.`
+    };
   }
-  return prismaClientEntry;
+  return {
+    clientPath: prismaClientEntry,
+    error: void 0
+  };
 }
 
 // src/envVarDefinitions.ts
@@ -566,6 +598,7 @@ function getEnvVarDefinitions() {
   getEnvVarDefinitions,
   getMigrationsPath,
   getPaths,
+  getPrismaSchemas,
   getRawConfig,
   getRouteHookForPage,
   getSchemaPath,

package/dist/cjs/prisma.d.ts

@@ -15,6 +15,10 @@ export declare function loadPrismaConfig(prismaConfigPath: string): Promise<Pris
  * @returns Absolute path to the schema file or directory
  */
 export declare function getSchemaPath(prismaConfigPath: string): Promise<string>;
+/**
+ * Gets the Prisma schemas for the current project's default schema location.
+ */
+export declare function getPrismaSchemas(): Promise<import("@prisma/schema-files-loader").GetSchemaResult>;
 /**
  * Gets the migrations path from Prisma config.
  * Defaults to 'migrations' in the same directory as the schema.
@@ -42,7 +46,13 @@ export declare function getDbDir(prismaConfigPath: string): Promise<string>;
  * @returns Absolute path to the data migrations directory
  */
 export declare function getDataMigrationsPath(prismaConfigPath: string): Promise<string>;
-export declare function resolveGeneratedPrismaClient({ mustExist }?: {
-    mustExist?: boolean | undefined;
-}): string;
+type ResolveReturnType = {
+    clientPath: string;
+    error: undefined;
+} | {
+    clientPath: string | undefined;
+    error: string;
+};
+export declare function resolveGeneratedPrismaClient(): Promise<ResolveReturnType>;
+export {};
 //# sourceMappingURL=prisma.d.ts.map

package/dist/cjs/prisma.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prisma.d.ts","sourceRoot":"","sources":["../../src/prisma.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAO1C;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,yBA8B9D;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CAAC,gBAAgB,EAAE,MAAM,mBAY3D;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQxE;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED,wBAAgB,4BAA4B,CAAC,EAAE,SAAiB,EAAE;;CAAK,UActE"}
+{"version":3,"file":"prisma.d.ts","sourceRoot":"","sources":["../../src/prisma.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAO1C;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,yBA8B9D;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CAAC,gBAAgB,EAAE,MAAM,mBAY3D;AAED;;GAEG;AACH,wBAAsB,gBAAgB,mEAgBrC;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQxE;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED,KAAK,iBAAiB,GAClB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,GACxC;IAAE,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAErD,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAuD/E"}

package/dist/index.js

@@ -407,6 +407,16 @@ async function getSchemaPath(prismaConfigPath) {
   }
   return path3.join(configDir, "schema.prisma");
 }
+async function getPrismaSchemas() {
+  const mod = await import("@prisma/internals");
+  const { createSchemaPathInput, getSchemaWithPath } = mod.default || mod;
+  const schemaPath = await getSchemaPath(getPaths().api.prismaConfig);
+  const schemaPathInput = createSchemaPathInput({
+    baseDir: fs4.lstatSync(schemaPath).isDirectory() ? schemaPath : path3.dirname(schemaPath),
+    schemaPathFromConfig: schemaPath
+  });
+  return getSchemaWithPath({ schemaPath: schemaPathInput });
+}
 async function getMigrationsPath(prismaConfigPath) {
   const config = await loadPrismaConfig(prismaConfigPath);
   const configDir = path3.dirname(prismaConfigPath);
@@ -429,17 +439,38 @@ async function getDataMigrationsPath(prismaConfigPath) {
   const migrationsDir = path3.dirname(migrationsPath);
   return path3.join(migrationsDir, "dataMigrations");
 }
-function resolveGeneratedPrismaClient({ mustExist = false } = {}) {
-  const prismaClientEntry = path3.join(
-    getPaths().base,
-    "node_modules/.prisma/client/index.js"
-  );
-  if (mustExist && !fs4.existsSync(prismaClientEntry)) {
-    throw new Error(
-      `Could not find generated Prisma client entry at ${prismaClientEntry}. Run \`yarn cedar prisma generate\` and try again.`
-    );
+async function resolveGeneratedPrismaClient() {
+  let generatorOutputPath;
+  let ext = "ts";
+  try {
+    const prismaInternalsMod = await import("@prisma/internals");
+    const { getConfig: getConfig3 } = prismaInternalsMod.default || prismaInternalsMod;
+    const { schemas, schemaRootDir } = await getPrismaSchemas();
+    const config = await getConfig3({ datamodel: schemas });
+    const generator = config.generators.find((entry) => entry.name === "client") ?? config.generators[0];
+    const output = generator?.output?.value;
+    const generatedFileExtension = generator?.config?.generatedFileExtension;
+    const resolvedExtension = Array.isArray(generatedFileExtension) ? generatedFileExtension[0] : generatedFileExtension;
+    if (typeof resolvedExtension === "string" && resolvedExtension.length > 0) {
+      ext = resolvedExtension;
+    }
+    if (output) {
+      generatorOutputPath = path3.isAbsolute(output) ? output : path3.resolve(schemaRootDir, output);
+    }
+  } catch {
+  }
+  const prismaClientEntry = typeof generatorOutputPath === "string" ? path3.join(generatorOutputPath, "client." + ext) : void 0;
+  if (!prismaClientEntry || !fs4.existsSync(prismaClientEntry)) {
+    const checked = prismaClientEntry ?? "(could not determine output path)";
+    return {
+      clientPath: prismaClientEntry,
+      error: `Could not find generated Prisma client entry. Checked: ${checked}. Run \`yarn cedar prisma generate\` and try again.`
+    };
   }
-  return prismaClientEntry;
+  return {
+    clientPath: prismaClientEntry,
+    error: void 0
+  };
 }
 
 // src/envVarDefinitions.ts
@@ -502,6 +533,7 @@ export {
   getEnvVarDefinitions,
   getMigrationsPath,
   getPaths,
+  getPrismaSchemas,
   getRawConfig,
   getRouteHookForPage,
   getSchemaPath,

package/dist/prisma.d.ts

@@ -15,6 +15,10 @@ export declare function loadPrismaConfig(prismaConfigPath: string): Promise<Pris
  * @returns Absolute path to the schema file or directory
  */
 export declare function getSchemaPath(prismaConfigPath: string): Promise<string>;
+/**
+ * Gets the Prisma schemas for the current project's default schema location.
+ */
+export declare function getPrismaSchemas(): Promise<import("@prisma/schema-files-loader").GetSchemaResult>;
 /**
  * Gets the migrations path from Prisma config.
  * Defaults to 'migrations' in the same directory as the schema.
@@ -42,7 +46,13 @@ export declare function getDbDir(prismaConfigPath: string): Promise<string>;
  * @returns Absolute path to the data migrations directory
  */
 export declare function getDataMigrationsPath(prismaConfigPath: string): Promise<string>;
-export declare function resolveGeneratedPrismaClient({ mustExist }?: {
-    mustExist?: boolean | undefined;
-}): string;
+type ResolveReturnType = {
+    clientPath: string;
+    error: undefined;
+} | {
+    clientPath: string | undefined;
+    error: string;
+};
+export declare function resolveGeneratedPrismaClient(): Promise<ResolveReturnType>;
+export {};
 //# sourceMappingURL=prisma.d.ts.map

package/dist/prisma.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prisma.d.ts","sourceRoot":"","sources":["../src/prisma.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAO1C;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,yBA8B9D;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CAAC,gBAAgB,EAAE,MAAM,mBAY3D;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQxE;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED,wBAAgB,4BAA4B,CAAC,EAAE,SAAiB,EAAE;;CAAK,UActE"}
+{"version":3,"file":"prisma.d.ts","sourceRoot":"","sources":["../src/prisma.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAO1C;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,yBA8B9D;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CAAC,gBAAgB,EAAE,MAAM,mBAY3D;AAED;;GAEG;AACH,wBAAsB,gBAAgB,mEAgBrC;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQxE;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CACzC,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED,KAAK,iBAAiB,GAClB;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,CAAA;CAAE,GACxC;IAAE,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAErD,wBAAsB,4BAA4B,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAuD/E"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/project-config",
-  "version": "2.8.1-next.0+f9966f3d1",
+  "version": "2.8.1-next.109+be993981d",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -36,6 +36,7 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
+    "@prisma/internals": "7.5.0",
     "deepmerge": "4.3.1",
     "fast-glob": "3.3.3",
     "smol-toml": "1.6.0",
@@ -43,9 +44,9 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.2",
-    "@cedarjs/framework-tools": "2.8.1-next.1",
+    "@cedarjs/framework-tools": "2.8.1-next.109",
     "concurrently": "9.2.1",
-    "prisma": "6.19.2",
+    "prisma": "7.5.0",
     "publint": "0.3.18",
     "rimraf": "6.1.3",
     "tsx": "4.21.0",
@@ -55,5 +56,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9966f3d17f1740c9a1eeb90b30f0e6bd2655914"
+  "gitHead": "be993981d7e162a83244009c3f7ab9270c6773f3"
 }