npm - @elisra-devops/docgen-skins - Versions diffs - 0.3.7 → 0.4.1 - Mend

@elisra-devops/docgen-skins 0.3.7 → 0.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/.github/workflows/ci.yml +7 -2
package/.github/workflows/release.yml +7 -5
package/bin/index.d.ts +1 -1
package/bin/index.js +33 -27
package/bin/index.js.map +1 -1
package/bin/models/json/table/JSONTable.d.ts +3 -3
package/bin/models/json/table/JSONTable.js +8 -8
package/bin/models/json/table/JSONTable.js.map +1 -1
package/bin/models/json/table/JSONTableCell.d.ts +4 -3
package/bin/models/json/table/JSONTableCell.js +43 -31
package/bin/models/json/table/JSONTableCell.js.map +1 -1
package/bin/models/json/table/JSONTableRow.d.ts +3 -3
package/bin/models/json/table/JSONTableRow.js +5 -5
package/bin/models/json/table/JSONTableRow.js.map +1 -1
package/package.json +1 -1
package/src/index.ts +69 -132
package/src/models/json/table/JSONTable.ts +12 -24
package/src/models/json/table/JSONTableCell.ts +64 -61
package/src/models/json/table/JSONTableRow.ts +7 -13

package/.github/workflows/ci.yml CHANGED Viewed

@@ -1,7 +1,12 @@
 name: "🚀 ci"
-on: [pull_request]
+on:
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - '.github/**'
 jobs:
   build_and_test:
     name: 🚀 build  and test

package/.github/workflows/release.yml CHANGED Viewed

@@ -4,7 +4,9 @@ on:
   push:
     branches:
       - main
+    paths-ignore:
+      - '.github/**'
 permissions:
   contents: write
   packages: write
@@ -17,7 +19,9 @@ jobs:
     steps:
       - name: 📚 checkout
         uses: actions/checkout@v2
+        with:
+          token:  ${{ secrets.ELISRADEVOPS_ACCESS_TOKEN }}
       - name: 🟢 node
         uses: actions/setup-node@v2
         with:
@@ -34,12 +38,10 @@ jobs:
       - name: 'Automated Version Bump'
         uses: 'phips28/gh-action-bump-version@master'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           commit-message: 'CI: bumps version to {{version}} [skip ci]'
       - name: 🚀 publish
         run: npm publish --access public
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

package/bin/index.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { DocumentSkin, WIQueryResults, StyleOptions } from "./models/json/wordJsonModels";
+import { DocumentSkin, WIQueryResults, StyleOptions } from './models/json/wordJsonModels';
 export default class Skins {
     SKIN_TYPE_TABLE: string;
     SKIN_TYPE_PARAGRAPH: string;

package/bin/index.js CHANGED Viewed

@@ -19,15 +19,15 @@ const JSONTestSuiteHeaderParagraph_1 = __importDefault(require("./models/json/pa
 const JSONRichTextParagraph_1 = __importDefault(require("./models/json/paragraph/JSONRichTextParagraph"));
 const default_1 = require("./models/json/default");
 class Skins {
-    constructor(skinFormat = "json", templatePath) {
-        this.SKIN_TYPE_TABLE = "table";
-        this.SKIN_TYPE_PARAGRAPH = "paragraph";
-        this.SKIN_TYPE_TEST_PLAN = "test-plan";
+    constructor(skinFormat = 'json', templatePath) {
+        this.SKIN_TYPE_TABLE = 'table';
+        this.SKIN_TYPE_PARAGRAPH = 'paragraph';
+        this.SKIN_TYPE_TEST_PLAN = 'test-plan';
         this.documentSkin = {
-            templatePath: "",
+            templatePath: '',
             contentControls: [],
         };
-        this.skinFormat = "json";
+        this.skinFormat = 'json';
         this.documentSkin.templatePath = templatePath;
         this.skinFormat = skinFormat;
     }
@@ -116,10 +116,10 @@ class Skins {
     generateQueryBasedTable(data, styles, headingLvl = 0) {
         logger_1.default.debug(`Generating table as ${this.skinFormat}`);
         switch (this.skinFormat) {
-            case "json":
+            case 'json':
                 let tableSkin = new JSONTable_1.default(data, styles, headingLvl);
                 return [tableSkin.getJSONTable()];
-            case "html":
+            case 'html':
                 logger_1.default.info(`Generating html table!`);
                 break;
             default:
@@ -129,28 +129,25 @@ class Skins {
     generateQueryBasedParagraphs(data, styles, headingLvl = 0) {
         logger_1.default.debug(`Generating paragraph as ${this.skinFormat}`);
         switch (this.skinFormat) {
-            case "json":
+            case 'json':
                 let paragraphs = [];
                 data.forEach((wi) => {
                     wi.fields.forEach((field) => {
                         //Description and Test Description are handled in richText handler
-                        if (field.name === "Description: " ||
-                            field.name === "Test Description:") {
+                        if (field.name === 'Description: ' || field.name === 'Test Description:') {
                             let paragraphSkin = new JSONRichTextParagraph_1.default(field, styles, wi.Source, headingLvl + wi.level);
                             paragraphs.push(paragraphSkin.getJSONRichTextParagraph());
                         }
                         //making sure ID is not printed
                         //excluding Description and Test Description are handled in richText handler
-                        if (field.name !== "ID" &&
-                            field.name !== "Description: " &&
-                            field.name !== "Test Description:") {
+                        if (field.name !== 'ID' && field.name !== 'Description: ' && field.name !== 'Test Description:') {
                             let paragraphSkin = new JSONParagraph_1.default(field, styles, wi.Source, headingLvl + wi.level);
                             paragraphs.push(paragraphSkin.getJSONParagraph());
                         }
                     });
                 });
                 return paragraphs;
-            case "html":
+            case 'html':
                 logger_1.default.info(`Generating html paragraphs!`);
                 break;
             default:
@@ -160,7 +157,7 @@ class Skins {
     generateTestBasedSkin(data, styles, headingLvl = 0, includeAttachments = true) {
         logger_1.default.debug(`Generating testSkin as ${this.skinFormat}`);
         switch (this.skinFormat) {
-            case "json":
+            case 'json':
                 let testSkin = [];
                 //create suite Header pragraph
                 data.forEach((testSuite) => {
@@ -170,7 +167,7 @@ class Skins {
                         IsUnderline: false,
                         Size: 16,
                         Uri: null,
-                        Font: "Arial",
+                        Font: 'Arial',
                         InsertLineBreak: false,
                         InsertSpace: true,
                     };
@@ -192,7 +189,7 @@ class Skins {
                             IsUnderline: false,
                             Size: 14,
                             Uri: null,
-                            Font: "Arial",
+                            Font: 'Arial',
                             InsertLineBreak: false,
                             InsertSpace: true,
                         };
@@ -202,14 +199,14 @@ class Skins {
                                 ? headingLvl
                                 : 1);
                         testSkin.push(testCaseParagraphSkin.getJSONParagraph());
-                        let testDescriptionTitleParagraph = new JSONParagraph_1.default({ name: "Title", value: "Test Description:" }, default_1.DescriptionandProcedureStyle, testcase.id || 0, 0);
+                        let testDescriptionTitleParagraph = new JSONParagraph_1.default({ name: 'Title', value: 'Test Description:' }, default_1.DescriptionandProcedureStyle, testcase.id || 0, 0);
                         testSkin.push(testDescriptionTitleParagraph.getJSONParagraph());
                         let testDescriptionParagraph = new JSONRichTextParagraph_1.default(testcase.testCaseHeaderSkinData.fields[2], styles, testcase.id || 0, 0);
                         let richTextSkin = testDescriptionParagraph.getJSONRichTextParagraph();
                         testSkin = [...testSkin, ...richTextSkin];
                         if (testcase.testCaseRequirements) {
                             if (testcase.testCaseRequirements.length > 0) {
-                                let testDescriptionTitleParagraph = new JSONParagraph_1.default({ name: "Title", value: "Covered Requirements:" }, default_1.DescriptionandProcedureStyle, testcase.id || 0, 0);
+                                let testDescriptionTitleParagraph = new JSONParagraph_1.default({ name: 'Title', value: 'Covered Requirements:' }, default_1.DescriptionandProcedureStyle, testcase.id || 0, 0);
                                 testSkin.push(testDescriptionTitleParagraph.getJSONParagraph());
                                 //create test steps table
                                 let tableSkin = new JSONTable_1.default(testcase.testCaseRequirements, styles, headingLvl);
@@ -217,16 +214,26 @@ class Skins {
                                 testSkin.push(populatedTableSkin);
                             }
                         }
+                        if (testcase.testCaseBugs) {
+                            if (testcase.testCaseBugs.length > 0) {
+                                let testDescriptionTitleParagraph = new JSONParagraph_1.default({ name: 'Title', value: 'Linked Bugs:' }, default_1.DescriptionandProcedureStyle, testcase.id || 0, 0);
+                                testSkin.push(testDescriptionTitleParagraph.getJSONParagraph());
+                                //create test steps table
+                                let tableSkin = new JSONTable_1.default(testcase.testCaseBugs, styles, headingLvl);
+                                let populatedTableSkin = tableSkin.getJSONTable();
+                                testSkin.push(populatedTableSkin);
+                            }
+                        }
                         try {
                             if (testcase.testCaseStepsSkinData.length > 0) {
-                                let testProcedureTitleParagraph = new JSONParagraph_1.default({ name: "Title", value: "Test Procedure:" }, default_1.DescriptionandProcedureStyle, testcase.id || 0, 0);
+                                let testProcedureTitleParagraph = new JSONParagraph_1.default({ name: 'Title', value: 'Test Procedure:' }, default_1.DescriptionandProcedureStyle, testcase.id || 0, 0);
                                 let TableContentStyles = {
                                     isBold: false,
                                     IsItalic: false,
                                     IsUnderline: false,
                                     Size: 12,
                                     Uri: null,
-                                    Font: "Arial",
+                                    Font: 'Arial',
                                     InsertLineBreak: false,
                                     InsertSpace: true,
                                 };
@@ -242,12 +249,11 @@ class Skins {
                         }
                         //attachments table
                         if (testcase.testCaseAttachments) {
-                            if (testcase.testCaseAttachments.length > 0 &&
-                                includeAttachments == true) {
-                                let testDescriptionTitleParagraph = new JSONParagraph_1.default({ name: "Title", value: "Test Case Attachments:" }, styles, testcase.id || 0, 0);
+                            if (testcase.testCaseAttachments.length > 0 && includeAttachments == true) {
+                                let testDescriptionTitleParagraph = new JSONParagraph_1.default({ name: 'Title', value: 'Test Case Attachments:' }, styles, testcase.id || 0, 0);
                                 testSkin.push(testDescriptionTitleParagraph.getJSONParagraph());
                                 //create test steps table
-                                let tableSkin = new JSONTable_1.default(testcase.testCaseAttachments, styles, headingLvl);
+                                let tableSkin = new JSONTable_1.default(testcase.testCaseAttachments, styles, headingLvl, true);
                                 let populatedTableSkin = tableSkin.getJSONTable();
                                 testSkin.push(populatedTableSkin);
                             }
@@ -256,7 +262,7 @@ class Skins {
                 });
                 return testSkin;
                 break;
-            case "html":
+            case 'html':
                 logger_1.default.info(`Generating html test data!`);
                 break;
             default:

package/bin/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;~~AAOA~~,+DAAuC;AACvC,8EAAsD;AACtD,0FAAkE;AAClE,wHAAuF;AACvF,0GAAkF;AAClF,~~mDAE+B~~;~~AAE/B~~,MAAqB,KAAK;IAYxB,YAAY,aAAqB,MAAM,EAAE,YAAoB;QAX7D,oBAAe,GAAG,OAAO,CAAC;QAC1B,wBAAmB,GAAG,WAAW,CAAC;QAClC,wBAAmB,GAAG,WAAW,CAAC;QAElC,iBAAY,GAAiB;YAC3B,YAAY,EAAE,EAAE;YAChB,eAAe,EAAE,EAAE;SACpB,CAAC;QAEF,eAAU,GAAW,MAAM,CAAC;QAG1B,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,YAAY,CAAC;QAC9C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAEK,2BAA2B,CAC/B,mBAA2B,EAC3B,QAAgB,EAChB,IAAS,EACT,MAAoB,EACpB,aAAqB,CAAC,EACtB,qBAA8B,IAAI;;YAElC,IAAI;gBACF,IAAI,aAAa,CAAC;gBAElB,QAAQ,QAAQ,EAAE;oBAChB,KAAK,IAAI,CAAC,eAAe;wBACvB,aAAa,GAAG,IAAI,CAAC,uBAAuB,~~CAC1C~~,IAAI,~~EACJ~~,MAAM,~~EACN~~,UAAU,~~CACX~~,CAAC;~~wBACF~~,IAAI,aAAa,KAAK,KAAK,EAAE;4BAC3B,gBAAM,CAAC,KAAK,~~CACV~~,iDAAiD,mBAAmB,EAAE,~~CACvE~~,CAAC;~~4BACF~~,OAAO,KAAK,CAAC;yBACd;wBACD,MAAM;oBACR,KAAK,IAAI,CAAC,mBAAmB;wBAC3B,aAAa,GAAG,IAAI,CAAC,4BAA4B,~~CAC/C~~,IAAI,~~EACJ~~,MAAM,~~EACN~~,UAAU,~~CACX~~,CAAC;~~wBACF~~,IAAI,aAAa,KAAK,KAAK,EAAE;4BAC3B,gBAAM,CAAC,KAAK,~~CACV~~,qDAAqD,mBAAmB,EAAE,~~CAC3E~~,CAAC;~~4BACF~~,OAAO,KAAK,CAAC;yBACd;wBACD,MAAM;oBACR,KAAK,IAAI,CAAC,mBAAmB;wBAC3B,aAAa,GAAG,IAAI,CAAC,qBAAqB,~~CACxC~~,IAAI,~~EACJ~~,MAAM,~~EACN~~,UAAU,~~EACV~~,kBAAkB,~~CACnB~~,CAAC;~~wBACF~~,IAAI,aAAa,KAAK,KAAK,EAAE;4BAC3B,gBAAM,CAAC,KAAK,~~CACV~~,qDAAqD,mBAAmB,EAAE,~~CAC3E~~,CAAC;~~4BACF~~,OAAO,KAAK,CAAC;yBACd;wBACD,MAAM;oBACR;wBACE,gBAAM,CAAC,KAAK,~~CACV~~,sBAAsB,QAAQ,kCAAkC,~~CACjE~~,CAAC;~~wBACF~~,OAAO,KAAK,CAAC;iBAChB;gBAED,OAAO,aAAa,CAAC;gBAErB,+CAA+C;gBAC/C,yBAAyB;gBACzB,kBAAkB;gBAClB,KAAK;aACN;YAAC,OAAO,KAAK,EAAE;gBACd,gBAAM,CAAC,KAAK,~~CACV~~,iDAAiD,mBAAmB,EAAE,~~CACvE~~,CAAC;~~gBACF~~,OAAO,KAAK,CAAC;aACd;QACH,CAAC;KAAA,CAAC,6BAA6B;IAE/B,sCAAsC;IACtC,qEAAqE;IACrE,yBAAyB;IACnB,+BAA+B,~~CACnC~~,mBAA2B,~~EAC3B~~,aAAkB;;~~YAElB~~,IAAI;gBACF,IAAI,sBAAsB,GAAc,MAAM,OAAO,CAAC,GAAG,CACvD,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE;oBAC1D,IAAI,cAAc,CAAC,KAAK,KAAK,mBAAmB,EAAE;wBAChD,gBAAM,CAAC,KAAK,CAAC,qBAAqB,mBAAmB,mBAAmB,CAAC;6BACxD,mBAAmB,EAAE,CAAC,CAAC;wBACxC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG;4BACjD,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,WAAW;4BACnD,GAAG,aAAa;yBACjB,CAAC;wBACF,OAAO,IAAI,CAAC;qBACb;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC,CAAC,MAAM;iBACV,CAAC,CAAC,aAAa;gBAEhB,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAC1C,IAAI,sBAAsB,GAAG;wBAC3B,KAAK,EAAE,mBAAmB;wBAC1B,WAAW,EAAE,aAAa;qBAC3B,CAAC;oBAEF,gBAAM,CAAC,KAAK,CAAC,qBAAqB,mBAAmB;;aAEhD,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;oBAC5C,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;iBACnE;gBACD,gBAAM,CAAC,IAAI,~~CACT~~,2CAA2C,mBAAmB,EAAE,~~CACjE~~,CAAC;~~gBACF~~,OAAO,IAAI,CAAC;aACb;YAAC,OAAO,KAAK,EAAE;gBACd,gBAAM,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;gBAClE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;aACpB;QACH,CAAC;KAAA,CAAC,iCAAiC;IAEnC,kEAAkE;IAClE,0EAA0E;IAC1E,uBAAuB,~~CACrB~~,IAAoB,~~EACpB~~,MAAoB,~~EACpB~~,aAAqB,CAAC;~~QAEtB~~,gBAAM,CAAC,KAAK,CAAC,uBAAuB,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAEvD,QAAQ,IAAI,CAAC,UAAU,EAAE;YACvB,KAAK,MAAM;gBACT,IAAI,SAAS,GAAG,IAAI,mBAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;gBACxD,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC;YACpC,KAAK,MAAM;gBACT,gBAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;gBACtC,MAAM;YACR;gBACE,OAAO,KAAK,CAAC;SAChB,CAAC,QAAQ;IACZ,CAAC,CAAC,eAAe;IAEjB,4BAA4B,~~CAC1B~~,IAAS,~~EACT~~,MAAoB,~~EACpB~~,aAAqB,CAAC;~~QAEtB~~,gBAAM,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAE3D,QAAQ,IAAI,CAAC,UAAU,EAAE;YACvB,KAAK,MAAM;gBACT,IAAI,UAAU,GAAU,EAAE,CAAC;gBAC3B,IAAI,CAAC,OAAO,CAAC,CAAC,EAAU,EAAE,EAAE;oBAC1B,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAiB,EAAE,EAAE;wBACtC,kEAAkE;wBAClE,~~IACE~~,KAAK,CAAC,IAAI,KAAK,eAAe~~;4BAC9B~~,KAAK,CAAC,IAAI,KAAK,mBAAmB,~~EAClC~~;~~4BACA~~,IAAI,aAAa,GAAG,IAAI,+BAAqB,~~CAC3C~~,KAAK,~~EACL~~,MAAM,~~EACN~~,EAAE,CAAC,MAAM,~~EACT~~,UAAU,GAAG,EAAE,CAAC,KAAK,~~CACtB~~,CAAC;~~4BACF~~,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,wBAAwB,EAAE,CAAC,CAAC;yBAC3D;wBAED,+BAA+B;wBAC/B,4EAA4E;wBAC5E,~~IACE~~,KAAK,CAAC,IAAI,KAAK,IAAI~~;4BACnB~~,KAAK,CAAC,IAAI,KAAK,eAAe~~;4BAC9B~~,KAAK,CAAC,IAAI,KAAK,mBAAmB,~~EAClC~~;~~4BACA~~,IAAI,aAAa,GAAG,IAAI,uBAAa,~~CACnC~~,KAAK,~~EACL~~,MAAM,~~EACN~~,EAAE,CAAC,MAAM,~~EACT~~,UAAU,GAAG,EAAE,CAAC,KAAK,~~CACtB~~,CAAC;~~4BACF~~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~~GACd~~,wBAAwB,CAAC,wBAAwB,EAAE,CAAC;~~wBACtD~~,QAAQ,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,YAAY,CAAC,CAAC;wBAE1C,IAAI,QAAQ,CAAC,oBAAoB,EAAE;4BACjC,~~IACE~~,QAAQ,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,~~EACxC~~;~~gCAEA~~,IAAI,6BAA6B,GAAG,IAAI,uBAAa,CACnD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAAE,EACjD,sCAA4B,EAC5B,QAAQ,CAAC,EAAE,IAAI,CAAC,EAChB,CAAC,CACF,CAAC;gCACF,QAAQ,CAAC,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,EAAE,CAAC,CAAC;gCAChE,yBAAyB;gCACzB,IAAI,SAAS,GAAG,IAAI,mBAAS,~~CAC3B~~,QAAQ,CAAC,oBAAoB,~~EAC7B~~,MAAM,~~EACN~~,UAAU,~~CACX~~,CAAC;~~gCAEF~~,IAAI,kBAAkB,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;gCAElD,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;6BACnC;yBACF;wBAED,IAAI;4BACF,IAAI,QAAQ,CAAC,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE;gCAC7C,IAAI,2BAA2B,GAAG,IAAI,uBAAa,CACjD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAC3C,sCAA4B,EAC5B,QAAQ,CAAC,EAAE,IAAI,CAAC,EAChB,CAAC,CACF,CAAC;gCACF,IAAI,kBAAkB,GAAG;oCACvB,MAAM,EAAE,KAAK;oCACb,QAAQ,EAAE,KAAK;oCACf,WAAW,EAAE,KAAK;oCAClB,IAAI,EAAE,EAAE;oCACR,GAAG,EAAE,IAAI;oCACT,IAAI,EAAE,OAAO;oCACb,eAAe,EAAE,KAAK;oCACtB,WAAW,EAAE,IAAI;iCAClB,CAAC;gCACF,QAAQ,CAAC,IAAI,CAAC,2BAA2B,CAAC,gBAAgB,EAAE,CAAC,CAAC;gCAC9D,yBAAyB;gCACzB,IAAI,SAAS,GAAG,IAAI,mBAAS,~~CAC3B~~,QAAQ,CAAC,qBAAqB,~~EAC9B~~,kBAAkB,~~EAClB~~,UAAU,~~CACX~~,CAAC;~~gCACF~~,IAAI,kBAAkB,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;gCAClD,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;6BACnC;yBACF;wBAAC,OAAO,KAAK,EAAE;4BACd,gBAAM,CAAC,IAAI,CACT,kBAAkB,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,mDAAmD,QAAQ,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAC/J,CAAC;~~yBACJ~~;~~wBAEA~~,mBAAmB;wBACnB,IAAI,QAAQ,CAAC,mBAAmB,EAAE;4BAChC,~~IACE~~,QAAQ,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC~~;gCACvC~~,kBAAkB,IAAI,IAAI,~~EAC1B~~;~~gCAEA~~,IAAI,6BAA6B,GAAG,IAAI,uBAAa,CACnD,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,wBAAwB,EAAE,EAClD,MAAM,EACN,QAAQ,CAAC,EAAE,IAAI,CAAC,EAChB,CAAC,CACF,CAAC;gCACF,QAAQ,CAAC,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,EAAE,CAAC,CAAC;gCAChE,yBAAyB;gCACzB,IAAI,SAAS,GAAG,IAAI,mBAAS,~~CAC3B~~,QAAQ,CAAC,mBAAmB,~~EAC5B~~,MAAM,~~EACN~~,UAAU,~~CACX~~,CAAC;~~gCACF~~,IAAI,kBAAkB,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;gCAClD,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;6BACnC;yBACF;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,OAAO,QAAQ,CAAC;gBAChB,MAAM;YACR,KAAK,MAAM;gBACT,gBAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;gBAC1C,MAAM;YACR;gBACE,OAAO,KAAK,CAAC;SAChB,CAAC,QAAQ;IACZ,CAAC,CAAC,uBAAuB;IAEzB,eAAe;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC,CAAC,iBAAiB;CACpB;~~AAhYD~~,~~wBAgYC~~"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/bin/models/json/table/JSONTable.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
-import { Table, TableRow, WIQueryResults, WIData, StyleOptions } from "../wordJsonModels";
+import { Table, TableRow, WIQueryResults, WIData, StyleOptions } from '../wordJsonModels';
 export default class JSONTable {
     tableTemplate: Table;
     tableStyles: StyleOptions;
-    constructor(data: WIQueryResults, tableStyles: StyleOptions, headingLvl: number);
-    generateJsonRows(data: any, tableStyles: StyleOptions): TableRow[];
+    constructor(data: WIQueryResults, tableStyles: StyleOptions, headingLvl: number, retrieveOriginal?: boolean);
+    generateJsonRows(data: any, tableStyles: StyleOptions, retrieveOriginal: boolean): TableRow[];
     headersRowAdapter(data: WIData): WIData;
     getJSONTable(): Table;
 }

package/bin/models/json/table/JSONTable.js CHANGED Viewed

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = __importDefault(require("../../../services/logger"));
 const JSONTableRow_1 = __importDefault(require("./JSONTableRow"));
 class JSONTable {
-    constructor(data, tableStyles, headingLvl) {
+    constructor(data, tableStyles, headingLvl, retrieveOriginal = false) {
         this.tableStyles = tableStyles;
         this.tableTemplate = {
-            type: "table",
+            type: 'table',
             headingLevel: headingLvl,
-            Rows: this.generateJsonRows(data, this.tableStyles),
+            Rows: this.generateJsonRows(data, this.tableStyles, retrieveOriginal),
         };
     }
-    generateJsonRows(data, tableStyles) {
+    generateJsonRows(data, tableStyles, retrieveOriginal) {
         let rows = [];
         let headersRowData = this.headersRowAdapter(data[0]);
         let style2 = {
@@ -23,14 +23,14 @@ class JSONTable {
             IsUnderline: false,
             Size: 12,
             Uri: null,
-            Font: "Arial",
+            Font: 'Arial',
             InsertLineBreak: false,
             InsertSpace: false,
         };
         let headersRow = new JSONTableRow_1.default(headersRowData, style2);
         rows.push(headersRow.getRow());
         data.forEach((rowData) => {
-            let row = new JSONTableRow_1.default(rowData, tableStyles);
+            let row = new JSONTableRow_1.default(rowData, tableStyles, retrieveOriginal);
             rows.push(row.getRow());
         });
         return rows;
@@ -39,14 +39,14 @@ class JSONTable {
         let headerValuesWi;
         try {
             headerValuesWi = data.fields.map((field) => {
-                return { name: "header", value: field.name };
+                return { name: 'header', value: field.name };
             });
         }
         catch (error) {
             logger_1.default.error(`no fields to append`);
         }
         return {
-            url: "",
+            url: '',
             fields: headerValuesWi,
             Source: 999999999999,
             level: data.level,

package/bin/models/json/table/JSONTable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"JSONTable.js","sourceRoot":"","sources":["../../../../src/models/json/table/JSONTable.ts"],"names":[],"mappings":";;;;;AAAA,sEAA8C;~~AAS9C~~,kEAA0C;AAC1C,MAAqB,SAAS;IAI5B,~~YACE~~,IAAoB,~~EACpB~~,WAAyB,~~EACzB~~,UAAkB;~~QAElB~~,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG;YACnB,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,UAAU;YACxB,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC;~~SACpD~~,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,IAAS,EAAE,WAAyB;~~QACnD~~,IAAI,IAAI,GAAe,EAAE,CAAC;QAC1B,IAAI,cAAc,GAAW,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAE7D,IAAI,MAAM,GAAG;YACX,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,KAAK;YAClB,IAAI,EAAE,EAAE;YACR,GAAG,EAAE,IAAI;YACT,IAAI,EAAE,OAAO;YACb,eAAe,EAAE,KAAK;YACtB,WAAW,EAAE,KAAK;SACnB,CAAC;QACF,IAAI,UAAU,GAAG,IAAI,sBAAY,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAE1D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,CAAC,CAAC,OAAe,EAAE,EAAE;YAC/B,IAAI,GAAG,GAAG,IAAI,sBAAY,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;~~YACjD~~,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,kBAAkB;IAEpB,iBAAiB,CAAC,IAAY;QAC5B,IAAI,cAAc,CAAC;QACnB,IAAI;YACF,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAiB,EAAE,EAAE;gBACrD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YAC/C,CAAC,CAAC,CAAC;~~SAEJ~~;QAAC,OAAO,KAAK,EAAE;YACd,gBAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;SACrC;QACD,OAAO;YACL,GAAG,EAAE,EAAE;YACP,MAAM,EAAE,cAAc;YACtB,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;IACJ,CAAC,CAAC,mBAAmB;IAErB,YAAY;QACV,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC,CAAC,cAAc;CACjB,CAAC,OAAO;~~AAhET~~,~~4BAgEC~~"}
1	+ {"version":3,"file":"JSONTable.js","sourceRoot":"","sources":["../../../../src/models/json/table/JSONTable.ts"],"names":[],"mappings":";;;;;AAAA,sEAA8C;AAE9C,kEAA0C;AAC1C,MAAqB,SAAS;IAI5B,YAAY,IAAoB,EAAE,WAAyB,EAAE,UAAkB,EAAE,gBAAgB,GAAG,KAAK;QACvG,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG;YACnB,IAAI,EAAE,OAAO;YACb,YAAY,EAAE,UAAU;YACxB,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE,gBAAgB,CAAC;SACtE,CAAC;IACJ,CAAC;IAED,gBAAgB,CAAC,IAAS,EAAE,WAAyB,EAAE,gBAAyB;QAC9E,IAAI,IAAI,GAAe,EAAE,CAAC;QAC1B,IAAI,cAAc,GAAW,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAE7D,IAAI,MAAM,GAAG;YACX,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,KAAK;YACf,WAAW,EAAE,KAAK;YAClB,IAAI,EAAE,EAAE;YACR,GAAG,EAAE,IAAI;YACT,IAAI,EAAE,OAAO;YACb,eAAe,EAAE,KAAK;YACtB,WAAW,EAAE,KAAK;SACnB,CAAC;QACF,IAAI,UAAU,GAAG,IAAI,sBAAY,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAE1D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/B,IAAI,CAAC,OAAO,CAAC,CAAC,OAAe,EAAE,EAAE;YAC/B,IAAI,GAAG,GAAG,IAAI,sBAAY,CAAC,OAAO,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC;YACnE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,kBAAkB;IAEpB,iBAAiB,CAAC,IAAY;QAC5B,IAAI,cAAc,CAAC;QACnB,IAAI;YACF,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAiB,EAAE,EAAE;gBACrD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YAC/C,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE;YACd,gBAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;SACrC;QACD,OAAO;YACL,GAAG,EAAE,EAAE;YACP,MAAM,EAAE,cAAc;YACtB,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;IACJ,CAAC,CAAC,mBAAmB;IAErB,YAAY;QACV,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC,CAAC,cAAc;CACjB,CAAC,OAAO;AA3DT,4BA2DC"}

package/bin/models/json/table/JSONTableCell.d.ts CHANGED Viewed

@@ -1,8 +1,9 @@
-import { TableCell, WIProperty, MultipeValuesWIProperty, StyleOptions } from "../wordJsonModels";
+import { TableCell, WIProperty, MultipeValuesWIProperty, StyleOptions } from '../wordJsonModels';
 export default class JSONTableCell {
     cell: TableCell;
-    constructor(data: WIProperty, tableStyles: StyleOptions);
-    generateJsonCell(data: WIProperty | MultipeValuesWIProperty, styles: any): TableCell;
+    constructor(data: WIProperty, tableStyles: StyleOptions, retrieveOriginal?: boolean);
+    private removeFileExtension;
+    generateJsonCell(data: WIProperty | MultipeValuesWIProperty, styles: any, retrieveOriginal: any): TableCell;
     isPictureUri(uri: string): boolean;
     getJsonCell(): TableCell;
 }

package/bin/models/json/table/JSONTableCell.js CHANGED Viewed

@@ -7,35 +7,48 @@ const path_1 = require("path");
 const JSONRun_1 = __importDefault(require("../JSONRun"));
 const logger_1 = __importDefault(require("../../../services/logger"));
 class JSONTableCell {
-    constructor(data, tableStyles) {
-        this.cell = this.generateJsonCell(data, tableStyles);
+    constructor(data, tableStyles, retrieveOriginal = false) {
+        this.cell = this.generateJsonCell(data, tableStyles, retrieveOriginal);
     }
-    generateJsonCell(data, styles) {
+    removeFileExtension(filePath) {
+        const lastDotIndex = filePath.lastIndexOf('.');
+        if (lastDotIndex > 0) {
+            return filePath.slice(0, lastDotIndex);
+        }
+        return filePath; // If there's no extension, return the original file path
+    }
+    generateJsonCell(data, styles, retrieveOriginal) {
         let runs = [];
         let attachments = [];
-        let HtmlData = "";
+        let HtmlData = '';
         //multiple values
-        if (typeof data.value !== "string" &&
-            typeof data.value !== "number" &&
-            data.value) {
+        if (typeof data.value !== 'string' && typeof data.value !== 'number' && data.value) {
             data.value.forEach((runData) => {
                 //check if photo type
-                if (this.isPictureUri(runData.tableCellAttachmentLink)) {
-                    let attachment = {
-                        type: "Picture",
-                        path: runData.tableCellAttachmentLink,
-                    };
-                    attachments.push(attachment);
+                if (runData.attachmentLink) {
+                    let attachmentLink = retrieveOriginal ? runData.attachmentLink : runData.tableCellAttachmentLink;
+                    if (this.isPictureUri(attachmentLink)) {
+                        let attachment = {
+                            type: 'Picture',
+                            path: attachmentLink,
+                            name: this.removeFileExtension(runData.attachmentFileName),
+                        };
+                        attachments.push(attachment);
+                    }
+                    else {
+                        let attachment = {
+                            type: 'File',
+                            path: runData.attachmentLink,
+                            name: this.removeFileExtension(runData.attachmentFileName),
+                        };
+                        attachments.push(attachment);
+                    }
                 }
                 else if (/<[^>]*>/.test(runData.value)) {
-                    HtmlData = runData.value || "";
+                    HtmlData = runData.value || '';
                 }
                 else {
-                    styles.Uri = runData.relativeUrl
-                        ? runData.relativeUrl
-                        : runData.Uri
-                            ? runData.Uri
-                            : null;
+                    styles.Uri = runData.relativeUrl ? runData.relativeUrl : runData.Uri ? runData.Uri : null;
                     styles.InsertLineBreak = false;
                     let jsonRun = new JSONRun_1.default(runData.value, styles);
                     runs = [...runs, ...jsonRun.getRun()];
@@ -43,22 +56,18 @@ class JSONTableCell {
             });
         }
         else if (/<[^>]*>/.test(data.value)) {
-            HtmlData = data.value || "";
+            HtmlData = data.value || '';
         }
         else {
-            styles.Uri = data.relativeUrl
-                ? data.relativeUrl
-                : data.url
-                    ? data.url
-                    : null;
-            let text = data.value || "";
+            styles.Uri = data.relativeUrl ? data.relativeUrl : data.url ? data.url : null;
+            let text = data.value || '';
             let jsonRun = new JSONRun_1.default(`${text}`, styles);
             runs = [...runs, ...jsonRun.getRun()];
         }
-        if (HtmlData != "") {
+        if (HtmlData != '') {
             let Html = {
-                type: "html",
-                Html: HtmlData
+                type: 'html',
+                Html: HtmlData,
             };
             return {
                 attachments: attachments,
@@ -67,7 +76,7 @@ class JSONTableCell {
                         Runs: runs,
                     },
                 ],
-                Html
+                Html,
             };
         }
         else {
@@ -85,7 +94,10 @@ class JSONTableCell {
         try {
             let fileExt = (0, path_1.extname)(uri);
             logger_1.default.debug(`attachment extension: ${fileExt}`);
-            if (fileExt == ".PNG" || fileExt == ".jpg") {
+            if (fileExt.toUpperCase() == '.PNG' ||
+                fileExt.toUpperCase() == '.JPG' ||
+                fileExt.toUpperCase() == '.JPEG' ||
+                fileExt.toUpperCase() == '.GIF') {
                 return true;
             }
             else {

package/bin/models/json/table/JSONTableCell.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"JSONTableCell.js","sourceRoot":"","sources":["../../../../src/models/json/table/JSONTableCell.ts"],"names":[],"mappings":";;;;;AAAA,+BAA+B;AAU/B,yDAAiC;AACjC,sEAA8C;AAE9C,MAAqB,aAAa;IAEhC,YAAY,IAAgB,EAAE,WAAyB;~~QACrD~~,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;~~IACvD~~,CAAC;IAED,gBAAgB,~~CACd~~,IAA0C,~~EAC1C~~,MAAM;~~QAEN~~,IAAI,IAAI,GAAU,EAAE,CAAC;QACrB,IAAI,WAAW,GAAiB,EAAE,CAAC;QACnC,IAAI,QAAQ,GAAW,EAAE,~~CAAA~~;~~QAEzB~~,iBAAiB;QACjB,~~IACE~~,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ~~;YAC9B~~,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ~~;YAC9B~~,IAAI,CAAC,KAAK,~~EACV~~;~~YACA~~,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC7B,qBAAqB;gBACrB,IAAI,IAAI,CAAC,~~YAAY~~,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAAE;~~oBACtD~~,IAAI,UAAU,GAAG;~~wBACf~~,IAAI,EAAE,SAAS;~~wBACf~~,IAAI,EAAE,OAAO,CAAC,~~uBAAuB~~;~~qBACtC~~,CAAC;~~oBACF~~,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;~~iBAC9B~~;~~qBACI~~,~~IAAG~~,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;~~oBACrC~~,QAAQ,GAAG,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;iBAChC;~~qBACI~~;~~oBACH~~,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,WAAW~~;wBAC9B~~,CAAC,CAAC,OAAO,CAAC,WAAW~~;wBACrB~~,CAAC,CAAC,OAAO,CAAC,GAAG~~;4BACb~~,CAAC,CAAC,OAAO,CAAC,GAAG~~;4BACb~~,CAAC,CAAC,IAAI,CAAC;~~oBACT~~,MAAM,CAAC,eAAe,GAAG,KAAK,CAAC;oBAC/B,IAAI,OAAO,GAAG,IAAI,iBAAO,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;oBACjD,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;iBACvC;YACH,CAAC,CAAC,CAAC;SACJ;~~aACI~~,~~IAAG~~,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;~~YAClC~~,QAAQ,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;SAC7B;~~aACK~~;~~YACJ~~,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,WAAW~~;gBAC3B~~,CAAC,CAAC,IAAI,CAAC,WAAW~~;gBAClB~~,CAAC,CAAC,IAAI,CAAC,GAAG~~;oBACV~~,CAAC,CAAC,IAAI,CAAC,GAAG~~;oBACV~~,CAAC,CAAC,IAAI,CAAC;~~YACT~~,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAC5B,IAAI,OAAO,GAAG,IAAI,iBAAO,CAAC,GAAG,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;YAC7C,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;SACvC;QACD,IAAI,QAAQ,~~IAAG~~,EAAE,~~EACjB~~;~~YACE~~,IAAI,IAAI,~~GAAY~~;~~gBAClB~~,IAAI,~~EAAC~~,MAAM;~~gBACX~~,IAAI,~~EAAC~~,QAAQ;~~aACd~~,~~CAAA~~;~~YACD~~,OAAO;gBACL,WAAW,EAAE,WAAW;gBACxB,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,IAAI;qBACX;iBACF;gBACD,IAAI;aACL,CAAC;SACH;~~aACG~~;~~YACF~~,OAAO;gBACL,WAAW,EAAE,WAAW;~~gBAC1B~~,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,IAAI;qBACX;iBACF;aACF,CAAC;SACH;IACH,CAAC,CAAC,mBAAmB;~~IAEnB~~,YAAY,CAAC,GAAW;QACtB,IAAI;YACF,IAAI,OAAO,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;YAC3B,gBAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;YACjD,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,IAAI,MAAM,~~EAAE~~;~~gBAC1C~~,OAAO,IAAI,CAAC;aACb;iBAAM;gBACL,OAAO,KAAK,CAAC;aACd;SACF;QAAC,OAAO,CAAC,EAAE;YACV,gBAAM,CAAC,KAAK,CAAC,sCAAsC,GAAG,EAAE,CAAC,CAAC;YAC1D,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;CACF,CAAC,OAAO;~~AAvGT~~,~~gCAuGC~~"}
1	+ {"version":3,"file":"JSONTableCell.js","sourceRoot":"","sources":["../../../../src/models/json/table/JSONTableCell.ts"],"names":[],"mappings":"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"}

package/bin/models/json/table/JSONTableRow.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
-import { TableRow, WIData, StyleOptions } from "../wordJsonModels";
+import { TableRow, WIData, StyleOptions } from '../wordJsonModels';
 export default class JSONTableRow {
     row: TableRow;
-    constructor(data: WIData, tableStyles: StyleOptions);
-    generateJsonRow(data: WIData, styles: StyleOptions): TableRow;
+    constructor(data: WIData, tableStyles: StyleOptions, retrieveOriginal?: boolean);
+    generateJsonRow(data: WIData, styles: StyleOptions, retrieveOriginal: boolean): TableRow;
     getRow(): TableRow;
 }

package/bin/models/json/table/JSONTableRow.js CHANGED Viewed

@@ -5,16 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const JSONTableCell_1 = __importDefault(require("./JSONTableCell"));
 class JSONTableRow {
-    constructor(data, tableStyles) {
-        this.row = this.generateJsonRow(data, tableStyles);
+    constructor(data, tableStyles, retrieveOriginal = false) {
+        this.row = this.generateJsonRow(data, tableStyles, retrieveOriginal);
     } //constructor
-    generateJsonRow(data, styles) {
+    generateJsonRow(data, styles, retrieveOriginal) {
         let tableCells = [];
         data.fields.forEach((wiProperty) => {
-            if (wiProperty.name === "id") {
+            if (wiProperty.name === 'id') {
                 styles.Uri = data.url;
             }
-            let jsonTableCell = new JSONTableCell_1.default(wiProperty, styles);
+            let jsonTableCell = new JSONTableCell_1.default(wiProperty, styles, retrieveOriginal);
             tableCells.push(JSON.parse(JSON.stringify(jsonTableCell.getJsonCell())));
         });
         return { Cells: tableCells };

package/bin/models/json/table/JSONTableRow.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"JSONTableRow.js","sourceRoot":"","sources":["../../../../src/models/json/table/JSONTableRow.ts"],"names":[],"mappings":";;;;;~~AAOA~~,oEAA4C;AAE5C,MAAqB,YAAY;IAG/B,YAAY,IAAY,EAAE,WAAyB;~~QACjD~~,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;~~IACrD~~,CAAC,CAAC,aAAa;IAEf,eAAe,CAAC,IAAY,EAAE,MAAoB;~~QAChD~~,IAAI,UAAU,GAAgB,EAAE,CAAC;QAEjC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAsB,EAAE,EAAE;YAC7C,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,EAAE;gBAC5B,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;aACvB;YACD,IAAI,aAAa,GAAG,IAAI,uBAAa,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;~~YAC1D~~,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAC/B,CAAC,CAAC,iBAAiB;IAEnB,MAAM;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC,CAAC,QAAQ;CACX,CAAC,OAAO;AAxBT,+BAwBC"}
1	+ {"version":3,"file":"JSONTableRow.js","sourceRoot":"","sources":["../../../../src/models/json/table/JSONTableRow.ts"],"names":[],"mappings":";;;;;AACA,oEAA4C;AAE5C,MAAqB,YAAY;IAG/B,YAAY,IAAY,EAAE,WAAyB,EAAE,gBAAgB,GAAG,KAAK;QAC3E,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC;IACvE,CAAC,CAAC,aAAa;IAEf,eAAe,CAAC,IAAY,EAAE,MAAoB,EAAE,gBAAyB;QAC3E,IAAI,UAAU,GAAgB,EAAE,CAAC;QAEjC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAsB,EAAE,EAAE;YAC7C,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,EAAE;gBAC5B,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;aACvB;YACD,IAAI,aAAa,GAAG,IAAI,uBAAa,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC;YAC5E,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAC/B,CAAC,CAAC,iBAAiB;IAEnB,MAAM;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC,CAAC,QAAQ;CACX,CAAC,OAAO;AAxBT,+BAwBC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@elisra-devops/docgen-skins",
-  "version": "0.3.7",
+  "version": "0.4.1",
   "description": "Can be outputed in various types:",
   "main": "./bin/index.js",
   "types": "./bin/index.d.ts",

package/src/index.ts CHANGED Viewed

@@ -1,32 +1,24 @@
-import {
-  DocumentSkin,
-  WIQueryResults,
-  WIData,
-  WIProperty,
-  StyleOptions,
-} from "./models/json/wordJsonModels";
-import logger from "./services/logger";
-import JSONTable from "./models/json/table/JSONTable";
-import JSONParagraph from "./models/json/paragraph/JSONParagraph";
-import JSONHeaderParagraph from "./models/json/paragraph/JSONTestSuiteHeaderParagraph";
-import JSONRichTextParagraph from "./models/json/paragraph/JSONRichTextParagraph";
-import {
-  DescriptionandProcedureStyle
-} from "./models/json/default";
+import { DocumentSkin, WIQueryResults, WIData, WIProperty, StyleOptions } from './models/json/wordJsonModels';
+import logger from './services/logger';
+import JSONTable from './models/json/table/JSONTable';
+import JSONParagraph from './models/json/paragraph/JSONParagraph';
+import JSONHeaderParagraph from './models/json/paragraph/JSONTestSuiteHeaderParagraph';
+import JSONRichTextParagraph from './models/json/paragraph/JSONRichTextParagraph';
+import { DescriptionandProcedureStyle } from './models/json/default';
 export default class Skins {
-  SKIN_TYPE_TABLE = "table";
-  SKIN_TYPE_PARAGRAPH = "paragraph";
-  SKIN_TYPE_TEST_PLAN = "test-plan";
+  SKIN_TYPE_TABLE = 'table';
+  SKIN_TYPE_PARAGRAPH = 'paragraph';
+  SKIN_TYPE_TEST_PLAN = 'test-plan';
   documentSkin: DocumentSkin = {
-    templatePath: "",
+    templatePath: '',
     contentControls: [],
   };
-  skinFormat: string = "json";
+  skinFormat: string = 'json';
-  constructor(skinFormat: string = "json", templatePath: string) {
+  constructor(skinFormat: string = 'json', templatePath: string) {
     this.documentSkin.templatePath = templatePath;
     this.skinFormat = skinFormat;
   }
@@ -44,49 +36,28 @@ export default class Skins {
       switch (skinType) {
         case this.SKIN_TYPE_TABLE:
-          populatedSkin = this.generateQueryBasedTable(
-            data,
-            styles,
-            headingLvl
-          );
+          populatedSkin = this.generateQueryBasedTable(data, styles, headingLvl);
           if (populatedSkin === false) {
-            logger.error(
-              `Could not generate table for content control :${contetnControlTitle}`
-            );
+            logger.error(`Could not generate table for content control :${contetnControlTitle}`);
             return false;
           }
           break;
         case this.SKIN_TYPE_PARAGRAPH:
-          populatedSkin = this.generateQueryBasedParagraphs(
-            data,
-            styles,
-            headingLvl
-          );
+          populatedSkin = this.generateQueryBasedParagraphs(data, styles, headingLvl);
           if (populatedSkin === false) {
-            logger.error(
-              `Could not generate paragraph for content control :${contetnControlTitle}`
-            );
+            logger.error(`Could not generate paragraph for content control :${contetnControlTitle}`);
             return false;
           }
           break;
         case this.SKIN_TYPE_TEST_PLAN:
-          populatedSkin = this.generateTestBasedSkin(
-            data,
-            styles,
-            headingLvl,
-            includeAttachments
-          );
+          populatedSkin = this.generateTestBasedSkin(data, styles, headingLvl, includeAttachments);
           if (populatedSkin === false) {
-            logger.error(
-              `Could not generate test skin for content control :${contetnControlTitle}`
-            );
+            logger.error(`Could not generate test skin for content control :${contetnControlTitle}`);
             return false;
           }
           break;
         default:
-          logger.error(
-            `Unknown skinType : ${skinType} - not appended to document skin`
-          );
+          logger.error(`Unknown skinType : ${skinType} - not appended to document skin`);
           return false;
       }
@@ -97,9 +68,7 @@ export default class Skins {
       //   populatedSkin
       // );
     } catch (error) {
-      logger.error(
-        `Fatal error happened when generate skin for : ${contetnControlTitle}`
-      );
+      logger.error(`Fatal error happened when generate skin for : ${contetnControlTitle}`);
       return false;
     }
   } //addNewContentToDocumentSkin
@@ -107,10 +76,7 @@ export default class Skins {
   // iterates on content controls array:
   // if finds return true else creates content control and returns true
   // on error returns false
-  async validateAndAppendContentControl(
-    contetnControlTitle: string,
-    populatedSkin: any
-  ): Promise<boolean> {
+  async validateAndAppendContentControl(contetnControlTitle: string, populatedSkin: any): Promise<boolean> {
     try {
       let isContetnControlExists: boolean[] = await Promise.all(
         this.documentSkin.contentControls.map((contentControl, i) => {
@@ -138,9 +104,7 @@ export default class Skins {
            ${JSON.stringify(contetnControlTitle)}`);
         this.documentSkin.contentControls.unshift(contentControlToAppend);
       }
-      logger.info(
-        `Appended new content control document:  ${contetnControlTitle}`
-      );
+      logger.info(`Appended new content control document:  ${contetnControlTitle}`);
       return true;
     } catch (error) {
       logger.error(`Error validating and appending to content control`);
@@ -150,18 +114,14 @@ export default class Skins {
   //parses data to the class skin format and returns the parsed data
   //returns false if supplied an invalid type or error occurd during parsing
-  generateQueryBasedTable(
-    data: WIQueryResults,
-    styles: StyleOptions,
-    headingLvl: number = 0
-  ) {
+  generateQueryBasedTable(data: WIQueryResults, styles: StyleOptions, headingLvl: number = 0) {
     logger.debug(`Generating table as ${this.skinFormat}`);
     switch (this.skinFormat) {
-      case "json":
+      case 'json':
         let tableSkin = new JSONTable(data, styles, headingLvl);
         return [tableSkin.getJSONTable()];
-      case "html":
+      case 'html':
         logger.info(`Generating html table!`);
         break;
       default:
@@ -169,51 +129,30 @@ export default class Skins {
     } //switch
   } //generateTable
-  generateQueryBasedParagraphs(
-    data: any,
-    styles: StyleOptions,
-    headingLvl: number = 0
-  ) {
+  generateQueryBasedParagraphs(data: any, styles: StyleOptions, headingLvl: number = 0) {
     logger.debug(`Generating paragraph as ${this.skinFormat}`);
     switch (this.skinFormat) {
-      case "json":
+      case 'json':
         let paragraphs: any[] = [];
         data.forEach((wi: WIData) => {
           wi.fields.forEach((field: WIProperty) => {
             //Description and Test Description are handled in richText handler
-            if (
-              field.name === "Description: " ||
-              field.name === "Test Description:"
-            ) {
-              let paragraphSkin = new JSONRichTextParagraph(
-                field,
-                styles,
-                wi.Source,
-                headingLvl + wi.level
-              );
+            if (field.name === 'Description: ' || field.name === 'Test Description:') {
+              let paragraphSkin = new JSONRichTextParagraph(field, styles, wi.Source, headingLvl + wi.level);
               paragraphs.push(paragraphSkin.getJSONRichTextParagraph());
             }
             //making sure ID is not printed
             //excluding Description and Test Description are handled in richText handler
-            if (
-              field.name !== "ID" &&
-              field.name !== "Description: " &&
-              field.name !== "Test Description:"
-            ) {
-              let paragraphSkin = new JSONParagraph(
-                field,
-                styles,
-                wi.Source,
-                headingLvl + wi.level
-              );
+            if (field.name !== 'ID' && field.name !== 'Description: ' && field.name !== 'Test Description:') {
+              let paragraphSkin = new JSONParagraph(field, styles, wi.Source, headingLvl + wi.level);
               paragraphs.push(paragraphSkin.getJSONParagraph());
             }
           });
         });
         return paragraphs;
-      case "html":
+      case 'html':
         logger.info(`Generating html paragraphs!`);
         break;
       default:
@@ -229,7 +168,7 @@ export default class Skins {
   ) {
     logger.debug(`Generating testSkin as ${this.skinFormat}`);
     switch (this.skinFormat) {
-      case "json":
+      case 'json':
         let testSkin: any[] = [];
         //create suite Header pragraph
         data.forEach((testSuite: any) => {
@@ -239,7 +178,7 @@ export default class Skins {
             IsUnderline: false,
             Size: 16,
             Uri: null,
-            Font: "Arial",
+            Font: 'Arial',
             InsertLineBreak: false,
             InsertSpace: true,
           };
@@ -267,7 +206,7 @@ export default class Skins {
               IsUnderline: false,
               Size: 14,
               Uri: null,
-              Font: "Arial",
+              Font: 'Arial',
               InsertLineBreak: false,
               InsertSpace: true,
             };
@@ -284,11 +223,11 @@ export default class Skins {
             testSkin.push(testCaseParagraphSkin.getJSONParagraph());
             let testDescriptionTitleParagraph = new JSONParagraph(
-              { name: "Title", value: "Test Description:" },
+              { name: 'Title', value: 'Test Description:' },
               DescriptionandProcedureStyle,
               testcase.id || 0,
               0
-            );
+            );
             testSkin.push(testDescriptionTitleParagraph.getJSONParagraph());
             let testDescriptionParagraph = new JSONRichTextParagraph(
               testcase.testCaseHeaderSkinData.fields[2],
@@ -296,39 +235,49 @@ export default class Skins {
               testcase.id || 0,
               0
             );
-            let richTextSkin: any[] =
-              testDescriptionParagraph.getJSONRichTextParagraph();
+            let richTextSkin: any[] = testDescriptionParagraph.getJSONRichTextParagraph();
             testSkin = [...testSkin, ...richTextSkin];
             if (testcase.testCaseRequirements) {
-              if (
-                testcase.testCaseRequirements.length > 0
-              ) {
+              if (testcase.testCaseRequirements.length > 0) {
                 let testDescriptionTitleParagraph = new JSONParagraph(
-                  { name: "Title", value: "Covered Requirements:" },
+                  { name: 'Title', value: 'Covered Requirements:' },
                   DescriptionandProcedureStyle,
                   testcase.id || 0,
                   0
                 );
                 testSkin.push(testDescriptionTitleParagraph.getJSONParagraph());
                 //create test steps table
-                let tableSkin = new JSONTable(
-                  testcase.testCaseRequirements,
-                  styles,
-                  headingLvl
+                let tableSkin = new JSONTable(testcase.testCaseRequirements, styles, headingLvl);
+                let populatedTableSkin = tableSkin.getJSONTable();
+                testSkin.push(populatedTableSkin);
+              }
+            }
+            if (testcase.testCaseBugs) {
+              if (testcase.testCaseBugs.length > 0) {
+                let testDescriptionTitleParagraph = new JSONParagraph(
+                  { name: 'Title', value: 'Linked Bugs:' },
+                  DescriptionandProcedureStyle,
+                  testcase.id || 0,
+                  0
                 );
+                testSkin.push(testDescriptionTitleParagraph.getJSONParagraph());
+                //create test steps table
+                let tableSkin = new JSONTable(testcase.testCaseBugs, styles, headingLvl);
                 let populatedTableSkin = tableSkin.getJSONTable();
                 testSkin.push(populatedTableSkin);
               }
             }
             try {
               if (testcase.testCaseStepsSkinData.length > 0) {
                 let testProcedureTitleParagraph = new JSONParagraph(
-                  { name: "Title", value: "Test Procedure:" },
+                  { name: 'Title', value: 'Test Procedure:' },
                   DescriptionandProcedureStyle,
                   testcase.id || 0,
                   0
@@ -339,17 +288,13 @@ export default class Skins {
                   IsUnderline: false,
                   Size: 12,
                   Uri: null,
-                  Font: "Arial",
+                  Font: 'Arial',
                   InsertLineBreak: false,
                   InsertSpace: true,
                 };
                 testSkin.push(testProcedureTitleParagraph.getJSONParagraph());
                 //create test steps table
-                let tableSkin = new JSONTable(
-                  testcase.testCaseStepsSkinData,
-                  TableContentStyles,
-                  headingLvl
-                );
+                let tableSkin = new JSONTable(testcase.testCaseStepsSkinData, TableContentStyles, headingLvl);
                 let populatedTableSkin = tableSkin.getJSONTable();
                 testSkin.push(populatedTableSkin);
               }
@@ -357,28 +302,20 @@ export default class Skins {
               logger.warn(
                 `For suite id : ${testSuite.suiteSkinData.fields[0].value} , the testCaseStepsSkinData is not defined for ${testcase.testCaseHeaderSkinData.fields[0].value} `
               );
-           }
+            }
             //attachments table
             if (testcase.testCaseAttachments) {
-              if (
-                testcase.testCaseAttachments.length > 0 &&
-                includeAttachments == true
-              ) {
+              if (testcase.testCaseAttachments.length > 0 && includeAttachments == true) {
                 let testDescriptionTitleParagraph = new JSONParagraph(
-                  { name: "Title", value: "Test Case Attachments:" },
+                  { name: 'Title', value: 'Test Case Attachments:' },
                   styles,
                   testcase.id || 0,
                   0
                 );
                 testSkin.push(testDescriptionTitleParagraph.getJSONParagraph());
                 //create test steps table
-                let tableSkin = new JSONTable(
-                  testcase.testCaseAttachments,
-                  styles,
-                  headingLvl
-                );
+                let tableSkin = new JSONTable(testcase.testCaseAttachments, styles, headingLvl, true);
                 let populatedTableSkin = tableSkin.getJSONTable();
                 testSkin.push(populatedTableSkin);
               }
@@ -387,7 +324,7 @@ export default class Skins {
         });
         return testSkin;
         break;
-      case "html":
+      case 'html':
         logger.info(`Generating html test data!`);
         break;
       default:

package/src/models/json/table/JSONTable.ts CHANGED Viewed

@@ -1,31 +1,20 @@
-import logger from "../../../services/logger";
-import {
-  Table,
-  TableRow,
-  WIQueryResults,
-  WIData,
-  WIProperty,
-  StyleOptions,
-} from "../wordJsonModels";
-import JSONTableRow from "./JSONTableRow";
+import logger from '../../../services/logger';
+import { Table, TableRow, WIQueryResults, WIData, WIProperty, StyleOptions } from '../wordJsonModels';
+import JSONTableRow from './JSONTableRow';
 export default class JSONTable {
   tableTemplate: Table;
   tableStyles: StyleOptions;
-  constructor(
-    data: WIQueryResults,
-    tableStyles: StyleOptions,
-    headingLvl: number
-  ) {
+  constructor(data: WIQueryResults, tableStyles: StyleOptions, headingLvl: number, retrieveOriginal = false) {
     this.tableStyles = tableStyles;
     this.tableTemplate = {
-      type: "table",
+      type: 'table',
       headingLevel: headingLvl,
-      Rows: this.generateJsonRows(data, this.tableStyles),
+      Rows: this.generateJsonRows(data, this.tableStyles, retrieveOriginal),
     };
   }
-  generateJsonRows(data: any, tableStyles: StyleOptions): TableRow[] {
+  generateJsonRows(data: any, tableStyles: StyleOptions, retrieveOriginal: boolean): TableRow[] {
     let rows: TableRow[] = [];
     let headersRowData: WIData = this.headersRowAdapter(data[0]);
@@ -35,7 +24,7 @@ export default class JSONTable {
       IsUnderline: false,
       Size: 12,
       Uri: null,
-      Font: "Arial",
+      Font: 'Arial',
       InsertLineBreak: false,
       InsertSpace: false,
     };
@@ -44,7 +33,7 @@ export default class JSONTable {
     rows.push(headersRow.getRow());
     data.forEach((rowData: WIData) => {
-      let row = new JSONTableRow(rowData, tableStyles);
+      let row = new JSONTableRow(rowData, tableStyles, retrieveOriginal);
       rows.push(row.getRow());
     });
@@ -55,14 +44,13 @@ export default class JSONTable {
     let headerValuesWi;
     try {
       headerValuesWi = data.fields.map((field: WIProperty) => {
-        return { name: "header", value: field.name };
+        return { name: 'header', value: field.name };
       });
     } catch (error) {
       logger.error(`no fields to append`);
     }
     return {
-      url: "",
+      url: '',
       fields: headerValuesWi,
       Source: 999999999999,
       level: data.level,
@@ -72,4 +60,4 @@ export default class JSONTable {
   getJSONTable(): Table {
     return this.tableTemplate;
   } //getJSONTable
-} //class
+} //class

package/src/models/json/table/JSONTableCell.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { extname } from "path";
+import { extname } from 'path';
 import {
   TableCell,
   Run,
@@ -7,73 +7,72 @@ import {
   MultipeValuesWIProperty,
   StyleOptions,
   JsonHtml,
-} from "../wordJsonModels";
-import JSONRun from "../JSONRun";
-import logger from "../../../services/logger";
+} from '../wordJsonModels';
+import JSONRun from '../JSONRun';
+import logger from '../../../services/logger';
 export default class JSONTableCell {
   cell: TableCell;
-  constructor(data: WIProperty, tableStyles: StyleOptions) {
-    this.cell = this.generateJsonCell(data, tableStyles);
+  constructor(data: WIProperty, tableStyles: StyleOptions, retrieveOriginal = false) {
+    this.cell = this.generateJsonCell(data, tableStyles, retrieveOriginal);
   }
-  generateJsonCell(
-    data: WIProperty | MultipeValuesWIProperty,
-    styles
-  ): TableCell {
+  private removeFileExtension(filePath) {
+    const lastDotIndex = filePath.lastIndexOf('.');
+    if (lastDotIndex > 0) {
+      return filePath.slice(0, lastDotIndex);
+    }
+    return filePath; // If there's no extension, return the original file path
+  }
+  generateJsonCell(data: WIProperty | MultipeValuesWIProperty, styles, retrieveOriginal): TableCell {
     let runs: Run[] = [];
     let attachments: Attachment[] = [];
-    let HtmlData: string = ""
+    let HtmlData: string = '';
     //multiple values
-    if (
-      typeof data.value !== "string" &&
-      typeof data.value !== "number" &&
-      data.value
-    ) {
+    if (typeof data.value !== 'string' && typeof data.value !== 'number' && data.value) {
       data.value.forEach((runData) => {
         //check if photo type
-        if (this.isPictureUri(runData.tableCellAttachmentLink)) {
-          let attachment = {
-            type: "Picture",
-            path: runData.tableCellAttachmentLink,
-          };
-          attachments.push(attachment);
-        }
-        else if(/<[^>]*>/.test(runData.value)) {
-          HtmlData = runData.value || "";
-        }
-        else {
-          styles.Uri = runData.relativeUrl
-            ? runData.relativeUrl
-            : runData.Uri
-            ? runData.Uri
-            : null;
+        if (runData.attachmentLink) {
+          let attachmentLink = retrieveOriginal ? runData.attachmentLink : runData.tableCellAttachmentLink;
+          if (this.isPictureUri(attachmentLink)) {
+            let attachment = {
+              type: 'Picture',
+              path: attachmentLink,
+              name: this.removeFileExtension(runData.attachmentFileName),
+            };
+            attachments.push(attachment);
+          } else {
+            let attachment = {
+              type: 'File',
+              path: runData.attachmentLink,
+              name: this.removeFileExtension(runData.attachmentFileName),
+            };
+            attachments.push(attachment);
+          }
+        } else if (/<[^>]*>/.test(runData.value)) {
+          HtmlData = runData.value || '';
+        } else {
+          styles.Uri = runData.relativeUrl ? runData.relativeUrl : runData.Uri ? runData.Uri : null;
           styles.InsertLineBreak = false;
           let jsonRun = new JSONRun(runData.value, styles);
           runs = [...runs, ...jsonRun.getRun()];
         }
       });
-    }
-    else if(/<[^>]*>/.test(data.value)) {
-      HtmlData = data.value || "";
-    }
-     else {
-      styles.Uri = data.relativeUrl
-        ? data.relativeUrl
-        : data.url
-        ? data.url
-        : null;
-      let text = data.value || "";
+    } else if (/<[^>]*>/.test(data.value)) {
+      HtmlData = data.value || '';
+    } else {
+      styles.Uri = data.relativeUrl ? data.relativeUrl : data.url ? data.url : null;
+      let text = data.value || '';
       let jsonRun = new JSONRun(`${text}`, styles);
       runs = [...runs, ...jsonRun.getRun()];
     }
-    if (HtmlData!= "")
-    {
-      let Html:JsonHtml = {
-        type:"html",
-        Html:HtmlData
-      }
+    if (HtmlData != '') {
+      let Html: JsonHtml = {
+        type: 'html',
+        Html: HtmlData,
+      };
       return {
         attachments: attachments,
         Paragraphs: [
@@ -81,26 +80,30 @@ export default class JSONTableCell {
             Runs: runs,
           },
         ],
-        Html
+        Html,
       };
-    }
-    else{
+    } else {
       return {
         attachments: attachments,
-      Paragraphs: [
-        {
-          Runs: runs,
-        },
-      ],
-    };
-  }
-} //generateJsonCells
+        Paragraphs: [
+          {
+            Runs: runs,
+          },
+        ],
+      };
+    }
+  } //generateJsonCells
   isPictureUri(uri: string) {
     try {
       let fileExt = extname(uri);
       logger.debug(`attachment extension: ${fileExt}`);
-      if (fileExt == ".PNG" || fileExt == ".jpg") {
+      if (
+        fileExt.toUpperCase() == '.PNG' ||
+        fileExt.toUpperCase() == '.JPG' ||
+        fileExt.toUpperCase() == '.JPEG' ||
+        fileExt.toUpperCase() == '.GIF'
+      ) {
         return true;
       } else {
         return false;

package/src/models/json/table/JSONTableRow.ts CHANGED Viewed

@@ -1,27 +1,21 @@
-import {
-  TableRow,
-  TableCell,
-  WIData,
-  WIProperty,
-  StyleOptions
-} from "../wordJsonModels";
-import JSONTableCell from "./JSONTableCell";
+import { TableRow, TableCell, WIData, WIProperty, StyleOptions } from '../wordJsonModels';
+import JSONTableCell from './JSONTableCell';
 export default class JSONTableRow {
   row: TableRow;
-  constructor(data: WIData, tableStyles: StyleOptions) {
-    this.row = this.generateJsonRow(data, tableStyles);
+  constructor(data: WIData, tableStyles: StyleOptions, retrieveOriginal = false) {
+    this.row = this.generateJsonRow(data, tableStyles, retrieveOriginal);
   } //constructor
-  generateJsonRow(data: WIData, styles: StyleOptions): TableRow {
+  generateJsonRow(data: WIData, styles: StyleOptions, retrieveOriginal: boolean): TableRow {
     let tableCells: TableCell[] = [];
     data.fields.forEach((wiProperty: WIProperty) => {
-      if (wiProperty.name === "id") {
+      if (wiProperty.name === 'id') {
         styles.Uri = data.url;
       }
-      let jsonTableCell = new JSONTableCell(wiProperty, styles);
+      let jsonTableCell = new JSONTableCell(wiProperty, styles, retrieveOriginal);
       tableCells.push(JSON.parse(JSON.stringify(jsonTableCell.getJsonCell())));
     });