@modern-js/utils 2.58.1 → 2.58.2-alpha.0

package/dist/esm/cli/require.js

@@ -1,28 +1,103 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { findExists } from "./fs";
-var compatRequire = function(filePath) {
-  var interop = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
-  var mod = require(filePath);
-  var rtnESMDefault = interop && (mod === null || mod === void 0 ? void 0 : mod.__esModule);
-  return rtnESMDefault ? mod.default : mod;
-};
+function compatibleRequire(path) {
+  return _compatibleRequire.apply(this, arguments);
+}
+function _compatibleRequire() {
+  _compatibleRequire = _async_to_generator(function(path) {
+    var interop, requiredModule, err;
+    var _arguments = arguments;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          interop = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : true;
+          if (path.endsWith(".json")) {
+            return [
+              2,
+              require(path)
+            ];
+          }
+          _state.label = 1;
+        case 1:
+          _state.trys.push([
+            1,
+            2,
+            ,
+            6
+          ]);
+          requiredModule = require(path);
+          return [
+            3,
+            6
+          ];
+        case 2:
+          err = _state.sent();
+          if (!(err.code === "ERR_REQUIRE_ESM" || _instanceof(err, SyntaxError)))
+            return [
+              3,
+              4
+            ];
+          return [
+            4,
+            import(path)
+          ];
+        case 3:
+          requiredModule = _state.sent();
+          return [
+            2,
+            interop ? requiredModule.default : requiredModule
+          ];
+        case 4:
+          throw err;
+        case 5:
+          return [
+            3,
+            6
+          ];
+        case 6:
+          return [
+            2,
+            interop && (requiredModule === null || requiredModule === void 0 ? void 0 : requiredModule.__esModule) ? requiredModule.default : requiredModule
+          ];
+      }
+    });
+  });
+  return _compatibleRequire.apply(this, arguments);
+}
 var dynamicImport = new Function("modulePath", "return import(modulePath)");
-var requireExistModule = function(filename, opt) {
-  var final = _object_spread({
-    extensions: [
-      ".ts",
-      ".js"
-    ],
-    interop: true
-  }, opt);
-  var exist = findExists(final.extensions.map(function(ext) {
-    return "".concat(filename).concat(ext);
-  }));
-  if (!exist) {
-    return null;
-  }
-  return compatRequire(exist, final.interop);
-};
+var requireExistModule = function() {
+  var _ref = _async_to_generator(function(filename, opt) {
+    var final, exist;
+    return _ts_generator(this, function(_state) {
+      final = _object_spread({
+        extensions: [
+          ".ts",
+          ".js"
+        ],
+        interop: true
+      }, opt);
+      exist = findExists(final.extensions.map(function(ext) {
+        return "".concat(filename).concat(ext);
+      }));
+      if (!exist) {
+        return [
+          2,
+          null
+        ];
+      }
+      return [
+        2,
+        compatibleRequire(exist, final.interop)
+      ];
+    });
+  });
+  return function requireExistModule2(filename, opt) {
+    return _ref.apply(this, arguments);
+  };
+}();
 var cleanRequireCache = function(filelist) {
   filelist.forEach(function(filepath) {
     delete require.cache[filepath];
@@ -57,7 +132,7 @@ var tryResolve = function(name, resolvePath) {
 };
 export {
   cleanRequireCache,
-  compatRequire,
+  compatibleRequire,
   deleteRequireCache,
   dynamicImport,
   requireExistModule,

package/dist/esm/universal/pluginDagSort.js

@@ -10,14 +10,11 @@ var pluginDagSort = function(plugins) {
         return sp[key] === item[key];
       });
     });
-    zeroEndPoints = restPoints.filter(
-      // eslint-disable-next-line @typescript-eslint/no-loop-func
-      function(item) {
-        return !allLines.find(function(l) {
-          return l[1] === item[key];
-        });
-      }
-    );
+    zeroEndPoints = restPoints.filter(function(item) {
+      return !allLines.find(function(l) {
+        return l[1] === item[key];
+      });
+    });
   };
   var key = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "name", preKey = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "pre", postKey = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : "post";
   var getPluginByAny = function getPluginByAny2(q) {

package/dist/esm-node/cli/require.js

@@ -1,11 +1,23 @@
 import { findExists } from "./fs";
-const compatRequire = (filePath, interop = true) => {
-  const mod = require(filePath);
-  const rtnESMDefault = interop && (mod === null || mod === void 0 ? void 0 : mod.__esModule);
-  return rtnESMDefault ? mod.default : mod;
-};
+async function compatibleRequire(path, interop = true) {
+  if (path.endsWith(".json")) {
+    return require(path);
+  }
+  let requiredModule;
+  try {
+    requiredModule = require(path);
+  } catch (err) {
+    if (err.code === "ERR_REQUIRE_ESM" || err instanceof SyntaxError) {
+      requiredModule = await import(path);
+      return interop ? requiredModule.default : requiredModule;
+    } else {
+      throw err;
+    }
+  }
+  return interop && (requiredModule === null || requiredModule === void 0 ? void 0 : requiredModule.__esModule) ? requiredModule.default : requiredModule;
+}
 const dynamicImport = new Function("modulePath", "return import(modulePath)");
-const requireExistModule = (filename, opt) => {
+const requireExistModule = async (filename, opt) => {
   const final = {
     extensions: [
       ".ts",
@@ -18,7 +30,7 @@ const requireExistModule = (filename, opt) => {
   if (!exist) {
     return null;
   }
-  return compatRequire(exist, final.interop);
+  return compatibleRequire(exist, final.interop);
 };
 const cleanRequireCache = (filelist) => {
   filelist.forEach((filepath) => {
@@ -52,7 +64,7 @@ const tryResolve = (name, resolvePath) => {
 };
 export {
   cleanRequireCache,
-  compatRequire,
+  compatibleRequire,
   deleteRequireCache,
   dynamicImport,
   requireExistModule,

package/dist/esm-node/universal/pluginDagSort.js

@@ -33,10 +33,7 @@ const pluginDagSort = (plugins, key = "name", preKey = "pre", postKey = "post")
     sortedPoint.push(getPluginByAny(zep));
     allLines = allLines.filter((l) => l[0] !== getPluginByAny(zep)[key]);
     const restPoints = plugins.filter((item) => !sortedPoint.find((sp) => sp[key] === item[key]));
-    zeroEndPoints = restPoints.filter(
-      // eslint-disable-next-line @typescript-eslint/no-loop-func
-      (item) => !allLines.find((l) => l[1] === item[key])
-    );
+    zeroEndPoints = restPoints.filter((item) => !allLines.find((l) => l[1] === item[key]));
   }
   if (allLines.length) {
     const restInRingPoints = {};

package/dist/types/cli/require.d.ts

@@ -1,14 +1,14 @@
 /**
  * Require function compatible with esm and cjs module.
- * @param filePath - File to required.
+ * @param path - File to required.
  * @returns module export object.
  */
-export declare const compatRequire: (filePath: string, interop?: boolean) => any;
+export declare function compatibleRequire(path: string, interop?: boolean): Promise<any>;
 export declare const dynamicImport: Function;
 export declare const requireExistModule: (filename: string, opt?: {
     extensions?: string[];
     interop?: boolean;
-}) => any;
+}) => Promise<any>;
 export declare const cleanRequireCache: (filelist: string[]) => void;
 export declare function deleteRequireCache(path: string): void;
 /**

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.1",
+  "version": "2.58.2-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -162,8 +162,8 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.93.0",
-    "@modern-js/types": "2.58.1",
     "@scripts/build": "2.58.1",
+    "@modern-js/types": "2.58.1",
     "@scripts/jest-config": "2.58.1"
   },
   "sideEffects": false,