@goast/typescript 0.3.7-beta1 → 0.3.8-beta1

package/assets/client/angular/request-builder.ts

@@ -310,7 +310,7 @@ export class RequestBuilder {
       return value;
     }
     if (typeof value === 'object') {
-      return JSON.stringify(value);
+      return new Blob([JSON.stringify(value)], { type: 'application/json' });
     }
     return String(value);
   }

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.instanceType = exports.returnType = exports.parameters = exports.nonNullable = exports.extract = exports.exclude = exports.omit = exports.pick = exports.required = exports.partial = exports.readonly = exports.readonlyArray = exports.promise = exports.set = exports.map = exports.record = exports.array = exports.null_ = exports.undefined_ = exports.object = exports.symbol = exports.bigint = exports.boolean = exports.string = exports.number = exports.never = exports.void_ = exports.unknown = exports.any = void 0;
+exports.blob = exports.instanceType = exports.returnType = exports.parameters = exports.nonNullable = exports.extract = exports.exclude = exports.omit = exports.pick = exports.required = exports.partial = exports.readonly = exports.readonlyArray = exports.promise = exports.set = exports.map = exports.record = exports.array = exports.null_ = exports.undefined_ = exports.object = exports.symbol = exports.bigint = exports.boolean = exports.string = exports.number = exports.never = exports.void_ = exports.unknown = exports.any = void 0;
 const reference_1 = require("../nodes/reference");
 exports.any = reference_1.tsReference.factory('any');
 exports.unknown = reference_1.tsReference.factory('unknown');
@@ -31,3 +31,4 @@ exports.nonNullable = reference_1.tsReference.genericFactory('NonNullable');
 exports.parameters = reference_1.tsReference.genericFactory('Parameters');
 exports.returnType = reference_1.tsReference.genericFactory('ReturnType');
 exports.instanceType = reference_1.tsReference.genericFactory('InstanceType');
+exports.blob = reference_1.tsReference.factory('Blob');

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

@@ -19,15 +19,25 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
                 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 ast_1.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 ast_1.ts.Interface || node instanceof ast_1.ts.TypeAlias ? 'type-import' : 'import',
+                    },
+                ],
                 additionalExports: exports
                     .filter((x) => x.name !== name)
-                    .map((x) => ({ name: x.name, type: x instanceof ast_1.ts.TypeAlias ? 'type-export' : 'export' })),
-                kind: isType ? 'type' : 'interface',
+                    .map((x) => ({
+                    name: x.name,
+                    type: x instanceof ast_1.ts.TypeAlias || x instanceof ast_1.ts.Interface ? 'type-export' : 'export',
+                })),
+                kind: this.getNodeKind(node),
             };
         }
         else {
@@ -35,9 +45,20 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
             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 ast_1.ts.Interface)
+            return 'interface';
+        if (node instanceof ast_1.ts.TypeAlias)
+            return 'type';
+        if (node instanceof ast_1.ts.Enum)
+            return 'enum';
+        if (node instanceof ast_1.ts.Class)
+            return 'class';
+        return undefined;
+    }
     getFileContent(ctx) {
         var _a;
         const content = (0, core_1.appendValueGroup)([], '\n');
@@ -182,7 +203,7 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
             case 'number':
                 return 'number';
             case 'string':
-                return 'string';
+                return this.getStringType(ctx, schema);
             case 'null':
                 return 'null';
             case 'unknown':
@@ -201,6 +222,12 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
                 return this.getAnyType(ctx);
         }
     }
+    getStringType(ctx, schema) {
+        if (schema.format === 'binary') {
+            return ast_1.ts.refs.blob();
+        }
+        return 'string';
+    }
     getArrayType(ctx, schema) {
         var _a;
         return ast_1.ts.arrayType((_a = this.getType(ctx, schema.items)) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
@@ -269,7 +296,7 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
         return ast_1.ts.unionType(schema.type.map((x) => {
             switch (x) {
                 case 'string':
-                    return 'string';
+                    return this.getStringType(ctx, schema);
                 case 'number':
                 case 'integer':
                     return 'number';

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

@@ -58,7 +58,9 @@ class TypeScriptModelsGenerator extends core_1.OpenApiSchemasGenerationProviderB
             if (!filePath)
                 return [];
             return [
-                ast_1.ts.export(x.component, filePath, { kind: x.kind === 'type' ? 'type-export' : 'export' }),
+                ast_1.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' ? ast_1.ts.export(e, filePath) : ast_1.ts.export(e.name, filePath, { kind: e.type }))) !== null && _b !== void 0 ? _b : []),
             ];
         }));

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/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

@@ -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');
@@ -179,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':
@@ -198,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), {
@@ -266,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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.3.7-beta1",
+  "version": "0.3.8-beta1",
   "repository": "https://github.com/MaSch0212/goast.git",
   "description": "Provides gOAst generators for generating TypeScript code from OpenAPI specifications.",
   "keywords": [

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/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 { ApiSchema, AppendValueGroup, ArrayLikeApiSchema, CombinedLikeApiSchema, Nullable, ObjectLikeApiSchema, StringLikeApiSchema } 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>;
@@ -22,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>;