@cedarjs/internal 6.0.3-next.227 → 6.0.3-next.296

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;AAmB9D,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;AA2OD,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;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;AAqPD,eAAO,MAAM,iBAAiB,4RAe7B,CAAA"}

package/dist/generate/graphqlCodeGen.js

@@ -14,6 +14,7 @@ import { Kind } from "graphql";
 import {
   getPaths,
   getConfig,
+  getParsedScalars,
   resolveGeneratedPrismaClient
 } from "@cedarjs/project-config";
 import { getPackageManager } from "@cedarjs/project-config/packageManager";
@@ -114,7 +115,10 @@ const generateTypeDefGraphQLWeb = async () => {
     {
       name: "add",
       options: {
-        content: `import { Prisma } from "$api/src/lib/db"`,
+        content: [
+          `import { Prisma } from "$api/src/lib/db"`,
+          ...getApolloScalarDeclarations()
+        ],
         placement: "prepend"
       },
       codegenPlugin: addPlugin
@@ -147,14 +151,45 @@ const generateTypeDefGraphQLWeb = async () => {
     };
   }
 };
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function mergeScalars(cedarScalars, userScalars) {
+  if (userScalars === void 0 || userScalars === null) {
+    return cedarScalars;
+  }
+  if (isRecord(cedarScalars) && isRecord(userScalars)) {
+    return { ...cedarScalars, ...userScalars };
+  }
+  return userScalars;
+}
+function getApolloScalarDeclarations() {
+  const declarations = [];
+  if (getParsedScalars().DateTime === "Date") {
+    declarations.push(
+      [
+        "declare module '@apollo/client' {",
+        "  namespace ApolloCache {",
+        "    interface Scalars {",
+        "      DateTime: { serialized: string; parsed: Date }",
+        "    }",
+        "  }",
+        "}"
+      ].join("\n")
+    );
+  }
+  return declarations;
+}
 async function runCodegenGraphQL(documents, extraPlugins, filename, side) {
   const userCodegenConfig = await loadCodegenConfig({
     configFilePath: getPaths().base
   });
   const pluginConfig = await getPluginConfig(side);
+  const { scalars: userScalars, ...userPluginConfig } = userCodegenConfig?.config?.config ?? {};
   const mergedConfig = {
     ...pluginConfig,
-    ...userCodegenConfig?.config?.config
+    ...userPluginConfig,
+    scalars: mergeScalars(pluginConfig.scalars, userScalars)
   };
   const options = getCodegenOptions(documents, mergedConfig, extraPlugins);
   const output = await codegen(options);
@@ -268,8 +303,8 @@ async function getPluginConfig(side) {
   const scalars = {
     // We need these, otherwise these scalars are mapped to any
     BigInt: "number",
-    // @Note: DateTime fields can be valid Date-strings, or the Date object in the api side. They're always strings on the web side.
-    DateTime: side === 1 /* WEB */ ? "string" : "Date | string",
+    // @Note: DateTime fields can be valid Date-strings, or the Date object in the api side. They're strings on the web side, unless `graphql.parsedScalars.DateTime` is set. Then they are Date objects when the web side reads them, and Apollo Client accepts a Date or a string when they're sent.
+    DateTime: side === 1 /* WEB */ ? getParsedScalars().DateTime === "Date" ? { input: "Date | string", output: "Date" } : "string" : "Date | string",
     Date: side === 1 /* WEB */ ? "string" : "Date | string",
     JSON: "Prisma.JsonValue",
     JSONObject: "Prisma.JsonObject",

package/dist/generate/parsedScalars.d.ts

@@ -0,0 +1,42 @@
+import type { GraphQLSchema } from 'graphql';
+import type { ParsedScalarsConfig } from '@cedarjs/project-config';
+/**
+ * What `CedarApolloProvider` needs to make Apollo Client's cache parse the
+ * scalars in `graphql.parsedScalars`. The `typePolicies` and `inputObjects`
+ * are passed to `InMemoryCache` as they are.
+ */
+export interface ParsedScalarsCacheConfig {
+    /**
+     * The scalars to parse, and the type each is parsed into
+     */
+    scalars: ParsedScalarsConfig;
+    /**
+     * The fields in the schema that hold a parsed scalar
+     */
+    typePolicies: Record<string, {
+        fields: Record<string, {
+            scalar: string;
+        }>;
+    }>;
+    /**
+     * The input objects that hold a parsed scalar, directly or through another
+     * input object
+     */
+    inputObjects: Record<string, {
+        fields: Record<string, string>;
+    }>;
+}
+/**
+ * Finds every field in the schema that holds one of the scalars in
+ * `parsedScalars`, in the shape Apollo Client's `InMemoryCache` takes, so that
+ * the cache parses those fields when it reads a response and serializes them
+ * in a query's variables.
+ */
+export declare function getParsedScalarsCacheConfig(schema: GraphQLSchema, parsedScalars: ParsedScalarsConfig): ParsedScalarsCacheConfig;
+/**
+ * Reads the project's `graphql.parsedScalars` setting and its generated
+ * GraphQL schema, and returns the cache config for them. Returns `undefined`
+ * when no scalar is set to be parsed, or when the schema hasn't been generated.
+ */
+export declare function loadParsedScalarsCacheConfig(): ParsedScalarsCacheConfig | undefined;
+//# sourceMappingURL=parsedScalars.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"parsedScalars.d.ts","sourceRoot":"","sources":["../../src/generate/parsedScalars.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAe,MAAM,SAAS,CAAA;AASzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAGlE;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,OAAO,EAAE,mBAAmB,CAAA;IAC5B;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;YAAE,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC,CAAA;IAC5E;;;OAGG;IACH,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC,CAAA;CACjE;AA0BD;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,aAAa,EACrB,aAAa,EAAE,mBAAmB,GACjC,wBAAwB,CA0E1B;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,IAC1C,wBAAwB,GAAG,SAAS,CAwBrC"}

package/dist/generate/parsedScalars.js

@@ -0,0 +1,96 @@
+import fs from "node:fs";
+import { GraphQLFileLoader } from "@graphql-tools/graphql-file-loader";
+import { loadSchemaSync } from "@graphql-tools/load";
+import {
+  getNamedType,
+  isInputObjectType,
+  isListType,
+  isNonNullType,
+  isObjectType
+} from "graphql";
+import { getParsedScalars, getPaths } from "@cedarjs/project-config";
+function scalarTypeName(type, names) {
+  if (isNonNullType(type)) {
+    return scalarTypeName(type.ofType, names);
+  }
+  if (isListType(type)) {
+    const inner = scalarTypeName(type.ofType, names);
+    return inner === void 0 ? void 0 : `[${inner}]`;
+  }
+  const name = getNamedType(type).name;
+  return names.has(name) ? name : void 0;
+}
+function getParsedScalarsCacheConfig(schema, parsedScalars) {
+  const scalarNames = new Set(Object.keys(parsedScalars));
+  const typePolicies = {};
+  const inputObjects = {};
+  if (scalarNames.size === 0) {
+    return { scalars: parsedScalars, typePolicies, inputObjects };
+  }
+  const types = Object.values(schema.getTypeMap()).filter(
+    (type) => !type.name.startsWith("__")
+  );
+  for (const type of types) {
+    if (!isObjectType(type)) {
+      continue;
+    }
+    for (const field of Object.values(type.getFields())) {
+      const scalar = scalarTypeName(field.type, scalarNames);
+      if (scalar) {
+        typePolicies[type.name] ??= { fields: {} };
+        typePolicies[type.name].fields[field.name] = { scalar };
+      }
+    }
+  }
+  const inputTypes = types.filter(isInputObjectType);
+  let inputObjectNames = /* @__PURE__ */ new Set();
+  let grew = true;
+  while (grew) {
+    const names2 = /* @__PURE__ */ new Set([...scalarNames, ...inputObjectNames]);
+    const next = new Set(inputObjectNames);
+    for (const type of inputTypes) {
+      const holdsScalar = Object.values(type.getFields()).some(
+        (field) => scalarTypeName(field.type, names2) !== void 0
+      );
+      if (holdsScalar) {
+        next.add(type.name);
+      }
+    }
+    grew = next.size > inputObjectNames.size;
+    inputObjectNames = next;
+  }
+  const names = /* @__PURE__ */ new Set([...scalarNames, ...inputObjectNames]);
+  for (const type of inputTypes) {
+    if (!inputObjectNames.has(type.name)) {
+      continue;
+    }
+    const fields = {};
+    for (const field of Object.values(type.getFields())) {
+      const fieldType = scalarTypeName(field.type, names);
+      if (fieldType) {
+        fields[field.name] = fieldType;
+      }
+    }
+    inputObjects[type.name] = { fields };
+  }
+  return { scalars: parsedScalars, typePolicies, inputObjects };
+}
+function loadParsedScalarsCacheConfig() {
+  const parsedScalars = getParsedScalars();
+  if (Object.keys(parsedScalars).length === 0) {
+    return void 0;
+  }
+  const schemaPath = getPaths().generated.schema;
+  if (!fs.existsSync(schemaPath)) {
+    return void 0;
+  }
+  const schema = loadSchemaSync(schemaPath, {
+    loaders: [new GraphQLFileLoader()],
+    sort: true
+  });
+  return getParsedScalarsCacheConfig(schema, parsedScalars);
+}
+export {
+  getParsedScalarsCacheConfig,
+  loadParsedScalarsCacheConfig
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "6.0.3-next.227",
+  "version": "6.0.3-next.296",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -87,6 +87,12 @@
         "types": "./dist/generate/gqlormSchema.d.ts",
         "default": "./dist/generate/gqlormSchema.js"
       }
+    },
+    "./dist/generate/parsedScalars.js": {
+      "default": {
+        "types": "./dist/generate/parsedScalars.d.ts",
+        "default": "./dist/generate/parsedScalars.js"
+      }
     }
   },
   "types": "dist/index.d.ts",
@@ -112,16 +118,16 @@
   },
   "dependencies": {
     "@babel/core": "^7.26.10",
-    "@babel/parser": "7.29.8",
+    "@babel/parser": "7.29.9",
     "@babel/traverse": "7.29.8",
-    "@cedarjs/api": "6.0.3-next.227",
-    "@cedarjs/babel-config": "6.0.3-next.227",
-    "@cedarjs/cli-helpers": "6.0.3-next.227",
-    "@cedarjs/graphql-server": "6.0.3-next.227",
-    "@cedarjs/project-config": "6.0.3-next.227",
-    "@cedarjs/router": "6.0.3-next.227",
-    "@cedarjs/structure": "6.0.3-next.227",
-    "@cedarjs/utils": "6.0.3-next.227",
+    "@cedarjs/api": "6.0.3-next.296",
+    "@cedarjs/babel-config": "6.0.3-next.296",
+    "@cedarjs/cli-helpers": "6.0.3-next.296",
+    "@cedarjs/graphql-server": "6.0.3-next.296",
+    "@cedarjs/project-config": "6.0.3-next.296",
+    "@cedarjs/router": "6.0.3-next.296",
+    "@cedarjs/structure": "6.0.3-next.296",
+    "@cedarjs/utils": "6.0.3-next.296",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -140,7 +146,7 @@
     "@prisma/dmmf": "7.10.0",
     "@prisma/internals": "7.10.0",
     "@sdl-codegen/node": "2.0.1",
-    "ansis": "4.3.1",
+    "ansis": "4.4.0",
     "chokidar": "3.6.0",
     "esbuild": "0.28.2",
     "execa": "5.1.1",
@@ -148,8 +154,8 @@
     "graphql": "16.14.2",
     "kill-port": "1.6.1",
     "magic-string": "0.30.21",
-    "oxc-parser": "0.149.0",
-    "prettier": "3.9.6",
+    "oxc-parser": "0.151.0",
+    "prettier": "3.9.8",
     "rimraf": "6.1.3",
     "source-map": "0.8.0",
     "termi-link": "1.1.0",
@@ -159,12 +165,12 @@
     "vite-tsconfig-paths": "^6.1.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.3-next.227",
+    "@cedarjs/framework-tools": "6.0.3-next.296",
     "@jridgewell/trace-mapping": "0.3.31",
-    "@oxc-project/types": "^0.149.0",
+    "@oxc-project/types": "^0.151.0",
     "concurrently": "9.2.4",
     "graphql-tag": "2.12.7",
-    "memfs": "4.76.0",
+    "memfs": "4.79.0",
     "publint": "0.3.24",
     "ts-dedent": "2.3.0",
     "vitest": "4.1.11"