back to green

finos · Nov 21, 2024 · 3e4f5ee · 3e4f5ee
1 parent 4f1a434
commit 3e4f5ee
Show file tree

Hide file tree

Showing 20 changed files with 1,024 additions and 128 deletions.
diff --git a/.../legend-application-query/src/components/__tests__/TEST_DATA__DSL_DataSpace_Entities.json b/.../legend-application-query/src/components/__tests__/TEST_DATA__DSL_DataSpace_Entities.json
@@ -181,7 +181,14 @@
         "lowerBound": 1,
         "upperBound": 1
       },
-      "returnType": "meta::pure::tds::TabularDataSet"
+      "returnGenericType": {
+        "rawType": {
+          "_type": "packageableType",
+          "fullPath": "meta::pure::tds::TabularDataSet"
+        },
+        "typeArguments": [],
+        "typeVariableValues": []
+      }
     },
     "classifierPath": "meta::pure::metamodel::function::ConcreteFunctionDefinition"
   },

diff --git a/...editor/editor-group/function-activator/__tests__/TEST_DATA__SimpleRelationalEntities.json b/...editor/editor-group/function-activator/__tests__/TEST_DATA__SimpleRelationalEntities.json
@@ -229,7 +229,14 @@
         "lowerBound": 1,
         "upperBound": 1
       },
-      "returnType": "meta::pure::tds::TabularDataSet"
+      "returnGenericType": {
+        "rawType": {
+          "_type": "packageableType",
+          "fullPath": "meta::pure::tds::TabularDataSet"
+        },
+        "typeArguments": [],
+        "typeVariableValues": []
+      }
     },
     "classifierPath": "meta::pure::metamodel::function::ConcreteFunctionDefinition"
   },

diff --git a/...ditor/editor-group/service-editor/__tests__/TEST_DATA__ExternalFormatServiceEntities.json b/...ditor/editor-group/service-editor/__tests__/TEST_DATA__ExternalFormatServiceEntities.json
@@ -316,7 +316,14 @@
           "parameters": [
             {
               "_type": "var",
-              "class": "String",
+              "genericType": {
+                "rawType": {
+                  "_type": "packageableType",
+                  "fullPath": "String"
+                },
+                "typeArguments": [],
+                "typeVariableValues": []
+              },
               "multiplicity": {
                 "lowerBound": 1,
                 "upperBound": 1
@@ -325,7 +332,14 @@
             },
             {
               "_type": "var",
-              "class": "String",
+              "genericType": {
+                "rawType": {
+                  "_type": "packageableType",
+                  "fullPath": "String"
+                },
+                "typeArguments": [],
+                "typeVariableValues": []
+              },
               "multiplicity": {
                 "lowerBound": 1,
                 "upperBound": 1
@@ -633,7 +647,14 @@
             },
             {
               "_type": "var",
-              "class": "String",
+              "genericType": {
+                "rawType": {
+                  "_type": "packageableType",
+                  "fullPath": "String"
+                },
+                "typeArguments": [],
+                "typeVariableValues": []
+              },
               "multiplicity": {
                 "lowerBound": 1,
                 "upperBound": 1

diff --git a/...es/legend-application-studio/src/stores/editor/__tests__/TEST_DATA__M2MGraphEntities.json b/...es/legend-application-studio/src/stores/editor/__tests__/TEST_DATA__M2MGraphEntities.json
@@ -263,7 +263,14 @@
             "lowerBound": 1,
             "upperBound": 1
           },
-          "returnType": "Integer"
+          "returnGenericType": {
+            "rawType": {
+              "_type": "packageableType",
+              "fullPath": "Integer"
+            },
+            "typeArguments": [],
+            "typeVariableValues": []
+          }
         }
       ],
       "superTypes": ["ui::test1::Animal"],

diff --git a/...ages/legend-graph/src/graph-manager/__tests__/buildGraph/TEST_DATA__M2MGraphEntities.json b/...ages/legend-graph/src/graph-manager/__tests__/buildGraph/TEST_DATA__M2MGraphEntities.json
@@ -263,7 +263,14 @@
             "lowerBound": 1,
             "upperBound": 1
           },
-          "returnType": "Integer"
+          "returnGenericType": {
+            "rawType": {
+              "_type": "packageableType",
+              "fullPath": "Integer"
+            },
+            "typeArguments": [],
+            "typeVariableValues": []
+          }
         }
       ],
       "superTypes": ["ui::test1::Animal"],

diff --git a/...nd-graph/src/graph-manager/__tests__/buildGraph/generation/TEST_DATA__FileGeneration.json b/...nd-graph/src/graph-manager/__tests__/buildGraph/generation/TEST_DATA__FileGeneration.json
@@ -185,7 +185,14 @@
       "parameters": [
         {
           "_type": "var",
-          "class": "model::Firm",
+          "genericType": {
+            "rawType": {
+              "_type": "packageableType",
+              "fullPath": "model::Firm"
+            },
+            "typeArguments": [],
+            "typeVariableValues": []
+          },
           "multiplicity": {
             "lowerBound": 1,
             "upperBound": 1
@@ -194,23 +201,44 @@
         },
         {
           "_type": "var",
-          "class": "model::Firm",
+          "genericType": {
+            "rawType": {
+              "_type": "packageableType",
+              "fullPath": "model::Firm"
+            },
+            "typeArguments": [],
+            "typeVariableValues": []
+          },
           "multiplicity": {
             "lowerBound": 0
           },
           "name": "many"
         },
         {
           "_type": "var",
-          "class": "model::Firm",
+          "genericType": {
+            "rawType": {
+              "_type": "packageableType",
+              "fullPath": "model::Firm"
+            },
+            "typeArguments": [],
+            "typeVariableValues": []
+          },
           "multiplicity": {
             "lowerBound": 1
           },
           "name": "oneMany"
         },
         {
           "_type": "var",
-          "class": "String",
+          "genericType": {
+            "rawType": {
+              "_type": "packageableType",
+              "fullPath": "String"
+            },
+            "typeArguments": [],
+            "typeVariableValues": []
+          },
           "multiplicity": {
             "lowerBound": 1,
             "upperBound": 1

diff --git a/.../legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__DomainRoundtrip.ts b/.../legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__DomainRoundtrip.ts
@@ -1012,7 +1012,14 @@ export const TEST_DATA__OverloadedFunctionsRoundtrip = [
       parameters: [
         {
           _type: 'var',
-          class: 'String',
+          genericType: {
+            rawType: {
+              _type: 'packageableType',
+              fullPath: 'String',
+            },
+            typeArguments: [],
+            typeVariableValues: [],
+          },
           multiplicity: {
             lowerBound: 1,
             upperBound: 1,