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

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.2",
   "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": {