@modern-js/utils 2.15.0 → 2.16.0

package/dist/esm/path.js

@@ -2,29 +2,34 @@ import path from "path";
 import os from "os";
 import fs from "fs";
 import { nanoid, upath, lodash as _ } from "./compiled";
-const isPathString = (test) => path.posix.basename(test) !== test || path.win32.basename(test) !== test;
-const isRelativePath = (test) => /^\.\.?($|[\\/])/.test(test);
-const normalizeOutputPath = (s) => s.replace(/\\/g, "\\\\");
-const normalizeToPosixPath = (p) => upath.normalizeSafe(path.normalize(p || "")).replace(/^([a-zA-Z]+):/, (_2, m) => `/${m.toLowerCase()}`);
-const getTemplatePath = (prefix) => {
+export const isPathString = (test) => path.posix.basename(test) !== test || path.win32.basename(test) !== test;
+export const isRelativePath = (test) => /^\.\.?($|[\\/])/.test(test);
+export const normalizeOutputPath = (s) => s.replace(/\\/g, "\\\\");
+export const normalizeToPosixPath = (p) => upath.normalizeSafe(path.normalize(p || "")).replace(/^([a-zA-Z]+):/, (_2, m) => `/${m.toLowerCase()}`);
+export const getTemplatePath = (prefix) => {
   const tmpRoot = fs.realpathSync(os.tmpdir());
-  const parts = [tmpRoot];
+  const parts = [
+    tmpRoot
+  ];
   prefix && parts.push(prefix);
   parts.push(nanoid());
   return path.resolve(...parts);
 };
-function compilePathMatcherRegExp(match) {
+export function compilePathMatcherRegExp(match) {
   if (typeof match !== "string") {
     return match;
   }
   const escaped = _.escapeRegExp(match);
   return new RegExp(`(?<=\\W|^)${escaped}(?=\\W|$)`);
 }
-const _joinPathParts = (_part, i, parts) => _(parts).filter((part) => !["/", "\\"].includes(part)).tap((parts2) => parts2.unshift("")).slice(0, i + 2).join("/");
-function upwardPaths(start) {
+export const _joinPathParts = (_part, i, parts) => _(parts).filter((part) => ![
+  "/",
+  "\\"
+].includes(part)).tap((parts2) => parts2.unshift("")).slice(0, i + 2).join("/");
+export function upwardPaths(start) {
   return _(start).split(/[/\\]/).filter(Boolean).map(_joinPathParts).reverse().push("/").value();
 }
-function getRealTemporaryDirectory() {
+export function getRealTemporaryDirectory() {
   let ret = null;
   try {
     ret = os.tmpdir();
@@ -33,18 +38,6 @@ function getRealTemporaryDirectory() {
   }
   return ret;
 }
-function splitPathString(str) {
+export function splitPathString(str) {
   return str.split(/[\\/]/);
 }
-export {
-  _joinPathParts,
-  compilePathMatcherRegExp,
-  getRealTemporaryDirectory,
-  getTemplatePath,
-  isPathString,
-  isRelativePath,
-  normalizeOutputPath,
-  normalizeToPosixPath,
-  splitPathString,
-  upwardPaths
-};

package/dist/esm/pathSerializer.js

@@ -1,14 +1,11 @@
 import os from "os";
 import _ from "../compiled/lodash";
-import {
-  compilePathMatcherRegExp,
-  normalizeToPosixPath,
-  getRealTemporaryDirectory,
-  splitPathString,
-  upwardPaths
-} from "./path";
-const matchUpwardPathsAsUnknown = (p) => _(upwardPaths(normalizeToPosixPath(p))).map((match) => ({ match, mark: "unknown" })).slice(1, -1).value();
-function applyPathMatcher(matcher, str, options = {}) {
+import { compilePathMatcherRegExp, normalizeToPosixPath, getRealTemporaryDirectory, splitPathString, upwardPaths } from "./path";
+export const matchUpwardPathsAsUnknown = (p) => _(upwardPaths(normalizeToPosixPath(p))).map((match) => ({
+  match,
+  mark: "unknown"
+})).slice(1, -1).value();
+export function applyPathMatcher(matcher, str, options = {}) {
   const regex = compilePathMatcherRegExp(matcher.match);
   const replacer = (substring, ...args) => {
     if (options.minPartials && splitPathString(substring).length < options.minPartials) {
@@ -19,28 +16,31 @@ function applyPathMatcher(matcher, str, options = {}) {
   };
   return str.replace(regex, replacer);
 }
-function applyMatcherReplacement(matchers, str, options = {}) {
+export function applyMatcherReplacement(matchers, str, options = {}) {
   return matchers.reduce((ret, matcher) => {
     return applyPathMatcher(matcher, ret, options);
   }, str);
 }
-const createDefaultPathMatchers = (root) => {
+export const createDefaultPathMatchers = (root) => {
   const ret = [
     {
-      match: /(?<=\/)(\.pnpm\/.+?\/node_modules)(?=\/)/,
+      match: RegExp("(?<=\\/)(\\.pnpm\\/.+?\\/node_modules)(?=\\/)"),
       mark: "pnpmInner"
     }
   ];
   const tmpdir = getRealTemporaryDirectory();
-  tmpdir && ret.push({ match: tmpdir, mark: "temp" });
-  ret.push({ match: os.tmpdir(), mark: "temp" });
-  ret.push({ match: os.homedir(), mark: "home" });
+  tmpdir && ret.push({
+    match: tmpdir,
+    mark: "temp"
+  });
+  ret.push({
+    match: os.tmpdir(),
+    mark: "temp"
+  });
+  ret.push({
+    match: os.homedir(),
+    mark: "home"
+  });
   ret.push(...matchUpwardPathsAsUnknown(root));
   return ret;
 };
-export {
-  applyMatcherReplacement,
-  applyPathMatcher,
-  createDefaultPathMatchers,
-  matchUpwardPathsAsUnknown
-};

package/dist/esm/plugin.js

@@ -1,6 +1,6 @@
 import { INTERNAL_CLI_PLUGINS } from "./constants";
 import { isDepExists } from "./is";
-function getInternalPlugins(appDirectory, internalPlugins = INTERNAL_CLI_PLUGINS) {
+export function getInternalPlugins(appDirectory, internalPlugins = INTERNAL_CLI_PLUGINS) {
   return [
     ...Object.keys(internalPlugins).filter((name) => {
       const config = internalPlugins[name];
@@ -18,6 +18,3 @@ function getInternalPlugins(appDirectory, internalPlugins = INTERNAL_CLI_PLUGINS
     })
   ];
 }
-export {
-  getInternalPlugins
-};

package/dist/esm/prettyInstructions.js

@@ -3,7 +3,7 @@ import { chalk } from "./compiled";
 import { isDev, isSingleEntry } from "./is";
 import { DEFAULT_DEV_HOST } from "./constants";
 const normalizeUrl = (url) => url.replace(/([^:]\/)\/+/g, "$1");
-const getIpv4Interfaces = () => {
+export const getIpv4Interfaces = () => {
   const interfaces = os.networkInterfaces();
   const ipv4Interfaces = [];
   Object.keys(interfaces).forEach((key) => {
@@ -16,10 +16,12 @@ const getIpv4Interfaces = () => {
   });
   return ipv4Interfaces;
 };
-const getAddressUrls = (protocol = "http", port, host) => {
+export const getAddressUrls = (protocol = "http", port, host) => {
   const LOCAL_LABEL = "Local:  ";
   const NETWORK_LABEL = "Network:  ";
-  const isLocalhost = (url) => url == null ? void 0 : url.includes("localhost");
+  const isLocalhost = (url) => {
+    return url === null || url === void 0 ? void 0 : url.includes("localhost");
+  };
   if (host && host !== DEFAULT_DEV_HOST) {
     return [
       {
@@ -44,23 +46,15 @@ const getAddressUrls = (protocol = "http", port, host) => {
     return memo;
   }, []);
 };
-const prettyInstructions = (appContext, config) => {
-  var _a;
+export const prettyInstructions = (appContext, config) => {
+  var _config_dev;
   const { entrypoints, serverRoutes, port, apiOnly, checkedEntries } = appContext;
-  const urls = getAddressUrls(
-    config.dev.https && isDev() ? "https" : "http",
-    port,
-    (_a = config.dev) == null ? void 0 : _a.host
-  );
+  const urls = getAddressUrls(config.dev.https && isDev() ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
   const routes = !apiOnly ? serverRoutes.filter((route) => route.entryName) : serverRoutes;
   let message = "App running at:\n\n";
   if (isSingleEntry(entrypoints) || apiOnly) {
-    message += urls.map(
-      ({ label, url }) => `  ${chalk.bold(`> ${label.padEnd(10)}`)}${chalk.cyanBright(
-        normalizeUrl(`${url}/${routes[0].urlPath}`)
-      )}
-`
-    ).join("");
+    message += urls.map(({ label, url }) => `  ${chalk.bold(`> ${label.padEnd(10)}`)}${chalk.cyanBright(normalizeUrl(`${url}/${routes[0].urlPath}`))}
+`).join("");
   } else {
     const maxNameLength = Math.max(...routes.map((r) => r.entryName.length));
     urls.forEach(({ label, url }) => {
@@ -70,26 +64,13 @@ const prettyInstructions = (appContext, config) => {
         if (!checkedEntries.includes(entryName)) {
           return;
         }
-        message += `    ${chalk.yellowBright(
-          isSSR ? "λ" : "○"
-        )}  ${chalk.yellowBright(
-          entryName.padEnd(maxNameLength + 8)
-        )}${chalk.cyanBright(normalizeUrl(`${url}/${urlPath}`))}
+        message += `    ${chalk.yellowBright(isSSR ? "λ" : "○")}  ${chalk.yellowBright(entryName.padEnd(maxNameLength + 8))}${chalk.cyanBright(normalizeUrl(`${url}/${urlPath}`))}
 `;
       });
     });
     message += "\n";
-    message += chalk.cyanBright(
-      "  λ (Server) server-side renders at runtime\n"
-    );
-    message += chalk.cyanBright(
-      "  ○ (Static) client-side renders as static HTML\n"
-    );
+    message += chalk.cyanBright("  λ (Server) server-side renders at runtime\n");
+    message += chalk.cyanBright("  ○ (Static) client-side renders as static HTML\n");
   }
   return message;
 };
-export {
-  getAddressUrls,
-  getIpv4Interfaces,
-  prettyInstructions
-};

package/dist/esm/printBuildError.js

@@ -1,6 +1,6 @@
 import { chalk } from "./compiled";
 import { logger } from "./logger";
-function printBuildError(err) {
+export function printBuildError(err) {
   const message = err != null && err.message;
   const stack = err != null && err.stack;
   if (stack && typeof message === "string" && message.indexOf("from Terser") !== -1) {
@@ -12,14 +12,10 @@ function printBuildError(err) {
       const problemPath = matched[2];
       const line = matched[3];
       const column = matched[4];
-      logger.error(
-        `Failed to minify the code from this file: 
+      logger.error(`Failed to minify the code from this file: 
 
- ${chalk.yellow(
-          `	${problemPath}:${line}${column !== "0" ? ":" + column : ""}`
-        )}
-`
-      );
+ ${chalk.yellow(`	${problemPath}:${line}${column !== "0" ? ":" + column : ""}`)}
+`);
     } catch (ignored) {
       logger.error(`Failed to minify the bundle. ${err}
 `);
@@ -29,6 +25,3 @@ function printBuildError(err) {
   }
   logger.log();
 }
-export {
-  printBuildError
-};

package/dist/esm/react.js

@@ -1,6 +1,6 @@
 import path from "path";
 import { fs, semver } from ".";
-const isBeyondReact17 = (cwd) => {
+export const isBeyondReact17 = (cwd) => {
   const pkgPath = path.join(cwd, "package.json");
   if (!fs.existsSync(pkgPath)) {
     return false;
@@ -15,6 +15,3 @@ const isBeyondReact17 = (cwd) => {
   }
   return semver.satisfies(semver.minVersion(deps.react), ">=17.0.0");
 };
-export {
-  isBeyondReact17
-};

package/dist/esm/readTsConfig.js

@@ -1,13 +1,9 @@
 import path from "path";
 import { fs, json5 } from "./compiled";
-const readTsConfig = (root) => {
+export const readTsConfig = (root) => {
   return readTsConfigByFile(path.resolve(root, "./tsconfig.json"));
 };
-const readTsConfigByFile = (filename) => {
+export const readTsConfigByFile = (filename) => {
   const content = fs.readFileSync(path.resolve(filename), "utf-8");
   return json5.parse(content);
 };
-export {
-  readTsConfig,
-  readTsConfigByFile
-};

package/dist/esm/removeSlash.js

@@ -1,8 +1,3 @@
-const removeLeadingSlash = (s) => s.replace(/^\/+/, "");
-const removeTailSlash = (s) => s.replace(/\/+$/, "");
-const removeSlash = (s) => removeLeadingSlash(removeTailSlash(s));
-export {
-  removeLeadingSlash,
-  removeSlash,
-  removeTailSlash
-};
+export const removeLeadingSlash = (s) => s.replace(/^\/+/, "");
+export const removeTailSlash = (s) => s.replace(/\/+$/, "");
+export const removeSlash = (s) => removeLeadingSlash(removeTailSlash(s));

package/dist/esm/resolve.js

@@ -1,8 +1,12 @@
 import { ensureArray } from "./ensureArray";
-const tryResolve = (name, resolvePath) => {
+export const tryResolve = (name, resolvePath) => {
   let filePath = "";
   try {
-    filePath = require.resolve(name, { paths: [resolvePath] });
+    filePath = require.resolve(name, {
+      paths: [
+        resolvePath
+      ]
+    });
     delete require.cache[filePath];
   } catch (err) {
     if (err.code === "MODULE_NOT_FOUND") {
@@ -12,18 +16,22 @@ const tryResolve = (name, resolvePath) => {
   }
   return filePath;
 };
-const isPackageInstalled = (name, resolvePaths) => {
+export const isPackageInstalled = (name, resolvePaths) => {
   try {
-    require.resolve(name, { paths: ensureArray(resolvePaths) });
+    require.resolve(name, {
+      paths: ensureArray(resolvePaths)
+    });
     return true;
   } catch (err) {
     return false;
   }
 };
-const getAntdMajorVersion = (appDirectory) => {
+export const getAntdMajorVersion = (appDirectory) => {
   try {
     const pkgJsonPath = require.resolve("antd/package.json", {
-      paths: [appDirectory]
+      paths: [
+        appDirectory
+      ]
     });
     const { version } = require(pkgJsonPath);
     return Number(version.split(".")[0]);
@@ -31,8 +39,3 @@ const getAntdMajorVersion = (appDirectory) => {
     return null;
   }
 };
-export {
-  getAntdMajorVersion,
-  isPackageInstalled,
-  tryResolve
-};

package/dist/esm/routes.js

@@ -1,14 +1,12 @@
 import path from "path";
 import { normalizeToPosixPath } from "./path";
 import { MAIN_ENTRY_NAME } from "./constants";
-const getPathWithoutExt = (filename) => {
+export const getPathWithoutExt = (filename) => {
   const extname = path.extname(filename);
   return filename.slice(0, -extname.length);
 };
-const getRouteId = (componentPath, routesDir, entryName) => {
-  const relativePath = normalizeToPosixPath(
-    path.relative(routesDir, componentPath)
-  );
+export const getRouteId = (componentPath, routesDir, entryName) => {
+  const relativePath = normalizeToPosixPath(path.relative(routesDir, componentPath));
   const pathWithoutExt = getPathWithoutExt(relativePath);
   let id = ``;
   if (entryName === MAIN_ENTRY_NAME) {
@@ -16,9 +14,5 @@ const getRouteId = (componentPath, routesDir, entryName) => {
   } else {
     id = `${entryName}_${pathWithoutExt}`;
   }
-  return id;
-};
-export {
-  getPathWithoutExt,
-  getRouteId
+  return id.replace(/\[(.*?)\]/g, "($1)");
 };

package/dist/esm/runtime/parsed.js

@@ -1,8 +1,8 @@
-const parsedJSONFromElement = (id) => {
+export const parsedJSONFromElement = (id) => {
   const element = document.getElementById(id);
   if (element) {
     try {
-      const parsed = JSON.parse(element.textContent || "");
+      const parsed = JSON.parse((element === null || element === void 0 ? void 0 : element.textContent) || "");
       return parsed;
     } catch (e) {
       console.error(`parse ${id} error`, e);
@@ -11,6 +11,3 @@ const parsedJSONFromElement = (id) => {
   }
   return void 0;
 };
-export {
-  parsedJSONFromElement
-};

package/dist/esm/runtimeExports.js

@@ -14,27 +14,22 @@ const memo = (fn) => {
     return res;
   };
 };
-const createRuntimeExportsUtils = memo(
-  (pwd = "", namespace = "index") => {
-    const entryExportFile = path.join(pwd, `.runtime-exports/${namespace}.js`);
-    const addExport = (statement) => {
-      statement = normalizeOutputPath(statement);
-      try {
-        fs.ensureFileSync(entryExportFile);
-        if (!fs.readFileSync(entryExportFile, "utf8").includes(statement)) {
-          fs.appendFileSync(entryExportFile, `${statement}
+export const createRuntimeExportsUtils = memo((pwd = "", namespace = "index") => {
+  const entryExportFile = path.join(pwd, `.runtime-exports/${namespace}.js`);
+  const addExport = (statement) => {
+    statement = normalizeOutputPath(statement);
+    try {
+      fs.ensureFileSync(entryExportFile);
+      if (!fs.readFileSync(entryExportFile, "utf8").includes(statement)) {
+        fs.appendFileSync(entryExportFile, `${statement}
 `);
-        }
-      } catch {
       }
-    };
-    const getPath = () => entryExportFile;
-    return {
-      addExport,
-      getPath
-    };
-  }
-);
-export {
-  createRuntimeExportsUtils
-};
+    } catch {
+    }
+  };
+  const getPath = () => entryExportFile;
+  return {
+    addExport,
+    getPath
+  };
+});

package/dist/esm/ssr.js

@@ -1,6 +1,3 @@
 import { createStorage } from "./storage";
 const { run, useContext: useHeaders } = createStorage();
-export {
-  run,
-  useHeaders
-};
+export { run, useHeaders };

package/dist/esm/storage.js

@@ -26,9 +26,7 @@ const createStorage = () => {
     }
     const context = storage.getStore();
     if (!context) {
-      throw new Error(
-        `Can't call useContext out of scope, make sure @modern-js/utils is a single version in node_modules`
-      );
+      throw new Error(`Can't call useContext out of scope, make sure @modern-js/utils is a single version in node_modules`);
     }
     return context;
   };
@@ -37,6 +35,4 @@ const createStorage = () => {
     useContext
   };
 };
-export {
-  createStorage
-};
+export { createStorage };

package/dist/esm/testUtils.js

@@ -1,15 +1,9 @@
-const initSnapshotSerializer = (root) => {
+export const initSnapshotSerializer = (root) => {
   expect.addSnapshotSerializer({
     test: (val) => typeof val === "string" && (val.includes("modern.js") || val.includes("node_modules") || val.includes(root)),
     print: (val) => (
       // eslint-disable-next-line no-nested-ternary
-      typeof val === "string" ? (
-        // eslint-disable-next-line no-nested-ternary
-        val.includes("node_modules") ? `"${val.replace(/.+node_modules/, ``).replace(/\\/g, "/")}"` : val.includes("modern.js") ? `"${val.replace(/.+modern\.js/, ``).replace(/\\/g, "/")}"` : `"${val.replace(root, "").replace(/\\/g, "/")}"`
-      ) : val
+      typeof val === "string" ? val.includes("node_modules") ? `"${val.replace(/.+node_modules/, ``).replace(/\\/g, "/")}"` : val.includes("modern.js") ? `"${val.replace(/.+modern\.js/, ``).replace(/\\/g, "/")}"` : `"${val.replace(root, "").replace(/\\/g, "/")}"` : val
     )
   });
 };
-export {
-  initSnapshotSerializer
-};

package/dist/esm/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/universal/constants.js

@@ -1,6 +1,2 @@
-const ROUTE_MANIFEST = `_MODERNJS_ROUTE_MANIFEST`;
-const HMR_SOCK_PATH = "/webpack-hmr";
-export {
-  HMR_SOCK_PATH,
-  ROUTE_MANIFEST
-};
+export const ROUTE_MANIFEST = `_MODERNJS_ROUTE_MANIFEST`;
+export const HMR_SOCK_PATH = "/webpack-hmr";

package/dist/esm/universal/formatWebpack.js

@@ -20,9 +20,7 @@ ${stats.stack}` : "";
   }
   lines = message.split("\n");
   lines = lines.map((line) => {
-    const parsingError = /Line (\d+):(?:(\d+):)?\s*Parsing error: (.+)$/.exec(
-      line
-    );
+    const parsingError = /Line (\d+):(?:(\d+):)?\s*Parsing error: (.+)$/.exec(line);
     if (!parsingError) {
       return line;
     }
@@ -30,11 +28,8 @@ ${stats.stack}` : "";
     return `${friendlySyntaxErrorLabel} ${errorMessage} (${errorLine}:${errorColumn})`;
   });
   message = lines.join("\n");
-  message = message.replace(
-    /SyntaxError\s+\((\d+):(\d+)\)\s*(.+?)\n/g,
-    `${friendlySyntaxErrorLabel} $3 ($1:$2)
-`
-  );
+  message = message.replace(/SyntaxError\s+\((\d+):(\d+)\)\s*(.+?)\n/g, `${friendlySyntaxErrorLabel} $3 ($1:$2)
+`);
   lines = message.split("\n");
   if (lines.length > 2 && lines[1].trim() === "") {
     lines.splice(1, 1);
@@ -44,27 +39,22 @@ ${stats.stack}` : "";
     lines[1] = lines[1].replace("Error: ", "");
   }
   message = lines.join("\n");
-  message = message.replace(
-    /^\s*at\s((?!webpack:).)*:\d+:\d+[\s)]*(\n|$)/gm,
-    ""
-  );
+  message = message.replace(/^\s*at\s((?!webpack:).)*:\d+:\d+[\s)]*(\n|$)/gm, "");
   message = message.replace(/^\s*at\s<anonymous>(\n|$)/gm, "");
   lines = message.split("\n");
-  lines = lines.filter(
-    (line, index, arr) => index === 0 || line.trim() !== "" || line.trim() !== arr[index - 1].trim()
-  );
+  lines = lines.filter((line, index, arr) => index === 0 || line.trim() !== "" || line.trim() !== arr[index - 1].trim());
   message = lines.join("\n");
   return message.trim();
 }
 function formatWebpackMessages(json) {
-  var _a, _b, _c;
-  const formattedErrors = (_a = json == null ? void 0 : json.errors) == null ? void 0 : _a.map(formatMessage);
-  const formattedWarnings = (_b = json == null ? void 0 : json.warnings) == null ? void 0 : _b.map(formatMessage);
+  var _json_errors, _json_warnings, _result_errors;
+  const formattedErrors = json === null || json === void 0 ? void 0 : (_json_errors = json.errors) === null || _json_errors === void 0 ? void 0 : _json_errors.map(formatMessage);
+  const formattedWarnings = json === null || json === void 0 ? void 0 : (_json_warnings = json.warnings) === null || _json_warnings === void 0 ? void 0 : _json_warnings.map(formatMessage);
   const result = {
     errors: formattedErrors || [],
     warnings: formattedWarnings || []
   };
-  if ((_c = result.errors) == null ? void 0 : _c.some(isLikelyASyntaxError)) {
+  if ((_result_errors = result.errors) === null || _result_errors === void 0 ? void 0 : _result_errors.some(isLikelyASyntaxError)) {
     result.errors = result.errors.filter(isLikelyASyntaxError);
   }
   if (result.errors.length > 1) {
@@ -72,6 +62,4 @@ function formatWebpackMessages(json) {
   }
   return result;
 }
-export {
-  formatWebpackMessages
-};
+export { formatWebpackMessages };