node-oojs-tool - npm Package Compare versions

Comparing version 1.0.2 to 1.0.5

package.json

@@ -6,3 +6,3 @@ {
     "main": "",
-    "version": "1.0.2",
+    "version": "1.0.5",
     "engines": {
@@ -9,0 +9,0 @@ "node": ">=0.4.0"

src/oojs/args.js

 define && define({
     name:'args',
     namespace:'oojs',
-    parseArgs:function(args){
+    parseArgs: function(args) {
         var result = { values:[] };
@@ -41,2 +41,2 @@ var count = args.length;
     }
-});
+});

src/oojs/cli.js

@@ -38,2 +38,2 @@ define && define({
     }
-});
+});

src/oojs/command/build.js

@@ -9,8 +9,8 @@ define && define({
     },
-    $build: function () {
+    $build: function() {
         this.fs = require('fs');
         this.path = require('path');
     },
-    
-    build: function(args){
+
+    build: function(args) {
         this.config = args.config || './package.json';
@@ -20,2 +20,62 @@ this.configPath = this.path.resolve(this.config);
 
+    recording: {},
+    //所有类的名字集合
+    classNameArray: [],
+    //待加载类的集合
+    prepareloadArray: [],
+    //待加载的依赖类集合
+    prepareDepsArray: [],
+
+    getClassName: function(classObj) {
+        this.recording = {};
+        this.classNameArray = [];
+        this.prepareloadArray = [];
+        this.prepareDepsArray = [];
+
+        //将起点类放入待加载数组中
+        this.prepareloadArray.push(classObj);
+        //待加载数据为空时终止
+        while (this.prepareloadArray && this.prepareloadArray.length > 0) {
+            this.loadClassName();
+        }
+        return this.classNameArray;
+    },
+
+    loadClassName: function() {
+        var count = this.prepareloadArray.legnth;
+        for (var i = 0, count = this.prepareloadArray.length; i < count; i++) {
+            var classObj = this.prepareloadArray.shift();
+            //获取类名
+            var className = classObj.name;
+            var classFullName = classObj.namespace ? classObj.namespace + "." : "";
+            classFullName = classFullName + className;
+            //类没有被遍历过
+
+            if (!this.recording[classFullName]) {
+                this.recording[classFullName] = true;
+                this.classNameArray.push(classFullName);
+
+                //获取依赖类
+                var deps = classObj.deps || {};
+
+                //遍历每一个依赖类
+                for (var key in deps) {
+                    if (key && deps.hasOwnProperty(key)) {
+                        var depClassFullName = deps[key];
+
+                        //类没有被遍历过
+                        if (!this.recording[depClassFullName]) {
+                            var tempClassObj = oojs.using(depClassFullName);
+                            this.prepareDepsArray.push(tempClassObj);
+                        }
+
+                    }
+                }
+            }
+        }
+
+        this.prepareloadArray = this.prepareDepsArray;
+        this.prepareDepsArray = [];
+    },
+
     /*
@@ -32,3 +92,3 @@ "build": {
     */
-    run: function () {
+    run: function() {
 
@@ -45,8 +105,11 @@ var packageObj = require(this.configPath);
                 var importRegexp = /\$import\((\S+)\)\s*;/gi;
+                var importWithDepsRegexp = /\$importWithDeps\((\S+)\)\s*;/gi;
                 var importMatch;
-                var sourceFileString = templateSource.replace(importRegexp, function () {                
+
+                //处理import命令, 只引用当前类
+                var sourceFileString = templateSource.replace(importRegexp, function() {
                     var result = "";
                     var importFilePath = arguments[1];
-                    importFilePath = importFilePath.replace(/\'/gi,"").replace(/\"/gi,"");
-                    if (importFilePath) {                        
+                    importFilePath = importFilePath.replace(/\'/gi, "").replace(/\"/gi, "");
+                    if (importFilePath) {
                         result = this.fileSync.readFileSync(importFilePath);
@@ -56,37 +119,60 @@ }
                 }.proxy(this));
-                
-                
+
+                //处理importWithDeps命令, 加载当前类以及所有依赖的类
+                sourceFileString = templateSource.replace(importWithDepsRegexp, function() {
+                    var result = [];
+                    var importFilePath = arguments[1];
+                    importFilePath = importFilePath.replace(/\'/gi, "").replace(/\"/gi, "");
+                    try {
+                        var classObj = oojs.using(importFilePath);
+                    } catch (ex) {
+                        var classObj = oojs.using(importFilePath);
+                    }
+                    var classNameArray = this.getClassName(classObj);
+
+                    for (var i = 0, count = classNameArray.length; i < count; i++) {
+                        var tempClassName = classNameArray.pop();
+                        var tempClassFilePath = oojs.getClassPath(tempClassName);
+                        result.push(this.fileSync.readFileSync(tempClassFilePath));
+                    }
+
+                    return result.join("");
+                }.proxy(this));
+
+
                 //处理source文件
                 var sourceFileArray = buildItem.sourceFile;
-                for(var i=0, count=sourceFileArray.length; i<count; i++){
+                for (var i = 0, count = sourceFileArray.length; i < count; i++) {
                     var tempSourceFilePath = sourceFileArray[i];
-                    this.fs.writeFileSync(tempSourceFilePath, sourceFileString);   
+                    this.fs.writeFileSync(tempSourceFilePath, sourceFileString);
                 }
-                
-                
+
+
                 //处理format文件
-                var formatFileString = this.jsHelper.formatSync(sourceFileString,{comments: false} );
+                var formatFileString = this.jsHelper.formatSync(sourceFileString, {
+                    comments: false
+                });
                 var formatFileArray = buildItem.formatFile;
-                for(var i=0, count=formatFileArray.length; i<count; i++){
+                for (var i = 0, count = formatFileArray.length; i < count; i++) {
                     var tempFormatFilePath = formatFileArray[i];
                     this.fs.writeFileSync(tempFormatFilePath, formatFileString);
-                }               
-                
-                
+                }
+
+
                 //处理compress文件
                 var compressFileString = this.jsHelper.compressSync(sourceFileString);
                 var compressFileArray = buildItem.compressFile;
-                for(var i=0, count=compressFileArray.length; i<count; i++){
+                for (var i = 0, count = compressFileArray.length; i < count; i++) {
                     var tempCompressFilePath = compressFileArray[i];
                     this.fs.writeFileSync(tempCompressFilePath, compressFileString);
-                }               
-                
+                }
+
                 //处理gzip文件
                 var gzipFileArray = buildItem.gzipFile;
-                for(var i=0, count=gzipFileArray.length; i<count; i++){
+                for (var i = 0, count = gzipFileArray.length; i < count; i++) {
                     var tempGzipFilePath = gzipFileArray[i];
                     this.gzip.zipStringToFileSync(tempGzipFilePath, compressFileString);
                 }
-                
-                 return;
+
+                return;
             }
@@ -97,3 +183,2 @@ }
 
-});
-
+});

No alert changes

Improved metrics

Total package byte prevSize

19253

24.36%

Lines of code

432

19.67%

No dependency changes