@typemf/core 0.5.0 → 0.6.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,
@@ -232,6 +233,7 @@ var fallbackIdCounter = 0;
 var EObjectImpl = class _EObjectImpl {
   _eContainer;
   _eContainingFeature;
+  _eProxy = false;
   frozen = false;
   /**
    * Marks this object (and, recursively, everything it contains) as no longer intended to be
@@ -463,7 +465,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();
@@ -525,7 +537,7 @@ var EStringToStringMapEntryImpl = class extends EObjectImpl {
       case 1:
         return this._value;
       default:
-        throw new Error(`EStringToStringMapEntry has no feature with id ${feature.getFeatureID()}`);
+        throw new Error(`EStringToStringMapEntry has no feature with id ${String(feature.getFeatureID())}`);
     }
   }
   eSet(feature, value) {
@@ -567,7 +579,7 @@ var EStringToStringMapEntryImpl = class extends EObjectImpl {
         return;
       }
       default:
-        throw new Error(`EStringToStringMapEntry has no feature with id ${feature.getFeatureID()}`);
+        throw new Error(`EStringToStringMapEntry has no feature with id ${String(feature.getFeatureID())}`);
     }
   }
   eBasicSetValue(feature, value) {
@@ -580,14 +592,13 @@ var EStringToStringMapEntryImpl = class extends EObjectImpl {
         this._value = value;
         return;
       default:
-        void value;
-        throw new Error(`Feature ${featureId} on EStringToStringMapEntry is many-valued or unknown.`);
+        throw new Error(`Feature ${String(featureId)} on EStringToStringMapEntry is many-valued or unknown.`);
     }
   }
   eBootstrapList(featureId) {
     switch (featureId) {
       default:
-        throw new Error(`Feature ${featureId} on EStringToStringMapEntry is single-valued or unknown.`);
+        throw new Error(`Feature ${String(featureId)} on EStringToStringMapEntry is single-valued or unknown.`);
     }
   }
   eIsSet(feature) {
@@ -597,7 +608,7 @@ var EStringToStringMapEntryImpl = class extends EObjectImpl {
       case 1:
         return this._value !== void 0;
       default:
-        throw new Error(`EStringToStringMapEntry has no feature with id ${feature.getFeatureID()}`);
+        throw new Error(`EStringToStringMapEntry has no feature with id ${String(feature.getFeatureID())}`);
     }
   }
   eUnset(feature) {
@@ -635,7 +646,7 @@ var EStringToStringMapEntryImpl = class extends EObjectImpl {
         return;
       }
       default:
-        throw new Error(`EStringToStringMapEntry has no feature with id ${feature.getFeatureID()}`);
+        throw new Error(`EStringToStringMapEntry has no feature with id ${String(feature.getFeatureID())}`);
     }
   }
 };
@@ -751,9 +762,7 @@ var DynamicEObjectImpl = class extends EObjectImpl {
 var EModelElementImpl = class extends EObjectImpl {
   _eAnnotationsCache;
   get _eAnnotations() {
-    if (!this._eAnnotationsCache) {
-      this._eAnnotationsCache = new BasicEList(this, getEcorePackageRef().getEModelElement_EAnnotations());
-    }
+    this._eAnnotationsCache ??= new BasicEList(this, getEcorePackageRef().getEModelElement_EAnnotations());
     return this._eAnnotationsCache;
   }
   eClass() {
@@ -770,7 +779,7 @@ var EModelElementImpl = class extends EObjectImpl {
       case 0:
         return this._eAnnotations;
       default:
-        throw new Error(`EModelElement has no feature with id ${feature.getFeatureID()}`);
+        throw new Error(`EModelElement has no feature with id ${String(feature.getFeatureID())}`);
     }
   }
   eSet(feature, value) {
@@ -783,24 +792,23 @@ var EModelElementImpl = class extends EObjectImpl {
         return;
       }
       default:
-        throw new Error(`EModelElement has no feature with id ${feature.getFeatureID()}`);
+        throw new Error(`EModelElement has no feature with id ${String(feature.getFeatureID())}`);
     }
   }
-  eBasicSetValue(feature, value) {
+  eBasicSetValue(feature, _value) {
     const featureId = typeof feature === "number" ? feature : feature.getFeatureID();
     switch (featureId) {
       default:
-        void value;
-        throw new Error(`Feature ${featureId} on EModelElement is many-valued or unknown.`);
+        throw new Error(`Feature ${String(featureId)} on EModelElement is many-valued or unknown.`);
     }
   }
   eBootstrapList(featureId) {
     switch (featureId) {
       case 0:
-        if (!this._eAnnotationsCache) this._eAnnotationsCache = new BasicEList(this);
+        this._eAnnotationsCache ??= new BasicEList(this);
         return this._eAnnotationsCache;
       default:
-        throw new Error(`Feature ${featureId} on EModelElement is single-valued or unknown.`);
+        throw new Error(`Feature ${String(featureId)} on EModelElement is single-valued or unknown.`);
     }
   }
   eIsSet(feature) {
@@ -808,7 +816,7 @@ var EModelElementImpl = class extends EObjectImpl {
       case 0:
         return this._eAnnotationsCache !== void 0 && this._eAnnotationsCache.size() !== 0;
       default:
-        throw new Error(`EModelElement has no feature with id ${feature.getFeatureID()}`);
+        throw new Error(`EModelElement has no feature with id ${String(feature.getFeatureID())}`);
     }
   }
   eUnset(feature) {
@@ -817,7 +825,7 @@ var EModelElementImpl = class extends EObjectImpl {
         this._eAnnotationsCache?.clear();
         return;
       default:
-        throw new Error(`EModelElement has no feature with id ${feature.getFeatureID()}`);
+        throw new Error(`EModelElement has no feature with id ${String(feature.getFeatureID())}`);
     }
   }
 };
@@ -984,24 +992,18 @@ var EAnnotationImpl = class extends EModelElementImpl {
   _source;
   _detailsCache;
   get _details() {
-    if (!this._detailsCache) {
-      this._detailsCache = new BasicEList(this, getEcorePackageRef().getEAnnotation_Details());
-    }
+    this._detailsCache ??= new BasicEList(this, getEcorePackageRef().getEAnnotation_Details());
     return this._detailsCache;
   }
   _eModelElement;
   _contentsCache;
   get _contents() {
-    if (!this._contentsCache) {
-      this._contentsCache = new BasicEList(this, getEcorePackageRef().getEAnnotation_Contents());
-    }
+    this._contentsCache ??= new BasicEList(this, getEcorePackageRef().getEAnnotation_Contents());
     return this._contentsCache;
   }
   _referencesCache;
   get _references() {
-    if (!this._referencesCache) {
-      this._referencesCache = new BasicEList(this, getEcorePackageRef().getEAnnotation_References());
-    }
+    this._referencesCache ??= new BasicEList(this, getEcorePackageRef().getEAnnotation_References());
     return this._referencesCache;
   }
   eClass() {
@@ -1125,13 +1127,13 @@ var EAnnotationImpl = class extends EModelElementImpl {
   eBootstrapList(featureId) {
     switch (featureId) {
       case 2:
-        if (!this._detailsCache) this._detailsCache = new BasicEList(this);
+        this._detailsCache ??= new BasicEList(this);
         return this._detailsCache;
       case 4:
-        if (!this._contentsCache) this._contentsCache = new BasicEList(this);
+        this._contentsCache ??= new BasicEList(this);
         return this._contentsCache;
       case 5:
-        if (!this._referencesCache) this._referencesCache = new BasicEList(this);
+        this._referencesCache ??= new BasicEList(this);
         return this._referencesCache;
       default:
         return super.eBootstrapList(featureId);
@@ -2224,12 +2226,10 @@ var EClassifierImpl = class extends ENamedElementImpl {
   _ePackage;
   _eTypeParametersCache;
   get _eTypeParameters() {
-    if (!this._eTypeParametersCache) {
-      this._eTypeParametersCache = new BasicEList(
-        this,
-        getEcorePackageRef().getEClassifier_ETypeParameters()
-      );
-    }
+    this._eTypeParametersCache ??= new BasicEList(
+      this,
+      getEcorePackageRef().getEClassifier_ETypeParameters()
+    );
     return this._eTypeParametersCache;
   }
   classifierId = -1;
@@ -2372,7 +2372,7 @@ var EClassifierImpl = class extends ENamedElementImpl {
   eBootstrapList(featureId) {
     switch (featureId) {
       case 7:
-        if (!this._eTypeParametersCache) this._eTypeParametersCache = new BasicEList(this);
+        this._eTypeParametersCache ??= new BasicEList(this);
         return this._eTypeParametersCache;
       default:
         return super.eBootstrapList(featureId);
@@ -2555,12 +2555,10 @@ var EGenericTypeImpl = class extends EObjectImpl {
   _eUpperBound;
   _eTypeArgumentsCache;
   get _eTypeArguments() {
-    if (!this._eTypeArgumentsCache) {
-      this._eTypeArgumentsCache = new BasicEList(
-        this,
-        getEcorePackageRef().getEGenericType_ETypeArguments()
-      );
-    }
+    this._eTypeArgumentsCache ??= new BasicEList(
+      this,
+      getEcorePackageRef().getEGenericType_ETypeArguments()
+    );
     return this._eTypeArgumentsCache;
   }
   _eRawTypeCache;
@@ -2630,7 +2628,7 @@ var EGenericTypeImpl = class extends EObjectImpl {
       case 5:
         return this._eClassifier;
       default:
-        throw new Error(`EGenericType has no feature with id ${feature.getFeatureID()}`);
+        throw new Error(`EGenericType has no feature with id ${String(feature.getFeatureID())}`);
     }
   }
   eSet(feature, value) {
@@ -2715,7 +2713,7 @@ var EGenericTypeImpl = class extends EObjectImpl {
         return;
       }
       default:
-        throw new Error(`EGenericType has no feature with id ${feature.getFeatureID()}`);
+        throw new Error(`EGenericType has no feature with id ${String(feature.getFeatureID())}`);
     }
   }
   eBasicSetValue(feature, value) {
@@ -2734,17 +2732,16 @@ var EGenericTypeImpl = class extends EObjectImpl {
         this._eClassifier = value;
         return;
       default:
-        void value;
-        throw new Error(`Feature ${featureId} on EGenericType is many-valued or unknown.`);
+        throw new Error(`Feature ${String(featureId)} on EGenericType is many-valued or unknown.`);
     }
   }
   eBootstrapList(featureId) {
     switch (featureId) {
       case 1:
-        if (!this._eTypeArgumentsCache) this._eTypeArgumentsCache = new BasicEList(this);
+        this._eTypeArgumentsCache ??= new BasicEList(this);
         return this._eTypeArgumentsCache;
       default:
-        throw new Error(`Feature ${featureId} on EGenericType is single-valued or unknown.`);
+        throw new Error(`Feature ${String(featureId)} on EGenericType is single-valued or unknown.`);
     }
   }
   eIsSet(feature) {
@@ -2762,7 +2759,7 @@ var EGenericTypeImpl = class extends EObjectImpl {
       case 5:
         return this._eClassifier !== void 0;
       default:
-        throw new Error(`EGenericType has no feature with id ${feature.getFeatureID()}`);
+        throw new Error(`EGenericType has no feature with id ${String(feature.getFeatureID())}`);
     }
   }
   eUnset(feature) {
@@ -2835,7 +2832,7 @@ var EGenericTypeImpl = class extends EObjectImpl {
         return;
       }
       default:
-        throw new Error(`EGenericType has no feature with id ${feature.getFeatureID()}`);
+        throw new Error(`EGenericType has no feature with id ${String(feature.getFeatureID())}`);
     }
   }
 };
@@ -2846,16 +2843,12 @@ var EClassImpl = class extends EClassifierImpl {
   _interface = false;
   _eSuperTypesCache;
   get _eSuperTypes() {
-    if (!this._eSuperTypesCache) {
-      this._eSuperTypesCache = new BasicEList(this, getEcorePackageRef().getEClass_ESuperTypes());
-    }
+    this._eSuperTypesCache ??= new BasicEList(this, getEcorePackageRef().getEClass_ESuperTypes());
     return this._eSuperTypesCache;
   }
   _eOperationsCache;
   get _eOperations() {
-    if (!this._eOperationsCache) {
-      this._eOperationsCache = new BasicEList(this, getEcorePackageRef().getEClass_EOperations());
-    }
+    this._eOperationsCache ??= new BasicEList(this, getEcorePackageRef().getEClass_EOperations());
     return this._eOperationsCache;
   }
   _eAllAttributesCache;
@@ -2878,22 +2871,18 @@ var EClassImpl = class extends EClassifierImpl {
   _eIDAttributeCacheGeneration = -1;
   _eStructuralFeaturesCache;
   get _eStructuralFeatures() {
-    if (!this._eStructuralFeaturesCache) {
-      this._eStructuralFeaturesCache = new BasicEList(
-        this,
-        getEcorePackageRef().getEClass_EStructuralFeatures()
-      );
-    }
+    this._eStructuralFeaturesCache ??= new BasicEList(
+      this,
+      getEcorePackageRef().getEClass_EStructuralFeatures()
+    );
     return this._eStructuralFeaturesCache;
   }
   _eGenericSuperTypesCache;
   get _eGenericSuperTypes() {
-    if (!this._eGenericSuperTypesCache) {
-      this._eGenericSuperTypesCache = new BasicEList(
-        this,
-        getEcorePackageRef().getEClass_EGenericSuperTypes()
-      );
-    }
+    this._eGenericSuperTypesCache ??= new BasicEList(
+      this,
+      getEcorePackageRef().getEClass_EGenericSuperTypes()
+    );
     return this._eGenericSuperTypesCache;
   }
   _eAllGenericSuperTypesCache;
@@ -3273,16 +3262,16 @@ var EClassImpl = class extends EClassifierImpl {
   eBootstrapList(featureId) {
     switch (featureId) {
       case 10:
-        if (!this._eSuperTypesCache) this._eSuperTypesCache = new BasicEList(this);
+        this._eSuperTypesCache ??= new BasicEList(this);
         return this._eSuperTypesCache;
       case 11:
-        if (!this._eOperationsCache) this._eOperationsCache = new BasicEList(this);
+        this._eOperationsCache ??= new BasicEList(this);
         return this._eOperationsCache;
       case 21:
-        if (!this._eStructuralFeaturesCache) this._eStructuralFeaturesCache = new BasicEList(this);
+        this._eStructuralFeaturesCache ??= new BasicEList(this);
         return this._eStructuralFeaturesCache;
       case 22:
-        if (!this._eGenericSuperTypesCache) this._eGenericSuperTypesCache = new BasicEList(this);
+        this._eGenericSuperTypesCache ??= new BasicEList(this);
         return this._eGenericSuperTypesCache;
       default:
         return super.eBootstrapList(featureId);
@@ -3478,9 +3467,7 @@ var EDataTypeImpl = class extends EClassifierImpl {
 var EEnumImpl = class extends EDataTypeImpl {
   _eLiteralsCache;
   get _eLiterals() {
-    if (!this._eLiteralsCache) {
-      this._eLiteralsCache = new BasicEList(this, getEcorePackageRef().getEEnum_ELiterals());
-    }
+    this._eLiteralsCache ??= new BasicEList(this, getEcorePackageRef().getEEnum_ELiterals());
     return this._eLiteralsCache;
   }
   eClass() {
@@ -3536,7 +3523,7 @@ var EEnumImpl = class extends EDataTypeImpl {
   eBootstrapList(featureId) {
     switch (featureId) {
       case 9:
-        if (!this._eLiteralsCache) this._eLiteralsCache = new BasicEList(this);
+        this._eLiteralsCache ??= new BasicEList(this);
         return this._eLiteralsCache;
       default:
         return super.eBootstrapList(featureId);
@@ -3778,36 +3765,28 @@ var EOperationImpl = class extends ETypedElementImpl {
   _eContainingClass;
   _eTypeParametersCache;
   get _eTypeParameters() {
-    if (!this._eTypeParametersCache) {
-      this._eTypeParametersCache = new BasicEList(
-        this,
-        getEcorePackageRef().getEOperation_ETypeParameters()
-      );
-    }
+    this._eTypeParametersCache ??= new BasicEList(
+      this,
+      getEcorePackageRef().getEOperation_ETypeParameters()
+    );
     return this._eTypeParametersCache;
   }
   _eParametersCache;
   get _eParameters() {
-    if (!this._eParametersCache) {
-      this._eParametersCache = new BasicEList(this, getEcorePackageRef().getEOperation_EParameters());
-    }
+    this._eParametersCache ??= new BasicEList(this, getEcorePackageRef().getEOperation_EParameters());
     return this._eParametersCache;
   }
   _eExceptionsCache;
   get _eExceptions() {
-    if (!this._eExceptionsCache) {
-      this._eExceptionsCache = new BasicEList(this, getEcorePackageRef().getEOperation_EExceptions());
-    }
+    this._eExceptionsCache ??= new BasicEList(this, getEcorePackageRef().getEOperation_EExceptions());
     return this._eExceptionsCache;
   }
   _eGenericExceptionsCache;
   get _eGenericExceptions() {
-    if (!this._eGenericExceptionsCache) {
-      this._eGenericExceptionsCache = new BasicEList(
-        this,
-        getEcorePackageRef().getEOperation_EGenericExceptions()
-      );
-    }
+    this._eGenericExceptionsCache ??= new BasicEList(
+      this,
+      getEcorePackageRef().getEOperation_EGenericExceptions()
+    );
     return this._eGenericExceptionsCache;
   }
   operationId = -1;
@@ -3919,16 +3898,16 @@ var EOperationImpl = class extends ETypedElementImpl {
   eBootstrapList(featureId) {
     switch (featureId) {
       case 11:
-        if (!this._eTypeParametersCache) this._eTypeParametersCache = new BasicEList(this);
+        this._eTypeParametersCache ??= new BasicEList(this);
         return this._eTypeParametersCache;
       case 12:
-        if (!this._eParametersCache) this._eParametersCache = new BasicEList(this);
+        this._eParametersCache ??= new BasicEList(this);
         return this._eParametersCache;
       case 13:
-        if (!this._eExceptionsCache) this._eExceptionsCache = new BasicEList(this);
+        this._eExceptionsCache ??= new BasicEList(this);
         return this._eExceptionsCache;
       case 14:
-        if (!this._eGenericExceptionsCache) this._eGenericExceptionsCache = new BasicEList(this);
+        this._eGenericExceptionsCache ??= new BasicEList(this);
         return this._eGenericExceptionsCache;
       default:
         return super.eBootstrapList(featureId);
@@ -3994,16 +3973,12 @@ var EPackageImpl = class extends ENamedElementImpl {
   _eFactoryInstance;
   _eClassifiersCache;
   get _eClassifiers() {
-    if (!this._eClassifiersCache) {
-      this._eClassifiersCache = new BasicEList(this, getEcorePackageRef().getEPackage_EClassifiers());
-    }
+    this._eClassifiersCache ??= new BasicEList(this, getEcorePackageRef().getEPackage_EClassifiers());
     return this._eClassifiersCache;
   }
   _eSubpackagesCache;
   get _eSubpackages() {
-    if (!this._eSubpackagesCache) {
-      this._eSubpackagesCache = new BasicEList(this, getEcorePackageRef().getEPackage_ESubpackages());
-    }
+    this._eSubpackagesCache ??= new BasicEList(this, getEcorePackageRef().getEPackage_ESubpackages());
     return this._eSubpackagesCache;
   }
   _eSuperPackage;
@@ -4159,10 +4134,10 @@ var EPackageImpl = class extends ENamedElementImpl {
   eBootstrapList(featureId) {
     switch (featureId) {
       case 5:
-        if (!this._eClassifiersCache) this._eClassifiersCache = new BasicEList(this);
+        this._eClassifiersCache ??= new BasicEList(this);
         return this._eClassifiersCache;
       case 6:
-        if (!this._eSubpackagesCache) this._eSubpackagesCache = new BasicEList(this);
+        this._eSubpackagesCache ??= new BasicEList(this);
         return this._eSubpackagesCache;
       default:
         return super.eBootstrapList(featureId);
@@ -4351,9 +4326,7 @@ var EReferenceImpl = class extends EStructuralFeatureImpl {
   _eReferenceType;
   _eKeysCache;
   get _eKeys() {
-    if (!this._eKeysCache) {
-      this._eKeysCache = new BasicEList(this, getEcorePackageRef().getEReference_EKeys());
-    }
+    this._eKeysCache ??= new BasicEList(this, getEcorePackageRef().getEReference_EKeys());
     return this._eKeysCache;
   }
   eClass() {
@@ -4498,7 +4471,7 @@ var EReferenceImpl = class extends EStructuralFeatureImpl {
   eBootstrapList(featureId) {
     switch (featureId) {
       case 23:
-        if (!this._eKeysCache) this._eKeysCache = new BasicEList(this);
+        this._eKeysCache ??= new BasicEList(this);
         return this._eKeysCache;
       default:
         return super.eBootstrapList(featureId);
@@ -4618,9 +4591,7 @@ var EReferenceImpl = class extends EStructuralFeatureImpl {
 var ETypeParameterImpl = class extends ENamedElementImpl {
   _eBoundsCache;
   get _eBounds() {
-    if (!this._eBoundsCache) {
-      this._eBoundsCache = new BasicEList(this, getEcorePackageRef().getETypeParameter_EBounds());
-    }
+    this._eBoundsCache ??= new BasicEList(this, getEcorePackageRef().getETypeParameter_EBounds());
     return this._eBoundsCache;
   }
   eClass() {
@@ -4662,7 +4633,7 @@ var ETypeParameterImpl = class extends ENamedElementImpl {
   eBootstrapList(featureId) {
     switch (featureId) {
       case 2:
-        if (!this._eBoundsCache) this._eBoundsCache = new BasicEList(this);
+        this._eBoundsCache ??= new BasicEList(this);
         return this._eBoundsCache;
       default:
         return super.eBootstrapList(featureId);
@@ -4820,59 +4791,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 {
@@ -5119,24 +5054,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();
@@ -5145,12 +5083,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;
@@ -9999,7 +9958,6 @@ var EcorePackageImpl = class _EcorePackageImpl extends EPackageImpl {
   EcoreFactoryImpl,
   EcorePackageImpl,
   Ids,
-  ProxyEObjectImpl,
   ResourceFactoryRegistryImpl,
   ResourceImpl,
   ResourceSetImpl,
@@ -10008,8 +9966,10 @@ var EcorePackageImpl = class _EcorePackageImpl extends EPackageImpl {
   associateRoot,
   computeFragment,
   createInstanceOf,
+  createProxy,
   detailValue,
   dissociateRoot,
+  getProxyURI,
   getResourceOf,
   isEAnnotation,
   isEAttribute,