@cyberismo/data-handler 0.0.8 → 0.0.10

package/dist/macros/common.js

@@ -1,23 +1,36 @@
 /**
-    Cyberismo
-    Copyright © Cyberismo Ltd and contributors 2024
-
-    This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License version 3 as published by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public
-    License along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  Cyberismo
+  Copyright © Cyberismo Ltd and contributors 2024
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU Affero General Public License version 3 as published by
+  the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+  details. You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <https://www.gnu.org/licenses/>.
 */
 // important that this file imports only the metadata
 import createCards from './createCards/metadata.js';
 import graph from './graph/metadata.js';
+import image from './image/metadata.js';
+import include from './include/metadata.js';
 import report from './report/metadata.js';
 import scoreCard from './scoreCard/metadata.js';
+import xref from './xref/metadata.js';
+import percentage from './percentage/metadata.js';
+import vega from './vega/metadata.js';
+import vegaLite from './vegalite/metadata.js';
 export const macroMetadata = {
     createCards,
     graph,
+    image,
+    include,
     report,
     scoreCard,
+    xref,
+    percentage,
+    vega,
+    vegaLite,
 };
 //# sourceMappingURL=common.js.map

package/dist/macros/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/macros/common.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;EAUE;AAEF,qDAAqD;AACrD,OAAO,WAAW,MAAM,2BAA2B,CAAC;AACpD,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAEhD,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,WAAW;IACX,KAAK;IACL,MAAM;IACN,SAAS;CACV,CAAC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/macros/common.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;EAWE;AAEF,qDAAqD;AACrD,OAAO,WAAW,MAAM,2BAA2B,CAAC;AACpD,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAE9C,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,WAAW;IACX,KAAK;IACL,KAAK;IACL,OAAO;IACP,MAAM;IACN,SAAS;IACT,IAAI;IACJ,UAAU;IACV,IAAI;IACJ,QAAQ;CACT,CAAC"}

package/dist/macros/createCards/index.d.ts

@@ -9,11 +9,10 @@
     You should have received a copy of the GNU Affero General Public
     License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-import type { MacroOptions } from '../index.js';
 import type { MacroGenerationContext } from '../../interfaces/macros.js';
 import BaseMacro from '../base-macro.js';
 import type TaskQueue from '../task-queue.js';
-export interface CreateCardsOptions extends MacroOptions {
+export interface CreateCardsOptions {
     buttonLabel: string;
     template: string;
     cardKey?: string;
@@ -31,6 +30,7 @@ declare class CreateCardsMacro extends BaseMacro {
     handleValidate: (input: unknown) => void;
     handleStatic(): Promise<string>;
     handleInject: (_: MacroGenerationContext, input: unknown) => Promise<string>;
+    handleStaticSite: () => Promise<string>;
     private validate;
 }
 export default CreateCardsMacro;

package/dist/macros/createCards/index.js

@@ -27,6 +27,10 @@ class CreateCardsMacro extends BaseMacro {
         const options = this.validate(input);
         return createHtmlPlaceholder(this.metadata, options);
     };
+    handleStaticSite = async () => {
+        // export site does not support createCards
+        return '';
+    };
     validate(input) {
         return validateMacroContent(this.metadata, input);
     }

package/dist/macros/createCards/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/createCards/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;EAUE;AAGF,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAG1E,OAAO,aAAa,MAAM,eAAe,CAAC;AAC1C,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAezC,MAAM,gBAAiB,SAAQ,SAAS;IACtC,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,KAAK,CAAC,YAAY;QAChB,0CAA0C;QAC1C,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,YAAY,GAAG,KAAK,EAAE,CAAyB,EAAE,KAAc,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrC,OAAO,qBAAqB,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC,CAAC;IAEM,QAAQ,CAAC,KAAc;QAC7B,OAAO,oBAAoB,CAAqB,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACxE,CAAC;CACF;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/createCards/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;EAUE;AAEF,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAG1E,OAAO,aAAa,MAAM,eAAe,CAAC;AAC1C,OAAO,SAAS,MAAM,kBAAkB,CAAC;AAezC,MAAM,gBAAiB,SAAQ,SAAS;IACtC,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,KAAK,CAAC,YAAY;QAChB,0CAA0C;QAC1C,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,YAAY,GAAG,KAAK,EAAE,CAAyB,EAAE,KAAc,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACrC,OAAO,qBAAqB,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC,CAAC;IAEF,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAC5B,2CAA2C;QAC3C,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEM,QAAQ,CAAC,KAAc;QAC7B,OAAO,oBAAoB,CAAqB,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACxE,CAAC;CACF;AAED,eAAe,gBAAgB,CAAC"}

package/dist/macros/graph/index.d.ts

@@ -11,10 +11,9 @@
   License along with this program. If not, see <https://www.gnu.org/licenses/>.
 */
 import BaseMacro from '../base-macro.js';
-import type { MacroOptions } from '../index.js';
 import type { MacroGenerationContext } from '../../interfaces/macros.js';
 import type TaskQueue from '../task-queue.js';
-export interface GraphOptions extends MacroOptions {
+export interface GraphOptions {
     model: string;
     view: string;
 }
@@ -22,7 +21,6 @@ declare class ReportMacro extends BaseMacro {
     constructor(tasksQueue: TaskQueue);
     handleValidate: (input: unknown) => void;
     handleStatic: (context: MacroGenerationContext, input: unknown) => Promise<string>;
-    handleInject: (context: MacroGenerationContext, input: unknown) => Promise<string>;
     private parseOptions;
 }
 export default ReportMacro;

package/dist/macros/graph/index.js

@@ -11,7 +11,6 @@
   License along with this program. If not, see <https://www.gnu.org/licenses/>.
 */
 import BaseMacro from '../base-macro.js';
-import { Calculate } from '../../commands/index.js';
 import { createImage, validateMacroContent } from '../index.js';
 import Handlebars from 'handlebars';
 import { join } from 'node:path';
@@ -29,10 +28,6 @@ class ReportMacro extends BaseMacro {
         this.parseOptions(input);
     };
     handleStatic = async (context, input) => {
-        return this.handleInject(context, input);
-    };
-    handleInject = async (context, input) => {
-        const calculate = new Calculate(context.project);
         const resourceNameToPath = (name, fileName) => {
             const { identifier, prefix, type } = resourceName(name);
             if (prefix === context.project.projectPrefix) {
@@ -74,7 +69,7 @@ class ReportMacro extends BaseMacro {
         const modelContent = await readFile(modelLocation, { encoding: 'utf-8' });
         let result;
         try {
-            result = await calculate.runGraph(modelContent, view);
+            result = await context.project.calculationEngine.runGraph(modelContent, view, context.context);
         }
         catch (error) {
             if (error instanceof ClingoError) {

package/dist/macros/graph/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/graph/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/graph/index.ts"],"names":[],"mappings":"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"}

package/dist/macros/image/index.d.ts

@@ -0,0 +1,39 @@
+/**
+  Cyberismo
+  Copyright © Cyberismo Ltd and contributors 2025
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU Affero General Public License version 3 as published by
+  the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+  details. You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+import type { MacroGenerationContext } from '../../interfaces/macros.js';
+import BaseMacro from '../base-macro.js';
+import type TaskQueue from '../task-queue.js';
+/**
+ * Options for the image macro.
+ * @param fileName - Name of the file to include.
+ * @param cardKey - Key of the card to include the file from.
+ * @param alt - Alternative text for the image.
+ * @param title - Title of the image.
+ */
+export interface ImageMacroOptions {
+    fileName: string;
+    cardKey?: string;
+    alt?: string;
+    title?: string;
+}
+/**
+ * Macro for including images in the content
+ */
+export default class ImageMacro extends BaseMacro {
+    constructor(tasksQueue: TaskQueue);
+    handleValidate: (input: unknown) => void;
+    handleStatic: (context: MacroGenerationContext, input: unknown) => Promise<string>;
+    handleInject: (context: MacroGenerationContext, input: unknown) => Promise<string>;
+    private buildImageAttributes;
+    private validate;
+}

package/dist/macros/image/index.js

@@ -0,0 +1,82 @@
+/**
+  Cyberismo
+  Copyright © Cyberismo Ltd and contributors 2025
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU Affero General Public License version 3 as published by
+  the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+  details. You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import mime from 'mime-types';
+import { validateMacroContent } from '../index.js';
+import macroMetadata from './metadata.js';
+import BaseMacro from '../base-macro.js';
+/**
+ * Macro for including images in the content
+ */
+export default class ImageMacro extends BaseMacro {
+    constructor(tasksQueue) {
+        super(macroMetadata, tasksQueue);
+    }
+    handleValidate = (input) => {
+        this.validate(input);
+    };
+    handleStatic = async (context, input) => {
+        const options = this.validate(input);
+        const cardKey = options.cardKey || context.cardKey;
+        // Get the attachment folder path
+        const attachmentFolder = await context.project.cardAttachmentFolder(cardKey);
+        if (!attachmentFolder) {
+            throw new Error(`Card '${cardKey}' not found`);
+        }
+        // Read the file and convert to base64
+        const attachmentPath = join(attachmentFolder, options.fileName);
+        if (!existsSync(attachmentPath)) {
+            throw new Error(`Attachment file '${options.fileName}' not found in card '${cardKey}'`);
+        }
+        const fileBuffer = readFileSync(attachmentPath);
+        const base64Data = fileBuffer.toString('base64');
+        // Get mime type
+        const mimeType = mime.lookup(attachmentPath) || 'application/octet-stream';
+        // Build image attributes
+        const attributes = this.buildImageAttributes(options);
+        // Return as data URI for static mode (for export/PDF generation)
+        return `image::data:${mimeType};base64,${base64Data}[${attributes}]`;
+    };
+    handleInject = async (context, input) => {
+        const options = this.validate(input);
+        const cardKey = options.cardKey || context.cardKey;
+        // Verify that the card and attachment folder exist
+        const attachmentFolder = await context.project.cardAttachmentFolder(cardKey);
+        if (!attachmentFolder) {
+            throw new Error(`Card '${cardKey}' not found`);
+        }
+        const attachmentPath = join(attachmentFolder, options.fileName);
+        if (!existsSync(attachmentPath)) {
+            throw new Error(`Attachment file '${options.fileName}' not found in card '${cardKey}'`);
+        }
+        // Build image attributes
+        const attributes = this.buildImageAttributes(options);
+        // In inject mode, always use the API path for consistency
+        return `image::/api/cards/${cardKey}/a/${options.fileName}[${attributes}]`;
+    };
+    buildImageAttributes(options) {
+        const attributes = [];
+        if (options.alt !== undefined) {
+            attributes.push(`alt="${options.alt}"`);
+        }
+        if (options.title !== undefined) {
+            attributes.push(`title="${options.title}"`);
+        }
+        return attributes.join(',');
+    }
+    validate(input) {
+        return validateMacroContent(this.metadata, input);
+    }
+}
+//# sourceMappingURL=index.js.map

package/dist/macros/image/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/image/index.ts"],"names":[],"mappings":"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"}

package/dist/macros/image/metadata.d.ts

@@ -0,0 +1,18 @@
+/**
+  Cyberismo
+  Copyright © Cyberismo Ltd and contributors 2025
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU Affero General Public License version 3 as published by
+  the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+  details. You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+import type { MacroMetadata } from '../../interfaces/macros.js';
+/**
+ * Metadata for the image macro.
+ */
+declare const macroMetadata: MacroMetadata;
+export default macroMetadata;

package/dist/macros/image/metadata.js

@@ -0,0 +1,22 @@
+/**
+  Cyberismo
+  Copyright © Cyberismo Ltd and contributors 2025
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU Affero General Public License version 3 as published by
+  the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+  details. You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+/**
+ * Metadata for the image macro.
+ */
+const macroMetadata = {
+    name: 'image',
+    tagName: 'image',
+    schema: 'imageMacroSchema',
+};
+export default macroMetadata;
+//# sourceMappingURL=metadata.js.map

package/dist/macros/image/metadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/macros/image/metadata.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;EAWE;AAIF;;GAEG;AACH,MAAM,aAAa,GAAkB;IACnC,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,OAAO;IAChB,MAAM,EAAE,kBAAkB;CAC3B,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/macros/include/index.d.ts

@@ -0,0 +1,31 @@
+/**
+  Cyberismo
+  Copyright © Cyberismo Ltd and contributors 2025
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU Affero General Public License version 3 as published by
+  the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+  details. You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+import type { MacroGenerationContext } from '../../interfaces/macros.js';
+import BaseMacro from '../base-macro.js';
+import type TaskQueue from '../task-queue.js';
+export interface IncludeMacroOptions {
+    cardKey: string;
+    levelOffset?: string;
+    title?: 'include' | 'exclude' | 'only';
+    pageTitles?: 'normal' | 'discrete';
+}
+export default class IncludeMacro extends BaseMacro {
+    constructor(tasksQueue: TaskQueue);
+    handleValidate: (input: unknown) => void;
+    handleStatic: (context: MacroGenerationContext, input: unknown) => Promise<string>;
+    private validate;
+    private generateAnchor;
+    private generateTitle;
+    private generateCardContent;
+    private adjustTitles;
+}

package/dist/macros/include/index.js

@@ -0,0 +1,94 @@
+/**
+  Cyberismo
+  Copyright © Cyberismo Ltd and contributors 2025
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU Affero General Public License version 3 as published by
+  the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+  details. You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+import { evaluateMacros, validateMacroContent } from '../index.js';
+import macroMetadata from './metadata.js';
+import BaseMacro from '../base-macro.js';
+import { MAX_LEVEL_OFFSET } from '../../utils/constants.js';
+export default class IncludeMacro extends BaseMacro {
+    constructor(tasksQueue) {
+        super(macroMetadata, tasksQueue);
+    }
+    handleValidate = (input) => {
+        this.validate(input);
+    };
+    handleStatic = async (context, input) => {
+        const options = this.validate(input);
+        if (!options.title) {
+            options.title = 'include';
+        }
+        if (!options.pageTitles) {
+            options.pageTitles = 'normal';
+        }
+        const card = await context.project.cardDetailsById(options.cardKey, {
+            content: true,
+            metadata: true,
+        });
+        if (!card) {
+            throw new Error(`Card key ${options.cardKey} not found`);
+        }
+        const newContext = {
+            ...context,
+            cardKey: options.cardKey,
+        };
+        const anchor = this.generateAnchor(options);
+        const title = this.generateTitle(options, card.metadata?.title);
+        const cardContent = await this.generateCardContent(options, card.content, newContext);
+        const content = `\n\n${anchor}${title}${cardContent}`;
+        let levelOffset = 0;
+        if (options.levelOffset) {
+            levelOffset = parseInt(options.levelOffset, 10);
+            if (isNaN(levelOffset)) {
+                throw new Error(`Invalid level offset: ${options.levelOffset}`);
+            }
+            levelOffset = Math.min(Math.max(levelOffset, -MAX_LEVEL_OFFSET), MAX_LEVEL_OFFSET);
+        }
+        const adjustedContent = this.adjustTitles(content, levelOffset, options.pageTitles === 'discrete');
+        return adjustedContent;
+    };
+    validate(input) {
+        return validateMacroContent(this.metadata, input);
+    }
+    generateAnchor(options) {
+        return options.title !== 'exclude' && options.pageTitles === 'normal'
+            ? `[[${options.cardKey}]]\n`
+            : '';
+    }
+    generateTitle(options, cardTitle) {
+        if (options.title === 'only' || options.title === 'include') {
+            return `= ${cardTitle}\n\n`;
+        }
+        return '';
+    }
+    async generateCardContent(options, cardContent, context) {
+        if (options.title !== 'only') {
+            return await evaluateMacros(cardContent ?? '', context, true);
+        }
+        return '';
+    }
+    // Adjust asciidoc titles to match the level offset
+    adjustTitles(content, levelOffset, discrete) {
+        const lines = content.split('\n');
+        const adjustedLines = lines.map((line) => {
+            const match = line.match(/^(\s*)([=#]+)(.*?)\s*$/);
+            if (match) {
+                const currentLevel = match[2].length;
+                const newLevel = Math.min(Math.max(1, currentLevel + levelOffset), MAX_LEVEL_OFFSET + 1);
+                const equals = '='.repeat(newLevel);
+                return `${discrete ? '[discrete]\n' : ''}${match[1]}${equals} ${match[3].trim()}`;
+            }
+            return line;
+        });
+        return adjustedLines.join('\n');
+    }
+}
+//# sourceMappingURL=index.js.map

package/dist/macros/include/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/macros/include/index.ts"],"names":[],"mappings":"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"}

package/dist/macros/include/metadata.d.ts

@@ -0,0 +1,15 @@
+/**
+  Cyberismo
+  Copyright © Cyberismo Ltd and contributors 2025
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU Affero General Public License version 3 as published by
+  the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+  details. You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+import type { MacroMetadata } from '../../interfaces/macros.js';
+declare const macroMetadata: MacroMetadata;
+export default macroMetadata;

package/dist/macros/include/metadata.js

@@ -0,0 +1,19 @@
+/**
+  Cyberismo
+  Copyright © Cyberismo Ltd and contributors 2025
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU Affero General Public License version 3 as published by
+  the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+  details. You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <https://www.gnu.org/licenses/>.
+*/
+const macroMetadata = {
+    name: 'include',
+    tagName: 'include',
+    schema: 'includeMacroSchema',
+};
+export default macroMetadata;
+//# sourceMappingURL=metadata.js.map

package/dist/macros/include/metadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/macros/include/metadata.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;EAWE;AAIF,MAAM,aAAa,GAAkB;IACnC,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,oBAAoB;CAC7B,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/dist/macros/index.d.ts

@@ -1,21 +1,21 @@
 /**
-    Cyberismo
-    Copyright © Cyberismo Ltd and contributors 2024
-
-    This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License version 3 as published by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public
-    License along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  Cyberismo
+  Copyright © Cyberismo Ltd and contributors 2024
+  This program is free software: you can redistribute it and/or modify it under
+  the terms of the GNU Affero General Public License version 3 as published by
+  the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+  details. You should have received a copy of the GNU Affero General Public
+  License along with this program. If not, see <https://www.gnu.org/licenses/>.
 */
 import Handlebars from 'handlebars';
 import type { AdmonitionType } from '../interfaces/adoc.js';
-import type { Validator } from 'jsonschema';
 import type { MacroGenerationContext, MacroMetadata, MacroName } from '../interfaces/macros.js';
 import type BaseMacro from './base-macro.js';
 import TaskQueue from './task-queue.js';
-import type { Calculate } from '../commands/index.js';
+import type { Schema } from 'jsonschema';
 /**
  * Constructor for all macros except report macros
  */
@@ -26,7 +26,7 @@ export interface SimpleMacroConstructor {
  * Constructor for report macros
  */
 export interface ReportMacroConstructor {
-    new (tasks: TaskQueue, calculate: Calculate): BaseMacro;
+    new (tasks: TaskQueue): BaseMacro;
 }
 /**
  * Constructor for all macros
@@ -39,15 +39,14 @@ export declare const macros: {
  * Validates the content inside a macro
  * @param macro - The macro to validate the content of
  * @param data - The data to validate
- * @param validator - The validator to use
  * @returns The validated data
  */
-export declare function validateMacroContent<T>(macro: MacroMetadata, data: unknown, validator?: Validator): T;
+export declare function validateMacroContent<T>(macro: MacroMetadata, data: unknown, schema?: Schema): T;
 /**
  * Registers the macros with Handlebars
  * @param {Mode} mode - The mode to register the macros in
  */
-export declare function registerMacros(instance: typeof Handlebars, context: MacroGenerationContext, tasks: TaskQueue, calculate: Calculate): BaseMacro[];
+export declare function registerMacros(instance: typeof Handlebars, context: MacroGenerationContext, tasks: TaskQueue): BaseMacro[];
 /**
  * Calculate amount of handlebars templates inside a string
  * @param input
@@ -63,9 +62,11 @@ export declare function registerEmptyMacros(instance: typeof Handlebars): void;
 /**
  * Handle the macros in the content
  * @param content - The content to handle the macros in
- * @param mode - The mode to handle the macros in. Inject mode will generate injectable placeholders for the macros while static mode will generate valid adoc. Validate mode will only validate the macros syntax and throw errors in case of issues.
+ * @param context - The context for macro generation
+ * @param calculate - The calculate function
+ * @param preserveRawBlocks - If true, don't unescape raw blocks at the end (for nested evaluations)
  */
-export declare function evaluateMacros(content: string, context: MacroGenerationContext, calculate: Calculate, maxTries?: number): Promise<string>;
+export declare function evaluateMacros(content: string, context: MacroGenerationContext, preserveRawBlocks?: boolean): Promise<string>;
 /**
  * This function assumes that tasks, which were started by macros, are complete.
  * It replaces the placeholders of the tasks with the actual results
@@ -83,20 +84,14 @@ export declare function applyMacroResults(input: string, tasks: TaskQueue, conte
  * @returns The error message that is valid adoc
  */
 export declare function handleMacroError(error: unknown, macro: string, context: MacroGenerationContext): string;
-type Value = string | number | boolean | undefined;
-/**
- * Macro options can be a flat object or a nested object
- * The nested object will be flattened into dot notation attributes
- */
-export type MacroOptions = {
-    [key: string]: Value | MacroOptions;
-};
 /**
- * Creates an injectable placeholder for a macro
- * @param macro - The macro to create the placeholder for
- * @param options - Options will be passed to the html element as attributes
+ * Creates a placeholder for a macro
+ * Options are encoded as base64
+ * @param macro - The macro to create a placeholder for
+ * @param options - The options for the macro
+ * @returns The placeholder for the macro
  */
-export declare function createHtmlPlaceholder(macro: MacroMetadata, options: MacroOptions): string;
+export declare function createHtmlPlaceholder(macro: MacroMetadata, options: unknown): string;
 /**
  * Creates an adoc admonition
  * @param type - The type of admonition
@@ -116,5 +111,12 @@ export declare function createCodeBlock(content: string): string;
  * @param image base64 encoded image
  * @returns valid asciidoc with the image
  */
-export declare function createImage(image: string): string;
-export {};
+export declare function createImage(image: string, controls?: boolean): string;
+/**
+ * Creates a Handlebars macro block string with the given macro name and options.
+ *
+ * @param macro - The name of the macro to create (e.g., 'scoreCard', 'include').
+ * @param options - The options object to be stringified and inserted as macro content.
+ * @returns The Handlebars macro block as a string, e.g. {{#macro}}...{{/macro}}
+ */
+export declare function createMacro(macro: MacroName, options: unknown): string;