@elisra-devops/docgen-skins 0.10.13 → 0.11.0

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.
@@ -26,6 +26,7 @@ class JSONFile {
26
26
  path: fileAttachmentData.attachmentLink,
27
27
  name: this.removeFileExtension(fileAttachmentData.attachmentFileName),
28
28
  isLinkedFile: fileAttachmentData.attachmentType === 'asLink',
29
+ includeAttachmentContent: fileAttachmentData.includeAttachmentContent,
29
30
  };
30
31
  }
31
32
  }
@@ -1 +1 @@
1
- {"version":3,"file":"JSONFile.js","sourceRoot":"","sources":["../../../../src/models/json/file/JSONFile.ts"],"names":[],"mappings":";;;;;AAAA,+BAA+B;AAE/B,sEAA8C;AAE9C,MAAqB,QAAQ;IAG3B,YAAY,kBAAuB;QACjC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;IACzE,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAEO,sBAAsB,CAAC,kBAAuB;QACpD,IAAI,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE;YACxD,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,kBAAkB,CAAC,cAAc;gBACvC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,kBAAkB,CAAC;aACtE,CAAC;SACH;aAAM;YACL,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,kBAAkB,CAAC,cAAc;gBACvC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,kBAAkB,CAAC;gBACrE,YAAY,EAAE,kBAAkB,CAAC,cAAc,KAAK,QAAQ;aAC7D,CAAC;SACH;IACH,CAAC;IAEO,mBAAmB,CAAC,QAAQ;QAClC,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,YAAY,GAAG,CAAC,EAAE;YACpB,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;SACxC;QACD,OAAO,QAAQ,CAAC,CAAC,yDAAyD;IAC5E,CAAC;IAEO,YAAY,CAAC,GAAW;QAC9B,IAAI;YACF,IAAI,OAAO,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;YAC3B,gBAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;YACjD,IACE,OAAO,CAAC,WAAW,EAAE,IAAI,MAAM;gBAC/B,OAAO,CAAC,WAAW,EAAE,IAAI,MAAM;gBAC/B,OAAO,CAAC,WAAW,EAAE,IAAI,OAAO;gBAChC,OAAO,CAAC,WAAW,EAAE,IAAI,MAAM,EAC/B;gBACA,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;CACF;AAvDD,2BAuDC"}
1
+ {"version":3,"file":"JSONFile.js","sourceRoot":"","sources":["../../../../src/models/json/file/JSONFile.ts"],"names":[],"mappings":";;;;;AAAA,+BAA+B;AAE/B,sEAA8C;AAE9C,MAAqB,QAAQ;IAG3B,YAAY,kBAAuB;QACjC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;IACzE,CAAC;IAED,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAEO,sBAAsB,CAAC,kBAAuB;QACpD,IAAI,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE;YACxD,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,kBAAkB,CAAC,cAAc;gBACvC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,kBAAkB,CAAC;aACtE,CAAC;SACH;aAAM;YACL,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,kBAAkB,CAAC,cAAc;gBACvC,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,kBAAkB,CAAC;gBACrE,YAAY,EAAE,kBAAkB,CAAC,cAAc,KAAK,QAAQ;gBAC5D,wBAAwB,EAAE,kBAAkB,CAAC,wBAAwB;aACtE,CAAC;SACH;IACH,CAAC;IAEO,mBAAmB,CAAC,QAAQ;QAClC,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,YAAY,GAAG,CAAC,EAAE;YACpB,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;SACxC;QACD,OAAO,QAAQ,CAAC,CAAC,yDAAyD;IAC5E,CAAC;IAEO,YAAY,CAAC,GAAW;QAC9B,IAAI;YACF,IAAI,OAAO,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;YAC3B,gBAAM,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,CAAC,CAAC;YACjD,IACE,OAAO,CAAC,WAAW,EAAE,IAAI,MAAM;gBAC/B,OAAO,CAAC,WAAW,EAAE,IAAI,MAAM;gBAC/B,OAAO,CAAC,WAAW,EAAE,IAAI,OAAO;gBAChC,OAAO,CAAC,WAAW,EAAE,IAAI,MAAM,EAC/B;gBACA,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;CACF;AAxDD,2BAwDC"}
@@ -22,49 +22,66 @@ class JSONTableCell {
22
22
  let attachments = [];
23
23
  let HtmlData = '';
24
24
  //multiple values
25
- if (typeof data.value !== 'string' && typeof data.value !== 'number' && data.value) {
26
- data.value.forEach((runData) => {
27
- //check if photo type
28
- if (runData.attachmentLink) {
29
- let attachmentLink = retrieveOriginal ? runData.attachmentLink : runData.tableCellAttachmentLink;
30
- if (this.isPictureUri(attachmentLink)) {
31
- let attachment = {
32
- type: 'Picture',
33
- path: attachmentLink,
34
- name: this.removeFileExtension(runData.attachmentFileName),
35
- isFlattened,
36
- };
37
- attachments.push(attachment);
38
- }
39
- else {
40
- let attachment = {
41
- type: 'File',
42
- path: runData.attachmentLink,
43
- name: this.removeFileExtension(runData.attachmentFileName),
44
- isLinkedFile: data.attachmentType === 'asLink',
45
- isFlattened,
46
- };
47
- attachments.push(attachment);
48
- }
49
- }
50
- else if (/<[^>]*>/.test(runData.value)) {
51
- HtmlData = runData.value || '';
25
+ try {
26
+ if (typeof data.value !== 'string' && typeof data.value !== 'number' && data.value) {
27
+ if (!Array.isArray(data.value)) {
28
+ throw new Error(`Invalid data value for cell: ${JSON.stringify(data.value)}`);
52
29
  }
53
30
  else {
54
- styles.Uri = runData.relativeUrl ? runData.relativeUrl : runData.Uri ? runData.Uri : null;
55
- styles.InsertLineBreak = false;
56
- let jsonRun = new JSONRun_1.default(runData.value, styles);
57
- runs = [...runs, ...jsonRun.getRun()];
31
+ data.value.forEach((runData) => {
32
+ //check if photo type
33
+ if (runData.attachmentLink) {
34
+ let attachmentLink = retrieveOriginal
35
+ ? runData.attachmentLink
36
+ : runData.tableCellAttachmentLink;
37
+ if (this.isPictureUri(attachmentLink)) {
38
+ let attachment = {
39
+ type: 'Picture',
40
+ path: attachmentLink,
41
+ name: this.removeFileExtension(runData.attachmentFileName),
42
+ isFlattened,
43
+ };
44
+ attachments.push(attachment);
45
+ }
46
+ else {
47
+ let attachment = {
48
+ type: 'File',
49
+ path: runData.attachmentLink,
50
+ name: this.removeFileExtension(runData.attachmentFileName),
51
+ isLinkedFile: data.attachmentType === 'asLink',
52
+ includeAttachmentContent: data.includeAttachmentContent,
53
+ isFlattened,
54
+ };
55
+ attachments.push(attachment);
56
+ }
57
+ }
58
+ else if (/<[^>]*>/.test(runData.value)) {
59
+ HtmlData = runData.value || '';
60
+ }
61
+ else {
62
+ styles.Uri = runData.relativeUrl ? runData.relativeUrl : runData.Uri ? runData.Uri : null;
63
+ styles.InsertLineBreak = false;
64
+ let jsonRun = new JSONRun_1.default(runData.value, styles);
65
+ runs = [...runs, ...jsonRun.getRun()];
66
+ }
67
+ });
58
68
  }
59
- });
60
- }
61
- else if (/<[^>]*>/.test(data.value)) {
62
- HtmlData = data.value || '';
69
+ }
70
+ else if (/<[^>]*>/.test(data.value)) {
71
+ HtmlData = data.value || '';
72
+ }
73
+ else {
74
+ styles.Uri = data.relativeUrl ? data.relativeUrl : data.url ? data.url : null;
75
+ let text = data.value || '';
76
+ let jsonRun = new JSONRun_1.default(`${text}`, styles);
77
+ runs = [...runs, ...jsonRun.getRun()];
78
+ }
63
79
  }
64
- else {
65
- styles.Uri = data.relativeUrl ? data.relativeUrl : data.url ? data.url : null;
66
- let text = data.value || '';
67
- let jsonRun = new JSONRun_1.default(`${text}`, styles);
80
+ catch (e) {
81
+ logger_1.default.error(`Error generating JSON cell: ${e.message}`);
82
+ logger_1.default.error(`Error data: ${JSON.stringify(data)}`);
83
+ logger_1.default.error(`Type Of Data: ${typeof data.value}`);
84
+ let jsonRun = new JSONRun_1.default('Docgen Error: Invalid data value', styles);
68
85
  runs = [...runs, ...jsonRun.getRun()];
69
86
  }
70
87
  if (HtmlData != '') {
@@ -1 +1 @@
1
- {"version":3,"file":"JSONTableCell.js","sourceRoot":"","sources":["../../../../src/models/json/table/JSONTableCell.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JSONTableCell.js","sourceRoot":"","sources":["../../../../src/models/json/table/JSONTableCell.ts"],"names":[],"mappings":"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"}
@@ -52,6 +52,7 @@ export interface Attachment {
52
52
  name: string;
53
53
  isLinkedFile?: boolean;
54
54
  IsFlattened?: boolean;
55
+ includeAttachmentContent?: boolean;
55
56
  }
56
57
  export interface Run {
57
58
  text: string;
@@ -104,6 +105,7 @@ export interface WIProperty {
104
105
  relativeUrl?: string;
105
106
  attachmentLink?: string;
106
107
  attachmentType?: string;
108
+ includeAttachmentContent?: boolean;
107
109
  relativeAttachmentLink?: string;
108
110
  richText?: any[];
109
111
  }
@@ -116,6 +118,7 @@ export interface MultipeValuesWIProperty {
116
118
  relativeUrl?: string;
117
119
  attachmentLink?: string;
118
120
  attachmentType?: string;
121
+ includeAttachmentContent?: boolean;
119
122
  relativeAttachmentLink?: string;
120
123
  richText?: any[];
121
124
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@elisra-devops/docgen-skins",
3
- "version": "0.10.13",
3
+ "version": "0.11.0",
4
4
  "description": "Can be outputed in various types:",
5
5
  "main": "./bin/index.js",
6
6
  "types": "./bin/index.d.ts",
@@ -26,6 +26,7 @@ export default class JSONFile {
26
26
  path: fileAttachmentData.attachmentLink,
27
27
  name: this.removeFileExtension(fileAttachmentData.attachmentFileName),
28
28
  isLinkedFile: fileAttachmentData.attachmentType === 'asLink',
29
+ includeAttachmentContent: fileAttachmentData.includeAttachmentContent,
29
30
  };
30
31
  }
31
32
  }
@@ -43,44 +43,59 @@ export default class JSONTableCell {
43
43
  let attachments: Attachment[] = [];
44
44
  let HtmlData: string = '';
45
45
  //multiple values
46
- if (typeof data.value !== 'string' && typeof data.value !== 'number' && data.value) {
47
- data.value.forEach((runData) => {
48
- //check if photo type
49
- if (runData.attachmentLink) {
50
- let attachmentLink = retrieveOriginal ? runData.attachmentLink : runData.tableCellAttachmentLink;
51
- if (this.isPictureUri(attachmentLink)) {
52
- let attachment = {
53
- type: 'Picture',
54
- path: attachmentLink,
55
- name: this.removeFileExtension(runData.attachmentFileName),
56
- isFlattened,
57
- };
58
- attachments.push(attachment);
59
- } else {
60
- let attachment = {
61
- type: 'File',
62
- path: runData.attachmentLink,
63
- name: this.removeFileExtension(runData.attachmentFileName),
64
- isLinkedFile: data.attachmentType === 'asLink',
65
- isFlattened,
66
- };
67
- attachments.push(attachment);
68
- }
69
- } else if (/<[^>]*>/.test(runData.value)) {
70
- HtmlData = runData.value || '';
46
+ try {
47
+ if (typeof data.value !== 'string' && typeof data.value !== 'number' && data.value) {
48
+ if (!Array.isArray(data.value)) {
49
+ throw new Error(`Invalid data value for cell: ${JSON.stringify(data.value)}`);
71
50
  } else {
72
- styles.Uri = runData.relativeUrl ? runData.relativeUrl : runData.Uri ? runData.Uri : null;
73
- styles.InsertLineBreak = false;
74
- let jsonRun = new JSONRun(runData.value, styles);
75
- runs = [...runs, ...jsonRun.getRun()];
51
+ data.value.forEach((runData) => {
52
+ //check if photo type
53
+ if (runData.attachmentLink) {
54
+ let attachmentLink = retrieveOriginal
55
+ ? runData.attachmentLink
56
+ : runData.tableCellAttachmentLink;
57
+ if (this.isPictureUri(attachmentLink)) {
58
+ let attachment = {
59
+ type: 'Picture',
60
+ path: attachmentLink,
61
+ name: this.removeFileExtension(runData.attachmentFileName),
62
+ isFlattened,
63
+ };
64
+ attachments.push(attachment);
65
+ } else {
66
+ let attachment = {
67
+ type: 'File',
68
+ path: runData.attachmentLink,
69
+ name: this.removeFileExtension(runData.attachmentFileName),
70
+ isLinkedFile: data.attachmentType === 'asLink',
71
+ includeAttachmentContent: data.includeAttachmentContent,
72
+ isFlattened,
73
+ };
74
+ attachments.push(attachment);
75
+ }
76
+ } else if (/<[^>]*>/.test(runData.value)) {
77
+ HtmlData = runData.value || '';
78
+ } else {
79
+ styles.Uri = runData.relativeUrl ? runData.relativeUrl : runData.Uri ? runData.Uri : null;
80
+ styles.InsertLineBreak = false;
81
+ let jsonRun = new JSONRun(runData.value, styles);
82
+ runs = [...runs, ...jsonRun.getRun()];
83
+ }
84
+ });
76
85
  }
77
- });
78
- } else if (/<[^>]*>/.test(data.value)) {
79
- HtmlData = data.value || '';
80
- } else {
81
- styles.Uri = data.relativeUrl ? data.relativeUrl : data.url ? data.url : null;
82
- let text = data.value || '';
83
- let jsonRun = new JSONRun(`${text}`, styles);
86
+ } else if (/<[^>]*>/.test(data.value)) {
87
+ HtmlData = data.value || '';
88
+ } else {
89
+ styles.Uri = data.relativeUrl ? data.relativeUrl : data.url ? data.url : null;
90
+ let text = data.value || '';
91
+ let jsonRun = new JSONRun(`${text}`, styles);
92
+ runs = [...runs, ...jsonRun.getRun()];
93
+ }
94
+ } catch (e) {
95
+ logger.error(`Error generating JSON cell: ${e.message}`);
96
+ logger.error(`Error data: ${JSON.stringify(data)}`);
97
+ logger.error(`Type Of Data: ${typeof data.value}`);
98
+ let jsonRun = new JSONRun('Docgen Error: Invalid data value', styles);
84
99
  runs = [...runs, ...jsonRun.getRun()];
85
100
  }
86
101
  if (HtmlData != '') {
@@ -54,6 +54,7 @@ export interface Attachment {
54
54
  name: string;
55
55
  isLinkedFile?: boolean;
56
56
  IsFlattened?: boolean;
57
+ includeAttachmentContent?: boolean;
57
58
  }
58
59
 
59
60
  export interface Run {
@@ -110,6 +111,7 @@ export interface WIProperty {
110
111
  relativeUrl?: string;
111
112
  attachmentLink?: string;
112
113
  attachmentType?: string;
114
+ includeAttachmentContent?: boolean;
113
115
  relativeAttachmentLink?: string;
114
116
  richText?: any[];
115
117
  }
@@ -122,6 +124,7 @@ export interface MultipeValuesWIProperty {
122
124
  relativeUrl?: string;
123
125
  attachmentLink?: string;
124
126
  attachmentType?: string;
127
+ includeAttachmentContent?: boolean;
125
128
  relativeAttachmentLink?: string;
126
129
  richText?: any[];
127
130
  }