@goast/typescript 0.2.0 → 0.2.2

package/assets/stubs/easy-network-stub/easy-network-stub.utils.ts

@@ -226,6 +226,29 @@ export class EasyNetworkStubBase {
   }
 }
 
+export type EasyNetworkStubGroup<Group, GroupContainer> = Group & {
+  (stubActions: (stubs: Group) => void): GroupContainer;
+};
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+declare interface GroupType<T> extends Function {
+  new (stubWrapper: EasyNetworkStubWrapper): T;
+}
+
+export function createEasyNetworkStubGroup<GroupContainer, Group>(
+  container: GroupContainer,
+  stubWrapper: EasyNetworkStubWrapper,
+  groupType: GroupType<Group>,
+): EasyNetworkStubGroup<Group, GroupContainer> {
+  const group = new groupType(stubWrapper);
+  const groupFn = (stubActions: (stubs: Group) => void) => {
+    stubActions(group);
+    return container;
+  };
+  Object.setPrototypeOf(groupFn, groupType.prototype);
+  return Object.assign(groupFn, group);
+}
+
 function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }

package/cjs/lib/ast/references/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rxjs = exports.angular = void 0;
+exports.rxjs = exports.angular = exports.easyNetworkStub = void 0;
 const tslib_1 = require("tslib");
+exports.easyNetworkStub = tslib_1.__importStar(require("./easy-network-stub"));
 exports.angular = tslib_1.__importStar(require("./angular"));
 exports.rxjs = tslib_1.__importStar(require("./rxjs"));
 tslib_1.__exportStar(require("./typescript"), exports);

package/cjs/lib/generators/services/angular-services/angular-service-generator.js

@@ -52,7 +52,12 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_1.TypeScri
             ast_1.ts.unionType([
                 ...Object.entries(statusCodes).map(([key, value]) => ast_1.ts.intersectionType([
                     ast_1.ts.refs.angular.httpResponse([value]),
-                    ast_1.ts.objectType({ members: [ast_1.ts.property('status', { type: key })] }),
+                    ast_1.ts.objectType({
+                        members: [
+                            ast_1.ts.property('status', { type: key }),
+                            ast_1.ts.property('ok', { type: key.startsWith('2') ? 'true' : 'false' }),
+                        ],
+                    }),
                 ])),
                 !ctx.config.strictResponseTypes
                     ? ast_1.ts.intersectionType([

package/cjs/lib/generators/services/easy-network-stub/easy-network-stubs-generator.js

@@ -58,11 +58,71 @@ class TypeScriptEasyNetworkStubsGenerator extends core_1.OpenApiServicesGenerati
         };
     }
     getStubsIndexFileContent(ctx) {
-        return (0, core_1.appendValueGroup)(Object.values(ctx.output.stubs).map((x) => ast_1.ts.export(x.component, x.filePath)));
+        return (0, core_1.appendValueGroup)([
+            (0, core_1.appendValueGroup)(Object.values(ctx.output.stubs).map((x) => ast_1.ts.export(x.component, x.filePath))),
+            this.getStubsClass(ctx),
+        ], '\n');
+    }
+    getStubsClass(ctx) {
+        const fieldCasing = (0, core_1.adjustCasing)(ctx.config.propertyNameCasing, { prefix: '_' });
+        const serviceNames = Object.fromEntries(ctx.data.services.map((x) => [x.id, x.name]));
+        return ast_1.ts.class(this.getStubsClassName(ctx), {
+            export: true,
+            members: [
+                ast_1.ts.property('_stubWrapper', {
+                    accessModifier: 'private',
+                    readonly: true,
+                    type: ctx.refs.easyNetworkStubWrapper(),
+                }),
+                ...Object.entries(ctx.output.stubs).map(([id, x]) => ast_1.ts.property((0, core_1.toCasing)(serviceNames[id], fieldCasing), {
+                    accessModifier: 'private',
+                    optional: true,
+                    type: ctx.refs.easyNetworkStubGroup([ast_1.ts.reference(x.component, x.filePath), 'this']),
+                })),
+                ast_1.ts.constructor({
+                    parameters: [
+                        ast_1.ts.constructorParameter('stub', { type: ast_1.ts.refs.easyNetworkStub.easyNetworkStub() }),
+                        ast_1.ts.constructorParameter('options', {
+                            type: ast_1.ts.refs.partial([ctx.refs.easyNetworkStubWrapperOptions()]),
+                            optional: true,
+                        }),
+                    ],
+                    body: (0, core_1.appendValueGroup)([(0, core_1.builderTemplate) `this._stubWrapper = new ${ctx.refs.easyNetworkStubWrapper()}(stub, options);`], '\n'),
+                }),
+                ast_1.ts.property('requests', {
+                    accessModifier: 'public',
+                    type: ast_1.ts.arrayType(ctx.refs.stubRequestItem(), { readonly: true }),
+                    get: ast_1.ts.property.getter({
+                        body: (0, core_1.appendValueGroup)(['return this._stubWrapper.requests;'], '\n'),
+                    }),
+                }),
+                ...Object.entries(ctx.output.stubs).map(([id, x]) => ast_1.ts.property((0, core_1.toCasing)(serviceNames[id], ctx.config.propertyNameCasing), {
+                    accessModifier: 'public',
+                    type: ctx.refs.easyNetworkStubGroup([ast_1.ts.reference(x.component, x.filePath), 'this']),
+                    get: ast_1.ts.property.getter({
+                        body: (0, core_1.appendValueGroup)([
+                            (0, core_1.builderTemplate) `return this.${(0, core_1.toCasing)(serviceNames[id], fieldCasing)} ??= ${ctx.refs.createEasyNetworkStubGroup.infer()}(this, this._stubWrapper, ${ast_1.ts.reference(x.component, x.filePath)});`,
+                        ], '\n'),
+                    }),
+                })),
+                ast_1.ts.method('resetStubs', {
+                    accessModifier: 'public',
+                    returnType: 'this',
+                    body: (0, core_1.appendValueGroup)([
+                        ...Object.keys(ctx.output.stubs).map((id) => `this.${(0, core_1.toCasing)(serviceNames[id], fieldCasing)}?.reset();`),
+                        'return this;',
+                    ], '\n'),
+                }),
+            ],
+        });
     }
     getStubsIndexFilePath(ctx) {
         return ctx.config.stubsIndexFilePath ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.stubsIndexFilePath) : null;
     }
+    getStubsClassName(ctx) {
+        var _a;
+        return (0, core_1.toCasing)(`${(_a = ctx.config.domainName) !== null && _a !== void 0 ? _a : ''}_ApiStubs`, ctx.config.typeNameCasing);
+    }
     copyFile(logName, sourceDir, targetDir, fileName) {
         const source = (0, path_1.resolve)(sourceDir, fileName);
         const target = (0, path_1.resolve)(targetDir, fileName);

package/cjs/lib/generators/services/easy-network-stub/refs.js

@@ -16,6 +16,8 @@ function getReferenceFactories(options) {
         getStubResponder: ast_1.ts.reference.genericFactory('getStubResponder', easyNetworkStubUtilsPath),
         easyNetworkStubWrapper: ast_1.ts.reference.factory('EasyNetworkStubWrapper', easyNetworkStubUtilsPath),
         easyNetworkStubBase: ast_1.ts.reference.factory('EasyNetworkStubBase', easyNetworkStubUtilsPath),
+        easyNetworkStubGroup: ast_1.ts.reference.genericFactory('EasyNetworkStubGroup', easyNetworkStubUtilsPath),
+        createEasyNetworkStubGroup: ast_1.ts.reference.genericFactory('createEasyNetworkStubGroup', easyNetworkStubUtilsPath),
     };
 }
 exports.getReferenceFactories = getReferenceFactories;

package/cjs/lib/generators/services/fetch-clients/fetch-clients-generator.js

@@ -18,8 +18,9 @@ class TypeScriptClientsGenerator extends core_1.OpenApiServicesGenerationProvide
     initResult() {
         return {
             clients: {},
-            clientIndexFilePath: undefined,
-            clientInterfaceIndexFilePath: undefined,
+            indexFiles: {
+                clients: undefined,
+            },
         };
     }
     buildContext(context, config) {
@@ -31,7 +32,7 @@ class TypeScriptClientsGenerator extends core_1.OpenApiServicesGenerationProvide
     onGenerate(ctx) {
         this.copyUtilsFiles(ctx);
         const output = super.onGenerate(ctx);
-        output.clientIndexFilePath = this.generateIndexFile(ctx);
+        output.indexFiles.clients = this.generateIndexFile(ctx);
         return output;
     }
     generateService(ctx, service) {

package/esm/lib/ast/references/index.js

@@ -1,3 +1,5 @@
+import * as easyNetworkStub_1 from './easy-network-stub';
+export { easyNetworkStub_1 as easyNetworkStub };
 import * as angular_1 from './angular';
 export { angular_1 as angular };
 import * as rxjs_1 from './rxjs';

package/esm/lib/generators/services/angular-services/angular-service-generator.js

@@ -49,7 +49,12 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
             ts.unionType([
                 ...Object.entries(statusCodes).map(([key, value]) => ts.intersectionType([
                     ts.refs.angular.httpResponse([value]),
-                    ts.objectType({ members: [ts.property('status', { type: key })] }),
+                    ts.objectType({
+                        members: [
+                            ts.property('status', { type: key }),
+                            ts.property('ok', { type: key.startsWith('2') ? 'true' : 'false' }),
+                        ],
+                    }),
                 ])),
                 !ctx.config.strictResponseTypes
                     ? ts.intersectionType([

package/esm/lib/generators/services/easy-network-stub/easy-network-stubs-generator.js

@@ -1,6 +1,6 @@
 import { dirname, resolve } from 'path';
 import { copyFileSync, ensureDirSync } from 'fs-extra';
-import { Factory, OpenApiServicesGenerationProviderBase, appendValueGroup, } from '@goast/core';
+import { Factory, OpenApiServicesGenerationProviderBase, adjustCasing, appendValueGroup, toCasing, builderTemplate as s, } from '@goast/core';
 import { DefaultTypeScriptEasyNetworkStubGenerator, } from './easy-network-stub-generator';
 import { defaultTypeScriptEasyNetworkStubsGeneratorConfig, } from './models';
 import { getReferenceFactories } from './refs';
@@ -55,11 +55,71 @@ export class TypeScriptEasyNetworkStubsGenerator extends OpenApiServicesGenerati
         };
     }
     getStubsIndexFileContent(ctx) {
-        return appendValueGroup(Object.values(ctx.output.stubs).map((x) => ts.export(x.component, x.filePath)));
+        return appendValueGroup([
+            appendValueGroup(Object.values(ctx.output.stubs).map((x) => ts.export(x.component, x.filePath))),
+            this.getStubsClass(ctx),
+        ], '\n');
+    }
+    getStubsClass(ctx) {
+        const fieldCasing = adjustCasing(ctx.config.propertyNameCasing, { prefix: '_' });
+        const serviceNames = Object.fromEntries(ctx.data.services.map((x) => [x.id, x.name]));
+        return ts.class(this.getStubsClassName(ctx), {
+            export: true,
+            members: [
+                ts.property('_stubWrapper', {
+                    accessModifier: 'private',
+                    readonly: true,
+                    type: ctx.refs.easyNetworkStubWrapper(),
+                }),
+                ...Object.entries(ctx.output.stubs).map(([id, x]) => ts.property(toCasing(serviceNames[id], fieldCasing), {
+                    accessModifier: 'private',
+                    optional: true,
+                    type: ctx.refs.easyNetworkStubGroup([ts.reference(x.component, x.filePath), 'this']),
+                })),
+                ts.constructor({
+                    parameters: [
+                        ts.constructorParameter('stub', { type: ts.refs.easyNetworkStub.easyNetworkStub() }),
+                        ts.constructorParameter('options', {
+                            type: ts.refs.partial([ctx.refs.easyNetworkStubWrapperOptions()]),
+                            optional: true,
+                        }),
+                    ],
+                    body: appendValueGroup([s `this._stubWrapper = new ${ctx.refs.easyNetworkStubWrapper()}(stub, options);`], '\n'),
+                }),
+                ts.property('requests', {
+                    accessModifier: 'public',
+                    type: ts.arrayType(ctx.refs.stubRequestItem(), { readonly: true }),
+                    get: ts.property.getter({
+                        body: appendValueGroup(['return this._stubWrapper.requests;'], '\n'),
+                    }),
+                }),
+                ...Object.entries(ctx.output.stubs).map(([id, x]) => ts.property(toCasing(serviceNames[id], ctx.config.propertyNameCasing), {
+                    accessModifier: 'public',
+                    type: ctx.refs.easyNetworkStubGroup([ts.reference(x.component, x.filePath), 'this']),
+                    get: ts.property.getter({
+                        body: appendValueGroup([
+                            s `return this.${toCasing(serviceNames[id], fieldCasing)} ??= ${ctx.refs.createEasyNetworkStubGroup.infer()}(this, this._stubWrapper, ${ts.reference(x.component, x.filePath)});`,
+                        ], '\n'),
+                    }),
+                })),
+                ts.method('resetStubs', {
+                    accessModifier: 'public',
+                    returnType: 'this',
+                    body: appendValueGroup([
+                        ...Object.keys(ctx.output.stubs).map((id) => `this.${toCasing(serviceNames[id], fieldCasing)}?.reset();`),
+                        'return this;',
+                    ], '\n'),
+                }),
+            ],
+        });
     }
     getStubsIndexFilePath(ctx) {
         return ctx.config.stubsIndexFilePath ? resolve(ctx.config.outputDir, ctx.config.stubsIndexFilePath) : null;
     }
+    getStubsClassName(ctx) {
+        var _a;
+        return toCasing(`${(_a = ctx.config.domainName) !== null && _a !== void 0 ? _a : ''}_ApiStubs`, ctx.config.typeNameCasing);
+    }
     copyFile(logName, sourceDir, targetDir, fileName) {
         const source = resolve(sourceDir, fileName);
         const target = resolve(targetDir, fileName);

package/esm/lib/generators/services/easy-network-stub/refs.js

@@ -13,5 +13,7 @@ export function getReferenceFactories(options) {
         getStubResponder: ts.reference.genericFactory('getStubResponder', easyNetworkStubUtilsPath),
         easyNetworkStubWrapper: ts.reference.factory('EasyNetworkStubWrapper', easyNetworkStubUtilsPath),
         easyNetworkStubBase: ts.reference.factory('EasyNetworkStubBase', easyNetworkStubUtilsPath),
+        easyNetworkStubGroup: ts.reference.genericFactory('EasyNetworkStubGroup', easyNetworkStubUtilsPath),
+        createEasyNetworkStubGroup: ts.reference.genericFactory('createEasyNetworkStubGroup', easyNetworkStubUtilsPath),
     };
 }

package/esm/lib/generators/services/fetch-clients/fetch-clients-generator.js

@@ -15,8 +15,9 @@ export class TypeScriptClientsGenerator extends OpenApiServicesGenerationProvide
     initResult() {
         return {
             clients: {},
-            clientIndexFilePath: undefined,
-            clientInterfaceIndexFilePath: undefined,
+            indexFiles: {
+                clients: undefined,
+            },
         };
     }
     buildContext(context, config) {
@@ -28,7 +29,7 @@ export class TypeScriptClientsGenerator extends OpenApiServicesGenerationProvide
     onGenerate(ctx) {
         this.copyUtilsFiles(ctx);
         const output = super.onGenerate(ctx);
-        output.clientIndexFilePath = this.generateIndexFile(ctx);
+        output.indexFiles.clients = this.generateIndexFile(ctx);
         return output;
     }
     generateService(ctx, service) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",
@@ -12,7 +12,7 @@
     "fs-extra": "^11.2.0",
     "node-fetch": "^2.7.0",
     "yaml": "^2.4.1",
-    "@goast/core": "0.2.0",
+    "@goast/core": "0.2.1",
     "tslib": "2.6.2"
   },
   "module": "./esm/index.js",

package/types/lib/ast/references/index.d.ts

@@ -1,3 +1,4 @@
+export * as easyNetworkStub from './easy-network-stub';
 export * as angular from './angular';
 export * as rxjs from './rxjs';
 export * from './typescript';

package/types/lib/generators/services/easy-network-stub/easy-network-stubs-generator.d.ts

@@ -1,6 +1,7 @@
 import { ApiService, AppendValueGroup, Factory, OpenApiGeneratorContext, OpenApiServicesGenerationProviderBase } from '@goast/core';
 import { TypeScriptEasyNetworkStubGenerator } from './easy-network-stub-generator';
 import { TypeScriptEasyNetworkStubsGeneratorInput, TypeScriptEasyNetworkStubsGeneratorOutput, TypeScriptEasyNetworkStubsGeneratorConfig, TypeScriptEasyNetworkStubGeneratorOutput, TypeScriptEasyNetworkStubsGeneratorContext } from './models';
+import { ts } from '../../../ast';
 import { TypeScriptExportOutput } from '../../../common-results';
 import { TypeScriptFileBuilder } from '../../../file-builder';
 type Input = TypeScriptEasyNetworkStubsGeneratorInput;
@@ -19,7 +20,9 @@ export declare class TypeScriptEasyNetworkStubsGenerator extends OpenApiServices
     protected generateUtilsFiles(ctx: Context): void;
     protected generateIndexFiles(ctx: Context): Output['indexFiles'];
     protected getStubsIndexFileContent(ctx: Context): AppendValueGroup<TypeScriptFileBuilder>;
+    protected getStubsClass(ctx: Context): ts.Class<TypeScriptFileBuilder>;
     protected getStubsIndexFilePath(ctx: Context): string | null;
+    protected getStubsClassName(ctx: Context): string;
     private copyFile;
 }
 export {};

package/types/lib/generators/services/easy-network-stub/models.d.ts

@@ -6,6 +6,10 @@ import { TypeScriptGeneratorConfig } from '../../../config';
 import { TypeScriptFileBuilder } from '../../../file-builder';
 import { TypeScriptModelGeneratorOutput } from '../../models';
 export type TypeScriptEasyNetworkStubsGeneratorConfig = TypeScriptGeneratorConfig & {
+    /**
+     * The domain name of the API. Used as a prefix for exported components (e.g. `ApiConfiguration`).
+     */
+    domainName?: string;
     /**
      * The default response types for status codes that are not defined in the OpenAPI specification.
      * @example

package/types/lib/generators/services/easy-network-stub/refs.d.ts

@@ -46,4 +46,18 @@ export declare function getReferenceFactories(options: TypeScriptEasyNetworkStub
     } & {
         moduleNameOrfilePath: string;
     };
+    easyNetworkStubGroup: (<TBuilder_1 extends import("@goast/core").SourceBuilder<never>>(generics: [ts.Type<TBuilder_1>, ts.Type<TBuilder_1>]) => ts.Reference<TBuilder_1, never>) & {
+        refName: string;
+        moduleNameOrfilePath: import("@goast/core").Nullable<string>;
+        infer: <TBuilder_2 extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder_2, never>;
+    } & {
+        moduleNameOrfilePath: string;
+    };
+    createEasyNetworkStubGroup: (<TBuilder_1 extends import("@goast/core").SourceBuilder<never>>(generics: [ts.Type<TBuilder_1>, ts.Type<TBuilder_1>]) => ts.Reference<TBuilder_1, never>) & {
+        refName: string;
+        moduleNameOrfilePath: import("@goast/core").Nullable<string>;
+        infer: <TBuilder_2 extends import("@goast/core").SourceBuilder<never>>() => ts.Reference<TBuilder_2, never>;
+    } & {
+        moduleNameOrfilePath: string;
+    };
 };

package/types/lib/generators/services/fetch-clients/models.d.ts

@@ -22,8 +22,9 @@ export type TypeScriptFetchClientsGeneratorOutput = {
     clients: {
         [serviceId: string]: TypeScriptFetchClientGeneratorOutput;
     };
-    clientIndexFilePath: string | undefined;
-    clientInterfaceIndexFilePath: string | undefined;
+    indexFiles: {
+        clients: Nullable<string>;
+    };
 };
 export type TypeScriptFetchClientGeneratorOutput = {
     class?: Omit<TypeScriptComponentOutput, 'additionalImports'>;