@finos/legend-graph 14.0.2 → 14.0.3

package/src/graphManager/protocol/pure/v1/engine/V1_Engine.ts

@@ -27,10 +27,6 @@ import {
   returnUndefOnError,
   deserializeMap,
 } from '@finos/legend-shared';
-import {
-  type ImportConfigurationDescription,
-  ImportMode,
-} from '../../../../../graphManager/action/generation/ImportConfigurationDescription.js';
 import type { RawLambda } from '../../../../../graph/metamodel/pure/rawValueSpecification/RawLambda.js';
 import {
   GenerationMode,
@@ -49,7 +45,6 @@ import {
 import { V1_serializeRawValueSpecification } from '../transformation/pureProtocol/serializationHelpers/V1_RawValueSpecificationSerializationHelper.js';
 import { V1_transformRawLambda } from '../transformation/pureGraph/from/V1_RawValueSpecificationTransformer.js';
 import { V1_GenerateFileInput } from '../engine/generation/V1_FileGenerationInput.js';
-import { V1_ImportConfigurationDescription } from '../engine/import/V1_ImportConfigurationDescription.js';
 import { V1_GenerationConfigurationDescription } from '../engine/generation/V1_GenerationConfigurationDescription.js';
 import { V1_GenerationOutput } from '../engine/generation/V1_GenerationOutput.js';
 import { V1_ParserError } from '../engine/grammar/V1_ParserError.js';
@@ -63,7 +58,6 @@ import {
   V1_buildExecutionError,
   V1_buildExternalFormatDescription,
   V1_buildGenerationConfigurationDescription,
-  V1_buildImportConfigurationDescription,
   V1_buildParserError,
 } from './V1_EngineHelper.js';
 import { V1_LightQuery, V1_Query } from './query/V1_Query.js';
@@ -603,39 +597,6 @@ export class V1_Engine {
     return pureCode;
   }
 
-  // ------------------------------------------- Schema Import -------------------------------------------
-
-  async transformExternalFormatToProtocol(
-    externalFormat: string,
-    type: string,
-    mode: ImportMode,
-  ): Promise<V1_PureModelContextData> {
-    return V1_deserializePureModelContextData(
-      await this.engineServerClient.transformExternalFormatToProtocol(
-        JSON.parse(externalFormat),
-        type,
-        mode,
-      ),
-    );
-  }
-
-  async getAvailableImportConfigurationDescriptions(): Promise<
-    ImportConfigurationDescription[]
-  > {
-    const schemaImportDescriptions = (
-      await this.engineServerClient.getAvailableSchemaImportDescriptions()
-    ).map((gen) => ({ ...gen, modelImportMode: ImportMode.SCHEMA_IMPORT }));
-    const codeImportDescriptions = (
-      await this.engineServerClient.getAvailableCodeImportDescriptions()
-    ).map((gen) => ({ ...gen, modelImportMode: ImportMode.CODE_IMPORT }));
-    return [...schemaImportDescriptions, ...codeImportDescriptions].map(
-      (description) =>
-        V1_buildImportConfigurationDescription(
-          V1_ImportConfigurationDescription.serialization.fromJson(description),
-        ),
-    );
-  }
-
   // ------------------------------------------- Service -------------------------------------------
 
   async getServerServiceInfo(): Promise<V1_ServiceConfigurationInfo> {

package/src/graphManager/protocol/pure/v1/engine/V1_EngineHelper.ts

@@ -32,11 +32,6 @@ import { DEPRECATED__ServiceTestResult } from '../../../../../graphManager/actio
 import type { V1_DEPRECATED__ServiceTestResult } from './service/V1_DEPRECATED__ServiceTestResult.js';
 import type { V1_ServiceRegistrationResult } from './service/V1_ServiceRegistrationResult.js';
 import { ServiceRegistrationResult } from '../../../../../graphManager/action/service/ServiceRegistrationResult.js';
-import {
-  getImportMode,
-  ImportConfigurationDescription,
-} from '../../../../../graphManager/action/generation/ImportConfigurationDescription.js';
-import type { V1_ImportConfigurationDescription } from './import/V1_ImportConfigurationDescription.js';
 import { GenerationOutput } from '../../../../../graphManager/action/generation/GenerationOutput.js';
 import type { V1_GenerationOutput } from './generation/V1_GenerationOutput.js';
 import {
@@ -284,27 +279,6 @@ export const V1_buildServiceRegistrationResult = (
   );
 };
 
-export const V1_buildImportConfigurationDescription = (
-  protocol: V1_ImportConfigurationDescription,
-): ImportConfigurationDescription => {
-  const metamodel = new ImportConfigurationDescription();
-  metamodel.key = guaranteeNonNullable(
-    protocol.key,
-    `Import configuration description 'key' field is missing`,
-  );
-  metamodel.label = guaranteeNonNullable(
-    protocol.label,
-    `Import configuration description 'label' field is missing`,
-  );
-  metamodel.modelImportMode = getImportMode(
-    guaranteeNonNullable(
-      protocol.modelImportMode,
-      `Import configuration description 'modelImportMode' field is missing`,
-    ),
-  );
-  return metamodel;
-};
-
 export const V1_buildGenerationProperty = (
   protocol: V1_GenerationProperty,
 ): GenerationProperty => {

package/src/graphManager/protocol/pure/v1/engine/V1_EngineServerClient.ts

@@ -22,14 +22,12 @@ import {
   type TraceData,
   HttpHeader,
 } from '@finos/legend-shared';
-import type { ImportMode } from '../../../../../graphManager/action/generation/ImportConfigurationDescription.js';
 import type { V1_PureModelContextData } from '../model/context/V1_PureModelContextData.js';
 import type { V1_LambdaReturnTypeResult } from './compilation/V1_LambdaReturnTypeResult.js';
 import type { V1_ServiceRegistrationResult } from './service/V1_ServiceRegistrationResult.js';
 import type { V1_ServiceConfigurationInfo } from './service/V1_ServiceConfiguration.js';
 import type { V1_CompileResult } from './compilation/V1_CompileResult.js';
 import type { V1_RawLambda } from '../model/rawValueSpecification/V1_RawLambda.js';
-import type { V1_PureModelContextGenerationInput } from './import/V1_PureModelContextGenerationInput.js';
 import type { V1_GenerateFileInput } from './generation/V1_FileGenerationInput.js';
 import type { V1_ExecutionResult } from './execution/V1_ExecutionResult.js';
 import type { V1_ImportConfigurationDescription } from './import/V1_ImportConfigurationDescription.js';
@@ -369,21 +367,6 @@ export class V1_EngineServerClient extends AbstractServerClient {
   getAvailableSchemaImportDescriptions = (): Promise<
     PlainObject<V1_ImportConfigurationDescription>[]
   > => this.get(`${this._pure()}/schemaImport/availableImports`);
-  transformExternalFormatToProtocol = (
-    input: PlainObject<V1_PureModelContextGenerationInput>,
-    type: string,
-    mode: ImportMode,
-  ): Promise<PlainObject<V1_PureModelContextData>> =>
-    this.postWithTracing(
-      this.getTraceData(CORE_ENGINE_ACTIVITY_TRACE.EXTERNAL_FORMAT_TO_PROTOCOL),
-      `${this._pure()}/${mode}/${type}`,
-      input,
-      {},
-      undefined,
-      undefined,
-      { enableCompression: true },
-    );
-
   // ------------------------------------------- Code Generation -------------------------------------------
 
   getAvailableCodeGenerationDescriptions = (): Promise<

package/src/graphManager/protocol/pure/v1/engine/externalFormat/V1_ExternalFormatModelGeneration.ts

@@ -14,19 +14,37 @@
  * limitations under the License.
  */
 
-import { createModelSchema, object, primitive, raw } from 'serializr';
+import { createModelSchema, optional, primitive, raw } from 'serializr';
 import { SerializationFactory } from '@finos/legend-shared';
-import { V1_GenerationInput } from '../generation/V1_GenerationInput.js';
-import { V1_PureModelContextData } from '../../model/context/V1_PureModelContextData.js';
+import type { V1_PureModelContext } from '../../model/context/V1_PureModelContext.js';
+import { V1_pureModelContextPropSchema } from '../../transformation/pureProtocol/V1_PureProtocolSerialization.js';
 
-export class V1_ExternalFormatModelGenerationInput extends V1_GenerationInput {
+export class V1_ExternalFormatModelGenerationInput {
+  clientVersion?: string | undefined;
+  sourceSchemaSet: string;
+  model: V1_PureModelContext;
   config?: Record<PropertyKey, unknown> | undefined;
+  generateBinding: boolean | undefined;
+  targetBindingPath: string | undefined;
 
-  static override readonly serialization = new SerializationFactory(
+  constructor(
+    sourceSchemaSet: string,
+    model: V1_PureModelContext,
+    config?: Record<PropertyKey, unknown>,
+  ) {
+    this.model = model;
+    this.sourceSchemaSet = sourceSchemaSet;
+    this.config = config;
+  }
+
+  static readonly serialization = new SerializationFactory(
     createModelSchema(V1_ExternalFormatModelGenerationInput, {
-      clientVersion: primitive(),
-      model: object(V1_PureModelContextData),
+      clientVersion: optional(primitive()),
       config: raw(),
+      model: V1_pureModelContextPropSchema,
+      generateBinding: optional(primitive()),
+      targetBindingPath: optional(primitive()),
+      sourceSchemaSet: primitive(),
     }),
   );
 }

package/src/index.ts

@@ -226,7 +226,6 @@ export * from './graphManager/action/query/Query.js';
 export * from './graphManager/action/query/QuerySearchSpecification.js';
 export * from './graphManager/action/EngineError.js';
 export * from './graphManager/action/SourceInformationHelper.js';
-export * from './graphManager/action/generation/ImportConfigurationDescription.js';
 export * from './graphManager/action/generation/DatabaseBuilderInput.js';
 export * from './graphManager/action/generation/GenerationConfigurationDescription.js';
 export { GenerationOutput } from './graphManager/action/generation/GenerationOutput.js';

package/tsconfig.json

@@ -296,7 +296,6 @@
     "./src/graphManager/action/generation/DatabaseBuilderInput.ts",
     "./src/graphManager/action/generation/GenerationConfigurationDescription.ts",
     "./src/graphManager/action/generation/GenerationOutput.ts",
-    "./src/graphManager/action/generation/ImportConfigurationDescription.ts",
     "./src/graphManager/action/query/Query.ts",
     "./src/graphManager/action/query/QuerySearchSpecification.ts",
     "./src/graphManager/action/service/DEPRECATED__ServiceTestResult.ts",

package/lib/graphManager/action/generation/ImportConfigurationDescription.d.ts

@@ -1,26 +0,0 @@
-/**
- * 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.
- */
-export declare enum ImportMode {
-    CODE_IMPORT = "codeImport",
-    SCHEMA_IMPORT = "schemaImport"
-}
-export declare const getImportMode: (value: string) => ImportMode;
-export declare class ImportConfigurationDescription {
-    key: string;
-    label: string;
-    modelImportMode: ImportMode;
-}
-//# sourceMappingURL=ImportConfigurationDescription.d.ts.map

package/lib/graphManager/action/generation/ImportConfigurationDescription.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ImportConfigurationDescription.d.ts","sourceRoot":"","sources":["../../../../src/graphManager/action/generation/ImportConfigurationDescription.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,oBAAY,UAAU;IACpB,WAAW,eAAe;IAC1B,aAAa,iBAAiB;CAC/B;AAED,eAAO,MAAM,aAAa,UAAW,MAAM,KAAG,UAI3C,CAAC;AAEJ,qBAAa,8BAA8B;IACzC,GAAG,EAAG,MAAM,CAAC;IACb,KAAK,EAAG,MAAM,CAAC;IACf,eAAe,EAAG,UAAU,CAAC;CAC9B"}

package/lib/graphManager/action/generation/ImportConfigurationDescription.js

@@ -1,28 +0,0 @@
-/**
- * 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 { guaranteeNonNullable } from '@finos/legend-shared';
-export var ImportMode;
-(function (ImportMode) {
-    ImportMode["CODE_IMPORT"] = "codeImport";
-    ImportMode["SCHEMA_IMPORT"] = "schemaImport";
-})(ImportMode = ImportMode || (ImportMode = {}));
-export const getImportMode = (value) => guaranteeNonNullable(Object.values(ImportMode).find((mode) => mode === value), `Encountered unsupported import mode '${value}'`);
-export class ImportConfigurationDescription {
-    key;
-    label;
-    modelImportMode;
-}
-//# sourceMappingURL=ImportConfigurationDescription.js.map

package/lib/graphManager/action/generation/ImportConfigurationDescription.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ImportConfigurationDescription.js","sourceRoot":"","sources":["../../../../src/graphManager/action/generation/ImportConfigurationDescription.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,wCAA0B,CAAA;IAC1B,4CAA8B,CAAA;AAChC,CAAC,EAHW,UAAU,GAAV,UAAU,KAAV,UAAU,QAGrB;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAa,EAAc,EAAE,CACzD,oBAAoB,CAClB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,EACxD,wCAAwC,KAAK,GAAG,CACjD,CAAC;AAEJ,MAAM,OAAO,8BAA8B;IACzC,GAAG,CAAU;IACb,KAAK,CAAU;IACf,eAAe,CAAc;CAC9B"}

package/src/graphManager/action/generation/ImportConfigurationDescription.ts

@@ -1,34 +0,0 @@
-/**
- * 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 { guaranteeNonNullable } from '@finos/legend-shared';
-
-export enum ImportMode {
-  CODE_IMPORT = 'codeImport',
-  SCHEMA_IMPORT = 'schemaImport',
-}
-
-export const getImportMode = (value: string): ImportMode =>
-  guaranteeNonNullable(
-    Object.values(ImportMode).find((mode) => mode === value),
-    `Encountered unsupported import mode '${value}'`,
-  );
-
-export class ImportConfigurationDescription {
-  key!: string;
-  label!: string;
-  modelImportMode!: ImportMode;
-}