nodefony 7.0.0-beta.2 → 7.0.0-beta.21

package/container.es6

@@ -1,4 +1,4 @@
-const shortId = require('shortid');
+const shortId = require("shortid");
 
 
 const ISDefined = function (ele) {
@@ -23,12 +23,10 @@ const parseParameterString = function (str, value) {
       ns = Array.prototype.shift.call(str);
       if (!this[ns]) {
         this[ns] = value;
+      } else if (ISDefined(value)) {
+        this[ns] = value;
       } else {
-        if (ISDefined(value)) {
-          this[ns] = value;
-        } else {
-          return this[ns];
-        }
+        return this[ns];
       }
       return value;
     default:
@@ -40,7 +38,7 @@ const parseParameterString = function (str, value) {
     }
     break;
   default:
-    return this; //nodefony.extend(true, this, this.prototype);
+    return this; // nodefony.extend(true, this, this.prototype);
   }
 };
 
@@ -50,28 +48,27 @@ const parseParameterString = function (str, value) {
  *
  */
 class Container {
-
-  constructor(services, parameters) {
-    this.protoService = function protoService() {};
-    this.protoParameters = function protoParameters() {};
+  constructor (services, parameters) {
+    this.protoService = function protoService () {};
+    this.protoParameters = function protoParameters () {};
     this.id = generateId();
     this.scope = {};
     this.services = new this.protoService();
     if (services && typeof services === "object") {
-      for (let service in services) {
+      for (const service in services) {
         this.set(service, services[service]);
       }
     }
     this.parameters = new this.protoParameters();
     if (parameters && typeof parameters === "object") {
-      for (let parameter in parameters) {
+      for (const parameter in parameters) {
         this.setParameters(parameter, parameters[parameter]);
       }
     }
   }
 
-  log(pci, severity, msgid, msg) {
-    let syslog = this.get("syslog");
+  log (pci, severity, msgid, msg) {
+    const syslog = this.get("syslog");
     if (!syslog) {
       console.log(pci);
       return;
@@ -82,29 +79,29 @@ class Container {
     return syslog.log(pci, severity, msgid, msg);
   }
 
-  set(name, object) {
+  set (name, object) {
     if (name) {
       return this.protoService.prototype[name] = object;
     }
     throw new Error("Container bad argument name");
   }
 
-  get(name) {
+  get (name) {
     if (name in this.services) {
       return this.services[name];
     }
     return null;
   }
 
-  remove(name) {
+  remove (name) {
     if (this.get(name)) {
       delete this.services[name];
       if (this.protoService.prototype[name]) {
         delete this.protoService.prototype[name];
       }
-      for (let scope in this.scope) {
-        let subScopes = this.scope[scope];
-        for (let subScope in subScopes) {
+      for (const scope in this.scope) {
+        const subScopes = this.scope[scope];
+        for (const subScope in subScopes) {
           subScopes[subScope].remove(name);
         }
       }
@@ -113,78 +110,77 @@ class Container {
     return false;
   }
 
-  has(name) {
+  has (name) {
     return this.services[name];
   }
 
-  addScope(name) {
+  addScope (name) {
     if (!this.scope[name]) {
       return this.scope[name] = {};
     }
     return this.scope[name];
   }
 
-  enterScope(name) {
-    let sc = new Scope(name, this);
+  enterScope (name) {
+    const sc = new Scope(name, this);
     this.scope[name][sc.id] = sc;
     return sc;
   }
 
-  enterScopeExtended(name) {
-    let sc = new ExtendedScope(name, this);
+  enterScopeExtended (name) {
+    const sc = new ExtendedScope(name, this);
     this.scope[name][sc.id] = sc;
     return sc;
   }
 
-  leaveScope(scope) {
+  leaveScope (scope) {
     if (this.scope[scope.name]) {
       let sc = this.scope[scope.name][scope.id];
       if (sc) {
         sc.clean();
-        //console.log("pass leaveScope "+ scope.id)
+        // console.log("pass leaveScope "+ scope.id)
         delete this.scope[scope.name][scope.id];
         sc = null;
       }
-      //console.log(this.scope)
+      // console.log(this.scope)
     }
   }
 
-  removeScope(name) {
+  removeScope (name) {
     if (this.scope[name]) {
-      for (let scope in this.scope[name]) {
+      for (const scope in this.scope[name]) {
         this.leaveScope(this.scope[name][scope]);
       }
       delete this.scope[name];
     }
   }
 
-  setParameters(name, str) {
+  setParameters (name, str) {
     if (typeof name !== "string") {
       this.log(new Error("setParameters : container parameter name must be a string"));
       return false;
     }
     if (str === undefined) {
-      this.log(new Error("setParameters : " + name + " container parameter value must be define"));
+      this.log(new Error(`setParameters : ${name} container parameter value must be define`));
       return false;
     }
     if (parseParameterString.call(this.protoParameters.prototype, name, str) === str) {
       return str;
-    } else {
-      this.log(new Error("container parameter " + name + " parse error"));
-      return false;
     }
+    this.log(new Error(`container parameter ${name} parse error`));
+    return false;
   }
 
-  getParameters(name) {
-    /*if (typeof name !== "string") {
+  getParameters (name) {
+    /* if (typeof name !== "string") {
       this.log(new Error("container parameter name must be a string"));
       return false;
     }*/
-    //return parseParameterString.call(this.protoParameters.prototype, name, null);
+    // return parseParameterString.call(this.protoParameters.prototype, name, null);
     return parseParameterString.call(this.parameters, name, null);
   }
 
-  clean() {
+  clean () {
     this.services = null;
     delete this.services;
     this.parameters = null;
@@ -199,34 +195,32 @@ class Container {
  */
 
 class Scope extends Container {
-
-  constructor(name, parent) {
+  constructor (name, parent) {
     super();
     this.name = name;
     this.parent = parent;
     this.services = new parent.protoService();
     this.parameters = new parent.protoParameters();
     this.scope = parent.scope;
-    //this.id = generateId();
+    // this.id = generateId();
   }
 
-  set(name, obj) {
+  set (name, obj) {
     this.services[name] = obj;
     return super.set(name, obj);
   }
 
-  clean() {
+  clean () {
     this.parent = null;
     return super.clean();
   }
 
-  setParameters(name, str) {
+  setParameters (name, str) {
     if (parseParameterString.call(this.parameters, name, str) === str) {
       return super.setParameters(name, str);
-    } else {
-      this.log(new Error("container parameter " + name + " parse error"));
-      return false;
     }
+    this.log(new Error(`container parameter ${name} parse error`));
+    return false;
   }
 }
 
@@ -236,15 +230,14 @@ class Scope extends Container {
  *
  */
 class ExtendedScope extends Container {
-
-  constructor(name, parent) {
+  constructor (name, parent) {
     super();
     this.name = name;
     this.parent = parent;
     this.services = new parent.protoService();
     this.parameters = new parent.protoParameters();
     this.scope = parent.scope;
-    //this.id = generateId();
+    // this.id = generateId();
 
     this.protoService = function () {};
     this.protoService.prototype = nodefony.extend({}, this.parent.protoService.prototype);
@@ -253,7 +246,7 @@ class ExtendedScope extends Container {
     this.protoParameters.prototype = nodefony.extend({}, this.parent.protoParameters.prototype);
   }
 
-  clean() {
+  clean () {
     this.services = null;
     delete this.services;
     this.parameters = null;
@@ -262,18 +255,17 @@ class ExtendedScope extends Container {
     this.protoParameters = null;
   }
 
-  set(name, obj) {
+  set (name, obj) {
     this.services[name] = obj;
     return super.set(name, obj);
   }
 
-  setParameters(name, str) {
+  setParameters (name, str) {
     if (parseParameterString.call(this.parameters, name, str) === str) {
       return super.setParameters(name, str);
-    } else {
-      this.log(new Error("container parameter " + name + " parse error"));
-      return false;
     }
+    this.log(new Error(`container parameter ${name} parse error`));
+    return false;
   }
 }
 

package/error.es6

@@ -1,10 +1,10 @@
 const assert = require("assert");
-const STATUS_CODES = require("http").STATUS_CODES;
+const {STATUS_CODES} = require("http");
 const json = {
   configurable: true,
   writable: true,
-  value: function () {
-    let alt = {};
+  value () {
+    const alt = {};
     const storeKey = function (key) {
       alt[key] = this[key];
     };
@@ -12,22 +12,22 @@ const json = {
     return alt;
   }
 };
-Object.defineProperty(Error.prototype, 'toJSON', json);
+Object.defineProperty(Error.prototype, "toJSON", json);
 
 const exclude = {
-  context:true,
-  resolver:true,
-  container:true,
-  secure:true
+  context: true,
+  resolver: true,
+  container: true,
+  secure: true
 };
 const jsonNodefony = {
   configurable: true,
   writable: true,
-  value: function () {
-    let alt = {};
+  value () {
+    const alt = {};
     const storeKey = function (key) {
-      if (key in exclude){
-        return ;
+      if (key in exclude) {
+        return;
       }
       alt[key] = this[key];
     };
@@ -54,8 +54,7 @@ const isMongooseError = function (error) {
 };
 
 class nodefonyError extends Error {
-
-  constructor(message, code) {
+  constructor (message, code) {
     super(message);
     this.name = this.constructor.name;
     this.code = null;
@@ -68,11 +67,11 @@ class nodefonyError extends Error {
     }
   }
 
-  toJSON(){
+  toJSON () {
 
   }
 
-  static isError(error) {
+  static isError (error) {
     switch (true) {
     case error instanceof ReferenceError:
       return "ReferenceError";
@@ -102,7 +101,7 @@ class nodefonyError extends Error {
     return false;
   }
 
-  getType(error) {
+  getType (error) {
     const errorType = nodefony.Error.isError(error);
     if (errorType) {
       switch (errorType) {
@@ -170,8 +169,8 @@ class nodefonyError extends Error {
     return "Error";
   }
 
-  toString() {
-    let err = ``;
+  toString () {
+    let err = "";
     switch (this.errorType) {
     case "Error":
       if (kernel && kernel.environment === "prod") {
@@ -237,7 +236,7 @@ class nodefonyError extends Error {
     return err;
   }
 
-  parseMessage(message) {
+  parseMessage (message) {
     this.errorType = this.getType(message);
     switch (nodefony.typeOf(message)) {
     case "Error":
@@ -263,8 +262,8 @@ class nodefonyError extends Error {
         if (message.message) {
           this.message = message.message;
         } else {
-          //this.message = JSON.stringify(message);
-          this.message = util.inspect(message,{depth:0});
+          // this.message = JSON.stringify(message);
+          this.message = util.inspect(message, {depth: 0});
         }
       } catch (e) {
         this.error = e;
@@ -275,21 +274,20 @@ class nodefonyError extends Error {
     }
   }
 
-  getDefaultMessage() {
+  getDefaultMessage () {
     if (!this.message && this.code) {
-      let str = this.code.toString();
+      const str = this.code.toString();
       if (str in STATUS_CODES) {
         this.message = STATUS_CODES[str];
       }
     }
   }
 
-  logger() {
+  logger () {
     return console.log(this.toString());
   }
-
 }
 
-Object.defineProperty(nodefonyError.prototype, 'toJSON', jsonNodefony);
+Object.defineProperty(nodefonyError.prototype, "toJSON", jsonNodefony);
 
 module.exports = nodefonyError;

package/fileClass.es6

@@ -1,21 +1,20 @@
-const mime = require('mime');
-const crypto = require('crypto');
+const mime = require("mime");
+const crypto = require("crypto");
 const checkPath = function (myPath) {
   if (!myPath) {
     return null;
   }
-  let abs = path.isAbsolute(myPath);
+  const abs = path.isAbsolute(myPath);
   if (abs) {
     return myPath;
-  } else {
-    return path.resolve(process.cwd(), myPath);
   }
+  return path.resolve(process.cwd(), myPath);
 };
 const regHidden = /^\./;
 const defautWriteOption = {
-  flags: 'w',
-  defaultEncoding: 'utf8'
-  //mode: 0o666
+  flags: "w",
+  defaultEncoding: "utf8"
+  // mode: 0o666
 };
 
 /*
@@ -25,7 +24,7 @@ const defautWriteOption = {
  *
  */
 class File {
-  constructor(Path) {
+  constructor (Path) {
     if (Path) {
       Path = checkPath(Path);
       this.stats = fs.lstatSync(Path);
@@ -42,22 +41,22 @@ class File {
       this.shortName = this.parse.name;
       if (this.type === "File") {
         this.mimeType = this.getMimeType(this.name);
-        this.encoding = "UTF-8"; //this.getCharset();
+        this.encoding = "UTF-8"; // this.getCharset();
         this.extention = this.getExtension(this.mimeType);
       }
       this.dirName = this.parse.dir;
       this.match = null;
     } else {
-      throw new Error("error fileClass Path : " + Path);
+      throw new Error(`error fileClass Path : ${Path}`);
     }
   }
 
-  toString() {
+  toString () {
     return JSON.stringify(this.toJson(), null, "\n");
   }
 
-  toJson() {
-    let obj = {
+  toJson () {
+    const obj = {
       path: this.path,
       name: this.name,
       ext: this.ext,
@@ -75,7 +74,7 @@ class File {
     return obj;
   }
 
-  checkType() {
+  checkType () {
     if (this.stats.isDirectory()) {
       return "Directory";
     }
@@ -97,41 +96,41 @@ class File {
     if (this.stats.isSocket()) {
       return "Socket";
     }
-    return;
   }
 
-  getType() {
+  getType () {
     return this.checkType();
   }
 
-  checkSum(type) {
+  checkSum (type) {
     if (!type) {
-      type = 'md5';
+      type = "md5";
     }
-    return crypto.createHash(type).update(this.content()).digest("hex");
+    return crypto.createHash(type).update(this.content())
+      .digest("hex");
   }
 
-  getMimeType(name) {
+  getMimeType (name) {
     return mime.getType(name || this.name);
   }
 
-  getExtension(mimeType) {
+  getExtension (mimeType) {
     return mime.getExtension(mimeType || this.mimeType);
   }
 
-  getExtention(mimeType) {
+  getExtention (mimeType) {
     return mime.getExtension(mimeType || this.mimeType);
   }
 
-  /*getCharset (mimeType){
+  /* getCharset (mimeType){
     //return mime.charsets.lookup(mimeType || this.mimeType );
   }*/
 
-  getRealpath(Path, options) {
+  getRealpath (Path, options) {
     return fs.realpathSync(Path, options);
   }
 
-  matchName(ele) {
+  matchName (ele) {
     if (ele instanceof RegExp) {
       this.match = ele.exec(this.name);
       return this.match;
@@ -142,49 +141,49 @@ class File {
     return false;
   }
 
-  matchType(type) {
+  matchType (type) {
     return type === this.type;
   }
 
-  isFile() {
+  isFile () {
     return this.type === "File";
   }
 
-  isDirectory() {
+  isDirectory () {
     return this.type === "Directory";
   }
 
-  isSymbolicLink() {
+  isSymbolicLink () {
     return this.type === "symbolicLink";
   }
 
-  dirname() {
+  dirname () {
     return path.dirname(this.path);
   }
 
-  isHidden() {
+  isHidden () {
     return regHidden.test(this.name);
   }
 
-  content(encoding) {
-    let encode = encoding ? encoding : (this.encoding ? this.encoding : 'utf8');
+  content (encoding) {
+    const encode = encoding ? encoding : this.encoding ? this.encoding : "utf8";
     return fs.readFileSync(this.path, encode);
   }
 
-  read(encoding) {
-    let encode = encoding ? encoding : (this.encoding ? this.encoding : 'utf8');
+  read (encoding) {
+    const encode = encoding ? encoding : this.encoding ? this.encoding : "utf8";
     if (this.type === "symbolicLink") {
-      let Path = fs.readlinkSync(this.path, encode);
+      const Path = fs.readlinkSync(this.path, encode);
       return fs.readFileSync(Path, encode);
     }
     return fs.readFileSync(this.path, encode);
   }
 
-  readAsync(encoding) {
-    let encode = encoding ? encoding : (this.encoding ? this.encoding : 'utf8');
+  readAsync (encoding) {
+    const encode = encoding ? encoding : this.encoding ? this.encoding : "utf8";
     if (this.type === "symbolicLink") {
       return new Promise((resolve, reject) => {
-        let Path = fs.readlinkSync(this.path, encode);
+        const Path = fs.readlinkSync(this.path, encode);
         return fs.readFileSync(Path, encode, (error, data) => {
           if (error) {
             return reject(error);
@@ -193,25 +192,24 @@ class File {
         });
       });
     }
-    return new Promise((resolve, reject) => {
-      return fs.readFile(this.path, encode, (error, data) => {
-        if (error) {
-          return reject(error);
-        }
-        return resolve(data);
-      });
-    });
+    return new Promise((resolve, reject) => fs.readFile(this.path, encode, (error, data) => {
+      if (error) {
+        return reject(error);
+      }
+      return resolve(data);
+    }));
   }
 
-  readByLine(callback, encoding) {
+  readByLine (callback, encoding) {
     return new Promise((resolve, reject) => {
       let res = null;
       try {
         res = this.content(encoding);
         let nb = 0;
-        res.toString().split('\n').forEach(function (line) {
-          callback(line, ++nb);
-        });
+        res.toString().split("\n")
+          .forEach((line) => {
+            callback(line, ++nb);
+          });
       } catch (e) {
         return reject(e);
       }
@@ -219,11 +217,11 @@ class File {
     });
   }
 
-  write(data, options) {
+  write (data, options) {
     return fs.writeFileSync(this.path, data, nodefony.extend({}, defautWriteOption, options));
   }
 
-  move(target) {
+  move (target) {
     try {
       fs.renameSync(this.path, target);
       return new File(target);
@@ -232,7 +230,7 @@ class File {
     }
   }
 
-  unlink() {
+  unlink () {
     try {
       fs.unlinkSync(this.path);
     } catch (e) {

package/finder/file.es6

@@ -1,15 +1,16 @@
 class File extends nodefony.fileClass {
-  constructor(path, parent = null) {
+  constructor (path, parent = null) {
     super(path);
     this.parent = parent;
     this.children = new nodefony.FileResult();
   }
-  get length() {
+
+  get length () {
     return this.children.length;
   }
 
-  toJson() {
-    let obj = {
+  toJson () {
+    const obj = {
       path: this.path,
       name: this.name,
       ext: this.ext,