cdk-common 2.0.28 → 2.0.32

package/node_modules/table/dist/src/drawBorder.js

@@ -1,34 +1,150 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.drawBorderTop = exports.drawBorderJoin = exports.drawBorderBottom = exports.drawBorder = exports.createTableBorderGetter = void 0;
+exports.createTableBorderGetter = exports.drawBorderBottom = exports.drawBorderJoin = exports.drawBorderTop = exports.drawBorder = exports.createSeparatorGetter = exports.drawBorderSegments = void 0;
 const drawContent_1 = require("./drawContent");
-const drawBorder = (columnWidths, config) => {
-    const { separator, drawVerticalLine } = config;
-    const columns = columnWidths.map((size) => {
-        return config.separator.body.repeat(size);
+const drawBorderSegments = (columnWidths, parameters) => {
+    const { separator, horizontalBorderIndex, spanningCellManager } = parameters;
+    return columnWidths.map((columnWidth, columnIndex) => {
+        const normalSegment = separator.body.repeat(columnWidth);
+        if (horizontalBorderIndex === undefined) {
+            return normalSegment;
+        }
+        /* istanbul ignore next */
+        const range = spanningCellManager === null || spanningCellManager === void 0 ? void 0 : spanningCellManager.getContainingRange({ col: columnIndex,
+            row: horizontalBorderIndex });
+        if (!range) {
+            return normalSegment;
+        }
+        const { topLeft } = range;
+        // draw border segments as usual for top border of spanning cell
+        if (horizontalBorderIndex === topLeft.row) {
+            return normalSegment;
+        }
+        // if for first column/row of spanning cell, just skip
+        if (columnIndex !== topLeft.col) {
+            return '';
+        }
+        return range.extractBorderContent(horizontalBorderIndex);
     });
-    return (0, drawContent_1.drawContent)(columns, {
-        drawSeparator: drawVerticalLine,
-        separatorGetter: (index, columnCount) => {
-            if (index === 0) {
+};
+exports.drawBorderSegments = drawBorderSegments;
+const createSeparatorGetter = (dependencies) => {
+    const { separator, spanningCellManager, horizontalBorderIndex, rowCount } = dependencies;
+    // eslint-disable-next-line complexity
+    return (verticalBorderIndex, columnCount) => {
+        const inSameRange = spanningCellManager === null || spanningCellManager === void 0 ? void 0 : spanningCellManager.inSameRange;
+        if (horizontalBorderIndex !== undefined && inSameRange) {
+            const topCell = { col: verticalBorderIndex,
+                row: horizontalBorderIndex - 1 };
+            const leftCell = { col: verticalBorderIndex - 1,
+                row: horizontalBorderIndex };
+            const oppositeCell = { col: verticalBorderIndex - 1,
+                row: horizontalBorderIndex - 1 };
+            const currentCell = { col: verticalBorderIndex,
+                row: horizontalBorderIndex };
+            const pairs = [
+                [oppositeCell, topCell],
+                [topCell, currentCell],
+                [currentCell, leftCell],
+                [leftCell, oppositeCell],
+            ];
+            // left side of horizontal border
+            if (verticalBorderIndex === 0) {
+                if (inSameRange(currentCell, topCell) && separator.bodyJoinOuter) {
+                    return separator.bodyJoinOuter;
+                }
                 return separator.left;
             }
-            if (index === columnCount) {
+            // right side of horizontal border
+            if (verticalBorderIndex === columnCount) {
+                if (inSameRange(oppositeCell, leftCell) && separator.bodyJoinOuter) {
+                    return separator.bodyJoinOuter;
+                }
                 return separator.right;
             }
-            return separator.join;
-        },
+            // top horizontal border
+            if (horizontalBorderIndex === 0) {
+                if (inSameRange(currentCell, leftCell)) {
+                    return separator.body;
+                }
+                return separator.join;
+            }
+            // bottom horizontal border
+            if (horizontalBorderIndex === rowCount) {
+                if (inSameRange(topCell, oppositeCell)) {
+                    return separator.body;
+                }
+                return separator.join;
+            }
+            const sameRangeCount = pairs.map((pair) => {
+                return inSameRange(...pair);
+            }).filter(Boolean).length;
+            // four cells are belongs to different spanning cells
+            if (sameRangeCount === 0) {
+                return separator.join;
+            }
+            // belong to one spanning cell
+            if (sameRangeCount === 4) {
+                return '';
+            }
+            // belongs to two spanning cell
+            if (sameRangeCount === 2) {
+                if (inSameRange(...pairs[1]) && inSameRange(...pairs[3]) && separator.bodyJoinInner) {
+                    return separator.bodyJoinInner;
+                }
+                return separator.body;
+            }
+            /* istanbul ignore next */
+            if (sameRangeCount === 1) {
+                if (!separator.joinRight || !separator.joinLeft || !separator.joinUp || !separator.joinDown) {
+                    throw new Error(`Can not get border separator for position [${horizontalBorderIndex}, ${verticalBorderIndex}]`);
+                }
+                if (inSameRange(...pairs[0])) {
+                    return separator.joinDown;
+                }
+                if (inSameRange(...pairs[1])) {
+                    return separator.joinLeft;
+                }
+                if (inSameRange(...pairs[2])) {
+                    return separator.joinUp;
+                }
+                return separator.joinRight;
+            }
+            /* istanbul ignore next */
+            throw new Error('Invalid case');
+        }
+        if (verticalBorderIndex === 0) {
+            return separator.left;
+        }
+        if (verticalBorderIndex === columnCount) {
+            return separator.right;
+        }
+        return separator.join;
+    };
+};
+exports.createSeparatorGetter = createSeparatorGetter;
+const drawBorder = (columnWidths, parameters) => {
+    const borderSegments = (0, exports.drawBorderSegments)(columnWidths, parameters);
+    const { drawVerticalLine, horizontalBorderIndex, spanningCellManager } = parameters;
+    return (0, drawContent_1.drawContent)({
+        contents: borderSegments,
+        drawSeparator: drawVerticalLine,
+        elementType: 'border',
+        rowIndex: horizontalBorderIndex,
+        separatorGetter: (0, exports.createSeparatorGetter)(parameters),
+        spanningCellManager,
     }) + '\n';
 };
 exports.drawBorder = drawBorder;
-const drawBorderTop = (columnWidths, config) => {
-    const result = drawBorder(columnWidths, {
-        ...config,
+const drawBorderTop = (columnWidths, parameters) => {
+    const { border } = parameters;
+    const result = (0, exports.drawBorder)(columnWidths, {
+        ...parameters,
         separator: {
-            body: config.border.topBody,
-            join: config.border.topJoin,
-            left: config.border.topLeft,
-            right: config.border.topRight,
+            body: border.topBody,
+            join: border.topJoin,
+            left: border.topLeft,
+            right: border.topRight,
         },
     });
     if (result === '\n') {
@@ -37,64 +153,49 @@ const drawBorderTop = (columnWidths, config) => {
     return result;
 };
 exports.drawBorderTop = drawBorderTop;
-const drawBorderJoin = (columnWidths, config) => {
-    return drawBorder(columnWidths, {
-        ...config,
+const drawBorderJoin = (columnWidths, parameters) => {
+    const { border } = parameters;
+    return (0, exports.drawBorder)(columnWidths, {
+        ...parameters,
         separator: {
-            body: config.border.joinBody,
-            join: config.border.joinJoin,
-            left: config.border.joinLeft,
-            right: config.border.joinRight,
+            body: border.joinBody,
+            bodyJoinInner: border.bodyJoin,
+            bodyJoinOuter: border.bodyLeft,
+            join: border.joinJoin,
+            joinDown: border.joinMiddleDown,
+            joinLeft: border.joinMiddleLeft,
+            joinRight: border.joinMiddleRight,
+            joinUp: border.joinMiddleUp,
+            left: border.joinLeft,
+            right: border.joinRight,
         },
     });
 };
 exports.drawBorderJoin = drawBorderJoin;
-const drawBorderBottom = (columnWidths, config) => {
-    return drawBorder(columnWidths, {
-        ...config,
+const drawBorderBottom = (columnWidths, parameters) => {
+    const { border } = parameters;
+    return (0, exports.drawBorder)(columnWidths, {
+        ...parameters,
         separator: {
-            body: config.border.bottomBody,
-            join: config.border.bottomJoin,
-            left: config.border.bottomLeft,
-            right: config.border.bottomRight,
+            body: border.bottomBody,
+            join: border.bottomJoin,
+            left: border.bottomLeft,
+            right: border.bottomRight,
         },
     });
 };
 exports.drawBorderBottom = drawBorderBottom;
-const createTableBorderGetter = (columnWidths, config) => {
+const createTableBorderGetter = (columnWidths, parameters) => {
     return (index, size) => {
-        if (!config.header) {
-            if (index === 0) {
-                return drawBorderTop(columnWidths, config);
-            }
-            if (index === size) {
-                return drawBorderBottom(columnWidths, config);
-            }
-            return drawBorderJoin(columnWidths, config);
-        }
-        // Deal with the header
+        const drawBorderParameters = { ...parameters,
+            horizontalBorderIndex: index };
         if (index === 0) {
-            return drawBorderTop(columnWidths, {
-                ...config,
-                border: {
-                    ...config.border,
-                    topJoin: config.border.topBody,
-                },
-            });
-        }
-        if (index === 1) {
-            return drawBorderJoin(columnWidths, {
-                ...config,
-                border: {
-                    ...config.border,
-                    joinJoin: config.border.headerJoin,
-                },
-            });
+            return (0, exports.drawBorderTop)(columnWidths, drawBorderParameters);
         }
-        if (index === size) {
-            return drawBorderBottom(columnWidths, config);
+        else if (index === size) {
+            return (0, exports.drawBorderBottom)(columnWidths, drawBorderParameters);
         }
-        return drawBorderJoin(columnWidths, config);
+        return (0, exports.drawBorderJoin)(columnWidths, drawBorderParameters);
     };
 };
 exports.createTableBorderGetter = createTableBorderGetter;

package/node_modules/table/dist/src/drawBorder.js.map

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

package/node_modules/table/dist/src/drawContent.d.ts

@@ -1,9 +1,14 @@
-declare type SeparatorConfig = {
-    drawSeparator: (index: number, size: number) => boolean;
-    separatorGetter: (index: number, size: number) => string;
-};
+import type { SpanningCellManager } from './spanningCellManager';
 /**
  * Shared function to draw horizontal borders, rows or the entire table
  */
-export declare const drawContent: (contents: string[], separatorConfig: SeparatorConfig) => string;
+declare type DrawContentParameters = {
+    contents: string[];
+    drawSeparator: (index: number, size: number) => boolean;
+    separatorGetter: (index: number, size: number) => string;
+    spanningCellManager?: SpanningCellManager;
+    rowIndex?: number;
+    elementType?: 'border' | 'cell' | 'row';
+};
+export declare const drawContent: (parameters: DrawContentParameters) => string;
 export {};

package/node_modules/table/dist/src/drawContent.js

@@ -1,21 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.drawContent = void 0;
-/**
- * Shared function to draw horizontal borders, rows or the entire table
- */
-const drawContent = (contents, separatorConfig) => {
-    const { separatorGetter, drawSeparator } = separatorConfig;
+const drawContent = (parameters) => {
+    const { contents, separatorGetter, drawSeparator, spanningCellManager, rowIndex, elementType } = parameters;
     const contentSize = contents.length;
     const result = [];
     if (drawSeparator(0, contentSize)) {
         result.push(separatorGetter(0, contentSize));
     }
     contents.forEach((content, contentIndex) => {
-        result.push(content);
+        if (!elementType || elementType === 'border' || elementType === 'row') {
+            result.push(content);
+        }
+        if (elementType === 'cell' && rowIndex === undefined) {
+            result.push(content);
+        }
+        if (elementType === 'cell' && rowIndex !== undefined) {
+            /* istanbul ignore next */
+            const containingRange = spanningCellManager === null || spanningCellManager === void 0 ? void 0 : spanningCellManager.getContainingRange({ col: contentIndex,
+                row: rowIndex });
+            // when drawing content row, just add a cell when it is a normal cell
+            // or belongs to first column of spanning cell
+            if (!containingRange || contentIndex === containingRange.topLeft.col) {
+                result.push(content);
+            }
+        }
         // Only append the middle separator if the content is not the last
         if (contentIndex + 1 < contentSize && drawSeparator(contentIndex + 1, contentSize)) {
-            result.push(separatorGetter(contentIndex + 1, contentSize));
+            const separator = separatorGetter(contentIndex + 1, contentSize);
+            if (elementType === 'cell' && rowIndex !== undefined) {
+                const currentCell = { col: contentIndex + 1,
+                    row: rowIndex };
+                /* istanbul ignore next */
+                const containingRange = spanningCellManager === null || spanningCellManager === void 0 ? void 0 : spanningCellManager.getContainingRange(currentCell);
+                if (!containingRange || containingRange.topLeft.col === currentCell.col) {
+                    result.push(separator);
+                }
+            }
+            else {
+                result.push(separator);
+            }
         }
     });
     if (drawSeparator(contentSize, contentSize)) {

package/node_modules/table/dist/src/drawContent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"drawContent.js","sourceRoot":"","sources":["../../src/drawContent.ts"],"names":[],"mappings":";;;AAmBO,MAAM,WAAW,GAAG,CAAC,UAAiC,EAAU,EAAE;IACvE,MAAM,EAAC,QAAQ,EAAE,eAAe,EAAE,aAAa,EAAE,mBAAmB,EAAE,QAAQ,EAAE,WAAW,EAAC,GAAG,UAAU,CAAC;IAC1G,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC;IACpC,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,IAAI,aAAa,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE;QACjC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC;KAC9C;IAED,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE;QACzC,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,QAAQ,IAAI,WAAW,KAAK,KAAK,EAAE;YACrE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACtB;QAED,IAAI,WAAW,KAAK,MAAM,IAAI,QAAQ,KAAK,SAAS,EAAE;YACpD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACtB;QAED,IAAI,WAAW,KAAK,MAAM,IAAI,QAAQ,KAAK,SAAS,EAAE;YACpD,0BAA0B;YAC1B,MAAM,eAAe,GAAG,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,kBAAkB,CAAC,EAAC,GAAG,EAAE,YAAY;gBAChF,GAAG,EAAE,QAAQ,EAAC,CAAC,CAAC;YAElB,qEAAqE;YACrE,8CAA8C;YAC9C,IAAI,CAAC,eAAe,IAAI,YAAY,KAAK,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE;gBACpE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACtB;SACF;QAED,kEAAkE;QAClE,IAAI,YAAY,GAAG,CAAC,GAAG,WAAW,IAAI,aAAa,CAAC,YAAY,GAAG,CAAC,EAAE,WAAW,CAAC,EAAE;YAClF,MAAM,SAAS,GAAG,eAAe,CAAC,YAAY,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC;YAEjE,IAAI,WAAW,KAAK,MAAM,IAAI,QAAQ,KAAK,SAAS,EAAE;gBACpD,MAAM,WAAW,GAAoB,EAAC,GAAG,EAAE,YAAY,GAAG,CAAC;oBACzD,GAAG,EAAE,QAAQ,EAAC,CAAC;gBACjB,0BAA0B;gBAC1B,MAAM,eAAe,GAAG,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,kBAAkB,CAAC,WAAW,CAAC,CAAC;gBAC7E,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,KAAK,WAAW,CAAC,GAAG,EAAE;oBACvE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;iBACxB;aACF;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACxB;SACF;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE;QAC3C,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;KACxD;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACzB,CAAC,CAAC;AArDW,QAAA,WAAW,eAqDtB"}

package/node_modules/table/dist/src/drawRow.d.ts

@@ -1,6 +1,10 @@
+import type { SpanningCellManager } from './spanningCellManager';
 import type { DrawVerticalLine } from './types/api';
 import type { BodyBorderConfig, Row } from './types/internal';
-export declare const drawRow: (row: Row, config: {
+export declare type DrawRowConfig = {
     border: BodyBorderConfig;
     drawVerticalLine: DrawVerticalLine;
-}) => string;
+    spanningCellManager?: SpanningCellManager;
+    rowIndex?: number;
+};
+export declare const drawRow: (row: Row, config: DrawRowConfig) => string;

package/node_modules/table/dist/src/drawRow.js

@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.drawRow = void 0;
 const drawContent_1 = require("./drawContent");
 const drawRow = (row, config) => {
-    const { border, drawVerticalLine } = config;
-    return (0, drawContent_1.drawContent)(row, {
+    const { border, drawVerticalLine, rowIndex, spanningCellManager } = config;
+    return (0, drawContent_1.drawContent)({
+        contents: row,
         drawSeparator: drawVerticalLine,
+        elementType: 'cell',
+        rowIndex,
         separatorGetter: (index, columnCount) => {
             if (index === 0) {
                 return border.bodyLeft;
@@ -15,6 +18,7 @@ const drawRow = (row, config) => {
             }
             return border.bodyJoin;
         },
+        spanningCellManager,
     }) + '\n';
 };
 exports.drawRow = drawRow;

package/node_modules/table/dist/src/drawRow.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"drawRow.js","sourceRoot":"","sources":["../../src/drawRow.ts"],"names":[],"mappings":";;;AAAA,+CAEuB;AAmBhB,MAAM,OAAO,GAAG,CAAC,GAAQ,EAAE,MAAqB,EAAU,EAAE;IACjE,MAAM,EAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,mBAAmB,EAAC,GAAG,MAAM,CAAC;IAEzE,OAAO,IAAA,yBAAW,EAAC;QACjB,QAAQ,EAAE,GAAG;QACb,aAAa,EAAE,gBAAgB;QAC/B,WAAW,EAAE,MAAM;QACnB,QAAQ;QACR,eAAe,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;YACtC,IAAI,KAAK,KAAK,CAAC,EAAE;gBACf,OAAO,MAAM,CAAC,QAAQ,CAAC;aACxB;YAED,IAAI,KAAK,KAAK,WAAW,EAAE;gBACzB,OAAO,MAAM,CAAC,SAAS,CAAC;aACzB;YAED,OAAO,MAAM,CAAC,QAAQ,CAAC;QACzB,CAAC;QACD,mBAAmB;KACpB,CAAC,GAAG,IAAI,CAAC;AACZ,CAAC,CAAC;AArBW,QAAA,OAAO,WAqBlB"}

package/node_modules/table/dist/src/drawTable.d.ts

@@ -1,2 +1,2 @@
 import type { TableConfig, Row } from './types/internal';
-export declare const drawTable: (rows: Row[], columnWidths: number[], rowHeights: number[], config: TableConfig) => string;
+export declare const drawTable: (rows: Row[], outputColumnWidths: number[], rowHeights: number[], config: TableConfig) => string;

package/node_modules/table/dist/src/drawTable.js

@@ -1,30 +1,19 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.drawTable = void 0;
-const string_width_1 = __importDefault(require("string-width"));
 const drawBorder_1 = require("./drawBorder");
 const drawContent_1 = require("./drawContent");
-const drawHeader_1 = require("./drawHeader");
 const drawRow_1 = require("./drawRow");
 const utils_1 = require("./utils");
-const drawTable = (rows, columnWidths, rowHeights, config) => {
+const drawTable = (rows, outputColumnWidths, rowHeights, config) => {
     const { drawHorizontalLine, singleLine, } = config;
-    const contents = (0, utils_1.groupBySizes)(rows, rowHeights).map((group) => {
+    const contents = (0, utils_1.groupBySizes)(rows, rowHeights).map((group, groupIndex) => {
         return group.map((row) => {
-            return (0, drawRow_1.drawRow)(row, config);
+            return (0, drawRow_1.drawRow)(row, { ...config,
+                rowIndex: groupIndex });
         }).join('');
     });
-    if (config.header) {
-        // assume that topLeft/right border have width = 1
-        const headerWidth = (0, string_width_1.default)((0, drawRow_1.drawRow)(rows[0], config)) - 2 -
-            config.header.paddingLeft - config.header.paddingRight;
-        const header = (0, drawHeader_1.drawHeader)(headerWidth, config);
-        contents.unshift(header);
-    }
-    return (0, drawContent_1.drawContent)(contents, {
+    return (0, drawContent_1.drawContent)({ contents,
         drawSeparator: (index, size) => {
             // Top/bottom border
             if (index === 0 || index === size) {
@@ -32,8 +21,11 @@ const drawTable = (rows, columnWidths, rowHeights, config) => {
             }
             return !singleLine && drawHorizontalLine(index, size);
         },
-        separatorGetter: (0, drawBorder_1.createTableBorderGetter)(columnWidths, config),
-    });
+        elementType: 'row',
+        rowIndex: -1,
+        separatorGetter: (0, drawBorder_1.createTableBorderGetter)(outputColumnWidths, { ...config,
+            rowCount: contents.length }),
+        spanningCellManager: config.spanningCellManager });
 };
 exports.drawTable = drawTable;
 //# sourceMappingURL=drawTable.js.map

package/node_modules/table/dist/src/drawTable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"drawTable.js","sourceRoot":"","sources":["../../src/drawTable.ts"],"names":[],"mappings":";;;AAAA,6CAEsB;AACtB,+CAEuB;AACvB,uCAEmB;AAInB,mCAEiB;AAEV,MAAM,SAAS,GAAG,CAAC,IAAW,EAAE,kBAA4B,EAAE,UAAoB,EAAE,MAAmB,EAAU,EAAE;IACxH,MAAM,EACJ,kBAAkB,EAClB,UAAU,GACX,GAAG,MAAM,CAAC;IAEX,MAAM,QAAQ,GAAG,IAAA,oBAAY,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QACxE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,OAAO,IAAA,iBAAO,EAAC,GAAG,EAAE,EAAC,GAAG,MAAM;gBAC5B,QAAQ,EAAE,UAAU,EAAC,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,OAAO,IAAA,yBAAW,EAAC,EAAC,QAAQ;QAC1B,aAAa,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YAC7B,oBAAoB;YACpB,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,IAAI,EAAE;gBACjC,OAAO,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;aACxC;YAED,OAAO,CAAC,UAAU,IAAI,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACxD,CAAC;QACD,WAAW,EAAE,KAAK;QAClB,QAAQ,EAAE,CAAC,CAAC;QACZ,eAAe,EAAE,IAAA,oCAAuB,EAAC,kBAAkB,EAAE,EAAC,GAAG,MAAM;YACrE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAC,CAAC;QAC7B,mBAAmB,EAAE,MAAM,CAAC,mBAAmB,EAAC,CAAC,CAAC;AACtD,CAAC,CAAC;AA3BW,QAAA,SAAS,aA2BpB"}

package/node_modules/table/dist/src/generated/validators.d.ts

@@ -4,10 +4,10 @@ declare function validate43(data: any, { instancePath, parentData, parentDataPro
     parentDataProperty: any;
     rootData?: any;
 }): boolean;
-declare function validate76(data: any, { instancePath, parentData, parentDataProperty, rootData }?: {
+declare function validate86(data: any, { instancePath, parentData, parentDataProperty, rootData }?: {
     instancePath?: string | undefined;
     parentData: any;
     parentDataProperty: any;
     rootData?: any;
 }): boolean;
-export { validate43 as _config_json, validate76 as _streamConfig_json };
+export { validate43 as _config_json, validate86 as _streamConfig_json };