@cyberismo/data-handler 0.0.9 → 0.0.11
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.
- package/dist/commands/edit.d.ts +6 -0
- package/dist/commands/edit.js +23 -4
- package/dist/commands/edit.js.map +1 -1
- package/dist/commands/export.d.ts +3 -3
- package/dist/commands/export.js +4 -4
- package/dist/commands/export.js.map +1 -1
- package/dist/commands/show.js +7 -4
- package/dist/commands/show.js.map +1 -1
- package/dist/commands/validate.js +1 -1
- package/dist/commands/validate.js.map +1 -1
- package/dist/containers/project/resource-collector.js +1 -3
- package/dist/containers/project/resource-collector.js.map +1 -1
- package/dist/interfaces/macros.d.ts +1 -1
- package/dist/interfaces/resource-interfaces.d.ts +3 -1
- package/dist/interfaces/resource-interfaces.js.map +1 -1
- package/dist/macros/base-macro.d.ts +2 -1
- package/dist/macros/base-macro.js +14 -2
- package/dist/macros/base-macro.js.map +1 -1
- package/dist/macros/createCards/index.d.ts +1 -0
- package/dist/macros/createCards/index.js +4 -0
- package/dist/macros/createCards/index.js.map +1 -1
- package/dist/macros/graph/index.d.ts +0 -1
- package/dist/macros/graph/index.js +0 -3
- package/dist/macros/graph/index.js.map +1 -1
- package/dist/macros/image/index.js +4 -0
- package/dist/macros/image/index.js.map +1 -1
- package/dist/macros/include/index.d.ts +0 -1
- package/dist/macros/include/index.js +0 -3
- package/dist/macros/include/index.js.map +1 -1
- package/dist/macros/percentage/index.d.ts +0 -1
- package/dist/macros/percentage/index.js +0 -3
- package/dist/macros/percentage/index.js.map +1 -1
- package/dist/macros/report/index.d.ts +0 -1
- package/dist/macros/report/index.js +0 -3
- package/dist/macros/report/index.js.map +1 -1
- package/dist/macros/scoreCard/index.d.ts +0 -1
- package/dist/macros/scoreCard/index.js +0 -3
- package/dist/macros/scoreCard/index.js.map +1 -1
- package/dist/macros/vegalite/index.d.ts +0 -1
- package/dist/macros/vegalite/index.js +0 -3
- package/dist/macros/vegalite/index.js.map +1 -1
- package/dist/resources/resource-object.js +1 -1
- package/dist/resources/resource-object.js.map +1 -1
- package/dist/utils/resource-utils.d.ts +1 -1
- package/dist/utils/resource-utils.js +3 -3
- package/dist/utils/resource-utils.js.map +1 -1
- package/package.json +3 -4
- package/src/commands/edit.ts +45 -4
- package/src/commands/export.ts +7 -8
- package/src/commands/show.ts +7 -3
- package/src/commands/validate.ts +2 -1
- package/src/containers/project/resource-collector.ts +1 -3
- package/src/interfaces/macros.ts +1 -1
- package/src/interfaces/resource-interfaces.ts +4 -2
- package/src/macros/base-macro.ts +19 -4
- package/src/macros/createCards/index.ts +5 -0
- package/src/macros/graph/index.ts +0 -4
- package/src/macros/image/index.ts +7 -0
- package/src/macros/include/index.ts +0 -4
- package/src/macros/percentage/index.ts +0 -4
- package/src/macros/report/index.ts +0 -4
- package/src/macros/scoreCard/index.ts +0 -4
- package/src/macros/vegalite/index.ts +0 -4
- package/src/resources/resource-object.ts +5 -1
- package/src/utils/resource-utils.ts +3 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/graph/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;EAWE;AAEF,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,aAAa,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAOrD,MAAM,WAAY,SAAQ,SAAS;IACjC,YAAY,UAAqB;QAC/B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,cAAc,GAAG,CAAC,KAAc,EAAE,EAAE;QAClC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC,CAAC;IAEF,YAAY,GAAG,KAAK,EAAE,OAA+B,EAAE,KAAc,EAAE,EAAE;QACvE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/graph/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,10 @@ export default class ImageMacro extends BaseMacro {
|
|
|
56
56
|
if (!attachmentFolder) {
|
|
57
57
|
throw new Error(`Card '${cardKey}' not found`);
|
|
58
58
|
}
|
|
59
|
+
const attachmentPath = join(attachmentFolder, options.fileName);
|
|
60
|
+
if (!existsSync(attachmentPath)) {
|
|
61
|
+
throw new Error(`Attachment file '${options.fileName}' not found in card '${cardKey}'`);
|
|
62
|
+
}
|
|
59
63
|
// Build image attributes
|
|
60
64
|
const attributes = this.buildImageAttributes(options);
|
|
61
65
|
// In inject mode, always use the API path for consistency
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/image/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/image/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,6 @@ export default class IncludeMacro extends BaseMacro {
|
|
|
23
23
|
constructor(tasksQueue: TaskQueue);
|
|
24
24
|
handleValidate: (input: unknown) => void;
|
|
25
25
|
handleStatic: (context: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
26
|
-
handleInject: (context: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
27
26
|
private validate;
|
|
28
27
|
private generateAnchor;
|
|
29
28
|
private generateTitle;
|
|
@@ -55,9 +55,6 @@ export default class IncludeMacro extends BaseMacro {
|
|
|
55
55
|
const adjustedContent = this.adjustTitles(content, levelOffset, options.pageTitles === 'discrete');
|
|
56
56
|
return adjustedContent;
|
|
57
57
|
};
|
|
58
|
-
handleInject = async (context, input) => {
|
|
59
|
-
return this.handleStatic(context, input);
|
|
60
|
-
};
|
|
61
58
|
validate(input) {
|
|
62
59
|
return validateMacroContent(this.metadata, input);
|
|
63
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/include/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;EAWE;AAEF,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnE,OAAO,aAAa,MAAM,eAAe,CAAC;AAC1C,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAS5D,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,SAAS;IACjD,YAAY,UAAqB;QAC/B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,cAAc,GAAG,CAAC,KAAc,EAAE,EAAE;QAClC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,YAAY,GAAG,KAAK,EAClB,OAA+B,EAC/B,KAAc,EACG,EAAE;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACnB,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,OAAO,CAAC,UAAU,GAAG,QAAQ,CAAC;QAChC,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE;YAClE,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,YAAY,OAAO,CAAC,OAAO,YAAY,CAAC,CAAC;QAC3D,CAAC;QACD,MAAM,UAAU,GAAG;YACjB,GAAG,OAAO;YACV,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAChE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAChD,OAAO,EACP,IAAI,CAAC,OAAO,EACZ,UAAU,CACX,CAAC;QACF,MAAM,OAAO,GAAG,OAAO,MAAM,GAAG,KAAK,GAAG,WAAW,EAAE,CAAC;QAEtD,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAChD,IAAI,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;YAClE,CAAC;YACD,WAAW,GAAG,IAAI,CAAC,GAAG,CACpB,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,EACxC,gBAAgB,CACjB,CAAC;QACJ,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,YAAY,CACvC,OAAO,EACP,WAAW,EACX,OAAO,CAAC,UAAU,KAAK,UAAU,CAClC,CAAC;QACF,OAAO,eAAe,CAAC;IACzB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/include/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,6 @@ declare class PercentageMacro extends BaseMacro {
|
|
|
23
23
|
constructor(tasksQueue: TaskQueue);
|
|
24
24
|
handleValidate: (data: string) => void;
|
|
25
25
|
handleStatic: (_: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
26
|
-
handleInject: (context: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
27
26
|
private validate;
|
|
28
27
|
}
|
|
29
28
|
export default PercentageMacro;
|
|
@@ -25,9 +25,6 @@ class PercentageMacro extends BaseMacro {
|
|
|
25
25
|
const options = this.validate(input);
|
|
26
26
|
return createImage(Buffer.from(percentage(options)).toString('base64'), false);
|
|
27
27
|
};
|
|
28
|
-
handleInject = async (context, input) => {
|
|
29
|
-
return this.handleStatic(context, input);
|
|
30
|
-
};
|
|
31
28
|
validate(input) {
|
|
32
29
|
return validateMacroContent(this.metadata, input);
|
|
33
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/percentage/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;EAWE;AAEF,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGhE,OAAO,aAAa,MAAM,eAAe,CAAC;AAC1C,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAShD,MAAM,eAAgB,SAAQ,SAAS;IACrC,YAAY,UAAqB;QAC/B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnC,CAAC;IACD,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;QAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,YAAY,GAAG,KAAK,EAAE,CAAyB,EAAE,KAAc,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrC,OAAO,WAAW,CAChB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACnD,KAAK,CACN,CAAC;IACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/percentage/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;EAWE;AAEF,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGhE,OAAO,aAAa,MAAM,eAAe,CAAC;AAC1C,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAShD,MAAM,eAAgB,SAAQ,SAAS;IACrC,YAAY,UAAqB;QAC/B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnC,CAAC;IACD,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;QAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,YAAY,GAAG,KAAK,EAAE,CAAyB,EAAE,KAAc,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrC,OAAO,WAAW,CAChB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EACnD,KAAK,CACN,CAAC;IACJ,CAAC,CAAC;IAEM,QAAQ,CAAC,KAAc;QAC7B,OAAO,oBAAoB,CAAoB,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACvE,CAAC;CACF;AAED,eAAe,eAAe,CAAC"}
|
|
@@ -20,7 +20,6 @@ declare class ReportMacro extends BaseMacro {
|
|
|
20
20
|
constructor(tasks: TaskQueue);
|
|
21
21
|
handleValidate: (input: unknown) => void;
|
|
22
22
|
handleStatic: (context: MacroGenerationContext, data: unknown) => Promise<string>;
|
|
23
|
-
handleInject: (context: MacroGenerationContext, data: unknown) => Promise<string>;
|
|
24
23
|
private validate;
|
|
25
24
|
}
|
|
26
25
|
export default ReportMacro;
|
|
@@ -26,9 +26,6 @@ class ReportMacro extends BaseMacro {
|
|
|
26
26
|
this.validate(input);
|
|
27
27
|
};
|
|
28
28
|
handleStatic = async (context, data) => {
|
|
29
|
-
return this.handleInject(context, data);
|
|
30
|
-
};
|
|
31
|
-
handleInject = async (context, data) => {
|
|
32
29
|
const options = this.validate(data);
|
|
33
30
|
const resource = new ReportResource(context.project, resourceName(options.name));
|
|
34
31
|
const report = await resource.show();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/report/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;EAWE;AAEF,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnD,OAAO,aAAa,MAAM,eAAe,CAAC;AAC1C,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAMrD,MAAM,WAAY,SAAQ,SAAS;IACjC,YAAY,KAAgB;QAC1B,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC;IACD,cAAc,GAAG,CAAC,KAAc,EAAE,EAAE;QAClC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,YAAY,GAAG,KAAK,EAAE,OAA+B,EAAE,IAAa,EAAE,EAAE;QACtE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/report/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;EAWE;AAEF,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGnD,OAAO,aAAa,MAAM,eAAe,CAAC;AAC1C,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAMrD,MAAM,WAAY,SAAQ,SAAS;IACjC,YAAY,KAAgB;QAC1B,KAAK,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC;IACD,cAAc,GAAG,CAAC,KAAc,EAAE,EAAE;QAClC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,YAAY,GAAG,KAAK,EAAE,OAA+B,EAAE,IAAa,EAAE,EAAE;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,QAAQ,GAAG,IAAI,cAAc,CACjC,OAAO,CAAC,OAAO,EACf,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAC3B,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAErC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,UAAU,OAAO,CAAC,IAAI,iBAAiB,CAAC,CAAC;QAEtE,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,YAAY,CAAC,OAAO,EAAE;gBACpB,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;QACL,CAAC;QACD,IAAI,CAAC;YACH,OAAO,MAAM,qBAAqB,CAAC;gBACjC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,iBAAiB;gBAC5C,eAAe,EAAE,MAAM,CAAC,eAAe;gBACvC,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,OAAO,EAAE;oBACP,OAAO,EAAE,OAAO,CAAC,OAAO;oBACxB,GAAG,OAAO;iBACX;gBACD,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CACb,0CAA0C,OAAO,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC7F,CAAC;YACJ,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IAEM,QAAQ,CAAC,IAAa;QAC5B,OAAO,oBAAoB,CAAgB,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;CACF;AAED,eAAe,WAAW,CAAC"}
|
|
@@ -24,7 +24,6 @@ declare class ScoreCardMacro extends BaseMacro {
|
|
|
24
24
|
constructor(tasksQueue: TaskQueue);
|
|
25
25
|
handleValidate: (data: string) => void;
|
|
26
26
|
handleStatic: (_: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
27
|
-
handleInject: (context: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
28
27
|
private validate;
|
|
29
28
|
}
|
|
30
29
|
export default ScoreCardMacro;
|
|
@@ -26,9 +26,6 @@ class ScoreCardMacro extends BaseMacro {
|
|
|
26
26
|
const options = this.validate(input);
|
|
27
27
|
return createImage(Buffer.from(scoreCard(options)).toString('base64'), false);
|
|
28
28
|
};
|
|
29
|
-
handleInject = async (context, input) => {
|
|
30
|
-
return this.handleStatic(context, input);
|
|
31
|
-
};
|
|
32
29
|
validate(input) {
|
|
33
30
|
return validateMacroContent(this.metadata, input);
|
|
34
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/scoreCard/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;EAYE;AAEF,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGhE,OAAO,aAAa,MAAM,eAAe,CAAC;AAC1C,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAS/C,MAAM,cAAe,SAAQ,SAAS;IACpC,YAAY,UAAqB;QAC/B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnC,CAAC;IACD,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;QAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,YAAY,GAAG,KAAK,EAAE,CAAyB,EAAE,KAAc,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrC,OAAO,WAAW,CAChB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAClD,KAAK,CACN,CAAC;IACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/scoreCard/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;EAYE;AAEF,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAGhE,OAAO,aAAa,MAAM,eAAe,CAAC;AAC1C,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAS/C,MAAM,cAAe,SAAQ,SAAS;IACpC,YAAY,UAAqB;QAC/B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnC,CAAC;IACD,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;QAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,YAAY,GAAG,KAAK,EAAE,CAAyB,EAAE,KAAc,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrC,OAAO,WAAW,CAChB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAClD,KAAK,CACN,CAAC;IACJ,CAAC,CAAC;IAEM,QAAQ,CAAC,KAAc;QAC7B,OAAO,oBAAoB,CAAmB,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACtE,CAAC;CACF;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -21,7 +21,6 @@ declare class VegaLiteMacro extends BaseMacro {
|
|
|
21
21
|
constructor(tasksQueue: TaskQueue);
|
|
22
22
|
handleValidate: (input: unknown) => void;
|
|
23
23
|
handleStatic: (_: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
24
|
-
handleInject: (context: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
25
24
|
private validate;
|
|
26
25
|
}
|
|
27
26
|
export default VegaLiteMacro;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/vegalite/index.ts"],"names":[],"mappings":"AAaA,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,aAAa,MAAM,eAAe,CAAC;AAE1C,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAMhE,MAAM,aAAc,SAAQ,SAAS;IACnC,YAAY,UAAqB;QAC/B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,cAAc,GAAG,CAAC,KAAc,EAAE,EAAE;QAClC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,YAAY,GAAG,KAAK,EAAE,CAAyB,EAAE,KAAc,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAuB,CAAC;QAC3D,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;QACrD,OAAO,WAAW,CAAC,MAAM,EAAE;YACzB,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/vegalite/index.ts"],"names":[],"mappings":"AAaA,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,aAAa,MAAM,eAAe,CAAC;AAE1C,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAMhE,MAAM,aAAc,SAAQ,SAAS;IACnC,YAAY,UAAqB;QAC/B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,cAAc,GAAG,CAAC,KAAc,EAAE,EAAE;QAClC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,YAAY,GAAG,KAAK,EAAE,CAAyB,EAAE,KAAc,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAuB,CAAC;QAC3D,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;QACrD,OAAO,WAAW,CAAC,MAAM,EAAE;YACzB,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;IACL,CAAC,CAAC;IAEM,QAAQ,CAAC,KAAc;QAC7B,OAAO,oBAAoB,CAAqB,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACxE,CAAC;CACF;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -121,7 +121,7 @@ export class ResourceObject extends AbstractResource {
|
|
|
121
121
|
if (!calculation.path) {
|
|
122
122
|
throw new Error(`Calculation file's '${calculation.name}' path is not defined`);
|
|
123
123
|
}
|
|
124
|
-
const filename = join(calculation.path, basename(calculation.name));
|
|
124
|
+
const filename = join(calculation.path, basename(calculation.name) + '.lp');
|
|
125
125
|
try {
|
|
126
126
|
const content = await readFile(filename, 'utf-8');
|
|
127
127
|
const updatedContent = content.replaceAll(from, to);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-object.js","sourceRoot":"","sources":["../../src/resources/resource-object.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"resource-object.js","sourceRoot":"","sources":["../../src/resources/resource-object.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ export declare function resourceName(resourceName: string, strict?: boolean): Re
|
|
|
29
29
|
* @param resourceName Name of the resource (e.g. <prefix>/<type>/<name>)
|
|
30
30
|
* @returns path to resource metadata file
|
|
31
31
|
*/
|
|
32
|
-
export declare function resourceNameToPath(project: Project, resourceName: ResourceName): string;
|
|
32
|
+
export declare function resourceNameToPath(project: Project, resourceName: ResourceName, extension?: string): string;
|
|
33
33
|
/**
|
|
34
34
|
* Resource metadata file path to resource name (e.g. <prefix>/<type>/<name>)
|
|
35
35
|
* @param project Project where resource is in
|
|
@@ -70,12 +70,12 @@ export function resourceName(resourceName, strict = false) {
|
|
|
70
70
|
* @param resourceName Name of the resource (e.g. <prefix>/<type>/<name>)
|
|
71
71
|
* @returns path to resource metadata file
|
|
72
72
|
*/
|
|
73
|
-
export function resourceNameToPath(project, resourceName) {
|
|
73
|
+
export function resourceNameToPath(project, resourceName, extension = '.json') {
|
|
74
74
|
if (project.projectPrefix === resourceName.prefix) {
|
|
75
|
-
return join(project.paths.resourcesFolder, resourceName.type, resourceName.identifier +
|
|
75
|
+
return join(project.paths.resourcesFolder, resourceName.type, resourceName.identifier + extension);
|
|
76
76
|
}
|
|
77
77
|
else if (resourceName.prefix !== '') {
|
|
78
|
-
return join(project.paths.modulesFolder, resourceName.prefix, resourceName.type, resourceName.identifier +
|
|
78
|
+
return join(project.paths.modulesFolder, resourceName.prefix, resourceName.type, resourceName.identifier + extension);
|
|
79
79
|
}
|
|
80
80
|
throw new Error('resourceName does not contain prefix');
|
|
81
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-utils.js","sourceRoot":"","sources":["../../src/utils/resource-utils.ts"],"names":[],"mappings":"AAAA;;;;;;;EAOE;AAEF,OAAO;AACP,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAG7C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAYjD,iCAAiC;AACjC,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,UAAU,GAAG,CAAC,CAAC;AACrB,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,sCAAsC;AACtC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,qBAAqB,GAAG;IAC5B,aAAa;IACb,YAAY;IACZ,SAAS;IACT,WAAW;CACZ,CAAC;AAEF,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,OAAO,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC;AACD,uDAAuD;AACvD,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C,OAAO,UAAU,KAAK,mBAAmB,CAAC;AAC5C,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAC1B,YAAoB,EACpB,SAAkB,KAAK;IAEvB,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,yDAAyD;IACzD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QAC7C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,SAAS,YAAY,8BAA8B,CAAC,CAAC;QACvE,CAAC;QACD,OAAO;YACL,MAAM,EAAE,EAAE;YACV,IAAI,EAAE,EAAE;YACR,UAAU,EAAE,YAAY;SACzB,CAAC;IACJ,CAAC;IACD,gBAAgB;IAChB,IAAI,KAAK,CAAC,MAAM,KAAK,mBAAmB,EAAE,CAAC;QACzC,OAAO;YACL,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC;YAC3B,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC;YACvB,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI;SAChD,CAAC;IACJ,CAAC;IACD,iCAAiC;IACjC,IAAI,YAAY,KAAK,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,SAAS,YAAY,8BAA8B,CAAC,CAAC;AACvE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAChC,OAAgB,EAChB,YAA0B;
|
|
1
|
+
{"version":3,"file":"resource-utils.js","sourceRoot":"","sources":["../../src/utils/resource-utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cyberismo/data-handler",
|
|
3
3
|
"description": "Command handler for cards and web service",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.11",
|
|
5
5
|
"author": "sami.merila@cyberismo.com",
|
|
6
6
|
"license": "AGPL-3.0",
|
|
7
7
|
"homepage": "https://github.com/CyberismoCom/cyberismo",
|
|
@@ -35,7 +35,6 @@
|
|
|
35
35
|
"dompurify": "^3.2.6",
|
|
36
36
|
"email-validator": "^2.0.4",
|
|
37
37
|
"handlebars": "^4.7.8",
|
|
38
|
-
"isomorphic-git": "^1.30.2",
|
|
39
38
|
"jsdom": "^26.1.0",
|
|
40
39
|
"json-schema": "^0.4.0",
|
|
41
40
|
"jsonschema": "^1.5.0",
|
|
@@ -47,8 +46,8 @@
|
|
|
47
46
|
"vega": "^6.1.2",
|
|
48
47
|
"vega-lite": "^6.2.0",
|
|
49
48
|
"write-json-file": "^6.0.0",
|
|
50
|
-
"@cyberismo/
|
|
51
|
-
"@cyberismo/
|
|
49
|
+
"@cyberismo/assets": "0.0.11",
|
|
50
|
+
"@cyberismo/node-clingo": "1.1.5"
|
|
52
51
|
},
|
|
53
52
|
"type": "module",
|
|
54
53
|
"files": [
|
package/src/commands/edit.ts
CHANGED
|
@@ -27,6 +27,7 @@ import {
|
|
|
27
27
|
resourceNameToString,
|
|
28
28
|
} from '../utils/resource-utils.js';
|
|
29
29
|
import { FolderResource } from '../resources/folder-resource.js';
|
|
30
|
+
import { writeFile } from 'node:fs/promises';
|
|
30
31
|
|
|
31
32
|
export class Edit {
|
|
32
33
|
private project: Project;
|
|
@@ -35,6 +36,44 @@ export class Edit {
|
|
|
35
36
|
this.project = project;
|
|
36
37
|
}
|
|
37
38
|
|
|
39
|
+
/**
|
|
40
|
+
* Updates a calculation file.
|
|
41
|
+
* @param resourceName The name of the resource to update.
|
|
42
|
+
* @param changedContent The new content for the calculation.
|
|
43
|
+
*/
|
|
44
|
+
public async editCalculation(
|
|
45
|
+
resourceName: ResourceName,
|
|
46
|
+
changedContent: string,
|
|
47
|
+
) {
|
|
48
|
+
if (resourceName.prefix !== this.project.projectPrefix) {
|
|
49
|
+
throw new Error(
|
|
50
|
+
`Resource '${resourceName.identifier}' is not a local resource`,
|
|
51
|
+
);
|
|
52
|
+
}
|
|
53
|
+
const resourceNameString = resourceNameToString(resourceName);
|
|
54
|
+
if (
|
|
55
|
+
!(await this.project.resourceExists(
|
|
56
|
+
resourceName.type as ResourceFolderType,
|
|
57
|
+
resourceNameString,
|
|
58
|
+
))
|
|
59
|
+
) {
|
|
60
|
+
throw new Error(
|
|
61
|
+
`Resource '${resourceNameString}' does not exist in the project`,
|
|
62
|
+
);
|
|
63
|
+
}
|
|
64
|
+
await writeFile(
|
|
65
|
+
join(
|
|
66
|
+
this.project.paths.calculationProjectFolder,
|
|
67
|
+
resourceName.identifier + '.lp',
|
|
68
|
+
),
|
|
69
|
+
changedContent,
|
|
70
|
+
{
|
|
71
|
+
encoding: 'utf-8',
|
|
72
|
+
flag: 'r+',
|
|
73
|
+
},
|
|
74
|
+
);
|
|
75
|
+
}
|
|
76
|
+
|
|
38
77
|
/**
|
|
39
78
|
* Opens the content and metadata files for a card in the code editor
|
|
40
79
|
* @param cardKey - The key of the card to open. Required.
|
|
@@ -145,20 +184,22 @@ export class Edit {
|
|
|
145
184
|
fileName: string,
|
|
146
185
|
changedContent: string,
|
|
147
186
|
) {
|
|
148
|
-
const
|
|
187
|
+
const resourceNameString = resourceNameToString(resourceName);
|
|
149
188
|
if (
|
|
150
189
|
!(await this.project.resourceExists(
|
|
151
190
|
resourceName.type as ResourceFolderType,
|
|
152
|
-
|
|
191
|
+
resourceNameString,
|
|
153
192
|
))
|
|
154
193
|
) {
|
|
155
194
|
throw new Error(
|
|
156
|
-
`Resource '${
|
|
195
|
+
`Resource '${resourceNameString}' does not exist in the project`,
|
|
157
196
|
);
|
|
158
197
|
}
|
|
159
198
|
const resource = Project.resourceObject(this.project, resourceName);
|
|
160
199
|
if (!(resource instanceof FolderResource)) {
|
|
161
|
-
throw new Error(
|
|
200
|
+
throw new Error(
|
|
201
|
+
`Resource '${resourceNameString}' is not a folder resource`,
|
|
202
|
+
);
|
|
162
203
|
}
|
|
163
204
|
return resource.updateFile(fileName, changedContent);
|
|
164
205
|
}
|
package/src/commands/export.ts
CHANGED
|
@@ -21,22 +21,21 @@ import {
|
|
|
21
21
|
writeFile,
|
|
22
22
|
} from 'node:fs/promises';
|
|
23
23
|
import { dirname, join } from 'node:path';
|
|
24
|
-
|
|
25
|
-
import { Project } from '../containers/project.js';
|
|
26
|
-
import { sortItems } from '../utils/lexorank.js';
|
|
24
|
+
import { spawn } from 'node:child_process';
|
|
27
25
|
|
|
28
26
|
import type {
|
|
29
27
|
Card,
|
|
30
28
|
FetchCardDetails,
|
|
31
29
|
} from '../interfaces/project-interfaces.js';
|
|
32
|
-
import type { QueryResult } from '../types/queries.js';
|
|
33
30
|
import type { CardType } from '../interfaces/resource-interfaces.js';
|
|
34
|
-
import type { Show } from './index.js';
|
|
35
|
-
import { generateReportContent } from '../utils/report.js';
|
|
36
|
-
import { getStaticDirectoryPath, pdfReport } from '@cyberismo/assets';
|
|
37
|
-
import { spawn } from 'node:child_process';
|
|
38
31
|
import { evaluateMacros } from '../macros/index.js';
|
|
39
32
|
import type { ExportPdfOptions } from '../interfaces/project-interfaces.js';
|
|
33
|
+
import { generateReportContent } from '../utils/report.js';
|
|
34
|
+
import { getStaticDirectoryPath, pdfReport } from '@cyberismo/assets';
|
|
35
|
+
import { Project } from '../containers/project.js';
|
|
36
|
+
import type { QueryResult } from '../types/queries.js';
|
|
37
|
+
import type { Show } from './index.js';
|
|
38
|
+
import { sortItems } from '../utils/lexorank.js';
|
|
40
39
|
|
|
41
40
|
const attachmentFolder: string = 'a';
|
|
42
41
|
|
package/src/commands/show.ts
CHANGED
|
@@ -16,7 +16,7 @@ import { existsSync, readFileSync } from 'node:fs';
|
|
|
16
16
|
import { homedir } from 'node:os';
|
|
17
17
|
import { join, resolve } from 'node:path';
|
|
18
18
|
import { spawn } from 'node:child_process';
|
|
19
|
-
import { writeFile } from 'node:fs/promises';
|
|
19
|
+
import { readFile, writeFile } from 'node:fs/promises';
|
|
20
20
|
|
|
21
21
|
import mime from 'mime-types';
|
|
22
22
|
|
|
@@ -43,6 +43,7 @@ import { Project, type ResourcesFrom } from '../containers/project.js';
|
|
|
43
43
|
import {
|
|
44
44
|
type ResourceName,
|
|
45
45
|
resourceName,
|
|
46
|
+
resourceNameToPath,
|
|
46
47
|
resourceNameToString,
|
|
47
48
|
} from '../utils/resource-utils.js';
|
|
48
49
|
import { TemplateResource } from '../resources/template-resource.js';
|
|
@@ -457,7 +458,7 @@ export class Show {
|
|
|
457
458
|
|
|
458
459
|
await this.project.calculationEngine.generate();
|
|
459
460
|
const reportMacro = new ReportMacro(new TaskQueue());
|
|
460
|
-
let result = await reportMacro.
|
|
461
|
+
let result = await reportMacro.handleStatic(
|
|
461
462
|
{
|
|
462
463
|
project: this.project,
|
|
463
464
|
cardKey: cardKey,
|
|
@@ -500,9 +501,12 @@ export class Show {
|
|
|
500
501
|
): Promise<ResourceContent | undefined> {
|
|
501
502
|
// TODO: remove this workaround once calculations are implemented as a resource class
|
|
502
503
|
if (resourceName(name).type === 'calculations') {
|
|
504
|
+
const nameObj = resourceName(name);
|
|
505
|
+
const path = resourceNameToPath(this.project, nameObj, '.lp');
|
|
503
506
|
return {
|
|
504
507
|
name,
|
|
505
|
-
displayName:
|
|
508
|
+
displayName: nameObj.identifier,
|
|
509
|
+
calculation: await readFile(path, 'utf-8'),
|
|
506
510
|
};
|
|
507
511
|
}
|
|
508
512
|
|
package/src/commands/validate.ts
CHANGED
|
@@ -481,7 +481,8 @@ export class Validate {
|
|
|
481
481
|
* returns true if identifier is valid, and false otherwise.
|
|
482
482
|
*/
|
|
483
483
|
public static isValidIdentifierName(identifier: string): boolean {
|
|
484
|
-
const validIdentifier = new RegExp('^[A-Za-z0-9
|
|
484
|
+
const validIdentifier = new RegExp('^[A-Za-z0-9._-]+$');
|
|
485
|
+
|
|
485
486
|
const contentValidated = validIdentifier.test(identifier);
|
|
486
487
|
const lengthValidated = identifier.length > 0 && identifier.length < 256;
|
|
487
488
|
const notInvalidIdentifier = !invalidNames.test(identifier);
|
|
@@ -236,9 +236,7 @@ export class ResourceCollector {
|
|
|
236
236
|
entry.isFile() && allowedExtensions.includes(extname(entry.name)),
|
|
237
237
|
)
|
|
238
238
|
.map((entry) => {
|
|
239
|
-
|
|
240
|
-
entry.name = stripExtension(entry.name);
|
|
241
|
-
}
|
|
239
|
+
entry.name = stripExtension(entry.name);
|
|
242
240
|
return {
|
|
243
241
|
name: `${this.project.projectPrefix}/${type}/${entry.name}`,
|
|
244
242
|
path: entry.parentPath,
|
package/src/interfaces/macros.ts
CHANGED
|
@@ -15,7 +15,7 @@ import type { Project } from '../containers/project.js';
|
|
|
15
15
|
import type { MacroError } from '../exceptions/index.js';
|
|
16
16
|
import type { Context } from './project-interfaces.js';
|
|
17
17
|
|
|
18
|
-
export type Mode = 'validate' | 'static' | 'inject';
|
|
18
|
+
export type Mode = 'validate' | 'static' | 'inject' | 'staticSite';
|
|
19
19
|
|
|
20
20
|
export interface MacroGenerationContext {
|
|
21
21
|
context: Context;
|
|
@@ -19,8 +19,10 @@ import type { Schema } from 'jsonschema';
|
|
|
19
19
|
* in a correct place in folder structure.
|
|
20
20
|
*/
|
|
21
21
|
|
|
22
|
-
// Calculation
|
|
23
|
-
export
|
|
22
|
+
// Calculation metadata.
|
|
23
|
+
export interface CalculationMetadata extends ResourceBaseMetadata {
|
|
24
|
+
calculation: string;
|
|
25
|
+
}
|
|
24
26
|
|
|
25
27
|
// Card type content.
|
|
26
28
|
export interface CardType extends ResourceBaseMetadata {
|
package/src/macros/base-macro.ts
CHANGED
|
@@ -42,10 +42,21 @@ abstract class BaseMacro {
|
|
|
42
42
|
this.globalId = `${generateRandomString(36, 10)}`;
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
|
|
45
|
+
// Default: exportSite uses inject output unless overridden by subclass
|
|
46
|
+
protected handleStaticSite(
|
|
46
47
|
context: MacroGenerationContext,
|
|
47
48
|
input: unknown,
|
|
48
|
-
): Promise<string
|
|
49
|
+
): Promise<string> {
|
|
50
|
+
return this.handleInject(context, input);
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
// Default: inject uses static output unless overridden by subclass
|
|
54
|
+
protected handleInject(
|
|
55
|
+
context: MacroGenerationContext,
|
|
56
|
+
input: unknown,
|
|
57
|
+
): Promise<string> {
|
|
58
|
+
return this.handleStatic(context, input);
|
|
59
|
+
}
|
|
49
60
|
|
|
50
61
|
protected abstract handleStatic(
|
|
51
62
|
context: MacroGenerationContext,
|
|
@@ -181,10 +192,14 @@ abstract class BaseMacro {
|
|
|
181
192
|
|
|
182
193
|
// Select the function to execute based on context mode
|
|
183
194
|
const functionToCall =
|
|
184
|
-
context.mode === 'inject'
|
|
195
|
+
context.mode === 'inject'
|
|
196
|
+
? this.handleInject
|
|
197
|
+
: context.mode === 'staticSite'
|
|
198
|
+
? this.handleStaticSite
|
|
199
|
+
: this.handleStatic;
|
|
185
200
|
|
|
186
201
|
// Execute the function and handle its result
|
|
187
|
-
return functionToCall(context, parsed);
|
|
202
|
+
return functionToCall.call(this, context, parsed);
|
|
188
203
|
})
|
|
189
204
|
.then((result) => {
|
|
190
205
|
// undefined is used to indicate that the macro did not run for some reason
|
|
@@ -48,6 +48,11 @@ class CreateCardsMacro extends BaseMacro {
|
|
|
48
48
|
return createHtmlPlaceholder(this.metadata, options);
|
|
49
49
|
};
|
|
50
50
|
|
|
51
|
+
handleStaticSite = async () => {
|
|
52
|
+
// export site does not support createCards
|
|
53
|
+
return '';
|
|
54
|
+
};
|
|
55
|
+
|
|
51
56
|
private validate(input: unknown): CreateCardsOptions {
|
|
52
57
|
return validateMacroContent<CreateCardsOptions>(this.metadata, input);
|
|
53
58
|
}
|
|
@@ -40,10 +40,6 @@ class ReportMacro extends BaseMacro {
|
|
|
40
40
|
};
|
|
41
41
|
|
|
42
42
|
handleStatic = async (context: MacroGenerationContext, input: unknown) => {
|
|
43
|
-
return this.handleInject(context, input);
|
|
44
|
-
};
|
|
45
|
-
|
|
46
|
-
handleInject = async (context: MacroGenerationContext, input: unknown) => {
|
|
47
43
|
const resourceNameToPath = (name: string, fileName: string) => {
|
|
48
44
|
const { identifier, prefix, type } = resourceName(name);
|
|
49
45
|
if (prefix === context.project.projectPrefix) {
|
|
@@ -94,6 +94,13 @@ export default class ImageMacro extends BaseMacro {
|
|
|
94
94
|
throw new Error(`Card '${cardKey}' not found`);
|
|
95
95
|
}
|
|
96
96
|
|
|
97
|
+
const attachmentPath = join(attachmentFolder, options.fileName);
|
|
98
|
+
if (!existsSync(attachmentPath)) {
|
|
99
|
+
throw new Error(
|
|
100
|
+
`Attachment file '${options.fileName}' not found in card '${cardKey}'`,
|
|
101
|
+
);
|
|
102
|
+
}
|
|
103
|
+
|
|
97
104
|
// Build image attributes
|
|
98
105
|
const attributes = this.buildImageAttributes(options);
|
|
99
106
|
|
|
@@ -87,10 +87,6 @@ export default class IncludeMacro extends BaseMacro {
|
|
|
87
87
|
return adjustedContent;
|
|
88
88
|
};
|
|
89
89
|
|
|
90
|
-
handleInject = async (context: MacroGenerationContext, input: unknown) => {
|
|
91
|
-
return this.handleStatic(context, input);
|
|
92
|
-
};
|
|
93
|
-
|
|
94
90
|
private validate(input: unknown): IncludeMacroOptions {
|
|
95
91
|
return validateMacroContent<IncludeMacroOptions>(this.metadata, input);
|
|
96
92
|
}
|
|
@@ -42,10 +42,6 @@ class PercentageMacro extends BaseMacro {
|
|
|
42
42
|
);
|
|
43
43
|
};
|
|
44
44
|
|
|
45
|
-
handleInject = async (context: MacroGenerationContext, input: unknown) => {
|
|
46
|
-
return this.handleStatic(context, input);
|
|
47
|
-
};
|
|
48
|
-
|
|
49
45
|
private validate(input: unknown): PercentageOptions {
|
|
50
46
|
return validateMacroContent<PercentageOptions>(this.metadata, input);
|
|
51
47
|
}
|
|
@@ -36,10 +36,6 @@ class ReportMacro extends BaseMacro {
|
|
|
36
36
|
};
|
|
37
37
|
|
|
38
38
|
handleStatic = async (context: MacroGenerationContext, data: unknown) => {
|
|
39
|
-
return this.handleInject(context, data);
|
|
40
|
-
};
|
|
41
|
-
|
|
42
|
-
handleInject = async (context: MacroGenerationContext, data: unknown) => {
|
|
43
39
|
const options = this.validate(data);
|
|
44
40
|
const resource = new ReportResource(
|
|
45
41
|
context.project,
|