@cedarjs/cli 1.0.0-canary.12969 → 1.0.0-canary.12971

package/dist/commands/generate/directive/directiveHandler.js

@@ -1,4 +1,3 @@
-import path from "path";
 import camelcase from "camelcase";
 import execa from "execa";
 import { Listr } from "listr2";
@@ -6,11 +5,7 @@ import prompts from "prompts";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { getConfig } from "@cedarjs/project-config";
 import c from "../../../lib/colors.js";
-import {
-  getPaths,
-  writeFilesTask,
-  transformTSToJS
-} from "../../../lib/index.js";
+import { writeFilesTask, transformTSToJS } from "../../../lib/index.js";
 import {
   prepareForRollback,
   addFunctionToRollback
@@ -25,28 +20,23 @@ const files = async ({ name, typescript = false, type, tests }) => {
     throw new Error("You must specify a directive type");
   }
   const camelName = camelcase(name);
-  const outputFilename = `${camelName}.${typescript ? "ts" : "js"}`;
+  const extension = typescript ? ".ts" : ".js";
   const directiveFile = await templateForComponentFile({
     name,
-    extension: typescript ? ".ts" : ".js",
+    extension,
     generator: "directive",
+    apiPathSection: "directives",
     templatePath: `${type}.directive.ts.template`,
-    outputPath: path.join(getPaths().api.directives, camelName, outputFilename),
     templateVars: { camelName }
   });
   const files2 = [directiveFile];
   if (tests) {
-    const testOutputFilename = `${camelcase(name)}.test.${typescript ? "ts" : "js"}`;
     const testFile = await templateForComponentFile({
       name,
-      extension: typescript ? ".test.ts" : ".test.js",
+      extension: `.test${extension}`,
       generator: "directive",
+      apiPathSection: "directives",
       templatePath: `${type}.directive.test.ts.template`,
-      outputPath: path.join(
-        getPaths().api.directives,
-        camelName,
-        testOutputFilename
-      ),
       templateVars: { camelName }
     });
     files2.push(testFile);

package/dist/commands/generate/function/functionHandler.js

@@ -1,15 +1,9 @@
-import path from "path";
-import camelcase from "camelcase";
 import { Listr } from "listr2";
 import { terminalLink } from "termi-link";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../../lib/colors.js";
-import {
-  getPaths,
-  transformTSToJS,
-  writeFilesTask
-} from "../../../lib/index.js";
+import { transformTSToJS, writeFilesTask } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
 import { validateName } from "../helpers.js";
 import { templateForComponentFile } from "../yargsHandlerHelpers.js";
@@ -20,51 +14,32 @@ const files = async ({
   ...rest
 }) => {
   const extension = generateTypescript ? ".ts" : ".js";
-  const functionName = camelcase(name);
   const outputFiles = [];
   const functionFiles = await templateForComponentFile({
-    name: functionName,
-    componentName: functionName,
+    name,
     extension,
     apiPathSection: "functions",
     generator: "function",
     templatePath: "function.ts.template",
-    templateVars: { ...rest, typescript: generateTypescript },
-    outputPath: path.join(
-      getPaths().api.functions,
-      functionName,
-      `${functionName}${extension}`
-    )
+    templateVars: { ...rest, typescript: generateTypescript }
   });
   outputFiles.push(functionFiles);
   if (generateTests) {
     const testFile = await templateForComponentFile({
-      name: functionName,
-      componentName: functionName,
-      extension,
+      name,
+      extension: `.test${extension}`,
       apiPathSection: "functions",
       generator: "function",
       templatePath: "test.ts.template",
-      templateVars: { ...rest },
-      outputPath: path.join(
-        getPaths().api.functions,
-        functionName,
-        `${functionName}.test${extension}`
-      )
+      templateVars: { ...rest }
     });
     const scenarioFile = await templateForComponentFile({
-      name: functionName,
-      componentName: functionName,
-      extension,
+      name,
+      extension: `.scenarios${extension}`,
       apiPathSection: "functions",
       generator: "function",
       templatePath: "scenarios.ts.template",
-      templateVars: { ...rest },
-      outputPath: path.join(
-        getPaths().api.functions,
-        functionName,
-        `${functionName}.scenarios${extension}`
-      )
+      templateVars: { ...rest }
     });
     outputFiles.push(testFile);
     outputFiles.push(scenarioFile);

package/dist/commands/generate/function/templates/function.ts.template

@@ -19,7 +19,7 @@ import { logger } from 'src/lib/logger'
  * function, and execution environment.
  */
 export const handler = async (event: APIGatewayEvent, _context: Context) => {
-  logger.info(`<%= '$' %>{event.httpMethod} <%= '$' %>{event.path}: <%= name %> function`)
+  logger.info(`<%= '$' %>{event.httpMethod} <%= '$' %>{event.path}: <%= camelName %> function`)
 
   return {
     statusCode: 200,
@@ -27,7 +27,7 @@ export const handler = async (event: APIGatewayEvent, _context: Context) => {
       'Content-Type': 'application/json',
     },
     body: JSON.stringify({
-      data: '${name} function',
+      data: '${camelName} function',
     }),
   }
 }

package/dist/commands/generate/job/jobHandler.js

@@ -13,70 +13,61 @@ import {
 } from "../../../lib/index.js";
 import { prepareForRollback } from "../../../lib/rollback.js";
 import { validateName } from "../helpers.js";
-import { templateForComponentFile } from "../yargsHandlerHelpers.js";
+import { templateForFile } from "../yargsHandlerHelpers.js";
 const normalizeName = (name) => {
   return changeCase.pascalCase(name).replace(/Job$/, "");
 };
 const files = async ({
   name,
   queueName,
-  typescript: generateTypescript,
+  typescript,
   tests: generateTests = true,
   ...rest
 }) => {
-  const extension = generateTypescript ? ".ts" : ".js";
-  const outputFiles = [];
   const jobName = normalizeName(name);
-  const jobFiles = await templateForComponentFile({
+  const componentName = `${jobName}Job`;
+  const extension = typescript ? ".ts" : ".js";
+  const jobFiles = await templateForFile({
     name: jobName,
-    componentName: jobName,
-    extension,
-    apiPathSection: "jobs",
+    side: "api",
+    sidePathSection: "jobs",
     generator: "job",
+    outputPath: path.join(componentName, componentName + extension),
     templatePath: "job.ts.template",
-    templateVars: { name: jobName, queueName, ...rest },
-    outputPath: path.join(
-      getPaths().api.jobs,
-      `${jobName}Job`,
-      `${jobName}Job${extension}`
-    )
+    // TODO: Remove `name` here. It's already passed to the template by the
+    // helper function we're using
+    templateVars: { name: jobName, queueName, ...rest }
   });
+  const outputFiles = [];
   outputFiles.push(jobFiles);
   if (generateTests) {
-    const testFile = await templateForComponentFile({
+    const testFile = await templateForFile({
       name: jobName,
-      componentName: jobName,
-      extension,
-      apiPathSection: "jobs",
+      side: "api",
+      sidePathSection: "jobs",
       generator: "job",
+      outputPath: path.join(componentName, componentName + `.test${extension}`),
       templatePath: "test.ts.template",
-      templateVars: { ...rest },
-      outputPath: path.join(
-        getPaths().api.jobs,
-        `${jobName}Job`,
-        `${jobName}Job.test${extension}`
-      )
+      templateVars: { ...rest }
     });
-    const scenarioFile = await templateForComponentFile({
+    const scenarioFile = await templateForFile({
       name: jobName,
-      componentName: jobName,
-      extension,
-      apiPathSection: "jobs",
+      side: "api",
+      sidePathSection: "jobs",
       generator: "job",
-      templatePath: "scenarios.ts.template",
-      templateVars: { ...rest },
       outputPath: path.join(
-        getPaths().api.jobs,
-        `${jobName}Job`,
-        `${jobName}Job.scenarios${extension}`
-      )
+        componentName,
+        componentName + `.scenarios${extension}`
+      ),
+      templatePath: "scenarios.ts.template",
+      templateVars: { ...rest }
     });
     outputFiles.push(testFile);
     outputFiles.push(scenarioFile);
   }
   return outputFiles.reduce(async (accP, [outputPath, content]) => {
     const acc = await accP;
-    const template = generateTypescript ? content : await transformTSToJS(outputPath, content);
+    const template = typescript ? content : await transformTSToJS(outputPath, content);
     return {
       [outputPath]: template,
       ...acc

package/dist/commands/generate/sdl/sdlHandler.js

@@ -1,4 +1,3 @@
-import path from "path";
 import ansis from "ansis";
 import boxen from "boxen";
 import camelcase from "camelcase";
@@ -8,12 +7,7 @@ import { generate as generateTypes } from "@cedarjs/internal/dist/generate/gener
 import { getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import c from "../../../lib/colors.js";
-import {
-  generateTemplate,
-  transformTSToJS,
-  getPaths,
-  writeFilesTask
-} from "../../../lib/index.js";
+import { transformTSToJS, writeFilesTask } from "../../../lib/index.js";
 import {
   prepareForRollback,
   addFunctionToRollback
@@ -26,7 +20,7 @@ import {
 } from "../../../lib/schemaHelpers.js";
 import { relationsForModel } from "../helpers.js";
 import { files as serviceFiles } from "../service/serviceHandler.js";
-import { customOrDefaultTemplatePath } from "../yargsHandlerHelpers.js";
+import { templateForFile } from "../yargsHandlerHelpers.js";
 const DEFAULT_IGNORE_FIELDS_FOR_INPUT = ["createdAt", "updatedAt"];
 const missingIdConsoleMessage = () => {
   const line1 = ansis.bold.yellow("WARNING") + ": Cannot generate CRUD SDL without an `@id` database column.";
@@ -164,52 +158,25 @@ const files = async ({
   tests,
   typescript
 }) => {
-  const {
-    modelName,
-    modelDescription,
-    query,
-    createInput,
-    updateInput,
-    idInput,
-    idType: idType2,
-    idName: idName2,
-    relations,
-    enums
-  } = await sdlFromSchemaModel(name, crud, docs);
-  const templatePath = customOrDefaultTemplatePath({
+  const extension = typescript ? "ts" : "js";
+  const sdlData = await sdlFromSchemaModel(name, crud, docs);
+  const [outputPath, content] = await templateForFile({
+    name,
     side: "api",
+    sidePathSection: "graphql",
     generator: "sdl",
-    templatePath: "sdl.ts.template"
-  });
-  let template = await generateTemplate(templatePath, {
-    docs,
-    modelName,
-    modelDescription,
-    name,
-    crud,
-    query,
-    createInput,
-    updateInput,
-    idInput,
-    idType: idType2,
-    idName: idName2,
-    enums
+    templatePath: "sdl.ts.template",
+    templateVars: { docs, name, crud, ...sdlData },
+    outputPath: `${camelcase(pluralize(name))}.sdl.${extension}`
   });
-  const extension = typescript ? "ts" : "js";
-  let outputPath = path.join(
-    getPaths().api.graphql,
-    `${camelcase(pluralize(name))}.sdl.${extension}`
-  );
-  if (typescript) {
-    template = await transformTSToJS(outputPath, template);
-  }
+  const template = typescript ? content : await transformTSToJS(outputPath, content);
   return {
     [outputPath]: template,
     ...await serviceFiles({
       name,
       crud,
       tests,
-      relations,
+      relations: sdlData.relations,
       typescript
     })
   };

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

@@ -1,12 +1,10 @@
+import path from "node:path";
 import camelcase from "camelcase";
 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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "1.0.0-canary.12969+fa4218aac",
+  "version": "1.0.0-canary.12971+eaa14e3a1",
   "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.12969",
-    "@cedarjs/cli-helpers": "1.0.0-canary.12969",
-    "@cedarjs/fastify-web": "1.0.0-canary.12969",
-    "@cedarjs/internal": "1.0.0-canary.12969",
-    "@cedarjs/prerender": "1.0.0-canary.12969",
-    "@cedarjs/project-config": "1.0.0-canary.12969",
-    "@cedarjs/structure": "1.0.0-canary.12969",
-    "@cedarjs/telemetry": "1.0.0-canary.12969",
-    "@cedarjs/web-server": "1.0.0-canary.12969",
+    "@cedarjs/api-server": "1.0.0-canary.12971",
+    "@cedarjs/cli-helpers": "1.0.0-canary.12971",
+    "@cedarjs/fastify-web": "1.0.0-canary.12971",
+    "@cedarjs/internal": "1.0.0-canary.12971",
+    "@cedarjs/prerender": "1.0.0-canary.12971",
+    "@cedarjs/project-config": "1.0.0-canary.12971",
+    "@cedarjs/structure": "1.0.0-canary.12971",
+    "@cedarjs/telemetry": "1.0.0-canary.12971",
+    "@cedarjs/web-server": "1.0.0-canary.12971",
     "@listr2/prompt-adapter-enquirer": "2.0.16",
     "@opentelemetry/api": "1.8.0",
     "@opentelemetry/core": "1.22.0",
@@ -101,5 +101,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fa4218aac5522b9d324ecb7c819876503d4f3ef5"
+  "gitHead": "eaa14e3a10eedb0d1d386d3fd0b44746a26407e6"
 }