instant-ctrl-flow-logic 0.1.3 → 0.1.4

package/package.json

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

package/src/filesystem.ts

@@ -3,13 +3,17 @@ 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 {
+  assembleDefinitionStepProfileDirectory,
+  createFilesystemDefinitionStepProfileRuntime,
+} from 'flow-step-space-logic/filesystem';
 import { FlowLoadError, runInstantCtrlFlowSpec } from './engine.js';
 import type { InstantCtrlFlowRunOptions } from 'instant-ctrl-flow-contract';
 
 /** Filesystem convenience only; parsing and validation belong to the named-source loader. */
 export function loadFlowBundle(dir: string, options: LoadFlowSourcesOptions = {}): LoadResult {
   const absoluteDir = path.resolve(dir);
+  const stepRuntime = createFilesystemDefinitionStepProfileRuntime({ rootDir: absoluteDir });
   const sources = fs.existsSync(absoluteDir)
     ? fs.readdirSync(absoluteDir, { withFileTypes: true })
         .filter((entry) => entry.isFile() && entry.name.endsWith('.xnl'))
@@ -20,7 +24,11 @@ export function loadFlowBundle(dir: string, options: LoadFlowSourcesOptions = {}
         }))
     : [];
   for (const profileRoot of ['InstantCtrlFlow', 'WorkCtrlFlow', 'BPCtrlFlow']) {
-    const assembled = assembleDefinitionStepProfileDirectory(absoluteDir, profileRoot, options.stepSpace);
+    const assembled = assembleDefinitionStepProfileDirectory(
+      stepRuntime,
+      {},
+      { ...(options.stepSpace ?? {}), profileRoot },
+    );
     if (assembled.diagnostics.length > 0) {
       return { diagnostics: assembled.diagnostics.map(({ code, message }) => ({ code, message })) };
     }

package/src/loader.ts

@@ -4,8 +4,11 @@
  * 完整 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 {
+  assembleDefinitionStepProfile,
+  createDefinitionStepSourceRuntime,
+} from 'flow-step-space-logic';
+import type { DefinitionStepForest, DefinitionStepSourceCollection } from 'flow-step-space-contract';
 import type {
   FlowBundleSpec,
   CtrlFlowContract,
@@ -171,8 +174,16 @@ function loadCtrlFlowSources(
 
   let definitionStepForest: DefinitionStepForest | undefined;
   let effectiveSources = sources;
+  const definitionSources: DefinitionStepSourceCollection = Array.isArray(sources)
+    ? sources.map((source) => ({ ref: source.name, content: source.content }))
+    : Object.entries(sources).map(([ref, content]) => ({ ref, content }));
+  const stepRuntime = createDefinitionStepSourceRuntime(definitionSources);
   for (const candidateRoot of profile ? [profile.rootTag] : FORMS) {
-    const assembled = assembleDefinitionStepProfileSources(sources, candidateRoot, options.stepSpace);
+    const assembled = assembleDefinitionStepProfile(
+      stepRuntime,
+      { sources: definitionSources },
+      { ...(options.stepSpace ?? {}), profileRoot: candidateRoot },
+    );
     if (assembled.diagnostics.length > 0) {
       return { diagnostics: assembled.diagnostics.map(({ code, message }) => ({ code, message })) };
     }