@typemf/core 0.8.1 → 0.9.1

package/dist/index.cjs

@@ -5435,10 +5435,26 @@ function isUnresolvedProxy(value) {
 function resolveAgainstPackage(pkg, fragment) {
   const segments = fragment.replace(/^\/+/, "").split("/").filter((s) => s.length > 0);
   if (segments.length === 0) return void 0;
-  const classifier = pkg.getEClassifier(segments[0]);
-  if (segments.length === 1) return classifier;
-  if (!classifier || !isEClass(classifier)) return void 0;
-  return classifier.getEStructuralFeature(segments[1]);
+  let current = pkg;
+  for (const segment of segments) {
+    const container = current;
+    current = namedContent(container, segment) ?? (isEClass(container) ? container.getEStructuralFeature(segment) : void 0);
+    if (!current) return void 0;
+  }
+  return current;
+}
+function namedContent(container, segment) {
+  const counted = /^(.*)\.(\d+)$/.exec(segment);
+  return counted && nthNamedContent(container, counted[1], Number(counted[2])) || nthNamedContent(container, segment, 0);
+}
+function nthNamedContent(container, name, n) {
+  let remaining = n;
+  for (const child of container.eContents()) {
+    if (!isENamedElement(child) || child.getName() !== name) continue;
+    if (remaining === 0) return child;
+    remaining--;
+  }
+  return void 0;
 }
 
 // src/resource/uri.ts