@conduit-client/generator-ts 3.17.0 → 3.17.2

package/dist/types/v1/generators/base-command-generator.d.ts

@@ -96,6 +96,11 @@ export declare abstract class CommandGenerator {
      * Override (e.g. GraphQL) when the constructor has a fixed param list with no rest.
      */
     protected getBuildCommandClassConstructorParams(): Code;
+    /**
+     * Additional generic type args for the Generated declare class that surface
+     * public constructor fields (config, typeRegistry, etc.) on InstanceType<>.
+     */
+    protected getBuildCommandClassConstructorFieldGenerics(): Code;
     protected buildCommandTypeGenerics(): Code;
     protected buildExtraServices(): Code | undefined;
     protected generateAfterRequestHooks(): Code;

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

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

package/dist/v1/index.js

@@ -2249,9 +2249,9 @@ class CommandGenerator {
   }
   get commandConstructorArgs() {
     if (this.commandModel.invalidationConfigs.length > 0) {
-      return code`private config: Config, private typeRegistry: ${this.services.typeRegistryGenerator.build()}`;
+      return code`public config: Config, public typeRegistry: ${this.services.typeRegistryGenerator.build()}`;
     }
-    return code`private config: Config`;
+    return code`public config: Config`;
   }
   get exposeSubscribeAndRefresh() {
     if (this.commandModel.exposeRefresh && this.commandModel.cacheStrategy.type === "none") {
@@ -2332,7 +2332,8 @@ class CommandGenerator {
     file.pushTo(this.commandClassBodySymbol, ...this.classBody);
     const generatedClass = this.commandGeneratedClass;
     if (generatedClass) {
-      const constructorSignature = code`new (${this.getBuildCommandClassConstructorParams()}) => ${generatedClass}<${this.getBuildCommandClassReturnTypeGenerics()}>`;
+      const fieldGenerics = this.getBuildCommandClassConstructorFieldGenerics();
+      const constructorSignature = code`new (${this.getBuildCommandClassConstructorParams()}) => ${generatedClass}<${this.getBuildCommandClassReturnTypeGenerics()}, ${fieldGenerics}>`;
       file.pushTo(this.commandBuildCommandClassReturnTypeSymbol, constructorSignature);
       file.pushTo(
         this.commandBuildCommandClassReturnAssertionSymbol,
@@ -2369,6 +2370,16 @@ class CommandGenerator {
   getBuildCommandClassConstructorParams() {
     return code`${this.commandTypeConstructorArgs}, ...args: CommandConstructorParams`;
   }
+  /**
+   * Additional generic type args for the Generated declare class that surface
+   * public constructor fields (config, typeRegistry, etc.) on InstanceType<>.
+   */
+  getBuildCommandClassConstructorFieldGenerics() {
+    if (this.commandModel.invalidationConfigs.length > 0) {
+      return code`Config, ${this.services.typeRegistryGenerator.build()}`;
+    }
+    return code`Config`;
+  }
   buildCommandTypeGenerics() {
     var _a;
     const extraServicesCode = this.buildExtraServices();
@@ -2965,7 +2976,7 @@ class ImperativeAdapterBindingGenerator {
     };
   }
   buildDeclaration() {
-    return code`export let ${this.binding.identifier}:${this.bindingTypeCode};`;
+    return code`let ${this.binding.identifier}:${this.bindingTypeCode};`;
   }
   get bindingTypeCode() {
     return code`(config:${this.commandConfigTypeImport}, options?: ${this.commandOptionsTypeImport})=>${this.returnShape}<${this.responseTypeCode}>`;
@@ -3016,7 +3027,7 @@ class ImperativeAdapterBindingGenerator {
     const requiresTypeRegistry = this.commandModel.cacheStrategy.type === "normalized" || this.commandModel.invalidationConfigs.length > 0;
     const typeRegistry = requiresTypeRegistry ? "typeRegistry," : "";
     return code`const ${this.localCommandConstructorName} = services.instrumentCommand(${this.classBuilderImport}(${servicesName}.${this.commandModel.serviceDependencies.baseClass.localName}), '${this.commandModel.className}');
-            ${this.binding.identifier}=${this.invoker}<Parameters<typeof ${this.binding.identifier}>,${this.responseTypeCode}>(
+            const ${this.binding.identifier}=${this.invoker}<Parameters<BindingsExports["${this.binding.identifier}"]>,${this.responseTypeCode}>(
             ({params,assertIsValid})=>{
             const config=params[0];
             const options=params[1];
@@ -3067,7 +3078,7 @@ class ImperativeAdapterLegacyBindingGenerator {
     );
   }
   buildDeclaration() {
-    return code`export let ${this.binding.identifier}:${LEGACY_IMPERATIVE_RETURN_SHAPE}<${this.commandConfigTypeImport},${this.responseTypeCode}>;`;
+    return code`let ${this.binding.identifier}:${LEGACY_IMPERATIVE_RETURN_SHAPE}<${this.commandConfigTypeImport},${this.responseTypeCode}>;`;
   }
   get localCommandConstructorName() {
     return `${this.binding.identifier}_ctor`;
@@ -3078,7 +3089,7 @@ class ImperativeAdapterLegacyBindingGenerator {
   buildInvocation(servicesName = "services") {
     const requiresTypeRegistry = this.commandModel.cacheStrategy.type === "normalized" || this.commandModel.invalidationConfigs.length > 0;
     return code`const ${this.localCommandConstructorName} = services.instrumentCommand(${this.classBuilderImport}(${servicesName}.${this.commandModel.serviceDependencies.baseClass.localName}), '${this.commandModel.className}');
-            ${this.binding.identifier}=services.${LEGACY_IMPERATIVE_BINDINGS}.bind<${this.commandConfigTypeImport},${this.responseTypeCode}>(
+            const ${this.binding.identifier}=services.${LEGACY_IMPERATIVE_BINDINGS}.bind<${this.commandConfigTypeImport},${this.responseTypeCode}>(
             ({config,assertIsValid})=>{
             const _:<T>(data:unknown,_:${JSON_SCHEMA_TYPE$3})=>asserts data is T=assertIsValid;
             _<${this.commandConfigTypeImport}>(config,${this.commandConfigSchemaImport});
@@ -3127,7 +3138,7 @@ class GraphQLImperativeAdapterLegacyBindingGenerator {
     );
   }
   buildDeclaration() {
-    return code`export let ${this.binding.identifier}:${LEGACY_GRAPHQL_IMPERATIVE_RETURN_SHAPE}<${this.commandConfigTypeImport}>;`;
+    return code`let ${this.binding.identifier}:${LEGACY_GRAPHQL_IMPERATIVE_RETURN_SHAPE}<${this.commandConfigTypeImport}>;`;
   }
   get localCommandConstructorName() {
     return `${this.binding.identifier}_ctor`;
@@ -3137,7 +3148,7 @@ class GraphQLImperativeAdapterLegacyBindingGenerator {
   }
   buildInvocation(servicesName = "services") {
     return code`const ${this.localCommandConstructorName} = services.instrumentCommand(${this.classBuilderImport}(${servicesName}.${this.commandModel.serviceDependencies.baseClass.localName}), '${this.commandModel.className}');
-            ${this.binding.identifier}=services.${GRAPHQL_LEGACY_IMPERATIVE_BINDINGS}.bind<${this.commandConfigTypeImport}>(
+            const ${this.binding.identifier}=services.${GRAPHQL_LEGACY_IMPERATIVE_BINDINGS}.bind<${this.commandConfigTypeImport}>(
             ({config,assertIsValid})=>{
             const _:<T>(data:unknown,_:${JSON_SCHEMA_TYPE$2})=>asserts data is T=assertIsValid;
             _<${this.commandConfigTypeImport}>(config,${this.commandConfigSchemaImport});
@@ -3184,7 +3195,7 @@ class WireAdapterBindingGenerator {
     );
   }
   buildDeclaration() {
-    return code`export let ${this.binding.identifier}:${WIRE_ADAPTER_CONSTRUCTOR$1}<${this.commandConfigTypeImport}, ${WIRE_ADAPTER_RESULT}<${this.responseTypeCode}>, {}>;`;
+    return code`let ${this.binding.identifier}:${WIRE_ADAPTER_CONSTRUCTOR$1}<${this.commandConfigTypeImport}, ${WIRE_ADAPTER_RESULT}<${this.responseTypeCode}>, {}>;`;
   }
   get localCommandConstructorName() {
     return `${this.binding.identifier}_ctor`;
@@ -3194,7 +3205,7 @@ class WireAdapterBindingGenerator {
   }
   buildInvocation(servicesName = "services") {
     return code`const ${this.localCommandConstructorName} = services.instrumentCommand(${this.classBuilderImport}(${servicesName}.${this.commandModel.serviceDependencies.baseClass.localName}), '${this.commandModel.className}');
-            ${this.binding.identifier}=services.${LWC_WIRE_BINDINGS}.bind<${this.responseTypeCode}, ${this.commandConfigTypeImport}>(
+            const ${this.binding.identifier}=services.${LWC_WIRE_BINDINGS}.bind<${this.responseTypeCode}, ${this.commandConfigTypeImport}>(
                 (config: ${this.commandConfigTypeImport}) => new ${this.localCommandConstructorName}(config!,${this.getTypeRegistryArgument()}${servicesName}),${this.commandConfigSchemaImport},${this.commandModel.exposeRefresh});`;
   }
   getTypeRegistryArgument() {
@@ -3247,7 +3258,7 @@ class GraphQLImperativeAdapterBindingGenerator {
     };
   }
   buildDeclaration() {
-    return code`export let ${this.binding.identifier}:${this.bindingTypeCode};`;
+    return code`let ${this.binding.identifier}:${this.bindingTypeCode};`;
   }
   get bindingTypeCode() {
     return code`(config:${this.commandConfigTypeImport}, options?: ${this.commandOptionsTypeImport})=>${this.returnShape}`;
@@ -3275,7 +3286,7 @@ class GraphQLImperativeAdapterBindingGenerator {
   }
   buildInvocation(servicesName = "services") {
     return code`const ${this.localCommandConstructorName} = services.instrumentCommand(${this.classBuilderImport}(${servicesName}.${this.commandModel.serviceDependencies.baseClass.localName}), '${this.commandModel.className}');
-            ${this.binding.identifier}=${this.invoker}<Parameters<typeof ${this.binding.identifier}>>(
+            const ${this.binding.identifier}=${this.invoker}<Parameters<BindingsExports["${this.binding.identifier}"]>>(
             ({params,assertIsValid})=>{
             const config=params[0];
             const options=params[1];
@@ -3326,7 +3337,7 @@ class GraphQLWireAdapterBindingGenerator {
     );
   }
   buildDeclaration() {
-    return code`export let ${this.binding.identifier}:${WIRE_ADAPTER_CONSTRUCTOR}<${this.commandConfigTypeImport}, ${GRAPHQL_WIRE_ADAPTER_RESULT}, {}>;`;
+    return code`let ${this.binding.identifier}:${WIRE_ADAPTER_CONSTRUCTOR}<${this.commandConfigTypeImport}, ${GRAPHQL_WIRE_ADAPTER_RESULT}, {}>;`;
   }
   get localCommandConstructorName() {
     return `${this.binding.identifier}_ctor`;
@@ -3336,7 +3347,7 @@ class GraphQLWireAdapterBindingGenerator {
   }
   buildInvocation(servicesName = "services") {
     return code`const ${this.localCommandConstructorName} = services.instrumentCommand(${this.classBuilderImport}(${servicesName}.${this.commandModel.serviceDependencies.baseClass.localName}), '${this.commandModel.className}');
-            ${this.binding.identifier}=services.${GRAPHQL_WIRE_BINDINGS}.bind<${this.commandConfigTypeImport}>((config: ${this.commandConfigTypeImport}) => new ${this.localCommandConstructorName}(config,${QUERY_TYPE_VARIABLE_NAME},${servicesName}), ${this.commandConfigSchemaImport}, ${this.commandModel.exposeRefresh});`;
+            const ${this.binding.identifier}=services.${GRAPHQL_WIRE_BINDINGS}.bind<${this.commandConfigTypeImport}>((config: ${this.commandConfigTypeImport}) => new ${this.localCommandConstructorName}(config,${QUERY_TYPE_VARIABLE_NAME},${servicesName}), ${this.commandConfigSchemaImport}, ${this.commandModel.exposeRefresh});`;
   }
 }
 const GRAPHQL_MUTATION_RESULT = {
@@ -3382,7 +3393,7 @@ class GraphQLMutationAdapterBindingGenerator {
     };
   }
   buildDeclaration() {
-    return code`export let ${this.binding.identifier}:${this.bindingTypeCode};`;
+    return code`let ${this.binding.identifier}:${this.bindingTypeCode};`;
   }
   get bindingTypeCode() {
     return code`(config:${this.commandConfigTypeImport}, options?: ${this.commandOptionsTypeImport})=>${this.returnShape}`;
@@ -3401,7 +3412,7 @@ class GraphQLMutationAdapterBindingGenerator {
   }
   buildInvocation(servicesName = "services") {
     return code`const ${this.localCommandConstructorName} = services.instrumentCommand(${this.classBuilderImport}(${servicesName}.${this.commandModel.serviceDependencies.baseClass.localName}), '${this.commandModel.className}');
-            ${this.binding.identifier}=${this.invoker}<Parameters<typeof ${this.binding.identifier}>>(
+            const ${this.binding.identifier}=${this.invoker}<Parameters<BindingsExports["${this.binding.identifier}"]>>(
             ({params,assertIsValid})=>{
             const config=params[0];
             const options=params[1];
@@ -3602,10 +3613,12 @@ class BindingsGenerator {
     this.typeInvalidationDefinitionSymbol = Symbol.for("typeInvalidationDefinition");
     this.rootTypesInstantiationSymbol = Symbol.for("rootTypesInstantiation");
     this.exportsTypeMembersSymbol = Symbol.for("exportsTypeMembers");
-    this.exportsAssignmentsSymbol = Symbol.for("exportsAssignments");
     this.initGeneratedBindingsExtraParamsSymbol = Symbol.for(
       "initGeneratedBindingsExtraParams"
     );
+    this.returnStatementSymbol = Symbol.for("returnStatement");
+    this.wrapperDeclarationsSymbol = Symbol.for("wrapperDeclarations");
+    this.wrapperAssignmentsSymbol = Symbol.for("wrapperAssignments");
   }
   /**
    * Template for generating the binding structure in the output file.
@@ -3627,27 +3640,31 @@ class BindingsGenerator {
       code`export type BindingsExports = {`,
       this.exportsTypeMembersSymbol,
       code`};`,
-      code`export const exports = {} as BindingsExports;`,
       code`export const serviceRequirements=`,
       this.serviceRequirementsSymbol,
       code` as const;`,
-      code`export function initGeneratedBindings<S extends ${REQUESTED_SERVICES_TYPE}<typeof serviceRequirements>>(services: S, exports: BindingsExports`,
+      code`export function initGeneratedBindings<S extends ${REQUESTED_SERVICES_TYPE}<typeof serviceRequirements>>(services: S`,
       this.initGeneratedBindingsExtraParamsSymbol,
-      code`) {`,
+      code`): BindingsExports {`,
       this.typeRegistryInstantiationSymbol,
       this.rootTypesInstantiationSymbol,
       this.typeInvalidationDefinitionSymbol,
       this.adapterInvocationSymbol,
-      this.exportsAssignmentsSymbol,
+      this.returnStatementSymbol,
       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;`
+      code`import { serviceRequirements, initGeneratedBindings, type BindingsExports } from './bindings-core';`,
+      this.wrapperDeclarationsSymbol,
+      code`${INIT_BINDINGS_EXPORTS}({`,
+      code`serviceRequirements,`,
+      code`init: (services) => {`,
+      code`const result = initGeneratedBindings(services);`,
+      this.wrapperAssignmentsSymbol,
+      code`},`,
+      code`});`
     ];
   }
   get serviceDependencies() {
@@ -3884,9 +3901,25 @@ class BindingsGenerator {
       )
     );
     coreFile.pushTo(
-      this.exportsAssignmentsSymbol,
+      this.returnStatementSymbol,
+      code`return {${Code.join(
+        uniqueExportNames.map((name) => code`${name},`),
+        " "
+      )}};`
+    );
+    wrapperFile.pushTo(
+      this.wrapperDeclarationsSymbol,
       Code.join(
-        uniqueExportNames.map((name) => code`exports.${code`${name}`} = ${code`${name}`};`),
+        uniqueExportNames.map(
+          (name) => code`export let ${code`${name}`}: BindingsExports['${name}'];`
+        ),
+        "\n"
+      )
+    );
+    wrapperFile.pushTo(
+      this.wrapperAssignmentsSymbol,
+      Code.join(
+        uniqueExportNames.map((name) => code`${code`${name}`} = result.${code`${name}`};`),
         "\n"
       )
     );
@@ -3990,10 +4023,10 @@ class BindingsGenerator {
       (acc, { propertyName, typeClassRef }) => {
         const invalidateFunctionName = code`invalidate${toTypeScriptSafeIdentifier(propertyName)}`;
         acc.declarations.push(
-          code`export let ${invalidateFunctionName}: ${typeClassRef}["invalidate"];`
+          code`let ${invalidateFunctionName}: ${typeClassRef}["invalidate"];`
         );
         acc.definitions.push(
-          code`${invalidateFunctionName} = (configs) => typeRegistry.${toTypeScriptSafeIdentifier(propertyName)}.invalidate(configs);`
+          code`const ${invalidateFunctionName}: ${typeClassRef}["invalidate"] = (configs) => typeRegistry.${toTypeScriptSafeIdentifier(propertyName)}.invalidate(configs);`
         );
         return acc;
       },
@@ -4293,7 +4326,10 @@ function NormalizedCacheControlGeneratorMixin(Base, commandBaseClass, commandGen
       return code`config: Config, typeRegistry: ${this.services.typeRegistryGenerator.build()}`;
     }
     get commandConstructorArgs() {
-      return code`private config: Config, private typeRegistry: ${this.services.typeRegistryGenerator.build()}`;
+      return code`public config: Config, public typeRegistry: ${this.services.typeRegistryGenerator.build()}`;
+    }
+    getBuildCommandClassConstructorFieldGenerics() {
+      return code`Config, ${this.services.typeRegistryGenerator.build()}`;
     }
     buildCommandTypeGenerics() {
       const extraServicesCode = this.buildExtraServices();
@@ -4493,8 +4529,11 @@ function GraphQLNormalizedCacheControlGeneratorMixin(Base, commandBaseClass, com
     getBuildCommandClassReturnTypeGenerics() {
       return this.buildCommandTypeGenerics();
     }
+    getBuildCommandClassConstructorFieldGenerics() {
+      return code`CommandConfig, DocumentRootType, ${NAMED_CACHE_CONTROLLER_SERVICE} & ${NAMED_PUBSUB_SERVICE$3} & ${this.buildNetworkServicesCode()} & object`;
+    }
     get commandConstructorArgs() {
-      return code`protected config: CommandConfig, protected documentRootType: DocumentRootType, protected services: ${NAMED_CACHE_CONTROLLER_SERVICE} & ${NAMED_PUBSUB_SERVICE$3} & ${this.buildNetworkServicesCode()} & object`;
+      return code`public config: CommandConfig, public documentRootType: DocumentRootType, public services: ${NAMED_CACHE_CONTROLLER_SERVICE} & ${NAMED_PUBSUB_SERVICE$3} & ${this.buildNetworkServicesCode()} & object`;
     }
     get commandConstructorBody() {
       return code`super(config, documentRootType, services);`;