unique array values only

ShMcK · ShMcK · commit d0caf8b7edbf · 2016-03-12T08:35:10.000-08:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,19 @@
+# Auto detect text files and perform LF normalization
+*        text=auto
+
+*.html   text diff=html
+*.css    text
+*.less   text
+*.js     text
+*.ts     text
+*.json   text
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+
+# absolute paths are ok, as are globs
+/**/postinst* text eol=lf
+
+# paths that don't start with / are treated relative to the .gitattributes folder
+relative/path/*.txt text eol=lf
diff --git a/lib/build/parser/actions.js b/lib/build/parser/actions.js
@@ -6,14 +6,19 @@ function doAction(type, isArray, actionValue, result, line, _a) {
     if (result.chapters[chapter].pages[page].tasks[task][type] === undefined) {
         result.chapters[chapter].pages[page].tasks[task][type] = [];
     }
+    var current = result.chapters[chapter].pages[page].tasks[task][type];
     if (!!isArray) {
-        var values = cleanup_1.trimArray(actionValue);
-        values.forEach(function (value) {
-            result.chapters[chapter].pages[page].tasks[task][type].push(value);
+        var values_1 = cleanup_1.trimArray(actionValue);
+        values_1.forEach(function (value) {
+            if (current.indexOf(value) === -1 && values_1.indexOf(value) === -1) {
+                result.chapters[chapter].pages[page].tasks[task][type].push(value);
+            }
         });
     }
     else {
-        result.chapters[chapter].pages[page].tasks[task][type].push(actionValue);
+        if (current.indexOf(actionValue) === -1) {
+            result.chapters[chapter].pages[page].tasks[task][type].push(actionValue);
+        }
     }
     return result;
 }
diff --git a/lib/cli.js b/lib/cli.js
@@ -1,5 +1,4 @@
 #! /usr/bin/env node
-
 "use strict";
 var program = require('commander');
 var chalk = require('chalk');
diff --git a/src/build/parser/actions.ts b/src/build/parser/actions.ts
@@ -8,15 +8,20 @@ function doAction(type: CR.OutputAction, isArray, actionValue, result, line, {ch
   if (result.chapters[chapter].pages[page].tasks[task][type] === undefined) {
     result.chapters[chapter].pages[page].tasks[task][type] = [];
   }
+  let current = result.chapters[chapter].pages[page].tasks[task][type];
   if (!!isArray) {
     // array
     let values = trimArray(actionValue);
     values.forEach((value) => {
-      result.chapters[chapter].pages[page].tasks[task][type].push(value);
+      if (current.indexOf(value) === -1 && values.indexOf(value) === -1) {
+        result.chapters[chapter].pages[page].tasks[task][type].push(value);
+      }
     });
   } else {
     // string
-    result.chapters[chapter].pages[page].tasks[task][type].push(actionValue);
+    if (current.indexOf(actionValue) === -1) {
+      result.chapters[chapter].pages[page].tasks[task][type].push(actionValue);
+    }
   }
   return result;
 }

Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,19 @@ function doAction(type, isArray, actionValue, result, line, _a) {`
`6`	`6`	`if (result.chapters[chapter].pages[page].tasks[task][type] === undefined) {`
`7`	`7`	`result.chapters[chapter].pages[page].tasks[task][type] = [];`
`8`	`8`	`}`
	`9`	`+ var current = result.chapters[chapter].pages[page].tasks[task][type];`
`9`	`10`	`if (!!isArray) {`
`10`		`- var values = cleanup_1.trimArray(actionValue);`
`11`		`- values.forEach(function (value) {`
`12`		`- result.chapters[chapter].pages[page].tasks[task][type].push(value);`
	`11`	`+ var values_1 = cleanup_1.trimArray(actionValue);`
	`12`	`+ values_1.forEach(function (value) {`
	`13`	`+ if (current.indexOf(value) === -1 && values_1.indexOf(value) === -1) {`
	`14`	`+ result.chapters[chapter].pages[page].tasks[task][type].push(value);`
	`15`	`+ }`
`13`	`16`	`});`
`14`	`17`	`}`
`15`	`18`	`else {`
`16`		`- result.chapters[chapter].pages[page].tasks[task][type].push(actionValue);`
	`19`	`+ if (current.indexOf(actionValue) === -1) {`
	`20`	`+ result.chapters[chapter].pages[page].tasks[task][type].push(actionValue);`
	`21`	`+ }`
`17`	`22`	`}`
`18`	`23`	`return result;`
`19`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#! /usr/bin/env node`
`2`		`-`
`3`	`2`	`"use strict";`
`4`	`3`	`var program = require('commander');`
`5`	`4`	`var chalk = require('chalk');`