@cedarjs/cli 6.0.0-canary.2869 → 6.0.0-canary.2871

package/dist/commands/generate/helpers.js

@@ -23,6 +23,20 @@ const validateName = (name) => {
     );
   }
 };
+const SENSITIVE_FIELDS = [
+  "hashedPassword",
+  "salt",
+  "resetToken",
+  "resetTokenExpiresAt",
+  "webAuthnChallenge"
+];
+const redactedModelFields = (fieldNames) => {
+  const sensitive = fieldNames.filter((name) => SENSITIVE_FIELDS.includes(name));
+  if (sensitive.length === 1 && sensitive[0] === "salt") {
+    return [];
+  }
+  return sensitive;
+};
 const relationsForModel = (model) => {
   return model?.fields.filter((f) => f.relationName).map((field) => {
     return field.name;
@@ -60,11 +74,13 @@ const mapPrismaScalarToPagePropTsType = (scalarType) => {
   return prismaScalarToTsType[scalarType] || "unknown";
 };
 export {
+  SENSITIVE_FIELDS,
   forcePluralizeWord,
   intForeignKeysForModel,
   mapPrismaScalarToPagePropTsType,
   mapRouteParamTypeToTsType,
   pathName,
+  redactedModelFields,
   relationsForModel,
   removeGeneratorName,
   validateName

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

@@ -30,12 +30,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 } from "../sdl/sdlHandler.js";
+import {
+  files as sdlFiles,
+  printRedactedFieldsNote,
+  redactedSensitiveFields
+} from "../sdl/sdlHandler.js";
 import { writeFilesWithStubsTask } from "../sdl/stubFiles.js";
 import { builder as serviceBuilder } from "../service/service.js";
 import { files as serviceFiles } from "../service/serviceHandler.js";
@@ -273,7 +278,10 @@ const modelRelatedVariables = (model) => {
     }
   };
   const relations = relationsForModel(model)?.map((relation) => relation);
-  const columns = model.fields.filter((field) => field.kind !== "object").map((column) => {
+  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) => {
     let validation;
     const meta = componentMetadata[column.type];
     const validationDef = meta?.validation;
@@ -716,6 +724,7 @@ const handler = async ({
       prepareForRollback(t);
     }
     await t.run();
+    printRedactedFieldsNote(await redactedSensitiveFields([name]));
   } catch (e) {
     const message = e instanceof Error ? e.message : String(e);
     const exitCode = e instanceof Error && "exitCode" in e ? e.exitCode ?? 1 : 1;

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

@@ -3,6 +3,7 @@ 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";
@@ -17,7 +18,7 @@ import {
   getEnum,
   verifyModelName
 } from "../../../lib/schemaHelpers.js";
-import { relationsForModel } from "../helpers.js";
+import { redactedModelFields, relationsForModel } from "../helpers.js";
 import { files as serviceFiles } from "../service/serviceHandler.js";
 import { templateForFile } from "../yargsHandlerHelpers.js";
 import {
@@ -68,11 +69,18 @@ const modelFieldToSDL = ({
     return fieldContent;
   }
 };
+const modelRedactedFields = (model) => {
+  return redactedModelFields(model.fields.map((field) => field.name));
+};
 const querySDL = (model, docs = false) => {
-  return model.fields.map((field) => modelFieldToSDL({ field, docs }));
+  const redactedFields = modelRedactedFields(model);
+  return model.fields.filter((field) => !redactedFields.includes(field.name)).map((field) => modelFieldToSDL({ field, docs }));
 };
 const inputSDL = (model, required, docs = false) => {
-  const ignoredFields = [...DEFAULT_IGNORE_FIELDS_FOR_INPUT];
+  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);
@@ -199,6 +207,35 @@ const stubFiles = async (models, generatedFor, { docs = false, typescript }) =>
   }
   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,
@@ -223,6 +260,10 @@ 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(
       [
         {
@@ -273,9 +314,12 @@ const handler = async ({
       );
       console.log(c.info("To replace a stub with a full SDL and service, run"));
       for (const stubModel of missingModels) {
-        console.log(c.info(`  yarn cedar generate sdl ${stubModel}`));
+        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;
@@ -287,5 +331,7 @@ const handler = async ({
 export {
   files,
   handler,
+  printRedactedFieldsNote,
+  redactedSensitiveFields,
   stubFiles
 };

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 { relationsForModel } from "../helpers.js";
+import { redactedModelFields, 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,7 +32,10 @@ const parseSchema = async (model) => {
     return field.isRequired && !field.hasDefaultValue && // don't include fields that the database will default
     !field.relationName;
   });
-  return { scalarFields, relations, foreignKeys };
+  const redactedFields = redactedModelFields(
+    schema.fields.map((field) => field.name)
+  );
+  return { scalarFields, relations, foreignKeys, redactedFields };
 };
 function scenarioFieldValue(field) {
   const randFloat = Math.random() * 1e7;
@@ -145,9 +148,14 @@ const fieldTypes = async (model) => {
   );
 };
 const fieldsToInput = async (model) => {
-  const { scalarFields, foreignKeys } = await parseSchema(model);
+  const { scalarFields, foreignKeys, redactedFields } = 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}`;
@@ -162,14 +170,17 @@ const fieldsToInput = async (model) => {
   }
 };
 const fieldsToUpdate = async (model) => {
-  const { scalarFields, relations, foreignKeys } = await parseSchema(model);
+  const { scalarFields, relations, foreignKeys, redactedFields } = await parseSchema(model);
   const modelName = camelcase(singularize(model));
   let field, newValue, fieldName;
-  field = scalarFields.find(
+  const updatableFields = scalarFields.filter(
+    (scalar) => !redactedFields.includes(scalar.name)
+  );
+  field = updatableFields.find(
     (scalar) => !foreignKeys.includes(scalar.name)
   );
   if (!field) {
-    field = scalarFields[0];
+    field = updatableFields[0];
   }
   if (!field) {
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli",
-  "version": "6.0.0-canary.2869",
+  "version": "6.0.0-canary.2871",
   "description": "The CedarJS Command Line",
   "repository": {
     "type": "git",
@@ -36,17 +36,17 @@
     "@babel/preset-typescript": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api-server": "6.0.0-canary.2869",
-    "@cedarjs/babel-config": "6.0.0-canary.2869",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2869",
-    "@cedarjs/internal": "6.0.0-canary.2869",
-    "@cedarjs/prerender": "6.0.0-canary.2869",
-    "@cedarjs/project-config": "6.0.0-canary.2869",
-    "@cedarjs/structure": "6.0.0-canary.2869",
-    "@cedarjs/telemetry": "6.0.0-canary.2869",
-    "@cedarjs/utils": "6.0.0-canary.2869",
-    "@cedarjs/vite": "6.0.0-canary.2869",
-    "@cedarjs/web-server": "6.0.0-canary.2869",
+    "@cedarjs/api-server": "6.0.0-canary.2871",
+    "@cedarjs/babel-config": "6.0.0-canary.2871",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2871",
+    "@cedarjs/internal": "6.0.0-canary.2871",
+    "@cedarjs/prerender": "6.0.0-canary.2871",
+    "@cedarjs/project-config": "6.0.0-canary.2871",
+    "@cedarjs/structure": "6.0.0-canary.2871",
+    "@cedarjs/telemetry": "6.0.0-canary.2871",
+    "@cedarjs/utils": "6.0.0-canary.2871",
+    "@cedarjs/vite": "6.0.0-canary.2871",
+    "@cedarjs/web-server": "6.0.0-canary.2871",
     "@listr2/prompt-adapter-enquirer": "4.3.0",
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/core": "1.30.1",
@@ -94,7 +94,7 @@
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "6.0.0-canary.2869",
+    "@cedarjs/framework-tools": "6.0.0-canary.2871",
     "@prisma/dmmf": "7.8.0",
     "@types/archiver": "^7.0.0",
     "memfs": "4.64.0",