from alpha

Author: SnorreFossland

.DS_Store

@@ -46,7 +46,7 @@
     "es6-promise": "^4.2.8",
     "file-saver": "^2.0.5",
     "fs": "0.0.1-security",
-    "go": "^3.0.1",
+    "go": "^2.0.2",
     "gojs": "^3.0.19",
     "gojs-react": "^1.1.2",
     "graphql": "^16.10.0",
@@ -66,7 +66,7 @@
     "next-remove-imports": "^1.0.12",
     "node": "^20.19.0",
     "node-fetch": "^3.3.2",
-    "npm": "^11.2.0",
+    "npm": "^8.18.0",
     "phoenix": "^1.7.20",
     "postcss": "^8.5.3",
     "printf": "^0.6.1",
@@ -122,7 +122,7 @@
     "prettier": "^3.5.3",
     "pretty-quick": "^4.1.1",
     "promise": "^8.3.0",
-    "react-scripts": "^5.0.1",
+    "react-scripts": "^0.0.0",
     "typescript": "^5.8.2",
     "typescript-fsa": "^3.0.0",
     "typescript-fsa-reducers": "^1.2.2"
@@ -132,5 +132,6 @@
     "bufferutil": "^4.0.9",
     "fsevents": "^2.3.3",
     "utf-8-validate": "^6.0.5"
-  }
+  },
+  "packageManager": "pnpm@10.15.0+sha512.486ebc259d3e999a4e8691ce03b5cac4a71cbeca39372a9b762cb500cfdf0873e2cb16abe3d951b1ee2cf012503f027b98b6584e4df22524e0c7450d9ec7aa7b"
 }

package-lock.json

@@ -9519,45 +9519,47 @@ export class cxObjectView extends cxMetaObject {
     category: string;
     object: cxObject | null;
     objectRef: string;
+    parent: string;
     inputrelviews: cxRelationshipView[] | null;
     outputrelviews: cxRelationshipView[] | null;
     typeview: cxObjectTypeView | null;
     typeviewRef: string;
-    figure: string;
-    group: string;
-    isGroup: boolean;
+
     groupLayout: string;
-    parent: string;
-    isExpanded: boolean;
-    isSelected: boolean;
-    visible: boolean;
     grabIsAllowed: boolean;
+    isExpanded: boolean;
     readonly: boolean;
+    visible: boolean;
+    
     text: string;
-    loc: string;
-    size: string;
-    scale: number;
-    memberscale: number;
-    arrowscale: number;
-    viewkind: string;
-    template: string;
-    template2: string;
-    figure: string;
-    geometry: string;
-    icon: string;
-    image: string;
     routing: string;
     linkcurve: string;
-    fillcolor: string;
     fillcolor1: string;
+    strokecolor1: string;
+
+    figure: string;
+    fillcolor: string;
     fillcolor2: string;
+    geometry: string;
+    group: string;
+    icon: string;
+    image: string;
+    isGroup: boolean;
+    isSelected: boolean;
+    loc: string;
+    memberscale: number;
+    modified: boolean;
+    scale: number;
+    size: string;
     strokecolor: string;
-    strokecolor1: string;
     strokecolor2: string;
     strokewidth: number;
+    template: string;
+    template2: string;
     textcolor: string;
     textcolor2: string;
     textscale: number;
+    viewkind: string;
     constructor(id: string, name: string, object: cxObject | null, description: string, modelview: cxModelView | null) {
         super(id, name, description);
         this.modelview = modelview;
@@ -9574,7 +9576,7 @@ export class cxObjectView extends cxMetaObject {
         this.memberscale = this.typeview?.memberscale ? this.typeview.memberscale : 1.0;
         this.arrowscale = this.typeview?.arrowscale ? this.typeview.arrowscale : 1.3;
         this.textscale = this.typeview?.textscale ? this.typeview.textscale : 1.0;
-        if (false) {
+        if (true) {
         this.group = "";
         this.isGroup = false;
         this.groupLayout = "";
@@ -9849,7 +9851,7 @@ export class cxObjectView extends cxMetaObject {
     }
     setFigure(figure: string) {
         if (figure == undefined)
-        figure = "";
+            figure = "";
         this.figure = figure;
     }
     getFigure(): string {
@@ -10157,6 +10159,8 @@ export class cxRelationshipView extends cxMetaObject {
                 this.textcolor = 'black';
                 break;
             default:
+                this.setFromArrow('');
+                this.textcolor = 'black';
                 break;
         }
         if (debug) console.log('5773 fromArrowColor', this.fromArrowColor);
@@ -10187,9 +10191,13 @@ export class cxRelationshipView extends cxMetaObject {
             case 'Aggregation':
             case 'Composition':
                 this.setToArrow('OpenTriangle');
+                this.setToArrowColor('black');
                 this.textcolor = 'black';
                 break;
             default:
+                this.setToArrow('OpenTriangle');
+                this.setToArrowColor('black');
+                this.textcolor = 'black';
                 break;
         }
     }

package.json

@@ -334,19 +334,21 @@ export function buildGoModel(metis: akm.cxMetis, model: akm.cxModel, modelview:
         const object = node.object as akm.cxObject;
         let objtype = object?.type as akm.cxObjectType;
         if (!objtype) objtype = metis.findObjectType(object.typeRef);
-        const typeview = objtype?.getDefaultTypeView() as akm.cxObjectTypeView;
-        if (typeview) {
-          if (!node.template) node.template = typeview.template;
-          if (node.template === "") node.template = typeview.template;
-          if (!node.fillcolor) node.fillcolor = typeview.fillcolor;
-          if (node.fillcolor2 === "") node.fillcolor2 = typeview.fillcolor2;
-          if (node.strokecolor === "") node.strokecolor = typeview.strokecolor;
-          if (node.strokecolor2 === "") node.strokecolor2 = typeview.strokecolor2;
-          if (node.textcolor === "") node.textcolor = typeview.textcolor;
-          if (node.textcolor2 === "") node.textcolor2 = typeview.textcolor2;
-          if (node.icon === "") node.icon = typeview.icon;
-          if (node.image === "") node.image = typeview.image;
-          if (node.viewkind === "") node.viewkind = typeview.viewkind;
+        if (objtype.name !== 'EntityType') {
+          const typeview = objtype?.getDefaultTypeView() as akm.cxObjectTypeView;
+          if (typeview) {
+            if (!node.template) node.template = typeview.template;
+            if (node.template === "") node.template = typeview.template;
+            if (!node.fillcolor) node.fillcolor = typeview.fillcolor;
+            if (node.fillcolor2 === "") node.fillcolor2 = typeview.fillcolor2;
+            if (node.strokecolor === "") node.strokecolor = typeview.strokecolor;
+            if (node.strokecolor2 === "") node.strokecolor2 = typeview.strokecolor2;
+            if (node.textcolor === "") node.textcolor = typeview.textcolor;
+            if (node.textcolor2 === "") node.textcolor2 = typeview.textcolor2;
+            if (node.icon === "") node.icon = typeview.icon;
+            if (node.image === "") node.image = typeview.image;
+            if (node.viewkind === "") node.viewkind = typeview.viewkind;
+          }
         }
       }
     }
@@ -373,6 +375,9 @@ export function buildGoModel(metis: akm.cxMetis, model: akm.cxModel, modelview:
         node.text = objview.name;
       }
       let typeview = objview.typeview;
+      if (!typeview) 
+        typeview = objview.object?.type?.typeview as akm.cxObjectTypeView;
+
       if (typeview && typeview instanceof akm.cxObjectTypeView) {
         typeview = metis.findObjectTypeView(typeview.id);
         objview.setTypeView(typeview);

src/akmm/metamodeller.ts

@@ -2569,7 +2569,7 @@ export function scaleNodeLocation(group: any, node: any): any {
     deltaNy *= scale;
     nx = gx + deltaNx;
     ny = gy + deltaNy;
-    const loc = { "x": nx, "y": ny };
+    const loc = nx + " " + ny;
     if (debug) console.log('921 node, node.loc, loc', node, node.loc, loc);
     return loc;
 }
@@ -2590,8 +2590,11 @@ export function scaleNodeLocation1(group: any, node: any): any {
     const ny = parseInt(nodLoc[1]);
     let deltaNx = (nx - gx) * scaleFactor;
     let deltaNy = (ny - gy) * scaleFactor;
-    const loc = { "x": nx, "y": ny };
-    return loc;
+    const deltaX = nx - deltaNx;
+    const deltaY = ny - deltaNy;
+    const loc1 = deltaX + " " + deltaY;
+    const loc2 = nx + " " + ny;
+    return loc2;
 }
 
 export function scaleNodeLocation2(node: any, refloc: string, toloc: any, scaleFactor: any): any {
@@ -2611,7 +2614,7 @@ export function scaleNodeLocation2(node: any, refloc: string, toloc: any, scaleF
     if (debug) console.log('1159 rx, ry, nx, ny, deltaNx, deltaNy', rx, ry, nx, ny, deltaNx, deltaNy);
     nx = rx + deltaNx;
     ny = ry + deltaNy;
-    const loc = { "x": nx, "y": ny };
+    const loc = nx + " " + ny;
     if (debug) console.log('1163 node, node.loc, loc', node, node.loc, loc);
     return loc;
 }
@@ -2711,6 +2714,7 @@ export function isPropIncluded(k: string, type: akm.cxType): boolean {
     if (k === 'points') retVal = false;
     if (k === 'propertyValues') retVal = false;
     if (k === 'relship') retVal = false;
+    if (k === 'relshipkind') retVal = false;
     if (k === 'relshipRef') retVal = false;
     if (k === 'relshiptype') retVal = false;
     if (k === 'relview') retVal = false;
@@ -2746,7 +2750,7 @@ export function isPropIncluded(k: string, type: akm.cxType): boolean {
     // if (k === 'viewkind') retVal = false;
     if (k === 'visible') retVal = false;
     // if (k === 'viewkind') retVal = false;
-    if (k === 'relshipkind') retVal = false;
+    // if (k === 'relshipkind') retVal = false;
     if (type?.name !== 'ViewFormat' &&
         type?.name !== 'Datatype' &&
         type?.name !== 'Property') {
@@ -4647,3 +4651,89 @@ export function fullFillGoModel(myGoModel: gjs.goModel, myModelView: akm.cxModel
     return myGoModel;
 }
 
+/**
+ * Returns the parent group for a given cxObjectView, if one exists.
+ * This example assumes that the child's "group" property holds the parent’s id
+ * and that you have access to the current model view (e.g. "currentModelView")
+ * which can be used to find an object view by its id.
+ *
+ * Modify this implementation to suit your project’s structure.
+ *
+ * @param ov The child cxObjectView.
+ * @returns The parent cxObjectView if found, otherwise null.
+ */
+export function getParent(ov: cxObjectView): cxObjectView | null {
+  if (ov && ov.group) {
+    // Assuming you have a reference to the current model view.
+    // For example, if it's globally accessible via "currentModelView":
+    const currentModelView = ov.modelview; // Replace with your actual model view reference
+    return currentModelView.findObjectView(ov.group);
+  }
+  return null;
+}
+
+
+/**
+ * Recursively calculates the effective scale for a member view by accumulating the scale factors
+ * of all its ancestor groups using the global getParent function.
+ *
+ * @param member - The child cxObjectView whose effective scale is to be calculated.
+ * @returns The effective scale as a number.
+ */
+function getEffectiveScale(member: cxObjectView): number {
+    let effectiveScale = member.scale || 1.0;
+    let currentParent = getParent(member);
+    while (currentParent) {
+        effectiveScale *= (currentParent.scale || 1.0) * (currentParent.memberscale || 1.0);
+        currentParent = getParent(currentParent);
+    }
+    return effectiveScale;
+}
+
+/**
+ * Calculates and returns the new (x,y) position and (width, height) for a member object view,
+ * based on the recursively accumulated effective scale. Assumes that member.loc is in the format "x y"
+ * and member.size is in the format "width height".
+ *
+ * @param member - The child cxObjectView to be repositioned and resized.
+ * @returns An object containing the calculated x, y, width and height.
+ */
+function calculateRecursiveMemberLayout(member: cxObjectView): { x: number; y: number; width?: number; height?: number } {
+    const effectiveScale = getEffectiveScale(member);
+    let x = 0, y = 0;
+    let width: number | undefined, height: number | undefined;
+    
+    if (member.loc) {
+        const parts = member.loc.split(" ").map(s => parseFloat(s.trim()));
+        if (parts.length >= 2 && !isNaN(parts[0]) && !isNaN(parts[1])) {
+            x = parts[0] * effectiveScale;
+            y = parts[1] * effectiveScale;
+        }
+    }
+    
+    if (member.size) {
+        const parts = member.size.split(" ").map(s => parseFloat(s.trim()));
+        if (parts.length >= 2 && !isNaN(parts[0]) && !isNaN(parts[1])) {
+            width = parts[0] * effectiveScale;
+            height = parts[1] * effectiveScale;
+        }
+    }
+    
+    return { x, y, width, height };
+}
+
+/**
+ * Updates the member's 'loc' and 'size' properties using the recursively computed effective scale.
+ *
+ * @param member - The cxObjectView to update.
+ */
+export function updateRecursiveMemberLayout(member: cxObjectView): void {
+    const layout = calculateRecursiveMemberLayout(member);
+    member.loc = `${layout.x} ${layout.y}`;
+    
+    if (layout.width !== undefined && layout.height !== undefined) {
+        member.size = `${layout.width} ${layout.height}`;
+    }
+    
+    console.log(`Updated recursive layout for ${member.id}: loc=${member.loc}, size=${member.size}`);
+}

src/akmm/ui_buildmodels.ts

@@ -1809,6 +1809,7 @@ export function generateMetamodel(objects: akm.cxObject[], relships: akm.cxRelat
                 // if (!toObjview) continue;
                 // let toObj = toObjview?.object as akm.cxObject;
                 // toObj = myModel.findObjectByName(toObj.name);
+                if (rel.name === constants.types.AKM_CONTAINS)
                 if (rel.name === constants.types.AKM_IS) {
                     for (let j = 0; j < objecttypes.length; j++) {
                         const otype1 = objecttypes[j];
@@ -2035,6 +2036,10 @@ export function configureMetamodel(object: akm.cxObject, myMetis: akm.cxMetis, m
         }
     } else {
         myMetamodel.description = object.description;
+        const container = myMetis.findObjectTypeByName(constants.types.AKM_CONTAINER);
+        myMetamodel.addObjectType(container);
+        const label = myMetis.findObjectTypeByName(constants.types.AKM_LABEL);
+        myMetamodel.addObjectType(label);
     }
     // Do the configuration
     const isType = myMetis.findRelationshipTypeByName(constants.types.AKM_IS);

src/akmm/ui_common.ts

@@ -437,26 +437,34 @@ export class goObjectNode extends goNode {
     rightPorts: akm.cxPort[] | null;
     topPorts: akm.cxPort[] | null;
     bottomPorts: akm.cxPort[] | null;
-    template: string;
-    template2: string;
+
+    grabIsAllowed: boolean;
+    isExpanded: boolean;
+
+    // arrowscale: number;
     figure: string;
-    geometry: string;
-    strokewidth: string;
     fillcolor: string;
     fillcolor2: string;
+    geometry: string;
+    group: string;
+    icon: string;
+    image: string;
+    isGroup: boolean | "";
+    isSelected: boolean | "";
+    loc:             string;
+    memberscale:     float;
+    scale:           float;
+    size:            float;
     strokecolor: string;
     strokecolor2: string;
+    strokewidth: string;
+    template: string;
+    template2: string;
     textcolor: string;
     textcolor2: string;
     textscale: string;
-    icon: string;
-    image: string;
-    grabIsAllowed: boolean;
-    isGroup: boolean | "";
-    isExpanded: boolean | "";
-    isSelected: boolean | "";
+
     groupLayout: string;
-    group: string;
     parent: string;
     constructor(key: string, model: goModel, objview: akm.cxObjectView) {
         super(key, model);