@atlaspack/utils 2.17.3-typescript-5b4d3ad41.0 → 2.17.3

package/src/{stream.ts → stream.js}

@@ -1,20 +1,17 @@
+// @flow strict-local
+
 import {Readable, PassThrough} from 'stream';
 import type {Blob} from '@atlaspack/types';
 
 export function measureStreamLength(stream: Readable): Promise<number> {
-  return new Promise(
-    (
-      resolve: (result: Promise<number> | number) => void,
-      reject: (error?: any) => void,
-    ) => {
-      let length = 0;
-      stream.on('data', (chunk) => {
-        length += chunk;
-      });
-      stream.on('end', () => resolve(length));
-      stream.on('error', reject);
-    },
-  );
+  return new Promise((resolve, reject) => {
+    let length = 0;
+    stream.on('data', (chunk) => {
+      length += chunk;
+    });
+    stream.on('end', () => resolve(length));
+    stream.on('error', reject);
+  });
 }
 
 export function readableFromStringOrBuffer(str: string | Buffer): Readable {
@@ -26,21 +23,16 @@ export function readableFromStringOrBuffer(str: string | Buffer): Readable {
 }
 
 export function bufferStream(stream: Readable): Promise<Buffer> {
-  return new Promise(
-    (
-      resolve: (result: Promise<Buffer> | Buffer) => void,
-      reject: (error?: any) => void,
-    ) => {
-      let buf = Buffer.from([]);
-      stream.on('data', (data) => {
-        buf = Buffer.concat([buf, data]);
-      });
-      stream.on('end', () => {
-        resolve(buf);
-      });
-      stream.on('error', reject);
-    },
-  );
+  return new Promise((resolve, reject) => {
+    let buf = Buffer.from([]);
+    stream.on('data', (data) => {
+      buf = Buffer.concat([buf, data]);
+    });
+    stream.on('end', () => {
+      resolve(buf);
+    });
+    stream.on('error', reject);
+  });
 }
 
 export function blobToStream(blob: Blob): Readable {
@@ -70,7 +62,7 @@ export function fallbackStream(
 ): Readable {
   const res = new PassThrough();
   stream.on('error', (err) => {
-    if ((err as any).code === 'ENOENT') {
+    if (err.code === 'ENOENT') {
       fallback().pipe(res);
     } else {
       res.emit('error', err);

package/src/throttle.js

@@ -0,0 +1,15 @@
+// @flow strict-local
+
+export default function throttle<TArgs: Iterable<mixed>>(
+  fn: (...args: TArgs) => mixed,
+  delay: number,
+): (...args: TArgs) => void {
+  let lastCalled: ?number;
+
+  return function throttled(...args: TArgs) {
+    if (lastCalled == null || lastCalled + delay <= Date.now()) {
+      fn.call(this, ...args);
+      lastCalled = Date.now();
+    }
+  };
+}

package/src/{urlJoin.ts → urlJoin.js}

@@ -1,3 +1,5 @@
+// @flow strict-local
+
 import URL from 'url';
 import path from 'path';
 
@@ -10,7 +12,7 @@ export default function urlJoin(publicURL: string, assetPath: string): string {
   // Leading / ensures that paths with colons are not parsed as a protocol.
   let p = assetPath.startsWith('/') ? assetPath : '/' + assetPath;
   const assetUrl = URL.parse(p);
-  url.pathname = path.posix.join(url.pathname ?? '', assetUrl.pathname ?? '');
+  url.pathname = path.posix.join(url.pathname, assetUrl.pathname);
   url.search = assetUrl.search;
   url.hash = assetUrl.hash;
   return URL.format(url);

package/test/{DefaultMap.test.ts → DefaultMap.test.js}

@@ -1,10 +1,12 @@
+// @flow strict-local
+
 import assert from 'assert';
 import {DefaultMap} from '../src/DefaultMap';
 
 describe('DefaultMap', () => {
   it('constructs with entries just like Map', () => {
     let map = new DefaultMap(
-      (k: any) => k,
+      (k) => k,
       [
         [1, 3],
         [2, 27],
@@ -18,18 +20,18 @@ describe('DefaultMap', () => {
   });
 
   it("returns a default value based on a key if it doesn't exist", () => {
-    let map = new DefaultMap((k: any) => k);
+    let map = new DefaultMap((k) => k);
     assert.equal(map.get(3), 3);
   });
 
   it("sets a default value based on a key if it doesn't exist", () => {
-    let map = new DefaultMap((k: any) => k);
+    let map = new DefaultMap((k) => k);
     map.get(3);
     assert.deepEqual(Array.from(map.entries()), [[3, 3]]);
   });
 
   it('respects undefined/null if it already existed in the map', () => {
-    let map = new DefaultMap<number, number | undefined | null>((k: any) => k);
+    let map = new DefaultMap<number, number | void | null>((k) => k);
     map.set(3, undefined);
     assert.equal(map.get(3), undefined);
 

package/test/{PromiseQueue.test.ts → PromiseQueue.test.js}

@@ -1,3 +1,4 @@
+// @flow
 import assert from 'assert';
 import randomInt from 'random-int';
 
@@ -24,7 +25,7 @@ describe('PromiseQueue', () => {
       let queue = new PromiseQueue();
       queue.add(() => Promise.reject(error));
       await queue.run();
-    } catch (e: any) {
+    } catch (e) {
       assert.equal(e, error);
     }
   });
@@ -37,7 +38,7 @@ describe('PromiseQueue', () => {
         throw error;
       });
       await queue.run();
-    } catch (e: any) {
+    } catch (e) {
       assert.equal(e, error);
     }
   });
@@ -91,17 +92,17 @@ describe('PromiseQueue', () => {
 
     const fn1 = sinon
       .stub()
-      .returns(new Promise((resolve: any) => setTimeout(resolve, 5000)));
+      .returns(new Promise((resolve) => setTimeout(resolve, 5000)));
 
     queue.add(fn1); // queue does not work if nothing is running, this is broken behaviour
     queue.run();
 
     const fn2 = sinon
       .stub()
-      .returns(new Promise((resolve: any) => setTimeout(resolve, 5000)));
+      .returns(new Promise((resolve) => setTimeout(resolve, 5000)));
     const fn3 = sinon
       .stub()
-      .returns(new Promise((resolve: any) => setTimeout(resolve, 5000)));
+      .returns(new Promise((resolve) => setTimeout(resolve, 5000)));
 
     queue.add(fn2);
     queue.add(fn3);

package/test/{collection.test.ts → collection.test.js}

@@ -1,3 +1,5 @@
+// @flow
+
 import assert from 'assert';
 import {
   objectSortedEntries,

package/test/{config.test.ts → config.test.js}

@@ -1,3 +1,5 @@
+// @flow strict-local
+
 import assert from 'assert';
 import {loadConfig} from '../src/config';
 import {inputFS as fs} from '@atlaspack/test-utils';
@@ -21,6 +23,7 @@ describe('loadConfig', () => {
   });
 
   it('should throw error with empty string json', async () => {
+    // $FlowFixMe[prop-missing]
     await assert.rejects(async () => {
       await loadConfig(
         fs,

package/test/{objectHash.test.ts → objectHash.test.js}

@@ -1,3 +1,4 @@
+// @flow
 import assert from 'assert';
 import objectHash from '../src/objectHash';
 
@@ -7,12 +8,12 @@ describe('objectHash', () => {
       foo: {foo: 'foo', baz: ['foo', 'baz', 'bar'], bar: 'bar'},
       baz: 'baz',
       bar: 'bar',
-    } as const;
+    };
     const obj2 = {
       foo: {foo: 'foo', baz: ['foo', 'baz', 'bar'], bar: 'bar'},
       baz: 'baz',
       bar: 'bar',
-    } as const;
+    };
 
     assert.equal(objectHash(obj1), objectHash(obj2));
   });
@@ -21,11 +22,11 @@ describe('objectHash', () => {
     const obj1 = {
       baz: 'baz',
       bar: 'ba',
-    } as const;
+    };
     const obj2 = {
       baz: 'baz',
       bar: 'bar',
-    } as const;
+    };
 
     assert.notEqual(objectHash(obj1), objectHash(obj2));
   });

package/test/{prettifyTime.test.ts → prettifyTime.test.js}

@@ -1,3 +1,4 @@
+// @flow
 import assert from 'assert';
 import prettifyTime from '../src/prettifyTime';
 

package/test/{replaceBundleReferences.test.ts → replaceBundleReferences.test.js}

@@ -1,3 +1,5 @@
+// @flow strict-local
+
 import type {NamedBundle, Dependency} from '@atlaspack/types';
 
 import assert from 'assert';
@@ -5,25 +7,30 @@ import {getURLReplacement} from '../src/replaceBundleReferences';
 
 describe('replace bundle references', () => {
   it('Query params and named pipeline, relative', () => {
+    // $FlowFixMe
     let fromBundle: NamedBundle = {
       filePath: '/user/dist/reformat.html',
       name: 'reformat.html',
+      // $FlowFixMe
       target: {
         distDir: '/user/dist',
         publicUrl: '/',
       },
     };
 
+    // $FlowFixMe
     let toBundle: NamedBundle = {
       filePath:
         '/user/dist/image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
       name: 'image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+      // $FlowFixMe
       target: {
         distDir: '/user/dist',
         publicUrl: '/',
       },
     };
 
+    // $FlowFixMe
     let dependency: Dependency = {
       id: '074b36596e3147e900a8ad17ceb5c90b',
       specifier: 'url:./image.jpg?as=webp',
@@ -45,25 +52,30 @@ describe('replace bundle references', () => {
   });
 
   it('Query params and named pipeline, absolute', () => {
+    // $FlowFixMe
     let fromBundle: NamedBundle = {
       filePath: '/user/dist/reformat.html',
       name: 'reformat.html',
+      // $FlowFixMe
       target: {
         distDir: '/user/dist',
         publicUrl: '/',
       },
     };
 
+    // $FlowFixMe
     let toBundle: NamedBundle = {
       filePath:
         '/user/dist/image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
       name: 'image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+      // $FlowFixMe
       target: {
         distDir: '/user/dist',
         publicUrl: '/',
       },
     };
 
+    // $FlowFixMe
     let dependency: Dependency = {
       id: '074b36596e3147e900a8ad17ceb5c90b',
       specifier: 'url:./image.jpg?as=webp',
@@ -85,25 +97,30 @@ describe('replace bundle references', () => {
   });
 
   it('Custom Public URL', () => {
+    // $FlowFixMe
     let fromBundle: NamedBundle = {
       filePath: '/user/dist/reformat.html',
       name: 'reformat.html',
+      // $FlowFixMe
       target: {
         distDir: '/user/dist',
         publicUrl: 'https://test.com/static',
       },
     };
 
+    // $FlowFixMe
     let toBundle: NamedBundle = {
       filePath:
         '/user/dist/image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
       name: 'image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+      // $FlowFixMe
       target: {
         distDir: '/user/dist',
         publicUrl: 'https://test.com/static',
       },
     };
 
+    // $FlowFixMe
     let dependency: Dependency = {
       id: '074b36596e314797845a8ad17ceb5c9b',
       specifier: './image.jpg',
@@ -125,25 +142,30 @@ describe('replace bundle references', () => {
   });
 
   it('Relative with folders in between', () => {
+    // $FlowFixMe
     let fromBundle: NamedBundle = {
       filePath: '/user/dist/reformat.html',
       name: 'reformat.html',
+      // $FlowFixMe
       target: {
         distDir: '/user/dist',
         publicUrl: 'https://test.com/static',
       },
     };
 
+    // $FlowFixMe
     let toBundle: NamedBundle = {
       filePath:
         '/user/dist/assets/image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
       name: 'image.HASH_REF_87f9d66c16c2216ccc7e5664cf089305.webp',
+      // $FlowFixMe
       target: {
         distDir: '/user/dist/assets',
         publicUrl: 'https://test.com/static',
       },
     };
 
+    // $FlowFixMe
     let dependency: Dependency = {
       id: '074b36596e3147e900a8ad17ceb5c90b',
       specifier: 'url:./image.jpg?as=webp',
@@ -165,24 +187,29 @@ describe('replace bundle references', () => {
   });
 
   it('should work with bundle names with colons, relative', () => {
+    // $FlowFixMe
     let fromBundle: NamedBundle = {
       filePath: '/user/dist/reformat.html',
       name: 'reformat.html',
+      // $FlowFixMe
       target: {
         distDir: '/user/dist',
         publicUrl: '/',
       },
     };
 
+    // $FlowFixMe
     let toBundle: NamedBundle = {
       filePath: '/user/dist/a:b:c.html',
       name: 'a:b:c.html',
+      // $FlowFixMe
       target: {
         distDir: '/user/dist',
         publicUrl: '/',
       },
     };
 
+    // $FlowFixMe
     let dependency: Dependency = {
       id: '074b36596e3147e900a8ad17ceb5c90b',
       specifier: './a:b:c.html',
@@ -200,24 +227,29 @@ describe('replace bundle references', () => {
   });
 
   it('should work with bundle names with colons, absolute', () => {
+    // $FlowFixMe
     let fromBundle: NamedBundle = {
       filePath: '/user/dist/reformat.html',
       name: 'reformat.html',
+      // $FlowFixMe
       target: {
         distDir: '/user/dist',
         publicUrl: '/',
       },
     };
 
+    // $FlowFixMe
     let toBundle: NamedBundle = {
       filePath: '/user/dist/a:b:c.html',
       name: 'a:b:c.html',
+      // $FlowFixMe
       target: {
         distDir: '/user/dist',
         publicUrl: '/',
       },
     };
 
+    // $FlowFixMe
     let dependency: Dependency = {
       id: '074b36596e3147e900a8ad17ceb5c90b',
       specifier: './a:b:c.html',

package/test/{sourcemap.test.ts → sourcemap.test.js}

@@ -1,3 +1,4 @@
+// @flow
 import assert from 'assert';
 import {
   matchSourceMappingURL,

package/test/{throttle.test.ts → throttle.test.js}

@@ -1,3 +1,5 @@
+// @flow strict-local
+
 import assert from 'assert';
 import sinon from 'sinon';
 import throttle from '../src/throttle';
@@ -31,7 +33,7 @@ describe('throttle', () => {
   });
 
   it('preserves the `this` when throttled functions are invoked', () => {
-    let result: any;
+    let result;
     let throttled = throttle(function () {
       result = this.bar;
     }, 100);

package/test/{urlJoin.test.ts → urlJoin.test.js}

@@ -1,3 +1,5 @@
+// @flow strict-local
+
 import assert from 'assert';
 import urlJoin from '../src/urlJoin';
 

package/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright (c) 2024 Atlassian US., Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

package/lib/DefaultMap.d.ts

@@ -1,13 +0,0 @@
-export declare class DefaultMap<K, V> extends Map<K, V> {
-    _getDefault: (arg1: K) => V;
-    constructor(getDefault: (arg1: K) => V, entries?: Iterable<[K, V]>);
-    get(key: K): V;
-}
-interface Key {
-}
-export declare class DefaultWeakMap<K extends Key, V> extends WeakMap<K, V> {
-    _getDefault: (arg1: K) => V;
-    constructor(getDefault: (arg1: K) => V, entries?: Iterable<[K, V]>);
-    get(key: K): V;
-}
-export {};