@cedarjs/internal 6.0.2-rc.53 → 6.0.3-next.227

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,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"}
+{"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"}

package/dist/build/api.js

@@ -14,12 +14,7 @@ import {
   getApiSideBabelPluginsForVite,
   transformWithBabel
 } from "@cedarjs/babel-config";
-import {
-  getConfig,
-  getPaths,
-  projectSideIsEsm,
-  resolveFile
-} from "@cedarjs/project-config";
+import { getConfig, getPaths, resolveFile } from "@cedarjs/project-config";
 import { findApiFiles } from "../files.js";
 import {
   applyGqlormInject,
@@ -79,7 +74,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) {
@@ -98,9 +92,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;
@@ -178,7 +170,6 @@ function createDirectoryNamedImportVitePlugin() {
 }
 function createCedarViteApiPlugin() {
   const cedarConfig = getConfig();
-  const isEsm = projectSideIsEsm("api");
   return {
     name: "cedar-vite-api-babel-transform",
     enforce: "pre",
@@ -223,9 +214,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) {
@@ -245,8 +234,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) {
@@ -263,7 +250,7 @@ const buildApiWithVite = async () => {
       rollupOptions: {
         input,
         output: {
-          format,
+          format: "es",
           preserveModules: true,
           preserveModulesRoot: cedarPaths.api.src,
           entryFileNames: "[name].js",
@@ -344,13 +331,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/index.d.ts

@@ -1,5 +1,4 @@
 export * from '@cedarjs/project-config';
-export * from './ts2js.js';
 export * from './dev.js';
 export * from './routes.js';
 export * from './files.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AAEvC,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAE3B,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,cAAc,qBAAqB,CAAA;AAGnC,cAAc,uBAAuB,CAAA;AAErC,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAA;AAEvC,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAE3B,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,cAAc,qBAAqB,CAAA;AAGnC,cAAc,uBAAuB,CAAA;AAErC,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA"}

package/dist/index.js

@@ -1,5 +1,4 @@
 export * from "@cedarjs/project-config";
-export * from "./ts2js.js";
 export * from "./dev.js";
 export * from "./routes.js";
 export * from "./files.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "6.0.2-rc.53",
+  "version": "6.0.3-next.227",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -52,12 +52,6 @@
         "default": "./dist/routes.js"
       }
     },
-    "./dist/ts2js": {
-      "default": {
-        "types": "./dist/ts2js.d.ts",
-        "default": "./dist/ts2js.js"
-      }
-    },
     "./dist/validateSchema": {
       "default": {
         "types": "./dist/validateSchema.d.ts",
@@ -119,16 +113,15 @@
   "dependencies": {
     "@babel/core": "^7.26.10",
     "@babel/parser": "7.29.8",
-    "@babel/plugin-transform-typescript": "^7.26.8",
     "@babel/traverse": "7.29.8",
-    "@cedarjs/api": "6.0.2-rc.53",
-    "@cedarjs/babel-config": "6.0.2-rc.53",
-    "@cedarjs/cli-helpers": "6.0.2-rc.53",
-    "@cedarjs/graphql-server": "6.0.2-rc.53",
-    "@cedarjs/project-config": "6.0.2-rc.53",
-    "@cedarjs/router": "6.0.2-rc.53",
-    "@cedarjs/structure": "6.0.2-rc.53",
-    "@cedarjs/utils": "6.0.2-rc.53",
+    "@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",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -140,12 +133,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.37",
-    "@graphql-tools/graphql-file-loader": "8.1.19",
-    "@graphql-tools/load": "8.1.16",
-    "@graphql-tools/merge": "9.2.3",
-    "@prisma/dmmf": "7.8.0",
-    "@prisma/internals": "7.8.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.10.0",
+    "@prisma/internals": "7.10.0",
     "@sdl-codegen/node": "2.0.1",
     "ansis": "4.3.1",
     "chokidar": "3.6.0",
@@ -155,8 +148,8 @@
     "graphql": "16.14.2",
     "kill-port": "1.6.1",
     "magic-string": "0.30.21",
-    "oxc-parser": "0.148.0",
-    "prettier": "3.8.4",
+    "oxc-parser": "0.149.0",
+    "prettier": "3.9.6",
     "rimraf": "6.1.3",
     "source-map": "0.8.0",
     "termi-link": "1.1.0",
@@ -166,12 +159,12 @@
     "vite-tsconfig-paths": "^6.1.1"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.2-rc.53",
+    "@cedarjs/framework-tools": "6.0.3-next.227",
     "@jridgewell/trace-mapping": "0.3.31",
-    "@oxc-project/types": "^0.147.0",
+    "@oxc-project/types": "^0.149.0",
     "concurrently": "9.2.4",
-    "graphql-tag": "2.12.6",
-    "memfs": "4.68.2",
+    "graphql-tag": "2.12.7",
+    "memfs": "4.76.0",
     "publint": "0.3.24",
     "ts-dedent": "2.3.0",
     "vitest": "4.1.11"

package/dist/ts2js.d.ts

@@ -1,40 +0,0 @@
-/**
- * Converts all the TypeScript files in the `api` and `web` sides to JavaScript.
- *
- * @param {string} cwd - The base path to the project.
- */
-export declare const convertTsProjectToJs: (cwd?: string) => void;
-/**
- * Converts all the TypeScript files in the `api` and `web` sides to JavaScript.
- *
- * @param {string} cwd - The base path to the project.
- */
-export declare const convertTsScriptsToJs: (cwd?: string) => void;
-/**
- * Converts TypeScript files to JavaScript.
- *
- * @param {string} cwd - Current directory
- * @param {string[]} files - Collection of files to convert
- */
-export declare const convertTsFilesToJs: (cwd: string, files: string[]) => Promise<void>;
-/**
- * Get all the source code from a Redwood project
- */
-export declare const typeScriptSourceFiles: (cwd: string, globPattern?: string) => string[];
-/**
- * Read the contents of a TypeScript file, transpile it to JavaScript,
- * but leave the JSX intact and format via Prettier.
- *
- * @param {string} file - The path to the TypeScript file.
- */
-export declare const transformTSToJS: (file: string) => Promise<string> | undefined;
-export declare const getPrettierConfig: () => Promise<any>;
-/**
- * Prettify `code` according to the extension in `filename`.
- * This will also read a user's `prettier.config.cjs` file if it exists.
- *
- * @param {string} code
- * @param {string} filename
- */
-export declare const prettify: (code: string, filename: string) => Promise<string>;
-//# sourceMappingURL=ts2js.d.ts.map

package/dist/ts2js.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ts2js.d.ts","sourceRoot":"","sources":["../src/ts2js.ts"],"names":[],"mappings":"AASA;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,YAAqB,SAGzD,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,YAAqB,SAGzD,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAU,KAAK,MAAM,EAAE,OAAO,MAAM,EAAE,kBAkCpE,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,qBAAqB,GAChC,KAAK,MAAM,EACX,oBAA2C,aAS5C,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,gCAwB3C,CAAA;AAED,eAAO,MAAM,iBAAiB,oBAS7B,CAAA;AAsBD;;;;;;GAMG;AACH,eAAO,MAAM,QAAQ,GAAU,MAAM,MAAM,EAAE,UAAU,MAAM,oBAa5D,CAAA"}

package/dist/ts2js.js

@@ -1,119 +0,0 @@
-import fs from "node:fs";
-import path from "path";
-import { transform } from "@babel/core";
-import fg from "fast-glob";
-import { format } from "prettier";
-import { getPaths } from "@cedarjs/project-config";
-const convertTsProjectToJs = (cwd = getPaths().base) => {
-  const files = typeScriptSourceFiles(cwd);
-  convertTsFilesToJs(cwd, files);
-};
-const convertTsScriptsToJs = (cwd = getPaths().base) => {
-  const files = typeScriptSourceFiles(cwd, "scripts/*.{ts,tsx}");
-  convertTsFilesToJs(cwd, files);
-};
-const convertTsFilesToJs = async (cwd, files) => {
-  if (files.length === 0) {
-    console.log("No TypeScript files found to convert to JS in this project.");
-  }
-  for (const f of files) {
-    const code = await transformTSToJS(f);
-    if (code) {
-      fs.writeFileSync(
-        path.join(cwd, f.replace(".tsx", ".jsx").replace(".ts", ".js")),
-        code,
-        "utf8"
-      );
-      fs.unlinkSync(path.join(cwd, f));
-    }
-  }
-  if (fs.existsSync(path.join(cwd, "api/tsconfig.json"))) {
-    fs.renameSync(
-      path.join(cwd, "api/tsconfig.json"),
-      path.join(cwd, "api/jsconfig.json")
-    );
-  }
-  if (fs.existsSync(path.join(cwd, "web/tsconfig.json"))) {
-    fs.renameSync(
-      path.join(cwd, "web/tsconfig.json"),
-      path.join(cwd, "web/jsconfig.json")
-    );
-  }
-  if (fs.existsSync(path.join(cwd, "scripts/tsconfig.json"))) {
-    fs.renameSync(
-      path.join(cwd, "scripts/tsconfig.json"),
-      path.join(cwd, "scripts/jsconfig.json")
-    );
-  }
-};
-const typeScriptSourceFiles = (cwd, globPattern = "{api,web}/src/**/*.{ts,tsx}") => {
-  console.log(globPattern);
-  return fg.sync(globPattern, {
-    cwd,
-    ignore: ["node_modules"]
-  });
-};
-const transformTSToJS = (file) => {
-  const tsCode = fs.readFileSync(file, "utf8");
-  const filename = path.basename(file);
-  const result = transform(tsCode, {
-    filename,
-    cwd: getPaths().base,
-    configFile: false,
-    plugins: [
-      [
-        "@babel/plugin-transform-typescript",
-        {
-          isTSX: true,
-          allExtensions: true
-        }
-      ]
-    ],
-    retainLines: true
-  });
-  if (!result?.code) {
-    return void 0;
-  }
-  return prettify(result.code, filename.replace(/\.ts$/, ".js"));
-};
-const getPrettierConfig = async () => {
-  try {
-    const { default: prettierConfig } = await import(`file://${path.join(getPaths().base, "prettier.config.cjs")}`);
-    return prettierConfig;
-  } catch {
-    return void 0;
-  }
-};
-const prettierParser = (filename) => {
-  switch (path.extname(filename.replace(".template", ""))) {
-    case ".css":
-      return "css";
-    case ".js":
-      return "babel";
-    case ".ts":
-    case ".tsx":
-      return "babel-ts";
-    default:
-      return void 0;
-  }
-};
-const prettify = async (code, filename) => {
-  const parser = prettierParser(filename);
-  if (typeof parser === "undefined") {
-    return code;
-  }
-  const prettierConfig = await getPrettierConfig();
-  return format(code, {
-    ...prettierConfig,
-    parser
-  });
-};
-export {
-  convertTsFilesToJs,
-  convertTsProjectToJs,
-  convertTsScriptsToJs,
-  getPrettierConfig,
-  prettify,
-  transformTSToJS,
-  typeScriptSourceFiles
-};