@cyberismo/data-handler 0.0.11 → 0.0.13
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/card-metadata-updater.js +1 -1
- package/dist/card-metadata-updater.js.map +1 -1
- package/dist/command-handler.d.ts +26 -39
- package/dist/command-handler.js +76 -31
- package/dist/command-handler.js.map +1 -1
- package/dist/command-manager.d.ts +2 -1
- package/dist/command-manager.js +4 -2
- package/dist/command-manager.js.map +1 -1
- package/dist/commands/calculate.d.ts +7 -0
- package/dist/commands/calculate.js +9 -0
- package/dist/commands/calculate.js.map +1 -1
- package/dist/commands/create.d.ts +5 -0
- package/dist/commands/create.js +15 -8
- package/dist/commands/create.js.map +1 -1
- package/dist/commands/fetch.d.ts +24 -0
- package/dist/commands/fetch.js +118 -0
- package/dist/commands/fetch.js.map +1 -0
- package/dist/commands/import.js +2 -2
- package/dist/commands/import.js.map +1 -1
- package/dist/commands/index.d.ts +2 -1
- package/dist/commands/index.js +2 -1
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/remove.d.ts +1 -0
- package/dist/commands/remove.js +16 -12
- package/dist/commands/remove.js.map +1 -1
- package/dist/commands/rename.js +4 -6
- package/dist/commands/rename.js.map +1 -1
- package/dist/commands/show.d.ts +22 -1
- package/dist/commands/show.js +56 -0
- package/dist/commands/show.js.map +1 -1
- package/dist/commands/update.d.ts +11 -1
- package/dist/commands/update.js +14 -2
- package/dist/commands/update.js.map +1 -1
- package/dist/commands/validate.d.ts +2 -1
- package/dist/commands/validate.js +10 -10
- package/dist/commands/validate.js.map +1 -1
- package/dist/containers/card-container.js +1 -1
- package/dist/containers/card-container.js.map +1 -1
- package/dist/containers/project/calculation-engine.d.ts +8 -0
- package/dist/containers/project/calculation-engine.js +21 -10
- package/dist/containers/project/calculation-engine.js.map +1 -1
- package/dist/containers/project.d.ts +19 -8
- package/dist/containers/project.js +52 -34
- package/dist/containers/project.js.map +1 -1
- package/dist/containers/template.js +1 -1
- package/dist/containers/template.js.map +1 -1
- package/dist/index.d.ts +4 -2
- package/dist/index.js.map +1 -1
- package/dist/interfaces/command-options.d.ts +81 -0
- package/dist/interfaces/command-options.js +14 -0
- package/dist/interfaces/command-options.js.map +1 -0
- package/dist/interfaces/folder-content-interfaces.d.ts +50 -0
- package/dist/interfaces/folder-content-interfaces.js +45 -0
- package/dist/interfaces/folder-content-interfaces.js.map +1 -0
- package/dist/interfaces/project-interfaces.d.ts +13 -2
- package/dist/interfaces/project-interfaces.js.map +1 -1
- package/dist/interfaces/resource-interfaces.d.ts +28 -10
- package/dist/interfaces/resource-interfaces.js.map +1 -1
- package/dist/macros/base-macro.d.ts +1 -1
- package/dist/macros/base-macro.js +1 -1
- package/dist/macros/base-macro.js.map +1 -1
- package/dist/macros/createCards/index.d.ts +1 -1
- package/dist/macros/createCards/index.js +1 -1
- package/dist/macros/createCards/index.js.map +1 -1
- package/dist/macros/graph/index.d.ts +1 -1
- package/dist/macros/graph/index.js +21 -29
- package/dist/macros/graph/index.js.map +1 -1
- package/dist/macros/image/index.d.ts +1 -1
- package/dist/macros/image/index.js +1 -7
- package/dist/macros/image/index.js.map +1 -1
- package/dist/macros/include/index.d.ts +1 -1
- package/dist/macros/include/index.js +1 -1
- package/dist/macros/include/index.js.map +1 -1
- package/dist/macros/index.d.ts +12 -5
- package/dist/macros/index.js +19 -7
- package/dist/macros/index.js.map +1 -1
- package/dist/macros/percentage/index.d.ts +1 -1
- package/dist/macros/percentage/index.js +1 -1
- package/dist/macros/percentage/index.js.map +1 -1
- package/dist/macros/report/index.d.ts +1 -1
- package/dist/macros/report/index.js +5 -5
- package/dist/macros/report/index.js.map +1 -1
- package/dist/macros/scoreCard/index.d.ts +1 -1
- package/dist/macros/scoreCard/index.js +1 -1
- package/dist/macros/scoreCard/index.js.map +1 -1
- package/dist/macros/vega/index.d.ts +1 -1
- package/dist/macros/vega/index.js +1 -1
- package/dist/macros/vega/index.js.map +1 -1
- package/dist/macros/vegalite/index.d.ts +1 -1
- package/dist/macros/vegalite/index.js +1 -1
- package/dist/macros/vegalite/index.js.map +1 -1
- package/dist/macros/xref/index.d.ts +1 -1
- package/dist/macros/xref/index.js +1 -1
- package/dist/macros/xref/index.js.map +1 -1
- package/dist/project-settings.d.ts +14 -1
- package/dist/project-settings.js +51 -1
- package/dist/project-settings.js.map +1 -1
- package/dist/resources/card-type-resource.js +11 -5
- package/dist/resources/card-type-resource.js.map +1 -1
- package/dist/resources/field-type-resource.d.ts +5 -0
- package/dist/resources/field-type-resource.js +9 -4
- package/dist/resources/field-type-resource.js.map +1 -1
- package/dist/resources/folder-resource.d.ts +37 -9
- package/dist/resources/folder-resource.js +108 -12
- package/dist/resources/folder-resource.js.map +1 -1
- package/dist/resources/graph-model-resource.d.ts +7 -4
- package/dist/resources/graph-model-resource.js +12 -25
- package/dist/resources/graph-model-resource.js.map +1 -1
- package/dist/resources/graph-view-resource.d.ts +7 -4
- package/dist/resources/graph-view-resource.js +15 -31
- package/dist/resources/graph-view-resource.js.map +1 -1
- package/dist/resources/link-type-resource.js +1 -1
- package/dist/resources/link-type-resource.js.map +1 -1
- package/dist/resources/report-resource.d.ts +14 -10
- package/dist/resources/report-resource.js +41 -45
- package/dist/resources/report-resource.js.map +1 -1
- package/dist/resources/resource-object.d.ts +7 -0
- package/dist/resources/resource-object.js.map +1 -1
- package/dist/resources/template-resource.d.ts +5 -1
- package/dist/resources/template-resource.js +12 -7
- package/dist/resources/template-resource.js.map +1 -1
- package/dist/resources/workflow-resource.js +12 -5
- package/dist/resources/workflow-resource.js.map +1 -1
- package/dist/utils/log-utils.js +1 -1
- package/dist/utils/log-utils.js.map +1 -1
- package/dist/utils/report.js +6 -0
- package/dist/utils/report.js.map +1 -1
- package/dist/utils/resource-utils.d.ts +8 -0
- package/dist/utils/resource-utils.js +11 -0
- package/dist/utils/resource-utils.js.map +1 -1
- package/package.json +11 -11
- package/src/card-metadata-updater.ts +1 -1
- package/src/command-handler.ts +129 -61
- package/src/command-manager.ts +4 -1
- package/src/commands/calculate.ts +18 -0
- package/src/commands/create.ts +31 -19
- package/src/commands/fetch.ts +152 -0
- package/src/commands/import.ts +2 -0
- package/src/commands/index.ts +2 -0
- package/src/commands/remove.ts +18 -12
- package/src/commands/rename.ts +11 -11
- package/src/commands/show.ts +72 -0
- package/src/commands/update.ts +20 -2
- package/src/commands/validate.ts +13 -10
- package/src/containers/card-container.ts +1 -1
- package/src/containers/project/calculation-engine.ts +27 -11
- package/src/containers/project.ts +71 -61
- package/src/containers/template.ts +1 -1
- package/src/index.ts +36 -2
- package/src/interfaces/command-options.ts +144 -0
- package/src/interfaces/folder-content-interfaces.ts +69 -0
- package/src/interfaces/project-interfaces.ts +18 -0
- package/src/interfaces/resource-interfaces.ts +41 -12
- package/src/macros/base-macro.ts +5 -2
- package/src/macros/createCards/index.ts +1 -1
- package/src/macros/graph/index.ts +47 -51
- package/src/macros/image/index.ts +1 -7
- package/src/macros/include/index.ts +1 -1
- package/src/macros/index.ts +19 -7
- package/src/macros/percentage/index.ts +1 -1
- package/src/macros/report/index.ts +5 -5
- package/src/macros/scoreCard/index.ts +1 -1
- package/src/macros/vega/index.ts +1 -1
- package/src/macros/vegalite/index.ts +1 -1
- package/src/macros/xref/index.ts +1 -1
- package/src/project-settings.ts +62 -1
- package/src/resources/card-type-resource.ts +12 -6
- package/src/resources/field-type-resource.ts +9 -4
- package/src/resources/folder-resource.ts +149 -19
- package/src/resources/graph-model-resource.ts +16 -27
- package/src/resources/graph-view-resource.ts +23 -33
- package/src/resources/link-type-resource.ts +1 -1
- package/src/resources/report-resource.ts +60 -62
- package/src/resources/resource-object.ts +11 -0
- package/src/resources/template-resource.ts +12 -7
- package/src/resources/workflow-resource.ts +11 -6
- package/src/utils/log-utils.ts +1 -1
- package/src/utils/report.ts +6 -0
- package/src/utils/resource-utils.ts +16 -0
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/include/index.ts"],"names":[],"mappings":"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"}
|
package/dist/macros/index.d.ts
CHANGED
|
@@ -39,17 +39,22 @@ export declare const macros: {
|
|
|
39
39
|
* Validates the content inside a macro
|
|
40
40
|
* @param macro - The macro to validate the content of
|
|
41
41
|
* @param data - The data to validate
|
|
42
|
+
* @param schema - Schema to use in validation
|
|
42
43
|
* @returns The validated data
|
|
43
44
|
*/
|
|
44
45
|
export declare function validateMacroContent<T>(macro: MacroMetadata, data: unknown, schema?: Schema): T;
|
|
45
46
|
/**
|
|
46
47
|
* Registers the macros with Handlebars
|
|
47
|
-
* @param
|
|
48
|
+
* @param instance - Handlebar instance
|
|
49
|
+
* @param context - The context for macro generation
|
|
50
|
+
* @param tasks - Tasks to register
|
|
51
|
+
* @returns macro instances
|
|
48
52
|
*/
|
|
49
53
|
export declare function registerMacros(instance: typeof Handlebars, context: MacroGenerationContext, tasks: TaskQueue): BaseMacro[];
|
|
50
54
|
/**
|
|
51
55
|
* Calculate amount of handlebars templates inside a string
|
|
52
|
-
* @param input
|
|
56
|
+
* @param input - String to calculate templates from
|
|
57
|
+
* @returns number of macros
|
|
53
58
|
*/
|
|
54
59
|
export declare function macroCount(input: string): number;
|
|
55
60
|
/**
|
|
@@ -60,11 +65,11 @@ export declare function macroCount(input: string): number;
|
|
|
60
65
|
*/
|
|
61
66
|
export declare function registerEmptyMacros(instance: typeof Handlebars): void;
|
|
62
67
|
/**
|
|
63
|
-
* Handle the macros in the content
|
|
68
|
+
* Handle the macros in the content.
|
|
64
69
|
* @param content - The content to handle the macros in
|
|
65
70
|
* @param context - The context for macro generation
|
|
66
|
-
* @param calculate - The calculate function
|
|
67
71
|
* @param preserveRawBlocks - If true, don't unescape raw blocks at the end (for nested evaluations)
|
|
72
|
+
* @returns macro result
|
|
68
73
|
*/
|
|
69
74
|
export declare function evaluateMacros(content: string, context: MacroGenerationContext, preserveRawBlocks?: boolean): Promise<string>;
|
|
70
75
|
/**
|
|
@@ -81,6 +86,7 @@ export declare function applyMacroResults(input: string, tasks: TaskQueue, conte
|
|
|
81
86
|
* Handles errors that come when handling macros
|
|
82
87
|
* @param error - The error that was thrown
|
|
83
88
|
* @param macro - The macro that caused the error
|
|
89
|
+
* @param context - General context for the macro evaluation process
|
|
84
90
|
* @returns The error message that is valid adoc
|
|
85
91
|
*/
|
|
86
92
|
export declare function handleMacroError(error: unknown, macro: string, context: MacroGenerationContext): string;
|
|
@@ -107,8 +113,9 @@ export declare function createAdmonition(type: AdmonitionType, label: string, co
|
|
|
107
113
|
*/
|
|
108
114
|
export declare function createCodeBlock(content: string): string;
|
|
109
115
|
/**
|
|
110
|
-
* Helper function for including base64 encoded images
|
|
116
|
+
* Helper function for including base64 encoded images
|
|
111
117
|
* @param image base64 encoded image
|
|
118
|
+
* @param controls Add controls
|
|
112
119
|
* @returns valid asciidoc with the image
|
|
113
120
|
*/
|
|
114
121
|
export declare function createImage(image: string, controls?: boolean): string;
|
package/dist/macros/index.js
CHANGED
|
@@ -113,6 +113,7 @@ export const macros = {
|
|
|
113
113
|
* Validates the content inside a macro
|
|
114
114
|
* @param macro - The macro to validate the content of
|
|
115
115
|
* @param data - The data to validate
|
|
116
|
+
* @param schema - Schema to use in validation
|
|
116
117
|
* @returns The validated data
|
|
117
118
|
*/
|
|
118
119
|
export function validateMacroContent(macro, data, schema) {
|
|
@@ -135,7 +136,10 @@ export function validateMacroContent(macro, data, schema) {
|
|
|
135
136
|
}
|
|
136
137
|
/**
|
|
137
138
|
* Registers the macros with Handlebars
|
|
138
|
-
* @param
|
|
139
|
+
* @param instance - Handlebar instance
|
|
140
|
+
* @param context - The context for macro generation
|
|
141
|
+
* @param tasks - Tasks to register
|
|
142
|
+
* @returns macro instances
|
|
139
143
|
*/
|
|
140
144
|
export function registerMacros(instance, context, tasks) {
|
|
141
145
|
const macroInstances = [];
|
|
@@ -151,7 +155,8 @@ export function registerMacros(instance, context, tasks) {
|
|
|
151
155
|
}
|
|
152
156
|
/**
|
|
153
157
|
* Calculate amount of handlebars templates inside a string
|
|
154
|
-
* @param input
|
|
158
|
+
* @param input - String to calculate templates from
|
|
159
|
+
* @returns number of macros
|
|
155
160
|
*/
|
|
156
161
|
export function macroCount(input) {
|
|
157
162
|
const regex = /{{#[\w\s-]+?}}/g;
|
|
@@ -172,11 +177,11 @@ export function registerEmptyMacros(instance) {
|
|
|
172
177
|
}
|
|
173
178
|
}
|
|
174
179
|
/**
|
|
175
|
-
* Handle the macros in the content
|
|
180
|
+
* Handle the macros in the content.
|
|
176
181
|
* @param content - The content to handle the macros in
|
|
177
182
|
* @param context - The context for macro generation
|
|
178
|
-
* @param calculate - The calculate function
|
|
179
183
|
* @param preserveRawBlocks - If true, don't unescape raw blocks at the end (for nested evaluations)
|
|
184
|
+
* @returns macro result
|
|
180
185
|
*/
|
|
181
186
|
export async function evaluateMacros(content, context, preserveRawBlocks = false) {
|
|
182
187
|
const handlebars = Handlebars.create();
|
|
@@ -184,7 +189,7 @@ export async function evaluateMacros(content, context, preserveRawBlocks = false
|
|
|
184
189
|
registerMacros(handlebars, context, tasks);
|
|
185
190
|
let result = content;
|
|
186
191
|
while ((context.maxTries ?? 10) > 0) {
|
|
187
|
-
tasks.reset();
|
|
192
|
+
await tasks.reset();
|
|
188
193
|
try {
|
|
189
194
|
const compiled = handlebars.compile(preprocessRawBlocks(result), {
|
|
190
195
|
strict: true,
|
|
@@ -237,6 +242,7 @@ export function applyMacroResults(input, tasks, context) {
|
|
|
237
242
|
* Handles errors that come when handling macros
|
|
238
243
|
* @param error - The error that was thrown
|
|
239
244
|
* @param macro - The macro that caused the error
|
|
245
|
+
* @param context - General context for the macro evaluation process
|
|
240
246
|
* @returns The error message that is valid adoc
|
|
241
247
|
*/
|
|
242
248
|
export function handleMacroError(error, macro, context) {
|
|
@@ -268,8 +274,13 @@ export function handleMacroError(error, macro, context) {
|
|
|
268
274
|
}
|
|
269
275
|
}
|
|
270
276
|
// This is used to generate unique keys for macros
|
|
271
|
-
// There might be a better way to do this
|
|
277
|
+
// TODO: There might be a better way to do this
|
|
272
278
|
let macroCounter = 0;
|
|
279
|
+
/**
|
|
280
|
+
* Converts object to base64
|
|
281
|
+
* @param obj Object to convert
|
|
282
|
+
* @returns base64 conversion (as a Buffer)
|
|
283
|
+
*/
|
|
273
284
|
function objectToBase64(obj) {
|
|
274
285
|
return Buffer.from(JSON.stringify(obj), 'utf-8').toString('base64');
|
|
275
286
|
}
|
|
@@ -303,8 +314,9 @@ export function createCodeBlock(content) {
|
|
|
303
314
|
return `\n\n----\n${content}\n----\n\n`;
|
|
304
315
|
}
|
|
305
316
|
/**
|
|
306
|
-
* Helper function for including base64 encoded images
|
|
317
|
+
* Helper function for including base64 encoded images
|
|
307
318
|
* @param image base64 encoded image
|
|
319
|
+
* @param controls Add controls
|
|
308
320
|
* @returns valid asciidoc with the image
|
|
309
321
|
*/
|
|
310
322
|
export function createImage(image, controls = true) {
|
package/dist/macros/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/macros/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/macros/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export interface PercentageOptions {
|
|
|
21
21
|
}
|
|
22
22
|
declare class PercentageMacro extends BaseMacro {
|
|
23
23
|
constructor(tasksQueue: TaskQueue);
|
|
24
|
-
handleValidate: (data: string) => void;
|
|
24
|
+
handleValidate: (_: MacroGenerationContext, data: string) => void;
|
|
25
25
|
handleStatic: (_: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
26
26
|
private validate;
|
|
27
27
|
}
|
|
@@ -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;
|
|
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,CAAyB,EAAE,IAAY,EAAE,EAAE;QAC3D,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"}
|
|
@@ -18,7 +18,7 @@ export interface ReportOptions {
|
|
|
18
18
|
}
|
|
19
19
|
declare class ReportMacro extends BaseMacro {
|
|
20
20
|
constructor(tasks: TaskQueue);
|
|
21
|
-
handleValidate: (input: unknown) => void;
|
|
21
|
+
handleValidate: (_: MacroGenerationContext, input: unknown) => void;
|
|
22
22
|
handleStatic: (context: MacroGenerationContext, data: unknown) => Promise<string>;
|
|
23
23
|
private validate;
|
|
24
24
|
}
|
|
@@ -22,7 +22,7 @@ class ReportMacro extends BaseMacro {
|
|
|
22
22
|
constructor(tasks) {
|
|
23
23
|
super(macroMetadata, tasks);
|
|
24
24
|
}
|
|
25
|
-
handleValidate = (input) => {
|
|
25
|
+
handleValidate = (_, input) => {
|
|
26
26
|
this.validate(input);
|
|
27
27
|
};
|
|
28
28
|
handleStatic = async (context, data) => {
|
|
@@ -31,16 +31,16 @@ class ReportMacro extends BaseMacro {
|
|
|
31
31
|
const report = await resource.show();
|
|
32
32
|
if (!report)
|
|
33
33
|
throw new Error(`Report ${options.name} does not exist`);
|
|
34
|
-
if (report.schema) {
|
|
34
|
+
if (report.content.schema) {
|
|
35
35
|
validateJson(options, {
|
|
36
|
-
schema: report.schema,
|
|
36
|
+
schema: report.content.schema,
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
39
|
try {
|
|
40
40
|
return await generateReportContent({
|
|
41
41
|
calculate: context.project.calculationEngine,
|
|
42
|
-
contentTemplate: report.contentTemplate,
|
|
43
|
-
queryTemplate: report.queryTemplate,
|
|
42
|
+
contentTemplate: report.content.contentTemplate,
|
|
43
|
+
queryTemplate: report.content.queryTemplate,
|
|
44
44
|
options: {
|
|
45
45
|
cardKey: context.cardKey,
|
|
46
46
|
...options,
|
|
@@ -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;
|
|
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,CAAyB,EAAE,KAAc,EAAE,EAAE;QAC7D,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,OAAO,CAAC,MAAM,EAAE,CAAC;YAC1B,YAAY,CAAC,OAAO,EAAE;gBACpB,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;aAC9B,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,OAAO,CAAC,eAAe;gBAC/C,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa;gBAC3C,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"}
|
|
@@ -22,7 +22,7 @@ export interface ScoreCardOptions {
|
|
|
22
22
|
}
|
|
23
23
|
declare class ScoreCardMacro extends BaseMacro {
|
|
24
24
|
constructor(tasksQueue: TaskQueue);
|
|
25
|
-
handleValidate: (data: string) => void;
|
|
25
|
+
handleValidate: (_: MacroGenerationContext, data: string) => void;
|
|
26
26
|
handleStatic: (_: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
27
27
|
private validate;
|
|
28
28
|
}
|
|
@@ -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;
|
|
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,CAAyB,EAAE,IAAY,EAAE,EAAE;QAC3D,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"}
|
|
@@ -20,7 +20,7 @@ export interface VegaMacroInput {
|
|
|
20
20
|
}
|
|
21
21
|
declare class VegaMacro extends BaseMacro {
|
|
22
22
|
constructor(tasksQueue: TaskQueue);
|
|
23
|
-
handleValidate: (input: unknown) => void;
|
|
23
|
+
handleValidate: (_: MacroGenerationContext, input: unknown) => void;
|
|
24
24
|
handleStatic: (_: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
25
25
|
handleInject: (_: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
26
26
|
private validate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/vega/index.ts"],"names":[],"mappings":"AAcA,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,aAAa,MAAM,eAAe,CAAC;AAE1C,OAAO,EACL,qBAAqB,EACrB,WAAW,EACX,oBAAoB,GACrB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAM7B,MAAM,SAAU,SAAQ,SAAS;IAC/B,YAAY,UAAqB;QAC/B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,cAAc,GAAG,CAAC,KAAc,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/vega/index.ts"],"names":[],"mappings":"AAcA,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,aAAa,MAAM,eAAe,CAAC;AAE1C,OAAO,EACL,qBAAqB,EACrB,WAAW,EACX,oBAAoB,GACrB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAM7B,MAAM,SAAU,SAAQ,SAAS;IAC/B,YAAY,UAAqB;QAC/B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,cAAc,GAAG,CAAC,CAAyB,EAAE,KAAc,EAAE,EAAE;QAC7D,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,CAAmB,CAAC;QACvD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QAC/B,OAAO,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;IACjE,CAAC,CAAC;IAEF,YAAY,GAAG,KAAK,EAAE,CAAyB,EAAE,KAAc,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAmB,CAAC;QACvD,OAAO,qBAAqB,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC,CAAC;IAEM,QAAQ,CAAC,KAAc;QAC7B,OAAO,oBAAoB,CAAiB,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACpE,CAAC;CACF;AAED,eAAe,SAAS,CAAC"}
|
|
@@ -19,7 +19,7 @@ export interface VegaLiteMacroInput {
|
|
|
19
19
|
}
|
|
20
20
|
declare class VegaLiteMacro extends BaseMacro {
|
|
21
21
|
constructor(tasksQueue: TaskQueue);
|
|
22
|
-
handleValidate: (input: unknown) => void;
|
|
22
|
+
handleValidate: (_: MacroGenerationContext, input: unknown) => void;
|
|
23
23
|
handleStatic: (_: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
24
24
|
private validate;
|
|
25
25
|
}
|
|
@@ -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;
|
|
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,CAAyB,EAAE,KAAc,EAAE,EAAE;QAC7D,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"}
|
|
@@ -18,7 +18,7 @@ export interface XrefMacroOptions {
|
|
|
18
18
|
}
|
|
19
19
|
export default class XrefMacro extends BaseMacro {
|
|
20
20
|
constructor(tasksQueue: TaskQueue);
|
|
21
|
-
handleValidate: (input: unknown) => void;
|
|
21
|
+
handleValidate: (_: MacroGenerationContext, input: unknown) => void;
|
|
22
22
|
handleStatic: (context: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
23
23
|
handleInject: (context: MacroGenerationContext, input: unknown) => Promise<string>;
|
|
24
24
|
private getCard;
|
|
@@ -17,7 +17,7 @@ export default class XrefMacro extends BaseMacro {
|
|
|
17
17
|
constructor(tasksQueue) {
|
|
18
18
|
super(macroMetadata, tasksQueue);
|
|
19
19
|
}
|
|
20
|
-
handleValidate = (input) => {
|
|
20
|
+
handleValidate = (_, input) => {
|
|
21
21
|
this.validate(input);
|
|
22
22
|
};
|
|
23
23
|
handleStatic = async (context, input) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/xref/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;AAOzC,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAS;IAC9C,YAAY,UAAqB;QAC/B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,cAAc,GAAG,CAAC,KAAc,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/xref/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;AAOzC,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAS;IAC9C,YAAY,UAAqB;QAC/B,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,cAAc,GAAG,CAAC,CAAyB,EAAE,KAAc,EAAE,EAAE;QAC7D,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,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE1D,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,YAAY,OAAO,CAAC,OAAO,YAAY,CAAC,CAAC;QAC3D,CAAC;QAED,oDAAoD;QACpD,OAAO,KAAK,OAAO,CAAC,OAAO,IAAI,CAAC;IAClC,CAAC,CAAC;IAEF,YAAY,GAAG,KAAK,EAAE,OAA+B,EAAE,KAAc,EAAE,EAAE;QACvE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE1D,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,YAAY,OAAO,CAAC,OAAO,YAAY,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,QAAQ,OAAO,CAAC,OAAO,SAAS,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC;IAChE,CAAC,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,OAAe,EAAE,OAA+B;QACpE,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,EAAE;YAC1D,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,YAAY,OAAO,YAAY,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,QAAQ,CAAC,KAAc;QAC7B,OAAO,oBAAoB,CAAmB,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACtE,CAAC;CACF"}
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
details. You should have received a copy of the GNU Affero General Public
|
|
11
11
|
License along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
12
12
|
*/
|
|
13
|
-
import type { ModuleSetting, ProjectSettings } from './interfaces/project-interfaces.js';
|
|
13
|
+
import type { HubSetting, ModuleSetting, ProjectSettings } from './interfaces/project-interfaces.js';
|
|
14
14
|
/**
|
|
15
15
|
* Represents Project's cardsConfig.json file.
|
|
16
16
|
*/
|
|
@@ -19,16 +19,29 @@ export declare class ProjectConfiguration implements ProjectSettings {
|
|
|
19
19
|
name: string;
|
|
20
20
|
cardKeyPrefix: string;
|
|
21
21
|
modules: ModuleSetting[];
|
|
22
|
+
hubs: HubSetting[];
|
|
22
23
|
private settingPath;
|
|
23
24
|
constructor(path: string);
|
|
24
25
|
save(): Promise<void>;
|
|
25
26
|
private readSettings;
|
|
26
27
|
private toJSON;
|
|
28
|
+
/**
|
|
29
|
+
* Adds a new hub.
|
|
30
|
+
* @param hubName URL of the hub to add
|
|
31
|
+
* @throws if hub is already in the project or URL is invalid
|
|
32
|
+
*/
|
|
33
|
+
addHub(hubName: string): Promise<void>;
|
|
27
34
|
/**
|
|
28
35
|
* Adds new module to imported modules property.
|
|
29
36
|
* @param module Module to add as dependency
|
|
30
37
|
*/
|
|
31
38
|
addModule(module: ModuleSetting): Promise<void>;
|
|
39
|
+
/**
|
|
40
|
+
* Removes a hub.
|
|
41
|
+
* @param hubName Name of the hub to remove.
|
|
42
|
+
* @throws if hub is not part of the project
|
|
43
|
+
*/
|
|
44
|
+
removeHub(hubName: string): Promise<void>;
|
|
32
45
|
/**
|
|
33
46
|
* Removes module from imported modules property.
|
|
34
47
|
* @param moduleName Name of the module to remove.
|
package/dist/project-settings.js
CHANGED
|
@@ -11,7 +11,8 @@
|
|
|
11
11
|
License along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
12
12
|
*/
|
|
13
13
|
import { writeJsonFile as atomicWrite } from 'write-json-file';
|
|
14
|
-
import { resolve } from 'path';
|
|
14
|
+
import { resolve } from 'node:path';
|
|
15
|
+
import { URL } from 'node:url';
|
|
15
16
|
import { readJsonFileSync } from './utils/json.js';
|
|
16
17
|
import { Validate } from './commands/index.js';
|
|
17
18
|
/**
|
|
@@ -22,12 +23,14 @@ export class ProjectConfiguration {
|
|
|
22
23
|
name;
|
|
23
24
|
cardKeyPrefix;
|
|
24
25
|
modules;
|
|
26
|
+
hubs;
|
|
25
27
|
settingPath;
|
|
26
28
|
constructor(path) {
|
|
27
29
|
this.name = '';
|
|
28
30
|
this.settingPath = path;
|
|
29
31
|
this.cardKeyPrefix = '';
|
|
30
32
|
this.modules = [];
|
|
33
|
+
this.hubs = [];
|
|
31
34
|
this.readSettings();
|
|
32
35
|
}
|
|
33
36
|
// Persists configuration file to disk.
|
|
@@ -56,6 +59,7 @@ export class ProjectConfiguration {
|
|
|
56
59
|
this.cardKeyPrefix = settings.cardKeyPrefix;
|
|
57
60
|
this.name = settings.name;
|
|
58
61
|
this.modules = settings.modules || [];
|
|
62
|
+
this.hubs = settings.hubs || [];
|
|
59
63
|
}
|
|
60
64
|
else {
|
|
61
65
|
throw new Error(`Invalid configuration file '${this.settingPath}'`);
|
|
@@ -67,8 +71,41 @@ export class ProjectConfiguration {
|
|
|
67
71
|
cardKeyPrefix: this.cardKeyPrefix,
|
|
68
72
|
name: this.name,
|
|
69
73
|
modules: this.modules,
|
|
74
|
+
hubs: this.hubs,
|
|
70
75
|
};
|
|
71
76
|
}
|
|
77
|
+
/**
|
|
78
|
+
* Adds a new hub.
|
|
79
|
+
* @param hubName URL of the hub to add
|
|
80
|
+
* @throws if hub is already in the project or URL is invalid
|
|
81
|
+
*/
|
|
82
|
+
async addHub(hubName) {
|
|
83
|
+
const trimmedHub = hubName?.trim();
|
|
84
|
+
if (!trimmedHub) {
|
|
85
|
+
throw new Error(`Cannot add empty hub to the project`);
|
|
86
|
+
}
|
|
87
|
+
const exists = this.hubs.find((item) => item.location === trimmedHub);
|
|
88
|
+
if (exists) {
|
|
89
|
+
throw new Error(`Hub '${trimmedHub}' already exists as a hub for the project`);
|
|
90
|
+
}
|
|
91
|
+
try {
|
|
92
|
+
const hubUrl = new URL(trimmedHub);
|
|
93
|
+
if (!['http:', 'https:'].includes(hubUrl.protocol)) {
|
|
94
|
+
throw new Error(`Invalid URL protocol '${hubUrl.protocol}'. Only HTTP and HTTPS protocols are supported for hubs.`);
|
|
95
|
+
}
|
|
96
|
+
if (!hubUrl.hostname) {
|
|
97
|
+
throw new Error('Hub URL must have a valid hostname.');
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
catch (error) {
|
|
101
|
+
if (error instanceof TypeError) {
|
|
102
|
+
throw new Error(`Invalid hub URL '${trimmedHub}'. Please provide a valid HTTP or HTTPS URL.`);
|
|
103
|
+
}
|
|
104
|
+
throw error;
|
|
105
|
+
}
|
|
106
|
+
this.hubs.push({ location: trimmedHub });
|
|
107
|
+
return this.save();
|
|
108
|
+
}
|
|
72
109
|
/**
|
|
73
110
|
* Adds new module to imported modules property.
|
|
74
111
|
* @param module Module to add as dependency
|
|
@@ -89,6 +126,19 @@ export class ProjectConfiguration {
|
|
|
89
126
|
this.modules.push(module);
|
|
90
127
|
return this.save();
|
|
91
128
|
}
|
|
129
|
+
/**
|
|
130
|
+
* Removes a hub.
|
|
131
|
+
* @param hubName Name of the hub to remove.
|
|
132
|
+
* @throws if hub is not part of the project
|
|
133
|
+
*/
|
|
134
|
+
async removeHub(hubName) {
|
|
135
|
+
const exists = this.hubs.find((item) => item.location === hubName);
|
|
136
|
+
if (!exists) {
|
|
137
|
+
throw new Error(`Hub '${hubName}' not part of the project`);
|
|
138
|
+
}
|
|
139
|
+
this.hubs = this.hubs.filter((item) => item.location !== hubName);
|
|
140
|
+
return this.save();
|
|
141
|
+
}
|
|
92
142
|
/**
|
|
93
143
|
* Removes module from imported modules property.
|
|
94
144
|
* @param moduleName Name of the module to remove.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-settings.js","sourceRoot":"","sources":["../src/project-settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;EAWE;AAEF,OAAO,EAAE,aAAa,IAAI,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"project-settings.js","sourceRoot":"","sources":["../src/project-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -165,7 +165,7 @@ export class CardTypeResource extends FileResource {
|
|
|
165
165
|
return linkTypeNames.filter((name) => name !== null);
|
|
166
166
|
}
|
|
167
167
|
// If value from 'customFields' is removed, remove it also from 'optionallyVisible' and 'alwaysVisible' arrays.
|
|
168
|
-
removeValueFromOtherArrays(op) {
|
|
168
|
+
removeValueFromOtherArrays(op, content) {
|
|
169
169
|
// Update target can be a string, or an object. Of object, fetch only 'name'
|
|
170
170
|
// todo: fetching 'name' or using string as name could be function in resource base class.
|
|
171
171
|
const target = op.target;
|
|
@@ -174,8 +174,8 @@ export class CardTypeResource extends FileResource {
|
|
|
174
174
|
field = { name: target['name'] };
|
|
175
175
|
}
|
|
176
176
|
const fieldName = (field ? field.name : target);
|
|
177
|
-
this.removeValue(
|
|
178
|
-
this.removeValue(
|
|
177
|
+
this.removeValue(content.alwaysVisibleFields, fieldName);
|
|
178
|
+
this.removeValue(content.optionallyVisibleFields, fieldName);
|
|
179
179
|
}
|
|
180
180
|
// Sets content container values to be either '[]' or with proper values.
|
|
181
181
|
setContainerValues() {
|
|
@@ -347,7 +347,7 @@ export class CardTypeResource extends FileResource {
|
|
|
347
347
|
const customFieldsChange = key === 'customFields';
|
|
348
348
|
const existingName = this.content.name;
|
|
349
349
|
await super.update(key, op);
|
|
350
|
-
const content = this.content;
|
|
350
|
+
const content = structuredClone(this.content);
|
|
351
351
|
if (key === 'name') {
|
|
352
352
|
content.name = super.handleScalar(op);
|
|
353
353
|
}
|
|
@@ -371,9 +371,15 @@ export class CardTypeResource extends FileResource {
|
|
|
371
371
|
await this.validateFieldType(key, op);
|
|
372
372
|
content.customFields = super.handleArray(op, key, content.customFields);
|
|
373
373
|
if (op.name === 'remove') {
|
|
374
|
-
this.removeValueFromOtherArrays(op);
|
|
374
|
+
this.removeValueFromOtherArrays(op, content);
|
|
375
375
|
}
|
|
376
376
|
}
|
|
377
|
+
else if (key === 'description') {
|
|
378
|
+
content.description = super.handleScalar(op);
|
|
379
|
+
}
|
|
380
|
+
else if (key === 'displayName') {
|
|
381
|
+
content.displayName = super.handleScalar(op);
|
|
382
|
+
}
|
|
377
383
|
else {
|
|
378
384
|
throw new Error(`Unknown property '${key}' for CardType`);
|
|
379
385
|
}
|