@goast/typescript 0.2.18 → 0.2.20

package/cjs/lib/ast/nodes/tuple.js

@@ -6,8 +6,10 @@ const node_1 = require("../node");
 const write_ts_nodes_1 = require("../utils/write-ts-nodes");
 class TsTuple extends node_1.TsNode {
     constructor(options) {
+        var _a;
         super(options);
         this.elements = options.elements.filter(core_1.notNullish);
+        this.asConst = (_a = options.asConst) !== null && _a !== void 0 ? _a : false;
     }
     onWrite(builder) {
         if (this.elements.length === 0) {
@@ -19,6 +21,9 @@ class TsTuple extends node_1.TsNode {
                 multiline,
             });
         }
+        if (this.asConst) {
+            builder.append(' as const');
+        }
     }
 }
 exports.TsTuple = TsTuple;

package/cjs/lib/ast/nodes/variable.js

@@ -15,6 +15,8 @@ class TsVariable extends node_1.TsNode {
         this.readonly = (_e = options.readonly) !== null && _e !== void 0 ? _e : false;
     }
     onWrite(builder) {
+        if (this.doc)
+            (0, write_ts_nodes_1.writeTsNode)(builder, this.doc);
         if (this.export)
             builder.append('export ');
         builder.append(this.readonly ? 'const ' : 'let ');

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

@@ -11,13 +11,22 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
         if (this.shouldGenerateTypeDeclaration(ctx, ctx.schema)) {
             const name = this.getDeclarationTypeName(ctx, ctx.schema);
             const filePath = this.getFilePath(ctx, ctx.schema);
+            const fileContent = this.getFileContent(ctx);
             file_builder_1.TypeScriptFileBuilder.generate({
                 logName: `model ${name}`,
                 filePath,
                 options: ctx.config,
-                generator: (b) => b.append(this.getFileContent(ctx)),
+                generator: (b) => b.append(fileContent),
             });
-            return { component: name, filePath, imports: [{ kind: 'file', name, modulePath: filePath }] };
+            return {
+                component: name,
+                filePath,
+                imports: [{ kind: 'file', name, modulePath: filePath }],
+                additionalExports: fileContent.values
+                    .filter((x) => typeof x === 'object' && x !== null && 'export' in x && x.export === true && 'name' in x)
+                    .filter((x) => x.name !== name)
+                    .map((x) => x.name),
+            };
         }
         else {
             const builder = new file_builder_1.TypeScriptFileBuilder(undefined, ctx.config);
@@ -45,6 +54,9 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
         }
         else {
             content.values.push(this.getTypeAlias(ctx, ctx.schema));
+            if (ctx.schema.enum) {
+                content.values.push(this.getEnumValuesVariable(ctx, ctx.schema));
+            }
         }
         return content;
     }
@@ -109,6 +121,19 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
         }
         return result;
     }
+    getEnumValuesVariable(ctx, schema) {
+        var _a, _b;
+        const enumTypeName = this.getDeclarationTypeName(ctx, schema);
+        const values = (_b = (_a = schema.enum) === null || _a === void 0 ? void 0 : _a.map((x) => ast_1.ts.toNode(x))) !== null && _b !== void 0 ? _b : [];
+        return ast_1.ts.variable((0, core_1.toCasing)(`${enumTypeName}-Values`, ctx.config.constantNameCasing), {
+            doc: ast_1.ts.doc({
+                description: `All possible values of the enum \`${enumTypeName}\`.`,
+            }),
+            export: true,
+            readonly: true,
+            value: ast_1.ts.tuple(values, { asConst: true }),
+        });
+    }
     getIndexer(ctx, schema) {
         var _a;
         return schema.additionalProperties

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

@@ -47,7 +47,13 @@ class TypeScriptModelsGenerator extends core_1.OpenApiSchemasGenerationProviderB
         return ctx.config.indexFilePath ? (0, path_1.resolve)(ctx.config.outputDir, ctx.config.indexFilePath) : null;
     }
     getIndexFileContent(ctx) {
-        return (0, core_1.appendValueGroup)(Object.values(ctx.output.models).map((x) => (x.filePath ? ast_1.ts.export(x.component, x.filePath) : null)));
+        return (0, core_1.appendValueGroup)(Object.values(ctx.output.models).flatMap((x) => {
+            var _a, _b;
+            const { filePath } = x;
+            if (!filePath)
+                return [];
+            return [ast_1.ts.export(x.component, filePath), ...((_b = (_a = x.additionalExports) === null || _a === void 0 ? void 0 : _a.map((e) => ast_1.ts.export(e, filePath))) !== null && _b !== void 0 ? _b : [])];
+        }));
     }
 }
 exports.TypeScriptModelsGenerator = TypeScriptModelsGenerator;

package/esm/lib/ast/nodes/tuple.js

@@ -3,8 +3,10 @@ import { TsNode } from '../node';
 import { writeTsNodes } from '../utils/write-ts-nodes';
 export class TsTuple extends TsNode {
     constructor(options) {
+        var _a;
         super(options);
         this.elements = options.elements.filter(notNullish);
+        this.asConst = (_a = options.asConst) !== null && _a !== void 0 ? _a : false;
     }
     onWrite(builder) {
         if (this.elements.length === 0) {
@@ -16,6 +18,9 @@ export class TsTuple extends TsNode {
                 multiline,
             });
         }
+        if (this.asConst) {
+            builder.append(' as const');
+        }
     }
 }
 const createTuple = (elements, options) => new TsTuple(Object.assign(Object.assign({}, options), { elements }));

package/esm/lib/ast/nodes/variable.js

@@ -12,6 +12,8 @@ export class TsVariable extends TsNode {
         this.readonly = (_e = options.readonly) !== null && _e !== void 0 ? _e : false;
     }
     onWrite(builder) {
+        if (this.doc)
+            writeTsNode(builder, this.doc);
         if (this.export)
             builder.append('export ');
         builder.append(this.readonly ? 'const ' : 'let ');

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

@@ -8,13 +8,22 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
         if (this.shouldGenerateTypeDeclaration(ctx, ctx.schema)) {
             const name = this.getDeclarationTypeName(ctx, ctx.schema);
             const filePath = this.getFilePath(ctx, ctx.schema);
+            const fileContent = this.getFileContent(ctx);
             TypeScriptFileBuilder.generate({
                 logName: `model ${name}`,
                 filePath,
                 options: ctx.config,
-                generator: (b) => b.append(this.getFileContent(ctx)),
+                generator: (b) => b.append(fileContent),
             });
-            return { component: name, filePath, imports: [{ kind: 'file', name, modulePath: filePath }] };
+            return {
+                component: name,
+                filePath,
+                imports: [{ kind: 'file', name, modulePath: filePath }],
+                additionalExports: fileContent.values
+                    .filter((x) => typeof x === 'object' && x !== null && 'export' in x && x.export === true && 'name' in x)
+                    .filter((x) => x.name !== name)
+                    .map((x) => x.name),
+            };
         }
         else {
             const builder = new TypeScriptFileBuilder(undefined, ctx.config);
@@ -42,6 +51,9 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
         }
         else {
             content.values.push(this.getTypeAlias(ctx, ctx.schema));
+            if (ctx.schema.enum) {
+                content.values.push(this.getEnumValuesVariable(ctx, ctx.schema));
+            }
         }
         return content;
     }
@@ -106,6 +118,19 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
         }
         return result;
     }
+    getEnumValuesVariable(ctx, schema) {
+        var _a, _b;
+        const enumTypeName = this.getDeclarationTypeName(ctx, schema);
+        const values = (_b = (_a = schema.enum) === null || _a === void 0 ? void 0 : _a.map((x) => ts.toNode(x))) !== null && _b !== void 0 ? _b : [];
+        return ts.variable(toCasing(`${enumTypeName}-Values`, ctx.config.constantNameCasing), {
+            doc: ts.doc({
+                description: `All possible values of the enum \`${enumTypeName}\`.`,
+            }),
+            export: true,
+            readonly: true,
+            value: ts.tuple(values, { asConst: true }),
+        });
+    }
     getIndexer(ctx, schema) {
         var _a;
         return schema.additionalProperties

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

@@ -44,6 +44,12 @@ export class TypeScriptModelsGenerator extends OpenApiSchemasGenerationProviderB
         return ctx.config.indexFilePath ? resolve(ctx.config.outputDir, ctx.config.indexFilePath) : null;
     }
     getIndexFileContent(ctx) {
-        return appendValueGroup(Object.values(ctx.output.models).map((x) => (x.filePath ? ts.export(x.component, x.filePath) : null)));
+        return appendValueGroup(Object.values(ctx.output.models).flatMap((x) => {
+            var _a, _b;
+            const { filePath } = x;
+            if (!filePath)
+                return [];
+            return [ts.export(x.component, filePath), ...((_b = (_a = x.additionalExports) === null || _a === void 0 ? void 0 : _a.map((e) => ts.export(e, filePath))) !== null && _b !== void 0 ? _b : [])];
+        }));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",

package/types/lib/ast/nodes/tuple.d.ts

@@ -5,9 +5,11 @@ import { writeTsNodes } from '../utils/write-ts-nodes';
 type Injects = never;
 type Options<TBuilder extends SourceBuilder, TInjects extends string = never> = AstNodeOptions<typeof TsNode<TBuilder, TInjects | Injects>, {
     elements: Nullable<TsType<TBuilder> | TsValue<TBuilder>>[];
+    asConst?: Nullable<boolean>;
 }>;
 export declare class TsTuple<TBuilder extends SourceBuilder, TInjects extends string = never> extends TsNode<TBuilder, TInjects | Injects> {
     elements: (TsType<TBuilder> | TsValue<TBuilder>)[];
+    asConst: boolean;
     constructor(options: Options<TBuilder, TInjects>);
     protected onWrite(builder: TBuilder): void;
 }

package/types/lib/ast/nodes/types.d.ts

@@ -14,5 +14,5 @@ import type { TsTuple } from './tuple';
 import type { TsTypeof } from './typeof';
 import type { TsUnionType } from './union-type';
 import type { BasicAppendValue, SourceBuilder } from '@goast/core';
-export type TsType<TBuilder extends SourceBuilder> = BasicAppendValue<TBuilder> | TsIntersectionType<TBuilder> | TsUnionType<TBuilder> | TsArrayType<TBuilder> | TsFunctionType<TBuilder> | TsObjectType<TBuilder> | TsString<TBuilder> | TsLookupType<TBuilder> | TsTypeof<TBuilder> | TsReference<TBuilder>;
+export type TsType<TBuilder extends SourceBuilder> = BasicAppendValue<TBuilder> | TsIntersectionType<TBuilder> | TsUnionType<TBuilder> | TsArrayType<TBuilder> | TsTuple<TBuilder> | TsFunctionType<TBuilder> | TsObjectType<TBuilder> | TsString<TBuilder> | TsLookupType<TBuilder> | TsTypeof<TBuilder> | TsReference<TBuilder>;
 export type TsValue<TBuilder extends SourceBuilder> = BasicAppendValue<TBuilder> | TsObject<TBuilder> | TsTuple<TBuilder> | TsString<TBuilder> | TsArrowFunction<TBuilder> | TsFunction<TBuilder> | TsClass<TBuilder> | TsCall<TBuilder> | TsReference<TBuilder>;

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

@@ -2,6 +2,7 @@ export type TypeScriptComponentOutput = {
     component: string;
     filePath?: string;
     imports: TypeScriptImport[];
+    additionalExports?: string[];
 };
 export type TypeScriptExportOutput = {
     component: string;

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

@@ -15,6 +15,7 @@ export declare class DefaultTypeScriptModelGenerator extends TypeScriptFileGener
     protected getEnum(ctx: Context): ts.Enum<import("@goast/core").SourceBuilder<never>, never>;
     protected getInterface(ctx: Context, schema: ObjectLikeApiSchema): ts.Interface<Builder, never>;
     protected getTypeAlias(ctx: Context, schema: ApiSchema): ts.TypeAlias<Builder>;
+    protected getEnumValuesVariable(ctx: Context, schema: ApiSchema): ts.Variable<Builder>;
     protected getIndexer(ctx: Context, schema: ObjectLikeApiSchema): ts.Indexer<Builder, never> | null;
     protected getProperties(ctx: Context, schema: ObjectLikeApiSchema): (import("../../ast/nodes/property").TsAccessorProperty<Builder, ""> | import("../../ast/nodes/property").TsSimpleProperty<Builder, "">)[];
     protected getType(ctx: Context, schema: Nullable<ApiSchema>, options?: {