@emfts/codegen 0.0.1-next.8 → 0.0.2-next.1

package/dist/templates/partials/emf/class-file.ejs

@@ -4,9 +4,27 @@
 const imports = importResolver.resolveImportsForClass(eClass, genPackage, 'emf');
 const hardcodedCoreTypes = ['BasicEObject', 'EClass', 'EStructuralFeature'];
 const coreTypeImports = ['EClass', 'EStructuralFeature'];
+const coreValueImports = [];
 const typeOnlyImports = [];
 const valueImports = [];
 const importedNames = new Set();
+// Check if any feature is many-valued (needs EList imports)
+const useEList = typeMapper.useEList;
+const hasManyFeature = features.some(gf => isMany(gf.ecoreFeature));
+const hasManyMixin = (mixinFeatures || []).some(mf => isMany(mf.feature));
+if (useEList && (hasManyFeature || hasManyMixin)) {
+  coreTypeImports.push('EList', 'EReference');
+  // Determine which factory functions are needed
+  const needsContainment = features.some(gf => isMany(gf.ecoreFeature) && isContainment(gf.ecoreFeature))
+    || (mixinFeatures || []).some(mf => isMany(mf.feature) && isContainment(mf.feature));
+  const needsEObjectList = features.some(gf => isMany(gf.ecoreFeature) && !isContainment(gf.ecoreFeature) && typeMapper.isReference(gf.ecoreFeature))
+    || (mixinFeatures || []).some(mf => isMany(mf.feature) && !isContainment(mf.feature) && typeMapper.isReference(mf.feature));
+  const needsBasicList = features.some(gf => isMany(gf.ecoreFeature) && typeMapper.isAttribute(gf.ecoreFeature))
+    || (mixinFeatures || []).some(mf => isMany(mf.feature) && typeMapper.isAttribute(mf.feature));
+  if (needsContainment) coreValueImports.push('createContainmentEList');
+  if (needsEObjectList) coreValueImports.push('createEObjectEList');
+  if (needsBasicList) coreValueImports.push('createBasicEList');
+}
 for (const imp of imports) {
   if (imp.typeName === className || imp.typeName === interfaceName || imp.typeName === extendsClass) continue;
   if (hardcodedCoreTypes.includes(imp.typeName)) continue;
@@ -46,6 +64,9 @@ for (const imp of (mixinImports || [])) {
 <% if (!extendsImport) { -%>
 import { BasicEObject } from '@emfts/core';
 <% } -%>
+<% if (coreValueImports.length > 0) { -%>
+import { <%- coreValueImports.join(', ') %> } from '@emfts/core';
+<% } -%>
 import type { <%- coreTypeImports.join(', ') %> } from '@emfts/core';
 <% for (const imp of typeOnlyImports) { -%>
 import type { <%- imp.typeName %> } from '<%- imp.importPath %>';
@@ -56,8 +77,8 @@ import { <%- imp.typeName %> } from '<%- imp.importPath %>';
 <% if (extendsImport) { -%>
 import { <%- extendsClass %> } from '<%- extendsImport %>';
 <% } -%>
-import type { <%- interfaceName %> } from './<%- interfaceName %>';
-import { <%- packagePrefix %>Package } from './<%- packagePrefix %>Package';
+import type { <%- interfaceName %> } from './<%- interfaceName %>.js';
+import { <%- packagePrefix %>Package } from './<%- packagePrefix %>Package.js';
 
 /**
  * Implementation of <%- interfaceName %>
@@ -80,14 +101,14 @@ export <% if (isAbstract) { %>abstract <% } %>class <%- className %> extends <%-
   const defaultValue = typeMapper.getDefaultValue(feature);
   const featureIsMany = isMany(feature);
 -%>
-  private _<%- featureName %><% if (!featureIsMany && defaultValue === null) { %>?<% } %>: <%- featureType %><% if (defaultValue !== null) { %> = <%- defaultValue %><% } %>;
+  private _<%- featureName %><% if (useEList && featureIsMany) { %>!<% } else if (!featureIsMany && defaultValue === null) { %>?<% } %>: <%- featureType %><% if (defaultValue !== null) { %> = <%- defaultValue %><% } %>;
 <% } -%>
 <% for (const mf of (mixinFeatures || [])) {
   const featureType = typeMapper.mapFeature(mf.feature);
   const defaultValue = typeMapper.getDefaultValue(mf.feature);
   const featureIsMany = isMany(mf.feature);
 -%>
-  private _<%- mf.name %><% if (!featureIsMany && defaultValue === null) { %>?<% } %>: <%- featureType %><% if (defaultValue !== null) { %> = <%- defaultValue %><% } %>;
+  private _<%- mf.name %><% if (useEList && featureIsMany) { %>!<% } else if (!featureIsMany && defaultValue === null) { %>?<% } %>: <%- featureType %><% if (defaultValue !== null) { %> = <%- defaultValue %><% } %>;
 <% } -%>
 
   /**
@@ -105,6 +126,27 @@ export <% if (isAbstract) { %>abstract <% } %>class <%- className %> extends <%-
   const featureIsMany = isMany(feature);
   const upperName = toUpperSnake(featureName);
 -%>
+<% if (useEList && featureIsMany) {
+  // EList lazy-init getter: creates the right EList on first access
+  const isRef = typeMapper.isReference(feature);
+  const isCont = isRef && isContainment(feature);
+  let factoryCall;
+  if (isCont) {
+    factoryCall = `createContainmentEList<any>(this, this.eClass().getEStructuralFeature('${featureName}') as EReference)`;
+  } else if (isRef) {
+    factoryCall = `createEObjectEList(this, this.eClass().getEStructuralFeature('${featureName}') as EReference) as unknown as ${featureType}`;
+  } else {
+    factoryCall = `createBasicEList<any>(this, this.eClass().getEStructuralFeature('${featureName}')!)`;
+  }
+-%>
+  get <%- featureName %>(): <%- featureType %> {
+    if (!this._<%- featureName %>) {
+      this._<%- featureName %> = <%- factoryCall %>;
+    }
+    return this._<%- featureName %>;
+  }
+
+<% } else { -%>
   get <%- featureName %>(): <%- featureType %> {
     return this._<%- featureName %><% if (!featureIsMany) { %>!<% } %>;
   }
@@ -134,6 +176,7 @@ export <% if (isAbstract) { %>abstract <% } %>class <%- className %> extends <%-
 <% } -%>
   }
 
+<% } -%>
 <% } -%>
 <% } -%>
 <% for (const mf of (mixinFeatures || [])) {
@@ -177,18 +220,32 @@ export <% if (isAbstract) { %>abstract <% } %>class <%- className %> extends <%-
     const featureID = this.eClass().getFeatureID(feature);
     switch (featureID) {
 <% for (const fid of featureIds) {
-  const featureType = typeMapper.mapFeature(fid.feature.ecoreFeature);
+  const feat = fid.feature.ecoreFeature;
+  const featureType = typeMapper.mapFeature(feat);
+  const featureName = getName(feat);
+  const featureIsMany = isMany(feat);
 -%>
       case <%- className %>.<%- fid.name %>:
-        this.<%- getName(fid.feature.ecoreFeature) %> = newValue as <%- featureType %>;
+<% if (useEList && featureIsMany) { -%>
+        this.<%- featureName %>.clear();
+        this.<%- featureName %>.addAll(newValue as any[]);
+<% } else { -%>
+        this.<%- featureName %> = newValue as <%- featureType %>;
+<% } -%>
         super.eSet(feature, newValue);
         break;
 <% } -%>
 <% for (const mf of (mixinFeatures || [])) {
   const featureType = typeMapper.mapFeature(mf.feature);
+  const featureIsMany = isMany(mf.feature);
 -%>
       case <%- className %>.<%- mf.upperName %>:
+<% if (useEList && featureIsMany) { -%>
+        this.<%- mf.name %>.clear();
+        this.<%- mf.name %>.addAll(newValue as any[]);
+<% } else { -%>
         this.<%- mf.name %> = newValue as <%- featureType %>;
+<% } -%>
         super.eSet(feature, newValue);
         break;
 <% } -%>
@@ -210,7 +267,9 @@ export <% if (isAbstract) { %>abstract <% } %>class <%- className %> extends <%-
   const featureName = getName(feature);
 -%>
       case <%- className %>.<%- fid.name %>:
-<% if (featureIsMany) { -%>
+<% if (useEList && featureIsMany) { -%>
+        return this._<%- featureName %> !== undefined && !this._<%- featureName %>.isEmpty();
+<% } else if (featureIsMany) { -%>
         return this._<%- featureName %> !== undefined && this._<%- featureName %>.length > 0;
 <% } else if (defaultValue !== null) { -%>
         return this._<%- featureName %> !== <%- defaultValue %>;
@@ -223,7 +282,9 @@ export <% if (isAbstract) { %>abstract <% } %>class <%- className %> extends <%-
   const defaultValue = typeMapper.getDefaultValue(mf.feature);
 -%>
       case <%- className %>.<%- mf.upperName %>:
-<% if (featureIsMany) { -%>
+<% if (useEList && featureIsMany) { -%>
+        return this._<%- mf.name %> !== undefined && !this._<%- mf.name %>.isEmpty();
+<% } else if (featureIsMany) { -%>
         return this._<%- mf.name %> !== undefined && this._<%- mf.name %>.length > 0;
 <% } else if (defaultValue !== null) { -%>
         return this._<%- mf.name %> !== <%- defaultValue %>;
@@ -249,7 +310,9 @@ export <% if (isAbstract) { %>abstract <% } %>class <%- className %> extends <%-
   const featureName = getName(feature);
 -%>
       case <%- className %>.<%- fid.name %>:
-<% if (featureIsMany) { -%>
+<% if (useEList && featureIsMany) { -%>
+        if (this._<%- featureName %>) this._<%- featureName %>.clear();
+<% } else if (featureIsMany) { -%>
         this._<%- featureName %> = [];
 <% } else if (defaultValue !== null) { -%>
         this._<%- featureName %> = <%- defaultValue %>;
@@ -263,7 +326,9 @@ export <% if (isAbstract) { %>abstract <% } %>class <%- className %> extends <%-
   const defaultValue = typeMapper.getDefaultValue(mf.feature);
 -%>
       case <%- className %>.<%- mf.upperName %>:
-<% if (featureIsMany) { -%>
+<% if (useEList && featureIsMany) { -%>
+        if (this._<%- mf.name %>) this._<%- mf.name %>.clear();
+<% } else if (featureIsMany) { -%>
         this._<%- mf.name %> = [];
 <% } else if (defaultValue !== null) { -%>
         this._<%- mf.name %> = <%- defaultValue %>;

package/dist/templates/partials/emf/factory-file.ejs

@@ -2,13 +2,13 @@
 
 import { BasicEFactory } from '@emfts/core';
 import type { EClass, EObject } from '@emfts/core';
-import { <%- packageName %>Package } from './<%- packageName %>Package';
+import { <%- packageName %>Package } from './<%- packageName %>Package.js';
 <% for (const genClass of concreteClasses) {
   const className = genClass.ecoreClass.getName();
   const implName = genClass.implClassName || (className + 'Impl');
 -%>
-import type { <%- className %> } from './<%- className %>';
-import { <%- implName %> } from './<%- implName %>';
+import type { <%- className %> } from './<%- className %>.js';
+import { <%- implName %> } from './<%- implName %>.js';
 <% } -%>
 
 /**

package/dist/templates/partials/emf/index-file.ejs

@@ -1,14 +1,14 @@
 <%- header %>
 
 // Package and Factory
-export { <%- packageName %>Package } from './<%- packageName %>Package';
-export { <%- packageName %>Factory } from './<%- packageName %>Factory';
+export { <%- packageName %>Package } from './<%- packageName %>Package.js';
+export { <%- packageName %>Factory } from './<%- packageName %>Factory.js';
 
 // Interfaces
 <% for (const genClass of genClasses) {
   const name = getName(genClass.ecoreClass);
 -%>
-export type { <%- name %> } from './<%- name %>';
+export type { <%- name %> } from './<%- name %>.js';
 <% } -%>
 
 // Implementations (including abstract classes, as they're extended by subclasses)
@@ -16,7 +16,7 @@ export type { <%- name %> } from './<%- name %>';
   if (!checkIsInterface(genClass.ecoreClass)) {
     const implName = genClass.implClassName || (getName(genClass.ecoreClass) + 'Impl');
 -%>
-export { <%- implName %> } from './<%- implName %>';
+export { <%- implName %> } from './<%- implName %>.js';
 <%
   }
 } -%>
@@ -25,5 +25,5 @@ export { <%- implName %> } from './<%- implName %>';
 <% for (const genEnum of genEnums) {
   const name = getName(genEnum.ecoreEnum);
 -%>
-export { <%- name %>, get<%- name %>, get<%- name %>ByLiteral } from './<%- name %>';
+export { <%- name %>, get<%- name %>, get<%- name %>ByLiteral } from './<%- name %>.js';
 <% } -%>

package/dist/templates/partials/emf/interface-file.ejs

@@ -4,6 +4,11 @@
 const imports = importResolver.resolveImportsForClass(eClass, genPackage, 'emf');
 const coreTypeImports = ['EObject'];
 const otherTypeImports = [];
+// Add EList import if any feature is many-valued and useEList is on
+const useEList = typeMapper.useEList;
+if (useEList && features.some(gf => isMany(gf.ecoreFeature))) {
+  coreTypeImports.push('EList');
+}
 for (const imp of imports) {
   if (imp.typeName === interfaceName) continue;
   if (imp.importPath === '@emfts/core') {

package/dist/templates/partials/emf/package-file.ejs

@@ -94,6 +94,7 @@ if (needsRegistryImport) coreImports.push('EPackageRegistry');
 -%>
 import { <%- coreImports.join(', ') %> } from '@emfts/core';
 import type { EClass, EAttribute, EReference, EEnum } from '@emfts/core';
+import { <%- packageName %>Factory } from './<%- packageName %>Factory.js';
 
 /**
  * <%- packageName %> Package
@@ -138,6 +139,11 @@ export class <%- packageName %>Package extends BasicEPackage {
    * Initialize package contents
    */
   private init(): void {
+    // Wire the generated factory so loaded/created instances are typed Impls.
+    // eINSTANCE is already assigned at this point, so the factory's back
+    // reference to the package resolves without re-entering init()
+    this.setEFactoryInstance(<%- packageName %>Factory.eINSTANCE);
+
 <% for (const genClass of genClasses) {
   const eClass = genClass.ecoreClass;
   const className = getName(eClass);

package/dist/templates/partials/plain/class-file.ejs

@@ -60,14 +60,8 @@ if (superTypes && superTypes.length > 0) {
   const op = genOp.ecoreOperation;
   const opName = op.getName();
   const returnType = op.getEType() ? typeMapper.mapClassifier(op.getEType()) : 'void';
-  const params = [];
-  for (const param of op.getEParameters()) {
-    const paramName = param.getName();
-    const paramType = typeMapper.mapClassifier(param.getEType());
-    params.push(`${paramName}: ${paramType}`);
-  }
 -%>
-  <%- opName %>(<%- params.join(', ') %>): <%- returnType %> {
+  <%- opName %>(<%- mapParams(op) %>): <%- returnType %> {
     throw new Error('<%- opName %> not implemented');
   }
 

package/dist/templates/partials/plain/interface-file.ejs

@@ -49,13 +49,7 @@ if (superTypes && superTypes.length > 0) {
   const op = genOp.ecoreOperation;
   const opName = op.getName();
   const returnType = op.getEType() ? typeMapper.mapClassifier(op.getEType()) : 'void';
-  const params = [];
-  for (const param of op.getEParameters()) {
-    const paramName = param.getName();
-    const paramType = typeMapper.mapClassifier(param.getEType());
-    params.push(`${paramName}: ${paramType}`);
-  }
 -%>
-  <%- opName %>(<%- params.join(', ') %>): <%- returnType %>;
+  <%- opName %>(<%- mapParams(op) %>): <%- returnType %>;
 <% } -%>
 }

package/dist/templates/partials/plain/package-file.ejs

@@ -2,5 +2,5 @@
 
 // Re-export all types from this package
 <% for (const exp of exports) { -%>
-export * from './<%- exp %>';
+export * from './<%- exp %>.js';
 <% } -%>

package/model/genconfig.ecore

@@ -19,6 +19,22 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="classDefaults" eType="#//ClassDefaults" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="featureDefaults" eType="#//FeatureDefaults" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="classOverrides" upperBound="-1" eType="#//ClassOverride" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedPackages" upperBound="-1" eType="#//ReferencedPackage" containment="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Import path mappings for cross-package references (equivalent of usedGenPackages in EMF Java genmodels)"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+
+  <!-- ============================================ -->
+  <!-- REFERENCED PACKAGE                           -->
+  <!-- ============================================ -->
+  <eClassifiers xsi:type="ecore:EClass" name="ReferencedPackage">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="Maps the nsURI of an external EPackage to the TypeScript import path of its generated code"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nsURI" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="importPath" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
 
   <!-- ============================================ -->
@@ -32,6 +48,11 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="outputDir" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral="./generated"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="fileExtension" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" defaultValueLiteral=".ts"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="headerComment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="annotationsPackage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Decorator mode: import ModelClass/Attribute/... decorators from this package instead of generating ModelAnnotations per model"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
 
   <eClassifiers xsi:type="ecore:EEnum" name="GenerationMode">

package/model/genconfig.genconfig.xmi

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genconfig:GenConfig
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:genconfig="http://www.emfts.org/genconfig/1.0"
+    ecorePackage="http://www.emfts.org/genconfig/1.0#/">
+  <generation mode="emf" outputDir="./src/genconfig"/>
+  <package prefix="GenConfig" basePackage="model" generateFactory="true" generatePackage="true" generateIndex="true"/>
+  <classDefaults generateInterface="true" generateImpl="true" rootExtendsClass="BasicEObject" rootExtendsInterface="EObject"/>
+  <featureDefaults notify="true" property="editable"/>
+</genconfig:GenConfig>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emfts/codegen",
-  "version": "0.0.1-next.8",
+  "version": "0.0.2-next.1",
   "description": "TypeScript code generator for Ecore models using emfts",
   "type": "module",
   "main": "dist/index.js",
@@ -16,6 +16,7 @@
   },
   "scripts": {
     "build": "tsc && rm -rf dist/templates && cp -r src/templates dist/templates",
+    "generate:genconfig": "npm run build && node dist/cli/index.js generate -m model/genconfig.ecore -c model/genconfig.genconfig.xmi && npm run build",
     "watch": "tsc --watch",
     "test": "vitest",
     "test:run": "vitest run",
@@ -45,7 +46,7 @@
   "dependencies": {
     "commander": "^12.0.0",
     "ejs": "^3.1.10",
-    "@emfts/core": "^0.1.1-next.2",
+    "@emfts/core": "^0.2.0-next.1",
     "sax": "^1.4.4"
   },
   "devDependencies": {