@goast/typescript 0.2.17 → 0.2.19

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

@@ -45,6 +45,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 +112,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
@@ -272,6 +288,10 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
             schema.kind !== 'oneOf') {
             return false;
         }
+        // Dynamically generated schemas do not have its own type declaration
+        if (!ctx.data.schemas.some((x) => x.id === schema.id)) {
+            return false;
+        }
         // For all other types, check if the user has enabled inline unnamed schemas
         return !ctx.config.inlineUnnamedSchemas;
     }

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

@@ -42,6 +42,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 +109,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
@@ -269,6 +285,10 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
             schema.kind !== 'oneOf') {
             return false;
         }
+        // Dynamically generated schemas do not have its own type declaration
+        if (!ctx.data.schemas.some((x) => x.id === schema.id)) {
+            return false;
+        }
         // For all other types, check if the user has enabled inline unnamed schemas
         return !ctx.config.inlineUnnamedSchemas;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.2.17",
+  "version": "0.2.19",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",
@@ -9,11 +9,7 @@
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "fs-extra": "^11.2.0",
-    "node-fetch": "^2.7.0",
-    "yaml": "^2.4.1",
-    "@goast/core": "0.2.1",
-    "tslib": "2.6.2"
+    "@goast/core": "0.2.2"
   },
   "module": "./esm/index.js",
   "main": "./cjs/index.js",

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/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?: {