@almadar/core 7.7.0 → 7.7.1

package/dist/index.js

@@ -1531,12 +1531,21 @@ function schemaToIR(schema, useCache = true) {
         featureName: page.name.toLowerCase(),
         viewType: page.viewType && ["list", "detail", "create", "edit", "dashboard"].includes(page.viewType) ? page.viewType : void 0,
         sections: [],
-        traits: (page.traits || []).map((traitRef) => ({
-          ref: traitRef.ref,
-          trait: resolveTraitRef(traitRef, ir.traits, orbital.traits || []),
-          linkedEntity: traitRef.linkedEntity ?? (orbital.entity ? typeof orbital.entity === "string" ? orbital.entity.replace(".entity", "") : orbital.entity.name : void 0),
-          config: traitRef.config
-        })),
+        traits: (page.traits || []).map((traitRef) => {
+          const resolvedTrait = resolveTraitRef(traitRef, ir.traits, orbital.traits || []);
+          const orbitalTrait = (orbital.traits || []).find(
+            (t) => typeof t === "object" && t !== null && ("name" in t && t.name === traitRef.ref || "ref" in t && t.ref === traitRef.ref)
+          );
+          const orbitalTraitWrapped = orbitalTrait;
+          const wrapperLinked = orbitalTraitWrapped?.linkedEntity ?? orbitalTraitWrapped?._resolved?.linkedEntity;
+          const resolvedLinked = resolvedTrait?.linkedEntity;
+          return {
+            ref: traitRef.ref,
+            trait: resolvedTrait,
+            linkedEntity: traitRef.linkedEntity ?? wrapperLinked ?? resolvedLinked ?? (orbital.entity ? typeof orbital.entity === "string" ? orbital.entity.replace(".entity", "") : orbital.entity.name : void 0),
+            config: traitRef.config
+          };
+        }),
         entityBindings: [],
         navigation: [],
         singletonEntities: []