@bldrs-ai/conway 1.419.1268 → 1.422.1273

package/compiled/src/compat/web-ifc/ifc_api_proxy_ifc.js

@@ -39,6 +39,10 @@ export class IfcApiProxyIfc {
         this.wasmModule = wasmModule;
         this.settings = settings;
         this.fs = undefined;
+        /** Was this model opened without extraction (DEFER_GEOMETRY)? */
+        this.deferredMode_ = false;
+        /** Cursor into demandProducts_ — products before it are extracted. */
+        this.demandCursor_ = 0;
         this._isCoordinated = false;
         this.linearScalingFactor = 1;
         this.identity = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
@@ -57,6 +61,8 @@ export class IfcApiProxyIfc {
         const loadState = precomputed ??
             IfcApiProxyIfc.parseAndExtract(modelID, data, new ConwayGeometry(wasmModule), settings);
         this.conwaywasm = loadState.conwaywasm;
+        this.conwayGeometry_ = loadState.conwayGeometry;
+        this.deferredMode_ = loadState.deferred === true;
         const statistics = Logger.getStatistics(modelID);
         const { allTimeStart, stepHeader, model, scene, conwayGeometry, geometryTimeInMs: executionTimeInMs, } = loadState;
         // get linear scaling factor
@@ -195,6 +201,26 @@ export class IfcApiProxyIfc {
         const loadState = await IfcApiProxyIfc.parseColumnarAndExtractAsync(modelID, data, new ConwayGeometry(wasmModule), settings);
         return new IfcApiProxyIfc(modelID, data, wasmModule, settings, loadState);
     }
+    /**
+     * Deferred-geometry streamed open (conway extension; slice A of
+     * Share's demand/tiled rendering — design doc
+     * demand-tiled-rendering.md): identical streamed columnar parse, but
+     * NO geometry extraction happens at open. The proxy registers with an
+     * empty scene wired to the demand-extraction seam; callers then pump
+     * {@link extractGeometryBatch} to extract products in file-order
+     * batches, receiving each batch's meshes incrementally — the scene,
+     * properties, and spatial structure work from the first batch.
+     *
+     * @param modelID The model ID being opened.
+     * @param data The IFC data buffer.
+     * @param wasmModule The wasm module.
+     * @param settings Loader settings (ON_PROGRESS is honored for parse).
+     * @return {Promise<IfcApiProxyIfc>} The constructed proxy.
+     */
+    static async createDeferred(modelID, data, wasmModule, settings) {
+        const loadState = await IfcApiProxyIfc.parseColumnarAndExtractAsync(modelID, data, new ConwayGeometry(wasmModule), settings, true);
+        return new IfcApiProxyIfc(modelID, data, wasmModule, settings, loadState);
+    }
     /**
      * Log + record the header parse result on the model statistics.
      *
@@ -393,7 +419,7 @@ export class IfcApiProxyIfc {
      * @param settings Loader settings (ON_PROGRESS is honored).
      * @return {Promise<IfcProxyLoadState>} Everything the constructor tail needs.
      */
-    static async parseColumnarAndExtractAsync(modelID, data, conwaywasm, settings) {
+    static async parseColumnarAndExtractAsync(modelID, data, conwaywasm, settings, deferGeometry = false) {
         const tracker = IfcApiProxyIfc.makeTracker(settings);
         const allTimeStart = Date.now();
         const parser = IfcStepParser.Instance;
@@ -424,6 +450,24 @@ export class IfcApiProxyIfc {
         const model = new IfcStepModel(data, columns);
         statistics?.setParseTime(parseEndTime - parseStartTime);
         const conwayGeometry = new IfcGeometryExtraction(conwaywasm, model);
+        // Deferred mode (createDeferred): no extraction now — prime the
+        // per-product demand seam and hand back the (empty) live scene the
+        // batch pump populates. `scene` is the same object streamAllMeshes
+        // walks, so meshes appear to consumers as batches extract.
+        if (deferGeometry) {
+            conwayGeometry.prepareDemandExtraction();
+            statistics?.setProductCount(model.typeCount(IfcProduct));
+            return {
+                conwaywasm,
+                deferred: true,
+                allTimeStart,
+                stepHeader,
+                model,
+                scene: conwayGeometry.scene,
+                conwayGeometry,
+                geometryTimeInMs: 0,
+            };
+        }
         tracker?.beginPhase("geometry", "products");
         const geometryTick = tracker !== void 0 ?
             (completed, total) => {
@@ -913,6 +957,171 @@ export class IfcApiProxyIfc {
     closeModel() {
         // Null operation.
     }
+    /**
+     * Deferred-mode batch pump (conway extension; Share demand/tiled
+     * rendering slice A): extract the next `batchSize` products (file
+     * order) through the per-product demand seam and emit THIS BATCH's
+     * meshes through `meshCallback` — the incremental twin of
+     * streamAllMeshes. Placed-geometry math (coordination, scaling,
+     * centering) is identical; the shared meshMap is updated so
+     * getFlatMesh keeps working. Call repeatedly until `remaining` is 0.
+     *
+     * Requires a model opened with deferred geometry
+     * (`OpenModelStreamed(data, {..., DEFER_GEOMETRY: true})`); on a
+     * fully-extracted model this is a no-op returning remaining 0.
+     *
+     * @param batchSize Max products to extract this call (min 1).
+     * @param meshCallback Receives each newly-extracted product's mesh.
+     * @return {object} `{extracted, remaining}` — products processed this
+     * call and products still pending.
+     */
+    extractGeometryBatch(batchSize, meshCallback) {
+        // Fully-extracted opens have nothing to pump — re-running the
+        // per-product extraction on them would duplicate scene work.
+        if (!this.deferredMode_) {
+            return { extracted: 0, remaining: 0 };
+        }
+        if (this.demandProducts_ === void 0) {
+            const products = [];
+            for (const product of this.model[0].types(IfcProduct)) {
+                products.push(product.localID);
+            }
+            this.demandProducts_ = products;
+            this.demandCursor_ = 0;
+        }
+        const end = Math.min(this.demandCursor_ + Math.max(batchSize, 1), this.demandProducts_.length);
+        const batch = new Set();
+        for (; this.demandCursor_ < end; ++this.demandCursor_) {
+            const localID = this.demandProducts_[this.demandCursor_];
+            if (this.conwayGeometry_.extractProductGeometryByLocalID(localID)) {
+                batch.add(localID);
+            }
+        }
+        if (meshCallback !== void 0 && batch.size > 0) {
+            this.streamMeshesForEntities_(batch, meshCallback);
+        }
+        return {
+            extracted: batch.size,
+            remaining: this.demandProducts_.length - this.demandCursor_,
+        };
+    }
+    /**
+     * Walk the scene and emit FlatMeshes for the given entities only —
+     * the filtered core of streamAllMeshes with identical placed-geometry
+     * math. Also fixes a latent multi-call bug: the derived coordination
+     * matrix is stored back to the model tuple, so later batches place
+     * with the SAME coordination the first batch established
+     * (streamAllMeshes never needed this — it runs once).
+     *
+     * @param entityFilter Entity localIDs whose meshes to emit.
+     * @param meshCallback Receives one FlatMesh per matched entity.
+     */
+    streamMeshesForEntities_(entityFilter, meshCallback) {
+        const [model, scene, meshMap, geometryMaterialTransformMap] = this.model;
+        let coordinationMatrix = this.model[5];
+        const emitted = new Set();
+        // eslint-disable-next-line no-unused-vars
+        for (const [_, nativeTransform, geometry, material, entity] of scene.walk()) {
+            if (entity?.localID === void 0 || !entityFilter.has(entity.localID) ||
+                entity.expressID === void 0) {
+                continue;
+            }
+            if (geometry.type !== CanonicalMeshType.BUFFER_GEOMETRY || geometry.temporary) {
+                continue;
+            }
+            const material_ = material ?? {
+                name: "",
+                // eslint-disable-next-line no-magic-numbers
+                baseColor: [0.8, 0.8, 0.8, 1],
+                // eslint-disable-next-line no-magic-numbers
+                legacyColor: [0.8, 0.8, 0.8, 1],
+                doubleSided: true,
+                blend: 0,
+            };
+            let nativePt;
+            if (!this._isCoordinated && this.settings?.COORDINATE_TO_ORIGIN) {
+                nativePt = geometry.geometry.getPoint(0);
+            }
+            const geomCenter = glmatrix.vec3.create();
+            const center = geometry.geometry.normalize();
+            geomCenter[0] = center.x;
+            geomCenter[1] = center.y;
+            geomCenter[2] = center.z;
+            const translationMatrixGeomMin = glmatrix.mat4.create();
+            glmatrix.mat4.fromTranslation(translationMatrixGeomMin, geomCenter);
+            const expressID = model.getElementByLocalID(geometry.localID)?.expressID;
+            const geometryTransform = nativeTransform?.getValues();
+            let newMatrix;
+            if (geometryTransform !== void 0) {
+                newMatrix = glmatrix.mat4.fromValues(...geometryTransform);
+            }
+            else {
+                newMatrix = glmatrix.mat4.create();
+            }
+            if (!this._isCoordinated && this.settings?.COORDINATE_TO_ORIGIN) {
+                const pt = [nativePt.x, nativePt.y, nativePt.z];
+                const transformedPt = glmatrix.vec4.create();
+                glmatrix.vec4.transformMat4(transformedPt, [pt[0], pt[1], pt[2], 1], newMatrix);
+                coordinationMatrix = glmatrix.mat4.create();
+                glmatrix.mat4.fromTranslation(coordinationMatrix, [-transformedPt[0], -transformedPt[1], -transformedPt[2]]);
+                const scaleMatrix = glmatrix.mat4.create();
+                const scaleVec = glmatrix.vec3.fromValues(this.linearScalingFactor, this.linearScalingFactor, this.linearScalingFactor);
+                glmatrix.mat4.scale(scaleMatrix, scaleMatrix, scaleVec);
+                glmatrix.mat4.multiply(coordinationMatrix, this.NormalizeMat, coordinationMatrix);
+                glmatrix.mat4.multiply(coordinationMatrix, scaleMatrix, coordinationMatrix);
+                // Persist for every later batch (and getCoordinationMatrix).
+                this.model[5] = coordinationMatrix;
+                this._isCoordinated = true;
+            }
+            const newTransform = glmatrix.mat4.create();
+            const scaleMatrix = glmatrix.mat4.create();
+            const scaleVec = glmatrix.vec3.fromValues(this.linearScalingFactor, this.linearScalingFactor, this.linearScalingFactor);
+            glmatrix.mat4.scale(scaleMatrix, scaleMatrix, scaleVec);
+            glmatrix.mat4.multiply(newTransform, coordinationMatrix, newMatrix);
+            glmatrix.mat4.multiply(newTransform, newTransform, translationMatrixGeomMin);
+            const newTransformArr = Array.from(newTransform);
+            geometryMaterialTransformMap.set(expressID, [geometry.geometry, material_, newTransformArr]);
+            const color = {
+                x: material_.legacyColor[0],
+                y: material_.legacyColor[1],
+                z: material_.legacyColor[2],
+                w: material_.legacyColor[3],
+            };
+            const placed = {
+                color,
+                geometryExpressID: expressID,
+                flatTransformation: newTransformArr,
+            };
+            let mesh = meshMap.get(entity.expressID);
+            if (mesh === void 0) {
+                const placedArray = new Array();
+                const placedVector = {
+                    get: (index) => placedArray[index] ?? placed,
+                    size: () => placedArray.length,
+                    push: (parameter) => {
+                        placedArray.push(parameter);
+                    },
+                };
+                const flatMesh = {
+                    geometries: placedVector,
+                    expressID: entity.expressID,
+                };
+                mesh = [placedVector, flatMesh];
+                meshMap.set(entity.expressID, mesh);
+            }
+            mesh[0].push(placed);
+            mesh[1].geometries = mesh[0];
+            emitted.add(entity.expressID);
+        }
+        const vectorFlatMesh = this.model[4];
+        for (const expressID of emitted) {
+            const mesh = meshMap.get(expressID);
+            if (mesh !== void 0) {
+                vectorFlatMesh.push(mesh[1]);
+                meshCallback(mesh[1]);
+            }
+        }
+    }
     /**
      *
      * @param modelID

package/compiled/src/compat/web-ifc/web_wasm_directory.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=web_wasm_directory.test.d.ts.map

package/compiled/src/compat/web-ifc/web_wasm_directory.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"web_wasm_directory.test.d.ts","sourceRoot":"","sources":["../../../../src/compat/web-ifc/web_wasm_directory.test.ts"],"names":[],"mappings":""}

package/compiled/src/compat/web-ifc/web_wasm_directory.test.js

@@ -0,0 +1,22 @@
+// The wasm-directory normalization behind the isolated-context module
+// prefix (Share #1610): embedder SetWasmPath values are site-root-
+// relative by convention and must come out as absolute directories,
+// since they become runtime dynamic-import prefixes whose resolution
+// must not depend on the page or bundle URL (the pthread worker script
+// URL derives from the imported module's import.meta.url).
+import { describe, expect, test } from "@jest/globals";
+import { webWasmDirectory } from "./ifc_api.js";
+describe("webWasmDirectory", () => {
+    test("site-root-relative convention absolutizes", () => {
+        expect(webWasmDirectory("./static/js/")).toBe("/static/js/");
+        expect(webWasmDirectory("static/js/")).toBe("/static/js/");
+    });
+    test("absolute paths pass through with a trailing slash ensured", () => {
+        expect(webWasmDirectory("/static/js/")).toBe("/static/js/");
+        expect(webWasmDirectory("/wasm")).toBe("/wasm/");
+    });
+    test("missing input falls back to the conventional serve directory", () => {
+        expect(webWasmDirectory(undefined)).toBe("/static/js/");
+        expect(webWasmDirectory("")).toBe("/static/js/");
+    });
+});

package/compiled/src/index.d.ts

@@ -1,7 +1,7 @@
 export { ParseResult } from "./step/parsing/step_parser.js";
 export { IfcGeometryExtraction } from "./ifc/ifc_geometry_extraction.js";
 export { IfcPropertyExtraction } from "./ifc/ifc_property_extraction.js";
-export { ConwayGeometry, GeometryObject, FileHandlerFunction } from "../dependencies/conway-geom/index.js";
+export { ConwayGeometry, GeometryObject, FileHandlerFunction, setModulePrefix, } from "../dependencies/conway-geom/index.js";
 export { versionString } from "./version/version.js";
 export { default as Logger, LogLevel, LogEntry, LoggingProxy, LogSink } from "./logging/logger.js";
 export { product, shape_definition_representation } from "./AP214E3_2010/AP214E3_2010_gen/index.js";

package/compiled/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AACrE,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,mBAAmB,EAAC,MAAM,6BAA6B,CAAA;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAE/F,OAAO,EAAE,OAAO,EAAE,+BAA+B,EAAE,MAAM,iCAAiC,CAAA;AAC1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,eAAe,EACf,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EACL,kBAAkB,EAClB,SAAS,EACT,iBAAiB,EACjB,SAAS,EACT,QAAQ,EACR,eAAe,EACf,aAAa,EACb,UAAU,GACX,MAAM,qBAAqB,CAAA;AAU5B,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AACrG,OAAO,EACL,2BAA2B,EAC3B,gCAAgC,GACjC,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AACzE,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,kBAAkB,EAClB,0BAA0B,GAC3B,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EAChC,oBAAoB,EACpB,UAAU,GACX,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAA;AACrG,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAC5E,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AACnG,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AACnG,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAClB,eAAe,EACf,qBAAqB,EACrB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AACpF,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AACrE,OAAO,EACL,cAAc,EACd,cAAc,EACd,mBAAmB,EACnB,eAAe,GAChB,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,EAAE,OAAO,IAAI,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAE/F,OAAO,EAAE,OAAO,EAAE,+BAA+B,EAAE,MAAM,iCAAiC,CAAA;AAC1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,YAAY,EACZ,eAAe,EACf,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EACL,kBAAkB,EAClB,SAAS,EACT,iBAAiB,EACjB,SAAS,EACT,QAAQ,EACR,eAAe,EACf,aAAa,EACb,UAAU,GACX,MAAM,qBAAqB,CAAA;AAU5B,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AACrG,OAAO,EACL,2BAA2B,EAC3B,gCAAgC,GACjC,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AACzE,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,kBAAkB,EAClB,0BAA0B,GAC3B,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EAChC,oBAAoB,EACpB,UAAU,GACX,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAA;AACrG,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAC5E,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AACnG,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AACnG,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAClB,eAAe,EACf,qBAAqB,EACrB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,+BAA+B,CAAA;AACtC,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AACpF,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA"}

package/compiled/src/index.js

@@ -1,7 +1,7 @@
 export { ParseResult } from "./step/parsing/step_parser.js";
 export { IfcGeometryExtraction } from "./ifc/ifc_geometry_extraction.js";
 export { IfcPropertyExtraction } from "./ifc/ifc_property_extraction.js";
-export { ConwayGeometry } from "../dependencies/conway-geom/index.js";
+export { ConwayGeometry, setModulePrefix, } from "../dependencies/conway-geom/index.js";
 export { versionString } from "./version/version.js";
 // Replace your current Logger export with this
 export { default as Logger, LogLevel } from "./logging/logger.js";

package/compiled/src/version/version.js

@@ -5,5 +5,5 @@
 // only the first segment (major) is meaningful and is the one CI carries forward.
 // Must stay in `vN.N.N` shape: the CI stamp regex, scripts/updateVersion.mjs, and
 // statistics.ts all match `v\d+\.\d+\.\d+`.
-const versionString = 'Conway v1.419.1268';
+const versionString = 'Conway v1.422.1273';
 export { versionString };