@cedarjs/internal 7.1.0 → 7.1.1-next.468

package/dist/build/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AA8CtE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAI9D,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAyYD,eAAO,MAAM,gBAAgB,iHAiE5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AA6CtE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAI9D,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA8XD,eAAO,MAAM,gBAAgB,iHA+D5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}

package/dist/build/api.js

@@ -17,7 +17,6 @@ import {
 import {
   getConfig,
   getPaths,
-  projectSideIsEsm,
   createPrismaClientFileMatcher,
   resolveFile
 } from "@cedarjs/project-config";
@@ -91,7 +90,6 @@ const runCedarBabelTransformsPlugin = {
       fileContents = applyJobPathInjector(fileContents, args.path, getPaths().api.jobs) ?? fileContents;
       const normalizedPath = normalizePath(args.path);
       const cedarPaths = getPaths();
-      const isEsm = projectSideIsEsm("api");
       const apiBabelConfigPath = getApiSideBabelConfigPath();
       let code = fileContents;
       if (apiBabelConfigPath) {
@@ -110,9 +108,7 @@ const runCedarBabelTransformsPlugin = {
       code = applyImportExtensions(code, args.path);
       const functionsDir = normalizePath(cedarPaths.api.functions);
       if (normalizedPath.startsWith(functionsDir + "/")) {
-        code = applyHandlerAlsWrapping(code, {
-          projectIsEsm: isEsm
-        }) ?? code;
+        code = applyHandlerAlsWrapping(code) ?? code;
       }
       if (normalizedPath.startsWith(normalizePath(cedarPaths.api.src) + "/")) {
         code = applyOtelWrapping(code, args.path, cedarPaths.api.src) ?? code;
@@ -197,7 +193,6 @@ function createDirectoryNamedImportVitePlugin() {
 }
 function createCedarViteApiPlugin() {
   const cedarConfig = getConfig();
-  const isEsm = projectSideIsEsm("api");
   const prismaClientFiles = createPrismaClientFileMatcher();
   return {
     name: "cedar-vite-api-babel-transform",
@@ -256,9 +251,7 @@ function createCedarViteApiPlugin() {
       outputCode = applyImportExtensions(outputCode, id);
       const functionsDir = normalizePath(cedarPaths.api.functions);
       if (normalizedId.startsWith(functionsDir + "/")) {
-        outputCode = applyHandlerAlsWrapping(outputCode, {
-          projectIsEsm: isEsm
-        }) ?? outputCode;
+        outputCode = applyHandlerAlsWrapping(outputCode) ?? outputCode;
       }
       if (!transformedCode) {
         if (outputCode === code) {
@@ -278,8 +271,6 @@ function createCedarViteApiPlugin() {
 }
 const buildApiWithVite = async () => {
   const cedarPaths = getPaths();
-  const isEsm = projectSideIsEsm("api");
-  const format = isEsm ? "es" : "cjs";
   const apiFiles = findApiFiles();
   const input = {};
   for (const f of apiFiles) {
@@ -296,7 +287,7 @@ const buildApiWithVite = async () => {
       rollupOptions: {
         input,
         output: {
-          format,
+          format: "es",
           preserveModules: true,
           preserveModulesRoot: cedarPaths.api.src,
           entryFileNames: "[name].js",
@@ -377,13 +368,12 @@ async function fixSourceMaps(distDir, srcDir) {
 }
 function getEsbuildOptions(files) {
   const cedarPaths = getPaths();
-  const format = projectSideIsEsm("api") ? "esm" : "cjs";
   return {
     absWorkingDir: cedarPaths.api.base,
     entryPoints: files,
     platform: "node",
     target: "node24",
-    format,
+    format: "esm",
     allowOverwrite: true,
     bundle: false,
     // Registration order matters: cedarApiGraphqlPlugin (narrow filter) must

package/dist/build/esbuild-plugin-api-graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAsB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CAiHzB,CAAA"}
+{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAsB1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CA8GzB,CAAA"}

package/dist/build/esbuild-plugin-api-graphql.js

@@ -5,7 +5,7 @@ import {
   getApiSideBabelPluginsForVite,
   transformWithBabel
 } from "@cedarjs/babel-config";
-import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
+import { getConfig, getPaths } from "@cedarjs/project-config";
 import {
   applyGqlormInject,
   applyGraphqlOptionsExtract
@@ -59,9 +59,7 @@ const cedarApiGraphqlPlugin = {
       if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
         code = applyOtelWrapping(code, args.path, getPaths().api.src) ?? code;
       }
-      code = applyHandlerAlsWrapping(code, {
-        projectIsEsm: projectSideIsEsm("api")
-      }) ?? code;
+      code = applyHandlerAlsWrapping(code) ?? code;
       return {
         contents: code,
         // Babel output is always plain JS. Without Babel the contents are

package/dist/build/esbuild-plugin-handler-als-wrapping.d.ts

@@ -1,4 +1,2 @@
-export declare function applyHandlerAlsWrapping(code: string, { projectIsEsm }?: {
-    projectIsEsm?: boolean;
-}): string | null;
+export declare function applyHandlerAlsWrapping(code: string): string | null;
 //# sourceMappingURL=esbuild-plugin-handler-als-wrapping.d.ts.map

package/dist/build/esbuild-plugin-handler-als-wrapping.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-plugin-handler-als-wrapping.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-handler-als-wrapping.ts"],"names":[],"mappings":"AAOA,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,EAAE,YAAoB,EAAE,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GACxD,MAAM,GAAG,IAAI,CA0Cf"}
+{"version":3,"file":"esbuild-plugin-handler-als-wrapping.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-handler-als-wrapping.ts"],"names":[],"mappings":"AAOA,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAsCnE"}

package/dist/build/esbuild-plugin-handler-als-wrapping.js

@@ -1,4 +1,4 @@
-function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
+function applyHandlerAlsWrapping(code) {
   const handlerRe = /^export\s+(?:const|let|var)\s+handler(?:[^=]|=>)*?=(?![>=])/m;
   const handlerMatch = handlerRe.exec(code);
   if (!handlerMatch) {
@@ -6,8 +6,7 @@ function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
   }
   const afterEquals = code.slice(handlerMatch.index + handlerMatch[0].length).trimStart();
   const isAsync = /^async(?:\s*[\(\*]|\s+function)/.test(afterEquals);
-  const storePath = projectIsEsm ? "@cedarjs/context/dist/store.js" : "@cedarjs/context/dist/store";
-  const importStatement = `import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '${storePath}'
+  const importStatement = `import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '@cedarjs/context/dist/store.js'
 `;
   const handlerStart = handlerMatch.index;
   const before = code.slice(0, handlerStart);

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;AA+DD,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;AAmQD,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
@@ -159,6 +163,23 @@ function mergeScalars(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
@@ -282,11 +303,14 @@ 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",
+    // On the api side JSON inputs use Prisma's input types, so they can be
+    // passed straight to Prisma. These don't include a top-level null; a
+    // nullable JSON argument is typed as `InputMaybe<...>` instead
+    JSON: side === 1 /* WEB */ ? "Prisma.JsonValue" : { input: "Prisma.InputJsonValue", output: "Prisma.JsonValue" },
+    JSONObject: side === 1 /* WEB */ ? "Prisma.JsonObject" : { input: "Prisma.InputJsonObject", output: "Prisma.JsonObject" },
     Time: side === 1 /* WEB */ ? "string" : "Date | string",
     Byte: "Uint8Array"
   };
@@ -309,7 +333,12 @@ async function getPluginConfig(side) {
       // We do this, so that service tests can call resolvers without doing a null check
       // see https://github.com/redwoodjs/redwood/pull/6222#issuecomment-1230156868
       // Look at type or source https://shrtm.nu/2BA0 for possible config, not well documented
-      resolvers: true
+      resolvers: true,
+      // `resolvers` doesn't cover the root types, so Query and Mutation
+      // resolvers need their own flags for services to export non-optional
+      // resolver functions
+      query: true,
+      mutation: true
     },
     contextType: `@cedarjs/graphql-server/dist/types#CedarGraphQLContext`
   };

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/dist/generate/templates/all-currentUser.d.ts.template

@@ -3,7 +3,14 @@ import '@cedarjs/auth'
 
 import { getCurrentUser } from '../../../api/src/lib/auth.js'
 
-export type InferredCurrentUser = Awaited<ReturnType<typeof getCurrentUser>>
+// The logged-in user getCurrentUser() returns. getCurrentUser() returns null
+// when nobody is logged in; @cedarjs/auth's CurrentUser type and
+// GlobalContext's currentUser type below cover that case. LoggedInUser below
+// extends this type, and with strictNullChecks an interface can't extend a
+// type that includes null.
+export type InferredLoggedInUser = NonNullable<
+  Awaited<ReturnType<typeof getCurrentUser>>
+>
 
 type UndefinedRoles = {
   /**
@@ -21,10 +28,12 @@ type Overwrite<T, U> = Omit<T, keyof U> & U
 
 declare module '@cedarjs/context' {
   interface GlobalContext {
-    currentUser?: Overwrite<UndefinedRoles, InferredCurrentUser>
+    // Not set when nobody is logged in. Functions wrapped in useRequireAuth
+    // set it to whatever getCurrentUser() returned, including null
+    currentUser?: Overwrite<UndefinedRoles, InferredLoggedInUser> | null
   }
 }
 
 declare module '@cedarjs/auth' {
-  interface CurrentUser extends InferredCurrentUser {}
+  interface LoggedInUser extends InferredLoggedInUser {}
 }

package/dist/generate/templates/api-test-globals.d.ts.template

@@ -1,11 +1,11 @@
 import type { vi as _vi } from 'vitest'
 
-import type { CurrentUser } from '@cedarjs/auth'
+import type { InferredLoggedInUser } from './all-currentUser.js'
 
 declare global {
   // describe, it, expect etc. are typed by @types/jest. Referencing
   // vitest/globals here would conflict with those declarations, so only vi
   // is declared
   const vi: typeof _vi
-  const mockCurrentUser: (currentUser: CurrentUser) => void
+  const mockCurrentUser: (currentUser: InferredLoggedInUser | null) => void
 }

package/dist/generate/templates/web-test-globals.d.ts.template

@@ -5,14 +5,14 @@ import type {
   mockGraphQLQuery as _mockGraphQLQuery,
 } from '@cedarjs/testing/web'
 
-import { InferredCurrentUser } from './all-currentUser.js'
+import type { InferredLoggedInUser } from './all-currentUser.js'
 
 declare global {
   // describe, it, expect etc. are typed by @types/jest. Referencing
   // vitest/globals here would conflict with those declarations, so only vi
   // is declared
   const vi: typeof _vi
-  const mockCurrentUser: (currentUser: InferredCurrentUser) => void
+  const mockCurrentUser: (currentUser: InferredLoggedInUser | null) => void
   const mockGraphQLQuery: typeof _mockGraphQLQuery
   const mockGraphQLMutation: typeof _mockGraphQLMutation
 }

package/dist/generate/typeDefinitions.js

@@ -304,8 +304,16 @@ const generateViteClientTypesDirective = () => {
 };
 function generateStubStorybookTypes() {
   const stubStorybookTypesFileContent = `declare module '@storybook/react' {
-  export type Meta<T = any> = any
-  export type StoryObj<T = any> = any
+  // Loose stand-ins for when Storybook isn't installed. \`render\` is spelled
+  // out so that its parameters are typed in stories, which keeps them valid
+  // with \`noImplicitAny\`
+  interface StubStoryAnnotations {
+    [key: string]: any
+    render?: (args: any, context: any) => any
+  }
+
+  export type Meta<T = any> = StubStoryAnnotations
+  export type StoryObj<T = any> = StubStoryAnnotations
 }
 `;
   const cedarProjectPaths = getPaths();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "7.1.0",
+  "version": "7.1.1-next.468",
   "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",
@@ -113,15 +119,15 @@
   "dependencies": {
     "@babel/core": "^7.26.10",
     "@babel/parser": "7.29.9",
-    "@babel/traverse": "7.29.8",
-    "@cedarjs/api": "7.1.0",
-    "@cedarjs/babel-config": "7.1.0",
-    "@cedarjs/cli-helpers": "7.1.0",
-    "@cedarjs/graphql-server": "7.1.0",
-    "@cedarjs/project-config": "7.1.0",
-    "@cedarjs/router": "7.1.0",
-    "@cedarjs/structure": "7.1.0",
-    "@cedarjs/utils": "7.1.0",
+    "@babel/traverse": "7.29.10",
+    "@cedarjs/api": "7.1.1-next.468",
+    "@cedarjs/babel-config": "7.1.1-next.468",
+    "@cedarjs/cli-helpers": "7.1.1-next.468",
+    "@cedarjs/graphql-server": "7.1.1-next.468",
+    "@cedarjs/project-config": "7.1.1-next.468",
+    "@cedarjs/router": "7.1.1-next.468",
+    "@cedarjs/structure": "7.1.1-next.468",
+    "@cedarjs/utils": "7.1.1-next.468",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -133,12 +139,12 @@
     "@graphql-codegen/typescript-operations": "5.1.0",
     "@graphql-codegen/typescript-resolvers": "5.1.8",
     "@graphql-codegen/visitor-plugin-common": "6.3.0",
-    "@graphql-tools/code-file-loader": "8.1.39",
-    "@graphql-tools/graphql-file-loader": "8.1.20",
-    "@graphql-tools/load": "8.1.17",
-    "@graphql-tools/merge": "9.2.4",
-    "@prisma/dmmf": "7.8.0",
-    "@prisma/internals": "7.8.0",
+    "@graphql-tools/code-file-loader": "8.1.41",
+    "@graphql-tools/graphql-file-loader": "8.1.22",
+    "@graphql-tools/load": "8.1.19",
+    "@graphql-tools/merge": "9.2.6",
+    "@prisma/dmmf": "7.10.0",
+    "@prisma/internals": "7.10.0",
     "@sdl-codegen/node": "2.0.1",
     "ansis": "4.4.0",
     "chokidar": "3.6.0",
@@ -148,24 +154,24 @@
     "graphql": "16.14.2",
     "kill-port": "1.6.1",
     "magic-string": "0.30.21",
-    "oxc-parser": "0.151.0",
-    "prettier": "3.9.8",
+    "oxc-parser": "0.153.0",
+    "prettier": "3.9.10",
     "rimraf": "6.1.3",
     "source-map": "0.8.0",
     "termi-link": "1.1.0",
     "tsconfig-paths": "4.2.0",
     "typescript": "5.9.3",
-    "vite": "7.3.6",
+    "vite": "7.3.7",
     "vite-tsconfig-paths": "^6.1.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "7.1.0",
+    "@cedarjs/framework-tools": "7.1.1-next.468",
     "@jridgewell/trace-mapping": "0.3.31",
-    "@oxc-project/types": "^0.151.0",
-    "concurrently": "9.2.4",
-    "graphql-tag": "2.12.6",
-    "memfs": "4.78.1",
-    "publint": "0.3.24",
+    "@oxc-project/types": "^0.153.0",
+    "concurrently": "9.2.5",
+    "graphql-tag": "2.12.7",
+    "memfs": "4.80.0",
+    "publint": "0.3.25",
     "ts-dedent": "2.3.0",
     "vitest": "4.1.11"
   },