@cedarjs/internal 7.0.1-next.333 → 7.0.1-next.467

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;AAwCtE,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;AA8UD,eAAO,MAAM,gBAAgB,iHA+D5B,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

@@ -14,7 +14,12 @@ import {
   getApiSideBabelPluginsForVite,
   transformWithBabel
 } from "@cedarjs/babel-config";
-import { getConfig, getPaths, resolveFile } from "@cedarjs/project-config";
+import {
+  getConfig,
+  getPaths,
+  createPrismaClientFileMatcher,
+  resolveFile
+} from "@cedarjs/project-config";
 import { findApiFiles } from "../files.js";
 import {
   applyGqlormInject,
@@ -55,8 +60,19 @@ const cleanApiBuild = async () => {
 const runCedarBabelTransformsPlugin = {
   name: "cedar-esbuild-babel-transform",
   setup(build2) {
+    let prismaClientFiles = createPrismaClientFileMatcher();
+    build2.onStart(async () => {
+      prismaClientFiles = createPrismaClientFileMatcher();
+      await prismaClientFiles.load();
+    });
     build2.onLoad({ filter: /\.(js|ts|tsx|jsx)$/ }, async (args) => {
       let fileContents = await fs.promises.readFile(args.path, "utf-8");
+      if (await prismaClientFiles.matches(args.path)) {
+        return {
+          contents: applyImportExtensions(fileContents, args.path),
+          loader: getEsbuildLoader(args.path)
+        };
+      }
       fileContents = applySrcAlias(
         fileContents,
         path.dirname(
@@ -120,16 +136,23 @@ function getEsbuildLoader(filePath) {
   }
 }
 function createImportDirVitePlugin() {
+  const prismaClientFiles = createPrismaClientFileMatcher();
   return {
     name: "cedar-internal-import-dir",
     enforce: "pre",
-    transform(code, id) {
+    async buildStart() {
+      await prismaClientFiles.load();
+    },
+    async transform(code, id) {
       if (!/\.(js|ts|tsx|jsx)$/.test(id)) {
         return null;
       }
       if (id.includes("node_modules")) {
         return null;
       }
+      if (await prismaClientFiles.matches(id)) {
+        return null;
+      }
       const result = applyImportDir(code, id);
       if (!result) {
         return null;
@@ -170,9 +193,13 @@ function createDirectoryNamedImportVitePlugin() {
 }
 function createCedarViteApiPlugin() {
   const cedarConfig = getConfig();
+  const prismaClientFiles = createPrismaClientFileMatcher();
   return {
     name: "cedar-vite-api-babel-transform",
     enforce: "pre",
+    async buildStart() {
+      await prismaClientFiles.load();
+    },
     async transform(code, id) {
       if (!/\.(js|ts|tsx|jsx)$/.test(id)) {
         return null;
@@ -184,6 +211,16 @@ function createCedarViteApiPlugin() {
       if (!normalizePath(id).startsWith(normalizePath(cedarPaths.api.base))) {
         return null;
       }
+      if (await prismaClientFiles.matches(id)) {
+        const outputCode2 = applyImportExtensions(code, id);
+        if (outputCode2 === code) {
+          return null;
+        }
+        return {
+          code: outputCode2,
+          map: new MagicString(code).generateMap({ hires: true })
+        };
+      }
       let sourceCode = code;
       const normalizedId = normalizePath(id);
       sourceCode = applySrcAlias(

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;AAqPD,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

@@ -306,8 +306,11 @@ async function getPluginConfig(side) {
     // @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"
   };
@@ -330,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/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.0.1-next.333",
+  "version": "7.0.1-next.467",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -119,15 +119,15 @@
   "dependencies": {
     "@babel/core": "^7.26.10",
     "@babel/parser": "7.29.9",
-    "@babel/traverse": "7.29.8",
-    "@cedarjs/api": "7.0.1-next.333",
-    "@cedarjs/babel-config": "7.0.1-next.333",
-    "@cedarjs/cli-helpers": "7.0.1-next.333",
-    "@cedarjs/graphql-server": "7.0.1-next.333",
-    "@cedarjs/project-config": "7.0.1-next.333",
-    "@cedarjs/router": "7.0.1-next.333",
-    "@cedarjs/structure": "7.0.1-next.333",
-    "@cedarjs/utils": "7.0.1-next.333",
+    "@babel/traverse": "7.29.10",
+    "@cedarjs/api": "7.0.1-next.467",
+    "@cedarjs/babel-config": "7.0.1-next.467",
+    "@cedarjs/cli-helpers": "7.0.1-next.467",
+    "@cedarjs/graphql-server": "7.0.1-next.467",
+    "@cedarjs/project-config": "7.0.1-next.467",
+    "@cedarjs/router": "7.0.1-next.467",
+    "@cedarjs/structure": "7.0.1-next.467",
+    "@cedarjs/utils": "7.0.1-next.467",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -139,10 +139,10 @@
     "@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",
+    "@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",
@@ -154,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.9",
+    "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.0.1-next.333",
+    "@cedarjs/framework-tools": "7.0.1-next.467",
     "@jridgewell/trace-mapping": "0.3.31",
-    "@oxc-project/types": "^0.151.0",
-    "concurrently": "9.2.4",
+    "@oxc-project/types": "^0.153.0",
+    "concurrently": "9.2.5",
     "graphql-tag": "2.12.7",
-    "memfs": "4.79.0",
-    "publint": "0.3.24",
+    "memfs": "4.80.0",
+    "publint": "0.3.25",
     "ts-dedent": "2.3.0",
     "vitest": "4.1.11"
   },