@cedarjs/internal 6.0.0-rc.312 → 6.0.0-rc.340

package/dist/build/api.d.ts

@@ -1,6 +1,6 @@
 import type { BuildOptions } from 'esbuild';
 export { applySrcAlias } from './src-alias.js';
-export { applyEsmExtensions } from './esm-extensions.js';
+export { applyImportExtensions } from './import-extensions.js';
 export declare const buildApi: () => Promise<import("esbuild").BuildResult<BuildOptions>>;
 export declare const rebuildApi: () => Promise<import("esbuild").BuildResult<BuildOptions>>;
 export declare const cleanApiBuild: () => Promise<void>;

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;AA6CtE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAIxD,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA0VD,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;AAyVD,eAAO,MAAM,gBAAgB,iHAiE5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}

package/dist/build/api.js

@@ -30,13 +30,13 @@ import { applyDirectoryNamedImport } from "./directory-named-import.js";
 import { cedarApiGraphqlPlugin } from "./esbuild-plugin-api-graphql.js";
 import { applyOtelWrapping } from "./esbuild-plugin-cedar-otel-wrapping.js";
 import { applyHandlerAlsWrapping } from "./esbuild-plugin-handler-als-wrapping.js";
-import { applyEsmExtensions } from "./esm-extensions.js";
 import { applyImportDir } from "./import-dir.js";
+import { applyImportExtensions } from "./import-extensions.js";
 import { applyJobPathInjector } from "./job-path-injector.js";
 import { applySrcAlias } from "./src-alias.js";
 import { applyTsconfigPaths } from "./tsconfig-paths.js";
 import { applySrcAlias as applySrcAlias2 } from "./src-alias.js";
-import { applyEsmExtensions as applyEsmExtensions2 } from "./esm-extensions.js";
+import { applyImportExtensions as applyImportExtensions2 } from "./import-extensions.js";
 let BUILD_CTX = null;
 const buildApi = async () => {
   BUILD_CTX?.dispose();
@@ -95,9 +95,7 @@ const runCedarBabelTransformsPlugin = {
         }
         code = transformedCode.code;
       }
-      if (isEsm) {
-        code = applyEsmExtensions(code, args.path);
-      }
+      code = applyImportExtensions(code, args.path);
       const functionsDir = normalizePath(cedarPaths.api.functions);
       if (normalizedPath.startsWith(functionsDir + "/")) {
         code = applyHandlerAlsWrapping(code, {
@@ -222,9 +220,7 @@ function createCedarViteApiPlugin() {
       if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
         outputCode = applyOtelWrapping(outputCode, id, cedarPaths.api.src) ?? outputCode;
       }
-      if (isEsm) {
-        outputCode = applyEsmExtensions(outputCode, id);
-      }
+      outputCode = applyImportExtensions(outputCode, id);
       const functionsDir = normalizePath(cedarPaths.api.functions);
       if (normalizedId.startsWith(functionsDir + "/")) {
         outputCode = applyHandlerAlsWrapping(outputCode, {
@@ -369,7 +365,7 @@ function getEsbuildOptions(files) {
   };
 }
 export {
-  applyEsmExtensions2 as applyEsmExtensions,
+  applyImportExtensions2 as applyImportExtensions,
   applySrcAlias2 as applySrcAlias,
   buildApi,
   buildApiWithVite,

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

@@ -14,8 +14,8 @@ import { applyAutoImports } from "./auto-import.js";
 import { applyDirectoryNamedImport } from "./directory-named-import.js";
 import { applyOtelWrapping } from "./esbuild-plugin-cedar-otel-wrapping.js";
 import { applyHandlerAlsWrapping } from "./esbuild-plugin-handler-als-wrapping.js";
-import { applyEsmExtensions } from "./esm-extensions.js";
 import { applyImportDir } from "./import-dir.js";
+import { applyImportExtensions } from "./import-extensions.js";
 import { applySrcAlias } from "./src-alias.js";
 import { applyTsconfigPaths } from "./tsconfig-paths.js";
 const cedarApiGraphqlPlugin = {
@@ -55,9 +55,7 @@ const cedarApiGraphqlPlugin = {
         }
         code = transformedCode.code;
       }
-      if (projectSideIsEsm("api")) {
-        code = applyEsmExtensions(code, args.path);
-      }
+      code = applyImportExtensions(code, args.path);
       if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
         code = applyOtelWrapping(code, args.path, getPaths().api.src) ?? code;
       }

package/dist/build/import-extensions.d.ts

@@ -0,0 +1,47 @@
+/**
+ * Rewrites relative import specifiers so they point at the compiled `.js`
+ * output files instead of the TypeScript/JSX source files:
+ *
+ *  - Extensionless imports (`from '../lib/db'`) get `.js` appended so that
+ *    Node's ESM resolver can locate the compiled output at runtime. Node's
+ *    CJS resolver appends the extension itself, so for CJS output this
+ *    rewrite is behavior-neutral.
+ *  - Explicit TypeScript-extension imports (`from './hello.ts'`, allowed by
+ *    `allowImportingTsExtensions` in the project tsconfig) are rewritten to
+ *    `.js`, since the file on disk after compilation is `hello.js`. This is
+ *    required for both CJS and ESM output — neither Node resolver maps a
+ *    `.ts` specifier to a `.js` file.
+ *
+ * Handles static imports/re-exports (`from '../lib/db'`), side-effect
+ * imports (`import '../lib/setup'`), dynamic imports (`import('../lib/db')`),
+ * and `require('../lib/db')` calls (emitted when a custom api/babel.config.js
+ * lowers ESM to CommonJS before this function runs).
+ *
+ * Always outputs `.js` because both build pipelines compile every source
+ * file (`.ts`, `.tsx`, `.jsx`) to `.js` output. For a source file
+ * `api/src/lib/db.ts` or `api/src/lib/db.tsx`, the output is always
+ * `api/dist/lib/db.js`, so all import specifiers must use `.js` at runtime.
+ *
+ * For the standalone esbuild build path (`runCedarBabelTransformsPlugin`)
+ * this replaces the `resolvePath` hook in `babel-plugin-module-resolver`,
+ * which is not part of `getApiSideBabelPluginsForVite()`.
+ *
+ * It is a plain function called inline — not an esbuild plugin — following
+ * the same pattern as `applySrcAlias`, `applyTsconfigPaths`, etc.
+ *
+ * Also handles Cedar SDL files whose names include a compound extension:
+ * `contacts.sdl.ts` compiles to `contacts.sdl.js`, so an import specifier
+ * `../graphql/contacts.sdl` (generated by applyImportDir's glob expansion)
+ * is rewritten to `../graphql/contacts.sdl.js`.
+ *
+ * Example: in `api/src/functions/graphql.ts` importing `../lib/db`, this
+ * rewrites it to `../lib/db.js` when `api/src/lib/db.ts` (or `db.tsx`)
+ * exists on disk.
+ *
+ * Files under the generated data directory (`.cedar/` or `.redwood/`) are
+ * excluded from rewriting: generated artifacts such as the gqlorm backend
+ * (`.cedar/gqlorm/backend.ts`) are never compiled to `.js`, so an explicit
+ * `.ts` import pointing there must stay `.ts` at runtime.
+ */
+export declare function applyImportExtensions(code: string, fromFile: string): string;
+//# sourceMappingURL=import-extensions.d.ts.map

package/dist/build/import-extensions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"import-extensions.d.ts","sourceRoot":"","sources":["../../src/build/import-extensions.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CA+G5E"}

package/dist/build/{esm-extensions.js → import-extensions.js}

@@ -1,10 +1,20 @@
 import fs from "node:fs";
 import path from "node:path";
-function applyEsmExtensions(code, fromFile) {
+import { getPaths } from "@cedarjs/project-config";
+function applyImportExtensions(code, fromFile) {
   const fromDir = path.dirname(fromFile);
+  const generatedBase = getPaths().generated.base;
   const rewriteImportPath = (importPath, preservePrefix, preserveSuffix) => {
     const existingExt = path.extname(importPath);
     const absImport = path.join(fromDir, importPath);
+    const relativeToGeneratedBase = path.relative(generatedBase, absImport);
+    if (relativeToGeneratedBase === "" || !relativeToGeneratedBase.startsWith("..") && !path.isAbsolute(relativeToGeneratedBase)) {
+      return preservePrefix + importPath + preserveSuffix;
+    }
+    if ((existingExt === ".ts" || existingExt === ".tsx") && fs.existsSync(absImport)) {
+      const base2 = importPath.slice(0, -existingExt.length);
+      return preservePrefix + base2 + ".js" + preserveSuffix;
+    }
     if (existingExt && existingExt !== ".js" && existingExt !== ".jsx") {
       if (fs.existsSync(absImport + ".ts") || fs.existsSync(absImport + ".js") || fs.existsSync(absImport + ".tsx") || fs.existsSync(absImport + ".jsx")) {
         return preservePrefix + importPath + ".js" + preserveSuffix;
@@ -24,14 +34,26 @@ function applyEsmExtensions(code, fromFile) {
       return `from ${rewriteImportPath(importPath, quote, quote)}`;
     }
   );
+  result = result.replace(
+    /(^[ \t]*|;\s*)import\s+(['"])(\.\.?\/[^'"]+)\2/gm,
+    (match, prefix, quote, importPath) => {
+      return `${prefix}import ${rewriteImportPath(importPath, quote, quote)}`;
+    }
+  );
   result = result.replace(
     /\bimport\s*\(\s*(['"])(\.\.?\/[^'"]+)\1\s*\)/g,
     (match, quote, importPath) => {
       return `import(${rewriteImportPath(importPath, quote, quote)})`;
     }
   );
+  result = result.replace(
+    /\brequire\s*\(\s*(['"])(\.\.?\/[^'"]+)\1\s*\)/g,
+    (match, quote, importPath) => {
+      return `require(${rewriteImportPath(importPath, quote, quote)})`;
+    }
+  );
   return result;
 }
 export {
-  applyEsmExtensions
+  applyImportExtensions
 };

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

package/dist/generate/graphqlCodeGen.js

@@ -171,15 +171,37 @@ function getLoadDocumentsOptions(filename) {
   };
   return loadTypedefsConfig;
 }
-async function importGeneratedPrismaClient() {
+class PrismaModelsFormatError extends Error {
+}
+const MODEL_REEXPORT_RE = /^export type \* from '\.\/models\/(\w+)\.\w+'/gm;
+function readPrismaModelNames(clientPath) {
+  const ext = path.extname(clientPath);
+  const modelsPath = path.join(path.dirname(clientPath), `models${ext}`);
+  const source = fs.readFileSync(modelsPath, "utf8");
+  const modelNames = {};
+  for (const match of source.matchAll(MODEL_REEXPORT_RE)) {
+    modelNames[match[1]] = match[1];
+  }
+  if (Object.keys(modelNames).length === 0) {
+    throw new PrismaModelsFormatError(
+      `Could not read any Prisma model names from ${modelsPath}. Expected lines like \`export type * from './models/Post.ts'\`. This is most likely a change in what Prisma generates. Please open an issue at https://github.com/cedarjs/cedar/issues.`
+    );
+  }
+  return modelNames;
+}
+async function readGeneratedPrismaModelNames() {
   const cacheBuster = `?t=${Date.now()}`;
   const { clientPath, error } = await resolveGeneratedPrismaClient();
   if (!clientPath) {
     throw new Error(error);
   }
+  if (/\.[mc]?ts$/.test(clientPath)) {
+    return readPrismaModelNames(clientPath);
+  }
   const fileUrl = pathToFileURL(clientPath).href + cacheBuster;
   const freshPrisma = await import(fileUrl);
-  return freshPrisma;
+  const modelName = getModelName(freshPrisma);
+  return modelName ?? {};
 }
 function isModelNameRecord(value) {
   if (typeof value !== "object" || value === null) {
@@ -206,23 +228,27 @@ function getModelName(mod) {
 }
 async function getPrismaClient() {
   try {
-    const localPrisma = await importGeneratedPrismaClient();
-    const modelName = getModelName(localPrisma);
-    if (modelName) {
+    const modelName = await readGeneratedPrismaModelNames();
+    if (Object.keys(modelName).length > 0) {
       return { ModelName: modelName };
     }
-  } catch {
+  } catch (e) {
+    if (e instanceof PrismaModelsFormatError) {
+      throw e;
+    }
   }
   const pm = getPackageManager();
   const pmExec = pm === "npm" ? "npx" : pm;
   execa.sync(pmExec, ["cedar", "prisma", "generate"]);
   try {
-    const freshPrisma = await importGeneratedPrismaClient();
-    const modelName = getModelName(freshPrisma);
-    if (modelName) {
+    const modelName = await readGeneratedPrismaModelNames();
+    if (Object.keys(modelName).length > 0) {
       return { ModelName: modelName };
     }
-  } catch {
+  } catch (e) {
+    if (e instanceof PrismaModelsFormatError) {
+      throw e;
+    }
   }
   return { ModelName: {} };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "6.0.0-rc.312",
+  "version": "6.0.0-rc.340",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -118,17 +118,17 @@
   },
   "dependencies": {
     "@babel/core": "^7.26.10",
-    "@babel/parser": "7.29.7",
+    "@babel/parser": "7.29.8",
     "@babel/plugin-transform-typescript": "^7.26.8",
-    "@babel/traverse": "7.29.7",
-    "@cedarjs/api": "6.0.0-rc.312",
-    "@cedarjs/babel-config": "6.0.0-rc.312",
-    "@cedarjs/cli-helpers": "6.0.0-rc.312",
-    "@cedarjs/graphql-server": "6.0.0-rc.312",
-    "@cedarjs/project-config": "6.0.0-rc.312",
-    "@cedarjs/router": "6.0.0-rc.312",
-    "@cedarjs/structure": "6.0.0-rc.312",
-    "@cedarjs/utils": "6.0.0-rc.312",
+    "@babel/traverse": "7.29.8",
+    "@cedarjs/api": "6.0.0-rc.340",
+    "@cedarjs/babel-config": "6.0.0-rc.340",
+    "@cedarjs/cli-helpers": "6.0.0-rc.340",
+    "@cedarjs/graphql-server": "6.0.0-rc.340",
+    "@cedarjs/project-config": "6.0.0-rc.340",
+    "@cedarjs/router": "6.0.0-rc.340",
+    "@cedarjs/structure": "6.0.0-rc.340",
+    "@cedarjs/utils": "6.0.0-rc.340",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -166,7 +166,7 @@
     "vite-tsconfig-paths": "^6.1.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-rc.312",
+    "@cedarjs/framework-tools": "6.0.0-rc.340",
     "@jridgewell/trace-mapping": "0.3.31",
     "@oxc-project/types": "^0.144.0",
     "concurrently": "9.2.4",

package/dist/build/esm-extensions.d.ts

@@ -1,33 +0,0 @@
-/**
- * For ESM projects using esbuild with `bundle: false`, rewrites extensionless
- * relative imports to include `.js` extension so that Node's ESM resolver can
- * locate the compiled output files at runtime.
- *
- * Handles both static imports (`from '../lib/db'`) and dynamic imports
- * (`import('../lib/db')`).
- *
- * Always outputs `.js` because esbuild with `loader: 'js'` compiles all source
- * files (`.ts`, `.tsx`, `.jsx`) to `.js` output. For a source file `api/src/lib/db.ts`
- * or `api/src/lib/db.tsx`, the output is always `api/dist/lib/db.js`, so all
- * import specifiers must use `.js` at runtime.
- *
- * This replaces the `resolvePath` hook in `babel-plugin-module-resolver` for
- * the standalone esbuild build path (`runCedarBabelTransformsPlugin`), which
- * was previously responsible for this extension-appending behaviour.  Vite
- * and Rollup resolve extensions themselves during bundling; only the esbuild
- * `bundle: false` path needs explicit extension suffixes in the source.
- *
- * It is a plain function called inline — not an esbuild plugin — following
- * the same pattern as `applySrcAlias`, `applyTsconfigPaths`, etc.
- *
- * Also handles Cedar SDL files whose names include a compound extension:
- * `contacts.sdl.ts` compiles to `contacts.sdl.js`, so an import specifier
- * `../graphql/contacts.sdl` (generated by applyImportDir's glob expansion)
- * is rewritten to `../graphql/contacts.sdl.js`.
- *
- * Example: in `api/src/functions/graphql.ts` importing `../lib/db`, this
- * rewrites it to `../lib/db.js` when `api/src/lib/db.ts` (or `db.tsx`)
- * exists on disk.
- */
-export declare function applyEsmExtensions(code: string, fromFile: string): string;
-//# sourceMappingURL=esm-extensions.d.ts.map

package/dist/build/esm-extensions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"esm-extensions.d.ts","sourceRoot":"","sources":["../../src/build/esm-extensions.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAiEzE"}