@modern-js/babel-compiler 2.0.0-beta.3 → 2.0.0-beta.6

package/dist/js/modern/index.js

@@ -1,18 +1,43 @@
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 import { getFinalCompilerOption } from "./getFinalOption";
 import { build } from "./build";
 import { buildWatch } from "./buildWatch";
 import { validate } from "./validate";
-export async function compiler(compilerOptions, babelOptions = {}) {
-  const validRet = validate(compilerOptions);
-  if (validRet) {
-    return validRet;
-  }
-  const finalCompilerOption = getFinalCompilerOption(compilerOptions);
-  if (compilerOptions.enableWatch) {
-    return buildWatch(finalCompilerOption, babelOptions);
-  } else {
-    return build(finalCompilerOption, babelOptions);
-  }
+function compiler(_0) {
+  return __async(this, arguments, function* (compilerOptions, babelOptions = {}) {
+    const validRet = validate(compilerOptions);
+    if (validRet) {
+      return validRet;
+    }
+    const finalCompilerOption = getFinalCompilerOption(compilerOptions);
+    if (compilerOptions.enableWatch) {
+      return buildWatch(finalCompilerOption, babelOptions);
+    } else {
+      return build(finalCompilerOption, babelOptions);
+    }
+  });
 }
 export * from "./buildWatch";
-export * from "./type";
+export * from "./type";
+export {
+  compiler
+};

package/dist/js/modern/utils.js

@@ -1,4 +1,8 @@
-import * as path from 'path';
-export function addSourceMappingUrl(code, loc) {
-  return `${code}\n//# sourceMappingURL=${path.normalize(path.basename(loc))}`;
-}
+import * as path from "path";
+function addSourceMappingUrl(code, loc) {
+  return `${code}
+//# sourceMappingURL=${path.normalize(path.basename(loc))}`;
+}
+export {
+  addSourceMappingUrl
+};

package/dist/js/modern/validate.js

@@ -1,12 +1,8 @@
-import { logger } from '@modern-js/utils';
-export const sourceDirAndFileNamesValidMessage = 'At least one of the sourceDir and filenames configurations must be configured';
-export const watchDirValidMessage = 'should set watchDir when enableWatch is true';
-export const validateSourceDirAndFileNames = compilerOptions => {
-  const {
-    sourceDir,
-    filenames,
-    quiet
-  } = compilerOptions;
+import { logger } from "@modern-js/utils";
+const sourceDirAndFileNamesValidMessage = "At least one of the sourceDir and filenames configurations must be configured";
+const watchDirValidMessage = "should set watchDir when enableWatch is true";
+const validateSourceDirAndFileNames = (compilerOptions) => {
+  const { sourceDir, filenames, quiet } = compilerOptions;
   if (!sourceDir && !filenames) {
     if (!quiet) {
       logger.error(sourceDirAndFileNamesValidMessage);
@@ -19,27 +15,26 @@ export const validateSourceDirAndFileNames = compilerOptions => {
   }
   return null;
 };
-export const validateWatchDir = compilerOptions => {
-  const {
-    watchDir,
-    enableWatch,
-    quiet
-  } = compilerOptions;
+const validateWatchDir = (compilerOptions) => {
+  const { watchDir, enableWatch, quiet } = compilerOptions;
   if (enableWatch && !watchDir) {
     if (!quiet) {
       logger.error(watchDirValidMessage);
     }
-    return {
-      code: 1,
-      message: watchDirValidMessage,
-      virtualDists: []
-    };
+    return { code: 1, message: watchDirValidMessage, virtualDists: [] };
   }
   return null;
 };
-export const validate = compilerOptions => {
+const validate = (compilerOptions) => {
   if (compilerOptions.enableWatch) {
     return validateWatchDir(compilerOptions);
   }
   return validateSourceDirAndFileNames(compilerOptions);
-};
+};
+export {
+  sourceDirAndFileNamesValidMessage,
+  validate,
+  validateSourceDirAndFileNames,
+  validateWatchDir,
+  watchDirValidMessage
+};

package/dist/js/node/build.js

@@ -1,32 +1,68 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+var build_exports = {};
+__export(build_exports, {
+  build: () => build
 });
-exports.build = void 0;
-var _utils = require("@modern-js/utils");
-var _constants = require("./constants");
-var _compiler = require("./compiler");
-const build = async (option, babelConfig = {}) => {
+module.exports = __toCommonJS(build_exports);
+var import_utils = require("@modern-js/utils");
+var import_constants = require("./constants");
+var import_compiler = require("./compiler");
+const build = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (option, babelConfig = {}) {
   const {
     rootDir,
     enableVirtualDist,
     filenames,
     clean,
     distDir,
-    distFileExtMap = _constants.defaultDistFileExtMap,
+    distFileExtMap = import_constants.defaultDistFileExtMap,
     verbose = false,
     quiet = false
   } = option;
   const virtualDists = [];
   if (clean) {
-    await _utils.fs.remove(distDir);
+    yield import_utils.fs.remove(distDir);
   }
-  _utils.fs.ensureDir(distDir);
+  import_utils.fs.ensureDir(distDir);
   const messageDetails = [];
   for (const filename of filenames) {
     try {
-      const dist = (0, _compiler.compiler)({
+      const dist = (0, import_compiler.compiler)({
         rootDir,
         enableVirtualDist,
         filepath: filename,
@@ -49,23 +85,29 @@ const build = async (option, babelConfig = {}) => {
   const happenError = messageDetails.length > 0;
   if (!quiet) {
     if (happenError) {
-      _utils.logger.error(`Compilation failure ${messageDetails.length} ${messageDetails.length !== 1 ? 'files' : 'file'} with Babel.`);
-      // TODO: 具体的报错信息打印
+      import_utils.logger.error(
+        `Compilation failure ${messageDetails.length} ${messageDetails.length !== 1 ? "files" : "file"} with Babel.`
+      );
     } else {
-      _utils.logger.info(`Successfully compiled ${filenames.length} ${filenames.length !== 1 ? 'files' : 'file'} with Babel.`);
+      import_utils.logger.info(
+        `Successfully compiled ${filenames.length} ${filenames.length !== 1 ? "files" : "file"} with Babel.`
+      );
     }
   }
   if (happenError) {
     return {
       code: 1,
-      message: `Compilation failure ${messageDetails.length} ${messageDetails.length !== 1 ? 'files' : 'file'} with Babel.`,
+      message: `Compilation failure ${messageDetails.length} ${messageDetails.length !== 1 ? "files" : "file"} with Babel.`,
       messageDetails
     };
   }
   return {
     code: 0,
-    message: `Successfully compiled ${filenames.length} ${filenames.length !== 1 ? 'files' : 'file'} with Babel.`,
+    message: `Successfully compiled ${filenames.length} ${filenames.length !== 1 ? "files" : "file"} with Babel.`,
     virtualDists
   };
-};
-exports.build = build;
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  build
+});

package/dist/js/node/buildWatch.js

@@ -1,104 +1,161 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+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 __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+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;
+};
+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 __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+var buildWatch_exports = {};
+__export(buildWatch_exports, {
+  BuildWatchEmitter: () => BuildWatchEmitter,
+  BuildWatchEvent: () => BuildWatchEvent,
+  buildWatch: () => buildWatch,
+  runBuildWatch: () => runBuildWatch
 });
-exports.runBuildWatch = exports.buildWatch = exports.BuildWatchEvent = exports.BuildWatchEmitter = void 0;
-var path = _interopRequireWildcard(require("path"));
-var Event = _interopRequireWildcard(require("events"));
-var _utils = require("@modern-js/utils");
-var _build = require("./build");
-var _compilerErrorResult = require("./compilerErrorResult");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-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; }
+module.exports = __toCommonJS(buildWatch_exports);
+var path = __toESM(require("path"));
+var Event = __toESM(require("events"));
+var import_utils = require("@modern-js/utils");
+var import_build = require("./build");
+var import_compilerErrorResult = require("./compilerErrorResult");
 const BuildWatchEvent = {
-  firstCompiler: 'first-compiler',
-  compiling: 'compiling',
-  watchingCompiler: 'watching-compiler'
+  firstCompiler: "first-compiler",
+  compiling: "compiling",
+  watchingCompiler: "watching-compiler"
 };
-exports.BuildWatchEvent = BuildWatchEvent;
 class BuildWatchEmitter extends Event.EventEmitter {
-  constructor(...args) {
-    super(...args);
-    _defineProperty(this, "_initFn", void 0);
-  }
   setInitFn(fn) {
     this._initFn = fn;
   }
-  async watch() {
-    if (typeof this._initFn === 'function') {
-      return this._initFn(this);
-    }
-    return null;
+  watch() {
+    return __async(this, null, function* () {
+      if (typeof this._initFn === "function") {
+        return this._initFn(this);
+      }
+      return null;
+    });
   }
 }
-exports.BuildWatchEmitter = BuildWatchEmitter;
-const runBuildWatch = async (option, babelConfig = {}, emitter) => {
+const runBuildWatch = (_0, ..._1) => __async(void 0, [_0, ..._1], function* (option, babelConfig = {}, emitter) {
   emitter.emit(BuildWatchEvent.compiling);
-  const errorResult = new _compilerErrorResult.CompilerErrorResult();
+  const errorResult = new import_compilerErrorResult.CompilerErrorResult();
   const watchDir = option.watchDir;
-  const {
-    distDir,
-    quiet
-  } = option;
-  // 第一次正常构建
-  const firstBuildResult = await (0, _build.build)(option, babelConfig);
-  const {
-    code
-  } = firstBuildResult;
+  const { distDir, quiet } = option;
+  const firstBuildResult = yield (0, import_build.build)(option, babelConfig);
+  const { code } = firstBuildResult;
   if (code === 1) {
     errorResult.init(firstBuildResult);
     emitter.emit(BuildWatchEvent.firstCompiler, errorResult.value);
   } else {
     emitter.emit(BuildWatchEvent.firstCompiler, firstBuildResult);
   }
-  return (0, _utils.watch)(`${watchDir}/**/*.{js,jsx,ts,tsx}`, async ({
-    changeType,
-    changedFilePath
-  }) => {
-    emitter.emit(BuildWatchEvent.compiling);
-    if (changeType === _utils.WatchChangeType.UNLINK) {
-      const removeFiles = [path.normalize(`./${distDir}/${path.relative(watchDir, changedFilePath)}`)];
-      if (!quiet) {
-        _utils.logger.info(`remove file: ${removeFiles.join(',')}`);
+  return (0, import_utils.watch)(
+    `${watchDir}/**/*.{js,jsx,ts,tsx}`,
+    (_02) => __async(void 0, [_02], function* ({ changeType, changedFilePath }) {
+      emitter.emit(BuildWatchEvent.compiling);
+      if (changeType === import_utils.WatchChangeType.UNLINK) {
+        const removeFiles = [
+          path.normalize(
+            `./${distDir}/${path.relative(watchDir, changedFilePath)}`
+          )
+        ];
+        if (!quiet) {
+          import_utils.logger.info(`remove file: ${removeFiles.join(",")}`);
+        }
+        const result2 = {
+          code: 0,
+          message: `remove file: ${removeFiles.join(",")}`,
+          removeFiles
+        };
+        emitter.emit(BuildWatchEvent.watchingCompiler, result2);
+        return;
       }
-      const result = {
-        code: 0,
-        message: `remove file: ${removeFiles.join(',')}`,
-        removeFiles
-      };
-      emitter.emit(BuildWatchEvent.watchingCompiler, result);
-      return;
-    }
-    const result = await (0, _build.build)(_objectSpread(_objectSpread({}, option), {}, {
-      filenames: [changedFilePath]
-    }), babelConfig);
-    if (result.code === 1) {
-      errorResult.update(result.messageDetails || []);
-      emitter.emit(BuildWatchEvent.watchingCompiler, errorResult.value);
-      !quiet && _utils.logger.info(errorResult.value.message);
-    } else {
-      errorResult.removeByFileName(changedFilePath);
-      // 如果该文件没有报错，则更新该文件状态并检查是否还存在其他报错文件
-      if (errorResult.checkExistError()) {
-        emitter.emit(BuildWatchEvent.watchingCompiler, _objectSpread(_objectSpread({}, errorResult.value), {}, {
-          virtualDists: result.virtualDists
-        }));
-        !quiet && _utils.logger.info(errorResult.value.message);
+      const result = yield (0, import_build.build)(
+        __spreadProps(__spreadValues({}, option), { filenames: [changedFilePath] }),
+        babelConfig
+      );
+      if (result.code === 1) {
+        errorResult.update(result.messageDetails || []);
+        emitter.emit(BuildWatchEvent.watchingCompiler, errorResult.value);
+        !quiet && import_utils.logger.info(errorResult.value.message);
       } else {
-        emitter.emit(BuildWatchEvent.watchingCompiler, result);
-        !quiet && _utils.logger.info(result.message);
+        errorResult.removeByFileName(changedFilePath);
+        if (errorResult.checkExistError()) {
+          emitter.emit(BuildWatchEvent.watchingCompiler, __spreadProps(__spreadValues({}, errorResult.value), {
+            virtualDists: result.virtualDists
+          }));
+          !quiet && import_utils.logger.info(errorResult.value.message);
+        } else {
+          emitter.emit(BuildWatchEvent.watchingCompiler, result);
+          !quiet && import_utils.logger.info(result.message);
+        }
       }
-    }
-  }, [`${watchDir}/**/*.d.ts`]);
-};
-exports.runBuildWatch = runBuildWatch;
+    }),
+    [`${watchDir}/**/*.d.ts`]
+  );
+});
 const buildWatch = (option, babelConfig = {}) => {
   const buildWatchEmitter = new BuildWatchEmitter();
   buildWatchEmitter.setInitFn(runBuildWatch.bind(null, option, babelConfig));
   return buildWatchEmitter;
 };
-exports.buildWatch = buildWatch;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BuildWatchEmitter,
+  BuildWatchEvent,
+  buildWatch,
+  runBuildWatch
+});