@jskit-ai/kernel 0.1.36 → 0.1.38

package/client/index.d.ts

@@ -34,6 +34,7 @@ export function bootstrapClientShellApp(options?: {
   rootComponent: any;
   appConfig?: Record<string, any>;
   appPlugins?: any[];
+  pinia?: any;
   router: any;
   bootClientModules: (context: any) => Promise<any>;
   surfaceRuntime: any;

package/client/moduleBootstrap.js

@@ -482,6 +482,7 @@ function normalizeClientModuleEntries(clientModules) {
 function createClientRuntimeApp({
   profile = "client",
   app,
+  pinia = null,
   router,
   env,
   logger,
@@ -496,6 +497,7 @@ function createClientRuntimeApp({
   runtimeApp.instance("jskit.client.runtime.app", runtimeApp);
   runtimeApp.instance("jskit.client.router", router || null);
   runtimeApp.instance("jskit.client.vue.app", app || null);
+  runtimeApp.instance("jskit.client.pinia", pinia);
   runtimeApp.instance("jskit.client.env", isRecord(env) ? { ...env } : {});
   runtimeApp.instance("jskit.client.surface.runtime", surfaceRuntime || null);
   runtimeApp.instance("jskit.client.surface.mode", String(surfaceMode || "").trim());
@@ -507,6 +509,7 @@ function createClientRuntimeApp({
 async function bootClientModules({
   clientModules = [],
   app,
+  pinia = null,
   router,
   surfaceRuntime,
   surfaceMode,
@@ -525,6 +528,7 @@ async function bootClientModules({
   const runtimeApp = createClientRuntimeApp({
     profile: String(surfaceRuntime.normalizeSurfaceMode(surfaceMode) || "client"),
     app,
+    pinia,
     router,
     env,
     logger: log,

package/client/moduleBootstrap.test.js

@@ -112,11 +112,14 @@ test("bootClientModules registers descriptor and clientRoutes with providers onl
   const surfaceRuntime = createSurfaceRuntimeFixture();
   const events = [];
   const loginComponent = {};
+  const pinia = { id: "pinia-instance" };
+  const implicitPinia = { id: "implicit-vue-global-pinia" };
   class ExampleClientProvider {
     static id = "example.client";
     register(app) {
       events.push("register");
       app.instance("example.value", 42);
+      app.instance("example.pinia", app.make("jskit.client.pinia"));
     }
     boot() {
       events.push("boot");
@@ -179,6 +182,14 @@ test("bootClientModules registers descriptor and clientRoutes with providers onl
         }
       }
     ],
+    app: {
+      config: {
+        globalProperties: {
+          $pinia: implicitPinia
+        }
+      }
+    },
+    pinia,
     router,
     surfaceRuntime,
     surfaceMode: "all",
@@ -194,6 +205,8 @@ test("bootClientModules registers descriptor and clientRoutes with providers onl
   assert.equal(router.routes[1].path, "/auth/login");
   assert.equal(router.routes[1].component, loginComponent);
   assert.equal(result.runtimeApp.make("example.value"), 42);
+  assert.equal(result.runtimeApp.make("example.pinia"), pinia);
+  assert.notEqual(result.runtimeApp.make("example.pinia"), implicitPinia);
 });
 
 test("bootClientModules does not auto-discover providers from module exports", async () => {

package/client/shellBootstrap.js

@@ -108,6 +108,7 @@ async function bootstrapClientShellApp({
   rootComponent,
   appConfig = {},
   appPlugins = [],
+  pinia = null,
   router,
   bootClientModules,
   surfaceRuntime,
@@ -158,6 +159,7 @@ async function bootstrapClientShellApp({
 
   const clientBootstrap = await bootClientModules({
     app,
+    pinia,
     router,
     surfaceRuntime,
     surfaceMode,

package/client/shellBootstrap.test.js

@@ -85,6 +85,7 @@ test("bootstrapClientShellApp boots modules, reinstalls fallback route, and moun
   const logs = [];
   const surfaceRuntime = createSurfaceRuntimeFixture();
   const plugin = { name: "vuetify-like-plugin" };
+  const pinia = { id: "pinia-instance" };
   const fallbackRoute = {
     name: "not-found",
     path: "/:pathMatch(.*)*",
@@ -140,10 +141,12 @@ test("bootstrapClientShellApp boots modules, reinstalls fallback route, and moun
       }
     },
     appPlugins: [plugin],
+    pinia,
     router,
     bootClientModules: async (context) => {
       calls.push("bootClientModules");
       assert.equal(context.app, app);
+      assert.equal(context.pinia, pinia);
       assert.equal(context.router, router);
       assert.equal(typeof context.logger.debug, "function");
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/kernel",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "type": "module",
   "dependencies": {
     "typebox": "^1.0.81"

package/server/registries/bootstrapPayloadContributorRegistry.js

@@ -9,8 +9,21 @@ function registerBootstrapPayloadContributor(app, token, factory) {
 
 function resolveBootstrapPayloadContributors(scope) {
   return resolveTaggedEntries(scope, "jskit.runtime.bootstrap.payloadContributors")
-    .map((entry) => normalizeContributorEntry(entry))
-    .filter(Boolean);
+    .map((entry, index) => ({
+      contributor: normalizeContributorEntry(entry),
+      index
+    }))
+    .filter((entry) => Boolean(entry.contributor))
+    .sort((left, right) => {
+      const leftOrder = Number.isFinite(left.contributor?.order) ? Number(left.contributor.order) : 0;
+      const rightOrder = Number.isFinite(right.contributor?.order) ? Number(right.contributor.order) : 0;
+      if (leftOrder !== rightOrder) {
+        return leftOrder - rightOrder;
+      }
+
+      return left.index - right.index;
+    })
+    .map((entry) => entry.contributor);
 }
 
 async function resolveBootstrapPayload(scope, context = {}) {

package/server/runtime/bootstrapContributors.test.js

@@ -87,6 +87,58 @@ test("resolveBootstrapPayload applies contributors in deterministic token order"
   });
 });
 
+test("resolveBootstrapPayload honors explicit contributor order before token order", async () => {
+  const app = createContainer();
+  const calls = [];
+
+  registerBootstrapPayloadContributor(app, "test.bootstrap.alpha", () => ({
+    contributorId: "alpha",
+    order: 200,
+    contribute({ payload }) {
+      calls.push({
+        contributorId: "alpha",
+        payload
+      });
+      return {
+        alpha: true
+      };
+    }
+  }));
+
+  registerBootstrapPayloadContributor(app, "test.bootstrap.zeta", () => ({
+    contributorId: "zeta",
+    order: 100,
+    contribute({ payload }) {
+      calls.push({
+        contributorId: "zeta",
+        payload
+      });
+      return {
+        zeta: true
+      };
+    }
+  }));
+
+  const payload = await resolveBootstrapPayload(app);
+
+  assert.deepEqual(calls, [
+    {
+      contributorId: "zeta",
+      payload: {}
+    },
+    {
+      contributorId: "alpha",
+      payload: {
+        zeta: true
+      }
+    }
+  ]);
+  assert.deepEqual(payload, {
+    zeta: true,
+    alpha: true
+  });
+});
+
 test("resolveBootstrapPayload ignores non-object contributions", async () => {
   const app = createContainer();