@goast/core 0.0.5 → 0.1.0

package/cjs/lib/codegen/schemas-generator.js

@@ -31,6 +31,7 @@ class OpenApiSchemasGenerationProviderBase extends generator_1.OpenApiGeneration
             result = this.generateSchema(ctx, schema);
         }
         (0, internal_utils_1.addSourceIfTest)(ctx.config, result, () => `${schema.$src.file}#${schema.$src.path}`);
+        ctx.existingSchemaResults.set(schema.id, result);
         this.addSchemaResult(ctx, schema, result);
         return result;
     }

package/cjs/lib/collect/collector.js

@@ -56,6 +56,7 @@ function collectPathItem(data, pathItems, path) {
 }
 function collectSchema(data, schemas) {
     (0, helpers_1.collect)(data, schemas, (data, schema) => {
+        var _a;
         const key = `${schema.$src.file}#${schema.$src.path}`;
         if (data.schemas.has(key))
             return;
@@ -75,6 +76,9 @@ function collectSchema(data, schemas) {
         if (typeof schema.additionalItems === 'object') {
             collectSchema(data, schema.additionalItems);
         }
+        if (typeof schema.discriminator === 'object') {
+            (0, helpers_1.collectRecord)(data, (_a = schema.discriminator) === null || _a === void 0 ? void 0 : _a.mapping, collectSchema);
+        }
     });
 }
 function collectParameter(data, parameters) {

package/cjs/lib/parse/parser.js

@@ -11,6 +11,7 @@ const yaml_1 = tslib_1.__importDefault(require("yaml"));
 const deref_proxy_1 = require("./deref-proxy");
 const collector_1 = require("../collect/collector");
 const transformer_1 = require("../transform/transformer");
+const utils_1 = require("../utils");
 class OpenApiParser {
     constructor() {
         this._loadedDocuments = new Map();
@@ -61,7 +62,9 @@ class OpenApiParser {
                 if (key === '$ref')
                     continue;
                 const v = value[key];
-                if (v && typeof v === 'object') {
+                if ((0, utils_1.isNullish)(v))
+                    continue;
+                if (typeof v === 'object') {
                     if (Array.isArray(v)) {
                         result[key] = yield Promise.all(v.map((v, index) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                             if (v && typeof v === 'object') {
@@ -76,6 +79,9 @@ class OpenApiParser {
                         result[key] = yield this.dereference(file, `${path}/${String(key)}`, v);
                     }
                 }
+                if (typeof v === 'string' && path.endsWith('/discriminator/mapping')) {
+                    result[key] = yield this.resolveReference(file, { $ref: v });
+                }
             }
             return result;
         });

package/cjs/lib/transform/transform-schema.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformSchema = void 0;
 const helpers_1 = require("./helpers");
 const utils_1 = require("../utils");
-function transformSchema(context, schema, isReference = false) {
+function transformSchema(context, schema) {
     var _a, _b;
     if (!schema) {
         throw new Error('Schema is required.');
@@ -33,12 +33,11 @@ function transformSchema(context, schema, isReference = false) {
             kind = (0, helpers_1.determineSchemaKind)(schema);
         }
     }
-    const ref = schema.$ref ? transformSchema(context, schema.$ref, true) : undefined;
     const id = context.idGenerator.generateId('schema');
     const nameInfo = (0, helpers_1.determineSchemaName)(schema, id);
-    const result = {
+    const incompleteSchema = {
         $src: Object.assign(Object.assign({}, schema.$src), { component: schema }),
-        $ref: ref,
+        $ref: undefined,
         id,
         name: nameInfo.name,
         isNameGenerated: nameInfo.isGenerated,
@@ -54,16 +53,25 @@ function transformSchema(context, schema, isReference = false) {
         custom: (0, helpers_1.getCustomFields)(schema),
         not: schema.not ? transformSchema(context, schema.not) : undefined,
         const: schema.const,
+        discriminator: schema.discriminator
+            ? {
+                propertyName: typeof schema.discriminator === 'string' ? schema.discriminator : schema.discriminator.propertyName,
+                mapping: {},
+            }
+            : undefined,
+        inheritedSchemas: [],
     };
-    context.incompleteSchemas.set(schemaSource, result);
+    context.incompleteSchemas.set(schemaSource, incompleteSchema);
+    if (schema.$ref) {
+        incompleteSchema.$ref = transformSchema(context, schema.$ref);
+    }
     const extensions = schemaTransformers[kind](schema, context);
-    Object.assign(result, extensions);
+    const completeSchema = Object.assign(incompleteSchema, extensions);
+    resolveDescriminatorMapping(context, completeSchema);
     context.incompleteSchemas.delete(schemaSource);
-    context.transformed.schemas.set(openApiObjectId, result);
-    if (!isReference) {
-        context.schemas.set(schemaSource, result);
-    }
-    return result;
+    context.transformed.schemas.set(openApiObjectId, completeSchema);
+    context.schemas.set(schemaSource, completeSchema);
+    return completeSchema;
 }
 exports.transformSchema = transformSchema;
 const schemaTransformers = {
@@ -139,3 +147,14 @@ const schemaTransformers = {
     null: () => ({ type: 'null' }),
     unknown: () => ({}),
 };
+function resolveDescriminatorMapping(context, schema) {
+    const discriminator = schema.$src.component.discriminator;
+    if (!discriminator || typeof discriminator === 'string' || !discriminator.mapping)
+        return;
+    for (const key of Object.keys(discriminator.mapping)) {
+        const mappedSchemaRef = discriminator.mapping[key];
+        const mappedSchema = transformSchema(context, mappedSchemaRef);
+        schema.discriminator.mapping[key] = mappedSchema;
+        mappedSchema.inheritedSchemas.push(schema);
+    }
+}

package/cjs/lib/utils/source-builder.js

@@ -65,58 +65,69 @@ class SourceBuilder extends string_utils_1.StringBuilder {
      * @returns The current SourceBuilder.
      */
     append(...value) {
-        if (value.length === 0 || !value.some((v) => v && v.length > 0)) {
-            return this;
-        }
-        const str = value.join('');
-        let lineStartIndex = 0;
-        for (let i = 0; i < str.length; i++) {
-            if (str[i] === '\r')
+        for (const str of value) {
+            if (!str)
                 continue;
-            if (str[i] === '\n') {
-                let lineLength = i - lineStartIndex;
-                for (let j = i; j > 0 && str[j - 1] === '\r'; j--) {
-                    lineLength--;
-                }
-                if (lineLength > 0) {
-                    if (!this._isLineIndented) {
+            if (typeof str === 'function') {
+                str(this);
+                continue;
+            }
+            let lineStartIndex = 0;
+            for (let i = 0; i < str.length; i++) {
+                if (str[i] === '\r')
+                    continue;
+                if (str[i] === '\n') {
+                    let lineLength = i - lineStartIndex;
+                    for (let j = i; j > 0 && str[j - 1] === '\r'; j--) {
+                        lineLength--;
+                    }
+                    if (lineLength > 0) {
+                        if (!this._isLineIndented) {
+                            this.appendIndent();
+                        }
+                        super.append(str.substring(lineStartIndex, i).replace(/\r/g, ''));
+                    }
+                    this._isLastLineEmpty = this._isCurrentLineEmpty;
+                    super.append(this.__options.newLine);
+                    if (this._linePrefix) {
                         this.appendIndent();
+                        this._isLineIndented = true;
+                        this._isCurrentLineEmpty = false;
                     }
-                    super.append(str.substring(lineStartIndex, i).replace(/\r/g, ''));
+                    else {
+                        this._isLineIndented = false;
+                        this._isCurrentLineEmpty = true;
+                    }
+                    lineStartIndex = i + 1;
+                }
+                if (!this._emptyLineCharRegex.test(str[i])) {
+                    this._isCurrentLineEmpty = false;
                 }
-                this._isLastLineEmpty = this._isCurrentLineEmpty;
-                super.append(this.__options.newLine);
-                this._isCurrentLineEmpty = true;
-                this._isLineIndented = false;
-                lineStartIndex = i + 1;
             }
-            if (!this._emptyLineCharRegex.test(str[i])) {
-                this._isCurrentLineEmpty = false;
+            if (!this._isLineIndented && (lineStartIndex < str.length || this._linePrefix)) {
+                this.appendIndent();
+                this._isLineIndented = true;
             }
+            super.append(str.substring(lineStartIndex).replace(/\r/g, ''));
         }
-        if (!this._isLineIndented && lineStartIndex < str.length) {
-            this.appendIndent();
-            this._isLineIndented = true;
-        }
-        super.append(str.substring(lineStartIndex).replace(/\r/g, ''));
         return this;
     }
     /**
-     * Appends one or more strings to the end of the current SourceBuilder, followed by a line terminator.
+     * Appends one or more strings to the end of the current SourceBuilder if the specified condition is true.
+     * @param condition The condition to check before appending the specified value.
      * @param value The string(s) to append.
      * @returns The current SourceBuilder.
      */
-    appendLine(...value) {
-        return this.append(...value, '\n');
+    appendIf(condition, ...value) {
+        return this.if(condition, (builder) => builder.append(...value));
     }
     /**
-     * Appends one or more strings to the end of the current SourceBuilder if the specified condition is true.
-     * @param condition The condition to check before appending the specified value.
+     * Appends one or more strings to the end of the current SourceBuilder, followed by a line terminator.
      * @param value The string(s) to append.
      * @returns The current SourceBuilder.
      */
-    appendIf(condition, ...value) {
-        return (0, condition_1.evalCondition)(condition) ? this.append(...value) : this;
+    appendLine(...value) {
+        return this.append(...value, '\n');
     }
     /**
      * Appends one or more strings to the end of the current SourceBuilder, followed by a line terminator, if the specified condition is true.
@@ -125,7 +136,7 @@ class SourceBuilder extends string_utils_1.StringBuilder {
      * @returns The current SourceBuilder.
      */
     appendLineIf(condition, ...value) {
-        return (0, condition_1.evalCondition)(condition) ? this.appendLine(...value) : this;
+        return this.if(condition, (builder) => builder.appendLine(...value));
     }
     /**
      * Appends the specified values to this source builder with the specified line prefix.
@@ -134,7 +145,15 @@ class SourceBuilder extends string_utils_1.StringBuilder {
      * @returns {SourceBuilder} This source builder instance.
      */
     appendWithLinePrefix(prefix, ...value) {
-        return this.applyWithLinePrefix(prefix, (builder) => builder.append(...value));
+        const previousLinePrefix = this._linePrefix;
+        this._linePrefix += prefix;
+        try {
+            this.append(...value);
+        }
+        finally {
+            this._linePrefix = previousLinePrefix;
+        }
+        return this;
     }
     /**
      * Appends the specified values to this source builder as a new line with the specified line prefix.
@@ -143,7 +162,7 @@ class SourceBuilder extends string_utils_1.StringBuilder {
      * @returns {SourceBuilder} This source builder instance.
      */
     appendLineWithLinePrefix(prefix, ...value) {
-        return this.applyWithLinePrefix(prefix, (builder) => builder.appendLine(...value));
+        return this.appendWithLinePrefix(prefix, ...value, '\n');
     }
     /**
      * Prepends one or more strings to the beginning of the current SourceBuilder if the specified condition is true.
@@ -152,7 +171,7 @@ class SourceBuilder extends string_utils_1.StringBuilder {
      * @returns The current SourceBuilder.
      */
     prependIf(condition, ...value) {
-        return (0, condition_1.evalCondition)(condition) ? this.prepend(...value) : this;
+        return this.if(condition, (builder) => builder.prepend(...value));
     }
     /**
      * Prepends one or more strings to the beginning of the current SourceBuilder, followed by a line terminator, if the specified condition is true.
@@ -161,33 +180,7 @@ class SourceBuilder extends string_utils_1.StringBuilder {
      * @returns The current SourceBuilder.
      */
     prependLineIf(condition, ...value) {
-        return (0, condition_1.evalCondition)(condition) ? this.prependLine(...value) : this;
-    }
-    /**
-     * Applies the provided builder function to this source builder.
-     * @param builderFn The builder function to apply.
-     * @returns This source builder instance.
-     */
-    apply(builderFn) {
-        builderFn(this);
-        return this;
-    }
-    /**
-     * Applies the provided builder function to this source builder with the specified line prefix.
-     * @param prefix The line prefix to use.
-     * @param builderFn The builder function to apply.
-     * @returns This source builder instance.
-     */
-    applyWithLinePrefix(prefix, builderFn) {
-        const previousLinePrefix = this._linePrefix;
-        this._linePrefix += prefix;
-        try {
-            builderFn(this);
-        }
-        finally {
-            this._linePrefix = previousLinePrefix;
-        }
-        return this;
+        return this.if(condition, (builder) => builder.prependLine(...value));
     }
     /**
      * Ensures that the current line is empty or consists only of whitespace characters.
@@ -215,136 +208,82 @@ class SourceBuilder extends string_utils_1.StringBuilder {
     /**
      * Inserts specified content if the specified condition is true.
      * @param condition The condition to check before inserting content.
-     * @param builderFn The function to add content.
-     * @returns A reference to this instance.
-     */
-    applyIf(condition, builderFn) {
-        if ((0, condition_1.evalCondition)(condition)) {
-            builderFn(this);
-        }
-        return this;
-    }
-    /**
-     * Inserts specified content depending on the specified condition.
-     * @param condition The condition to check before inserting content.
      * @param builderFn The function to add content if the condition is true.
      * @param elseBuilderFn The function to add content if the condition is false.
      * @returns A reference to this instance.
      */
-    applyIfElse(condition, builderFn, elseBuilderFn) {
+    if(condition, builderFn, elseBuilderFn) {
         if ((0, condition_1.evalCondition)(condition)) {
             builderFn(this);
         }
         else {
-            elseBuilderFn(this);
+            elseBuilderFn === null || elseBuilderFn === void 0 ? void 0 : elseBuilderFn(this);
         }
         return this;
     }
     /**
      * Adds one indentation level. If the current line already contains characters, only subsequent lines are affected.
-     * @param builderFn The function to add indented content.
+     * @param builderFn The function to add indented content or the content itself.
      * @param condition The condition to check before adding indentation.
      * @returns A reference to this instance.
      */
-    indent(builderFn, condition = true) {
-        const shouldIndent = (0, condition_1.evalCondition)(condition);
-        if (shouldIndent) {
-            this.currentIndentLevel++;
-        }
+    indent(value) {
+        this.currentIndentLevel++;
         try {
-            builderFn(this);
+            this.append(value);
         }
         finally {
-            if (shouldIndent) {
-                this.currentIndentLevel--;
-            }
+            this.currentIndentLevel--;
         }
         return this;
     }
     /**
-     * Adds parentheses around the specified content and adds one indentation level.
-     * @param brackets The brackets to use.
-     * @param builderFn The function to add content inside parentheses.
-     * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
+     * Adds one indentation level if the specified condition is true. If the current line already contains characters, only subsequent lines are affected.
+     * @param builderFn The function to add indented content or the content itself.
+     * @param condition The condition to check before adding indentation.
      * @returns A reference to this instance.
      */
-    parenthesize(brackets, builderFn, indent = true) {
-        var _a, _b;
-        this.append((_a = brackets[0]) !== null && _a !== void 0 ? _a : '');
-        this.indent(builderFn, indent);
-        this.append((_b = brackets[1]) !== null && _b !== void 0 ? _b : '');
-        return this;
+    indentIf(condition, value) {
+        return this.if(condition, (builder) => builder.indent(value), (builder) => builder.append(value));
     }
     /**
-     * Adds parentheses around the specified content if the specified condition is true.
-     * @param condition The condition to check before adding parentheses.
+     * Adds parentheses around the specified content.
      * @param brackets The brackets to use.
-     * @param builderFn The function to add content inside parentheses.
-     * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
-     * @returns A reference to this instance.
-     */
-    parenthesizeIf(condition, brackets, builderFn, indent) {
-        if ((0, condition_1.evalCondition)(condition)) {
-            this.parenthesize(brackets, builderFn, indent !== null && indent !== void 0 ? indent : true);
-        }
-        else {
-            this.indent(builderFn, indent !== null && indent !== void 0 ? indent : false);
-        }
-        return this;
-    }
-    /**
-     * Adds content for each item in the specified array.
-     * @param items The items to add content for.
-     * @param builderFn The function to add content for each item.
+     * @param value The function to add content inside parentheses or one string that should be parenthesized.
+     * @param options Options for the parentheses.
      * @returns A reference to this instance.
      */
-    forEach(items, builderFn) {
-        return this.forEachImpl(items, builderFn);
+    parenthesize(brackets, value, options) {
+        var _a, _b, _c, _d;
+        return this.if((_a = options === null || options === void 0 ? void 0 : options.multiline) !== null && _a !== void 0 ? _a : false, (b) => { var _a; return b.appendLine((_a = brackets[0]) !== null && _a !== void 0 ? _a : ''); }, (b) => { var _a; return b.append((_a = brackets[0]) !== null && _a !== void 0 ? _a : ''); })
+            .indentIf((_b = options === null || options === void 0 ? void 0 : options.indent) !== null && _b !== void 0 ? _b : true, value)
+            .if((_c = options === null || options === void 0 ? void 0 : options.multiline) !== null && _c !== void 0 ? _c : false, (b) => b.ensureCurrentLineEmpty())
+            .append((_d = brackets[1]) !== null && _d !== void 0 ? _d : '');
     }
     /**
-     * Adds content for each item in the specified array.
-     * @param items The items to add content for.
-     * @param condition The condition to check before adding content.
-     * @param builderFn The function to add content for each item.
-     * @returns A reference to this instance.
-     */
-    forEachIf(items, condition, builderFn) {
-        return (0, condition_1.evalCondition)(condition) ? this.forEachImpl(items, builderFn) : this;
-    }
-    /**
-     * Adds content for each item in the specified array.
-     * @param items The items to add content for.
-     * @param condition The condition to check before adding content for each item.
-     * @param builderFn The function to add content for each item.
-     * @returns A reference to this instance.
-     */
-    forEachMatching(items, condition, builderFn) {
-        return this.forEachImpl(items, builderFn, undefined, condition);
-    }
-    /**
-     * Adds content for each item in the specified array.
-     * @param items The items to add content for.
-     * @param seperator The seperator to add between items.
-     * @param builderFn The function to add content for each item.
+     * Adds parentheses around the specified content if the specified condition is true.
+     * @param condition The condition to check before adding parentheses.
+     * @param brackets The brackets to use.
+     * @param value The function to add content inside parentheses or one string that should be parenthesized.
+     * @param options Options for the parentheses.
      * @returns A reference to this instance.
      */
-    forEachSeparated(items, seperator, builderFn) {
-        return this.forEachImpl(items, builderFn, seperator);
+    parenthesizeIf(condition, brackets, value, options) {
+        return this.if(condition, (builder) => builder.parenthesize(brackets, value, options), (builder) => builder.indentIf((options === null || options === void 0 ? void 0 : options.indent) === true, value));
     }
     /**
      * Adds content for each item in the specified array.
      * @param items The items to add content for.
-     * @param condition The condition to check before adding content for each item.
-     * @param seperator The seperator to add between items.
      * @param builderFn The function to add content for each item.
+     * @param options The options for the loop.
      * @returns A reference to this instance.
      */
-    forEachMatchingSeparated(items, condition, seperator, builderFn) {
-        return this.forEachImpl(items, builderFn, seperator, condition);
-    }
-    forEachImpl(items, builderFn, seperator, condition = true) {
-        if (condition === false)
+    forEach(items, builderFn, options) {
+        var _a;
+        const condition = (_a = options === null || options === void 0 ? void 0 : options.condition) !== null && _a !== void 0 ? _a : true;
+        if ((options === null || options === void 0 ? void 0 : options.condition) === false)
             return this;
+        const seperator = options === null || options === void 0 ? void 0 : options.separator;
         let previousIndex = -1;
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         let previousItem = undefined;
@@ -367,6 +306,15 @@ class SourceBuilder extends string_utils_1.StringBuilder {
         }
         return this;
     }
+    forEachIf(condition, items, builderFn, options) {
+        return this.if(condition, (b) => b.forEach(items, builderFn, options));
+    }
+    appendSeparated(items, separator) {
+        return this.forEach(items, (builder, item) => builder.append(item), { separator });
+    }
+    appendSeparatedIf(condition, items, separator) {
+        return this.forEachIf(condition, items, (builder, item) => builder.append(item), { separator });
+    }
     appendIndent() {
         super.append(this._indentString.repeat(this.currentIndentLevel));
         if (this._linePrefix) {

package/cjs/lib/utils/string.utils.js

@@ -277,9 +277,14 @@ class StringBuilder {
      */
     append(...value) {
         for (const part of value) {
-            if ((0, common_utils_1.isNullish)(part) || part.length === 0)
+            if (!part)
                 continue;
-            this._str += part;
+            if (typeof part === 'string') {
+                this._str += part;
+            }
+            else {
+                part(this);
+            }
         }
         return this;
     }

package/esm/lib/codegen/schemas-generator.js

@@ -28,6 +28,7 @@ export class OpenApiSchemasGenerationProviderBase extends OpenApiGenerationProvi
             result = this.generateSchema(ctx, schema);
         }
         addSourceIfTest(ctx.config, result, () => `${schema.$src.file}#${schema.$src.path}`);
+        ctx.existingSchemaResults.set(schema.id, result);
         this.addSchemaResult(ctx, schema, result);
         return result;
     }

package/esm/lib/collect/collector.js

@@ -52,6 +52,7 @@ function collectPathItem(data, pathItems, path) {
 }
 function collectSchema(data, schemas) {
     collect(data, schemas, (data, schema) => {
+        var _a;
         const key = `${schema.$src.file}#${schema.$src.path}`;
         if (data.schemas.has(key))
             return;
@@ -71,6 +72,9 @@ function collectSchema(data, schemas) {
         if (typeof schema.additionalItems === 'object') {
             collectSchema(data, schema.additionalItems);
         }
+        if (typeof schema.discriminator === 'object') {
+            collectRecord(data, (_a = schema.discriminator) === null || _a === void 0 ? void 0 : _a.mapping, collectSchema);
+        }
     });
 }
 function collectParameter(data, parameters) {

package/esm/lib/parse/parser.js

@@ -8,6 +8,7 @@ import YAML from 'yaml';
 import { createDerefProxy } from './deref-proxy';
 import { collectOpenApi } from '../collect/collector';
 import { transformOpenApi } from '../transform/transformer';
+import { isNullish } from '../utils';
 export class OpenApiParser {
     constructor() {
         this._loadedDocuments = new Map();
@@ -58,7 +59,9 @@ export class OpenApiParser {
                 if (key === '$ref')
                     continue;
                 const v = value[key];
-                if (v && typeof v === 'object') {
+                if (isNullish(v))
+                    continue;
+                if (typeof v === 'object') {
                     if (Array.isArray(v)) {
                         result[key] = yield Promise.all(v.map((v, index) => __awaiter(this, void 0, void 0, function* () {
                             if (v && typeof v === 'object') {
@@ -73,6 +76,9 @@ export class OpenApiParser {
                         result[key] = yield this.dereference(file, `${path}/${String(key)}`, v);
                     }
                 }
+                if (typeof v === 'string' && path.endsWith('/discriminator/mapping')) {
+                    result[key] = yield this.resolveReference(file, { $ref: v });
+                }
             }
             return result;
         });

package/esm/lib/transform/transform-schema.js

@@ -1,6 +1,6 @@
 import { determineSchemaAccessibility, determineSchemaKind, determineSchemaName, getCustomFields, getOpenApiObjectIdentifier, transformAdditionalProperties, transformSchemaProperties, } from './helpers';
 import { createOverwriteProxy } from '../utils';
-export function transformSchema(context, schema, isReference = false) {
+export function transformSchema(context, schema) {
     var _a, _b;
     if (!schema) {
         throw new Error('Schema is required.');
@@ -30,12 +30,11 @@ export function transformSchema(context, schema, isReference = false) {
             kind = determineSchemaKind(schema);
         }
     }
-    const ref = schema.$ref ? transformSchema(context, schema.$ref, true) : undefined;
     const id = context.idGenerator.generateId('schema');
     const nameInfo = determineSchemaName(schema, id);
-    const result = {
+    const incompleteSchema = {
         $src: Object.assign(Object.assign({}, schema.$src), { component: schema }),
-        $ref: ref,
+        $ref: undefined,
         id,
         name: nameInfo.name,
         isNameGenerated: nameInfo.isGenerated,
@@ -51,16 +50,25 @@ export function transformSchema(context, schema, isReference = false) {
         custom: getCustomFields(schema),
         not: schema.not ? transformSchema(context, schema.not) : undefined,
         const: schema.const,
+        discriminator: schema.discriminator
+            ? {
+                propertyName: typeof schema.discriminator === 'string' ? schema.discriminator : schema.discriminator.propertyName,
+                mapping: {},
+            }
+            : undefined,
+        inheritedSchemas: [],
     };
-    context.incompleteSchemas.set(schemaSource, result);
+    context.incompleteSchemas.set(schemaSource, incompleteSchema);
+    if (schema.$ref) {
+        incompleteSchema.$ref = transformSchema(context, schema.$ref);
+    }
     const extensions = schemaTransformers[kind](schema, context);
-    Object.assign(result, extensions);
+    const completeSchema = Object.assign(incompleteSchema, extensions);
+    resolveDescriminatorMapping(context, completeSchema);
     context.incompleteSchemas.delete(schemaSource);
-    context.transformed.schemas.set(openApiObjectId, result);
-    if (!isReference) {
-        context.schemas.set(schemaSource, result);
-    }
-    return result;
+    context.transformed.schemas.set(openApiObjectId, completeSchema);
+    context.schemas.set(schemaSource, completeSchema);
+    return completeSchema;
 }
 const schemaTransformers = {
     oneOf: (schema, context) => {
@@ -135,3 +143,14 @@ const schemaTransformers = {
     null: () => ({ type: 'null' }),
     unknown: () => ({}),
 };
+function resolveDescriminatorMapping(context, schema) {
+    const discriminator = schema.$src.component.discriminator;
+    if (!discriminator || typeof discriminator === 'string' || !discriminator.mapping)
+        return;
+    for (const key of Object.keys(discriminator.mapping)) {
+        const mappedSchemaRef = discriminator.mapping[key];
+        const mappedSchema = transformSchema(context, mappedSchemaRef);
+        schema.discriminator.mapping[key] = mappedSchema;
+        mappedSchema.inheritedSchemas.push(schema);
+    }
+}