mm_expand 1.5.9 → 1.6.0

package/index.js

@@ -5,7 +5,10 @@
  */
 const JSON5 = require('json5');
 var ncp = require('ncp').ncp;
-const { rimraf, rimrafSync } = require('rimraf');
+const {
+	rimraf,
+	rimrafSync
+} = require('rimraf');
 const {
 	j2xParser,
 	parse
@@ -1235,23 +1238,22 @@ if (typeof($) === "undefined") {
 	 */
 	String.prototype.fullname = function(dir) {
 		var file = this + '';
-		file = file.replace(/\//g, slash);
-		if (file.startWith('.' + slash)) {
-			if (dir) {
-				file = file.replace('.' + slash, dir.fullname());
-			} else {
-				file = file.replace('.' + slash, $.runPath);
+		if (dir) {
+			if (!dir.endsWith(slash)) {
+				dir += slash;
 			}
-		} else if (file.startWith('..' + slash)) {
-			if (dir) {
-				file = dir.fullname() + file;
+			dir = dir.fullname();
+		} else {
+			dir = $.runPath;
+		}
+		file = file.replace(/\//g, slash);
+		if (!file.startWith($.runPath)) {
+			if (file.startWith(slash)) {
+				file = join($.runPath, file);
 			} else {
-				file = $.runPath + file;
+				file = join(dir, file);
 			}
-		} else if (file.startWith(slash) && !file.startWith($.runPath)) {
-			file = $.runPath + file.substring(0);
 		}
-		file = join(file, '');
 		if (file.indexOf('.') === -1 && !file.endsWith(slash)) {
 			file += slash;
 		}
@@ -1387,7 +1389,7 @@ if (typeof($) === "undefined") {
 	 */
 	String.prototype.addDir = function(dirbase) {
 		var d = (this + '').fullname(dirbase);
-		
+
 		if (d.indexOf('.') !== -1) {
 			d = d.dirname()
 		}
@@ -1409,7 +1411,7 @@ if (typeof($) === "undefined") {
 	String.prototype.copyFile = function(file) {
 		return copyFileSync(this.fullname(), file.fullname());
 	};
-	
+
 	/**
 	 * @description 复制目录
 	 * @param {String} file 保存路径
@@ -2132,31 +2134,31 @@ if (typeof($) === "undefined") {
 		});
 		return obj;
 	};
-	
+
 	/**
 	 * 将一维数组转成二维
 	 * @param {Object} size
 	 */
 	Array.prototype.to2D = function(size) {
 		var arr = this;
-	    let newArr = [];
-	    for (let i = 0; i < arr.length; i += size) {
-	        let arrayChunk = arr.slice(i, i + size);
-	        newArr.push(arrayChunk);
-	    }
-	    return newArr;
+		let newArr = [];
+		for (let i = 0; i < arr.length; i += size) {
+			let arrayChunk = arr.slice(i, i + size);
+			newArr.push(arrayChunk);
+		}
+		return newArr;
 	};
-	
+
 	/**
 	 * 将二维数组合并转成一维
 	 */
 	Array.prototype.to1D = function() {
 		var arr = this;
-	    let newArr = [];
-	    for (let i = 0; i < arr.length; i++) {
+		let newArr = [];
+		for (let i = 0; i < arr.length; i++) {
 			newArr = newArr.concat(arr[i]);
-	    }
-	    return newArr;
+		}
+		return newArr;
 	};
 })();
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_expand",
-    "version": "1.5.9",
+    "version": "1.6.0",
     "description": "这是超级美眉原型函数拓展模块，更有利于对string、array、object的操作，避免出错，简化业务逻辑。",
     "main": "index.js",
     "scripts": {

package/test.js

@@ -1,6 +1,25 @@
 require('./index.js');
 
-var arr1 = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'];
+
+console.log("./fast/log".fullname(__dirname));
+console.log("./fast/log".fullname());
+console.log("./fast/log/".fullname());
+console.log("fast/log".fullname(__dirname));
+console.log("fast/log".fullname());
+console.log("fast/log/".fullname());
+console.log("../fast/log".fullname(__dirname));
+console.log("../fast/log".fullname());
+console.log("/fast/log".fullname(__dirname));
+console.log("/fast/log".fullname());
+console.log("/fast/log/".fullname());
+console.log("/fast/log.lgo".fullname());
+console.log("/fast/log.lgo\\".fullname());
+console.log("/fast/log.lgo/".fullname());
+console.log("E:\\github\\mm_modules\\mm_expand\\fast\\log\\".fullname(__dirname));
+console.log("E:\\github\\mm_modules\\mm_expand\\fast\\log\\".fullname());
+console.log("E:\\github\\mm_modules\\mm_expand\\fast\\log".fullname());
+// var arr1 = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'];
+
 // var arr1 = [{
 // 	id: 1
 // }, {
@@ -8,16 +27,16 @@ var arr1 = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'];
 // }, {
 // 	id: 3
 // }, '4', '5', '6', '7', '8', '9', '10', '11', '12'];
-console.log('拆分', arr1.to2D(2));
-console.log('拆分', arr1.to2D(3));
-console.log('拆分', arr1.to2D(4));
-console.log('拆分', arr1.to2D(5));
-console.log('拆分', arr1.to2D(6));
-console.log('拆分', arr1.to2D(7));
-console.log('拆分', arr1.to2D(8));
-
-console.log('合并', arr1.to2D(7).to1D());
-console.log('合并', arr1.to2D(8).to1D());
+// console.log('拆分', arr1.to2D(2));
+// console.log('拆分', arr1.to2D(3));
+// console.log('拆分', arr1.to2D(4));
+// console.log('拆分', arr1.to2D(5));
+// console.log('拆分', arr1.to2D(6));
+// console.log('拆分', arr1.to2D(7));
+// console.log('拆分', arr1.to2D(8));
+
+// console.log('合并', arr1.to2D(7).to1D());
+// console.log('合并', arr1.to2D(8).to1D());
 
 // 测试复制目录
 // "./demo/test3".delDir();