@jskit-ai/json-rest-api-core 0.1.103 → 0.1.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/json-rest-api-core",
-  "version": "0.1.103",
+  "version": "0.1.104",
   "type": "module",
   "scripts": {
     "test": "node --test"
@@ -9,9 +9,9 @@
     "./server/jsonRestApiHost": "./src/server/jsonRestApiHost.js"
   },
   "dependencies": {
-    "@jskit-ai/database-runtime": "0.1.159",
-    "@jskit-ai/kernel": "0.1.159",
-    "@jskit-ai/resource-crud-core": "0.1.101",
+    "@jskit-ai/database-runtime": "0.1.160",
+    "@jskit-ai/kernel": "0.1.160",
+    "@jskit-ai/resource-crud-core": "0.1.102",
     "hooked-api": "1.x.x",
     "json-rest-api": "^1.0.27"
   },
@@ -20,7 +20,7 @@
     "kind": "runtime",
     "capabilities": {
       "provides": [
-        "json-rest-api.core"
+        "runtime.json-rest-api"
       ],
       "requires": [
         "runtime.database"
@@ -30,8 +30,8 @@
       "server": {
         "providers": [
           {
-            "entrypoint": "src/server/JsonRestApiCoreServiceProvider.js",
-            "export": "JsonRestApiCoreServiceProvider"
+            "entrypoint": "src/server/JsonRestApiProvider.js",
+            "export": "JsonRestApiProvider"
           }
         ]
       },
@@ -44,28 +44,10 @@
         "surfaces": [
           {
             "subpath": "./server",
-            "summary": "Exports the shared internal json-rest-api host token and resource registration helpers, including server-only row policies."
+            "summary": "Provides runtime.json-rest-api and exports focused resource/query helpers, including server-only row policies."
           }
-        ],
-        "containerTokens": {
-          "server": [
-            "internal.json-rest-api"
-          ],
-          "client": []
-        }
+        ]
       }
-    },
-    "mutations": {
-      "dependencies": {
-        "runtime": {},
-        "dev": {}
-      },
-      "packageJson": {
-        "scripts": {}
-      },
-      "procfile": {},
-      "files": [],
-      "text": []
     }
   }
 }

package/src/server/JsonRestApiProvider.js

@@ -0,0 +1,19 @@
+import { defineProvider } from "@jskit-ai/kernel/shared/capabilities";
+import { createJsonRestApiHost } from "./jsonRestApiHost.js";
+
+const JsonRestApiProvider = defineProvider({
+  id: "runtime.json-rest-api",
+  requires: {
+    database: "runtime.database"
+  },
+  provides: {
+    jsonRestApi: "runtime.json-rest-api"
+  },
+  async setup({ database }) {
+    return {
+      jsonRestApi: await createJsonRestApiHost({ knex: database.knex })
+    };
+  }
+});
+
+export { JsonRestApiProvider };

package/src/server/jsonRestApiHost.js

@@ -18,8 +18,6 @@ import {
 } from "@jskit-ai/kernel/shared/support/jsonApiFieldsets";
 import { AppError } from "@jskit-ai/kernel/server/runtime/errors";
 
-const INTERNAL_JSON_REST_API = "internal.json-rest-api";
-
 const JSON_REST_AUTOFILTER_PRESETS = Object.freeze({
   public: Object.freeze([]),
   workspace: Object.freeze([
@@ -837,23 +835,7 @@ async function createJsonRestApiHost({ knex }) {
   return api;
 }
 
-async function registerJsonRestApiHost(app) {
-  if (!app || typeof app.instance !== "function" || typeof app.make !== "function" || typeof app.has !== "function") {
-    throw new Error("registerJsonRestApiHost requires application instance()/make()/has().");
-  }
-
-  if (app.has(INTERNAL_JSON_REST_API)) {
-    return app.make(INTERNAL_JSON_REST_API);
-  }
-
-  const knex = app.make("jskit.database.knex");
-  const api = await createJsonRestApiHost({ knex });
-  app.instance(INTERNAL_JSON_REST_API, api);
-  return api;
-}
-
 export {
-  INTERNAL_JSON_REST_API,
   JSON_REST_AUTOFILTER_PRESETS,
   addResourceIfMissing,
   buildJsonRestQueryParams,
@@ -867,6 +849,5 @@ export {
   returnBadRequestWhenJsonRestFieldsetInvalid,
   resolveWorkspaceScopeValue,
   resolveUserScopeValue,
-  createJsonRestApiHost,
-  registerJsonRestApiHost
+  createJsonRestApiHost
 };

package/test/entrypoints.boundary.test.js

@@ -6,7 +6,6 @@ import { normalizeRecordId } from "@jskit-ai/kernel/shared/support/normalize";
 import { RestApiFieldsetError } from "json-rest-api";
 
 import {
-  INTERNAL_JSON_REST_API,
   addResourceIfMissing,
   buildJsonRestQueryParams,
   createJsonApiInputRecord,
@@ -16,13 +15,12 @@ import {
   createJsonRestApiHost,
   extractJsonRestCollectionRows,
   isJsonRestResourceMissingError,
-  registerJsonRestApiHost,
   returnNullWhenJsonRestResourceMissing,
   returnBadRequestWhenJsonRestFieldsetInvalid,
   resolveWorkspaceScopeValue,
   resolveUserScopeValue
 } from "../src/server/jsonRestApiHost.js";
-import { JsonRestApiCoreServiceProvider } from "../src/server/JsonRestApiCoreServiceProvider.js";
+import { JsonRestApiProvider } from "../src/server/JsonRestApiProvider.js";
 
 test("package exports include explicit server jsonRestApiHost entrypoint only", async () => {
   const packageJson = JSON.parse(await readFile(new URL("../package.json", import.meta.url), "utf8"));
@@ -38,7 +36,6 @@ test("server jsonRestApiHost entrypoint exposes only the focused host API", asyn
 });
 
 test("server entrypoint exports shared host helpers", () => {
-  assert.equal(INTERNAL_JSON_REST_API, "internal.json-rest-api");
   assert.equal(typeof addResourceIfMissing, "function");
   assert.equal(typeof buildJsonRestQueryParams, "function");
   assert.equal(typeof createJsonApiInputRecord, "function");
@@ -48,12 +45,13 @@ test("server entrypoint exports shared host helpers", () => {
   assert.equal(typeof createJsonRestApiHost, "function");
   assert.equal(typeof extractJsonRestCollectionRows, "function");
   assert.equal(typeof isJsonRestResourceMissingError, "function");
-  assert.equal(typeof registerJsonRestApiHost, "function");
   assert.equal(typeof returnNullWhenJsonRestResourceMissing, "function");
   assert.equal(typeof returnBadRequestWhenJsonRestFieldsetInvalid, "function");
   assert.equal(typeof resolveWorkspaceScopeValue, "function");
   assert.equal(typeof resolveUserScopeValue, "function");
-  assert.equal(typeof JsonRestApiCoreServiceProvider, "function");
+  assert.equal(JsonRestApiProvider.id, "runtime.json-rest-api");
+  assert.deepEqual(JsonRestApiProvider.requires, { database: "runtime.database" });
+  assert.deepEqual(JsonRestApiProvider.provides, { jsonRestApi: "runtime.json-rest-api" });
 });
 
 test("createJsonRestContext returns a mutable clone for frozen JSKIT execution context", () => {

package/src/server/JsonRestApiCoreServiceProvider.js

@@ -1,11 +0,0 @@
-import { registerJsonRestApiHost } from "./jsonRestApiHost.js";
-
-class JsonRestApiCoreServiceProvider {
-  static id = "json-rest-api.core";
-
-  async boot(app) {
-    await registerJsonRestApiHost(app);
-  }
-}
-
-export { JsonRestApiCoreServiceProvider };