@modern-js/utils 2.4.1-beta.0 → 2.5.0-alpha.0

package/dist/logger.d.ts

@@ -1,65 +1,65 @@
 import { Color } from '../compiled/chalk';
-type LogLevel = 'debug' | 'info' | 'warn' | 'error';
-type LogMsg = number | string | Error | null;
+declare type LogLevel = 'debug' | 'info' | 'warn' | 'error';
+declare type LogMsg = number | string | Error | null;
 interface LoggerConfiguration {
-    color?: typeof Color;
-    label?: string;
-    level?: LogLevel;
+  color?: typeof Color;
+  label?: string;
+  level?: LogLevel;
 }
 interface InstanceConfiguration {
-    displayLabel?: boolean;
-    uppercaseLabel?: boolean;
+  displayLabel?: boolean;
+  uppercaseLabel?: boolean;
 }
 interface ConstructorOptions {
-    config?: InstanceConfiguration;
-    level?: string;
-    types?: Record<string, LoggerConfiguration>;
+  config?: InstanceConfiguration;
+  level?: string;
+  types?: Record<string, LoggerConfiguration>;
 }
-type LoggerFunction = (message?: LogMsg, ...args: any[]) => void;
+declare type LoggerFunction = (message?: LogMsg, ...args: any[]) => void;
 declare const LOG_TYPES: {
-    error: {
-        color: string;
-        label: string;
-        level: string;
-    };
-    info: {
-        color: string;
-        label: string;
-        level: string;
-    };
-    success: {
-        color: string;
-        label: string;
-        level: string;
-    };
-    warn: {
-        color: string;
-        label: string;
-        level: string;
-    };
-    debug: {
-        color: string;
-        label: string;
-        level: string;
-    };
-    log: {
-        level: string;
-    };
+  error: {
+    color: string;
+    label: string;
+    level: string;
+  };
+  info: {
+    color: string;
+    label: string;
+    level: string;
+  };
+  success: {
+    color: string;
+    label: string;
+    level: string;
+  };
+  warn: {
+    color: string;
+    label: string;
+    level: string;
+  };
+  debug: {
+    color: string;
+    label: string;
+    level: string;
+  };
+  log: {
+    level: string;
+  };
 };
+
 declare class Logger {
-    private readonly level;
-    private readonly config;
-    private readonly types;
-    private readonly longestLabel;
-    [key: string]: any;
-    constructor(options?: ConstructorOptions);
-    private _log;
-    private getLongestLabel;
+  private readonly level;
+  private readonly config;
+  private readonly types;
+  private readonly longestLabel;
+  [key: string]: any;
+  constructor(options?: ConstructorOptions);
+  private _log;
+  private getLongestLabel;
 }
-type LoggerInterface = {
-    [key in keyof typeof LOG_TYPES]: LoggerFunction;
-};
+
+declare type LoggerInterface = { [key in keyof typeof LOG_TYPES]: LoggerFunction };
 declare const logger: Logger & LoggerInterface;
 export { Logger };
 export { logger };
-export type { LoggerInterface };
+export type { LoggerInterface };

package/dist/logger.js

@@ -1,109 +1,141 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = exports.Logger = void 0;
-const chalk_1 = __importDefault(require("../compiled/chalk"));
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var logger_exports = {};
+__export(logger_exports, {
+  Logger: () => Logger,
+  logger: () => logger
+});
+module.exports = __toCommonJS(logger_exports);
+var import_chalk = __toESM(require("../compiled/chalk"));
 const LOG_LEVEL = {
-    error: 0,
-    warn: 1,
-    info: 2,
-    debug: 3,
-    log: 4,
+  error: 0,
+  warn: 1,
+  info: 2,
+  debug: 3,
+  log: 4
 };
 const LOG_TYPES = {
-    error: {
-        color: 'red',
-        label: 'error',
-        level: 'error',
-    },
-    info: {
-        color: 'cyan',
-        label: 'info',
-        level: 'info',
-    },
-    success: {
-        color: 'green',
-        label: 'Success',
-        level: 'info',
-    },
-    warn: {
-        color: 'yellow',
-        label: 'warn',
-        level: 'warn',
-    },
-    debug: {
-        color: 'red',
-        label: 'debug',
-        level: 'debug',
-    },
-    log: { level: 'log' },
+  error: {
+    color: "red",
+    label: "error",
+    level: "error"
+  },
+  info: {
+    color: "cyan",
+    label: "info",
+    level: "info"
+  },
+  success: {
+    color: "green",
+    label: "Success",
+    level: "info"
+  },
+  warn: {
+    color: "yellow",
+    label: "warn",
+    level: "warn"
+  },
+  debug: {
+    color: "red",
+    label: "debug",
+    level: "debug"
+  },
+  log: { level: "log" }
 };
 const DEFAULT_CONFIG = {
-    displayLabel: true,
-    uppercaseLabel: false,
+  displayLabel: true,
+  uppercaseLabel: false
 };
 class Logger {
-    constructor(options = {}) {
-        this.level = options.level || LOG_TYPES.log.level;
-        this.config = { ...DEFAULT_CONFIG, ...(options.config || {}) };
-        this.types = {
-            ...LOG_TYPES,
-            ...(options.types || {}),
-        };
-        this.longestLabel = this.getLongestLabel();
-        Object.keys(this.types).forEach(type => {
-            this[type] = this._log.bind(this, type);
-        });
+  constructor(options = {}) {
+    this.level = options.level || LOG_TYPES.log.level;
+    this.config = __spreadValues(__spreadValues({}, DEFAULT_CONFIG), options.config || {});
+    this.types = __spreadValues(__spreadValues({}, LOG_TYPES), options.types || {});
+    this.longestLabel = this.getLongestLabel();
+    Object.keys(this.types).forEach((type) => {
+      this[type] = this._log.bind(this, type);
+    });
+  }
+  _log(type, message, ...args) {
+    if (message === void 0 || message === null) {
+      console.log();
+      return;
+    }
+    if (LOG_LEVEL[type] > LOG_LEVEL[this.level]) {
+      return;
     }
-    _log(type, message, ...args) {
-        if (message === undefined || message === null) {
-            // eslint-disable-next-line no-console
-            console.log();
-            return;
-        }
-        if (LOG_LEVEL[type] > LOG_LEVEL[this.level]) {
-            return;
-        }
-        let label = '';
-        let text = '';
-        const logType = this.types[type];
-        if (this.config.displayLabel && logType.label) {
-            label = this.config.uppercaseLabel
-                ? logType.label.toUpperCase()
-                : logType.label;
-            label = label.padEnd(this.longestLabel.length);
-            label = chalk_1.default.bold(logType.color ? chalk_1.default[logType.color](label) : label);
-        }
-        if (message instanceof Error) {
-            if (message.stack) {
-                const [name, ...rest] = message.stack.split('\n');
-                text = `${name}\n${chalk_1.default.grey(rest.join('\n'))}`;
-            }
-            else {
-                text = message.message;
-            }
-        }
-        else {
-            text = `${message}`;
-        }
-        const log = label.length > 0 ? `${label} ${text}` : text;
-        // eslint-disable-next-line no-console
-        console.log(log, ...args);
+    let label = "";
+    let text = "";
+    const logType = this.types[type];
+    if (this.config.displayLabel && logType.label) {
+      label = this.config.uppercaseLabel ? logType.label.toUpperCase() : logType.label;
+      label = label.padEnd(this.longestLabel.length);
+      label = import_chalk.default.bold(logType.color ? import_chalk.default[logType.color](label) : label);
     }
-    getLongestLabel() {
-        let longestLabel = '';
-        Object.keys(this.types).forEach(type => {
-            const { label = '' } = this.types[type];
-            if (label.length > longestLabel.length) {
-                longestLabel = label;
-            }
-        });
-        return longestLabel;
+    if (message instanceof Error) {
+      if (message.stack) {
+        const [name, ...rest] = message.stack.split("\n");
+        text = `${name}
+${import_chalk.default.grey(rest.join("\n"))}`;
+      } else {
+        text = message.message;
+      }
+    } else {
+      text = `${message}`;
     }
+    const log = label.length > 0 ? `${label} ${text}` : text;
+    console.log(log, ...args);
+  }
+  getLongestLabel() {
+    let longestLabel = "";
+    Object.keys(this.types).forEach((type) => {
+      const { label = "" } = this.types[type];
+      if (label.length > longestLabel.length) {
+        longestLabel = label;
+      }
+    });
+    return longestLabel;
+  }
 }
-exports.Logger = Logger;
 const logger = new Logger();
-exports.logger = logger;
 logger.Logger = Logger;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Logger,
+  logger
+});

package/dist/monorepo.d.ts

@@ -6,6 +6,6 @@ export declare const isMonorepo: (root: string) => boolean;
 export declare const isModernjsMonorepo: (root: string) => boolean;
 export declare const findMonorepoRoot: (appDirectory: string, maxDepth?: number) => string | undefined;
 export declare const getMonorepoPackages: (root: string) => {
-    name: string;
-    path: string;
-}[];
+  name: string;
+  path: string;
+}[];

package/dist/monorepo.js

@@ -1,87 +1,130 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMonorepoPackages = exports.findMonorepoRoot = exports.isModernjsMonorepo = exports.isMonorepo = exports.isPnpmWorkspaces = exports.isYarnWorkspaces = exports.isLerna = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const compiled_1 = require("./compiled");
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var monorepo_exports = {};
+__export(monorepo_exports, {
+  findMonorepoRoot: () => findMonorepoRoot,
+  getMonorepoPackages: () => getMonorepoPackages,
+  isLerna: () => isLerna,
+  isModernjsMonorepo: () => isModernjsMonorepo,
+  isMonorepo: () => isMonorepo,
+  isPnpmWorkspaces: () => isPnpmWorkspaces,
+  isYarnWorkspaces: () => isYarnWorkspaces
+});
+module.exports = __toCommonJS(monorepo_exports);
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
+var import_compiled = require("./compiled");
 const PACKAGE_MAX_DEPTH = 5;
 const WORKSPACE_FILES = {
-    YARN: 'package.json',
-    PNPM: 'pnpm-workspace.yaml',
-    LERNA: 'lerna.json',
+  YARN: "package.json",
+  PNPM: "pnpm-workspace.yaml",
+  LERNA: "lerna.json"
 };
-const isLerna = (root) => fs_1.default.existsSync(path_1.default.join(root, WORKSPACE_FILES.LERNA));
-exports.isLerna = isLerna;
+const isLerna = (root) => import_fs.default.existsSync(import_path.default.join(root, WORKSPACE_FILES.LERNA));
 const isYarnWorkspaces = (root) => {
-    var _a;
-    const pkg = path_1.default.join(root, WORKSPACE_FILES.YARN);
-    if (!fs_1.default.existsSync(pkg)) {
-        return false;
-    }
-    const json = JSON.parse(fs_1.default.readFileSync(pkg, 'utf8'));
-    return Boolean((_a = json.workspaces) === null || _a === void 0 ? void 0 : _a.packages);
+  var _a;
+  const pkg = import_path.default.join(root, WORKSPACE_FILES.YARN);
+  if (!import_fs.default.existsSync(pkg)) {
+    return false;
+  }
+  const json = JSON.parse(import_fs.default.readFileSync(pkg, "utf8"));
+  return Boolean((_a = json.workspaces) == null ? void 0 : _a.packages);
 };
-exports.isYarnWorkspaces = isYarnWorkspaces;
-const isPnpmWorkspaces = (root) => fs_1.default.existsSync(path_1.default.join(root, WORKSPACE_FILES.PNPM));
-exports.isPnpmWorkspaces = isPnpmWorkspaces;
-const isMonorepo = (root) => (0, exports.isLerna)(root) || (0, exports.isYarnWorkspaces)(root) || (0, exports.isPnpmWorkspaces)(root);
-exports.isMonorepo = isMonorepo;
+const isPnpmWorkspaces = (root) => import_fs.default.existsSync(import_path.default.join(root, WORKSPACE_FILES.PNPM));
+const isMonorepo = (root) => isLerna(root) || isYarnWorkspaces(root) || isPnpmWorkspaces(root);
 const isModernjsMonorepo = (root) => {
-    const pkgJsonPath = path_1.default.join(root, 'package.json');
-    if (!fs_1.default.existsSync(pkgJsonPath)) {
-        return false;
-    }
-    const json = JSON.parse(fs_1.default.readFileSync(pkgJsonPath, 'utf8'));
-    const deps = {
-        ...(json.dependencies || {}),
-        ...(json.devDependencies || {}),
-    };
-    return Boolean(deps['@modern-js/monorepo-tools']);
+  const pkgJsonPath = import_path.default.join(root, "package.json");
+  if (!import_fs.default.existsSync(pkgJsonPath)) {
+    return false;
+  }
+  const json = JSON.parse(import_fs.default.readFileSync(pkgJsonPath, "utf8"));
+  const deps = __spreadValues(__spreadValues({}, json.dependencies || {}), json.devDependencies || {});
+  return Boolean(deps["@modern-js/monorepo-tools"]);
 };
-exports.isModernjsMonorepo = isModernjsMonorepo;
 const findMonorepoRoot = (appDirectory, maxDepth = PACKAGE_MAX_DEPTH) => {
-    let inMonorepo = false;
-    for (let depth = 0; depth < maxDepth; depth++) {
-        if ((0, exports.isMonorepo)(appDirectory)) {
-            inMonorepo = true;
-            break;
-        }
-        // eslint-disable-next-line no-param-reassign
-        appDirectory = path_1.default.dirname(appDirectory);
+  let inMonorepo = false;
+  for (let depth = 0; depth < maxDepth; depth++) {
+    if (isMonorepo(appDirectory)) {
+      inMonorepo = true;
+      break;
     }
-    return inMonorepo ? appDirectory : undefined;
+    appDirectory = import_path.default.dirname(appDirectory);
+  }
+  return inMonorepo ? appDirectory : void 0;
 };
-exports.findMonorepoRoot = findMonorepoRoot;
 const getMonorepoPackages = (root) => {
-    let packages = [];
-    if ((0, exports.isYarnWorkspaces)(root)) {
-        const json = JSON.parse(fs_1.default.readFileSync(path_1.default.join(root, 'package.json'), 'utf8'));
-        ({ packages } = json.workspaces);
-    }
-    else if ((0, exports.isLerna)(root)) {
-        const json = JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(root, 'lerna.json'), 'utf8'));
-        ({ packages } = json);
-    }
-    else {
-        ({ packages } = compiled_1.yaml.load(fs_1.default.readFileSync(path_1.default.join(root, WORKSPACE_FILES.PNPM), 'utf8')));
-    }
-    if (packages) {
-        return packages
-            .map(name => 
-        // The trailing / ensures only dirs are picked up
-        compiled_1.glob.sync(path_1.default.join(root, `${name}/`), {
-            ignore: ['**/node_modules/**'],
-        }))
-            .reduce((acc, val) => acc.concat(val), [])
-            .filter(filepath => fs_1.default.existsSync(path_1.default.resolve(filepath, 'package.json')))
-            .map(filepath => ({
-            path: filepath,
-            name: JSON.parse(fs_1.default.readFileSync(path_1.default.resolve(filepath, 'package.json'), 'utf8')).name,
-        }));
-    }
-    return [];
+  let packages = [];
+  if (isYarnWorkspaces(root)) {
+    const json = JSON.parse(
+      import_fs.default.readFileSync(import_path.default.join(root, "package.json"), "utf8")
+    );
+    ({ packages } = json.workspaces);
+  } else if (isLerna(root)) {
+    const json = JSON.parse(
+      import_fs.default.readFileSync(import_path.default.resolve(root, "lerna.json"), "utf8")
+    );
+    ({ packages } = json);
+  } else {
+    ({ packages } = import_compiled.yaml.load(
+      import_fs.default.readFileSync(import_path.default.join(root, WORKSPACE_FILES.PNPM), "utf8")
+    ));
+  }
+  if (packages) {
+    return packages.map(
+      (name) => import_compiled.glob.sync(import_path.default.join(root, `${name}/`), {
+        ignore: ["**/node_modules/**"]
+      })
+    ).reduce((acc, val) => acc.concat(val), []).filter((filepath) => import_fs.default.existsSync(import_path.default.resolve(filepath, "package.json"))).map((filepath) => ({
+      path: filepath,
+      name: JSON.parse(
+        import_fs.default.readFileSync(import_path.default.resolve(filepath, "package.json"), "utf8")
+      ).name
+    }));
+  }
+  return [];
 };
-exports.getMonorepoPackages = getMonorepoPackages;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  findMonorepoRoot,
+  getMonorepoPackages,
+  isLerna,
+  isModernjsMonorepo,
+  isMonorepo,
+  isPnpmWorkspaces,
+  isYarnWorkspaces
+});

package/dist/nestedRoutes.d.ts

@@ -0,0 +1,9 @@
+/**
+ * runtime utils for nested routes generating
+ */
+import type { NestedRoute } from '@modern-js/types';
+export declare const transformNestedRoutes: (routes: NestedRoute[]) => import("react-router-dom").RouteObject[];
+export declare const renderNestedRoute: (nestedRoute: NestedRoute, options?: {
+  parent?: NestedRoute;
+  DeferredDataComponent?: () => JSX.Element;
+}) => JSX.Element;