@conduit-client/generator-ts 3.7.1 → 3.9.0

package/dist/types/v1/generators/bindings-generator.d.ts

@@ -40,6 +40,8 @@ export declare class BindingsGenerator {
     protected typeInvalidationDeclarationSymbol: symbol;
     protected typeInvalidationDefinitionSymbol: symbol;
     protected rootTypesInstantiationSymbol: symbol;
+    protected exportsTypeMembersSymbol: symbol;
+    protected exportsAssignmentsSymbol: symbol;
     /**
      * Template for generating the binding structure in the output file.
      * Includes placeholders for adapter declarations, service requirements, and adapter invocations.
@@ -52,7 +54,8 @@ export declare class BindingsGenerator {
      *
      * @returns {Code[]} An array of code blocks forming the template for the binding output file.
      */
-    get template(): (symbol | Code)[];
+    get coreTemplate(): (symbol | Code)[];
+    get wrapperTemplate(): Code[];
     protected get serviceDependencies(): ServiceDependency[];
     /**
      * Builds the binding file, generating declarations, requirements, and invocations for each command model.

package/dist/v1/index.js

@@ -2422,7 +2422,7 @@ const FETCH_RESPONSE$1 = {
   exportedSymbol: "FetchResponse",
   isType: true
 };
-const COERCE_RESPONSE_TO_FETCH_RESPONSE = {
+const COERCE_RESPONSE_TO_FETCH_RESPONSE$1 = {
   module: "@conduit-client/utils",
   exportedSymbol: "coerceResponseToFetchResponse",
   isType: false
@@ -2578,7 +2578,7 @@ class HttpCommandGenerator extends CommandGenerator {
   generateCoerceError() {
     if (this.commandModel.errorStrategy.type === "fetchResponse") {
       return code`async coerceError(errorResponse: Response):Promise<${FETCH_RESPONSE$1}<unknown>>{
-                return ${COERCE_RESPONSE_TO_FETCH_RESPONSE}(errorResponse)
+                return ${COERCE_RESPONSE_TO_FETCH_RESPONSE$1}(errorResponse)
             }`;
     }
     return code``;
@@ -2594,6 +2594,11 @@ const CONVERT_AURA_ERRORS_TO_FETCH_RESPONSE = {
   exportedSymbol: "getFetchResponseFromAuraError",
   isType: false
 };
+const COERCE_RESPONSE_TO_FETCH_RESPONSE = {
+  module: "@conduit-client/utils",
+  exportedSymbol: "coerceResponseToFetchResponse",
+  isType: false
+};
 const AURA_COMMAND_BASE_CLASS = {
   module: "@conduit-client/command-aura-network/v1",
   exportedSymbol: "AuraNetworkCommand",
@@ -2686,7 +2691,15 @@ class AuraCommandGenerator extends HttpCommandGenerator {
    */
   generateCoerceError() {
     if (this.commandModel.errorStrategy.type === "fetchResponse") {
-      return code`protected override coerceAuraErrors(auraErrors: any[]):${FETCH_RESPONSE}<unknown>{return ${CONVERT_AURA_ERRORS_TO_FETCH_RESPONSE}(auraErrors[0])}`;
+      return code`
+                protected override coerceAuraErrors(auraErrors: any[]):${FETCH_RESPONSE}<unknown>{
+                    return ${CONVERT_AURA_ERRORS_TO_FETCH_RESPONSE}(auraErrors[0])
+                }
+
+                protected override async coerceError(errorResponse: Response):Promise<${FETCH_RESPONSE}<unknown>>{
+                    return ${COERCE_RESPONSE_TO_FETCH_RESPONSE}(errorResponse)
+                }
+            `;
     }
     return code``;
   }
@@ -3253,8 +3266,14 @@ const OPTIONAL_SERVICE_REQUEST_TYPE = {
   exportedSymbol: "OptionalServiceRequest",
   isType: true
 };
-const GET_SERVICES = {
+const REQUESTED_SERVICES_TYPE = {
   module: "@conduit-client/service-provisioner/v1",
+  exportedSymbol: "RequestedServices",
+  isType: true
+};
+const INIT_BINDINGS_EXPORTS = {
+  module: "@conduit-client/bindings-utils/v1",
+  exportedSymbol: "initBindingsExports",
   isType: false
 };
 const INSTRUMENT_COMMAND_DESCRIPTOR = {
@@ -3425,6 +3444,8 @@ class BindingsGenerator {
     this.typeInvalidationDeclarationSymbol = Symbol.for("typeInvalidationDeclaration");
     this.typeInvalidationDefinitionSymbol = Symbol.for("typeInvalidationDefinition");
     this.rootTypesInstantiationSymbol = Symbol.for("rootTypesInstantiation");
+    this.exportsTypeMembersSymbol = Symbol.for("exportsTypeMembers");
+    this.exportsAssignmentsSymbol = Symbol.for("exportsAssignments");
   }
   /**
    * Template for generating the binding structure in the output file.
@@ -3438,21 +3459,33 @@ class BindingsGenerator {
    *
    * @returns {Code[]} An array of code blocks forming the template for the binding output file.
    */
-  get template() {
+  get coreTemplate() {
     return [
       this.bindingsServicesDeclarationSymbol,
       this.adapterDeclarationSymbol,
       this.typeInvalidationDeclarationSymbol,
-      code`const serviceRequirements=`,
+      code`export type BindingsExports = {`,
+      this.exportsTypeMembersSymbol,
+      code`};`,
+      code`export const exports = {} as BindingsExports;`,
+      code`export const serviceRequirements=`,
       this.serviceRequirementsSymbol,
-      code`;`,
-      code`${GET_SERVICES}(serviceRequirements).then(
-                (services) => {`,
+      code` as const;`,
+      code`export function initGeneratedBindings(services: ${REQUESTED_SERVICES_TYPE}<typeof serviceRequirements>, exports: BindingsExports) {`,
       this.typeRegistryInstantiationSymbol,
       this.rootTypesInstantiationSymbol,
       this.typeInvalidationDefinitionSymbol,
       this.adapterInvocationSymbol,
-      code`},(_err) => {});`
+      this.exportsAssignmentsSymbol,
+      code`}`
+    ];
+  }
+  get wrapperTemplate() {
+    return [
+      code`export * from './bindings-core';`,
+      code`import { exports, serviceRequirements, initGeneratedBindings } from './bindings-core';`,
+      code`export const ready = ${INIT_BINDINGS_EXPORTS}({ serviceRequirements, exports, init: initGeneratedBindings }).ready;`,
+      code`export default exports;`
     ];
   }
   get serviceDependencies() {
@@ -3580,20 +3613,23 @@ class BindingsGenerator {
    * This method coordinates with individual binding generators to compile the necessary elements into a single file.
    */
   build() {
-    const filename = "artifacts/bindings.ts";
-    const file = this.services.file.build(filename);
-    file.template = this.template;
+    const coreFilename = "artifacts/bindings-core.ts";
+    const coreFile = this.services.file.build(coreFilename);
+    coreFile.template = this.coreTemplate;
+    const wrapperFilename = "artifacts/bindings.ts";
+    const wrapperFile = this.services.file.build(wrapperFilename);
+    wrapperFile.template = this.wrapperTemplate;
     if (this.hasRESTNormalization) {
       const { typeRegistryGenerator } = this.services;
-      file.pushTo(
+      coreFile.pushTo(
         this.typeRegistryInstantiationSymbol,
         code`const typeRegistry = new ${typeRegistryGenerator.build()}(services);`
       );
       const { declarations, definitions } = this.buildTypeInvalidation(
         typeRegistryGenerator.invalidatableTypes
       );
-      file.pushTo(this.typeInvalidationDeclarationSymbol, declarations);
-      file.pushTo(this.typeInvalidationDefinitionSymbol, definitions);
+      coreFile.pushTo(this.typeInvalidationDeclarationSymbol, declarations);
+      coreFile.pushTo(this.typeInvalidationDefinitionSymbol, definitions);
     }
     if (this.hasGraphQL) {
       const { graphqlTypeRegistryGenerator } = this.services;
@@ -3615,13 +3651,13 @@ class BindingsGenerator {
         schemaModel: firstGraphQLCommand.schema,
         type: mutationTypeModel
       }) : void 0;
-      file.pushTo(
+      coreFile.pushTo(
         this.rootTypesInstantiationSymbol,
         code`const graphqlTypeRegistry = new ${graphqlTypeRegistry}(services);
                 const ${QUERY_TYPE_VARIABLE_NAME} = graphqlTypeRegistry.${queryType.propertyName};`
       );
       if (mutationType) {
-        file.pushTo(
+        coreFile.pushTo(
           this.rootTypesInstantiationSymbol,
           code`const ${MUTATION_TYPE_VARIABLE_NAME} = graphqlTypeRegistry.${mutationType.propertyName};`
         );
@@ -3633,10 +3669,10 @@ class BindingsGenerator {
       })
     );
     bindingGenerators.forEach((generator) => {
-      file.pushTo(this.adapterDeclarationSymbol, generator.buildDeclaration());
+      coreFile.pushTo(this.adapterDeclarationSymbol, generator.buildDeclaration());
     });
-    file.pushTo(this.serviceRequirementsSymbol, this.buildRequirements());
-    file.pushTo(
+    coreFile.pushTo(this.serviceRequirementsSymbol, this.buildRequirements());
+    coreFile.pushTo(
       this.adapterInvocationSymbol,
       Code.join(
         bindingGenerators.flatMap((generator) => {
@@ -3652,6 +3688,35 @@ class BindingsGenerator {
         ""
       )
     );
+    const exportNames = [
+      ...bindingGenerators.map((g) => {
+        var _a;
+        return (_a = g.binding) == null ? void 0 : _a.identifier;
+      }).filter(Boolean)
+    ];
+    if (this.hasRESTNormalization) {
+      const { typeRegistryGenerator } = this.services;
+      exportNames.push(
+        ...typeRegistryGenerator.invalidatableTypes.map(({ propertyName }) => {
+          return `invalidate${toTypeScriptSafeIdentifier(propertyName)}`;
+        })
+      );
+    }
+    const uniqueExportNames = Array.from(new Set(exportNames));
+    coreFile.pushTo(
+      this.exportsTypeMembersSymbol,
+      Code.join(
+        uniqueExportNames.map((name) => code`${name}: typeof ${code`${name}`};`),
+        "\n"
+      )
+    );
+    coreFile.pushTo(
+      this.exportsAssignmentsSymbol,
+      Code.join(
+        uniqueExportNames.map((name) => code`exports.${code`${name}`} = ${code`${name}`};`),
+        "\n"
+      )
+    );
   }
   buildTypeInvalidation(typesWithNormalization) {
     return typesWithNormalization.reduce(