@goast/kotlin 0.4.7-beta2 → 0.4.7

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/ast/references/spring.d.ts

@@ -4,7 +4,6 @@ export declare const httpStatus: KtReferenceFactory;
 export declare const responseEntity: KtGenericReferenceFactory<1>;
 export declare const filePart: KtReferenceFactory;
 export declare const controller: KtReferenceFactory;
-export declare const multiValueMap: KtGenericReferenceFactory<2>;
 export declare const validated: KtReferenceFactory;
 export declare const pathVariable: KtReferenceFactory;
 export declare const requestBody: KtReferenceFactory;

package/script/src/ast/references/spring.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spring.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/references/spring.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,yBAAyB,EAAe,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG7G,eAAO,MAAM,SAAS,EAAE,kBAGvB,CAAC;AAGF,eAAO,MAAM,UAAU,EAAE,kBAAkF,CAAC;AAC5G,eAAO,MAAM,cAAc,EAAE,yBAAyB,CAAC,CAAC,CAGvD,CAAC;AAGF,eAAO,MAAM,QAAQ,EAAE,kBAAgG,CAAC;AAGxH,eAAO,MAAM,UAAU,EAAE,kBAAwF,CAAC;AAGlH,eAAO,MAAM,aAAa,EAAE,yBAAyB,CAAC,CAAC,CAGtD,CAAC;AAGF,eAAO,MAAM,SAAS,EAAE,kBAGvB,CAAC;AAGF,eAAO,MAAM,YAAY,EAAE,kBAG1B,CAAC;AACF,eAAO,MAAM,WAAW,EAAE,kBAGzB,CAAC;AACF,eAAO,MAAM,cAAc,EAAE,kBAG5B,CAAC;AACF,eAAO,MAAM,aAAa,EAAE,kBAG3B,CAAC;AACF,eAAO,MAAM,YAAY,EAAE,kBAG1B,CAAC;AACF,eAAO,MAAM,WAAW,EAAE,kBAGzB,CAAC;AAGF,eAAO,MAAM,gBAAgB,EAAE,kBAG9B,CAAC"}
+{"version":3,"file":"spring.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/references/spring.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,yBAAyB,EAAe,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG7G,eAAO,MAAM,SAAS,EAAE,kBAGvB,CAAC;AAGF,eAAO,MAAM,UAAU,EAAE,kBAAkF,CAAC;AAC5G,eAAO,MAAM,cAAc,EAAE,yBAAyB,CAAC,CAAC,CAGvD,CAAC;AAGF,eAAO,MAAM,QAAQ,EAAE,kBAAgG,CAAC;AAGxH,eAAO,MAAM,UAAU,EAAE,kBAAwF,CAAC;AAGlH,eAAO,MAAM,SAAS,EAAE,kBAGvB,CAAC;AAGF,eAAO,MAAM,YAAY,EAAE,kBAG1B,CAAC;AACF,eAAO,MAAM,WAAW,EAAE,kBAGzB,CAAC;AACF,eAAO,MAAM,cAAc,EAAE,kBAG5B,CAAC;AACF,eAAO,MAAM,aAAa,EAAE,kBAG3B,CAAC;AACF,eAAO,MAAM,YAAY,EAAE,kBAG1B,CAAC;AACF,eAAO,MAAM,WAAW,EAAE,kBAGzB,CAAC;AAGF,eAAO,MAAM,gBAAgB,EAAE,kBAG9B,CAAC"}

package/script/src/ast/references/spring.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nativeWebRequest = exports.requestPart = exports.requestParam = exports.requestMethod = exports.requestMapping = exports.requestBody = exports.pathVariable = exports.validated = exports.multiValueMap = exports.controller = exports.filePart = exports.responseEntity = exports.httpStatus = exports.autowired = void 0;
+exports.nativeWebRequest = exports.requestPart = exports.requestParam = exports.requestMethod = exports.requestMapping = exports.requestBody = exports.pathVariable = exports.validated = exports.controller = exports.filePart = exports.responseEntity = exports.httpStatus = exports.autowired = void 0;
 const reference_js_1 = require("../nodes/reference.js");
 // org.springframework.beans.factory.annotation
 exports.autowired = reference_js_1.ktReference.factory('Autowired', 'org.springframework.beans.factory.annotation');
@@ -11,8 +11,6 @@ exports.responseEntity = reference_js_1.ktReference.genericFactory('ResponseEnti
 exports.filePart = reference_js_1.ktReference.factory('FilePart', 'org.springframework.http.codec.multipart');
 // org.springframework.stereotype
 exports.controller = reference_js_1.ktReference.factory('Controller', 'org.springframework.stereotype');
-// org.springframework.util
-exports.multiValueMap = reference_js_1.ktReference.genericFactory('MultiValueMap', 'org.springframework.util');
 // org.springframework.validation.annotation
 exports.validated = reference_js_1.ktReference.factory('Validated', 'org.springframework.validation.annotation');
 // org.springframework.web.bind.annotation

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/args.d.ts

@@ -1,19 +1,11 @@
-import type { ApiEndpoint, ApiResponse, ApiSchema, SourceBuilder } from '@goast/core';
+import type { ApiEndpoint, ApiSchema, SourceBuilder } from '@goast/core';
 import type { kt } from '../../../ast/index.js';
 import type { ApiParameterWithMultipartInfo } from '../../../types.js';
-export type GenerateApiResponseEntitiesFile = {
-    dirPath: string;
-    packageName: string;
-};
-export type GetApiResponseEntitiesFileContent = {
-    packageName: string;
-};
-export type GetApiResponseEntities = object;
 export type GenerateApiInterfaceFile = {
     dirPath: string;
     packageName: string;
 };
-export type GetApiInterfaceFileContent = {
+export type GetApiinterfaceFileContent = {
     interfaceName: string;
 };
 export type GetApiInterface = {
@@ -22,9 +14,6 @@ export type GetApiInterface = {
 export type GetApiInterfaceEndpointMethod = {
     endpoint: ApiEndpoint;
 };
-export type GetApiResponseEntityClass = {
-    endpoint: ApiEndpoint;
-};
 export type GenerateApiControllerFile = {
     dirPath: string;
     packageName: string;
@@ -54,7 +43,6 @@ export type GetParameterType = {
 };
 export type GetResponseType = {
     endpoint: ApiEndpoint;
-    response?: ApiResponse;
 };
 export type GetTypeUsage<TBuilder extends SourceBuilder> = {
     schema: ApiSchema | undefined;
@@ -78,9 +66,6 @@ export type GetPathConstantName = {
     endpoint: ApiEndpoint;
 };
 export type GetPackageName = object;
-export type GetApiResponseEntityName = {
-    endpoint: ApiEndpoint;
-};
 export type GetApiInterfaceName = object;
 export type GetApiDelegateInterfaceName = object;
 export type GetApiControllerName = object;

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

@@ -1 +1 @@
-{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-controllers/args.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/spring-controllers/args.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEzE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,mBAAmB,CAAC;AAGvE,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnE,MAAM,MAAM,eAAe,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC;AAExD,MAAM,MAAM,6BAA6B,GAAG;IAAE,QAAQ,EAAE,WAAW,CAAA;CAAE,CAAC;AAItE,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,gBAAgB,GAAG;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,CAAC;AAI1D,MAAM,MAAM,gCAAgC,GAAG;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAAE,qBAAqB,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnF,MAAM,MAAM,uBAAuB,GAAG;IAAE,qBAAqB,EAAE,MAAM,CAAA;CAAE,CAAC;AAExE,MAAM,MAAM,qCAAqC,GAAG;IAAE,QAAQ,EAAE,WAAW,CAAA;CAAE,CAAC;AAG9E,MAAM,MAAM,gBAAgB,GAAG;IAAE,QAAQ,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE,6BAA6B,CAAA;CAAE,CAAC;AAEnG,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,EAAE,WAAW,CAAA;CAAE,CAAC;AAExD,MAAM,MAAM,YAAY,CAAC,QAAQ,SAAS,aAAa,IAAI;IACzD,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,MAAM,EAAE,SAAS,GAAG,SAAS,CAAA;CAAE,CAAC;AAE9D,MAAM,MAAM,2BAA2B,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9D,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC;AAEjC,MAAM,MAAM,eAAe,GAAG;IAAE,QAAQ,EAAE,WAAW,CAAA;CAAE,CAAC;AAExD,MAAM,MAAM,gBAAgB,GAAG;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvD,MAAM,MAAM,mBAAmB,GAAG;IAAE,QAAQ,EAAE,WAAW,CAAA;CAAE,CAAC;AAE5D,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC;AAEzC,MAAM,MAAM,2BAA2B,GAAG,MAAM,CAAC;AAEjD,MAAM,MAAM,oBAAoB,GAAG,MAAM,CAAC;AAE1C,MAAM,MAAM,gBAAgB,GAAG;IAAE,QAAQ,EAAE,WAAW,CAAA;CAAE,CAAC"}

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

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

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;CAC5B,CAAC;AAEF,eAAO,MAAM,oCAAoC,EAAE,+BAA+B,CAAC,6BAA6B,CAS/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,5 @@ exports.defaultKotlinServicesGeneratorConfig = {
     packageSuffix: '.api',
     addSwaggerAnnotations: true,
     addJakartaValidationAnnotations: true,
-    strictResponseEntities: false,
-    defaultStatusCodes: [400, 401, 403, 500, 501],
+    arrayType: 'flux',
 };

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

@@ -15,7 +15,7 @@ export interface KotlinSpringControllerGenerator<TOutput extends Output = Output
 export declare class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator<Context, Output> implements KotlinSpringControllerGenerator {
     generate(ctx: KotlinServiceGeneratorContext): MaybePromise<KotlinServiceGeneratorOutput>;
     protected generateApiInterfaceFile(ctx: Context, args: Args.GenerateApiInterfaceFile): KotlinImport;
-    protected getApiInterfaceFileContent(ctx: Context, args: Args.GetApiInterfaceFileContent): AppendValueGroup<Builder>;
+    protected getApiInterfaceFileContent(ctx: Context, args: Args.GetApiinterfaceFileContent): AppendValueGroup<Builder>;
     protected getApiInterface(ctx: Context, args: Args.GetApiInterface): kt.Interface<Builder>;
     private getApiInterfaceAnnotations;
     private getApiInterfaceMembers;
@@ -23,7 +23,6 @@ export declare class DefaultKotlinSpringControllerGenerator extends KotlinFileGe
     private getApiInterfaceEndpointMethodAnnnotations;
     private getApiInterfaceEndpointMethodParameter;
     private getApiInterfaceEndpointMethodBody;
-    private getApiResponseEntityClass;
     protected generateApiControllerFile(ctx: Context, args: Args.GenerateApiControllerFile): KotlinImport;
     protected getApiControllerFileContent(ctx: Context, args: Args.GetApiControllerFileContent): AppendValueGroup<Builder>;
     protected getApiController(ctx: Context, args: Args.GetApiController): kt.Class<Builder>;
@@ -45,13 +44,12 @@ export declare class DefaultKotlinSpringControllerGenerator extends KotlinFileGe
     protected getDirectoryPath(ctx: Context, args: Args.GetDirectoryPath): string;
     protected getPathConstantName(ctx: Context, args: Args.GetPathConstantName): string;
     protected getPackageName(ctx: Context, _args: Args.GetPackageName): string;
-    protected getApiResponseEntityName(ctx: Context, args: Args.GetApiResponseEntityName): string;
     protected getApiInterfaceName(ctx: Context, _args: Args.GetApiInterfaceName): string;
     protected getApiControllerName(ctx: Context, _args: Args.GetApiControllerName): string;
     protected getApiDelegateInterfaceName(ctx: Context, _args: Args.GetApiDelegateInterfaceName): string;
     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,11 +1,10 @@
 "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");
-const http_status_codes_1 = require("http-status-codes");
 const index_js_1 = require("../../../ast/index.js");
 const file_builder_js_1 = require("../../../file-builder.js");
 const utils_js_1 = require("../../../utils.js");
@@ -71,9 +70,6 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
         ctx.service.endpoints.forEach((endpoint) => {
             members.push(this.getApiInterfaceEndpointMethod(ctx, { endpoint }));
         });
-        if (ctx.config.strictResponseEntities) {
-            members.push(...ctx.service.endpoints.map((endpoint) => this.getApiResponseEntityClass(ctx, { endpoint })));
-        }
         return members;
     }
     getApiInterfaceEndpointMethod(ctx, args) {
@@ -83,9 +79,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
             suspend: true,
             annotations: this.getApiInterfaceEndpointMethodAnnnotations(ctx, endpoint),
             parameters: parameters.map((parameter) => this.getApiInterfaceEndpointMethodParameter(ctx, endpoint, parameter)),
-            returnType: ctx.config.strictResponseEntities
-                ? index_js_1.kt.reference(this.getApiResponseEntityName(ctx, { endpoint }), null, { generics: ['*'] })
-                : index_js_1.kt.refs.spring.responseEntity([this.getResponseType(ctx, { endpoint })]),
+            returnType: index_js_1.kt.refs.spring.responseEntity([this.getResponseType(ctx, { endpoint })]),
             body: this.getApiInterfaceEndpointMethodBody(ctx, endpoint, parameters),
         });
     }
@@ -198,53 +192,6 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
             (0, core_1.builderTemplate) `return ${index_js_1.kt.call([index_js_1.kt.call(index_js_1.kt.reference('getDelegate'), []), (0, core_1.toCasing)(endpoint.name, ctx.config.functionNameCasing)], parameters.map((x) => (0, core_1.toCasing)(x.name, ctx.config.parameterNameCasing)))}`,
         ], '\n');
     }
-    getApiResponseEntityClass(ctx, args) {
-        const { endpoint } = args;
-        const name = this.getApiResponseEntityName(ctx, { endpoint });
-        return index_js_1.kt.class(name, {
-            doc: index_js_1.kt.doc(`Response entity for ${endpoint.name}.`),
-            generics: [index_js_1.kt.genericParameter('T')],
-            primaryConstructor: index_js_1.kt.constructor([
-                index_js_1.kt.parameter.class('body', index_js_1.kt.reference('T')),
-                index_js_1.kt.parameter.class('rawStatus', index_js_1.kt.refs.int()),
-                index_js_1.kt.parameter.class('headers', index_js_1.kt.refs.spring.multiValueMap([index_js_1.kt.refs.string(), index_js_1.kt.refs.string()], { nullable: true }), { default: index_js_1.kt.toNode(null) }),
-            ], null, {
-                accessModifier: endpoint.responses.length > 0 ? 'private' : null,
-                delegateTarget: 'super',
-                delegateArguments: [index_js_1.kt.argument('body'), index_js_1.kt.argument('headers'), index_js_1.kt.argument('rawStatus')],
-            }),
-            extends: index_js_1.kt.refs.spring.responseEntity([index_js_1.kt.reference('T')]),
-            companionObject: index_js_1.kt.object({
-                members: Array.from(new Set([
-                    ...ctx.config.defaultStatusCodes,
-                    501,
-                    ...endpoint.responses.map((x) => x.statusCode),
-                ].filter(core_1.notNullish)))
-                    .map((code) => {
-                    const fnName = (0, core_1.toCasing)((0, http_status_codes_1.getReasonPhrase)(code), ctx.config.functionNameCasing);
-                    const response = endpoint.responses.find((x) => x.statusCode === code);
-                    const responseType = response ? this.getResponseType(ctx, { endpoint, response }) : undefined;
-                    const hasResponseBody = responseType && !index_js_1.kt.refs.unit.matches(responseType);
-                    return index_js_1.kt.function(fnName, {
-                        parameters: [
-                            hasResponseBody ? index_js_1.kt.parameter.class('body', responseType) : null,
-                            index_js_1.kt.parameter.class('headers', index_js_1.kt.refs.spring.multiValueMap([index_js_1.kt.refs.string(), index_js_1.kt.refs.string()], { nullable: true }), { default: index_js_1.kt.toNode(null) }),
-                        ],
-                        singleExpression: true,
-                        body: index_js_1.kt.call([
-                            index_js_1.kt.reference(this.getApiResponseEntityName(ctx, { endpoint }), null, {
-                                generics: [hasResponseBody ? responseType : index_js_1.kt.refs.unit({ nullable: true })],
-                            }),
-                        ], [
-                            hasResponseBody ? index_js_1.kt.argument('body') : index_js_1.kt.toNode(null),
-                            index_js_1.kt.toNode(code),
-                            index_js_1.kt.argument('headers'),
-                        ]),
-                    });
-                }),
-            }),
-        });
-    }
     // #endregion
     // #region API Controller
     generateApiControllerFile(ctx, args) {
@@ -351,25 +298,14 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
     getApiDelegateInterfaceEndpointMethod(ctx, args) {
         const { endpoint } = args;
         const parameters = this.getAllParameters(ctx, { endpoint });
-        const fn = index_js_1.kt.function((0, core_1.toCasing)(endpoint.name, ctx.config.functionNameCasing), {
+        return index_js_1.kt.function((0, core_1.toCasing)(endpoint.name, ctx.config.functionNameCasing), {
             suspend: true,
             parameters: parameters.map((parameter) => {
                 return index_js_1.kt.parameter((0, core_1.toCasing)(parameter.name, ctx.config.parameterNameCasing), this.getParameterType(ctx, { endpoint, parameter }));
             }),
+            returnType: index_js_1.kt.refs.spring.responseEntity([this.getResponseType(ctx, { endpoint })]),
+            body: (0, core_1.appendValueGroup)([(0, core_1.builderTemplate) `return ${index_js_1.kt.refs.spring.responseEntity.infer()}(${index_js_1.kt.refs.spring.httpStatus()}.NOT_IMPLEMENTED)`], '\n'),
         });
-        if (ctx.config.strictResponseEntities) {
-            const responseEntity = index_js_1.kt.reference.genericFactory(this.getApiResponseEntityName(ctx, { endpoint }), `${this.getPackageName(ctx, {})}.${this.getApiInterfaceName(ctx, {})}`);
-            fn.returnType = responseEntity(['*']);
-            fn.body = (0, core_1.appendValueGroup)([(0, core_1.builderTemplate) `return ${index_js_1.kt.call([
-                    responseEntity.infer(),
-                    (0, core_1.toCasing)((0, http_status_codes_1.getReasonPhrase)(501), ctx.config.functionNameCasing),
-                ], [])}`], '\n');
-        }
-        else {
-            fn.returnType = index_js_1.kt.refs.spring.responseEntity([this.getResponseType(ctx, { endpoint })]);
-            fn.body = (0, core_1.appendValueGroup)([(0, core_1.builderTemplate) `return ${index_js_1.kt.refs.spring.responseEntity.infer()}(${index_js_1.kt.refs.spring.httpStatus()}.NOT_IMPLEMENTED)`], '\n');
-        }
-        return fn;
     }
     // #endregion
     getParameterType(ctx, args) {
@@ -382,11 +318,11 @@ 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;
-        const responseSchemas = (response ? [response] : endpoint.responses)
+        const { endpoint } = args;
+        const responseSchemas = endpoint.responses
             .flatMap((x) => x.contentOptions.flatMap((x) => x.schema))
             .filter(core_1.notNullish)
             .filter((x, i, a) => a.findIndex((y) => {
@@ -395,7 +331,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();
@@ -443,10 +379,6 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
             : ctx.config.packageSuffix(ctx.service);
         return ctx.config.packageName + packageSuffix;
     }
-    getApiResponseEntityName(ctx, args) {
-        const { endpoint } = args;
-        return (0, core_1.toCasing)(`${endpoint.name}_ResponseEntity`, ctx.config.typeNameCasing);
-    }
     getApiInterfaceName(ctx, _args) {
         return (0, core_1.toCasing)(ctx.service.name + '_Api', ctx.config.typeNameCasing);
     }
@@ -519,6 +451,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"}