@modern-js/server 2.0.0-beta.0 → 2.0.0-beta.2

package/dist/js/modern/dev-tools/dev-middleware/socket-server.js

@@ -1,39 +1,31 @@
 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 ws from 'ws';
 import { logger } from '@modern-js/utils';
 export default class SocketServer {
   constructor(options) {
     _defineProperty(this, "wsServer", void 0);
-
     _defineProperty(this, "sockets", []);
-
     _defineProperty(this, "options", void 0);
-
     _defineProperty(this, "app", void 0);
-
     _defineProperty(this, "stats", void 0);
-
     _defineProperty(this, "timer", null);
-
     this.options = options;
-  } // create socket, install socket handler, bind socket event
-
+  }
 
+  // create socket, install socket handler, bind socket event
   prepare(app) {
     var _this$options$client;
-
     this.app = app;
     this.wsServer = new ws.Server({
       noServer: true,
       path: (_this$options$client = this.options.client) === null || _this$options$client === void 0 ? void 0 : _this$options$client.path
-    }); // listen upgrade event to handle socket
+    });
 
+    // listen upgrade event to handle socket
     this.app.on('upgrade', (req, sock, head) => {
       if (!this.wsServer.shouldHandle(req)) {
         return;
       }
-
       this.wsServer.handleUpgrade(req, sock, head, connection => {
         this.wsServer.emit('connection', connection, req);
       });
@@ -45,12 +37,12 @@ export default class SocketServer {
     this.timer = setInterval(() => {
       this.wsServer.clients.forEach(socket => {
         const extWs = socket;
-
         if (!extWs.isAlive) {
           extWs.terminate();
         } else {
           extWs.isAlive = false;
-          extWs.ping(() => {// empty
+          extWs.ping(() => {
+            // empty
           });
         }
       });
@@ -59,13 +51,12 @@ export default class SocketServer {
       this.onConnect(socket);
     });
   }
-
   updateStats(stats) {
     this.stats = stats;
     this.sendStats();
-  } // write message to each socket
-
+  }
 
+  // write message to each socket
   sockWrite(type, data) {
     this.sockets.forEach(socket => {
       this.send(socket, JSON.stringify({
@@ -74,67 +65,56 @@ export default class SocketServer {
       }));
     });
   }
-
   singleWrite(socket, type, data) {
     this.send(socket, JSON.stringify({
       type,
       data
     }));
   }
-
   close() {
     this.sockets.forEach(socket => {
       socket.close();
     });
-
     if (this.timer) {
       clearInterval(this.timer);
       this.timer = null;
     }
   }
-
   onConnect(socket) {
     const connection = socket;
     connection.isAlive = true;
     connection.on('pong', () => {
       connection.isAlive = true;
     });
-
     if (!connection) {
       return;
     }
-
     this.sockets.push(connection);
     connection.on('close', () => {
       const idx = this.sockets.indexOf(connection);
-
       if (idx >= 0) {
         this.sockets.splice(idx, 1);
       }
     });
-
     if (this.options.hot || this.options.hot === 'only') {
       this.singleWrite(connection, 'hot');
     }
-
     if (this.options.liveReload) {
       this.singleWrite(connection, 'liveReload');
-    } // send first stats to active client sock if stats exist
-
+    }
 
+    // send first stats to active client sock if stats exist
     if (this.stats) {
       this.sendStats(true);
     }
-  } // get standard stats
-
+  }
 
+  // get standard stats
   getStats() {
     const curStats = this.stats;
-
     if (!curStats) {
       return null;
     }
-
     const defaultStats = {
       all: false,
       hash: true,
@@ -144,24 +124,21 @@ export default class SocketServer {
       errorDetails: false
     };
     return curStats.toJson(defaultStats);
-  } // determine what message should send by stats
-
+  }
 
+  // determine what message should send by stats
   sendStats(force = false) {
-    const stats = this.getStats(); // this should never happened
+    const stats = this.getStats();
 
+    // this should never happened
     if (!stats) {
       return null;
     }
-
     const shouldEmit = !force && stats && (!stats.errors || stats.errors.length === 0) && stats.assets && stats.assets.every(asset => !asset.emitted);
-
     if (shouldEmit) {
       return this.sockWrite('still-ok');
     }
-
     this.sockWrite('hash', stats.hash);
-
     if (stats.errors && stats.errors.length > 0) {
       return this.sockWrite('errors', stats.errors);
     } else if (stats.warnings && stats.warnings.length > 0) {
@@ -169,15 +146,13 @@ export default class SocketServer {
     } else {
       return this.sockWrite('ok');
     }
-  } // send message to connecting socket
-
+  }
 
+  // send message to connecting socket
   send(connection, message) {
     if (connection.readyState !== 1) {
       return;
     }
-
     connection.send(message);
   }
-
 }

package/dist/js/modern/dev-tools/https/index.js

@@ -1,11 +1,9 @@
 import * as devcert from 'devcert';
 export const genHttpsOptions = async userOptions => {
   const httpsOptions = typeof userOptions === 'boolean' ? {} : userOptions;
-
   if (!httpsOptions.key || !httpsOptions.cert) {
     const selfsign = await devcert.certificateFor(['localhost']);
     return selfsign;
   }
-
   return httpsOptions;
 };

package/dist/js/modern/dev-tools/mock/getMockData.js

@@ -1,16 +1,12 @@
 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 { compatRequire } from '@modern-js/utils';
 import { match } from 'path-to-regexp';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-const VALID_METHODS = ['get', 'post', 'put', 'delete', 'patch']; // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+const VALID_METHODS = ['get', 'post', 'put', 'delete', 'patch'];
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const BODY_PARSED_METHODS = ['post', 'put', 'delete', 'patch'];
-
 const createFunctionDataHandler = (method, handler) => async (context, next) => {
   const {
     req,
@@ -18,7 +14,6 @@ const createFunctionDataHandler = (method, handler) => async (context, next) =>
   } = context;
   return handler(req, res, next);
 };
-
 const createStaticDataHandler = (method, handler) => context => {
   const {
     res
@@ -26,19 +21,14 @@ const createStaticDataHandler = (method, handler) => context => {
   res.setHeader('Content-Type', 'application/json');
   res.end(JSON.stringify(handler));
 };
-
 const allowTypes = ['object', 'function'];
-
 const normalizeConfig = mockConfig => Object.keys(mockConfig).reduce((acc, key) => {
   const handler = mockConfig[key];
   const type = typeof handler;
-
   if (!allowTypes.includes(type)) {
     throw new Error(`mock value of ${key} should be object or function, but got ${type}`);
   }
-
   const meta = parseKey(key);
-
   if (type === 'object') {
     acc.push(_objectSpread(_objectSpread({}, meta), {}, {
       handler: createStaticDataHandler(meta.method, handler)
@@ -48,38 +38,31 @@ const normalizeConfig = mockConfig => Object.keys(mockConfig).reduce((acc, key)
       handler: createFunctionDataHandler(meta.method, handler)
     }));
   }
-
   return acc;
 }, []);
-
 const _blank = ' ';
-
 const parseKey = key => {
   // 'Method /pathname' | '/pathname'
   const splitted = key.split(_blank).filter(Boolean);
-
   if (splitted.length > 1) {
     const [method, pathname] = splitted;
     return {
       method: method.toLowerCase(),
       path: pathname
     };
-  } // default return get method
-
+  }
 
+  // default return get method
   return {
     method: 'get',
     path: key
   };
 };
-
 export default (filepath => {
   const mockModule = compatRequire(filepath);
-
   if (!mockModule) {
     throw new Error(`Mock file ${filepath} parsed failed!`);
   }
-
   const data = normalizeConfig(mockModule);
   return data;
 });
@@ -93,14 +76,12 @@ export const getMatched = (context, mockApiList) => {
       method,
       path: pathname
     } = mockApi;
-
     if (method.toLowerCase() === targetMethod.toLowerCase()) {
       return match(pathname, {
         encode: encodeURI,
         decode: decodeURIComponent
       })(targetPathname);
     }
-
     return false;
   });
   return matched;

package/dist/js/modern/dev-tools/mock/index.js

@@ -7,36 +7,28 @@ export const createMockHandler = ({
 }) => {
   const exts = ['.ts', '.js'];
   let filepath = '';
-
   for (const ext of exts) {
     const maybeMatch = path.join(pwd, `${AGGRED_DIR.mock}/index${ext}`);
-
     if (fs.existsSync(maybeMatch)) {
       filepath = maybeMatch;
       break;
     }
   }
-
   if (!filepath) {
     return null;
   }
-
   const apiList = getMockData(filepath);
-
   if (!apiList || apiList.length === 0) {
     return null;
   }
-
   return async (context, next) => {
     const {
       res
     } = context;
     const matched = getMatched(context, apiList);
-
     if (!matched) {
       return next();
     }
-
     res.setHeader('Access-Control-Allow-Origin', '*');
     return matched.handler(context, next);
   };

package/dist/js/modern/dev-tools/register/index.js

@@ -1,27 +1,21 @@
 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 path from 'path';
 import { resolveBabelConfig } from '@modern-js/server-utils';
 import { fs, getAliasConfig, createDebugger } from '@modern-js/utils';
 const debug = createDebugger('server');
-
 const checkDep = (depName, paths) => {
   let packagePath = '';
-
   try {
     packagePath = require.resolve(depName, {
       paths
     });
   } catch (error) {}
-
   return Boolean(packagePath);
 };
-
-export const enableRegister = (projectRoot, config // eslint-disable-next-line consistent-return
+export const enableRegister = (projectRoot, config
+// eslint-disable-next-line consistent-return
 ) => {
   const registerDirs = ['./api', './server', './config/mock', './shared'];
   const TS_CONFIG_FILENAME = `tsconfig.json`;
@@ -29,17 +23,12 @@ export const enableRegister = (projectRoot, config // eslint-disable-next-line c
   const isTsProject = fs.existsSync(tsconfigPath);
   const existTsNode = checkDep('ts-node', [projectRoot]);
   const existTsConfigPaths = checkDep('tsconfig-paths', [projectRoot]);
-
   if (isTsProject && existTsNode && existTsConfigPaths) {
-    var _config$output;
-
+    var _config$output$distPa;
     debug('use ts-node');
-    const distPath = (config === null || config === void 0 ? void 0 : (_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist';
-
+    const distPath = ((_config$output$distPa = config.output.distPath) === null || _config$output$distPa === void 0 ? void 0 : _config$output$distPa.root) || 'dist';
     const tsNode = require('ts-node');
-
     const tsConfigPaths = require('tsconfig-paths');
-
     const {
       alias
     } = config.source;
@@ -53,15 +42,12 @@ export const enableRegister = (projectRoot, config // eslint-disable-next-line c
     } = aliasConfig;
     const tsPaths = Object.keys(paths).reduce((o, key) => {
       let tsPath = paths[key];
-
       if (typeof tsPath === 'string' && path.isAbsolute(tsPath)) {
         tsPath = path.relative(absoluteBaseUrl, tsPath);
       }
-
       if (typeof tsPath === 'string') {
         tsPath = [tsPath];
       }
-
       return _objectSpread(_objectSpread({}, o), {}, {
         [`${key}`]: tsPath
       });
@@ -79,11 +65,11 @@ export const enableRegister = (projectRoot, config // eslint-disable-next-line c
     });
   } else {
     var _config$tools, _config$server;
-
     debug('use @babel/register');
     const babelConfig = resolveBabelConfig(projectRoot, _objectSpread(_objectSpread({}, config.source), {}, {
       babelConfig: (_config$tools = config.tools) === null || _config$tools === void 0 ? void 0 : _config$tools.babel,
       server: {
+        // FIXME: the compiler config from ??
         compiler: (_config$server = config.server) === null || _config$server === void 0 ? void 0 : _config$server.compiler
       }
     }), {
@@ -98,7 +84,6 @@ export const enableRegister = (projectRoot, config // eslint-disable-next-line c
         if (filePath.includes(`node_modules${path.sep}.modern-js`)) {
           return true;
         }
-
         return registerDirs.some(registerDir => filePath.startsWith(path.join(projectRoot, registerDir)));
       }],
       extensions: ['.js', '.ts'],

package/dist/js/modern/dev-tools/watcher/dependency-tree.js

@@ -1,8 +1,6 @@
 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 minimatch from 'minimatch';
 export const defaultIgnores = ['**/bower_components/**', '**/coverage/**', '**/node_modules/**', '**/.*/**', '**/*.d.ts', '**/*.log'];
-
 /**
  * `require.cache` already is a dependency tree, however require cache's
  * `module.parent` is the module that first required. so we have to implement
@@ -11,26 +9,23 @@ export const defaultIgnores = ['**/bower_components/**', '**/coverage/**', '**/n
 export class DependencyTree {
   constructor() {
     _defineProperty(this, "tree", void 0);
-
     _defineProperty(this, "ignore", void 0);
-
     this.tree = new Map();
     this.ignore = [...defaultIgnores];
   }
-
   getNode(path) {
     return this.tree.get(path);
   }
+
   /**
    * update dependency tree
    *
    * @param cache
    */
-
-
   update(cache) {
-    this.tree.clear(); // insert all module that not ignored
+    this.tree.clear();
 
+    // insert all module that not ignored
     Object.keys(cache).forEach(path => {
       if (!this.shouldIgnore(path)) {
         const module = cache[path];
@@ -40,8 +35,9 @@ export class DependencyTree {
           children: new Set()
         });
       }
-    }); // update treeNode parent and children
+    });
 
+    // update treeNode parent and children
     for (const treeNode of this.tree.values()) {
       const {
         parent
@@ -49,19 +45,15 @@ export class DependencyTree {
       const {
         children
       } = treeNode.module;
-
       if (parent && !this.shouldIgnore(parent.filename)) {
         const parentTreeNode = this.tree.get(parent.filename);
-
         if (parentTreeNode) {
           treeNode.parent.add(parentTreeNode);
         }
       }
-
       children.forEach(child => {
         if (!this.shouldIgnore(child.filename)) {
           const childTreeNode = this.tree.get(child.filename);
-
           if (childTreeNode) {
             treeNode.children.add(childTreeNode);
             childTreeNode.parent.add(treeNode);
@@ -70,9 +62,7 @@ export class DependencyTree {
       });
     }
   }
-
   shouldIgnore(path) {
     return !path || Boolean(this.ignore.find(rule => minimatch.match([path], rule).length > 0));
   }
-
 }

package/dist/js/modern/dev-tools/watcher/index.js

@@ -1,9 +1,6 @@
 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 path from 'path';
 import { fs, chokidar } from '@modern-js/utils';
 import { DependencyTree } from "./dependency-tree";
@@ -25,29 +22,23 @@ export const getWatchedFiles = watcher => {
 };
 export const mergeWatchOptions = options => {
   const watchOptions = _objectSpread({}, options);
-
   if (watchOptions) {
     const {
       ignored
     } = watchOptions;
     const finalIgnored = ignored ? [defaultWatchOptions.ignored, ...(Array.isArray(ignored) ? ignored : [ignored])] : ignored;
-
     if (finalIgnored) {
       watchOptions.ignored = finalIgnored;
     }
   }
-
   const finalWatchOptions = _objectSpread(_objectSpread({}, defaultWatchOptions), watchOptions);
-
   return finalWatchOptions;
 };
 export default class Watcher {
   constructor() {
     _defineProperty(this, "dependencyTree", null);
-
     _defineProperty(this, "watcher", void 0);
   }
-
   listen(files, options, callback) {
     const watched = files.filter(Boolean);
     const filenames = watched.map(filename => filename.replace(/\\/g, '/'));
@@ -74,33 +65,24 @@ export default class Watcher {
     });
     this.watcher = watcher;
   }
-
   createDepTree() {
     this.dependencyTree = new DependencyTree();
   }
-
   updateDepTree() {
     var _this$dependencyTree;
-
     (_this$dependencyTree = this.dependencyTree) === null || _this$dependencyTree === void 0 ? void 0 : _this$dependencyTree.update(require.cache);
   }
-
   cleanDepCache(filepath) {
     var _this$dependencyTree2;
-
     const node = (_this$dependencyTree2 = this.dependencyTree) === null || _this$dependencyTree2 === void 0 ? void 0 : _this$dependencyTree2.getNode(filepath);
-
     if (node && require.cache[filepath]) {
       delete require.cache[filepath];
-
       for (const parentNode of node.parent.values()) {
         this.cleanDepCache(parentNode.module.filename);
       }
     }
   }
-
   close() {
     return this.watcher.close();
   }
-
 }

package/dist/js/modern/dev-tools/watcher/stats-cache.js

@@ -1,24 +1,19 @@
 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 crypto from 'crypto';
 export class StatsCache {
   constructor() {
     _defineProperty(this, "cachedHash", {});
-
     _defineProperty(this, "cachedSize", {});
   }
-
   add(files) {
     const {
       cachedHash,
       cachedSize
     } = this;
-
     for (const filename of files) {
       if (fs.existsSync(filename)) {
         const stats = fs.statSync(filename);
-
         if (stats.isFile() && !cachedHash[filename]) {
           cachedHash[filename] = this.hash(stats, filename);
           cachedSize[filename] = stats.size;
@@ -26,30 +21,25 @@ export class StatsCache {
       }
     }
   }
-
   refresh(filename) {
     const {
       cachedHash,
       cachedSize
     } = this;
-
     if (fs.existsSync(filename)) {
       const stats = fs.statSync(filename);
-
       if (stats.isFile()) {
         cachedHash[filename] = this.hash(stats, filename);
         cachedSize[filename] = stats.size;
       }
     }
   }
-
   del(filename) {
     if (this.cachedHash[filename]) {
       delete this.cachedHash[filename];
       delete this.cachedSize[filename];
     }
   }
-
   isDiff(filename) {
     const {
       cachedHash,
@@ -58,24 +48,18 @@ export class StatsCache {
     const stats = fs.statSync(filename);
     const hash = cachedHash[filename];
     const size = cachedSize[filename];
-
     if (stats.size !== size) {
       return true;
     }
-
     if (this.hash(stats, filename) !== hash) {
       return true;
     }
-
     return false;
   }
-
   has(filename) {
     return Boolean(this.cachedHash[filename]);
   }
-
   hash(stats, filename) {
     return crypto.createHash('md5').update(fs.readFileSync(filename)).digest('hex');
   }
-
 }

package/dist/js/modern/index.js

@@ -4,7 +4,6 @@ export default (options => {
   if (options == null) {
     throw new Error('can not start mserver without options');
   }
-
   const server = new Server(options);
   return server.init();
 });