@jskit-ai/json-rest-api-core 0.1.102 → 0.1.104-oldline.0

package/package.descriptor.mjs

@@ -0,0 +1,60 @@
+export default Object.freeze({
+  packageVersion: 1,
+  packageId: "@jskit-ai/json-rest-api-core",
+  version: "0.1.92",
+  kind: "runtime",
+  description: "Shared internal json-rest-api host runtime with autofilter, query-projection, and row-policy support.",
+  dependsOn: [
+    "@jskit-ai/database-runtime",
+    "@jskit-ai/kernel"
+  ],
+  capabilities: {
+    provides: [
+      "json-rest-api.core"
+    ],
+    requires: [
+      "runtime.database"
+    ]
+  },
+  runtime: {
+    server: {
+      providers: [
+        {
+          entrypoint: "src/server/JsonRestApiCoreServiceProvider.js",
+          export: "JsonRestApiCoreServiceProvider"
+        }
+      ]
+    },
+    client: {
+      providers: []
+    }
+  },
+  metadata: {
+    apiSummary: {
+      surfaces: [
+        {
+          subpath: "./server",
+          summary: "Exports the shared internal json-rest-api host token and resource registration helpers, including server-only row policies."
+        }
+      ],
+      containerTokens: {
+        server: [
+          "internal.json-rest-api"
+        ],
+        client: []
+      }
+    }
+  },
+  mutations: {
+    dependencies: {
+      runtime: {},
+      dev: {}
+    },
+    packageJson: {
+      scripts: {}
+    },
+    procfile: {},
+    files: [],
+    text: []
+  }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/json-rest-api-core",
-  "version": "0.1.102",
+  "version": "0.1.104-oldline.0",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -9,63 +9,8 @@
     "./server/jsonRestApiHost": "./src/server/jsonRestApiHost.js"
   },
   "dependencies": {
-    "@jskit-ai/database-runtime": "0.1.158",
-    "@jskit-ai/kernel": "0.1.158",
-    "@jskit-ai/resource-crud-core": "0.1.100",
     "hooked-api": "1.x.x",
-    "json-rest-api": "^1.0.27"
-  },
-  "description": "Shared internal json-rest-api host runtime with autofilter, query-projection, and row-policy support.",
-  "jskit": {
-    "kind": "runtime",
-    "capabilities": {
-      "provides": [
-        "json-rest-api.core"
-      ],
-      "requires": [
-        "runtime.database"
-      ]
-    },
-    "runtime": {
-      "server": {
-        "providers": [
-          {
-            "entrypoint": "src/server/JsonRestApiCoreServiceProvider.js",
-            "export": "JsonRestApiCoreServiceProvider"
-          }
-        ]
-      },
-      "client": {
-        "providers": []
-      }
-    },
-    "metadata": {
-      "apiSummary": {
-        "surfaces": [
-          {
-            "subpath": "./server",
-            "summary": "Exports the shared internal json-rest-api host token and resource registration helpers, including server-only row policies."
-          }
-        ],
-        "containerTokens": {
-          "server": [
-            "internal.json-rest-api"
-          ],
-          "client": []
-        }
-      }
-    },
-    "mutations": {
-      "dependencies": {
-        "runtime": {},
-        "dev": {}
-      },
-      "packageJson": {
-        "scripts": {}
-      },
-      "procfile": {},
-      "files": [],
-      "text": []
-    }
+    "json-rest-api": "^1.0.27",
+    "@jskit-ai/kernel": "0.1.147"
   }
 }

package/src/server/JsonRestApiCoreServiceProvider.js

@@ -3,6 +3,8 @@ import { registerJsonRestApiHost } from "./jsonRestApiHost.js";
 class JsonRestApiCoreServiceProvider {
   static id = "json-rest-api.core";
 
+  static dependsOn = ["runtime.database"];
+
   async boot(app) {
     await registerJsonRestApiHost(app);
   }

package/src/server/jsonRestApiHost.js

@@ -11,7 +11,7 @@ import {
   normalizeRecordId,
   normalizeUniqueTextList
 } from "@jskit-ai/kernel/shared/support/normalize";
-import { resolveCrudResourceScopeName } from "@jskit-ai/resource-crud-core/shared/crudLookup";
+import { resolveCrudResourceScopeName } from "@jskit-ai/kernel/shared/support/crudLookup";
 import {
   normalizeJsonApiFieldList,
   normalizeJsonApiFieldsets
@@ -108,6 +108,38 @@ function cloneJsonRestResourceValue(value, { writeSerializers = {} } = {}) {
   return next;
 }
 
+function applyJsonRestStorageColumns(scopeOptions = {}) {
+  const schema = normalizeJsonRestObject(scopeOptions.schema);
+  for (const [fieldName, fieldDefinition] of Object.entries(schema)) {
+    if (!isPlainJsonRestObject(fieldDefinition)) {
+      continue;
+    }
+
+    const actualField = normalizeJsonRestText(fieldDefinition.actualField);
+    if (!actualField) {
+      continue;
+    }
+
+    const storage = normalizeJsonRestObject(fieldDefinition.storage);
+    const storageColumn = normalizeJsonRestText(storage.column);
+    if (storage.virtual === true) {
+      throw new Error(
+        `json-rest-api schema field "${fieldName}" cannot define actualField when storage.virtual is true.`
+      );
+    }
+    if (storageColumn && storageColumn !== actualField) {
+      throw new Error(
+        `json-rest-api schema field "${fieldName}" actualField and storage.column must match.`
+      );
+    }
+
+    fieldDefinition.storage = {
+      ...storage,
+      column: actualField
+    };
+  }
+}
+
 function resolveCanonicalCalendarDate(value) {
   if (value instanceof Date) {
     return Number.isNaN(value.getTime())
@@ -677,6 +709,7 @@ function createJsonRestResourceScopeOptions(
   const scopeOptions = cloneJsonRestResourceValue(resource, {
     writeSerializers: normalizeJsonRestObject(writeSerializers)
   });
+  applyJsonRestStorageColumns(scopeOptions);
   applyJsonRestCalendarDateWriteSerializers(scopeOptions);
   if (isPlainJsonRestObject(searchSchema)) {
     scopeOptions.searchSchema = {

package/test/entrypoints.boundary.test.js

@@ -32,7 +32,7 @@ test("package exports include explicit server jsonRestApiHost entrypoint only",
   assert.equal(packageJson.dependencies?.["json-rest-api"], "^1.0.27");
 });
 
-test("server jsonRestApiHost entrypoint exposes only the focused host API", async () => {
+test("server jsonRestApiHost entrypoint no longer exports host-side JSON:API simplification helpers", async () => {
   const hostModule = await import("../src/server/jsonRestApiHost.js");
   assert.equal(Object.hasOwn(hostModule, "simplifyJsonApiDocument"), false);
 });
@@ -460,6 +460,48 @@ test("createJsonRestResourceScopeOptions clones canonical resource metadata and
   assert.equal(source.schema.createdAt.indexed, undefined);
 });
 
+test("createJsonRestResourceScopeOptions maps resource actualField values to storage columns", () => {
+  const resource = Object.freeze({
+    namespace: "products",
+    schema: Object.freeze({
+      price1: Object.freeze({ type: "number", actualField: "price_1" }),
+      price2: Object.freeze({
+        type: "number",
+        actualField: "price_2",
+        storage: Object.freeze({ writeSerializer: "decimal" })
+      })
+    }),
+    searchSchema: Object.freeze({
+      minimumPrice: Object.freeze({ type: "number", actualField: "price_1", filterOperator: ">=" })
+    })
+  });
+  const decimalSerializer = (value) => value;
+
+  const result = createJsonRestResourceScopeOptions(resource, {
+    writeSerializers: { decimal: decimalSerializer }
+  });
+
+  assert.equal(result.schema.price1.storage.column, "price_1");
+  assert.equal(result.schema.price2.storage.column, "price_2");
+  assert.equal(result.schema.price2.storage.serialize, decimalSerializer);
+  assert.equal(result.searchSchema.minimumPrice.actualField, "price_1");
+  assert.equal(result.searchSchema.minimumPrice.storage, undefined);
+  assert.equal(resource.schema.price1.storage, undefined);
+
+  assert.throws(
+    () => createJsonRestResourceScopeOptions({
+      schema: {
+        price1: {
+          type: "number",
+          actualField: "price_1",
+          storage: { column: "price1" }
+        }
+      }
+    }),
+    /actualField and storage\.column must match/
+  );
+});
+
 test("createJsonRestResourceScopeOptions maps server query projections into json-rest-api queryFields", () => {
   const select = ({ knex }) => knex.raw("1");
   const resource = {