@modern-js/babel-compiler 1.2.0 → 1.2.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @modern-js/babel-compiler
 
+## 1.2.1
+
+### Patch Changes
+
+- 83166714: change .npmignore
+- Updated dependencies [83166714]
+  - @modern-js/utils@1.2.2
+
 ## 1.2.0
 
 ### Minor Changes

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.0",
+  "version": "1.2.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@babel/core": "7.16.7",
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.2.0",
+    "@modern-js/utils": "^1.2.2",
     "chokidar": "^3.5.2",
     "glob": "^7.1.6"
   },

package/src/build.ts

@@ -1,95 +0,0 @@
-import { fs, logger } from '@modern-js/utils';
-import { defaultDistFileExtMap } from './constants';
-import { compiler } from './compiler';
-import type {
-  IFinaleCompilerOptions,
-  BabelOptions,
-  ICompilerResult,
-  IVirtualDist,
-  ICompilerMessageDetail,
-} from './type';
-
-export const build = async (
-  option: IFinaleCompilerOptions,
-  babelConfig: BabelOptions = {},
-): Promise<ICompilerResult> => {
-  const {
-    rootDir,
-    enableVirtualDist,
-    filenames,
-    clean,
-    distDir,
-    distFileExtMap = defaultDistFileExtMap,
-    verbose = false,
-    quiet = false,
-  } = option;
-
-  const virtualDists: IVirtualDist[] = [];
-
-  if (clean) {
-    await fs.remove(distDir);
-  }
-
-  fs.ensureDir(distDir);
-  const messageDetails: ICompilerMessageDetail[] = [];
-
-  for (const filename of filenames) {
-    try {
-      const dist = compiler({
-        rootDir,
-        enableVirtualDist,
-        filepath: filename,
-        distDir,
-        verbose,
-        quiet,
-        babelConfig,
-        distFileExtMap,
-      });
-      if (enableVirtualDist && dist) {
-        virtualDists.push(dist);
-      }
-    } catch (e: any) {
-      messageDetails.push({
-        filename,
-        content: e.toString(),
-      });
-    }
-  }
-
-  const happenError = messageDetails.length > 0;
-
-  if (!quiet) {
-    if (happenError) {
-      logger.error(
-        `Compilation failure ${messageDetails.length} ${
-          messageDetails.length !== 1 ? 'files' : 'file'
-        } with Babel.`,
-      );
-      // TODO: 具体的报错信息打印
-    } else {
-      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.`,
-      messageDetails,
-    };
-  }
-
-  return {
-    code: 0,
-    message: `Successfully compiled ${filenames.length} ${
-      filenames.length !== 1 ? 'files' : 'file'
-    } with Babel.`,
-    virtualDists,
-  };
-};

package/src/buildWatch.ts

@@ -1,113 +0,0 @@
-import * as path from 'path';
-import * as Event from 'events';
-import { logger, watch, WatchChangeType } from '@modern-js/utils';
-import { FSWatcher } from 'chokidar';
-import { build } from './build';
-import { CompilerErrorResult } from './compilerErrorResult';
-import type {
-  IFinaleCompilerOptions,
-  BabelOptions,
-  ICompilerResult,
-} from './type';
-
-export const BuildWatchEvent = {
-  firstCompiler: 'first-compiler',
-  compiling: 'compiling',
-  watchingCompiler: 'watching-compiler',
-};
-
-export class BuildWatchEmitter extends Event.EventEmitter {
-  private _initFn!: (
-    emitter: BuildWatchEmitter,
-  ) => Promise<FSWatcher> | FSWatcher;
-
-  setInitFn(fn: (emitter: BuildWatchEmitter) => Promise<any> | any) {
-    this._initFn = fn;
-  }
-
-  async watch() {
-    if (typeof this._initFn === 'function') {
-      return this._initFn(this);
-    }
-
-    return null;
-  }
-}
-
-export const runBuildWatch = async (
-  option: IFinaleCompilerOptions,
-  babelConfig: BabelOptions = {},
-  emitter: BuildWatchEmitter,
-) => {
-  emitter.emit(BuildWatchEvent.compiling);
-  const errorResult = new CompilerErrorResult();
-  const watchDir = option.watchDir as string;
-  const { distDir, quiet } = option;
-  // 第一次正常构建
-  const fisrtBuildResult = await build(option, babelConfig);
-
-  const { code } = fisrtBuildResult;
-  if (code === 1) {
-    errorResult.init(fisrtBuildResult);
-    emitter.emit(BuildWatchEvent.firstCompiler, errorResult.value);
-  } else {
-    emitter.emit(BuildWatchEvent.firstCompiler, fisrtBuildResult);
-  }
-
-  return watch(
-    `${watchDir}/**/*.{js,jsx,ts,tsx}`,
-    async ({ changeType, changedFilePath }) => {
-      emitter.emit(BuildWatchEvent.compiling);
-      if (changeType === WatchChangeType.UNLINK) {
-        const removeFiles = [
-          path.normalize(
-            `./${distDir}/${path.relative(watchDir, changedFilePath)}`,
-          ),
-        ];
-        if (!quiet) {
-          logger.info(`remove file: ${removeFiles.join(',')}`);
-        }
-        const result: ICompilerResult = {
-          code: 0,
-          message: `remove file: ${removeFiles.join(',')}`,
-          removeFiles,
-        };
-        emitter.emit(BuildWatchEvent.watchingCompiler, result);
-        return;
-      }
-
-      const result = await build(
-        { ...option, filenames: [changedFilePath] },
-        babelConfig,
-      );
-      if (result.code === 1) {
-        errorResult.update(result.messageDetails || []);
-        emitter.emit(BuildWatchEvent.watchingCompiler, errorResult.value);
-        !quiet && logger.info(errorResult.value.message);
-      } else {
-        errorResult.removeByFileName(changedFilePath);
-        // 如果该文件没有报错，则更新该文件状态并检查是否还存在其他报错文件
-        if (errorResult.checkExistError()) {
-          emitter.emit(BuildWatchEvent.watchingCompiler, {
-            ...errorResult.value,
-            virtualDists: result.virtualDists,
-          } as ICompilerResult);
-          !quiet && logger.info(errorResult.value.message);
-        } else {
-          emitter.emit(BuildWatchEvent.watchingCompiler, result);
-          !quiet && logger.info(result.message);
-        }
-      }
-    },
-    [`${watchDir}/**/*.d.ts`],
-  );
-};
-
-export const buildWatch = (
-  option: IFinaleCompilerOptions,
-  babelConfig: BabelOptions = {},
-) => {
-  const buildWatchEmitter = new BuildWatchEmitter();
-  buildWatchEmitter.setInitFn(runBuildWatch.bind(null, option, babelConfig));
-  return buildWatchEmitter;
-};

package/src/compiler.ts

@@ -1,151 +0,0 @@
-import * as path from 'path';
-import * as babel from '@babel/core';
-import { logger, fs } from '@modern-js/utils';
-import * as utils from './utils';
-import { BabelOptions, IVirtualDist } from './type';
-import { defaultDistFileExtMap } from './constants';
-
-export interface ISingleFileCompilerOption {
-  filepath: string;
-  rootDir: string;
-  enableVirtualDist?: boolean;
-  distDir?: string;
-  verbose?: boolean;
-  quiet?: boolean;
-  babelConfig?: BabelOptions;
-  distFileExtMap?: Record<string, string>;
-}
-
-const defaultDistDir = 'dist';
-
-export const isRes = (
-  r: babel.BabelFileResult | null,
-): r is babel.BabelFileResult => Boolean(r);
-
-export const getDistFilePath = (option: {
-  filepath: string;
-  rootDir: string;
-  distDir: string;
-  extMap: Record<string, string>;
-}) => {
-  const { filepath, rootDir, distDir, extMap } = option;
-  const ext = path.extname(filepath);
-  return path.join(
-    distDir,
-    path.relative(rootDir, filepath).replace(ext, extMap[ext]),
-  );
-};
-
-export const resolveSourceMap = (option: {
-  babelRes: babel.BabelFileResult;
-  sourceFilePath: string;
-  distFilePath: string;
-  enableVirtualDist?: boolean;
-}) => {
-  const {
-    babelRes,
-    sourceFilePath,
-    distFilePath,
-    enableVirtualDist = false,
-  } = option;
-  const mapLoc = `${distFilePath}.map`;
-  babelRes.code = utils.addSourceMappingUrl(babelRes.code as string, mapLoc);
-
-  if (babelRes.map) {
-    babelRes.map.file = path.basename(distFilePath);
-    babelRes.map.sources = [
-      path.relative(path.dirname(distFilePath), sourceFilePath),
-    ];
-  }
-
-  const sourceMapVirtualDist = {
-    sourcemap: JSON.stringify(babelRes.map),
-    sourceMapPath: mapLoc,
-  };
-
-  if (enableVirtualDist) {
-    return sourceMapVirtualDist;
-  }
-
-  fs.ensureDirSync(path.dirname(mapLoc));
-  fs.writeFileSync(mapLoc, JSON.stringify(babelRes.map));
-
-  return sourceMapVirtualDist;
-};
-
-export const compiler = (option: ISingleFileCompilerOption) => {
-  const {
-    filepath,
-    rootDir,
-    enableVirtualDist = false,
-    distDir = path.join(path.dirname(rootDir), defaultDistDir),
-    verbose = false,
-    babelConfig = {},
-    distFileExtMap = defaultDistFileExtMap,
-    quiet = false,
-  } = option;
-  const babelRes = babel.transformFileSync(filepath, babelConfig);
-  let virtualDist: IVirtualDist | null = null;
-
-  if (!isRes(babelRes)) {
-    throw new Error(`${filepath} happen error`);
-  }
-
-  const distFilePath = getDistFilePath({
-    filepath,
-    rootDir,
-    distDir,
-    extMap: distFileExtMap,
-  });
-
-  if (enableVirtualDist) {
-    virtualDist = {
-      distPath: distFilePath,
-      sourceMapPath: '',
-      code: '',
-      sourcemap: '',
-    };
-  }
-
-  if (
-    babelRes?.map &&
-    babelConfig.sourceMaps &&
-    babelConfig.sourceMaps !== 'inline'
-  ) {
-    if (virtualDist) {
-      virtualDist = {
-        ...virtualDist,
-        ...resolveSourceMap({
-          babelRes,
-          sourceFilePath: filepath,
-          distFilePath,
-          enableVirtualDist,
-        }),
-      };
-    } else {
-      resolveSourceMap({
-        babelRes,
-        sourceFilePath: filepath,
-        distFilePath,
-        enableVirtualDist,
-      });
-    }
-  }
-
-  if (virtualDist) {
-    virtualDist = {
-      ...virtualDist,
-      distPath: distFilePath,
-      code: babelRes.code as string,
-    };
-  } else {
-    fs.ensureDirSync(path.dirname(distFilePath));
-    fs.writeFileSync(distFilePath, babelRes.code as string);
-  }
-
-  if (verbose && !quiet) {
-    logger.info(`${filepath} => ${distFilePath}`);
-  }
-
-  return virtualDist;
-};

package/src/compilerErrorResult.ts

@@ -1,49 +0,0 @@
-import { ICompilerResult, ICompilerMessageDetail } from './type';
-
-export class CompilerErrorResult {
-  _messageDetails!: ICompilerMessageDetail[];
-
-  constructor(initErrorResult?: ICompilerResult) {
-    this.init(initErrorResult);
-  }
-
-  init(initErrorResult?: ICompilerResult) {
-    this._messageDetails = initErrorResult?.messageDetails || [];
-  }
-
-  update(messageDetails: ICompilerMessageDetail[]) {
-    for (const messageDetail of messageDetails) {
-      // 遍历存不存在该文件报错信息，不存在则增加，否则更新内容
-      const addError = !this._messageDetails.some(detail => {
-        if (detail.filename === messageDetail.filename) {
-          // 如果错误栈里存在该文件报错信息，则更新内容
-          detail.content = messageDetail.content;
-          return true;
-        }
-        return false;
-      });
-
-      if (addError) {
-        this._messageDetails.push(messageDetail);
-      }
-    }
-  }
-
-  removeByFileName(filename: string) {
-    this._messageDetails = this._messageDetails.filter(
-      detail => detail.filename !== filename,
-    );
-  }
-
-  get value(): ICompilerResult {
-    return {
-      code: 1,
-      message: `Compilation failure ${this._messageDetails?.length} files with Babel.`,
-      messageDetails: this._messageDetails,
-    };
-  }
-
-  checkExistError() {
-    return this._messageDetails.length > 0;
-  }
-}

package/src/constants.ts

@@ -1,6 +0,0 @@
-export const defaultDistFileExtMap = {
-  '.js': '.js',
-  '.jsx': '.js',
-  '.ts': '.js',
-  '.tsx': '.js',
-};

package/src/defaults.ts

@@ -1,21 +0,0 @@
-import { ICompilerOptions, ICompilerOptionsWithDefault } from './type';
-import { defaultDistFileExtMap } from './constants';
-
-const defaultOptions = {
-  enableWatch: false,
-  enableVirtualDist: false,
-  extensions: [],
-  filenames: [],
-  distFileExtMap: defaultDistFileExtMap,
-  ignore: [],
-  quiet: false,
-  verbose: false,
-  clean: false,
-};
-
-export const mergeDefaultOption = (
-  compilerOptions: ICompilerOptions,
-): ICompilerOptionsWithDefault => ({
-  ...defaultOptions,
-  ...compilerOptions,
-});

package/src/getFinalOption.ts

@@ -1,93 +0,0 @@
-import * as glob from 'glob';
-import type { IOptions } from 'glob';
-import { DEFAULT_EXTENSIONS } from '@babel/core';
-import {
-  Extensions,
-  ExtensionsFunc,
-  ICompilerOptions,
-  IFinaleCompilerOptions,
-} from './type';
-import { mergeDefaultOption } from './defaults';
-
-export const getGlobPattern = (dir: string, extensions: Extensions) => {
-  if (extensions.length > 1) {
-    return `${dir}/**/*{${extensions.join(',')}}`;
-  } else if (extensions.length === 1) {
-    return `${dir}/**/*${extensions[0]}`;
-  } else {
-    return `${dir}/**/*`;
-  }
-};
-export const getFinalExtensions = (
-  extensions: Extensions | ExtensionsFunc | undefined,
-) => {
-  const isExtensions = (
-    ext: Extensions | ExtensionsFunc | undefined,
-  ): ext is Extensions => Array.isArray(ext);
-
-  const isExtensionsFunc = (
-    ext: Extensions | ExtensionsFunc | undefined,
-  ): ext is ExtensionsFunc => typeof ext === 'function';
-
-  if (isExtensions(extensions)) {
-    return [...extensions, ...DEFAULT_EXTENSIONS];
-  } else if (isExtensionsFunc(extensions)) {
-    return extensions(DEFAULT_EXTENSIONS);
-  } else {
-    return DEFAULT_EXTENSIONS;
-  }
-};
-
-export const getFilesFromDir = ({
-  dir,
-  finalExt = [],
-  ignore = [],
-}: {
-  dir: string;
-  finalExt?: string[];
-  ignore?: IOptions['ignore'];
-}) => {
-  let globFindFilenames: string[] = [];
-  const globPattern = getGlobPattern(dir, finalExt);
-
-  globFindFilenames = glob.sync(globPattern, { ignore });
-
-  return globFindFilenames;
-};
-
-export const getFinalCompilerOption = (
-  option: ICompilerOptions,
-): IFinaleCompilerOptions => {
-  const optionWithDefault = mergeDefaultOption(option);
-  const {
-    sourceDir,
-    ignore,
-    enableWatch = false,
-    watchDir,
-    extensions = DEFAULT_EXTENSIONS,
-  } = option;
-  let globFindFilenames: string[] = [];
-
-  const finalExt = getFinalExtensions(extensions);
-  if (sourceDir) {
-    globFindFilenames = getFilesFromDir({
-      dir: sourceDir,
-      ignore,
-      finalExt,
-    });
-  }
-
-  if (enableWatch) {
-    // 开启watch模式，清空通过 sourceDir 找到的文件，而改为使用watchDirs
-    globFindFilenames = getFilesFromDir({
-      dir: watchDir as string,
-      ignore,
-      finalExt,
-    });
-  }
-
-  return {
-    ...optionWithDefault,
-    filenames: [...optionWithDefault.filenames, ...globFindFilenames],
-  };
-};

package/src/index.ts

@@ -1,35 +0,0 @@
-import { ICompilerOptions, ICompilerResult, BabelOptions } from './type';
-import { getFinalCompilerOption } from './getFinalOption';
-import { build } from './build';
-import { buildWatch, BuildWatchEmitter } from './buildWatch';
-import { validate } from './validate';
-
-export async function compiler(
-  compilerOptions: ICompilerOptions & { enableWatch: true },
-  babelOptions?: BabelOptions,
-): Promise<BuildWatchEmitter>;
-export async function compiler(
-  compilerOptions: ICompilerOptions & { enableWatch?: false },
-  babelOptions?: BabelOptions,
-): Promise<ICompilerResult>;
-
-export async function compiler(
-  compilerOptions: ICompilerOptions,
-  babelOptions: 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';

package/src/type.ts

@@ -1,76 +0,0 @@
-import { TransformOptions } from '@babel/core';
-import type { IOptions } from 'glob';
-
-export type BabelOptions = TransformOptions;
-export type Extensions = string[];
-export type ExtensionsFunc = (defaultExtensions: Extensions) => Extensions;
-
-export interface ICompilerOptions {
-  rootDir: string;
-  distDir: string;
-  sourceDir?: string;
-  watchDir?: string;
-  enableWatch?: boolean;
-  enableVirtualDist?: boolean;
-  extensions?: Extensions | ExtensionsFunc;
-  filenames?: string[];
-  distFileExtMap?: Record<string, string>;
-  ignore?: IOptions['ignore'];
-  quiet?: boolean;
-  verbose?: boolean;
-  clean?: boolean;
-}
-
-export interface ICompilerOptionsWithDefault {
-  rootDir: string;
-  enableVirtualDist?: boolean;
-  sourceDir?: string;
-  watchDir?: string;
-  enableWatch?: boolean;
-  distDir: string;
-  extensions: Extensions | ExtensionsFunc;
-  filenames: string[];
-  distFileExtMap?: Record<string, string>;
-  ignore: IOptions['ignore'];
-  quiet?: boolean;
-  verbose?: boolean;
-  clean?: boolean;
-}
-
-export interface IFinaleCompilerOptions {
-  rootDir: string;
-  filenames: string[];
-  ignore?: IOptions['ignore'];
-  enableVirtualDist?: boolean;
-  distDir: string;
-  watchDir?: string;
-  enableWatch?: boolean;
-  distFileExtMap?: Record<string, string>;
-  quiet?: boolean;
-  verbose?: boolean;
-  clean?: boolean;
-}
-
-export interface BuildOptions {
-  babelOptions: BabelOptions;
-}
-
-export interface IVirtualDist {
-  distPath: string;
-  sourceMapPath: string;
-  code: string;
-  sourcemap: string;
-}
-
-export interface ICompilerMessageDetail {
-  filename: string;
-  content: string;
-}
-
-export interface ICompilerResult {
-  code: number;
-  message: string;
-  messageDetails?: ICompilerMessageDetail[];
-  virtualDists?: IVirtualDist[];
-  removeFiles?: string[];
-}

package/src/utils.ts

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

package/src/validate.ts

@@ -1,47 +0,0 @@
-import { logger } from '@modern-js/utils';
-import { ICompilerOptions, ICompilerResult } from './type';
-
-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: ICompilerOptions,
-): ICompilerResult | null => {
-  const { sourceDir, filenames, quiet } = compilerOptions;
-  if (!sourceDir && !filenames) {
-    if (!quiet) {
-      logger.error(sourceDirAndFileNamesValidMessage);
-    }
-    return {
-      code: 1,
-      message: sourceDirAndFileNamesValidMessage,
-      virtualDists: [],
-    };
-  }
-
-  return null;
-};
-
-export const validateWatchDir = (
-  compilerOptions: ICompilerOptions,
-): ICompilerResult | null => {
-  const { watchDir, enableWatch, quiet } = compilerOptions;
-  if (enableWatch && !watchDir) {
-    if (!quiet) {
-      logger.error(watchDirValidMessage);
-    }
-    return { code: 1, message: watchDirValidMessage, virtualDists: [] };
-  }
-
-  return null;
-};
-
-export const validate = (compilerOptions: ICompilerOptions) => {
-  if (compilerOptions.enableWatch) {
-    return validateWatchDir(compilerOptions);
-  }
-
-  return validateSourceDirAndFileNames(compilerOptions);
-};