@goast/typescript 0.4.3 → 0.4.4

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

@@ -0,0 +1,91 @@
+"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.12/expect.js");
+const bdd_js_1 = require("../../../deps/jsr.io/@std/testing/1.0.9/bdd.js");
+const file_builder_js_1 = require("../../file-builder.js");
+const property_js_1 = require("./property.js");
+let builder;
+(0, bdd_js_1.beforeEach)(() => {
+    builder = new file_builder_js_1.TypeScriptFileBuilder();
+});
+(0, bdd_js_1.describe)('tsProperty', () => {
+    (0, bdd_js_1.it)('should write the name of the property', () => {
+        builder.append((0, property_js_1.tsProperty)('x'));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('x;' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should put name in quotes if needed', () => {
+        builder.append((0, property_js_1.tsProperty)('x y'));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe("'x y';" + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should write the type if it exists', () => {
+        builder.append((0, property_js_1.tsProperty)('x', { type: 'number' }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('x: number;' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should write the value if it exists', () => {
+        builder.append((0, property_js_1.tsProperty)('x', { value: '42' }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('x = 42;' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should write the readonly keyword if the property is readonly', () => {
+        builder.append((0, property_js_1.tsProperty)('x', { readonly: true }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('readonly x;' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should write the accessibility if it exists', () => {
+        builder.append((0, property_js_1.tsProperty)('x', { accessModifier: 'public' }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('public x;' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should write the static keyword if the property is static', () => {
+        builder.append((0, property_js_1.tsProperty)('x', { static: true }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('static x;' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should write the abstract keyword if the property is abstract', () => {
+        builder.append((0, property_js_1.tsProperty)('x', { abstract: true }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('abstract x;' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should write the override keyword if the property is override', () => {
+        builder.append((0, property_js_1.tsProperty)('x', { override: true }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('override x;' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should write the optional symbol if the property is optional', () => {
+        builder.append((0, property_js_1.tsProperty)('x', { optional: true }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('x?;' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should write all the parts of the property', () => {
+        builder.append((0, property_js_1.tsProperty)('x', {
+            type: 'number',
+            value: 42,
+            readonly: true,
+            accessModifier: 'public',
+            static: true,
+            abstract: true,
+            override: true,
+            optional: true,
+        }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('public static abstract override readonly x?: number = 42;' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should write getter and setter', () => {
+        builder.append((0, property_js_1.tsProperty)('x', { get: property_js_1.tsProperty.getter(), set: property_js_1.tsProperty.setter() }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('get x();' + node_os_1.EOL + 'set x(value);' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should write getter only', () => {
+        builder.append((0, property_js_1.tsProperty)('x', { get: property_js_1.tsProperty.getter() }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('get x();' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should write setter only', () => {
+        builder.append((0, property_js_1.tsProperty)('x', { set: property_js_1.tsProperty.setter() }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('set x(value);' + node_os_1.EOL);
+    });
+    (0, bdd_js_1.it)('should render injections', () => {
+        builder.append((0, property_js_1.tsProperty)('x', { inject: { before: ['before'], after: ['after'] } }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`beforex;${node_os_1.EOL}after`);
+    });
+    (0, bdd_js_1.it)('should render injections with getter and setter', () => {
+        builder.append((0, property_js_1.tsProperty)('x', {
+            get: property_js_1.tsProperty.getter(),
+            set: property_js_1.tsProperty.setter(),
+            inject: { before: ['before'], after: ['after'] },
+        }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`beforeget x();${node_os_1.EOL}set x(value);${node_os_1.EOL}after`);
+    });
+});

package/script/src/ast/nodes/reference.test.d.ts

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

package/script/src/ast/nodes/reference.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reference.test.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/nodes/reference.test.ts"],"names":[],"mappings":"AAAA,OAAO,iCAAiC,CAAC"}

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

@@ -0,0 +1,33 @@
+"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.12/expect.js");
+const bdd_js_1 = require("../../../deps/jsr.io/@std/testing/1.0.9/bdd.js");
+const file_builder_js_1 = require("../../file-builder.js");
+const reference_js_1 = require("./reference.js");
+let builder;
+(0, bdd_js_1.beforeEach)(() => {
+    builder = new file_builder_js_1.TypeScriptFileBuilder();
+});
+(0, bdd_js_1.describe)('tsReference', () => {
+    (0, bdd_js_1.it)('should write the name of the reference', () => {
+        builder.append((0, reference_js_1.tsReference)('X'));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('X');
+    });
+    (0, bdd_js_1.it)('should write the generics if they exist', () => {
+        builder.append((0, reference_js_1.tsReference)('X', null, { generics: ['T', 'U'] }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('X<T, U>');
+    });
+    (0, bdd_js_1.it)('should add the import if module name of file path is provided', () => {
+        builder.append((0, reference_js_1.tsReference)('X', 'module'));
+        (0, expect_js_1.expect)(builder.imports.imports).toEqual([
+            { kind: 'module', modulePath: 'module', name: 'X', type: 'import' },
+        ]);
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`import { X } from 'module';${node_os_1.EOL}X`);
+    });
+    (0, bdd_js_1.it)('should write the injections', () => {
+        builder.append((0, reference_js_1.tsReference)('X', null, { generics: ['T', 'U'], inject: { before: '║b║', after: '║a║' } }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('║b║X<T, U>║a║');
+    });
+});

package/script/src/ast/nodes/string.test.d.ts

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

package/script/src/ast/nodes/string.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"string.test.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/nodes/string.test.ts"],"names":[],"mappings":"AAAA,OAAO,iCAAiC,CAAC"}

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

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("../../../_dnt.test_polyfills.js");
+const expect_js_1 = require("../../../deps/jsr.io/@std/expect/1.0.12/expect.js");
+const bdd_js_1 = require("../../../deps/jsr.io/@std/testing/1.0.9/bdd.js");
+const file_builder_js_1 = require("../../file-builder.js");
+const string_js_1 = require("./string.js");
+let builder;
+(0, bdd_js_1.beforeEach)(() => {
+    builder = new file_builder_js_1.TypeScriptFileBuilder();
+});
+(0, bdd_js_1.describe)('tsString', () => {
+    (0, bdd_js_1.it)('should write the string', () => {
+        builder.append((0, string_js_1.tsString)('X'));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`'X'`);
+    });
+    (0, bdd_js_1.it)('should use double quotes if configured', () => {
+        builder.options.useSingleQuotes = false;
+        builder.append((0, string_js_1.tsString)('X'));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`"X"`);
+    });
+    (0, bdd_js_1.it)('should write the string as template string if configured', () => {
+        builder.append((0, string_js_1.tsString)('X', { template: true }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('`X`');
+    });
+    (0, bdd_js_1.it)('should write the injections', () => {
+        builder.append((0, string_js_1.tsString)('X', { inject: { before: '║b║', after: '║a║' } }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`║b║'X'║a║`);
+    });
+});

package/script/src/ast/nodes/tuple.test.d.ts

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

package/script/src/ast/nodes/tuple.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tuple.test.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/nodes/tuple.test.ts"],"names":[],"mappings":"AAAA,OAAO,iCAAiC,CAAC"}

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

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("../../../_dnt.test_polyfills.js");
+const test_utils_1 = require("@goast/test-utils");
+const expect_js_1 = require("../../../deps/jsr.io/@std/expect/1.0.12/expect.js");
+const bdd_js_1 = require("../../../deps/jsr.io/@std/testing/1.0.9/bdd.js");
+const file_builder_js_1 = require("../../file-builder.js");
+const tuple_js_1 = require("./tuple.js");
+let builder;
+(0, bdd_js_1.beforeEach)(() => {
+    builder = new file_builder_js_1.TypeScriptFileBuilder();
+});
+(0, bdd_js_1.describe)('tsTuple', () => {
+    (0, bdd_js_1.it)('should write empty tuple if no elements are provided', () => {
+        builder.append((0, tuple_js_1.tsTuple)([]));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('[]');
+    });
+    (0, bdd_js_1.it)('should write the elements', () => {
+        builder.append((0, tuple_js_1.tsTuple)(['string', 'number']));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('[string, number]');
+    });
+    (0, bdd_js_1.it)('should write multiline if there are more than 3 elements', () => {
+        builder.append((0, tuple_js_1.tsTuple)(['string', 'number', 'boolean', 'unknown']));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe((0, test_utils_1.normalizeEOL)(8)(`[
+          string,
+          number,
+          boolean,
+          unknown
+        ]`));
+    });
+    (0, bdd_js_1.it)('should write as const', () => {
+        builder.append((0, tuple_js_1.tsTuple)(['string', 'number'], { asConst: true }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('[string, number] as const');
+    });
+});

package/script/src/ast/nodes/type-alias.test.d.ts

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

package/script/src/ast/nodes/type-alias.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-alias.test.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/nodes/type-alias.test.ts"],"names":[],"mappings":"AAAA,OAAO,iCAAiC,CAAC"}

package/script/src/ast/nodes/type-alias.test.js

@@ -0,0 +1,29 @@
+"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.12/expect.js");
+const bdd_js_1 = require("../../../deps/jsr.io/@std/testing/1.0.9/bdd.js");
+const file_builder_js_1 = require("../../file-builder.js");
+const generic_parameter_js_1 = require("./generic-parameter.js");
+const type_alias_js_1 = require("./type-alias.js");
+let builder;
+(0, bdd_js_1.beforeEach)(() => {
+    builder = new file_builder_js_1.TypeScriptFileBuilder();
+});
+(0, bdd_js_1.it)('should write the name of the type alias', () => {
+    builder.append((0, type_alias_js_1.tsTypeAlias)('X', 'number'));
+    (0, expect_js_1.expect)(builder.toString(false)).toBe('type X = number;' + node_os_1.EOL);
+});
+(0, bdd_js_1.it)('should write the generics if they exist', () => {
+    builder.append((0, type_alias_js_1.tsTypeAlias)('X', 'number', { generics: [(0, generic_parameter_js_1.tsGenericParameter)('T'), (0, generic_parameter_js_1.tsGenericParameter)('U')] }));
+    (0, expect_js_1.expect)(builder.toString(false)).toBe('type X<T, U> = number;' + node_os_1.EOL);
+});
+(0, bdd_js_1.it)('should write export keyword if configured', () => {
+    builder.append((0, type_alias_js_1.tsTypeAlias)('X', 'number', { export: true }));
+    (0, expect_js_1.expect)(builder.toString(false)).toBe('export type X = number;' + node_os_1.EOL);
+});
+(0, bdd_js_1.it)('should render injections', () => {
+    builder.append((0, type_alias_js_1.tsTypeAlias)('X', 'number', { inject: { before: ['before'], after: ['after'] } }));
+    (0, expect_js_1.expect)(builder.toString(false)).toBe(`beforetype X = number;${node_os_1.EOL}after`);
+});

package/script/src/ast/nodes/union-type.test.d.ts

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

package/script/src/ast/nodes/union-type.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"union-type.test.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/nodes/union-type.test.ts"],"names":[],"mappings":"AAAA,OAAO,iCAAiC,CAAC"}

package/script/src/ast/nodes/union-type.test.js

@@ -0,0 +1,40 @@
+"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.12/expect.js");
+const bdd_js_1 = require("../../../deps/jsr.io/@std/testing/1.0.9/bdd.js");
+const file_builder_js_1 = require("../../file-builder.js");
+const union_type_js_1 = require("./union-type.js");
+let builder;
+(0, bdd_js_1.beforeEach)(() => {
+    builder = new file_builder_js_1.TypeScriptFileBuilder();
+});
+(0, bdd_js_1.describe)('tsUnionType', () => {
+    (0, bdd_js_1.it)('should write type "never" if no types are provided', () => {
+        builder.append((0, union_type_js_1.tsUnionType)([]));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('never');
+    });
+    (0, bdd_js_1.it)('should write the type if only one type is provided', () => {
+        builder.append((0, union_type_js_1.tsUnionType)(['string']));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('string');
+    });
+    (0, bdd_js_1.it)('should write the types', () => {
+        builder.append((0, union_type_js_1.tsUnionType)(['string', 'number']));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('(string) | (number)');
+    });
+    (0, bdd_js_1.it)('should write the types on separate lines if there are more than 3', () => {
+        builder.append((0, union_type_js_1.tsUnionType)(['string', 'number', 'boolean', 'unknown']));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`${node_os_1.EOL}| (string)${node_os_1.EOL}| (number)${node_os_1.EOL}| (boolean)${node_os_1.EOL}| (unknown)`);
+    });
+    (0, bdd_js_1.it)('should collapse nested union types', () => {
+        builder.append((0, union_type_js_1.tsUnionType)([(0, union_type_js_1.tsUnionType)(['string', 'number']), (0, union_type_js_1.tsUnionType)(['boolean', 'unknown'])]));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe(`${node_os_1.EOL}| (string)${node_os_1.EOL}| (number)${node_os_1.EOL}| (boolean)${node_os_1.EOL}| (unknown)`);
+    });
+    (0, bdd_js_1.it)('should render injections', () => {
+        builder.append((0, union_type_js_1.tsUnionType)(['string', 'number'], {
+            inject: { before: '║b║', after: '║a║' },
+        }));
+        (0, expect_js_1.expect)(builder.toString(false)).toBe('║b║(string) | (number)║a║');
+    });
+});

package/script/src/ast/nodes/variable.test.d.ts

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

package/script/src/ast/nodes/variable.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"variable.test.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/nodes/variable.test.ts"],"names":[],"mappings":"AAAA,OAAO,iCAAiC,CAAC"}

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

@@ -0,0 +1,40 @@
+"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.12/expect.js");
+const bdd_js_1 = require("../../../deps/jsr.io/@std/testing/1.0.9/bdd.js");
+const file_builder_js_1 = require("../../file-builder.js");
+const variable_js_1 = require("./variable.js");
+let builder;
+(0, bdd_js_1.beforeEach)(() => {
+    builder = new file_builder_js_1.TypeScriptFileBuilder();
+});
+(0, bdd_js_1.it)('should write the name of the variable', () => {
+    builder.append((0, variable_js_1.tsVariable)('x'));
+    (0, expect_js_1.expect)(builder.toString(false)).toBe('let x;' + node_os_1.EOL);
+});
+(0, bdd_js_1.it)('should write the type if it exists', () => {
+    builder.append((0, variable_js_1.tsVariable)('x', { type: 'number' }));
+    (0, expect_js_1.expect)(builder.toString(false)).toBe('let x: number;' + node_os_1.EOL);
+});
+(0, bdd_js_1.it)('should write the value if it exists', () => {
+    builder.append((0, variable_js_1.tsVariable)('x', { value: 42 }));
+    (0, expect_js_1.expect)(builder.toString(false)).toBe('let x = 42;' + node_os_1.EOL);
+});
+(0, bdd_js_1.it)('should write the const keyword if configured', () => {
+    builder.append((0, variable_js_1.tsVariable)('x', { readonly: true }));
+    (0, expect_js_1.expect)(builder.toString(false)).toBe('const x;' + node_os_1.EOL);
+});
+(0, bdd_js_1.it)('should write the export keyword if configured', () => {
+    builder.append((0, variable_js_1.tsVariable)('x', { export: true }));
+    (0, expect_js_1.expect)(builder.toString(false)).toBe('export let x;' + node_os_1.EOL);
+});
+(0, bdd_js_1.it)('should write all the parts of the variable', () => {
+    builder.append((0, variable_js_1.tsVariable)('x', { type: 'number', value: 42, readonly: true, export: true }));
+    (0, expect_js_1.expect)(builder.toString(false)).toBe('export const x: number = 42;' + node_os_1.EOL);
+});
+(0, bdd_js_1.it)('should render injections', () => {
+    builder.append((0, variable_js_1.tsVariable)('x', { inject: { before: ['before'], after: ['after'] } }));
+    (0, expect_js_1.expect)(builder.toString(false)).toBe(`beforelet x;${node_os_1.EOL}after`);
+});

package/script/src/generators/services/angular-services/angular-service-generator.js

@@ -235,13 +235,13 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_js_1.TypeS
                     }
                     : null,
                 '',
-                (0, core_1.builderTemplate) `return ${ctx.refs.waitForResponse([responseModelType])}(${core_1.builderTemplate.indent `
-              this.http.request(rb.build({${core_1.builderTemplate.indent `
-                responseType: ${index_js_1.ts.string(responseType)},
-                accept: ${index_js_1.ts.string(accept)},
-                context,`}
-              })),
-              {${core_1.builderTemplate.indent `
+                (0, core_1.builderTemplate) `return ${ctx.refs.waitForResponse([responseModelType])}(${core_1.builderTemplate.indent `
+              this.http.request(rb.build({${core_1.builderTemplate.indent `
+                responseType: ${index_js_1.ts.string(responseType)},
+                accept: ${index_js_1.ts.string(accept)},
+                context,`}
+              })),
+              {${core_1.builderTemplate.indent `
                 errorResponseTypes: ${index_js_1.ts.object({
                     members: [
                         ...Object.entries(this.getEndpointStatusCodes(ctx, endpoint))
@@ -250,8 +250,8 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_js_1.TypeS
                             return index_js_1.ts.property(key, { value: index_js_1.ts.string(value.parser) });
                         }),
                     ],
-                })}`}
-              }`}
+                })}`}
+              }`}
             )`,
             ], '\n'),
         });

package/script/src/generators/services/easy-network-stub/easy-network-stub-generator.js

@@ -97,15 +97,15 @@ class DefaultTypeScriptEasyNetworkStubGenerator extends file_generator_js_1.Type
             ],
             returnType: 'this',
             body: (0, core_1.appendValueGroup)([
-                (0, core_1.builderTemplate) `this.stubWrapper.stub2<${requestType}>()(${core_1.builderTemplate.indent `
-              ${index_js_1.ts.string(endpoint.method.toUpperCase())},
-              ${this.getStubClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)},
-              async (request) => {${core_1.builderTemplate.indent `
-                if (this.stubWrapper.options.rememberRequests) {${core_1.builderTemplate.indent `
-                  this.${this.getEndpointRequestsFieldName(ctx, endpoint)}.push(request);`}
-                }
-                throw await response(${this.getResponderVariableName(ctx, endpoint)}, request);`}
-              }`}
+                (0, core_1.builderTemplate) `this.stubWrapper.stub2<${requestType}>()(${core_1.builderTemplate.indent `
+              ${index_js_1.ts.string(endpoint.method.toUpperCase())},
+              ${this.getStubClassName(ctx)}.${this.getEndpointPathPropertyName(ctx, endpoint)},
+              async (request) => {${core_1.builderTemplate.indent `
+                if (this.stubWrapper.options.rememberRequests) {${core_1.builderTemplate.indent `
+                  this.${this.getEndpointRequestsFieldName(ctx, endpoint)}.push(request);`}
+                }
+                throw await response(${this.getResponderVariableName(ctx, endpoint)}, request);`}
+              }`}
             );`,
                 'return this;',
             ], '\n'),

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

@@ -134,7 +134,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_js_1.TypeScri
         const method = this.getInterfaceEndpointMethod(ctx, endpoint);
         method.accessModifier = 'public';
         method.body = (0, core_1.appendValueGroup)([
-            (0, core_1.builderTemplate) `const url = new ${ctx.refs.urlBuilder()}(this.options.baseUrl)${core_1.builderTemplate.indent `
+            (0, core_1.builderTemplate) `const url = new ${ctx.refs.urlBuilder()}(this.options.baseUrl)${core_1.builderTemplate.indent `
           .withPath(${index_js_1.ts.string(endpoint.path)})${(b) => b.forEach(endpoint.parameters, (b, p) => {
                 switch (p.target) {
                     case 'path':
@@ -144,7 +144,7 @@ class DefaultTypeScriptFetchClientGenerator extends file_generator_js_1.TypeScri
                         b.append((0, core_1.builderTemplate) `\n.withQueryParam(${index_js_1.ts.string(p.name)}, params.${(0, core_1.toCasing)(p.name, ctx.config.paramNameCasing)})`);
                         break;
                 }
-            })}
+            })}
           .build();`}`,
             (0, core_1.builderTemplate) `const response = (this.options.fetch ?? fetch)(url, ${index_js_1.ts.object({
                 members: [

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

@@ -191,7 +191,7 @@ class DefaultTypeScriptK6ClientGenerator extends file_generator_js_1.TypeScriptF
                         ],
                     }),
                     parameters: [index_js_1.ts.constructorParameter('rootUrl'), index_js_1.ts.constructorParameter('defaultK6ParamsFactory')],
-                    body: (0, core_1.builderTemplate) `this.rootUrl = rootUrl;
+                    body: (0, core_1.builderTemplate) `this.rootUrl = rootUrl;
                   this._defaultK6ParamsFactory = defaultK6ParamsFactory;`,
                 }),
                 ...ctx.service.endpoints.map((e) => this.getEndpointMethod(ctx, e)),
@@ -252,11 +252,11 @@ class DefaultTypeScriptK6ClientGenerator extends file_generator_js_1.TypeScriptF
                     }
                     : null,
                 '',
-                (0, core_1.builderTemplate) `return /** @type {${returnType}} */ (${core_1.builderTemplate.indent `
-              ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
-                accept: ${index_js_1.ts.string(accept)},
-                params: this.getK6Params(k6Params),`}
-              })`}
+                (0, core_1.builderTemplate) `return /** @type {${returnType}} */ (${core_1.builderTemplate.indent `
+              ${ctx.config.async ? 'await rb.buildAsync' : 'rb.build'}({${core_1.builderTemplate.indent `
+                accept: ${index_js_1.ts.string(accept)},
+                params: this.getK6Params(k6Params),`}
+              })`}
             );`,
             ], '\n'),
         });

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,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("../_dnt.test_polyfills.js");
+const mod_js_1 = require("../deps/jsr.io/@std/expect/1.0.12/mod.js");
+const bdd_js_1 = require("../deps/jsr.io/@std/testing/1.0.9/bdd.js");
+const import_collection_js_1 = require("./import-collection.js");
+(0, bdd_js_1.describe)('ImportExportCollection', () => {
+    let collection;
+    let sourceBuilderOptions;
+    (0, bdd_js_1.beforeEach)(() => {
+        collection = new import_collection_js_1.ImportExportCollection({ importModuleTransformer: 'omit-extension' });
+        sourceBuilderOptions = { newLine: '\n' };
+    });
+    (0, bdd_js_1.describe)('addImport', () => {
+        (0, bdd_js_1.it)('should add a new import to the collection', () => {
+            collection.addImport('myImport', 'myModule');
+            (0, mod_js_1.expect)(collection.hasImports).toBe(true);
+            (0, mod_js_1.expect)(collection.hasExports).toBe(false);
+            (0, mod_js_1.expect)(collection.toString(sourceBuilderOptions)).toBe("import { myImport } from 'myModule';\n");
+        });
+        (0, bdd_js_1.it)('should add a new import to an existing module', () => {
+            collection.addImport('myImport1', 'myModule');
+            collection.addImport('myImport2', 'myModule');
+            (0, mod_js_1.expect)(collection.hasImports).toBe(true);
+            (0, mod_js_1.expect)(collection.hasExports).toBe(false);
+            (0, mod_js_1.expect)(collection.toString(sourceBuilderOptions)).toBe("import { myImport1, myImport2 } from 'myModule';\n");
+        });
+    });
+    (0, bdd_js_1.describe)('addExport', () => {
+        (0, bdd_js_1.it)('should add a new export to the collection', () => {
+            collection.addExport('myExport', 'myModule');
+            (0, mod_js_1.expect)(collection.hasImports).toBe(false);
+            (0, mod_js_1.expect)(collection.hasExports).toBe(true);
+            (0, mod_js_1.expect)(collection.toString(sourceBuilderOptions)).toBe("export { myExport } from 'myModule';\n");
+        });
+        (0, bdd_js_1.it)('should add a new export to an existing module', () => {
+            collection.addExport('myExport1', 'myModule');
+            collection.addExport('myExport2', 'myModule');
+            (0, mod_js_1.expect)(collection.hasImports).toBe(false);
+            (0, mod_js_1.expect)(collection.hasExports).toBe(true);
+            (0, mod_js_1.expect)(collection.toString(sourceBuilderOptions)).toBe("export { myExport1, myExport2 } from 'myModule';\n");
+        });
+    });
+    (0, bdd_js_1.describe)('clear', () => {
+        (0, bdd_js_1.it)('should clear the collection', () => {
+            collection.addImport('myImport', 'myModule');
+            collection.addExport('myExport', 'myModule');
+            (0, mod_js_1.expect)(collection.hasImports).toBe(true);
+            (0, mod_js_1.expect)(collection.hasExports).toBe(true);
+            collection.clear();
+            (0, mod_js_1.expect)(collection.hasImports).toBe(false);
+            (0, mod_js_1.expect)(collection.hasExports).toBe(false);
+            (0, mod_js_1.expect)(collection.toString(sourceBuilderOptions)).toBe('');
+        });
+    });
+    (0, bdd_js_1.describe)('toString', () => {
+        (0, bdd_js_1.it)('should return an empty string if the collection is empty', () => {
+            (0, mod_js_1.expect)(collection.toString(sourceBuilderOptions)).toBe('');
+        });
+        (0, bdd_js_1.it)('should return a string representation of the collection', () => {
+            collection.addImport('myImport', 'myModule');
+            collection.addExport('myExport', 'myModule');
+            (0, mod_js_1.expect)(collection.toString(sourceBuilderOptions)).toBe("import { myImport } from 'myModule';\n\nexport { myExport } from 'myModule';\n");
+        });
+    });
+});

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 fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const core_1 = require("@goast/core");
+const test_utils_1 = require("@goast/test-utils");
+const bdd_js_1 = require("../deps/jsr.io/@std/testing/1.0.9/bdd.js");
+const mock_js_1 = require("../deps/jsr.io/@std/testing/1.0.9/mock.js");
+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.TypeScriptModelsGenerator, { __test__: true })
+                    .parseAndGenerate(filePath);
+                result.splice(0, 0, ['state', state]);
+                (0, mock_js_1.restore)();
+                await (0, test_utils_1.verify)(t, result);
+            });
+        }
+    });
+}