From 3e4f5ee1a8124c5d6e43ab53baaf22db4392239d Mon Sep 17 00:00:00 2001 From: Mauricio Uyaguari Date: Wed, 20 Nov 2024 18:51:33 -0500 Subject: [PATCH] back to green --- .../TEST_DATA__DSL_DataSpace_Entities.json | 9 +- .../TEST_DATA__SimpleRelationalEntities.json | 9 +- ...T_DATA__ExternalFormatServiceEntities.json | 27 +- .../TEST_DATA__M2MGraphEntities.json | 9 +- .../TEST_DATA__M2MGraphEntities.json | 9 +- .../generation/TEST_DATA__FileGeneration.json | 36 +- .../TEST_DATA__DomainRoundtrip.ts | 9 +- .../TEST_DATA__RelationalRoundtrip.ts | 135 ++++- ...simpleCrossStoreGraphFetchExecutionPlan.ts | 9 +- ...EST_DATA__FunctionSignatureGeneration.json | 36 +- .../TEST_DATA__QueryBuilder_Generic.ts | 171 +++++- ..._QueryBuilder_LambdaProcessingRoundtrip.ts | 63 ++- .../TEST_DATA__QueryBuilder_Milestoning.ts | 495 ++++++++++++++++-- ...T_DATA__QueryBuilder_Model_ComplexM2M.json | 18 +- ..._QueryBuilder_Model_ComplexRelational.json | 54 +- ..._DATA__QueryBuilder_Model_Milestoning.json | 9 +- ...__QueryBuilder_Model_SimpleRelational.json | 9 +- ...ueryBuilder_Roundtrip_TestFilterQueries.ts | 18 +- ..._DATA__QueryBuilder_Roundtrip_Watermark.ts | 18 +- ..._DATA__QueryBuilder_TestTypeaheadSearch.ts | 9 +- 20 files changed, 1024 insertions(+), 128 deletions(-) diff --git a/packages/legend-application-query/src/components/__tests__/TEST_DATA__DSL_DataSpace_Entities.json b/packages/legend-application-query/src/components/__tests__/TEST_DATA__DSL_DataSpace_Entities.json index 4c9b77d04c..01d4dcfb7b 100644 --- a/packages/legend-application-query/src/components/__tests__/TEST_DATA__DSL_DataSpace_Entities.json +++ b/packages/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/packages/legend-application-studio/src/components/editor/editor-group/function-activator/__tests__/TEST_DATA__SimpleRelationalEntities.json b/packages/legend-application-studio/src/components/editor/editor-group/function-activator/__tests__/TEST_DATA__SimpleRelationalEntities.json index 325a725ac3..cad95b8722 100644 --- a/packages/legend-application-studio/src/components/editor/editor-group/function-activator/__tests__/TEST_DATA__SimpleRelationalEntities.json +++ b/packages/legend-application-studio/src/components/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/packages/legend-application-studio/src/components/editor/editor-group/service-editor/__tests__/TEST_DATA__ExternalFormatServiceEntities.json b/packages/legend-application-studio/src/components/editor/editor-group/service-editor/__tests__/TEST_DATA__ExternalFormatServiceEntities.json index 5ea70eac9a..407bdc37ff 100644 --- a/packages/legend-application-studio/src/components/editor/editor-group/service-editor/__tests__/TEST_DATA__ExternalFormatServiceEntities.json +++ b/packages/legend-application-studio/src/components/editor/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/packages/legend-application-studio/src/stores/editor/__tests__/TEST_DATA__M2MGraphEntities.json b/packages/legend-application-studio/src/stores/editor/__tests__/TEST_DATA__M2MGraphEntities.json index e615cfa236..a9292026e2 100644 --- a/packages/legend-application-studio/src/stores/editor/__tests__/TEST_DATA__M2MGraphEntities.json +++ b/packages/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/packages/legend-graph/src/graph-manager/__tests__/buildGraph/TEST_DATA__M2MGraphEntities.json b/packages/legend-graph/src/graph-manager/__tests__/buildGraph/TEST_DATA__M2MGraphEntities.json index 1bfee5013c..52d8e8de36 100644 --- a/packages/legend-graph/src/graph-manager/__tests__/buildGraph/TEST_DATA__M2MGraphEntities.json +++ b/packages/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/packages/legend-graph/src/graph-manager/__tests__/buildGraph/generation/TEST_DATA__FileGeneration.json b/packages/legend-graph/src/graph-manager/__tests__/buildGraph/generation/TEST_DATA__FileGeneration.json index c3dc2ed4c7..292ebfed4f 100644 --- a/packages/legend-graph/src/graph-manager/__tests__/buildGraph/generation/TEST_DATA__FileGeneration.json +++ b/packages/legend-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,7 +201,14 @@ }, { "_type": "var", - "class": "model::Firm", + "genericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "model::Firm" + }, + "typeArguments": [], + "typeVariableValues": [] + }, "multiplicity": { "lowerBound": 0 }, @@ -202,7 +216,14 @@ }, { "_type": "var", - "class": "model::Firm", + "genericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "model::Firm" + }, + "typeArguments": [], + "typeVariableValues": [] + }, "multiplicity": { "lowerBound": 1 }, @@ -210,7 +231,14 @@ }, { "_type": "var", - "class": "String", + "genericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "String" + }, + "typeArguments": [], + "typeVariableValues": [] + }, "multiplicity": { "lowerBound": 1, "upperBound": 1 diff --git a/packages/legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__DomainRoundtrip.ts b/packages/legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__DomainRoundtrip.ts index 92878d9dac..54f97eb01a 100644 --- a/packages/legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__DomainRoundtrip.ts +++ b/packages/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, diff --git a/packages/legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__RelationalRoundtrip.ts b/packages/legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__RelationalRoundtrip.ts index d2d4b1195d..aede50a130 100644 --- a/packages/legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__RelationalRoundtrip.ts +++ b/packages/legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__RelationalRoundtrip.ts @@ -4901,7 +4901,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -4981,7 +4988,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5055,7 +5069,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5234,7 +5255,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5243,7 +5271,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ }, { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5380,7 +5415,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5389,7 +5431,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ }, { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5398,7 +5447,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ }, { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5628,7 +5684,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5752,7 +5815,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5879,7 +5949,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -6347,7 +6424,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -6622,7 +6706,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -6987,7 +7078,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 0, upperBound: 1, @@ -6996,7 +7094,14 @@ export const TEST_DATA__RelationalAssociationMapping = [ }, { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 0, }, diff --git a/packages/legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__simpleCrossStoreGraphFetchExecutionPlan.ts b/packages/legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__simpleCrossStoreGraphFetchExecutionPlan.ts index e760570c34..aeb65da59e 100644 --- a/packages/legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__simpleCrossStoreGraphFetchExecutionPlan.ts +++ b/packages/legend-graph/src/graph-manager/__tests__/roundtripTestData/TEST_DATA__simpleCrossStoreGraphFetchExecutionPlan.ts @@ -1776,7 +1776,14 @@ export const TEST_DATA__simpleCrossStoreGraphFetchExecutionPlan = { lowerBound: 1, upperBound: 1, }, - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, }, ], }, diff --git a/packages/legend-graph/src/graph/helpers/__tests__/TEST_DATA__FunctionSignatureGeneration.json b/packages/legend-graph/src/graph/helpers/__tests__/TEST_DATA__FunctionSignatureGeneration.json index 79702d2fe0..20a7a1017c 100644 --- a/packages/legend-graph/src/graph/helpers/__tests__/TEST_DATA__FunctionSignatureGeneration.json +++ b/packages/legend-graph/src/graph/helpers/__tests__/TEST_DATA__FunctionSignatureGeneration.json @@ -95,7 +95,14 @@ "parameters": [ { "_type": "var", - "class": "String", + "genericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "String" + }, + "typeArguments": [], + "typeVariableValues": [] + }, "multiplicity": { "lowerBound": 1, "upperBound": 1 @@ -104,7 +111,14 @@ }, { "_type": "var", - "class": "model::IncType", + "genericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "model::IncType" + }, + "typeArguments": [], + "typeVariableValues": [] + }, "multiplicity": { "lowerBound": 1, "upperBound": 1 @@ -113,7 +127,14 @@ }, { "_type": "var", - "class": "Date", + "genericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "Date" + }, + "typeArguments": [], + "typeVariableValues": [] + }, "multiplicity": { "lowerBound": 1, "upperBound": 1 @@ -122,7 +143,14 @@ }, { "_type": "var", - "class": "DateTime", + "genericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "DateTime" + }, + "typeArguments": [], + "typeVariableValues": [] + }, "multiplicity": { "lowerBound": 1, "upperBound": 1 diff --git a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Generic.ts b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Generic.ts index 276135aa6f..bfc6f81c75 100644 --- a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Generic.ts +++ b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Generic.ts @@ -107,7 +107,14 @@ export const TEST_DATA__simpleProjection = { parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 0, upperBound: 1 }, name: 'var_1', }, @@ -283,7 +290,14 @@ export const TEST_DATA__simpleProjectionWithPreviewLimit = { parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 0, upperBound: 1 }, name: 'var_1', }, @@ -380,7 +394,14 @@ export const TEST_DATA__simpleProjectionWithOutPreviewLimit = { parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 0, upperBound: 1 }, name: 'var_1', }, @@ -745,7 +766,14 @@ export const TEST_DATA__simpleGraphFetchWithSubtype = { type: 'rootGraphFetchTree', value: { _type: 'rootGraphFetchTree', - class: 'model::Person', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'model::Person', + }, + typeArguments: [], + typeVariableValues: [], + }, subTrees: [ { _type: 'propertyGraphFetchTree', @@ -792,7 +820,14 @@ export const TEST_DATA__simpleGraphFetchWithSubtype = { type: 'rootGraphFetchTree', value: { _type: 'rootGraphFetchTree', - class: 'model::Person', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'model::Person', + }, + typeArguments: [], + typeVariableValues: [], + }, subTrees: [ { _type: 'propertyGraphFetchTree', @@ -3865,7 +3900,14 @@ export const TEST_DATA__simpleProjectionWithConstantsAndParameters = { parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 0, upperBound: 1, @@ -4353,7 +4395,14 @@ export const TEST_DATA__simpeFilterWithMilestonedExists = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5104,7 +5153,14 @@ export const TEST_DATA__lambda_simpleConstantWithDatesAndCalcualted = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5354,7 +5410,14 @@ export const TEST_DATA__lambda_WithDerivedProjectColumnsUsingConstAndParams = { lowerBound: 1, upperBound: 1, }, - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, }, ], }; @@ -5431,13 +5494,27 @@ export const TEST_DATA__lambda_returnTypeSimple = { parameters: [ { _type: 'var', - class: 'model::Person', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'model::Person', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1 }, name: 'x', }, { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1 }, name: 'testing', }, @@ -5535,7 +5612,14 @@ export const TEST_DATA__lambda_returnTypeWithConst = { parameters: [ { _type: 'var', - class: 'model::Person', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'model::Person', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5544,7 +5628,14 @@ export const TEST_DATA__lambda_returnTypeWithConst = { }, { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5645,7 +5736,14 @@ export const TEST_DATA__lambda_returnTypeWithParam = { parameters: [ { _type: 'var', - class: 'model::Person', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'model::Person', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5654,7 +5752,14 @@ export const TEST_DATA__lambda_returnTypeWithParam = { }, { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5774,7 +5879,14 @@ export const TEST_DATA__lambda_returnTypeWithConstAndParam = { parameters: [ { _type: 'var', - class: 'model::Person', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'model::Person', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -5783,7 +5895,14 @@ export const TEST_DATA__lambda_returnTypeWithConstAndParam = { }, { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -6367,7 +6486,14 @@ export const TEST_DATA__lambda_builtPostFilterQuery = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -6898,7 +7024,14 @@ export const TEST_DATA__lambda_expectedModifiedPostFilterQuery = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, diff --git a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_LambdaProcessingRoundtrip.ts b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_LambdaProcessingRoundtrip.ts index 4a899f94eb..8d62551b3a 100644 --- a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_LambdaProcessingRoundtrip.ts +++ b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_LambdaProcessingRoundtrip.ts @@ -52,7 +52,14 @@ export const TEST_DATA__allFuncOnBusinessTemporalMilestonedClass = { parameters: [ { _type: 'var', - class: 'StrictDate', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'StrictDate', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: '1', @@ -83,7 +90,14 @@ export const TEST_DATA__allFuncOnProcessingTemporalMilestonedClass = { parameters: [ { _type: 'var', - class: 'StrictDate', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'StrictDate', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'processingDate', multiplicity: { lowerBound: '1', @@ -118,7 +132,14 @@ export const TEST_DATA__allFuncOnBiTemporalMilestonedClass = { parameters: [ { _type: 'var', - class: 'StrictDate', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'StrictDate', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'processingDate', multiplicity: { lowerBound: '1', @@ -127,7 +148,14 @@ export const TEST_DATA__allFuncOnBiTemporalMilestonedClass = { }, { _type: 'var', - class: 'StrictDate', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'StrictDate', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: '1', @@ -1486,7 +1514,14 @@ export const TEST_DATA__personWithParameter = { parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'firstName', multiplicity: { lowerBound: 1, @@ -1954,13 +1989,27 @@ export const TEST_DATA__M2MModel = [ parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'suffix', }, { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'prefix', }, diff --git a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Milestoning.ts b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Milestoning.ts index f503961a62..b0b4faf546 100644 --- a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Milestoning.ts +++ b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Milestoning.ts @@ -95,7 +95,14 @@ export const TEST_DATA__simpleProjectionWithBusinessTemporalSourceAndProcessingT parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: 1, @@ -104,7 +111,14 @@ export const TEST_DATA__simpleProjectionWithBusinessTemporalSourceAndProcessingT }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'processingDate', multiplicity: { lowerBound: 1, @@ -191,7 +205,14 @@ export const TEST_DATA__simpleProjectionWithBusinessTemporalSourceAndBusinessTem parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: 1, @@ -282,7 +303,14 @@ export const TEST_DATA__simpleProjectionWithBusinessTemporalSourceAndBiTemporalT parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: 1, @@ -291,7 +319,14 @@ export const TEST_DATA__simpleProjectionWithBusinessTemporalSourceAndBiTemporalT }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'processingDate', multiplicity: { lowerBound: 1, @@ -382,7 +417,14 @@ export const TEST_DATA__simpleProjectionWithBiTemporalSourceAndBiTemporalTarget parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -391,7 +433,14 @@ export const TEST_DATA__simpleProjectionWithBiTemporalSourceAndBiTemporalTarget }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -478,7 +527,14 @@ export const TEST_DATA__simpleProjectionWithBiTemporalSourceAndBusinessTemporalT parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: 1, @@ -487,7 +543,14 @@ export const TEST_DATA__simpleProjectionWithBiTemporalSourceAndBusinessTemporalT }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'processingDate', multiplicity: { lowerBound: 1, @@ -578,7 +641,14 @@ export const TEST_DATA__simpleProjectionWithBiTemporalSourceAndProcessingTempora parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: 1, @@ -587,7 +657,14 @@ export const TEST_DATA__simpleProjectionWithBiTemporalSourceAndProcessingTempora }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'processingDate', multiplicity: { lowerBound: 1, @@ -682,7 +759,14 @@ export const TEST_DATA__simpleProjectionWithProcessingTemporalSourceAndBiTempora parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: 1, @@ -691,7 +775,14 @@ export const TEST_DATA__simpleProjectionWithProcessingTemporalSourceAndBiTempora }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'processingDate', multiplicity: { lowerBound: 1, @@ -782,7 +873,14 @@ export const TEST_DATA__simpleProjectionWithProcessingTemporalSourceAndBusinessT parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: 1, @@ -791,7 +889,14 @@ export const TEST_DATA__simpleProjectionWithProcessingTemporalSourceAndBusinessT }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'processingDate', multiplicity: { lowerBound: 1, @@ -878,7 +983,14 @@ export const TEST_DATA__simpleProjectionWithProcessingTemporalSourceAndProcessin parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'processingDate', multiplicity: { lowerBound: 1, @@ -965,7 +1077,14 @@ export const TEST_DATA__simpleProjectionWithNonTemporalSourceAndProcessingTempor parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'processingDate', multiplicity: { lowerBound: 1, @@ -1056,7 +1175,14 @@ export const TEST_DATA__simpleProjectionWithNonTemporalSourceAndBiTemporalTarget parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'processingDate', multiplicity: { lowerBound: 1, @@ -1065,7 +1191,14 @@ export const TEST_DATA__simpleProjectionWithNonTemporalSourceAndBiTemporalTarget }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: 1, @@ -1152,7 +1285,14 @@ export const TEST_DATA__simpleProjectionWithNonTemporalSourceAndBusinessTemporal parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: 1, @@ -1353,7 +1493,14 @@ export const TEST_DATA__simpleProjectionWithAggregationInput = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: 1, @@ -1479,7 +1626,14 @@ export const TEST_DATA__simpleProjectionWithAggregationOutput = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'businessDate', multiplicity: { lowerBound: 1, @@ -1783,7 +1937,14 @@ export const TEST_DATA__simpleFilterWithBusinessTemporalSourceAndBusinessTempora parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -1862,7 +2023,14 @@ export const TEST_DATA__simpleFilterWithBusinessTemporalSourceAndProcessingTempo parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -1871,7 +2039,14 @@ export const TEST_DATA__simpleFilterWithBusinessTemporalSourceAndProcessingTempo }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -1954,7 +2129,14 @@ export const TEST_DATA__simpleFilterWithBusinessTemporalSourceAndBiTemporalTarge parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -1963,7 +2145,14 @@ export const TEST_DATA__simpleFilterWithBusinessTemporalSourceAndBiTemporalTarge }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2042,7 +2231,14 @@ export const TEST_DATA__simpleFilterWithProcessingTemporalSourceAndBusinessTempo parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2051,7 +2247,14 @@ export const TEST_DATA__simpleFilterWithProcessingTemporalSourceAndBusinessTempo }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2126,7 +2329,14 @@ export const TEST_DATA__simpleFilterWithProcessingTemporalSourceAndProcessingTem parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2209,7 +2419,14 @@ export const TEST_DATA__simpleFilterWithProcessingTemporalSourceAndBiTemporalTar parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2218,7 +2435,14 @@ export const TEST_DATA__simpleFilterWithProcessingTemporalSourceAndBiTemporalTar }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2297,7 +2521,14 @@ export const TEST_DATA__simpleFilterWithBiTemporalSourceAndBusinessTemporalTarge parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2306,7 +2537,14 @@ export const TEST_DATA__simpleFilterWithBiTemporalSourceAndBusinessTemporalTarge }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2385,7 +2623,14 @@ export const TEST_DATA__simpleFilterWithBiTemporalSourceAndProcessingTemporalTar parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2394,7 +2639,14 @@ export const TEST_DATA__simpleFilterWithBiTemporalSourceAndProcessingTemporalTar }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2472,7 +2724,14 @@ export const TEST_DATA__simpleFilterWithBiTemporalSourceAndBiTemporalTarget = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2481,7 +2740,14 @@ export const TEST_DATA__simpleFilterWithBiTemporalSourceAndBiTemporalTarget = { }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2556,7 +2822,14 @@ export const TEST_DATA__simpleFilterWithNonTemporalSourceAndBusinessTemporalTarg parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2631,7 +2904,14 @@ export const TEST_DATA__simpleFilterWithNonTemporalSourceAndProcessingTemporalTa parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2709,7 +2989,14 @@ export const TEST_DATA__simpleFilterWithNonTemporalSourceAndBiTemporalTarget = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2718,7 +3005,14 @@ export const TEST_DATA__simpleFilterWithNonTemporalSourceAndBiTemporalTarget = { }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2821,7 +3115,14 @@ export const TEST_DATA__simpleGetAllVersionsInRangeWithBusinessTemporalClass = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2830,7 +3131,14 @@ export const TEST_DATA__simpleGetAllVersionsInRangeWithBusinessTemporalClass = { }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2865,7 +3173,14 @@ export const TEST_DATA__simpleGetAllVersionsInRangeWithBiTemporalClass = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2874,7 +3189,14 @@ export const TEST_DATA__simpleGetAllVersionsInRangeWithBiTemporalClass = { }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2910,7 +3232,14 @@ export const TEST_DATA__simpleGetAllVersionsInRangeWithProcessingTemporalClass = parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2919,7 +3248,14 @@ export const TEST_DATA__simpleGetAllVersionsInRangeWithProcessingTemporalClass = }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2954,7 +3290,14 @@ export const TEST_DATA__simpleGetAllVersionsInRangeWithNonTemporalClass = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -2963,7 +3306,14 @@ export const TEST_DATA__simpleGetAllVersionsInRangeWithNonTemporalClass = { }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -3050,7 +3400,14 @@ export const TEST_DATA__simpleGetAllVersionsWithBusinessTemporalSourceAndBusines parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -3141,7 +3498,14 @@ export const TEST_DATA__simpleGetAllVersionsWithBiTemporalSourceAndBiTemporalTar parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -3150,7 +3514,14 @@ export const TEST_DATA__simpleGetAllVersionsWithBiTemporalSourceAndBiTemporalTar }, { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -3237,7 +3608,14 @@ export const TEST_DATA__simpleGetAllVersionsWithProcessingTemporalSourceAndProce parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -3324,7 +3702,14 @@ export const TEST_DATA__simpleGetAllVersionsWithProcessingTemporalSourceAndBusin parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, diff --git a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_ComplexM2M.json b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_ComplexM2M.json index c5579c70d0..f7f0665860 100644 --- a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_ComplexM2M.json +++ b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_ComplexM2M.json @@ -291,7 +291,14 @@ "parameters": [ { "_type": "var", - "class": "String", + "genericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "String" + }, + "typeArguments": [], + "typeVariableValues": [] + }, "multiplicity": { "lowerBound": 1, "upperBound": 1 @@ -300,7 +307,14 @@ }, { "_type": "var", - "class": "String", + "genericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "String" + }, + "typeArguments": [], + "typeVariableValues": [] + }, "multiplicity": { "lowerBound": 1, "upperBound": 1 diff --git a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_ComplexRelational.json b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_ComplexRelational.json index b7fe2d5267..4064bc3543 100644 --- a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_ComplexRelational.json +++ b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_ComplexRelational.json @@ -142,7 +142,14 @@ "lowerBound": 0, "upperBound": 1 }, - "returnType": "Integer" + "returnGenericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "Integer" + }, + "typeArguments": [], + "typeVariableValues": [] + } } ], "superTypes": ["model::pure::tests::model::simple::Person"] @@ -2300,7 +2307,14 @@ "lowerBound": 1, "upperBound": 1 }, - "returnType": "Integer" + "returnGenericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "Integer" + }, + "typeArguments": [], + "typeVariableValues": [] + } }, { "body": [ @@ -2333,7 +2347,14 @@ "lowerBound": 0, "upperBound": 1 }, - "returnType": "Integer" + "returnGenericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "Integer" + }, + "typeArguments": [], + "typeVariableValues": [] + } }, { "body": [ @@ -4474,7 +4495,14 @@ "lowerBound": 1, "upperBound": 1 }, - "returnType": "Integer" + "returnGenericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "Integer" + }, + "typeArguments": [], + "typeVariableValues": [] + } }, { "body": [ @@ -4605,7 +4633,14 @@ "lowerBound": 1, "upperBound": 1 }, - "class": "Date" + "genericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "Date" + }, + "typeArguments": [], + "typeVariableValues": [] + } } ], "returnMultiplicity": { @@ -5122,7 +5157,14 @@ "lowerBound": 1, "upperBound": 1 }, - "returnType": "Integer" + "returnGenericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "Integer" + }, + "typeArguments": [], + "typeVariableValues": [] + } }, { "body": [ diff --git a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_Milestoning.json b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_Milestoning.json index 00be1655df..4eba2bf83e 100644 --- a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_Milestoning.json +++ b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_Milestoning.json @@ -181,7 +181,14 @@ "parameters": [ { "_type": "var", - "class": "String", + "genericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "String" + }, + "typeArguments": [], + "typeVariableValues": [] + }, "multiplicity": { "lowerBound": 1, "upperBound": 1 diff --git a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_SimpleRelational.json b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_SimpleRelational.json index e96bc4daeb..b1e9c15a99 100644 --- a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_SimpleRelational.json +++ b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Model_SimpleRelational.json @@ -79,7 +79,14 @@ "parameters": [ { "_type": "var", - "class": "String", + "genericType": { + "rawType": { + "_type": "packageableType", + "fullPath": "String" + }, + "typeArguments": [], + "typeVariableValues": [] + }, "multiplicity": { "lowerBound": 1, "upperBound": 1 diff --git a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Roundtrip_TestFilterQueries.ts b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Roundtrip_TestFilterQueries.ts index 1e4fbcda66..93ecf0930e 100644 --- a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Roundtrip_TestFilterQueries.ts +++ b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Roundtrip_TestFilterQueries.ts @@ -138,7 +138,14 @@ export const TEST_DATA__simpleSingleConditionMilestoningFilter = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -1155,7 +1162,14 @@ export const TEST_DATA__lambda_simpleSingleConditionFilterWithParameter = { parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, name: 'case', multiplicity: { lowerBound: 1, diff --git a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Roundtrip_Watermark.ts b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Roundtrip_Watermark.ts index 57b8fb9c9d..5bfa1f6b37 100644 --- a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Roundtrip_Watermark.ts +++ b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_Roundtrip_Watermark.ts @@ -68,7 +68,14 @@ export const TEST_DATA_lambda_watermark_Parameter = { parameters: [ { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, @@ -77,7 +84,14 @@ export const TEST_DATA_lambda_watermark_Parameter = { }, { _type: 'var', - class: 'String', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'String', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1, diff --git a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_TestTypeaheadSearch.ts b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_TestTypeaheadSearch.ts index 775b0d8e93..f233ce5126 100644 --- a/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_TestTypeaheadSearch.ts +++ b/packages/legend-query-builder/src/stores/__tests__/TEST_DATA__QueryBuilder_TestTypeaheadSearch.ts @@ -685,7 +685,14 @@ export const TEST_DATA__lambda_typeahead_simple_postFilter_milestoning = { parameters: [ { _type: 'var', - class: 'Date', + genericType: { + rawType: { + _type: 'packageableType', + fullPath: 'Date', + }, + typeArguments: [], + typeVariableValues: [], + }, multiplicity: { lowerBound: 1, upperBound: 1,