@jskit-ai/crud-server-generator 0.1.30 → 0.1.32

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/crud-server-generator",
-  version: "0.1.30",
+  version: "0.1.32",
   kind: "generator",
   description: "CRUD server generator with routes, actions, and persistence scaffolding.",
   options: {
@@ -80,10 +80,39 @@ export default Object.freeze({
     }
   },
   metadata: {
+    generatorPrimarySubcommand: "scaffold",
     generatorSubcommands: {
-      "add-field": {
+      "scaffold": {
+        description: "Scaffold a CRUD resource package for a table (same behavior as running generate with no subcommand).",
+        optionNames: [
+          "namespace",
+          "surface",
+          "ownership-filter",
+          "table-name",
+          "id-column",
+          "directory-prefix"
+        ]
+      },
+      "scaffold-field": {
         entrypoint: "src/server/subcommands/addField.js",
-        export: "runGeneratorSubcommand"
+        export: "runGeneratorSubcommand",
+        description: "Patch one writable field into an existing generated CRUD resource module.",
+        positionalArgs: [
+          {
+            name: "<fieldKey>",
+            required: true,
+            description: "Resource field key (camelCase) resolved from the DB snapshot."
+          },
+          {
+            name: "<targetFile>",
+            required: true,
+            description: "Path to the generated CRUD resource file relative to app root."
+          }
+        ],
+        optionNames: [
+          "table-name",
+          "id-column"
+        ]
       }
     },
     apiSummary: {
@@ -105,13 +134,13 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/auth-core": "0.1.21",
-        "@jskit-ai/crud-core": "0.1.30",
-        "@jskit-ai/database-runtime": "0.1.22",
-        "@jskit-ai/http-runtime": "0.1.21",
-        "@jskit-ai/kernel": "0.1.22",
-        "@jskit-ai/realtime": "0.1.21",
-        "@jskit-ai/users-core": "0.1.31",
+        "@jskit-ai/auth-core": "0.1.23",
+        "@jskit-ai/crud-core": "0.1.32",
+        "@jskit-ai/database-runtime": "0.1.24",
+        "@jskit-ai/http-runtime": "0.1.23",
+        "@jskit-ai/kernel": "0.1.24",
+        "@jskit-ai/realtime": "0.1.23",
+        "@jskit-ai/users-core": "0.1.33",
         "@local/${option:namespace|kebab}": "file:packages/${option:namespace|kebab}",
         "typebox": "^1.0.81"
       },
@@ -218,6 +247,18 @@ export default Object.freeze({
         }
       }
     ],
-    text: []
+    text: [
+      {
+        op: "append-text",
+        file: "config/roles.js",
+        position: "bottom",
+        skipIfContains: "\"crud.${option:namespace|snake}.list\"",
+        value:
+          "\nroleCatalog.roles.member.permissions.push(\n  \"crud.${option:namespace|snake}.list\",\n  \"crud.${option:namespace|snake}.view\",\n  \"crud.${option:namespace|snake}.create\",\n  \"crud.${option:namespace|snake}.update\",\n  \"crud.${option:namespace|snake}.delete\"\n);\n",
+        reason: "Grant generated CRUD action permissions to the default member role in the app-owned role catalog.",
+        category: "crud",
+        id: "crud-role-catalog-permissions-${option:namespace|snake}"
+      }
+    ]
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/crud-server-generator",
-  "version": "0.1.30",
+  "version": "0.1.32",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -13,11 +13,11 @@
   },
   "dependencies": {
     "@babel/parser": "^7.29.2",
-    "@jskit-ai/crud-core": "0.1.30",
-    "@jskit-ai/database-runtime": "0.1.22",
-    "@jskit-ai/http-runtime": "0.1.21",
-    "@jskit-ai/kernel": "0.1.22",
-    "@jskit-ai/users-core": "0.1.31",
+    "@jskit-ai/crud-core": "0.1.32",
+    "@jskit-ai/database-runtime": "0.1.24",
+    "@jskit-ai/http-runtime": "0.1.23",
+    "@jskit-ai/kernel": "0.1.24",
+    "@jskit-ai/users-core": "0.1.33",
     "recast": "^0.23.11",
     "typebox": "^1.0.81"
   }

package/src/server/buildTemplateContext.js

@@ -369,7 +369,9 @@ function renderResourceFieldSchema(column, { forOutput = false } = {}) {
   } else if (typeKind === "date") {
     schemaExpression = 'Type.String({ format: "date", minLength: 1 })';
   } else if (typeKind === "time") {
-    schemaExpression = 'Type.String({ format: "time", minLength: 1 })';
+    return column.nullable === true
+      ? "NULLABLE_HTML_TIME_STRING_SCHEMA"
+      : "HTML_TIME_STRING_SCHEMA";
   } else if (typeKind === "json") {
     schemaExpression = "Type.Any()";
   }
@@ -380,6 +382,17 @@ function renderResourceFieldSchema(column, { forOutput = false } = {}) {
   return schemaExpression;
 }
 
+function renderResourceValidatorsImport({ needsHtmlTimeSchemas = false } = {}) {
+  const imports = [
+    "normalizeObjectInput",
+    "createCursorListValidator"
+  ];
+  if (needsHtmlTimeSchemas) {
+    imports.push("HTML_TIME_STRING_SCHEMA", "NULLABLE_HTML_TIME_STRING_SCHEMA");
+  }
+  return `import {\n  ${imports.join(",\n  ")}\n} from "@jskit-ai/kernel/shared/validators";`;
+}
+
 function renderInputNormalizer(column) {
   const typeKind = String(column.typeKind || "");
   const nullable = column?.nullable === true;
@@ -751,32 +764,34 @@ function renderMigrationForeignKeyLines(snapshot) {
   return lines.join("\n");
 }
 
-function mergeFieldMetaEntries(baseEntries = [], patchEntries = []) {
+function mergeFieldMetaEntries(...entryGroups) {
   const mergedByKey = new Map();
-  for (const sourceEntry of [...baseEntries, ...patchEntries]) {
-    const key = normalizeText(sourceEntry?.key);
-    if (!key) {
-      continue;
-    }
-    const existing = mergedByKey.get(key) || {};
-    const next = {
-      ...existing,
-      ...sourceEntry,
-      key
-    };
-    if (existing.relation || sourceEntry.relation) {
-      next.relation = {
-        ...(existing.relation && typeof existing.relation === "object" ? existing.relation : {}),
-        ...(sourceEntry.relation && typeof sourceEntry.relation === "object" ? sourceEntry.relation : {})
-      };
-    }
-    if (existing.ui || sourceEntry.ui) {
-      next.ui = {
-        ...(existing.ui && typeof existing.ui === "object" ? existing.ui : {}),
-        ...(sourceEntry.ui && typeof sourceEntry.ui === "object" ? sourceEntry.ui : {})
+  for (const sourceEntries of entryGroups) {
+    for (const sourceEntry of Array.isArray(sourceEntries) ? sourceEntries : []) {
+      const key = normalizeText(sourceEntry?.key);
+      if (!key) {
+        continue;
+      }
+      const existing = mergedByKey.get(key) || {};
+      const next = {
+        ...existing,
+        ...sourceEntry,
+        key
       };
+      if (existing.relation || sourceEntry.relation) {
+        next.relation = {
+          ...(existing.relation && typeof existing.relation === "object" ? existing.relation : {}),
+          ...(sourceEntry.relation && typeof sourceEntry.relation === "object" ? sourceEntry.relation : {})
+        };
+      }
+      if (existing.ui || sourceEntry.ui) {
+        next.ui = {
+          ...(existing.ui && typeof existing.ui === "object" ? existing.ui : {}),
+          ...(sourceEntry.ui && typeof sourceEntry.ui === "object" ? sourceEntry.ui : {})
+        };
+      }
+      mergedByKey.set(key, next);
     }
-    mergedByKey.set(key, next);
   }
 
   return [...mergedByKey.values()].sort((left, right) => left.key.localeCompare(right.key));
@@ -791,6 +806,87 @@ function resolveLookupNamespaceFromTableName(tableName = "") {
   return normalizedTableName.replace(/_/g, "-");
 }
 
+function toFieldLabel(key = "") {
+  const normalizedKey = normalizeText(key);
+  if (!normalizedKey) {
+    return "";
+  }
+
+  const words = normalizedKey
+    .replace(/([a-z0-9])([A-Z])/g, "$1 $2")
+    .replace(/[_\-.]+/g, " ")
+    .split(/\s+/)
+    .map((entry) => normalizeText(entry))
+    .filter(Boolean);
+  if (words.length < 1) {
+    return "";
+  }
+
+  return words
+    .map((entry) => `${entry.slice(0, 1).toUpperCase()}${entry.slice(1)}`)
+    .join(" ");
+}
+
+function isSupportedSelectOptionValue(value) {
+  return typeof value === "string" || typeof value === "number" || typeof value === "boolean";
+}
+
+function toSelectOptionIdentity(value) {
+  return `${typeof value}:${String(value)}`;
+}
+
+function toSelectOptionLabel(value) {
+  if (typeof value === "string") {
+    return toFieldLabel(value) || value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  return "";
+}
+
+function normalizeFieldMetaUiOptions(rawOptions = []) {
+  if (!Array.isArray(rawOptions)) {
+    return [];
+  }
+
+  const options = [];
+  const seenValues = new Set();
+  for (const rawEntry of rawOptions) {
+    if (!rawEntry || typeof rawEntry !== "object" || Array.isArray(rawEntry)) {
+      continue;
+    }
+    const value = rawEntry.value;
+    if (!isSupportedSelectOptionValue(value)) {
+      continue;
+    }
+
+    const identity = toSelectOptionIdentity(value);
+    if (seenValues.has(identity)) {
+      continue;
+    }
+    seenValues.add(identity);
+
+    const explicitLabel = normalizeText(rawEntry.label);
+    options.push({
+      value,
+      label: explicitLabel || toSelectOptionLabel(value) || String(value)
+    });
+  }
+
+  return options;
+}
+
+function resolveEnumFieldMetaUiOptions(enumValues = []) {
+  const options = Array.isArray(enumValues)
+    ? enumValues.map((value) => ({
+        value,
+        label: toSelectOptionLabel(value)
+      }))
+    : [];
+  return normalizeFieldMetaUiOptions(options);
+}
+
 function buildFieldMetaEntries({ outputColumns = [], writableColumns = [], snapshot = {} } = {}) {
   const fieldColumns = [...outputColumns, ...writableColumns];
   const fieldColumnsByName = new Map();
@@ -858,7 +954,33 @@ function buildFieldMetaEntries({ outputColumns = [], writableColumns = [], snaps
     });
   }
 
-  return mergeFieldMetaEntries(dbColumnEntries, relationEntries);
+  const relationFieldKeys = new Set(
+    relationEntries
+      .map((entry) => normalizeText(entry?.key))
+      .filter(Boolean)
+  );
+  const enumEntries = [];
+  for (const column of fieldColumnsByKey.values()) {
+    const key = normalizeText(column?.key);
+    if (!key || relationFieldKeys.has(key)) {
+      continue;
+    }
+
+    const options = resolveEnumFieldMetaUiOptions(column?.enumValues);
+    if (options.length < 1) {
+      continue;
+    }
+
+    enumEntries.push({
+      key,
+      ui: {
+        formControl: "select",
+        options
+      }
+    });
+  }
+
+  return mergeFieldMetaEntries(dbColumnEntries, relationEntries, enumEntries);
 }
 
 function renderFieldMetaEntryLines(entry = {}) {
@@ -896,17 +1018,39 @@ function renderFieldMetaEntryLines(entry = {}) {
     topLevelProperties.push(relationLines.join("\n"));
   }
 
+  const fieldUiOptions = normalizeFieldMetaUiOptions(entry?.ui?.options);
   const formControl = checkCrudLookupFormControl(entry?.ui?.formControl, {
     context: `resource.fieldMeta["${normalizeText(entry.key)}"].ui.formControl`,
-    defaultValue: relation ? "autocomplete" : ""
+    defaultValue: relation ? "autocomplete" : (fieldUiOptions.length > 0 ? "select" : "")
   });
-  if (formControl) {
+  if (formControl || fieldUiOptions.length > 0) {
+    const uiPropertyBlocks = [];
+    if (formControl) {
+      uiPropertyBlocks.push([
+        `formControl: ${JSON.stringify(formControl)}${relation ? " // or \"select\"" : ""}`
+      ]);
+    }
+    if (fieldUiOptions.length > 0) {
+      const optionsJsonLines = JSON.stringify(fieldUiOptions, null, 2).split("\n");
+      const optionPropertyLines = [`options: ${optionsJsonLines[0]}`];
+      for (const jsonLine of optionsJsonLines.slice(1)) {
+        optionPropertyLines.push(jsonLine);
+      }
+      uiPropertyBlocks.push(optionPropertyLines);
+    }
+
+    const uiLines = ["ui: {"];
+    for (const [propertyIndex, propertyLines] of uiPropertyBlocks.entries()) {
+      const isLastProperty = propertyIndex >= uiPropertyBlocks.length - 1;
+      const propertySuffix = isLastProperty ? "" : ",";
+      for (const [lineIndex, line] of propertyLines.entries()) {
+        const isLastLine = lineIndex >= propertyLines.length - 1;
+        uiLines.push(`  ${line}${isLastLine ? propertySuffix : ""}`);
+      }
+    }
+    uiLines.push("}");
     topLevelProperties.push(
-      [
-        "ui: {",
-        `  formControl: ${JSON.stringify(formControl)} // or "select"`,
-        "}"
-      ].join("\n")
+      uiLines.join("\n")
     );
   }
 
@@ -933,6 +1077,29 @@ function renderResourceFieldMetaPushLines(entries = []) {
   return sourceEntries.map((entry) => renderFieldMetaEntryLines(entry)).join("\n\n");
 }
 
+function renderRepositoryListConfigLines(snapshot = {}) {
+  const commentLines = [
+    "  // defaultLimit: 20,",
+    "  // maxLimit: 100,",
+    "  // searchColumns: [\"name\"],"
+  ];
+  const sourceColumns = Array.isArray(snapshot?.columns) ? snapshot.columns : [];
+  const hasCreatedAtColumn = sourceColumns.some((column = {}) => normalizeText(column?.name) === "created_at");
+  if (!hasCreatedAtColumn) {
+    return commentLines.join("\n");
+  }
+
+  return [
+    ...commentLines,
+    "  orderBy: [",
+    "    {",
+    "      column: \"created_at\",",
+    "      direction: \"desc\"",
+    "    }",
+    "  ]"
+  ].join("\n");
+}
+
 function buildReplacementsFromSnapshot({
   snapshot,
   resolvedOwnershipFilter
@@ -959,6 +1126,7 @@ function buildReplacementsFromSnapshot({
   const needsNullableDateInput = writableColumns.some(
     (column) => column.typeKind === "date" && column.nullable === true
   );
+  const needsHtmlTimeSchemas = resourceColumns.some((column) => column.typeKind === "time");
   const needsDate = resourceColumns.some((column) => column.typeKind === "date");
   const needsJson = resourceColumns.some((column) => column.typeKind === "json");
   const needsNormalizeText = resourceColumns.some((column) =>
@@ -976,6 +1144,9 @@ function buildReplacementsFromSnapshot({
     __JSKIT_CRUD_TABLE_NAME__: JSON.stringify(snapshot.tableName),
     __JSKIT_CRUD_ID_COLUMN__: JSON.stringify(snapshot.idColumn || DEFAULT_ID_COLUMN),
     __JSKIT_CRUD_RESOLVED_OWNERSHIP_FILTER__: resolvedOwnershipFilter,
+    __JSKIT_CRUD_RESOURCE_VALIDATORS_IMPORT__: renderResourceValidatorsImport({
+      needsHtmlTimeSchemas
+    }),
     __JSKIT_CRUD_RESOURCE_DATABASE_RUNTIME_IMPORT__: renderResourceDatabaseRuntimeImport({
       needsToIsoString: needsDateTimeOutput || needsDate,
       needsToDatabaseDateTimeUtc: needsDateTimeInput
@@ -1002,6 +1173,7 @@ function buildReplacementsFromSnapshot({
     __JSKIT_CRUD_RESOURCE_OUTPUT_NORMALIZATION_LINES__: renderResourceOutputNormalizationLines(outputColumns),
     __JSKIT_CRUD_RESOURCE_CREATE_REQUIRED_FIELDS__: JSON.stringify(createRequiredFieldKeys),
     __JSKIT_CRUD_RESOURCE_FIELD_META_PUSH_LINES__: renderResourceFieldMetaPushLines(fieldMetaEntries),
+    __JSKIT_CRUD_LIST_CONFIG_LINES__: renderRepositoryListConfigLines(snapshot),
     __JSKIT_CRUD_MIGRATION_COLUMN_LINES__: renderMigrationColumnLines(snapshot),
     __JSKIT_CRUD_MIGRATION_INDEX_LINES__: renderMigrationIndexLines(snapshot),
     __JSKIT_CRUD_MIGRATION_FOREIGN_KEY_LINES__: renderMigrationForeignKeyLines(snapshot)

package/src/server/subcommands/addField.js

@@ -35,12 +35,12 @@ function toPosixPath(value = "") {
 function resolveTargetFilePath(appRoot, targetFile) {
   const appRootAbsolute = path.resolve(String(appRoot || ""));
   if (!appRootAbsolute) {
-    throw new Error("crud-server-generator add-field requires appRoot.");
+    throw new Error("crud-server-generator scaffold-field requires appRoot.");
   }
 
   const normalizedTargetFile = normalizeText(targetFile);
   if (!normalizedTargetFile) {
-    throw new Error("crud-server-generator add-field requires target file path.");
+    throw new Error("crud-server-generator scaffold-field requires target file path.");
   }
 
   const absolutePath = path.isAbsolute(normalizedTargetFile)
@@ -53,7 +53,7 @@ function resolveTargetFilePath(appRoot, targetFile) {
     relativePath.startsWith(`..${path.sep}`) ||
     path.isAbsolute(relativePath)
   ) {
-    throw new Error("crud-server-generator add-field target file must stay within app root.");
+    throw new Error("crud-server-generator scaffold-field target file must stay within app root.");
   }
 
   return {
@@ -68,10 +68,10 @@ function parseSubcommandArgs(args = []) {
   const targetFile = normalizeText(source[1]);
 
   if (!fieldKey) {
-    throw new Error("crud-server-generator add-field requires <fieldKey>.");
+    throw new Error("crud-server-generator scaffold-field requires <fieldKey>.");
   }
   if (!targetFile) {
-    throw new Error("crud-server-generator add-field requires <targetFile>.");
+    throw new Error("crud-server-generator scaffold-field requires <targetFile>.");
   }
 
   return {
@@ -80,7 +80,7 @@ function parseSubcommandArgs(args = []) {
   };
 }
 
-function resolveRequestedTableConfig(source = "", options = {}, context = "crud-server-generator add-field") {
+function resolveRequestedTableConfig(source = "", options = {}, context = "crud-server-generator scaffold-field") {
   const defaults = resolveCrudResourceDefaults(source, context);
   const tableName = normalizeText(options?.["table-name"] || defaults.tableName);
   if (!tableName) {
@@ -110,7 +110,7 @@ function resolveColumnForField(snapshot = {}, fieldKey = "", { idColumn = "id" }
     .filter(Boolean)
     .join(", ");
   throw new Error(
-    `crud-server-generator add-field could not find field "${key}" in DB snapshot columns. Available: ${available || "<none>"}.`
+    `crud-server-generator scaffold-field could not find field "${key}" in DB snapshot columns. Available: ${available || "<none>"}.`
   );
 }
 
@@ -178,7 +178,7 @@ async function runGeneratorSubcommand({
   resolveSnapshot = resolveGenerationSnapshot
 } = {}) {
   const normalizedSubcommand = normalizeText(subcommand).toLowerCase();
-  if (normalizedSubcommand !== "add-field") {
+  if (normalizedSubcommand !== "scaffold-field") {
     throw new Error(`Unsupported crud-server-generator subcommand: ${normalizedSubcommand || "<empty>"}.`);
   }
 
@@ -197,7 +197,7 @@ async function runGeneratorSubcommand({
   const column = resolveColumnForField(snapshot, fieldKey, { idColumn });
   if (column?.writable !== true) {
     throw new Error(
-      `crud-server-generator add-field cannot patch non-writable field "${fieldKey}" (column "${column.name}").`
+      `crud-server-generator scaffold-field cannot patch non-writable field "${fieldKey}" (column "${column.name}").`
     );
   }
 

package/src/server/subcommands/resourceAst.js

@@ -37,7 +37,7 @@ function isIdentifierName(value = "") {
   return IDENTIFIER_PATTERN.test(String(value || ""));
 }
 
-function parseModule(source = "", context = "crud-server-generator add-field") {
+function parseModule(source = "", context = "crud-server-generator scaffold-field") {
   try {
     return recast.parse(String(source || ""), { parser: BABEL_REC_AST_PARSER });
   } catch (error) {
@@ -47,7 +47,7 @@ function parseModule(source = "", context = "crud-server-generator add-field") {
   }
 }
 
-function parseExpression(source = "", context = "crud-server-generator add-field") {
+function parseExpression(source = "", context = "crud-server-generator scaffold-field") {
   const expressionSource = `const __jskitFieldExpression = ${String(source || "")};`;
   const ast = parseModule(expressionSource, context);
   const statement = ast?.program?.body?.[0];
@@ -61,7 +61,7 @@ function parseExpression(source = "", context = "crud-server-generator add-field
   return declaration.init;
 }
 
-function parseStatement(source = "", context = "crud-server-generator add-field") {
+function parseStatement(source = "", context = "crud-server-generator scaffold-field") {
   const ast = parseModule(String(source || ""), context);
   const statement = ast?.program?.body?.[0];
   if (!statement) {
@@ -114,7 +114,7 @@ function findVariableDeclarator(programNode, variableName = "") {
   return null;
 }
 
-function requireVariableDeclarator(programNode, variableName = "", context = "crud-server-generator add-field") {
+function requireVariableDeclarator(programNode, variableName = "", context = "crud-server-generator scaffold-field") {
   const declaration = findVariableDeclarator(programNode, variableName);
   if (declaration) {
     return declaration;
@@ -122,7 +122,7 @@ function requireVariableDeclarator(programNode, variableName = "", context = "cr
   throw new Error(`${context} could not find const ${variableName}.`);
 }
 
-function requireSchemaPropertiesObject(programNode, variableName = "", context = "crud-server-generator add-field") {
+function requireSchemaPropertiesObject(programNode, variableName = "", context = "crud-server-generator scaffold-field") {
   const declaration = requireVariableDeclarator(programNode, variableName, context);
   const initExpression = declaration.init;
   if (!n.CallExpression.check(initExpression)) {
@@ -149,7 +149,7 @@ function requireSchemaPropertiesObject(programNode, variableName = "", context =
   return firstArgument;
 }
 
-function requireObjectFreezePayloadObject(programNode, variableName = "", context = "crud-server-generator add-field") {
+function requireObjectFreezePayloadObject(programNode, variableName = "", context = "crud-server-generator scaffold-field") {
   const declaration = requireVariableDeclarator(programNode, variableName, context);
   const initExpression = declaration.init;
   if (!n.CallExpression.check(initExpression)) {
@@ -197,7 +197,7 @@ function findObjectPropertyByName(objectNode, propertyName = "") {
   return null;
 }
 
-function requireNormalizeFunctionBody(programNode, variableName = "", context = "crud-server-generator add-field") {
+function requireNormalizeFunctionBody(programNode, variableName = "", context = "crud-server-generator scaffold-field") {
   const validatorObject = requireObjectFreezePayloadObject(programNode, variableName, context);
   const normalizeProperty = findObjectPropertyByName(validatorObject, "normalize");
   if (!normalizeProperty) {
@@ -218,7 +218,7 @@ function requireNormalizeFunctionBody(programNode, variableName = "", context =
   throw new Error(`${context} expected ${variableName}.normalize to be a function with a block body.`);
 }
 
-function requireNormalizedObjectLiteral(functionBody, context = "crud-server-generator add-field") {
+function requireNormalizedObjectLiteral(functionBody, context = "crud-server-generator scaffold-field") {
   for (const statement of functionBody.body || []) {
     if (!n.VariableDeclaration.check(statement)) {
       continue;
@@ -248,7 +248,7 @@ function insertObjectProperty(
   propertyName = "",
   valueExpressionSource = "",
   {
-    context = "crud-server-generator add-field",
+    context = "crud-server-generator scaffold-field",
     insertBeforeComputed = false
   } = {}
 ) {
@@ -448,7 +448,7 @@ function resolveObjectPropertyStringValue(objectNode, propertyName = "") {
   return "";
 }
 
-function resolveCrudResourceDefaults(source = "", context = "crud-server-generator add-field") {
+function resolveCrudResourceDefaults(source = "", context = "crud-server-generator scaffold-field") {
   const ast = parseModule(source, context);
   const statements = Array.isArray(ast?.program?.body) ? ast.program.body : [];
 
@@ -478,7 +478,7 @@ function resolveCrudResourceDefaults(source = "", context = "crud-server-generat
 function renderResourceFieldMetaPushStatement(entry = {}) {
   const key = normalizeText(entry?.key);
   if (!key) {
-    throw new Error("crud-server-generator add-field fieldMeta entry requires key.");
+    throw new Error("crud-server-generator scaffold-field fieldMeta entry requires key.");
   }
 
   const lines = ["RESOURCE_FIELD_META.push({"];
@@ -495,7 +495,7 @@ function renderResourceFieldMetaPushStatement(entry = {}) {
       normalizeCrudLookupNamespace(relation.namespace) ||
       normalizeCrudLookupNamespace(relation.apiPath);
     if (!relationNamespace) {
-      throw new Error("crud-server-generator add-field fieldMeta relation requires namespace.");
+      throw new Error("crud-server-generator scaffold-field fieldMeta relation requires namespace.");
     }
     lines.push("  relation: {");
     lines.push(`    kind: ${JSON.stringify(normalizeText(relation.kind) || "lookup")},`);
@@ -530,7 +530,7 @@ function applyCrudResourceFieldPatch(
     normalizeImportNames = [],
     databaseRuntimeImportNames = [],
     databaseRuntimeRepositoryOptionsImportNames = [],
-    context = "crud-server-generator add-field"
+    context = "crud-server-generator scaffold-field"
   } = {}
 ) {
   const normalizedFieldKey = normalizeText(fieldKey);

package/src/shared/crud/crudResource.js

@@ -183,4 +183,21 @@ const crudResource = {
 
 void CRUD_RESOURCE_FIELD_META;
 
+// Example 1:n collection hydration:
+// CRUD_RESOURCE_FIELD_META.push({
+//   key: "pets",
+//   relation: {
+//     kind: "collection",
+//     namespace: "pets",
+//     foreignKey: "customerId",
+//     parentValueKey: "id",
+//     hydrateOnList: false, // list: opt-in with include=pets
+//     hydrateOnView: true // view: hydrated by default
+//   }
+// });
+//
+// To hydrate child lookups too, request nested include paths:
+// - include=pets
+// - include=pets,pets.breedId
+
 export { crudResource };

package/templates/src/local-package/server/CrudProvider.js

@@ -45,7 +45,9 @@ class ${option:namespace|pascal}Provider {
     });
 
     app.singleton("crud.lookup.${option:namespace|snake}", (scope) => {
-      return createCrudLookupProvider(scope.make("repository.${option:namespace|snake}"));
+      return createCrudLookupProvider(scope.make("repository.${option:namespace|snake}"), {
+        ownershipFilter: crudPolicy.ownershipFilter
+      });
     });
 
     app.service(