@cedarjs/cli 2.2.0-rc.34 → 2.2.0

package/dist/{rwfw.js → cfw.js}

@@ -6,28 +6,25 @@ import fs from "fs-extra";
 import { terminalLink } from "termi-link";
 import { getConfigPath } from "@cedarjs/project-config";
 const config = new Configstore("@cedarjs/cli");
-const RWFW_PATH = process.env.RWFW_PATH || process.env.RW_PATH || config.get("RWFW_PATH");
-if (!RWFW_PATH) {
-  console.error("Error: You must specify the path to Redwood Framework");
-  console.error("Usage: `RWFW_PATH=~/gh/cedarjs/cedar yarn rwfw <command>");
+const CFW_PATH = process.env.CFW_PATH || process.env.RWFW_PATH || process.env.RW_PATH || config.get("CFW_PATH") || config.get("RWFW_PATH");
+if (!CFW_PATH) {
+  console.error("Error: You must specify the path to Cedar Framework");
+  console.error("Usage: `CFW_PATH=~/gh/cedarjs/cedar yarn cfw <command>");
   process.exit(1);
 }
-if (!fs.existsSync(RWFW_PATH)) {
+if (!fs.existsSync(CFW_PATH)) {
   console.error(
-    `Error: The specified path to Redwood Framework (${RWFW_PATH}) does not exist.`
+    `Error: The specified path to Cedar Framework (${CFW_PATH}) does not exist.`
   );
-  console.error("Usage: `RWFW_PATH=~/gh/cedarjs/cedar yarn rwfw <command>");
+  console.error("Usage: `CFW_PATH=~/gh/cedarjs/cedar yarn cfw <command>");
   process.exit(1);
 }
-const absRwFwPath = path.resolve(process.cwd(), RWFW_PATH);
-config.set("RWFW_PATH", absRwFwPath);
+const absCfwPath = path.resolve(process.cwd(), CFW_PATH);
+config.set("CFW_PATH", absCfwPath);
 const projectPath = path.dirname(
   getConfigPath(process.env.RWJS_CWD ?? process.cwd())
 );
-console.log(
-  "Redwood Framework Tools Path:",
-  terminalLink(absRwFwPath, absRwFwPath)
-);
+console.log("Cedar Framework Tools Path:", terminalLink(absCfwPath, absCfwPath));
 let command = process.argv.slice(2);
 const helpCommands = ["help", "--help"];
 if (!command.length || command.some((cmd) => helpCommands.includes(cmd))) {
@@ -36,7 +33,7 @@ if (!command.length || command.some((cmd) => helpCommands.includes(cmd))) {
 try {
   execa.sync("yarn", [...command], {
     stdio: "inherit",
-    cwd: absRwFwPath,
+    cwd: absCfwPath,
     env: {
       RWJS_CWD: projectPath
     }

package/dist/commands/consoleHandler.js

@@ -9,7 +9,7 @@ const paths = getPaths();
 const loadPrismaClient = (replContext) => {
   const createdRequire = createRequire(import.meta.url);
   const { db } = createdRequire(path.join(paths.api.lib, "db"));
-  db[Symbol.for("nodejs.util.inspect.custom")] = "PrismaClient";
+  db[/* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom")] = "PrismaClient";
   replContext.db = db;
 };
 const consoleHistoryFile = path.join(paths.generated.base, "console_history");

package/dist/commands/deploy/baremetal/baremetalHandler.js

@@ -25,7 +25,7 @@ const DEFAULT_SERVER_CONFIG = {
 const pathJoin = path.posix.join;
 const throwMissingConfig = (name) => {
   throw new Error(
-    `"${name}" config option not set. See https://redwoodjs.com/docs/deployment/baremetal#deploytoml`
+    `"${name}" config option not set. See https://cedarjs.com/docs/deployment/baremetal#deploytoml`
   );
 };
 const verifyConfig = (config, yargs) => {

package/dist/commands/deploy/serverlessHandler.js

@@ -157,7 +157,7 @@ const handler = async (yargs) => {
           "To do this run `yarn serverless` on each of the sides, and connect your account",
           "",
           "Find more information in our docs:",
-          c.underline("https://redwoodjs.com/docs/deploy#serverless")
+          c.underline("https://cedarjs.com/docs/deploy#serverless")
         ];
         console.log(
           boxen(message.join("\n"), {

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

@@ -1,6 +1,7 @@
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
+import { pluralize } from "../../../lib/cedarPluralize.js";
 import c from "../../../lib/colors.js";
 import {
   deleteFilesTask,
@@ -9,7 +10,6 @@ import {
   removeRoutesFromRouterTask,
   writeFile
 } from "../../../lib/index.js";
-import { pluralize } from "../../../lib/rwPluralize.js";
 import { verifyModelName } from "../../../lib/schemaHelpers.js";
 import {
   files,

package/dist/commands/generate/cell/cellHandler.js

@@ -1,9 +1,9 @@
 import pascalcase from "pascalcase";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
+import { isPlural, singularize } from "../../../lib/cedarPluralize.js";
 import { nameVariants, transformTSToJS } from "../../../lib/index.js";
 import { isWordPluralizable } from "../../../lib/pluralHelpers.js";
 import { addFunctionToRollback } from "../../../lib/rollback.js";
-import { isPlural, singularize } from "../../../lib/rwPluralize.js";
 import { getSchema } from "../../../lib/schemaHelpers.js";
 import { forcePluralizeWord, removeGeneratorName } from "../helpers.js";
 import {

package/dist/commands/generate/cell/templates/test.js.template

@@ -6,8 +6,8 @@ import { standard } from './${pascalName}Cell.mock'
 // Generated boilerplate tests do not account for all circumstances
 // and can fail without adjustments, e.g. Float and DateTime types.
 //           Please refer to the RedwoodJS Testing Docs:
-//        https://redwoodjs.com/docs/testing#testing-cells
-// https://redwoodjs.com/docs/testing#jest-expect-type-considerations
+//        https://cedarjs.com/docs/testing#testing-cells
+// https://cedarjs.com/docs/testing#jest-expect-type-considerations
 
 describe('${pascalName}Cell', () => {
   it('renders Loading successfully', () => {

package/dist/commands/generate/component/templates/test.tsx.template

@@ -3,7 +3,7 @@ import { render } from '@cedarjs/testing/web'
 import ${pascalName} from './${pascalName}'
 
 //   Improve this test with help from the Redwood Testing Doc:
-//    https://redwoodjs.com/docs/testing#testing-components
+//    https://cedarjs.com/docs/testing#testing-components
 
 describe('${pascalName}', () => {
   it('renders successfully', () => {

package/dist/commands/generate/dbAuth/dbAuth.js

@@ -39,7 +39,7 @@ const builder = (yargs) => {
   }).epilogue(
     `Also see the ${terminalLink(
       "CedarJS dbAuth Reference",
-      "https://redwoodjs.com/docs/auth/dbauth"
+      "https://cedarjs.com/docs/auth/dbauth"
     )}`
   );
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {

package/dist/commands/generate/dbAuth/dbAuthHandler.js

@@ -263,7 +263,7 @@ const tasks = ({
             {
               type: "confirm",
               name: "answer",
-              message: "Enable WebAuthn support (TouchID/FaceID) on LoginPage? See https://redwoodjs.com/docs/auth/dbAuth#webAuthn",
+              message: "Enable WebAuthn support (TouchID/FaceID) on LoginPage? See https://cedarjs.com/docs/auth/dbAuth#webAuthn",
               default: false
             },
             { enquirer: ctx.enquirer }

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/directive/templates/transformer.directive.ts.template

@@ -28,7 +28,7 @@ const transform: TransformerDirectiveFunc = ({ context, resolvedValue }) => {
 
   // You can also modify your directive to take arguments
   // and use the directiveArgs object provided to this function to get values
-  // See documentation here: https://redwoodjs.com/docs/directives
+  // See documentation here: https://cedarjs.com/docs/directives
 
   return resolvedValue.replace('foo', 'bar')
 }

package/dist/commands/generate/directive/templates/validator.directive.ts.template

@@ -27,7 +27,7 @@ const validate: ValidatorDirectiveFunc = ({ context, directiveArgs }) => {
 
   // You can also modify your directive to take arguments
   // and use the directiveArgs object provided to this function to get values
-  // See documentation here: https://redwoodjs.com/docs/directives
+  // See documentation here: https://cedarjs.com/docs/directives
   logger.debug(directiveArgs, 'directiveArgs in ${camelName} directive')
 
 

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);
@@ -115,7 +90,7 @@ const handler = async ({ name, force, ...rest }) => {
     console.info(
       `Please consult the ${terminalLink(
         "Serverless Function Considerations",
-        "https://redwoodjs.com/docs/serverless-functions#security-considerations"
+        "https://cedarjs.com/docs/serverless-functions#security-considerations"
       )} in the RedwoodJS documentation for more information.`
     );
     console.info("");

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

@@ -9,7 +9,7 @@ import { logger } from 'src/lib/logger'
  * Important: When deployed, a custom serverless function is an open API endpoint and
  * is your responsibility to secure appropriately.
  *
- * @see {@link https://redwoodjs.com/docs/serverless-functions#security-considerations|Serverless Function Considerations}
+ * @see {@link https://cedarjs.com/docs/serverless-functions#security-considerations|Serverless Function Considerations}
  * in the RedwoodJS documentation for more information.
  *<% if (!typescript) { %>
  * @typedef { import('aws-lambda').APIGatewayEvent } APIGatewayEvent
@@ -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/function/templates/scenarios.ts.template

@@ -2,7 +2,7 @@ import type { ScenarioData } from '@cedarjs/testing/api'
 
 export const standard = defineScenario({
   // Define the "fixture" to write into your test database here
-  // See guide: https://redwoodjs.com/docs/testing#scenarios
+  // See guide: https://cedarjs.com/docs/testing#scenarios
 })
 
 export type StandardScenario = ScenarioData<unknown>

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

@@ -3,7 +3,7 @@ import { mockHttpEvent, mockContext } from '@cedarjs/testing/api'
 import { handler } from './${name}'
 
 //   Improve this test with help from the Redwood Testing Doc:
-//    https://redwoodjs.com/docs/testing#testing-functions
+//    https://cedarjs.com/docs/testing#testing-functions
 
 describe('${name} function', () => {
 
@@ -22,7 +22,7 @@ describe('${name} function', () => {
   })
 
 // You can also use scenarios to test your api functions
-// See guide here: https://redwoodjs.com/docs/testing#scenarios
+// See guide here: https://cedarjs.com/docs/testing#scenarios
 //
 // scenario('Scenario test', async () => {
 //

package/dist/commands/generate/helpers.js

@@ -1,6 +1,6 @@
 import { paramCase } from "change-case";
 import pascalcase from "pascalcase";
-import { pluralize, isPlural, isSingular } from "../../lib/rwPluralize.js";
+import { pluralize, isPlural, isSingular } from "../../lib/cedarPluralize.js";
 const pathName = (path, name) => {
   let routePath = path;
   if (path && path.startsWith("{") && path.endsWith("}")) {

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/job/templates/scenarios.ts.template

@@ -2,7 +2,7 @@ import type { ScenarioData } from '@cedarjs/testing/api'
 
 export const standard = defineScenario({
   // Define the "fixture" to write into your test database here
-  // See guide: https://redwoodjs.com/docs/testing#scenarios
+  // See guide: https://cedarjs.com/docs/testing#scenarios
 })
 
 export type StandardScenario = ScenarioData<unknown>

package/dist/commands/generate/layout/templates/test.tsx.template

@@ -3,7 +3,7 @@ import { render } from '@cedarjs/testing/web'
 import ${pascalName}Layout from './${pascalName}Layout'
 
 //   Improve this test with help from the Redwood Testing Doc:
-//   https://redwoodjs.com/docs/testing#testing-pages-layouts
+//   https://cedarjs.com/docs/testing#testing-pages-layouts
 
 describe('${pascalName}Layout', () => {
   it('renders successfully', () => {

package/dist/commands/generate/model/model.js

@@ -13,7 +13,7 @@ const builder = (yargs) => {
   }).epilogue(
     `Also see the ${terminalLink(
       "RedwoodRecord Reference",
-      "https://redwoodjs.com/docs/redwoodrecord"
+      "https://cedarjs.com/docs/redwoodrecord"
     )}`
   );
   Object.entries(getYargsDefaults()).forEach(([option, config]) => {

package/dist/commands/generate/page/templates/test.tsx.template

@@ -3,7 +3,7 @@ import { render } from '@cedarjs/testing/web'
 import ${pascalName}Page from './${pascalName}Page'
 
 //   Improve this test with help from the Redwood Testing Doc:
-//   https://redwoodjs.com/docs/testing#testing-pages-layouts
+//   https://cedarjs.com/docs/testing#testing-pages-layouts
 
 describe('${pascalName}Page', () => {
   it('renders successfully', () => {

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

@@ -9,6 +9,7 @@ import pascalcase from "pascalcase";
 import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { getConfig } from "@cedarjs/project-config";
+import { pluralize, singularize } from "../../../lib/cedarPluralize.js";
 import c from "../../../lib/colors.js";
 import {
   generateTemplate,
@@ -26,7 +27,6 @@ import {
   prepareForRollback,
   addFunctionToRollback
 } from "../../../lib/rollback.js";
-import { pluralize, singularize } from "../../../lib/rwPluralize.js";
 import { getSchema, verifyModelName } from "../../../lib/schemaHelpers.js";
 import {
   relationsForModel,

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";
@@ -7,18 +6,13 @@ import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
+import { pluralize } from "../../../lib/cedarPluralize.js";
 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
 } from "../../../lib/rollback.js";
-import { pluralize } from "../../../lib/rwPluralize.js";
 import {
   getSchema,
   getEnum,
@@ -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.";
@@ -34,7 +28,7 @@ const missingIdConsoleMessage = () => {
   const line3 = "you'll need to update your schema definition to include";
   const line4 = "an `@id` column. Read more here: ";
   const line5 = ansis.underline.blue(
-    "https://redwoodjs.com/docs/schema-relations"
+    "https://cedarjs.com/docs/schema-relations"
   );
   console.error(
     boxen(line1 + "\n\n" + line2 + "\n" + line3 + "\n" + line4 + "\n" + line5, {
@@ -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
     })
   };