@finos/legend-graph 0.3.1 → 1.0.2

package/src/models/metamodels/pure/rawValueSpecification/RawInstanceValue.ts

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import type { Multiplicity } from '../packageableElements/domain/Multiplicity';
 import type { PackageableElementReference } from '../packageableElements/PackageableElementReference';
 import type { Type } from '../packageableElements/domain/Type';
-import type { RawValueSpecificationVisitor } from './RawValueSpecification';
-import { RawValueSpecification } from './RawValueSpecification';
+import {
+  type RawValueSpecificationVisitor,
+  RawValueSpecification,
+} from './RawValueSpecification';
 import { computed, makeObservable, observable } from 'mobx';
 import { CORE_HASH_STRUCTURE } from '../../../../MetaModelConst';
 

package/src/models/metamodels/pure/rawValueSpecification/RawLambda.ts

@@ -15,12 +15,13 @@
  */
 
 import { computed, observable, makeObservable } from 'mobx';
-import { hashArray } from '@finos/legend-shared';
 import { hashLambda } from '../../../../MetaModelUtils';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../MetaModelConst';
-import type { RawValueSpecificationVisitor } from './RawValueSpecification';
-import { RawValueSpecification } from './RawValueSpecification';
+import {
+  type RawValueSpecificationVisitor,
+  RawValueSpecification,
+} from './RawValueSpecification';
 import type { Stubable } from '../../../../helpers/Stubable';
 
 export class RawLambda

package/src/models/metamodels/pure/rawValueSpecification/RawVariableExpression.ts

@@ -15,16 +15,19 @@
  */
 
 import { observable, action, computed, makeObservable } from 'mobx';
-import { hashArray, uuid } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, uuid, type Hashable } from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../MetaModelConst';
 import type { Type } from '../packageableElements/domain/Type';
 import { Multiplicity } from '../packageableElements/domain/Multiplicity';
 import type { Stubable } from '../../../../helpers/Stubable';
-import type { PackageableElementReference } from '../packageableElements/PackageableElementReference';
-import { PackageableElementExplicitReference } from '../packageableElements/PackageableElementReference';
-import type { RawValueSpecificationVisitor } from './RawValueSpecification';
-import { RawValueSpecification } from './RawValueSpecification';
+import {
+  type PackageableElementReference,
+  PackageableElementExplicitReference,
+} from '../packageableElements/PackageableElementReference';
+import {
+  type RawValueSpecificationVisitor,
+  RawValueSpecification,
+} from './RawValueSpecification';
 
 export class RawVariableExpression
   extends RawValueSpecification

package/src/models/metamodels/pure/valueSpecification/GraphFetchTree.ts

@@ -18,11 +18,11 @@ import { makeObservable, observable, action, computed } from 'mobx';
 import { addUniqueEntry, deleteEntry } from '@finos/legend-shared';
 import type { Class } from '../packageableElements/domain/Class';
 import type { PropertyReference } from '../packageableElements/domain/PropertyReference';
-import type {
-  OptionalPackageableElementReference,
-  PackageableElementReference,
+import {
+  OptionalPackageableElementExplicitReference,
+  type OptionalPackageableElementReference,
+  type PackageableElementReference,
 } from '../packageableElements/PackageableElementReference';
-import { OptionalPackageableElementExplicitReference } from '../packageableElements/PackageableElementReference';
 import type {
   ValueSpecification,
   ValueSpecificationVisitor,

package/src/models/metamodels/pure/valueSpecification/INTERNAL__UnknownValueSpecification.ts

@@ -15,8 +15,10 @@
  */
 
 import { Multiplicity } from '../packageableElements/domain/Multiplicity';
-import type { ValueSpecificationVisitor } from './ValueSpecification';
-import { ValueSpecification } from './ValueSpecification';
+import {
+  type ValueSpecificationVisitor,
+  ValueSpecification,
+} from './ValueSpecification';
 
 export class INTERNAL__UnknownValueSpecification extends ValueSpecification {
   content: object;

package/src/models/metamodels/pure/valueSpecification/InstanceValue.ts

@@ -15,10 +15,11 @@
  */
 
 import { observable, makeObservable, action } from 'mobx';
-import { deleteEntry, addUniqueEntry } from '@finos/legend-shared';
-import type { Pair } from '@finos/legend-shared';
-import type { ValueSpecificationVisitor } from './ValueSpecification';
-import { ValueSpecification } from './ValueSpecification';
+import { deleteEntry, addUniqueEntry, type Pair } from '@finos/legend-shared';
+import {
+  type ValueSpecificationVisitor,
+  ValueSpecification,
+} from './ValueSpecification';
 import type { Multiplicity } from '../packageableElements/domain/Multiplicity';
 import type { GenericTypeReference } from '../packageableElements/domain/GenericTypeReference';
 import type { EnumValueReference } from '../packageableElements/domain/EnumValueReference';

package/src/models/metamodels/pure/valueSpecification/SimpleFunctionExpression.ts

@@ -18,8 +18,10 @@ import { observable, makeObservable, action } from 'mobx';
 import type { GenericTypeReference } from '../packageableElements/domain/GenericTypeReference';
 import type { Multiplicity } from '../packageableElements/domain/Multiplicity';
 import type { PackageableElementReference } from '../packageableElements/PackageableElementReference';
-import type { ValueSpecificationVisitor } from './ValueSpecification';
-import { ValueSpecification } from './ValueSpecification';
+import {
+  type ValueSpecificationVisitor,
+  ValueSpecification,
+} from './ValueSpecification';
 import type { Function } from '../packageableElements/domain/Function';
 import type { AbstractProperty } from '../packageableElements/domain/AbstractProperty';
 import { UnsupportedOperationError } from '@finos/legend-shared';

package/src/models/metamodels/pure/valueSpecification/VariableExpression.ts

@@ -17,8 +17,10 @@
 import { makeObservable, observable, action } from 'mobx';
 import type { GenericTypeReference } from '../packageableElements/domain/GenericTypeReference';
 import type { Multiplicity } from '../packageableElements/domain/Multiplicity';
-import type { ValueSpecificationVisitor } from './ValueSpecification';
-import { ValueSpecification } from './ValueSpecification';
+import {
+  type ValueSpecificationVisitor,
+  ValueSpecification,
+} from './ValueSpecification';
 
 export class VariableExpression extends ValueSpecification {
   name: string;

package/src/models/protocols/pure/PureProtocolProcessorPlugin.ts

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { AbstractPlugin } from '@finos/legend-shared';
-import type { PlainObject } from '@finos/legend-shared';
+import { AbstractPlugin, type PlainObject } from '@finos/legend-shared';
 import type { PackageableElement } from '../../metamodels/pure/packageableElements/PackageableElement';
 import type { V1_PackageableElement } from './v1/model/packageableElements/V1_PackageableElement';
 import type { V1_ElementBuilder } from './v1/transformation/pureGraph/to/V1_ElementBuilder';
@@ -30,6 +29,7 @@ import type { V1_ProcessingContext } from './v1/transformation/pureGraph/to/help
 import type { SimpleFunctionExpression } from '../../metamodels/pure/valueSpecification/SimpleFunctionExpression';
 import type { ValueSpecification } from '../../metamodels/pure/valueSpecification/ValueSpecification';
 import type { GraphPluginManager } from '../../../GraphPluginManager';
+import type { Type } from '../../metamodels/pure/packageableElements/domain/Type';
 
 export type V1_ElementProtocolClassifierPathGetter = (
   protocol: V1_PackageableElement,
@@ -65,6 +65,10 @@ export type V1_ExecutionInputGetter = (
   protocolGraph: V1_PureModelContextData,
 ) => V1_PackageableElement[];
 
+export type V1_PropertyExpressionTypeInferrer = (
+  variable: ValueSpecification | undefined,
+) => Type | undefined;
+
 /**
  * Plugins for protocol processors. Technically, this is a sub-part of `PureGraphManagerPlugin`
  * but due to the way we encapsulate the protocol code and the way we organize graph managers,
@@ -140,4 +144,9 @@ export abstract class PureProtocolProcessorPlugin extends AbstractPlugin {
    * This would provide a mechanism to add more elements in this reduced graph.
    */
   V1_getExtraExecutionInputGetters?(): V1_ExecutionInputGetter[];
+
+  /**
+   * Get the list of type inferrers for property expression.
+   */
+  V1_getExtraPropertyExpressionTypeInferrers?(): V1_PropertyExpressionTypeInferrer[];
 }

package/src/models/protocols/pure/v1/V1_PureGraphManager.ts

@@ -17,19 +17,17 @@
 import { flow, flowResult, makeObservable, runInAction } from 'mobx';
 import { GRAPH_MANAGER_LOG_EVENT } from '../../../../graphManager/GraphManagerLogEvent';
 import {
-  CORE_ELEMENT_PATH,
+  CORE_PURE_PATH,
   ELEMENT_PATH_DELIMITER,
   ROOT_PACKAGE_NAME,
   SOURCE_INFORMATION_KEY,
 } from '../../../../MetaModelConst';
-import type {
-  Clazz,
-  GeneratorFn,
-  Log,
-  PlainObject,
-  ServerClientConfig,
-} from '@finos/legend-shared';
 import {
+  type Clazz,
+  type GeneratorFn,
+  type Log,
+  type PlainObject,
+  type ServerClientConfig,
   TracerService,
   LogEvent,
   getClass,
@@ -41,11 +39,11 @@ import {
   promisify,
 } from '@finos/legend-shared';
 import type { TEMP__AbstractEngineConfig } from '../../../../graphManager/action/TEMP__AbstractEngineConfig';
-import type {
-  TEMP__EngineSetupConfig,
-  GraphBuilderOptions,
+import {
+  AbstractPureGraphManager,
+  type TEMP__EngineSetupConfig,
+  type GraphBuilderOptions,
 } from '../../../../graphManager/AbstractPureGraphManager';
-import { AbstractPureGraphManager } from '../../../../graphManager/AbstractPureGraphManager';
 import type { Mapping } from '../../../metamodels/pure/packageableElements/mapping/Mapping';
 import type { Runtime } from '../../../metamodels/pure/packageableElements/runtime/Runtime';
 import type {
@@ -53,8 +51,11 @@ import type {
   ImportMode,
 } from '../../../../graphManager/action/generation/ImportConfigurationDescription';
 import type { PackageableElement } from '../../../metamodels/pure/packageableElements/PackageableElement';
-import type { SystemModel, CoreModel } from '../../../../graph/PureModel';
-import { PureModel } from '../../../../graph/PureModel';
+import {
+  type SystemModel,
+  type CoreModel,
+  PureModel,
+} from '../../../../graph/PureModel';
 import type { BasicModel } from '../../../../graph/BasicModel';
 import type { DependencyManager } from '../../../../graph/DependencyManager';
 import type { Class } from '../../../metamodels/pure/packageableElements/domain/Class';
@@ -90,11 +91,9 @@ import {
   V1_setupPureModelContextDataSerialization,
 } from './transformation/pureProtocol/V1_PureProtocolSerialization';
 import { V1_PureModelContextData } from './model/context/V1_PureModelContextData';
-import type {
-  V1_PackageableElement,
-  V1_PackageableElementVisitor,
-} from './model/packageableElements/V1_PackageableElement';
 import {
+  type V1_PackageableElement,
+  type V1_PackageableElementVisitor,
   V1_PackageableElementPointerType,
   V1_PackageableElementPointer,
 } from './model/packageableElements/V1_PackageableElement';
@@ -105,8 +104,10 @@ import { V1_ProtocolToMetaModelGraphFourthPassBuilder } from './transformation/p
 import { V1_ProtocolToMetaModelGraphFifthPassBuilder } from './transformation/pureGraph/to/V1_ProtocolToMetaModelGraphFifthPassBuilder';
 import { V1_ProtocolToMetaModelRawValueSpecificationBuilder } from './transformation/pureGraph/to/V1_ProtocolToMetaModelRawValueSpecificationBuilder';
 import { V1_RawBaseExecutionContext } from './model/rawValueSpecification/V1_RawExecutionContext';
-import type { V1_GraphBuilderContext } from './transformation/pureGraph/to/V1_GraphBuilderContext';
-import { V1_GraphBuilderContextBuilder } from './transformation/pureGraph/to/V1_GraphBuilderContext';
+import {
+  type V1_GraphBuilderContext,
+  V1_GraphBuilderContextBuilder,
+} from './transformation/pureGraph/to/V1_GraphBuilderContext';
 import { V1_PureModelContextPointer } from './model/context/V1_PureModelContextPointer';
 import { V1_Engine } from './engine/V1_Engine';
 import { V1_PackageableElementTransformer } from './transformation/pureGraph/from/V1_PackageableElementTransformer';
@@ -195,8 +196,10 @@ import {
   V1_transformQuerySearchSpecification,
 } from './engine/V1_EngineHelper';
 import { V1_buildExecutionResult } from './engine/V1_ExecutionHelper';
-import type { Entity } from '@finos/legend-model-storage';
-import { ENTITY_PATH_DELIMITER } from '@finos/legend-model-storage';
+import {
+  type Entity,
+  ENTITY_PATH_DELIMITER,
+} from '@finos/legend-model-storage';
 import {
   DependencyGraphBuilderError,
   GraphBuilderError,
@@ -2259,35 +2262,35 @@ export class V1_PureGraphManager extends AbstractPureGraphManager {
     protocol: V1_PackageableElement,
   ): string => {
     if (protocol instanceof V1_Association) {
-      return CORE_ELEMENT_PATH.ASSOCIATION;
+      return CORE_PURE_PATH.ASSOCIATION;
     } else if (protocol instanceof V1_Class) {
-      return CORE_ELEMENT_PATH.CLASS;
+      return CORE_PURE_PATH.CLASS;
     } else if (protocol instanceof V1_Enumeration) {
-      return CORE_ELEMENT_PATH.ENUMERATION;
+      return CORE_PURE_PATH.ENUMERATION;
     } else if (protocol instanceof V1_ConcreteFunctionDefinition) {
-      return CORE_ELEMENT_PATH.FUNCTION;
+      return CORE_PURE_PATH.FUNCTION;
     } else if (protocol instanceof V1_Profile) {
-      return CORE_ELEMENT_PATH.PROFILE;
+      return CORE_PURE_PATH.PROFILE;
     } else if (protocol instanceof V1_Measure) {
-      return CORE_ELEMENT_PATH.MEASURE;
+      return CORE_PURE_PATH.MEASURE;
     } else if (protocol instanceof V1_Mapping) {
-      return CORE_ELEMENT_PATH.MAPPING;
+      return CORE_PURE_PATH.MAPPING;
     } else if (protocol instanceof V1_PackageableConnection) {
-      return CORE_ELEMENT_PATH.CONNECTION;
+      return CORE_PURE_PATH.CONNECTION;
     } else if (protocol instanceof V1_PackageableRuntime) {
-      return CORE_ELEMENT_PATH.RUNTIME;
+      return CORE_PURE_PATH.RUNTIME;
     } else if (protocol instanceof V1_SectionIndex) {
-      return CORE_ELEMENT_PATH.SECTION_INDEX;
+      return CORE_PURE_PATH.SECTION_INDEX;
     } else if (protocol instanceof V1_FlatData) {
-      return CORE_ELEMENT_PATH.FLAT_DATA;
+      return CORE_PURE_PATH.FLAT_DATA;
     } else if (protocol instanceof V1_Database) {
-      return CORE_ELEMENT_PATH.DATABASE;
+      return CORE_PURE_PATH.DATABASE;
     } else if (protocol instanceof V1_Service) {
-      return CORE_ELEMENT_PATH.SERVICE;
+      return CORE_PURE_PATH.SERVICE;
     } else if (protocol instanceof V1_FileGenerationSpecification) {
-      return CORE_ELEMENT_PATH.FILE_GENERATION;
+      return CORE_PURE_PATH.FILE_GENERATION;
     } else if (protocol instanceof V1_GenerationSpecification) {
-      return CORE_ELEMENT_PATH.GENERATION_SPECIFICATION;
+      return CORE_PURE_PATH.GENERATION_SPECIFICATION;
     }
     const extraElementProtocolClassifierPathGetters = this.pluginManager
       .getPureProtocolProcessorPlugins()

package/src/models/protocols/pure/v1/engine/V1_Engine.ts

@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-import type {
-  Log,
-  PlainObject,
-  ServerClientConfig,
-} from '@finos/legend-shared';
 import {
+  type Log,
+  type PlainObject,
+  type ServerClientConfig,
   LogEvent,
   losslessParse,
   assertErrorThrown,
@@ -29,11 +27,15 @@ import {
   NetworkClientError,
 } from '@finos/legend-shared';
 import { GRAPH_MANAGER_LOG_EVENT } from '../../../../../graphManager/GraphManagerLogEvent';
-import type { ImportConfigurationDescription } from '../../../../../graphManager/action/generation/ImportConfigurationDescription';
-import { ImportMode } from '../../../../../graphManager/action/generation/ImportConfigurationDescription';
+import {
+  type ImportConfigurationDescription,
+  ImportMode,
+} from '../../../../../graphManager/action/generation/ImportConfigurationDescription';
 import type { RawLambda } from '../../../../metamodels/pure/rawValueSpecification/RawLambda';
-import { GenerationMode } from '../../../../../graphManager/action/generation/GenerationConfigurationDescription';
-import type { GenerationConfigurationDescription } from '../../../../../graphManager/action/generation/GenerationConfigurationDescription';
+import {
+  GenerationMode,
+  type GenerationConfigurationDescription,
+} from '../../../../../graphManager/action/generation/GenerationConfigurationDescription';
 import { TEMP__AbstractEngineConfig } from '../../../../../graphManager/action/TEMP__AbstractEngineConfig';
 import { V1_EngineServerClient } from './V1_EngineServerClient';
 import type { V1_PureModelContextData } from '../model/context/V1_PureModelContextData';
@@ -76,8 +78,10 @@ import { V1_DatabaseBuilderInput } from './generation/V1_DatabaseBuilderInput';
 import type { V1_ServiceConfigurationInfo } from './service/V1_ServiceConfiguration';
 import { V1_ExecuteInput } from './execution/V1_ExecuteInput';
 import type { V1_ExecutionPlan } from '../model/executionPlan/V1_ExecutionPlan';
-import type { V1_ExecutionResult } from './execution/V1_ExecutionResult';
-import { V1_serializeExecutionResult } from './execution/V1_ExecutionResult';
+import {
+  type V1_ExecutionResult,
+  V1_serializeExecutionResult,
+} from './execution/V1_ExecutionResult';
 import { V1_ServiceStorage } from './service/V1_ServiceStorage';
 import { V1_ServiceRegistrationResult } from './service/V1_ServiceRegistrationResult';
 import type { V1_PureModelContext } from '../model/context/V1_PureModelContext';

package/src/models/protocols/pure/v1/engine/V1_EngineHelper.ts

@@ -24,8 +24,7 @@ import {
   QueryStereotype,
   QueryTaggedValue,
 } from '../../../../../graphManager/action/query/Query';
-import type { V1_LightQuery } from './query/V1_Query';
-import { V1_Query } from './query/V1_Query';
+import { type V1_LightQuery, V1_Query } from './query/V1_Query';
 import type { PureModel } from '../../../../../graph/PureModel';
 import { PackageableElementExplicitReference } from '../../../../metamodels/pure/packageableElements/PackageableElementReference';
 import { ServiceTestResult } from '../../../../../graphManager/action/service/ServiceTestResult';
@@ -394,8 +393,7 @@ const buildSourceInformation = (
 export const V1_buildCompilationError = (
   protocol: V1_CompilationError,
 ): CompilationError => {
-  const metamodel = new CompilationError();
-  metamodel.message = protocol.message;
+  const metamodel = new CompilationError(protocol.message);
   metamodel.sourceInformation = protocol.sourceInformation
     ? buildSourceInformation(protocol.sourceInformation)
     : undefined;
@@ -403,8 +401,7 @@ export const V1_buildCompilationError = (
 };
 
 export const V1_buildParserError = (protocol: V1_ParserError): ParserError => {
-  const metamodel = new ParserError();
-  metamodel.message = protocol.message;
+  const metamodel = new ParserError(protocol.message);
   metamodel.sourceInformation = protocol.sourceInformation
     ? buildSourceInformation(protocol.sourceInformation)
     : undefined;
@@ -414,8 +411,7 @@ export const V1_buildParserError = (protocol: V1_ParserError): ParserError => {
 export const V1_buildExecutionError = (
   protocol: V1_ExecutionError,
 ): ExecutionError => {
-  const executionError = new ExecutionError();
-  executionError.message = protocol.message;
+  const executionError = new ExecutionError(protocol.message);
   executionError.stack = protocol.trace;
   return executionError;
 };

package/src/models/protocols/pure/v1/engine/V1_EngineServerClient.ts

@@ -15,12 +15,13 @@
  */
 
 import { action, makeObservable, observable } from 'mobx';
-import type {
-  PlainObject,
-  ServerClientConfig,
-  TraceData,
+import {
+  ContentType,
+  AbstractServerClient,
+  type PlainObject,
+  type ServerClientConfig,
+  type TraceData,
 } from '@finos/legend-shared';
-import { ContentType, AbstractServerClient } from '@finos/legend-shared';
 import type { ImportMode } from '../../../../../graphManager/action/generation/ImportConfigurationDescription';
 import type { V1_PureModelContextData } from '../model/context/V1_PureModelContextData';
 import type { V1_LambdaReturnTypeResult } from './compilation/V1_LambdaReturnTypeResult';
@@ -122,13 +123,13 @@ export class V1_EngineServerClient extends AbstractServerClient {
     },
   });
 
-  _pure = (): string => `${this.networkClient.baseUrl}/pure/v1`;
+  _pure = (): string => `${this.baseUrl}/pure/v1`;
 
   // ------------------------------------------- Server -------------------------------------------
 
-  _server = (): string => `${this.networkClient.baseUrl}/server/v1`;
+  _server = (): string => `${this.baseUrl}/server/v1`;
   getCurrentUserId = (): Promise<string> =>
-    this.networkClient.get(`${this._server()}/currentUser`);
+    this.get(`${this._server()}/currentUser`);
 
   // ------------------------------------------- Grammar -------------------------------------------
 
@@ -187,13 +188,13 @@ export class V1_EngineServerClient extends AbstractServerClient {
 
   getAvailableCodeImportDescriptions = (): Promise<
     PlainObject<V1_ImportConfigurationDescription>[]
-  > => this.networkClient.get(`${this._pure()}/codeImport/availableImports`);
+  > => this.get(`${this._pure()}/codeImport/availableImports`);
 
   // ------------------------------------------- Schema Import -------------------------------------------
 
   getAvailableSchemaImportDescriptions = (): Promise<
     PlainObject<V1_ImportConfigurationDescription>[]
-  > => this.networkClient.get(`${this._pure()}/schemaImport/availableImports`);
+  > => this.get(`${this._pure()}/schemaImport/availableImports`);
   transformExternalFormatToProtocol = (
     input: PlainObject<V1_PureModelContextGenerationInput>,
     type: string,
@@ -213,10 +214,7 @@ export class V1_EngineServerClient extends AbstractServerClient {
 
   getAvailableCodeGenerationDescriptions = (): Promise<
     PlainObject<V1_GenerationConfigurationDescription>[]
-  > =>
-    this.networkClient.get(
-      `${this._pure()}/codeGeneration/availableGenerations`,
-    );
+  > => this.get(`${this._pure()}/codeGeneration/availableGenerations`);
   generateFile = (
     mode: GenerationMode,
     type: string,
@@ -236,10 +234,7 @@ export class V1_EngineServerClient extends AbstractServerClient {
 
   getAvailableSchemaGenerationDescriptions = (): Promise<
     PlainObject<V1_GenerationConfigurationDescription>[]
-  > =>
-    this.networkClient.get(
-      `${this._pure()}/schemaGeneration/availableGenerations`,
-    );
+  > => this.get(`${this._pure()}/schemaGeneration/availableGenerations`);
 
   // ------------------------------------------- Compile -------------------------------------------
 
@@ -331,10 +326,10 @@ export class V1_EngineServerClient extends AbstractServerClient {
   // ------------------------------------------- Service -------------------------------------------
 
   _service = (serviceServerUrl?: string): string =>
-    `${serviceServerUrl ?? this.networkClient.baseUrl}/service/v1`;
+    `${serviceServerUrl ?? this.baseUrl}/service/v1`;
   getServerServiceInfo = (): Promise<
     PlainObject<V1_ServiceConfigurationInfo>
-  > => this.networkClient.get(`${this._server()}/info/services`);
+  > => this.get(`${this._server()}/info/services`);
   registerService = (
     graphModelData: PlainObject<V1_PureModelContext>,
     serviceServerUrl: string,
@@ -391,7 +386,7 @@ export class V1_EngineServerClient extends AbstractServerClient {
   // ------------------------------------------- Query -------------------------------------------
 
   _query = (queryId?: string): string =>
-    `${this.queryBaseUrl ?? this.networkClient.baseUrl}/pure/v1/query${
+    `${this.queryBaseUrl ?? this.baseUrl}/pure/v1/query${
       queryId ? `/${encodeURIComponent(queryId)}` : ''
     }`;
   searchQueries = (

package/src/models/protocols/pure/v1/engine/V1_ExecutionHelper.ts

@@ -19,6 +19,7 @@ import {
   UnsupportedOperationError,
 } from '@finos/legend-shared';
 import {
+  type ExecutionResult,
   TdsRow,
   INTERNAL__UnknownExecutionResult,
   ClassExecutionResult,
@@ -27,12 +28,9 @@ import {
   TdsBuilder,
   TDSColumn,
 } from '../../../../../graphManager/action/execution/ExecutionResult';
-import type { ExecutionResult } from '../../../../../graphManager/action/execution/ExecutionResult';
-import type {
-  V1_ExecutionResult,
-  V1_TdsBuilder,
-} from './execution/V1_ExecutionResult';
 import {
+  type V1_ExecutionResult,
+  type V1_TdsBuilder,
   V1_ClassExecutionResult,
   V1_JsonExecutionResult,
   V1_INTERNAL__UnknownExecutionResult,

package/src/models/protocols/pure/v1/engine/execution/V1_ExecutionResult.ts

@@ -15,8 +15,11 @@
  */
 
 import { createModelSchema, list, optional, primitive, raw } from 'serializr';
-import type { PlainObject } from '@finos/legend-shared';
-import { SerializationFactory, usingModelSchema } from '@finos/legend-shared';
+import {
+  type PlainObject,
+  SerializationFactory,
+  usingModelSchema,
+} from '@finos/legend-shared';
 import { BuilderType } from '../../../../../../graphManager/action/execution/ExecutionResult';
 
 export class V1_ResultBuilder {

package/src/models/protocols/pure/v1/model/packageableElements/V1_PackageableElement.ts

@@ -18,8 +18,7 @@ import {
   CORE_HASH_STRUCTURE,
   ELEMENT_PATH_DELIMITER,
 } from '../../../../../../MetaModelConst';
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import type { V1_Profile } from './domain/V1_Profile';
 import type { V1_Class } from './domain/V1_Class';
 import type { V1_Enumeration } from './domain/V1_Enumeration';

package/src/models/protocols/pure/v1/model/packageableElements/connection/V1_ConnectionPointer.ts

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../MetaModelConst';
-import type { V1_ConnectionVisitor } from '../../../model/packageableElements/connection/V1_Connection';
-import { V1_Connection } from '../../../model/packageableElements/connection/V1_Connection';
+import {
+  type V1_ConnectionVisitor,
+  V1_Connection,
+} from '../../../model/packageableElements/connection/V1_Connection';
 
 export class V1_ConnectionPointer extends V1_Connection implements Hashable {
   connection!: string;

package/src/models/protocols/pure/v1/model/packageableElements/connection/V1_PackageableConnection.ts

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../MetaModelConst';
-import type { V1_PackageableElementVisitor } from '../../../model/packageableElements/V1_PackageableElement';
-import { V1_PackageableElement } from '../../../model/packageableElements/V1_PackageableElement';
+import {
+  type V1_PackageableElementVisitor,
+  V1_PackageableElement,
+} from '../../../model/packageableElements/V1_PackageableElement';
 import type { V1_Connection } from '../../../model/packageableElements/connection/V1_Connection';
 
 export class V1_PackageableConnection

package/src/models/protocols/pure/v1/model/packageableElements/domain/V1_Association.ts

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../MetaModelConst';
 import type { V1_DerivedProperty } from './V1_DerivedProperty';
 import type { V1_Property } from './V1_Property';
-import type { V1_PackageableElementVisitor } from '../../../model/packageableElements/V1_PackageableElement';
-import { V1_PackageableElement } from '../../../model/packageableElements/V1_PackageableElement';
+import {
+  type V1_PackageableElementVisitor,
+  V1_PackageableElement,
+} from '../../../model/packageableElements/V1_PackageableElement';
 import type { V1_StereotypePtr } from '../../../model/packageableElements/domain/V1_StereotypePtr';
 import type { V1_TaggedValue } from '../../../model/packageableElements/domain/V1_TaggedValue';
 

package/src/models/protocols/pure/v1/model/packageableElements/domain/V1_Class.ts

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-import { hashArray } from '@finos/legend-shared';
-import type { Hashable } from '@finos/legend-shared';
+import { hashArray, type Hashable } from '@finos/legend-shared';
 import { CORE_HASH_STRUCTURE } from '../../../../../../../MetaModelConst';
 import type { V1_Property } from '../../../model/packageableElements/domain/V1_Property';
 import type { V1_StereotypePtr } from '../../../model/packageableElements/domain/V1_StereotypePtr';
-import type { V1_PackageableElementVisitor } from '../../../model/packageableElements/V1_PackageableElement';
-import { V1_PackageableElement } from '../../../model/packageableElements/V1_PackageableElement';
+import {
+  type V1_PackageableElementVisitor,
+  V1_PackageableElement,
+} from '../../../model/packageableElements/V1_PackageableElement';
 import type { V1_TaggedValue } from '../../../model/packageableElements/domain/V1_TaggedValue';
 import type { V1_Constraint } from '../../../model/packageableElements/domain/V1_Constraint';
 import type { V1_DerivedProperty } from './V1_DerivedProperty';