@typemf/core 0.5.1 → 0.7.0

package/dist/index.cjs

@@ -47,7 +47,6 @@ __export(index_exports, {
   EcoreFactoryImpl: () => EcoreFactoryImpl,
   EcorePackageImpl: () => EcorePackageImpl,
   Ids: () => Ids,
-  ProxyEObjectImpl: () => ProxyEObjectImpl,
   ResourceFactoryRegistryImpl: () => ResourceFactoryRegistryImpl,
   ResourceImpl: () => ResourceImpl,
   ResourceSetImpl: () => ResourceSetImpl,
@@ -56,8 +55,10 @@ __export(index_exports, {
   associateRoot: () => associateRoot,
   computeFragment: () => computeFragment,
   createInstanceOf: () => createInstanceOf,
+  createProxy: () => createProxy,
   detailValue: () => detailValue,
   dissociateRoot: () => dissociateRoot,
+  getProxyURI: () => getProxyURI,
   getResourceOf: () => getResourceOf,
   isEAnnotation: () => isEAnnotation,
   isEAttribute: () => isEAttribute,
@@ -138,6 +139,13 @@ var BasicEList = class {
     const removed = this.items.splice(0, this.items.length);
     for (const item of removed) this.onRemoved(item, 0);
   }
+  move(fromIndex, toIndex) {
+    const item = this.get(fromIndex);
+    this.items.splice(fromIndex, 1);
+    this.items.splice(toIndex, 0, item);
+    this.onMoved(item, fromIndex, toIndex);
+    return item;
+  }
   contains(item) {
     return this.items.includes(item);
   }
@@ -222,6 +230,24 @@ var BasicEList = class {
       });
     }
   }
+  /**
+   * CORE-12: the element stays in the list throughout - no containment/opposite change, so
+   * unlike onAdded/onRemoved there's no eDidAdd/eDidRemove to call, only the notification
+   * (real EMF's own MOVE: oldValue is the OLD position, newValue is the moved element, position
+   * is the NEW position).
+   */
+  onMoved(item, fromIndex, toIndex) {
+    if (!this.owner || !this.feature) return;
+    this.owner.eNotify({
+      eventType: "MOVE",
+      notifier: this.owner,
+      feature: this.feature,
+      oldValue: fromIndex,
+      newValue: item,
+      position: toIndex,
+      wasSet: true
+    });
+  }
 };
 function isReference(feature) {
   return "isContainment" in feature;
@@ -229,10 +255,24 @@ function isReference(feature) {
 
 // src/metamodel/impl/EObjectImpl.ts
 var fallbackIdCounter = 0;
+function findRoot(obj) {
+  let current = obj;
+  let container = current.eContainer();
+  while (container) {
+    current = container;
+    container = current.eContainer();
+  }
+  return current;
+}
 var EObjectImpl = class _EObjectImpl {
   _eContainer;
   _eContainingFeature;
+  _eProxy = false;
   frozen = false;
+  /** Only ever set on a root (see eSetDirectResource) - a non-root's eResource() is found by
+   *  walking up to its root via eContainer() instead, exactly like real EMF's own
+   *  eDirectResource field. */
+  _eDirectResource;
   /**
    * Marks this object (and, recursively, everything it contains) as no longer intended to be
    * mutated. Matches real EMF's own design precisely: a queryable flag, not enforced in every
@@ -270,6 +310,20 @@ var EObjectImpl = class _EObjectImpl {
   freezeChild(child) {
     if (child instanceof _EObjectImpl) child.freeze();
   }
+  /**
+   * EMF rejects a feature that doesn't belong to this object's own class outright, rather than
+   * dispatching on `feature.getFeatureID()` alone - two unrelated classes' features can share the
+   * same id (each is only unique within its own declaring class, or - for a dynamic class with
+   * multiple supertypes, see CORE-05 - within `getEAllStructuralFeatures()`'s own position-based
+   * scheme), so reading or writing by id alone silently hits the wrong field when a caller passes
+   * a feature from some other EClass entirely. Every generated eGet/eSet/eIsSet/eUnset
+   * (eclass.njk) and DynamicEObjectImpl call this first, before dispatching on the id.
+   */
+  requireOwnFeature(feature) {
+    if (!this.eClass().getEAllStructuralFeatures().contains(feature)) {
+      throw new Error(`The feature '${feature.getName()}' is not a valid feature`);
+    }
+  }
   listeners = [];
   deliverFlag = true;
   onDidChange(callback, feature) {
@@ -312,6 +366,20 @@ var EObjectImpl = class _EObjectImpl {
   eContainingFeature() {
     return this._eContainingFeature;
   }
+  eResource() {
+    return findRoot(this)._eDirectResource;
+  }
+  /**
+   * Internal - not part of the public EObject API, same as eBasicSetContainer/eSetProxy. Called
+   * by Resource's own contents list (resource/resource-impl.ts) as an object enters/leaves
+   * getContents() - the only time an object's OWN eResource() is ever set directly; every other
+   * object's eResource() is found by walking up to its root instead (see eResource() above).
+   * Resetting a former root's own direct resource when it becomes contained elsewhere, or leaves
+   * a resource's contents, is resource-impl.ts's responsibility, not this method's.
+   */
+  eSetDirectResource(resource) {
+    this._eDirectResource = resource;
+  }
   /**
    * Internal - called by BasicEList (for many-valued containment features)
    * and by single-valued containment setters to update the backpointer.
@@ -386,12 +454,35 @@ var EObjectImpl = class _EObjectImpl {
    */
   eInverseAdd(otherEnd, feature) {
     if (feature.isMany()) {
-      this.eBasicList(feature).basicAdd(otherEnd);
+      const list = this.eBasicList(feature);
+      const sizeBefore = list.size();
+      list.basicAdd(otherEnd);
+      if (list.size() > sizeBefore) {
+        this.eNotify({
+          eventType: "ADD",
+          notifier: this,
+          feature,
+          oldValue: void 0,
+          newValue: otherEnd,
+          position: list.size() - 1,
+          wasSet: true
+        });
+      }
     } else {
       const oldValue = this.eGet(feature);
       if (oldValue === otherEnd) return;
+      const wasSet = this.eIsSet(feature);
       this.eBasicSetValue(feature, otherEnd);
       this.eDidRemove(feature, oldValue);
+      this.eNotify({
+        eventType: "SET",
+        notifier: this,
+        feature,
+        oldValue,
+        newValue: otherEnd,
+        position: void 0,
+        wasSet
+      });
     }
     if (feature.isContainment()) otherEnd.eBasicMoveInto(this, feature);
   }
@@ -425,11 +516,60 @@ var EObjectImpl = class _EObjectImpl {
       this.eBasicSetContainer(void 0, void 0);
     }
   }
+  /**
+   * Internal - detaches `this` from whatever containment feature currently holds it (clearing the
+   * old container's own feature value and opposite, same cleanup eBasicMoveInto does for a move
+   * into a new container), without moving it anywhere new. Not part of the public EObject API;
+   * used by Resource's own contents list (resource/resource-impl.ts) when an already-contained
+   * object becomes a document root instead - EMF semantics: adding moves the object, it never
+   * belongs to a container and a resource's roots at the same time.
+   */
+  eBasicDetachFromContainer() {
+    const oldContainer = this._eContainer;
+    const oldFeature = this._eContainingFeature;
+    if (oldContainer instanceof _EObjectImpl && oldFeature && isReference2(oldFeature)) {
+      oldContainer.eBasicRemoveValue(oldFeature, this);
+      const oldOpposite = oldFeature.getEOpposite();
+      if (oldOpposite) this.eBasicRemoveValue(oldOpposite, oldContainer);
+    }
+    this.eBasicSetContainer(void 0, void 0);
+  }
+  /**
+   * CORE-09: every caller of this (eInverseRemove's own "opposite stopped referencing me", and
+   * eBasicMoveInto/eBasicDetachFromContainer clearing an old container or its opposite) silently
+   * mutated storage with no notification - the affected object's own listeners (and the instance
+   * editor's webview relay) never found out, even though a real change happened. Fires the same
+   * REMOVE/SET a plain eSet()/BasicEList.remove() would have, for whichever of those the normal
+   * path this bypasses (deliberately, to avoid re-triggering containment/opposite bookkeeping
+   * recursively) would otherwise have fired.
+   */
   eBasicRemoveValue(feature, value) {
     if (feature.isMany()) {
-      this.eBasicList(feature).basicRemove(value);
+      const list = this.eBasicList(feature);
+      const position = list.indexOf(value);
+      if (list.basicRemove(value)) {
+        this.eNotify({
+          eventType: "REMOVE",
+          notifier: this,
+          feature,
+          oldValue: value,
+          newValue: void 0,
+          position,
+          wasSet: true
+        });
+      }
     } else if (this.eGet(feature) === value) {
+      const wasSet = this.eIsSet(feature);
       this.eBasicSetValue(feature, void 0);
+      this.eNotify({
+        eventType: "SET",
+        notifier: this,
+        feature,
+        oldValue: value,
+        newValue: void 0,
+        position: void 0,
+        wasSet
+      });
     }
   }
   eBasicList(feature) {
@@ -463,7 +603,17 @@ var EObjectImpl = class _EObjectImpl {
     return result;
   }
   eIsProxy() {
-    return false;
+    return this._eProxy;
+  }
+  /**
+   * Internal - flips the proxy flag. Not part of the public EObject interface, same as
+   * eBasicSetContainer/eBasicSetValue; only `resource/proxy.ts`'s createProxy() calls this, right
+   * after constructing a real instance of the target EClass through its own factory - a proxy is
+   * not a separate class, just an ordinary, freshly-constructed instance flagged as a stand-in
+   * until something resolves it.
+   */
+  eSetProxy(flag) {
+    this._eProxy = flag;
   }
   fullId() {
     const className = this.eClass().getName();
@@ -489,12 +639,27 @@ function isEListOfEObject(value) {
 
 // src/metamodel/impl/EcorePackageRef.ts
 var ref;
+var initializer;
+var initializing = false;
 function setEcorePackageRef(pkg) {
   ref = pkg;
 }
+function registerEcorePackageInitializer(init) {
+  initializer = init;
+}
 function getEcorePackageRef() {
+  if (!ref && initializer && !initializing) {
+    initializing = true;
+    try {
+      initializer();
+    } finally {
+      initializing = false;
+    }
+  }
   if (!ref) {
-    throw new Error("getEcorePackageRef() called before the EcorePackage singleton finished constructing itself.");
+    throw new Error(
+      "getEcorePackageRef() called before the EcorePackage singleton finished constructing itself, and no initializer was registered to construct it on demand - this means EcorePackageImpl.ts's own module was never evaluated at all (an unusual bundler/tree-shaking setup). Call EcorePackageImpl.eINSTANCE or .init() yourself first, or check that this package is marked side-effectful."
+    );
   }
   return ref;
 }
@@ -519,6 +684,7 @@ var EStringToStringMapEntryImpl = class extends EObjectImpl {
     this.eSet(getEcorePackageRef().getEStringToStringMapEntry_Value(), value);
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 0:
         return this._key;
@@ -529,6 +695,7 @@ var EStringToStringMapEntryImpl = class extends EObjectImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 0: {
         const oldValue = this.eGet(feature);
@@ -590,6 +757,7 @@ var EStringToStringMapEntryImpl = class extends EObjectImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 0:
         return this._key !== void 0;
@@ -600,6 +768,7 @@ var EStringToStringMapEntryImpl = class extends EObjectImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 0: {
         const wasSet = this.eIsSet(feature);
@@ -672,7 +841,7 @@ var DynamicEObjectImpl = class extends EObjectImpl {
     this.dynamicEClass = dynamicEClass;
     for (const feature of dynamicEClass.getEAllStructuralFeatures()) {
       if (feature.isMany()) {
-        this.values.set(feature.getFeatureID(), new BasicEList(this, feature));
+        this.values.set(this.dynamicEClass.getFeatureID(feature), new BasicEList(this, feature));
       }
     }
   }
@@ -682,10 +851,12 @@ var DynamicEObjectImpl = class extends EObjectImpl {
     return this.dynamicEClass;
   }
   eGet(feature) {
-    return this.values.get(feature.getFeatureID());
+    this.requireOwnFeature(feature);
+    return this.values.get(this.dynamicEClass.getFeatureID(feature));
   }
   eSet(feature, value) {
-    const id = feature.getFeatureID();
+    this.requireOwnFeature(feature);
+    const id = this.dynamicEClass.getFeatureID(feature);
     if (feature.isMany()) {
       const list = this.requireList(feature);
       const items = value === void 0 || value === null ? [] : [...value];
@@ -702,14 +873,16 @@ var DynamicEObjectImpl = class extends EObjectImpl {
     this.eNotify({ eventType: "SET", notifier: this, feature, oldValue, newValue: value, position: void 0, wasSet });
   }
   eIsSet(feature) {
-    const id = feature.getFeatureID();
+    this.requireOwnFeature(feature);
+    const id = this.dynamicEClass.getFeatureID(feature);
     if (feature.isMany()) {
       return this.values.get(id)?.size() !== 0;
     }
     return this.values.has(id) && this.values.get(id) !== void 0;
   }
   eUnset(feature) {
-    const id = feature.getFeatureID();
+    this.requireOwnFeature(feature);
+    const id = this.dynamicEClass.getFeatureID(feature);
     if (feature.isMany()) {
       this.requireList(feature).clear();
       return;
@@ -729,14 +902,15 @@ var DynamicEObjectImpl = class extends EObjectImpl {
     });
   }
   eBasicSetValue(feature, value) {
+    const id = this.dynamicEClass.getFeatureID(feature);
     if (value === void 0) {
-      this.values.delete(feature.getFeatureID());
+      this.values.delete(id);
     } else {
-      this.values.set(feature.getFeatureID(), value);
+      this.values.set(id, value);
     }
   }
   requireList(feature) {
-    const list = this.values.get(feature.getFeatureID());
+    const list = this.values.get(this.dynamicEClass.getFeatureID(feature));
     if (!(list instanceof BasicEList)) {
       throw new Error(
         `Feature '${feature.getName()}' is many-valued but has no backing EList - this DynamicEObjectImpl may have been constructed against a stale EClass (its structural features changed after construction).`
@@ -763,6 +937,7 @@ var EModelElementImpl = class extends EObjectImpl {
     return this.getEAnnotations().filter((ann) => ann.getSource() === source).at(0);
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 0:
         return this._eAnnotations;
@@ -771,6 +946,7 @@ var EModelElementImpl = class extends EObjectImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 0: {
         const list = this._eAnnotations;
@@ -800,6 +976,7 @@ var EModelElementImpl = class extends EObjectImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 0:
         return this._eAnnotationsCache !== void 0 && this._eAnnotationsCache.size() !== 0;
@@ -808,6 +985,7 @@ var EModelElementImpl = class extends EObjectImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 0:
         this._eAnnotationsCache?.clear();
@@ -883,6 +1061,7 @@ var EFactoryImpl = class extends EModelElementImpl {
     return String(instanceValue);
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 1:
         return this._ePackage;
@@ -891,6 +1070,7 @@ var EFactoryImpl = class extends EModelElementImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 1: {
         const oldValue = this.eGet(feature);
@@ -933,6 +1113,7 @@ var EFactoryImpl = class extends EModelElementImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 1:
         return this._ePackage !== void 0;
@@ -941,6 +1122,7 @@ var EFactoryImpl = class extends EModelElementImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 1: {
         const wasSet = this.eIsSet(feature);
@@ -1019,6 +1201,7 @@ var EAnnotationImpl = class extends EModelElementImpl {
     return this._references;
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 1:
         return this._source;
@@ -1035,6 +1218,7 @@ var EAnnotationImpl = class extends EModelElementImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 1: {
         const oldValue = this.eGet(feature);
@@ -1128,6 +1312,7 @@ var EAnnotationImpl = class extends EModelElementImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 1:
         return this._source !== void 0;
@@ -1144,6 +1329,7 @@ var EAnnotationImpl = class extends EModelElementImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 1: {
         const wasSet = this.eIsSet(feature);
@@ -1206,6 +1392,7 @@ var ENamedElementImpl = class extends EModelElementImpl {
     this.eSet(getEcorePackageRef().getENamedElement_Name(), value);
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 1:
         return this._name;
@@ -1214,6 +1401,7 @@ var ENamedElementImpl = class extends EModelElementImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 1: {
         const oldValue = this.eGet(feature);
@@ -1256,6 +1444,7 @@ var ENamedElementImpl = class extends EModelElementImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 1:
         return this._name !== void 0;
@@ -1264,6 +1453,7 @@ var ENamedElementImpl = class extends EModelElementImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 1: {
         const wasSet = this.eIsSet(feature);
@@ -1369,6 +1559,7 @@ var ETypedElementImpl = class extends ENamedElementImpl {
     });
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2:
         return this._ordered;
@@ -1391,6 +1582,7 @@ var ETypedElementImpl = class extends ENamedElementImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2: {
         const oldValue = this.eGet(feature);
@@ -1516,6 +1708,7 @@ var ETypedElementImpl = class extends ENamedElementImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2:
         return this._ordered !== true;
@@ -1538,6 +1731,7 @@ var ETypedElementImpl = class extends ENamedElementImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2: {
         const wasSet = this.eIsSet(feature);
@@ -1750,6 +1944,7 @@ var EStructuralFeatureImpl = class extends ETypedElementImpl {
     this._eContainingClass = value;
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 10:
         return this._changeable;
@@ -1772,6 +1967,7 @@ var EStructuralFeatureImpl = class extends ETypedElementImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 10: {
         const oldValue = this.eGet(feature);
@@ -1925,6 +2121,7 @@ var EStructuralFeatureImpl = class extends ETypedElementImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 10:
         return this._changeable !== true;
@@ -1947,6 +2144,7 @@ var EStructuralFeatureImpl = class extends ETypedElementImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 10: {
         const wasSet = this.eIsSet(feature);
@@ -2100,6 +2298,7 @@ var EAttributeImpl = class extends EStructuralFeatureImpl {
     return this.getEType();
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 18:
         return this._iD;
@@ -2110,6 +2309,7 @@ var EAttributeImpl = class extends EStructuralFeatureImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 18: {
         const oldValue = this.eGet(feature);
@@ -2155,6 +2355,7 @@ var EAttributeImpl = class extends EStructuralFeatureImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 18:
         return this._iD !== false;
@@ -2165,6 +2366,7 @@ var EAttributeImpl = class extends EStructuralFeatureImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 18: {
         const wasSet = this.eIsSet(feature);
@@ -2264,9 +2466,42 @@ var EClassifierImpl = class extends ENamedElementImpl {
     return this._eTypeParameters;
   }
   isInstance(object) {
-    return object instanceof EObjectImpl;
+    switch (this.eClass().getName()) {
+      case "EClass":
+        return object instanceof EObjectImpl && this.isSuperTypeOf(object.eClass());
+      default:
+        switch (this.getName()) {
+          case "EString":
+          case "EChar":
+          case "ECharacterObject":
+            return typeof object === "string";
+          case "EInt":
+          case "EIntegerObject":
+          case "ELong":
+          case "ELongObject":
+          case "EDouble":
+          case "EDoubleObject":
+          case "EFloat":
+          case "EFloatObject":
+          case "EShort":
+          case "EShortObject":
+          case "EByte":
+          case "EByteObject":
+            return typeof object === "number";
+          case "EBigInteger":
+            return typeof object === "bigint";
+          case "EBoolean":
+          case "EBooleanObject":
+            return typeof object === "boolean";
+          case "EDate":
+            return object instanceof Date;
+          default:
+            return object !== void 0 && object !== null;
+        }
+    }
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2:
         return this._instanceClassName;
@@ -2285,6 +2520,7 @@ var EClassifierImpl = class extends ENamedElementImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2: {
         const oldValue = this.eGet(feature);
@@ -2367,6 +2603,7 @@ var EClassifierImpl = class extends ENamedElementImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2:
         return this._instanceClassName !== void 0;
@@ -2385,6 +2622,7 @@ var EClassifierImpl = class extends ENamedElementImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2: {
         const wasSet = this.eIsSet(feature);
@@ -2602,6 +2840,7 @@ var EGenericTypeImpl = class extends EObjectImpl {
     this.eSet(getEcorePackageRef().getEGenericType_EClassifier(), value);
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 0:
         return this._eUpperBound;
@@ -2620,6 +2859,7 @@ var EGenericTypeImpl = class extends EObjectImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 0: {
         const oldValue = this.eGet(feature);
@@ -2733,6 +2973,7 @@ var EGenericTypeImpl = class extends EObjectImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 0:
         return this._eUpperBound !== void 0;
@@ -2751,6 +2992,7 @@ var EGenericTypeImpl = class extends EObjectImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 0: {
         const wasSet = this.eIsSet(feature);
@@ -3098,7 +3340,8 @@ var EClassImpl = class extends EClassifierImpl {
   }
   getEStructuralFeature(featureIDOrFeatureName) {
     if (typeof featureIDOrFeatureName === "number") {
-      return this.getEAllStructuralFeatures().filter((feature) => this.getFeatureID(feature) === featureIDOrFeatureName).at(0);
+      const features = this.getEAllStructuralFeatures();
+      return featureIDOrFeatureName >= 0 && featureIDOrFeatureName < features.size() ? features.get(featureIDOrFeatureName) : void 0;
     }
     if (typeof featureIDOrFeatureName === "string") {
       return this.getEAllStructuralFeatures().filter((feature) => feature.getName() === featureIDOrFeatureName).at(0);
@@ -3106,7 +3349,7 @@ var EClassImpl = class extends EClassifierImpl {
     throw new Error("EClass.getEStructuralFeature(): no overload matches the given arguments.");
   }
   getFeatureID(feature) {
-    return feature.getFeatureID();
+    return this.getEAllStructuralFeatures().indexOf(feature);
   }
   getOperationCount() {
     return this.getEAllOperations().size();
@@ -3125,6 +3368,7 @@ var EClassImpl = class extends EClassifierImpl {
     return void 0;
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 8:
         return this._abstract;
@@ -3163,6 +3407,7 @@ var EClassImpl = class extends EClassifierImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 8: {
         const oldValue = this.eGet(feature);
@@ -3266,6 +3511,7 @@ var EClassImpl = class extends EClassifierImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 8:
         return this._abstract !== false;
@@ -3304,6 +3550,7 @@ var EClassImpl = class extends EClassifierImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 8: {
         const wasSet = this.eIsSet(feature);
@@ -3369,6 +3616,7 @@ var EDataTypeImpl = class extends EClassifierImpl {
     this.eSet(getEcorePackageRef().getEDataType_Serializable(), value);
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 8:
         return this._serializable;
@@ -3377,6 +3625,7 @@ var EDataTypeImpl = class extends EClassifierImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 8: {
         const oldValue = this.eGet(feature);
@@ -3419,6 +3668,7 @@ var EDataTypeImpl = class extends EClassifierImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 8:
         return this._serializable !== true;
@@ -3427,6 +3677,7 @@ var EDataTypeImpl = class extends EClassifierImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 8: {
         const wasSet = this.eIsSet(feature);
@@ -3479,6 +3730,7 @@ var EEnumImpl = class extends EDataTypeImpl {
     return this.getELiterals().find((candidate) => candidate.getLiteral() === literal);
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 9:
         return this._eLiterals;
@@ -3487,6 +3739,7 @@ var EEnumImpl = class extends EDataTypeImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 9: {
         const list = this._eLiterals;
@@ -3518,6 +3771,7 @@ var EEnumImpl = class extends EDataTypeImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 9:
         return this._eLiteralsCache !== void 0 && this._eLiteralsCache.size() !== 0;
@@ -3526,6 +3780,7 @@ var EEnumImpl = class extends EDataTypeImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 9:
         this._eLiteralsCache?.clear();
@@ -3578,6 +3833,7 @@ var EEnumLiteralImpl = class extends ENamedElementImpl {
     this._eEnum = value;
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2:
         return this._value;
@@ -3592,6 +3848,7 @@ var EEnumLiteralImpl = class extends ENamedElementImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2: {
         const oldValue = this.eGet(feature);
@@ -3662,6 +3919,7 @@ var EEnumLiteralImpl = class extends ENamedElementImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2:
         return this._value !== 0;
@@ -3676,6 +3934,7 @@ var EEnumLiteralImpl = class extends ENamedElementImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2: {
         const wasSet = this.eIsSet(feature);
@@ -3822,6 +4081,7 @@ var EOperationImpl = class extends ETypedElementImpl {
     return true;
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 10:
         return this._eContainingClass;
@@ -3838,6 +4098,7 @@ var EOperationImpl = class extends ETypedElementImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 11: {
         const list = this._eTypeParameters;
@@ -3902,6 +4163,7 @@ var EOperationImpl = class extends ETypedElementImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 10:
         return this._eContainingClass !== void 0;
@@ -3918,6 +4180,7 @@ var EOperationImpl = class extends ETypedElementImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 10: {
         const wasSet = this.eIsSet(feature);
@@ -4007,6 +4270,7 @@ var EPackageImpl = class extends ENamedElementImpl {
     return this.getEClassifiers().filter((cl) => cl.getName() === name).at(0);
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2:
         return this._nsURI;
@@ -4025,6 +4289,7 @@ var EPackageImpl = class extends ENamedElementImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2: {
         const oldValue = this.eGet(feature);
@@ -4132,6 +4397,7 @@ var EPackageImpl = class extends ENamedElementImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2:
         return this._nsURI !== void 0;
@@ -4150,6 +4416,7 @@ var EPackageImpl = class extends ENamedElementImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2: {
         const wasSet = this.eIsSet(feature);
@@ -4241,6 +4508,7 @@ var EParameterImpl = class extends ETypedElementImpl {
     this._eOperation = value;
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 10:
         return this._eOperation;
@@ -4249,6 +4517,7 @@ var EParameterImpl = class extends ETypedElementImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       default:
         super.eSet(feature, value);
@@ -4273,6 +4542,7 @@ var EParameterImpl = class extends ETypedElementImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 10:
         return this._eOperation !== void 0;
@@ -4281,6 +4551,7 @@ var EParameterImpl = class extends ETypedElementImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 10: {
         const wasSet = this.eIsSet(feature);
@@ -4348,6 +4619,7 @@ var EReferenceImpl = class extends EStructuralFeatureImpl {
     return this._eKeys;
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 18:
         return this._containment;
@@ -4366,6 +4638,7 @@ var EReferenceImpl = class extends EStructuralFeatureImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 18: {
         const oldValue = this.eGet(feature);
@@ -4466,6 +4739,7 @@ var EReferenceImpl = class extends EStructuralFeatureImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 18:
         return this._containment !== false;
@@ -4484,6 +4758,7 @@ var EReferenceImpl = class extends EStructuralFeatureImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 18: {
         const wasSet = this.eIsSet(feature);
@@ -4589,6 +4864,7 @@ var ETypeParameterImpl = class extends ENamedElementImpl {
     return this._eBounds;
   }
   eGet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2:
         return this._eBounds;
@@ -4597,6 +4873,7 @@ var ETypeParameterImpl = class extends ENamedElementImpl {
     }
   }
   eSet(feature, value) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2: {
         const list = this._eBounds;
@@ -4628,6 +4905,7 @@ var ETypeParameterImpl = class extends ENamedElementImpl {
     }
   }
   eIsSet(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2:
         return this._eBoundsCache !== void 0 && this._eBoundsCache.size() !== 0;
@@ -4636,6 +4914,7 @@ var ETypeParameterImpl = class extends ENamedElementImpl {
     }
   }
   eUnset(feature) {
+    this.requireOwnFeature(feature);
     switch (feature.getFeatureID()) {
       case 2:
         this._eBoundsCache?.clear();
@@ -4779,59 +5058,23 @@ function resolvePositionalPath(path, roots) {
   return current;
 }
 
-// src/resource/proxy-eobject-impl.ts
-var ProxyEObjectImpl = class extends EObjectImpl {
-  constructor(proxyEClass, proxyURI) {
-    super();
-    this.proxyEClass = proxyEClass;
-    this.proxyURI = proxyURI;
-  }
-  proxyEClass;
-  proxyURI;
-  eClass() {
-    return this.proxyEClass;
-  }
-  eIsProxy() {
-    return true;
-  }
-  getProxyURI() {
-    return this.proxyURI;
-  }
-  eContents() {
-    return new BasicEList();
-  }
-  eAllContents() {
-    return [];
-  }
-  fullId() {
-    return `Proxy(${this.proxyEClass.getName()}, ${this.proxyURI.toString()})`;
-  }
-  eGet(_feature) {
-    throw new Error(
-      `Cannot read a feature of an unresolved proxy (${this.fullId()}) - resolve it via ResourceSet.resolve() first.`
-    );
-  }
-  eSet(_feature, _value) {
-    throw new Error(
-      `Cannot set a feature of an unresolved proxy (${this.fullId()}) - resolve it via ResourceSet.resolve() first.`
-    );
-  }
-  eBasicSetValue(_feature, _value) {
-    throw new Error(
-      `Cannot set a feature of an unresolved proxy (${this.fullId()}) - resolve it via ResourceSet.resolve() first.`
-    );
-  }
-  eIsSet(_feature) {
-    throw new Error(
-      `Cannot check a feature of an unresolved proxy (${this.fullId()}) - resolve it via ResourceSet.resolve() first.`
-    );
-  }
-  eUnset(_feature) {
-    throw new Error(
-      `Cannot unset a feature of an unresolved proxy (${this.fullId()}) - resolve it via ResourceSet.resolve() first.`
-    );
-  }
-};
+// src/resource/proxy.ts
+var proxyURIs = /* @__PURE__ */ new WeakMap();
+function createProxy(eClass, uri) {
+  const factory = eClass.getEPackage()?.getEFactoryInstance();
+  let obj;
+  try {
+    obj = factory ? factory.create(eClass) : new DynamicEObjectImpl(eClass);
+  } catch {
+    obj = new DynamicEObjectImpl(eClass);
+  }
+  obj.eSetProxy(true);
+  proxyURIs.set(obj, uri);
+  return obj;
+}
+function getProxyURI(obj) {
+  return proxyURIs.get(obj);
+}
 
 // src/resource/resource-factory-registry-impl.ts
 var ResourceFactoryRegistryImpl = class {
@@ -4849,26 +5092,20 @@ var ResourceFactoryRegistryImpl = class {
       const byExtension = this.factoriesByExtension.get(extension);
       if (byExtension) return byExtension;
     }
-    return this.factoriesByProtocol.get(uri.getScheme());
+    const scheme = uri.getScheme();
+    return scheme === void 0 ? void 0 : this.factoriesByProtocol.get(scheme);
   }
 };
 
 // src/resource/resource-utils.ts
-var resourceByRoot = /* @__PURE__ */ new WeakMap();
 function associateRoot(root, resource) {
-  resourceByRoot.set(root, resource);
+  root.eSetDirectResource(resource);
 }
 function dissociateRoot(root) {
-  resourceByRoot.delete(root);
+  root.eSetDirectResource(void 0);
 }
 function getResourceOf(obj) {
-  let current = obj;
-  let container = current.eContainer();
-  while (container) {
-    current = container;
-    container = current.eContainer();
-  }
-  return resourceByRoot.get(current);
+  return obj.eResource();
 }
 
 // src/resource/resource-impl.ts
@@ -4879,13 +5116,28 @@ var ResourceContentsList = class extends BasicEList {
   }
   owningResource;
   add(item) {
+    if (this.contains(item)) return;
+    this.detachFromCurrentOwner(item);
     super.add(item);
     associateRoot(item, this.owningResource);
   }
   addAt(index, item) {
+    if (this.contains(item)) return;
+    this.detachFromCurrentOwner(item);
     super.addAt(index, item);
     associateRoot(item, this.owningResource);
   }
+  detachFromCurrentOwner(item) {
+    const container = item.eContainer();
+    if (container) {
+      item.eBasicDetachFromContainer();
+      return;
+    }
+    const oldResource = getResourceOf(item);
+    if (oldResource && oldResource !== this.owningResource) {
+      oldResource.getContents().remove(item);
+    }
+  }
   addAll(items) {
     for (const item of items) this.add(item);
   }
@@ -5078,24 +5330,27 @@ var ResourceSetImpl = class {
   }
   async resolve(proxy) {
     if (!proxy.eIsProxy()) return proxy;
-    if (!(proxy instanceof ProxyEObjectImpl)) {
-      throw new Error("eIsProxy() is true but the object is not a ProxyEObjectImpl - cannot resolve it.");
+    const proxyURI = getProxyURI(proxy);
+    if (!proxyURI) {
+      throw new Error(
+        `eIsProxy() is true but no proxy URI is on record for this ${proxy.eClass().getName()} - it was not created via createProxy().`
+      );
     }
-    const proxyURI = proxy.getProxyURI();
+    const proxyLabel = `${proxy.eClass().getName()} (${proxyURI.toString()})`;
     const registeredPackage = this.packageRegistry.getPackage(proxyURI.trimFragment().toString());
     if (registeredPackage) {
       const fragment2 = proxyURI.getFragment();
       const resolved = fragment2 ? resolveAgainstPackage(registeredPackage, fragment2) : void 0;
       if (!resolved) {
         throw new Error(
-          `Could not resolve proxy '${proxy.fullId()}': fragment '${fragment2 ?? "<none>"}' did not match anything in the registered package '${registeredPackage.getNsURI() ?? "<no nsURI>"}'.`
+          `Could not resolve proxy '${proxyLabel}': fragment '${fragment2 ?? "<none>"}' did not match anything in the registered package '${registeredPackage.getNsURI() ?? "<no nsURI>"}'.`
         );
       }
       return resolved;
     }
     const targetResource = await this.getResource(proxyURI.trimFragment(), true);
     if (!targetResource) {
-      throw new Error(`Could not resolve proxy '${proxy.fullId()}': its resource could not be loaded.`);
+      throw new Error(`Could not resolve proxy '${proxyLabel}': its resource could not be loaded.`);
     }
     const fragment = proxyURI.getFragment();
     const roots = targetResource.getContents().toArray();
@@ -5104,12 +5359,33 @@ var ResourceSetImpl = class {
     const found = fragment ? resolver(fragment, roots) : void 0;
     if (!found) {
       throw new Error(
-        `Could not resolve proxy '${proxy.fullId()}': fragment '${fragment ?? "<none>"}' did not match any object in '${targetResource.getURI().toString()}'.`
+        `Could not resolve proxy '${proxyLabel}': fragment '${fragment ?? "<none>"}' did not match any object in '${targetResource.getURI().toString()}'.`
       );
     }
     return found;
   }
+  async resolveFeature(container, feature) {
+    const current = container.eGet(feature);
+    if (!isUnresolvedProxy(current)) return current;
+    const resolved = await this.resolve(current);
+    if (resolved !== current) {
+      container.eBasicSetValue(feature, resolved);
+      container.eNotify({
+        eventType: "RESOLVE",
+        notifier: container,
+        feature,
+        oldValue: current,
+        newValue: resolved,
+        position: void 0,
+        wasSet: true
+      });
+    }
+    return resolved;
+  }
 };
+function isUnresolvedProxy(value) {
+  return typeof value === "object" && value !== null && typeof value.eIsProxy === "function" && value.eIsProxy();
+}
 function resolveAgainstPackage(pkg, fragment) {
   const segments = fragment.replace(/^\/+/, "").split("/").filter((s) => s.length > 0);
   if (segments.length === 0) return void 0;
@@ -5131,22 +5407,46 @@ var URI = class _URI {
   hasAuthority;
   path;
   fragment;
+  /** Parses an absolute URI ("scheme:path" / "scheme://path") or a relative reference (anything
+   *  else - a bare path, with no scheme). Never throws: a string with no recognizable scheme is
+   *  relative, not invalid - resolve() against a base URI before using it as a document location. */
   static parse(uriString) {
-    const match = /^([a-zA-Z][a-zA-Z0-9+.-]*):(\/\/)?([^#]*)(?:#(.*))?$/.exec(uriString);
-    if (!match) {
-      throw new Error(`Not a valid absolute URI: '${uriString}' (expected "scheme:path" or "scheme://path")`);
+    const absolute = /^([a-zA-Z][a-zA-Z0-9+.-]*):(\/\/)?([^#]*)(?:#(.*))?$/.exec(uriString);
+    if (absolute) {
+      const [, scheme, authorityMarker, path2, fragment2] = absolute;
+      return new _URI(scheme, authorityMarker === "//", path2, fragment2);
     }
-    const [, scheme, authorityMarker, path, fragment] = match;
-    return new _URI(scheme, authorityMarker === "//", path, fragment);
+    const [, path, fragment] = /^([^#]*)(?:#(.*))?$/.exec(uriString);
+    return new _URI(void 0, false, path, fragment);
   }
-  /** Convenience for the common case of wrapping a filesystem path. */
+  /**
+   * Convenience for the common case of wrapping a filesystem path (CORE-06). Backslashes become
+   * forward slashes first - a Windows `fsPath` ("C:\Users\a b\m.xmi") has none of its own, so this
+   * is purely "native path -> URI path" translation, matching real EMF's own `URI.createFileURI`;
+   * it naturally also makes a drive-letter path absolute, the same way a POSIX path already was,
+   * with no separate case needed (`C:/...` doesn't start with "/" yet, so it gets one prepended,
+   * same as any other non-absolute input). Each path segment is then percent-encoded (a reserved
+   * character - most commonly a space in a real file path - would otherwise corrupt `resolve`/
+   * `deresolve`'s own segment splitting, or the URI text once serialized into an `href`); `:` is
+   * deliberately left unescaped (valid unencoded in a URI path segment, and this is exactly what
+   * keeps a drive letter readable as "C:" rather than "C%3A", matching Eclipse's own Windows file
+   * URIs). `getPath()`/`toString()` return this encoded form - decoding back to a native path is
+   * `@typemf/node`'s own job (NODE-01's `fileURLToPath`), not this class's.
+   */
   static createFileURI(path) {
-    const normalized = path.startsWith("/") ? path : `/${path}`;
-    return new _URI("file", true, normalized, void 0);
+    const normalized = path.replace(/\\/g, "/");
+    const absolute = normalized.startsWith("/") ? normalized : `/${normalized}`;
+    const encoded = absolute.split("/").map(encodePathSegment).join("/");
+    return new _URI("file", true, encoded, void 0);
   }
+  /** Undefined for a relative reference - see the class doc comment. */
   getScheme() {
     return this.scheme;
   }
+  /** A relative reference, as opposed to one naming an absolute document location. */
+  isRelative() {
+    return this.scheme === void 0;
+  }
   getPath() {
     return this.path;
   }
@@ -5166,15 +5466,62 @@ var URI = class _URI {
   trimFragment() {
     return this.fragment === void 0 ? this : this.withFragment(void 0);
   }
+  /**
+   * This URI, made absolute against `base` if it is relative; returned unchanged otherwise.
+   * `base`'s own fragment is irrelevant and ignored - only its scheme/authority/path (i.e. "which
+   * document") anchor the result; this URI's own fragment (if any) is kept as-is.
+   */
+  resolve(base) {
+    if (!this.isRelative()) return this;
+    const baseDir = base.path.slice(0, base.path.lastIndexOf("/") + 1);
+    const merged = this.path.startsWith("/") ? this.path : baseDir + this.path;
+    return new _URI(base.scheme, base.hasAuthority, normalizePath(merged), this.fragment);
+  }
+  /**
+   * The shortest relative reference from `base` to this URI, when both share a scheme and
+   * authority (the common, same-workspace case this is actually for) - this URI unchanged
+   * otherwise, since there is then nothing meaningful to make relative against. Already-relative
+   * stays unchanged either way. The inverse of resolve(): `uri.deresolve(base).resolve(base)`
+   * reconstructs the original absolute path.
+   */
+  deresolve(base) {
+    if (this.isRelative() || this.scheme !== base.scheme || this.hasAuthority !== base.hasAuthority) return this;
+    const baseDirSegments = base.path.split("/").slice(0, -1);
+    const targetSegments = this.path.split("/");
+    let common = 0;
+    while (common < baseDirSegments.length && common < targetSegments.length && baseDirSegments[common] === targetSegments[common]) {
+      common++;
+    }
+    const upSegments = baseDirSegments.slice(common).map(() => "..");
+    const relativePath = [...upSegments, ...targetSegments.slice(common)].join("/");
+    return new _URI(void 0, false, relativePath, this.fragment);
+  }
   toString() {
+    const schemePart = this.scheme !== void 0 ? `${this.scheme}:` : "";
     const authority = this.hasAuthority ? "//" : "";
     const fragmentPart = this.fragment !== void 0 ? `#${this.fragment}` : "";
-    return `${this.scheme}:${authority}${this.path}${fragmentPart}`;
+    return `${schemePart}${authority}${this.path}${fragmentPart}`;
   }
   equals(other) {
     return this.toString() === other.toString();
   }
 };
+function normalizePath(path) {
+  const segments = path.split("/");
+  const result = [];
+  for (const segment of segments) {
+    if (segment === ".") continue;
+    if (segment === ".." && result.length > 0 && result[result.length - 1] !== "" && result.at(-1) !== "..") {
+      result.pop();
+    } else {
+      result.push(segment);
+    }
+  }
+  return result.join("/");
+}
+function encodePathSegment(segment) {
+  return segment.replace(/[^A-Za-z0-9\-._~!$&'()*+,;=:@]/g, (ch) => encodeURIComponent(ch));
+}
 
 // src/metamodel/EcorePackage.ts
 var Ids = {
@@ -5327,6 +5674,13 @@ var Ids = {
 
 // src/metamodel/impl/EcoreFactoryImpl.ts
 var EcoreFactoryImpl = class extends EFactoryImpl {
+  /** The one canonical factory instance - real EMF's own `EcoreFactory.eINSTANCE`, which this project
+   *  ports onto the Impl class rather than the interface (TypeScript interfaces have no statics).
+   *  Reading this also constructs the package singleton on first use (CORE-01), via the same
+   *  lazy initializer EcorePackageImpl.eINSTANCE itself goes through. */
+  static get eINSTANCE() {
+    return getEcorePackageRef().getEFactoryInstance();
+  }
   createEAttribute() {
     return new EAttributeImpl();
   }
@@ -8872,7 +9226,7 @@ var EcorePackageImpl = class _EcorePackageImpl extends EPackageImpl {
         entry.eBasicSetValue(Ids.EStringToStringMapEntry.key, "body");
         entry.eBasicSetValue(
           Ids.EStringToStringMapEntry.value,
-          "return this.getEAllStructuralFeatures().filter(feature => this.getFeatureID(feature) === featureIDOrFeatureName).at(0);"
+          "const features = this.getEAllStructuralFeatures(); return featureIDOrFeatureName >= 0 && featureIDOrFeatureName < features.size() ? features.get(featureIDOrFeatureName) : undefined;"
         );
         annotation.eBootstrapList(Ids.EAnnotation.details).add(entry);
       }
@@ -8899,35 +9253,12 @@ var EcorePackageImpl = class _EcorePackageImpl extends EPackageImpl {
         entry.eBasicSetValue(Ids.EStringToStringMapEntry.key, "body");
         entry.eBasicSetValue(
           Ids.EStringToStringMapEntry.value,
-          "return (feature as EStructuralFeatureImpl).getFeatureID();"
+          "return this.getEAllStructuralFeatures().indexOf(feature);"
         );
         annotation.eBootstrapList(Ids.EAnnotation.details).add(entry);
       }
       this._EClass_op3.eBootstrapList(Ids.EModelElement.eAnnotations).add(annotation);
     }
-    {
-      const annotation = new EAnnotationImpl();
-      annotation.eBasicSetValue(Ids.EAnnotation.source, "https://typemf.dev/generator/import");
-      {
-        const entry = new EStringToStringMapEntryImpl();
-        entry.eBasicSetValue(Ids.EStringToStringMapEntry.key, "type");
-        entry.eBasicSetValue(Ids.EStringToStringMapEntry.value, "EStructuralFeatureImpl");
-        annotation.eBootstrapList(Ids.EAnnotation.details).add(entry);
-      }
-      {
-        const entry = new EStringToStringMapEntryImpl();
-        entry.eBasicSetValue(Ids.EStringToStringMapEntry.key, "from");
-        entry.eBasicSetValue(Ids.EStringToStringMapEntry.value, "@typemf/core");
-        annotation.eBootstrapList(Ids.EAnnotation.details).add(entry);
-      }
-      {
-        const entry = new EStringToStringMapEntryImpl();
-        entry.eBasicSetValue(Ids.EStringToStringMapEntry.key, "internal-from");
-        entry.eBasicSetValue(Ids.EStringToStringMapEntry.value, "./impl/EStructuralFeatureImpl");
-        annotation.eBootstrapList(Ids.EAnnotation.details).add(entry);
-      }
-      this._EClass_op3.eBootstrapList(Ids.EModelElement.eAnnotations).add(annotation);
-    }
     this._EClass.eBootstrapList(Ids.EClass.eOperations).add(this._EClass_op3);
     this._EClass_op4 = new EOperationImpl();
     this._EClass_op4.eBasicSetValue(Ids.ENamedElement.name, "getEStructuralFeature");
@@ -9095,15 +9426,35 @@ var EcorePackageImpl = class _EcorePackageImpl extends EPackageImpl {
       {
         const entry = new EStringToStringMapEntryImpl();
         entry.eBasicSetValue(Ids.EStringToStringMapEntry.key, "body");
-        entry.eBasicSetValue(Ids.EStringToStringMapEntry.value, "return object instanceof EObjectImpl;");
+        entry.eBasicSetValue(
+          Ids.EStringToStringMapEntry.value,
+          "switch (this.eClass().getName()) {\n  case 'EClass':\n    return object instanceof EObjectImpl && (this as unknown as EClass).isSuperTypeOf((object as EObject).eClass());\n  default:\n    switch (this.getName()) {\n      case 'EString':\n      case 'EChar':\n      case 'ECharacterObject':\n        return typeof object === 'string';\n      case 'EInt':\n      case 'EIntegerObject':\n      case 'ELong':\n      case 'ELongObject':\n      case 'EDouble':\n      case 'EDoubleObject':\n      case 'EFloat':\n      case 'EFloatObject':\n      case 'EShort':\n      case 'EShortObject':\n      case 'EByte':\n      case 'EByteObject':\n        return typeof object === 'number';\n      case 'EBigInteger':\n        return typeof object === 'bigint';\n      case 'EBoolean':\n      case 'EBooleanObject':\n        return typeof object === 'boolean';\n      case 'EDate':\n        return object instanceof Date;\n      default:\n        return object !== undefined && object !== null;\n    }\n}"
+        );
         annotation.eBootstrapList(Ids.EAnnotation.details).add(entry);
       }
+      this._EClassifier_op0.eBootstrapList(Ids.EModelElement.eAnnotations).add(annotation);
+    }
+    {
+      const annotation = new EAnnotationImpl();
+      annotation.eBasicSetValue(Ids.EAnnotation.source, "https://typemf.dev/generator/import");
       {
         const entry = new EStringToStringMapEntryImpl();
-        entry.eBasicSetValue(Ids.EStringToStringMapEntry.key, "use-type-name");
+        entry.eBasicSetValue(Ids.EStringToStringMapEntry.key, "type");
         entry.eBasicSetValue(Ids.EStringToStringMapEntry.value, "EObjectImpl");
         annotation.eBootstrapList(Ids.EAnnotation.details).add(entry);
       }
+      {
+        const entry = new EStringToStringMapEntryImpl();
+        entry.eBasicSetValue(Ids.EStringToStringMapEntry.key, "from");
+        entry.eBasicSetValue(Ids.EStringToStringMapEntry.value, "@typemf/core");
+        annotation.eBootstrapList(Ids.EAnnotation.details).add(entry);
+      }
+      {
+        const entry = new EStringToStringMapEntryImpl();
+        entry.eBasicSetValue(Ids.EStringToStringMapEntry.key, "internal-from");
+        entry.eBasicSetValue(Ids.EStringToStringMapEntry.value, "./impl/EObjectImpl");
+        annotation.eBootstrapList(Ids.EAnnotation.details).add(entry);
+      }
       this._EClassifier_op0.eBootstrapList(Ids.EModelElement.eAnnotations).add(annotation);
     }
     {
@@ -9112,7 +9463,7 @@ var EcorePackageImpl = class _EcorePackageImpl extends EPackageImpl {
       {
         const entry = new EStringToStringMapEntryImpl();
         entry.eBasicSetValue(Ids.EStringToStringMapEntry.key, "type");
-        entry.eBasicSetValue(Ids.EStringToStringMapEntry.value, "EObjectImpl");
+        entry.eBasicSetValue(Ids.EStringToStringMapEntry.value, "EObject");
         annotation.eBootstrapList(Ids.EAnnotation.details).add(entry);
       }
       {
@@ -9124,7 +9475,7 @@ var EcorePackageImpl = class _EcorePackageImpl extends EPackageImpl {
       {
         const entry = new EStringToStringMapEntryImpl();
         entry.eBasicSetValue(Ids.EStringToStringMapEntry.key, "internal-from");
-        entry.eBasicSetValue(Ids.EStringToStringMapEntry.value, "./impl/EObjectImpl");
+        entry.eBasicSetValue(Ids.EStringToStringMapEntry.value, "./types/EObject");
         annotation.eBootstrapList(Ids.EAnnotation.details).add(entry);
       }
       this._EClassifier_op0.eBootstrapList(Ids.EModelElement.eAnnotations).add(annotation);
@@ -9929,6 +10280,9 @@ var EcorePackageImpl = class _EcorePackageImpl extends EPackageImpl {
     return this._EInvocationTargetException;
   }
 };
+registerEcorePackageInitializer(() => {
+  void EcorePackageImpl.eINSTANCE;
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BasicEList,
@@ -9958,7 +10312,6 @@ var EcorePackageImpl = class _EcorePackageImpl extends EPackageImpl {
   EcoreFactoryImpl,
   EcorePackageImpl,
   Ids,
-  ProxyEObjectImpl,
   ResourceFactoryRegistryImpl,
   ResourceImpl,
   ResourceSetImpl,
@@ -9967,8 +10320,10 @@ var EcorePackageImpl = class _EcorePackageImpl extends EPackageImpl {
   associateRoot,
   computeFragment,
   createInstanceOf,
+  createProxy,
   detailValue,
   dissociateRoot,
+  getProxyURI,
   getResourceOf,
   isEAnnotation,
   isEAttribute,