@goast/core 0.0.5 → 0.1.0

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

@@ -62,58 +62,69 @@ export class SourceBuilder extends 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 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.
@@ -122,7 +133,7 @@ export class SourceBuilder extends StringBuilder {
      * @returns The current SourceBuilder.
      */
     appendLineIf(condition, ...value) {
-        return 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.
@@ -131,7 +142,15 @@ export class SourceBuilder extends 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.
@@ -140,7 +159,7 @@ export class SourceBuilder extends 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.
@@ -149,7 +168,7 @@ export class SourceBuilder extends StringBuilder {
      * @returns The current SourceBuilder.
      */
     prependIf(condition, ...value) {
-        return 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.
@@ -158,33 +177,7 @@ export class SourceBuilder extends StringBuilder {
      * @returns The current SourceBuilder.
      */
     prependLineIf(condition, ...value) {
-        return 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.
@@ -212,136 +205,82 @@ export class SourceBuilder extends 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 (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 (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 = 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 (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 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;
@@ -364,6 +303,15 @@ export class SourceBuilder extends 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/esm/lib/utils/string.utils.js

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

package/package.json

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

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

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