Merge pull request #81 from appcraft/master

fix wrongly replacing text in shared strings
optilude · Aug 9, 2018 · 781bcab · 781bcab
2 parents bd302ea + 306ea34
commit 781bcab
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -770,8 +770,7 @@ module.exports = (function() {
         } else {
             var newString = string.replace(placeholder.placeholder, self.stringify(substitution));
             cell.attrib.t = "s";
-            self.replaceString(string, newString);
-            return newString;
+            return self.insertCellValue(cell, newString)
         }
 
     };

diff --git a/test/crud-test.js b/test/crud-test.js
@@ -852,7 +852,8 @@ describe("CRUD operations", function() {
                 for (let sheetNumber = 1; sheetNumber <= 2; sheetNumber++) {
                     // Set up some placeholder values matching the placeholders in the template
                     var values = {
-                        page: 'page: ' + sheetNumber
+                        page: 'page: ' + sheetNumber,
+                        sheetNumber
                     };
 
                     // Perform substitution
@@ -868,6 +869,8 @@ describe("CRUD operations", function() {
                 buster.expect(sheet2).toBeDefined();
                 buster.expect(getSharedString(sharedStrings, sheet1, "A1")).toEqual("page: 1");
                 buster.expect(getSharedString(sharedStrings, sheet2, "A1")).toEqual("page: 2");
+                buster.expect(getSharedString(sharedStrings, sheet1, "A2")).toEqual("Page 1");
+                buster.expect(getSharedString(sharedStrings, sheet2, "A2")).toEqual("Page 2");
 
                 fs.writeFileSync('test/output/multple-sheets-arrays.xlsx', newData, 'binary');
                 done();

diff --git a/test/helpers-test.js b/test/helpers-test.js
@@ -638,8 +638,8 @@ describe("Helpers", function() {
             t.addSharedString(string);
             buster.expect(t.substituteScalar(col, string, placeholder, substitution)).toEqual("foo: bar");
             buster.expect(col.attrib.t).toEqual("s");
-            buster.expect(val.text).toEqual("0");
-            buster.expect(t.sharedStrings).toEqual(["foo: bar"]);
+            buster.expect(val.text).toEqual("1");
+            buster.expect(t.sharedStrings).toEqual(["foo: ${foo}", "foo: bar"]);
         });
 
         it("can substitute parts of strings with booleans", function() {
@@ -666,8 +666,8 @@ describe("Helpers", function() {
             t.addSharedString(string);
             buster.expect(t.substituteScalar(col, string, placeholder, substitution)).toEqual("foo: 0");
             buster.expect(col.attrib.t).toEqual("s");
-            buster.expect(val.text).toEqual("0");
-            buster.expect(t.sharedStrings).toEqual(["foo: 0"]);
+            buster.expect(val.text).toEqual("1");
+            buster.expect(t.sharedStrings).toEqual(["foo: ${foo}", "foo: 0"]);
         });
 
         it("can substitute parts of strings with numbers", function() {
@@ -694,8 +694,8 @@ describe("Helpers", function() {
             t.addSharedString(string);
             buster.expect(t.substituteScalar(col, string, placeholder, substitution)).toEqual("foo: 10");
             buster.expect(col.attrib.t).toEqual("s");
-            buster.expect(val.text).toEqual("0");
-            buster.expect(t.sharedStrings).toEqual(["foo: 10"]);
+            buster.expect(val.text).toEqual("1");
+            buster.expect(t.sharedStrings).toEqual(["foo: ${foo}", "foo: 10"]);
         });
 
 

diff --git a/test/templates/multple-sheets-arrays.xlsx b/test/templates/multple-sheets-arrays.xlsx