Generate single unified es module for exports

- Minification hints and optimizations for webpack
nevware21 · Apr 17, 2024 · 7af8a42 · 7af8a42
1 parent 24a5c6b
commit 7af8a42
Show file tree

Hide file tree

Showing 11 changed files with 238 additions and 259 deletions.
diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json
diff --git a/gruntfile.js b/gruntfile.js
@@ -39,11 +39,11 @@ module.exports = function (grunt) {
             "ts_async": {
                 // Default ES5
                 tsconfig: "./lib/tsconfig.json",
-                outDir: "./lib/dist/es5/mod"
+                outDir: "./lib/build/es5/mod"
             },
             "ts_async_es6": {
                 tsconfig: "./lib/tsconfig.es6.json",
-                outDir: "./lib/dist/es6/mod"
+                outDir: "./lib/build/es6/mod"
             },
             "ts_async-test": {
                 tsconfig: "./lib/test/tsconfig.test.json",

diff --git a/lib/package.json b/lib/package.json
@@ -34,8 +34,8 @@
     ],
     "main": "dist/es5/main/ts-async.js",
     "esnext:main": "dist/es6/main/ts-async.js",
-    "module": "dist/es5/mod/index.js",
-    "esnext": "dist/es6/mod/index.js",
+    "module": "dist/es5/mod/ts-async.js",
+    "esnext": "dist/es6/mod/ts-async.js",
     "types": "dist/types/ts-async.d.ts",    
     "repository": {
         "type": "git",
@@ -74,7 +74,7 @@
     },
 
     "dependencies": {
-        "@nevware21/ts-utils": ">= 0.11.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.2 < 2.x"
     },
     "devDependencies": {
         "@nevware21/tools-pre-proc": "0.1.0",

diff --git a/lib/rollup.config.js b/lib/rollup.config.js
@@ -186,31 +186,6 @@ const rollupConfigMainEntry = (srcPath, destPath, path, format = "umd") => {
     return taskRollupConfig;
 };
 
-const rollupModule = (srcPath, destPath) => {
-    const taskRollupConfig = {
-        input: `./${srcPath}/index.js`,
-        output: {
-            file: `./${destPath}/${outputName}.js`,
-            banner: banner,
-            format: "esm",
-            name: "nevware21.ts-async",
-            freeze: false,
-            sourcemap: true
-        },
-        external: [ "fs", "path", "@nevware21/ts-utils" ],
-        plugins: [
-            cleanup({
-                comments: [
-                    /[#@]__/,
-                    /^!/
-                ]
-            })
-        ]
-    };
-
-    return taskRollupConfig;
-};
-
 const polyfillRollupConfigFactory = (srcPath, destPath, isMinified, format = "iife", postfix = "") => {
     const taskRollupConfig = {
         input: `./${srcPath}/polyfills.js`,
@@ -261,42 +236,26 @@ const polyfillRollupConfigFactory = (srcPath, destPath, isMinified, format = "ii
 };
 
 export default [
-    //rollupModule("build/es5", "dist-es5", false),
-   // rollupModule("build/es6", "dist-es6", false),
-
-    polyfillRollupConfigFactory("dist/es5/mod", "bundle/es5", true),
-    polyfillRollupConfigFactory("dist/es5/mod", "bundle/es5", false),
-
-    rollupConfigMainEntry("dist/es5/mod", "dist/es5", "main", "umd"),
-    rollupConfigMainEntry("dist/es6/mod", "dist/es6", "main", "umd"),
-
-    // Self contained bundles
-    rollupConfigFactory("dist/es5/mod", "dist/es5", false, "umd", "umd"),
-    rollupConfigFactory("dist/es6/mod", "dist/es6", false, "umd", "umd"),
-
-    rollupConfigFactory("dist/es5/mod", "bundle/es5", false, "esm", "esm"),
-    rollupConfigFactory("dist/es5/mod", "bundle/es5", true, "esm", "esm"),
-    // rollupConfigFactory("dist/es5/mod", "bundle/es5", false, "amd", "amd"),
-    // rollupConfigFactory("dist/es5/mod", "bundle/es5", true, "amd", "amd"),
-    // rollupConfigFactory("dist/es5/mod", "bundle/es5", false, "cjs", "cjs"),
-    // rollupConfigFactory("dist/es5/mod", "bundle/es5", true, "cjs", "cjs"),
-    rollupConfigFactory("dist/es5/mod", "bundle/es5", false, "iife", "iife"),
-    rollupConfigFactory("dist/es5/mod", "bundle/es5", true, "iife", "iife"),
-    rollupConfigFactory("dist/es5/mod", "bundle/es5", false, "umd", "umd"),
-    rollupConfigFactory("dist/es5/mod", "bundle/es5", true, "umd", "umd"),
-    // rollupConfigFactory("dist/es5/mod", "bundle/es5", false, "system", "system"),
-    // rollupConfigFactory("dist/es5/mod", "bundle/es5", true, "system", "system"),
-
-    rollupConfigFactory("dist/es6/mod", "bundle/es6", false, "esm", "esm"),
-    rollupConfigFactory("dist/es6/mod", "bundle/es6", true, "esm", "esm"),
-    // rollupConfigFactory("dist/es6/mod", "bundle/es6", false, "amd", "amd"),
-    // rollupConfigFactory("dist/es6/mod", "bundle/es6", true, "amd", "amd"),
-    // rollupConfigFactory("dist/es6/mod", "bundle/es6", false, "cjs", "cjs"),
-    // rollupConfigFactory("dist/es6/mod", "bundle/es6", true, "cjs", "cjs"),
-    rollupConfigFactory("dist/es6/mod", "bundle/es6", false, "iife", "iife"),
-    rollupConfigFactory("dist/es6/mod", "bundle/es6", true, "iife", "iife"),
-    rollupConfigFactory("dist/es6/mod", "bundle/es6", false, "umd", "umd"),
-    rollupConfigFactory("dist/es6/mod", "bundle/es6", true, "umd", "umd")
-    // rollupConfigFactory("dist/es6/mod", "bundle/es6", false, "system", "system"),
-    // rollupConfigFactory("dist/es6/mod", "bundle/es6", true, "system", "system")
+    polyfillRollupConfigFactory("build/es5/mod", "bundle/es5", true),
+    polyfillRollupConfigFactory("build/es5/mod", "bundle/es5", false),
+
+    rollupConfigMainEntry("build/es5/mod", "dist/es5", "main", "umd"),
+    rollupConfigMainEntry("build/es6/mod", "dist/es6", "main", "umd"),
+    rollupConfigMainEntry("build/es5/mod", "dist/es5", "mod", "es"),
+    rollupConfigMainEntry("build/es6/mod", "dist/es6", "mod", "es"),
+
+    // Self contained bundles (Used for testing -- will be removed in a future release)
+    rollupConfigFactory("build/es5/mod", "dist/es5", false, "umd", "umd"),
+
+    // ES5 Bundles
+    rollupConfigFactory("build/es5/mod", "bundle/es5", false, "iife", "iife"),
+    rollupConfigFactory("build/es5/mod", "bundle/es5", true, "iife", "iife"),
+    rollupConfigFactory("build/es5/mod", "bundle/es5", false, "umd", "umd"),
+    rollupConfigFactory("build/es5/mod", "bundle/es5", true, "umd", "umd"),
+
+    // ES6 Bundles
+    rollupConfigFactory("build/es6/mod", "bundle/es6", false, "iife", "iife"),
+    rollupConfigFactory("build/es6/mod", "bundle/es6", true, "iife", "iife"),
+    rollupConfigFactory("build/es6/mod", "bundle/es6", false, "umd", "umd"),
+    rollupConfigFactory("build/es6/mod", "bundle/es6", true, "umd", "umd")
 ];
diff --git a/lib/src/promise/base.ts b/lib/src/promise/base.ts
@@ -9,8 +9,8 @@
 import {
     arrSlice, dumpObj, getKnownSymbol, hasSymbol, isFunction, isPromiseLike, isUndefined,
     throwTypeError, WellKnownSymbols, objToString, scheduleTimeout, ITimerHandler, getWindow, isNode,
-    getGlobal, ILazyValue, objDefine, objDefineProp, lazySafeGetInst, iterForOf, isIterable,
-    isArray, arrForEach, createCachedValue, ICachedValue, safe, getInst, createCustomError
+    getGlobal, objDefine, objDefineProp, iterForOf, isIterable, isArray, arrForEach, createCachedValue,
+    ICachedValue, safe, getInst, createCustomError
 } from "@nevware21/ts-utils";
 import { doAwait, doAwaitResponse } from "./await";
 import { _addDebugState, _promiseDebugEnabled } from "./debug";
@@ -36,7 +36,22 @@ let _uniquePromiseId = 0;
 let _unhandledRejectionTimeout = 10;
 let _aggregationError: ICachedValue<any>;
 
-let _hasPromiseRejectionEvent: ILazyValue<any>;
+/**
+ * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PromiseRejectionEvent)
+ */
+interface _PromiseRejectionEvent extends Event {
+    /**
+     * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PromiseRejectionEvent/promise)
+     */
+    readonly promise: IPromise<any>;
+
+    /**
+     * [MDN Reference](https://developer.mozilla.org/docs/Web/API/PromiseRejectionEvent/reason)
+     */
+    readonly reason: any;
+}
+
+let _hasPromiseRejectionEvent: ICachedValue<_PromiseRejectionEvent>;
 
 function dumpFnObj(value: any) {
     if (isFunction(value)) {
@@ -103,8 +118,6 @@ export function _createPromise<T>(newPromise: PromiseCreatorFn, processor: Promi
     let _handled = false;
     let _unHandledRejectionHandler: ITimerHandler = null;
     let _thePromise: IPromise<T>;
-
-    !_hasPromiseRejectionEvent && (_hasPromiseRejectionEvent = lazySafeGetInst(STR_PROMISE + "RejectionEvent"));
 
     // https://tc39.es/ecma262/#sec-promise.prototype.then
     function _then<TResult1 = T, TResult2 = never>(onResolved?: ResolvedPromiseHandler<T, TResult1>, onRejected?: RejectedPromiseHandler<TResult2>): IPromise<TResult1 | TResult2> {
@@ -282,6 +295,8 @@ export function _createPromise<T>(newPromise: PromiseCreatorFn, processor: Promi
             } else {
                 let gbl = getWindow() || getGlobal();
 
+                !_hasPromiseRejectionEvent && (_hasPromiseRejectionEvent = createCachedValue(safe(getInst<_PromiseRejectionEvent>, [STR_PROMISE + "RejectionEvent"]).v));
+
                 //#ifdef DEBUG
                 _debugLog(_toString(), "Emitting " + UNHANDLED_REJECTION);
                 //#endif

diff --git a/lib/src/promise/idlePromise.ts b/lib/src/promise/idlePromise.ts
@@ -226,7 +226,7 @@ export function createIdleRacePromise<T>(values: Iterable<T | PromiseLike<T>>, t
  * if the iterable passed is empty. If the iterable passed is non-empty but contains no pending promises, the returned promise will settle
  * asynchronously when the system detects that the runtime is idle.
  */
-export function  createIdleRacePromise<T extends readonly unknown[] | []>(values: T, timeout?: number): IPromise<Awaited<T[number]>> {
+export function createIdleRacePromise<T extends readonly unknown[] | []>(values: T, timeout?: number): IPromise<Awaited<T[number]>> {
     !_raceIdleCreator && (_raceIdleCreator = _createRacePromise(createIdlePromise));
     return _raceIdleCreator.v(values, timeout);
 }

diff --git a/lib/test/src/promise/idle.promise.test.ts b/lib/test/src/promise/idle.promise.test.ts
@@ -8,12 +8,17 @@
 
 import { assert } from "chai";
 import { createIdlePromise, setDefaultIdlePromiseTimeout } from "../../../src/promise/idlePromise";
-import { getGlobal } from "@nevware21/ts-utils";
+import { getGlobal, setBypassLazyCache } from "@nevware21/ts-utils";
 import { setPromiseDebugState } from "../../../src/promise/debug";
 
 describe("createIdlePromise", () => {
     beforeEach(() => {
         setDefaultIdlePromiseTimeout();
+        setBypassLazyCache(true);
+    });
+
+    afterEach(() => {
+        setBypassLazyCache(false);
     });
 
     it("should create a new idle promise with timeout from parameter", async () => {

diff --git a/lib/tsconfig.es6.json b/lib/tsconfig.es6.json
@@ -2,6 +2,6 @@
     "extends": "./tsconfig.base.json",
     "compilerOptions": {
         "target": "es6",
-        "outDir": "./dist-es6"
+        "outDir": "./build/es6"
     }
 }
diff --git a/lib/tsconfig.json b/lib/tsconfig.json
@@ -5,6 +5,6 @@
         "declaration": true,
         "declarationDir": "./build/types",
         "removeComments": false,
-        "outDir": "./dist-es5"
+        "outDir": "./build/es5"
     }
 }
diff --git a/package.json b/package.json
@@ -34,8 +34,8 @@
     ],
     "main": "lib/dist/es5/main/ts-async.js",
     "esnext:main": "lib/dist/es6/main/ts-async.js",
-    "module": "lib/dist/es5/mod/index.js",
-    "esnext": "lib/dist/es6/mod/index.js",
+    "module": "lib/dist/es5/mod/ts-async.js",
+    "esnext": "lib/dist/es6/mod/ts-async.js",
     "types": "lib/dist/types/ts-async.d.ts",    
     "scripts": {
         "postinstall": "node common/scripts/install-run-rush.js update --full",
@@ -79,7 +79,7 @@
         "node": ">= 0.8.0"
     },
     "dependencies": {
-        "@nevware21/ts-utils": ">= 0.11.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.2 < 2.x"
     },
     "devDependencies": {
         "@istanbuljs/nyc-config-typescript": "^1.0.2",
@@ -112,7 +112,7 @@
     "size-limit": [
         {
             "name": "es5-full",
-            "path": "lib/dist/es5/mod/index.js",
+            "path": "lib/dist/es5/mod/ts-async.js",
             "limit": "18 kb",
             "brotli": false,
             "ignore": [
@@ -122,7 +122,7 @@
         },
         {
             "name": "es6-full",
-            "path": "lib/dist/es6/mod/index.js",
+            "path": "lib/dist/es6/mod/ts-async.js",
             "limit": "17 kb",
             "brotli": false,
             "ignore": [
@@ -132,7 +132,7 @@
         },
         {
             "name": "es5-zip",
-            "path": "lib/dist/es5/mod/index.js",
+            "path": "lib/dist/es5/mod/ts-async.js",
             "limit": "7 Kb",
             "gzip": true,
             "ignore": [
@@ -142,7 +142,7 @@
         },
         {
             "name": "es6-zip",
-            "path": "lib/dist/es6/mod/index.js",
+            "path": "lib/dist/es6/mod/ts-async.js",
             "limit": "7 Kb",
             "gzip": true,
             "ignore": [
@@ -152,7 +152,7 @@
         },
         {
             "name": "es5-promise",
-            "path": "lib/dist/es5/mod/index.js",
+            "path": "lib/dist/es5/mod/ts-async.js",
             "limit": "8 kb",
             "import": "{ createAsyncPromise }",
             "brotli": false,
@@ -163,7 +163,7 @@
         },
         {
             "name": "es5-any",
-            "path": "lib/dist/es5/mod/index.js",
+            "path": "lib/dist/es5/mod/ts-async.js",
             "limit": "10 kb",
             "import": "{ createAnyPromise }",
             "brotli": false,
@@ -174,7 +174,7 @@
         },
         {
             "name": "es5-race",
-            "path": "lib/dist/es5/mod/index.js",
+            "path": "lib/dist/es5/mod/ts-async.js",
             "limit": "9 kb",
             "import": "{ createRacePromise }",
             "brotli": false,
@@ -185,14 +185,14 @@
         },
         {
             "name": "es5-polypromise",
-            "path": "lib/dist/es5/mod/index.js",
+            "path": "lib/dist/es5/mod/ts-async.js",
             "limit": "12 kb",
             "import": "{ PolyPromise }",
             "brotli": false
         },
         {
             "name": "es5-ppolyfill",
-            "path": "lib/dist/es5/mod/polyfills.js",
+            "path": "lib/build/es5/mod/polyfills.js",
             "limit": "12 kb",
             "brotli": false
         } 

diff --git a/tools/build-tools/pre-proc/package.json b/tools/build-tools/pre-proc/package.json
@@ -21,7 +21,7 @@
     "homepage": "https://github.com/nevware21/ts-async",
     "dependencies": {
         "globby": "^11.0.0",
-        "@nevware21/ts-utils": ">= 0.11.0 < 2.x"
+        "@nevware21/ts-utils": ">= 0.11.2 < 2.x"
     },
     "devDependencies": {
         "@types/node": "^18.14.2",