@goast/typescript 0.3.7-beta1 → 0.3.7

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

@@ -82,15 +82,13 @@ class TypeScriptEasyNetworkStubsGenerator extends core_1.OpenApiServicesGenerati
                 ...Object.entries(ctx.output.typescript.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'], {
-                        importType: 'type-import',
-                    }),
+                    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()], { importType: 'type-import' }),
+                            type: ast_1.ts.refs.partial([ctx.refs.easyNetworkStubWrapperOptions()]),
                             optional: true,
                         }),
                     ],
@@ -98,16 +96,14 @@ class TypeScriptEasyNetworkStubsGenerator extends core_1.OpenApiServicesGenerati
                 }),
                 ast_1.ts.property('requests', {
                     accessModifier: 'public',
-                    type: ast_1.ts.arrayType(ctx.refs.stubRequestItem({ importType: 'type-import' }), { readonly: true }),
+                    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.typescript.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'], {
-                        importType: 'type-import',
-                    }),
+                    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)});`,

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

@@ -136,7 +136,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
         const method = this.getInterfaceEndpointMethod(ctx, endpoint);
         method.accessModifier = 'public';
         method.body = (0, core_1.appendValueGroup)([
-            (0, core_1.builderTemplate) `const url = new ${ctx.refs.urlBuilder()}(this.options.baseUrl)${core_1.builderTemplate.indent `
+            (0, core_1.builderTemplate) `const url = new ${ctx.refs.urlBuilder()}(this.options.baseUrl)${core_1.builderTemplate.indent `
           .withPath(${ast_1.ts.string(endpoint.path)})${(b) => b.forEach(endpoint.parameters, (b, p) => {
                 switch (p.target) {
                     case 'path':
@@ -146,7 +146,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_1.TypeScriptF
                         b.append((0, core_1.builderTemplate) `\n.withQueryParam(${ast_1.ts.string(p.name)}, params.${(0, core_1.toCasing)(p.name, ctx.config.paramNameCasing)})`);
                         break;
                 }
-            })}
+            })}
           .build();`}`,
             (0, core_1.builderTemplate) `const response = (this.options.fetch ?? fetch)(url, ${ast_1.ts.object({
                 members: [

package/cjs/lib/generators/services/k6-clients/k6-client-generator.js

@@ -189,7 +189,7 @@ class DefaultTypeScriptK6ClientGenerator extends file_generator_1.TypeScriptFile
                         ],
                     }),
                     parameters: [ast_1.ts.constructorParameter('rootUrl'), ast_1.ts.constructorParameter('defaultK6ParamsFactory')],
-                    body: (0, core_1.builderTemplate) `this.rootUrl = rootUrl;
+                    body: (0, core_1.builderTemplate) `this.rootUrl = rootUrl;
                   this._defaultK6ParamsFactory = defaultK6ParamsFactory;`,
                 }),
                 ...ctx.service.endpoints.map((e) => this.getEndpointMethod(ctx, e)),
@@ -248,11 +248,11 @@ class DefaultTypeScriptK6ClientGenerator extends file_generator_1.TypeScriptFile
                     }
                     : null,
                 '',
-                (0, core_1.builderTemplate) `return /** @type {${returnType}} */ (${core_1.builderTemplate.indent `
-              ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
-                accept: ${ast_1.ts.string(accept)},
-                params: this.getK6Params(k6Params),`}
-              })`}
+                (0, core_1.builderTemplate) `return /** @type {${returnType}} */ (${core_1.builderTemplate.indent `
+              ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
+                accept: ${ast_1.ts.string(accept)},
+                params: this.getK6Params(k6Params),`}
+              })`}
             );`,
             ], '\n'),
         });

package/esm/lib/generators/models/model-generator.js

@@ -16,15 +16,25 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
                 generator: (b) => b.append(fileContent),
             });
             const exports = fileContent.values.filter((x) => typeof x === 'object' && x !== null && 'export' in x && x.export === true && 'name' in x);
-            const isType = exports.find((x) => x.name === name) instanceof ts.TypeAlias;
+            const node = exports.find((x) => x.name === name);
             return {
                 component: name,
                 filePath,
-                imports: [{ kind: 'file', name, modulePath: filePath, type: 'type-import' }],
+                imports: [
+                    {
+                        kind: 'file',
+                        name,
+                        modulePath: filePath,
+                        type: node instanceof ts.Interface || node instanceof ts.TypeAlias ? 'type-import' : 'import',
+                    },
+                ],
                 additionalExports: exports
                     .filter((x) => x.name !== name)
-                    .map((x) => ({ name: x.name, type: x instanceof ts.TypeAlias ? 'type-export' : 'export' })),
-                kind: isType ? 'type' : 'interface',
+                    .map((x) => ({
+                    name: x.name,
+                    type: x instanceof ts.TypeAlias || x instanceof ts.Interface ? 'type-export' : 'export',
+                })),
+                kind: this.getNodeKind(node),
             };
         }
         else {
@@ -32,9 +42,20 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
             builder.append(this.getType(ctx, ctx.schema));
             const imports = builder.imports.imports;
             builder.imports.clear();
-            return { component: builder.toString(false), imports, kind: 'unknown' };
+            return { component: builder.toString(false), imports };
         }
     }
+    getNodeKind(node) {
+        if (node instanceof ts.Interface)
+            return 'interface';
+        if (node instanceof ts.TypeAlias)
+            return 'type';
+        if (node instanceof ts.Enum)
+            return 'enum';
+        if (node instanceof ts.Class)
+            return 'class';
+        return undefined;
+    }
     getFileContent(ctx) {
         var _a;
         const content = appendValueGroup([], '\n');

package/esm/lib/generators/models/models-generator.js

@@ -55,7 +55,9 @@ export class TypeScriptModelsGenerator extends OpenApiSchemasGenerationProviderB
             if (!filePath)
                 return [];
             return [
-                ts.export(x.component, filePath, { kind: x.kind === 'type' ? 'type-export' : 'export' }),
+                ts.export(x.component, filePath, {
+                    kind: x.kind === 'type' || x.kind === 'interface' ? 'type-export' : 'export',
+                }),
                 ...((_b = (_a = x.additionalExports) === null || _a === void 0 ? void 0 : _a.map((e) => typeof e === 'string' ? ts.export(e, filePath) : ts.export(e.name, filePath, { kind: e.type }))) !== null && _b !== void 0 ? _b : []),
             ];
         }));

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

@@ -228,13 +228,13 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                     }
                     : null,
                 '',
-                s `return ${ctx.refs.waitForResponse([responseModelType])}(${s.indent `
-              this.http.request(rb.build({${s.indent `
-                responseType: ${ts.string(responseType)},
-                accept: ${ts.string(accept)},
-                context,`}
-              })),
-              {${s.indent `
+                s `return ${ctx.refs.waitForResponse([responseModelType])}(${s.indent `
+              this.http.request(rb.build({${s.indent `
+                responseType: ${ts.string(responseType)},
+                accept: ${ts.string(accept)},
+                context,`}
+              })),
+              {${s.indent `
                 errorResponseTypes: ${ts.object({
                     members: [
                         ...Object.entries(this.getEndpointStatusCodes(ctx, endpoint))
@@ -243,8 +243,8 @@ export class DefaultTypeScriptAngularServiceGenerator extends TypeScriptFileGene
                             return ts.property(key, { value: ts.string(value.parser) });
                         }),
                     ],
-                })}`}
-              }`}
+                })}`}
+              }`}
             )`,
             ], '\n'),
         });

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

@@ -94,15 +94,15 @@ export class DefaultTypeScriptEasyNetworkStubGenerator extends TypeScriptFileGen
             ],
             returnType: 'this',
             body: appendValueGroup([
-                s `this.stubWrapper.stub2<${requestType}>()(${s.indent `
-              ${ts.string(endpoint.method.toUpperCase())},
-              ${this.getStubClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)},
-              async (request) => {${s.indent `
-                if (this.stubWrapper.options.rememberRequests) {${s.indent `
-                  this.${this.getEndpointRequestsFieldName(ctx, endpoint)}.push(request);`}
-                }
-                throw await response(${this.getResponderVariableName(ctx, endpoint)}, request);`}
-              }`}
+                s `this.stubWrapper.stub2<${requestType}>()(${s.indent `
+              ${ts.string(endpoint.method.toUpperCase())},
+              ${this.getStubClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)},
+              async (request) => {${s.indent `
+                if (this.stubWrapper.options.rememberRequests) {${s.indent `
+                  this.${this.getEndpointRequestsFieldName(ctx, endpoint)}.push(request);`}
+                }
+                throw await response(${this.getResponderVariableName(ctx, endpoint)}, request);`}
+              }`}
             );`,
                 'return this;',
             ], '\n'),

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

@@ -79,15 +79,13 @@ export class TypeScriptEasyNetworkStubsGenerator extends OpenApiServicesGenerati
                 ...Object.entries(ctx.output.typescript.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'], {
-                        importType: 'type-import',
-                    }),
+                    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()], { importType: 'type-import' }),
+                            type: ts.refs.partial([ctx.refs.easyNetworkStubWrapperOptions()]),
                             optional: true,
                         }),
                     ],
@@ -95,16 +93,14 @@ export class TypeScriptEasyNetworkStubsGenerator extends OpenApiServicesGenerati
                 }),
                 ts.property('requests', {
                     accessModifier: 'public',
-                    type: ts.arrayType(ctx.refs.stubRequestItem({ importType: 'type-import' }), { readonly: true }),
+                    type: ts.arrayType(ctx.refs.stubRequestItem(), { readonly: true }),
                     get: ts.property.getter({
                         body: appendValueGroup(['return this._stubWrapper.requests;'], '\n'),
                     }),
                 }),
                 ...Object.entries(ctx.output.typescript.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'], {
-                        importType: 'type-import',
-                    }),
+                    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)});`,

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

@@ -133,7 +133,7 @@ export class DefaultTypeScriptFetchClientGenerator extends TypeScriptFileGenerat
         const method = this.getInterfaceEndpointMethod(ctx, endpoint);
         method.accessModifier = 'public';
         method.body = appendValueGroup([
-            s `const url = new ${ctx.refs.urlBuilder()}(this.options.baseUrl)${s.indent `
+            s `const url = new ${ctx.refs.urlBuilder()}(this.options.baseUrl)${s.indent `
           .withPath(${ts.string(endpoint.path)})${(b) => b.forEach(endpoint.parameters, (b, p) => {
                 switch (p.target) {
                     case 'path':
@@ -143,7 +143,7 @@ export class DefaultTypeScriptFetchClientGenerator extends TypeScriptFileGenerat
                         b.append(s `\n.withQueryParam(${ts.string(p.name)}, params.${toCasing(p.name, ctx.config.paramNameCasing)})`);
                         break;
                 }
-            })}
+            })}
           .build();`}`,
             s `const response = (this.options.fetch ?? fetch)(url, ${ts.object({
                 members: [

package/esm/lib/generators/services/k6-clients/k6-client-generator.js

@@ -186,7 +186,7 @@ export class DefaultTypeScriptK6ClientGenerator extends TypeScriptFileGenerator
                         ],
                     }),
                     parameters: [ts.constructorParameter('rootUrl'), ts.constructorParameter('defaultK6ParamsFactory')],
-                    body: s `this.rootUrl = rootUrl;
+                    body: s `this.rootUrl = rootUrl;
                   this._defaultK6ParamsFactory = defaultK6ParamsFactory;`,
                 }),
                 ...ctx.service.endpoints.map((e) => this.getEndpointMethod(ctx, e)),
@@ -245,11 +245,11 @@ export class DefaultTypeScriptK6ClientGenerator extends TypeScriptFileGenerator
                     }
                     : null,
                 '',
-                s `return /** @type {${returnType}} */ (${s.indent `
-              ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${s.indent `
-                accept: ${ts.string(accept)},
-                params: this.getK6Params(k6Params),`}
-              })`}
+                s `return /** @type {${returnType}} */ (${s.indent `
+              ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${s.indent `
+                accept: ${ts.string(accept)},
+                params: this.getK6Params(k6Params),`}
+              })`}
             );`,
             ], '\n'),
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.3.7-beta1",
+  "version": "0.3.7",
   "repository": "https://github.com/MaSch0212/goast.git",
   "description": "Provides gOAst generators for generating TypeScript code from OpenAPI specifications.",
   "keywords": [
@@ -30,6 +30,7 @@
     "@goast/core": "0.3.5",
     "tslib": "2.6.3"
   },
+  "packageManager": "pnpm@9.5.0",
   "module": "./esm/index.js",
   "main": "./cjs/index.js",
   "types": "./types/index.d.ts",
@@ -41,4 +42,4 @@
     },
     "./package.json": "./package.json"
   }
-}
+}

package/types/lib/common-results.d.ts

@@ -1,4 +1,5 @@
 import { TypeScriptExportOptions } from './import-collection';
+export type TypeScriptComponentOutputKind = 'interface' | 'type' | 'enum' | 'class' | 'function' | 'variable';
 export type TypeScriptComponentOutput = {
     component: string;
     filePath?: string;
@@ -6,7 +7,7 @@ export type TypeScriptComponentOutput = {
     additionalExports?: string[] | ({
         name: string;
     } & TypeScriptExportOptions)[];
-    kind: 'unknown' | 'interface' | 'type' | 'enum' | 'class' | 'function' | 'variable';
+    kind?: TypeScriptComponentOutputKind;
 };
 export type TypeScriptExportOutput = {
     component: string;

package/types/lib/generators/models/model-generator.d.ts

@@ -1,6 +1,7 @@
 import { ApiSchema, AppendValueGroup, ArrayLikeApiSchema, CombinedLikeApiSchema, Nullable, ObjectLikeApiSchema } from '@goast/core';
 import { TypeScriptModelGeneratorContext, TypeScriptModelGeneratorOutput } from './models';
 import { ts } from '../../ast';
+import { TypeScriptComponentOutputKind } from '../../common-results';
 import { TypeScriptFileBuilder } from '../../file-builder';
 import { TypeScriptFileGenerator } from '../file-generator';
 type Context = TypeScriptModelGeneratorContext;
@@ -11,6 +12,7 @@ export interface TypeScriptModelGenerator<TOutput extends Output = Output> {
 }
 export declare class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator<Context, Output> implements TypeScriptModelGenerator {
     generate(ctx: Context): Output;
+    protected getNodeKind(node: unknown): TypeScriptComponentOutputKind | undefined;
     protected getFileContent(ctx: Context): AppendValueGroup<Builder>;
     protected getEnum(ctx: Context): ts.Enum<import("@goast/core").SourceBuilder<never>, never>;
     protected getInterface(ctx: Context, schema: ObjectLikeApiSchema): ts.Interface<Builder, never>;