@goast/typescript 0.2.4 → 0.2.5

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

@@ -41,7 +41,7 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
             content.values.push(this.getEnum(ctx));
         }
         else if (ctx.schema.discriminator && Object.keys(ctx.schema.discriminator.mapping).length > 0) {
-            content.values.push(ast_1.ts.typeAlias(this.getDiscriminatorTypeName(ctx, ctx.schema), ast_1.ts.unionType(Object.keys(ctx.schema.discriminator.mapping).map((x) => ast_1.ts.string(x)))), ast_1.ts.typeAlias(this.getBaseTypeName(ctx, ctx.schema), (_a = this.getType(ctx, ctx.schema, true)) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), { export: true }), this.getTypeAlias(ctx, ctx.schema));
+            content.values.push(ast_1.ts.typeAlias(this.getDiscriminatorTypeName(ctx, ctx.schema), ast_1.ts.unionType(Object.keys(ctx.schema.discriminator.mapping).map((x) => ast_1.ts.string(x)))), ast_1.ts.typeAlias(this.getBaseTypeName(ctx, ctx.schema), (_a = this.getType(ctx, ctx.schema, { skipSchemas: true })) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), { export: true }), this.getTypeAlias(ctx, ctx.schema));
         }
         else {
             content.values.push(this.getTypeAlias(ctx, ctx.schema));
@@ -65,7 +65,7 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
     getTypeAlias(ctx, schema) {
         var _a;
         const isDiscriminated = schema.discriminator && Object.keys(schema.discriminator.mapping).length > 0;
-        const result = ast_1.ts.typeAlias(this.getDeclarationTypeName(ctx, schema), (_a = (isDiscriminated ? this.getDiscriminatorType(ctx, schema) : this.getType(ctx, schema, true))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
+        const result = ast_1.ts.typeAlias(this.getDeclarationTypeName(ctx, schema), (_a = (isDiscriminated ? this.getDiscriminatorType(ctx, schema) : this.getType(ctx, schema, { skipSchemas: true }))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
             export: true,
             doc: ast_1.ts.doc({ description: schema.description }),
         });
@@ -94,14 +94,14 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
             });
         });
     }
-    getType(ctx, schema, skipSchemas = false) {
+    getType(ctx, schema, options) {
         if (!schema)
             return this.getAnyType(ctx);
         schema = (0, core_1.getSchemaReference)(schema, ['description']);
-        if (ctx.schema.inheritedSchemas.some((x) => x.id === schema.id)) {
+        if ((options === null || options === void 0 ? void 0 : options.useBaseType) && ctx.schema.inheritedSchemas.some((x) => x.id === schema.id)) {
             return ast_1.ts.reference(this.getBaseTypeName(ctx, schema), this.getFilePath(ctx, schema));
         }
-        if (!skipSchemas && this.shouldGenerateTypeDeclaration(ctx, schema)) {
+        if (!(options === null || options === void 0 ? void 0 : options.skipSchemas) && this.shouldGenerateTypeDeclaration(ctx, schema)) {
             if (schema.id === ctx.schema.id) {
                 return null;
             }
@@ -178,9 +178,10 @@ class DefaultTypeScriptModelGenerator extends file_generator_1.TypeScriptFileGen
         if (schema.allOf.length === 0 && schema.anyOf.length === 0) {
             return this.getAnyType(ctx);
         }
+        const useBaseType = schema.id === ctx.schema.id;
         return ast_1.ts.intersectionType([
-            ...schema.allOf.map((x) => this.getType(ctx, x)),
-            ...schema.anyOf.map((x) => ast_1.ts.reference('Partial', null, { generics: [this.getType(ctx, x)] })),
+            ...schema.allOf.map((x) => this.getType(ctx, x, { useBaseType })),
+            ...schema.anyOf.map((x) => ast_1.ts.reference('Partial', null, { generics: [this.getType(ctx, x, { useBaseType })] })),
         ]);
     }
     getOneOfType(ctx, schema) {

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

@@ -38,7 +38,7 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
             content.values.push(this.getEnum(ctx));
         }
         else if (ctx.schema.discriminator && Object.keys(ctx.schema.discriminator.mapping).length > 0) {
-            content.values.push(ts.typeAlias(this.getDiscriminatorTypeName(ctx, ctx.schema), ts.unionType(Object.keys(ctx.schema.discriminator.mapping).map((x) => ts.string(x)))), ts.typeAlias(this.getBaseTypeName(ctx, ctx.schema), (_a = this.getType(ctx, ctx.schema, true)) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), { export: true }), this.getTypeAlias(ctx, ctx.schema));
+            content.values.push(ts.typeAlias(this.getDiscriminatorTypeName(ctx, ctx.schema), ts.unionType(Object.keys(ctx.schema.discriminator.mapping).map((x) => ts.string(x)))), ts.typeAlias(this.getBaseTypeName(ctx, ctx.schema), (_a = this.getType(ctx, ctx.schema, { skipSchemas: true })) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), { export: true }), this.getTypeAlias(ctx, ctx.schema));
         }
         else {
             content.values.push(this.getTypeAlias(ctx, ctx.schema));
@@ -62,7 +62,7 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
     getTypeAlias(ctx, schema) {
         var _a;
         const isDiscriminated = schema.discriminator && Object.keys(schema.discriminator.mapping).length > 0;
-        const result = ts.typeAlias(this.getDeclarationTypeName(ctx, schema), (_a = (isDiscriminated ? this.getDiscriminatorType(ctx, schema) : this.getType(ctx, schema, true))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
+        const result = ts.typeAlias(this.getDeclarationTypeName(ctx, schema), (_a = (isDiscriminated ? this.getDiscriminatorType(ctx, schema) : this.getType(ctx, schema, { skipSchemas: true }))) !== null && _a !== void 0 ? _a : this.getAnyType(ctx), {
             export: true,
             doc: ts.doc({ description: schema.description }),
         });
@@ -91,14 +91,14 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
             });
         });
     }
-    getType(ctx, schema, skipSchemas = false) {
+    getType(ctx, schema, options) {
         if (!schema)
             return this.getAnyType(ctx);
         schema = getSchemaReference(schema, ['description']);
-        if (ctx.schema.inheritedSchemas.some((x) => x.id === schema.id)) {
+        if ((options === null || options === void 0 ? void 0 : options.useBaseType) && ctx.schema.inheritedSchemas.some((x) => x.id === schema.id)) {
             return ts.reference(this.getBaseTypeName(ctx, schema), this.getFilePath(ctx, schema));
         }
-        if (!skipSchemas && this.shouldGenerateTypeDeclaration(ctx, schema)) {
+        if (!(options === null || options === void 0 ? void 0 : options.skipSchemas) && this.shouldGenerateTypeDeclaration(ctx, schema)) {
             if (schema.id === ctx.schema.id) {
                 return null;
             }
@@ -175,9 +175,10 @@ export class DefaultTypeScriptModelGenerator extends TypeScriptFileGenerator {
         if (schema.allOf.length === 0 && schema.anyOf.length === 0) {
             return this.getAnyType(ctx);
         }
+        const useBaseType = schema.id === ctx.schema.id;
         return ts.intersectionType([
-            ...schema.allOf.map((x) => this.getType(ctx, x)),
-            ...schema.anyOf.map((x) => ts.reference('Partial', null, { generics: [this.getType(ctx, x)] })),
+            ...schema.allOf.map((x) => this.getType(ctx, x, { useBaseType })),
+            ...schema.anyOf.map((x) => ts.reference('Partial', null, { generics: [this.getType(ctx, x, { useBaseType })] })),
         ]);
     }
     getOneOfType(ctx, schema) {

package/package.json

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

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

@@ -17,7 +17,10 @@ export declare class DefaultTypeScriptModelGenerator extends TypeScriptFileGener
     protected getTypeAlias(ctx: Context, schema: ApiSchema): ts.TypeAlias<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>, skipSchemas?: boolean): ts.Type<Builder> | null;
+    protected getType(ctx: Context, schema: Nullable<ApiSchema>, options?: {
+        skipSchemas?: boolean;
+        useBaseType?: boolean;
+    }): ts.Type<Builder> | null;
     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>;