@bldrs-ai/conway 0.23.977 → 1.22.969

package/compiled/src/AP214E3_2010/ap214_geometry_extraction.js

@@ -1581,11 +1581,55 @@ export class AP214GeometryExtraction {
     extractMappedItem(from, owningElementLocalID, parents = void 0) {
         const representationMap = from.mapping_source;
         const mappingTarget = from.mapping_target;
-        let popTransform = false;
+        const mappingOrigin = representationMap.mapping_origin;
+        let pushedTransforms = 0;
+        const pushTransform = (nativeTransform) => {
+            this.scene.addTransform(from.localID, nativeTransform.getValues(), nativeTransform, true);
+            ++pushedTransforms;
+        };
         if (mappingTarget instanceof cartesian_transformation_operator_3d) {
             const nativeCartesianTransform = this.extractCartesianTransformOperator3D(mappingTarget);
-            this.scene.addTransform(from.localID, nativeCartesianTransform.getValues(), nativeCartesianTransform, true);
-            popTransform = true;
+            const originTransform = mappingOrigin instanceof placement ?
+                this.extractRawPlacement(mappingOrigin) : void 0;
+            let combinedTransform;
+            if (originTransform !== void 0) {
+                // Use the same semantics as doTransforms: from = origin^-1, to = target
+                const from = originTransform.invert();
+                const to = nativeCartesianTransform;
+                const params = {
+                    useRelPlacement: true,
+                    axis2Placement: from,
+                    relPlacement: to,
+                };
+                combinedTransform = this.conwayModel.getLocalPlacement(params);
+            }
+            else {
+                combinedTransform = nativeCartesianTransform;
+            }
+            pushTransform(combinedTransform);
+        }
+        else if (mappingTarget instanceof placement) {
+            const targetTransform = this.extractRawPlacement(mappingTarget);
+            const originTransform = mappingOrigin instanceof placement ?
+                this.extractRawPlacement(mappingOrigin) : void 0;
+            if (targetTransform !== void 0) {
+                let combinedTransform;
+                if (originTransform !== void 0) {
+                    // Again, same semantics as doTransforms
+                    const from = originTransform.invert();
+                    const to = targetTransform;
+                    const params = {
+                        useRelPlacement: true,
+                        axis2Placement: from,
+                        relPlacement: to,
+                    };
+                    combinedTransform = this.conwayModel.getLocalPlacement(params);
+                }
+                else {
+                    combinedTransform = targetTransform;
+                }
+                pushTransform(combinedTransform);
+            }
         }
         for (const representationItem of representationMap.mapped_representation.items) {
             if (representationItem instanceof mapped_item) {
@@ -1623,7 +1667,7 @@ export class AP214GeometryExtraction {
                 this.scene.addGeometry(representationItem.localID, owningElementLocalID, materialOverrideID);
             }
         }
-        if (popTransform) {
+        for (; pushedTransforms > 0; --pushedTransforms) {
             this.scene.popTransform();
         }
     }
@@ -2534,23 +2578,22 @@ export class AP214GeometryExtraction {
         return this.scene.addTransform(parentLocalId, axis2PlacementTransform.getValues(), axis2PlacementTransform, true);
     }
     /**
+     * Extract a placement, adding it to the scene.
      *
-     * @param from
-     * @param mappedItem
+     * @param from The placement to extract.
+     * @param mappedItem Whether the placement is a mapped item.
+     * @return The extracted placement or undefined if the placement is not a axis2_placement_3d.
      */
     extractPlacement(from, mappedItem = false) {
-        // if ( !mappedItem ) {
-        //   const result: AP214SceneTransform | undefined =
-        //     this.scene.getTransform(from.localID)
-        //   if (result !== void 0) {
-        //     this.scene.pushTransform(result)
-        //     return result
-        //   }
-        // }
+        if (from instanceof axis2_placement_3d) {
+            const placementTransform = this.extractRawPlacement(from);
+            if (placementTransform) {
+                this.scene.addTransform(from.localID, placementTransform.getValues(), placementTransform, true);
+            }
+        }
         if (from instanceof axis2_placement_3d) {
             return this.extractAxis2Placement3D(from, from.localID, false, true);
         }
-        return;
     }
     extractRawPlacement(from) {
         if (from instanceof axis2_placement_3d) {
@@ -2559,6 +2602,42 @@ export class AP214GeometryExtraction {
         }
         return;
     }
+    /**
+     * Multiply a native 4x4 transform by a uniform scale factor in affine
+     * semantics: scale both the 3x3 basis and the translation column,
+     * leaving the bottom row at [0,0,0,1]. Equivalent to `factor * mat`
+     * for any affine input.
+     *
+     * Used in preference to the native `uniformScale` binding for unit
+     * conversion, where the placement's translation also needs to be
+     * scaled. See https://github.com/bldrs-ai/conway/issues/308.
+     *
+     * @param mat Source column-major Glmdmat4 transform; not mutated.
+     * @param factor Scalar applied to every affine entry.
+     * @return A freshly allocated 4x4 with the scale applied.
+     */
+    uniformScaleAffine(mat, factor) {
+        const v = mat.getValues().slice();
+        // Column-major Glmdmat4 layout:
+        //   basis at 0,1,2 / 4,5,6 / 8,9,10
+        //   translation at 12,13,14
+        //   bottom row at 3,7,11,15 (untouched: [0,0,0,1])
+        v[0] *= factor;
+        v[1] *= factor;
+        v[2] *= factor;
+        v[4] *= factor;
+        v[5] *= factor;
+        v[6] *= factor;
+        v[8] *= factor;
+        v[9] *= factor;
+        v[10] *= factor;
+        v[12] *= factor;
+        v[13] *= factor;
+        v[14] *= factor;
+        const result = (new (this.wasmModule.Glmdmat4));
+        result.setValues(v);
+        return result;
+    }
     /**
      *
      */
@@ -2768,53 +2847,9 @@ export class AP214GeometryExtraction {
                 shapeRepresentationRelationshipsSeen.add(shapeRelationship.localID);
                 const sourceShape = shapeRelationship.rep_1;
                 const targetShape = shapeRelationship.rep_2;
-                const transformInstance = shapeRelationship.findVariant(representation_relationship_with_transformation);
-                let transform = void 0;
-                let scaleTransform = void 0;
-                if (transformInstance !== void 0) {
-                    const transformOperator = transformInstance.transformation_operator;
-                    if (!(transformOperator instanceof item_defined_transformation)) {
-                        continue;
-                    }
-                    const placement1 = transformOperator.transform_item_1;
-                    if (!(placement1 instanceof placement)) {
-                        continue;
-                    }
-                    const placement2 = transformOperator.transform_item_2;
-                    if (!(placement2 instanceof placement)) {
-                        continue;
-                    }
-                    const from = this.extractRawPlacement(placement1)?.invert() ?? this.identity3DNativeMatrix;
-                    const to = this.extractRawPlacement(placement2) ?? this.identity3DNativeMatrix;
-                    const localPlacementParameters = {
-                        useRelPlacement: true,
-                        axis2Placement: from,
-                        relPlacement: to,
-                    };
-                    transform = this.conwayModel.getLocalPlacement(localPlacementParameters);
-                }
-                const sourceShapeContext = sourceShape.context_of_items.findVariant(global_unit_assigned_context)?.units?.
-                    find(unit => unit.findVariant(length_unit))?.findVariant(length_unit);
-                const targetShapeContext = targetShape.context_of_items.findVariant(global_unit_assigned_context)?.units?.
-                    find(unit => unit.findVariant(length_unit))?.findVariant(length_unit);
-                if (sourceShapeContext !== void 0 && targetShapeContext !== void 0) {
-                    const scaleRatio = this.lengthUnitConversionRatio(sourceShapeContext, targetShapeContext);
-                    if (scaleRatio !== void 0 && scaleRatio !== 1) {
-                        scaleTransform = this.identity3DNativeMatrix.uniformScale(scaleRatio);
-                    }
-                }
-                if (scaleTransform !== void 0) {
-                    if (transform !== void 0) {
-                        const localPlacementParameters = {
-                            useRelPlacement: true,
-                            axis2Placement: transform,
-                            relPlacement: scaleTransform,
-                        };
-                        transform = this.conwayModel.getLocalPlacement(localPlacementParameters);
-                    }
-                    else {
-                        transform = scaleTransform;
-                    }
+                const [transform, isContinue] = this.doTransforms(shapeRelationship, sourceShape, targetShape, owningLocalID);
+                if (isContinue) {
+                    continue;
                 }
                 const sourceID = sourceShape.localID;
                 const targetID = targetShape.localID;
@@ -2853,53 +2888,9 @@ export class AP214GeometryExtraction {
                  */
                 const sourceShape = shapeRelationship.rep_2;
                 const targetShape = shapeRelationship.rep_1;
-                const transformInstance = shapeRelationship.findVariant(representation_relationship_with_transformation);
-                let transform = void 0;
-                let scaleTransform = void 0;
-                if (transformInstance !== void 0) {
-                    const transformOperator = transformInstance.transformation_operator;
-                    if (!(transformOperator instanceof item_defined_transformation)) {
-                        continue;
-                    }
-                    const placement1 = transformOperator.transform_item_1;
-                    if (!(placement1 instanceof placement)) {
-                        continue;
-                    }
-                    const placement2 = transformOperator.transform_item_2;
-                    if (!(placement2 instanceof placement)) {
-                        continue;
-                    }
-                    const from = this.extractRawPlacement(placement1)?.invert() ?? this.identity3DNativeMatrix;
-                    const to = this.extractRawPlacement(placement2) ?? this.identity3DNativeMatrix;
-                    const localPlacementParameters = {
-                        useRelPlacement: true,
-                        axis2Placement: from,
-                        relPlacement: to,
-                    };
-                    transform = this.conwayModel.getLocalPlacement(localPlacementParameters);
-                }
-                const sourceShapeContext = sourceShape.context_of_items.findVariant(global_unit_assigned_context)?.units?.
-                    find(unit => unit.findVariant(length_unit))?.findVariant(length_unit);
-                const targetShapeContext = targetShape.context_of_items.findVariant(global_unit_assigned_context)?.units?.
-                    find(unit => unit.findVariant(length_unit))?.findVariant(length_unit);
-                if (sourceShapeContext !== void 0 && targetShapeContext !== void 0) {
-                    const scaleRatio = this.lengthUnitConversionRatio(sourceShapeContext, targetShapeContext);
-                    if (scaleRatio !== void 0 && scaleRatio !== 1) {
-                        scaleTransform = this.identity3DNativeMatrix.uniformScale(scaleRatio);
-                    }
-                }
-                if (scaleTransform !== void 0) {
-                    if (transform !== void 0) {
-                        const localPlacementParameters = {
-                            useRelPlacement: true,
-                            axis2Placement: transform,
-                            relPlacement: scaleTransform,
-                        };
-                        transform = this.conwayModel.getLocalPlacement(localPlacementParameters);
-                    }
-                    else {
-                        transform = scaleTransform;
-                    }
+                const [transform, isContinue] = this.doTransforms(shapeRelationship, sourceShape, targetShape, owningLocalID);
+                if (isContinue) {
+                    continue;
                 }
                 const sourceID = sourceShape.localID;
                 const targetID = targetShape.localID;
@@ -2951,7 +2942,8 @@ export class AP214GeometryExtraction {
                     let scaleTransform = void 0;
                     if (sourceShapeContext !== void 0) {
                         const sourceUnitInM = (this.convertToMetres(sourceShapeContext) ?? 1);
-                        scaleTransform = this.identity3DNativeMatrix.uniformScale(1 / sourceUnitInM);
+                        scaleTransform =
+                            this.uniformScaleAffine(this.identity3DNativeMatrix, 1 / sourceUnitInM);
                     }
                     // not an assembly mapped item, just extract the representation
                     thunk(void 0, scaleTransform);
@@ -2984,7 +2976,8 @@ export class AP214GeometryExtraction {
                     let scaleTransform = void 0;
                     if (sourceShapeContext !== void 0) {
                         const sourceUnitInM = (this.convertToMetres(sourceShapeContext) ?? 1);
-                        scaleTransform = this.identity3DNativeMatrix.uniformScale(1 / sourceUnitInM);
+                        scaleTransform =
+                            this.uniformScaleAffine(this.identity3DNativeMatrix, 1 / sourceUnitInM);
                     }
                     // not an assembly mapped item, just extract the representation
                     mappedNode.thunk(void 0, scaleTransform);
@@ -3005,4 +2998,56 @@ export class AP214GeometryExtraction {
             this.model.elementMemoization = previousMemoizationState;
         }
     }
+    /**
+     * Process the transforms for a shape relationship.
+     *
+     * @param shapeRelationship The shape relationship to process.
+     * @param sourceShape The source shape.
+     * @param targetShape The target shape.
+     * @param owningLocalID The owning local ID.
+     * @return The transform and a boolean indicating if the processing should continue inside the loop.
+     */
+    doTransforms(shapeRelationship, sourceShape, targetShape, owningLocalID) {
+        const transformInstance = shapeRelationship.findVariant(representation_relationship_with_transformation);
+        let transform = void 0;
+        if (transformInstance !== void 0) {
+            const transformOperator = transformInstance.transformation_operator;
+            if (transformOperator instanceof item_defined_transformation) {
+                const placement1 = transformOperator.transform_item_1;
+                const placement2 = transformOperator.transform_item_2;
+                if (!(placement1 instanceof placement) || !(placement2 instanceof placement)) {
+                    return [void 0, true];
+                }
+                const from = this.extractRawPlacement(placement1)?.invert() ?? this.identity3DNativeMatrix;
+                const to = this.extractRawPlacement(placement2) ?? this.identity3DNativeMatrix;
+                const localPlacementParameters = {
+                    useRelPlacement: true,
+                    axis2Placement: from,
+                    relPlacement: to,
+                };
+                transform = this.conwayModel.getLocalPlacement(localPlacementParameters);
+            }
+            else if (transformOperator instanceof cartesian_transformation_operator_3d) {
+                transform = this.extractCartesianTransformOperator3D(transformOperator);
+            }
+        }
+        const sourceShapeContext = sourceShape.context_of_items.findVariant(global_unit_assigned_context)?.units?.
+            find(unit => unit.findVariant(length_unit))?.findVariant(length_unit);
+        const targetShapeContext = targetShape.context_of_items.findVariant(global_unit_assigned_context)?.units?.
+            find(unit => unit.findVariant(length_unit))?.findVariant(length_unit);
+        let scaleRatio = 1;
+        let needsScale = false;
+        if (sourceShapeContext !== void 0 && targetShapeContext !== void 0) {
+            const sr = this.lengthUnitConversionRatio(sourceShapeContext, targetShapeContext);
+            if (sr !== void 0 && sr !== 1) {
+                scaleRatio = sr;
+                needsScale = true;
+            }
+        }
+        if (needsScale) {
+            transform =
+                this.uniformScaleAffine(transform ?? this.identity3DNativeMatrix, scaleRatio);
+        }
+        return [transform, false];
+    }
 }

package/compiled/src/AP214E3_2010/ap214_geometry_extraction.test.js

@@ -112,6 +112,85 @@ describe("AP214 Geometry Extraction", () => {
         const testParameter = 48108;
         expect(getGearMeshSize()).toBe(testParameter);
     });
+    test("uniformScaleAffine scales basis AND translation, preserves bottom row", () => {
+        // Direct unit test for the affine scale helper used by the unit-conversion
+        // path in doTransforms (see https://github.com/bldrs-ai/conway/issues/308).
+        // Models a placement in mm with a 1000 mm x-translation, 50 mm
+        // y-translation, converted to metres (factor = 1/MM_PER_M).
+        const MM_PER_M = 1000;
+        const TX_MM = 1000;
+        const TY_MM = 50;
+        const factor = 1 / MM_PER_M;
+        const model = conwayTubeModel;
+        const input = new model.wasmModule.Glmdmat4();
+        // Column-major: cols 0..2 = basis (identity), col 3 = translation
+        input.setValues([
+            1,
+            0,
+            0,
+            0,
+            0,
+            1,
+            0,
+            0,
+            0,
+            0,
+            1,
+            0,
+            TX_MM,
+            TY_MM,
+            0,
+            1,
+        ]);
+        const v = model.uniformScaleAffine(input, factor).getValues();
+        // Basis diagonal scaled by factor.
+        expect(v[0]).toBeCloseTo(factor);
+        expect(v[5]).toBeCloseTo(factor);
+        expect(v[10]).toBeCloseTo(factor);
+        // Translation scaled by factor (mm -> m). This is the bug the C++
+        // `uniformScale` left in source units before; the helper fixes it.
+        expect(v[12]).toBeCloseTo(TX_MM * factor);
+        expect(v[13]).toBeCloseTo(TY_MM * factor);
+        expect(v[14]).toBeCloseTo(0);
+        // Bottom row left at [0, 0, 0, 1].
+        expect(v[3]).toBe(0);
+        expect(v[7]).toBe(0);
+        expect(v[11]).toBe(0);
+        expect(v[15]).toBe(1);
+    });
+    test("uniformScaleAffine with factor=1 returns the original matrix entries", () => {
+        const model = conwayTubeModel;
+        // A column-major rotation+translation matrix with non-trivial entries
+        // (60-degree z-rotation, arbitrary translation).
+        const COS60 = Math.cos(Math.PI / 3);
+        const SIN60 = Math.sin(Math.PI / 3);
+        const TY = 20;
+        const TZ = 30;
+        const original = [
+            COS60,
+            SIN60,
+            0,
+            0,
+            -SIN60,
+            COS60,
+            0,
+            0,
+            0,
+            0,
+            1,
+            0,
+            10,
+            TY,
+            TZ,
+            1,
+        ];
+        const input = new model.wasmModule.Glmdmat4();
+        input.setValues(original);
+        const v = model.uniformScaleAffine(input, 1).getValues();
+        for (let i = 0; i < original.length; ++i) {
+            expect(v[i]).toBeCloseTo(original[i]);
+        }
+    });
     test("destroy()", () => {
         expect(destroy()).toBe(false);
     });

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

@@ -180,12 +180,17 @@ export declare class AP214SceneBuilder implements WalkableScene<StepEntityBase<E
      */
     addGeometry(localID: number, owningElementLocalID?: number, materialOverridLocalID?: number): AP214SceneGeometry;
     /**
+     * Add a transform node and make the current transform stack parent its parent.
      *
-     * @param localID
-     * @param transform
-     * @param nativeTransform
-     * @param mappedItem
-     * @return {AP214SceneTransform}
+     * Items added will be made the top of the transform stack.
+     *
+     * To prevent a node being used as a parent, pop it subsequently.
+     *
+     * @param localID The local ID of the transform.
+     * @param transform The transform matrix.
+     * @param nativeTransform The native transform matrix.
+     * @param mappedItem Whether the transform is a mapped item.
+     * @return The added transform node.
      */
     addTransform(localID: number, transform: ReadonlyArray<number>, nativeTransform: NativeTransform4x4, mappedItem?: boolean): AP214SceneTransform;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ap214_scene_builder.d.ts","sourceRoot":"","sources":["../../../src/AP214E3_2010/ap214_scene_builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ap214_scene_builder.d.ts","sourceRoot":"","sources":["../../../src/AP214E3_2010/ap214_scene_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAkB,kBAAkB,EAAwB,MACjF,gCAAgC,CAAA;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAqB,MAAM,wBAAwB,CAAA;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAA;AAClF,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EACnB,MACM,oBAAoB,CAAA;AAE3B,OAAO,cAAc,MAAM,0BAA0B,CAAA;AACrD,OAAO,gBAAgB,MAAM,2CAA2C,CAAA;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,cAAc,MAAM,oBAAoB,CAAA;AAG/C;;GAEG;AACH,qBAAa,mBAAoB,YAAW,kBAAkB;aAkB1C,KAAK,EAAE,KAAK;aACZ,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC;aAChC,iBAAiB,EAAE,aAAa,CAAC,MAAM,CAAC;aACxC,OAAO,EAAE,MAAM;aACf,KAAK,EAAE,MAAM;aACb,eAAe,EAAE,kBAAkB;aACnC,uBAAuB,EAAE,kBAAkB;aAC3C,WAAW,CAAC;IAvB9B,QAAQ,CAAC,IAAI,gCAA+B;IAI5C;;;;;;;;;;OAUG;gBAEe,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,EAChC,iBAAiB,EAAE,aAAa,CAAC,MAAM,CAAC,EACxC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,kBAAkB,EACnC,uBAAuB,EAAE,kBAAkB,EAC3C,WAAW,CAAC,oBAAQ;IAE/B,QAAQ,EAAE,MAAM,EAAE,CAAK;CAC/B;AAED;;GAEG;AACH,qBAAa,kBAAmB,YAAW,iBAAiB;aA0BxC,KAAK,EAAE,KAAK;aACZ,OAAO,EAAE,MAAM;aACf,KAAK,EAAE,MAAM;aACb,qBAAqB,CAAC;aACtB,WAAW,CAAC;aACZ,sBAAsB,CAAC;IA7BzC,QAAQ,CAAC,IAAI,+BAA8B;IAE3C;;;;OAIG;IACH,IAAW,OAAO,IAAI,OAAO,CAG5B;IAGD;;;;;;;;;OASG;gBAEe,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,qBAAqB,CAAC,oBAAQ,EAC9B,WAAW,CAAC,oBAAQ,EACpB,sBAAsB,CAAC,oBAAQ;CAElD;AAED,MAAM,MAAM,cAAc,GAAG,mBAAmB,GAAG,kBAAkB,CAAA;AAErE;;GAEG;AACH,qBAAa,iBAAkB,YAAW,aAAa,CAAE,cAAc,CAAE,gBAAgB,CAAE,CAAE;aAsBzE,KAAK,EAAE,cAAc;aACrB,cAAc,EAAE,cAAc;aAC9B,SAAS,EAAE,kBAAkB;IAtBxC,KAAK,EAAE,MAAM,EAAE,CAAK;IAE3B,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,gBAAgB,CAA4B;IACpD,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,cAAc,CAAC,CAAqB;IAE5C,OAAO,CAAC,mBAAmB,CAAC,CAAiB;IAC7C,OAAO,CAAC,kBAAkB,CAAC,CAAiB;IAG5C;;;;;OAKG;gBAEe,KAAK,EAAE,cAAc,EACrB,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,kBAAkB;IAI/C,IAAW,aAAa,IAAI,mBAAmB,GAAG,SAAS,CAE1D;IAED;;;;OAIG;IACH,gBAAgB,CACZ,QAAQ,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,oBAAoB,GAAI,IAAI;IA0D1C;;;OAGG;IACH,mBAAmB,CAAE,QAAQ,EAAE,aAAa,GAAI,IAAI;IAsCpD;;;;OAIG;IACI,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAIpE;;;;OAIG;IACH,OAAO,CAAC,GAAG;IAOX;;;;OAIG;IACH,IAAW,WAAW,IAAI,MAAM,CAG/B;IAED;;OAEG;IACI,gBAAgB,IAAI,IAAI;IAO/B;;;;OAIG;IACI,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IAYrE;;;;;OAKG;IACI,oBAAoB,IAAI,UAAU,CAAC,cAAc,CAAC;IAuGzD;;;;OAIG;IACI,WAAW,IAAI,OAAO;IAK7B;;;;;;OAMG;IACK,IAAI,CAAC,aAAa,GAAE,OAAe,GACzC,gBAAgB,CAAC;QAAC,SAAS,MAAM,EAAE,GAAG,SAAS;QAC7C,kBAAkB,GAAG,SAAS;QAC9B,aAAa;QACb,iBAAiB,GAAG,SAAS;QAC7B,cAAc,CAAC,gBAAgB,CAAC,GAAG,SAAS;KAAC,CAAC;IAmClD;;OAEG;IACI,YAAY,IAAI,IAAI;IAM3B;;;OAGG;IACI,aAAa,CAAC,SAAS,EAAE,mBAAmB;IASnD;;;;;OAKG;IACI,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAK5C;;;;;;OAMG;IACI,WAAW,CACd,OAAO,EAAE,MAAM,EACf,oBAAoB,CAAC,EAAE,MAAM,EAC7B,sBAAsB,CAAC,EAAE,MAAM,GAAI,kBAAkB;IA8DzD;;;;;;;;;;;;OAYG;IACI,YAAY,CACf,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,aAAa,CAAC,MAAM,CAAC,EAChC,eAAe,EAAE,kBAAkB,EACnC,UAAU,GAAE,OAAe,GAAI,mBAAmB;CAsEvD"}

package/compiled/src/AP214E3_2010/ap214_scene_builder.js

@@ -372,12 +372,17 @@ export class AP214SceneBuilder {
         return result;
     }
     /**
+     * Add a transform node and make the current transform stack parent its parent.
      *
-     * @param localID
-     * @param transform
-     * @param nativeTransform
-     * @param mappedItem
-     * @return {AP214SceneTransform}
+     * Items added will be made the top of the transform stack.
+     *
+     * To prevent a node being used as a parent, pop it subsequently.
+     *
+     * @param localID The local ID of the transform.
+     * @param transform The transform matrix.
+     * @param nativeTransform The native transform matrix.
+     * @param mappedItem Whether the transform is a mapped item.
+     * @return The added transform node.
      */
     addTransform(localID, transform, nativeTransform, mappedItem = false) {
         if (!mappedItem && this.sceneLocalIdMap_.has(localID)) {

package/compiled/src/AP214E3_2010/ap214_transform_helpers.test.d.ts

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

package/compiled/src/AP214E3_2010/ap214_transform_helpers.test.d.ts.map

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

package/compiled/src/AP214E3_2010/ap214_transform_helpers.test.js

@@ -0,0 +1,112 @@
+import fs from "fs";
+import { describe, expect, test, beforeAll, afterAll } from "@jest/globals";
+import { AP214GeometryExtraction } from "./ap214_geometry_extraction.js";
+import { AP214SceneTransform } from "./ap214_scene_builder.js";
+import { ParseResult } from "../step/parsing/step_parser.js";
+import IfcStepParser from "./ap214_step_parser.js";
+import ParsingBuffer from "../parsing/parsing_buffer.js";
+import { ConwayGeometry } from "../../dependencies/conway-geom/index.js";
+import { cartesian_transformation_operator_3d, mapped_item, } from "./AP214E3_2010_gen/index.js";
+let extraction;
+let conwayGeometry;
+/**
+ * Parse data/ap214-mapped-item-test.step and create an AP214GeometryExtraction
+ * for testing transform helpers (extractMappedItem origin-inversion semantics
+ * from PR #309 and extractCartesianTransformOperator3D parameter packaging).
+ *
+ * @return {Promise<boolean>} True iff parse + WASM init succeeded.
+ */
+async function initialize() {
+    const parser = IfcStepParser.Instance;
+    const buffer = fs.readFileSync("data/ap214-mapped-item-test.step");
+    const input = new ParsingBuffer(buffer);
+    if (parser.parseHeader(input)[1] !== ParseResult.COMPLETE) {
+        return false;
+    }
+    conwayGeometry = new ConwayGeometry();
+    if (!(await conwayGeometry.initialize())) {
+        return false;
+    }
+    const [, model] = parser.parseDataToModel(input);
+    if (model === void 0) {
+        return false;
+    }
+    extraction = new AP214GeometryExtraction(conwayGeometry, model);
+    return extraction.isInitialized();
+}
+describe("AP214 transform helpers", () => {
+    beforeAll(async () => {
+        await initialize();
+    });
+    afterAll(() => {
+        extraction?.destroy();
+    });
+    test("parses fixture and finds the mapped_item + CTO3D entities", () => {
+        const mappedItems = Array.from(extraction.model.types(mapped_item));
+        const ctos = Array.from(extraction.model.types(cartesian_transformation_operator_3d));
+        expect(mappedItems.length).toBe(1);
+        expect(ctos.length).toBe(1);
+    });
+    test("extractCartesianTransformOperator3D produces a non-trivial matrix with the entity origin", () => {
+        // Fixture has CARTESIAN_TRANSFORMATION_OPERATOR_3D('',$,$,#13,2.,$)
+        // with #13 = CARTESIAN_POINT('',(50.,0.,0.)). Verifies the helper
+        // packages local_origin into the returned matrix's translation
+        // column (column-major v[12..14]).
+        const CTO_ORIGIN_X = 50;
+        const MAT_4X4_ENTRIES = 16;
+        const ctos = Array.from(extraction.model.types(cartesian_transformation_operator_3d));
+        const cto = ctos[0];
+        const result = extraction.extractCartesianTransformOperator3D(cto);
+        const v = result.getValues();
+        expect(v.length).toBe(MAT_4X4_ENTRIES);
+        // Translation reflects the entity's local_origin.
+        expect(v[12]).toBeCloseTo(CTO_ORIGIN_X);
+        expect(v[13]).toBeCloseTo(0);
+        expect(v[14]).toBeCloseTo(0);
+        // Bottom row sane for an affine 4x4.
+        expect(v[3]).toBeCloseTo(0);
+        expect(v[7]).toBeCloseTo(0);
+        expect(v[11]).toBeCloseTo(0);
+    });
+    test("extractMappedItem composes target * origin^-1 for a placement target", () => {
+        // Fixture has:
+        //   origin placement #30 at  (10, 0, 0)
+        //   target placement #31 at (100, 0, 0)
+        //   mapped_item   #60 mapping #30 -> #31
+        //
+        // Per PR #309 (line 2298-2308 of ap214_geometry_extraction.ts): the
+        // pushed transform is `target * origin^-1`. With identity rotations
+        // and translations as above, the result's translation column should
+        // be (100 - 10, 0, 0) = (90, 0, 0).
+        //
+        // Regression guard: if origin^-1 were dropped, the result would be
+        // the bare target translation (100, 0, 0).
+        const EXPECTED_TX = 90;
+        const TARGET_ONLY_TX = 100;
+        const mappedItems = Array.from(extraction.model.types(mapped_item));
+        const mi = mappedItems[0];
+        const sceneInternal = extraction.scene;
+        const indexBefore = sceneInternal.scene_.length;
+        extraction.extractMappedItem(mi);
+        // The first scene node added by extractMappedItem is the combined
+        // transform itself (pushed with mapped_item's localID); subsequent
+        // nodes come from the recursive extraction of mapped_representation.
+        let pushed;
+        for (let i = indexBefore; i < sceneInternal.scene_.length; ++i) {
+            const node = sceneInternal.scene_[i];
+            if (node instanceof AP214SceneTransform && node.localID === mi.localID) {
+                pushed = node;
+                break;
+            }
+        }
+        expect(pushed).toBeDefined();
+        const v = pushed.transform;
+        // Combined translation = target - origin = 100 - 10 = 90 along X.
+        expect(v[12]).toBeCloseTo(EXPECTED_TX);
+        expect(v[13]).toBeCloseTo(0);
+        expect(v[14]).toBeCloseTo(0);
+        // If the origin inversion were ever removed, v[12] would land at
+        // TARGET_ONLY_TX. Spell that out so a regressed value reads clearly.
+        expect(v[12]).not.toBeCloseTo(TARGET_ONLY_TX);
+    });
+});

package/compiled/src/format_detection/model_format_detector.d.ts

@@ -4,7 +4,8 @@
 import ParsingBuffer from "../parsing/parsing_buffer.js";
 export declare enum ModelFormatType {
     IFC = 0,
-    AP214 = 1
+    AP214 = 1,
+    AP203 = 2
 }
 /**
  * Format detector for finding the format of a model from a buffer in conway.

package/compiled/src/format_detection/model_format_detector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model_format_detector.d.ts","sourceRoot":"","sources":["../../../src/format_detection/model_format_detector.ts"],"names":[],"mappings":"AACA;;GAEG;AAEH,OAAO,aAAa,MAAM,2BAA2B,CAAA;AAIrD,oBAAY,eAAe;IAEzB,GAAG,IAAI;IAEP,KAAK,IAAI;CACV;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAEtC;;;;;;OAMG;WACW,MAAM,CAAE,KAAK,EAAE,aAAa,GAAI,eAAe,GAAG,SAAS;CAsC1E"}
+{"version":3,"file":"model_format_detector.d.ts","sourceRoot":"","sources":["../../../src/format_detection/model_format_detector.ts"],"names":[],"mappings":"AACA;;GAEG;AAEH,OAAO,aAAa,MAAM,2BAA2B,CAAA;AAIrD,oBAAY,eAAe;IAEzB,GAAG,IAAI;IAEP,KAAK,IAAI;IAET,KAAK,IAAI;CACV;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAEtC;;;;;;OAMG;WACW,MAAM,CAAE,KAAK,EAAE,aAAa,GAAI,eAAe,GAAG,SAAS;CAiC1E"}