@cedarjs/cli 4.2.1-next.0 → 4.2.1-next.269

package/dist/commands/generate/package/packageHandler.js

@@ -2,14 +2,17 @@ import fs from "node:fs";
 import path from "node:path";
 import { ListrEnquirerPromptAdapter } from "@listr2/prompt-adapter-enquirer";
 import { paramCase, camelCase } from "change-case";
-import execa from "execa";
 import { modify, applyEdits } from "jsonc-parser";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import ts from "typescript";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
 import { workspacePackageSpecifier } from "@cedarjs/cli-helpers/packageManager";
+import { runScript, runBinSync } from "@cedarjs/cli-helpers/packageManager/exec";
+import { installPackages } from "@cedarjs/cli-helpers/packageManager/packages";
+import { addWorkspaceDir } from "@cedarjs/cli-helpers/packageManager/workspaces";
 import { getConfig } from "@cedarjs/project-config";
+import { getPackageManager } from "@cedarjs/project-config/packageManager";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { getPaths, writeFilesTask } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
@@ -60,7 +63,7 @@ async function updateTsconfig(task) {
         "Failed to parse tsconfig: " + JSON.stringify(error, null, 2)
       );
     }
-    if (!tsconfig?.compilerOptions || typeof tsconfig.compilerOptions.module === "undefined") {
+    if (tsconfig.compilerOptions?.module === void 0) {
       continue;
     }
     const currentModule = typeof tsconfig.compilerOptions.module === "string" ? tsconfig.compilerOptions.module.toLowerCase() : String(tsconfig.compilerOptions.module).toLowerCase();
@@ -126,10 +129,8 @@ async function addDependencyToPackageJson(task, packageJsonPath, packageName) {
   const packageJson = JSON.parse(
     await fs.promises.readFile(packageJsonPath, "utf8")
   );
-  if (!packageJson.dependencies) {
-    packageJson.dependencies = {};
-  }
-  if (packageJson.dependencies[packageName]) {
+  packageJson.dependencies ??= {};
+  if (packageJson?.dependencies[packageName]) {
     task.skip("Dependency already exists");
     return;
   }
@@ -200,7 +201,7 @@ function updateWorkspaceTsconfigReferences(task, folderName, targetWorkspaces) {
             readFile: (p) => {
               try {
                 return fs.readFileSync(p, "utf8");
-              } catch (e) {
+              } catch {
                 return ts.sys.readFile(p);
               }
             },
@@ -213,21 +214,21 @@ function updateWorkspaceTsconfigReferences(task, folderName, targetWorkspaces) {
           },
           path.dirname(ws.tsconfigPath)
         );
-        if (configParseResult.errors && configParseResult.errors.length) {
+        if (configParseResult.errors?.length) {
           console.error("Parse errors:", configParseResult.errors);
         }
         if (!Array.isArray(tsconfig.references)) {
           tsconfig.references = [];
         }
-        const packageDir2 = ws.packageDir || path.join(getPaths().base, "packages", folderName);
-        const referencePath = path.relative(path.dirname(ws.tsconfigPath), packageDir2).split(path.sep).join("/");
+        const wsPackageDir = ws.packageDir || path.join(getPaths().base, "packages", folderName);
+        const referencePath = path.relative(path.dirname(ws.tsconfigPath), wsPackageDir).split(path.sep).join("/");
         const references = tsconfig.references;
-        if (references.some((ref) => ref && ref.path === referencePath)) {
+        if (references.some((ref) => ref?.path === referencePath)) {
           subtask.skip("tsconfig already up to date");
           return;
         }
         const newReferences = references.concat([{ path: referencePath }]);
-        let text = await fs.promises.readFile(ws.tsconfigPath, "utf8");
+        const text = await fs.promises.readFile(ws.tsconfigPath, "utf8");
         const edits = modify(text, ["references"], newReferences, {
           formattingOptions: { insertSpaces: true, tabSize: 2 }
         });
@@ -244,14 +245,18 @@ function updateWorkspaceTsconfigReferences(task, folderName, targetWorkspaces) {
 }
 async function installAndBuild(folderName) {
   const packagePath = path.join("packages", folderName);
-  await execa("yarn", ["install"], { stdio: "inherit", cwd: getPaths().base });
-  await execa("yarn", ["build"], { stdio: "inherit", cwd: packagePath });
+  await installPackages({ stdio: "inherit", cwd: getPaths().base });
+  await runScript("build", [], { stdio: "inherit", cwd: packagePath });
 }
-const handler = async ({ name, force, ...rest }) => {
+const handler = async ({
+  name,
+  force,
+  ...rest
+}) => {
   recordTelemetryAttributes({
     command: "generate package",
     force,
-    rollback: rest.rollback
+    rollback: typeof rest.rollback === "boolean" ? rest.rollback : void 0
   });
   if (name.replaceAll("/", "").length < name.length - 1) {
     throw new Error(
@@ -272,7 +277,6 @@ const handler = async ({ name, force, ...rest }) => {
   }
   let packageFiles = {};
   const tasks = new Listr(
-    /** @type {import('listr2').ListrTask<ListrContext>[]} */
     [
       {
         title: "Parsing package name...",
@@ -282,34 +286,12 @@ const handler = async ({ name, force, ...rest }) => {
       },
       {
         title: "Updating workspace config...",
-        task: async (ctx, task) => {
-          const rootPackageJsonPath = path.join(getPaths().base, "package.json");
-          const packageJson = JSON.parse(
-            await fs.promises.readFile(rootPackageJsonPath, "utf8")
-          );
-          if (!Array.isArray(packageJson.workspaces)) {
-            throw new Error(
-              "Invalid workspace config in " + rootPackageJsonPath
-            );
-          }
+        task: (ctx, task) => {
+          const pm = getPackageManager();
           const packagePath = `packages/${ctx.nameVariants.folderName}`;
-          const hasWildcardPackagesWorkspace = packageJson.workspaces.includes("packages/*");
-          const hasNamedPackagesWorkspace = packageJson.workspaces.includes(packagePath);
-          const hasOtherNamedPackages = packageJson.workspaces.some(
-            (workspace) => workspace.startsWith("packages/") && workspace !== packagePath
-          );
-          if (hasWildcardPackagesWorkspace || hasNamedPackagesWorkspace) {
+          const result = addWorkspaceDir(getPaths().base, packagePath, pm);
+          if (result === "exists") {
             task.skip("Workspaces already configured");
-          } else {
-            if (hasOtherNamedPackages) {
-              packageJson.workspaces.push(packagePath);
-            } else {
-              packageJson.workspaces.push("packages/*");
-            }
-            await fs.promises.writeFile(
-              rootPackageJsonPath,
-              JSON.stringify(packageJson, null, 2)
-            );
           }
         }
       },
@@ -326,7 +308,7 @@ const handler = async ({ name, force, ...rest }) => {
               return;
             }
           } catch (e) {
-            throw new Error(e.message);
+            throw new Error(e instanceof Error ? e.message : String(e));
           }
           const prompt = task.prompt(ListrEnquirerPromptAdapter);
           const response = await prompt.run({
@@ -425,8 +407,7 @@ const handler = async ({ name, force, ...rest }) => {
       {
         title: "Cleaning up...",
         task: () => {
-          execa.sync("yarn", [
-            "eslint",
+          runBinSync("eslint", [
             "--fix",
             "--config",
             `${getPaths().base}/node_modules/@cedarjs/eslint-config/index.js`,
@@ -443,9 +424,11 @@ const handler = async ({ name, force, ...rest }) => {
     }
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const msg = e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, msg);
+    console.error(c.error(msg));
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/generate/page/pageHandler.js

@@ -8,7 +8,7 @@ import { getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import {
   addRoutesToRouterTask,
-  transformTSToJS,
+  transformTSToJSMap,
   writeFilesTask
 } from "../../../lib/index.js";
 import {
@@ -23,8 +23,8 @@ import {
 } from "../helpers.js";
 import { templateForComponentFile } from "../yargsHandlerHelpers.js";
 const COMPONENT_SUFFIX = "Page";
-const REDWOOD_WEB_PATH_NAME = "pages";
-const mapRouteParamTypeToDefaultValue = (paramType) => {
+const CEDAR_WEB_PATH_NAME = "pages";
+function mapRouteParamTypeToDefaultValue(paramType) {
   switch (paramType) {
     case "Int":
       return 42;
@@ -35,7 +35,7 @@ const mapRouteParamTypeToDefaultValue = (paramType) => {
     default:
       return "42";
   }
-};
+}
 const paramVariants = (path) => {
   const param = path?.match(/(\{[\w:]+\})/)?.[1];
   const paramName = param?.replace(/:[^}]+/, "").slice(1, -1);
@@ -62,13 +62,19 @@ const paramVariants = (path) => {
     paramType: mapRouteParamTypeToTsType(routeParamType)
   };
 };
-const files = async ({ name, tests, stories, typescript, ...rest }) => {
+const files = async ({
+  name,
+  tests,
+  stories,
+  typescript = false,
+  ...rest
+}) => {
   const extension = typescript ? ".tsx" : ".jsx";
   const pageFile = await templateForComponentFile({
     name,
     suffix: COMPONENT_SUFFIX,
     extension,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "page",
     templatePath: "page.tsx.template",
     templateVars: {
@@ -80,7 +86,7 @@ const files = async ({ name, tests, stories, typescript, ...rest }) => {
     name,
     suffix: COMPONENT_SUFFIX,
     extension: `.test${extension}`,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "page",
     templatePath: "test.tsx.template",
     templateVars: rest
@@ -89,7 +95,7 @@ const files = async ({ name, tests, stories, typescript, ...rest }) => {
     name,
     suffix: COMPONENT_SUFFIX,
     extension: `.stories${extension}`,
-    webPathSection: REDWOOD_WEB_PATH_NAME,
+    webPathSection: CEDAR_WEB_PATH_NAME,
     generator: "page",
     templatePath: rest.paramName !== "" ? "stories.tsx.parameters.template" : "stories.tsx.template",
     templateVars: rest
@@ -101,16 +107,12 @@ const files = async ({ name, tests, stories, typescript, ...rest }) => {
   if (stories) {
     files2.push(storiesFile);
   }
-  return files2.reduce(async (accP, [outputPath, content]) => {
-    const acc = await accP;
-    const template = typescript ? content : await transformTSToJS(outputPath, content);
-    return {
-      [outputPath]: template,
-      ...acc
-    };
-  }, Promise.resolve({}));
+  return transformTSToJSMap(files2, typescript);
 };
-const routes = ({ name, path }) => {
+const routes = ({
+  name,
+  path
+}) => {
   return [
     `<Route path="${path}" page={${pascalcase(name)}Page} name="${camelcase(
       name
@@ -159,7 +161,6 @@ const handler = async ({
           path = pathName(path, pageName);
           const f = await files({
             name: pageName,
-            path,
             tests,
             stories,
             typescript,
@@ -191,7 +192,7 @@ const handler = async ({
       },
       {
         title: "One more thing...",
-        task: (ctx, task) => {
+        task: (_ctx, task) => {
           task.title = `One more thing...
 
    ${c.warning("Page created! A note about <Metadata>:")}
@@ -213,9 +214,11 @@ const handler = async ({
     }
     await tasks.run();
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(exitCode);
   }
 };
 export {

package/dist/commands/generate/realtime/realtime.js

@@ -2,7 +2,7 @@ import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "realtime <name>";
 const description = "Generate a subscription or live query used with RedwoodJS Realtime";
 function builder(yargs) {
-  yargs.positional("name", {
+  return yargs.positional("name", {
     type: "string",
     description: "Name of the realtime event to setup. This should be a type or model name like: Widget, Sprocket, etc.",
     demandOption: true

package/dist/commands/generate/realtime/realtimeHandler.js

@@ -35,8 +35,14 @@ const templateVariables = (name) => {
     subscriptionServiceResolver: `publishTo${pascalcase(name)}Channel`
   };
 };
-async function handler({ name, type, force, verbose, silent }) {
-  const redwoodPaths = getPaths();
+async function handler({
+  name,
+  type,
+  force,
+  verbose,
+  silent
+}) {
+  const cedarPaths = getPaths();
   const ts = isTypeScriptProject();
   name = pluralize.singular(name.toLowerCase());
   let functionType = type;
@@ -60,12 +66,13 @@ async function handler({ name, type, force, verbose, silent }) {
     });
     functionType = response.functionType;
   }
-  const tasks = new Listr(
-    [
+  function buildTaskData() {
+    return [
       {
         title: "Checking for realtime environment prerequisites ...",
         task: () => {
-          isServerFileSetup() && isRealtimeSetup();
+          isServerFileSetup();
+          isRealtimeSetup();
         }
       },
       {
@@ -80,7 +87,7 @@ async function handler({ name, type, force, verbose, silent }) {
             `blank.sdl.ts.template`
           );
           const sdlFile = path.join(
-            redwoodPaths.api.graphql,
+            cedarPaths.api.graphql,
             `${name}.sdl.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const sdlContent = ts ? exampleSdlTemplateContent : await transformTSToJS(sdlFile, exampleSdlTemplateContent);
@@ -92,7 +99,7 @@ async function handler({ name, type, force, verbose, silent }) {
             `blank.service.ts.template`
           );
           const serviceFile = path.join(
-            redwoodPaths.api.services,
+            cedarPaths.api.services,
             `${name}`,
             `${name}.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -105,7 +112,7 @@ async function handler({ name, type, force, verbose, silent }) {
             `blank.ts.template`
           );
           const exampleFile = path.join(
-            redwoodPaths.api.subscriptions,
+            cedarPaths.api.subscriptions,
             `${name}`,
             `${name}.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -156,7 +163,7 @@ async function handler({ name, type, force, verbose, silent }) {
             `blank.sdl.ts.template`
           );
           const sdlFile = path.join(
-            redwoodPaths.api.graphql,
+            cedarPaths.api.graphql,
             `${name}.sdl.${isTypeScriptProject() ? "ts" : "js"}`
           );
           const sdlContent = ts ? exampleSdlTemplateContent : await transformTSToJS(sdlFile, exampleSdlTemplateContent);
@@ -168,7 +175,7 @@ async function handler({ name, type, force, verbose, silent }) {
             "blank.service.ts.template"
           );
           const serviceFile = path.join(
-            redwoodPaths.api.services,
+            cedarPaths.api.services,
             `${name}`,
             `${name}.${isTypeScriptProject() ? "ts" : "js"}`
           );
@@ -200,18 +207,37 @@ async function handler({ name, type, force, verbose, silent }) {
           );
         }
       }
-    ],
-    {
-      rendererOptions: { collapseSubtasks: false, persistentOutput: true },
-      renderer: silent ? "silent" : verbose ? "verbose" : "default"
-    }
-  );
+    ];
+  }
   try {
-    await tasks.run();
+    if (silent) {
+      await new Listr(buildTaskData(), {
+        exitOnError: true,
+        renderer: "silent"
+      }).run();
+    } else if (verbose) {
+      await new Listr(buildTaskData(), {
+        exitOnError: true,
+        renderer: "verbose"
+      }).run();
+    } else {
+      await new Listr(
+        buildTaskData().map((t) => ({
+          ...t,
+          rendererOptions: { persistentOutput: true }
+        })),
+        {
+          exitOnError: true,
+          rendererOptions: { collapseSubtasks: false }
+        }
+      ).run();
+    }
   } catch (e) {
-    errorTelemetry(process.argv, e.message);
-    console.error(c.error(e.message));
-    process.exit(e?.exitCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
+    errorTelemetry(process.argv, message);
+    console.error(c.error(message));
+    process.exit(exitCode);
   }
 }
 export {

package/dist/commands/generate/scaffold/scaffold.js

@@ -28,6 +28,7 @@ const builder = (yargs) => {
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("scaffold");
 export {

package/dist/commands/generate/scaffold/scaffoldHandler.js

@@ -2,11 +2,14 @@ import fs from "node:fs";
 import path from "path";
 import camelcase from "camelcase";
 import { paramCase } from "change-case";
-import execa from "execa";
 import humanize from "humanize-string";
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
+import {
+  addWorkspacePackages,
+  removeWorkspacePackages
+} from "@cedarjs/cli-helpers/packageManager/packages";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { getConfig } from "@cedarjs/project-config";
 import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
@@ -47,7 +50,7 @@ const getIdName = (model) => {
 };
 const isAutoGeneratedColumnForScaffold = (column) => {
   const autoGeneratedFunctions = ["now", "autoincrement"];
-  const columnDefaultFunction = typeof column.default === "object" && "name" in column.default ? column.default?.name : "";
+  const columnDefaultFunction = typeof column.default === "object" && column.default !== null && "name" in column.default ? column.default.name : "";
   return column.isId || column.isUpdatedAt || column.name === "createdAt" || autoGeneratedFunctions.includes(columnDefaultFunction);
 };
 const getImportComponentNames = (name, scaffoldPath, nestScaffoldByModel = true) => {
@@ -146,7 +149,7 @@ const files = async ({
   };
 };
 const assetFiles = async (name, tailwind) => {
-  let fileList = {};
+  const fileList = {};
   const assets = fs.readdirSync(
     customOrDefaultTemplatePath({
       side: "web",
@@ -268,17 +271,19 @@ const modelRelatedVariables = (model) => {
       listDisplayFunction: "truncate"
     }
   };
-  const relations = relationsForModel(model).map((relation) => relation);
+  const relations = relationsForModel(model)?.map((relation) => relation);
   const columns = model.fields.filter((field) => field.kind !== "object").map((column) => {
     let validation;
-    if (componentMetadata[column.type]?.validation) {
-      validation = componentMetadata[column.type]?.validation(
-        column?.isRequired
-      );
+    const meta = componentMetadata[column.type];
+    const validationDef = meta?.validation;
+    if (typeof validationDef === "function") {
+      validation = validationDef(column.isRequired);
+    } else if (validationDef !== void 0) {
+      validation = column.isRequired ? validationDef : null;
     } else {
-      validation = column?.isRequired ? componentMetadata.default.validation : null;
+      validation = column.isRequired ? componentMetadata.default.validation : null;
     }
-    const isRelationalField = column.name.endsWith("Id") && relations.some((relation) => column.name.includes(relation));
+    const isRelationalField = column.name.endsWith("Id") && relations?.some((relation) => column.name.includes(relation));
     const isRequired = column.isRequired;
     const isEnum = column.kind === "enum";
     const isList = column.isList;
@@ -305,7 +310,9 @@ const modelRelatedVariables = (model) => {
   );
   const fieldsToImport = Object.keys(
     editableColumns.reduce((accumulator, column) => {
-      accumulator[column.component] = true;
+      if (column.component) {
+        accumulator[column.component] = true;
+      }
       return accumulator;
     }, {})
   );
@@ -323,7 +330,7 @@ const modelRelatedVariables = (model) => {
   };
 };
 const layoutFiles = async (name, force, generateTypescript, templateStrings) => {
-  let fileList = {};
+  const fileList = {};
   const layouts = fs.readdirSync(
     customOrDefaultTemplatePath({
       side: "web",
@@ -366,7 +373,7 @@ const pageFiles = async (name, pascalScaffoldPath = "", generateTypescript, nest
   const idType = getIdType(model);
   const idTsType = mapPrismaScalarToPagePropTsType(idType);
   const idName = getIdName(model);
-  let fileList = {};
+  const fileList = {};
   const pages = fs.readdirSync(
     customOrDefaultTemplatePath({
       side: "web",
@@ -408,9 +415,9 @@ const componentFiles = async (name, pascalScaffoldPath = "", generateTypescript,
   const model = await getSchema(singularName);
   const idType = getIdType(model);
   const idName = getIdName(model);
-  const pascalIdName = pascalcase(idName);
+  const pascalIdName = pascalcase(idName ?? "");
   const intForeignKeys = intForeignKeysForModel(model);
-  let fileList = {};
+  const fileList = {};
   const components = fs.readdirSync(
     customOrDefaultTemplatePath({
       side: "web",
@@ -500,18 +507,18 @@ const addHelperPackages = async (task) => {
   if (packageJson.default.dependencies["humanize-string"]) {
     return task.skip("Skipping. Already installed");
   }
-  await execa("yarn", ["workspace", "web", "add", "humanize-string@2.1.0"]);
+  await addWorkspacePackages("web", ["humanize-string@2.1.0"]);
   addFunctionToRollback(async () => {
-    await execa("yarn", ["workspace", "web", "remove", "humanize-string"]);
+    await removeWorkspacePackages("web", ["humanize-string"]);
   });
 };
 const addSetImport = (task) => {
   const routesPath = getPaths().web.routes;
   const routesContent = readFile(routesPath).toString();
-  const [redwoodRouterImport, importStart, spacing, importContent, importEnd] = routesContent.match(
+  const [cedarRouterImport, importStart, spacing, importContent, importEnd] = routesContent.match(
     /(import {)(\s*)([^]*)(} from ['"]@cedarjs\/router['"])/
   ) || [];
-  if (!redwoodRouterImport) {
+  if (!cedarRouterImport) {
     task.skip(
       "Couldn't add Set import from @cedarjs/router to Routes.{jsx,tsx}"
     );
@@ -522,21 +529,21 @@ const addSetImport = (task) => {
     return "Skipping Set import";
   }
   const newRoutesContent = routesContent.replace(
-    redwoodRouterImport,
+    cedarRouterImport,
     importStart + spacing + PACKAGE_SET + `,` + spacing + importContent + importEnd
   );
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });
   return "Added Set import to Routes.{jsx,tsx}";
 };
-const addScaffoldSetToRouter = async (model, path2) => {
-  const templateNames = getTemplateStrings(model, path2);
+const addScaffoldSetToRouter = async (model, scaffoldPath) => {
+  const templateNames = getTemplateStrings(model, scaffoldPath);
   const nameVars = nameVariants(model);
   const title = nameVars.pluralPascalName;
   const titleTo = templateNames.pluralRouteName;
   const buttonLabel = `New ${nameVars.singularPascalName}`;
   const buttonTo = templateNames.newRouteName;
   return addRoutesToRouterTask(
-    await routes({ model, path: path2 }),
+    await routes({ model, path: scaffoldPath }),
     "ScaffoldLayout",
     { title, titleTo, buttonLabel, buttonTo }
   );
@@ -548,7 +555,7 @@ const tasks = ({
   force,
   tests,
   typescript,
-  javascript,
+  javascript: _javascript,
   tailwind
 }) => {
   return new Listr(
@@ -562,7 +569,6 @@ const tasks = ({
             path: path2,
             tests,
             typescript,
-            javascript,
             tailwind,
             force
           });
@@ -645,8 +651,10 @@ const handler = async ({
     }
     await t.run();
   } catch (e) {
-    console.log(c.error(e.message));
-    process.exit(e?.existCode || 1);
+    const message = e instanceof Error ? e.message : String(e);
+    const exitCode = e instanceof Error && "exitCode" in e ? e.exitCode ?? 1 : 1;
+    console.log(c.error(message));
+    process.exit(exitCode);
   }
 };
 const splitPathAndModel = (pathSlashModel) => {

package/dist/commands/generate/script/script.js

@@ -19,6 +19,7 @@ const builder = (yargs) => {
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {
     yargs.option(option, config);
   });
+  return yargs;
 };
 const handler = createHandler("script");
 export {

package/dist/commands/generate/script/templates/tsconfig.json.template

@@ -4,6 +4,12 @@
     "allowJs": true,
     "esModuleInterop": true,
     "baseUrl": "./",
+    "rootDirs": [
+      "../api/src",
+      "../.cedar/types/mirror/api/src",
+      "../web/src",
+      "../.cedar/types/mirror/web/src"
+    ],
     "paths": {
       "$api/*": [
         "../api/*",
@@ -11,6 +17,14 @@
       "api/*": [
         "../api/*",
       ],
+      "$api/src/*": [
+        "../api/src/*",
+        "../.cedar/types/mirror/api/src/*"
+      ],
+      "api/src/*": [
+        "../api/src/*",
+        "../.cedar/types/mirror/api/src/*"
+      ],
       "$web/*": [
         "../web/*",
       ],