Merge pull request #23 from securedeveloper/jse-feature

JSE [feat] Update the coverage options.

Author: securedeveloper

jest.config.js

@@ -1,13 +1,10 @@
 module.exports = {
-    "globals": {
-        "ts-jest": {
-            "skipBabel": true
-        }
-    },
     "collectCoverage": true,
     "coverageDirectory": "./coverage/",
     "collectCoverageFrom": [
-        "**/*.{ts,tsx}",
+        "**/src/util/*.{ts,tsx}",
+        "!**/src/api/*.{ts,tsx}",
+        "!**/src/xlsx/*.{ts,tsx}",
         "!**/.circleci/**",
         "!**/.idea/**",
         "!**/lib/**",
@@ -25,7 +22,7 @@ module.exports = {
     "moduleDirectories": [
         "node_modules"
     ],
-    modulePathIgnorePatterns: [
+    "modulePathIgnorePatterns": [
         "<rootDir>/.circleci",
         "<rootDir>/.idea",
         "<rootDir>/coverage",

src/api/Helper.ts src/util/Helper.tssrc/api/Helper.ts renamed to src/util/Helper.ts

@@ -1,9 +1,9 @@
 export function cleanAlphaNumericString(str: string): string {
-    return str ? str.replace(/\W/g, '') : str;
+    return (str && typeof str === "string") ? str.replace(/\W/g, '') : str;
 }
 
 export function getISOFormattedDate(date?: Date): string {
-    if (!date) {
+    if (!date || typeof date !== "object") {
         date = new Date();
     }
 

src/xlsx/FileContentTypes.ts

@@ -11,10 +11,13 @@ import {
     PART_NAME_XL_THEME,
     PART_NAME_XL_WORKBOOK,
     XMLNS_CONTENT_TYPES,
-    DEFAULT_XML_VERSION, ENCODING_UTF_8, DEFAULT_STAND_ALONE
+    DEFAULT_XML_VERSION,
+    ENCODING_UTF_8,
+    DEFAULT_STAND_ALONE
 } from "../api/Internals";
 import {JSESheet, JSExcel} from "../Types";
 import {DEFAULT_FILE_EXTENSION} from "../api/constants";
+import {cleanAlphaNumericString} from "../util/Helper";
 
 const fileProps: any = {
     name: "[Content_Types]",
@@ -99,7 +102,10 @@ function getWorkSheetsOverrides(excel: JSExcel): Array<___JSE_XLSX___Node> {
     return excel.sheets.map((sheet: JSESheet) => ({
         name: fileProps.nodes.Override,
         values: [
-            {key: fileProps.keys.PartName, value: `${partNameOverride}${sheet.name}${fileProps.extension}`},
+            {
+                key: fileProps.keys.PartName,
+                value: `${partNameOverride}${cleanAlphaNumericString(sheet.name)}${fileProps.extension}`
+            },
             {key: fileProps.keys.ContentType, value: PART_NAME_XL_WORKSHEET}
         ]
     }));

src/xlsx/docProps/FileDocPropsCore.ts

@@ -1,7 +1,7 @@
 // TODO: Tier-02 Replace values when file properties module is implemented
 import {JSExcel} from "../../Types";
 import {___JSE_XLSX___File, ___JSE_XLSX___Node} from "../../api/xlsx";
-import {getISOFormattedDate} from "../../api/Helper";
+import {getISOFormattedDate} from "../../util/Helper";
 import {
     DEFAULT_PROPS_CREATOR,
     DEFAULT_PROPS_DESCRIPTION,

test/unit/Helper.test.ts

@@ -1,7 +1,7 @@
-import {cleanAlphaNumericString, getISOFormattedDate} from "../../src/api/Helper";
+import {cleanAlphaNumericString, getISOFormattedDate} from "../../src/util/Helper";
 
 describe("Helper --> ", () => {
-    describe("String --> ", () => {
+    describe("String -->", () => {
         test("it return a clean expected string", () => {
             const inputs: Array<string> = ["\\test\red\bob\fred\new", "±~NaNNumericApha$-and_returned0"];
             const outputs: Array<string> = ["testedobredew", "NaNNumericAphaand_returned0"];
@@ -10,14 +10,29 @@ describe("Helper --> ", () => {
                 expect(cleanAlphaNumericString(input)).toBe(outputs[index]);
             });
         });
+
+        test("it return exact input if wrong string value is supplied", () => {
+            const inputs: Array<any> = [false, undefined, true, 121, new Date(), {}, null];
+
+            inputs.forEach((input: any) => {
+                expect(cleanAlphaNumericString(input)).toBe(input);
+            });
+        });
     });
 
-    describe("Date --> ", () => {
-        test("it should return required ISO formatted date stamp", () => {
+    describe("Date -->", () => {
+        test("it should return required ISO formatted date stamp w.r.t date provided", () => {
             const inputDate: Date = new Date('05 October 2011 14:48 UTC');
             const expectedOutput: string = "2011-10-05T14:48:00Z";
 
             expect(getISOFormattedDate(inputDate)).toBe(expectedOutput);
         });
+
+
+        test("it should return today as  ISO formatted date stamp if no arg is provided", () => {
+            const expectedOutput: string = new Date().toISOString().split(".")[0] + "Z";
+
+            expect(getISOFormattedDate()).toBe(expectedOutput);
+        });
     });
 });