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

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;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;AA+DD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM;SACD,MAAM;GAQ5D;AA2OD,eAAO,MAAM,iBAAiB,4RAe7B,CAAA"}

package/dist/generate/graphqlCodeGen.js

@@ -147,14 +147,28 @@ 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;
+}
 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "6.0.3-next.227",
+  "version": "6.0.3-next.275",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -114,14 +114,14 @@
     "@babel/core": "^7.26.10",
     "@babel/parser": "7.29.8",
     "@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.275",
+    "@cedarjs/babel-config": "6.0.3-next.275",
+    "@cedarjs/cli-helpers": "6.0.3-next.275",
+    "@cedarjs/graphql-server": "6.0.3-next.275",
+    "@cedarjs/project-config": "6.0.3-next.275",
+    "@cedarjs/router": "6.0.3-next.275",
+    "@cedarjs/structure": "6.0.3-next.275",
+    "@cedarjs/utils": "6.0.3-next.275",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -140,7 +140,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 +148,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.150.0",
+    "prettier": "3.9.8",
     "rimraf": "6.1.3",
     "source-map": "0.8.0",
     "termi-link": "1.1.0",
@@ -159,12 +159,12 @@
     "vite-tsconfig-paths": "^6.1.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.3-next.227",
+    "@cedarjs/framework-tools": "6.0.3-next.275",
     "@jridgewell/trace-mapping": "0.3.31",
-    "@oxc-project/types": "^0.149.0",
+    "@oxc-project/types": "^0.150.0",
     "concurrently": "9.2.4",
     "graphql-tag": "2.12.7",
-    "memfs": "4.76.0",
+    "memfs": "4.78.1",
     "publint": "0.3.24",
     "ts-dedent": "2.3.0",
     "vitest": "4.1.11"