@typemf/generator 0.8.0 → 0.9.0

package/README.md

@@ -28,6 +28,24 @@ The config file defaults to `./typemf-generator.config.json`:
 
 Paths are resolved relative to the config file. `typescript` is currently the only template set.
 
+## Other packages
+
+A `.ecore` file can use classifiers of another `.ecore` file (`href="other.ecore#//Shape"`). The
+generator loads that file too, but doesn't generate it; generate it with its own config. The
+option `package-imports` says where its generated code is, by nsURI:
+
+```json
+"options": {
+  "package-imports": {
+    "https://example.com/shapes": "../shapes"
+  }
+}
+```
+
+A value starting with `./` or `../` is the folder of the other package's generated code, relative
+to `outputDir`. Any other value is a module name that exports its types and its `PackageImpl`.
+Classifiers of Ecore need no entry. Supertypes from another package are not supported yet.
+
 ## Generated code
 
 For a package `library` with the classes `Library`, `Writer` and `Book`:

package/dist/cli.js

@@ -42,7 +42,13 @@ function validateConfig(value, configPath) {
 }
 
 // src/ecore-loader.ts
-import { EcorePackageImpl as EcorePackageImpl2, ResourceSetImpl, URI } from "@typemf/core";
+import {
+  EcorePackageImpl as EcorePackageImpl2,
+  getProxyURI as getProxyURI2,
+  isEReference,
+  ResourceSetImpl,
+  URI
+} from "@typemf/core";
 import { NodeFileUriConverter } from "@typemf/node";
 import { registerXmiFormat } from "@typemf/xmi";
 
@@ -66,7 +72,7 @@ import {
   isEClassifier,
   resolveAgainstPackage
 } from "@typemf/core";
-function convertDynamicEcoreToTyped(dynamicPkg) {
+function convertDynamicEcoreToTyped(dynamicPkg, foreignClassifier) {
   const realPkg = new EPackageImpl();
   realPkg.setName(byName(dynamicPkg, "name") ?? "");
   realPkg.setNsURI(byName(dynamicPkg, "nsURI") ?? "");
@@ -102,6 +108,8 @@ function convertDynamicEcoreToTyped(dynamicPkg) {
   }
   function classifierOf(dynClassifier) {
     if (classifierMap.has(dynClassifier)) return classifierMap.get(dynClassifier);
+    const foreign = foreignClassifier?.(dynClassifier);
+    if (foreign) return foreign;
     const uri = dynClassifier.eIsProxy() ? getProxyURI(dynClassifier) : void 0;
     const ecore = EcorePackageImpl.eINSTANCE;
     if (uri && uri.trimFragment().toString() === ecore.getNsURI()) {
@@ -111,7 +119,7 @@ function convertDynamicEcoreToTyped(dynamicPkg) {
       if (isEClassifier(resolved)) return resolved;
     }
     throw new Error(
-      `Cannot resolve the classifier reference '${uri?.toString() ?? dynClassifier.fullId()}': only classifiers of this package and of Ecore are supported.`
+      `Cannot resolve the classifier reference '${uri?.toString() ?? dynClassifier.fullId()}': only classifiers of this package, of Ecore and of other .ecore files are supported.`
     );
   }
   function resolveType(dynFeature) {
@@ -692,12 +700,57 @@ async function loadEcorePackage(ecoreFilePath) {
   if (!resource) {
     throw new Error(`Could not load '${ecoreFilePath}'.`);
   }
-  const roots = resource.getContents().toArray();
-  const dynamicPkg = roots[0];
+  return convertResource(resource, resourceSet, /* @__PURE__ */ new Map(), []);
+}
+async function convertResource(resource, resourceSet, converted, inProgress) {
+  const done = converted.get(resource);
+  if (done) return done;
+  const location = resource.getURI().toString();
+  if (inProgress.includes(resource)) {
+    const cycle = [...inProgress, resource].map((r) => r.getURI().toString()).join(" -> ");
+    throw new Error(`Cyclic references between .ecore files are not supported: ${cycle}`);
+  }
+  const dynamicPkg = resource.getContents().toArray()[0];
   if (!dynamicPkg) {
-    throw new Error(`'${ecoreFilePath}' has no root element - expected a single EPackage.`);
+    throw new Error(`'${location}' has no root element - expected a single EPackage.`);
+  }
+  const foreign = /* @__PURE__ */ new Map();
+  for (const proxy of foreignProxies(dynamicPkg)) {
+    const target = await resourceSet.resolve(proxy).catch((err) => {
+      throw new Error(
+        `Cannot resolve the classifier reference '${getProxyURI2(proxy)?.toString()}': ${err.message}`,
+        { cause: err }
+      );
+    });
+    const targetResource = target.eResource();
+    const targetPkg = targetResource ? await convertResource(targetResource, resourceSet, converted, [...inProgress, resource]) : void 0;
+    const name = target.eClass().getEStructuralFeature("name");
+    const classifier = name && targetPkg?.getEClassifier(target.eGet(name));
+    if (!classifier) {
+      throw new Error(
+        `Cannot resolve the classifier reference '${getProxyURI2(proxy)?.toString()}': only classifiers of a referenced package's root are supported.`
+      );
+    }
+    foreign.set(proxy, classifier);
+  }
+  const pkg = convertDynamicEcoreToTyped(dynamicPkg, (proxy) => foreign.get(proxy));
+  converted.set(resource, pkg);
+  return pkg;
+}
+function foreignProxies(root) {
+  const ecoreNsURI = EcorePackageImpl2.eINSTANCE.getNsURI();
+  const proxies = /* @__PURE__ */ new Set();
+  for (const obj of [root, ...root.eAllContents()]) {
+    for (const feature of obj.eClass().getEAllStructuralFeatures()) {
+      if (!isEReference(feature) || feature.isContainment()) continue;
+      const value = obj.eGet(feature);
+      const values = feature.isMany() ? [...value] : value ? [value] : [];
+      for (const v of values) {
+        if (v.eIsProxy() && getProxyURI2(v)?.trimFragment().toString() !== ecoreNsURI) proxies.add(v);
+      }
+    }
   }
-  return convertDynamicEcoreToTyped(dynamicPkg);
+  return proxies;
 }
 
 // src/run-generation.ts
@@ -821,16 +874,26 @@ var TypeImportMapping = class _TypeImportMapping {
 var generationContext = {
   pkg: void 0,
   typeImports: new TypeImportMapping(),
-  generateEcore: false
+  generateEcore: false,
+  packageImports: /* @__PURE__ */ new Map()
 };
 var GENERATE_ECORE_OPTION = "generate-ecore";
 var TYPE_IMPORTS_OPTION = "type-imports";
+var PACKAGE_IMPORTS_OPTION = "package-imports";
 function beginGeneration(pkg, options) {
   generationContext.pkg = pkg;
   const entries = options[TYPE_IMPORTS_OPTION];
   const valid = typeof entries === "object" && entries !== null && !Array.isArray(entries);
   generationContext.typeImports = new TypeImportMapping(valid ? entries : {});
   generationContext.generateEcore = options[GENERATE_ECORE_OPTION] === true;
+  generationContext.packageImports = new Map(
+    Object.entries(objectOption(options[PACKAGE_IMPORTS_OPTION])).filter(
+      (entry) => typeof entry[1] === "string" && entry[1] !== ""
+    )
+  );
+}
+function objectOption(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
 }
 function isExternal(classifier) {
   const owner = classifier.getEPackage();
@@ -929,8 +992,10 @@ function locationOfPath(path) {
 }
 
 // src/typescript-filters.ts
+import { posix as posix2 } from "path";
 import {
   detailValue as detailValue2,
+  EcorePackageImpl as EcorePackageImpl3,
   isEDataType as isDataTypeObject
 } from "@typemf/core";
 var TYPEMF_GENERATOR_ANNOTATION_SOURCE = "https://typemf.dev/generator";
@@ -1065,8 +1130,60 @@ function tsBaseType(classifier) {
     return "EObject";
   }
   if (isEDataType(classifier)) return tsPrimitiveType(classifier);
+  if (isExternal(classifier)) {
+    const name = classifier.getName();
+    if (isEcoreClassifier(classifier)) importCollector.add({ name, location: "types", foundational: true });
+    else
+      importCollector.add({
+        name,
+        location: "types",
+        foundational: false,
+        from: otherPackageImport(classifier.getEPackage(), "types", name)
+      });
+  }
   return classifier.getName();
 }
+function isEcoreClassifier(classifier) {
+  return classifier.getEPackage()?.getNsURI() === EcorePackageImpl3.eINSTANCE.getNsURI();
+}
+function otherPackageImport(pkg, folder, file) {
+  const nsURI = pkg.getNsURI() ?? "";
+  const location = generationContext.packageImports.get(nsURI);
+  if (location === void 0) {
+    throw new Error(
+      `The package '${nsURI}' is referenced, but the "${PACKAGE_IMPORTS_OPTION}" option has no entry for it.`
+    );
+  }
+  if (!location.startsWith("./") && !location.startsWith("../")) return location;
+  const path = posix2.join(location, folder, `${file}.js`);
+  return path.startsWith(".") ? path : `./${path}`;
+}
+function findOtherPackageSuperTypes(pkg) {
+  const messages = [];
+  for (const classifier of pkg.getEClassifiers()) {
+    if (!isEClass2(classifier)) continue;
+    for (const superType2 of classifier.getESuperTypes()) {
+      if (superType2.getEPackage() !== pkg)
+        messages.push(
+          `${classifier.getName()}: the supertype ${superType2.getName()} belongs to another package, which is not supported yet`
+        );
+    }
+  }
+  return messages;
+}
+function otherPackageClassifierExpr(classifier) {
+  const pkg = classifier.getEPackage();
+  const implName = isEcoreClassifier(classifier) ? "EcorePackageImpl" : `${packageClassName(pkg)}Impl`;
+  if (isEcoreClassifier(classifier)) importCollector.add({ name: implName, location: "impl", foundational: true });
+  else
+    importCollector.add({
+      name: implName,
+      location: "impl",
+      foundational: false,
+      from: otherPackageImport(pkg, "impl", implName)
+    });
+  return `${implName}.eINSTANCE.get${classifier.getName()}()`;
+}
 function resolveDataTypeTs(dataType) {
   const resolved = resolveDataTypeText(dataType);
   const importInfo = generationContext.typeImports.lookup(dataType);
@@ -1161,7 +1278,7 @@ function isEEnum(classifier) {
 function isEDataType(classifier) {
   return !isEClass2(classifier) && !isEEnum(classifier);
 }
-function isEReference(feature) {
+function isEReference2(feature) {
   return "isContainment" in feature;
 }
 function paramList(operation) {
@@ -1478,9 +1595,10 @@ function referencedApiTypes(features, ...excludeTypeNames) {
   const names = /* @__PURE__ */ new Set();
   for (const feature of features) {
     const type = feature.getEType();
-    if (type && (isEReference(feature) || isEEnum(type)) && !exclude.has(type.getName())) names.add(type.getName());
+    if (type && (isEReference2(feature) || isEEnum(type)) && !isExternal(type) && !exclude.has(type.getName()))
+      names.add(type.getName());
     for (const argument of genericArgumentClassifiers(feature.getEGenericType())) {
-      if ((isEClass2(argument) || isEEnum(argument)) && !exclude.has(argument.getName()))
+      if ((isEClass2(argument) || isEEnum(argument)) && !isExternal(argument) && !exclude.has(argument.getName()))
         names.add(argument.getName());
     }
   }
@@ -1490,7 +1608,7 @@ function referencedOperationTypes(operations, ...excludeTypeNames) {
   const exclude = new Set(excludeTypeNames);
   const names = /* @__PURE__ */ new Set();
   const maybeAdd = (type) => {
-    if (type && (isEClass2(type) || isEEnum(type)) && !exclude.has(type.getName())) {
+    if (type && (isEClass2(type) || isEEnum(type)) && !isExternal(type) && !exclude.has(type.getName())) {
       names.add(type.getName());
     }
   };
@@ -1553,7 +1671,8 @@ var typescriptTemplateSet = {
       ...findUnnamedElements(pkg),
       ...findUnresolvedCollisions(pkg).map(
         (c) => `${c.classifierName}.${c.memberName}: name collision between ${c.sources.join(" and ")}`
-      )
+      ),
+      ...findOtherPackageSuperTypes(pkg)
     ];
   },
   configureEnvironment(env, { pkg, options }) {
@@ -1575,7 +1694,7 @@ var typescriptTemplateSet = {
     env.addGlobal("isEClass", isEClass2);
     env.addGlobal("isEEnum", isEEnum);
     env.addGlobal("isEDataType", isEDataType);
-    env.addGlobal("isEReference", isEReference);
+    env.addGlobal("isEReference", isEReference2);
     env.addGlobal("paramList", paramList);
     env.addGlobal("argList", argList);
     env.addGlobal("ucfirst", ucfirst);
@@ -1607,6 +1726,7 @@ var typescriptTemplateSet = {
     env.addGlobal("metaclassAccessorCollision", metaclassAccessorCollision);
     env.addGlobal("metaclassAccessorCollisionTypeNames", metaclassAccessorCollisionTypeNames);
     env.addGlobal("optionalParamList", optionalParamList);
+    env.addGlobal("otherPackageClassifierExpr", otherPackageClassifierExpr);
     env.addGlobal("typeGuardsClassName", typeGuardsClassName);
     env.addGlobal("useImport", useImport);
   },

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { EPackage, EObject, EPackageImpl, EClassImpl, EOperation, EStructuralFeature, EClass, EAnnotation, EModelElement, EGenericType, EClassifier, EDataType, EEnum, ETypedElement } from '@typemf/core';
+import { EPackage, EObject, EClassifier, EPackageImpl, EClassImpl, EOperation, EStructuralFeature, EClass, EAnnotation, EModelElement, EGenericType, EDataType, EEnum, ETypedElement } from '@typemf/core';
 import nunjucks from 'nunjucks';
 
 /**
@@ -62,8 +62,11 @@ declare function loadEcorePackage(ecoreFilePath: string): Promise<EPackage>;
  * classifier here: any reference to it becomes `undefined` on the real
  * side, matching the generator's own existing convention for a classifier
  * with no explicit type (which already means "real @typemf/core EObject").
+ *
+ * `foreignClassifier` maps a proxy into another .ecore file to the typed classifier it stands for
+ * (see loadEcorePackage); without it, only this package's and Ecore's classifiers can be referenced.
  */
-declare function convertDynamicEcoreToTyped(dynamicPkg: EObject): EPackage;
+declare function convertDynamicEcoreToTyped(dynamicPkg: EObject, foreignClassifier?: (proxy: EObject) => EClassifier | undefined): EPackage;
 
 /**
  * A hand-authored graph mirroring real Ecore.ecore's own full structure -
@@ -381,6 +384,13 @@ declare function tsScalarType(type: EClassifier | ETypedElement | undefined): st
  * imports the emitted type arguments require.
  */
 declare function genericArgumentClassifiers(genericType: EGenericType | undefined): EClassifier[];
+/** A message for each class of `pkg` with a supertype from another package, which is not supported. */
+declare function findOtherPackageSuperTypes(pkg: EPackage): string[];
+/**
+ * The expression for a classifier of another package in the generated package class: the accessor
+ * on that package's PackageImpl singleton, whose import it registers.
+ */
+declare function otherPackageClassifierExpr(classifier: EClassifier): string;
 interface ResolvedDataTypeText {
     /** The TypeScript type text to emit wherever this datatype is used. */
     text: string;
@@ -655,9 +665,11 @@ interface MemberCollision {
 declare function findUnnamedElements(pkg: EPackage): string[];
 declare function findUnresolvedCollisions(pkg: EPackage): MemberCollision[];
 /**
- * Distinct EClass/EEnum type names referenced by `features` (an EClass or
- * EEnum's own attribute/reference types) that need their own import
- * statement - EDataType primitives (string/number/boolean/Date) never do.
+ * Distinct EClass/EEnum type names of this package referenced by `features`
+ * (an EClass or EEnum's own attribute/reference types) that need their own
+ * import statement - EDataType primitives (string/number/boolean/Date) never
+ * do, and other packages' types are imported where they are emitted (see
+ * tsBaseType).
  * A TS helper rather than a Nunjucks loop with manual dedup, since
  * template-level array mutation is awkward without extra Nunjucks
  * extensions - matches the "templates handle structure, TS computes"
@@ -735,4 +747,4 @@ declare function singleValuedFeatures(features: Iterable<EStructuralFeature>): E
 
 declare const typescriptTemplateSet: TemplateSet;
 
-export { ECLIPSE_ECORE_ANNOTATION_SOURCE, ECLIPSE_GENMODEL_ANNOTATION_SOURCE, FEATURE_ANNOTATION_SOURCE, type GeneratedFile, type GeneratorConfig, type MemberCollision, type OverloadBranch, type OverloadDispatch, type ResolvedDataTypeText, type RunGenerationResult, TYPEMF_GENERATOR_ANNOTATION_SOURCE, type TemplateSet, argList, assignFreshIds, beanGetterName, buildEcoreMetaSchema, concreteEClassesOf, convertDynamicEcoreToTyped, customBodyNeedsOwnField, detailsEntries, docComment, documentationOf, eClassesOf, factoryClassName, featureGetter, featureSetter, findEClassByName, findFeatureAnnotationProblems, findUnnamedElements, findUnresolvedCollisions, generate, genericArgumentClassifiers, groupOperationsByName, hasStoredManyValuedFeature, isBookkeepingOperation, isClassifierDerived, isEClass, isEDataType, isEEnum, isEReference, isOperationDerived, isOptional, isPrimitiveValueType, isReadOnlyFeature, isStructuralFeatureDerived, jsString, layeredAnnotationDetail, loadConfig, loadEcorePackage, mergedParamList, mergedReturnType, metaclassAccessorCollision, metaclassAccessorCollisionTypeNames, needsImplOnlySetter, operationBody, optionalParamList, overloadDispatch, packageClassName, paramList, primitiveDefaultValue, referencedApiTypes, referencedOperationTypes, registerBodyImports, resolveDataTypeTs, resolveTemplateSet, runGeneration, runtimeAnnotations, singleValuedFeatures, superType, superTypeChain, switchClassName, trivialDerivedFormula, tsFeatureType, tsOperationReturnType, tsOptionalScalarType, tsScalarType, typeGuardsClassName, typescriptTemplateSet, ucfirst };
+export { ECLIPSE_ECORE_ANNOTATION_SOURCE, ECLIPSE_GENMODEL_ANNOTATION_SOURCE, FEATURE_ANNOTATION_SOURCE, type GeneratedFile, type GeneratorConfig, type MemberCollision, type OverloadBranch, type OverloadDispatch, type ResolvedDataTypeText, type RunGenerationResult, TYPEMF_GENERATOR_ANNOTATION_SOURCE, type TemplateSet, argList, assignFreshIds, beanGetterName, buildEcoreMetaSchema, concreteEClassesOf, convertDynamicEcoreToTyped, customBodyNeedsOwnField, detailsEntries, docComment, documentationOf, eClassesOf, factoryClassName, featureGetter, featureSetter, findEClassByName, findFeatureAnnotationProblems, findOtherPackageSuperTypes, findUnnamedElements, findUnresolvedCollisions, generate, genericArgumentClassifiers, groupOperationsByName, hasStoredManyValuedFeature, isBookkeepingOperation, isClassifierDerived, isEClass, isEDataType, isEEnum, isEReference, isOperationDerived, isOptional, isPrimitiveValueType, isReadOnlyFeature, isStructuralFeatureDerived, jsString, layeredAnnotationDetail, loadConfig, loadEcorePackage, mergedParamList, mergedReturnType, metaclassAccessorCollision, metaclassAccessorCollisionTypeNames, needsImplOnlySetter, operationBody, optionalParamList, otherPackageClassifierExpr, overloadDispatch, packageClassName, paramList, primitiveDefaultValue, referencedApiTypes, referencedOperationTypes, registerBodyImports, resolveDataTypeTs, resolveTemplateSet, runGeneration, runtimeAnnotations, singleValuedFeatures, superType, superTypeChain, switchClassName, trivialDerivedFormula, tsFeatureType, tsOperationReturnType, tsOptionalScalarType, tsScalarType, typeGuardsClassName, typescriptTemplateSet, ucfirst };

package/dist/index.js

@@ -37,7 +37,13 @@ function validateConfig(value, configPath) {
 }
 
 // src/ecore-loader.ts
-import { EcorePackageImpl as EcorePackageImpl2, ResourceSetImpl, URI } from "@typemf/core";
+import {
+  EcorePackageImpl as EcorePackageImpl2,
+  getProxyURI as getProxyURI2,
+  isEReference,
+  ResourceSetImpl,
+  URI
+} from "@typemf/core";
 import { NodeFileUriConverter } from "@typemf/node";
 import { registerXmiFormat } from "@typemf/xmi";
 
@@ -61,7 +67,7 @@ import {
   isEClassifier,
   resolveAgainstPackage
 } from "@typemf/core";
-function convertDynamicEcoreToTyped(dynamicPkg) {
+function convertDynamicEcoreToTyped(dynamicPkg, foreignClassifier) {
   const realPkg = new EPackageImpl();
   realPkg.setName(byName(dynamicPkg, "name") ?? "");
   realPkg.setNsURI(byName(dynamicPkg, "nsURI") ?? "");
@@ -97,6 +103,8 @@ function convertDynamicEcoreToTyped(dynamicPkg) {
   }
   function classifierOf(dynClassifier) {
     if (classifierMap.has(dynClassifier)) return classifierMap.get(dynClassifier);
+    const foreign = foreignClassifier?.(dynClassifier);
+    if (foreign) return foreign;
     const uri = dynClassifier.eIsProxy() ? getProxyURI(dynClassifier) : void 0;
     const ecore = EcorePackageImpl.eINSTANCE;
     if (uri && uri.trimFragment().toString() === ecore.getNsURI()) {
@@ -106,7 +114,7 @@ function convertDynamicEcoreToTyped(dynamicPkg) {
       if (isEClassifier(resolved)) return resolved;
     }
     throw new Error(
-      `Cannot resolve the classifier reference '${uri?.toString() ?? dynClassifier.fullId()}': only classifiers of this package and of Ecore are supported.`
+      `Cannot resolve the classifier reference '${uri?.toString() ?? dynClassifier.fullId()}': only classifiers of this package, of Ecore and of other .ecore files are supported.`
     );
   }
   function resolveType(dynFeature) {
@@ -687,12 +695,57 @@ async function loadEcorePackage(ecoreFilePath) {
   if (!resource) {
     throw new Error(`Could not load '${ecoreFilePath}'.`);
   }
-  const roots = resource.getContents().toArray();
-  const dynamicPkg = roots[0];
+  return convertResource(resource, resourceSet, /* @__PURE__ */ new Map(), []);
+}
+async function convertResource(resource, resourceSet, converted, inProgress) {
+  const done = converted.get(resource);
+  if (done) return done;
+  const location = resource.getURI().toString();
+  if (inProgress.includes(resource)) {
+    const cycle = [...inProgress, resource].map((r) => r.getURI().toString()).join(" -> ");
+    throw new Error(`Cyclic references between .ecore files are not supported: ${cycle}`);
+  }
+  const dynamicPkg = resource.getContents().toArray()[0];
   if (!dynamicPkg) {
-    throw new Error(`'${ecoreFilePath}' has no root element - expected a single EPackage.`);
+    throw new Error(`'${location}' has no root element - expected a single EPackage.`);
+  }
+  const foreign = /* @__PURE__ */ new Map();
+  for (const proxy of foreignProxies(dynamicPkg)) {
+    const target = await resourceSet.resolve(proxy).catch((err) => {
+      throw new Error(
+        `Cannot resolve the classifier reference '${getProxyURI2(proxy)?.toString()}': ${err.message}`,
+        { cause: err }
+      );
+    });
+    const targetResource = target.eResource();
+    const targetPkg = targetResource ? await convertResource(targetResource, resourceSet, converted, [...inProgress, resource]) : void 0;
+    const name = target.eClass().getEStructuralFeature("name");
+    const classifier = name && targetPkg?.getEClassifier(target.eGet(name));
+    if (!classifier) {
+      throw new Error(
+        `Cannot resolve the classifier reference '${getProxyURI2(proxy)?.toString()}': only classifiers of a referenced package's root are supported.`
+      );
+    }
+    foreign.set(proxy, classifier);
+  }
+  const pkg = convertDynamicEcoreToTyped(dynamicPkg, (proxy) => foreign.get(proxy));
+  converted.set(resource, pkg);
+  return pkg;
+}
+function foreignProxies(root) {
+  const ecoreNsURI = EcorePackageImpl2.eINSTANCE.getNsURI();
+  const proxies = /* @__PURE__ */ new Set();
+  for (const obj of [root, ...root.eAllContents()]) {
+    for (const feature of obj.eClass().getEAllStructuralFeatures()) {
+      if (!isEReference(feature) || feature.isContainment()) continue;
+      const value = obj.eGet(feature);
+      const values = feature.isMany() ? [...value] : value ? [value] : [];
+      for (const v of values) {
+        if (v.eIsProxy() && getProxyURI2(v)?.trimFragment().toString() !== ecoreNsURI) proxies.add(v);
+      }
+    }
   }
-  return convertDynamicEcoreToTyped(dynamicPkg);
+  return proxies;
 }
 
 // src/generate.ts
@@ -816,16 +869,26 @@ var TypeImportMapping = class _TypeImportMapping {
 var generationContext = {
   pkg: void 0,
   typeImports: new TypeImportMapping(),
-  generateEcore: false
+  generateEcore: false,
+  packageImports: /* @__PURE__ */ new Map()
 };
 var GENERATE_ECORE_OPTION = "generate-ecore";
 var TYPE_IMPORTS_OPTION = "type-imports";
+var PACKAGE_IMPORTS_OPTION = "package-imports";
 function beginGeneration(pkg, options) {
   generationContext.pkg = pkg;
   const entries = options[TYPE_IMPORTS_OPTION];
   const valid = typeof entries === "object" && entries !== null && !Array.isArray(entries);
   generationContext.typeImports = new TypeImportMapping(valid ? entries : {});
   generationContext.generateEcore = options[GENERATE_ECORE_OPTION] === true;
+  generationContext.packageImports = new Map(
+    Object.entries(objectOption(options[PACKAGE_IMPORTS_OPTION])).filter(
+      (entry) => typeof entry[1] === "string" && entry[1] !== ""
+    )
+  );
+}
+function objectOption(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : {};
 }
 function isExternal(classifier) {
   const owner = classifier.getEPackage();
@@ -924,8 +987,10 @@ function locationOfPath(path) {
 }
 
 // src/typescript-filters.ts
+import { posix as posix2 } from "path";
 import {
   detailValue as detailValue2,
+  EcorePackageImpl as EcorePackageImpl3,
   isEDataType as isDataTypeObject
 } from "@typemf/core";
 var TYPEMF_GENERATOR_ANNOTATION_SOURCE = "https://typemf.dev/generator";
@@ -1074,8 +1139,60 @@ function tsBaseType(classifier) {
     return "EObject";
   }
   if (isEDataType(classifier)) return tsPrimitiveType(classifier);
+  if (isExternal(classifier)) {
+    const name = classifier.getName();
+    if (isEcoreClassifier(classifier)) importCollector.add({ name, location: "types", foundational: true });
+    else
+      importCollector.add({
+        name,
+        location: "types",
+        foundational: false,
+        from: otherPackageImport(classifier.getEPackage(), "types", name)
+      });
+  }
   return classifier.getName();
 }
+function isEcoreClassifier(classifier) {
+  return classifier.getEPackage()?.getNsURI() === EcorePackageImpl3.eINSTANCE.getNsURI();
+}
+function otherPackageImport(pkg, folder, file) {
+  const nsURI = pkg.getNsURI() ?? "";
+  const location = generationContext.packageImports.get(nsURI);
+  if (location === void 0) {
+    throw new Error(
+      `The package '${nsURI}' is referenced, but the "${PACKAGE_IMPORTS_OPTION}" option has no entry for it.`
+    );
+  }
+  if (!location.startsWith("./") && !location.startsWith("../")) return location;
+  const path = posix2.join(location, folder, `${file}.js`);
+  return path.startsWith(".") ? path : `./${path}`;
+}
+function findOtherPackageSuperTypes(pkg) {
+  const messages = [];
+  for (const classifier of pkg.getEClassifiers()) {
+    if (!isEClass2(classifier)) continue;
+    for (const superType2 of classifier.getESuperTypes()) {
+      if (superType2.getEPackage() !== pkg)
+        messages.push(
+          `${classifier.getName()}: the supertype ${superType2.getName()} belongs to another package, which is not supported yet`
+        );
+    }
+  }
+  return messages;
+}
+function otherPackageClassifierExpr(classifier) {
+  const pkg = classifier.getEPackage();
+  const implName = isEcoreClassifier(classifier) ? "EcorePackageImpl" : `${packageClassName(pkg)}Impl`;
+  if (isEcoreClassifier(classifier)) importCollector.add({ name: implName, location: "impl", foundational: true });
+  else
+    importCollector.add({
+      name: implName,
+      location: "impl",
+      foundational: false,
+      from: otherPackageImport(pkg, "impl", implName)
+    });
+  return `${implName}.eINSTANCE.get${classifier.getName()}()`;
+}
 function resolveDataTypeTs(dataType) {
   const resolved = resolveDataTypeText(dataType);
   const importInfo = generationContext.typeImports.lookup(dataType);
@@ -1170,7 +1287,7 @@ function isEEnum(classifier) {
 function isEDataType(classifier) {
   return !isEClass2(classifier) && !isEEnum(classifier);
 }
-function isEReference(feature) {
+function isEReference2(feature) {
   return "isContainment" in feature;
 }
 function paramList(operation) {
@@ -1487,9 +1604,10 @@ function referencedApiTypes(features, ...excludeTypeNames) {
   const names = /* @__PURE__ */ new Set();
   for (const feature of features) {
     const type = feature.getEType();
-    if (type && (isEReference(feature) || isEEnum(type)) && !exclude.has(type.getName())) names.add(type.getName());
+    if (type && (isEReference2(feature) || isEEnum(type)) && !isExternal(type) && !exclude.has(type.getName()))
+      names.add(type.getName());
     for (const argument of genericArgumentClassifiers(feature.getEGenericType())) {
-      if ((isEClass2(argument) || isEEnum(argument)) && !exclude.has(argument.getName()))
+      if ((isEClass2(argument) || isEEnum(argument)) && !isExternal(argument) && !exclude.has(argument.getName()))
         names.add(argument.getName());
     }
   }
@@ -1499,7 +1617,7 @@ function referencedOperationTypes(operations, ...excludeTypeNames) {
   const exclude = new Set(excludeTypeNames);
   const names = /* @__PURE__ */ new Set();
   const maybeAdd = (type) => {
-    if (type && (isEClass2(type) || isEEnum(type)) && !exclude.has(type.getName())) {
+    if (type && (isEClass2(type) || isEEnum(type)) && !isExternal(type) && !exclude.has(type.getName())) {
       names.add(type.getName());
     }
   };
@@ -1562,7 +1680,8 @@ var typescriptTemplateSet = {
       ...findUnnamedElements(pkg),
       ...findUnresolvedCollisions(pkg).map(
         (c) => `${c.classifierName}.${c.memberName}: name collision between ${c.sources.join(" and ")}`
-      )
+      ),
+      ...findOtherPackageSuperTypes(pkg)
     ];
   },
   configureEnvironment(env, { pkg, options }) {
@@ -1584,7 +1703,7 @@ var typescriptTemplateSet = {
     env.addGlobal("isEClass", isEClass2);
     env.addGlobal("isEEnum", isEEnum);
     env.addGlobal("isEDataType", isEDataType);
-    env.addGlobal("isEReference", isEReference);
+    env.addGlobal("isEReference", isEReference2);
     env.addGlobal("paramList", paramList);
     env.addGlobal("argList", argList);
     env.addGlobal("ucfirst", ucfirst);
@@ -1616,6 +1735,7 @@ var typescriptTemplateSet = {
     env.addGlobal("metaclassAccessorCollision", metaclassAccessorCollision);
     env.addGlobal("metaclassAccessorCollisionTypeNames", metaclassAccessorCollisionTypeNames);
     env.addGlobal("optionalParamList", optionalParamList);
+    env.addGlobal("otherPackageClassifierExpr", otherPackageClassifierExpr);
     env.addGlobal("typeGuardsClassName", typeGuardsClassName);
     env.addGlobal("useImport", useImport);
   },
@@ -1676,6 +1796,7 @@ export {
   featureSetter,
   findEClassByName,
   findFeatureAnnotationProblems,
+  findOtherPackageSuperTypes,
   findUnnamedElements,
   findUnresolvedCollisions,
   generate,
@@ -1687,7 +1808,7 @@ export {
   isEClass2 as isEClass,
   isEDataType,
   isEEnum,
-  isEReference,
+  isEReference2 as isEReference,
   isOperationDerived,
   isOptional,
   isPrimitiveValueType,
@@ -1704,6 +1825,7 @@ export {
   needsImplOnlySetter,
   operationBody,
   optionalParamList,
+  otherPackageClassifierExpr,
   overloadDispatch,
   packageClassName,
   paramList,