@kubun/protocol 0.16.0 → 0.17.0

package/lib/models/cluster.js

@@ -167,11 +167,14 @@ export class ClusterBuilder {
             ...model.fieldsMeta
         };
         for (const [key, field] of Object.entries(fieldsMeta)){
-            if (field.type === 'document' && field.model != null && idMap[field.model] != null) {
-                fieldsMeta[key] = {
-                    ...field,
-                    model: idMap[field.model]
-                };
+            if (field.type === 'document' && field.model != null) {
+                const globalID = idMap[field.model];
+                if (globalID != null) {
+                    fieldsMeta[key] = {
+                        ...field,
+                        model: globalID
+                    };
+                }
             }
         }
         return {

package/lib/models/document.js

@@ -580,7 +580,7 @@ export class DocumentModelNormalizer {
                 continue;
             }
             const match = field.model.match(LOCAL_ID_REGEXP);
-            if (match != null) {
+            if (match?.[1] != null) {
                 this.#fieldsMeta[key] = {
                     ...field,
                     model: DocumentModelID.local(Number.parseInt(match[1], 10)).toString()

package/lib/models/graph.d.ts

@@ -20,6 +20,7 @@ export declare class GraphModel {
     get aliases(): Record<string, string>;
     get record(): DocumentModelsRecord;
     getAlias(modelID: string): string | null;
+    aliasID(alias: string): string;
     getModel(aliasOrID: string): DocumentModel | null;
     toJSON(): GraphModelJSON;
 }

package/lib/models/graph.js

@@ -42,6 +42,13 @@ export class GraphModel {
         }
         return null;
     }
+    aliasID(alias) {
+        const id = this.#aliases[alias];
+        if (id == null) {
+            throw new Error(`Unknown model alias: ${alias}`);
+        }
+        return id;
+    }
     getModel(aliasOrID) {
         const id = this.#aliases[aliasOrID] ?? aliasOrID;
         return this.#record[id] ?? null;

package/lib/models/optimal-clusters.js

@@ -57,13 +57,13 @@ import { ClusterBuilder, clusterToRecord } from './cluster.js';
         currentIndex++;
         stack.push(node);
         onStack[node] = true;
-        for (const dep of deps[node]){
+        for (const dep of deps[node] ?? []){
             if (dep >= n) continue;
             if (indices[dep] === -1) {
                 strongConnect(dep);
-                lowlinks[node] = Math.min(lowlinks[node], lowlinks[dep]);
+                lowlinks[node] = Math.min(lowlinks[node] ?? 0, lowlinks[dep] ?? 0);
             } else if (onStack[dep]) {
-                lowlinks[node] = Math.min(lowlinks[node], indices[dep]);
+                lowlinks[node] = Math.min(lowlinks[node] ?? 0, indices[dep] ?? 0);
             }
         }
         if (lowlinks[node] === indices[node]) {
@@ -84,7 +84,7 @@ import { ClusterBuilder, clusterToRecord } from './cluster.js';
         }
     }
     // Sort each SCC internally and sort SCCs by smallest index
-    return sccs.map((scc)=>scc.sort((a, b)=>a - b)).sort((a, b)=>a[0] - b[0]);
+    return sccs.map((scc)=>scc.sort((a, b)=>a - b)).sort((a, b)=>(a[0] ?? 0) - (b[0] ?? 0));
 }
 /**
  * Find cluster groups from model definitions.
@@ -106,7 +106,7 @@ import { ClusterBuilder, clusterToRecord } from './cluster.js';
     const localInterfaceDeps = new Map();
     for (const origIdx of group){
         const filtered = new Set();
-        for (const dep of interfaceDeps[origIdx]){
+        for (const dep of interfaceDeps[origIdx] ?? []){
             if (groupSet.has(dep)) filtered.add(dep);
         }
         localInterfaceDeps.set(origIdx, filtered);
@@ -116,10 +116,15 @@ import { ClusterBuilder, clusterToRecord } from './cluster.js';
         remaining.set(origIdx, localInterfaceDeps.get(origIdx)?.size ?? 0);
     }
     const sorted = [];
-    const ready = group.filter((idx)=>(remaining.get(idx) ?? 0) === 0).map((idx)=>({
-            originalIndex: idx,
-            model: models[idx]
-        })).sort((a, b)=>a.model.name.localeCompare(b.model.name));
+    const ready = group.filter((idx)=>(remaining.get(idx) ?? 0) === 0).flatMap((idx)=>{
+        const model = models[idx];
+        return model == null ? [] : [
+            {
+                originalIndex: idx,
+                model
+            }
+        ];
+    }).sort((a, b)=>a.model.name.localeCompare(b.model.name));
     while(ready.length > 0){
         const next = ready.shift();
         if (next == null) break;
@@ -129,9 +134,11 @@ import { ClusterBuilder, clusterToRecord } from './cluster.js';
                 const count = (remaining.get(origIdx) ?? 1) - 1;
                 remaining.set(origIdx, count);
                 if (count === 0) {
+                    const model = models[origIdx];
+                    if (model == null) continue;
                     const entry = {
                         originalIndex: origIdx,
-                        model: models[origIdx]
+                        model
                     };
                     const insertIdx = ready.findIndex((r)=>r.model.name.localeCompare(entry.model.name) > 0);
                     if (insertIdx === -1) {
@@ -145,9 +152,9 @@ import { ClusterBuilder, clusterToRecord } from './cluster.js';
     }
     // Build mapping: original index → new cluster-internal index
     const internalIndexMap = new Map();
-    for(let newIndex = 0; newIndex < sorted.length; newIndex++){
-        internalIndexMap.set(sorted[newIndex].originalIndex, newIndex);
-    }
+    sorted.forEach((entry, newIndex)=>{
+        internalIndexMap.set(entry.originalIndex, newIndex);
+    });
     // Rewrite references
     return sorted.map(({ model })=>{
         const rewritten = {
@@ -207,7 +214,7 @@ import { ClusterBuilder, clusterToRecord } from './cluster.js';
     // Map each model index to its group index
     const modelToGroup = new Map();
     for(let gi = 0; gi < groups.length; gi++){
-        for (const modelIdx of groups[gi]){
+        for (const modelIdx of groups[gi] ?? []){
             modelToGroup.set(modelIdx, gi);
         }
     }
@@ -216,19 +223,21 @@ import { ClusterBuilder, clusterToRecord } from './cluster.js';
         length: groups.length
     }, ()=>new Set());
     for(let gi = 0; gi < groups.length; gi++){
-        for (const modelIdx of groups[gi]){
+        const gd = groupDeps[gi];
+        if (gd == null) continue;
+        for (const modelIdx of groups[gi] ?? []){
             // Interface deps
-            for (const dep of interfaceDeps[modelIdx]){
+            for (const dep of interfaceDeps[modelIdx] ?? []){
                 const depGroup = modelToGroup.get(dep);
                 if (depGroup != null && depGroup !== gi) {
-                    groupDeps[gi].add(depGroup);
+                    gd.add(depGroup);
                 }
             }
             // One-way fieldsMeta deps (to models outside this group)
-            for (const dep of fieldsMetaDeps[modelIdx]){
+            for (const dep of fieldsMetaDeps[modelIdx] ?? []){
                 const depGroup = modelToGroup.get(dep);
                 if (depGroup != null && depGroup !== gi) {
-                    groupDeps[gi].add(depGroup);
+                    gd.add(depGroup);
                 }
             }
         }
@@ -242,9 +251,10 @@ import { ClusterBuilder, clusterToRecord } from './cluster.js';
         if (next == null) break;
         sorted.push(next);
         for(let gi = 0; gi < groupDeps.length; gi++){
-            if (groupDeps[gi].has(next)) {
-                remaining[gi]--;
-                if (remaining[gi] === 0) {
+            if (groupDeps[gi]?.has(next)) {
+                const count = (remaining[gi] ?? 0) - 1;
+                remaining[gi] = count;
+                if (count === 0) {
                     ready.push(gi);
                 }
             }
@@ -269,6 +279,7 @@ function buildOptimalClusters(models, externalClusters) {
     const result = [];
     for (const groupIdx of buildOrder){
         const group = groups[groupIdx];
+        if (group == null) continue;
         const prepared = prepareClusterModels(models, group, interfaceDeps, globalIDMap);
         const builder = new ClusterBuilder({
             externalClusters: Object.keys(builtClusters).length > 0 ? builtClusters : undefined
@@ -278,11 +289,12 @@ function buildOptimalClusters(models, externalClusters) {
         result.push(cluster);
         // Record global IDs for models in this cluster
         const clusterDigest = digestJSON(cluster.models);
-        for(let i = 0; i < group.length; i++){
+        for (const origIdx of group){
             // Find which cluster-internal index corresponds to this original model
             // prepareClusterModels sorts by interface deps + name, so we match by name
-            const origIdx = group[i];
-            const modelName = models[origIdx].name;
+            const model = models[origIdx];
+            if (model == null) continue;
+            const modelName = model.name;
             const clusterInternalIdx = cluster.models.findIndex((m)=>m.name === modelName);
             if (clusterInternalIdx !== -1) {
                 const globalID = new DocumentModelID(clusterDigest, clusterInternalIdx);

package/lib/services/graph.d.ts

@@ -3586,6 +3586,9 @@ export declare const mutateGraphParams: {
                 readonly type: "null";
             }];
         };
+        readonly owner: {
+            readonly type: "string";
+        };
         readonly transactionID: {
             readonly type: "string";
         };
@@ -7119,6 +7122,9 @@ export declare const graphProtocol: {
                         readonly type: "null";
                     }];
                 };
+                readonly owner: {
+                    readonly type: "string";
+                };
                 readonly transactionID: {
                     readonly type: "string";
                 };

package/lib/services/graph.js

@@ -227,6 +227,9 @@ export const mutateGraphParams = {
                 }
             ]
         },
+        owner: {
+            type: 'string'
+        },
         transactionID: {
             type: 'string'
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/protocol",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "keywords": [],
   "license": "see LICENSE.md",
   "sideEffects": false,
@@ -17,8 +17,8 @@
   "dependencies": {
     "@enkaku/protocol": "^0.21.1",
     "@enkaku/server": "^0.21.2",
-    "@kubun/id": "^0.16.0",
-    "@kubun/logger": "^0.16.0",
+    "@kubun/id": "^0.17.0",
+    "@kubun/logger": "^0.17.0",
     "@sozai/codec": "^0.4.0",
     "@sozai/schema": "^0.1.2",
     "change-case": "^5.4.4"
@@ -33,8 +33,8 @@
   "scripts": {
     "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:types",
     "build:clean": "del lib",
-    "build:js": "swc src -d ./lib --config-file ../../node_modules/@kigu/dev/swc.json --strip-leading-paths",
-    "build:types": "tsc --emitDeclarationOnly --skipLibCheck",
+    "build:js": "del 'lib/**/*.js' && swc src -d ./lib --config-file ../../node_modules/@kigu/dev/swc.json --strip-leading-paths",
+    "build:types": "del 'lib/**/*.d.ts' 'lib/**/*.d.ts.map' && tsc --emitDeclarationOnly --skipLibCheck",
     "build:types:ci": "tsc --emitDeclarationOnly --declarationMap false",
     "test": "pnpm run test:types && pnpm run test:unit",
     "test:types": "tsc --noEmit -p tsconfig.test.json",