@modern-js/server-utils 1.2.12-beta.0 → 1.15.1-beta.1

package/dist/js/treeshaking/compilers/typescript/tsconfig-paths-plugin.js

@@ -0,0 +1,155 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
+import * as os from 'os';
+import path, { dirname, posix } from 'path';
+import { createMatchPath } from 'tsconfig-paths';
+
+var isRegExpKey = function isRegExpKey(str) {
+  return str.startsWith('^') || str.endsWith('$');
+};
+
+var resolveAliasPath = function resolveAliasPath(baseUrl, filePath) {
+  if (path.isAbsolute(filePath)) {
+    return filePath;
+  }
+
+  return path.resolve(baseUrl, filePath);
+};
+
+var createAliasMatcher = function createAliasMatcher(baseUrl, alias) {
+  var aliasPairs = Object.keys(alias).reduce(function (o, key) {
+    if (isRegExpKey(key)) {
+      var regexp = new RegExp(key);
+      var aliasPath = resolveAliasPath(baseUrl, alias[key]);
+      o.push([regexp, aliasPath]);
+    } else {
+      var _aliasPath = resolveAliasPath(baseUrl, alias[key]);
+
+      o.push([key, _aliasPath]);
+    }
+
+    return o;
+  }, []);
+  return function (requestedModule) {
+    var _iterator = _createForOfIteratorHelper(aliasPairs),
+        _step;
+
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var _step$value = _slicedToArray(_step.value, 2),
+            key = _step$value[0],
+            value = _step$value[1];
+
+        if (key instanceof RegExp) {
+          if (key.test(requestedModule)) {
+            return value;
+          }
+        }
+
+        if (requestedModule === key) {
+          return value;
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  };
+};
+
+export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
+  var tsPaths = {};
+  var alias = {};
+  Object.keys(paths).forEach(function (key) {
+    if (Array.isArray(paths[key])) {
+      tsPaths[key] = paths[key];
+    } else {
+      alias[key] = paths[key];
+    }
+  });
+  var matchAliasPath = createAliasMatcher(baseUrl, alias);
+  var matchTsPath = createMatchPath(baseUrl, tsPaths, ['main']);
+
+  var matchPath = function matchPath(requestedModule, readJSONSync, fileExists, extensions) {
+    var result = matchTsPath(requestedModule, readJSONSync, fileExists, extensions);
+
+    if (result) {
+      return result;
+    }
+
+    return matchAliasPath(requestedModule);
+  };
+
+  if (Object.keys(paths).length === 0) {
+    return undefined;
+  }
+
+  return function (ctx) {
+    return function (sf) {
+      var visitNode = function visitNode(node) {
+        if (tsBinary.isImportDeclaration(node) || tsBinary.isExportDeclaration(node) && node.moduleSpecifier) {
+          try {
+            var importPathWithQuotes = node.moduleSpecifier && node.moduleSpecifier.getText();
+
+            if (!importPathWithQuotes) {
+              return node;
+            }
+
+            var text = importPathWithQuotes.substring(1, importPathWithQuotes.length - 1);
+            var result = getNotAliasedPath(sf, matchPath, text);
+
+            if (!result) {
+              return node;
+            }
+
+            var moduleSpecifier = tsBinary.factory.createStringLiteral(result);
+            moduleSpecifier.parent = node.moduleSpecifier.parent;
+
+            if (tsBinary.isImportDeclaration(node)) {
+              return tsBinary.factory.updateImportDeclaration(node, node.decorators, node.modifiers, node.importClause, moduleSpecifier, node.assertClause);
+            } else {
+              return tsBinary.factory.updateExportDeclaration(node, node.decorators, node.modifiers, node.isTypeOnly, node.exportClause, moduleSpecifier, node.assertClause);
+            }
+          } catch (_unused) {
+            return node;
+          }
+        }
+
+        return tsBinary.visitEachChild(node, visitNode, ctx);
+      };
+
+      return tsBinary.visitNode(sf, visitNode);
+    };
+  };
+} // fork from https://github.com/nestjs/nest-cli/blob/HEAD/lib/compiler/hooks/tsconfig-paths.hook.ts
+
+function getNotAliasedPath(sf, matcher, text) {
+  var result = matcher(text, undefined, undefined, ['.ts', '.tsx', '.js', '.jsx']);
+
+  if (!result) {
+    return;
+  }
+
+  if (os.platform() === 'win32') {
+    result = result.replace(/\\/g, '/');
+  }
+
+  if (!path.isAbsolute(result)) {
+    try {
+      // Installed packages (node modules) should take precedence over root files with the same name.
+      // Ref: https://github.com/nestjs/nest-cli/issues/838
+      var packagePath = require.resolve(text, {
+        paths: [process.cwd()].concat(_toConsumableArray(module.paths))
+      });
+
+      if (packagePath) {
+        return text;
+      }
+    } catch (_unused2) {}
+  }
+
+  var resolvedPath = posix.relative(dirname(sf.fileName), result) || './';
+  return resolvedPath[0] === '.' ? resolvedPath : './' + resolvedPath;
+}

package/dist/js/treeshaking/compilers/typescript/typescript-loader.js

@@ -0,0 +1,39 @@
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+export var TypescriptLoader = /*#__PURE__*/function () {
+  function TypescriptLoader(_ref) {
+    var appDirectory = _ref.appDirectory;
+
+    _classCallCheck(this, TypescriptLoader);
+
+    _defineProperty(this, "tsBinary", void 0);
+
+    _defineProperty(this, "appDirectory", void 0);
+
+    this.appDirectory = appDirectory;
+  }
+
+  _createClass(TypescriptLoader, [{
+    key: "load",
+    value: function load() {
+      if (this.tsBinary) {
+        return this.tsBinary;
+      }
+
+      try {
+        var tsPath = require.resolve('typescript', {
+          paths: [this.appDirectory || process.cwd()]
+        });
+
+        var _ts = require(tsPath);
+
+        return _ts;
+      } catch (error) {
+        throw new Error('TypeScript could not be found! Please, install "typescript" package.');
+      }
+    }
+  }]);
+
+  return TypescriptLoader;
+}();

package/dist/js/treeshaking/index.js

@@ -1 +1,2 @@
-export * from "./babel";
+export * from "./compilers/babel";
+export { compile } from "./common";

package/dist/types/common/index.d.ts

@@ -0,0 +1,14 @@
+import type { NormalizedConfig } from '@modern-js/core';
+export interface Pattern {
+  from: string;
+  to: string;
+  tsconfigPath?: string;
+}
+export interface CompileOptions {
+  sourceDirs: string[];
+  distDir: string;
+  tsconfigPath?: string;
+}
+export declare type CompileFunc = (appDirectory: string, modernConfig: NormalizedConfig, compileOptions: CompileOptions) => Promise<void>;
+export declare const FILE_EXTENSIONS: string[];
+export declare const compile: CompileFunc;

package/dist/types/{babel.d.ts → compilers/babel/index.d.ts}

@@ -1,6 +1,7 @@
 import { ILibPresetOption, ISyntaxOption } from '@modern-js/babel-preset-lib';
 import { TransformOptions } from '@babel/core';
 import type { NormalizedConfig } from '@modern-js/core';
+import { CompileFunc } from '../../common';
 export * from '@babel/core';
 export interface ITsconfig {
   compilerOptions?: {
@@ -24,4 +25,5 @@ export interface IPackageModeValue {
   syntax: 'es5' | 'es6+';
   tsconfigPath: string;
 }
-export declare const resolveBabelConfig: (appDirectory: string, modernConfig: NormalizedConfig, option: IPackageModeValue) => any;
+export declare const resolveBabelConfig: (appDirectory: string, modernConfig: NormalizedConfig, option: IPackageModeValue) => any;
+export declare const compileByBabel: CompileFunc;

package/dist/types/compilers/typescript/index.d.ts

@@ -0,0 +1,2 @@
+import type { CompileFunc } from '../../common';
+export declare const compileByTs: CompileFunc;

package/dist/types/compilers/typescript/tsconfig-paths-plugin.d.ts

@@ -0,0 +1,2 @@
+import * as ts from 'typescript';
+export declare function tsconfigPathsBeforeHookFactory(tsBinary: typeof ts, baseUrl: string, paths: Record<string, string[] | string>): ((ctx: ts.TransformationContext) => ts.Transformer<any>) | undefined;

package/dist/types/compilers/typescript/typescript-loader.d.ts

@@ -0,0 +1,11 @@
+import type ts from 'typescript';
+export declare class TypescriptLoader {
+  private tsBinary?;
+  private appDirectory?;
+  constructor({
+    appDirectory
+  }: {
+    appDirectory: string;
+  });
+  load(): typeof ts;
+}

package/dist/types/index.d.ts

@@ -1 +1,2 @@
-export * from './babel';
+export * from './compilers/babel';
+export { compile } from './common';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.2.12-beta.0",
+  "version": "1.15.1-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,21 +35,25 @@
     "@babel/preset-env": "^7.18.0",
     "@babel/preset-typescript": "^7.17.12",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-preset-lib": "^1.3.1",
-    "@modern-js/plugin": "^1.3.7",
-    "@modern-js/utils": "^1.7.7",
+    "@modern-js/babel-compiler": "^1.15.0",
+    "@modern-js/babel-preset-lib": "1.15.0",
+    "@modern-js/plugin": "1.15.0",
+    "@modern-js/utils": "1.15.0",
     "babel-plugin-module-resolver": "^4.1.0",
-    "babel-plugin-transform-typescript-metadata": "^0.3.2"
+    "babel-plugin-transform-typescript-metadata": "^0.3.2",
+    "recursive-readdir": "2.2.2",
+    "tsconfig-paths": "3.14.1"
   },
   "devDependencies": {
-    "@modern-js/core": "1.12.0",
-    "@scripts/build": "0.0.0",
-    "@scripts/jest-config": "0.0.0",
+    "@modern-js/core": "1.15.0",
+    "@scripts/build": "1.15.0",
+    "@scripts/jest-config": "1.15.0",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",
     "@types/react": "^17",
     "@types/react-dom": "^17",
+    "@types/recursive-readdir": "2.2.0",
     "jest": "^27",
     "ts-jest": "^27.0.4",
     "typescript": "^4"
@@ -85,6 +89,7 @@
   },
   "scripts": {
     "new": "modern new",
+    "dev": "modern build --watch",
     "build": "wireit",
     "test": "wireit"
   },

package/dist/js/treeshaking/babel.js

@@ -1,82 +0,0 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { getBabelChain, applyUserBabelConfig } from '@modern-js/babel-preset-lib';
-import { fs, json5, getAlias, applyOptionsChain } from '@modern-js/utils';
-export * from '@babel/core';
-export var readTsConfig = function readTsConfig(tsconfigPath) {
-  var noExistReturn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-
-  // 如果不存在，则返回 noExistReturn
-  if (!fs.existsSync(tsconfigPath)) {
-    return noExistReturn;
-  }
-
-  var content = fs.readFileSync(tsconfigPath, 'utf-8');
-  return json5.parse(content);
-};
-export var existTsConfigFile = function existTsConfigFile(tsconfigAbsolutePath) {
-  var tsconfig = readTsConfig(tsconfigAbsolutePath);
-  return Boolean(tsconfig);
-};
-export var getBabelConfig = function getBabelConfig(libPresetOption, syntaxOption) {
-  var chain = getBabelChain(libPresetOption, syntaxOption);
-  return _objectSpread({
-    sourceType: 'unambiguous'
-  }, chain.toJSON());
-};
-export var resolveBabelConfig = function resolveBabelConfig(appDirectory, modernConfig, option // FIXME: babel type can't pass type checking
-) {
-  var _modernConfig$source = modernConfig.source,
-      envVars = _modernConfig$source.envVars,
-      globalVars = _modernConfig$source.globalVars,
-      _modernConfig$source$ = _modernConfig$source.jsxTransformRuntime,
-      jsxTransformRuntime = _modernConfig$source$ === void 0 ? 'automatic' : _modernConfig$source$,
-      userLodashOption = modernConfig.tools.lodash; // alias config
-
-  var aliasConfig = getAlias(modernConfig.source.alias, _objectSpread({
-    appDirectory: appDirectory
-  }, option)); // lodash config
-
-  var lodashOptions = applyOptionsChain({
-    id: ['lodash', 'ramda']
-  }, // TODO: 需要处理类型问题
-  userLodashOption); // babel config
-
-  var babelChain = getBabelChain({
-    appDirectory: appDirectory,
-    enableReactPreset: true,
-    enableTypescriptPreset: true,
-    alias: aliasConfig,
-    envVars: envVars,
-    globalVars: globalVars,
-    lodashOptions: lodashOptions,
-    jsxTransformRuntime: jsxTransformRuntime
-  }, {
-    type: option.type,
-    syntax: option.syntax
-  });
-  var envOptions = babelChain.preset('@babel/preset-env').options();
-  babelChain.preset('@babel/preset-env').use(require.resolve('@babel/preset-env'), [_objectSpread(_objectSpread({}, envOptions[0]), {}, {
-    targets: {
-      node: '12.18.3'
-    },
-    loose: true
-  })]);
-  babelChain.plugin('babel-plugin-transform-typescript-metadata').use(require.resolve('babel-plugin-transform-typescript-metadata'), []);
-  babelChain.plugin('@babel/plugin-proposal-decorators').use(require.resolve('@babel/plugin-proposal-decorators'), [{
-    legacy: true
-  }]); // resolve "Definitely assigned fields cannot be initialized here, but only in the constructor."
-  // babelChain
-  //   .plugin('@babel/plugin-proposal-class-properties')
-  //   .use(require.resolve('@babel/plugin-proposal-class-properties'), [
-  //     {
-  //       loose: true,
-  //     },
-  //   ]);
-
-  babelChain.plugin('@babel/plugin-syntax-class-properties').use(require.resolve('@babel/plugin-syntax-class-properties'), []);
-
-  var internalBabelConfig = _objectSpread({}, babelChain.toJSON());
-
-  var userBabelConfig = modernConfig.tools.babel;
-  return applyUserBabelConfig(internalBabelConfig, userBabelConfig);
-};