@goast/core 0.0.4 → 0.0.6

package/cjs/lib/codegen/generator.js

@@ -7,6 +7,7 @@ const fs_extra_1 = require("fs-extra");
 const config_1 = require("./config");
 const parser_1 = require("../parse/parser");
 const action_provider_1 = require("../utils/action-provider");
+const file_system_utils_1 = require("../utils/file-system.utils");
 class _OpenApiGenerator {
     constructor(config, providers, parser) {
         this._providers = providers;
@@ -56,6 +57,12 @@ class _OpenApiGenerator {
             return yield this.generate(data);
         });
     }
+    parseAndGenerateFromDir(dir, options) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const filter = (file) => { var _a, _b; return (file.endsWith('.yml') || file.endsWith('.yaml') || file.endsWith('.json')) && ((_b = (_a = options === null || options === void 0 ? void 0 : options.filter) === null || _a === void 0 ? void 0 : _a.call(options, file)) !== null && _b !== void 0 ? _b : true); };
+            return this.parseAndGenerate(...(yield (0, file_system_utils_1.getFiles)(dir, Object.assign(Object.assign({}, options), { filter }))));
+        });
+    }
 }
 class OpenApiGenerator extends _OpenApiGenerator {
     constructor(config) {
@@ -93,7 +100,7 @@ class OpenApiGenerationProviderBase {
         return this.onGenerate(ctx);
     }
     getProviderContext(context, config, defaultConfig) {
-        const c = Object.assign(Object.assign(Object.assign({}, defaultConfig), context.config), config);
+        const c = Object.assign(Object.assign(Object.assign({}, context.config), defaultConfig), config);
         return Object.assign(context, {
             config: c,
         });

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/collect/helpers.js

@@ -9,10 +9,14 @@ function collect(data, obj, func) {
         for (const o of obj) {
             if (!o)
                 continue;
+            if (o['x-ignore'])
+                continue;
             func(data, o);
         }
     }
     else {
+        if (obj['x-ignore'])
+            return;
         func(data, obj);
     }
 }
@@ -26,6 +30,8 @@ function collectRecord(data, obj, func) {
         const value = obj[key];
         if (!value)
             continue;
+        if (value['x-ignore'])
+            continue;
         func(data, value, key);
     }
 }

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/file-system.utils.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFiles = exports.defaultDirectoryScanOptions = void 0;
+const tslib_1 = require("tslib");
+const path_1 = require("path");
+const fs_extra_1 = require("fs-extra");
+exports.defaultDirectoryScanOptions = {
+    recursive: false,
+    maxDepth: 5,
+};
+function getFiles(dir, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const opts = Object.assign(Object.assign({}, exports.defaultDirectoryScanOptions), options);
+        const files = [];
+        yield getFilesImpl(dir, opts, files, 0);
+        return files;
+    });
+}
+exports.getFiles = getFiles;
+function getFilesImpl(dir, options, files, currentDepth) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const dirFiles = yield (0, fs_extra_1.readdir)(dir);
+        for (const file of dirFiles) {
+            const filePath = (0, path_1.resolve)(dir, file);
+            const stat = yield (0, fs_extra_1.lstat)(filePath);
+            if (stat.isDirectory()) {
+                if (options.recursive) {
+                    if (options.maxDepth && options.maxDepth > currentDepth) {
+                        getFilesImpl(filePath, options, files, currentDepth + 1);
+                    }
+                }
+            }
+            else {
+                if (!options.filter || options.filter(file)) {
+                    files.push(filePath);
+                }
+            }
+        }
+    });
+}

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

@@ -242,17 +242,22 @@ class SourceBuilder extends string_utils_1.StringBuilder {
     }
     /**
      * 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) {
+    indent(builderFnOrString, condition = true) {
         const shouldIndent = (0, condition_1.evalCondition)(condition);
         if (shouldIndent) {
             this.currentIndentLevel++;
         }
         try {
-            builderFn(this);
+            if (typeof builderFnOrString === 'string') {
+                this.append(builderFnOrString);
+            }
+            else {
+                builderFnOrString(this);
+            }
         }
         finally {
             if (shouldIndent) {
@@ -264,14 +269,29 @@ class SourceBuilder extends string_utils_1.StringBuilder {
     /**
      * 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 builderFnOrString The function to add content inside parentheses or one string that should be parenthesized.
      * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
      * @returns A reference to this instance.
      */
-    parenthesize(brackets, builderFn, indent = true) {
+    parenthesize(brackets, builderFnOrString, indent = true) {
         var _a, _b;
         this.append((_a = brackets[0]) !== null && _a !== void 0 ? _a : '');
-        this.indent(builderFn, indent);
+        this.indent(builderFnOrString, indent);
+        this.append((_b = brackets[1]) !== null && _b !== void 0 ? _b : '');
+        return this;
+    }
+    /**
+     * Adds parentheses around the specified content and adds one indentation level. Line breaks are added after start and before end of the parentheses.
+     * @param brackets The brackets to use.
+     * @param builderFnOrString The function to add content inside parentheses or one string that should be parenthesized.
+     * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
+     * @returns A reference to this instance.
+     */
+    parenthesizeMultiline(brackets, builderFnOrString, indent = true) {
+        var _a, _b;
+        this.appendLine((_a = brackets[0]) !== null && _a !== void 0 ? _a : '');
+        this.indent(builderFnOrString, indent);
+        this.ensureCurrentLineEmpty();
         this.append((_b = brackets[1]) !== null && _b !== void 0 ? _b : '');
         return this;
     }
@@ -279,16 +299,33 @@ class SourceBuilder extends string_utils_1.StringBuilder {
      * 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 builderFn The function to add content inside parentheses.
+     * @param builderFnOrString The function to add content inside parentheses or one string that should be parenthesized.
+     * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
+     * @returns A reference to this instance.
+     */
+    parenthesizeIf(condition, brackets, builderFnOrString, indent) {
+        if ((0, condition_1.evalCondition)(condition)) {
+            this.parenthesize(brackets, builderFnOrString, indent !== null && indent !== void 0 ? indent : true);
+        }
+        else {
+            this.indent(builderFnOrString, indent !== null && indent !== void 0 ? indent : false);
+        }
+        return this;
+    }
+    /**
+     * Adds parentheses around the specified content if the specified condition is true. Line breaks are added after start and before end of the parentheses.
+     * @param condition The condition to check before adding parentheses.
+     * @param brackets The brackets to use.
+     * @param builderFnOrString The function to add content inside parentheses or one string that should be parenthesized.
      * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
      * @returns A reference to this instance.
      */
-    parenthesizeIf(condition, brackets, builderFn, indent) {
+    parenthesizeMultilineIf(condition, brackets, builderFnOrString, indent) {
         if ((0, condition_1.evalCondition)(condition)) {
-            this.parenthesize(brackets, builderFn, indent !== null && indent !== void 0 ? indent : true);
+            this.parenthesizeMultiline(brackets, builderFnOrString, indent !== null && indent !== void 0 ? indent : true);
         }
         else {
-            this.indent(builderFn, indent !== null && indent !== void 0 ? indent : false);
+            this.indent(builderFnOrString, indent !== null && indent !== void 0 ? indent : false);
         }
         return this;
     }

package/esm/lib/codegen/generator.js

@@ -4,6 +4,7 @@ import { emptyDir, ensureDir } from 'fs-extra';
 import { defaultOpenApiGeneratorConfig } from './config';
 import { OpenApiParser } from '../parse/parser';
 import { ActionProvider } from '../utils/action-provider';
+import { getFiles } from '../utils/file-system.utils';
 class _OpenApiGenerator {
     constructor(config, providers, parser) {
         this._providers = providers;
@@ -53,6 +54,12 @@ class _OpenApiGenerator {
             return yield this.generate(data);
         });
     }
+    parseAndGenerateFromDir(dir, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const filter = (file) => { var _a, _b; return (file.endsWith('.yml') || file.endsWith('.yaml') || file.endsWith('.json')) && ((_b = (_a = options === null || options === void 0 ? void 0 : options.filter) === null || _a === void 0 ? void 0 : _a.call(options, file)) !== null && _b !== void 0 ? _b : true); };
+            return this.parseAndGenerate(...(yield getFiles(dir, Object.assign(Object.assign({}, options), { filter }))));
+        });
+    }
 }
 export class OpenApiGenerator extends _OpenApiGenerator {
     constructor(config) {
@@ -89,7 +96,7 @@ export class OpenApiGenerationProviderBase {
         return this.onGenerate(ctx);
     }
     getProviderContext(context, config, defaultConfig) {
-        const c = Object.assign(Object.assign(Object.assign({}, defaultConfig), context.config), config);
+        const c = Object.assign(Object.assign(Object.assign({}, context.config), defaultConfig), config);
         return Object.assign(context, {
             config: c,
         });

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/collect/helpers.js

@@ -6,10 +6,14 @@ export function collect(data, obj, func) {
         for (const o of obj) {
             if (!o)
                 continue;
+            if (o['x-ignore'])
+                continue;
             func(data, o);
         }
     }
     else {
+        if (obj['x-ignore'])
+            return;
         func(data, obj);
     }
 }
@@ -22,6 +26,8 @@ export function collectRecord(data, obj, func) {
         const value = obj[key];
         if (!value)
             continue;
+        if (value['x-ignore'])
+            continue;
         func(data, value, key);
     }
 }

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);
+    }
+}

package/esm/lib/utils/file-system.utils.js

@@ -0,0 +1,36 @@
+import { __awaiter } from "tslib";
+import { resolve } from 'path';
+import { lstat, readdir } from 'fs-extra';
+export const defaultDirectoryScanOptions = {
+    recursive: false,
+    maxDepth: 5,
+};
+export function getFiles(dir, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const opts = Object.assign(Object.assign({}, defaultDirectoryScanOptions), options);
+        const files = [];
+        yield getFilesImpl(dir, opts, files, 0);
+        return files;
+    });
+}
+function getFilesImpl(dir, options, files, currentDepth) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const dirFiles = yield readdir(dir);
+        for (const file of dirFiles) {
+            const filePath = resolve(dir, file);
+            const stat = yield lstat(filePath);
+            if (stat.isDirectory()) {
+                if (options.recursive) {
+                    if (options.maxDepth && options.maxDepth > currentDepth) {
+                        getFilesImpl(filePath, options, files, currentDepth + 1);
+                    }
+                }
+            }
+            else {
+                if (!options.filter || options.filter(file)) {
+                    files.push(filePath);
+                }
+            }
+        }
+    });
+}

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

@@ -239,17 +239,22 @@ export class SourceBuilder extends StringBuilder {
     }
     /**
      * 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) {
+    indent(builderFnOrString, condition = true) {
         const shouldIndent = evalCondition(condition);
         if (shouldIndent) {
             this.currentIndentLevel++;
         }
         try {
-            builderFn(this);
+            if (typeof builderFnOrString === 'string') {
+                this.append(builderFnOrString);
+            }
+            else {
+                builderFnOrString(this);
+            }
         }
         finally {
             if (shouldIndent) {
@@ -261,14 +266,29 @@ export class SourceBuilder extends StringBuilder {
     /**
      * 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 builderFnOrString The function to add content inside parentheses or one string that should be parenthesized.
      * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
      * @returns A reference to this instance.
      */
-    parenthesize(brackets, builderFn, indent = true) {
+    parenthesize(brackets, builderFnOrString, indent = true) {
         var _a, _b;
         this.append((_a = brackets[0]) !== null && _a !== void 0 ? _a : '');
-        this.indent(builderFn, indent);
+        this.indent(builderFnOrString, indent);
+        this.append((_b = brackets[1]) !== null && _b !== void 0 ? _b : '');
+        return this;
+    }
+    /**
+     * Adds parentheses around the specified content and adds one indentation level. Line breaks are added after start and before end of the parentheses.
+     * @param brackets The brackets to use.
+     * @param builderFnOrString The function to add content inside parentheses or one string that should be parenthesized.
+     * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
+     * @returns A reference to this instance.
+     */
+    parenthesizeMultiline(brackets, builderFnOrString, indent = true) {
+        var _a, _b;
+        this.appendLine((_a = brackets[0]) !== null && _a !== void 0 ? _a : '');
+        this.indent(builderFnOrString, indent);
+        this.ensureCurrentLineEmpty();
         this.append((_b = brackets[1]) !== null && _b !== void 0 ? _b : '');
         return this;
     }
@@ -276,16 +296,33 @@ export class SourceBuilder extends StringBuilder {
      * 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 builderFn The function to add content inside parentheses.
+     * @param builderFnOrString The function to add content inside parentheses or one string that should be parenthesized.
+     * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
+     * @returns A reference to this instance.
+     */
+    parenthesizeIf(condition, brackets, builderFnOrString, indent) {
+        if (evalCondition(condition)) {
+            this.parenthesize(brackets, builderFnOrString, indent !== null && indent !== void 0 ? indent : true);
+        }
+        else {
+            this.indent(builderFnOrString, indent !== null && indent !== void 0 ? indent : false);
+        }
+        return this;
+    }
+    /**
+     * Adds parentheses around the specified content if the specified condition is true. Line breaks are added after start and before end of the parentheses.
+     * @param condition The condition to check before adding parentheses.
+     * @param brackets The brackets to use.
+     * @param builderFnOrString The function to add content inside parentheses or one string that should be parenthesized.
      * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
      * @returns A reference to this instance.
      */
-    parenthesizeIf(condition, brackets, builderFn, indent) {
+    parenthesizeMultilineIf(condition, brackets, builderFnOrString, indent) {
         if (evalCondition(condition)) {
-            this.parenthesize(brackets, builderFn, indent !== null && indent !== void 0 ? indent : true);
+            this.parenthesizeMultiline(brackets, builderFnOrString, indent !== null && indent !== void 0 ? indent : true);
         }
         else {
-            this.indent(builderFn, indent !== null && indent !== void 0 ? indent : false);
+            this.indent(builderFnOrString, indent !== null && indent !== void 0 ? indent : false);
         }
         return this;
     }

package/package.json

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

package/types/lib/codegen/generator.d.ts

@@ -3,6 +3,7 @@ import { AnyConfig, OpenApiGenerationProvider, OpenApiGenerationProviderContext,
 import { OpenApiParser } from '../parse/parser';
 import { ApiData } from '../transform';
 import { ActionProvider } from '../utils/action-provider';
+import { DirectoryScanOptions } from '../utils/file-system.utils';
 import { EmptyConstructor, Merge } from '../utils/type.utils';
 type OpenApiGenerationProviders = {
     provider: ActionProvider<OpenApiGenerationProviderFn>;
@@ -22,6 +23,7 @@ declare class _OpenApiGenerator<TOutput extends OpenApiGeneratorInput> {
     useValue<PInput extends TOutput, POutput extends OpenApiGeneratorOutput, PConfig extends AnyConfig>(value: OpenApiGenerationProvider<VInput<PInput, TOutput>, POutput, PConfig>, config?: Partial<PConfig>): _OpenApiGenerator<Merge<[TOutput, POutput]>>;
     generate<T extends ApiData>(data: T): Promise<TOutput>;
     parseAndGenerate(...fileNames: (string | string[])[]): Promise<TOutput>;
+    parseAndGenerateFromDir(dir: string, options?: Partial<DirectoryScanOptions>): Promise<TOutput>;
 }
 export declare class OpenApiGenerator extends _OpenApiGenerator<{}> {
     constructor(config?: Partial<OpenApiGeneratorConfig>);

package/types/lib/collect/helpers.d.ts

@@ -1,3 +1,4 @@
 import { OpenApiCollectorData } from './types';
-export declare function collect<T>(data: OpenApiCollectorData, obj: T | T[] | undefined, func: (data: OpenApiCollectorData, obj: NonNullable<T>) => void): void;
-export declare function collectRecord<T>(data: OpenApiCollectorData, obj: Record<string, T> | undefined, func: (data: OpenApiCollectorData, obj: NonNullable<T>, key: string) => void): void;
+import { Nullable } from '../utils';
+export declare function collect<T extends Record<`x-${string}`, unknown>>(data: OpenApiCollectorData, obj: Nullable<T | Nullable<T>[]>, func: (data: OpenApiCollectorData, obj: NonNullable<T>) => void): void;
+export declare function collectRecord<T extends Record<`x-${string}`, unknown>>(data: OpenApiCollectorData, obj: Nullable<Record<string, Nullable<T>>>, func: (data: OpenApiCollectorData, obj: NonNullable<T>, key: string) => void): void;

package/types/lib/parse/types.d.ts

@@ -1,11 +1,14 @@
-import { OpenApiDocument, OpenApiReference } from './openapi-types';
+import { OpenApiDiscriminator, OpenApiDocument, OpenApiReference, OpenApiSchema } from './openapi-types';
 export type DerefSource<T> = {
     file: string;
     path: string;
     document: Deref<OpenApiDocument>;
     originalComponent: T;
 };
-type _Deref<T> = {
+type _DerefDiscriminator = Omit<OpenApiDiscriminator, 'mapping'> & {
+    mapping?: Record<string, Deref<OpenApiSchema>>;
+};
+type _Deref<T extends object> = T extends OpenApiDiscriminator ? _DerefDiscriminator : {
     [K in keyof T as K extends keyof OpenApiReference ? never : K]: Deref<T[K]>;
 } & {
     $src: DerefSource<T>;

package/types/lib/transform/api-types.d.ts

@@ -88,6 +88,10 @@ export type ApiSchemaProperty = {
     name: string;
     schema: ApiSchema;
 };
+export type ApiSchemaDiscriminator = {
+    propertyName: string;
+    mapping: Record<string, ApiSchema>;
+};
 export type ApiSchemaComponent = ApiComponent<OpenApiSchema>;
 export type ApiSchemaBase = ApiSchemaComponent & {
     name: string;
@@ -103,6 +107,8 @@ export type ApiSchemaBase = ApiSchemaComponent & {
     required: Set<string>;
     custom: Record<string, unknown>;
     not: ApiSchema | undefined;
+    discriminator: ApiSchemaDiscriminator | undefined;
+    inheritedSchemas: ApiSchema[];
 };
 export type ApiSchema<T extends ApiSchemaKind = ApiSchemaKind> = ApiSchemaBase & ApiSchemaExtensions<T>;
 type AdditionalCombinedSchemaProperties = {

package/types/lib/transform/transform-schema.d.ts

@@ -1,4 +1,4 @@
 import { ApiSchema } from './api-types';
 import { OpenApiTransformerContext } from './types';
 import { Deref, OpenApiSchema } from '../parse';
-export declare function transformSchema<T extends Deref<OpenApiSchema>>(context: OpenApiTransformerContext, schema: T, isReference?: boolean): ApiSchema;
+export declare function transformSchema<T extends Deref<OpenApiSchema>>(context: OpenApiTransformerContext, schema: T): ApiSchema;

package/types/lib/utils/file-system.utils.d.ts

@@ -0,0 +1,8 @@
+import { Nullable } from './type.utils';
+export type DirectoryScanOptions = {
+    recursive: boolean;
+    maxDepth: Nullable<number>;
+    filter?: (file: string) => boolean;
+};
+export declare const defaultDirectoryScanOptions: DirectoryScanOptions;
+export declare function getFiles(dir: string, options?: Partial<DirectoryScanOptions>): Promise<string[]>;

package/types/lib/utils/source-builder.d.ts

@@ -148,28 +148,45 @@ export declare class SourceBuilder extends StringBuilder {
     applyIfElse(condition: Condition, builderFn: (builder: this) => void, elseBuilderFn: (builder: this) => void): 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: (builder: this) => void, condition?: Condition): this;
+    indent(builderFnOrString: ((builder: this) => void) | string, condition?: Condition): 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 builderFnOrString The function to add content inside parentheses or one string that should be parenthesized.
      * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
      * @returns A reference to this instance.
      */
-    parenthesize(brackets: Paratheses, builderFn: (builder: this) => void, indent?: boolean): this;
+    parenthesize(brackets: Paratheses, builderFnOrString: ((builder: this) => void) | string, indent?: boolean): this;
+    /**
+     * Adds parentheses around the specified content and adds one indentation level. Line breaks are added after start and before end of the parentheses.
+     * @param brackets The brackets to use.
+     * @param builderFnOrString The function to add content inside parentheses or one string that should be parenthesized.
+     * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
+     * @returns A reference to this instance.
+     */
+    parenthesizeMultiline(brackets: Paratheses, builderFnOrString: ((builder: this) => void) | string, indent?: boolean): this;
     /**
      * 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 builderFn The function to add content inside parentheses.
+     * @param builderFnOrString The function to add content inside parentheses or one string that should be parenthesized.
+     * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
+     * @returns A reference to this instance.
+     */
+    parenthesizeIf(condition: Condition, brackets: Paratheses, builderFnOrString: ((builder: this) => void) | string, indent?: boolean): this;
+    /**
+     * Adds parentheses around the specified content if the specified condition is true. Line breaks are added after start and before end of the parentheses.
+     * @param condition The condition to check before adding parentheses.
+     * @param brackets The brackets to use.
+     * @param builderFnOrString The function to add content inside parentheses or one string that should be parenthesized.
      * @param indent Whether to indent the content inside parentheses. Defaults to `true`.
      * @returns A reference to this instance.
      */
-    parenthesizeIf(condition: Condition, brackets: Paratheses, builderFn: (builder: this) => void, indent?: boolean): this;
+    parenthesizeMultilineIf(condition: Condition, brackets: Paratheses, builderFnOrString: ((builder: this) => void) | string, indent?: boolean): this;
     /**
      * Adds content for each item in the specified array.
      * @param items The items to add content for.