@cedarjs/cli 1.0.0-canary.13052 → 1.0.0-canary.13053

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

@@ -1,5 +1,5 @@
-import path from "path";
-import fs from "fs-extra";
+import fs from "node:fs";
+import path from "node:path";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
@@ -11,26 +11,27 @@ import {
 } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
 import { validateName } from "../helpers.js";
-const TEMPLATE_PATH = path.resolve(
-  import.meta.dirname,
-  "templates",
-  "script.ts.template"
-);
-const TSCONFIG_TEMPLATE = path.resolve(
-  import.meta.dirname,
-  "templates",
-  "tsconfig.json.template"
-);
+import { customOrDefaultTemplatePath } from "../yargsHandlerHelpers.js";
 const files = async ({ name, typescript = false }) => {
   const outputFilename = `${name}.${typescript ? "ts" : "js"}`;
   const outputPath = path.join(getPaths().scripts, outputFilename);
   const scriptTsConfigPath = path.join(getPaths().scripts, "tsconfig.json");
-  const template = fs.readFileSync(TEMPLATE_PATH, "utf-8");
+  const templatePath = customOrDefaultTemplatePath({
+    side: "scripts",
+    generator: "script",
+    templatePath: "script.ts.template"
+  });
+  const template = fs.readFileSync(templatePath, "utf-8");
+  const tsconfigTemplatePath = customOrDefaultTemplatePath({
+    side: "scripts",
+    generator: "script",
+    templatePath: "tsconfig.json.template"
+  });
   return {
     [outputPath]: typescript ? template : await transformTSToJS(outputPath, template),
     // Add tsconfig for type and cmd+click support if project is TS
     ...typescript && !fs.existsSync(scriptTsConfigPath) && {
-      [scriptTsConfigPath]: fs.readFileSync(TSCONFIG_TEMPLATE, "utf-8")
+      [scriptTsConfigPath]: fs.readFileSync(tsconfigTemplatePath, "utf-8")
     }
   };
 };

package/dist/commands/generate/yargsHandlerHelpers.js

@@ -26,7 +26,8 @@ const customOrDefaultTemplatePath = ({
     templatePath
   );
   const customPath = path.join(
-    getPaths()[side].generators,
+    getPaths().generatorTemplates,
+    side,
     generator,
     templatePath
   );

package/dist/commands/setup/generator/generator.js

@@ -4,13 +4,7 @@ import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 const command = "generator <name>";
 const description = "Copies generator templates locally for customization";
-const EXCLUDE_GENERATORS = [
-  "dataMigration",
-  "dbAuth",
-  "generator",
-  "script",
-  "secret"
-];
+const EXCLUDE_GENERATORS = ["dataMigration", "dbAuth", "generator", "secret"];
 const builder = (yargs) => {
   const availableGenerators = fs.readdirSync(path.join(import.meta.dirname, "../../generate"), {
     withFileTypes: true

package/dist/commands/setup/generator/generatorHandler.js

@@ -5,17 +5,21 @@ import c from "../../../lib/colors.js";
 import { getPaths } from "../../../lib/index.js";
 const SIDE_MAP = {
   web: ["cell", "component", "layout", "page", "scaffold"],
-  api: ["function", "sdl", "service"]
+  api: ["function", "sdl", "service"],
+  scripts: ["script"]
 };
 const copyGenerator = (name, { force }) => {
-  const side = SIDE_MAP["web"].includes(name) ? "web" : "api";
+  const side = Object.keys(SIDE_MAP).find((key) => SIDE_MAP[key].includes(name));
+  if (!side) {
+    throw new Error(`Invalid generator name: ${name}`);
+  }
   const from = path.join(
     import.meta.dirname,
     "../../generate",
     name,
     "templates"
   );
-  const to = path.join(getPaths()[side].generators, name);
+  const to = path.join(getPaths().generatorTemplates, side, name);
   fse.copySync(from, to, { overwrite: force, errorOnExist: true });
   return to;
 };

package/dist/lib/test.js

@@ -25,7 +25,6 @@ vi.mock("@cedarjs/project-config", async (importOriginal) => {
             "prisma.config.cjs"
           ),
           dataMigrations: path.join(BASE_PATH, "./api/dataMigrations"),
-          generators: path.join(BASE_PATH, "./api/generators"),
           src: path.join(BASE_PATH, "./api/src"),
           jobs: path.join(BASE_PATH, "./api/src/jobs"),
           services: path.join(BASE_PATH, "./api/src/services"),
@@ -37,7 +36,6 @@ vi.mock("@cedarjs/project-config", async (importOriginal) => {
           base: path.join(BASE_PATH, "./web"),
           config: path.join(BASE_PATH, "./web/config"),
           src: path.join(BASE_PATH, "./web/src"),
-          generators: path.join(BASE_PATH, "./web/generators"),
           routes: path.join(BASE_PATH, "web/src/Routes.js"),
           components: path.join(BASE_PATH, "/web/src/components"),
           layouts: path.join(BASE_PATH, "/web/src/layouts"),
@@ -45,6 +43,7 @@ vi.mock("@cedarjs/project-config", async (importOriginal) => {
           app: path.join(BASE_PATH, "/web/src/App.js")
         },
         scripts: path.join(BASE_PATH, "scripts"),
+        generatorTemplates: path.join(BASE_PATH, "generatorTemplates"),
         generated: {
           base: path.join(BASE_PATH, ".redwood"),
           schema: path.join(BASE_PATH, ".redwood/schema.graphql"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.13052+3928e8a04",
+  "version": "1.0.0-canary.13053+a2d2ae402",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -31,15 +31,15 @@
   "dependencies": {
     "@babel/preset-typescript": "7.28.5",
     "@babel/runtime-corejs3": "7.28.4",
-    "@cedarjs/api-server": "1.0.0-canary.13052",
-    "@cedarjs/cli-helpers": "1.0.0-canary.13052",
-    "@cedarjs/fastify-web": "1.0.0-canary.13052",
-    "@cedarjs/internal": "1.0.0-canary.13052",
-    "@cedarjs/prerender": "1.0.0-canary.13052",
-    "@cedarjs/project-config": "1.0.0-canary.13052",
-    "@cedarjs/structure": "1.0.0-canary.13052",
-    "@cedarjs/telemetry": "1.0.0-canary.13052",
-    "@cedarjs/web-server": "1.0.0-canary.13052",
+    "@cedarjs/api-server": "1.0.0-canary.13053",
+    "@cedarjs/cli-helpers": "1.0.0-canary.13053",
+    "@cedarjs/fastify-web": "1.0.0-canary.13053",
+    "@cedarjs/internal": "1.0.0-canary.13053",
+    "@cedarjs/prerender": "1.0.0-canary.13053",
+    "@cedarjs/project-config": "1.0.0-canary.13053",
+    "@cedarjs/structure": "1.0.0-canary.13053",
+    "@cedarjs/telemetry": "1.0.0-canary.13053",
+    "@cedarjs/web-server": "1.0.0-canary.13053",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -102,5 +102,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3928e8a0411cedd6395520af3c2a5e17fbcb9de8"
+  "gitHead": "a2d2ae402ab934d33b5824a5444d0c865a9e3624"
 }