@goast/typescript 0.4.1 → 0.4.2

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/typescript",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Provides gOAst generators for generating TypeScript code from OpenAPI specifications.",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@types/node": "^20.9.0",
-    "@types/fs-extra": "^11.0.4"
+    "@types/fs-extra": "11"
   },
   "_generatedBy": "dnt@dev"
 }

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

@@ -355,7 +355,7 @@ class DefaultTypeScriptModelGenerator extends file_generator_js_1.TypeScriptFile
         return (0, core_1.toCasing)(schema.name + '_Discriminator', ctx.config.typeNameCasing);
     }
     getBaseTypeName(ctx, schema) {
-        return (0, core_1.toCasing)(schema.name + '_Base', ctx.config.typeNameCasing);
+        return (0, core_1.toCasing)(schema.name, ctx.config.discriminatorBaseTypeCasing);
     }
     getInheritedSchemas(ctx, schema) {
         return schema.inheritedSchemas

package/script/src/generators/models/models.d.ts

@@ -36,6 +36,11 @@ export type TypeScriptModelGeneratorConfig = TypeScriptGeneratorConfig & {
      * @default 'type'
      */
     typeDeclaration: 'type' | 'prefer-interface';
+    /**
+     * The casing to use for the base type of discriminator schemas.
+     * @default `_<SchemaName>Base`
+     */
+    discriminatorBaseTypeCasing: ExtendedStringCasing;
 };
 export type TypeScriptModelsGeneratorConfig = TypeScriptModelGeneratorConfig & {
     /**

package/script/src/generators/models/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,+BAA+B,EAC/B,oBAAoB,EACpB,QAAQ,EACR,uCAAuC,EACxC,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAoC,KAAK,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEnG,MAAM,MAAM,8BAA8B,GAAG,yBAAyB,GAAG;IACvE;;;;;OAKG;IACH,cAAc,EAAE,OAAO,GAAG,aAAa,CAAC;IAExC;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,mBAAmB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAEpD;;;;;OAKG;IACH,eAAe,EAAE,MAAM,GAAG,kBAAkB,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,8BAA8B,GAAG;IAC7E;;;OAGG;IACH,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,qCAAqC,EAAE,+BAA+B,CAAC,8BAA8B,CASjH,CAAC;AAEF,eAAO,MAAM,sCAAsC,EAAE,+BAA+B,CAAC,+BAA+B,CAKjH,CAAC;AAGJ,MAAM,MAAM,8BAA8B,GAAG,EAAE,CAAC;AAEhD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,UAAU,EAAE;QACV,MAAM,EAAE;YACN,CAAC,QAAQ,EAAE,MAAM,GAAG,8BAA8B,CAAC;SACpD,CAAC;QACF,UAAU,EAAE;YACV,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC1B,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,yBAAyB,CAAC;AAEvE,MAAM,MAAM,gCAAgC,GAAG,uCAAuC,CACpF,8BAA8B,EAC9B,+BAA+B,EAC/B,+BAA+B,EAC/B,8BAA8B,CAC/B,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,gCAAgC,GAAG;IAC/E,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,+BAA+B,EAC/B,oBAAoB,EACpB,QAAQ,EACR,uCAAuC,EACxC,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACzE,OAAO,EAAoC,KAAK,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEnG,MAAM,MAAM,8BAA8B,GAAG,yBAAyB,GAAG;IACvE;;;;;OAKG;IACH,cAAc,EAAE,OAAO,GAAG,aAAa,CAAC;IAExC;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IAExB;;;OAGG;IACH,oBAAoB,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,mBAAmB,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IAEpD;;;;;OAKG;IACH,eAAe,EAAE,MAAM,GAAG,kBAAkB,CAAC;IAE7C;;;OAGG;IACH,2BAA2B,EAAE,oBAAoB,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,8BAA8B,GAAG;IAC7E;;;OAGG;IACH,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,qCAAqC,EAAE,+BAA+B,CAAC,8BAA8B,CAUjH,CAAC;AAEF,eAAO,MAAM,sCAAsC,EAAE,+BAA+B,CAAC,+BAA+B,CAKjH,CAAC;AAGJ,MAAM,MAAM,8BAA8B,GAAG,EAAE,CAAC;AAEhD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,UAAU,EAAE;QACV,MAAM,EAAE;YACN,CAAC,QAAQ,EAAE,MAAM,GAAG,8BAA8B,CAAC;SACpD,CAAC;QACF,UAAU,EAAE;YACV,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC1B,CAAC;KACH,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG,yBAAyB,CAAC;AAEvE,MAAM,MAAM,gCAAgC,GAAG,uCAAuC,CACpF,8BAA8B,EAC9B,+BAA+B,EAC/B,+BAA+B,EAC/B,8BAA8B,CAC/B,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,gCAAgC,GAAG;IAC/E,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC"}

package/script/src/generators/models/models.js

@@ -10,6 +10,7 @@ exports.defaultTypeScriptModelGeneratorConfig = {
     modelsDir: 'models',
     modelFileNameCasing: undefined,
     typeDeclaration: 'type',
+    discriminatorBaseTypeCasing: { casing: 'pascal', prefix: '_', suffix: 'Base' },
 };
 exports.defaultTypeScriptModelsGeneratorConfig = {
     ...exports.defaultTypeScriptModelGeneratorConfig,

package/script/src/generators/services/angular-services/angular-service-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"angular-service-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/angular-services/angular-service-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"angular-service-generator.d.ts","sourceRoot":"","sources":["../../../../../src/src/generators/services/angular-services/angular-service-generator.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,gBAAgB,EAGrB,KAAK,YAAY,EAGlB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,EAAE,EAAE,MAAM,uBAAuB,CAAC;AAC3C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,wCAAwC,EAAE,uCAAuC,EAAE,MAAM,aAAa,CAAC;AAErH,KAAK,OAAO,GAAG,wCAAwC,CAAC;AACxD,KAAK,MAAM,GAAG,uCAAuC,CAAC;AACtD,KAAK,OAAO,GAAG,qBAAqB,CAAC;AAErC,MAAM,WAAW,iCAAiC,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;IAChF,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;CAC/C;AAED,qBAAa,wCAAyC,SAAQ,uBAAuB,CAAC,OAAO,EAAE,MAAM,CACnG,YAAW,iCAAiC;IACrC,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC;IAqBnD,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC;IAetF,SAAS,CAAC,2BAA2B,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC;IAmErG,SAAS,CAAC,sBAAsB,CAC9B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,WAAW,GACpB,MAAM,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;QAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;KAAE,CAAC;IAwBtE,SAAS,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC;IAWxE,SAAS,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;IAkC3F,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;IAgCnD,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC;IAiGpF,SAAS,CAAC,8BAA8B,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,MAAM;IAarF,SAAS,CAAC,0BAA0B,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,WAAW,GAAG,SAAS;IAOnG,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;IAInD,SAAS,CAAC,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,MAAM;IAI3E,SAAS,CAAC,yBAAyB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,MAAM;IAIhF,SAAS,CAAC,2BAA2B,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,MAAM;IAIlF,SAAS,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,MAAM;IAI5E,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;IAQlD,SAAS,CAAC,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM;IAQxD,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,GAAG,OAAO;IAI1E,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,GAAG,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;IAMnH,OAAO,CAAC,yBAAyB;CAGlC"}

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

@@ -53,7 +53,9 @@ class DefaultTypeScriptAngularServiceGenerator extends file_generator_js_1.TypeS
                 ...Object.entries(statusCodes).map(([key, value]) => {
                     const isSuccess = key.startsWith('2');
                     return index_js_1.ts.intersectionType([
-                        isSuccess ? index_js_1.ts.refs.angular.httpResponse([value.type]) : index_js_1.ts.refs.angular.httpErrorResponse(),
+                        isSuccess
+                            ? index_js_1.ts.refs.angular.httpResponse([value.type])
+                            : index_js_1.ts.refs.omit([index_js_1.ts.refs.angular.httpErrorResponse(), index_js_1.ts.string('error')]),
                         index_js_1.ts.objectType({
                             members: [
                                 isSuccess ? null : index_js_1.ts.property('error', { type: index_js_1.ts.unionType([value.type, index_js_1.ts.refs.null_()]) }),
@@ -233,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))
@@ -248,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/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.6/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.6/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.6/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.6/assertion_error.js

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

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

@@ -1,17 +0,0 @@
-/**
- * Deep equality comparison used in assertions.
- *
- * @param c The actual value
- * @param d 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(c: unknown, d: unknown): boolean;
-//# sourceMappingURL=equal.d.ts.map

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

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

package/esm/deps/jsr.io/@std/assert/1.0.6/equal.js

@@ -1,136 +0,0 @@
-// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
-// This module is browser compatible.
-function isKeyedCollection(x) {
-    return x instanceof Set || x instanceof Map;
-}
-function constructorsEqual(a, b) {
-    return a.constructor === b.constructor ||
-        a.constructor === Object && !b.constructor ||
-        !a.constructor && b.constructor === Object;
-}
-/**
- * Deep equality comparison used in assertions.
- *
- * @param c The actual value
- * @param d 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 function equal(c, d) {
-    const seen = new Map();
-    return (function compare(a, b) {
-        // Have to render RegExp & Date for string comparison
-        // unless it's mistreated as object
-        if (a &&
-            b &&
-            ((a instanceof RegExp && b instanceof RegExp) ||
-                (a instanceof URL && b instanceof URL))) {
-            return String(a) === String(b);
-        }
-        if (a instanceof Date && b instanceof Date) {
-            const aTime = a.getTime();
-            const bTime = b.getTime();
-            // Check for NaN equality manually since NaN is not
-            // equal to itself.
-            if (Number.isNaN(aTime) && Number.isNaN(bTime)) {
-                return true;
-            }
-            return aTime === bTime;
-        }
-        if (typeof a === "number" && typeof b === "number") {
-            return Number.isNaN(a) && Number.isNaN(b) || a === b;
-        }
-        if (Object.is(a, b)) {
-            return true;
-        }
-        if (a && typeof a === "object" && b && typeof b === "object") {
-            if (a && b && !constructorsEqual(a, b)) {
-                return false;
-            }
-            if (a instanceof WeakMap || b instanceof WeakMap) {
-                if (!(a instanceof WeakMap && b instanceof WeakMap))
-                    return false;
-                throw new TypeError("cannot compare WeakMap instances");
-            }
-            if (a instanceof WeakSet || b instanceof WeakSet) {
-                if (!(a instanceof WeakSet && b instanceof WeakSet))
-                    return false;
-                throw new TypeError("cannot compare WeakSet instances");
-            }
-            if (a instanceof WeakRef || b instanceof WeakRef) {
-                if (!(a instanceof WeakRef && b instanceof WeakRef))
-                    return false;
-                return compare(a.deref(), b.deref());
-            }
-            if (seen.get(a) === b) {
-                return true;
-            }
-            if (Object.keys(a).length !== Object.keys(b).length) {
-                return false;
-            }
-            seen.set(a, b);
-            if (isKeyedCollection(a) && isKeyedCollection(b)) {
-                if (a.size !== b.size) {
-                    return false;
-                }
-                const aKeys = [...a.keys()];
-                const primitiveKeysFastPath = aKeys.every((k) => {
-                    return typeof k === "string" ||
-                        typeof k === "number" ||
-                        typeof k === "boolean" ||
-                        typeof k === "bigint" ||
-                        typeof k === "symbol" ||
-                        k == null;
-                });
-                if (primitiveKeysFastPath) {
-                    if (a instanceof Set) {
-                        return a.symmetricDifference(b).size === 0;
-                    }
-                    for (const key of aKeys) {
-                        if (!b.has(key) ||
-                            !compare(a.get(key), b.get(key))) {
-                            return false;
-                        }
-                    }
-                    return true;
-                }
-                let unmatchedEntries = a.size;
-                for (const [aKey, aValue] of a.entries()) {
-                    for (const [bKey, bValue] of b.entries()) {
-                        /* Given that Map keys can be references, we need
-                         * to ensure that they are also deeply equal */
-                        if (!compare(aKey, bKey))
-                            continue;
-                        if ((aKey === aValue && bKey === bValue) ||
-                            (compare(aValue, bValue))) {
-                            unmatchedEntries--;
-                            break;
-                        }
-                    }
-                }
-                return unmatchedEntries === 0;
-            }
-            const merged = { ...a, ...b };
-            for (const key of [
-                ...Object.getOwnPropertyNames(merged),
-                ...Object.getOwnPropertySymbols(merged),
-            ]) {
-                if (!compare(a && a[key], b && b[key])) {
-                    return false;
-                }
-                if (((key in a) && (!(key in b))) || ((key in b) && (!(key in a)))) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        return false;
-    })(c, d);
-}

package/esm/deps/jsr.io/@std/assert/1.0.6/equals.d.ts

@@ -1,22 +0,0 @@
-/**
- * Make an assertion that `actual` and `expected` are equal, deeply. If not
- * deeply equal, then throw.
- *
- * Type parameter can be specified to ensure values under comparison have the
- * same type.
- *
- * @example Usage
- * ```ts ignore
- * import { assertEquals } from "@std/assert";
- *
- * assertEquals("world", "world"); // Doesn't throw
- * assertEquals("hello", "world"); // Throws
- * ```
- *
- * @typeParam T The type of the values to compare. This is usually inferred.
- * @param actual The actual value to compare.
- * @param expected The expected value to compare.
- * @param msg The optional message to display if the assertion fails.
- */
-export declare function assertEquals<T>(actual: T, expected: T, msg?: string): void;
-//# sourceMappingURL=equals.d.ts.map

package/esm/deps/jsr.io/@std/assert/1.0.6/equals.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"equals.d.ts","sourceRoot":"","sources":["../../../../../../src/deps/jsr.io/@std/assert/1.0.6/equals.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAC5B,MAAM,EAAE,CAAC,EACT,QAAQ,EAAE,CAAC,EACX,GAAG,CAAC,EAAE,MAAM,QAkBb"}