ee-core 2.12.0 → 4.0.0

package/utils/is.js

@@ -1,146 +1,112 @@
-'use strict'
+'use strict';
 
-const semver = require('semver')
-const gt = semver.gt
-const lt = semver.lt
-const release = require('os').release
+// Checks if we are in renderer process
+function renderer () {
+  return process.type === 'renderer'
+}
+
+// Checks if we are in main process
+function main() {
+  return process.type === 'browser'
+}
+
+// Checks if we are under Mac OS
+function osx() {
+  return process.platform === 'darwin'
+}
+
+// Checks if we are under Mac OS
+function macOS() {
+  return osx()
+}
+
+// Checks if we are under Windows OS
+function windows() {
+  return process.platform === 'win32'
+}
+
+// Checks if we are under Linux OS
+function linux() {
+  return process.platform === 'linux'
+}
+
+// Checks if we are the processor's arch is x86
+function x86() {
+  return process.arch === 'ia32'
+}
+
+// Checks if we are the processor's arch is x64
+function x64() {
+  return process.arch === 'x64'
+}
+
+// Checks if the app is running in a sandbox on macOS
+function sandbox() {
+  return 'APP_SANDBOX_CONTAINER_ID' in process.env
+}
+
+// Checks if the app is running as a Mac App Store build
+function mas() {
+  return process.mas === true
+}
+
+// Checks if the app is running as a Windows Store (appx) build
+function windowsStore() {
+  return process.windowsStore === true
+}
 
-const IS = {
-  // Checks if we are in renderer process
-  renderer() {
-    return process.type === 'renderer'
-  },
-  // Checks if we are in main process
-  main() {
-    return process.type === 'browser'
-  },
-  // Checks if we are under Mac OS
-  osx() {
-    return process.platform === 'darwin'
-  },
-  // Checks if we are under Mac OS
-  macOS() {
-    return this.osx()
-  },
-  // Checks if we are under Windows OS
-  windows() {
-    return process.platform === 'win32'
-  },
-  // Checks if we are under Linux OS
-  linux() {
-    return process.platform === 'linux'
-  },
-  // Checks if we are the processor's arch is x86
-  x86() {
-    return process.arch === 'ia32'
-  },
-  // Checks if we are the processor's arch is x64
-  x64() {
-    return process.arch === 'x64'
-  },
-  // Checks if the app is running in a sandbox on macOS
-  sandbox() {
-    return 'APP_SANDBOX_CONTAINER_ID' in process.env
-  },
-  // Checks if the app is running as a Mac App Store build
-  mas() {
-    return process.mas === true
-  },
-  // Checks if the app is running as a Windows Store (appx) build
-  windowsStore() {
-    return process.windowsStore === true
-  },
-  // checks if all the 'is functions' passed as arguments are true
-  all() {
-    const isFunctions = new Array(arguments.length)
-    for (var i = 0; i < isFunctions.length; i++) {
-      isFunctions[i] = arguments[i]
-    }
-    if (!isFunctions.length) return
-    for (i = 0; i < isFunctions.length; i++) {
-      if (!isFunctions[i]()) return false
-    }
-    return true
-  },
-  // checks if all the 'is functions' passed as arguments are false
-  none() {
-    const isFunctions = new Array(arguments.length)
-    for (var i = 0; i < isFunctions.length; i++) {
-      isFunctions[i] = arguments[i]
-    }
-    if (!isFunctions.length) return
-    for (i = 0; i < isFunctions.length; i++) {
-      if (isFunctions[i]()) return false
-    }
-    return true
-  },
-  // returns true if one of the 'is functions' passed as argument is true
-  one() {
-    const isFunctions = new Array(arguments.length)
-    for (var i = 0; i < isFunctions.length; i++) {
-      isFunctions[i] = arguments[i]
-    }
-    if (!isFunctions.length) return
-    for (i = 0; i < isFunctions.length; i++) {
-      if (isFunctions[i]()) return true
-    }
-    return false
-  },
-  // checks the if the given release is the same of the OS
-  release(requested) {
-    if (this.osx()) {
-      return requested === this._osxRelease()
-    } else if (this.windows()) {
-      requested = requested.split('.')
-      const actual = release().split('.')
-      if (requested.length === 2) {
-        return `${actual[0]}.${actual[1]}` === `${requested[0]}.${requested[1]}`
-      }
-      return `${actual[0]}.${actual[1]}.${actual[2]}` === `${requested[0]}.${requested[1]}.${requested[2]}`
-    } else {
-      // Not implemented for Linux yet
-      return null
-    }
-  },
-  // checks if the given release is greater than the current OS release
-  gtRelease(requested) {
-    if (this.osx()) {
-      return gt(requested, this._osxRelease())
-    } else if (this.windows()) {
-      requested = requested.split('.')
-      const actual = release().split('.')
-      if (requested.length === 2) {
-        return gt(`${requested[0]}.${requested[1]}.0`, `${actual[0]}.${actual[1]}.0`)
-      }
-      return gt(`${requested[0]}.${requested[1]}.${requested[2]}`, `${actual[0]}.${actual[1]}.${actual[2]}`)
-    } else {
-      // Not implemented for Linux yet
-      return null
-    }
-  },
-  // checks if the given release is less than the current OS release
-  ltRelease(requested) {
-    if (this.osx()) {
-      return lt(requested, this._osxRelease())
-    } else if (this.windows()) {
-      requested = requested.split('.')
-      const actual = release().split('.')
-      if (requested.length === 2) {
-        return lt(`${requested[0]}.${requested[1]}.0`, `${actual[0]}.${actual[1]}.0`)
-      }
-      return lt(`${requested[0]}.${requested[1]}.${requested[2]}`, `${actual[0]}.${actual[1]}.${actual[2]}`)
-    } else {
-      // Not implemented for Linux yet
-      return null
-    }
-  },
+// checks if all the 'is functions' passed as arguments are true
+function all() {
+  const isFunctions = new Array(arguments.length)
+  for (var i = 0; i < isFunctions.length; i++) {
+    isFunctions[i] = arguments[i]
+  }
+  if (!isFunctions.length) return
+  for (i = 0; i < isFunctions.length; i++) {
+    if (!isFunctions[i]()) return false
+  }
+  return true
+}
+
+// checks if all the 'is functions' passed as arguments are false
+function none() {
+  const isFunctions = new Array(arguments.length)
+  for (var i = 0; i < isFunctions.length; i++) {
+    isFunctions[i] = arguments[i]
+  }
+  if (!isFunctions.length) return
+  for (i = 0; i < isFunctions.length; i++) {
+    if (isFunctions[i]()) return false
+  }
+  return true
+}
 
-  // returns the current osx release
-  _osxRelease () {
-    const actual = release().split('.')
-    return `10.${actual[0] - 4}.${actual[1]}`
-  },
-  
+// returns true if one of the 'is functions' passed as argument is true
+function one() {
+  const isFunctions = new Array(arguments.length)
+  for (var i = 0; i < isFunctions.length; i++) {
+    isFunctions[i] = arguments[i]
+  }
+  if (!isFunctions.length) return
+  for (i = 0; i < isFunctions.length; i++) {
+    if (isFunctions[i]()) return true
+  }
+  return false
 }
 
-module.exports = IS;
+module.exports = {
+  renderer,
+  main,
+  osx,
+  macOS,
+  windows,
+  linux,
+  x86,
+  x64,
+  sandbox,
+  mas,
+  windowsStore,
+  all,
+  none,
+  one,
+};

package/utils/json.d.ts

@@ -0,0 +1,5 @@
+export declare function strictParse(str: string): {};
+export declare function readSync(filepath: string): any;
+export declare function writeSync(filepath: string, str: string, options: any): void;
+export declare function read(filepath: string): any;
+export declare function write(filepath: string, str: string, options: any): Promise<void>;

package/utils/json.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const mkdirp = require('mkdirp');
 
-exports.strictParse = function (str) {
+function strictParse(str) {
   const obj = JSON.parse(str);
   if (!obj || typeof obj !== 'object') {
     throw new Error('JSON string is not object');
@@ -10,14 +10,14 @@ exports.strictParse = function (str) {
   return obj;
 };
 
-exports.readSync = function(filepath) {
+function readSync(filepath) {
   if (!fs.existsSync(filepath)) {
     throw new Error(filepath + ' is not found');
   }
   return JSON.parse(fs.readFileSync(filepath));
 };
 
-exports.writeSync = function(filepath, str, options) {
+function writeSync(filepath, str, options) {
   options = options || {};
   if (!('space' in options)) {
     options.space = 2;
@@ -31,7 +31,7 @@ exports.writeSync = function(filepath, str, options) {
   fs.writeFileSync(filepath, str);
 };
 
-exports.read = function(filepath) {
+function read(filepath) {
   return fs.stat(filepath)
     .then(function(stats) {
       if (!stats.isFile()) {
@@ -44,7 +44,7 @@ exports.read = function(filepath) {
     });
 };
 
-exports.write = function(filepath, str, options) {
+function write(filepath, str, options) {
   options = options || {};
   if (!('space' in options)) {
     options.space = 2;
@@ -54,13 +54,13 @@ exports.write = function(filepath, str, options) {
     str = JSON.stringify(str, options.replacer, options.space) + '\n';
   }
 
-  return mkdir(path.dirname(filepath))
+  return _mkdir(path.dirname(filepath))
     .then(function() {
       return fs.writeFile(filepath, str);
     });
 };
 
-function mkdir(dir) {
+function _mkdir(dir) {
   return new Promise(function(resolve, reject) {
     mkdirp(dir, function(err) {
       if (err) {
@@ -70,3 +70,11 @@ function mkdir(dir) {
     });
   });
 }
+
+module.exports = {
+  strictParse,
+  readSync,
+  writeSync,
+  read,
+  write
+}

package/utils/pargv.d.ts

@@ -0,0 +1,3 @@
+export declare function parseArgv(args: any, opts: any): {
+    _: any[];
+};

package/utils/pargv.js

@@ -20,7 +20,7 @@ function isConstructorOrProto(obj, key) {
 	return (key === 'constructor' && typeof obj[key] === 'function') || key === '__proto__';
 }
 
-module.exports = function (args, opts) {
+function parseArgv(args, opts) {
 	if (!opts) { opts = {}; }
 
 	var flags = {
@@ -261,3 +261,7 @@ module.exports = function (args, opts) {
 
 	return argv;
 };
+
+module.exports = {
+  parseArgv
+}

package/utils/port/index.d.ts

@@ -0,0 +1 @@
+export declare function getPort(options?: any): Promise<any>;

package/utils/{get-port → port}/index.js

@@ -77,7 +77,7 @@ const portCheckSequence = function * (ports) {
 	yield 0; // Fall back to 0 if anything else failed
 };
 
-module.exports = async options => {
+async function getPort(options) {
 	let ports;
 
 	if (options) {
@@ -121,28 +121,6 @@ module.exports = async options => {
 	throw new Error('No available ports found');
 };
 
-module.exports.makeRange = (from, to) => {
-	if (!Number.isInteger(from) || !Number.isInteger(to)) {
-		throw new TypeError('`from` and `to` must be integer numbers');
-	}
-
-	if (from < 1024 || from > 65535) {
-		throw new RangeError('`from` must be between 1024 and 65535');
-	}
-
-	if (to < 1024 || to > 65536) {
-		throw new RangeError('`to` must be between 1024 and 65536');
-	}
-
-	if (to < from) {
-		throw new RangeError('`to` must be greater than or equal to `from`');
-	}
-
-	const generator = function * (from, to) {
-		for (let port = from; port <= to; port++) {
-			yield port;
-		}
-	};
-
-	return generator(from, to);
-};
+module.exports = {
+	getPort
+}

package/utils/wrap.d.ts

@@ -0,0 +1,4 @@
+export declare function getProperties(filepath: any, { caseStyle }: {
+    caseStyle: any;
+}): any;
+export declare function defaultCamelize(filepath: any, caseStyle: any): any;

package/utils/wrap.js

@@ -1,7 +1,7 @@
 const assert = require('assert');
 const is = require('is-type-of');
 
-exports.getProperties = (filepath, { caseStyle }) => {
+function getProperties(filepath, { caseStyle }) {
   // if caseStyle is function, return the result of function
   if (is.function(caseStyle)) {
     const result = caseStyle(filepath);
@@ -9,10 +9,10 @@ exports.getProperties = (filepath, { caseStyle }) => {
     return result;
   }
   // use default camelize
-  return this.defaultCamelize(filepath, caseStyle);
+  return defaultCamelize(filepath, caseStyle);
 }
 
-exports.defaultCamelize = (filepath, caseStyle) => {
+function defaultCamelize(filepath, caseStyle) {
   const properties = filepath.substring(0, filepath.lastIndexOf('.')).split('/');
   return properties.map(property => {
     if (!/^[a-z][a-z0-9_-]*$/i.test(property)) {
@@ -33,4 +33,9 @@ exports.defaultCamelize = (filepath, caseStyle) => {
     }
     return first + property.substring(1);
   });
+}
+
+module.exports = {
+  getProperties,
+  defaultCamelize,
 }

package/addon/index.js

@@ -1,35 +0,0 @@
-const EE = require('../ee');
-
-const Addon = {
-
-  /**
-   * 获取 all addon instances
-   */  
-  all() {
-    const { CoreApp } = EE;
-    if (!CoreApp) {
-      throw new Error('An unknown error or Addons cannot be used by the jobs!');
-    }
-
-    const instances = CoreApp.addon || null;
-    if (!instances) {
-      throw new Error('Addons not exists or do not call directly at the top!');
-    };
-    return instances;
-  },
-
-  /**
-   * 获取 addon instance
-   */  
-  get(name) {
-    const instances = this.all();
-    const instance = instances[name] || null;
-    if (!instance) {
-      throw new Error(`Addon class '${name}' not exists or do not call directly at the top!`);
-    };
-    return instance;
-  },
- 
-};
-
-module.exports = Addon;

package/addon/window/index.js

@@ -1,99 +0,0 @@
-const { BrowserWindow } = require('electron');
-const extend = require('../../utils/extend');
-
-/**
- * 窗口插件
- * @class
- */
-class WinAddon {
-
-  constructor(app) {
-    this.app = app;
-    this.windowContentsIdMap = {};
-  }
-
-  /**
-   * create window
-   *
-   * @function 
-   * @since 1.0.0
-   */
-  create(name, opt) {
-
-    // todo 判断name是否唯一
-    // if (this.windowContentsIdMap.hasOwnProperty(name)) {
-    //   throw new Error(`[addon] [window] Name: ${name} already exists!`);
-    // }
- 
-    const options = extend(true, {}, {
-      x: 10,
-      y: 10,
-      width: 980, 
-      height: 650,
-      webPreferences: {
-        contextIsolation: false,
-        nodeIntegration: true,
-      },
-    }, opt);
-    const win = new BrowserWindow(options)
-    
-    const winContentsId = win.webContents.id;
-    win.webContents.on('did-finish-load', () => {
-      this.registerWCid(name, winContentsId);
-    })
- 
-    win.webContents.on('destroyed', () => {
-      this.removeWCid(name);
-    })
-
-    win.webContents.on('render-process-gone', (event, details) => {
-      this.removeWCid(name);
-    })
-
-    return win;
-  }
-
-  /**
-   * 获取窗口Contents id
-   *
-   * @function 
-   * @since 1.0.0
-   */
-  getWCid(name) {
-    const id = this.windowContentsIdMap[name] || null;
-    return id;
-  }
-
-  /**
-   * 获取主窗口Contents id
-   *
-   * @function 
-   * @since 1.0.0
-   */
-  getMWCid() {
-    const id = this.windowContentsIdMap['main'] || null;
-    return id;
-  }
-
-  /**
-   * 注册窗口Contents id
-   *
-   * @function 
-   * @since 1.0.0
-   */
-  registerWCid(name, id) {
-    this.windowContentsIdMap[name] = id;
-  }
-
-  /**
-   * 销毁窗口Contents id
-   *
-   * @function 
-   * @since 1.0.0
-   */
-   removeWCid(name) {
-    delete this.windowContentsIdMap[name];
-  }  
-}
-
-module.exports = WinAddon;

package/bin/tools.js

@@ -1,8 +0,0 @@
-#!/usr/bin/env node
-
-const chalk = require('chalk');
-
-let tip = chalk.bgYellow('Warning') + ' please use ' + chalk.blue('ee-bin') + ', See: ';
-tip += chalk.underline('https://www.kaka996.com/pages/e1816f/');
-
-console.log(tip);

package/config/cache.js

@@ -1,62 +0,0 @@
-const EE = require('../ee');
-const { ConfigLoader } = require('./config_loader');
-
-const Instance = {
-  config: null,
-};
-
-const conf = {
-
-  loadConfig() {
-    const configLoader = new ConfigLoader();
-    Instance["config"] = configLoader.load();
-    return Instance["config"];
-  },
-
-  /**
-   * 获取 内存中的config
-   */
-  _getConfig() {
-    const { CoreApp } = EE;
-
-    if (CoreApp && CoreApp.config) {
-      return CoreApp.config;
-    }
-
-    if (Instance["config"]) {
-      return Instance["config"];
-    }
-
-    // 重新加载 config
-    this.loadConfig();
-
-    if (!Instance["config"]) {
-      throw new Error('[ee-core] [config] config is not loaded!');
-    }
-
-    return Instance["config"];
-  },
-
-  /**
-   * all
-   */
-  all() {
-    return this._getConfig();
-  },
-
-  /**
-   * getValue
-   */
-  getValue(key) {
-    const v = this._objectGet(this._getConfig(), key);
-    return v;
-  }, 
-  
-  _objectGet(object, path, defaultValue) {
-    const pathParts = Array.isArray(path) ? path : path.split('.');
-    const value = pathParts.reduce((obj, key) => obj && key in obj ? obj[key] : undefined, object);
-    return value === undefined ? defaultValue : value;
-  }
-};
-
-module.exports = conf;