@bldrs-ai/conway 0.23.977 → 1.22.969

package/compiled/src/format_detection/model_format_detector.js

@@ -6,6 +6,7 @@ export var ModelFormatType;
 (function (ModelFormatType) {
     ModelFormatType[ModelFormatType["IFC"] = 0] = "IFC";
     ModelFormatType[ModelFormatType["AP214"] = 1] = "AP214";
+    ModelFormatType[ModelFormatType["AP203"] = 2] = "AP203";
 })(ModelFormatType || (ModelFormatType = {}));
 /**
  * Format detector for finding the format of a model from a buffer in conway.
@@ -20,22 +21,22 @@ export default class ModelFormatDetector {
      */
     static detect(input) {
         const [stepHeader, errorCode] = StepHeaderParser.instance.parseHeader(input);
-        console.log(ParseResult[errorCode]);
         if (errorCode === ParseResult.COMPLETE || errorCode === ParseResult.INCOMPLETE) {
             const schema = stepHeader.headers.get("FILE_SCHEMA")?.toLocaleUpperCase();
             if (schema !== void 0) {
-                const schemaNoSpaces = schema.replaceAll(" ", "");
-                if (schemaNoSpaces.startsWith("(('IFC")) {
-                    return ModelFormatType.IFC;
-                }
-                if (schemaNoSpaces.startsWith("(('AUTOMOTIVE_DESIGN'))")) {
-                    return ModelFormatType.AP214;
-                }
-                if (schemaNoSpaces.startsWith("(('AUTOMOTIVE_DESIGN{")) {
-                    const afterBrace = schema.substring(schema.indexOf("{") + 1).trimStart();
-                    if (afterBrace.startsWith("1 0 10303 214")) {
+                const quotedEntries = Array.from(schema.matchAll(/'([^']+)'/g)).map((match) => match[1]);
+                const schemaEntries = quotedEntries.length > 0 ? quotedEntries : [schema];
+                for (const rawEntry of schemaEntries) {
+                    const entryNoSpaces = rawEntry.replaceAll(" ", "");
+                    if (entryNoSpaces.startsWith("IFC")) {
+                        return ModelFormatType.IFC;
+                    }
+                    if (entryNoSpaces.startsWith("AUTOMOTIVE_DESIGN")) {
                         return ModelFormatType.AP214;
                     }
+                    if (entryNoSpaces.startsWith("CONFIG_CONTROL_DESIGN")) {
+                        return ModelFormatType.AP203;
+                    }
                 }
             }
         }

package/compiled/src/format_detection/model_format_detector.test.js

@@ -5,11 +5,13 @@ import ModelFormatDetector, { ModelFormatType } from "./model_format_detector.js
 const indexIfcBuffer = fs.readFileSync("data/index.ifc");
 const tubeBuffer = fs.readFileSync("data/create-a-tube.step");
 const gearBuffer = fs.readFileSync("data/a-gear-with-3-inch-diameter-and-20-curved-teeth.step");
+const configControlDesignBuffer = fs.readFileSync("data/config-control-design-min.step");
 const nativeHDBuffer = fs.readFileSync("data/native_hd.m3u8");
 const emptyBuffer = new Uint8Array(0);
 const indexIfcBufferInput = new ParsingBuffer(indexIfcBuffer);
 const tubeBufferInput = new ParsingBuffer(tubeBuffer);
 const gearBufferInput = new ParsingBuffer(gearBuffer);
+const configControlDesignBufferInput = new ParsingBuffer(configControlDesignBuffer);
 const nativeHDBufferInput = new ParsingBuffer(nativeHDBuffer);
 const emptyBufferInput = new ParsingBuffer(emptyBuffer);
 /**
@@ -30,6 +32,12 @@ function testTubeStep() {
 function testGearStep() {
     return ModelFormatDetector.detect(gearBufferInput);
 }
+/**
+ * @return {ModelFormatType} The type for model formats, should be AP203.
+ */
+function testConfigControlDesignStep() {
+    return ModelFormatDetector.detect(configControlDesignBufferInput);
+}
 /**
  * @return {ModelFormatType} The type for model formats, should be AP214.
  */
@@ -52,6 +60,9 @@ describe("Model Format Detector", () => {
     test("testGearStep()", () => {
         expect(testGearStep()).toBe(ModelFormatType.AP214);
     });
+    test("testConfigControlDesignStep()", () => {
+        expect(testConfigControlDesignStep()).toBe(ModelFormatType.AP203);
+    });
     test("testNotAModel()", () => {
         expect(testNotAModel()).toBe(void 0);
     });

package/compiled/src/loaders/conway_model_loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conway_model_loader.d.ts","sourceRoot":"","sources":["../../../src/loaders/conway_model_loader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAcrC;;;;GAIG;AACH,qBAAa,iBAAiB;IAE5B;;;;;;;;OAQG;WACiB,kBAAkB,CAClC,IAAI,EAAE,UAAU,EAChB,aAAa,GAAE,OAAc,EAC7B,eAAe,GAAE,MAAW,EAC5B,OAAO,GAAE,MAAU,GAAI,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;CAqXnD"}
+{"version":3,"file":"conway_model_loader.d.ts","sourceRoot":"","sources":["../../../src/loaders/conway_model_loader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAcrC;;;;GAIG;AACH,qBAAa,iBAAiB;IAE5B;;;;;;;;OAQG;WACiB,kBAAkB,CAClC,IAAI,EAAE,UAAU,EAChB,aAAa,GAAE,OAAc,EAC7B,eAAe,GAAE,MAAW,EAC5B,OAAO,GAAE,MAAU,GAAI,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;CA8XnD"}

package/compiled/src/loaders/conway_model_loader.js

@@ -30,10 +30,17 @@ export class ConwayModelLoader {
     static async loadModelWithScene(data, limitCSGDepth = true, maximumCSGDepth = 20, modelID = 0) {
         const allTimeStart = Date.now();
         const modelFormat = ModelFormatDetector.detect(new ParsingBuffer(data));
+        let is203 = false;
         switch (modelFormat) {
+            case ModelFormatType.AP203:
+                console.log("AP203 Step Detected, using AP214 loader");
+                is203 = true;
+            // falls through
             case ModelFormatType.AP214:
-                try {
+                if (!is203) {
                     console.log("AP214 Step Detected");
+                }
+                try {
                     const conwayWasm = new ConwayGeometry();
                     if (!await conwayWasm.initialize()) {
                         throw Error("Couldn't initialise conway-geom");

package/compiled/src/version/version.js

@@ -1,2 +1,2 @@
-const versionString = 'Conway Web-Ifc Shim v0.23.977';
+const versionString = 'Conway Web-Ifc Shim v1.22.969';
 export { versionString };