@goast/kotlin 0.4.13 → 0.4.14-beta1

package/esm/src/generators/models/model-generator.d.ts.map

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

package/esm/src/generators/models/model-generator.js

@@ -1,6 +1,6 @@
 import { dirname } from 'node:path';
 import fs from 'fs-extra';
-import { appendValueGroup, createOverwriteProxy, getSchemaReference, modify, modifyEach, notNullish, resolveAnyOfAndAllOf, toCasing, } from '@goast/core';
+import { appendValueGroup, builderTemplate as s, createOverwriteProxy, getSchemaReference, modify, modifyEach, notNullish, resolveAnyOfAndAllOf, toCasing, } from '@goast/core';
 import { kt } from '../../ast/index.js';
 import { KotlinFileBuilder } from '../../file-builder.js';
 import { KotlinFileGenerator } from '../file-generator.js';
@@ -72,9 +72,10 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         });
     }
     getEnum(ctx, args) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const { schema } = args;
-        return kt.enum(this.getDeclarationTypeName(ctx, { schema }), (_b = (_a = schema.enum) === null || _a === void 0 ? void 0 : _a.map((x) => kt.enumValue(toCasing(String(x), ctx.config.enumValueNameCasing), {
+        const name = this.getDeclarationTypeName(ctx, { schema });
+        return kt.enum(name, (_b = (_a = schema.enum) === null || _a === void 0 ? void 0 : _a.map((x) => kt.enumValue(toCasing(String(x), ctx.config.enumValueNameCasing), {
             annotations: [kt.annotation(kt.refs.jackson.jsonProperty(), [kt.argument(kt.string(String(x)))])],
             arguments: [kt.argument(kt.string(String(x)))],
         }))) !== null && _b !== void 0 ? _b : [], {
@@ -85,6 +86,20 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
                     property: 'readonly',
                 }),
             ]),
+            companionObject: kt.object({
+                members: [
+                    kt.function('fromValue', {
+                        parameters: [kt.parameter('value', kt.refs.string())],
+                        returnType: kt.reference(name, null, { nullable: true }),
+                        singleExpression: true,
+                        body: !((_d = schema.enum) === null || _d === void 0 ? void 0 : _d.length) ? 'null' : s `\nwhen(value) {${s.indent `${appendValueGroup([
+                            schema.enum.map((x) => s `\n${kt.string(String(x))} -> ${toCasing(String(x), ctx.config.enumValueNameCasing)}`),
+                        ])}
+                else -> null`}
+              }`,
+                    }),
+                ],
+            }),
         });
     }
     getType(ctx, args) {

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

@@ -101,31 +101,31 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         return appendValueGroup([
             s `val localVarResponse = ${kt.call([toCasing(endpoint.name + '_WithHttpInfo', ctx.config.functionNameCasing)], parameters.map((x) => toCasing(x.name, ctx.config.parameterNameCasing)))}`,
             '',
-            s `return when (localVarResponse.responseType) {${s.indent `
+            s `return when (localVarResponse.responseType) {${s.indent `
             ${ctx.refs.responseType()}.Success -> ${responseSchema === undefined
                 ? kt.refs.unit()
                 : s `(localVarResponse as ${ctx.refs.success(['*'])}).data as ${this.getTypeUsage(ctx, {
                     schema: responseSchema,
-                })}`}
-            ${ctx.refs.responseType()}.Informational -> throw ${kt.refs.java.unsupportedOperationException()}("Client does not support Informational responses.")
-            ${ctx.refs.responseType()}.Redirection -> throw ${kt.refs.java.unsupportedOperationException()}("Client does not support Redirection responses.")
-            ${ctx.refs.responseType()}.ClientError -> {${s.indent `
-              val localVarError = localVarResponse as ${ctx.refs.clientError(['*'])}
-              throw ${ctx.refs.clientException()}(${s.indent `
-                "Client error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
-                localVarError.statusCode,
-                localVarResponse`}
-              )`}
-            }
-
-            ${ctx.refs.responseType()}.ServerError -> {${s.indent `
-              val localVarError = localVarResponse as ${ctx.refs.serverError(['*'])}
-              throw ${ctx.refs.serverException()}(${s.indent `
-                "Server error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
-                localVarError.statusCode,
-                localVarResponse`}
-              )`}
-            }`}
+                })}`}
+            ${ctx.refs.responseType()}.Informational -> throw ${kt.refs.java.unsupportedOperationException()}("Client does not support Informational responses.")
+            ${ctx.refs.responseType()}.Redirection -> throw ${kt.refs.java.unsupportedOperationException()}("Client does not support Redirection responses.")
+            ${ctx.refs.responseType()}.ClientError -> {${s.indent `
+              val localVarError = localVarResponse as ${ctx.refs.clientError(['*'])}
+              throw ${ctx.refs.clientException()}(${s.indent `
+                "Client error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
+                localVarError.statusCode,
+                localVarResponse`}
+              )`}
+            }
+
+            ${ctx.refs.responseType()}.ServerError -> {${s.indent `
+              val localVarError = localVarResponse as ${ctx.refs.serverError(['*'])}
+              throw ${ctx.refs.serverException()}(${s.indent `
+                "Server error : \${localVarError.statusCode} \${localVarError.message.orEmpty()}",
+                localVarError.statusCode,
+                localVarResponse`}
+              )`}
+            }`}
           }`,
         ], '\n');
     }
@@ -210,17 +210,17 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
                 result.values.push(`val localVariableBody = ${bodyParamName}`);
             }
         }
-        result.values.push(s `val localVariableQuery: ${ctx.refs.multiValueMap()} = ${kt.call([kt.refs.mutableMapOf([kt.refs.string(), kt.refs.list([kt.refs.string()])])], [])}${queryParameters.length === 0 ? '' : s.indent `
-            .apply {${s.indent `
+        result.values.push(s `val localVariableQuery: ${ctx.refs.multiValueMap()} = ${kt.call([kt.refs.mutableMapOf([kt.refs.string(), kt.refs.list([kt.refs.string()])])], [])}${queryParameters.length === 0 ? '' : s.indent `
+            .apply {${s.indent `
               ${appendValueGroup(queryParameters.map((param) => {
             var _a;
             const paramName = toCasing(param.name, ctx.config.parameterNameCasing);
             const toString = ((_a = param.schema) === null || _a === void 0 ? void 0 : _a.kind) === 'array' ? '.joinToString()' : '.toString()';
             const put = s `put(${kt.string(paramName)}, listOf(${paramName}${toString}))`;
-            return param.required ? put : s `if (${paramName} != null) {${s.indent `
-                        ${put}`}
+            return param.required ? put : s `if (${paramName} != null) {${s.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) {
@@ -229,8 +229,8 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
         for (const header of headerParameters) {
             const paramName = toCasing(header.name, ctx.config.parameterNameCasing);
             const toString = ((_d = header.schema) === null || _d === void 0 ? void 0 : _d.kind) === 'array' ? '.joinToString()' : '.toString()';
-            result.values.push(s `if (${paramName} != null) {${s.indent `
-          localVariableHeaders["${header.name}"] = ${paramName}${toString}`}
+            result.values.push(s `if (${paramName} != null) {${s.indent `
+          localVariableHeaders["${header.name}"] = ${paramName}${toString}`}
         }`);
         }
         result.values.push(s `return ${kt.call([ctx.refs.requestConfig.infer()], [

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

@@ -196,10 +196,10 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
     }
     getApiInterfaceEndpointMethodBody(ctx, endpoint, parameters) {
         return appendValueGroup([
-            s `try {${s.indent `
-            return ${kt.call([kt.call(kt.reference('getDelegate'), []), toCasing(endpoint.name, ctx.config.functionNameCasing)], parameters.map((x) => toCasing(x.name, ctx.config.parameterNameCasing)))}`}
-          } catch (e: ${kt.refs.throwable()}) {${s.indent `
-            return getExceptionHandler()?.handleApiException(e) ?: throw e`}
+            s `try {${s.indent `
+            return ${kt.call([kt.call(kt.reference('getDelegate'), []), toCasing(endpoint.name, ctx.config.functionNameCasing)], parameters.map((x) => toCasing(x.name, ctx.config.parameterNameCasing)))}`}
+          } catch (e: ${kt.refs.throwable()}) {${s.indent `
+            return getExceptionHandler()?.handleApiException(e) ?: throw e`}
           }`,
         ], '\n');
     }
@@ -246,11 +246,11 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
                             hasResponseBody ? kt.argument('body') : kt.toNode(null),
                             kt.toNode(code),
                             contentType
-                                ? s `${kt.refs.spring.linkedMultiValueMap([kt.refs.string(), kt.refs.string()])}().also {
-                        if (headers != null) {
-                            it.putAll(headers)
-                        }
-                        it.addIfAbsent("Content-Type", ${kt.string(contentType)})
+                                ? s `${kt.refs.spring.linkedMultiValueMap([kt.refs.string(), kt.refs.string()])}().also {
+                        if (headers != null) {
+                            it.putAll(headers)
+                        }
+                        it.addIfAbsent("Content-Type", ${kt.string(contentType)})
                     }`
                                 : kt.argument('headers'),
                         ]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.4.13",
+  "version": "0.4.14-beta1",
   "description": "Provides gOAst generators for generating Kotlin code from OpenAPI specifications.",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",
@@ -22,18 +22,18 @@
       "require": "./script/mod.js"
     }
   },
-  "scripts": {
-    "test": "node test_runner.js"
-  },
   "dependencies": {
     "tslib": "^2.6.2",
     "fs-extra": "^11.2.0",
     "http-status-codes": "^2.3.0",
-    "@goast/core": "0.4.1"
+    "@goast/core": "0.4.0"
   },
   "devDependencies": {
     "@types/node": "^20.9.0",
     "@types/fs-extra": "11"
   },
-  "_generatedBy": "dnt@dev"
+  "_generatedBy": "dnt@dev",
+  "scripts": {
+    "test": "node test_runner.js"
+  }
 }

package/script/src/generators/models/model-generator.d.ts.map

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

package/script/src/generators/models/model-generator.js

@@ -76,9 +76,10 @@ class DefaultKotlinModelGenerator extends file_generator_js_1.KotlinFileGenerato
         });
     }
     getEnum(ctx, args) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const { schema } = args;
-        return index_js_1.kt.enum(this.getDeclarationTypeName(ctx, { schema }), (_b = (_a = schema.enum) === null || _a === void 0 ? void 0 : _a.map((x) => index_js_1.kt.enumValue((0, core_1.toCasing)(String(x), ctx.config.enumValueNameCasing), {
+        const name = this.getDeclarationTypeName(ctx, { schema });
+        return index_js_1.kt.enum(name, (_b = (_a = schema.enum) === null || _a === void 0 ? void 0 : _a.map((x) => index_js_1.kt.enumValue((0, core_1.toCasing)(String(x), ctx.config.enumValueNameCasing), {
             annotations: [index_js_1.kt.annotation(index_js_1.kt.refs.jackson.jsonProperty(), [index_js_1.kt.argument(index_js_1.kt.string(String(x)))])],
             arguments: [index_js_1.kt.argument(index_js_1.kt.string(String(x)))],
         }))) !== null && _b !== void 0 ? _b : [], {
@@ -89,6 +90,20 @@ class DefaultKotlinModelGenerator extends file_generator_js_1.KotlinFileGenerato
                     property: 'readonly',
                 }),
             ]),
+            companionObject: index_js_1.kt.object({
+                members: [
+                    index_js_1.kt.function('fromValue', {
+                        parameters: [index_js_1.kt.parameter('value', index_js_1.kt.refs.string())],
+                        returnType: index_js_1.kt.reference(name, null, { nullable: true }),
+                        singleExpression: true,
+                        body: !((_d = schema.enum) === null || _d === void 0 ? void 0 : _d.length) ? 'null' : (0, core_1.builderTemplate) `\nwhen(value) {${core_1.builderTemplate.indent `${(0, core_1.appendValueGroup)([
+                            schema.enum.map((x) => (0, core_1.builderTemplate) `\n${index_js_1.kt.string(String(x))} -> ${(0, core_1.toCasing)(String(x), ctx.config.enumValueNameCasing)}`),
+                        ])}
+                else -> null`}
+              }`,
+                    }),
+                ],
+            }),
         });
     }
     getType(ctx, args) {

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) => (0, core_1.toCasing)(x.name, ctx.config.parameterNameCasing)))}`,
             '',
-            (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');
     }
@@ -214,17 +214,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) {
@@ -233,8 +233,8 @@ class DefaultKotlinOkHttp3Generator extends file_generator_js_1.KotlinFileGenera
         for (const header of headerParameters) {
             const paramName = (0, core_1.toCasing)(header.name, ctx.config.parameterNameCasing);
             const toString = ((_d = header.schema) === null || _d === void 0 ? void 0 : _d.kind) === 'array' ? '.joinToString()' : '.toString()';
-            result.values.push((0, core_1.builderTemplate) `if (${paramName} != null) {${core_1.builderTemplate.indent `
-          localVariableHeaders["${header.name}"] = ${paramName}${toString}`}
+            result.values.push((0, core_1.builderTemplate) `if (${paramName} != null) {${core_1.builderTemplate.indent `
+          localVariableHeaders["${header.name}"] = ${paramName}${toString}`}
         }`);
         }
         result.values.push((0, core_1.builderTemplate) `return ${index_js_1.kt.call([ctx.refs.requestConfig.infer()], [

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

@@ -201,10 +201,10 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
     }
     getApiInterfaceEndpointMethodBody(ctx, endpoint, parameters) {
         return (0, core_1.appendValueGroup)([
-            (0, core_1.builderTemplate) `try {${core_1.builderTemplate.indent `
-            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)))}`}
-          } catch (e: ${index_js_1.kt.refs.throwable()}) {${core_1.builderTemplate.indent `
-            return getExceptionHandler()?.handleApiException(e) ?: throw e`}
+            (0, core_1.builderTemplate) `try {${core_1.builderTemplate.indent `
+            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)))}`}
+          } catch (e: ${index_js_1.kt.refs.throwable()}) {${core_1.builderTemplate.indent `
+            return getExceptionHandler()?.handleApiException(e) ?: throw e`}
           }`,
         ], '\n');
     }
@@ -251,11 +251,11 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_js_1.KotlinF
                             hasResponseBody ? index_js_1.kt.argument('body') : index_js_1.kt.toNode(null),
                             index_js_1.kt.toNode(code),
                             contentType
-                                ? (0, core_1.builderTemplate) `${index_js_1.kt.refs.spring.linkedMultiValueMap([index_js_1.kt.refs.string(), index_js_1.kt.refs.string()])}().also {
-                        if (headers != null) {
-                            it.putAll(headers)
-                        }
-                        it.addIfAbsent("Content-Type", ${index_js_1.kt.string(contentType)})
+                                ? (0, core_1.builderTemplate) `${index_js_1.kt.refs.spring.linkedMultiValueMap([index_js_1.kt.refs.string(), index_js_1.kt.refs.string()])}().also {
+                        if (headers != null) {
+                            it.putAll(headers)
+                        }
+                        it.addIfAbsent("Content-Type", ${index_js_1.kt.string(contentType)})
                     }`
                                 : index_js_1.kt.argument('headers'),
                         ]),

package/esm/_dnt.test_polyfills.d.ts

@@ -1,29 +0,0 @@
-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 {
-    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;
-    }
-}
-export {};
-//# sourceMappingURL=_dnt.test_polyfills.d.ts.map

package/esm/_dnt.test_polyfills.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_dnt.test_polyfills.d.ts","sourceRoot":"","sources":["../src/_dnt.test_polyfills.ts"],"names":[],"mappings":"AAeA,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd;;;;WAIG;QACH,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC;KAC5C;CACF;AAED,OAAO,EAAE,CAAC;AACV,OAAO,CAAC,MAAM,CAAC;IAEb,UAAU,MAAM;QACd;;;;WAIG;QACH,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;QAEvE;;;;WAIG;QACH,UAAU,CACR,WAAW,EAAE,MAAM,GAAG,MAAM,EAC5B,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,GACtD,MAAM,CAAC;KACX;CACF;AAsBD,OAAO,EAAE,CAAC"}

package/esm/_dnt.test_polyfills.js

@@ -1,31 +0,0 @@
-// https://github.com/tc39/proposal-accessible-object-hasownproperty/blob/main/polyfill.js
-if (!Object.hasOwn) {
-    Object.defineProperty(Object, "hasOwn", {
-        value: function (object, property) {
-            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,
-    });
-}
-/**
- * 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, newStr) {
-        // 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/esm/_dnt.test_shims.d.ts

@@ -1,6 +0,0 @@
-import { Deno } from "@deno/shim-deno-test";
-export { Deno } from "@deno/shim-deno-test";
-export declare const dntGlobalThis: Omit<typeof globalThis, "Deno"> & {
-    Deno: typeof Deno;
-};
-//# sourceMappingURL=_dnt.test_shims.d.ts.map

package/esm/_dnt.test_shims.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"_dnt.test_shims.d.ts","sourceRoot":"","sources":["../src/_dnt.test_shims.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAK5C,eAAO,MAAM,aAAa;;CAA2C,CAAC"}

package/esm/_dnt.test_shims.js

@@ -1,61 +0,0 @@
-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(baseObj, extObj) {
-    return new Proxy(baseObj, {
-        get(_target, prop, _receiver) {
-            if (prop in extObj) {
-                return extObj[prop];
-            }
-            else {
-                return baseObj[prop];
-            }
-        },
-        set(_target, prop, value) {
-            if (prop in extObj) {
-                delete extObj[prop];
-            }
-            baseObj[prop] = value;
-            return true;
-        },
-        deleteProperty(_target, prop) {
-            let success = false;
-            if (prop in extObj) {
-                delete extObj[prop];
-                success = true;
-            }
-            if (prop in baseObj) {
-                delete baseObj[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[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;
-        },
-    });
-}

package/esm/deps/jsr.io/@std/assert/1.0.11/assertion_error.d.ts

@@ -1,26 +0,0 @@
-/**
- * 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 declare 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);
-}
-//# sourceMappingURL=assertion_error.d.ts.map

package/esm/deps/jsr.io/@std/assert/1.0.11/assertion_error.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"assertion_error.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/assert/1.0.11/assertion_error.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,cAAe,SAAQ,KAAK;IACvC;;;;OAIG;gBACS,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;CAIpD"}

package/esm/deps/jsr.io/@std/assert/1.0.11/assertion_error.js

@@ -1,30 +0,0 @@
-// Copyright 2018-2025 the Deno authors. 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, options) {
-        super(message, options);
-        this.name = "AssertionError";
-    }
-}

package/esm/deps/jsr.io/@std/assert/1.0.11/equal.d.ts

@@ -1,17 +0,0 @@
-/**
- * Deep equality comparison used in assertions.
- *
- * @param a The actual value
- * @param b The expected value
- * @returns `true` if the values are deeply equal, `false` otherwise
- *
- * @example Usage
- * ```ts
- * import { equal } from "@std/assert/equal";
- *
- * equal({ foo: "bar" }, { foo: "bar" }); // Returns `true`
- * equal({ foo: "bar" }, { foo: "baz" }); // Returns `false`
- * ```
- */
-export declare function equal(a: unknown, b: unknown): boolean;
-//# sourceMappingURL=equal.d.ts.map

package/esm/deps/jsr.io/@std/assert/1.0.11/equal.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"equal.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/assert/1.0.11/equal.ts"],"names":[],"mappings":"AA2FA;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,CAuGrD"}