refactor: 调整link实现。

huang-xiao-jian · Dec 1, 2016 · 1ff613b · 1ff613b
1 parent a34c657
commit 1ff613b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 27 deletions.
diff --git a/analyzer.type.js b/analyzer.type.js
@@ -10,13 +10,6 @@
  * @property {string} type - ES6 import style, default or destruct
  */
 
-/**
- * @typedef {object} TemplateDescriptor
- *
- * @property {string} location - import file source path
- * @property {string} category - only support template
- */
-
 /**
  * @typedef {object} NgDescriptor
  *

diff --git a/test/link.spec.js b/test/link.spec.js
@@ -12,35 +12,30 @@ const { linkAnalyzeStream, cleanAnalyzeStream } = require('../src/link');
 
 describe('ng-hot-analyze link', function () {
   it('should link analyze stream', function () {
-    let componentAccessToken = [{ token: 'bkPrompt', name: 'promptFactory', category: 'factory' }];
-    let componentInstanceReference = [
+    let instanceReferenceList = [
       { location: './service/prompt.factory', name: 'promptFactory', type: 'destruct' },
-      { location: './filter/postfix.filter', name: 'postfixFilter', type: 'destruct' }
+      { location: './template/todo.html', name: 'todoPageTemplate', type: 'default' }
     ];
 
-    let [prompt, postfix] = linkAnalyzeStream(componentInstanceReference, componentAccessToken);
+    let accessTokenList = [
+      { token: 'bkPrompt', name: 'promptFactory', category: 'factory' },
+      { token: 'RouteMark', name: 'todoPageTemplate', category: 'RouteTemplate' }
+    ];
 
-    prompt.should.eql({
-      name: 'promptFactory',
-      token: 'bkPrompt',
-      category: 'factory',
-      location: './service/prompt.factory',
-      type: 'destruct'
-    });
+    let [prompt, todo] = linkAnalyzeStream(instanceReferenceList, accessTokenList);
 
-    // ignore none-match reference
-    postfix.should.eql(componentInstanceReference[1]);
+    prompt.should.eql(Object.assign({}, instanceReferenceList[0], { token: 'bkPrompt', category: 'factory' }));
+    todo.should.eql(Object.assign({}, instanceReferenceList[1], { token: 'RouteMark', category: 'RouteTemplate' }));
   });
 
-  it('should clean unnecessary stream', function () {
-    let componentAccessToken = [{ token: 'bkPrompt', name: 'promptFactory', category: 'factory' }];
-    let componentInstanceReference = [
+  it('should clean unnecessary reference', function () {
+    let list = [
+      { token: 'bkPrompt', name: 'promptFactory', category: 'factory' },
       { location: './service/prompt.factory', name: 'promptFactory', type: 'destruct' },
-      { location: './filter/postfix.filter', name: 'postfixFilter', type: 'destruct' }
+      { location: './filter/postfix.filter', name: 'postfixFilter', type: 'destruct' },
+      { token: 'bkPrompt', location: './filter/postfix.filter', name: 'promptFactory' }
     ];
 
-    let pristine = cleanAnalyzeStream(linkAnalyzeStream(componentInstanceReference, componentAccessToken));
-
-    pristine.length.should.equal(1);
+    cleanAnalyzeStream(list).should.eql([list[3]]);
   });
 });