@faicad/faijs 0.29.5 → 0.31.1

package/dist/cad-runtime/runtime.js

@@ -20,14 +20,14 @@ import { getBrepEngine, hasBrepEngine, getActiveBrepEngineId, getMeshSolidBacken
 import { ensureOcctDefaultEngine } from '../brep/engine/adapters/occt.js';
 import { MeshSolidRegistry } from '../brep/mesh-solid.js';
 import { ParseError } from '../lang/parse-error.js';
-import { buildSolidTopologyRuntime } from '../brep/brep-topology.js';
+import { buildSolidTopologyRuntime, buildCompoundTopologyRuntime } from '../brep/brep-topology.js';
 import { buildTopologyFromMesh } from '../brep/brep-topology.js';
 import { asPartName } from '../identity.js';
 import { DirectExecutor } from './direct-executor.js';
 import { ModuleRegistry, ModuleRegistryError, isRelativeSpecifier } from './module-registry.js';
 import { computeLiveShapes, lineConsumes, blockConsumes } from './live-shapes.js';
 import { extractMetadata } from '../lang/metadata-extractor.js';
-import { configureBackends, CONTRACT_VERSION, assertContractVersion, } from '../runtime-state.js';
+import { configureBackends, CONTRACT_VERSION, assertContractVersion, configureTessellation, } from '../runtime-state.js';
 import { admitCompatLib } from './admit-compat-lib.js';
 import { hasDualOp, dualOpMetaOf } from '../define-op.js';
 import { computeLibId } from './lib-id.js';
@@ -118,7 +118,6 @@ export class CadRuntime {
     // P0 增量闸门用：上次成功执行的指纹快照
     lastParamsFingerprint = null;
     lastLibIdsFingerprint = null;
-    lastPartTransformFingerprint = null;
     lastHadKinematics = false;
     /**
      * PartName → OCCT 实体句柄，跨 execute 存活，持有所有权（顶替释放/删除/dispose 的唯一操作对象）。
@@ -200,8 +199,7 @@ export class CadRuntime {
      * @param options - registration hints. `packageName` declares the npm package
      *   backing this binding so `check()` can validate script import specifiers
      *   against registered libraries (specifier mismatch = hard check error).
-     *   `borrow: false` marks a faijs-native library (sheetmetal): compatOp must
-     *   not borrow inputs into brepjs handle form (compat-op.ts CompatSpec.borrow).
+  
      */
     registerLib(binding, ns, options) {
         assertContractVersion(ns);
@@ -213,10 +211,10 @@ export class CadRuntime {
         // skip the strict validation pass (R8).
         // Naming (2026-09-23): library authors no longer declare face naming; every
         // bare function is admitted with the default unmodeled provenance (see
-        // admit-compat-lib.ts / docs/plans/2026-09-23-relax-lib-naming-design.md).
+        // admit-compat-lib.ts).
         const lift = options?.autoLift ?? !hasDualOp(ns);
         const admitted = lift
-            ? admitCompatLib(ns, { borrow: options?.borrow })
+            ? admitCompatLib(ns)
             : ns;
         this.libs[binding] = admitted;
         this.libIds.set(binding, computeLibId(binding, ns));
@@ -276,6 +274,8 @@ export class CadRuntime {
         this.namespaces = { ...libs };
         this.securityPolicy = options.security ?? 'strict';
         this.determinismPolicy = options.determinism ?? 'error';
+        if (options.tessellation)
+            configureTessellation(options.tessellation);
         // P6/D7: register script-side unit constants (MM, INCH, DEGREE, …) on globalThis.
         // Both the VM backend (new Function resolves free identifiers from the global scope)
         // and the interpreter backend (env.ts reads globalThis[name] for S4_SAFE_GLOBALS)
@@ -319,11 +319,8 @@ export class CadRuntime {
                 get brepEngineId() {
                     return getActiveBrepEngineId();
                 },
-                get brepCapabilities() {
-                    return brepChainOf()?.capabilities;
-                },
-                get partTransform() {
-                    return brepChainOf()?.partTransform;
+                get hostEnv() {
+                    return portsOf().hostEnv;
                 },
             },
             kernel: {
@@ -371,7 +368,6 @@ export class CadRuntime {
         this.brepChain = {
             solidCache: this.solidCache,
             kernel,
-            capabilities: engine?.capabilities,
             faceEvolutionCache: this.faceEvolutionCache,
             roleTableCache: this.roleTableCache,
             meshShapeCache: new Map(),
@@ -542,13 +538,7 @@ export class CadRuntime {
         const moduleLoad = await this.loadDirectModuleImports(meta, opts?.entryKey);
         if (!('seed' in moduleLoad))
             return moduleLoad;
-        const brepChain = await this.ensureBrepChain();
-        if (opts?.partTransform?.position) {
-            brepChain.partTransform = {
-                position: opts.partTransform.position,
-                scale: opts.partTransform.scale,
-            };
-        }
+        await this.ensureBrepChain();
         const outcome = await de.execute(code, {
             imports: moduleLoad.seed,
             params: opts?.params,
@@ -635,13 +625,7 @@ export class CadRuntime {
         const moduleLoad = await this.loadDirectModuleImports(meta, opts?.entryKey);
         if (!('seed' in moduleLoad))
             return moduleLoad;
-        const brepChain = await this.ensureBrepChain();
-        if (opts?.partTransform?.position) {
-            brepChain.partTransform = {
-                position: opts.partTransform.position,
-                scale: opts.partTransform.scale,
-            };
-        }
+        await this.ensureBrepChain();
         const outcome = await de.append(code, {
             imports: moduleLoad.seed,
             params: opts?.params,
@@ -762,6 +746,18 @@ export class CadRuntime {
                     output: shape,
                 });
             }
+            else if (isCompoundLike(v)) {
+                // P2（2026-10-06-step-3mf-multipart-import-plan.md §7）：多零件 load 的
+                // 输出是 compound（无 positions/indices）——必须整体缓存，否则宿主经
+                // `getCachedOutput` 指令取不到多零件几何（探针实测：返回 undefined →
+                // "load produced no geometry"）。content key 退化为占位（compound 无
+                // 单一网格可哈希）。
+                this.statementCache.set(name, {
+                    statementKey: `direct:${String(name)}`,
+                    outputContentKey: `direct:compound:${String(name)}`,
+                    output: v,
+                });
+            }
         }
         // T3-cond：DAG 叶子终端判定换 computeLiveShapes（§4.4）——输入换源：
         // 候选 = ctx 键；行内 keep 查 metadata.keep 表；函数体 exec.keep 登记读
@@ -801,6 +797,18 @@ export class CadRuntime {
             const buildFor = (partName) => {
                 if (topology.has(partName))
                     return;
+                const v = de.getCtxVar(String(partName));
+                // 多零件 load（compound）：成员各带 BREP solid（fromBrep(shape,{solid})，
+                // 装配变换经 brepOf(child) 读回），但 compound 终端无单一 solidCache 键
+                // ——buildBrepTopology 必 miss。按成员合并构建 occurrence-aware 拓扑，
+                // 否则多 solid STEP 导入后该终端无拓扑 → 宿主面拾取/装配 overlay 缺失
+                // （assembly-dropdown 多文件回归）。
+                if (isCompoundLike(v)) {
+                    const rt = this.buildCompoundBrepTopology(v);
+                    if (rt)
+                        topology.set(partName, { partName, source: 'brep', data: runtimeToData(rt) });
+                    return;
+                }
                 const rt = this.buildBrepTopology(partName);
                 if (rt)
                     topology.set(partName, { partName, source: 'brep', data: runtimeToData(rt) });
@@ -808,7 +816,7 @@ export class CadRuntime {
             if (topoMode === 'brep') {
                 for (const name of shapeVarNames) {
                     const v = de.getCtxVar(String(name));
-                    if (isShapeLike(v))
+                    if (isShapeLike(v) || isCompoundLike(v))
                         buildFor(name);
                 }
             }
@@ -842,6 +850,7 @@ export class CadRuntime {
             kinematics: de.kinematicsSnapshot.size > 0 ? de.kinematicsSnapshot : undefined,
             detectedUnits: de.detectedUnitsSnapshot.size > 0 ? de.detectedUnitsSnapshot : undefined,
             multiPartCounts: de.multiPartCountSnapshot.size > 0 ? de.multiPartCountSnapshot : undefined,
+            importModels: de.importModelsSnapshot.size > 0 ? de.importModelsSnapshot : undefined,
             changed: deChanged ? deChanged.map(asPartName) : undefined,
             activeValues: activeValues.size > 0 ? activeValues : undefined,
         };
@@ -1210,6 +1219,21 @@ export class CadRuntime {
         const result = buildSolidTopologyRuntime(brepChain.kernel, solid);
         return result.runtime;
     }
+    /**
+     * 多零件 compound 终端的合并 BREP 拓扑（见 buildCompoundTopologyRuntime）。
+     *
+     * 读 compound 的**当前** children（装配变换已把新 solid 写回 child 槽位，
+     * brepOf(child) 返回最新句柄——比 buildBrepTopology 读持久 solidCache 更不
+     * 会陈旧），按声明序合并为单个 occurrence-aware runtime。
+     */
+    buildCompoundBrepTopology(v) {
+        if (!this.brepChain?.kernel)
+            return null;
+        const children = (v.children ?? []);
+        if (children.length === 0)
+            return null;
+        return buildCompoundTopologyRuntime(this.brepChain.kernel, children) ?? null;
+    }
     // ── 公开：dryRun 校验 ──
     /**
      * dryRun：acorn 语法门禁 + 元数据提取（T5 后唯一路径）。
@@ -1337,11 +1361,6 @@ export class CadRuntime {
         if (libIdsFp !== this.lastLibIdsFingerprint) {
             return this.executeDirectText(newCode, opts);
         }
-        // G8: partTransform 变化
-        const ptFp = stableFingerprint(opts?.partTransform ?? null);
-        if (ptFp !== this.lastPartTransformFingerprint) {
-            return this.executeDirectText(newCode, opts);
-        }
         // G5: 上一轮产生了装配运动学位姿
         if (this.lastHadKinematics) {
             return this.executeDirectText(newCode, opts);
@@ -1411,14 +1430,6 @@ export class CadRuntime {
         }
         // ── 派生缓存失效 ──
         this.releasePartCaches(replayKeys.map((k) => asPartName(k)));
-        // ── BREP 链与 partTransform 同步 ──
-        const brepChain = await this.ensureBrepChain();
-        if (opts?.partTransform?.position) {
-            brepChain.partTransform = {
-                position: opts.partTransform.position,
-                scale: opts.partTransform.scale,
-            };
-        }
         // ── 重放 ──
         // G4 already checked: no relative imports → moduleLoad.seed = {}
         const libLoadFailure = await this.autoLoadLibsFromImports(meta.imports);
@@ -1454,13 +1465,7 @@ export class CadRuntime {
         const libLoadFailure = await this.autoLoadLibsFromImports(meta.imports);
         if (libLoadFailure)
             return libLoadFailure;
-        const brepChain = await this.ensureBrepChain();
-        if (opts?.partTransform?.position) {
-            brepChain.partTransform = {
-                position: opts.partTransform.position,
-                scale: opts.partTransform.scale,
-            };
-        }
+        await this.ensureBrepChain();
         de.clearRoundState();
         return this.collectDirectResult(meta, opts);
     }
@@ -1471,7 +1476,6 @@ export class CadRuntime {
         this.lastParamsFingerprint = stableFingerprint(opts?.params ?? null);
         const libIdsEntries = [...this.libIds.entries()].sort((a, b) => a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0);
         this.lastLibIdsFingerprint = stableFingerprint(libIdsEntries);
-        this.lastPartTransformFingerprint = stableFingerprint(opts?.partTransform ?? null);
         this.lastHadKinematics = this.directExecutor.kinematicsSnapshot.size > 0;
     }
     // ── 公开：释放 ──
@@ -1500,16 +1504,47 @@ export class CadRuntime {
     }
 }
 // ── 工厂函数 ──
+import { createApiNamespace } from '../api/api-namespace.js';
 /**
- * Create a CadRuntime instance.
+ * Create a CadRuntime with the built-in `cad` namespace auto-registered as the
+ * default library.
+ *
+ * This is the single public `createRuntime` entry point. Hosts get "engine +
+ * standard library" in one call. If `libs` already contains a `cad` key, that
+ * caller-supplied namespace is kept (not overwritten).
+ *
  * @param ports - the host-injected environment capabilities.
  * @param mode - the execution mode (default 'auto').
- * @param libs - the host-injected library namespaces (including `cad`, which the
- * root facade injects automatically; core does not assemble it by default).
- * @param options - optional runtime options (e.g. `executor: 'direct' | 'module'`).
- * @returns a new CadRuntime.
+ * @param libs - the host-injected library namespaces. If `libs.cad` is omitted,
+ *   the built-in cad namespace is auto-registered as the default lib.
+ * @param options - optional runtime options (e.g. `execBackend`, `tessellation`).
+ * @returns a new CadRuntime with `cad` registered as the default namespace.
  */
 export function createRuntime(ports, mode, libs, options) {
+    const rt = new CadRuntime(ports, mode, libs, options);
+    if (!libs?.cad) {
+        rt.registerLib('cad', createApiNamespace(), {
+            default: true,
+            packageName: '@faicad/faijs',
+        });
+    }
+    return rt;
+}
+/**
+ * Create a bare CadRuntime without auto-registering the built-in `cad` namespace.
+ *
+ * For hosts that want a pure engine (e.g. only using the parser / runtime
+ * framework with a custom op set). `CadRuntime` itself can also be constructed
+ * directly via `new CadRuntime(...)` — this function is the named factory
+ * counterpart to avoid creating another same-name variant.
+ *
+ * @param ports - the host-injected environment capabilities.
+ * @param mode - the execution mode (default 'auto').
+ * @param libs - the host-injected library namespaces (no cad auto-registration).
+ * @param options - optional runtime options.
+ * @returns a new CadRuntime without cad registered.
+ */
+export function createBareRuntime(ports, mode, libs, options) {
     return new CadRuntime(ports, mode, libs, options);
 }
 //# sourceMappingURL=runtime.js.map