@finos/legend-graph 31.2.1 → 31.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-graph",
-  "version": "31.2.1",
+  "version": "31.2.3",
   "description": "Legend graph and graph manager",
   "keywords": [
     "legend",
@@ -40,17 +40,17 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-shared": "10.0.25",
-    "@finos/legend-storage": "3.0.75",
+    "@finos/legend-shared": "10.0.26",
+    "@finos/legend-storage": "3.0.76",
     "mobx": "6.10.2",
     "serializr": "3.0.2"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.79",
-    "@jest/globals": "29.6.4",
+    "@finos/legend-dev-utils": "2.0.80",
+    "@jest/globals": "29.7.0",
     "cross-env": "7.0.3",
-    "eslint": "8.48.0",
-    "jest": "29.6.4",
+    "eslint": "8.49.0",
+    "jest": "29.7.0",
     "npm-run-all": "4.1.5",
     "rimraf": "5.0.1",
     "typescript": "5.2.2"

package/src/graph-manager/AbstractPureGraphManager.ts

@@ -322,6 +322,16 @@ export abstract class AbstractPureGraphManager {
     pretty?: boolean,
   ): Promise<Map<string, string>>;
 
+  abstract valueSpecificationToPureCode(
+    valSpec: PlainObject<ValueSpecification>,
+    pretty?: boolean,
+  ): Promise<string>;
+
+  abstract pureCodeToValueSpecification(
+    valSpec: string,
+    pretty?: boolean,
+  ): Promise<PlainObject<ValueSpecification>>;
+
   abstract pureCodeToValueSpecifications(
     lambdas: Map<string, string>,
     graph: PureModel,

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

@@ -1831,6 +1831,19 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     return this.engine.transformValueSpecsToCode(input, Boolean(pretty));
   }
 
+  async valueSpecificationToPureCode(
+    valSpec: PlainObject<ValueSpecification>,
+    pretty?: boolean | undefined,
+  ): Promise<string> {
+    return this.engine.transformValueSpecToCode(valSpec, Boolean(pretty));
+  }
+
+  async pureCodeToValueSpecification(
+    valSpec: string,
+  ): Promise<PlainObject<ValueSpecification>> {
+    return this.engine.transformCodeToValueSpec(valSpec);
+  }
+
   async pureCodeToValueSpecifications(
     lambdas: Map<string, string>,
     graph: PureModel,

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

@@ -405,6 +405,17 @@ export class V1_Engine {
     );
   }
 
+  async transformValueSpecToCode(
+    input: PlainObject<V1_ValueSpecification>,
+    pretty: boolean,
+  ): Promise<string> {
+    const code = await this.engineServerClient.JSONToGrammar_valueSpecification(
+      input,
+      pretty ? V1_RenderStyle.PRETTY : V1_RenderStyle.STANDARD,
+    );
+    return code;
+  }
+
   async transformCodeToValueSpeces(
     input: Record<string, V1_GrammarParserBatchInputEntry>,
   ): Promise<Map<string, PlainObject>> {
@@ -422,6 +433,29 @@ export class V1_Engine {
     return finalResults;
   }
 
+  async transformCodeToValueSpec(
+    input: string,
+  ): Promise<PlainObject<V1_ValueSpecification>> {
+    try {
+      const batchResults =
+        await this.engineServerClient.grammarToJSON_valueSpecification(input);
+      return batchResults;
+    } catch (error) {
+      assertErrorThrown(error);
+      if (
+        error instanceof NetworkClientError &&
+        error.response.status === HttpStatus.BAD_REQUEST
+      ) {
+        throw V1_buildParserError(
+          V1_ParserError.serialization.fromJson(
+            error.payload as PlainObject<V1_ParserError>,
+          ),
+        );
+      }
+      throw error;
+    }
+  }
+
   async transformLambdaToCode(
     lambda: RawLambda,
     pretty: boolean,

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

@@ -81,6 +81,7 @@ import type { V1_DatabaseToModelGenerationInput } from './relational/V1_Database
 import type { V1_TestDataGenerationInput } from './service/V1_TestDataGenerationInput.js';
 import type { V1_TestDataGenerationResult } from './service/V1_TestDataGenerationResult.js';
 import type { V1_RelationalConnectionBuilder } from './relational/V1_RelationalConnectionBuilder.js';
+import type { V1_LambdaPrefix } from './lambda/V1_LambdaPrefix.js';
 
 enum CORE_ENGINE_ACTIVITY_TRACE {
   GRAMMAR_TO_JSON = 'transform Pure code to protocol',
@@ -191,6 +192,12 @@ export class V1_EngineServerClient extends AbstractServerClient {
   getCurrentUserId = (): Promise<string> =>
     this.get(`${this._server()}/currentUser`);
 
+  // ------------------------------------------- Server -------------------------------------------
+
+  _lambda = (): string => `${this.baseUrl}/lambda/v1`;
+  getLambdaPrefixes = (): Promise<PlainObject<V1_LambdaPrefix>[]> =>
+    this.get(`${this._lambda()}/lambdaPrefixes`);
+
   // ------------------------------------------- Protocol -------------------------------------------
 
   getClassifierPathMap = (): Promise<ClassifierPathMapping[]> =>
@@ -281,6 +288,19 @@ export class V1_EngineServerClient extends AbstractServerClient {
       { enableCompression: true },
     );
 
+  grammarToJSON_valueSpecification = (
+    input: string,
+  ): Promise<PlainObject<V1_ValueSpecification>> =>
+    this.postWithTracing(
+      this.getTraceData(CORE_ENGINE_ACTIVITY_TRACE.GRAMMAR_TO_JSON),
+      `${this._grammarToJSON()}/valueSpecification`,
+      input,
+      {},
+      undefined,
+      undefined,
+      { enableCompression: true },
+    );
+
   grammarToJSON_relationalOperationElement = (
     input: string,
     sourceId?: string | undefined,
@@ -381,6 +401,20 @@ export class V1_EngineServerClient extends AbstractServerClient {
       { enableCompression: true },
     );
 
+  JSONToGrammar_valueSpecification = (
+    input: PlainObject<V1_ValueSpecification>,
+    renderStyle?: V1_RenderStyle | undefined,
+  ): Promise<string> =>
+    this.postWithTracing(
+      this.getTraceData(CORE_ENGINE_ACTIVITY_TRACE.JSON_TO_GRAMMAR),
+      `${this._JSONToGrammar()}/valueSpecification`,
+      input,
+      {},
+      { [HttpHeader.ACCEPT]: ContentType.TEXT_PLAIN },
+      { renderStyle },
+      { enableCompression: false },
+    );
+
   JSONToGrammar_relationalOperationElement = (
     input: PlainObject<V1_RawRelationalOperationElement>,
     renderStyle?: V1_RenderStyle | undefined,

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

@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { SerializationFactory } from '@finos/legend-shared';
+import { createModelSchema, primitive } from 'serializr';
+
+export class V1_LambdaPrefix {
+  platformVersion!: string;
+  prefix!: string;
+
+  static readonly serialization = new SerializationFactory(
+    createModelSchema(V1_LambdaPrefix, {
+      platformVersion: primitive(),
+      prefix: primitive(),
+    }),
+  );
+}

package/src/index.ts

@@ -128,6 +128,7 @@ export { V1_Multiplicity } from './graph-manager/protocol/pure/v1/model/packagea
 export { V1_ExternalFormatDescription } from './graph-manager/protocol/pure/v1/engine/externalFormat/V1_ExternalFormatDescription.js';
 export { V1_ExternalFormatModelGenerationInput } from './graph-manager/protocol/pure/v1/engine/externalFormat/V1_ExternalFormatModelGeneration.js';
 export { V1_ExecuteInput } from './graph-manager/protocol/pure/v1/engine/execution/V1_ExecuteInput.js';
+export { V1_LambdaPrefix } from './graph-manager/protocol/pure/v1/engine/lambda/V1_LambdaPrefix.js';
 export {
   V1_buildExecutionResult,
   V1_serializeExecutionResult,
@@ -135,7 +136,6 @@ export {
 export { V1_CString } from './graph-manager/protocol/pure/v1/model/valueSpecification/raw/V1_CString.js';
 export { V1_CStrictDate } from './graph-manager/protocol/pure/v1/model/valueSpecification/raw/V1_CStrictDate.js';
 export { V1_INTERNAL__UnknownFunctionActivator } from './graph-manager/protocol/pure/v1/model/packageableElements/function/V1_INTERNAL__UnknownFunctionActivator.js';
-
 // --------------------------------------------- EXECUTION PLAN --------------------------------------------------
 
 export { INTERNAL__UnknownExecutionResult } from './graph-manager/action/execution/INTERNAL__UnknownExecutionResult.js';

package/tsconfig.json

@@ -414,6 +414,7 @@
     "./src/graph-manager/protocol/pure/v1/engine/grammar/V1_RenderStyle.ts",
     "./src/graph-manager/protocol/pure/v1/engine/import/V1_ImportConfigurationDescription.ts",
     "./src/graph-manager/protocol/pure/v1/engine/import/V1_PureModelContextGenerationInput.ts",
+    "./src/graph-manager/protocol/pure/v1/engine/lambda/V1_LambdaPrefix.ts",
     "./src/graph-manager/protocol/pure/v1/engine/query/V1_Query.ts",
     "./src/graph-manager/protocol/pure/v1/engine/query/V1_QuerySearchSpecification.ts",
     "./src/graph-manager/protocol/pure/v1/engine/relational/V1_DatabaseToModelGenerationInput.ts",