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

package/finder/fileResult.es6

@@ -1,32 +1,33 @@
-//const _ = require("lodash");
+// const _ = require("lodash");
 class FileResult extends nodefony.Result {
-  constructor(res) {
-    if(typeof(res) === 'number'){
+  constructor (res) {
+    if (typeof res === "number") {
       super();
-    }else{
+    } else {
       super(res);
     }
   }
 
-  toString() {
-    let txt = ``;
+  toString () {
+    let txt = "";
     for (let index = 0; index < this.length; index++) {
-      let info = this[index];
+      const info = this[index];
       txt += `${info.name}\n`;
     }
     return txt;
   }
-  toJson(json = []) {
+
+  toJson (json = []) {
     try {
       for (let index = 0; index < this.length; index++) {
-        let info = this[index];
+        const info = this[index];
         switch (info.type) {
         case "File":
           json.push(info.toJson());
           break;
         case "symbolicLink":
         case "Directory":
-          let dir = info.toJson();
+          const dir = info.toJson();
           if (info.children) {
             dir.children = info.children.toJson();
           }
@@ -40,15 +41,15 @@ class FileResult extends nodefony.Result {
     }
   }
 
-  uniq() {
+  uniq () {
     return this;
   }
 
-  find(ele, result = new FileResult()) {
+  find (ele, result = new FileResult()) {
     try {
       for (let index = 0; index < this.length; index++) {
-        let info = this[index];
-        let match = info.matchName(ele);
+        const info = this[index];
+        const match = info.matchName(ele);
         if (match) {
           result.push(info);
         }
@@ -60,10 +61,10 @@ class FileResult extends nodefony.Result {
     }
   }
 
-  getDirectories(result = new FileResult()) {
+  getDirectories (result = new FileResult()) {
     try {
       for (let index = 0; index < this.length; index++) {
-        let info = this[index];
+        const info = this[index];
         switch (info.type) {
         case "Directory":
           result.push(info);
@@ -80,10 +81,10 @@ class FileResult extends nodefony.Result {
     }
   }
 
-  getFiles(result = new FileResult()) {
+  getFiles (result = new FileResult()) {
     try {
       for (let index = 0; index < this.length; index++) {
-        let info = this[index];
+        const info = this[index];
         switch (info.type) {
         case "File":
           result.push(info);
@@ -100,8 +101,8 @@ class FileResult extends nodefony.Result {
     }
   }
 
-  sortByName(result = new FileResult()) {
-    let res = this.sort((a, b) => {
+  sortByName (result = new FileResult()) {
+    const res = this.sort((a, b) => {
       if (a.name.toString() > b.name.toString()) {
         return 1;
       }
@@ -116,8 +117,8 @@ class FileResult extends nodefony.Result {
     return this;
   }
 
-  sortByType(result = new FileResult()) {
-    let res = this.sort((a, b) => {
+  sortByType (result = new FileResult()) {
+    const res = this.sort((a, b) => {
       if (a.type.toString() > b.type.toString()) {
         return 1;
       }

package/finder/finder2.es6

@@ -2,7 +2,7 @@
  *  CLASS Result
  *
  */
-const fsPromises = require('fs').promises;
+const fsPromises = require("fs").promises;
 const defaultSettings = {
   recurse: false,
   depth: 10,
@@ -16,7 +16,7 @@ const defaultSettings = {
 
 const checkExclude = function (info, options) {
   let match = null;
-  let test = (options.exclude || options.excludeDir || options.excludeFile);
+  const test = options.exclude || options.excludeDir || options.excludeFile;
   if (!test) {
     return false;
   }
@@ -48,11 +48,11 @@ const checkExclude = function (info, options) {
 const checkMatch = function (info, options, result) {
   let match = false;
   let rec = false;
-  let test = (options.matchFile || options.matchDIr || options.match);
+  const test = options.matchFile || options.matchDIr || options.match;
   if (!test) {
     result.push(info);
     this.totals[info.type]++;
-    this.fire("on" + info.type, info, this);
+    this.fire(`on${info.type}`, info, this);
     return true;
   }
   if (options.matchDIr) {
@@ -74,8 +74,8 @@ const checkMatch = function (info, options, result) {
     }
   }
   if (options.match) {
-    let res = info.matchName(options.match);
-    //console.log("match ", info.name, res)
+    const res = info.matchName(options.match);
+    // console.log("match ", info.name, res)
     if (res) {
       match = true;
     } else {
@@ -83,26 +83,25 @@ const checkMatch = function (info, options, result) {
       rec = info.type;
     }
   }
-  //state match
+  // state match
   if (match) {
     result.push(info);
     this.totals[info.type]++;
-    this.fire("on" + info.type, info, this);
+    this.fire(`on${info.type}`, info, this);
     return true;
-  } else {
-    switch (rec) {
-      // false match
-    case "Directory":
-    case "symbolicLink":
-      result.push(info);
-      this.totals[info.type]++;
-      this.fire("on" + info.type, info, this);
-      return true;
-    default:
-      // false file
-      //console.log("bypass ", info.name)
-      return false;
-    }
+  }
+  switch (rec) {
+  // false match
+  case "Directory":
+  case "symbolicLink":
+    result.push(info);
+    this.totals[info.type]++;
+    this.fire(`on${info.type}`, info, this);
+    return true;
+  default:
+    // false file
+    // console.log("bypass ", info.name)
+    return false;
   }
 };
 
@@ -118,22 +117,16 @@ const parser = function (file, result = new nodefony.FileResult(), options = {},
     try {
       if (file.type !== "symbolicLink") {
         res = await fsPromises.readdir(file.path, {
-            encoding: 'utf8',
-            withFileTypes: false
-          })
-          .catch(e => {
-            return reject(e);
-          });
-      } else {
-        if (options.followSymLink) {
-          //console.log("symbolicLink First", file.name)
-          res = await fsPromises.readlink(file.path)
-            .catch((e) => {
-              return reject(e);
-            });
-        }
+          encoding: "utf8",
+          withFileTypes: false
+        })
+          .catch((e) => reject(e));
+      } else if (options.followSymLink) {
+        // console.log("symbolicLink First", file.name)
+        res = await fsPromises.readlink(file.path)
+          .catch((e) => reject(e));
       }
-      //console.log(res)
+      // console.log(res)
       if (res && res.length) {
         for (let i = 0; i < res.length; i++) {
           const ret = path.resolve(file.path, res[i]);
@@ -146,7 +139,7 @@ const parser = function (file, result = new nodefony.FileResult(), options = {},
             }
           }
           if (checkExclude(info, options)) {
-            //console.log("EXCLUDEEEEE", info.name)
+            // console.log("EXCLUDEEEEE", info.name)
             continue;
           }
           let symLink = null;
@@ -160,7 +153,7 @@ const parser = function (file, result = new nodefony.FileResult(), options = {},
             }
           }
           const match = checkMatch.call(this, info, options, result);
-          //console.log("match state", !match, info.name, info.type)
+          // console.log("match state", !match, info.name, info.type)
           if (!match) {
             continue;
           }
@@ -169,7 +162,7 @@ const parser = function (file, result = new nodefony.FileResult(), options = {},
             this.totals.hidden++;
             this.fire("onHidden", info, this);
           }
-          //console.log("PASSSS ", info.name, info.type)
+          // console.log("PASSSS ", info.name, info.type)
           if (info.type === "File") {
             continue;
           }
@@ -177,16 +170,16 @@ const parser = function (file, result = new nodefony.FileResult(), options = {},
           if (!options.recurse) {
             continue;
           }
-          //console.log("RECCCCCC", info.type, info.name)
+          // console.log("RECCCCCC", info.type, info.name)
           switch (info.type) {
           case "Directory":
-            //info.children = await parser.call(this, info, undefined, options, depth - 1, info);
+            // info.children = await parser.call(this, info, undefined, options, depth - 1, info);
             await parser.call(this, info, undefined, options, depth - 1, info);
             break;
           case "symbolicLink":
             if (symLink) {
               if (symLink.isDirectory()) {
-                //info.children = await parser.call(this, symLink, undefined, options, depth - 1, info);
+                // info.children = await parser.call(this, symLink, undefined, options, depth - 1, info);
                 await parser.call(this, symLink, undefined, options, depth - 1, info);
               }
             }
@@ -194,7 +187,7 @@ const parser = function (file, result = new nodefony.FileResult(), options = {},
           }
         }
       }
-      //console.log("resolve ", file.name, result.length)
+      // console.log("resolve ", file.name, result.length)
       return resolve(result);
     } catch (e) {
       this.fire("onError", e);
@@ -204,8 +197,7 @@ const parser = function (file, result = new nodefony.FileResult(), options = {},
 };
 
 class Finder extends nodefony.Events {
-
-  constructor(settings) {
+  constructor (settings) {
     super(settings);
     this.settings = nodefony.extend({}, defaultSettings, settings);
     this.totals = {
@@ -220,16 +212,16 @@ class Finder extends nodefony.Events {
     };
   }
 
-  clean() {
+  clean () {
     this.removeAllListeners();
-    for (let total in this.totals) {
+    for (const total in this.totals) {
       this.totals[total] = 0;
     }
   }
 
-  ckeckPath(Path) {
+  ckeckPath (Path) {
     const type = nodefony.typeOf(Path);
-    let result = new nodefony.FileResult();
+    const result = new nodefony.FileResult();
     switch (true) {
     case type === "string":
       try {
@@ -261,14 +253,14 @@ class Finder extends nodefony.Events {
     }
   }
 
-  async in(Path, settings = {}) {
+  async in (Path, settings = {}) {
     let result = null;
     try {
       result = this.ckeckPath(Path);
       this.settingsToListen(settings);
-      let options = nodefony.extend({}, this.settings, settings);
-      for await (let res of result) {
-        await parser.call(this, res, undefined, options, options.depth, res)
+      const options = nodefony.extend({}, this.settings, settings);
+      for await (const res of result) {
+        await parser.call(this, res, undefined, options, options.depth, res);
       }
     } catch (e) {
       this.fire("onError", e);

package/finder.es6

@@ -1,5 +1,5 @@
 class jsonTree extends nodefony.fileClass {
-  constructor(path, parent) {
+  constructor (path, parent) {
     super(path);
     this.parent = parent;
     if (this.parent !== null && this.parent.children) {
@@ -25,8 +25,7 @@ const findExist = function (tab, file) {
  *
  */
 class Result {
-
-  constructor(res) {
+  constructor (res) {
     if (res && nodefony.typeOf(res) === "array") {
       this.files = res;
     } else {
@@ -35,24 +34,24 @@ class Result {
     this.json = {};
   }
 
-  push(file) {
+  push (file) {
     this.files.push(file);
   }
 
-  length() {
+  length () {
     return this.files.length;
   }
 
-  slice(offset, limit) {
+  slice (offset, limit) {
     return new Result(Array.prototype.slice.call(this.files, offset, limit));
   }
 
-  sort(callback) {
+  sort (callback) {
     return new Result(Array.prototype.sort.call(this.files, callback));
   }
 
-  sortByName() {
-    let res = this.files.sort(function (a, b) {
+  sortByName () {
+    const res = this.files.sort((a, b) => {
       if (a.name.toString() > b.name.toString()) {
         return 1;
       }
@@ -67,8 +66,8 @@ class Result {
     return this;
   }
 
-  sortByType() {
-    let res = this.files.sort(function (a, b) {
+  sortByType () {
+    const res = this.files.sort((a, b) => {
       if (a.type.toString() > b.type.toString()) {
         return 1;
       }
@@ -83,7 +82,7 @@ class Result {
     return this;
   }
 
-  findByNode(nodeName, tab, Path) {
+  findByNode (nodeName, tab, Path) {
     let i = null;
     if (!Path) {
       Path = [];
@@ -113,8 +112,8 @@ class Result {
     return new Result(tab);
   }
 
-  getDirectories() {
-    let tab = [];
+  getDirectories () {
+    const tab = [];
     for (let i = 0; i < this.files.length; i++) {
       if (this.files[i].type === "Directory") {
         tab.push(this.files[i]);
@@ -123,16 +122,16 @@ class Result {
     return new Result(tab);
   }
 
-  getFiles() {
-    let tab = [];
+  getFiles () {
+    const tab = [];
     for (let i = 0; i < this.files.length; i++) {
       switch (this.files[i].type) {
       case "File":
         tab.push(this.files[i]);
         break;
       case "symbolicLink":
-        let path = fs.readlinkSync(this.files[i].path);
-        let file = this.files[i].dirName + "/" + path;
+        const path = fs.readlinkSync(this.files[i].path);
+        const file = `${this.files[i].dirName}/${path}`;
         if (fs.lstatSync(file).isFile()) {
           tab.push(this.files[i]);
         }
@@ -142,36 +141,32 @@ class Result {
     return new Result(tab);
   }
 
-  getFile(name, casse) {
+  getFile (name, casse) {
     let reg = null;
     for (let i = 0; i < this.files.length; i++) {
       switch (this.files[i].type) {
       case "File":
         if (casse) {
-          reg = new RegExp("^" + name + "$", "i");
+          reg = new RegExp(`^${name}$`, "i");
           if (reg.test(this.files[i].name)) {
             return this.files[i];
           }
-        } else {
-          if (this.files[i].name === name) {
-            return this.files[i];
-          }
+        } else if (this.files[i].name === name) {
+          return this.files[i];
         }
         break;
       case "symbolicLink":
         try {
-          let path = fs.readlinkSync(this.files[i].path);
-          let file = this.files[i].dirName + "/" + path;
+          const path = fs.readlinkSync(this.files[i].path);
+          const file = `${this.files[i].dirName}/${path}`;
           if (fs.lstatSync(file).isFile()) {
             if (casse) {
-              reg = new RegExp("^" + name + "$", "i");
+              reg = new RegExp(`^${name}$`, "i");
               if (reg.test(this.files[i].name)) {
                 return this.files[i];
               }
-            } else {
-              if (this.files[i].name === name) {
-                return this.files[i];
-              }
+            } else if (this.files[i].name === name) {
+              return this.files[i];
             }
           }
         } catch (e) {
@@ -183,14 +178,14 @@ class Result {
     return null;
   }
 
-  forEach(callback) {
+  forEach (callback) {
     return this.files.forEach(callback);
   }
 
-  match(reg) {
-    let tab = [];
+  match (reg) {
+    const tab = [];
     for (let i = 0; i < this.files.length; i++) {
-      let res = this.files[i].matchName(reg);
+      const res = this.files[i].matchName(reg);
       if (res) {
         tab.push(this.files[i]);
       }
@@ -208,12 +203,11 @@ const checkMatch = function (file, settings) {
   if (settings.match) {
     if (file.matchName(settings.match)) {
       return true;
-    } else {
-      if (file.matchType(settings.match)) {
-        return settings.match;
-      }
-      return false;
     }
+    if (file.matchType(settings.match)) {
+      return settings.match;
+    }
+    return false;
   }
   return true;
 };
@@ -252,17 +246,17 @@ const findStatic = function (file, result, depth, settings, parent) {
     }
 
     if (res && res.length) {
-      let ret = regSlash.exec(file.path);
+      const ret = regSlash.exec(file.path);
       let filePath = null;
       if (ret) {
-        filePath = ret[1] + "/";
+        filePath = `${ret[1]}/`;
       } else {
-        filePath = file.path + "/";
+        filePath = `${file.path}/`;
       }
       for (let i = 0; i < res.length; i++) {
         let match = true;
-        let File = filePath + res[i];
-        let info = new this.wrapper(File, parent);
+        const File = filePath + res[i];
+        const info = new this.wrapper(File, parent);
         if (!settings.seeHidden) {
           if (checkHidden.call(this, info, settings)) {
             if (parent && parent.children) {
@@ -284,11 +278,9 @@ const findStatic = function (file, result, depth, settings, parent) {
         }
         if (match) {
           result.push(info);
-          this.notificationsCenter.fire("on" + info.type, info, this);
-        } else {
-          if (parent && parent.children) {
-            parent.children.pop();
-          }
+          this.notificationsCenter.fire(`on${info.type}`, info, this);
+        } else if (parent && parent.children) {
+          parent.children.pop();
         }
         switch (info.type) {
         case "Directory":
@@ -299,7 +291,7 @@ const findStatic = function (file, result, depth, settings, parent) {
           break;
         case "symbolicLink":
           if (settings.followSymLink && depth - 1 !== 0) {
-            let obj = new this.wrapper(info.path, info);
+            const obj = new this.wrapper(info.path, info);
             if (obj.isDirectory()) {
               arguments.callee.call(this, obj, result, settings.depth, settings, parent);
             }
@@ -312,8 +304,8 @@ const findStatic = function (file, result, depth, settings, parent) {
   } catch (e) {
     this.notificationsCenter.fire("onError", e);
     this.errorParse.push(e);
-    //console.log(e);
-    //this.notificationsCenter.fire("onFinish",e,null);
+    // console.log(e);
+    // this.notificationsCenter.fire("onFinish",e,null);
     throw e;
   }
 };
@@ -324,8 +316,8 @@ const defaultSettings = {
   sync: true,
   recurse: true,
   depth: -1,
-  //onFinish: null,
-  //onFile: null,
+  // onFinish: null,
+  // onFile: null,
   seeHidden: false,
   match: null,
   exclude: null,
@@ -336,70 +328,69 @@ const defaultSettings = {
 
 const regSlash = /^(.*)\/$/g;
 class Finder {
-
-  constructor(settings) {
-      this.path = [];
-      this.errorParse = [];
-      this.settings = nodefony.extend({}, defaultSettings, settings);
-      if (this.settings.path) {
-        this.result = this.find();
+  constructor (settings) {
+    this.path = [];
+    this.errorParse = [];
+    this.settings = nodefony.extend({}, defaultSettings, settings);
+    if (this.settings.path) {
+      this.result = this.find();
+    } else {
+      this.tree = this.settings.json;
+      if (this.tree) {
+        this.wrapper = jsonTree;
       } else {
-        this.tree = this.settings.json;
-        if (this.tree) {
-          this.wrapper = jsonTree;
-        } else {
-          this.wrapper = nodefony.fileClass;
-        }
+        this.wrapper = nodefony.fileClass;
       }
     }
+  }
 
-    in (Path) {
-      this.typePath = nodefony.typeOf(Path);
-      switch (true) {
-      case this.typePath === "string":
-        try {
-          this.path.push(new this.wrapper(Path, null));
-          return this;
-        } catch (e) {
-          throw e;
-        }
-        break;
-      case this.typePath === "array":
-        for (let i = 0; i < Path.length; i++) {
-          try {
-            this.path.push(new this.wrapper(Path[i], null));
-          } catch (e) {
-            throw e;
-          }
-        }
+  in (Path) {
+    this.typePath = nodefony.typeOf(Path);
+    switch (true) {
+    case this.typePath === "string":
+      try {
+        this.path.push(new this.wrapper(Path, null));
         return this;
-      case Path instanceof nodefony.fileClass:
+      } catch (e) {
+        throw e;
+      }
+      break;
+    case this.typePath === "array":
+      for (let i = 0; i < Path.length; i++) {
         try {
-          this.path.push(new this.wrapper(Path.path, null));
-          return this;
+          this.path.push(new this.wrapper(Path[i], null));
         } catch (e) {
           throw e;
         }
-        break;
-        //default:
-        //  throw new Error(`Finder bad path type`);
       }
+      return this;
+    case Path instanceof nodefony.fileClass:
+      try {
+        this.path.push(new this.wrapper(Path.path, null));
+        return this;
+      } catch (e) {
+        throw e;
+      }
+      break;
+        // default:
+        //  throw new Error(`Finder bad path type`);
     }
+  }
 
-  files() {
+  files () {
     return this.find({
       match: "File"
     });
   }
 
-  directories() {
+  directories () {
     return this.find({
       match: "Directory"
     });
   }
 
-  find(settings) {
-    let result = new Result();
+  find (settings) {
+    const result = new Result();
     let extend = null;
     if (!settings) {
       extend = this.settings;