@goast/typescript 0.3.7 → 0.3.8-beta1

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/ast/references/typescript.js

@@ -28,3 +28,4 @@ export const nonNullable = tsReference.genericFactory('NonNullable');
 export const parameters = tsReference.genericFactory('Parameters');
 export const returnType = tsReference.genericFactory('ReturnType');
 export const instanceType = tsReference.genericFactory('InstanceType');
+export const blob = tsReference.factory('Blob');

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

@@ -200,7 +200,7 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
             case 'number':
                 return 'number';
             case 'string':
-                return 'string';
+                return this.getStringType(ctx, schema);
             case 'null':
                 return 'null';
             case 'unknown':
@@ -219,6 +219,12 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
                 return this.getAnyType(ctx);
         }
     }
+    getStringType(ctx, schema) {
+        if (schema.format === 'binary') {
+            return ts.refs.blob();
+        }
+        return 'string';
+    }
     getArrayType(ctx, schema) {
         var _a;
         return ts.arrayType((_a = this.getType(ctx, schema.items)) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
@@ -287,7 +293,7 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
         return ts.unionType(schema.type.map((x) => {
             switch (x) {
                 case 'string':
-                    return 'string';
+                    return this.getStringType(ctx, schema);
                 case 'number':
                 case 'integer':
                     return 'number';

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/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",
+  "version": "0.3.8-beta1",
   "repository": "https://github.com/MaSch0212/goast.git",
   "description": "Provides gOAst generators for generating TypeScript code from OpenAPI specifications.",
   "keywords": [
@@ -30,7 +30,6 @@
     "@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",
@@ -42,4 +41,4 @@
     },
     "./package.json": "./package.json"
   }
-}
+}

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

@@ -189,3 +189,9 @@ export declare const instanceType: (<TBuilder extends import("@goast/core").Sour
     moduleNameOrfilePath: import("@goast/core").Nullable<string>;
     infer: <TBuilder extends import("@goast/core").SourceBuilder>() => import("../nodes/reference").TsReference<TBuilder, never>;
 };
+export declare const blob: (<TBuilder extends import("@goast/core").SourceBuilder>(options?: {
+    importType?: import("@goast/core").Nullable<import("../../common-results").TypeScriptImportType>;
+}) => import("../nodes/reference").TsReference<TBuilder, never>) & {
+    refName: string;
+    moduleNameOrfilePath: import("@goast/core").Nullable<string>;
+};

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

@@ -1,4 +1,4 @@
-import { ApiSchema, AppendValueGroup, ArrayLikeApiSchema, CombinedLikeApiSchema, Nullable, ObjectLikeApiSchema } from '@goast/core';
+import { ApiSchema, AppendValueGroup, ArrayLikeApiSchema, CombinedLikeApiSchema, Nullable, ObjectLikeApiSchema, StringLikeApiSchema } from '@goast/core';
 import { TypeScriptModelGeneratorContext, TypeScriptModelGeneratorOutput } from './models';
 import { ts } from '../../ast';
 import { TypeScriptComponentOutputKind } from '../../common-results';
@@ -24,6 +24,7 @@ export declare class DefaultTypeScriptModelGenerator extends TypeScriptFileGener
         skipSchemas?: boolean;
         useBaseType?: boolean;
     }): ts.Type<Builder> | null;
+    protected getStringType(ctx: Context, schema: StringLikeApiSchema): ts.Type<Builder>;
     protected getArrayType(ctx: Context, schema: ArrayLikeApiSchema): ts.Type<Builder>;
     protected getObjectType(ctx: Context, schema: ObjectLikeApiSchema): ts.Type<Builder>;
     protected getDiscriminatorType(ctx: Context, schema: ApiSchema): ts.Type<Builder>;