@jskit-ai/crud-server-generator 0.1.54 → 0.1.55

package/package.descriptor.mjs

@@ -1,7 +1,7 @@
 export default Object.freeze({
   packageVersion: 1,
   packageId: "@jskit-ai/crud-server-generator",
-  version: "0.1.54",
+  version: "0.1.55",
   kind: "generator",
   description: "CRUD server generator with routes, actions, and persistence scaffolding.",
   options: {
@@ -151,13 +151,13 @@ export default Object.freeze({
   mutations: {
     dependencies: {
       runtime: {
-        "@jskit-ai/auth-core": "0.1.45",
-        "@jskit-ai/crud-core": "0.1.54",
-        "@jskit-ai/database-runtime": "0.1.46",
-        "@jskit-ai/http-runtime": "0.1.45",
-        "@jskit-ai/kernel": "0.1.46",
-        "@jskit-ai/realtime": "0.1.45",
-        "@jskit-ai/users-core": "0.1.56",
+        "@jskit-ai/auth-core": "0.1.46",
+        "@jskit-ai/crud-core": "0.1.55",
+        "@jskit-ai/database-runtime": "0.1.47",
+        "@jskit-ai/http-runtime": "0.1.46",
+        "@jskit-ai/kernel": "0.1.47",
+        "@jskit-ai/realtime": "0.1.46",
+        "@jskit-ai/users-core": "0.1.57",
         "@local/${option:namespace|kebab}": "file:packages/${option:namespace|kebab}",
         "typebox": "^1.0.81"
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/crud-server-generator",
-  "version": "0.1.54",
+  "version": "0.1.55",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -13,11 +13,11 @@
   },
   "dependencies": {
     "@babel/parser": "^7.29.2",
-    "@jskit-ai/crud-core": "0.1.54",
-    "@jskit-ai/database-runtime": "0.1.46",
-    "@jskit-ai/http-runtime": "0.1.45",
-    "@jskit-ai/kernel": "0.1.46",
-    "@jskit-ai/users-core": "0.1.56",
+    "@jskit-ai/crud-core": "0.1.55",
+    "@jskit-ai/database-runtime": "0.1.47",
+    "@jskit-ai/http-runtime": "0.1.46",
+    "@jskit-ai/kernel": "0.1.47",
+    "@jskit-ai/users-core": "0.1.57",
     "recast": "^0.23.11",
     "typebox": "^1.0.81"
   }

package/src/server/buildTemplateContext.js

@@ -1157,7 +1157,7 @@ function buildFieldMetaEntries({ outputColumns = [], writableColumns = [], snaps
     }
   }
 
-  const dbColumnEntries = [];
+  const repositoryEntries = [];
   for (const column of fieldColumnsByKey.values()) {
     const key = normalizeText(column?.key);
     const name = normalizeText(column?.name);
@@ -1167,9 +1167,11 @@ function buildFieldMetaEntries({ outputColumns = [], writableColumns = [], snaps
     if (toSnakeCase(key) === name) {
       continue;
     }
-    dbColumnEntries.push({
+    repositoryEntries.push({
       key,
-      dbColumn: name
+      repository: {
+        column: name
+      }
     });
   }
 
@@ -1235,15 +1237,19 @@ function buildFieldMetaEntries({ outputColumns = [], writableColumns = [], snaps
     });
   }
 
-  return mergeFieldMetaEntries(dbColumnEntries, relationEntries, enumEntries);
+  return mergeFieldMetaEntries(repositoryEntries, relationEntries, enumEntries);
 }
 
 function renderFieldMetaEntryLines(entry = {}) {
   const lines = ["RESOURCE_FIELD_META.push({"];
   const topLevelProperties = [`key: ${JSON.stringify(entry.key)}`];
-  const dbColumn = normalizeText(entry.dbColumn);
-  if (dbColumn) {
-    topLevelProperties.push(`dbColumn: ${JSON.stringify(dbColumn)}`);
+  const repositoryColumn = normalizeText(entry?.repository?.column);
+  if (repositoryColumn) {
+    topLevelProperties.push([
+      "repository: {",
+      `  column: ${JSON.stringify(repositoryColumn)}`,
+      "}"
+    ].join("\n"));
   }
 
   const relation = entry.relation && typeof entry.relation === "object" ? entry.relation : null;

package/src/server/subcommands/resourceAst.js

@@ -484,9 +484,11 @@ function renderResourceFieldMetaPushStatement(entry = {}) {
   const lines = ["RESOURCE_FIELD_META.push({"];
   lines.push(`  key: ${JSON.stringify(key)},`);
 
-  const dbColumn = normalizeText(entry?.dbColumn);
-  if (dbColumn) {
-    lines.push(`  dbColumn: ${JSON.stringify(dbColumn)},`);
+  const repositoryColumn = normalizeText(entry?.repository?.column);
+  if (repositoryColumn) {
+    lines.push("  repository: {");
+    lines.push(`    column: ${JSON.stringify(repositoryColumn)}`);
+    lines.push("  },");
   }
 
   const relation = entry?.relation && typeof entry.relation === "object" ? entry.relation : null;

package/src/shared/crud/crudResource.js

@@ -136,7 +136,7 @@ const deleteOutputValidator = Object.freeze({
 const CRUD_RESOURCE_FIELD_META = [];
 
 const crudResource = {
-  resource: "crud",
+  namespace: "crud",
   tableName: "crud",
   idColumn: "id",
   messages: {

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

@@ -1,9 +1,9 @@
 import { resolveAppConfig } from "@jskit-ai/kernel/server/support";
 import { resolveCrudSurfacePolicyFromAppConfig } from "@jskit-ai/crud-core/server/crudModuleConfig";
 import {
-  createCrudLookupProviderResolver,
-  createCrudLookupProvider
-} from "@jskit-ai/crud-core/server/lookupProviders";
+  createCrudLookupResolver,
+  createCrudLookup
+} from "@jskit-ai/crud-core/server/lookups";
 import { withActionDefaults } from "@jskit-ai/kernel/shared/actions";
 import { createRepository } from "./repository.js";
 import {
@@ -40,12 +40,12 @@ class ${option:namespace|pascal}Provider {
     app.singleton("repository.${option:namespace|snake}", (scope) => {
       const knex = scope.make("jskit.database.knex");
       return createRepository(knex, {
-        resolveLookupProvider: createCrudLookupProviderResolver(scope)
+        resolveLookup: createCrudLookupResolver(scope)
       });
     });
 
-    app.singleton("crud.lookup.${option:namespace|snake}", (scope) => {
-      return createCrudLookupProvider(scope.make("repository.${option:namespace|snake}"), {
+    app.singleton("lookup.${option:namespace|snake}", (scope) => {
+      return createCrudLookup(scope.make("repository.${option:namespace|snake}"), {
         ownershipFilter: crudPolicy.ownershipFilter
       });
     });

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

@@ -1,53 +1,52 @@
-import {
-  createCrudRepositoryRuntime,
-  crudRepositoryList,
-  crudRepositoryFindById,
-  crudRepositoryListByIds,
-  crudRepositoryCreate,
-  crudRepositoryUpdateById,
-  crudRepositoryDeleteById
-} from "@jskit-ai/crud-core/server/repositoryMethods";
-import { createWithTransaction } from "@jskit-ai/database-runtime/shared";
+import { createCrudResourceRuntime } from "@jskit-ai/crud-core/server/resourceRuntime";
 import { resource } from "../shared/${option:namespace|singular|camel}Resource.js";
 import { LIST_CONFIG } from "./listConfig.js";
 
-const repositoryRuntime = createCrudRepositoryRuntime(resource, {
+const REPOSITORY_CONFIG = Object.freeze({
   context: "${option:namespace|snake} repository",
   list: LIST_CONFIG
 });
 
 function createRepository(knex, options = {}) {
-  const withTransaction = createWithTransaction(knex);
+  const resourceRuntime = createCrudResourceRuntime(resource, knex, {
+    ...options,
+    ...REPOSITORY_CONFIG
+  });
 
   async function list(query = {}, callOptions = {}) {
-    return crudRepositoryList(repositoryRuntime, knex, query, options, callOptions);
+    return resourceRuntime.list(query, callOptions);
   }
 
   async function findById(recordId, callOptions = {}) {
-    return crudRepositoryFindById(repositoryRuntime, knex, recordId, options, callOptions);
+    return resourceRuntime.findById(recordId, callOptions);
   }
 
   async function listByIds(ids = [], callOptions = {}) {
-    return crudRepositoryListByIds(repositoryRuntime, knex, ids, options, callOptions);
+    return resourceRuntime.listByIds(ids, callOptions);
+  }
+
+  async function listByForeignIds(ids = [], foreignKey = "", callOptions = {}) {
+    return resourceRuntime.listByForeignIds(ids, foreignKey, callOptions);
   }
 
   async function create(payload = {}, callOptions = {}) {
-    return crudRepositoryCreate(repositoryRuntime, knex, payload, options, callOptions);
+    return resourceRuntime.create(payload, callOptions);
   }
 
   async function updateById(recordId, patch = {}, callOptions = {}) {
-    return crudRepositoryUpdateById(repositoryRuntime, knex, recordId, patch, options, callOptions);
+    return resourceRuntime.updateById(recordId, patch, callOptions);
   }
 
   async function deleteById(recordId, callOptions = {}) {
-    return crudRepositoryDeleteById(repositoryRuntime, knex, recordId, options, callOptions);
+    return resourceRuntime.deleteById(recordId, callOptions);
   }
 
   return Object.freeze({
-    withTransaction,
+    withTransaction: resourceRuntime.withTransaction,
     list,
     findById,
     listByIds,
+    listByForeignIds,
     create,
     updateById,
     deleteById

package/templates/src/local-package/shared/crudResource.js

@@ -83,7 +83,7 @@ const deleteOutputValidator = Object.freeze({
 const RESOURCE_FIELD_META = [];
 
 const resource = {
-  resource: "${option:namespace|snake}",
+  namespace: "${option:namespace|snake}",
   tableName: __JSKIT_CRUD_TABLE_NAME__,
   idColumn: __JSKIT_CRUD_ID_COLUMN__,
   messages: {

package/test/addFieldSubcommand.test.js

@@ -70,7 +70,7 @@ const patchBodyValidator = Object.freeze({
 const RESOURCE_FIELD_META = [];
 
 const resource = {
-  resource: "contacts",
+  namespace: "contacts",
   tableName: "contacts",
   idColumn: "id",
   operations: {

package/test/buildTemplateContext.test.js

@@ -827,18 +827,24 @@ test("crud repository template defines explicit one-line CRUD methods over repos
   const templateSource = await readFile(templatePath, "utf8");
   assert.match(
     templateSource,
-    /from "@jskit-ai\/crud-core\/server\/repositoryMethods";/
+    /from "@jskit-ai\/crud-core\/server\/resourceRuntime";/
   );
   assert.match(templateSource, /import \{ LIST_CONFIG \} from "\.\/listConfig\.js";/);
-  assert.match(templateSource, /const repositoryRuntime = createCrudRepositoryRuntime\(/);
-  assert.match(templateSource, /return crudRepositoryList\(repositoryRuntime, knex, query, options, callOptions\);/);
-  assert.match(templateSource, /return crudRepositoryFindById\(repositoryRuntime, knex, recordId, options, callOptions\);/);
-  assert.match(templateSource, /return crudRepositoryListByIds\(repositoryRuntime, knex, ids, options, callOptions\);/);
-  assert.match(templateSource, /return crudRepositoryCreate\(repositoryRuntime, knex, payload, options, callOptions\);/);
-  assert.match(templateSource, /return crudRepositoryUpdateById\(repositoryRuntime, knex, recordId, patch, options, callOptions\);/);
-  assert.match(templateSource, /return crudRepositoryDeleteById\(repositoryRuntime, knex, recordId, options, callOptions\);/);
-  assert.doesNotMatch(templateSource, /listByForeignIds/);
-  assert.doesNotMatch(templateSource, /crudRepository requires knex/);
+  assert.match(templateSource, /const REPOSITORY_CONFIG = Object\.freeze\(\{/);
+  assert.match(templateSource, /const resourceRuntime = createCrudResourceRuntime\(resource, knex, \{/);
+  assert.match(templateSource, /\.\.\.options,/);
+  assert.match(templateSource, /\.\.\.REPOSITORY_CONFIG/);
+  assert.match(templateSource, /return resourceRuntime\.list\(query, callOptions\);/);
+  assert.match(templateSource, /return resourceRuntime\.findById\(recordId, callOptions\);/);
+  assert.match(templateSource, /return resourceRuntime\.listByIds\(ids, callOptions\);/);
+  assert.match(templateSource, /return resourceRuntime\.listByForeignIds\(ids, foreignKey, callOptions\);/);
+  assert.match(templateSource, /return resourceRuntime\.create\(payload, callOptions\);/);
+  assert.match(templateSource, /return resourceRuntime\.updateById\(recordId, patch, callOptions\);/);
+  assert.match(templateSource, /return resourceRuntime\.deleteById\(recordId, callOptions\);/);
+  assert.match(templateSource, /async function listByForeignIds\(ids = \[\], foreignKey = "", callOptions = \{\}\) \{/);
+  assert.match(templateSource, /withTransaction: resourceRuntime\.withTransaction/);
+  assert.match(templateSource, /return Object\.freeze\(\{/);
+  assert.doesNotMatch(templateSource, /crudRepositoryList/);
 });
 
 test("crud actions and routes templates share LIST_CONFIG for cursor validation", async () => {
@@ -961,12 +967,12 @@ test("crud provider template uses shared lookup provider helpers instead of inli
 
   assert.match(
     templateSource,
-    /from "@jskit-ai\/crud-core\/server\/lookupProviders";/
+    /from "@jskit-ai\/crud-core\/server\/lookups";/
   );
-  assert.match(templateSource, /resolveLookupProvider: createCrudLookupProviderResolver\(scope\)/);
+  assert.match(templateSource, /resolveLookup: createCrudLookupResolver\(scope\)/);
   assert.match(
     templateSource,
-    /return createCrudLookupProvider\(scope\.make\("repository\.\$\{option:namespace\|snake\}"\), \{\s*ownershipFilter: crudPolicy\.ownershipFilter\s*\}\);/
+    /return createCrudLookup\(scope\.make\("repository\.\$\{option:namespace\|snake\}"\), \{\s*ownershipFilter: crudPolicy\.ownershipFilter\s*\}\);/
   );
   assert.doesNotMatch(templateSource, /normalizePathname\(relation\.apiPath\)/);
 });

package/test/crudService.test.js

@@ -96,7 +96,7 @@ test("crudService exports default realtime events for create/update/delete", ()
   assert.equal(serviceEvents.deleteRecord[0].realtime.event, "customers.record.changed");
 });
 
-test("crudService passes existing records into patch normalization via the shared CRUD service", async () => {
+test("crudService passes existing records into repository update options via the shared CRUD service", async () => {
   const calls = [];
   const service = createService({
     customersRepository: {
@@ -115,8 +115,8 @@ test("crudService passes existing records into patch normalization via the share
       async create(payload) {
         return { id: 1, ...payload };
       },
-      async updateById(recordId, payload) {
-        calls.push(["updateById", recordId, payload]);
+      async updateById(recordId, payload, options = {}) {
+        calls.push(["updateById", recordId, payload, options]);
         return {
           id: recordId,
           textField: payload.textField || "",
@@ -134,7 +134,14 @@ test("crudService passes existing records into patch normalization via the share
 
   assert.deepEqual(calls, [
     ["findById", 4],
-    ["updateById", 4, { textField: "Changed" }]
+    ["updateById", 4, { textField: "Changed" }, {
+      existingRecord: {
+        id: 4,
+        textField: "Existing",
+        dateField: "2026-03-11T00:00:00.000Z",
+        numberField: 3
+      }
+    }]
   ]);
 });
 

package/test-support/templateServerFixture.js

@@ -185,7 +185,7 @@ const patchBodyValidator = Object.freeze({
 });
 
 const resource = Object.freeze({
-  resource: "customers",
+  namespace: "customers",
   tableName: "customers",
   idColumn: "id",
   operations: {