@ifc-lite/codegen 1.14.3 → 1.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ifc-lite/codegen",
-  "version": "1.14.3",
+  "version": "1.15.0",
   "description": "TypeScript code generator from IFC EXPRESS schemas",
   "type": "module",
   "main": "dist/index.js",

package/src/express-parser.ts

@@ -161,11 +161,12 @@ function parseEntity(name: string, body: string): EntityDefinition {
   let attributesSection = body;
 
   // Find where attributes section ends
+  // Match only section-level keywords at line start (not inside attribute types, e.g. "OF UNIQUE")
   const sectionMatches = [
-    body.match(/\bWHERE\b/),
-    body.match(/\bDERIVE\b/),
-    body.match(/\bINVERSE\b/),
-    body.match(/\bUNIQUE\b/),
+    body.match(/^\s*WHERE\b/m),
+    body.match(/^\s*DERIVE\b/m),
+    body.match(/^\s*INVERSE\b/m),
+    body.match(/^\s*UNIQUE\b/m),
   ].filter(m => m !== null) as RegExpMatchArray[];
 
   if (sectionMatches.length > 0) {
@@ -398,13 +399,15 @@ export function getAllAttributes(
   entity: EntityDefinition,
   schema: ExpressSchema
 ): AttributeDefinition[] {
-  const attributes: AttributeDefinition[] = [];
+  // Collect attributes by walking up the inheritance chain,
+  // then reverse to get STEP order (parent-first / root → leaf)
+  const levels: AttributeDefinition[][] = [];
 
-  // Walk up the inheritance chain
   let current: EntityDefinition | undefined = entity;
   while (current) {
-    // Add attributes from this level
-    attributes.push(...current.attributes);
+    if (current.attributes.length > 0) {
+      levels.push(current.attributes);
+    }
 
     // Move to parent
     if (current.supertype) {
@@ -414,6 +417,12 @@ export function getAllAttributes(
     }
   }
 
+  // Reverse: root attributes first (STEP positional order)
+  const attributes: AttributeDefinition[] = [];
+  for (let i = levels.length - 1; i >= 0; i--) {
+    attributes.push(...levels[i]);
+  }
+
   return attributes;
 }
 

package/src/typescript-generator.ts

@@ -498,10 +498,20 @@ export function isKnownEntity(typeName: string): boolean {
  * Normalize type name to IfcXxx format
  */
 function normalizeTypeName(name: string): string {
-  // Convert IFCWALL -> IfcWall
-  if (name.toUpperCase().startsWith('IFC')) {
-    return 'Ifc' + name.substring(3).charAt(0).toUpperCase() +
-           name.substring(4).toLowerCase();
+  // Already in IfcPascalCase — return as-is
+  if (name.startsWith('Ifc') && name.length > 3 && name[3] >= 'A' && name[3] <= 'Z') {
+    return name;
+  }
+  // Convert UPPERCASE STEP names: IFCWALL -> IfcWall, IFCWALLTYPE -> IfcWallType
+  const upper = name.toUpperCase();
+  if (upper.startsWith('IFC')) {
+    const rest = upper.substring(3);
+    // Lookup by matching uppercase keys in the registry
+    for (const key of Object.keys(SCHEMA_REGISTRY.entities)) {
+      if (key.toUpperCase() === 'IFC' + rest) return key;
+    }
+    // Fallback: best-effort single-word conversion
+    return 'Ifc' + rest.charAt(0) + rest.substring(1).toLowerCase();
   }
   return name;
 }

package/test/express-parser.test.ts

@@ -293,10 +293,10 @@ describe('EXPRESS Parser', () => {
 
       expect(allAttrs).toHaveLength(4);
       expect(allAttrs.map(a => a.name)).toEqual([
-        'Tag',       // IfcProduct
-        'ObjectType', // IfcObject
         'GlobalId',  // IfcRoot
         'Name',      // IfcRoot
+        'ObjectType', // IfcObject
+        'Tag',       // IfcProduct
       ]);
     });