cvdl-ts 1.0.13 → 1.0.14

package/dist/AnyLayout.d.ts

@@ -34,4 +34,4 @@ export declare class FontDict {
     load_fonts_from_schema(schema: LayoutSchema, storage: Storage): Promise<void>;
     get_font(name: string): fontkit.Font;
 }
-export declare function render({ resume, layout_schemas, data_schemas, resume_layout, storage, fontDict }: RenderProps): Promise<[FontDict, Layout.RenderedLayout[]]>;
+export declare function render({ resume, layout_schemas, data_schemas, resume_layout, storage, fontDict }: RenderProps): Promise<Layout.RenderedLayout[]>;

package/dist/AnyLayout.js

@@ -54,8 +54,6 @@ class FontDict {
 }
 exports.FontDict = FontDict;
 async function render({ resume, layout_schemas, data_schemas, resume_layout, storage, fontDict }) {
-    // Each box contains a set of elements(positioned by 0x0 and projected into its bounding box)
-    const font_dict = fontDict !== null && fontDict !== void 0 ? fontDict : new FontDict();
     // Compute the total usable width by subtracting the margins from the document width
     const width = resume_layout.width - (resume_layout.margin.left + resume_layout.margin.right);
     // If the resume is double column, then the usable width is halved
@@ -65,7 +63,6 @@ async function render({ resume, layout_schemas, data_schemas, resume_layout, sto
     const layouts = [];
     console.error("Rendering sections...");
     for (const section of resume.sections) {
-        console.error("Print section:", section);
         // Render Section Header
         // 1. Find the layout schema for the section
         console.info("Computing section: ", section.section_name);
@@ -75,7 +72,7 @@ async function render({ resume, layout_schemas, data_schemas, resume_layout, sto
             throw new Error(`Could not find layout schema ${section.layout_schema}`);
         }
         let start_time = Date.now();
-        await font_dict.load_fonts_from_schema(layout_schema, storage);
+        await fontDict.load_fonts_from_schema(layout_schema, storage);
         let end_time = Date.now();
         console.info(`Font loading time: ${end_time - start_time}ms for section ${section.section_name}`);
         // 2. Find the data schema for the section
@@ -85,22 +82,24 @@ async function render({ resume, layout_schemas, data_schemas, resume_layout, sto
         }
         start_time = Date.now();
         // 3. Render the header
-        const layout = _1.Layout.computeBoxes(_1.Layout.normalize(_1.Layout.instantiate(layout_schema.header_layout_schema, section.data, data_schema.header_schema), column_width, font_dict), font_dict);
-        console.error("Header is computed");
+        const layout = _1.Layout.computeBoxes(_1.Layout.normalize(_1.Layout.instantiate(layout_schema.header_layout_schema, section.data, data_schema.header_schema), column_width, fontDict), fontDict);
+        layout.path = { tag: 'section', section: section.section_name };
+        console.info("Header is computed");
         layouts.push(layout);
         end_time = Date.now();
         console.info(`Header rendering time: ${end_time - start_time}ms for section ${section.section_name}`);
         start_time = Date.now();
         // Render Section Items
-        for (const [, item] of section.items.entries()) {
+        for (const [index, item] of section.items.entries()) {
             // 3. Render the item
-            const layout = _1.Layout.computeBoxes(_1.Layout.normalize(_1.Layout.instantiate(layout_schema.item_layout_schema, item.fields, data_schema.item_schema), column_width, font_dict), font_dict);
+            const layout = _1.Layout.computeBoxes(_1.Layout.normalize(_1.Layout.instantiate(layout_schema.item_layout_schema, item.fields, data_schema.item_schema), column_width, fontDict), fontDict);
+            layout.path = { tag: 'item', section: section.section_name, item: index };
             layouts.push(layout);
         }
         end_time = Date.now();
         console.info(`Item rendering time: ${end_time - start_time}ms for section ${section.section_name}`);
     }
     console.log("Position calculations are completed.");
-    return [font_dict, layouts];
+    return layouts;
 }
 exports.render = render;

package/dist/Elem.d.ts

@@ -7,7 +7,7 @@ import { ItemContent } from "./Resume";
 import { Field } from "./DataSchema";
 import { Optional } from "./Utils";
 import { Box } from "./Box";
-type Span = {
+export type Span = {
     is_italic: boolean;
     is_bold: boolean;
     is_code: boolean;
@@ -21,6 +21,7 @@ type Span = {
 export type t = {
     tag: "Elem";
     item: string;
+    text?: string;
     spans?: Span[];
     url: string | null;
     is_ref: boolean;
@@ -38,6 +39,7 @@ export declare function elem(item: string, url: string | null, is_ref: boolean,
 export declare function copy(e: Elem): {
     tag: "Elem";
     item: string;
+    text?: string;
     spans?: Span[];
     url: string;
     is_ref: boolean;

package/dist/Elem.js

@@ -140,19 +140,15 @@ function flattenToken(t, sp) {
     return (0, ts_pattern_1.match)(t)
         .returnType()
         .with({ type: "paragraph", tokens: ts_pattern_1.P.select("tokens") }, ({ tokens }) => {
-        // console.log("[paragraph]", tokens);
         return flatten(tokens, sp);
     })
         .with({ type: "strong", tokens: ts_pattern_1.P.select("tokens") }, ({ tokens }) => {
-        // console.log("[strong]", tokens);
         return flatten(tokens, { ...sp, is_bold: true });
     })
         .with({ type: "em", tokens: ts_pattern_1.P.select("tokens") }, ({ tokens }) => {
-        // console.log("[em]", tokens);
         return flatten(tokens, { ...sp, is_italic: true });
     })
         .with({ type: "codespan", text: ts_pattern_1.P.select("text") }, ({ text }) => {
-        // console.log("[codespan]", text);
         return [{ ...sp, is_code: true, text, link: null }];
     })
         .with({ type: "text", tokens: ts_pattern_1.P.select("tokens") }, ({ tokens }) => {
@@ -186,22 +182,29 @@ function parseMarkdownItem(item) {
 }
 exports.parseMarkdownItem = parseMarkdownItem;
 function fillFonts(e, fonts) {
-    const simpleSpans = e.is_markdown ? parseMarkdownItem(e.item) : [{ ...defaultSpanProps(), text: e.item, font: e.font, link: null }];
+    const simpleSpans = e.is_markdown ? parseMarkdownItem(e.text) : [{ ...defaultSpanProps(), text: e.text, font: e.font, link: null }];
     const spans = [];
     for (const span of simpleSpans) {
         const font = e.is_markdown ? (0, Utils_1.with_)(e.font, ({
             // style: span.is_italic ? "Italic" : "Normal",
             weight: span.is_bold ? "Bold" : "Medium",
         })) : e.font;
-        if (span.text === " " || span.text === "\n") {
-            const width = Font.get_width(font, span.text, fonts);
+        if (span.text === " ") {
+            const width = Font.get_width(font, "-", fonts);
             spans.push({ ...span, font, width });
             continue;
         }
-        span.text.split(/\s+/).forEach(word => {
+        if (span.text === "\n\n") {
+            spans.push({ ...span, font, width: 0 });
+            continue;
+        }
+        const words = span.text.split(/\s+/);
+        words.forEach((word, index) => {
             const width = Font.get_width(font, word, fonts);
             spans.push({ ...span, text: word, font, width });
-            spans.push({ ...span, text: " ", font, width: Font.get_width(font, " ", fonts) });
+            if (index < words.length - 1) {
+                spans.push({ ...span, text: " ", font, width: Font.get_width(font, " ", fonts) });
+            }
         });
     }
     const text_width = spans.reduce((acc, span) => acc + span.width, 0);
@@ -239,7 +242,7 @@ function break_lines(e, font_dict) {
     const lines = [];
     // todo: I'm sure this implementation is pretty buggy. Note to future me, fix
     // this.
-    const words = e.item.split(/\s+/);
+    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;
@@ -281,21 +284,20 @@ function instantiate(e, section, fields) {
         return e;
     }
     const itemType = fields.find(f => f.name === e.item);
-    console.log(`Found item type: ${JSON.stringify(itemType)}`);
     if (itemType.type.tag === "MarkdownString") {
-        console.log(`Found markdown string: ${e.item}`);
         e.is_markdown = true;
     }
     const text = section.get(e.item);
+    console.log(`Instantiating ${e.item} with ${JSON.stringify(text)}`);
     if (text === undefined) {
-        return withIsRef(withItem(e, ""), false);
+        return (0, Utils_1.with_)(e, { is_ref: false, text: "" });
     }
     else {
         if (text.tag === "Url") {
-            return withIsRef(withUrl(withItem(e, text.value.text), text.value.url), false);
+            return (0, Utils_1.with_)(e, { is_ref: false, text: text.value.text, url: text.value.url });
         }
         else {
-            return withIsRef(withItem(e, Resume_1.ItemContent.toString(text)), false);
+            return (0, Utils_1.with_)(e, { is_ref: false, text: Resume_1.ItemContent.toString(text) });
         }
     }
 }

package/dist/Layout.d.ts

@@ -4,7 +4,7 @@ import * as Width from "./Width";
 import * as Font from "./Font";
 import { ItemContent } from "./Resume";
 import { Box } from "./Box";
-import { FontDict } from "./AnyLayout";
+import { ElementPath, FontDict } from "./AnyLayout";
 import { Point } from "./Point";
 import * as Stack from "./Stack";
 import * as Row from "./Row";
@@ -24,7 +24,9 @@ export type RenderedRow = Row.t & {
 export type RenderedElem = Elem.t & {
     bounding_box: Box;
 };
-export type RenderedLayout = RenderedStack | RenderedRow | RenderedElem;
+export type RenderedLayout = (RenderedStack | RenderedRow | RenderedElem) & {
+    path?: ElementPath;
+};
 export declare function default_(tag: string): Stack.t | Row.t | Elem.t;
 export declare function empty(): Layout;
 export declare function fromJson(json: unknown): Layout;

package/dist/Layout.js

@@ -63,6 +63,7 @@ function fromJson(json) {
         case 'Text': {
             const inner = default_(key);
             inner.item = json[key].item;
+            inner.text = json[key].item;
             inner.margin = json[key].margin;
             inner.alignment = json[key].alignment;
             inner.width = Width.fromJson(json[key].width);
@@ -402,24 +403,24 @@ function computeTextboxPositions(l, top_left, font_dict) {
             let line = 1;
             let cursor = top_left.x;
             elem.spans.forEach(span => {
-                if (cursor + span.width > Width.get_fixed_unchecked(elem.width) - elem.margin.right) {
+                if (cursor - top_left.x + span.width > Width.get_fixed_unchecked(elem.width) - elem.margin.right || span.text === "\n\n") {
                     cursor = top_left.x;
                     line += 1;
                 }
-                span.bbox = new Box_1.Box(new Point_1.Point(cursor, (line - 1) * height), new Point_1.Point(cursor + span.width, line * height));
+                span.bbox = new Box_1.Box(new Point_1.Point(cursor - top_left.x, (line - 1) * height), new Point_1.Point(cursor + span.width, line * height));
+                span.line = line;
                 cursor += span.width;
-                console.log(span);
             });
-            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));
-            return { depth: top_left.y + height, renderedLayout: { ...l, bounding_box: textbox } };
+            // 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 } };
         }
     }
 }

package/dist/PdfLayout.d.ts

@@ -5,6 +5,7 @@ import { DataSchema } from "./DataSchema";
 import { LayoutSchema } from "./LayoutSchema";
 import { ResumeLayout } from "./ResumeLayout";
 import { Storage } from "./Storage";
+import * as Elem from "./Elem";
 import { Layout } from ".";
 export type RenderResult = {
     blob: Blob;
@@ -20,5 +21,6 @@ export type RenderProps = {
     fontDict?: FontDict;
     debug: boolean;
 };
-export declare const render: ({ resume_name, resume, data_schemas, layout_schemas, resume_layout, storage, fontDict, debug }: RenderProps) => Promise<RenderResult>;
+export declare const render: ({ resume_name, resume, data_schemas, layout_schemas, resume_layout, storage, fontDict }: RenderProps) => Promise<RenderResult>;
+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;

package/dist/PdfLayout.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderSectionLayout = exports.render = void 0;
+exports.renderSectionLayout = exports.mergeSpans = exports.render = void 0;
 const blob_stream_1 = __importDefault(require("blob-stream"));
 const AnyLayout_1 = require("./AnyLayout");
 const pdfkit_1 = __importDefault(require("pdfkit"));
 const _1 = require(".");
-const render = async ({ resume_name, resume, data_schemas, layout_schemas, resume_layout, storage, fontDict, debug = false }) => {
+const render = async ({ resume_name, resume, data_schemas, layout_schemas, resume_layout, storage, fontDict }) => {
     let start_time = Date.now();
     if (!resume && !resume_name) {
         throw "Rendering requires either resume_name or resume";
@@ -37,7 +37,7 @@ const render = async ({ resume_name, resume, data_schemas, layout_schemas, resum
     // doc.pipe(fs.createWriteStream('output.pdf'));
     const stream = doc.pipe((0, blob_stream_1.default)());
     start_time = Date.now();
-    const [font_dict, layouts] = await (0, AnyLayout_1.render)({ layout_schemas, resume, data_schemas, resume_layout, storage, fontDict });
+    const layouts = await (0, AnyLayout_1.render)({ layout_schemas, resume, data_schemas, resume_layout, storage, fontDict });
     end_time = Date.now();
     console.info(`Rendering time: ${end_time - start_time}ms`);
     console.log("Constructing printpdf font dictionary...");
@@ -46,7 +46,7 @@ const render = async ({ resume_name, resume, data_schemas, layout_schemas, resum
     //     "/Users/akeles/Programming/projects/cvdl/cvdl/assets/Exo/static/Exo-Medium.ttf");
     try {
         console.log("Registering fonts...");
-        for (const [font_name, font] of font_dict.fonts.entries()) {
+        for (const [font_name, font] of fontDict.fonts.entries()) {
             console.log(`Registering font ${font_name}`);
             // @ts-ignore
             doc.registerFont(font_name, font.stream.buffer);
@@ -56,36 +56,16 @@ const render = async ({ resume_name, resume, data_schemas, layout_schemas, resum
         console.error(e);
     }
     console.log("Rendering the document...");
-    // Render the boxes
-    // for (const [index, boxes] of pages.entries()) {
-    //     if (index > 0) {
-    //         doc.addPage();
-    //     }
-    //     boxes.forEach((box) => {
-    //         const elements = box.elements;
-    //         // if (debug) {
-    //         //     doc.rect(box.bounding_box.top_left.x, box.bounding_box.top_left.y, box.bounding_box.width(), box.bounding_box.height()).stroke();
-    //         // }
-    //         for (const [box_, element] of elements) {
-    //             console.log(
-    //                 `(${box_.top_left.x}, ${box_.top_left.y})(${box_.bottom_right.x}, ${box_.bottom_right.y}): ${element.item}`
-    //             );
-    //             if (element.background_color !== "Transparent") {
-    //                 doc.rect(box_.top_left.x, box_.top_left.y, box_.width(), box_.height()).fillAndStroke(ColorMap[element.background_color], ColorMap[element.background_color]);
-    //             }
-    //             // Make this more generic
-    //             doc.fillColor("black");
-    //             doc.
-    //                 font(element.font.full_name()).
-    //                 fontSize(element.font.size).
-    //                 text(element.item, box_.top_left.x, box_.top_left.y, { lineBreak: false });
-    //             if (debug) {
-    //                 // doc.rect(box_.top_left.x, box_.top_left.y, box_.width(), box_.height()).stroke();
-    //             }
-    //         }
-    //     });
-    // }
     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");
     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;
@@ -103,6 +83,27 @@ const render = async ({ resume_name, resume, data_schemas, layout_schemas, resum
     });
 };
 exports.render = render;
+const mergeSpans = (spans) => {
+    const merged_spans = [];
+    let currentSpan = spans[0];
+    for (let i = 1; i < spans.length; i++) {
+        if (currentSpan.bbox.top_left.y === spans[i].bbox.top_left.y
+            && currentSpan.font === spans[i].font
+            && currentSpan.is_code === spans[i].is_code
+            && currentSpan.is_bold === spans[i].is_bold
+            && currentSpan.is_italic === spans[i].is_italic) {
+            currentSpan.text += spans[i].text;
+            currentSpan.bbox.bottom_right = spans[i].bbox.bottom_right;
+        }
+        else {
+            merged_spans.push(currentSpan);
+            currentSpan = spans[i];
+        }
+    }
+    merged_spans.push(currentSpan);
+    return merged_spans;
+};
+exports.mergeSpans = mergeSpans;
 const renderSectionLayout = (layout, resume_layout, current_height, doc) => {
     switch (layout.tag) {
         case "Stack": {
@@ -122,21 +123,23 @@ const renderSectionLayout = (layout, resume_layout, current_height, doc) => {
         case "Elem": {
             const elem = layout;
             elem.spans.forEach((span) => {
-                console.log(span);
-                if (span.text === "") {
-                    return;
-                }
+                console.log("Rendering span:", span);
                 doc.
                     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, 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 });
                 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 / 3, layout.bounding_box.top_left.y + resume_layout.margin.top + current_height + span.bbox.top_left.y, span.bbox.width() + span.font.size / 3 * 2, span.bbox.height(), 5).stroke();
+                    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();
                     // 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 / 3, layout.bounding_box.top_left.y + resume_layout.margin.top + current_height + span.bbox.top_left.y, span.bbox.width() + span.font.size / 3 * 2, span.bbox.height()).fill();
+                    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);
                 }
             });

package/dist/Utils.d.ts

@@ -2,3 +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;

package/dist/Utils.js

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

package/package.json

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