cvdl-ts 1.0.7 → 1.0.9

package/dist/Layout.d.ts

@@ -75,6 +75,16 @@ export declare class Row {
     scale_width(w: number): Row;
     break_lines(font_dict: FontDict): Row[];
 }
+export type Color = "Transparent" | "Light Yellow" | "Light Brown" | "Light Green" | "Light Beige" | "Light Blue" | "Blue";
+export declare const ColorMap: {
+    Transparent: string;
+    "Light Yellow": string;
+    "Light Brown": string;
+    "Light Green": string;
+    "Light Beige": string;
+    "Light Blue": string;
+    Blue: string;
+};
 export declare class Elem {
     tag: "Elem";
     item: string;
@@ -86,8 +96,9 @@ export declare class Elem {
     margin: Margin;
     alignment: Alignment;
     width: Width;
-    constructor(item: string, url: string | null, is_ref: boolean, is_fill: boolean, text_width: Width, font: Font, margin: Margin, alignment: Alignment, width: Width);
-    static elem(item: string, url: string | null, is_ref: boolean, is_fill: boolean, text_width: Width, font: Font, margin: Margin, alignment: Alignment, width: Width): SectionLayout;
+    background_color: Color;
+    constructor(item: string, url: string | null, is_ref: boolean, is_fill: boolean, text_width: Width, font: Font, margin: Margin, alignment: Alignment, width: Width, background_color: Color);
+    static elem(item: string, url: string | null, is_ref: boolean, is_fill: boolean, text_width: Width, font: Font, margin: Margin, alignment: Alignment, width: Width, background_color: Color): SectionLayout;
     copy(): Elem;
     static default_(): Elem;
     with_item(item: string): Elem;

package/dist/Layout.js

@@ -1,7 +1,7 @@
 "use strict";
 /* eslint-disable @typescript-eslint/no-explicit-any */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Elem = exports.Row = exports.Stack = exports.SectionLayout = void 0;
+exports.Elem = exports.ColorMap = exports.Row = exports.Stack = exports.SectionLayout = void 0;
 const Margin_1 = require("./Margin");
 const Alignment_1 = require("./Alignment");
 const Width_1 = require("./Width");
@@ -38,6 +38,7 @@ class SectionLayout {
         return new SectionLayout(Stack.default_());
     }
     static fromJson(json) {
+        var _a;
         const key = Object.keys(json)[0];
         switch (key) {
             case 'Stack':
@@ -60,6 +61,7 @@ class SectionLayout {
                 inner.text_width = Width_1.Width.fromJson(json[key].text_width);
                 inner.font = Font_1.Font.fromJson(json[key].font);
                 inner.url = json[key].url;
+                inner.background_color = (_a = json[key].background_color) !== null && _a !== void 0 ? _a : "Transparent";
                 return new SectionLayout(inner);
             }
         }
@@ -81,6 +83,7 @@ class SectionLayout {
             }
             case "Elem": {
                 const elem = this.inner;
+                console.error(elem.background_color);
                 return {
                     [this.tag_()]: {
                         item: elem.item,
@@ -90,6 +93,7 @@ class SectionLayout {
                         text_width: Width_1.Width.toJson(elem.text_width),
                         font: elem.font.toJson(),
                         url: elem.url,
+                        background_color: elem.background_color,
                     },
                 };
             }
@@ -447,8 +451,17 @@ class Row {
     }
 }
 exports.Row = Row;
+exports.ColorMap = {
+    "Transparent": "transparent",
+    "Light Yellow": "#FFC96F",
+    "Light Brown": "#ECB176",
+    "Light Green": "#F6FAB9",
+    "Light Beige": "#F6EEC9",
+    "Light Blue": "#EEF7FF",
+    "Blue": "#4793AF",
+};
 class Elem {
-    constructor(item, url, is_ref, is_fill, text_width, font, margin, alignment, width) {
+    constructor(item, url, is_ref, is_fill, text_width, font, margin, alignment, width, background_color) {
         this.tag = "Elem";
         this.item = item;
         this.url = url;
@@ -459,42 +472,44 @@ class Elem {
         this.margin = margin;
         this.alignment = alignment;
         this.width = width;
+        this.background_color = background_color;
     }
-    static elem(item, url, is_ref, is_fill, text_width, font, margin, alignment, width) {
-        return new SectionLayout(new Elem(item, url, is_ref, is_fill, text_width, font, margin, alignment, width));
+    static elem(item, url, is_ref, is_fill, text_width, font, margin, alignment, width, background_color) {
+        return new SectionLayout(new Elem(item, url, is_ref, is_fill, text_width, font, margin, alignment, width, background_color));
     }
     copy() {
-        return new Elem(this.item, this.url, this.is_ref, this.is_fill, Width_1.Width.copy(this.text_width), this.font, this.margin.copy(), this.alignment, Width_1.Width.copy(this.width));
+        console.error(this.background_color);
+        return new Elem(this.item, this.url, this.is_ref, this.is_fill, Width_1.Width.copy(this.text_width), this.font, this.margin.copy(), this.alignment, Width_1.Width.copy(this.width), this.background_color);
     }
     static default_() {
-        return new Elem("", null, false, false, Width_1.Width.default_(), Font_1.Font.default_(), Margin_1.Margin.default_(), Alignment_1.Alignment.default_(), Width_1.Width.default_());
+        return new Elem("", null, false, false, Width_1.Width.default_(), Font_1.Font.default_(), Margin_1.Margin.default_(), Alignment_1.Alignment.default_(), Width_1.Width.default_(), "Transparent");
     }
     with_item(item) {
-        return new Elem(item, this.url, this.is_ref, this.is_fill, this.text_width, this.font, this.margin, this.alignment, this.width);
+        return new Elem(item, this.url, this.is_ref, this.is_fill, this.text_width, this.font, this.margin, this.alignment, this.width, this.background_color);
     }
     as_ref() {
-        return new Elem(this.item, this.url, true, this.is_fill, this.text_width, this.font, this.margin, this.alignment, this.width);
+        return new Elem(this.item, this.url, true, this.is_fill, this.text_width, this.font, this.margin, this.alignment, this.width, this.background_color);
     }
     with_font(font) {
-        return new Elem(this.item, this.url, this.is_ref, this.is_fill, this.text_width, font, this.margin, this.alignment, this.width);
+        return new Elem(this.item, this.url, this.is_ref, this.is_fill, this.text_width, font, this.margin, this.alignment, this.width, this.background_color);
     }
     with_url(url) {
-        return new Elem(this.item, url, this.is_ref, this.is_fill, this.text_width, this.font, this.margin, this.alignment, this.width);
+        return new Elem(this.item, url, this.is_ref, this.is_fill, this.text_width, this.font, this.margin, this.alignment, this.width, this.background_color);
     }
     with_margin(margin) {
-        return new Elem(this.item, this.url, this.is_ref, this.is_fill, this.text_width, this.font, margin, this.alignment, this.width);
+        return new Elem(this.item, this.url, this.is_ref, this.is_fill, this.text_width, this.font, margin, this.alignment, this.width, this.background_color);
     }
     with_alignment(alignment) {
-        return new Elem(this.item, this.url, this.is_ref, this.is_fill, this.text_width, this.font, this.margin, alignment, this.width);
+        return new Elem(this.item, this.url, this.is_ref, this.is_fill, this.text_width, this.font, this.margin, alignment, this.width, this.background_color);
     }
     with_width(width) {
-        return new Elem(this.item, this.url, this.is_ref, this.is_fill, this.text_width, this.font, this.margin, this.alignment, width);
+        return new Elem(this.item, this.url, this.is_ref, this.is_fill, this.text_width, this.font, this.margin, this.alignment, width, this.background_color);
     }
     with_text_width(text_width) {
-        return new Elem(this.item, this.url, this.is_ref, this.is_fill, text_width, this.font, this.margin, this.alignment, this.width);
+        return new Elem(this.item, this.url, this.is_ref, this.is_fill, text_width, this.font, this.margin, this.alignment, this.width, this.background_color);
     }
     with_is_fill(is_fill) {
-        return new Elem(this.item, this.url, this.is_ref, is_fill, this.text_width, this.font, this.margin, this.alignment, this.width);
+        return new Elem(this.item, this.url, this.is_ref, is_fill, this.text_width, this.font, this.margin, this.alignment, this.width, this.background_color);
     }
     scale_width(w) {
         return this.with_width(Width_1.Width.scale(this.width, w));
@@ -516,7 +531,7 @@ class Elem {
             const row = new Row([], false, line.margin, line.alignment, line.width);
             words.forEach(word => {
                 const word_width = this.font.get_width(word, font_dict);
-                row.elements.push(new SectionLayout(new Elem(word, null, false, false, Width_1.Width.absolute(word_width), this.font, Margin_1.Margin.default_(), Alignment_1.Alignment.default_(), Width_1.Width.absolute(word_width))));
+                row.elements.push(new SectionLayout(new Elem(word, null, false, false, Width_1.Width.absolute(word_width), this.font, Margin_1.Margin.default_(), Alignment_1.Alignment.default_(), Width_1.Width.absolute(word_width), this.background_color)));
             });
             rowLines.push(row);
         }

package/dist/PdfLayout.js

@@ -7,6 +7,7 @@ exports.render = void 0;
 const blob_stream_1 = __importDefault(require("blob-stream"));
 const AnyLayout_1 = require("./AnyLayout");
 const pdfkit_1 = __importDefault(require("pdfkit"));
+const Layout_1 = require("./Layout");
 const render = async ({ resume_name, resume, data_schemas, layout_schemas, resume_layout, storage, fontDict, debug = false }) => {
     let start_time = Date.now();
     if (!resume && !resume_name) {
@@ -67,7 +68,11 @@ const render = async ({ resume_name, resume, data_schemas, layout_schemas, resum
             }
             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}`);
-                console.log(element.font.full_name());
+                if (element.background_color !== "Transparent") {
+                    doc.rect(box_.top_left.x, box_.top_left.y, box_.width(), box_.height()).fillAndStroke(Layout_1.ColorMap[element.background_color], Layout_1.ColorMap[element.background_color]);
+                }
+                // Make this more generic
+                doc.fillColor("black");
                 doc.
                     font(element.font.full_name()).
                     fontSize(element.font.size).

package/package.json

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