@cedarjs/web 7.0.0-canary.3236 → 7.0.0-canary.3240

package/dist/apollo/CedarApolloProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CedarApolloProvider.d.ts","sourceRoot":"","sources":["../../src/apollo/CedarApolloProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAGnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAK5C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAGnE,OAAO,oBAAoB,CAAA;AAE3B,YAAY,EACV,uBAAuB,EACvB,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,uBAAuB,GACxB,MAAM,sBAAsB,CAAA;AAE7B,UAAU,KAAK;IACb,mBAAmB,CAAC,EAAE,uBAAuB,CAAA;IAC7C,SAAS,CAAC,EAAE,YAAY,EAAE,CAAA;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC7C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B;AAED,wBAAgB,mBAAmB,CAAC,EAClC,mBAAmB,EACnB,SAAS,EACT,OAAmB,EACnB,QAAkB,EAClB,QAAQ,GACT,EAAE,KAAK,qBAqCP"}
+{"version":3,"file":"CedarApolloProvider.d.ts","sourceRoot":"","sources":["../../src/apollo/CedarApolloProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAGnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAK5C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AAInE,OAAO,oBAAoB,CAAA;AAE3B,YAAY,EACV,uBAAuB,EACvB,eAAe,EACf,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,uBAAuB,GACxB,MAAM,sBAAsB,CAAA;AAE7B,UAAU,KAAK;IACb,mBAAmB,CAAC,EAAE,uBAAuB,CAAA;IAC7C,SAAS,CAAC,EAAE,YAAY,EAAE,CAAA;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC7C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B;AAED,wBAAgB,mBAAmB,CAAC,EAClC,mBAAmB,EACnB,SAAS,EACT,OAAmB,EACnB,QAAkB,EAClB,QAAQ,GACT,EAAE,KAAK,qBAqCP"}

package/dist/apollo/CedarApolloProvider.js

@@ -4,6 +4,7 @@ import { useNoAuth } from "@cedarjs/auth";
 import { FetchConfigProvider } from "../components/FetchConfigProvider.js";
 import { ApolloProviderWithFetchConfig } from "./ApolloProviderWithFetchConfig.js";
 import { fragmentRegistry } from "./fragmentRegistry.js";
+import { withParsedScalars } from "./parsedScalars.js";
 import "./typeOverrides.js";
 function CedarApolloProvider({
   graphQLClientConfig,
@@ -20,7 +21,7 @@ function CedarApolloProvider({
     return new InMemoryCache({
       fragments: fragmentRegistry,
       possibleTypes: cacheConfig?.possibleTypes,
-      ...cacheConfig
+      ...withParsedScalars(cacheConfig)
     });
   };
   const cache = createCache().restore(globalThis?.__CEDAR__APOLLO_STATE ?? {});

package/dist/apollo/parsedScalars.d.ts

@@ -0,0 +1,36 @@
+import type { InMemoryCacheConfig } from '@apollo/client';
+/**
+ * The cache config that `vite-plugin-cedar-parsed-scalars` builds from the
+ * project's GraphQL schema and the `graphql.parsedScalars` setting in
+ * `cedar.toml`, and puts on `globalThis.__CEDAR__PARSED_SCALARS`.
+ */
+export interface ParsedScalarsCacheConfig {
+    /**
+     * The scalars to parse, and the type each is parsed into
+     */
+    scalars: Record<string, string>;
+    /**
+     * The fields 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>;
+    }>;
+}
+/**
+ * Adds the scalars in `graphql.parsedScalars` to the cache config, so that
+ * Apollo Client's cache parses them when it reads a response and serializes
+ * them in a query's variables. Anything the app configured for the same
+ * scalar, field or input object takes precedence. Returns the config as it is
+ * when no scalar is parsed.
+ */
+export declare function withParsedScalars(cacheConfig?: InMemoryCacheConfig): InMemoryCacheConfig | undefined;
+//# sourceMappingURL=parsedScalars.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"parsedScalars.d.ts","sourceRoot":"","sources":["../../src/apollo/parsedScalars.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAgB,MAAM,gBAAgB,CAAA;AAEvE;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B;;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;AAmFD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,CAAC,EAAE,mBAAmB,GAChC,mBAAmB,GAAG,SAAS,CAmDjC"}

package/dist/apollo/parsedScalars.js

@@ -0,0 +1,75 @@
+import { Scalar } from "@apollo/client";
+const SCALAR_TYPES = {
+  Date: new Scalar({
+    parse: (serialized) => new Date(serialized),
+    serialize: (parsed) => parsed.toISOString(),
+    is: (value) => value instanceof Date
+  })
+};
+function mergeFieldPolicies(typeName, generated, configured = {}) {
+  const fields = { ...configured };
+  for (const [name, policy] of Object.entries(generated)) {
+    const configuredPolicy = configured[name];
+    const hasReadOrMerge = typeof configuredPolicy === "function" || configuredPolicy?.read !== void 0 || configuredPolicy?.merge !== void 0;
+    if (hasReadOrMerge) {
+      throw new Error(
+        `${typeName}.${name} holds a parsed ${policy.scalar} scalar and has a \`read\` or \`merge\` field policy. Apollo Client drops a field policy's \`read\` and \`merge\` the moment \`scalar\` is also set on it, so they can\u2019t both apply. Move the \`read\`/\`merge\` logic to a different field, for example one backed by a \`@requires\`-style resolver, or stop parsing this scalar.`
+      );
+    }
+    fields[name] = {
+      ...policy,
+      ...configuredPolicy
+    };
+  }
+  return fields;
+}
+function mergeInputObjects(generated, configured = {}) {
+  const inputObjects = { ...configured };
+  for (const [name, { fields }] of Object.entries(generated)) {
+    inputObjects[name] = {
+      ...configured[name],
+      fields: { ...fields, ...configured[name]?.fields }
+    };
+  }
+  return inputObjects;
+}
+function withParsedScalars(cacheConfig) {
+  const parsed = globalThis.__CEDAR__PARSED_SCALARS;
+  if (!parsed) {
+    return cacheConfig;
+  }
+  const scalars = Object.fromEntries(
+    Object.entries(parsed.scalars).map(([name, type]) => {
+      const scalarType = SCALAR_TYPES[type];
+      if (!scalarType) {
+        throw new Error(
+          `Can't parse the ${name} scalar into ${JSON.stringify(type)}. Supported: ` + Object.keys(SCALAR_TYPES).map((supported) => JSON.stringify(supported)).join(", ")
+        );
+      }
+      return [name, scalarType];
+    })
+  );
+  const typePolicies = { ...cacheConfig?.typePolicies };
+  for (const [typeName, { fields }] of Object.entries(parsed.typePolicies)) {
+    typePolicies[typeName] = {
+      ...typePolicies[typeName],
+      fields: mergeFieldPolicies(
+        typeName,
+        fields,
+        typePolicies[typeName]?.fields
+      )
+    };
+  }
+  return {
+    ...cacheConfig,
+    scalars: { ...scalars, ...cacheConfig?.scalars },
+    typePolicies,
+    inputObjects: mergeInputObjects(
+      parsed.inputObjects,
+      cacheConfig?.inputObjects
+    )
+  };
+}
+export {
+  withParsedScalars
+};

package/dist/apollo/suspense.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"suspense.d.ts","sourceRoot":"","sources":["../../src/apollo/suspense.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAEzC,OAAO,KAAK,EACV,YAAY,IAAI,gBAAgB,EAChC,QAAQ,EACR,mBAAmB,EACnB,eAAe,EAChB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACL,UAAU,EAEX,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAEL,aAAa,EAEd,MAAM,gCAAgC,CAAA;AAGvC,OAAO,oBAAoB,CAAA;AAE3B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAa5C,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,YAAY,CAAA;AASnB,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAEzD,YAAY,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,GACnB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,gBAAgB,CAAC,OAAO,EACxB,OAAO,GAAG,MAAM,CACjB,GAAG;IACF,KAAK,CAAC,EAAE,aAAa,CAAA;IACrB;;;OAGG;IACH,WAAW,CAAC,EAAE,uBAAuB,CAAA;IACrC;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAA;IACjC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE,UAAU,GAAG,wBAAwB,CAAA;CAC7C,CAAA;AAqHD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,iBAAiB,CAAC;IACxD,mBAAmB,CAAC,EAAE,uBAAuB,CAAA;IAC7C,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC7C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B,CAsCA,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB;0BAhDV,uBAAuB;cACnC,OAAO;eACN,UAAU,CAAC,OAAO,eAAe,CAAC;cACnC,KAAK,CAAC,SAAS;EA6C6B,CAAA"}
+{"version":3,"file":"suspense.d.ts","sourceRoot":"","sources":["../../src/apollo/suspense.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAqB,MAAM,OAAO,CAAA;AAEzC,OAAO,KAAK,EACV,YAAY,IAAI,gBAAgB,EAChC,QAAQ,EACR,mBAAmB,EACnB,eAAe,EAChB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACL,UAAU,EAEX,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAEL,aAAa,EAEd,MAAM,gCAAgC,CAAA;AAGvC,OAAO,oBAAoB,CAAA;AAE3B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAa5C,OAAO,KAAK,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,YAAY,CAAA;AAUnB,MAAM,MAAM,uBAAuB,GAAG,mBAAmB,CAAA;AAEzD,YAAY,EACV,iBAAiB,EACjB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,GACnB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,gBAAgB,CAAC,OAAO,EACxB,OAAO,GAAG,MAAM,CACjB,GAAG;IACF,KAAK,CAAC,EAAE,aAAa,CAAA;IACrB;;;OAGG;IACH,WAAW,CAAC,EAAE,uBAAuB,CAAA;IACrC;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAA;IACjC;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,IAAI,CAAC,EAAE,UAAU,GAAG,wBAAwB,CAAA;CAC7C,CAAA;AAqHD,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,iBAAiB,CAAC;IACxD,mBAAmB,CAAC,EAAE,uBAAuB,CAAA;IAC7C,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAA;IAC7C,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CAC1B,CAsCA,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB;0BAhDV,uBAAuB;cACnC,OAAO;eACN,UAAU,CAAC,OAAO,eAAe,CAAC;cACnC,KAAK,CAAC,SAAS;EA6C6B,CAAA"}

package/dist/apollo/suspense.js

@@ -28,6 +28,7 @@ import {
   createTokenLink,
   createUpdateDataLink
 } from "./links.js";
+import { withParsedScalars } from "./parsedScalars.js";
 const WrappedApolloProvider = WrapApolloProvider(
   buildManualDataTransport({
     useInsertHtml() {
@@ -101,7 +102,7 @@ const CedarApolloProvider = ({
   const createCache = () => {
     return new InMemoryCache({
       fragments: fragmentRegistry,
-      ...cacheConfig
+      ...withParsedScalars(cacheConfig)
     });
   };
   const cache = createCache().restore(globalThis?.__CEDAR__APOLLO_STATE ?? {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/web",
-  "version": "7.0.0-canary.3236",
+  "version": "7.0.0-canary.3240",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -79,7 +79,7 @@
   },
   "dependencies": {
     "@apollo/client": "4.3.1",
-    "@cedarjs/server-store": "7.0.0-canary.3236",
+    "@cedarjs/server-store": "7.0.0-canary.3240",
     "@dr.pogodin/react-helmet": "2.0.4",
     "@whatwg-node/fetch": "0.10.13",
     "apollo-upload-client": "19.0.0",
@@ -95,9 +95,9 @@
   "devDependencies": {
     "@apollo/client-react-streaming": "0.14.5",
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "7.0.0-canary.3236",
-    "@cedarjs/framework-tools": "7.0.0-canary.3236",
-    "@cedarjs/internal": "7.0.0-canary.3236",
+    "@cedarjs/auth": "7.0.0-canary.3240",
+    "@cedarjs/framework-tools": "7.0.0-canary.3240",
+    "@cedarjs/internal": "7.0.0-canary.3240",
     "@testing-library/dom": "10.4.2",
     "@testing-library/jest-dom": "6.9.1",
     "@testing-library/react": "16.3.3",
@@ -114,7 +114,7 @@
     "vitest": "4.1.11"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "7.0.0-canary.3236",
+    "@cedarjs/auth": "7.0.0-canary.3240",
     "react": "19.3.0",
     "react-dom": "19.3.0"
   },