Use Promise.resolve() to make sure the passed function result is "the…

…nable".
jackocnr · Dec 1, 2024 · 69fbc29 · 69fbc29
1 parent ba774eb
commit 69fbc29
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 50 deletions.
diff --git a/build/js/intlTelInput.js b/build/js/intlTelInput.js
@@ -3099,10 +3099,7 @@ var factoryOutput = (() => {
         );
       } else if (typeof source === "function") {
         try {
-          loadCall = source();
-          if (!(loadCall instanceof Promise)) {
-            throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof loadCall}`);
-          }
+          loadCall = Promise.resolve(source());
         } catch (error) {
           return Promise.reject(error);
         }

diff --git a/build/js/intlTelInput.min.js b/build/js/intlTelInput.min.js
diff --git a/build/js/intlTelInputWithUtils.js b/build/js/intlTelInputWithUtils.js
@@ -3094,10 +3094,7 @@ var factoryOutput = (() => {
         loadCall = Promise.reject(new Error("INTENTIONALLY BROKEN: this build of intl-tel-input includes the utilities module inline, but it has incorrectly attempted to load the utilities separately. If you are seeing this message, something is broken!"));
       } else if (typeof source === "function") {
         try {
-          loadCall = source();
-          if (!(loadCall instanceof Promise)) {
-            throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof loadCall}`);
-          }
+          loadCall = Promise.resolve(source());
         } catch (error) {
           return Promise.reject(error);
         }

diff --git a/build/js/intlTelInputWithUtils.min.js b/build/js/intlTelInputWithUtils.min.js
diff --git a/react/build/IntlTelInput.cjs b/react/build/IntlTelInput.cjs
@@ -3094,10 +3094,7 @@ var loadUtils = (source) => {
       );
     } else if (typeof source === "function") {
       try {
-        loadCall = source();
-        if (!(loadCall instanceof Promise)) {
-          throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof loadCall}`);
-        }
+        loadCall = Promise.resolve(source());
       } catch (error) {
         return Promise.reject(error);
       }

diff --git a/react/build/IntlTelInput.js b/react/build/IntlTelInput.js
@@ -3058,10 +3058,7 @@ var loadUtils = (source) => {
       );
     } else if (typeof source === "function") {
       try {
-        loadCall = source();
-        if (!(loadCall instanceof Promise)) {
-          throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof loadCall}`);
-        }
+        loadCall = Promise.resolve(source());
       } catch (error) {
         return Promise.reject(error);
       }

diff --git a/react/build/IntlTelInputWithUtils.cjs b/react/build/IntlTelInputWithUtils.cjs
@@ -3090,10 +3090,7 @@ var loadUtils = (source) => {
       loadCall = Promise.reject(new Error("INTENTIONALLY BROKEN: this build of intl-tel-input includes the utilities module inline, but it has incorrectly attempted to load the utilities separately. If you are seeing this message, something is broken!"));
     } else if (typeof source === "function") {
       try {
-        loadCall = source();
-        if (!(loadCall instanceof Promise)) {
-          throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof loadCall}`);
-        }
+        loadCall = Promise.resolve(source());
       } catch (error) {
         return Promise.reject(error);
       }

diff --git a/react/build/IntlTelInputWithUtils.js b/react/build/IntlTelInputWithUtils.js
@@ -3054,10 +3054,7 @@ var loadUtils = (source) => {
       loadCall = Promise.reject(new Error("INTENTIONALLY BROKEN: this build of intl-tel-input includes the utilities module inline, but it has incorrectly attempted to load the utilities separately. If you are seeing this message, something is broken!"));
     } else if (typeof source === "function") {
       try {
-        loadCall = source();
-        if (!(loadCall instanceof Promise)) {
-          throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof loadCall}`);
-        }
+        loadCall = Promise.resolve(source());
       } catch (error) {
         return Promise.reject(error);
       }

diff --git a/react/demo/set-number/set-number-bundle.js b/react/demo/set-number/set-number-bundle.js
@@ -26645,10 +26645,7 @@
         );
       } else if (typeof source === "function") {
         try {
-          loadCall = source();
-          if (!(loadCall instanceof Promise)) {
-            throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof loadCall}`);
-          }
+          loadCall = Promise.resolve(source());
         } catch (error) {
           return Promise.reject(error);
         }

diff --git a/react/demo/simple/simple-bundle.js b/react/demo/simple/simple-bundle.js
@@ -26645,10 +26645,7 @@
         );
       } else if (typeof source === "function") {
         try {
-          loadCall = source();
-          if (!(loadCall instanceof Promise)) {
-            throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof loadCall}`);
-          }
+          loadCall = Promise.resolve(source());
         } catch (error) {
           return Promise.reject(error);
         }

diff --git a/react/demo/toggle-disabled/toggle-disabled-bundle.js b/react/demo/toggle-disabled/toggle-disabled-bundle.js
@@ -26645,10 +26645,7 @@
         );
       } else if (typeof source === "function") {
         try {
-          loadCall = source();
-          if (!(loadCall instanceof Promise)) {
-            throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof loadCall}`);
-          }
+          loadCall = Promise.resolve(source());
         } catch (error) {
           return Promise.reject(error);
         }

diff --git a/react/demo/validation/validation-bundle.js b/react/demo/validation/validation-bundle.js
@@ -26645,10 +26645,7 @@
         );
       } else if (typeof source === "function") {
         try {
-          loadCall = source();
-          if (!(loadCall instanceof Promise)) {
-            throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof loadCall}`);
-          }
+          loadCall = Promise.resolve(source());
         } catch (error) {
           return Promise.reject(error);
         }

diff --git a/src/js/intl-tel-input.ts b/src/js/intl-tel-input.ts
@@ -2151,10 +2151,7 @@ const loadUtils = (source: string|UtilsLoader): Promise<unknown> | null => {
       loadCall = import(/* webpackIgnore: true */ /* @vite-ignore */ source);
     } else if (typeof source === "function") {
       try {
-        loadCall = source();
-        if (!(loadCall instanceof Promise)) {
-          throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof loadCall}`);
-        }
+        loadCall = Promise.resolve(source());
       } catch (error) {
         return Promise.reject(error);
       }

diff --git a/tests/options/loadUtilsOnInit.test.js b/tests/options/loadUtilsOnInit.test.js
@@ -95,6 +95,25 @@ describe("loadUtilsOnInit", () => {
     expect(intlTelInput.utils).toBe(mockUtils.default);
   });
 
+  it("works if loadUtilsOnInit returns a custom promise", async function() {
+    const mockUtils = { default: { mockUtils: true } };
+
+    const { iti } = initPlugin({
+      intlTelInput,
+      options: {
+        loadUtilsOnInit:  () => ({
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
+          then: (resolve, reject) => resolve(mockUtils),
+        }),
+      },
+    });
+
+    expect(intlTelInput).toHaveProperty("startedLoadingUtilsScript", true);
+    await iti.promise;
+
+    expect(intlTelInput.utils).toBe(mockUtils.default);
+  });
+
   describe("in 'withUtils' builds", () => {
     const intlTelInput = require("intl-tel-input/intlTelInputWithUtils");
     resetPackageAfterEach(intlTelInput);

diff --git a/vue/build/IntlTelInput.mjs b/vue/build/IntlTelInput.mjs
@@ -2465,8 +2465,7 @@ const W = (u) => {
       );
     else if (typeof u == "function")
       try {
-        if (t = u(), !(t instanceof Promise))
-          throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof t}`);
+        t = Promise.resolve(u());
       } catch (e) {
         return Promise.reject(e);
       }

diff --git a/vue/build/IntlTelInputWithUtils.mjs b/vue/build/IntlTelInputWithUtils.mjs
@@ -2461,8 +2461,7 @@ const V2 = (y) => {
       e = Promise.reject(new Error("INTENTIONALLY BROKEN: this build of intl-tel-input includes the utilities module inline, but it has incorrectly attempted to load the utilities separately. If you are seeing this message, something is broken!"));
     else if (typeof y == "function")
       try {
-        if (e = y(), !(e instanceof Promise))
-          throw new TypeError(`The function passed to loadUtils must return a promise for the utilities module, not ${typeof e}`);
+        e = Promise.resolve(y());
       } catch (i) {
         return Promise.reject(i);
       }