@cedarjs/cli 5.0.0-canary.2379 → 5.0.0-canary.2383

package/dist/cfw.js

@@ -34,10 +34,9 @@ try {
   execa.sync("yarn", [...command], {
     stdio: "inherit",
     cwd: absCfwPath,
-    env: {
-      CEDAR_CWD: projectPath
-    }
+    // @ts-expect-error - testUtils.d.ts augments ProcessEnv with REDWOOD_DISABLE_TELEMETRY
+    env: { CEDAR_CWD: projectPath }
   });
-} catch (e) {
+} catch {
   console.log();
 }

package/dist/commands/generate/helpers.js

@@ -37,26 +37,26 @@ const forcePluralizeWord = (word) => {
   }
   return pluralize(word);
 };
+const routeParamToTsType = {
+  Int: "number",
+  Float: "number",
+  Boolean: "boolean",
+  String: "string"
+};
 const mapRouteParamTypeToTsType = (paramType) => {
-  const routeParamToTsType = {
-    Int: "number",
-    Float: "number",
-    Boolean: "boolean",
-    String: "string"
-  };
   return routeParamToTsType[paramType] || "unknown";
 };
+const prismaScalarToTsType = {
+  String: "string",
+  Boolean: "boolean",
+  Int: "number",
+  BigInt: "number",
+  Float: "number",
+  Decimal: "number",
+  DateTime: "string",
+  Bytes: "Uint8Array"
+};
 const mapPrismaScalarToPagePropTsType = (scalarType) => {
-  const prismaScalarToTsType = {
-    String: "string",
-    Boolean: "boolean",
-    Int: "number",
-    BigInt: "number",
-    Float: "number",
-    Decimal: "number",
-    DateTime: "string",
-    Bytes: "Uint8Array"
-  };
   return prismaScalarToTsType[scalarType] || "unknown";
 };
 export {

package/dist/commands/setup/deploy/helpers/index.js

@@ -1,7 +1,10 @@
 import fs from "node:fs";
 import path from "node:path";
+import * as parser from "@babel/parser";
+import * as t from "@babel/types";
 import execa from "execa";
 import { Listr } from "listr2";
+import * as recast from "recast";
 import { getConfigPath, getConfig } from "@cedarjs/project-config";
 import { getPaths, writeFilesTask } from "../../../../lib/index.js";
 const updateApiURLTask = (apiUrl) => {
@@ -84,6 +87,91 @@ const verifyUDSetupTask = () => {
     }
   };
 };
+function posToIndex(str, line, column) {
+  const lines = str.split("\n");
+  let index = 0;
+  for (let i = 0; i < line - 1; i++) {
+    index += lines[i].length + 1;
+  }
+  return index + column;
+}
+function insertPluginsBeforeCedar({ content, pluginCodes }) {
+  const ast = recast.parse(content, {
+    parser: {
+      parse(source) {
+        return parser.parse(source, {
+          sourceType: "module",
+          plugins: ["typescript", "jsx"]
+        });
+      }
+    }
+  });
+  const defaultExport = ast.program.body.find(
+    (node) => t.isExportDefaultDeclaration(node) && t.isCallExpression(node.declaration) && t.isIdentifier(node.declaration.callee) && node.declaration.callee.name === "defineConfig"
+  );
+  if (!defaultExport) {
+    return null;
+  }
+  const configArg = defaultExport.declaration.arguments[0];
+  if (!t.isObjectExpression(configArg)) {
+    return null;
+  }
+  const pluginsProp = configArg.properties.find(
+    (prop) => t.isObjectProperty(prop) && t.isIdentifier(prop.key) && prop.key.name === "plugins" && t.isArrayExpression(prop.value)
+  );
+  if (!pluginsProp) {
+    return null;
+  }
+  const elements = pluginsProp.value.elements;
+  const cedarIndex = elements.findIndex(
+    (el) => t.isCallExpression(el) && t.isIdentifier(el.callee) && el.callee.name === "cedar"
+  );
+  if (cedarIndex === -1) {
+    return null;
+  }
+  const cedarNode = elements[cedarIndex];
+  const arrayNode = pluginsProp.value;
+  const isInline = cedarNode.loc.start.line === arrayNode.loc.start.line;
+  if (isInline) {
+    const startPos = posToIndex(
+      content,
+      arrayNode.loc.start.line,
+      arrayNode.loc.start.column
+    );
+    const endPos = posToIndex(
+      content,
+      arrayNode.loc.end.line,
+      arrayNode.loc.end.column
+    );
+    const precedingText = content.slice(0, startPos);
+    const followingText = content.slice(endPos);
+    const existingCodes = elements.map(
+      (el) => content.slice(
+        posToIndex(content, el.loc.start.line, el.loc.start.column),
+        posToIndex(content, el.loc.end.line, el.loc.end.column)
+      )
+    );
+    const lines2 = content.split("\n");
+    const pluginsLine = pluginsProp.loc.start.line;
+    const pluginsIndent = lines2[pluginsLine - 1].match(/^\s*/)[0];
+    const elemIndent = pluginsIndent + "  ";
+    const allCodes = [...existingCodes];
+    allCodes.splice(cedarIndex, 0, ...pluginCodes);
+    const multiline = [
+      "[",
+      ...allCodes.map((code) => `${elemIndent}${code},`),
+      `${pluginsIndent}]`
+    ].join("\n");
+    return precedingText + multiline + followingText;
+  }
+  const cedarLine = cedarNode.loc.start.line;
+  const insertPos = posToIndex(content, cedarLine, 0);
+  const lines = content.split("\n");
+  const indent = lines[cedarLine - 1].match(/^\s*/)[0];
+  const insertion = pluginCodes.map((code) => `${indent}${code},
+`).join("");
+  return content.slice(0, insertPos) + insertion + content.slice(insertPos);
+}
 const addToGitIgnoreTask = ({ paths }) => {
   return {
     title: "Updating .gitignore...",
@@ -125,6 +213,7 @@ export {
   addToDotEnvTask,
   addToGitIgnoreTask,
   getUserApiUrl,
+  insertPluginsBeforeCedar,
   preRequisiteCheckTask,
   updateApiURLTask,
   verifyUDSetupTask

package/dist/commands/setup/deploy/providers/netlifyHandler.js

@@ -10,6 +10,7 @@ import {
 } from "../../../../lib/index.js";
 import {
   addFilesTask,
+  insertPluginsBeforeCedar,
   updateApiURLTask,
   verifyUDSetupTask
 } from "../helpers/index.js";
@@ -87,17 +88,16 @@ ${result}`;
         }
       }
       if (!content.includes("netlifyCompat(")) {
-        content = content.replace(
-          /(\s*)(plugins:\s*\[)([\s\S]*?)(cedar\s*\()/,
-          (_match, leadingWs, prefix, beforeCedar, cedarCall) => {
-            const indent = beforeCedar.includes("\n") ? beforeCedar.match(/\n(\s*)$/)?.[1] || leadingWs + "  " : leadingWs + "  ";
-            const before = beforeCedar.replace(/\s*$/, "");
-            return `${leadingWs}${prefix}
-${indent}netlify({ build: { enabled: true } }),
-${indent}netlifyCompat(),${before}
-${indent}${cedarCall}`;
-          }
-        );
+        const result = insertPluginsBeforeCedar({
+          content,
+          pluginCodes: [
+            "netlify({ build: { enabled: true } })",
+            "netlifyCompat()"
+          ]
+        });
+        if (result) {
+          content = result;
+        }
       }
       fs.writeFileSync(viteConfigPath, content);
     }

package/dist/commands/setup/deploy/providers/vercelHandler.js

@@ -9,7 +9,11 @@ import {
   printSetupNotes,
   writeFile
 } from "../../../../lib/index.js";
-import { updateApiURLTask, verifyUDSetupTask } from "../helpers/index.js";
+import {
+  insertPluginsBeforeCedar,
+  updateApiURLTask,
+  verifyUDSetupTask
+} from "../helpers/index.js";
 async function handler({ force, ud }) {
   recordTelemetryAttributes({
     command: "setup deploy vercel",
@@ -67,16 +71,13 @@ function addVercelPluginToViteConfigTask() {
         }
       }
       if (!content.includes("vercel(")) {
-        content = content.replace(
-          /(\s*)(plugins:\s*\[)([\s\S]*?)(cedar\s*\()/,
-          (_match, leadingWs, prefix, beforeCedar, cedarCall) => {
-            const indent = beforeCedar.includes("\n") ? beforeCedar.match(/\n(\s*)$/)?.[1] || leadingWs + "  " : leadingWs + "  ";
-            const before = beforeCedar.replace(/\s*$/, "");
-            return `${leadingWs}${prefix}
-${indent}vercel(),${before}
-${indent}${cedarCall}`;
-          }
-        );
+        const result = insertPluginsBeforeCedar({
+          content,
+          pluginCodes: ["vercel()"]
+        });
+        if (result) {
+          content = result;
+        }
       }
       fs.writeFileSync(viteConfigPath, content);
     }

package/dist/commands/setup/deploy/templates/netlifyUD.js

@@ -8,7 +8,7 @@ publish = "web/dist"
 NODE_VERSION = "24"
 
 [functions]
-directory = "api/dist/functions"
+directory = "api/dist/ud"
 
 # To use Netlify Dev, install Netlify's CLI (\`netlify-cli\`) from NPM and use
 # \`netlify link\` to connect your local project to a site on Netlify. Then run

package/dist/lib/exit.js

@@ -12,12 +12,27 @@ const DEFAULT_ERROR_EPILOGUE = [
   ` - Not sure about something or need advice? Reach out on our ${discordLink}`,
   ` - Think you've found a bug? Open an issue on our ${githubLink}`
 ].join("\n");
-function exitWithError(error, { exitCode, message, epilogue, includeEpilogue, includeReferenceCode } = {}) {
-  exitCode ??= error?.exitCode ?? 1;
+function exitWithError(error, {
+  exitCode,
+  message,
+  epilogue,
+  includeEpilogue,
+  includeReferenceCode
+} = {}) {
+  if (error && typeof error === "object" && "exitCode" in error) {
+    exitCode ??= typeof error.exitCode === "number" ? error.exitCode : 1;
+  }
+  exitCode ??= 1;
   epilogue ??= DEFAULT_ERROR_EPILOGUE;
   includeEpilogue ??= true;
   includeReferenceCode ??= true;
-  message ??= error.stack ?? (error.toString() || "Unknown error");
+  if (message === void 0) {
+    if (error instanceof Error && error.stack) {
+      message = error.stack;
+    } else {
+      message = String(error) || "Unknown error";
+    }
+  }
   const errorReferenceCode = uuidv4();
   const line = ansis.red("-".repeat(process.stderr.columns - 4));
   const content = !includeEpilogue ? message : [
@@ -31,7 +46,7 @@ ${line}`,
     line
   ].filter(Boolean).join("\n");
   console.error(content);
-  recordTelemetryError(error ?? new Error(message));
+  recordTelemetryError(error ?? new Error(message ?? ""));
   recordTelemetryAttributes({ errorReferenceCode });
   process.exit(exitCode);
 }

package/dist/lib/packages.js

@@ -35,10 +35,12 @@ async function installRedwoodModule(module) {
       }
     } catch (error) {
       throw new Error(
-        `Couldn't fetch packument for ${module}: ${error.message}`
+        `Couldn't fetch packument for ${module}: ${error instanceof Error ? error.message : String(error)}`
       );
     }
-    const versionIsPublished = Object.keys(packument.versions).includes(version);
+    const versionIsPublished = Object.keys(packument.versions ?? {}).includes(
+      version
+    );
     if (!versionIsPublished) {
       version = "canary";
     }
@@ -66,9 +68,9 @@ function isModuleInstalled(module) {
     return true;
   }
   const createdRequire = createRequire(import.meta.url);
-  return createdRequire.resolve.paths(`${module}/package.json`).some((requireResolvePath) => {
+  return createdRequire.resolve.paths(`${module}/package.json`)?.some((requireResolvePath) => {
     return fs.existsSync(path.join(requireResolvePath, module));
-  });
+  }) ?? false;
 }
 export {
   installModule,

package/dist/lib/pluralHelpers.js

@@ -33,7 +33,7 @@ To continue, the generator requires a unique plural form:`;
   const destroyMessage = `Cannot determine the plural of "${model}" originally used to generate the files. 
 To continue, the destroy command requires the plural form:`;
   const promptMessage = isDestroyer ? destroyMessage : generateMessage;
-  const initialPlural = model.slice(-1) === "s" ? `${model}es` : `${model}s`;
+  const initialPlural = model.endsWith("s") ? `${model}es` : `${model}s`;
   const promptResult = await prompts({
     type: "text",
     name: "plural",

package/dist/lib/project.js

@@ -5,7 +5,9 @@ const isTypeScriptProject = () => {
   const paths = getPaths();
   return fs.existsSync(path.join(paths.web.base, "tsconfig.json")) || fs.existsSync(path.join(paths.api.base, "tsconfig.json"));
 };
-function workspaces({ includePackages = false } = {}) {
+function workspaces({
+  includePackages = false
+} = {}) {
   const cedarPaths = getPaths();
   let workspaces2 = [];
   if (fs.existsSync(path.join(cedarPaths.web.base, "package.json"))) {

package/dist/lib/rollback.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "path";
-let rollback = [];
+const rollback = [];
 function addFunctionToRollback(func, atEnd = false) {
   const step = { type: "func", func };
   if (atEnd) {
@@ -9,11 +9,11 @@ function addFunctionToRollback(func, atEnd = false) {
     rollback.push(step);
   }
 }
-function addFileToRollback(path2, atEnd = false) {
+function addFileToRollback(filePath, atEnd = false) {
   const step = {
     type: "file",
-    path: path2,
-    content: fs.existsSync(path2) ? fs.readFileSync(path2) : null
+    path: filePath,
+    content: fs.existsSync(filePath) ? fs.readFileSync(filePath) : null
   };
   if (atEnd) {
     rollback.unshift(step);
@@ -51,7 +51,7 @@ async function executeRollback(_ = null, task = null) {
     }
   }
   if (task) {
-    task.title = `Reverted because: ${task.task.message.error}`;
+    task.title = `Reverted because: ${task.task.message?.error ?? "unknown error"}`;
   }
 }
 function resetRollback() {

package/dist/telemetry/exporter.js

@@ -32,12 +32,19 @@ class CustomFileExporter {
    * @param spans the list of sampled Spans to be exported.
    */
   export(spans, resultCallback) {
-    for (let i = 0; i < spans.length; i++) {
-      const span = spans[i];
-      delete span["_spanProcessor"];
+    for (const span of spans) {
       fs.appendFileSync(
         this.#storageFilePath,
-        JSON.stringify(span, void 0, 2)
+        JSON.stringify(
+          span,
+          (key, value) => {
+            if (key === "_spanProcessor") {
+              return void 0;
+            }
+            return value;
+          },
+          2
+        )
       );
       fs.appendFileSync(this.#storageFilePath, ",");
     }

package/dist/telemetry/resource.js

@@ -8,9 +8,11 @@ import { v4 as uuidv4, validate as validateUUID } from "uuid";
 import { getPaths, getRawConfig } from "@cedarjs/project-config";
 import { RWProject } from "@cedarjs/structure/dist/model/RWProject";
 import {
-  name as packageName,
-  version as packageVersion
+  name as _packageName,
+  version as _packageVersion
 } from "../../package.js";
+const packageName = _packageName;
+const packageVersion = _packageVersion;
 async function getResources() {
   let UID = uuidv4();
   try {
@@ -29,7 +31,7 @@ async function getResources() {
         fs.writeFileSync(telemetryFile, UID);
       }
     }
-  } catch (_error) {
+  } catch {
   }
   const info = JSON.parse(
     await envinfo.run(
@@ -57,7 +59,9 @@ async function getResources() {
   const experiments = Object.keys(getRawConfig()["experimental"] || {});
   const project = new RWProject();
   const routes = project.getRouter().routes;
-  const prerenderedRoutes = routes.filter((route) => route.hasPrerender);
+  const prerenderedRoutes = routes.filter(
+    (route) => route.hasPrerender
+  );
   const complexity = [
     routes.length,
     prerenderedRoutes.length,

package/dist/telemetry/send.js

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import path from "path";
+import { ExportResultCode } from "@opentelemetry/core";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 import { Resource } from "@opentelemetry/resources";
 import { getPaths } from "@cedarjs/project-config";
@@ -53,14 +54,17 @@ async function main() {
       span.spanContext = () => span._spanContext;
       span.events = [];
     }
-    traceExporter.export(spans, ({ code, error }) => {
-      if (code !== 0) {
-        console.error("Encountered:");
-        console.error(error);
-        console.error("while exporting the following spans:");
-        console.error(spans);
+    traceExporter.export(
+      spans,
+      ({ code, error }) => {
+        if (code !== ExportResultCode.SUCCESS) {
+          console.error("Encountered:");
+          console.error(error);
+          console.error("while exporting the following spans:");
+          console.error(spans);
+        }
       }
-    });
+    );
     fs.writeFileSync(
       path.join(telemetryDir, `_${file}`),
       JSON.stringify(spans, null, 2)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "5.0.0-canary.2379",
+  "version": "5.0.0-canary.2383",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -33,17 +33,17 @@
   "dependencies": {
     "@babel/parser": "7.29.3",
     "@babel/preset-typescript": "7.28.5",
-    "@cedarjs/api-server": "5.0.0-canary.2379",
-    "@cedarjs/cli-helpers": "5.0.0-canary.2379",
-    "@cedarjs/fastify-web": "5.0.0-canary.2379",
-    "@cedarjs/internal": "5.0.0-canary.2379",
-    "@cedarjs/prerender": "5.0.0-canary.2379",
-    "@cedarjs/project-config": "5.0.0-canary.2379",
-    "@cedarjs/structure": "5.0.0-canary.2379",
-    "@cedarjs/telemetry": "5.0.0-canary.2379",
-    "@cedarjs/utils": "5.0.0-canary.2379",
-    "@cedarjs/vite": "5.0.0-canary.2379",
-    "@cedarjs/web-server": "5.0.0-canary.2379",
+    "@cedarjs/api-server": "5.0.0-canary.2383",
+    "@cedarjs/cli-helpers": "5.0.0-canary.2383",
+    "@cedarjs/fastify-web": "5.0.0-canary.2383",
+    "@cedarjs/internal": "5.0.0-canary.2383",
+    "@cedarjs/prerender": "5.0.0-canary.2383",
+    "@cedarjs/project-config": "5.0.0-canary.2383",
+    "@cedarjs/structure": "5.0.0-canary.2383",
+    "@cedarjs/telemetry": "5.0.0-canary.2383",
+    "@cedarjs/utils": "5.0.0-canary.2383",
+    "@cedarjs/vite": "5.0.0-canary.2383",
+    "@cedarjs/web-server": "5.0.0-canary.2383",
     "@listr2/prompt-adapter-enquirer": "4.2.1",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/core": "1.30.1",