to-spreadsheet 1.1.1 → 1.1.2

package/lib/generate-excel.js

@@ -42,8 +42,11 @@ const generateExcel = (dump, environmentType = EnvironmentType.NODE) => {
                 else if (content instanceof util_1.SkipCell) {
                     return new Array(content.getSkipCell()).fill({ type: index_1.ICellType.skip, value: undefined });
                 }
+                else if (content instanceof util_1.Equation) {
+                    return { type: index_1.ICellType.equation, value: content };
+                }
                 else {
-                    return { type: index_1.ICellType.skip, value: undefined };
+                    return { type: index_1.ICellType.skip };
                 }
             });
             return { cells };

package/lib/index.d.ts

@@ -1,14 +1,27 @@
 import { generateExcel, EnvironmentType } from "./generate-excel";
-import { SkipCell, skipCell } from "./util";
+import { SkipCell, skipCell, Equation, writeEquation } from "./util";
 declare enum ICellType {
     string = "s",
     number = "n",
-    skip = "skip"
+    skip = "skip",
+    equation = "equation"
 }
-interface ICell {
-    type: ICellType;
-    value: number | undefined;
+interface ICellString {
+    type: ICellType.string;
+    value: number;
 }
+interface ICellNumber {
+    type: ICellType.number;
+    value: number;
+}
+interface ICellSkip {
+    type: ICellType.skip;
+}
+interface ICellEquation {
+    type: ICellType.equation;
+    value: Equation;
+}
+declare type ICell = ICellString | ICellNumber | ICellSkip | ICellEquation;
 interface IRows {
     cells: ICell[];
 }
@@ -23,12 +36,12 @@ interface IWorkbook {
 }
 interface IPage {
     title: string;
-    content: (string | number | undefined | SkipCell)[][];
+    content: (string | number | undefined | SkipCell | Equation)[][];
 }
 export { ICell, ISheet, IWorkbook, IRows, ICellType, IPage };
 declare const sampleData: ({
     title: string;
-    content: (string[] | number[])[];
+    content: (string[] | (number | Equation)[])[];
 } | {
     title: string;
     content: (number | SkipCell)[][];
@@ -36,4 +49,4 @@ declare const sampleData: ({
     title: string;
     content: (string | undefined)[][];
 })[];
-export { generateExcel, sampleData, EnvironmentType, skipCell };
+export { generateExcel, sampleData, EnvironmentType, skipCell, writeEquation };

package/lib/index.js

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.skipCell = exports.EnvironmentType = exports.sampleData = exports.generateExcel = exports.ICellType = void 0;
+exports.writeEquation = exports.skipCell = exports.EnvironmentType = exports.sampleData = exports.generateExcel = exports.ICellType = void 0;
 const generate_excel_1 = require("./generate-excel");
 Object.defineProperty(exports, "generateExcel", { enumerable: true, get: function () { return generate_excel_1.generateExcel; } });
 Object.defineProperty(exports, "EnvironmentType", { enumerable: true, get: function () { return generate_excel_1.EnvironmentType; } });
 const util_1 = require("./util");
 Object.defineProperty(exports, "skipCell", { enumerable: true, get: function () { return util_1.skipCell; } });
+Object.defineProperty(exports, "writeEquation", { enumerable: true, get: function () { return util_1.writeEquation; } });
 var ICellType;
 (function (ICellType) {
     ICellType["string"] = "s";
     ICellType["number"] = "n";
     ICellType["skip"] = "skip";
+    ICellType["equation"] = "equation";
 })(ICellType || (ICellType = {}));
 exports.ICellType = ICellType;
 const sampleData = [
@@ -20,7 +22,7 @@ const sampleData = [
             ['woof', 'smack'],
             [1],
             [1, 2],
-            [1, 2, 3],
+            [1, 2, 3, (0, util_1.writeEquation)('SUM(A5,C5)')],
         ]
     },
     { title: 'Maifee2', content: [[1], [1, (0, util_1.skipCell)(3), 2]] },

package/lib/util.d.ts

@@ -10,4 +10,10 @@ declare class SkipCell {
     constructor(skipCell: number);
 }
 declare const skipCell: (skipCell: number) => SkipCell;
-export { indexToVbIndex, indexToVbRelationIndex, indexToRowIndex, rowColumnToVbPosition, calculateExtant, SkipCell, skipCell };
+declare class Equation {
+    private equation;
+    getEquation: () => string;
+    constructor(equation: string);
+}
+declare const writeEquation: (equation: string) => Equation;
+export { indexToVbIndex, indexToVbRelationIndex, indexToRowIndex, rowColumnToVbPosition, calculateExtant, SkipCell, skipCell, Equation, writeEquation };

package/lib/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.skipCell = exports.SkipCell = exports.calculateExtant = exports.rowColumnToVbPosition = exports.indexToRowIndex = exports.indexToVbRelationIndex = exports.indexToVbIndex = void 0;
+exports.writeEquation = exports.Equation = exports.skipCell = exports.SkipCell = exports.calculateExtant = exports.rowColumnToVbPosition = exports.indexToRowIndex = exports.indexToVbRelationIndex = exports.indexToVbIndex = void 0;
 const indexToVbIndex = (index) => index + 1;
 exports.indexToVbIndex = indexToVbIndex;
 const indexToVbRelationIndex = (index) => indexToVbIndex(index) + 2;
@@ -29,3 +29,12 @@ class SkipCell {
 exports.SkipCell = SkipCell;
 const skipCell = (skipCell) => new SkipCell(skipCell);
 exports.skipCell = skipCell;
+class Equation {
+    constructor(equation) {
+        this.getEquation = () => this.equation;
+        this.equation = equation;
+    }
+}
+exports.Equation = Equation;
+const writeEquation = (equation) => new Equation(equation);
+exports.writeEquation = writeEquation;

package/lib/xl/worksheets/sheet.xml.js

@@ -20,18 +20,33 @@ const generateSheetXml = (sheet) => {
     <col max="1025" min="1" style="0" width="11.52"/>
   </cols>
   <sheetData>
-    ${(sheet.rows).map((row, indexCol) => `
-      <row r="${(0, util_1.indexToVbIndex)(indexCol)}">
-        ${(row.cells).map((cell, indexRow) => cell.type === __1.ICellType.skip
-        ? ""
-        : `
-          <c r="${(0, util_1.rowColumnToVbPosition)(indexRow, indexCol)}" t="${cell.type}">
-            <v>${cell.value}</v>
-          </c>
-          `).join('\n')}
-      </row>
-      `).join('\n')}
-  </sheetData>
+  ${sheet.rows.map((row, rowIndex) => {
+        let rowContent = '';
+        rowContent += `<row r="${(0, util_1.indexToVbIndex)(rowIndex)}">\n`;
+        row.cells.forEach((cell, cellIndex) => {
+            const cellType = cell.type;
+            if (cellType !== __1.ICellType.skip) {
+                const cellPosition = (0, util_1.rowColumnToVbPosition)(cellIndex, rowIndex);
+                const cellValue = cell.value || '';
+                if (cell.type === __1.ICellType.equation) {
+                    rowContent += `
+              <c r="${cellPosition}" t="n">
+                <f aca="false">${cell.value.getEquation()}</f>
+              </c>\n`;
+                }
+                else {
+                    rowContent += `
+              <c r="${cellPosition}" t="${cellType}">
+                <v>${cellValue}</v>
+              </c>\n`;
+                }
+            }
+        });
+        rowContent += '</row>\n';
+        return rowContent;
+    }).join('')}
+</sheetData>
+
   <pageMargins left="0.7" right="0.7" top="0.75" bottom="0.75" header="0.3" footer="0.3"/>
 </worksheet>
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "to-spreadsheet",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "npm package to create spreadsheet in node environment",
   "main": "src/index.ts",
   "scripts": {

package/src/index.ts

@@ -1,16 +1,30 @@
 import { generateExcel, EnvironmentType } from "./generate-excel";
-import { SkipCell, skipCell } from "./util";
+import { SkipCell, skipCell, Equation, writeEquation } from "./util";
 
 enum ICellType {
   string = "s",
   number = "n",
   skip = "skip",
+  equation = "equation",
 }
 
-interface ICell {
-  type: ICellType;
-  value: number | undefined;
+interface ICellString {
+  type: ICellType.string;
+  value: number;
 }
+interface ICellNumber {
+  type: ICellType.number;
+  value: number;
+}
+interface ICellSkip {
+  type: ICellType.skip;
+}
+interface ICellEquation {
+  type: ICellType.equation;
+  value: Equation;
+}
+
+type ICell = ICellString | ICellNumber | ICellSkip | ICellEquation;
 
 interface IRows {
   cells: ICell[];
@@ -29,7 +43,7 @@ interface IWorkbook {
 
 interface IPage {
   title: string
-  content: (string | number | undefined | SkipCell)[][]
+  content: (string | number | undefined | SkipCell | Equation)[][]
 }
 
 export { ICell, ISheet, IWorkbook, IRows, ICellType, IPage }
@@ -42,7 +56,7 @@ const sampleData = [
       ['woof', 'smack'],
       [1],
       [1, 2],
-      [1, 2, 3],
+      [1, 2, 3, writeEquation('SUM(A5,C5)')],
     ]
   },
   { title: 'Maifee2', content: [[1], [1, skipCell(3), 2]] },
@@ -51,4 +65,4 @@ const sampleData = [
 
 // generateExcel(sampleData) // <- check before releasing with `yarn test:compile`
 
-export { generateExcel, sampleData, EnvironmentType, skipCell };
+export { generateExcel, sampleData, EnvironmentType, skipCell, writeEquation };