@modern-js/utils 1.3.4 → 1.3.7-alpha.prebundle.0

package/package.json

@@ -11,72 +11,87 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.4",
+  "version": "1.3.7-alpha.prebundle.0",
   "jsnext:source": "./src/index.ts",
-  "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "types": "./dist/index.d.ts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "jsnext:modern": "./dist/index.js",
   "exports": {
     ".": {
-      "node": {
-        "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
-      },
-      "default": "./dist/js/treeshaking/index.js"
+      "jsnext:source": "./src/index.ts",
+      "default": "./dist/index.js"
     },
     "./format": {
       "jsnext:source": "./src/format.ts",
-      "default": "./dist/js/treeshaking/format.js"
+      "default": "./dist/format.js"
     },
     "./constants": {
       "jsnext:source": "./src/constants.ts",
-      "default": "./dist/js/treeshaking/constants.js"
+      "default": "./dist/constants.js"
+    },
+    "./lodash": {
+      "jsnext:source": "./compiled/lodash/index.js",
+      "default": "./compiled/lodash/index.js"
+    },
+    "./strip-ansi": {
+      "jsnext:source": "./compiled/strip-ansi/index.js",
+      "default": "./compiled/strip-ansi/index.js"
     }
   },
   "typesVersions": {
     "*": {
       "format": [
-        "./dist/types/format.d.ts"
+        "./dist/format.d.ts"
       ],
       "constants": [
-        "./dist/types/constants.d.ts"
+        "./dist/constants.d.ts"
+      ],
+      "lodash": [
+        "./compiled/lodash/index.d.ts"
+      ],
+      "strip-ansi": [
+        "./compiled/strip-ansi/index.d.ts"
       ]
     }
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@types/fs-extra": "^9.0.12",
-    "browserslist": "^4.16.7",
-    "chalk": "^4.1.2",
-    "chokidar": "^3.5.2",
-    "debug": "^4.3.2",
-    "filesize": "^7.0.0",
-    "fs-extra": "^10.0.0",
-    "glob": "^7.1.7",
-    "gzip-size": "^6.0.0",
-    "import-lazy": "^4.0.0",
-    "pkg-up": "^3.1.0",
-    "recursive-readdir": "^2.2.2",
-    "strip-ansi": "6.0.0",
-    "upath": "^2.0.1",
-    "yaml": "^1.10.2",
-    "execa": "5",
     "typescript": "^4"
   },
   "devDependencies": {
-    "@types/debug": "^4.1.7",
-    "@types/fs-extra": "^9.0.12",
+    "@modern-js/types": "^1.3.6",
+    "@scripts/build": "0.0.0",
+    "@scripts/jest-config": "0.0.0",
+    "@types/debug": "4.1.7",
+    "@types/fs-extra": "9.0.13",
     "@types/glob": "^7.1.4",
     "@types/jest": "^26",
+    "@types/js-yaml": "4.0.5",
+    "@types/lodash": "4.14.181",
     "@types/node": "^14",
-    "@types/recursive-readdir": "^2.2.0",
-    "webpack": "^5.54.0",
-    "@scripts/build": "0.0.0",
+    "@types/recursive-readdir": "2.2.0",
+    "@types/signale": "1.4.4",
+    "browserslist": "4.20.2",
+    "chalk": "4.1.2",
+    "chokidar": "3.5.3",
+    "commander": "8.3.0",
+    "debug": "4.3.4",
+    "execa": "5.1.1",
+    "filesize": "8.0.7",
+    "fs-extra": "10.0.1",
+    "glob": "7.2.0",
+    "gzip-size": "6.0.0",
+    "import-lazy": "4.0.0",
     "jest": "^27",
-    "@scripts/jest-config": "0.0.0",
-    "@modern-js/types": "^1.3.4"
+    "js-yaml": "4.1.0",
+    "lodash": "4.17.21",
+    "pkg-up": "3.1.0",
+    "recursive-readdir": "2.2.2",
+    "signale": "1.4.0",
+    "strip-ansi": "6.0.1",
+    "upath": "2.0.1",
+    "webpack": "^5.71.0"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -85,7 +100,8 @@
   },
   "scripts": {
     "new": "modern new",
-    "build": "modern build",
+    "dev": "tsc --watch",
+    "build": "tsc",
     "test": "jest --passWithNoTests"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"

package/tests/debug.test.ts

@@ -1,5 +1,5 @@
-import debug from 'debug';
-import stripAnsi from 'strip-ansi';
+import { debug } from '../src/compiled';
+import { stripAnsi } from '../src';
 import { createDebugger } from '../src/debug';
 
 describe('debug utility', () => {

package/tests/is.test.ts

@@ -0,0 +1,27 @@
+import { isEmpty, isFastRefresh } from '../src/is';
+
+describe('validate', () => {
+  it('should validate empty object correctly', () => {
+    expect(isEmpty({})).toBeTruthy();
+    expect(isEmpty({ foo: 'bar' })).toBeFalsy();
+  });
+
+  it('should validate fast refresh correctly', () => {
+    const { NODE_ENV, FAST_REFRESH } = process.env;
+
+    process.env.NODE_ENV = 'development';
+    process.env.FAST_REFRESH = 'true';
+    expect(isFastRefresh()).toBeTruthy();
+
+    process.env.NODE_ENV = 'production';
+    process.env.FAST_REFRESH = 'true';
+    expect(isFastRefresh()).toBeFalsy();
+
+    process.env.NODE_ENV = 'development';
+    process.env.FAST_REFRESH = 'false';
+    expect(isFastRefresh()).toBeFalsy();
+
+    process.env.NODE_ENV = NODE_ENV;
+    process.env.FAST_REFRESH = FAST_REFRESH;
+  });
+});

package/tests/isPlatform.test.ts

@@ -0,0 +1,19 @@
+import { isNodeJS, isBrowser } from '../src/is/platform';
+
+describe('validate platform', () => {
+  it('should validate Node.js correctly', () => {
+    expect(isNodeJS()).toBeTruthy();
+  });
+
+  it('should validate browser correctly', () => {
+    const windowSpy = jest.spyOn(window, 'window', 'get');
+
+    windowSpy.mockImplementation((): any => undefined);
+    expect(isBrowser()).toBeFalsy();
+
+    windowSpy.mockImplementation((): any => global);
+    expect(isBrowser()).toBeTruthy();
+
+    windowSpy.mockRestore();
+  });
+});

package/tests/isType.test.ts

@@ -1,4 +1,12 @@
-import { isString, isUndefined } from '../src/is/type';
+import {
+  isArray,
+  isObject,
+  isString,
+  isRegExp,
+  isPromise,
+  isUndefined,
+  isPlainObject,
+} from '../src/is/type';
 
 describe('validate type', () => {
   it('should validate string correctly', () => {
@@ -8,10 +16,70 @@ describe('validate type', () => {
     expect(isString(123)).toBeFalsy();
   });
 
-  it('should validate undeinfed correctly', () => {
+  it('should validate undefined correctly', () => {
     expect(isUndefined(undefined)).toBeTruthy();
     expect(isUndefined(null)).toBeFalsy();
     expect(isUndefined('')).toBeFalsy();
     expect(isUndefined(123)).toBeFalsy();
   });
+
+  it('should validate array correctly', () => {
+    expect(isArray(undefined)).toBeFalsy();
+    expect(isArray(null)).toBeFalsy();
+    expect(isArray('')).toBeFalsy();
+    expect(isArray(123)).toBeFalsy();
+    expect(isArray({})).toBeFalsy();
+    expect(isArray([])).toBeTruthy();
+  });
+
+  it('should validate object correctly', () => {
+    expect(isObject(1)).toBeFalsy();
+    expect(isObject('1')).toBeFalsy();
+    expect(isObject(undefined)).toBeFalsy();
+    expect(isObject(null)).toBeFalsy();
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    expect(isObject(() => {})).toBeFalsy();
+    expect(isObject({})).toBeTruthy();
+    expect(isObject([])).toBeTruthy();
+    expect(isObject(/foo/)).toBeTruthy();
+  });
+
+  it('should validate plain object correctly', () => {
+    expect(isPlainObject(1)).toBeFalsy();
+    expect(isPlainObject('1')).toBeFalsy();
+    expect(isPlainObject(undefined)).toBeFalsy();
+    expect(isPlainObject(null)).toBeFalsy();
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    expect(isPlainObject(() => {})).toBeFalsy();
+    expect(isPlainObject({})).toBeTruthy();
+    expect(isPlainObject([])).toBeFalsy();
+    expect(isPlainObject(/foo/)).toBeFalsy();
+  });
+
+  it('should validate RegExp correctly', () => {
+    expect(isRegExp(1)).toBeFalsy();
+    expect(isRegExp('1')).toBeFalsy();
+    expect(isRegExp(undefined)).toBeFalsy();
+    expect(isRegExp(null)).toBeFalsy();
+    expect(isRegExp({})).toBeFalsy();
+    expect(isRegExp([])).toBeFalsy();
+    expect(isRegExp(/foo/)).toBeTruthy();
+  });
+
+  it('should validate Promise correctly', () => {
+    expect(isPromise(1)).toBeFalsy();
+    expect(isPromise('1')).toBeFalsy();
+    expect(isPromise(undefined)).toBeFalsy();
+    expect(isPromise(null)).toBeFalsy();
+    expect(isPromise({})).toBeFalsy();
+    expect(isPromise([])).toBeFalsy();
+    expect(isPromise(/foo/)).toBeFalsy();
+    expect(
+      isPromise(
+        new Promise<void>(resolve => {
+          resolve();
+        }),
+      ),
+    ).toBeTruthy();
+  });
 });

package/tests/prettyInstructions.test.ts

@@ -57,7 +57,7 @@ jest.mock('os', () => {
   };
 });
 
-jest.mock('chalk', () => ({
+jest.mock('../compiled/chalk', () => ({
   __esModule: true,
   default: {
     bold: jest.fn(str => str),

package/tsconfig.json

@@ -1,12 +1,10 @@
 {
   "extends": "@modern-js/tsconfig/base",
   "compilerOptions": {
-    "declaration": false,
-    "allowJs": true,
-    "jsx": "preserve",
+    "declaration": true,
+    "outDir": "./dist",
     "baseUrl": "./",
-    "isolatedModules": true,
-    "paths": {}
+    "isolatedModules": true
   },
   "include": ["src"]
 }

package/dist/js/modern/FileSizeReporter.js

@@ -1,156 +0,0 @@
-/* eslint-disable eslint-comments/no-unlimited-disable */
-
-/* eslint-disable */
-
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file at
- * https://github.com/facebook/create-react-app/blob/master/LICENSE
- */
-// Modified by Chao Xu (xuchaobei)
-'use strict';
-
-import fs from 'fs';
-import path from 'path';
-import chalk from 'chalk';
-import filesize from 'filesize';
-import recursive from 'recursive-readdir';
-import stripAnsi from 'strip-ansi';
-import gzipSize from 'gzip-size';
-import { logger } from "./logger";
-
-function canReadAsset(asset) {
-  return /\.(js|css)$/.test(asset) && !/service-worker\.js/.test(asset) && !/precache-manifest\.[0-9a-f]+\.js/.test(asset);
-} // Prints a detailed summary of build files.
-
-
-function printFileSizesAfterBuild(webpackStats, previousSizeMap, buildFolder, maxBundleGzipSize, maxChunkGzipSize) {
-  var root = previousSizeMap.root;
-  var sizes = previousSizeMap.sizes;
-  var assets = (webpackStats.stats || [webpackStats]).map(stats => stats.toJson({
-    all: false,
-    assets: true
-  }).assets.filter(asset => canReadAsset(asset.name)).map(asset => {
-    var fileContents = fs.readFileSync(path.join(root, asset.name));
-    var size = fileContents.length;
-    var gzippedSize = gzipSize.sync(fileContents);
-    var [previousSize, previousGzipSize] = sizes[removeFileNameHash(root, asset.name)] || [];
-    var sizeDifference = getDifferenceLabel(size, previousSize);
-    var gzipSizeDifference = getDifferenceLabel(gzippedSize, previousGzipSize);
-    return {
-      folder: path.join(path.basename(buildFolder), path.dirname(asset.name)),
-      name: path.basename(asset.name),
-      gzippedSize: gzippedSize,
-      sizeLabel: filesize(size) + (sizeDifference ? ' (' + sizeDifference + ')' : ''),
-      gzipSizeLabel: filesize(gzippedSize) + (gzipSizeDifference ? ' (' + gzipSizeDifference + ')' : '')
-    };
-  })).reduce((single, all) => all.concat(single), []);
-  assets.sort((a, b) => b.size - a.size);
-  var longestSizeLabelLength = Math.max.apply(null, assets.map(a => stripAnsi(a.sizeLabel).length));
-  var longestFileNameLength = Math.max.apply(null, assets.map(a => stripAnsi(a.folder + path.sep + a.name).length));
-  printFileSizesHeader(longestFileNameLength, longestSizeLabelLength);
-  var suggestBundleSplitting = false;
-  assets.forEach(asset => {
-    var {
-      folder,
-      name,
-      sizeLabel,
-      gzipSizeLabel,
-      gzippedSize
-    } = asset;
-    var fileNameLength = stripAnsi(folder + path.sep + name).length;
-    var sizeLength = stripAnsi(sizeLabel).length;
-
-    if (sizeLength < longestSizeLabelLength) {
-      var rightPadding = ' '.repeat(longestSizeLabelLength - sizeLength);
-      sizeLabel += rightPadding;
-    }
-
-    var fileNameLabel = chalk.dim(asset.folder + path.sep) + chalk.cyan(asset.name);
-
-    if (fileNameLength < longestFileNameLength) {
-      var rightPadding = ' '.repeat(longestFileNameLength - fileNameLength);
-      fileNameLabel += rightPadding;
-    }
-
-    var isMainBundle = asset.name.indexOf('main.') === 0;
-    var maxRecommendedSize = isMainBundle ? maxBundleGzipSize : maxChunkGzipSize;
-    var isLarge = maxRecommendedSize && gzippedSize > maxRecommendedSize;
-
-    if (isLarge && path.extname(asset.name) === '.js') {
-      suggestBundleSplitting = true;
-    }
-
-    logger.log('  ' + fileNameLabel + '    ' + sizeLabel + '    ' + (isLarge ? chalk.yellow(gzipSizeLabel) : gzipSizeLabel));
-  });
-
-  if (suggestBundleSplitting) {
-    logger.log();
-    logger.warn('The bundle size is significantly larger than recommended.');
-  }
-}
-
-function printFileSizesHeader(longestFileNameLength, longestSizeLabelLength) {
-  const longestLengths = [longestFileNameLength, longestSizeLabelLength];
-  const headerRow = ['File', 'Size', 'Gzipped'].reduce((prev, cur, index) => {
-    const length = longestLengths[index];
-    let curLabel = cur;
-
-    if (length) {
-      curLabel = cur.length < length ? cur + ' '.repeat(length - cur.length) : cur;
-    }
-
-    return prev + curLabel + '    ';
-  }, '  ');
-  logger.log(chalk.bold(chalk.blue(headerRow)));
-}
-
-function removeFileNameHash(buildFolder, fileName) {
-  return fileName.replace(buildFolder, '').replace(/\\/g, '/').replace(/\/?(.*)(\.[0-9a-f]+)(\.chunk)?(\.js|\.css)/, (match, p1, p2, p3, p4) => p1 + p4);
-} // Input: 1024, 2048
-// Output: "(+1 KB)"
-
-
-function getDifferenceLabel(currentSize, previousSize) {
-  var FIFTY_KILOBYTES = 1024 * 50;
-  var difference = currentSize - previousSize;
-  var fileSize = !Number.isNaN(difference) ? filesize(difference) : 0;
-
-  if (difference >= FIFTY_KILOBYTES) {
-    return chalk.red('+' + fileSize);
-  } else if (difference < FIFTY_KILOBYTES && difference > 0) {
-    return chalk.yellow('+' + fileSize);
-  } else if (difference < 0) {
-    return chalk.green(fileSize);
-  } else {
-    return '';
-  }
-}
-
-function measureFileSizesBeforeBuild(buildFolder) {
-  return new Promise(resolve => {
-    recursive(buildFolder, (err, fileNames) => {
-      var sizes;
-
-      if (!err && fileNames) {
-        sizes = fileNames.filter(canReadAsset).reduce((memo, fileName) => {
-          var contents = fs.readFileSync(fileName);
-          var key = removeFileNameHash(buildFolder, fileName); // save both the original size and gzip size
-
-          memo[key] = [contents.length, gzipSize.sync(contents)];
-          return memo;
-        }, {});
-      }
-
-      resolve({
-        root: buildFolder,
-        sizes: sizes || {}
-      });
-    });
-  });
-}
-
-export { measureFileSizesBeforeBuild, printFileSizesAfterBuild };
-/* eslint-enable */

package/dist/js/modern/alias.js

@@ -1,74 +0,0 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import fs from 'fs';
-import path from 'path';
-import chalk from 'chalk';
-import { readTsConfigByFile } from "./readTsConfig";
-import { applyOptionsChain } from "./applyOptionsChain";
-export const validAlias = (modernConfig, {
-  tsconfigPath
-}) => {
-  const {
-    source: {
-      alias
-    }
-  } = modernConfig;
-
-  if (!alias) {
-    return null;
-  }
-
-  const isTsProject = fs.existsSync(tsconfigPath);
-
-  if (!isTsProject) {
-    return null;
-  }
-
-  const userAlias = getUserAlias(alias);
-
-  if (Object.keys(userAlias).length > 0) {
-    return chalk.red('Note: Please use `compilerOptions.paths` in "tsconfig.json" file replace `source.alias` config in "modern.config.js/ts" when project is typescript');
-  }
-
-  return null;
-};
-export const getAlias = (aliasOption, option) => {
-  const isTsProject = fs.existsSync(option.tsconfigPath);
-  let aliasConfig;
-
-  if (!isTsProject) {
-    aliasConfig = {
-      absoluteBaseUrl: option.appDirectory,
-      paths: applyOptionsChain({
-        '@': ['./src']
-      }, aliasOption),
-      isTsPath: false,
-      isTsProject
-    };
-  } else {
-    var _tsconfig$compilerOpt, _tsconfig$compilerOpt2;
-
-    const tsconfig = readTsConfigByFile(option.tsconfigPath);
-    const baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt === void 0 ? void 0 : _tsconfig$compilerOpt.baseUrl;
-    aliasConfig = {
-      absoluteBaseUrl: baseUrl ? path.join(option.appDirectory, baseUrl) : option.appDirectory,
-      paths: _objectSpread(_objectSpread({}, aliasOption || {}), tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig$compilerOpt2 = tsconfig.compilerOptions) === null || _tsconfig$compilerOpt2 === void 0 ? void 0 : _tsconfig$compilerOpt2.paths),
-      isTsPath: true,
-      isTsProject
-    };
-  }
-
-  return aliasConfig;
-}; // filter invalid ts paths that are not array
-
-export const getUserAlias = (alias = {}) => Object.keys(alias).reduce((o, k) => {
-  if (Array.isArray(alias[k])) {
-    o[k] = alias[k];
-  }
-
-  return o;
-}, {});

package/dist/js/modern/applyOptionsChain.js

@@ -1,27 +0,0 @@
-// eslint-disable-next-line import/no-useless-path-segments
-import { isFunction, logger, isPlainObject } from "./index";
-export const applyOptionsChain = (defaults, options, utils, mergeFn = Object.assign) => {
-  if (!options) {
-    return defaults;
-  }
-
-  if (isPlainObject(options)) {
-    return mergeFn(defaults, options);
-  } else if (isFunction(options)) {
-    const ret = options(defaults, utils);
-
-    if (ret) {
-      if (!isPlainObject(ret)) {
-        logger.warn(`${options.name}: Function should mutate the config and return nothing, Or return a cloned or merged version of config object.`);
-      }
-
-      return ret;
-    }
-  } else if (Array.isArray(options)) {
-    return options.reduce((memo, cur) => applyOptionsChain(memo, cur, utils, mergeFn), defaults);
-  } else {
-    throw new Error(`applyOptionsChain error:\ndefault options is: ${JSON.stringify(defaults)}`);
-  }
-
-  return defaults;
-};

package/dist/js/modern/chalk.js

@@ -1,2 +0,0 @@
-import chalk from 'chalk';
-export { chalk };

package/dist/js/modern/clearConsole.js

@@ -1,5 +0,0 @@
-export const clearConsole = () => {
-  if (process.stdout.isTTY && !process.env.DEBUG) {
-    process.stdout.write('\x1B[H\x1B[2J');
-  }
-};

package/dist/js/modern/compatRequire.js

@@ -1,26 +0,0 @@
-import { findExists } from "./findExists";
-/**
- * Require function compatible with esm and cjs module.
- * @param filePath - File to required.
- * @returns module export object.
- */
-
-export const compatRequire = filePath => {
-  const mod = require(filePath);
-
-  return mod !== null && mod !== void 0 && mod.__esModule ? mod.default : mod;
-};
-export const requireExistModule = (filename, extensions = ['.ts', '.js']) => {
-  const exist = findExists(extensions.map(ext => `${filename}${ext}`));
-
-  if (!exist) {
-    return null;
-  }
-
-  return compatRequire(exist);
-};
-export const cleanRequireCache = filelist => {
-  filelist.forEach(filepath => {
-    delete require.cache[filepath];
-  });
-};