feat(semver-ranges): support x semver ranges in metamodel

Signed-off-by: Moh <[email protected]>

Author: muhabdulkadir

lib/metamodelutil.js

@@ -14,6 +14,8 @@
 
 'use strict';
 
+const semver = require('semver');
+
 /**
  * The metamodel itself, as an AST.
  * @type unknown
@@ -37,7 +39,54 @@ const metaModelCto = require('./metamodel.js');
  * @return {*} the model
  */
 function findNamespace(priorModels, namespace) {
-    return priorModels.models.find((thisModel) => thisModel.namespace === namespace);
+    // Exact match fast-path
+    const exact = priorModels.models.find(
+        (thisModel) => thisModel.namespace === namespace
+    );
+    if (exact) {
+        return exact;
+    }
+
+    // Parse range-based versioning (supports x-ranges like 1.x, 1.1.x)
+    const atIndex = namespace.lastIndexOf('@');
+    if (atIndex <= 0) {
+        return undefined;
+    }
+    const baseName = namespace.substring(0, atIndex);
+    const wanted = namespace.substring(atIndex + 1);
+
+    // Collect candidates with the same base name
+    const candidates = priorModels.models
+        .filter((m) => {
+            const idx = m.namespace.lastIndexOf('@');
+            if (idx <= 0) {
+                return false;
+            }
+            const name = m.namespace.substring(0, idx);
+            return name === baseName;
+        })
+        .map((m) => {
+            const v = m.namespace.substring(m.namespace.lastIndexOf('@') + 1);
+            return { model: m, version: v };
+        });
+
+    if (candidates.length === 0) {
+        return undefined;
+    }
+
+    // Treat requested version as a range (supports x-ranges like 1.x, 1.1.x)
+    // Pick the highest version that satisfies the range
+    const satisfying = candidates
+        .filter((c) => semver.valid(c.version))
+        .filter((c) =>
+            semver.satisfies(c.version, wanted, {
+                includePrerelease: false,
+                loose: true,
+            })
+        )
+        .sort((a, b) => semver.rcompare(a.version, b.version));
+
+    return satisfying.length > 0 ? satisfying[0].model : undefined;
 }
 
 /**

package.json

@@ -37,6 +37,9 @@
   ],
   "author": "accordproject.org",
   "license": "Apache-2.0",
+  "dependencies": {
+    "semver": "7.6.3"
+  },
   "devDependencies": {
     "@types/webgl-ext": "0.0.37",
     "chai": "4.3.6",
@@ -47,7 +50,6 @@
     "license-check-and-add": "2.3.6",
     "mocha": "10.8.2",
     "nyc": "17.1.0",
-    "semver": "7.6.3",
     "typescript": "5.7.2"
   },
   "browserslist": "> 0.25%, not dead",