Merge pull request #99 from SokaDance/module.impl

[gen][ts] support definition of implementation module for specific package

Author: SokaDance

Dockerfile-ts

@@ -6,12 +6,12 @@ INCLUDE+ Dockerfile-base
 FROM openjdk:16-alpine AS jvm
 COPY --from=build /home/soft.gen/out/soft.generator.ts/*.jar /soft.generator.ts/
 WORKDIR /soft.generator.ts
-RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.ts-1.5.0.jar > java.modules \
+RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.ts-1.5.1.jar > java.modules \
  && jlink --strip-java-debug-attributes --add-modules $(cat java.modules) --output /java-generator
 
 # Build result stage
 FROM alpine
 COPY --from=build /home/soft.gen/out/soft.generator.ts/*.jar /usr/share/soft.generator.ts/
 COPY --from=jvm /java-generator /usr/lib/jvm/java-generator
 
-ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.ts/soft.generator.ts-1.5.0.jar"]
+ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.ts/soft.generator.ts-1.5.1.jar"]

Makefile

@@ -4,7 +4,7 @@ soft.generators.version := 1.6.0
 soft.generator.common.version := 1.4.1
 soft.generator.cpp.version := 1.2.4
 soft.generator.go.version := 1.9.2
-soft.generator.ts.version := 1.5.0
+soft.generator.ts.version := 1.5.1
 
 export DOCKER_BUILDKIT=1
 

soft.generators/soft.generator.ts/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Created-By: 13.0.2+8 (Oracle Corporation)
 Bundle-ManifestVersion: 2
 Bundle-Name: Soft Generator TypeScript
 Bundle-SymbolicName: soft.generator.ts
-Bundle-Version: 1.5.0
+Bundle-Version: 1.5.1
 Export-Package: soft.generator.ts,
  soft.generator.ts.lib,
  soft.generator.ts.lib.factory,

soft.generators/soft.generator.ts/pom.xml

@@ -8,7 +8,7 @@
       <version>1.6.0</version>
    </parent>
    <artifactId>soft.generator.ts</artifactId>
-   <version>1.5.0</version>
+   <version>1.5.1</version>
    <dependencies>
       <dependency>
          <groupId>soft.generators</groupId>

soft.generators/soft.generator.ts/src/soft/generator/ts/generateModule.mtl

@@ -33,11 +33,13 @@
         tokenized->iterate( p : String ; res : OclAny = packageToModule | (
         	let index : Integer = p.index('=') in 
             if index = -1 then
-				let nameIndex : Integer = p.lastIndex('/') in
+				let packIndex : Integer = p.index('#') in
+				let packModule : String = if packIndex = -1 then p else p.substring(1, packIndex-1) endif in
+				let nameIndex : Integer = packModule.lastIndex('/') in
 				if nameIndex = -1 then
-					res.mapPut('name:'+p,p)
+					res.mapPut('name:'+packModule,p)
 				else
-					res.mapPut('name:'+p.substring(nameIndex+1),p)
+					res.mapPut('name:'+packModule.substring(nameIndex+1),p)
 				endif
             else
                 res.mapPut('uri:'+p.substring(1,index-1),p.substring(index+1))
@@ -48,24 +50,42 @@
     endif
 /]
 
-[query public getModule(aPackage : EPackage): String =
- 	let packageToModule : OclAny = getPackageToModuleMap() in
-	let uriPath : OclAny = mapGet(packageToModule, 'uri:' + aPackage.nsURI) in
-	if not uriPath.oclIsUndefined() then
-		uriPath.oclAsType(String)
+[query private getModule(modules : String, index : Integer) : String =
+	let tokenized : Sequence(String) = modules.tokenize('#') in
+	let size : Integer = tokenized->size() in 
+	if index > size then
+		tokenized->at( size )
 	else
-		let namePath : OclAny = mapGet(packageToModule, 'name:' + aPackage.name) in
-		if not namePath.oclIsUndefined() then
-			namePath.oclAsType(String)
+		tokenized->at(index)
+	endif
+/]
+
+[query private getIndexModule(aPackage : EPackage, index : Integer) : String =
+	let packageToModules : OclAny = getPackageToModuleMap() in
+	let uriModule : OclAny = mapGet(packageToModules, 'uri:' + aPackage.nsURI) in
+	if not uriModule.oclIsUndefined() then
+		getModule(uriModule.oclAsType(String),index)
+	else
+		let nameModule : OclAny = mapGet(packageToModules, 'name:' + aPackage.name) in
+		if not nameModule.oclIsUndefined() then
+			getModule(nameModule.oclAsType(String),index)
 		else
-			aPackage.name
+			aPackage.name + '/' + aPackage.name
 		endif
-	endif
+	endif 	
+/] 
+
+[query public getInterfaceModule(aPackage : EPackage): String =
+ 	aPackage.getIndexModule(1)
+/]
+
+[query public getImplementationModule(aPackage : EPackage): String =
+ 	aPackage.getIndexModule(2)
 /]
 
 [query private getModuleToPathMap(any : OclAny) : OclAny =
  	let currentPackage : EPackage = getCurrentPackage() in
-	let currentModule : String = currentPackage.getModule() in
+	let currentModule : String = currentPackage.getInterfaceModule() in
 	let pathsProperty : OclAny = getProperty('paths') in 
 	let paths : String = (if pathsProperty.oclIsUndefined() or pathsProperty = '' then '' else pathsProperty.oclAsType(String) endif) + 
 						 (if currentPackage.hasKey('paths') then ';' + currentPackage.valueKey('paths') else '' endif) in
@@ -99,7 +119,7 @@
 
 [query private getModuleToNamespaceMap(any : OclAny) : OclAny =
 	let currentPackage : EPackage = getCurrentPackage() in
-	let currentModule : String = currentPackage.getModule() in
+	let currentModule : String = currentPackage.getInterfaceModule() in
 	let moduleToNamespace : OclAny = mapNew('getModuleToNamespaceMap_' + currentPackage.name)
 									.mapPut('@masagroup/ecore','ecore' )
 								    .mapPut(currentModule,'') in

soft.generators/soft.generator.ts/src/soft/generator/ts/generateType.mtl

@@ -23,7 +23,9 @@
 
 [query private getQualifiedIdentifier( qualification : String, identifier : String ) : String = qualification + '/' + identifier/] 
 
-[query public getQualifiedIdentifier( aPackage : EPackage, identifier : String ) : String = getQualifiedIdentifier(aPackage.getModule(),identifier)/]
+[query public getQualifiedInterfaceIdentifier( aPackage : EPackage, identifier : String ) : String = getQualifiedIdentifier(aPackage.getInterfaceModule(),identifier)/]
+
+[query public getQualifiedImplementationIdentifier( aPackage : EPackage, identifier : String ) : String = getQualifiedIdentifier(aPackage.getImplementationModule(),identifier)/]
 
 [query public getQualifiedInterfaceIdentifier( aClassifier : EClassifier ) : String =
 	if aClassifier.oclIsUndefined() then 'any'
@@ -35,15 +37,15 @@
 
 [query public getQualifiedInterfaceIdentifier( aDataType : EDataType ) : String = aDataType.getType()/]
 
-[query public getQualifiedInterfaceIdentifier( aPackage : EPackage ) : String = aPackage.getQualifiedIdentifier( aPackage.getInterfaceName() ) /]
+[query public getQualifiedInterfaceIdentifier( aPackage : EPackage ) : String = aPackage.getQualifiedInterfaceIdentifier( aPackage.getInterfaceName() ) /]
 
-[query public getQualifiedInterfaceIdentifier( aClass : EClass ) : String = aClass.ePackage.getQualifiedIdentifier( aClass.getInterfaceName() ) /]
+[query public getQualifiedInterfaceIdentifier( aClass : EClass ) : String = aClass.ePackage.getQualifiedInterfaceIdentifier( aClass.getInterfaceName() ) /]
 
-[query public getQualifiedImplementationIdentifier( aClass : EClass ) : String = aClass.ePackage.getQualifiedIdentifier( aClass.getImplementationName() ) /]
+[query public getQualifiedImplementationIdentifier( aClass : EClass ) : String = aClass.ePackage.getQualifiedImplementationIdentifier( aClass.getImplementationName() ) /]
 
-[query public getQualifiedExtensionIdentifier( aClass : EClass ) : String = aClass.ePackage.getQualifiedIdentifier( aClass.getExtensionName() ) /]
+[query public getQualifiedExtensionIdentifier( aClass : EClass ) : String = aClass.ePackage.getQualifiedImplementationIdentifier( aClass.getExtensionName() ) /]
 
-[query public getQualifiedInterfaceIdentifier( aEnum : EEnum ) : String = aEnum.ePackage.getQualifiedIdentifier( aEnum.name ) /]
+[query public getQualifiedInterfaceIdentifier( aEnum : EEnum ) : String = aEnum.ePackage.getQualifiedInterfaceIdentifier( aEnum.name ) /]
 
 [query public getImportedIdentifier( qualifiedIdentifier : String, modules : OclAny ) : String =
 	if modules.oclIsUndefined() then
@@ -107,15 +109,15 @@
 /]
 
 [query public getImportedIDName( aClass : EClass, aFeature : EStructuralFeature, modules : OclAny) : String =
-	getImportedIdentifier(aClass.ePackage.getQualifiedIdentifier(aClass.ePackage.getConstantsName()+'.'+ aClass.getFeatureIDName(aFeature)),modules)
+	getImportedIdentifier(aClass.ePackage.getQualifiedInterfaceIdentifier(aClass.ePackage.getConstantsName()+'.'+ aClass.getFeatureIDName(aFeature)),modules)
 /]
 
 [query public getImportedIDName( aClass : EClass, aOperation : EOperation, modules : OclAny) : String =
-	getImportedIdentifier(aClass.ePackage.getQualifiedIdentifier(aClass.ePackage.getConstantsName()+'.'+ aClass.getOperationIDName(aOperation)),modules)
+	getImportedIdentifier(aClass.ePackage.getQualifiedInterfaceIdentifier(aClass.ePackage.getConstantsName()+'.'+ aClass.getOperationIDName(aOperation)),modules)
 /]
 
 [query public getImportedIDName( aClassifier : EClassifier, modules : OclAny) : String =
-	getImportedIdentifier(aClassifier.ePackage.getQualifiedIdentifier(aClassifier.ePackage.getConstantsName()+'.'+ aClassifier.getClassifierIDName()),modules)
+	getImportedIdentifier(aClassifier.ePackage.getQualifiedInterfaceIdentifier(aClassifier.ePackage.getConstantsName()+'.'+ aClassifier.getClassifierIDName()),modules)
  /]
 
 [template public generateType(aElement : ETypedElement, modules : OclAny) post (trim())]
@@ -126,9 +128,9 @@ void
     [let aPackage : EPackage = aElement.getEPackage()]
 	[let ecore : EPackage = getEcorePackage()]
     [if aElement.isMapType()]
-		[getImportedIdentifier( ecore.getQualifiedIdentifier('EMap'), modules)/]<[aDataType.generateMapKeyType(modules)/], [aDataType.generateMapValueType(modules)/]>
+		[getImportedIdentifier( ecore.getQualifiedInterfaceIdentifier('EMap'), modules)/]<[aDataType.generateMapKeyType(modules)/], [aDataType.generateMapValueType(modules)/]>
 	[elseif aElement.isListType()]
-        [getImportedIdentifier( ecore.getQualifiedIdentifier('EList'), modules)/]<[aDataType.generateListTypeParameters(modules)/]>
+        [getImportedIdentifier( ecore.getQualifiedInterfaceIdentifier('EList'), modules)/]<[aDataType.generateListTypeParameters(modules)/]>
     [else]
         [aDataType.generateType(modules)/][if aDataType.eClassifier.name <> 'EJavaClass' and aDataType.eTypeArguments->notEmpty()]<[for (g : EGenericType | aDataType.eTypeArguments) separator (',')][getImportedIdentifier(g.eClassifier.getType(),modules)/][/for]>[/if]
     [/if]
@@ -198,19 +200,19 @@ void
 		Sequence{ 'java.lang.Class' , 'any', 'null', ''},
 		Sequence{ 'java.lang.Object', 'any', 'null', 'null'},
 		Sequence{ 'java.lang.Long' , 'java.math.BigInteger', 'long' , 'number' , '0', '45'},
-        Sequence{ 'java.util.Map' , ecore.getQualifiedIdentifier('EMap'), 'null', 'null'},
-        Sequence{ 'java.util.Map$Entry' , ecore.getQualifiedIdentifier('EMapEntry'), 'null' , 'null'},
+        Sequence{ 'java.util.Map' , ecore.getQualifiedInterfaceIdentifier('EMap'), 'null', 'null'},
+        Sequence{ 'java.util.Map$Entry' , ecore.getQualifiedInterfaceIdentifier('EMapEntry'), 'null' , 'null'},
 		Sequence{ 'java.lang.Short' , 'short' , 'number' , '0', '2'},
         Sequence{ 'java.lang.String' , 'string', '""' , '"Test String"'},
 
 
-		Sequence{ 'org.eclipse.emf.common.util.DiagnosticChain', ecore.getQualifiedIdentifier('EDiagnosticChain'), 'null', 'null'},
-		Sequence{ 'org.eclipse.emf.common.util.EList', ecore.getQualifiedIdentifier('EList'), 'null', 'null'},
+		Sequence{ 'org.eclipse.emf.common.util.DiagnosticChain', ecore.getQualifiedInterfaceIdentifier('EDiagnosticChain'), 'null', 'null'},
+		Sequence{ 'org.eclipse.emf.common.util.EList', ecore.getQualifiedInterfaceIdentifier('EList'), 'null', 'null'},
 		Sequence{ 'org.eclipse.emf.common.util.Enumerator', 'any', 'null', 'null'},
 		Sequence{ 'org.eclipse.emf.ecore.util.FeatureMap', 'any', 'null', 'null'},
         Sequence{ 'org.eclipse.emf.ecore.util.FeatureMap$Entry', 'any', 'null', 'null'},
-        Sequence{ 'org.eclipse.emf.ecore.resource.Resource', ecore.getQualifiedIdentifier('EResource'), 'null' , 'null'},
-        Sequence{ 'org.eclipse.emf.ecore.resource.ResourceSet', ecore.getQualifiedIdentifier('EResourceSet'), 'null' , 'null'},
+        Sequence{ 'org.eclipse.emf.ecore.resource.Resource', ecore.getQualifiedInterfaceIdentifier('EResource'), 'null' , 'null'},
+        Sequence{ 'org.eclipse.emf.ecore.resource.ResourceSet', ecore.getQualifiedInterfaceIdentifier('EResourceSet'), 'null' , 'null'},
 		Sequence{ 'org.eclipse.emf.common.util.TreeIterator', 'IterableIterator', 'null' , 'null'}
     }
 /]
@@ -290,15 +292,14 @@ void
 	if eLiterals->isEmpty() then
 		literal 
 	else
-		getImportedIdentifier( aEnum.ePackage.getQualifiedIdentifier(aEnum.name + '.' + eLiterals->first().getConstantsName()),modules)
+		getImportedIdentifier( aEnum.ePackage.getQualifiedInterfaceIdentifier(aEnum.name + '.' + eLiterals->first().getConstantsName()),modules)
 	endif
 /]
 
 [query private getDefaultValueFromLiteral(aDataType : EDataType, literal : String , modules : OclAny) : String = 
 	literal
 /]
 
-
 [query public getDefaultValue(aClassifier : EClassifier, modules : OclAny) : String =
     if aClassifier.oclIsKindOf( EEnum ) then aClassifier.oclAsType(EEnum).getDefaultValue(modules)
     else if aClassifier.oclIsKindOf( EDataType ) then aClassifier.oclAsType(EDataType).getDefaultValue(modules)
@@ -307,7 +308,7 @@ void
 
 [query public getDefaultValue(aEnum : EEnum, modules : OclAny) : String = 
 	if aEnum.eLiterals->notEmpty() then
-		getImportedIdentifier( aEnum.ePackage.getQualifiedIdentifier(aEnum.name + '.' + aEnum.eLiterals->at(1).getConstantsName()), modules) 
+		getImportedIdentifier( aEnum.ePackage.getQualifiedInterfaceIdentifier(aEnum.name + '.' + aEnum.eLiterals->at(1).getConstantsName()), modules) 
 	else 
 		0 
 	endif
@@ -351,7 +352,7 @@ void
 [query private getTestValue( aEnum : EEnum , modules : OclAny ) : String =
 	if aEnum.eLiterals->size() >= 1 then
 		let constant : String = aEnum.eLiterals->at(if aEnum.eLiterals->size() > 1 then 2 else 1 endif).getConstantsName() in
-		getImportedIdentifier( aEnum.ePackage.getQualifiedIdentifier(aEnum.name + '.' + constant), modules)
+		getImportedIdentifier( aEnum.ePackage.getQualifiedInterfaceIdentifier(aEnum.name + '.' + constant), modules)
 	else 0 endif/]
 
 [query private getTestValue( aDataType : EDataType, modules : OclAny) : String = 
@@ -376,7 +377,7 @@ void
 
 [query public getModules(element : ENamedElement, templates :String, types : Set(String)) : OclAny =
 	let currentPackage : EPackage = getCurrentPackage() in
-	let currentModule : String = currentPackage.getModule() in
+	let currentModule : String = currentPackage.getInterfaceModule() in
 	let currentNamespace : String = getModuleNamespace(currentModule) in
 	let modulesToNamespace : OclAny = mapNew('getModules_'+ templates + '_' + element.name)
 										.mapClear()

soft.generators/soft.generator.ts/src/soft/generator/ts/lib/factory/generateFactoryImplementation.mtl

@@ -26,7 +26,7 @@
                                                                   , aEnum.name.toLowerFirst() + 'FromString' 
                                                                   }
 													          )
-										  ))->collect(t | aPackage.getQualifiedIdentifier(t))->asSet()
+										  ))->collect(t | aPackage.getQualifiedInterfaceIdentifier(t))->asSet()
 /]
 
 [template public generateFactoryImplementation(aPackage : EPackage) { 
@@ -35,8 +35,9 @@
     classes : Sequence(EClass) = aPackage.eAllContents(EClass)->select( not interface and not abstract );
 	types : Set(String) = Set{ classes->collect(c | if c.hasExtension() then c.getQualifiedExtensionIdentifier() else c.getQualifiedImplementationIdentifier() endif)
                                         , aPackage.eClassifiers->selectByKind(EClass)->collect(c | c.getQualifiedInterfaceIdentifier() )
-										, Set{'EObject' , 'EClass', 'EFactoryExt' , 'EDataType'}->collect(t | ecorePackage.getQualifiedIdentifier(t))
-										, Set{aPackage.getConstantsName(), aPackage.getFactoryName()}->collect(t | aPackage.getQualifiedIdentifier(t))->asSet()
+										, Set{'EObject' , 'EClass', 'EFactoryExt' , 'EDataType'}->collect(t | ecorePackage.getQualifiedInterfaceIdentifier(t))
+										, Set{aPackage.getConstantsName(), aPackage.getFactoryName()}->collect(t | aPackage.getQualifiedInterfaceIdentifier(t))->asSet()
+										, Set{ecorePackage.getQualifiedImplementationIdentifier('EFactoryExt')}
 										, aPackage.getPackageEnumTypes()
 										}->flatten()->select(s | s <> '')->asOrderedSet()->sortedBy(s | s);
 	modules : OclAny = aPackage.getModules('factory-implemention',types);
@@ -46,7 +47,7 @@
 
 [aPackage.generateImports('factory-implemention', types, modules)/]	
 
-export class [className/] extends [if not aPackage.isEcorePackage()]ecore.[/if]EFactoryExt implements [aPackage.getFactoryName()/] {
+export class [className/] extends [getImportedIdentifier( ecorePackage.getQualifiedImplementationIdentifier('EFactoryExt') , modules)/] implements [aPackage.getFactoryName()/] {
 
     private static _instance: [className/] = null
 

soft.generators/soft.generator.ts/src/soft/generator/ts/lib/factory/generateFactoryInterface.mtl

@@ -24,8 +24,8 @@
     extension : Boolean = aPackage.hasKey('factory') and aPackage.valueKey('factory') = 'extension';
     factoryName : String = if extension then aPackage.getFactoryExtensionName() else aPackage.getFactoryImplementationName() endif;
 	types : Set(String) = Set{  aPackage.eClassifiers->selectByKind(EClass)->collect(c | c.getQualifiedInterfaceIdentifier() )
-							 ,  Set{ ecorePackage.getQualifiedIdentifier('EFactory') }
-							 ,  Set{ aPackage.getQualifiedIdentifier(factoryName) }
+							 ,  Set{ ecorePackage.getQualifiedInterfaceIdentifier('EFactory') }
+							 ,  Set{ aPackage.getQualifiedInterfaceIdentifier(factoryName) }
 							 }->flatten();
 	modules : OclAny = aPackage.getModules('factory-interface',types);
 }]
@@ -34,7 +34,7 @@
 
 [aPackage.generateImports('factory-interface', types, modules)/]	
 
-export interface [className/] extends [if not aPackage.isEcorePackage()]ecore.[/if]EFactory {
+export interface [className/] extends [getImportedIdentifier( ecorePackage.getQualifiedInterfaceIdentifier('EFactory') , modules)/] {
 [for (aEClass : EClass | aPackage.eAllContents(EClass)->sortedBy(name))]
 [if (aEClass.abstract = false)]
 

soft.generators/soft.generator.ts/src/soft/generator/ts/lib/generateCommon.mtl

@@ -29,15 +29,15 @@
 [query public getInterfaceExtends(aClass : EClass ) : Sequence(String) =
 	let ecore : EPackage = getEcorePackage() in
 	if ( aClass.isMapEntry() ) then
-		Sequence{ ecore.getQualifiedIdentifier('EObject'), ecore.getQualifiedIdentifier('EMapEntry<'+aClass.getMapKeyType()+','+aClass.getMapValueType()+'>')}
+		Sequence{ ecore.getQualifiedInterfaceIdentifier('EObject'), ecore.getQualifiedInterfaceIdentifier('EMapEntry<'+aClass.getMapKeyType()+','+aClass.getMapValueType()+'>')}
     else if ( aClass.eSuperTypes->isEmpty() ) then
 		let aPackage : EPackage = aClass.ePackage in 
 	    if ( aClass.name = 'EObject' ) then
-            Sequence{ecore.getQualifiedIdentifier('ENotifier')}
+            Sequence{ecore.getQualifiedInterfaceIdentifier('ENotifier')}
         else if ( aPackage.hasPackageProperty('rootExtendsInterface') ) then
 			Sequence{aPackage.getPackageProperty('rootExtendsInterface')}
 		else
-            Sequence{ecore.getQualifiedIdentifier('EObject')}
+            Sequence{ecore.getQualifiedInterfaceIdentifier('EObject')}
         endif endif
     else
         aClass.eSuperTypes->iterate( cl ; res : Sequence(String) = Sequence{} | res->append(cl.getQualifiedInterfaceIdentifier()))
@@ -50,11 +50,11 @@
 		let aPackage : EPackage = aClass.ePackage in 
         let ecore : EPackage = getEcorePackage() in
     	if ( aClass.name = 'EObject' ) then
-			 ecore.getQualifiedIdentifier('BasicEObject')
+			 ecore.getQualifiedImplementationIdentifier('BasicEObject')
         else if ( aPackage.hasPackageProperty('rootExtendsClass') ) then
 			aPackage.getPackageProperty('rootExtendsClass')
 		else
-			ecore.getQualifiedIdentifier('EObjectImpl')
+			ecore.getQualifiedImplementationIdentifier('EObjectImpl')
         endif endif  
     else
         if ( extendsClass.hasExtension() ) then