instant-ctrl-flow-logic 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "instant-ctrl-flow-logic",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "private": false,
   "description": "InstantCtrlFlow 引擎：xnl bundle 加载 → 行为树编译 → 无状态单次执行",
   "type": "module",
@@ -12,7 +12,9 @@
   },
   "dependencies": {
     "depa-behavior-tree": "0.1.0",
-    "instant-ctrl-flow-contract": "0.1.0",
+    "flow-step-space-contract": "0.1.0",
+    "flow-step-space-logic": "0.1.0",
+    "instant-ctrl-flow-contract": "0.1.1",
     "xnl-core": "^0.1.8"
   },
   "files": [

package/src/filesystem.ts

@@ -3,6 +3,7 @@ import path from 'node:path';
 import { pathToFileURL } from 'node:url';
 import type { FlowCodeFunction, FlowCodeResolver, LoadFlowSourcesOptions } from 'instant-ctrl-flow-contract';
 import { loadFlowBundleFromSources, type LoadResult } from './loader.js';
+import { assembleDefinitionStepProfileDirectory } from 'flow-step-space-logic/filesystem';
 import { FlowLoadError, runInstantCtrlFlowSpec } from './engine.js';
 import type { InstantCtrlFlowRunOptions } from 'instant-ctrl-flow-contract';
 
@@ -18,6 +19,22 @@ export function loadFlowBundle(dir: string, options: LoadFlowSourcesOptions = {}
           content: fs.readFileSync(path.join(absoluteDir, entry.name), 'utf8'),
         }))
     : [];
+  for (const profileRoot of ['InstantCtrlFlow', 'WorkCtrlFlow', 'BPCtrlFlow']) {
+    const assembled = assembleDefinitionStepProfileDirectory(absoluteDir, profileRoot, options.stepSpace);
+    if (assembled.diagnostics.length > 0) {
+      return { diagnostics: assembled.diagnostics.map(({ code, message }) => ({ code, message })) };
+    }
+    if (!assembled.forest) continue;
+    const projectedSources = (assembled.sources as readonly ({ readonly ref: string; readonly content: string } | { readonly name: string; readonly content: string })[])
+      .map((source) => ({ name: 'name' in source ? source.name : source.ref, content: source.content }));
+    const loaded = loadFlowBundleFromSources(projectedSources, {
+      ...options,
+      baseUri: options.baseUri ?? absoluteDir,
+    });
+    return loaded.spec
+      ? { ...loaded, spec: { ...loaded.spec, definitionStepForest: assembled.forest } }
+      : loaded;
+  }
   return loadFlowBundleFromSources(sources, { ...options, baseUri: options.baseUri ?? absoluteDir });
 }
 

package/src/loader.ts

@@ -4,6 +4,8 @@
  * 完整 lint 由 tools/flow-dsl-check 承担；此处只做引擎必需的结构化与硬校验。
  */
 import { parseXnl } from 'xnl-core';
+import { assembleDefinitionStepProfileSources } from 'flow-step-space-logic';
+import type { DefinitionStepForest } from 'flow-step-space-contract';
 import type {
   FlowBundleSpec,
   CtrlFlowContract,
@@ -167,9 +169,26 @@ function loadCtrlFlowSources(
     }
   };
 
-  const sourceEntries = (Array.isArray(sources)
-    ? sources.map(({ name, content }) => ({ name, content }))
-    : Object.entries(sources).map(([name, content]) => ({ name, content })))
+  let definitionStepForest: DefinitionStepForest | undefined;
+  let effectiveSources = sources;
+  for (const candidateRoot of profile ? [profile.rootTag] : FORMS) {
+    const assembled = assembleDefinitionStepProfileSources(sources, candidateRoot, options.stepSpace);
+    if (assembled.diagnostics.length > 0) {
+      return { diagnostics: assembled.diagnostics.map(({ code, message }) => ({ code, message })) };
+    }
+    if (assembled.forest) {
+      effectiveSources = assembled.sources as FlowSourceCollection;
+      definitionStepForest = assembled.forest;
+      break;
+    }
+  }
+
+  const sourceEntries = (Array.isArray(effectiveSources)
+    ? effectiveSources.map((source) => ({
+        name: 'name' in source ? source.name : source.ref,
+        content: source.content,
+      }))
+    : Object.entries(effectiveSources).map(([name, content]) => ({ name, content })))
     .filter(({ name }) => name.endsWith('.xnl'))
     .sort((left, right) => left.name.localeCompare(right.name));
   const sourceNames = sourceEntries.map(({ name }) => name);
@@ -408,6 +427,7 @@ function loadCtrlFlowSources(
     baseUri: options.baseUri,
     dir: options.baseUri ?? '',
     statements: statementEls.map(toNodeSpec),
+    ...(definitionStepForest ? { definitionStepForest } : {}),
     flowContract,
     config,
     configDef,