@finos/legend-graph 30.0.1 → 30.0.3

package/lib/graph-manager/protocol/pure/v1/engine/query/V1_Query.js

@@ -16,6 +16,17 @@
 import { SerializationFactory, usingModelSchema } from '@finos/legend-shared';
 import { createModelSchema, list, optional, primitive } from 'serializr';
 import { V1_stereotypePtrModelSchema, V1_taggedValueModelSchema, } from '../../transformation/pureProtocol/serializationHelpers/V1_DomainSerializationHelper.js';
+class V1_QueryParameterValue {
+    name;
+    content;
+    static serialization = new SerializationFactory(createModelSchema(V1_QueryParameterValue, {
+        name: primitive(),
+        content: primitive(),
+    }), {
+        deserializeNullAsUndefined: true,
+    });
+}
+export { V1_QueryParameterValue };
 class V1_Query {
     name;
     id;
@@ -28,11 +39,13 @@ class V1_Query {
     owner;
     taggedValues;
     stereotypes;
+    defaultParameterValues;
     lastUpdatedAt;
     static serialization = new SerializationFactory(createModelSchema(V1_Query, {
         artifactId: primitive(),
         content: primitive(),
         id: primitive(),
+        defaultParameterValues: optional(list(usingModelSchema(V1_QueryParameterValue.serialization.schema))),
         groupId: primitive(),
         lastUpdatedAt: optional(primitive()),
         mapping: primitive(),

package/lib/graph-manager/protocol/pure/v1/engine/query/V1_Query.js.map

@@ -1 +1 @@
-{"version":3,"file":"V1_Query.js","sourceRoot":"","sources":["../../../../../../../src/graph-manager/protocol/pure/v1/engine/query/V1_Query.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGzE,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,GAC1B,MAAM,wFAAwF,CAAC;AAEhG,MAAa,QAAQ;IACnB,IAAI,CAAU;IACd,EAAE,CAAU;IACZ,OAAO,CAAU;IACjB,UAAU,CAAU;IACpB,SAAS,CAAU;IACnB,OAAO,CAAU;IACjB,OAAO,CAAU;IACjB,OAAO,CAAU;IACjB,KAAK,CAAsB;IAC3B,YAAY,CAAgC;IAC5C,WAAW,CAAkC;IAC7C,aAAa,CAAsB;IAEnC,MAAM,CAAU,aAAa,GAAG,IAAI,oBAAoB,CACtD,iBAAiB,CAAC,QAAQ,EAAE;QAC1B,UAAU,EAAE,SAAS,EAAE;QACvB,OAAO,EAAE,SAAS,EAAE;QACpB,EAAE,EAAE,SAAS,EAAE;QACf,OAAO,EAAE,SAAS,EAAE;QACpB,aAAa,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpC,OAAO,EAAE,SAAS,EAAE;QACpB,IAAI,EAAE,SAAS,EAAE;QACjB,KAAK,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,SAAS,EAAE;QACpB,WAAW,EAAE,QAAQ,CACnB,IAAI,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,CAAC,CACpD;QACD,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,CAAC,CAAC;QACzE,SAAS,EAAE,SAAS,EAAE;KACvB,CAAC,EACF;QACE,0BAA0B,EAAE,IAAI;KACjC,CACF,CAAC;;SAlCS,QAAQ;AAqCrB,MAAa,aAAa;IACxB,IAAI,CAAU;IACd,EAAE,CAAU;IACZ,OAAO,CAAU;IACjB,KAAK,CAAsB;IAC3B,UAAU,CAAU;IACpB,SAAS,CAAU;IACnB,aAAa,CAAsB;IAEnC,MAAM,CAAU,aAAa,GAAG,IAAI,oBAAoB,CACtD,iBAAiB,CAAC,QAAQ,EAAE;QAC1B,UAAU,EAAE,SAAS,EAAE;QACvB,EAAE,EAAE,SAAS,EAAE;QACf,OAAO,EAAE,SAAS,EAAE;QACpB,aAAa,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpC,IAAI,EAAE,SAAS,EAAE;QACjB,KAAK,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;QAC5B,SAAS,EAAE,SAAS,EAAE;KACvB,CAAC,EACF;QACE,0BAA0B,EAAE,IAAI;KACjC,CACF,CAAC;;SAtBS,aAAa"}
+{"version":3,"file":"V1_Query.js","sourceRoot":"","sources":["../../../../../../../src/graph-manager/protocol/pure/v1/engine/query/V1_Query.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGzE,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,GAC1B,MAAM,wFAAwF,CAAC;AAEhG,MAAa,sBAAsB;IACjC,IAAI,CAAU;IACd,OAAO,CAAU;IAEjB,MAAM,CAAU,aAAa,GAAG,IAAI,oBAAoB,CACtD,iBAAiB,CAAC,sBAAsB,EAAE;QACxC,IAAI,EAAE,SAAS,EAAE;QACjB,OAAO,EAAE,SAAS,EAAE;KACrB,CAAC,EACF;QACE,0BAA0B,EAAE,IAAI;KACjC,CACF,CAAC;;SAZS,sBAAsB;AAenC,MAAa,QAAQ;IACnB,IAAI,CAAU;IACd,EAAE,CAAU;IACZ,OAAO,CAAU;IACjB,UAAU,CAAU;IACpB,SAAS,CAAU;IACnB,OAAO,CAAU;IACjB,OAAO,CAAU;IACjB,OAAO,CAAU;IACjB,KAAK,CAAsB;IAC3B,YAAY,CAAgC;IAC5C,WAAW,CAAkC;IAC7C,sBAAsB,CAAwC;IAC9D,aAAa,CAAsB;IAEnC,MAAM,CAAU,aAAa,GAAG,IAAI,oBAAoB,CACtD,iBAAiB,CAAC,QAAQ,EAAE;QAC1B,UAAU,EAAE,SAAS,EAAE;QACvB,OAAO,EAAE,SAAS,EAAE;QACpB,EAAE,EAAE,SAAS,EAAE;QACf,sBAAsB,EAAE,QAAQ,CAC9B,IAAI,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CACpE;QACD,OAAO,EAAE,SAAS,EAAE;QACpB,aAAa,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpC,OAAO,EAAE,SAAS,EAAE;QACpB,IAAI,EAAE,SAAS,EAAE;QACjB,KAAK,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,SAAS,EAAE;QACpB,WAAW,EAAE,QAAQ,CACnB,IAAI,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,CAAC,CACpD;QACD,YAAY,EAAE,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,yBAAyB,CAAC,CAAC,CAAC;QACzE,SAAS,EAAE,SAAS,EAAE;KACvB,CAAC,EACF;QACE,0BAA0B,EAAE,IAAI;KACjC,CACF,CAAC;;SAtCS,QAAQ;AAyCrB,MAAa,aAAa;IACxB,IAAI,CAAU;IACd,EAAE,CAAU;IACZ,OAAO,CAAU;IACjB,KAAK,CAAsB;IAC3B,UAAU,CAAU;IACpB,SAAS,CAAU;IACnB,aAAa,CAAsB;IAEnC,MAAM,CAAU,aAAa,GAAG,IAAI,oBAAoB,CACtD,iBAAiB,CAAC,QAAQ,EAAE;QAC1B,UAAU,EAAE,SAAS,EAAE;QACvB,EAAE,EAAE,SAAS,EAAE;QACf,OAAO,EAAE,SAAS,EAAE;QACpB,aAAa,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;QACpC,IAAI,EAAE,SAAS,EAAE;QACjB,KAAK,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC;QAC5B,SAAS,EAAE,SAAS,EAAE;KACvB,CAAC,EACF;QACE,0BAA0B,EAAE,IAAI;KACjC,CACF,CAAC;;SAtBS,aAAa"}

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@finos/legend-graph",
-    "version": "30.0.1",
+    "version": "30.0.3",
     "description": "Legend graph and graph manager",
     "keywords": [
         "legend",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-graph",
-  "version": "30.0.1",
+  "version": "30.0.3",
   "description": "Legend graph and graph manager",
   "keywords": [
     "legend",
@@ -40,8 +40,8 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-shared": "10.0.9",
-    "@finos/legend-storage": "3.0.59",
+    "@finos/legend-shared": "10.0.10",
+    "@finos/legend-storage": "3.0.60",
     "mobx": "6.9.0",
     "serializr": "3.0.2"
   },

package/src/graph-manager/AbstractPureGraphManager.ts

@@ -317,6 +317,16 @@ export abstract class AbstractPureGraphManager {
     pretty?: boolean,
   ): Promise<Map<string, string>>;
 
+  abstract valueSpecificationsToPureCode(
+    lambdas: Map<string, ValueSpecification>,
+    pretty?: boolean,
+  ): Promise<Map<string, string>>;
+
+  abstract pureCodeToValueSpecifications(
+    lambdas: Map<string, string>,
+    graph: PureModel,
+  ): Promise<Map<string, ValueSpecification>>;
+
   // TODO: consider moving these to relational plugin when we complete modularization
   abstract pureCodeToRelationalOperationElement(
     operation: string,

package/src/graph-manager/action/TEMPORARY__AbstractEngineConfig.ts

@@ -27,21 +27,27 @@ export class TEMPORARY__AbstractEngineConfig {
   tabSize = DEFAULT_TAB_SIZE;
   currentUserId?: string | undefined;
   baseUrl?: string | undefined;
+  baseUrlForServiceRegistration?: string | undefined;
   useClientRequestPayloadCompression = false;
   useBase64ForAdhocConnectionDataUrls = false;
+  enableDebuggingPayload = false;
 
   constructor() {
     makeObservable(this, {
       env: observable,
       currentUserId: observable,
       baseUrl: observable,
+      baseUrlForServiceRegistration: observable,
       useClientRequestPayloadCompression: observable,
       useBase64ForAdhocConnectionDataUrls: observable,
+      enableDebuggingPayload: observable,
       setEnv: action,
       setCurrentUserId: action,
       setBaseUrl: action,
+      setBaseUrlForServiceRegistration: action,
       setUseClientRequestPayloadCompression: action,
       setUseBase64ForAdhocConnectionDataUrls: action,
+      setEnableDebuggingPayload: action,
     });
   }
 
@@ -61,6 +67,10 @@ export class TEMPORARY__AbstractEngineConfig {
     this.baseUrl = val;
   }
 
+  setBaseUrlForServiceRegistration(val: string | undefined): void {
+    this.baseUrlForServiceRegistration = val;
+  }
+
   setUseClientRequestPayloadCompression(val: boolean): void {
     this.useClientRequestPayloadCompression = val;
   }
@@ -68,4 +78,8 @@ export class TEMPORARY__AbstractEngineConfig {
   setUseBase64ForAdhocConnectionDataUrls(val: boolean): void {
     this.useBase64ForAdhocConnectionDataUrls = val;
   }
+
+  setEnableDebuggingPayload(val: boolean): void {
+    this.enableDebuggingPayload = val;
+  }
 }

package/src/graph-manager/action/query/Query.ts

@@ -29,6 +29,11 @@ export class QueryStereotype {
   stereotype!: string;
 }
 
+export class QueryParameterValue {
+  name!: string;
+  content!: string;
+}
+
 export class Query {
   name!: string;
   id!: string;
@@ -45,6 +50,8 @@ export class Query {
   // because we don't process them
   taggedValues?: QueryTaggedValue[] | undefined;
   stereotypes?: QueryStereotype[] | undefined;
+  defaultParameterValues?: QueryParameterValue[] | undefined;
+
   // Store query in text to be more compact and stable
   content!: string;
 

package/src/graph-manager/protocol/pure/v1/V1_PureGraphManager.ts

@@ -313,6 +313,8 @@ import type { RelationalDatabaseConnection } from '../../../../STO_Relational_Ex
 import { V1_RawSQLExecuteInput } from './engine/execution/V1_RawSQLExecuteInput.js';
 import type { SubtypeInfo } from '../../../action/protocol/ProtocolInfo.js';
 import { V1_INTERNAL__UnknownStore } from './model/packageableElements/store/V1_INTERNAL__UnknownStore.js';
+import type { V1_ValueSpecification } from './model/valueSpecification/V1_ValueSpecification.js';
+import type { V1_GrammarParserBatchInputEntry } from './engine/V1_EngineServerClient.js';
 
 class V1_PureModelContextDataIndex {
   elements: V1_PackageableElement[] = [];
@@ -1815,6 +1817,41 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     );
   }
 
+  override valueSpecificationsToPureCode(
+    lambdas: Map<string, ValueSpecification>,
+    pretty?: boolean | undefined,
+  ): Promise<Map<string, string>> {
+    const input: Record<string, PlainObject<V1_ValueSpecification>> = {};
+    lambdas.forEach((val, key) => {
+      input[key] = this.serializeValueSpecification(val);
+    });
+    return this.engine.transformValueSpecsToCode(input, Boolean(pretty));
+  }
+
+  async pureCodeToValueSpecifications(
+    lambdas: Map<string, string>,
+    graph: PureModel,
+  ): Promise<Map<string, ValueSpecification>> {
+    const pureCodeToValueSpecInput: Record<
+      string,
+      V1_GrammarParserBatchInputEntry
+    > = {};
+    Array.from(lambdas.entries()).forEach(([k, content]) => {
+      pureCodeToValueSpecInput[k] = {
+        value: content,
+        returnSourceInformation: false,
+      };
+    });
+    const specs = await this.engine.transformCodeToValueSpeces(
+      pureCodeToValueSpecInput,
+    );
+    const result = new Map<string, ValueSpecification>();
+    Array.from(specs.entries()).forEach(([k, v]) => {
+      result.set(k, this.buildValueSpecification(v, graph));
+    });
+    return result;
+  }
+
   pureCodeToRelationalOperationElement(
     operation: string,
     operationId: string,

package/src/graph-manager/protocol/pure/v1/engine/V1_Engine.ts

@@ -35,7 +35,10 @@ import {
   type GenerationConfigurationDescription,
 } from '../../../../../graph-manager/action/generation/GenerationConfigurationDescription.js';
 import { TEMPORARY__AbstractEngineConfig } from '../../../../../graph-manager/action/TEMPORARY__AbstractEngineConfig.js';
-import { V1_EngineServerClient } from './V1_EngineServerClient.js';
+import {
+  V1_EngineServerClient,
+  type V1_GrammarParserBatchInputEntry,
+} from './V1_EngineServerClient.js';
 import { V1_PureModelContextData } from '../model/context/V1_PureModelContextData.js';
 import {
   type V1_LambdaReturnTypeResult,
@@ -127,6 +130,7 @@ import {
   V1_serializeRawSQLExecuteInput,
   type V1_RawSQLExecuteInput,
 } from './execution/V1_RawSQLExecuteInput.js';
+import type { V1_ValueSpecification } from '../model/valueSpecification/V1_ValueSpecification.js';
 
 class V1_EngineConfig extends TEMPORARY__AbstractEngineConfig {
   private engine: V1_Engine;
@@ -146,11 +150,21 @@ class V1_EngineConfig extends TEMPORARY__AbstractEngineConfig {
     this.engine.getEngineServerClient().setBaseUrl(val);
   }
 
+  override setBaseUrlForServiceRegistration(val: string | undefined): void {
+    super.setBaseUrlForServiceRegistration(val);
+    this.engine.getEngineServerClient().setBaseUrlForServiceRegistration(val);
+  }
+
   override setUseClientRequestPayloadCompression(val: boolean): void {
     super.setUseClientRequestPayloadCompression(val);
     this.engine.getEngineServerClient().setCompression(val);
   }
 
+  override setEnableDebuggingPayload(val: boolean): void {
+    super.setEnableDebuggingPayload(val);
+    this.engine.getEngineServerClient().setDebugPayload(val);
+  }
+
   constructor(engine: V1_Engine) {
     super();
     this.engine = engine;
@@ -366,6 +380,36 @@ export class V1_Engine {
     );
   }
 
+  async transformValueSpecsToCode(
+    input: Record<string, PlainObject<V1_ValueSpecification>>,
+    pretty: boolean,
+  ): Promise<Map<string, string>> {
+    return deserializeMap(
+      await this.engineServerClient.JSONToGrammar_valueSpecification_batch(
+        input,
+        pretty ? V1_RenderStyle.PRETTY : V1_RenderStyle.STANDARD,
+      ),
+      (v) => v,
+    );
+  }
+
+  async transformCodeToValueSpeces(
+    input: Record<string, V1_GrammarParserBatchInputEntry>,
+  ): Promise<Map<string, PlainObject>> {
+    const batchResults =
+      await this.engineServerClient.grammarToJSON_valueSpecification_batch(
+        input,
+      );
+    const finalResults = new Map<string, PlainObject>();
+    const results = batchResults.result;
+    if (results) {
+      Object.entries(results).forEach(([k, v]) => {
+        finalResults.set(k, v);
+      });
+    }
+    return finalResults;
+  }
+
   async transformLambdaToCode(
     lambda: RawLambda,
     pretty: boolean,
@@ -748,7 +792,7 @@ export class V1_Engine {
   // ------------------------------------------- Service -------------------------------------------
 
   async getServerServiceInfo(): Promise<V1_ServiceConfigurationInfo> {
-    return (await this.engineServerClient.getServerServiceInfo()) as unknown as V1_ServiceConfigurationInfo;
+    return (await this.engineServerClient.TEMPORARY__getServerServiceInfo()) as unknown as V1_ServiceConfigurationInfo;
   }
 
   async registerService(
@@ -759,7 +803,7 @@ export class V1_Engine {
     TEMPORARY__useGenerateLineage: boolean,
   ): Promise<V1_ServiceRegistrationResult> {
     return V1_ServiceRegistrationResult.serialization.fromJson(
-      await this.engineServerClient.registerService(
+      await this.engineServerClient.INTERNAL__registerService(
         V1_serializePureModelContext(input),
         server,
         executionMode,
@@ -774,7 +818,7 @@ export class V1_Engine {
     serviceId: string,
   ): Promise<V1_ServiceStorage> {
     return V1_ServiceStorage.serialization.fromJson(
-      await this.engineServerClient.getServiceVersionInfo(
+      await this.engineServerClient.TEMPORARY__getServiceVersionInfo(
         serviceUrl,
         serviceId,
       ),
@@ -785,7 +829,7 @@ export class V1_Engine {
     serviceUrl: string,
     generationId: string,
   ): Promise<void> {
-    await this.engineServerClient.activateGenerationId(
+    await this.engineServerClient.TEMPORARY__activateGenerationId(
       serviceUrl,
       generationId,
     );

package/src/graph-manager/protocol/pure/v1/engine/V1_EngineHelper.ts

@@ -22,10 +22,15 @@ import {
 import {
   LightQuery,
   Query,
+  QueryParameterValue,
   QueryStereotype,
   QueryTaggedValue,
 } from '../../../../../graph-manager/action/query/Query.js';
-import { type V1_LightQuery, V1_Query } from './query/V1_Query.js';
+import {
+  type V1_LightQuery,
+  V1_Query,
+  V1_QueryParameterValue,
+} from './query/V1_Query.js';
 import type { PureModel } from '../../../../../graph/PureModel.js';
 import { PackageableElementExplicitReference } from '../../../../../graph/metamodel/pure/packageableElements/PackageableElementReference.js';
 import { DEPRECATED__ServiceTestResult } from '../../../../../graph-manager/action/service/DEPRECATED__ServiceTestResult.js';
@@ -179,6 +184,20 @@ export const V1_buildQuery = (
     );
     return stereotype;
   });
+  metamodel.defaultParameterValues = protocol.defaultParameterValues?.map(
+    (v) => {
+      const paramValue = new QueryParameterValue();
+      paramValue.name = guaranteeNonEmptyString(
+        v.name,
+        `Query Parameter 'name' field is missing or empty`,
+      );
+      paramValue.content = guaranteeNonEmptyString(
+        v.content,
+        `Query Parameter ${v.name} 'content' field is missing or empty`,
+      );
+      return paramValue;
+    },
+  );
 
   return metamodel;
 };
@@ -203,6 +222,14 @@ export const V1_transformQuery = (metamodel: Query): V1_Query => {
     taggedValue.value = _taggedValue.value;
     return taggedValue;
   });
+  protocol.defaultParameterValues = metamodel.defaultParameterValues?.map(
+    (_defaultParams) => {
+      const vDefault = new V1_QueryParameterValue();
+      vDefault.name = _defaultParams.name;
+      vDefault.content = _defaultParams.content;
+      return vDefault;
+    },
+  );
   protocol.stereotypes = metamodel.stereotypes?.map((_stereotype) => {
     const stereotype = new V1_StereotypePtr();
     stereotype.profile = _stereotype.profile;