@goast/kotlin 0.4.7-beta2 → 0.4.8

package/script/src/ast/nodes/string.test.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("../../../_dnt.test_polyfills.js");
+const node_os_1 = require("node:os");
+const expect_js_1 = require("../../../deps/jsr.io/@std/expect/1.0.9/expect.js");
+const bdd_js_1 = require("../../../deps/jsr.io/@std/testing/1.0.6/bdd.js");
+const file_builder_js_1 = require("../../file-builder.js");
+const string_js_1 = require("./string.js");
+(0, bdd_js_1.describe)('ktString', () => {
+    let builder;
+    (0, bdd_js_1.beforeEach)(() => {
+        builder = new file_builder_js_1.KotlinFileBuilder();
+    });
+    (0, bdd_js_1.it)('should handle null', () => {
+        builder.append((0, string_js_1.ktString)(null));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('null');
+    });
+    (0, bdd_js_1.it)('should surround string with double quotes', () => {
+        builder.append((0, string_js_1.ktString)('test'));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('"test"');
+    });
+    (0, bdd_js_1.it)('should escape certain characters', () => {
+        builder.append((0, string_js_1.ktString)('\r\n\t${\n"abc"\n}\u0014'));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('"\\r\\n\\t\\${\\n\\"abc\\"\\n}\\u0014"');
+    });
+    (0, bdd_js_1.it)('should not escape $ character in template string', () => {
+        builder.append((0, string_js_1.ktString)('\r\n\t${\n"abc"\n}\u0014', { template: true }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`"\\r\\n\\t\${${node_os_1.EOL}"abc"${node_os_1.EOL}}\\u0014"`);
+    });
+    (0, bdd_js_1.it)('should handle multiline strings', () => {
+        builder.append((0, string_js_1.ktString)('test\r\ntest', { multiline: true }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`"""${node_os_1.EOL}    |test${node_os_1.EOL}    |test${node_os_1.EOL}    """.trimMargin()`);
+    });
+    (0, bdd_js_1.it)('should handle multiline strings with custom margin prefix', () => {
+        builder.append((0, string_js_1.ktString)('test\r\ntest', { multiline: true, marginPrefix: '!' }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`"""${node_os_1.EOL}    !test${node_os_1.EOL}    !test${node_os_1.EOL}    """.trimMargin("!")`);
+    });
+    (0, bdd_js_1.it)('should handle multiline strings without auto prefix', () => {
+        builder.append((0, string_js_1.ktString)('test\r\ntest', { multiline: true, autoAddMarginPrefix: false }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`"""${node_os_1.EOL}    test${node_os_1.EOL}    test${node_os_1.EOL}    """.trimMargin()`);
+    });
+    (0, bdd_js_1.it)('should handle multiline strings without trimMargin', () => {
+        builder.append((0, string_js_1.ktString)('test\r\ntest', { multiline: true, trimMargin: false }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`"""test${node_os_1.EOL}test"""`);
+    });
+    (0, bdd_js_1.it)('should render injections', () => {
+        builder.append((0, string_js_1.ktString)('test', { inject: { before: 'before', after: 'after' } }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('before"test"after');
+    });
+});

package/script/src/generators/services/okhttp3-clients/okhttp3-client-generator.js

@@ -105,31 +105,31 @@ class DefaultKotlinOkHttp3Generator extends file_generator_js_1.KotlinFileGenera
         return (0, core_1.appendValueGroup)([
             (0, core_1.builderTemplate) `val localVarResponse = ${index_js_1.kt.call([(0, core_1.toCasing)(endpoint.name + '_WithHttpInfo', ctx.config.functionNameCasing)], parameters.map((x) => x.name))}`,
             '',
-            (0, core_1.builderTemplate) `return when (localVarResponse.responseType) {${core_1.builderTemplate.indent `
+            (0, core_1.builderTemplate) `return when (localVarResponse.responseType) {${core_1.builderTemplate.indent `
             ${ctx.refs.responseType()}.Success -> ${responseSchema === undefined
                 ? index_js_1.kt.refs.unit()
                 : (0, core_1.builderTemplate) `(localVarResponse as ${ctx.refs.success(['*'])}).data as ${this.getTypeUsage(ctx, {
                     schema: responseSchema,
-                })}`}
-            ${ctx.refs.responseType()}.Informational -> throw ${index_js_1.kt.refs.java.unsupportedOperationException()}("Client does not support Informational responses.")
-            ${ctx.refs.responseType()}.Redirection -> throw ${index_js_1.kt.refs.java.unsupportedOperationException()}("Client does not support Redirection responses.")
-            ${ctx.refs.responseType()}.ClientError -> {${core_1.builderTemplate.indent `
-              val localVarError = localVarResponse as ${ctx.refs.clientError(['*'])}
-              throw ${ctx.refs.clientException()}(${core_1.builderTemplate.indent `
-                "Client error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
-                localVarError.statusCode,
-                localVarResponse`}
-              )`}
-            }
-
-            ${ctx.refs.responseType()}.ServerError -> {${core_1.builderTemplate.indent `
-              val localVarError = localVarResponse as ${ctx.refs.serverError(['*'])}
-              throw ${ctx.refs.serverException()}(${core_1.builderTemplate.indent `
-                "Server error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
-                localVarError.statusCode,
-                localVarResponse`}
-              )`}
-            }`}
+                })}`}
+            ${ctx.refs.responseType()}.Informational -> throw ${index_js_1.kt.refs.java.unsupportedOperationException()}("Client does not support Informational responses.")
+            ${ctx.refs.responseType()}.Redirection -> throw ${index_js_1.kt.refs.java.unsupportedOperationException()}("Client does not support Redirection responses.")
+            ${ctx.refs.responseType()}.ClientError -> {${core_1.builderTemplate.indent `
+              val localVarError = localVarResponse as ${ctx.refs.clientError(['*'])}
+              throw ${ctx.refs.clientException()}(${core_1.builderTemplate.indent `
+                "Client error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
+                localVarError.statusCode,
+                localVarResponse`}
+              )`}
+            }
+
+            ${ctx.refs.responseType()}.ServerError -> {${core_1.builderTemplate.indent `
+              val localVarError = localVarResponse as ${ctx.refs.serverError(['*'])}
+              throw ${ctx.refs.serverException()}(${core_1.builderTemplate.indent `
+                "Server error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
+                localVarError.statusCode,
+                localVarResponse`}
+              )`}
+            }`}
           }`,
         ], '\n');
     }
@@ -213,17 +213,17 @@ class DefaultKotlinOkHttp3Generator extends file_generator_js_1.KotlinFileGenera
                 result.values.push(`val localVariableBody = ${bodyParamName}`);
             }
         }
-        result.values.push((0, core_1.builderTemplate) `val localVariableQuery: ${ctx.refs.multiValueMap()} = ${index_js_1.kt.call([index_js_1.kt.refs.mutableMapOf([index_js_1.kt.refs.string(), index_js_1.kt.refs.list([index_js_1.kt.refs.string()])])], [])}${queryParameters.length === 0 ? '' : core_1.builderTemplate.indent `
-            .apply {${core_1.builderTemplate.indent `
+        result.values.push((0, core_1.builderTemplate) `val localVariableQuery: ${ctx.refs.multiValueMap()} = ${index_js_1.kt.call([index_js_1.kt.refs.mutableMapOf([index_js_1.kt.refs.string(), index_js_1.kt.refs.list([index_js_1.kt.refs.string()])])], [])}${queryParameters.length === 0 ? '' : core_1.builderTemplate.indent `
+            .apply {${core_1.builderTemplate.indent `
               ${(0, core_1.appendValueGroup)(queryParameters.map((param) => {
             var _a;
             const paramName = (0, core_1.toCasing)(param.name, ctx.config.parameterNameCasing);
             const toString = ((_a = param.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'array' ? '.joinToString()' : '.toString()';
             const put = (0, core_1.builderTemplate) `put(${index_js_1.kt.string(paramName)}, listOf(${paramName}${toString}))`;
-            return param.required ? put : (0, core_1.builderTemplate) `if (${paramName} != null) {${core_1.builderTemplate.indent `
-                        ${put}`}
+            return param.required ? put : (0, core_1.builderTemplate) `if (${paramName} != null) {${core_1.builderTemplate.indent `
+                        ${put}`}
                       }`;
-        }), '\n')}`}
+        }), '\n')}`}
             }`}`);
         result.values.push('val localVariableHeaders: MutableMap<String, String> = mutableMapOf()');
         if (((_b = endpoint.requestBody) === null || _b === void 0 ? void 0 : _b.content[0]) !== undefined) {

package/script/src/generators/services/spring-controllers/models.d.ts

@@ -9,6 +9,7 @@ export type KotlinServicesGeneratorConfig = KotlinGeneratorConfig & {
     pathModifier?: RegExp | ((path: string, endpoint: ApiEndpoint) => string);
     addSwaggerAnnotations: boolean;
     addJakartaValidationAnnotations: boolean;
+    arrayType: 'list' | 'flux';
     strictResponseEntities: boolean;
     defaultStatusCodes: number[];
 };

package/script/src/generators/services/spring-controllers/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-controllers/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,+BAA+B,EAC/B,wCAAwC,EACzC,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAgC,KAAK,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC9F,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAEzE,MAAM,MAAM,6BAA6B,GAAG,qBAAqB,GAAG;IAClE,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC;IAE1D,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC;IACjF,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,KAAK,MAAM,CAAC,CAAC;IAE1E,qBAAqB,EAAE,OAAO,CAAC;IAC/B,+BAA+B,EAAE,OAAO,CAAC;IAEzC,sBAAsB,EAAE,OAAO,CAAC;IAChC,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,oCAAoC,EAAE,+BAA+B,CAAC,6BAA6B,CAW/G,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,2BAA2B,CAAC;AAEvE,MAAM,MAAM,6BAA6B,GAAG;IAC1C,MAAM,EAAE;QACN,QAAQ,EAAE;YACR,CAAC,SAAS,EAAE,MAAM,GAAG,4BAA4B,CAAC;SACnD,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,YAAY,CAAC;IAC5B,WAAW,EAAE,YAAY,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,wCAAwC,CACnF,4BAA4B,EAC5B,6BAA6B,EAC7B,6BAA6B,EAC7B,4BAA4B,CAC7B,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,8BAA8B,GAAG;IAC3E,OAAO,EAAE,UAAU,CAAC;CACrB,CAAC"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-controllers/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,+BAA+B,EAC/B,wCAAwC,EACzC,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAgC,KAAK,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC9F,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAEzE,MAAM,MAAM,6BAA6B,GAAG,qBAAqB,GAAG;IAClE,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC;IAE1D,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC;IACjF,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,KAAK,MAAM,CAAC,CAAC;IAE1E,qBAAqB,EAAE,OAAO,CAAC;IAC/B,+BAA+B,EAAE,OAAO,CAAC;IACzC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAE3B,sBAAsB,EAAE,OAAO,CAAC;IAChC,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,oCAAoC,EAAE,+BAA+B,CAAC,6BAA6B,CAY/G,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,2BAA2B,CAAC;AAEvE,MAAM,MAAM,6BAA6B,GAAG;IAC1C,MAAM,EAAE;QACN,QAAQ,EAAE;YACR,CAAC,SAAS,EAAE,MAAM,GAAG,4BAA4B,CAAC;SACnD,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,YAAY,CAAC;IAC5B,WAAW,EAAE,YAAY,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,wCAAwC,CACnF,4BAA4B,EAC5B,6BAA6B,EAC7B,6BAA6B,EAC7B,4BAA4B,CAC7B,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,8BAA8B,GAAG;IAC3E,OAAO,EAAE,UAAU,CAAC;CACrB,CAAC"}

package/script/src/generators/services/spring-controllers/models.js

@@ -8,6 +8,7 @@ exports.defaultKotlinServicesGeneratorConfig = {
     packageSuffix: '.api',
     addSwaggerAnnotations: true,
     addJakartaValidationAnnotations: true,
+    arrayType: 'flux',
     strictResponseEntities: false,
     defaultStatusCodes: [400, 401, 403, 500, 501],
 };

package/script/src/generators/services/spring-controllers/spring-controller-generator.d.ts

@@ -52,6 +52,6 @@ export declare class DefaultKotlinSpringControllerGenerator extends KotlinFileGe
     protected getAllParameters(ctx: Context, args: Args.GetAllParameters): ApiParameterWithMultipartInfo[];
     private createApiParameter;
 }
-export declare function listToFlux<T>(type: T): T;
+export declare function adjustListType<T>(ctx: Context, type: T): T;
 export {};
 //# sourceMappingURL=spring-controller-generator.d.ts.map

package/script/src/generators/services/spring-controllers/spring-controller-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spring-controller-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-controllers/spring-controller-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spring-controller-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-controllers/spring-controller-generator.ts"],"names":[],"mappings":"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"}

package/script/src/generators/services/spring-controllers/spring-controller-generator.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultKotlinSpringControllerGenerator = void 0;
-exports.listToFlux = listToFlux;
+exports.adjustListType = adjustListType;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const core_1 = require("@goast/core");
@@ -382,7 +382,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
             schema: parameter.schema,
             nullable: (!parameter.required && ((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.default) === undefined) || undefined,
         });
-        return parameter.target === 'body' ? listToFlux(type) : type;
+        return parameter.target === 'body' ? adjustListType(ctx, type) : type;
     }
     getResponseType(ctx, args) {
         const { endpoint, response } = args;
@@ -395,7 +395,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
             return (xType === null || xType === void 0 ? void 0 : xType.name) === (yType === null || yType === void 0 ? void 0 : yType.name) && (xType === null || xType === void 0 ? void 0 : xType.packageName) === (yType === null || yType === void 0 ? void 0 : yType.packageName);
         }) === i);
         if (responseSchemas.length === 1) {
-            return listToFlux(this.getTypeUsage(ctx, { schema: responseSchemas[0], fallback: index_js_1.kt.refs.unit() }));
+            return adjustListType(ctx, this.getTypeUsage(ctx, { schema: responseSchemas[0], fallback: index_js_1.kt.refs.unit() }));
         }
         else if (responseSchemas.length === 0) {
             return index_js_1.kt.refs.unit();
@@ -519,6 +519,13 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
     }
 }
 exports.DefaultKotlinSpringControllerGenerator = DefaultKotlinSpringControllerGenerator;
-function listToFlux(type) {
-    return index_js_1.kt.refs.list.matches(type) ? index_js_1.kt.refs.reactor.flux([type.generics[0]]) : type;
+function adjustListType(ctx, type) {
+    if (!index_js_1.kt.refs.list.matches(type))
+        return type;
+    switch (ctx.config.arrayType) {
+        case 'flux':
+            return index_js_1.kt.refs.reactor.flux([type.generics[0]]);
+        default:
+            return type;
+    }
 }

package/script/src/import-collection.test.d.ts

@@ -0,0 +1,2 @@
+import "../_dnt.test_polyfills.js";
+//# sourceMappingURL=import-collection.test.d.ts.map

package/script/src/import-collection.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"import-collection.test.d.ts","sourceRoot":"","sources":["../../src/src/import-collection.test.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC"}

package/script/src/import-collection.test.js

@@ -0,0 +1,101 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("../_dnt.test_polyfills.js");
+const node_os_1 = require("node:os");
+const expect_js_1 = require("../deps/jsr.io/@std/expect/1.0.9/expect.js");
+const bdd_js_1 = require("../deps/jsr.io/@std/testing/1.0.6/bdd.js");
+const core_1 = require("@goast/core");
+const import_collection_js_1 = require("./import-collection.js");
+(0, bdd_js_1.describe)('ImportCollection', () => {
+    (0, bdd_js_1.describe)('hasImport', () => {
+        (0, bdd_js_1.it)('should return false when no imports are added', () => {
+            const importCollection = new import_collection_js_1.ImportCollection();
+            (0, expect_js_1.expect)(importCollection.hasImports).toBe(false);
+        });
+        (0, bdd_js_1.it)('should return true when imports are added', () => {
+            const importCollection = new import_collection_js_1.ImportCollection();
+            importCollection.addImport('SomeClass', 'some.package');
+            (0, expect_js_1.expect)(importCollection.hasImports).toBe(true);
+        });
+    });
+    (0, bdd_js_1.describe)('imports', () => {
+        (0, bdd_js_1.it)('should return an empty array when no imports are added', () => {
+            const importCollection = new import_collection_js_1.ImportCollection();
+            (0, expect_js_1.expect)(importCollection.imports).toEqual([]);
+        });
+        (0, bdd_js_1.it)('should return an array of imports when imports are added', () => {
+            const importCollection = new import_collection_js_1.ImportCollection();
+            importCollection.addImport('SomeClass', 'some.package');
+            importCollection.addImport('AnotherClass', 'another.package');
+            (0, expect_js_1.expect)(importCollection.imports).toEqual([
+                { packageName: 'some.package', typeName: 'SomeClass' },
+                { packageName: 'another.package', typeName: 'AnotherClass' },
+            ]);
+        });
+    });
+    (0, bdd_js_1.describe)('addImport', () => {
+        (0, bdd_js_1.it)('should add an import to the collection', () => {
+            const importCollection = new import_collection_js_1.ImportCollection();
+            importCollection.addImport('SomeClass', 'some.package');
+            (0, expect_js_1.expect)(importCollection.imports).toEqual([{ packageName: 'some.package', typeName: 'SomeClass' }]);
+        });
+        (0, bdd_js_1.it)('should add an import to the collection using an object', () => {
+            const importCollection = new import_collection_js_1.ImportCollection();
+            importCollection.addImport({ packageName: 'some.package', typeName: 'SomeClass' });
+            (0, expect_js_1.expect)(importCollection.imports).toEqual([{ packageName: 'some.package', typeName: 'SomeClass' }]);
+        });
+    });
+    (0, bdd_js_1.describe)('addImports', () => {
+        (0, bdd_js_1.it)('should add multiple imports to the collection', () => {
+            const importCollection = new import_collection_js_1.ImportCollection();
+            importCollection.addImports([
+                { packageName: 'some.package', typeName: 'SomeClass' },
+                { packageName: 'another.package', typeName: 'AnotherClass' },
+            ]);
+            (0, expect_js_1.expect)(importCollection.imports).toEqual([
+                { packageName: 'some.package', typeName: 'SomeClass' },
+                { packageName: 'another.package', typeName: 'AnotherClass' },
+            ]);
+        });
+    });
+    (0, bdd_js_1.describe)('clear', () => {
+        (0, bdd_js_1.it)('should clear all imports', () => {
+            const importCollection = new import_collection_js_1.ImportCollection();
+            importCollection.addImport('SomeClass', 'some.package');
+            importCollection.clear();
+            (0, expect_js_1.expect)(importCollection.imports).toEqual([]);
+        });
+    });
+    (0, bdd_js_1.describe)('toString', () => {
+        (0, bdd_js_1.it)('should return an empty string when no imports are added', () => {
+            const importCollection = new import_collection_js_1.ImportCollection();
+            (0, expect_js_1.expect)(importCollection.toString()).toBe('');
+        });
+        (0, bdd_js_1.it)('should return a string of imports when imports are added', () => {
+            const importCollection = new import_collection_js_1.ImportCollection();
+            importCollection.addImport('SomeClass', 'some.package');
+            importCollection.addImport('AnotherClass', 'another.package');
+            (0, expect_js_1.expect)(importCollection.toString()).toBe(`import another.package.AnotherClass${node_os_1.EOL}import some.package.SomeClass${node_os_1.EOL}`);
+        });
+    });
+    (0, bdd_js_1.describe)('writeTo', () => {
+        (0, bdd_js_1.it)('should write imports to a StringBuilder', () => {
+            const importCollection = new import_collection_js_1.ImportCollection();
+            importCollection.addImport('SomeClass', 'some.package');
+            importCollection.addImport('AnotherClass', 'another.package');
+            const builder = new core_1.StringBuilder();
+            importCollection.writeTo(builder);
+            (0, expect_js_1.expect)(builder.toString()).toBe(`import another.package.AnotherClass${node_os_1.EOL}import some.package.SomeClass${node_os_1.EOL}`);
+        });
+    });
+    (0, bdd_js_1.it)('should ignore global imports', () => {
+        const importCollection = new import_collection_js_1.ImportCollection({
+            globalImports: ['kotlin.*', 'myPackage.MyClass'],
+        });
+        importCollection.addImport('String', 'kotlin');
+        importCollection.addImport('Int', 'kotlin');
+        importCollection.addImport('MyClass', 'myPackage');
+        importCollection.addImport('MyOtherClass', 'myPackage');
+        (0, expect_js_1.expect)(importCollection.toString()).toBe(`import myPackage.MyOtherClass${node_os_1.EOL}`);
+    });
+});

package/script/tests/openapi-models.test.d.ts

@@ -0,0 +1,2 @@
+import "../_dnt.test_polyfills.js";
+//# sourceMappingURL=openapi-models.test.d.ts.map

package/script/tests/openapi-models.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"openapi-models.test.d.ts","sourceRoot":"","sources":["../../src/tests/openapi-models.test.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC"}

package/script/tests/openapi-models.test.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+require("../_dnt.test_polyfills.js");
+const node_path_1 = require("node:path");
+const bdd_js_1 = require("../deps/jsr.io/@std/testing/1.0.6/bdd.js");
+const mock_js_1 = require("../deps/jsr.io/@std/testing/1.0.6/mock.js");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const core_1 = require("@goast/core");
+const test_utils_1 = require("@goast/test-utils");
+const models_generator_js_1 = require("../src/generators/models/models-generator.js");
+const filePaths = {
+    '2.0': test_utils_1.openApiV2FilesDir,
+    '3.0': test_utils_1.openApiV3FilesDir,
+    '3.1': test_utils_1.openApiV3_1FilesDir,
+};
+const testFilesAllVersions = ['simple-schemas.yml', 'detailed-schemas.yml', 'object-schemas.yml'];
+const testFilesV3x = ['oneof-schemas.yml', 'discriminated-schemas.yml'];
+for (const [version, path] of Object.entries(filePaths)) {
+    (0, bdd_js_1.describe)(`OpenAPI V${version}`, () => {
+        (0, bdd_js_1.afterEach)(() => {
+            (0, mock_js_1.restore)();
+        });
+        const testFiles = version.startsWith('3') ? testFilesAllVersions.concat(testFilesV3x) : testFilesAllVersions;
+        for (const file of testFiles) {
+            const fileWithoutExt = file.replace(/\.[^/.]+$/, '');
+            (0, bdd_js_1.test)((0, core_1.toCustomCase)(fileWithoutExt, { wordCasing: 'all-lower', wordSeparator: ' ' }), async (t) => {
+                const filePath = (0, node_path_1.join)(path, file);
+                const result = new test_utils_1.MultipartData();
+                (0, mock_js_1.stub)(fs_extra_1.default, 'ensureDirSync');
+                (0, mock_js_1.stub)(fs_extra_1.default, 'writeFileSync', (path, data) => {
+                    result.push([path.toString(), data.toString()]);
+                });
+                const generatorOptions = {
+                    outputDir: 'out',
+                    newLine: '\n',
+                };
+                const state = await new core_1.OpenApiGenerator(generatorOptions)
+                    // deno-lint-ignore no-explicit-any
+                    .useType(models_generator_js_1.KotlinModelsGenerator, { __test__: true })
+                    .parseAndGenerate(filePath);
+                result.splice(0, 0, ['state', state]);
+                (0, mock_js_1.restore)();
+                await (0, test_utils_1.verify)(t, result);
+            });
+        }
+    });
+}

package/src/_dnt.test_polyfills.ts

@@ -0,0 +1,70 @@
+// https://github.com/tc39/proposal-accessible-object-hasownproperty/blob/main/polyfill.js
+if (!Object.hasOwn) {
+  Object.defineProperty(Object, "hasOwn", {
+    value: function (object: any, property: any) {
+      if (object == null) {
+        throw new TypeError("Cannot convert undefined or null to object");
+      }
+      return Object.prototype.hasOwnProperty.call(Object(object), property);
+    },
+    configurable: true,
+    enumerable: false,
+    writable: true,
+  });
+}
+
+declare global {
+  interface Object {
+    /**
+     * Determines whether an object has a property with the specified name.
+     * @param o An object.
+     * @param v A property name.
+     */
+    hasOwn(o: object, v: PropertyKey): boolean;
+  }
+}
+
+export {};
+declare global {
+  // https://github.com/microsoft/TypeScript/blob/main/lib/lib.es2021.string.d.ts
+  interface String {
+    /**
+     * Replace all instances of a substring in a string, using a regular expression or search string.
+     * @param searchValue A string to search for.
+     * @param replaceValue A string containing the text to replace for every successful match of searchValue in this string.
+     */
+    replaceAll(searchValue: string | RegExp, replaceValue: string): string;
+
+    /**
+     * Replace all instances of a substring in a string, using a regular expression or search string.
+     * @param searchValue A string to search for.
+     * @param replacer A function that returns the replacement text.
+     */
+    replaceAll(
+      searchValue: string | RegExp,
+      replacer: (substring: string, ...args: any[]) => string,
+    ): string;
+  }
+}
+
+/**
+ * String.prototype.replaceAll() polyfill
+ * https://gomakethings.com/how-to-replace-a-section-of-a-string-with-another-one-with-vanilla-js/
+ * @author Chris Ferdinandi
+ * @license MIT
+ */
+if (!String.prototype.replaceAll) {
+  String.prototype.replaceAll = function (str: any, newStr: any) {
+    // If a regex pattern
+    if (
+      Object.prototype.toString.call(str).toLowerCase() === "[object regexp]"
+    ) {
+      return this.replace(str, newStr);
+    }
+
+    // If a string
+    return this.replace(new RegExp(str, "g"), newStr);
+  };
+}
+
+export {};

package/src/_dnt.test_shims.ts

@@ -0,0 +1,64 @@
+import { Deno } from "@deno/shim-deno-test";
+export { Deno } from "@deno/shim-deno-test";
+
+const dntGlobals = {
+  Deno,
+};
+export const dntGlobalThis = createMergeProxy(globalThis, dntGlobals);
+
+function createMergeProxy<T extends object, U extends object>(
+  baseObj: T,
+  extObj: U,
+): Omit<T, keyof U> & U {
+  return new Proxy(baseObj, {
+    get(_target, prop, _receiver) {
+      if (prop in extObj) {
+        return (extObj as any)[prop];
+      } else {
+        return (baseObj as any)[prop];
+      }
+    },
+    set(_target, prop, value) {
+      if (prop in extObj) {
+        delete (extObj as any)[prop];
+      }
+      (baseObj as any)[prop] = value;
+      return true;
+    },
+    deleteProperty(_target, prop) {
+      let success = false;
+      if (prop in extObj) {
+        delete (extObj as any)[prop];
+        success = true;
+      }
+      if (prop in baseObj) {
+        delete (baseObj as any)[prop];
+        success = true;
+      }
+      return success;
+    },
+    ownKeys(_target) {
+      const baseKeys = Reflect.ownKeys(baseObj);
+      const extKeys = Reflect.ownKeys(extObj);
+      const extKeysSet = new Set(extKeys);
+      return [...baseKeys.filter((k) => !extKeysSet.has(k)), ...extKeys];
+    },
+    defineProperty(_target, prop, desc) {
+      if (prop in extObj) {
+        delete (extObj as any)[prop];
+      }
+      Reflect.defineProperty(baseObj, prop, desc);
+      return true;
+    },
+    getOwnPropertyDescriptor(_target, prop) {
+      if (prop in extObj) {
+        return Reflect.getOwnPropertyDescriptor(extObj, prop);
+      } else {
+        return Reflect.getOwnPropertyDescriptor(baseObj, prop);
+      }
+    },
+    has(_target, prop) {
+      return prop in extObj || prop in baseObj;
+    },
+  }) as any;
+}

package/src/deps/jsr.io/@std/assert/1.0.9/assertion_error.ts

@@ -0,0 +1,31 @@
+// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
+// This module is browser compatible.
+
+/**
+ * Error thrown when an assertion fails.
+ *
+ * @example Usage
+ * ```ts ignore
+ * import { AssertionError } from "@std/assert";
+ *
+ * try {
+ *   throw new AssertionError("foo", { cause: "bar" });
+ * } catch (error) {
+ *   if (error instanceof AssertionError) {
+ *     error.message === "foo"; // true
+ *     error.cause === "bar"; // true
+ *   }
+ * }
+ * ```
+ */
+export class AssertionError extends Error {
+  /** Constructs a new instance.
+   *
+   * @param message The error message.
+   * @param options Additional options. This argument is still unstable. It may change in the future release.
+   */
+  constructor(message: string, options?: ErrorOptions) {
+    super(message, options);
+    this.name = "AssertionError";
+  }
+}