@typemf/core 0.5.1 → 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();
@@ -4779,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 {
@@ -5078,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();
@@ -5104,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;
@@ -9958,7 +9958,6 @@ var EcorePackageImpl = class _EcorePackageImpl extends EPackageImpl {
   EcoreFactoryImpl,
   EcorePackageImpl,
   Ids,
-  ProxyEObjectImpl,
   ResourceFactoryRegistryImpl,
   ResourceImpl,
   ResourceSetImpl,
@@ -9967,8 +9966,10 @@ var EcorePackageImpl = class _EcorePackageImpl extends EPackageImpl {
   associateRoot,
   computeFragment,
   createInstanceOf,
+  createProxy,
   detailValue,
   dissociateRoot,
+  getProxyURI,
   getResourceOf,
   isEAnnotation,
   isEAttribute,