@cedarjs/cli 5.0.7-next.338 → 5.0.7

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

@@ -6,7 +6,6 @@ import humanize from "humanize-string";
 import { Listr } from "listr2";
 import pascalcase from "pascalcase";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
-import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import {
   addWorkspacePackages,
   removeWorkspacePackages
@@ -20,6 +19,7 @@ import {
   writeFile,
   getDefaultArgs,
   getPaths,
+  writeFilesTask,
   addRoutesToRouterTask,
   addScaffoldImport,
   transformTSToJS,
@@ -31,28 +31,17 @@ import {
 } from "../../../lib/rollback.js";
 import { getSchema, verifyModelName } from "../../../lib/schemaHelpers.js";
 import {
-  redactedModelFields,
   relationsForModel,
   intForeignKeysForModel,
   mapPrismaScalarToPagePropTsType
 } from "../helpers.js";
 import { builder as sdlBuilder } from "../sdl/sdl.js";
-import {
-  files as sdlFiles,
-  stubFiles as sdlStubFiles,
-  printRedactedFieldsNote,
-  redactedSensitiveFields
-} from "../sdl/sdlHandler.js";
-import {
-  missingRelatedModels,
-  writeFilesWithStubsTask
-} from "../sdl/stubFiles.js";
+import { files as sdlFiles } from "../sdl/sdlHandler.js";
 import { builder as serviceBuilder } from "../service/service.js";
 import { files as serviceFiles } from "../service/serviceHandler.js";
 import { customOrDefaultTemplatePath } from "../yargsHandlerHelpers.js";
 const SKIPPABLE_ASSETS = ["scaffold.css"];
 const PACKAGE_SET = "Set";
-const PACKAGE_PRIVATE_SET = "PrivateSet";
 const getIdType = (model) => {
   return model.fields.find((field) => field.isId)?.type;
 };
@@ -283,10 +272,7 @@ const modelRelatedVariables = (model) => {
     }
   };
   const relations = relationsForModel(model)?.map((relation) => relation);
-  const redactedFields = redactedModelFields(
-    model.fields.map((field) => field.name)
-  );
-  const columns = model.fields.filter((field) => field.kind !== "object").filter((field) => !redactedFields.includes(field.name)).map((column) => {
+  const columns = model.fields.filter((field) => field.kind !== "object").map((column) => {
     let validation;
     const meta = componentMetadata[column.type];
     const validationDef = meta?.validation;
@@ -526,65 +512,6 @@ const addHelperPackages = async (task) => {
     await removeWorkspacePackages("web", ["humanize-string"]);
   });
 };
-const isAuthSetup = () => {
-  const extensions = ["ts", "js", "tsx", "jsx"];
-  return extensions.some(
-    (ext) => fs.existsSync(path.join(getPaths().web.src, "auth." + ext))
-  );
-};
-const ROUTE_TAG_RE = /<Route\s+([^>]*?)\/?>/g;
-const extractRouteAttr = (tagAttrs, attrName) => tagAttrs.match(new RegExp(`\\b${attrName}=["']([^"']+)["']`))?.[1];
-const getRoutesFileContent = () => {
-  const routesPath = getPaths().web.routes;
-  if (!fs.existsSync(routesPath)) {
-    return void 0;
-  }
-  return readFile(routesPath).toString();
-};
-const hasLoginRoute = () => {
-  const content = getRoutesFileContent();
-  if (!content) {
-    return false;
-  }
-  return Array.from(content.matchAll(ROUTE_TAG_RE)).some(
-    ([, attrs]) => extractRouteAttr(attrs, "name") === "login"
-  );
-};
-const findUnprotectedLandingPageRouteName = () => {
-  const content = getRoutesFileContent();
-  if (!content) {
-    return void 0;
-  }
-  const privateSetRanges = Array.from(
-    content.matchAll(/<PrivateSet\b[^>]*>([\s\S]*?)<\/PrivateSet>/g)
-  ).map((match) => ({
-    start: match.index ?? 0,
-    end: (match.index ?? 0) + match[0].length
-  }));
-  for (const match of content.matchAll(ROUTE_TAG_RE)) {
-    const [, attrs] = match;
-    if (extractRouteAttr(attrs, "path") !== "/") {
-      continue;
-    }
-    const tagStart = match.index ?? 0;
-    const isProtected = privateSetRanges.some(
-      (range) => tagStart >= range.start && tagStart < range.end
-    );
-    if (!isProtected) {
-      return extractRouteAttr(attrs, "name");
-    }
-  }
-  return void 0;
-};
-const getUnauthenticatedRedirectRoute = () => {
-  if (!isAuthSetup()) {
-    return void 0;
-  }
-  if (hasLoginRoute()) {
-    return "login";
-  }
-  return findUnprotectedLandingPageRouteName();
-};
 const addSetImport = (task) => {
   const routesPath = getPaths().web.routes;
   const routesContent = readFile(routesPath).toString();
@@ -598,19 +525,15 @@ const addSetImport = (task) => {
     return void 0;
   }
   const routerImports = importContent.replace(/\s/g, "").split(",");
-  const namesToImport = [
-    PACKAGE_SET,
-    ...getUnauthenticatedRedirectRoute() ? [PACKAGE_PRIVATE_SET] : []
-  ].filter((name) => !routerImports.includes(name));
-  if (!namesToImport.length) {
+  if (routerImports.includes(PACKAGE_SET)) {
     return "Skipping Set import";
   }
   const newRoutesContent = routesContent.replace(
     cedarRouterImport,
-    importStart + spacing + namesToImport.join("," + spacing) + `,` + spacing + importContent + importEnd
+    importStart + spacing + PACKAGE_SET + `,` + spacing + importContent + importEnd
   );
   writeFile(routesPath, newRoutesContent, { overwriteExisting: true });
-  return `Added ${namesToImport.join(", ")} import to Routes.{jsx,tsx}`;
+  return "Added Set import to Routes.{jsx,tsx}";
 };
 const addScaffoldSetToRouter = async (model, scaffoldPath) => {
   const templateNames = getTemplateStrings(model, scaffoldPath);
@@ -619,12 +542,10 @@ const addScaffoldSetToRouter = async (model, scaffoldPath) => {
   const titleTo = templateNames.pluralRouteName;
   const buttonLabel = `New ${nameVars.singularPascalName}`;
   const buttonTo = templateNames.newRouteName;
-  const unauthenticatedRoute = getUnauthenticatedRedirectRoute();
   return addRoutesToRouterTask(
     await routes({ model, path: scaffoldPath }),
     "ScaffoldLayout",
-    { title, titleTo, buttonLabel, buttonTo },
-    unauthenticatedRoute ? { unauthenticated: unauthenticatedRoute } : void 0
+    { title, titleTo, buttonLabel, buttonTo }
   );
 };
 const tasks = ({
@@ -635,27 +556,23 @@ const tasks = ({
   tests,
   typescript,
   javascript: _javascript,
-  tailwind,
-  missingModels
+  tailwind
 }) => {
   return new Listr(
     [
       {
         title: "Generating scaffold files...",
         task: async () => {
-          const f = {
-            ...await files({
-              docs,
-              model,
-              path: path2,
-              tests,
-              typescript,
-              tailwind,
-              force
-            }),
-            ...await sdlStubFiles(missingModels, model, { docs, typescript })
-          };
-          return writeFilesWithStubsTask(f, { overwriteExisting: force });
+          const f = await files({
+            docs,
+            model,
+            path: path2,
+            tests,
+            typescript,
+            tailwind,
+            force
+          });
+          return writeFilesTask(f, { overwriteExisting: force });
         }
       },
       {
@@ -720,7 +637,6 @@ const handler = async ({
   tailwind = shouldUseTailwindCSS(tailwind);
   try {
     const { name } = await verifyModelName({ name: model });
-    const missingModels = await missingRelatedModels(name);
     const t = tasks({
       docs,
       model: name,
@@ -728,44 +644,12 @@ const handler = async ({
       force,
       tests,
       typescript,
-      tailwind,
-      missingModels
+      tailwind
     });
     if (rollback && !force) {
       prepareForRollback(t);
     }
     await t.run();
-    if (missingModels.length > 0) {
-      console.log();
-      console.log(
-        c.info(
-          `${name} has relations to models that don't have SDL files of their own yet: ${missingModels.join(", ")}`
-        )
-      );
-      console.log(
-        c.info(
-          "Read-only SDL stubs were generated for them, since GraphQL type generation fails otherwise."
-        )
-      );
-      console.log(
-        c.info("To replace a stub, run one of the following for each model:")
-      );
-      for (const stubModel of missingModels) {
-        console.log(
-          c.info(
-            `  ${formatCedarCommand(["generate", "sdl", stubModel])} (SDL + service only)`
-          )
-        );
-        console.log(
-          c.info(
-            `  ${formatCedarCommand(["generate", "scaffold", stubModel])} (adds pages, cells, and forms too)`
-          )
-        );
-      }
-    }
-    printRedactedFieldsNote(
-      await redactedSensitiveFields([name, ...missingModels])
-    );
   } catch (e) {
     const message = e instanceof Error ? e.message : String(e);
     const exitCode = e instanceof Error && "exitCode" in e ? e.exitCode ?? 1 : 1;
@@ -780,10 +664,7 @@ const splitPathAndModel = (pathSlashModel) => {
 };
 export {
   files,
-  getUnauthenticatedRedirectRoute,
   handler,
-  hasLoginRoute,
-  isAuthSetup,
   routes,
   shouldUseTailwindCSS,
   splitPathAndModel,

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

@@ -3,17 +3,12 @@
 // To access your database uncomment the line below
 // import { db } from 'api/src/lib/db'
 
-interface ScriptArgs {
-  args: {
-    // positional args, e.g. `yarn cedar exec myScript foo 123` -> ['foo', 123]
-    // numeric-looking args are parsed as numbers, others as strings
-    _: Array<string | number>
-    // named flags, e.g. `--force` -> { force: true }
-    [flag: string]: unknown
-  }
+interface Args {
+  _: string[]
+  [key: string]: unknown
 }
 
-export default async ({ args }: ScriptArgs) => {
+export default async ({ args }: Args) => {
   // Your script here...
   console.log(':: Executing script with args ::')
   console.log(args)

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

@@ -3,12 +3,11 @@ import boxen from "boxen";
 import camelcase from "camelcase";
 import { Listr } from "listr2";
 import { recordTelemetryAttributes, colors as c } from "@cedarjs/cli-helpers";
-import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
 import { generate as generateTypes } from "@cedarjs/internal/dist/generate/generate";
 import { getConfig } from "@cedarjs/project-config";
 import { errorTelemetry } from "@cedarjs/telemetry";
 import { pluralize } from "@cedarjs/utils/cedarPluralize";
-import { transformTSToJS } from "../../../lib/index.js";
+import { transformTSToJS, writeFilesTask } from "../../../lib/index.js";
 import {
   prepareForRollback,
   addFunctionToRollback
@@ -18,14 +17,9 @@ import {
   getEnum,
   verifyModelName
 } from "../../../lib/schemaHelpers.js";
-import { redactedModelFields, relationsForModel } from "../helpers.js";
+import { relationsForModel } from "../helpers.js";
 import { files as serviceFiles } from "../service/serviceHandler.js";
 import { templateForFile } from "../yargsHandlerHelpers.js";
-import {
-  addStubHeader,
-  missingRelatedModels,
-  writeFilesWithStubsTask
-} from "./stubFiles.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.";
@@ -52,8 +46,15 @@ const addFieldGraphQLComment = (field, str) => {
 const modelFieldToSDL = ({
   field,
   required = true,
+  types = {},
   docs = false
 }) => {
+  if (Object.entries(types).length && field.kind === "object") {
+    const resolvedType = idType(types[field.type]);
+    if (typeof resolvedType === "string") {
+      field.type = resolvedType;
+    }
+  }
   const prismaTypeToGraphqlType = {
     Json: "JSON",
     Decimal: "Float",
@@ -69,37 +70,32 @@ const modelFieldToSDL = ({
     return fieldContent;
   }
 };
-const modelRedactedFields = (model) => {
-  return redactedModelFields(model.fields.map((field) => field.name));
-};
 const querySDL = (model, docs = false) => {
-  const redactedFields = modelRedactedFields(model);
-  return model.fields.filter((field) => !redactedFields.includes(field.name)).map((field) => modelFieldToSDL({ field, docs }));
+  return model.fields.map((field) => modelFieldToSDL({ field, docs }));
 };
-const inputSDL = (model, required, docs = false) => {
-  const ignoredFields = [
-    ...DEFAULT_IGNORE_FIELDS_FOR_INPUT,
-    ...modelRedactedFields(model)
-  ];
-  const idField = model.fields.find((field) => field.isId);
-  if (idField?.default !== void 0) {
-    ignoredFields.push(idField.name);
-  }
+const inputSDL = (model, required, types = {}, docs = false) => {
+  const ignoredFields = DEFAULT_IGNORE_FIELDS_FOR_INPUT;
   return model.fields.filter((field) => {
+    const idField = model.fields.find((field2) => field2.isId);
+    if (idField?.default) {
+      ignoredFields.push(idField.name);
+    }
     return !ignoredFields.includes(field.name) && field.kind !== "object";
-  }).map((field) => modelFieldToSDL({ field, required, docs }));
+  }).map((field) => modelFieldToSDL({ field, required, types, docs }));
 };
 function idInputSDL(idType2, docs) {
   if (!Array.isArray(idType2)) {
     return [];
   }
-  return idType2.map((field) => modelFieldToSDL({ field, required: true, docs }));
+  return idType2.map(
+    (field) => modelFieldToSDL({ field, required: true, types: {}, docs })
+  );
 }
-const createInputSDL = (model, docs = false) => {
-  return inputSDL(model, true, docs);
+const createInputSDL = (model, types = {}, docs = false) => {
+  return inputSDL(model, true, types, docs);
 };
-const updateInputSDL = (model, docs = false) => {
-  return inputSDL(model, false, docs);
+const updateInputSDL = (model, types = {}, docs = false) => {
+  return inputSDL(model, false, types, docs);
 };
 function idType(model, crud) {
   if (!crud || !model) {
@@ -135,6 +131,21 @@ const sdlFromSchemaModel = async (name, crud, docs = false) => {
     );
   }
   const model = schemaResult;
+  const resolvedTypes = await Promise.all(
+    model.fields.filter((field) => field.kind === "object").map(async (field) => {
+      const fieldModel = await getSchema(field.type);
+      return fieldModel && "fields" in fieldModel ? fieldModel : void 0;
+    })
+  );
+  const types = resolvedTypes.reduce(
+    (acc, cur) => {
+      if (!cur) {
+        return acc;
+      }
+      return { ...acc, [cur.name]: cur };
+    },
+    {}
+  );
   const enums = (await Promise.all(
     model.fields.filter((field) => field.kind === "enum").map(async (field) => {
       const enumDef = await getEnum(field.type);
@@ -148,8 +159,8 @@ const sdlFromSchemaModel = async (name, crud, docs = false) => {
     modelName,
     modelDescription,
     query: querySDL(model, docs).join("\n    "),
-    createInput: createInputSDL(model, docs).join("\n    "),
-    updateInput: updateInputSDL(model, docs).join("\n    "),
+    createInput: createInputSDL(model, types, docs).join("\n    "),
+    updateInput: updateInputSDL(model, types, docs).join("\n    "),
     idInput: idInputSDL(idTypeRes, docs).join("\n    "),
     idType: idType(model, crud),
     idName: idName(model, crud),
@@ -187,55 +198,6 @@ const files = async ({
     })
   };
 };
-const stubFiles = async (models, generatedFor, { docs = false, typescript }) => {
-  const generatedFiles = {};
-  for (const stubModel of models) {
-    const stubModelFiles = await files({
-      name: stubModel,
-      crud: false,
-      docs,
-      tests: false,
-      typescript
-    });
-    for (const [stubPath, stubContent] of Object.entries(stubModelFiles)) {
-      generatedFiles[stubPath] = addStubHeader({
-        content: stubContent,
-        stubModel,
-        generatedFor
-      });
-    }
-  }
-  return generatedFiles;
-};
-const redactedSensitiveFields = async (modelNames) => {
-  const redacted = [];
-  for (const modelName of modelNames) {
-    const model = await getSchema(modelName);
-    if (!model || !("fields" in model)) {
-      continue;
-    }
-    for (const fieldName of modelRedactedFields(model)) {
-      redacted.push(`${model.name}.${fieldName}`);
-    }
-  }
-  return redacted;
-};
-const printRedactedFieldsNote = (redactedFields) => {
-  if (redactedFields.length === 0) {
-    return;
-  }
-  console.log();
-  console.log(
-    c.warning(
-      `The following fields were excluded from the generated SDL because they may contain sensitive data: ${redactedFields.join(", ")}`
-    )
-  );
-  console.log(
-    c.warning(
-      "If you want to expose any of them through your GraphQL API you can add them to the SDL file manually."
-    )
-  );
-};
 const handler = async ({
   model,
   crud,
@@ -259,21 +221,13 @@ const handler = async ({
   });
   try {
     const { name } = await verifyModelName({ name: model });
-    const missingModels = await missingRelatedModels(name);
-    const redactedFields = await redactedSensitiveFields([
-      name,
-      ...missingModels
-    ]);
     const tasks = new Listr(
       [
         {
           title: "Generating SDL files...",
           task: async () => {
-            const f = {
-              ...await files({ name, tests, crud, typescript, docs }),
-              ...await stubFiles(missingModels, name, { typescript, docs })
-            };
-            return writeFilesWithStubsTask(f, { overwriteExisting: force });
+            const f = await files({ name, tests, crud, typescript, docs });
+            return writeFilesTask(f, { overwriteExisting: force });
           }
         },
         {
@@ -300,26 +254,6 @@ const handler = async ({
       prepareForRollback(tasks);
     }
     await tasks.run();
-    if (missingModels.length > 0) {
-      console.log();
-      console.log(
-        c.info(
-          `${name} has relations to models that don't have SDL files of their own yet: ${missingModels.join(", ")}`
-        )
-      );
-      console.log(
-        c.info(
-          "Read-only SDL stubs were generated for them, since GraphQL type generation fails otherwise."
-        )
-      );
-      console.log(c.info("To replace a stub with a full SDL and service, run"));
-      for (const stubModel of missingModels) {
-        console.log(
-          c.info(`  ${formatCedarCommand(["generate", "sdl", stubModel])}`)
-        );
-      }
-    }
-    printRedactedFieldsNote(redactedFields);
   } catch (e) {
     const message = e instanceof Error ? e.message : String(e);
     const exitCode = e instanceof Error && "exitCode" in e && typeof e.exitCode === "number" ? e.exitCode : 1;
@@ -330,8 +264,5 @@ const handler = async ({
 };
 export {
   files,
-  handler,
-  printRedactedFieldsNote,
-  redactedSensitiveFields,
-  stubFiles
+  handler
 };

package/dist/commands/generate/sdl/templates/sdl.js.template

@@ -30,7 +30,6 @@ export const schema = gql`
     <% } %>${singularCamelName}(${idName}: ${idType}!): ${singularPascalName} @requireAuth<% } %>
   }
 
-  <% if (crud) { %>
   <% if (docs) { %>
   """Autogenerated input type of Input${singularPascalName}."""
   <% } %>
@@ -52,7 +51,7 @@ export const schema = gql`
   <% } %>
   input Update${singularPascalName}Input {
     ${updateInput}
-  }
+  }<% if (crud) { %>
 
   <% if (docs) { %>
   """About mutations"""

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

@@ -30,7 +30,6 @@ export const schema = gql`
     <% } %>${singularCamelName}(${idName}: ${idType}!): ${singularPascalName} @requireAuth<% } %>
   }
 
-  <% if (crud) { %>
   <% if (docs) { %>
   """Autogenerated input type of Input${singularPascalName}."""
   <% } %>
@@ -52,7 +51,7 @@ export const schema = gql`
   <% } %>
   input Update${singularPascalName}Input {
     ${updateInput}
-  }
+  }<% if (crud) { %>
 
   <% if (docs) { %>
   """About mutations"""

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

@@ -3,7 +3,7 @@ import camelcase from "camelcase";
 import { pluralize, singularize } from "@cedarjs/utils/cedarPluralize";
 import { transformTSToJS } from "../../../lib/index.js";
 import { getSchema, verifyModelName } from "../../../lib/schemaHelpers.js";
-import { redactedModelFields, relationsForModel } from "../helpers.js";
+import { relationsForModel } from "../helpers.js";
 import { createHandler, templateForFile } from "../yargsHandlerHelpers.js";
 function isServiceModel(schema) {
   return typeof schema === "object" && schema !== null && "fields" in schema && "name" in schema;
@@ -32,10 +32,7 @@ const parseSchema = async (model) => {
     return field.isRequired && !field.hasDefaultValue && // don't include fields that the database will default
     !field.relationName;
   });
-  const redactedFields = redactedModelFields(
-    schema.fields.map((field) => field.name)
-  );
-  return { scalarFields, relations, foreignKeys, redactedFields };
+  return { scalarFields, relations, foreignKeys };
 };
 function scenarioFieldValue(field) {
   const randFloat = Math.random() * 1e7;
@@ -148,14 +145,9 @@ const fieldTypes = async (model) => {
   );
 };
 const fieldsToInput = async (model) => {
-  const { scalarFields, foreignKeys, redactedFields } = await parseSchema(model);
+  const { scalarFields, foreignKeys } = await parseSchema(model);
   const modelName = camelcase(singularize(model));
   const inputObj = {};
-  if (scalarFields.some(
-    (field) => redactedFields.includes(field.name)
-  )) {
-    return false;
-  }
   scalarFields.forEach((field) => {
     if (foreignKeys.includes(field.name)) {
       inputObj[field.name] = `scenario.${modelName}.two.${field.name}`;
@@ -170,17 +162,14 @@ const fieldsToInput = async (model) => {
   }
 };
 const fieldsToUpdate = async (model) => {
-  const { scalarFields, relations, foreignKeys, redactedFields } = await parseSchema(model);
+  const { scalarFields, relations, foreignKeys } = await parseSchema(model);
   const modelName = camelcase(singularize(model));
   let field, newValue, fieldName;
-  const updatableFields = scalarFields.filter(
-    (scalar) => !redactedFields.includes(scalar.name)
-  );
-  field = updatableFields.find(
+  field = scalarFields.find(
     (scalar) => !foreignKeys.includes(scalar.name)
   );
   if (!field) {
-    field = updatableFields[0];
+    field = scalarFields[0];
   }
   if (!field) {
     return false;

package/dist/commands/generate/yargsHandlerHelpers.js

@@ -30,8 +30,14 @@ const customOrDefaultTemplatePath = ({
     generator,
     templatePath
   );
+  const deprecatedCustomPath = getPaths()[side].generators ? path.join(getPaths()[side].generators, generator, templatePath) : void 0;
   if (fs.existsSync(customPath)) {
     return customPath;
+  } else if (deprecatedCustomPath && fs.existsSync(deprecatedCustomPath)) {
+    console.log(
+      `Having generator templates in ${getPaths()[side].generators} has been deprecated. Please move them to ${getPaths().generatorTemplates}.`
+    );
+    return deprecatedCustomPath;
   } else {
     return defaultPath;
   }