@cedarjs/internal 2.8.1-next.0 → 2.8.1-next.116

package/dist/cjs/generate/graphqlCodeGen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphqlCodeGen.d.ts","sourceRoot":"","sources":["../../../src/generate/graphqlCodeGen.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAkB9D,KAAK,aAAa,GAAG;IACnB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAC9C,CAAA;AAED,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CAmFvE,CAAA;AAED,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CA0DvE,CAAA;AAiCD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM;SACD,MAAM;GAQ5D;AAkHD,eAAO,MAAM,iBAAiB,4RAe7B,CAAA"}
+{"version":3,"file":"graphqlCodeGen.d.ts","sourceRoot":"","sources":["../../../src/generate/graphqlCodeGen.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAkB9D,KAAK,aAAa,GAAG;IACnB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAC9C,CAAA;AAED,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CAiFvE,CAAA;AAED,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CAwDvE,CAAA;AAmCD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM;SACD,MAAM;GAQ5D;AA8JD,eAAO,MAAM,iBAAiB,4RAe7B,CAAA"}

package/dist/cjs/generate/graphqlCodeGen.js

@@ -35,7 +35,8 @@ __export(graphqlCodeGen_exports, {
 });
 module.exports = __toCommonJS(graphqlCodeGen_exports);
 var import_node_fs = __toESM(require("node:fs"), 1);
-var import_path = __toESM(require("path"), 1);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_node_url = require("node:url");
 var addPlugin = __toESM(require("@graphql-codegen/add"), 1);
 var import_cli = require("@graphql-codegen/cli");
 var import_core = require("@graphql-codegen/core");
@@ -76,12 +77,12 @@ const generateTypeDefGraphQLApi = async () => {
       errors
     };
   }
-  const filename = import_path.default.join((0, import_project_config.getPaths)().api.types, "graphql.d.ts");
+  const filename = import_node_path.default.join((0, import_project_config.getPaths)().api.types, "graphql.d.ts");
   const prismaModels = await getPrismaModels();
   const prismaImports = Object.keys(prismaModels).map((key) => {
     return `${key} as Prisma${key}`;
   });
-  const prismaImportSource = (0, import_project.dbReexportsPrismaClient)() ? "src/lib/db" : "@prisma/client";
+  const prismaImportSource = "src/lib/db";
   const extraPlugins = [
     {
       name: "add",
@@ -128,7 +129,7 @@ const generateTypeDefGraphQLApi = async () => {
   }
 };
 const generateTypeDefGraphQLWeb = async () => {
-  const filename = import_path.default.join((0, import_project_config.getPaths)().web.types, "graphql.d.ts");
+  const filename = import_node_path.default.join((0, import_project_config.getPaths)().web.types, "graphql.d.ts");
   const options = getLoadDocumentsOptions(filename);
   const documentsGlob = "./web/src/**/!(*.d).{ts,tsx,js,jsx}";
   let documents;
@@ -144,7 +145,7 @@ const generateTypeDefGraphQLWeb = async () => {
     {
       name: "add",
       options: {
-        content: `import { Prisma } from "${(0, import_project.dbReexportsPrismaClient)() ? "$api/src/lib/db" : "@prisma/client"}"`,
+        content: `import { Prisma } from "$api/src/lib/db"`,
         placement: "prepend"
       },
       codegenPlugin: addPlugin
@@ -181,13 +182,14 @@ async function runCodegenGraphQL(documents, extraPlugins, filename, side) {
   const userCodegenConfig = await (0, import_cli.loadCodegenConfig)({
     configFilePath: (0, import_project_config.getPaths)().base
   });
+  const pluginConfig = await getPluginConfig(side);
   const mergedConfig = {
-    ...await getPluginConfig(side),
+    ...pluginConfig,
     ...userCodegenConfig?.config?.config
   };
   const options = getCodegenOptions(documents, mergedConfig, extraPlugins);
   const output = await (0, import_core.codegen)(options);
-  import_node_fs.default.mkdirSync(import_path.default.dirname(filename), { recursive: true });
+  import_node_fs.default.mkdirSync(import_node_path.default.dirname(filename), { recursive: true });
   import_node_fs.default.writeFileSync(filename, output);
   return [filename];
 }
@@ -200,26 +202,58 @@ function getLoadDocumentsOptions(filename) {
   };
   return loadTypedefsConfig;
 }
-async function getPrismaClient(hasGenerated = false) {
-  let localPrisma;
-  if (hasGenerated) {
-    const cacheBuster = `?t=${Date.now()}`;
-    const prismaClientPath = (0, import_project_config.resolveGeneratedPrismaClient)({ mustExist: true });
-    const { default: freshPrisma } = await import(`file://${prismaClientPath}${cacheBuster}`);
-    localPrisma = freshPrisma;
-  } else {
-    const { default: packagePrisma } = await import("@prisma/client");
-    localPrisma = packagePrisma;
+async function importGeneratedPrismaClient() {
+  const cacheBuster = `?t=${Date.now()}`;
+  const { clientPath, error } = await (0, import_project_config.resolveGeneratedPrismaClient)();
+  if (!clientPath) {
+    throw new Error(error);
+  }
+  const fileUrl = (0, import_node_url.pathToFileURL)(clientPath).href + cacheBuster;
+  const freshPrisma = await import(fileUrl);
+  return freshPrisma;
+}
+function isModelNameRecord(value) {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  return Object.values(value).every((entry) => typeof entry === "string");
+}
+function getModelName(mod) {
+  if (typeof mod !== "object" || mod === null || !("Prisma" in mod)) {
+    return null;
+  }
+  const prismaModule = mod.Prisma;
+  if (typeof prismaModule !== "object" || prismaModule === null || !("ModelName" in prismaModule)) {
+    return null;
+  }
+  const modelName = prismaModule.ModelName;
+  if (typeof modelName !== "object" || modelName === null) {
+    return null;
+  }
+  if (isModelNameRecord(modelName)) {
+    return modelName;
   }
-  if (!localPrisma.ModelName) {
-    if (hasGenerated) {
-      return { ModelName: {} };
-    } else {
-      import_execa.default.sync("yarn", ["cedar", "prisma", "generate"]);
-      return getPrismaClient(true);
+  return null;
+}
+async function getPrismaClient() {
+  try {
+    const localPrisma = await importGeneratedPrismaClient();
+    const modelName = getModelName(localPrisma);
+    if (modelName) {
+      return { ModelName: modelName };
     }
+  } catch {
+  }
+  import_execa.default.sync("yarn", ["cedar", "prisma", "generate"]);
+  try {
+    const freshPrisma = await importGeneratedPrismaClient();
+    const modelName = getModelName(freshPrisma);
+    if (modelName) {
+      return { ModelName: modelName };
+    }
+  } catch {
   }
-  return localPrisma;
+  return { ModelName: {} };
 }
 async function getPrismaModels() {
   const localPrisma = await getPrismaClient();

package/dist/cjs/generate/graphqlSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphqlSchema.d.ts","sourceRoot":"","sources":["../../../src/generate/graphqlSchema.ts"],"names":[],"mappings":"AA4BA,eAAO,MAAM,qBAAqB;;;iBA6DP,MAAM;eAAS,OAAO;;EA8EhD,CAAA"}
+{"version":3,"file":"graphqlSchema.d.ts","sourceRoot":"","sources":["../../../src/generate/graphqlSchema.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,qBAAqB;;;iBA2DP,MAAM;eAAS,OAAO;;EA2EhD,CAAA"}

package/dist/cjs/generate/graphqlSchema.js

@@ -36,16 +36,14 @@ var import_core = require("@graphql-codegen/core");
 var schemaAstPlugin = __toESM(require("@graphql-codegen/schema-ast"), 1);
 var import_code_file_loader = require("@graphql-tools/code-file-loader");
 var import_load = require("@graphql-tools/load");
-var import_internals = __toESM(require("@prisma/internals"), 1);
 var import_ansis = __toESM(require("ansis"), 1);
 var import_graphql = require("graphql");
 var import_termi_link = require("termi-link");
 var import_graphql_server = require("@cedarjs/graphql-server");
 var import_project_config = require("@cedarjs/project-config");
-const { getSchemaWithPath } = import_internals.default;
 const generateGraphQLSchema = async () => {
-  const redwoodProjectPaths = (0, import_project_config.getPaths)();
-  const redwoodProjectConfig = (0, import_project_config.getConfig)();
+  const cedarPaths = (0, import_project_config.getPaths)();
+  const cedarConfig = (0, import_project_config.getConfig)();
   const schemaPointerMap = {
     [(0, import_graphql.print)(import_graphql_server.rootSchema.schema)]: {},
     "graphql/**/*.sdl.{js,ts}": {},
@@ -57,7 +55,7 @@ const generateGraphQLSchema = async () => {
     "!subscriptions/**/*.spec.{js,ts}": {}
   };
   for (const [name, schema] of Object.entries(import_graphql_server.rootSchema.scalarSchemas)) {
-    if (redwoodProjectConfig.graphql.includeScalars[name]) {
+    if (cedarConfig.graphql.includeScalars[name]) {
       schemaPointerMap[(0, import_graphql.print)(schema)] = {};
     }
   }
@@ -76,10 +74,10 @@ const generateGraphQLSchema = async () => {
     sort: true,
     convertExtensions: true,
     includeSources: true,
-    cwd: redwoodProjectPaths.api.src,
+    cwd: cedarPaths.api.src,
     schema: Object.keys(schemaPointerMap),
     generates: {
-      [redwoodProjectPaths.generated.schema]: {
+      [cedarPaths.generated.schema]: {
         plugins: ["schema-ast"]
       }
     },
@@ -96,10 +94,7 @@ const generateGraphQLSchema = async () => {
     if (e instanceof Error) {
       const match = e.message.match(/Unknown type: "(\w+)"/);
       const name = match?.[1];
-      const schemaPath = await (0, import_project_config.getSchemaPath)(
-        redwoodProjectPaths.api.prismaConfig
-      );
-      const result = await getSchemaWithPath(schemaPath);
+      const result = await (0, import_project_config.getPrismaSchemas)();
       const schemaPrisma = result.schemas.map(([, content]) => content).join("\n");
       const errorObject = {
         message: `Schema loading failed. ${e.message}`,
@@ -139,14 +134,14 @@ const generateGraphQLSchema = async () => {
     pluginMap: { "schema-ast": schemaAstPlugin },
     schema: {},
     schemaAst: loadedSchema,
-    filename: redwoodProjectPaths.generated.schema,
+    filename: cedarPaths.generated.schema,
     documents: []
   };
   if (loadedSchema) {
     try {
       const schema = await (0, import_core.codegen)(options);
-      import_node_fs.default.writeFileSync(redwoodProjectPaths.generated.schema, schema);
-      return { schemaPath: redwoodProjectPaths.generated.schema, errors };
+      import_node_fs.default.writeFileSync(cedarPaths.generated.schema, schema);
+      return { schemaPath: cedarPaths.generated.schema, errors };
     } catch (e) {
       errors.push({
         message: `GraphQL Schema codegen failed`,

package/dist/cjs/generate/plugins/rw-typescript-resolvers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/generate/plugins/rw-typescript-resolvers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAK5E,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAI5F,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAA;AAE3D,eAAO,MAAM,MAAM,EAAE,cAAc,CACjC,+BAA+B,EAC/B,KAAK,CAAC,mBAAmB,CAgF1B,CAAA;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAA;AACvC,YAAY,EAAE,+BAA+B,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/generate/plugins/rw-typescript-resolvers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAK5E,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAI5F,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAA;AAE3D,eAAO,MAAM,MAAM,EAAE,cAAc,CACjC,+BAA+B,EAC/B,KAAK,CAAC,mBAAmB,CA6E1B,CAAA;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAA;AACvC,YAAY,EAAE,+BAA+B,EAAE,CAAA"}

package/dist/cjs/generate/plugins/rw-typescript-resolvers/index.js

@@ -25,12 +25,12 @@ module.exports = __toCommonJS(rw_typescript_resolvers_exports);
 var import_plugin_helpers = require("@graphql-codegen/plugin-helpers");
 var import_typescript_resolvers = require("@graphql-codegen/typescript-resolvers");
 var import_visitor = require("./visitor.js");
-const plugin = (schema, _documents, config) => {
+const plugin = async (schema, _documents, config) => {
   const visitor = new import_visitor.RwTypeScriptResolversVisitor(config, schema);
   const visitorResult = (0, import_plugin_helpers.oldVisit)((0, import_plugin_helpers.getCachedDocumentNodeFromSchema)(schema), {
     leave: visitor
   });
-  const { prepend, content } = (0, import_typescript_resolvers.plugin)(schema, [], config);
+  const { prepend = [], content } = await (0, import_typescript_resolvers.plugin)(schema, [], config);
   prepend.push(`export type OptArgsResolverFn<TResult, TParent = {}, TContext = {}, TArgs = {}> = (
       args?: TArgs,
       obj?: { root: TParent; context: TContext; info: GraphQLResolveInfo }
@@ -44,7 +44,7 @@ const plugin = (schema, _documents, config) => {
   const visitorResultStart = splitContent.indexOf(
     visitorResult.definitions.filter((d) => typeof d === "string")[0].split("\n")[0]
   );
-  const splitRootResolver = visitor.getRootResolver().split("\n");
+  const splitRootResolver = visitor.getRootResolver().content.split("\n");
   const visitorResultEnd = splitContent.findIndex(
     (line, index) => line === splitRootResolver[0] && splitContent[index + 1] === splitRootResolver[1]
   );

package/dist/cjs/generate/plugins/rw-typescript-resolvers/visitor.d.ts

@@ -1,9 +1,10 @@
 import type { TypeScriptResolversPluginConfig } from '@graphql-codegen/typescript-resolvers';
 import { TypeScriptResolversVisitor } from '@graphql-codegen/typescript-resolvers';
+import type { FieldDefinitionResult } from '@graphql-codegen/visitor-plugin-common';
 import type { FieldDefinitionNode, GraphQLSchema, ObjectTypeDefinitionNode } from 'graphql';
 export declare class RwTypeScriptResolversVisitor extends TypeScriptResolversVisitor {
     constructor(pluginConfig: TypeScriptResolversPluginConfig, schema: GraphQLSchema);
-    FieldDefinition(node: FieldDefinitionNode, key: string | number, parent: any): (parentName: string) => string | null;
-    ObjectTypeDefinition(node: ObjectTypeDefinitionNode): string;
+    FieldDefinition(node: FieldDefinitionNode, key: string | number, parent: any): FieldDefinitionResult;
+    ObjectTypeDefinition(node: ObjectTypeDefinitionNode): string | null;
 }
 //# sourceMappingURL=visitor.d.ts.map

package/dist/cjs/generate/plugins/rw-typescript-resolvers/visitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../../../../src/generate/plugins/rw-typescript-resolvers/visitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAA;AAKlF,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,wBAAwB,EACzB,MAAM,SAAS,CAAA;AAEhB,qBAAa,4BAA6B,SAAQ,0BAA0B;gBAExE,YAAY,EAAE,+BAA+B,EAC7C,MAAM,EAAE,aAAa;IAKvB,eAAe,CACb,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,MAAM,EAAE,GAAG,GACV,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI;IAuBxC,oBAAoB,CAAC,IAAI,EAAE,wBAAwB,GAAG,MAAM;CAgG7D"}
+{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../../../../src/generate/plugins/rw-typescript-resolvers/visitor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAA;AAElF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AACnF,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,wBAAwB,EACzB,MAAM,SAAS,CAAA;AAEhB,qBAAa,4BAA6B,SAAQ,0BAA0B;gBAExE,YAAY,EAAE,+BAA+B,EAC7C,MAAM,EAAE,aAAa;IAMvB,eAAe,CACb,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,MAAM,EAAE,GAAG,GACV,qBAAqB;IAgCxB,oBAAoB,CAAC,IAAI,EAAE,wBAAwB,GAAG,MAAM,GAAG,IAAI;CA6FpE"}

package/dist/cjs/generate/plugins/rw-typescript-resolvers/visitor.js

@@ -25,17 +25,26 @@ var import_typescript_resolvers = require("@graphql-codegen/typescript-resolvers
 var import_visitor_plugin_common = require("@graphql-codegen/visitor-plugin-common");
 class RwTypeScriptResolversVisitor extends import_typescript_resolvers.TypeScriptResolversVisitor {
   constructor(pluginConfig, schema) {
-    super(pluginConfig, schema);
+    super(pluginConfig, schema, {});
   }
   FieldDefinition(node, key, parent) {
     const hasArguments = node.arguments && node.arguments.length > 0;
     const superFieldDefinition = super.FieldDefinition(node, key, parent);
-    return (parentName) => {
-      const fieldDef = superFieldDefinition(parentName);
-      if (!hasArguments && fieldDef?.includes(": Resolver<")) {
-        return fieldDef.replace(": Resolver<", ": OptArgsResolverFn<");
+    return {
+      node: superFieldDefinition.node,
+      printContent: (parentNode, avoidResolverOptionals) => {
+        const result = superFieldDefinition.printContent(
+          parentNode,
+          avoidResolverOptionals
+        );
+        if (!hasArguments && result.value?.includes(": Resolver<")) {
+          return {
+            ...result,
+            value: result.value.replace(": Resolver<", ": OptArgsResolverFn<")
+          };
+        }
+        return result;
       }
-      return fieldDef;
     };
   }
   // Original implementation is here:
@@ -45,36 +54,35 @@ class RwTypeScriptResolversVisitor extends import_typescript_resolvers.TypeScrip
     const name = this.convertName(node, {
       suffix: this.config.resolverTypeSuffix
     });
-    const typeName = node.name;
+    const typeName = node.name.value;
     const parentType = this.getParentTypeToUse(typeName);
-    const fieldsContent = (node.fields || []).map((f) => f(node.name));
-    const isRootType = [
-      this.schema.getQueryType()?.name,
-      this.schema.getMutationType()?.name,
-      this.schema.getSubscriptionType()?.name
-    ].includes(typeName);
-    if (!isRootType) {
-      fieldsContent.push(
-        (0, import_visitor_plugin_common.indent)(
-          `${this.config.internalResolversPrefix}isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>${this.getPunctuation(
-            "type"
-          )}`
-        )
-      );
-    }
+    const fieldsContent = (node.fields || []).map((f) => {
+      if ("printContent" in f && typeof f.printContent === "function") {
+        return f.printContent(node, false).value;
+      } else {
+        throw new Error("Unexpected field type");
+      }
+    });
     const blockRelationsResolver = new import_visitor_plugin_common.DeclarationBlock(
       this._declarationBlockConfig
     ).export().asKind("type").withName(
       name.replace("Resolvers", "RelationResolvers"),
       `<ContextType = ${this.config.contextType.type}, ${this.transformParentGenericType(parentType)}>`
     ).withBlock(
-      fieldsContent.map(
-        (content) => content.replace(
-          /: (?:OptArgs)?Resolver(?:Fn)?/,
-          "?: RequiredResolverFn"
+      fieldsContent.filter((content) => content !== null).map(
+        (content) => (
+          // In v5, fields may already carry an optional marker `?:`. The
+          // regex consumes the optional `?` so we don't emit a double `??`.
+          content.replace(
+            /\??: (?:OptArgs)?Resolver(?:Fn)?/,
+            "?: RequiredResolverFn"
+          )
         )
       ).join("\n")
     );
+    if (originalBlock === null) {
+      return null;
+    }
     return originalBlock + "\n" + blockRelationsResolver.string;
   }
 }

package/dist/cjs/index.d.ts

@@ -2,7 +2,6 @@ export * from '@cedarjs/project-config';
 export * from './ts2js.js';
 export * from './dev.js';
 export * from './routes.js';
-export { dbReexportsPrismaClient } from './project.js';
 export * from './files.js';
 export { generate } from './generate/generate.js';
 export { buildApi } from './build/api.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AAEvC,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAA;AAEtD,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,cAAc,qBAAqB,CAAA;AAGnC,cAAc,uBAAuB,CAAA;AAErC,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AAEvC,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAE3B,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,cAAc,qBAAqB,CAAA;AAGnC,cAAc,uBAAuB,CAAA;AAErC,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA"}

package/dist/cjs/index.js

@@ -20,7 +20,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   buildApi: () => import_api.buildApi,
-  dbReexportsPrismaClient: () => import_project.dbReexportsPrismaClient,
   generate: () => import_generate.generate,
   listQueryTypeFieldsInProject: () => import_gql.listQueryTypeFieldsInProject
 });
@@ -29,7 +28,6 @@ __reExport(src_exports, require("@cedarjs/project-config"), module.exports);
 __reExport(src_exports, require("./ts2js.js"), module.exports);
 __reExport(src_exports, require("./dev.js"), module.exports);
 __reExport(src_exports, require("./routes.js"), module.exports);
-var import_project = require("./project.js");
 __reExport(src_exports, require("./files.js"), module.exports);
 var import_generate = require("./generate/generate.js");
 var import_api = require("./build/api.js");
@@ -39,7 +37,6 @@ var import_gql = require("./gql.js");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildApi,
-  dbReexportsPrismaClient,
   generate,
   listQueryTypeFieldsInProject,
   ...require("@cedarjs/project-config"),

package/dist/cjs/project.d.ts

@@ -5,5 +5,4 @@ export declare const getTsConfigs: () => {
 export declare const isTypeScriptProject: () => boolean;
 export declare const isServerFileSetup: () => boolean;
 export declare const isRealtimeSetup: () => boolean;
-export declare const dbReexportsPrismaClient: () => boolean;
 //# sourceMappingURL=project.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/project.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY;;;CAuBxB,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,iBAAiB,eAO7B,CAAA;AAED,eAAO,MAAM,eAAe,eAO3B,CAAA;AAED,eAAO,MAAM,uBAAuB,eAUnC,CAAA"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../src/project.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY;;;CAuBxB,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,iBAAiB,eAO7B,CAAA;AAED,eAAO,MAAM,eAAe,eAO3B,CAAA"}

package/dist/cjs/project.js

@@ -28,7 +28,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var project_exports = {};
 __export(project_exports, {
-  dbReexportsPrismaClient: () => dbReexportsPrismaClient,
   getTsConfigs: () => getTsConfigs,
   isRealtimeSetup: () => isRealtimeSetup,
   isServerFileSetup: () => isServerFileSetup,
@@ -74,17 +73,8 @@ const isRealtimeSetup = () => {
   );
   return import_node_fs.default.existsSync(realtimePath);
 };
-const dbReexportsPrismaClient = () => {
-  const dbPath = (0, import_project_config.resolveFile)(import_path.default.join((0, import_project_config.getPaths)().api.lib, "db"));
-  if (!dbPath) {
-    return false;
-  }
-  const content = import_node_fs.default.readFileSync(dbPath, "utf-8");
-  return /export\s+\*\s+from\s+['"]@prisma\/client['"]/.test(content);
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  dbReexportsPrismaClient,
   getTsConfigs,
   isRealtimeSetup,
   isServerFileSetup,

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

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/routes.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,gBAAgB,EAAE,CAyBvD;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,WAgBxC;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,MAAM,CAAA;IACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAA;IACnD,SAAS,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CAE9B;AAED,MAAM,WAAW,SAAU,SAAQ,mBAAmB;IACpD,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,SAAS,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAED,eAAO,MAAM,gBAAgB,QAAO,SAAS,EAoC5C,CAAA"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/routes.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,gBAAgB,EAAE,CAyBvD;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,WAgBxC;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,MAAM,CAAA;IACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAA;IACnD,SAAS,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CAE9B;AAED,MAAM,WAAW,SAAU,SAAQ,mBAAmB;IACpD,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,SAAS,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAED,eAAO,MAAM,gBAAgB,QAAO,SAAS,EAmC5C,CAAA"}

package/dist/cjs/routes.js

@@ -40,7 +40,7 @@ var import_util = require("@cedarjs/router/dist/util");
 var import_structure = require("@cedarjs/structure");
 function getDuplicateRoutes() {
   const duplicateRoutes = [];
-  const allRoutes = (0, import_structure.getProject)((0, import_project_config.getPaths)().base).router.routes;
+  const allRoutes = (0, import_structure.getProject)().router.routes;
   const uniqueNames = new Set(
     allRoutes.filter((route) => route.name !== void 0).map((route) => route.name)
   );
@@ -78,8 +78,7 @@ function warningForDuplicateRoutes() {
   return message.trimEnd();
 }
 const getProjectRoutes = () => {
-  const rwProject = (0, import_structure.getProject)((0, import_project_config.getPaths)().base);
-  const routes = rwProject.getRouter().routes;
+  const routes = (0, import_structure.getProject)().getRouter().routes;
   return routes.map((route) => {
     const { matchRegexString, routeParams } = route.isNotFound ? { matchRegexString: null, routeParams: null } : (0, import_util.getRouteRegexAndParams)(route.path);
     return {

package/dist/generate/graphqlCodeGen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphqlCodeGen.d.ts","sourceRoot":"","sources":["../../src/generate/graphqlCodeGen.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAkB9D,KAAK,aAAa,GAAG;IACnB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAC9C,CAAA;AAED,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CAmFvE,CAAA;AAED,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CA0DvE,CAAA;AAiCD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM;SACD,MAAM;GAQ5D;AAkHD,eAAO,MAAM,iBAAiB,4RAe7B,CAAA"}
+{"version":3,"file":"graphqlCodeGen.d.ts","sourceRoot":"","sources":["../../src/generate/graphqlCodeGen.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAkB9D,KAAK,aAAa,GAAG;IACnB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CAC9C,CAAA;AAED,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CAiFvE,CAAA;AAED,eAAO,MAAM,yBAAyB,QAAa,OAAO,CAAC,aAAa,CAwDvE,CAAA;AAmCD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM;SACD,MAAM;GAQ5D;AA8JD,eAAO,MAAM,iBAAiB,4RAe7B,CAAA"}

package/dist/generate/graphqlCodeGen.js

@@ -1,5 +1,6 @@
 import fs from "node:fs";
-import path from "path";
+import path from "node:path";
+import { pathToFileURL } from "node:url";
 import * as addPlugin from "@graphql-codegen/add";
 import { loadCodegenConfig } from "@graphql-codegen/cli";
 import { codegen } from "@graphql-codegen/core";
@@ -15,7 +16,7 @@ import {
   getConfig,
   resolveGeneratedPrismaClient
 } from "@cedarjs/project-config";
-import { getTsConfigs, dbReexportsPrismaClient } from "../project.js";
+import { getTsConfigs } from "../project.js";
 import * as rwTypescriptResolvers from "./plugins/rw-typescript-resolvers/index.js";
 var CodegenSide = /* @__PURE__ */ ((CodegenSide2) => {
   CodegenSide2[CodegenSide2["API"] = 0] = "API";
@@ -49,7 +50,7 @@ const generateTypeDefGraphQLApi = async () => {
   const prismaImports = Object.keys(prismaModels).map((key) => {
     return `${key} as Prisma${key}`;
   });
-  const prismaImportSource = dbReexportsPrismaClient() ? "src/lib/db" : "@prisma/client";
+  const prismaImportSource = "src/lib/db";
   const extraPlugins = [
     {
       name: "add",
@@ -112,7 +113,7 @@ const generateTypeDefGraphQLWeb = async () => {
     {
       name: "add",
       options: {
-        content: `import { Prisma } from "${dbReexportsPrismaClient() ? "$api/src/lib/db" : "@prisma/client"}"`,
+        content: `import { Prisma } from "$api/src/lib/db"`,
         placement: "prepend"
       },
       codegenPlugin: addPlugin
@@ -149,8 +150,9 @@ async function runCodegenGraphQL(documents, extraPlugins, filename, side) {
   const userCodegenConfig = await loadCodegenConfig({
     configFilePath: getPaths().base
   });
+  const pluginConfig = await getPluginConfig(side);
   const mergedConfig = {
-    ...await getPluginConfig(side),
+    ...pluginConfig,
     ...userCodegenConfig?.config?.config
   };
   const options = getCodegenOptions(documents, mergedConfig, extraPlugins);
@@ -168,26 +170,58 @@ function getLoadDocumentsOptions(filename) {
   };
   return loadTypedefsConfig;
 }
-async function getPrismaClient(hasGenerated = false) {
-  let localPrisma;
-  if (hasGenerated) {
-    const cacheBuster = `?t=${Date.now()}`;
-    const prismaClientPath = resolveGeneratedPrismaClient({ mustExist: true });
-    const { default: freshPrisma } = await import(`file://${prismaClientPath}${cacheBuster}`);
-    localPrisma = freshPrisma;
-  } else {
-    const { default: packagePrisma } = await import("@prisma/client");
-    localPrisma = packagePrisma;
+async function importGeneratedPrismaClient() {
+  const cacheBuster = `?t=${Date.now()}`;
+  const { clientPath, error } = await resolveGeneratedPrismaClient();
+  if (!clientPath) {
+    throw new Error(error);
+  }
+  const fileUrl = pathToFileURL(clientPath).href + cacheBuster;
+  const freshPrisma = await import(fileUrl);
+  return freshPrisma;
+}
+function isModelNameRecord(value) {
+  if (typeof value !== "object" || value === null) {
+    return false;
+  }
+  return Object.values(value).every((entry) => typeof entry === "string");
+}
+function getModelName(mod) {
+  if (typeof mod !== "object" || mod === null || !("Prisma" in mod)) {
+    return null;
+  }
+  const prismaModule = mod.Prisma;
+  if (typeof prismaModule !== "object" || prismaModule === null || !("ModelName" in prismaModule)) {
+    return null;
+  }
+  const modelName = prismaModule.ModelName;
+  if (typeof modelName !== "object" || modelName === null) {
+    return null;
+  }
+  if (isModelNameRecord(modelName)) {
+    return modelName;
   }
-  if (!localPrisma.ModelName) {
-    if (hasGenerated) {
-      return { ModelName: {} };
-    } else {
-      execa.sync("yarn", ["cedar", "prisma", "generate"]);
-      return getPrismaClient(true);
+  return null;
+}
+async function getPrismaClient() {
+  try {
+    const localPrisma = await importGeneratedPrismaClient();
+    const modelName = getModelName(localPrisma);
+    if (modelName) {
+      return { ModelName: modelName };
     }
+  } catch {
+  }
+  execa.sync("yarn", ["cedar", "prisma", "generate"]);
+  try {
+    const freshPrisma = await importGeneratedPrismaClient();
+    const modelName = getModelName(freshPrisma);
+    if (modelName) {
+      return { ModelName: modelName };
+    }
+  } catch {
   }
-  return localPrisma;
+  return { ModelName: {} };
 }
 async function getPrismaModels() {
   const localPrisma = await getPrismaClient();

package/dist/generate/graphqlSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphqlSchema.d.ts","sourceRoot":"","sources":["../../src/generate/graphqlSchema.ts"],"names":[],"mappings":"AA4BA,eAAO,MAAM,qBAAqB;;;iBA6DP,MAAM;eAAS,OAAO;;EA8EhD,CAAA"}
+{"version":3,"file":"graphqlSchema.d.ts","sourceRoot":"","sources":["../../src/generate/graphqlSchema.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,qBAAqB;;;iBA2DP,MAAM;eAAS,OAAO;;EA2EhD,CAAA"}

package/dist/generate/graphqlSchema.js

@@ -3,7 +3,6 @@ import { codegen } from "@graphql-codegen/core";
 import * as schemaAstPlugin from "@graphql-codegen/schema-ast";
 import { CodeFileLoader } from "@graphql-tools/code-file-loader";
 import { loadSchema } from "@graphql-tools/load";
-import prismaInternals from "@prisma/internals";
 import ansis from "ansis";
 import { print } from "graphql";
 import { terminalLink } from "termi-link";
@@ -12,12 +11,11 @@ import {
   getPaths,
   getConfig,
   resolveFile,
-  getSchemaPath
+  getPrismaSchemas
 } from "@cedarjs/project-config";
-const { getSchemaWithPath } = prismaInternals;
 const generateGraphQLSchema = async () => {
-  const redwoodProjectPaths = getPaths();
-  const redwoodProjectConfig = getConfig();
+  const cedarPaths = getPaths();
+  const cedarConfig = getConfig();
   const schemaPointerMap = {
     [print(rootSchema.schema)]: {},
     "graphql/**/*.sdl.{js,ts}": {},
@@ -29,7 +27,7 @@ const generateGraphQLSchema = async () => {
     "!subscriptions/**/*.spec.{js,ts}": {}
   };
   for (const [name, schema] of Object.entries(rootSchema.scalarSchemas)) {
-    if (redwoodProjectConfig.graphql.includeScalars[name]) {
+    if (cedarConfig.graphql.includeScalars[name]) {
       schemaPointerMap[print(schema)] = {};
     }
   }
@@ -48,10 +46,10 @@ const generateGraphQLSchema = async () => {
     sort: true,
     convertExtensions: true,
     includeSources: true,
-    cwd: redwoodProjectPaths.api.src,
+    cwd: cedarPaths.api.src,
     schema: Object.keys(schemaPointerMap),
     generates: {
-      [redwoodProjectPaths.generated.schema]: {
+      [cedarPaths.generated.schema]: {
         plugins: ["schema-ast"]
       }
     },
@@ -68,10 +66,7 @@ const generateGraphQLSchema = async () => {
     if (e instanceof Error) {
       const match = e.message.match(/Unknown type: "(\w+)"/);
       const name = match?.[1];
-      const schemaPath = await getSchemaPath(
-        redwoodProjectPaths.api.prismaConfig
-      );
-      const result = await getSchemaWithPath(schemaPath);
+      const result = await getPrismaSchemas();
       const schemaPrisma = result.schemas.map(([, content]) => content).join("\n");
       const errorObject = {
         message: `Schema loading failed. ${e.message}`,
@@ -111,14 +106,14 @@ const generateGraphQLSchema = async () => {
     pluginMap: { "schema-ast": schemaAstPlugin },
     schema: {},
     schemaAst: loadedSchema,
-    filename: redwoodProjectPaths.generated.schema,
+    filename: cedarPaths.generated.schema,
     documents: []
   };
   if (loadedSchema) {
     try {
       const schema = await codegen(options);
-      fs.writeFileSync(redwoodProjectPaths.generated.schema, schema);
-      return { schemaPath: redwoodProjectPaths.generated.schema, errors };
+      fs.writeFileSync(cedarPaths.generated.schema, schema);
+      return { schemaPath: cedarPaths.generated.schema, errors };
     } catch (e) {
       errors.push({
         message: `GraphQL Schema codegen failed`,

package/dist/generate/plugins/rw-typescript-resolvers/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/generate/plugins/rw-typescript-resolvers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAK5E,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAI5F,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAA;AAE3D,eAAO,MAAM,MAAM,EAAE,cAAc,CACjC,+BAA+B,EAC/B,KAAK,CAAC,mBAAmB,CAgF1B,CAAA;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAA;AACvC,YAAY,EAAE,+BAA+B,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/generate/plugins/rw-typescript-resolvers/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAK5E,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAI5F,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAA;AAE3D,eAAO,MAAM,MAAM,EAAE,cAAc,CACjC,+BAA+B,EAC/B,KAAK,CAAC,mBAAmB,CA6E1B,CAAA;AAED,OAAO,EAAE,4BAA4B,EAAE,CAAA;AACvC,YAAY,EAAE,+BAA+B,EAAE,CAAA"}

package/dist/generate/plugins/rw-typescript-resolvers/index.js

@@ -4,12 +4,12 @@ import {
 } from "@graphql-codegen/plugin-helpers";
 import { plugin as originalPlugin } from "@graphql-codegen/typescript-resolvers";
 import { RwTypeScriptResolversVisitor } from "./visitor.js";
-const plugin = (schema, _documents, config) => {
+const plugin = async (schema, _documents, config) => {
   const visitor = new RwTypeScriptResolversVisitor(config, schema);
   const visitorResult = oldVisit(getCachedDocumentNodeFromSchema(schema), {
     leave: visitor
   });
-  const { prepend, content } = originalPlugin(schema, [], config);
+  const { prepend = [], content } = await originalPlugin(schema, [], config);
   prepend.push(`export type OptArgsResolverFn<TResult, TParent = {}, TContext = {}, TArgs = {}> = (
       args?: TArgs,
       obj?: { root: TParent; context: TContext; info: GraphQLResolveInfo }
@@ -23,7 +23,7 @@ const plugin = (schema, _documents, config) => {
   const visitorResultStart = splitContent.indexOf(
     visitorResult.definitions.filter((d) => typeof d === "string")[0].split("\n")[0]
   );
-  const splitRootResolver = visitor.getRootResolver().split("\n");
+  const splitRootResolver = visitor.getRootResolver().content.split("\n");
   const visitorResultEnd = splitContent.findIndex(
     (line, index) => line === splitRootResolver[0] && splitContent[index + 1] === splitRootResolver[1]
   );

package/dist/generate/plugins/rw-typescript-resolvers/visitor.d.ts

@@ -1,9 +1,10 @@
 import type { TypeScriptResolversPluginConfig } from '@graphql-codegen/typescript-resolvers';
 import { TypeScriptResolversVisitor } from '@graphql-codegen/typescript-resolvers';
+import type { FieldDefinitionResult } from '@graphql-codegen/visitor-plugin-common';
 import type { FieldDefinitionNode, GraphQLSchema, ObjectTypeDefinitionNode } from 'graphql';
 export declare class RwTypeScriptResolversVisitor extends TypeScriptResolversVisitor {
     constructor(pluginConfig: TypeScriptResolversPluginConfig, schema: GraphQLSchema);
-    FieldDefinition(node: FieldDefinitionNode, key: string | number, parent: any): (parentName: string) => string | null;
-    ObjectTypeDefinition(node: ObjectTypeDefinitionNode): string;
+    FieldDefinition(node: FieldDefinitionNode, key: string | number, parent: any): FieldDefinitionResult;
+    ObjectTypeDefinition(node: ObjectTypeDefinitionNode): string | null;
 }
 //# sourceMappingURL=visitor.d.ts.map

package/dist/generate/plugins/rw-typescript-resolvers/visitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../../../src/generate/plugins/rw-typescript-resolvers/visitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAA;AAKlF,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,wBAAwB,EACzB,MAAM,SAAS,CAAA;AAEhB,qBAAa,4BAA6B,SAAQ,0BAA0B;gBAExE,YAAY,EAAE,+BAA+B,EAC7C,MAAM,EAAE,aAAa;IAKvB,eAAe,CACb,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,MAAM,EAAE,GAAG,GACV,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI;IAuBxC,oBAAoB,CAAC,IAAI,EAAE,wBAAwB,GAAG,MAAM;CAgG7D"}
+{"version":3,"file":"visitor.d.ts","sourceRoot":"","sources":["../../../../src/generate/plugins/rw-typescript-resolvers/visitor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAA;AAElF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AACnF,OAAO,KAAK,EACV,mBAAmB,EACnB,aAAa,EACb,wBAAwB,EACzB,MAAM,SAAS,CAAA;AAEhB,qBAAa,4BAA6B,SAAQ,0BAA0B;gBAExE,YAAY,EAAE,+BAA+B,EAC7C,MAAM,EAAE,aAAa;IAMvB,eAAe,CACb,IAAI,EAAE,mBAAmB,EACzB,GAAG,EAAE,MAAM,GAAG,MAAM,EACpB,MAAM,EAAE,GAAG,GACV,qBAAqB;IAgCxB,oBAAoB,CAAC,IAAI,EAAE,wBAAwB,GAAG,MAAM,GAAG,IAAI;CA6FpE"}

package/dist/generate/plugins/rw-typescript-resolvers/visitor.js

@@ -1,21 +1,27 @@
 import { TypeScriptResolversVisitor } from "@graphql-codegen/typescript-resolvers";
-import {
-  indent,
-  DeclarationBlock
-} from "@graphql-codegen/visitor-plugin-common";
+import { DeclarationBlock } from "@graphql-codegen/visitor-plugin-common";
 class RwTypeScriptResolversVisitor extends TypeScriptResolversVisitor {
   constructor(pluginConfig, schema) {
-    super(pluginConfig, schema);
+    super(pluginConfig, schema, {});
   }
   FieldDefinition(node, key, parent) {
     const hasArguments = node.arguments && node.arguments.length > 0;
     const superFieldDefinition = super.FieldDefinition(node, key, parent);
-    return (parentName) => {
-      const fieldDef = superFieldDefinition(parentName);
-      if (!hasArguments && fieldDef?.includes(": Resolver<")) {
-        return fieldDef.replace(": Resolver<", ": OptArgsResolverFn<");
+    return {
+      node: superFieldDefinition.node,
+      printContent: (parentNode, avoidResolverOptionals) => {
+        const result = superFieldDefinition.printContent(
+          parentNode,
+          avoidResolverOptionals
+        );
+        if (!hasArguments && result.value?.includes(": Resolver<")) {
+          return {
+            ...result,
+            value: result.value.replace(": Resolver<", ": OptArgsResolverFn<")
+          };
+        }
+        return result;
       }
-      return fieldDef;
     };
   }
   // Original implementation is here:
@@ -25,36 +31,35 @@ class RwTypeScriptResolversVisitor extends TypeScriptResolversVisitor {
     const name = this.convertName(node, {
       suffix: this.config.resolverTypeSuffix
     });
-    const typeName = node.name;
+    const typeName = node.name.value;
     const parentType = this.getParentTypeToUse(typeName);
-    const fieldsContent = (node.fields || []).map((f) => f(node.name));
-    const isRootType = [
-      this.schema.getQueryType()?.name,
-      this.schema.getMutationType()?.name,
-      this.schema.getSubscriptionType()?.name
-    ].includes(typeName);
-    if (!isRootType) {
-      fieldsContent.push(
-        indent(
-          `${this.config.internalResolversPrefix}isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>${this.getPunctuation(
-            "type"
-          )}`
-        )
-      );
-    }
+    const fieldsContent = (node.fields || []).map((f) => {
+      if ("printContent" in f && typeof f.printContent === "function") {
+        return f.printContent(node, false).value;
+      } else {
+        throw new Error("Unexpected field type");
+      }
+    });
     const blockRelationsResolver = new DeclarationBlock(
       this._declarationBlockConfig
     ).export().asKind("type").withName(
       name.replace("Resolvers", "RelationResolvers"),
       `<ContextType = ${this.config.contextType.type}, ${this.transformParentGenericType(parentType)}>`
     ).withBlock(
-      fieldsContent.map(
-        (content) => content.replace(
-          /: (?:OptArgs)?Resolver(?:Fn)?/,
-          "?: RequiredResolverFn"
+      fieldsContent.filter((content) => content !== null).map(
+        (content) => (
+          // In v5, fields may already carry an optional marker `?:`. The
+          // regex consumes the optional `?` so we don't emit a double `??`.
+          content.replace(
+            /\??: (?:OptArgs)?Resolver(?:Fn)?/,
+            "?: RequiredResolverFn"
+          )
         )
       ).join("\n")
     );
+    if (originalBlock === null) {
+      return null;
+    }
     return originalBlock + "\n" + blockRelationsResolver.string;
   }
 }

package/dist/index.d.ts

@@ -2,7 +2,6 @@ export * from '@cedarjs/project-config';
 export * from './ts2js.js';
 export * from './dev.js';
 export * from './routes.js';
-export { dbReexportsPrismaClient } from './project.js';
 export * from './files.js';
 export { generate } from './generate/generate.js';
 export { buildApi } from './build/api.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AAEvC,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAA;AAEtD,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,cAAc,qBAAqB,CAAA;AAGnC,cAAc,uBAAuB,CAAA;AAErC,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AAEvC,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAE3B,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,cAAc,qBAAqB,CAAA;AAGnC,cAAc,uBAAuB,CAAA;AAErC,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA"}

package/dist/index.js

@@ -2,7 +2,6 @@ export * from "@cedarjs/project-config";
 export * from "./ts2js.js";
 export * from "./dev.js";
 export * from "./routes.js";
-import { dbReexportsPrismaClient } from "./project.js";
 export * from "./files.js";
 import { generate } from "./generate/generate.js";
 import { buildApi } from "./build/api.js";
@@ -11,7 +10,6 @@ export * from "@cedarjs/babel-config";
 import { listQueryTypeFieldsInProject } from "./gql.js";
 export {
   buildApi,
-  dbReexportsPrismaClient,
   generate,
   listQueryTypeFieldsInProject
 };

package/dist/project.d.ts

@@ -5,5 +5,4 @@ export declare const getTsConfigs: () => {
 export declare const isTypeScriptProject: () => boolean;
 export declare const isServerFileSetup: () => boolean;
 export declare const isRealtimeSetup: () => boolean;
-export declare const dbReexportsPrismaClient: () => boolean;
 //# sourceMappingURL=project.d.ts.map

package/dist/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../src/project.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY;;;CAuBxB,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,iBAAiB,eAO7B,CAAA;AAED,eAAO,MAAM,eAAe,eAO3B,CAAA;AAED,eAAO,MAAM,uBAAuB,eAUnC,CAAA"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../src/project.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,YAAY;;;CAuBxB,CAAA;AAED,eAAO,MAAM,mBAAmB,eAM/B,CAAA;AAED,eAAO,MAAM,iBAAiB,eAO7B,CAAA;AAED,eAAO,MAAM,eAAe,eAO3B,CAAA"}

package/dist/project.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "path";
 import { parseConfigFileTextToJson } from "typescript";
-import { getPaths, resolveFile } from "@cedarjs/project-config";
+import { getPaths } from "@cedarjs/project-config";
 const getTsConfigs = () => {
   const rwPaths = getPaths();
   const apiTsConfigPath = path.join(rwPaths.api.base, "tsconfig.json");
@@ -37,16 +37,7 @@ const isRealtimeSetup = () => {
   );
   return fs.existsSync(realtimePath);
 };
-const dbReexportsPrismaClient = () => {
-  const dbPath = resolveFile(path.join(getPaths().api.lib, "db"));
-  if (!dbPath) {
-    return false;
-  }
-  const content = fs.readFileSync(dbPath, "utf-8");
-  return /export\s+\*\s+from\s+['"]@prisma\/client['"]/.test(content);
-};
 export {
-  dbReexportsPrismaClient,
   getTsConfigs,
   isRealtimeSetup,
   isServerFileSetup,

package/dist/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,gBAAgB,EAAE,CAyBvD;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,WAgBxC;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,MAAM,CAAA;IACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAA;IACnD,SAAS,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CAE9B;AAED,MAAM,WAAW,SAAU,SAAQ,mBAAmB;IACpD,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,SAAS,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAED,eAAO,MAAM,gBAAgB,QAAO,SAAS,EAoC5C,CAAA"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,gBAAgB,EAAE,CAyBvD;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,WAgBxC;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAA;IACZ,cAAc,EAAE,MAAM,CAAA;IACtB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,SAAS,EAAE,OAAO,CAAA;IAClB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAA;IACnD,SAAS,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAAA;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CAE9B;AAED,MAAM,WAAW,SAAU,SAAQ,mBAAmB;IACpD,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,SAAS,EAAE,OAAO,CAAA;IAClB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,gBAAgB,EAAE,MAAM,CAAA;CACzB;AAED,eAAO,MAAM,gBAAgB,QAAO,SAAS,EAmC5C,CAAA"}

package/dist/routes.js

@@ -5,7 +5,7 @@ import { getRouteRegexAndParams } from "@cedarjs/router/dist/util";
 import { getProject } from "@cedarjs/structure";
 function getDuplicateRoutes() {
   const duplicateRoutes = [];
-  const allRoutes = getProject(getPaths().base).router.routes;
+  const allRoutes = getProject().router.routes;
   const uniqueNames = new Set(
     allRoutes.filter((route) => route.name !== void 0).map((route) => route.name)
   );
@@ -43,8 +43,7 @@ function warningForDuplicateRoutes() {
   return message.trimEnd();
 }
 const getProjectRoutes = () => {
-  const rwProject = getProject(getPaths().base);
-  const routes = rwProject.getRouter().routes;
+  const routes = getProject().getRouter().routes;
   return routes.map((route) => {
     const { matchRegexString, routeParams } = route.isNotFound ? { matchRegexString: null, routeParams: null } : getRouteRegexAndParams(route.path);
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "2.8.1-next.0+f9966f3d1",
+  "version": "2.8.1-next.116+784d2c048",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -145,30 +145,29 @@
   },
   "dependencies": {
     "@babel/core": "^7.26.10",
-    "@babel/parser": "7.29.0",
+    "@babel/parser": "7.29.2",
     "@babel/plugin-transform-react-jsx": "7.28.6",
     "@babel/plugin-transform-typescript": "^7.26.8",
-    "@babel/runtime-corejs3": "7.29.0",
     "@babel/traverse": "7.29.0",
-    "@cedarjs/babel-config": "2.8.1-next.0+f9966f3d1",
-    "@cedarjs/graphql-server": "2.8.1-next.0+f9966f3d1",
-    "@cedarjs/project-config": "2.8.1-next.0+f9966f3d1",
-    "@cedarjs/router": "2.8.1-next.0+f9966f3d1",
-    "@graphql-codegen/add": "4.0.1",
-    "@graphql-codegen/cli": "3.3.1",
-    "@graphql-codegen/client-preset": "4.8.3",
-    "@graphql-codegen/core": "3.1.0",
-    "@graphql-codegen/fragment-matcher": "5.1.0",
-    "@graphql-codegen/schema-ast": "3.0.1",
-    "@graphql-codegen/typed-document-node": "5.1.2",
-    "@graphql-codegen/typescript": "3.0.4",
-    "@graphql-codegen/typescript-operations": "3.0.4",
-    "@graphql-codegen/typescript-react-apollo": "3.3.7",
-    "@graphql-codegen/typescript-resolvers": "3.2.1",
+    "@cedarjs/babel-config": "2.8.1-next.116+784d2c048",
+    "@cedarjs/graphql-server": "2.8.1-next.116+784d2c048",
+    "@cedarjs/project-config": "2.8.1-next.116+784d2c048",
+    "@cedarjs/router": "2.8.1-next.116+784d2c048",
+    "@cedarjs/structure": "2.8.1-next.116+784d2c048",
+    "@graphql-codegen/add": "6.0.0",
+    "@graphql-codegen/cli": "6.2.1",
+    "@graphql-codegen/client-preset": "5.2.4",
+    "@graphql-codegen/core": "5.0.1",
+    "@graphql-codegen/fragment-matcher": "6.0.0",
+    "@graphql-codegen/schema-ast": "5.0.1",
+    "@graphql-codegen/typed-document-node": "6.1.7",
+    "@graphql-codegen/typescript": "5.0.9",
+    "@graphql-codegen/typescript-operations": "5.0.9",
+    "@graphql-codegen/typescript-react-apollo": "4.4.1",
+    "@graphql-codegen/typescript-resolvers": "5.1.7",
     "@graphql-tools/documents": "1.0.1",
     "@sdl-codegen/node": "2.0.1",
     "ansis": "4.2.0",
-    "core-js": "3.48.0",
     "deepmerge": "4.3.1",
     "esbuild": "0.21.5",
     "fast-glob": "3.3.3",
@@ -178,14 +177,14 @@
     "rimraf": "6.1.3",
     "source-map": "0.7.6",
     "string-env-interpolation": "1.0.1",
-    "systeminformation": "5.31.2",
+    "systeminformation": "5.31.4",
     "termi-link": "1.1.0",
     "ts-node": "10.9.2",
     "typescript": "5.9.3"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.2",
-    "@cedarjs/framework-tools": "2.8.1-next.1",
+    "@cedarjs/framework-tools": "2.8.1-next.116",
     "concurrently": "9.2.1",
     "graphql-tag": "2.12.6",
     "publint": "0.3.18",
@@ -195,5 +194,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9966f3d17f1740c9a1eeb90b30f0e6bd2655914"
+  "gitHead": "784d2c0484936b2d853e5b316d167602bd80d996"
 }