Translate syntax - poc 1

.github/workflows/branch-deploy.yml

@@ -2,6 +2,11 @@ name: Deploy a branch as a snapshot version.
 
 on:
   workflow_dispatch:
+    inputs:
+      run-tests:
+        type: boolean
+        description: Run tests
+        default: true
 
 # Cancel previous jobs
 concurrency:
@@ -12,15 +17,28 @@ jobs:
   deploy-branch:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Normalize branch name
-      id: normalize-branch-name
-      uses: ./.github/actions/normalize-branch-name
-    - name: Set version
-      run: mvn -B versions:set -DnewVersion=0.0.0.${{ steps.normalize-branch-name.outputs.normalized }}-SNAPSHOT
-    - uses: ./.github/actions/maven-build
-      with:
-        build-command: deploy  # Deploy a snapshot build of main
-      env:
-        CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
-        CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
+      - uses: actions/checkout@v4
+      - name: Set up Maven Central Repository
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          architecture: x64
+          cache: maven
+          server-id: ossrh
+          server-username: CI_DEPLOY_USERNAME
+          server-password: CI_DEPLOY_PASSWORD
+          gpg-private-key: ${{ secrets.RUNE_GPG_PRIVATE_KEY }}
+          gpg-passphrase: GPG_PASSPHRASE
+      - name: Normalize branch name
+        id: normalize-branch-name
+        uses: ./.github/actions/normalize-branch-name
+      - name: Set version
+        run: mvn -B versions:set -DgenerateBackupPoms=false -DnewVersion=0.0.0.${{ steps.normalize-branch-name.outputs.normalized }}-SNAPSHOT
+      - uses: ./.github/actions/maven-build
+        with:
+          build-command: deploy
+          run-tests: ${{ inputs.run-tests }}
+        env:
+          CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
+          CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}

rosetta-ide/rosetta.tmLanguage.yaml

@@ -27,12 +27,13 @@ variables:
   # - keywords that may also be used as an identifier (e.g., `version`),
   # - keywords that may also be used as another keyword in a certain context (e.g., `synonym`),
   # - keywords that are unambiguous, i.e., all other keywords indicating the start of a root element.
-  identifiersConflictingWithRootStart: '{{wordStart}}(version){{wordEnd}}'
+  identifiersConflictingWithRootStart: '{{wordStart}}(translate){{wordEnd}}'
+  identifiersConflictingWithNamespace: '{{wordStart}}(version){{wordEnd}}'
   ambiguousRootStart: '{{wordStart}}(synonym|rule){{wordEnd}}'
   unambiguousRootStart: '{{wordStart}}(namespace|import|isEvent|isProduct|body|corpus|segment|basicType|recordType|typeAlias|library|reporting|eligibility|metaType|report|annotation|enum|type|choice|func){{wordEnd}}'
-  rootStart: '{{identifiersConflictingWithRootStart}}|{{ambiguousRootStart}}|{{unambiguousRootStart}}'
-  strictRootEnd: (?={{rootStart}})
-  rootEnd: (?={{ambiguousRootStart}}|{{unambiguousRootStart}})
+  rootStart: '{{identifiersConflictingWithRootStart}}|{{identifiersConflictingWithNamespace}}|{{ambiguousRootStart}}|{{unambiguousRootStart}}'
+  namespaceEnd: (?={{identifiersConflictingWithNamespace}}|{{ambiguousRootStart}}|{{unambiguousRootStart}})
+  rootEnd: (?={{identifiersConflictingWithRootStart}}|{{ambiguousRootStart}}|{{unambiguousRootStart}})
   unambiguousRootEnd: (?={{unambiguousRootStart}})
 
   sectionStart: '{{wordStart}}((\Qpost-\E)?condition|set|add|inputs|output|alias){{wordEnd}}'
@@ -45,7 +46,7 @@ variables:
   synonymAnnotationSectionEnd: (?={{synonymAnnotationSection}})|(?=\])|{{rootEnd}}
   docReferenceAnnotationSection: '{{wordStart}}(rationale|rationale_author|structured_provision|provision|reportedField){{wordEnd}}'
   docReferenceAnnotationSectionEnd: (?={{docReferenceAnnotationSection}}|\])|{{sectionEnd}}
-  expressionEnd: '(?=,|\)|\])|{{sectionEnd}}'
+  expressionEnd: '(?=,|\)|\]|\})|{{sectionEnd}}'
   functionalOperationEnd: (?={{listOperation}}|{{wordStart}}(else|then){{wordEnd}})|{{expressionEnd}}
 
 patterns:
@@ -78,7 +79,7 @@ repository:
         begin: '{{wordStart}}namespace{{wordEnd}}'
         beginCaptures:
           0: { name: keyword.other.namespace.rosetta }
-        end: '{{strictRootEnd}}'
+        end: '{{namespaceEnd}}'
         patterns:
         - include: '#comment'
         - include: '#documentation'
@@ -146,6 +147,7 @@ repository:
           - include: '#rosettaTypeAlias'
           - include: '#rosettaLibraryFunction'
           - include: '#rosettaAnnotationSource'
+          - include: '#rosettaTranslateSource'
           - include: '#rosettaRule'
           - include: '#rosettaMetaType'
           - include: '#rosettaReport'
@@ -453,6 +455,74 @@ repository:
               - include: '#comment'
               - include: '#annotation'
 
+      rosettaTranslateSource:
+        name: meta.translate-source.rosetta
+        begin: '{{wordStart}}translate{{wordEnd}}'
+        beginCaptures:
+          0: { name: keyword.other.translate.rosetta }
+        end: (\})|{{rootEnd}}
+        endCaptures:
+          1: { name: punctuation.section.braces.end.rosetta }
+        patterns:
+        - include: '#comment'
+        - begin: '(?<={{wordStart}}translate{{wordEnd}})'
+          end: (?=\{)|{{rootEnd}}
+          patterns:
+          - include: '#comment'
+          - name: keyword.other.source.rosetta
+            match: '{{wordStart}}source{{wordEnd}}'
+          - name: keyword.other.extends.rosetta
+            match: '{{wordStart}}extends{{wordEnd}}'
+          - name: entity.name.translate-source.rosetta
+            match: '{{identifier}}'
+        - name: meta.translate-source-body.rosetta
+          begin: (\{)
+          beginCaptures:
+            1: { name: punctuation.section.braces.begin.rosetta }
+          end: (?=\})|{{unambiguousRootEnd}}
+          patterns:
+          - include: '#comment'
+          - name: meta.translation.inputs.rosetta
+            begin: ({{wordStart}}from{{wordEnd}})
+            beginCaptures:
+              1: { name: keyword.other.from.rosetta }
+            end: (?=\:|\})|{{rootEnd}}
+            patterns:
+            - include: '#comment'
+            - begin: '(?={{identifier}})'
+              end: '(,)|(?=\:|\})|{{rootEnd}}'
+              endCaptures:
+                1: { name: punctuation.separator.comma.rosetta }
+              patterns:
+              - include: '#comment'
+              - begin: '({{identifier}})\s+(?={{identifier}})'
+                beginCaptures:
+                  1: { name: variable.parameter.input.rosetta }
+                end: '(?=,)|(?=\:|\})|{{rootEnd}}'
+                patterns:
+                - include: '#comment'
+                - include: '#typeCall'
+              - include: '#typeCall'
+          - name: meta.translation.result-type.rosetta
+            begin: '(?={{identifier}})'
+            end: (?={{wordStart}}from{{wordEnd}})|(?=\:|\})|{{rootEnd}}
+            patterns:
+            - include: '#comment'
+            - name: keyword.other.from.rosetta
+              match: '{{wordStart}}from{{wordEnd}}'
+            - include: '#typeCall'
+          - include: '#colon'
+          - include: '#translateAnnotation'
+          - name: meta.translation-attribute-mapping.rosetta
+            begin: '(\+|-)\s*({{identifier}})'
+            beginCaptures:
+              1: { name: keyword.operator.annotation.rosetta }
+              2: { name: variable.other.member.rosetta }
+            end: (?={{identifier}}|\}|\+|-)|{{rootEnd}}
+            patterns:
+            - include: '#comment'
+            - include: '#translateAnnotation'
+
       rosettaRule:
         patterns:
         - name: meta.rule.rosetta
@@ -722,6 +792,39 @@ repository:
         - include: '#comment'
         - name: entity.name.rule.rosetta
           match: '{{identifier}}'
+
+      translateAnnotation:
+        name: meta.annotated.translate.rosetta
+        begin: (\[)
+        beginCaptures:
+          1: { name: punctuation.annotation.begin.rosetta }
+        end: (\])|{{unambiguousRootEnd}}
+        endCaptures:
+          1: { name: punctuation.annotation.end.rosetta }
+        patterns:
+        - include: '#comment'
+        - include: '#translateInstructionAnnotationBody'
+        - include: '#translateMetaInstructionAnnotationBody'
+
+      translateInstructionAnnotationBody:
+        begin: '{{wordStart}}from{{wordEnd}}'
+        beginCaptures:
+          0: { name: keyword.other.from.rosetta }
+        end: (?=\]|\})|{{rootEnd}}
+        patterns:
+        - include: '#comment'
+        - include: '#expression'
+
+      translateMetaInstructionAnnotationBody:
+        begin: '{{wordStart}}meta{{wordEnd}}'
+        beginCaptures:
+          0: { name: keyword.other.meta.rosetta }
+        end: (?=\]|\})|{{rootEnd}}
+        patterns:
+        - include: '#comment'
+        - include: '#translateInstructionAnnotationBody'
+        - name: variable.other.member.meta.rosetta
+          match: '{{identifier}}'
 
       customAnnotationBody:
         name: meta.annotated.rosetta

rosetta-ide/src/main/java/com/regnosys/rosetta/ide/semantictokens/RosettaSemanticTokensService.java

@@ -36,6 +36,7 @@
 import com.regnosys.rosetta.rosetta.RosettaSymbol;
 import com.regnosys.rosetta.rosetta.RosettaType;
 import com.regnosys.rosetta.rosetta.RosettaTypeAlias;
+import com.regnosys.rosetta.rosetta.translate.TranslationParameter;
 import com.regnosys.rosetta.rosetta.TypeCall;
 import com.regnosys.rosetta.rosetta.TypeParameter;
 import com.regnosys.rosetta.rosetta.expression.ClosureParameter;
@@ -264,6 +265,8 @@ private SemanticToken markSymbol(EObject objectToMark, EStructuralFeature featur
 			return markAlias(objectToMark, featureToMark, (ShortcutDeclaration)symbol);
 		} else if (symbol instanceof TypeParameter) {
 			return createSemanticToken(objectToMark, featureToMark, PARAMETER);
+		} else if (symbol instanceof TranslationParameter) {
+			return createSemanticToken(objectToMark, featureToMark, PARAMETER);
 		}
 		return null;
 	}

rosetta-ide/src/test/java/com/regnosys/rosetta/ide/contentassist/ContentAssistTest.xtend

@@ -164,6 +164,7 @@ class ContentAssistTest extends AbstractRosettaLanguageServerTest {
 			to-string -> to-string [[7, 27] .. [7, 27]]
 			to-time -> to-time [[7, 27] .. [7, 27]]
 			to-zoned-date-time -> to-zoned-date-time [[7, 27] .. [7, 27]]
+			translate -> translate [[7, 27] .. [7, 27]]
 			type -> type [[7, 27] .. [7, 27]]
 			typeAlias -> typeAlias [[7, 27] .. [7, 27]]
 			* -> * [[7, 27] .. [7, 27]]

rosetta-lang/model/Rosetta.xcore

@@ -23,8 +23,11 @@ class RosettaModel extends RosettaDefinable {
 
 class Import {
 	String importedNamespace
+	String namespaceAlias
+
 }
 
+
 /**********************************************************************
  * Common types
  */
@@ -45,16 +48,10 @@ interface RosettaTyped {
 	}
 }
 
-class RosettaFeature extends RosettaNamed {
-	/**
-	 * @return The name or 'value' if it's <code>null</code>
-	 */
-	derived String getNameOrDefault get {
-		return name ?: 'value'
-	}
+interface RosettaFeature extends RosettaNamed {
 }
 
-class RosettaTypedFeature extends RosettaFeature, RosettaTyped {}
+interface RosettaTypedFeature extends RosettaFeature, RosettaTyped {}
 
 /**
  * A named symbol that may be used in an expression to reference an object

rosetta-lang/model/RosettaExpression.xcore

@@ -14,7 +14,9 @@ import com.regnosys.rosetta.rosetta.RosettaFeature
 import com.regnosys.rosetta.rosetta.RosettaCallableWithArgs
 import com.regnosys.rosetta.rosetta.RosettaMapTestExpression
 import com.regnosys.rosetta.rosetta.RosettaTyped
+import com.regnosys.rosetta.rosetta.TypeCall
 import com.regnosys.rosetta.rosetta.simple.Attribute
+import com.regnosys.rosetta.rosetta.translate.TranslateSource
 import org.eclipse.emf.common.util.BasicEList
 
 
@@ -170,6 +172,12 @@ class ConstructorKeyValuePair {
 	contains RosettaExpression value
 }
 
+class TranslateDispatchOperation extends RosettaExpression {
+	refers TranslateSource source
+	refers RosettaExpression[] inputs
+	refers TypeCall outputType
+}
+
 interface RosettaOperation extends RosettaExpression {
 	String operator
 }

rosetta-lang/model/RosettaTranslate.xcore

@@ -0,0 +1,56 @@
+@Ecore(nsURI="http://www.rosetta-model.com/RosettaTranslate")
+@GenModel(fileExtensions="rosetta", modelDirectory="/com.regnosys.rosetta/emf-gen/main/java", operationReflection="false",
+	copyrightText="Copyright (c) REGnosys 2017 (www.regnosys.com)", forceOverwrite="true", updateClasspath="false",
+	complianceLevel="8.0", bundleManifest="false", modelPluginID="")
+package com.regnosys.rosetta.rosetta.translate
+
+import com.regnosys.rosetta.rosetta.simple.Attribute
+import com.regnosys.rosetta.rosetta.RosettaMetaType
+import com.regnosys.rosetta.rosetta.RosettaNamed
+import com.regnosys.rosetta.rosetta.RosettaRootElement
+import com.regnosys.rosetta.rosetta.RosettaSymbol
+import com.regnosys.rosetta.rosetta.RosettaTyped
+import com.regnosys.rosetta.rosetta.TypeCall
+import com.regnosys.rosetta.rosetta.expression.RosettaExpression
+import com.regnosys.rosetta.rosetta.expression.TranslateDispatchOperation
+
+class TranslateSource extends RosettaRootElement, RosettaNamed {
+	refers TranslateSource[] superSources
+	contains Translation[] translations opposite source
+}
+
+class Translation {
+	refers TranslateSource source opposite translations
+
+	contains TypeCall resultType
+	contains TranslationParameter[] parameters
+	contains TranslateInstruction[] typeInstructions
+	contains TranslateMetaInstruction[] typeMetaInstructions
+
+    contains TranslationRule[] rules opposite translation
+}
+
+class TranslationParameter extends RosettaSymbol, RosettaTyped {
+
+}
+
+class TranslationRule {
+    refers Translation translation opposite rules
+
+    refers Attribute attribute
+    contains TranslateInstruction[] instructions
+    contains TranslateMetaInstruction[] metaInstructions
+}
+
+abstract class BaseTranslateInstruction {
+	contains TranslateDispatchOperation _internalDispatchExpression
+
+	contains RosettaExpression[] expressions
+}
+
+class TranslateInstruction extends BaseTranslateInstruction {
+}
+
+class TranslateMetaInstruction extends BaseTranslateInstruction {
+	refers RosettaMetaType metaFeature
+}

rosetta-lang/pom.xml

@@ -90,6 +90,7 @@
                     <include>model/Rosetta.xcore</include>
                     <include>model/RosettaSimple.xcore</include>
                     <include>model/RosettaExpression.xcore</include>
+                    <include>model/RosettaTranslate.xcore</include>
                 </includes>
             </resource>
             <resource>

rosetta-lang/src/main/java/com/regnosys/rosetta/GenerateRosetta.mwe2

@@ -60,6 +60,7 @@ Workflow {
 			referencedResource = "platform:/resource/com.regnosys.rosetta/model/Rosetta.xcore"
 			referencedResource = "platform:/resource/com.regnosys.rosetta/model/RosettaSimple.xcore"
 			referencedResource = "platform:/resource/com.regnosys.rosetta/model/RosettaExpression.xcore"
+			referencedResource = "platform:/resource/com.regnosys.rosetta/model/RosettaTranslate.xcore"
 			name = "com.regnosys.rosetta.Rosetta"
 			fileExtensions = "rosetta"