@cedarjs/internal 8.0.0-canary.3587 → 8.0.0-canary.3589

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

@@ -1 +1 @@
-{"version":3,"file":"graphqlCodeGen.d.ts","sourceRoot":"","sources":["../../src/generate/graphqlCodeGen.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAoB9D,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,CA2DvE,CAAA;AAyFD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM;SACD,MAAM;GAQ5D;AAmQD,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;AAqB9D,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,CA2DvE,CAAA;AAyFD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM;SACD,MAAM;GAQ5D;AAgRD,eAAO,MAAM,iBAAiB,4RAe7B,CAAA"}

package/dist/generate/graphqlCodeGen.js

@@ -20,6 +20,7 @@ import {
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { getTsConfigs } from "../project.js";
 import * as rwTypescriptResolvers from "./plugins/rw-typescript-resolvers/index.js";
+import { getServiceFieldResolvers } from "./serviceFieldResolvers.js";
 var CodegenSide = /* @__PURE__ */ ((CodegenSide2) => {
   CodegenSide2[CodegenSide2["API"] = 0] = "API";
   CodegenSide2[CodegenSide2["WEB"] = 1] = "WEB";
@@ -297,8 +298,11 @@ async function getPrismaModels() {
 }
 async function getPluginConfig(side) {
   const prismaModels = await getPrismaModels();
+  const fieldResolvers = side === 0 /* API */ ? getServiceFieldResolvers() : {};
   Object.keys(prismaModels).forEach((key) => {
-    prismaModels[key] = `MergePrismaWithSdlTypes<Prisma${key}, MakeRelationsOptional<${key}, AllMappedModels>, AllMappedModels>`;
+    const resolvedFields = fieldResolvers[key] ?? [];
+    const resolvedFieldsArg = resolvedFields.length ? `, ${resolvedFields.map((field) => JSON.stringify(field)).join(" | ")}` : "";
+    prismaModels[key] = `MergePrismaWithSdlTypes<Prisma${key}, MakeRelationsOptional<${key}, AllMappedModels>, AllMappedModels${resolvedFieldsArg}>`;
   });
   const scalars = {
     // We need these, otherwise these scalars are mapped to any

package/dist/generate/serviceFieldResolvers.d.ts

@@ -0,0 +1,33 @@
+import type { types } from '@babel/core';
+/**
+ * Field names, per GraphQL type, that services provide field resolvers for.
+ *
+ * Services provide field resolvers for a type by exporting an object named
+ * after the type, e.g. `export const Post = { author: (_args, { root }) => … }`.
+ * GraphQL server merges these exports from all services, so the field names
+ * here are merged the same way.
+ */
+export type ServiceFieldResolvers = Record<string, string[]>;
+/**
+ * Whether GraphQL server loads this file as a service. This matches the
+ * filters of the `src/services/**\/*.{js,ts}` glob import, in both
+ * vite-plugin-cedar-import-dir and babel-plugin-redwood-import-dir, so field
+ * resolvers in files that aren't loaded don't affect the generated types.
+ */
+export declare const isLoadedServiceFile: (filePath: string) => boolean;
+/**
+ * Finds the field resolvers in a single service file.
+ *
+ * Only object literals exported directly (`export const Post = { … }`) are
+ * recognized. Keys that can't be determined statically, like spread or
+ * computed keys, are skipped. A skipped field stays required on resolver
+ * results, which is the safe side to err on.
+ */
+export declare const getFieldResolversFromAst: (ast: types.File) => ServiceFieldResolvers;
+/**
+ * Finds the field resolvers that all the project's services provide, keyed by
+ * GraphQL type name. Field names are sorted and de-duplicated so the result
+ * is stable across runs.
+ */
+export declare const getServiceFieldResolvers: (serviceFiles?: string[]) => ServiceFieldResolvers;
+//# sourceMappingURL=serviceFieldResolvers.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"serviceFieldResolvers.d.ts","sourceRoot":"","sources":["../../src/generate/serviceFieldResolvers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAMxC;;;;;;;GAOG;AACH,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;AAI5D;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAAI,UAAU,MAAM,YAOnD,CAAA;AAyCD;;;;;;;GAOG;AACH,eAAO,MAAM,wBAAwB,GACnC,KAAK,KAAK,CAAC,IAAI,KACd,qBAwCF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,GACnC,eAAc,MAAM,EAAuB,KAC1C,qBAkCF,CAAA"}

package/dist/generate/serviceFieldResolvers.js

@@ -0,0 +1,85 @@
+import fs from "node:fs";
+import { parse } from "@babel/parser";
+import fg from "fast-glob";
+import { getPaths } from "@cedarjs/project-config";
+const ROOT_TYPES = ["Query", "Mutation", "Subscription"];
+const isLoadedServiceFile = (filePath) => {
+  return /\.(js|ts)$/.test(filePath) && !filePath.includes(".test.") && !filePath.includes(".scenarios.") && !filePath.includes(".d.ts");
+};
+const findServiceFiles = (cwd = getPaths().api.services) => {
+  return fg.sync("**/*.{js,ts}", { cwd, absolute: true }).filter(isLoadedServiceFile);
+};
+const unwrapExpression = (node) => {
+  if (node.type === "TSSatisfiesExpression" || node.type === "TSAsExpression" || node.type === "TSNonNullExpression" || node.type === "ParenthesizedExpression") {
+    return unwrapExpression(node.expression);
+  }
+  return node;
+};
+const getPropertyName = (property) => {
+  if (property.type === "SpreadElement" || property.computed) {
+    return void 0;
+  }
+  if (property.key.type === "Identifier") {
+    return property.key.name;
+  }
+  if (property.key.type === "StringLiteral") {
+    return property.key.value;
+  }
+  return void 0;
+};
+const getFieldResolversFromAst = (ast) => {
+  const fieldResolvers = {};
+  for (const statement of ast.program.body) {
+    if (statement.type !== "ExportNamedDeclaration" || statement.declaration?.type !== "VariableDeclaration") {
+      continue;
+    }
+    for (const declarator of statement.declaration.declarations) {
+      if (declarator.id.type !== "Identifier" || !declarator.init) {
+        continue;
+      }
+      const typeName = declarator.id.name;
+      if (ROOT_TYPES.includes(typeName)) {
+        continue;
+      }
+      const init = unwrapExpression(declarator.init);
+      if (init.type !== "ObjectExpression") {
+        continue;
+      }
+      const fieldNames = init.properties.map(getPropertyName).filter((name) => name !== void 0);
+      fieldResolvers[typeName] = [
+        ...fieldResolvers[typeName] ?? [],
+        ...fieldNames
+      ];
+    }
+  }
+  return fieldResolvers;
+};
+const getServiceFieldResolvers = (serviceFiles = findServiceFiles()) => {
+  const merged = {};
+  for (const file of serviceFiles) {
+    let ast;
+    try {
+      ast = parse(fs.readFileSync(file, "utf-8"), {
+        sourceType: "module",
+        plugins: ["typescript"]
+      });
+    } catch {
+      continue;
+    }
+    const fieldResolvers = getFieldResolversFromAst(ast);
+    for (const [typeName, fieldNames] of Object.entries(fieldResolvers)) {
+      merged[typeName] ??= /* @__PURE__ */ new Set();
+      for (const fieldName of fieldNames) {
+        merged[typeName].add(fieldName);
+      }
+    }
+  }
+  return Object.fromEntries(
+    Object.keys(merged).sort().map((typeName) => [typeName, [...merged[typeName]].sort()])
+  );
+};
+export {
+  getFieldResolversFromAst,
+  getServiceFieldResolvers,
+  isLoadedServiceFile
+};

package/dist/generate/watch.js

@@ -20,6 +20,10 @@ import {
   generateTypeDefGraphQLWeb
 } from "./graphqlCodeGen.js";
 import { generateGraphQLSchema } from "./graphqlSchema.js";
+import {
+  getServiceFieldResolvers,
+  isLoadedServiceFile
+} from "./serviceFieldResolvers.js";
 import {
   generateMirrorCell,
   generateMirrorDirectoryNamedModule,
@@ -46,6 +50,10 @@ const action = {
   change: "Modified"
 };
 let routesWarningMessage = "";
+let serviceFieldResolvers = JSON.stringify(getServiceFieldResolvers());
+const isServiceFile = (p) => {
+  return p.startsWith(rwjsPaths.api.services + path.sep) && isLoadedServiceFile(p);
+};
 process.stdin.on("data", async (data) => {
   const str = data.toString().trim().toLowerCase();
   if (str === "g" || str === "rs") {
@@ -118,6 +126,24 @@ Created ${files.length} in ${Date.now() - start} ms`);
     await generateGqlormArtifacts();
     finished("Prisma Schema");
   }
+  if (isServiceFile(absPath)) {
+    const nextServiceFieldResolvers = JSON.stringify(
+      getServiceFieldResolvers()
+    );
+    if (nextServiceFieldResolvers !== serviceFieldResolvers) {
+      const { errors } = await generateTypeDefGraphQLApi();
+      if (errors.length > 0) {
+        for (const { message, error } of errors) {
+          console.error(message);
+          console.error(error);
+          console.log();
+        }
+      } else {
+        serviceFieldResolvers = nextServiceFieldResolvers;
+        finished("Service field resolvers");
+      }
+    }
+  }
   if (routesWarningMessage) {
     console.warn(routesWarningMessage);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "8.0.0-canary.3587",
+  "version": "8.0.0-canary.3589",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -126,14 +126,14 @@
     "@babel/core": "^7.26.10",
     "@babel/parser": "7.29.12",
     "@babel/traverse": "7.29.12",
-    "@cedarjs/api": "8.0.0-canary.3587",
-    "@cedarjs/babel-config": "8.0.0-canary.3587",
-    "@cedarjs/cli-helpers": "8.0.0-canary.3587",
-    "@cedarjs/graphql-server": "8.0.0-canary.3587",
-    "@cedarjs/project-config": "8.0.0-canary.3587",
-    "@cedarjs/router": "8.0.0-canary.3587",
-    "@cedarjs/structure": "8.0.0-canary.3587",
-    "@cedarjs/utils": "8.0.0-canary.3587",
+    "@cedarjs/api": "8.0.0-canary.3589",
+    "@cedarjs/babel-config": "8.0.0-canary.3589",
+    "@cedarjs/cli-helpers": "8.0.0-canary.3589",
+    "@cedarjs/graphql-server": "8.0.0-canary.3589",
+    "@cedarjs/project-config": "8.0.0-canary.3589",
+    "@cedarjs/router": "8.0.0-canary.3589",
+    "@cedarjs/structure": "8.0.0-canary.3589",
+    "@cedarjs/utils": "8.0.0-canary.3589",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -171,7 +171,7 @@
     "vite-tsconfig-paths": "6.1.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "8.0.0-canary.3587",
+    "@cedarjs/framework-tools": "8.0.0-canary.3589",
     "@jridgewell/trace-mapping": "0.3.31",
     "@oxc-project/types": "^0.155.0",
     "concurrently": "9.2.5",