@cedarjs/cli 2.1.2-next.0 → 2.2.0-rc.101

package/dist/commands/generate/service/serviceHandler.js

@@ -1,12 +1,10 @@
+import path from "node:path";
 import camelcase from "camelcase";
+import { pluralize, singularize } from "../../../lib/cedarPluralize.js";
 import { transformTSToJS } from "../../../lib/index.js";
-import { pluralize, singularize } from "../../../lib/rwPluralize.js";
 import { getSchema, verifyModelName } from "../../../lib/schemaHelpers.js";
 import { relationsForModel } from "../helpers.js";
-import {
-  createHandler,
-  templateForComponentFile
-} from "../yargsHandlerHelpers.js";
+import { createHandler, templateForFile } from "../yargsHandlerHelpers.js";
 const DEFAULT_SCENARIO_NAMES = ["one", "two"];
 const parseSchema = async (model) => {
   const schema = await getSchema(model);
@@ -221,24 +219,23 @@ const files = async ({
   const componentName = camelcase(pluralize(name));
   const model = name;
   const idName = await getIdName(model);
-  const extension = "ts";
   const modelRelations = relations || relationsForModel(await getSchema(model));
-  const serviceFile = await templateForComponentFile({
+  const serviceFile = await templateForFile({
     name,
-    componentName,
-    extension: `.${extension}`,
-    apiPathSection: "services",
+    side: "api",
+    sidePathSection: "services",
     generator: "service",
-    templatePath: `service.${extension}.template`,
+    outputPath: path.join(componentName, componentName + ".ts"),
+    templatePath: "service.ts.template",
     templateVars: { relations: modelRelations, idName, ...rest }
   });
-  const testFile = await templateForComponentFile({
+  const testFile = await templateForFile({
     name,
-    componentName,
-    extension: `.test.${extension}`,
-    apiPathSection: "services",
+    side: "api",
+    sidePathSection: "services",
     generator: "service",
-    templatePath: `test.${extension}.template`,
+    outputPath: path.join(componentName, componentName + ".test.ts"),
+    templatePath: "test.ts.template",
     templateVars: {
       relations: relations || [],
       create: await fieldsToInput(model),
@@ -252,13 +249,13 @@ const files = async ({
       ...rest
     }
   });
-  const scenariosFile = await templateForComponentFile({
+  const scenariosFile = await templateForFile({
     name,
-    componentName,
-    extension: `.scenarios.${extension}`,
-    apiPathSection: "services",
+    side: "api",
+    sidePathSection: "services",
     generator: "service",
-    templatePath: `scenarios.${extension}.template`,
+    outputPath: path.join(componentName, componentName + ".scenarios.ts"),
+    templatePath: "scenarios.ts.template",
     templateVars: {
       scenario: await buildScenario(model),
       stringifiedScenario: await buildStringifiedScenario(model),

package/dist/commands/generate/service/templates/test.ts.template

@@ -39,8 +39,8 @@ import type { StandardScenario } from './${pluralCamelName}.scenarios.js'
 // Generated boilerplate tests do not account for all circumstances
 // and can fail without adjustments, e.g. Float.
 //           Please refer to the RedwoodJS Testing Docs:
-//       https://redwoodjs.com/docs/testing#testing-services
-// https://redwoodjs.com/docs/testing#jest-expect-type-considerations
+//       https://cedarjs.com/docs/testing#testing-services
+// https://cedarjs.com/docs/testing#jest-expect-type-considerations
 
 describe('${pluralCamelName}', () => {
   scenario('returns all ${pluralCamelName}', async (scenario: StandardScenario) => {

package/dist/commands/generate/yargsCommandHelpers.js

@@ -28,7 +28,12 @@ function createCommand(componentName, positionalsObj = {}) {
 function createDescription(componentName) {
   return `Generate a ${componentName} component`;
 }
-function createBuilder({ componentName, optionsObj, positionalsObj }) {
+function createBuilder({
+  componentName,
+  optionsObj,
+  positionalsObj,
+  addStories
+}) {
   return (yargs) => {
     yargs.positional("name", {
       description: `Name of the ${componentName}`,
@@ -41,9 +46,6 @@ function createBuilder({ componentName, optionsObj, positionalsObj }) {
     ).option("tests", {
       description: "Generate test files",
       type: "boolean"
-    }).option("stories", {
-      description: "Generate storybook files",
-      type: "boolean"
     }).option("verbose", {
       description: "Print all logs",
       type: "boolean",
@@ -53,6 +55,12 @@ function createBuilder({ componentName, optionsObj, positionalsObj }) {
       type: "boolean",
       default: true
     });
+    if (addStories || typeof addStories === "undefined") {
+      yargs.option("stories", {
+        description: "Generate storybook files",
+        type: "boolean"
+      });
+    }
     Object.entries(positionalsObj || {}).forEach(([option, config]) => {
       yargs.positional(option, config);
     });

package/dist/commands/generate/yargsHandlerHelpers.js

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
+import { camelCase } from "change-case";
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
@@ -35,34 +36,56 @@ const customOrDefaultTemplatePath = ({
     return defaultPath;
   }
 };
-const templateForComponentFile = async ({
+const templateForFile = async ({
   name,
-  suffix = "",
-  extension = ".js",
-  webPathSection,
-  apiPathSection,
+  side,
+  sidePathSection,
   generator,
+  outputPath,
   templatePath,
-  templateVars,
-  componentName,
-  outputPath
+  templateVars
 }) => {
-  const basePath = webPathSection ? getPaths().web[webPathSection] : getPaths().api[apiPathSection];
-  const outputComponentName = componentName || pascalcase(name) + suffix;
-  const componentOutputPath = outputPath || path.join(basePath, outputComponentName, outputComponentName + extension);
+  const basePath = getPaths()[side][sidePathSection];
+  const fullOutputPath = path.join(basePath, outputPath);
   const fullTemplatePath = customOrDefaultTemplatePath({
     generator,
     templatePath,
-    side: webPathSection ? "web" : "api"
+    side
   });
   const content = await generateTemplate(fullTemplatePath, {
     name,
     outputPath: ensurePosixPath(
-      `./${path.relative(getPaths().base, componentOutputPath)}`
+      `./${path.relative(getPaths().base, fullOutputPath)}`
     ),
     ...templateVars
   });
-  return [componentOutputPath, content];
+  return [fullOutputPath, content];
+};
+const templateForComponentFile = async ({
+  name,
+  suffix = "",
+  extension = ".js",
+  webPathSection,
+  apiPathSection,
+  generator,
+  templatePath,
+  templateVars
+}) => {
+  const side = webPathSection ? "web" : "api";
+  const caseFn = side === "web" ? pascalcase : camelCase;
+  const componentName = caseFn(name) + suffix;
+  const outputPath = path.join(componentName, componentName + extension);
+  return templateForFile({
+    name,
+    suffix,
+    extension,
+    side,
+    sidePathSection: webPathSection || apiPathSection,
+    generator,
+    outputPath,
+    templatePath,
+    templateVars
+  });
 };
 const validateName = (name) => {
   if (name.match(/^\W/)) {
@@ -151,5 +174,6 @@ export {
   createYargsForComponentGeneration,
   customOrDefaultTemplatePath,
   templateForComponentFile,
+  templateForFile,
   validateName
 };

package/dist/commands/prerenderHandler.js

@@ -268,12 +268,12 @@ const handler = async ({ path: routerPath, dryRun, verbose }) => {
       );
       console.log(
         c.info(
-          "- Avoid using `window` in the initial render path through your React components without checks. \n  See https://redwoodjs.com/docs/prerender#prerender-utils"
+          "- Avoid using `window` in the initial render path through your React components without checks. \n  See https://cedarjs.com/docs/prerender#prerender-utils"
         )
       );
       console.log(
         c.info(
-          "- Avoid prerendering Cells with authenticated queries, by conditionally rendering them.\n  See https://redwoodjs.com/docs/prerender#common-warnings--errors"
+          "- Avoid prerendering Cells with authenticated queries, by conditionally rendering them.\n  See https://cedarjs.com/docs/prerender#common-warnings--errors"
         )
       );
     }

package/dist/commands/record.js

@@ -4,7 +4,7 @@ import { terminalLink } from "termi-link";
 const builder = (yargs) => yargs.command({ command, description, handler }).demandCommand().epilogue(
   `Also see the ${terminalLink(
     "RedwoodRecord Docs",
-    "https://redwoodjs.com/docs/redwoodrecord"
+    "https://cedarjs.com/docs/redwoodrecord"
   )}
 `
 );

package/dist/commands/setup/auth/auth.js

@@ -181,7 +181,7 @@ function directToCustomAuthCommand(provider) {
       });
       const customAuthLink = terminalLink(
         "Custom Auth",
-        "https://redwoodjs.com/docs/auth/custom"
+        "https://cedarjs.com/docs/auth/custom"
       );
       console.log(
         `${provider} is no longer supported out of the box. But you can still integrate it yourself with ${customAuthLink}`

package/dist/commands/setup/cache/cacheHandler.js

@@ -51,7 +51,7 @@ const handler = async ({ client, force }) => {
         task.title = `One more thing...
 
           ${c.tip("Check out the Service Cache docs for config and usage:")}
-          ${c.link("https://redwoodjs.com/docs/services#caching")}
+          ${c.link("https://cedarjs.com/docs/services#caching")}
         `;
       }
     }

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

@@ -28,7 +28,7 @@ const files = [
 const notes = [
   "You are almost ready to go BAREMETAL!",
   "",
-  "See https://redwoodjs.com/docs/deploy/baremetal for the remaining",
+  "See https://cedarjs.com/docs/deploy/baremetal for the remaining",
   "config and setup required before you can perform your first deploy."
 ];
 const handler = async ({ force }) => {

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

@@ -14,7 +14,7 @@ const files = [
 ];
 const notes = [
   "You are ready to deploy to Netlify!",
-  "See: https://redwoodjs.com/docs/deploy/netlify"
+  "See: https://cedarjs.com/docs/deploy/netlify"
 ];
 const handler = async ({ force }) => {
   recordTelemetryAttributes({

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

@@ -1,6 +1,6 @@
 import { createHandler } from "../helpers/helpers.js";
 const command = "serverless";
-const description = "[DEPRECATED]\nSetup Serverless Framework AWS deploy\nFor more information:\nhttps://redwoodjs.com/docs/deploy/serverless";
+const description = "[DEPRECATED]\nSetup Serverless Framework AWS deploy\nFor more information:\nhttps://cedarjs.com/docs/deploy/serverless";
 const aliases = ["aws-serverless"];
 const handler = createHandler("serverless");
 export {

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

@@ -21,12 +21,12 @@ const notes = [
   c.error("DEPRECATED option not officially supported"),
   "",
   "For more information:",
-  "https://redwoodjs.com/docs/deploy/serverless",
+  "https://cedarjs.com/docs/deploy/serverless",
   "",
   "",
   c.success("You're almost ready to deploy using the Serverless framework!"),
   "",
-  "\u2022 See https://redwoodjs.com/docs/deploy#serverless-deploy for more info. If you ",
+  "\u2022 See https://cedarjs.com/docs/deploy#serverless-deploy for more info. If you ",
   "  want to give it a shot, open your `.env` file and add your AWS credentials,",
   "  then run: ",
   "",
@@ -77,7 +77,7 @@ const updateRedwoodTomlTask = () => {
       const content = fs.readFileSync(configPath).toString();
       const newContent = content.replace(
         /apiUrl.*?\n/m,
-        'apiUrl = "${API_URL:/api}"       # Set API_URL in production to the Serverless deploy endpoint of your api service, see https://redwoodjs.com/docs/deploy/serverless-deploy\n'
+        'apiUrl = "${API_URL:/api}"       # Set API_URL in production to the Serverless deploy endpoint of your api service, see https://cedarjs.com/docs/deploy/serverless-deploy\n'
       );
       fs.writeFileSync(configPath, newContent);
     }

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

@@ -49,7 +49,7 @@ const vercelConfig = {
 };
 const notes = [
   "You are ready to deploy to Vercel!",
-  "See: https://redwoodjs.com/docs/deploy#vercel-deploy"
+  "See: https://cedarjs.com/docs/deploy#vercel-deploy"
 ];
 export {
   handler

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

@@ -25,7 +25,7 @@ const DEPLOY = `# This file contains config for a baremetal deployment
 # * passphrase - used if your private key has a passphrase
 # * agentForward - set to \`true\` to forward the client machine's ssh credentials
 #
-# See https://redwoodjs.com/docs/deploy/baremetal for more info
+# See https://cedarjs.com/docs/deploy/baremetal for more info
 
 [[production.servers]]
 host = "server.com"

package/dist/commands/setup/docker/dockerHandler.js

@@ -233,7 +233,7 @@ async function handler({ force }) {
         "Lastly, ensure you have Docker. If you don't, see https://docs.docker.com/desktop/",
         "",
         "There's a lot in the Dockerfile and there's a reason for every line.",
-        "Be sure to check out the docs: https://redwoodjs.com/docs/docker"
+        "Be sure to check out the docs: https://cedarjs.com/docs/docker"
       ].join("\n")
     );
   } catch (e) {

package/dist/commands/setup/tsconfig/tsconfigHandler.js

@@ -39,7 +39,7 @@ const handler = async ({ force }) => {
           task.title = `One more thing...
 
           ${c.tip("Quick link to the docs on configuring TypeScript")}
-          ${c.link("https://redwoodjs.com/docs/typescript")}
+          ${c.link("https://cedarjs.com/docs/typescript")}
         `;
         }
       }

package/dist/commands/setup/uploads/uploadsHandler.js

@@ -77,11 +77,11 @@ const handler = async ({ force }) => {
           if (transformResult.error) {
             if (transformResult.error === "RW_CODEMOD_ERR_OLD_FORMAT") {
               throw new Error(
-                "It looks like your src/lib/db file is using the old format. Please update it as per the v8 upgrade guide: https://redwoodjs.com/upgrade/v8#database-file-structure-change. And run again. \n\nYou can also manually modify your api/src/lib/db to include the prisma extension: https://docs.redwoodjs.com/docs/uploads/#attaching-the-prisma-extension"
+                "It looks like your src/lib/db file is using the old format. Please update it as per the v8 upgrade guide: https://cedarjs.com/docs/upgrade-guides/v8#database-file-structure-change. And run again. \n\nYou can also manually modify your api/src/lib/db to include the prisma extension: https://cedarjs.com/docs/uploads/#attaching-the-prisma-extension"
               );
             }
             throw new Error(
-              "Could not add the prisma extension. \n Please modify your api/src/lib/db to include the prisma extension: https://docs.redwoodjs.com/docs/uploads/#attaching-the-prisma-extension"
+              "Could not add the prisma extension. \n Please modify your api/src/lib/db to include the prisma extension: https://cedarjs.com/docs/uploads/#attaching-the-prisma-extension"
             );
           }
         }
@@ -124,7 +124,7 @@ const handler = async ({ force }) => {
 
 
           Check out the docs for more info:
-          ${c.link("https://docs.redwoodjs.com/docs/uploads")}
+          ${c.link("https://cedarjs.com/docs/uploads")}
 
         `;
         }