@bldrs-ai/conway 1.356.1126 → 1.357.1128

package/compiled/examples/browser-bundled.cjs

@@ -69622,7 +69622,7 @@ IfcStepParser.Instance = new IfcStepParser();
 var ifc_step_parser_default = IfcStepParser;
 
 // compiled/src/version/version.js
-var versionString = "Conway Web-Ifc Shim v1.356.1126";
+var versionString = "Conway Web-Ifc Shim v1.357.1128";
 
 // compiled/src/statistics/statistics.js
 var Statistics = class {

package/compiled/examples/cli-bundled.cjs

@@ -85957,7 +85957,7 @@ var IfcSceneBuilder = class {
 };
 
 // compiled/src/version/version.js
-var versionString = "Conway Web-Ifc Shim v1.356.1126";
+var versionString = "Conway Web-Ifc Shim v1.357.1128";
 
 // compiled/src/statistics/statistics.js
 var Statistics = class {

package/compiled/examples/cli-step-bundled.cjs

@@ -79408,7 +79408,7 @@ var ExtractResult;
 })(ExtractResult || (ExtractResult = {}));
 
 // compiled/src/version/version.js
-var versionString = "Conway Web-Ifc Shim v1.356.1126";
+var versionString = "Conway Web-Ifc Shim v1.357.1128";
 
 // compiled/src/statistics/statistics.js
 var Statistics = class {

package/compiled/examples/validator-bundled.cjs

@@ -69620,7 +69620,7 @@ IfcStepParser.Instance = new IfcStepParser();
 var ifc_step_parser_default = IfcStepParser;
 
 // compiled/src/version/version.js
-var versionString = "Conway Web-Ifc Shim v1.356.1126";
+var versionString = "Conway Web-Ifc Shim v1.357.1128";
 
 // compiled/src/statistics/statistics.js
 var Statistics = class {

package/compiled/src/AP214E3_2010/ap214_regression_main.d.ts

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

package/compiled/src/AP214E3_2010/ap214_regression_main.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ap214_regression_main.d.ts","sourceRoot":"","sources":["../../../src/AP214E3_2010/ap214_regression_main.ts"],"names":[],"mappings":""}

package/compiled/src/AP214E3_2010/ap214_regression_main.js

@@ -0,0 +1,277 @@
+import { exit } from "process";
+import AP214StepParser from "./ap214_step_parser.js";
+import { AP214GeometryExtraction } from "./ap214_geometry_extraction.js";
+import ParsingBuffer from "../parsing/parsing_buffer.js";
+import { ParseResult } from "../step/parsing/step_parser.js";
+import yargs from "yargs/yargs";
+import fs from "fs";
+import fsPromises from "fs/promises";
+import path from "path";
+import crypto from "crypto";
+import { ConwayGeometry } from "../../dependencies/conway-geom/index.js";
+import Logger from "../logging/logger.js";
+import Environment from "../utilities/environment.js";
+import { ExtractResult } from "../core/shared_constants.js";
+import { CanonicalMeshType } from "../core/canonical_mesh.js";
+import EntityTypesAP214 from "./AP214E3_2010_gen/entity_types_ap214.gen.js";
+import { Console } from "console";
+const conwayGeom = new ConwayGeometry();
+main();
+/**
+ * Encapsultes a string in a CSV safe way.
+ *
+ * @param from
+ * @return {string}
+ */
+function csvSafeString(from) {
+    if (from.includes("\n") ||
+        from.includes("\r") ||
+        from.includes("\"") ||
+        from.includes(",")) {
+        return `"${from.replaceAll("\"", "\"\"")}"`;
+    }
+    return from;
+}
+// Bytes per megabyte for memory-stat formatting in the perf CSV.
+// eslint-disable-next-line no-magic-numbers
+const BYTES_PER_MB = 1024 * 1024;
+// Fixed-point precision for perf MB values.
+// eslint-disable-next-line no-magic-numbers
+const PERF_MB_PRECISION = 2;
+/**
+ * Write a single-row per-file perf CSV at the given path, matching the
+ * column layout of the IFC regression child so the batch aggregator can
+ * merge STEP and IFC rows into one perf CSV. No-op when perfPath is empty.
+ *
+ * @param perfPath Path to write the CSV to. Empty string disables.
+ * @param stepFile Source STEP file path (basename used as the row key).
+ * @param status OK or FAIL.
+ * @param parseTimeMs Parse stage duration in ms.
+ * @param geometryTimeMs Geometry extraction duration in ms.
+ * @param totalTimeMs Sum of parse + geometry in ms.
+ */
+async function writePerfCsvIfRequested(perfPath, stepFile, status, parseTimeMs, geometryTimeMs, totalTimeMs) {
+    if (perfPath.length === 0) {
+        return;
+    }
+    const mem = process.memoryUsage();
+    const rssMb = (mem.rss / BYTES_PER_MB).toFixed(PERF_MB_PRECISION);
+    const heapUsedMb = (mem.heapUsed / BYTES_PER_MB).toFixed(PERF_MB_PRECISION);
+    const heapTotalMb = (mem.heapTotal / BYTES_PER_MB).toFixed(PERF_MB_PRECISION);
+    const fileName = csvSafeString(path.basename(stepFile));
+    const header = "file,status,parseTimeMs,geometryTimeMs,totalTimeMs,rssMb,heapUsedMb,heapTotalMb\n";
+    const row = `${fileName},${status},${parseTimeMs},${geometryTimeMs},${totalTimeMs},` +
+        `${rssMb},${heapUsedMb},${heapTotalMb}\n`;
+    try {
+        await fsPromises.writeFile(perfPath, header + row);
+    }
+    catch (e) {
+        // Perf is best-effort; never fail the regression run because of a perf write.
+        console.error(`Failed to write perf CSV at ${perfPath}:`, e);
+    }
+}
+/**
+ * Display errors and dump errors to stderr in the batch runner's
+ * `message,count,expressids,file` CSV format.
+ *
+ * @param filePath
+ */
+function displayErrors(filePath) {
+    const fileName = csvSafeString(path.basename(filePath));
+    if (Logger.getLogs().length > 0) {
+        Logger.displayLogs();
+        const errors = Logger.getErrors();
+        if (errors.length > 0) {
+            const errConsole = new Console(process.stderr);
+            errConsole.log("message,count,expressids,file");
+            for (const error of errors) {
+                errConsole.log(`${csvSafeString(error.message)},${error.count},${csvSafeString(Array.from(error.expressIDs.keys()).join(" "))},${fileName}`);
+            }
+        }
+    }
+}
+/**
+ * Generalised error handling wrapper
+ */
+async function main() {
+    try {
+        await conwayGeom.initialize();
+        Environment.checkEnvironment();
+        Logger.initializeWasmCallbacks();
+        doWork();
+    }
+    catch (error) {
+        console.error("An error occurred:", error);
+    }
+}
+/**
+ * Actual execution function.
+ */
+function doWork() {
+    const SKIP_PARAMS = 2;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const args = yargs(process.argv.slice(SKIP_PARAMS))
+        .command("$0 <filename> [output]", "Digest a STEP (AP214) file", (yargs2) => {
+        yargs2.option("strict", {
+            describe: "Makes parser/reference errors on nullable fields return null instead of an error",
+            type: "boolean",
+            alias: "s",
+            default: false,
+        });
+        yargs2.option("digest", {
+            describe: "Output a digest ",
+            type: "boolean",
+            alias: "d",
+            default: false,
+        });
+        yargs2.option("perf", {
+            describe: "Write a single-row perf CSV (parse/geometry/total time + memory) at this path",
+            type: "string",
+            alias: "p",
+            default: "",
+        });
+        yargs2.positional("filename", { describe: "STEP (AP214) File Path", type: "string" });
+        yargs2.positional("output", { describe: "Output path", type: "string" });
+    }, async (argv) => {
+        const stepFile = argv["filename"];
+        const outputPath = argv["output"] ??
+            path.join(path.dirname(stepFile), path.parse(stepFile).name);
+        let stepBuffer;
+        const strict = argv["strict"] ?? false;
+        const digest = argv["digest"] ?? false;
+        const perfPath = argv["perf"] ?? "";
+        try {
+            stepBuffer = fs.readFileSync(stepFile);
+        }
+        catch {
+            Logger.error("Couldn't read file, check that it is accessible at the specified path.");
+            displayErrors(stepFile);
+            exit();
+        }
+        if (stepBuffer === void 0) {
+            Logger.error("Couldn't read file, check that it is accessible at the specified path.");
+            displayErrors(stepFile);
+            exit();
+        }
+        const parser = AP214StepParser.Instance;
+        const bufferInput = new ParsingBuffer(stepBuffer);
+        const parseStartMs = Date.now();
+        const result0 = parser.parseHeader(bufferInput)[1];
+        switch (result0) {
+            case ParseResult.COMPLETE:
+                break;
+            case ParseResult.INCOMPLETE:
+                Logger.warning("Parse incomplete but no errors");
+                break;
+            case ParseResult.INVALID_STEP:
+                Logger.error("Invalid STEP detected in parse, but no syntax error detected");
+                break;
+            case ParseResult.MISSING_TYPE:
+                Logger.error("Missing STEP type, but no syntax error detected");
+                break;
+            case ParseResult.SYNTAX_ERROR:
+                Logger.error(`Syntax error detected on line ${bufferInput.lineCount}`);
+                break;
+            default:
+        }
+        const [result1, model] = parser.parseDataToModel(bufferInput);
+        switch (result1) {
+            case ParseResult.COMPLETE:
+                break;
+            case ParseResult.INCOMPLETE:
+                Logger.warning("Parse incomplete but no errors");
+                break;
+            case ParseResult.INVALID_STEP:
+                Logger.error("Invalid STEP detected in parse, but no syntax error detected");
+                break;
+            case ParseResult.MISSING_TYPE:
+                Logger.error("Missing STEP type, but no syntax error detected");
+                break;
+            case ParseResult.SYNTAX_ERROR:
+                Logger.error(`Syntax error detected on line ${bufferInput.lineCount}`);
+                break;
+            default:
+        }
+        const parseEndMs = Date.now();
+        const parseTimeMs = parseEndMs - parseStartMs;
+        if (model === void 0) {
+            await writePerfCsvIfRequested(perfPath, stepFile, "FAIL", parseTimeMs, 0, parseTimeMs);
+            displayErrors(stepFile);
+            return;
+        }
+        model.nullOnErrors = !strict;
+        const geomStartMs = Date.now();
+        const extraction = geometryExtraction(model);
+        const geomEndMs = Date.now();
+        const geometryTimeMs = geomEndMs - geomStartMs;
+        const totalTimeMs = geomEndMs - parseStartMs;
+        const perfStatus = extraction === void 0 ? "FAIL" : "OK";
+        await writePerfCsvIfRequested(perfPath, stepFile, perfStatus, parseTimeMs, geometryTimeMs, totalTimeMs);
+        if (extraction === void 0) {
+            Logger.error("Couldn't extract geometry");
+        }
+        else if (digest) {
+            // Digest layout matches the IFC regression digest
+            // (ID,Hash,Type,Operand 1,Operand2,Void) so the same diff/bless
+            // tooling applies. STEP digests cover final meshes and memoized
+            // curves; AP214 has no void/CSG-operand columns to fill.
+            const csvLines = [];
+            const csvPath = `${outputPath}.csv`;
+            const csvFileHandle = await fsPromises.open(csvPath, "w");
+            await csvFileHandle.write(`ID,Hash,Type,Operand 1,Operand2,Void\n`);
+            for (const mesh of model.geometry) {
+                if (mesh.type !== CanonicalMeshType.BUFFER_GEOMETRY) {
+                    continue;
+                }
+                const objContents = mesh.geometry.dumpToOBJ("");
+                const hash = crypto.createHash("sha1").update(objContents).digest("hex");
+                const element = model.getElementByLocalID(mesh.localID);
+                const rowID = element?.expressID ?? mesh.localID;
+                const typeName = element !== void 0 ? EntityTypesAP214[element.type] : "";
+                csvLines.push([rowID, `${rowID},${hash},${typeName},,,FALSE\n`]);
+            }
+            for (const [curveItem, objContents] of model.curves.objs()) {
+                const hash = crypto.createHash("sha1").update(objContents).digest("hex");
+                const rowID = curveItem.expressID ?? curveItem.toString();
+                csvLines.push([rowID, `${rowID},${hash},${EntityTypesAP214[curveItem.type]},,,\n`]);
+            }
+            csvLines.sort((a, b) => {
+                const a0 = a[0];
+                const b0 = b[0];
+                if (typeof a0 === "number") {
+                    if (typeof b0 === "number") {
+                        return a0 - b0;
+                    }
+                    return -1;
+                }
+                if (typeof b0 === "number") {
+                    return 1;
+                }
+                return a0.localeCompare(b0);
+            });
+            // Note, we cast to any here because the writeFile supports an
+            // iterable but the typescript bindings don't have the option
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            await csvFileHandle.writeFile(csvLines.map((line) => line[1]));
+            await csvFileHandle.close();
+        }
+        displayErrors(stepFile);
+    })
+        .help().argv;
+}
+/**
+ * Function to extract geometry from an AP214StepModel.
+ *
+ * @param model
+ * @return {AP214GeometryExtraction | undefined} The extraction, or undefined
+ * on failure.
+ */
+function geometryExtraction(model) {
+    const conwayModel = new AP214GeometryExtraction(conwayGeom, model);
+    const [extractionResult] = conwayModel.extractAP214GeometryData(false);
+    if (extractionResult !== ExtractResult.COMPLETE) {
+        console.error("Could not extract geometry, exiting...");
+        return void 0;
+    }
+    return conwayModel;
+}

package/compiled/src/ifc/ifc_regression_batch_main.js

@@ -189,7 +189,12 @@ async function runForFile(filePath, outputPath, maxTimeout, perfPath) {
     const MAX_TIMEOUT_MS = maxTimeout;
     const startTime = Date.now(); // Start time
     const perfFlag = perfPath ? ` --perf "${perfPath}"` : '';
-    const safeExecCommand = `node --experimental-specifier-resolution=node ./compiled/src/ifc/ifc_regression_main.js -d${perfFlag} "${filePath}" "${outputPath}"`;
+    // STEP (AP214) models are digested by the AP214 pipeline, IFC models by
+    // the IFC pipeline; both children emit the same digest/error/perf formats.
+    const childScript = isStepFile(filePath) ?
+        './compiled/src/AP214E3_2010/ap214_regression_main.js' :
+        './compiled/src/ifc/ifc_regression_main.js';
+    const safeExecCommand = `node --experimental-specifier-resolution=node ${childScript} -d${perfFlag} "${filePath}" "${outputPath}"`;
     console.log(`Current File: ${filePath}`);
     // Use safeExecWithCancellation, will kill the process if it takes longer than MAX_TIMEOUT_MS.
     const process = await safeExecWithCancellation(safeExecCommand, MAX_TIMEOUT_MS);
@@ -227,6 +232,27 @@ async function runForFile(filePath, outputPath, maxTimeout, perfPath) {
         hash: fileHash,
     };
 }
+// Model files the regression harness understands: IFC plus STEP AP214.
+const SUPPORTED_MODEL_EXTENSIONS = ['.ifc', '.stp', '.step'];
+/**
+ * Whether this is a STEP (AP214) model file by extension.
+ *
+ * @param filePath
+ * @return {boolean}
+ */
+function isStepFile(filePath) {
+    const extension = path.extname(filePath).toLowerCase();
+    return extension === '.stp' || extension === '.step';
+}
+/**
+ * Whether this file is a supported model type (IFC or STEP), by extension.
+ *
+ * @param filePath
+ * @return {boolean}
+ */
+function isSupportedModelFile(filePath) {
+    return SUPPORTED_MODEL_EXTENSIONS.includes(path.extname(filePath).toLowerCase());
+}
 /**
  * Recursively collect all IFC file paths (instead of processing them immediately).
  *
@@ -255,7 +281,7 @@ async function collectIFCFiles(parentPath, excludeRegex) {
             if (item.isDirectory()) {
                 await recursiveWalk(resolved);
             }
-            else if (path.extname(resolved).toLowerCase() === '.ifc') {
+            else if (isSupportedModelFile(resolved)) {
                 ifcFiles.push(resolved);
             }
         }
@@ -305,9 +331,9 @@ async function processIFCFilesInParallel(ifcFiles, outputPath, errorLines, fileL
         activeTasks++;
         console.log(`Starting task for "${path.basename(ifcPath)}". Active tasks: ${activeTasks}`);
         const perfChildPath = perfDir ?
-            path.join(perfDir, `${path.basename(ifcPath, '.ifc')}.perf.csv`) :
+            path.join(perfDir, `${path.parse(ifcPath).name}.perf.csv`) :
             undefined;
-        const fileResults = await runForFile(ifcPath, path.join(outputPath, path.basename(ifcPath, '.ifc')), maxTimeout, perfChildPath);
+        const fileResults = await runForFile(ifcPath, path.join(outputPath, path.parse(ifcPath).name), maxTimeout, perfChildPath);
         activeTasks--;
         console.log(`Completed task for "${path.basename(ifcPath)}". Active tasks: ${activeTasks}`);
         return { ifcPath, fileResults };
@@ -355,11 +381,11 @@ async function recursiveWalk(parentPath, excludeRegex, outputPath, errorLines, f
         if (item.isDirectory()) {
             await recursiveWalk(resolved, excludeRegex, outputPath, errorLines, fileLines, failedLines, maxTimeout, perfDir);
         }
-        else if (path.extname(resolved).toLowerCase() === '.ifc') {
+        else if (isSupportedModelFile(resolved)) {
             const perfChildPath = perfDir ?
-                path.join(perfDir, `${path.basename(resolved, '.ifc')}.perf.csv`) :
+                path.join(perfDir, `${path.parse(resolved).name}.perf.csv`) :
                 undefined;
-            const fileResults = await runForFile(resolved, path.join(outputPath, path.basename(resolved, '.ifc')), maxTimeout, perfChildPath);
+            const fileResults = await runForFile(resolved, path.join(outputPath, path.parse(resolved).name), maxTimeout, perfChildPath);
             if (fileResults.type === 'Run') {
                 if (fileResults.errorLines !== void 0) {
                     errorLines.push(...fileResults.errorLines);

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 Web-Ifc Shim v1.356.1126';
+const versionString = 'Conway Web-Ifc Shim v1.357.1128';
 export { versionString };