cvdl-ts 1.0.14 → 1.0.16

package/dist/Elem.d.ts

@@ -1,8 +1,7 @@
 import * as Font from "./Font";
-import { Alignment, Layout, Margin, Width } from ".";
+import { Alignment, Margin, Width } from ".";
 import { Color } from "./Layout";
 import { FontDict } from "./AnyLayout";
-import * as Row from "./Row";
 import { ItemContent } from "./Resume";
 import { Field } from "./DataSchema";
 import { Optional } from "./Utils";
@@ -50,7 +49,7 @@ export declare function copy(e: Elem): {
     margin: Margin.t;
     alignment: Alignment.t;
     width: Width.t;
-    background_color: Layout.Color;
+    background_color: Color;
 };
 export declare function default_(): Elem;
 export declare function from(w: Optional<Elem>): Elem;
@@ -68,8 +67,6 @@ export declare function withBackgroundColor(e: Elem, background_color: Color): E
 export declare function scaleWidth(e: Elem, scale: number): Elem;
 export declare function parseMarkdownItem(item: string): Span[];
 export declare function fillFonts(e: Elem, fonts: FontDict): Elem;
-export declare function justifiedLines(e: Elem, lines: Elem[], font_dict: FontDict): Row.t[];
-export declare function break_lines(e: Elem, font_dict: FontDict): Layout.t[];
 export declare function boundWidth(e: Elem, width: number): Elem;
 export declare function instantiate(e: Elem, section: Map<string, ItemContent>, fields: Field.t[]): Elem;
 export {};

package/dist/Elem.js

@@ -23,10 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.instantiate = exports.boundWidth = exports.break_lines = exports.justifiedLines = exports.fillFonts = exports.parseMarkdownItem = exports.scaleWidth = exports.withBackgroundColor = exports.withWidth = exports.withAlignment = exports.withMargin = exports.withFont = exports.withTextWidth = exports.withIsFill = exports.asRef = exports.withIsRef = exports.withUrl = exports.withItem = exports.from = exports.default_ = exports.copy = exports.elem = void 0;
+exports.instantiate = exports.boundWidth = exports.fillFonts = exports.parseMarkdownItem = exports.scaleWidth = exports.withBackgroundColor = exports.withWidth = exports.withAlignment = exports.withMargin = exports.withFont = exports.withTextWidth = exports.withIsFill = exports.asRef = exports.withIsRef = exports.withUrl = exports.withItem = exports.from = exports.default_ = exports.copy = exports.elem = void 0;
 const Font = __importStar(require("./Font"));
 const _1 = require(".");
-const Row_1 = require("./Row");
 const Resume_1 = require("./Resume");
 const marked = __importStar(require("marked"));
 const ts_pattern_1 = require("ts-pattern");
@@ -220,56 +219,6 @@ function fillFonts(e, fonts) {
     }
 }
 exports.fillFonts = fillFonts;
-function justifiedLines(e, lines, font_dict) {
-    const rowLines = [];
-    for (const line of lines.slice(0, -1)) {
-        const words = line.item.split(/\s+/);
-        const r = (0, Row_1.row)([], line.margin, line.alignment, line.width, false, false);
-        words.forEach(word => {
-            const word_width = Font.get_width(e.font, word, font_dict);
-            r.elements.push(elem(word, null, false, false, false, _1.Width.absolute(word_width), this.font, _1.Margin.default_(), _1.Alignment.default_(), _1.Width.absolute(word_width), this.background_color));
-        });
-        rowLines.push(Row_1.row);
-    }
-    rowLines.push((0, Row_1.row)([withAlignment(lines[lines.length - 1], "Left")], lines[0].margin, "Left", lines[0].width, false, false));
-    return rowLines;
-}
-exports.justifiedLines = justifiedLines;
-function break_lines(e, font_dict) {
-    if (_1.Width.get_fixed_unchecked(e.text_width) <= _1.Width.get_fixed_unchecked(e.width)) {
-        return [e];
-    }
-    const lines = [];
-    // todo: I'm sure this implementation is pretty buggy. Note to future me, fix
-    // this.
-    const words = e.text.split(/\s+/);
-    const widths = words.map((word) => Font.get_width(e.font, word, font_dict));
-    const space_width = Font.get_width(e.font, " ", font_dict);
-    let start = 0;
-    let width = widths[0];
-    const max_width = _1.Width.get_fixed_unchecked(e.width);
-    for (let i = 1; i < words.length; i++) {
-        const candidate_width = width + space_width + widths[i];
-        if (candidate_width > max_width) {
-            const line = words.slice(start, i).join(" ");
-            const line_width = Font.get_width(e.font, line, font_dict);
-            lines.push(withTextWidth(withItem(e, line), _1.Width.absolute(line_width)));
-            start = i;
-            width = widths[i];
-        }
-        else {
-            width += space_width + widths[i];
-        }
-    }
-    const line = words.slice(start).join(" ");
-    const line_width = Font.get_width(e.font, line, font_dict);
-    lines.push(withTextWidth(withItem(e, line), _1.Width.absolute(line_width)));
-    if (e.alignment === "Justified") {
-        return justifiedLines(e, lines, font_dict);
-    }
-    return lines;
-}
-exports.break_lines = break_lines;
 function boundWidth(e, width) {
     if (!_1.Width.is_fill(e.width)) {
         return withIsFill(withWidth(e, _1.Width.absolute(Math.min(_1.Width.get_fixed_unchecked(e.width), width))), false);

package/dist/Layout.d.ts

@@ -1,6 +1,3 @@
-import * as Margin from "./Margin";
-import * as Alignment from "./Alignment";
-import * as Width from "./Width";
 import * as Font from "./Font";
 import { ItemContent } from "./Resume";
 import { Box } from "./Box";
@@ -37,9 +34,6 @@ export declare function isContainer(l: Layout): boolean;
 export declare function isFill(l: Layout): boolean;
 export declare function isRef(l: Layout): boolean;
 export declare function fonts(l: Layout): Font.t[];
-export declare function withMargin(l: Layout, margin: Margin.t): Layout;
-export declare function withAlignment(l: Layout, alignment: Alignment.t): Layout;
-export declare function withWidth(l: Layout, width: Width.t): Layout;
 export declare function totalElementsWidth(l: Layout): number;
 export declare function isInstantiated(l: Layout): boolean;
 export declare function instantiate(l: Layout, section: Map<string, ItemContent>, fields: Field.t[]): Layout;
@@ -47,7 +41,6 @@ export declare function boundWidth(l: Layout, width: number): Layout;
 export declare function scaleWidth(l: Layout, document_width: number): Layout;
 export declare function normalize(l: Layout, width: number, font_dict: FontDict): Layout;
 export declare function fillFonts(l: Layout, font_dict: FontDict): Layout;
-export declare function breakLines(l: Layout, font_dict: FontDict): Layout;
 export declare function computeBoxes(l: Layout, font_dict: FontDict): RenderedLayout;
 export declare function computeTextboxPositions(l: Layout, top_left: Point, font_dict: FontDict): {
     depth: number;

package/dist/Layout.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ColorMap = exports.computeTextboxPositions = exports.computeBoxes = exports.breakLines = exports.fillFonts = exports.normalize = exports.scaleWidth = exports.boundWidth = exports.instantiate = exports.isInstantiated = exports.totalElementsWidth = exports.withWidth = exports.withAlignment = exports.withMargin = exports.fonts = exports.isRef = exports.isFill = exports.isContainer = exports.toJson = exports.tag_ = exports.type_ = exports.fromJson = exports.empty = exports.default_ = void 0;
+exports.ColorMap = exports.computeTextboxPositions = exports.computeBoxes = exports.fillFonts = exports.normalize = exports.scaleWidth = exports.boundWidth = exports.instantiate = exports.isInstantiated = exports.totalElementsWidth = exports.fonts = exports.isRef = exports.isFill = exports.isContainer = exports.toJson = exports.tag_ = exports.type_ = exports.fromJson = exports.empty = exports.default_ = void 0;
 const Width = __importStar(require("./Width"));
 const Font = __importStar(require("./Font"));
 const Box_1 = require("./Box");
@@ -31,11 +31,12 @@ const Point_1 = require("./Point");
 const Stack = __importStar(require("./Stack"));
 const Row = __importStar(require("./Row"));
 const Elem = __importStar(require("./Elem"));
+const Utils_1 = require("./Utils");
 function default_(tag) {
     switch (tag) {
         case "Stack": return Stack.default_();
         case "FlexRow": return Row.default_();
-        case "FrozenRow": return Row.withFrozen(Row.default_(), true);
+        case "FrozenRow": return (0, Utils_1.with_)(Row.default_(), { is_frozen: true });
         case "Text": return Elem.default_();
         case "Ref": return Elem.asRef(Elem.default_());
     }
@@ -157,39 +158,6 @@ function fonts(l) {
     }
 }
 exports.fonts = fonts;
-function withMargin(l, margin) {
-    switch (l.tag) {
-        case "Stack":
-            return Stack.withMargin(l, margin);
-        case "Row":
-            return Row.withMargin(l, margin);
-        case "Elem":
-            return Elem.withMargin(l, margin);
-    }
-}
-exports.withMargin = withMargin;
-function withAlignment(l, alignment) {
-    switch (l.tag) {
-        case "Stack":
-            return Stack.withAlignment(l, alignment);
-        case "Row":
-            return Row.withAlignment(l, alignment);
-        case "Elem":
-            return Elem.withAlignment(l, alignment);
-    }
-}
-exports.withAlignment = withAlignment;
-function withWidth(l, width) {
-    switch (l.tag) {
-        case "Stack":
-            return Stack.withWidth(l, width);
-        case "Row":
-            return Row.withWidth(l, width);
-        case "Elem":
-            return Elem.withWidth(l, width);
-    }
-}
-exports.withWidth = withWidth;
 function totalElementsWidth(l) {
     switch (l.tag) {
         case "Stack":
@@ -213,9 +181,8 @@ exports.isInstantiated = isInstantiated;
 function instantiate(l, section, fields) {
     switch (l.tag) {
         case "Stack":
-            return Stack.withElements(l, l.elements.map(e => instantiate(e, section, fields)));
         case "Row":
-            return Row.withElements(l, l.elements.map(e => instantiate(e, section, fields)));
+            return (0, Utils_1.with_)(l, { elements: l.elements.map(e => instantiate(e, section, fields)) });
         case "Elem":
             return Elem.instantiate(l, section, fields);
     }
@@ -266,10 +233,7 @@ function normalize(l, width, font_dict) {
     const bounded_layout = boundWidth(scaled_layout, width);
     console.debug("Widths are bounded. Filling fonts...");
     const font_filled_layout = fillFonts(bounded_layout, font_dict);
-    console.debug("Fonts filled. Breaking lines...");
-    // const broken_layout = breakLines(font_filled_layout, font_dict);
-    console.debug("Lines broken.");
-    // return broken_layout;
+    console.debug("Fonts filled.");
     return font_filled_layout;
 }
 exports.normalize = normalize;
@@ -286,7 +250,7 @@ function fillFonts(l, font_dict) {
                 const total_width = totalElementsWidth(l);
                 if (total_width <= Width.get_fixed_unchecked(l.width)) {
                     // throw `Cannot fill fonts of row with width ${JSON.stringify(this.width())} and total width ${total_width}`
-                    return withWidth(l, Width.absolute(total_width));
+                    return (0, Utils_1.with_)(l, { width: Width.absolute(total_width) });
                 }
             }
             return l;
@@ -296,47 +260,6 @@ function fillFonts(l, font_dict) {
     }
 }
 exports.fillFonts = fillFonts;
-function breakLines(l, font_dict) {
-    switch (l.tag) {
-        case "Stack": {
-            const stack = l;
-            return Stack.withElements(stack, stack.elements.map(e => breakLines(e, font_dict)));
-        }
-        case "Row": {
-            const row = l;
-            if (row.is_frozen) {
-                const total_width = row
-                    .elements
-                    .map(e => Width.get_fixed_unchecked(e.width))
-                    .reduce((a, b) => a + b, 0.0);
-                if (total_width > Width.get_fixed_unchecked(row.width)) {
-                    throw `Cannot break lines of frozen row with width ${row.width} and total width ${total_width}`;
-                }
-                else {
-                    row.elements = row.elements.map(e => breakLines(e, font_dict));
-                }
-            }
-            else {
-                const lines = Row.breakLines(row, font_dict);
-                return Stack.stack(lines, row.margin, row.alignment, row.width, false);
-            }
-            return row;
-        }
-        case "Elem": {
-            if (isRef(l)) {
-                throw new Error("Cannot break lines of uninstantiated layout");
-            }
-            const elem = l;
-            const lines = Elem.break_lines(elem, font_dict);
-            // Make last line left if it's justified
-            if (lines[lines.length - 1].alignment === "Justified") {
-                lines[lines.length - 1] = withAlignment(lines[lines.length - 1], "Left");
-            }
-            return Stack.stack(lines, elem.margin, elem.alignment, elem.width, false);
-        }
-    }
-}
-exports.breakLines = breakLines;
 function computeBoxes(l, font_dict) {
     const top_left = new Point_1.Point(0.0, 0.0);
     return computeTextboxPositions(l, top_left, font_dict).renderedLayout;
@@ -356,9 +279,10 @@ function computeTextboxPositions(l, top_left, font_dict) {
                 top_left = top_left.move_y_to(depth);
                 renderedElements.push(result.renderedLayout);
             }
+            depth += stack.margin.bottom;
             return {
                 depth, renderedLayout: {
-                    ...l, bounding_box: new Box_1.Box(originalTopLeft, top_left.move_x_by(Width.get_fixed_unchecked(stack.width))), elements: renderedElements
+                    ...l, bounding_box: new Box_1.Box(originalTopLeft, top_left.move_x_by(Width.get_fixed_unchecked(stack.width)).move_y_by(stack.margin.bottom)), elements: renderedElements
                 }
             };
         }
@@ -386,6 +310,7 @@ function computeTextboxPositions(l, top_left, font_dict) {
                     top_left.move_x_by(Width.get_fixed_unchecked(element.width) + per_elem_space);
                 renderedElements.push(result.renderedLayout);
             }
+            depth += row.margin.bottom;
             return {
                 depth, renderedLayout: {
                     ...l, bounding_box: new Box_1.Box(originalTopLeft, originalTopLeft.move_y_by(depth).move_x_by(Width.get_fixed_unchecked(row.width))), elements: renderedElements
@@ -398,7 +323,6 @@ function computeTextboxPositions(l, top_left, font_dict) {
                 throw new Error("Cannot compute textbox positions of uninstantiated layout");
             }
             const height = Font.get_height(elem.font, font_dict);
-            const width = Width.get_fixed_unchecked(elem.text_width);
             top_left = top_left.move_y_by(elem.margin.top).move_x_by(elem.margin.left);
             let line = 1;
             let cursor = top_left.x;
@@ -411,16 +335,36 @@ function computeTextboxPositions(l, top_left, font_dict) {
                 span.line = line;
                 cursor += span.width;
             });
-            // switch (elem.alignment) {
-            //     case "Center":
-            //         top_left = top_left.move_x_by((Width.get_fixed_unchecked(elem.width) - width) / 2.0);
-            //         break;
-            //     case "Right":
-            //         top_left = top_left.move_x_by(Width.get_fixed_unchecked(elem.width) - width);
-            //         break;
-            // }
-            const textbox = new Box_1.Box(top_left, top_left.move_x_by(width).move_y_by(height * line));
-            return { depth: top_left.y + height * line, renderedLayout: { ...l, bounding_box: textbox } };
+            const lineWidths = elem.spans.reduce((acc, span) => {
+                acc[span.line - 1].width += span.width;
+                return acc;
+            }, Array.from({ length: line }, (_, i) => ({ line: i + 1, width: 0 })));
+            switch (elem.alignment) {
+                case "Center":
+                    elem.spans.forEach(span => {
+                        span.bbox = span.bbox.move_x_by((Width.get_fixed_unchecked(elem.width) - lineWidths[span.line - 1].width) / 2.0);
+                    });
+                    break;
+                case "Right":
+                    elem.spans.forEach(span => {
+                        span.bbox = span.bbox.move_x_by(Width.get_fixed_unchecked(elem.width) - lineWidths[span.line - 1].width);
+                    });
+                    break;
+                case "Justified": {
+                    for (let i = 1; i < line; i++) {
+                        const lineSpans = elem.spans.filter(span => span.line === i && span.text !== "\n\n" && span.text !== "\n" && span.text !== " ");
+                        const totalWidth = lineSpans.reduce((acc, span) => acc + span.width, 0);
+                        const perSpace = (Width.get_fixed_unchecked(elem.width) - totalWidth) / (lineSpans.length - 1);
+                        let cursor = 0;
+                        lineSpans.forEach(span => {
+                            span.bbox = span.bbox.move_x_by(cursor - span.bbox.top_left.x);
+                            cursor += span.width + perSpace;
+                        });
+                    }
+                }
+            }
+            const textbox = new Box_1.Box(top_left, top_left.move_x_by(Width.get_fixed_unchecked(elem.width)).move_y_by(height * line + elem.margin.bottom));
+            return { depth: top_left.y + height * line + elem.margin.bottom, renderedLayout: { ...l, bounding_box: textbox } };
         }
     }
 }

package/dist/PdfLayout.d.ts

@@ -22,5 +22,13 @@ export type RenderProps = {
     debug: boolean;
 };
 export declare const render: ({ resume_name, resume, data_schemas, layout_schemas, resume_layout, storage, fontDict }: RenderProps) => Promise<RenderResult>;
+type Tracker = {
+    page: number;
+    pageContainer: PDFKit.PDFDocument;
+    height: number;
+    layout: ResumeLayout;
+    fontDict: FontDict;
+};
 export declare const mergeSpans: (spans: Elem.Span[]) => Elem.Span[];
-export declare const renderSectionLayout: (layout: Layout.RenderedLayout, resume_layout: ResumeLayout, current_height: number, doc: PDFKit.PDFDocument) => void;
+export declare const renderSectionLayout: (layout: Layout.RenderedLayout, tracker: Tracker) => void;
+export {};

package/dist/PdfLayout.js

@@ -34,7 +34,6 @@ const render = async ({ resume_name, resume, data_schemas, layout_schemas, resum
     let end_time = Date.now();
     console.info(`Loading time: ${end_time - start_time}ms`);
     const doc = new pdfkit_1.default();
-    // doc.pipe(fs.createWriteStream('output.pdf'));
     const stream = doc.pipe((0, blob_stream_1.default)());
     start_time = Date.now();
     const layouts = await (0, AnyLayout_1.render)({ layout_schemas, resume, data_schemas, resume_layout, storage, fontDict });
@@ -56,19 +55,16 @@ const render = async ({ resume_name, resume, data_schemas, layout_schemas, resum
         console.error(e);
     }
     console.log("Rendering the document...");
-    let current_height = 0;
-    // Add rulers to the document at every 10 pixels
-    doc.strokeColor("grey");
-    for (let i = 0; i < resume_layout.height; i += 10) {
-        doc.moveTo(0, i).lineTo(resume_layout.width, i).stroke();
-    }
-    for (let i = 0; i < resume_layout.width; i += 10) {
-        doc.moveTo(i, 0).lineTo(i, resume_layout.height).stroke();
-    }
-    doc.strokeColor("black");
+    const tracker = {
+        page: 0,
+        pageContainer: doc,
+        height: 0,
+        layout: resume_layout,
+        fontDict: fontDict,
+    };
     for (const layout of layouts) {
-        (0, exports.renderSectionLayout)(layout, resume_layout, current_height, doc);
-        current_height += layout.bounding_box.height() + layout.margin.top + layout.margin.bottom;
+        (0, exports.renderSectionLayout)(layout, tracker);
+        tracker.height += layout.bounding_box.height() + layout.margin.top + layout.margin.bottom;
     }
     console.log("Rendering is completed. Saving the document...");
     console.log("Document is saved to output.pdf");
@@ -83,6 +79,15 @@ const render = async ({ resume_name, resume, data_schemas, layout_schemas, resum
     });
 };
 exports.render = render;
+const getPageContainer = (page, tracker) => {
+    if (page > tracker.page) {
+        tracker.page = page;
+        tracker.pageContainer.addPage({
+            size: [tracker.layout.width, tracker.layout.height],
+        });
+    }
+    return tracker.pageContainer;
+};
 const mergeSpans = (spans) => {
     const merged_spans = [];
     let currentSpan = spans[0];
@@ -104,49 +109,52 @@ const mergeSpans = (spans) => {
     return merged_spans;
 };
 exports.mergeSpans = mergeSpans;
-const renderSectionLayout = (layout, resume_layout, current_height, doc) => {
+const renderSectionLayout = (layout, tracker) => {
     switch (layout.tag) {
         case "Stack": {
             const stack = layout;
             for (const elem of stack.elements) {
-                (0, exports.renderSectionLayout)(elem, resume_layout, current_height, doc);
+                (0, exports.renderSectionLayout)(elem, tracker);
             }
             break;
         }
         case "Row": {
             const row = layout;
             for (const elem of row.elements) {
-                (0, exports.renderSectionLayout)(elem, resume_layout, current_height, doc);
+                (0, exports.renderSectionLayout)(elem, tracker);
             }
             break;
         }
         case "Elem": {
             const elem = layout;
-            elem.spans.forEach((span) => {
-                console.log("Rendering span:", span);
-                doc.
+            if (!layout.bounding_box) {
+                return;
+            }
+            const spans = elem.alignment === "Justified" ? elem.spans : (0, exports.mergeSpans)(elem.spans);
+            spans.forEach((span) => {
+                if (span.text === "" || span.text === " " || span.text === "\n" || span.text === "\n\n") {
+                    return;
+                }
+                const absoluteY = layout.bounding_box.top_left.y + tracker.height + span.bbox.top_left.y;
+                const page = Math.floor(absoluteY / (tracker.layout.height - tracker.layout.margin.top - tracker.layout.margin.bottom));
+                const currentPageY = absoluteY % (tracker.layout.height - tracker.layout.margin.top - tracker.layout.margin.bottom);
+                const y = currentPageY + tracker.layout.margin.top;
+                const x = layout.bounding_box.top_left.x + tracker.layout.margin.left + span.bbox.top_left.x;
+                tracker.pageContainer = getPageContainer(page, tracker);
+                tracker.pageContainer.
                     font(_1.Font.full_name(span.font)).
                     fontSize(span.font.size).
-                    text(span.text, layout.bounding_box.top_left.x
-                    + resume_layout.margin.left
-                    + span.bbox.top_left.x, layout.bounding_box.top_left.y
-                    + resume_layout.margin.top
-                    + current_height
-                    + span.bbox.top_left.y, { lineBreak: false });
+                    text(span.text, x, y, { lineBreak: false });
                 if (span.is_code) {
                     // Add a rounded rectangle around the code
-                    doc.roundedRect(layout.bounding_box.top_left.x + resume_layout.margin.left + span.bbox.top_left.x - span.font.size / 5, layout.bounding_box.top_left.y + resume_layout.margin.top + current_height + span.bbox.top_left.y, span.bbox.width() + span.font.size / 5 * 2, span.bbox.height(), 5).stroke();
+                    tracker.pageContainer.roundedRect(layout.bounding_box.top_left.x + tracker.layout.margin.left + span.bbox.top_left.x - span.font.size / 5, layout.bounding_box.top_left.y + tracker.layout.margin.top + tracker.height + span.bbox.top_left.y, span.bbox.width() + span.font.size / 5 * 2, span.bbox.height(), 5).stroke();
                     // Add a background color to the code
-                    doc.fillColor("black");
-                    doc.fillOpacity(0.05);
-                    doc.rect(layout.bounding_box.top_left.x + resume_layout.margin.left + span.bbox.top_left.x - span.font.size / 5, layout.bounding_box.top_left.y + resume_layout.margin.top + current_height + span.bbox.top_left.y, span.bbox.width() + span.font.size / 5 * 2, span.bbox.height()).fill();
-                    doc.fillOpacity(1);
+                    tracker.pageContainer.fillColor("black");
+                    tracker.pageContainer.fillOpacity(0.05);
+                    tracker.pageContainer.rect(layout.bounding_box.top_left.x + tracker.layout.margin.left + span.bbox.top_left.x - span.font.size / 5, layout.bounding_box.top_left.y + tracker.layout.margin.top + tracker.height + span.bbox.top_left.y, span.bbox.width() + span.font.size / 5 * 2, span.bbox.height()).fill();
+                    tracker.pageContainer.fillOpacity(1);
                 }
             });
-            // doc.
-            //     font(Font.full_name(elem.font)).
-            //     fontSize(elem.font.size).
-            //     text(elem.item, layout.bounding_box.top_left.x + resume_layout.margin.left, layout.bounding_box.top_left.y + resume_layout.margin.top + current_height, { lineBreak: false });
             break;
         }
     }

package/dist/Row.d.ts

@@ -1,5 +1,4 @@
 import { Alignment, Margin, Width } from ".";
-import { FontDict } from "./AnyLayout";
 import { Optional } from "./Utils";
 import * as Layout from "./Layout";
 export type t = {
@@ -14,16 +13,8 @@ export type t = {
 type Row = t;
 export declare function from(w: Optional<Row>): Row;
 export declare function row(elements: Layout.t[], margin: Margin.t, alignment: Alignment.t, width: Width.t, is_frozen: boolean, is_fill: boolean): Row;
-export declare function copy(r: Row): Row;
 export declare function default_(): Row;
-export declare function withElements(r: Row, elements: Layout.t[]): Row;
-export declare function withMargin(r: Row, margin: Margin.t): Row;
-export declare function withAlignment(r: Row, alignment: Alignment.t): Row;
-export declare function withWidth(r: Row, width: Width.t): Row;
-export declare function withFrozen(r: Row, is_frozen: boolean): Row;
-export declare function withFill(r: Row, is_fill: boolean): Row;
 export declare function elementsWidth(r: Row): number;
 export declare function boundWidth(r: Row, width: number): Row;
 export declare function scaleWidth(r: Row, w: number): Row;
-export declare function breakLines(r: Row, font_dict: FontDict): Row[];
 export {};

package/dist/Row.js

@@ -23,8 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.breakLines = exports.scaleWidth = exports.boundWidth = exports.elementsWidth = exports.withFill = exports.withFrozen = exports.withWidth = exports.withAlignment = exports.withMargin = exports.withElements = exports.default_ = exports.copy = exports.row = exports.from = void 0;
+exports.scaleWidth = exports.boundWidth = exports.elementsWidth = exports.default_ = exports.row = exports.from = void 0;
 const _1 = require(".");
+const Utils_1 = require("./Utils");
 const Layout = __importStar(require("./Layout"));
 function from(w) {
     return { ...default_(), ...w };
@@ -42,12 +43,6 @@ function row(elements, margin, alignment, width, is_frozen, is_fill) {
     };
 }
 exports.row = row;
-function copy(r) {
-    return {
-        ...r,
-    };
-}
-exports.copy = copy;
 function default_() {
     return {
         tag: "Row",
@@ -60,48 +55,6 @@ function default_() {
     };
 }
 exports.default_ = default_;
-function withElements(r, elements) {
-    return {
-        ...r,
-        elements,
-    };
-}
-exports.withElements = withElements;
-function withMargin(r, margin) {
-    return {
-        ...r,
-        margin,
-    };
-}
-exports.withMargin = withMargin;
-function withAlignment(r, alignment) {
-    return {
-        ...r,
-        alignment,
-    };
-}
-exports.withAlignment = withAlignment;
-function withWidth(r, width) {
-    return {
-        ...r,
-        width,
-    };
-}
-exports.withWidth = withWidth;
-function withFrozen(r, is_frozen) {
-    return {
-        ...r,
-        is_frozen,
-    };
-}
-exports.withFrozen = withFrozen;
-function withFill(r, is_fill) {
-    return {
-        ...r,
-        is_fill,
-    };
-}
-exports.withFill = withFill;
 function elementsWidth(r) {
     return r.elements.map(e => _1.Width.get_fixed_unchecked(e.width)).reduce((a, b) => a + b, 0.0);
 }
@@ -117,29 +70,9 @@ function boundWidth(r, width) {
 }
 exports.boundWidth = boundWidth;
 function scaleWidth(r, w) {
-    return withWidth(withElements(r, r.elements.map(e => Layout.scaleWidth(e, w))), _1.Width.scale(r.width, w));
+    return (0, Utils_1.with_)(r, {
+        elements: r.elements.map(e => Layout.scaleWidth(e, w)),
+        width: _1.Width.scale(r.width, w)
+    });
 }
 exports.scaleWidth = scaleWidth;
-function breakLines(r, font_dict) {
-    const lines = [];
-    let current_line = [];
-    let current_width = 0.0;
-    const elements = r
-        .elements
-        .map(e => Layout.breakLines(e, font_dict));
-    for (const element of elements) {
-        const element_width = _1.Width.get_fixed_unchecked(element.width);
-        if (current_width + element_width > _1.Width.get_fixed_unchecked(r.width)) {
-            lines.push(withElements(r, current_line));
-            current_line = [];
-            current_width = 0.0;
-        }
-        current_line.push(element);
-        current_width += element_width;
-    }
-    if (current_line.length > 0) {
-        lines.push(withElements(r, current_line));
-    }
-    return lines;
-}
-exports.breakLines = breakLines;

package/dist/Stack.d.ts

@@ -11,13 +11,7 @@ export type t = {
 type Stack = t;
 export declare function from(w: Optional<Stack>): Stack;
 export declare function stack(elements: Layout.t[], margin: Margin.t, alignment: Alignment.t, width: Width.t, is_fill: boolean): Stack;
-export declare function copy(s: Stack): Stack;
 export declare function default_(): Stack;
-export declare function withElements(s: Stack, elements: Layout.t[]): Stack;
-export declare function withMargin(s: Stack, margin: Margin.t): Stack;
-export declare function withAlignment(s: Stack, alignment: Alignment.t): Stack;
-export declare function withWidth(s: Stack, width: Width.t): Stack;
-export declare function withIsFill(s: Stack, is_fill: boolean): Stack;
 export declare function boundWidth(s: Stack, width: number): Stack;
 export declare function scaleWidth(s: Stack, scale: number): Stack;
 export {};

package/dist/Stack.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scaleWidth = exports.boundWidth = exports.withIsFill = exports.withWidth = exports.withAlignment = exports.withMargin = exports.withElements = exports.default_ = exports.copy = exports.stack = exports.from = void 0;
+exports.scaleWidth = exports.boundWidth = exports.default_ = exports.stack = exports.from = void 0;
 const _1 = require(".");
+const Utils_1 = require("./Utils");
 function from(w) {
     return { ...default_(), ...w };
 }
@@ -17,12 +18,6 @@ function stack(elements, margin, alignment, width, is_fill) {
     };
 }
 exports.stack = stack;
-function copy(s) {
-    return {
-        ...s,
-    };
-}
-exports.copy = copy;
 function default_() {
     return {
         tag: "Stack",
@@ -34,41 +29,6 @@ function default_() {
     };
 }
 exports.default_ = default_;
-function withElements(s, elements) {
-    return {
-        ...s,
-        elements,
-    };
-}
-exports.withElements = withElements;
-function withMargin(s, margin) {
-    return {
-        ...s,
-        margin,
-    };
-}
-exports.withMargin = withMargin;
-function withAlignment(s, alignment) {
-    return {
-        ...s,
-        alignment,
-    };
-}
-exports.withAlignment = withAlignment;
-function withWidth(s, width) {
-    return {
-        ...s,
-        width,
-    };
-}
-exports.withWidth = withWidth;
-function withIsFill(s, is_fill) {
-    return {
-        ...s,
-        is_fill,
-    };
-}
-exports.withIsFill = withIsFill;
 function boundWidth(s, width) {
     const bound = s.width.tag === "Absolute" ? Math.min(s.width.value, width)
         : s.width.tag === "Fill" ? width
@@ -76,10 +36,10 @@ function boundWidth(s, width) {
     if (bound === null) {
         throw new Error("Cannot bound width of non-unitized widths!");
     }
-    return withWidth(withElements(s, s.elements.map(e => _1.Layout.boundWidth(e, bound))), _1.Width.absolute(bound));
+    return (0, Utils_1.with_)(s, { elements: s.elements.map(e => _1.Layout.boundWidth(e, bound)), width: _1.Width.absolute(bound) });
 }
 exports.boundWidth = boundWidth;
 function scaleWidth(s, scale) {
-    return withWidth(withElements(s, s.elements.map(e => _1.Layout.scaleWidth(e, scale))), _1.Width.scale(s.width, scale));
+    return (0, Utils_1.with_)(s, { elements: s.elements.map(e => _1.Layout.scaleWidth(e, scale)), width: _1.Width.scale(s.width, scale) });
 }
 exports.scaleWidth = scaleWidth;

package/dist/Utils.d.ts

@@ -2,4 +2,4 @@ export type Optional<T> = {
     [P in keyof T]?: T[P];
 };
 export declare function with_<T>(e: T, w: Optional<T>): T;
-export declare const EPSILON = 5;
+export declare function copy<T>(s: T): T;

package/dist/Utils.js

@@ -1,8 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EPSILON = exports.with_ = void 0;
+exports.copy = exports.with_ = void 0;
 function with_(e, w) {
     return { ...e, ...w };
 }
 exports.with_ = with_;
-exports.EPSILON = 5;
+function copy(s) {
+    return {
+        ...s,
+    };
+}
+exports.copy = copy;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cvdl-ts",
-    "version": "1.0.14",
+    "version": "1.0.16",
     "description": "Typescript Implementation of CVDL Compiler",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",