@goast/core 0.0.6 → 0.1.1

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/parse/deref-proxy.js

@@ -14,16 +14,22 @@ class DerefProxyHandler {
         this._overwrittenValues = {};
     }
     get(target, prop) {
-        var _a, _b, _c;
+        var _a;
         if (prop === '$ref') {
             return this._ref;
         }
         else if (prop === '$src') {
             return this._source;
         }
-        return ((_b = (_a = this._overwrittenValues[prop]) !== null && _a !== void 0 ? _a : target[prop]) !== null && _b !== void 0 ? _b : (propertiesNotDerivedFromRef.includes(prop)
+        if (this._overwrittenValues[prop] !== undefined) {
+            return this._overwrittenValues[prop];
+        }
+        if (target[prop] !== undefined) {
+            return target[prop];
+        }
+        return propertiesNotDerivedFromRef.includes(prop)
             ? undefined
-            : (_c = this._ref) === null || _c === void 0 ? void 0 : _c[prop]));
+            : (_a = this._ref) === null || _a === void 0 ? void 0 : _a[prop];
     }
     set(target, prop, value) {
         if (prop === '$ref' && (typeof value === 'object' || typeof value === 'undefined')) {

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

@@ -17,14 +17,14 @@ function transformSchema(context, schema) {
     if (existing)
         return existing;
     let kind = (0, helpers_1.determineSchemaKind)(schema);
-    let nullable = false;
+    let nullable = kind === 'null';
     if (kind === 'multi-type') {
         const types = schema.type;
         let isSingleType = types.length === 1;
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        if (types.length === 2 && (types.includes('null') || types.includes(null))) {
+        if (types.includes('null') || types.includes(null)) {
             nullable = true;
-            isSingleType = true;
+            isSingleType = types.length === 2;
         }
         if (isSingleType) {
             const newType = types.filter((t) => t !== 'null' && t !== null)[0];
@@ -32,6 +32,9 @@ function transformSchema(context, schema) {
             schema.type = newType;
             kind = (0, helpers_1.determineSchemaKind)(schema);
         }
+        else {
+            schema.type = types.filter((t) => t !== 'null' && t !== null);
+        }
     }
     const id = context.idGenerator.generateId('schema');
     const nameInfo = (0, helpers_1.determineSchemaName)(schema, id);

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,28 +208,16 @@ 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;
     }
@@ -246,142 +227,63 @@ class SourceBuilder extends string_utils_1.StringBuilder {
      * @param condition The condition to check before adding indentation.
      * @returns A reference to this instance.
      */
-    indent(builderFnOrString, condition = true) {
-        const shouldIndent = (0, condition_1.evalCondition)(condition);
-        if (shouldIndent) {
-            this.currentIndentLevel++;
-        }
+    indent(value) {
+        this.currentIndentLevel++;
         try {
-            if (typeof builderFnOrString === 'string') {
-                this.append(builderFnOrString);
-            }
-            else {
-                builderFnOrString(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 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`.
+     * 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, builderFnOrString, indent = true) {
-        var _a, _b;
-        this.append((_a = brackets[0]) !== null && _a !== void 0 ? _a : '');
-        this.indent(builderFnOrString, 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 and adds one indentation level. Line breaks are added after start and before end of the parentheses.
+     * Adds parentheses around the specified content.
      * @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`.
+     * @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.
      */
-    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;
+    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 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 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.
-     */
-    parenthesizeMultilineIf(condition, brackets, builderFnOrString, indent) {
-        if ((0, condition_1.evalCondition)(condition)) {
-            this.parenthesizeMultiline(brackets, builderFnOrString, indent !== null && indent !== void 0 ? indent : true);
-        }
-        else {
-            this.indent(builderFnOrString, 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.
-     * @returns A reference to this instance.
-     */
-    forEach(items, builderFn) {
-        return this.forEachImpl(items, builderFn);
-    }
-    /**
-     * 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.
+     * @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;
@@ -404,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/parse/deref-proxy.js

@@ -10,16 +10,22 @@ class DerefProxyHandler {
         this._overwrittenValues = {};
     }
     get(target, prop) {
-        var _a, _b, _c;
+        var _a;
         if (prop === '$ref') {
             return this._ref;
         }
         else if (prop === '$src') {
             return this._source;
         }
-        return ((_b = (_a = this._overwrittenValues[prop]) !== null && _a !== void 0 ? _a : target[prop]) !== null && _b !== void 0 ? _b : (propertiesNotDerivedFromRef.includes(prop)
+        if (this._overwrittenValues[prop] !== undefined) {
+            return this._overwrittenValues[prop];
+        }
+        if (target[prop] !== undefined) {
+            return target[prop];
+        }
+        return propertiesNotDerivedFromRef.includes(prop)
             ? undefined
-            : (_c = this._ref) === null || _c === void 0 ? void 0 : _c[prop]));
+            : (_a = this._ref) === null || _a === void 0 ? void 0 : _a[prop];
     }
     set(target, prop, value) {
         if (prop === '$ref' && (typeof value === 'object' || typeof value === 'undefined')) {

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

@@ -14,14 +14,14 @@ export function transformSchema(context, schema) {
     if (existing)
         return existing;
     let kind = determineSchemaKind(schema);
-    let nullable = false;
+    let nullable = kind === 'null';
     if (kind === 'multi-type') {
         const types = schema.type;
         let isSingleType = types.length === 1;
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        if (types.length === 2 && (types.includes('null') || types.includes(null))) {
+        if (types.includes('null') || types.includes(null)) {
             nullable = true;
-            isSingleType = true;
+            isSingleType = types.length === 2;
         }
         if (isSingleType) {
             const newType = types.filter((t) => t !== 'null' && t !== null)[0];
@@ -29,6 +29,9 @@ export function transformSchema(context, schema) {
             schema.type = newType;
             kind = determineSchemaKind(schema);
         }
+        else {
+            schema.type = types.filter((t) => t !== 'null' && t !== null);
+        }
     }
     const id = context.idGenerator.generateId('schema');
     const nameInfo = determineSchemaName(schema, id);

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,28 +205,16 @@ 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;
     }
@@ -243,142 +224,63 @@ export class SourceBuilder extends StringBuilder {
      * @param condition The condition to check before adding indentation.
      * @returns A reference to this instance.
      */
-    indent(builderFnOrString, condition = true) {
-        const shouldIndent = evalCondition(condition);
-        if (shouldIndent) {
-            this.currentIndentLevel++;
-        }
+    indent(value) {
+        this.currentIndentLevel++;
         try {
-            if (typeof builderFnOrString === 'string') {
-                this.append(builderFnOrString);
-            }
-            else {
-                builderFnOrString(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 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`.
+     * 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, builderFnOrString, indent = true) {
-        var _a, _b;
-        this.append((_a = brackets[0]) !== null && _a !== void 0 ? _a : '');
-        this.indent(builderFnOrString, 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 and adds one indentation level. Line breaks are added after start and before end of the parentheses.
+     * Adds parentheses around the specified content.
      * @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`.
+     * @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.
      */
-    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;
+    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 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 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.
-     */
-    parenthesizeMultilineIf(condition, brackets, builderFnOrString, indent) {
-        if (evalCondition(condition)) {
-            this.parenthesizeMultiline(brackets, builderFnOrString, indent !== null && indent !== void 0 ? indent : true);
-        }
-        else {
-            this.indent(builderFnOrString, 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.
-     * @returns A reference to this instance.
-     */
-    forEach(items, builderFn) {
-        return this.forEachImpl(items, builderFn);
-    }
-    /**
-     * 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.
+     * @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;
@@ -401,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.6",
+  "version": "0.1.1",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",

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

@@ -1,5 +1,5 @@
 import { Condition } from './condition';
-import { StringBuilder, StringBuilderOptions } from './string.utils';
+import { BuilderFn, StringBuilder, StringBuilderOptions, TextOrBuilderFn } from './string.utils';
 import { Nullable } from './type.utils';
 export type IndentOptions = {
     readonly type: 'tabs';
@@ -16,6 +16,36 @@ type KnownParatheses = '()' | '[]' | '{}' | '<>';
 export type Paratheses = KnownParatheses | Omit<string, KnownParatheses> | [open: Nullable<string>, close: Nullable<string>];
 export type SeparatorBuidlerFn<TBuilder extends SourceBuilder, TItem> = (builder: TBuilder, previousItem: TItem, nextItem: TItem, previousItemIndex: number, nextItemIndex: number) => void;
 export type Separator<TBuilder extends SourceBuilder, TItem> = string | SeparatorBuidlerFn<TBuilder, TItem>;
+/**
+ * Options for the `parenthesize` methods of the `SourceBuilder`.
+ * @see SourceBuilder.parenthesize
+ * @see SourceBuilder.parenthesizeIf
+ */
+export type ParenthesizeOptions = {
+    /**
+     * Whether to add line breaks after start and before end of the parentheses. Defaults to `false`.
+     */
+    readonly multiline?: boolean;
+    /**
+     * Whether to indent the content inside parentheses. Defaults to `true`.
+     */
+    readonly indent?: boolean;
+};
+/**
+ * Options for the `forEach` methods of the `SourceBuilder`.
+ * @see SourceBuilder.forEach
+ * @see SourceBuilder.forEachIf
+ */
+export type ForEachOptions<TBuilder extends SourceBuilder, TItem> = {
+    /**
+     * The condition to check before adding content for each item. Defaults to `true`.
+     */
+    readonly condition?: Condition<TItem>;
+    /**
+     * The seperator to add between items. Default to `undefined`.
+     */
+    readonly separator?: Separator<TBuilder, TItem>;
+};
 /**
  * Represents an in-memory source file.
  */
@@ -53,74 +83,61 @@ export declare class SourceBuilder extends StringBuilder {
      * @param options The options to use for the `SourceBuilder` instance.
      * @returns The string built by the `SourceBuilder` instance.
      */
-    static build(buildAction: (builder: SourceBuilder) => void, options?: Partial<SourceBuilderOptions>): string;
+    static build(buildAction: BuilderFn<SourceBuilder>, options?: Partial<SourceBuilderOptions>): string;
     /**
      * Appends one or more strings to the end of the current SourceBuilder.
      * @param value The string(s) to append.
      * @returns The current SourceBuilder.
      */
-    append(...value: Nullable<string>[]): this;
+    append(...value: Nullable<TextOrBuilderFn<this>>[]): 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: Nullable<string>[]): this;
+    appendIf(condition: Condition, ...value: Nullable<TextOrBuilderFn<this>>[]): this;
     /**
-     * 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: Condition, ...value: Nullable<string>[]): this;
+    appendLine(...value: Nullable<TextOrBuilderFn<this>>[]): this;
     /**
      * Appends one or more strings to the end of the current SourceBuilder, followed by a line terminator, 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.
      */
-    appendLineIf(condition: Condition, ...value: Nullable<string>[]): this;
+    appendLineIf(condition: Condition, ...value: Nullable<TextOrBuilderFn<this>>[]): this;
     /**
      * Appends the specified values to this source builder with the specified line prefix.
      * @param {string} prefix - The line prefix to use.
      * @param {...(string|null|undefined)} value - The values to append.
      * @returns {SourceBuilder} This source builder instance.
      */
-    appendWithLinePrefix(prefix: string, ...value: Nullable<string>[]): this;
+    appendWithLinePrefix(prefix: string, ...value: Nullable<TextOrBuilderFn<this>>[]): this;
     /**
      * Appends the specified values to this source builder as a new line with the specified line prefix.
      * @param {string} prefix - The line prefix to use.
      * @param {...(string|null|undefined)} value - The values to append.
      * @returns {SourceBuilder} This source builder instance.
      */
-    appendLineWithLinePrefix(prefix: string, ...value: Nullable<string>[]): this;
+    appendLineWithLinePrefix(prefix: string, ...value: Nullable<TextOrBuilderFn<this>>[]): this;
     /**
      * Prepends one or more strings to the beginning of the current SourceBuilder if the specified condition is true.
      * @param condition The condition to check before prepending the specified value.
      * @param value The string(s) to prepend.
      * @returns The current SourceBuilder.
      */
-    prependIf(condition: Condition, ...value: Nullable<string | ((builder: StringBuilder) => void)>[]): this;
+    prependIf(condition: Condition, ...value: Nullable<TextOrBuilderFn<StringBuilder>>[]): this;
     /**
      * Prepends one or more strings to the beginning of the current SourceBuilder, followed by a line terminator, if the specified condition is true.
      * @param condition The condition to check before appending the specified value.
      * @param value The string(s) to prepend.
      * @returns The current SourceBuilder.
      */
-    prependLineIf(condition: Condition, ...value: Nullable<string | ((builder: StringBuilder) => void)>[]): this;
-    /**
-     * Applies the provided builder function to this source builder.
-     * @param builderFn The builder function to apply.
-     * @returns This source builder instance.
-     */
-    apply(builderFn: (builder: this) => void): 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: string, builderFn: (builder: this) => void): this;
+    prependLineIf(condition: Condition, ...value: Nullable<TextOrBuilderFn<StringBuilder>>[]): this;
     /**
      * Ensures that the current line is empty or consists only of whitespace characters.
      * @returns A reference to this instance.
@@ -134,100 +151,53 @@ export declare 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: Condition, builderFn: (builder: this) => void): 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: Condition, builderFn: (builder: this) => void, elseBuilderFn: (builder: this) => void): this;
+    if(condition: Condition, builderFn: BuilderFn<this>, elseBuilderFn?: BuilderFn<this>): 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 or the content itself.
      * @param condition The condition to check before adding indentation.
      * @returns A reference to this instance.
      */
-    indent(builderFnOrString: ((builder: this) => void) | string, condition?: Condition): this;
+    indent(value: Nullable<TextOrBuilderFn<this>>): this;
     /**
-     * Adds parentheses around the specified content and adds one indentation level.
-     * @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`.
+     * 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: Paratheses, builderFnOrString: ((builder: this) => void) | string, indent?: boolean): this;
+    indentIf(condition: Condition, value: Nullable<TextOrBuilderFn<this>>): this;
     /**
-     * Adds parentheses around the specified content and adds one indentation level. Line breaks are added after start and before end of the parentheses.
+     * Adds parentheses around the specified content.
      * @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`.
+     * @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.
      */
-    parenthesizeMultiline(brackets: Paratheses, builderFnOrString: ((builder: this) => void) | string, indent?: boolean): this;
+    parenthesize(brackets: Paratheses, value: Nullable<TextOrBuilderFn<this>>, options?: ParenthesizeOptions): 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 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.
-     */
-    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.
-     * @param builderFn The function to add content for each item.
-     * @returns A reference to this instance.
-     */
-    forEach<T>(items: Iterable<T>, builderFn: (builder: this, item: T, index: number) => void): 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.
-     * @param builderFn The function to add content for each item.
-     * @returns A reference to this instance.
-     */
-    forEachIf<T>(items: Iterable<T>, condition: Condition, builderFn: (builder: this, item: T, index: number) => void): 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<T>(items: Iterable<T>, condition: Condition<T>, builderFn: (builder: this, item: T, index: number) => void): this;
-    /**
-     * 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.
+     * @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<T>(items: Iterable<T>, seperator: Separator<this, T>, builderFn: (builder: this, item: T, index: number) => void): this;
+    parenthesizeIf(condition: Condition, brackets: Paratheses, value: TextOrBuilderFn<this>, options?: ParenthesizeOptions): 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 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<T>(items: Iterable<T>, condition: Condition<T>, seperator: Separator<this, T>, builderFn: (builder: this, item: T, index: number) => void): this;
-    private forEachImpl;
+    forEach<T>(items: Iterable<T>, builderFn: (builder: this, item: T, index: number) => void, options?: ForEachOptions<this, T>): this;
+    forEachIf<T>(condition: Condition, items: Iterable<T>, builderFn: (builder: this, item: T, index: number) => void, options?: ForEachOptions<this, T>): this;
+    appendSeparated(items: Iterable<Nullable<TextOrBuilderFn<this>>>, separator: string): this;
+    appendSeparatedIf(condition: Condition, items: Iterable<Nullable<TextOrBuilderFn<this>>>, separator: string): this;
     private appendIndent;
 }
 export {};

package/types/lib/utils/string.utils.d.ts

@@ -111,6 +111,8 @@ export type StringBuilderOptions = {
     readonly newLine: string;
 };
 export declare const defaultStringBuilderOptions: StringBuilderOptions;
+export type BuilderFn<TBuilder extends StringBuilder> = (builder: TBuilder) => void;
+export type TextOrBuilderFn<TBuilder extends StringBuilder> = string | BuilderFn<TBuilder>;
 /**
  * Represents a mutable string of characters.
  */
@@ -142,25 +144,25 @@ export declare class StringBuilder {
      * @param value The string(s) to append.
      * @returns The current StringBuilder.
      */
-    append(...value: Nullable<string>[]): this;
+    append(...value: Nullable<TextOrBuilderFn<this>>[]): this;
     /**
      * Appends one or more strings to the end of the current StringBuilder, followed by a line terminator.
      * @param value
      * @returns
      */
-    appendLine(...value: Nullable<string>[]): this;
+    appendLine(...value: Nullable<TextOrBuilderFn<this>>[]): this;
     /**
      * Prepends one or more strings to the beginning of the current StringBuilder.
      * @param value The string(s) to prepend.
      * @returns The current StringBuilder.
      */
-    prepend(...value: Nullable<string | ((builder: StringBuilder) => void)>[]): this;
+    prepend(...value: Nullable<TextOrBuilderFn<StringBuilder>>[]): this;
     /**
      * Prepends one or more strings to the beginning of the current StringBuilder, followed by a line terminator.
      * @param value The string(s) to prepend.
      * @returns The current StringBuilder.
      */
-    prependLine(...value: Nullable<string | ((builder: StringBuilder) => void)>[]): this;
+    prependLine(...value: Nullable<TextOrBuilderFn<StringBuilder>>[]): this;
     /**
      * Converts the value of this instance to a string.
      * @returns A string whose value is the same as this instance.

package/types/lib/utils/type.utils.d.ts

@@ -3,6 +3,7 @@ type MergeTwo<T, U> = {
 } & U;
 export type Merge<U extends unknown[]> = U extends [infer A, ...infer R] ? MergeTwo<A, Merge<R>> : {};
 export type OptionalProperties<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+export type RequiredProperties<T, K extends keyof T> = Omit<T, K> & Required<Pick<T, K>>;
 export type ArrayItem<T> = T extends (infer U)[] ? U : never;
 export type Nullable<T> = T | null | undefined;
 export interface Constructor<T, TArgs extends any[]> extends Function {