cvdl-ts 1.0.4 → 1.0.6

package/dist/AnyLayout.d.ts

@@ -6,9 +6,25 @@ import { LocalStorage } from "./LocalStorage";
 import { Resume } from "./Resume";
 import { ResumeLayout } from "./ResumeLayout";
 import * as fontkit from 'fontkit';
+export type ElementPath = {
+    tag: 'none';
+} | {
+    tag: 'section';
+    section: string;
+} | {
+    tag: 'item';
+    section: string;
+    item: number;
+} | {
+    tag: 'field';
+    section: string;
+    item: number;
+    field: string;
+};
 export declare class ElementBox {
     bounding_box: Box;
     elements: [Box, Elem][];
+    path?: ElementPath;
     constructor(bounding_box: Box, elements: [Box, Elem][]);
     move_y_by(y: number): ElementBox;
     move_x_by(x: number): ElementBox;

package/dist/AnyLayout.js

@@ -30,6 +30,7 @@ class ElementBox {
     constructor(bounding_box, elements) {
         this.bounding_box = bounding_box;
         this.elements = elements;
+        this.path = { tag: 'none' };
     }
     move_y_by(y) {
         this.bounding_box = this.bounding_box.move_y_by(y);
@@ -58,9 +59,7 @@ class FontDict {
                 console.log(`Font ${font.full_name()} is already loaded`);
                 continue;
             }
-            console.log(`Source ${font.source}`);
             const font_data = await storage.load_font(font);
-            console.error(font_data);
             const fontkit_font = fontkit.create(font_data);
             this.fonts.set(font.full_name(), fontkit_font);
         }
@@ -99,7 +98,6 @@ async function render({ resume, layout_schemas, data_schemas, resume_layout, sto
         console.info(`Font loading time: ${end_time - start_time}ms for section ${section.section_name}`);
         // 2. Find the data schema for the section
         const _data_schema = data_schemas.find(s => s.schema_name === section.data_schema);
-        console.error(data_schemas);
         if (_data_schema === undefined) {
             throw new Error(`Could not find data schema ${section.data_schema}`);
         }
@@ -113,12 +111,16 @@ async function render({ resume, layout_schemas, data_schemas, resume_layout, sto
             .compute_boxes(font_dict);
         end_time = Date.now();
         console.info(`Header rendering time: ${end_time - start_time}ms for section ${section.section_name}`);
+        result.path = {
+            tag: 'section',
+            section: section.section_name
+        };
         boxes.push(result);
         start_time = Date.now();
         // Render Section Items
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         // @ts-nocheck
-        for (const [_, item] of section.items.entries()) {
+        for (const [index, item] of section.items.entries()) {
             console.log("Computing item");
             // 1. Find the layout schema for the section
             const layout_schema = layout_schemas
@@ -139,6 +141,11 @@ async function render({ resume, layout_schemas, data_schemas, resume_layout, sto
                 .instantiate(item.fields)
                 .normalize(column_width, font_dict)
                 .compute_boxes(font_dict);
+            result.path = {
+                tag: 'item',
+                section: section.section_name,
+                item: index
+            };
             boxes.push(result);
         }
         end_time = Date.now();

package/dist/DataSchema.d.ts

@@ -24,4 +24,9 @@ export declare class DataSchema {
     item_schema: Field[];
     constructor(schema_name: string, header_schema: Field[], item_schema: Field[]);
     static fromJson(json: unknown): DataSchema;
+    toJson(): {
+        schema_name: string;
+        header_schema: Field[];
+        item_schema: Field[];
+    };
 }

package/dist/DataSchema.js

@@ -16,5 +16,12 @@ class DataSchema {
         }
         return new DataSchema(json.schema_name, json.header_schema, json.item_schema);
     }
+    toJson() {
+        return {
+            schema_name: this.schema_name,
+            header_schema: this.header_schema,
+            item_schema: this.item_schema,
+        };
+    }
 }
 exports.DataSchema = DataSchema;

package/dist/Layout.d.ts

@@ -42,7 +42,8 @@ export declare class Stack {
     margin: Margin;
     alignment: Alignment;
     width: Width;
-    constructor(elements: SectionLayout[], margin: Margin, alignment: Alignment, width: Width);
+    constructor(elements: SectionLayout[], margin?: Margin, alignment?: Alignment, width?: Width);
+    static stack(elements: SectionLayout[], margin?: Margin, alignment?: Alignment, width?: Width): SectionLayout;
     copy(): Stack;
     static default_(): Stack;
     instantiate(section: Map<string, ItemContent>): Stack;
@@ -60,7 +61,8 @@ export declare class Row {
     alignment: Alignment;
     width: Width;
     is_frozen: boolean;
-    constructor(elements: SectionLayout[], is_frozen: boolean, margin: Margin, alignment: Alignment, width: Width);
+    constructor(elements: SectionLayout[], is_frozen?: boolean, margin?: Margin, alignment?: Alignment, width?: Width);
+    static row(elements: SectionLayout[], is_frozen?: boolean, margin?: Margin, alignment?: Alignment, width?: Width): SectionLayout;
     copy(): Row;
     static default_(): Row;
     instantiate(section: Map<string, ItemContent>): Row;
@@ -85,9 +87,12 @@ export declare class Elem {
     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;
     copy(): Elem;
     static default_(): Elem;
     with_item(item: string): Elem;
+    as_ref(): Elem;
+    with_font(font: Font): Elem;
     with_url(url: string): Elem;
     with_margin(margin: Margin): Elem;
     with_alignment(alignment: Alignment): Elem;

package/dist/Layout.js

@@ -333,15 +333,18 @@ class Stack {
     constructor(elements, margin, alignment, width) {
         this.tag = "Stack";
         this.elements = elements;
-        this.margin = margin;
-        this.alignment = alignment;
-        this.width = width;
+        this.margin = margin !== null && margin !== void 0 ? margin : Margin_1.Margin.default_();
+        this.alignment = alignment !== null && alignment !== void 0 ? alignment : Alignment_1.Alignment.default_();
+        this.width = width !== null && width !== void 0 ? width : Width_1.Width.default_();
+    }
+    static stack(elements, margin, alignment, width) {
+        return new SectionLayout(new Stack(elements, margin, alignment, width));
     }
     copy() {
         return new Stack(this.elements.map((e) => e.copy()), this.margin.copy(), this.alignment, Width_1.Width.copy(this.width));
     }
     static default_() {
-        return new Stack([], Margin_1.Margin.default_(), Alignment_1.Alignment.default_(), Width_1.Width.default_());
+        return new Stack([]);
     }
     instantiate(section) {
         return new Stack(this.elements.map(e => e.instantiate(section)), this.margin, this.alignment, this.width);
@@ -376,16 +379,19 @@ class Row {
     constructor(elements, is_frozen, margin, alignment, width) {
         this.tag = "Row";
         this.elements = elements;
-        this.is_frozen = is_frozen;
-        this.margin = margin;
-        this.alignment = alignment;
-        this.width = width;
+        this.is_frozen = is_frozen !== null && is_frozen !== void 0 ? is_frozen : false;
+        this.margin = margin !== null && margin !== void 0 ? margin : Margin_1.Margin.default_();
+        this.alignment = alignment !== null && alignment !== void 0 ? alignment : Alignment_1.Alignment.default_();
+        this.width = width !== null && width !== void 0 ? width : Width_1.Width.default_();
+    }
+    static row(elements, is_frozen, margin, alignment, width) {
+        return new SectionLayout(new Row(elements, is_frozen, margin, alignment, width));
     }
     copy() {
         return new Row(this.elements.map((e) => e.copy()), this.is_frozen, this.margin.copy(), this.alignment, Width_1.Width.copy(this.width));
     }
     static default_() {
-        return new Row([], false, Margin_1.Margin.default_(), Alignment_1.Alignment.default_(), Width_1.Width.default_());
+        return new Row([]);
     }
     instantiate(section) {
         return new Row(this.elements.map(e => e.instantiate(section)), this.is_frozen, this.margin, this.alignment, this.width);
@@ -454,6 +460,9 @@ class Elem {
         this.alignment = alignment;
         this.width = width;
     }
+    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));
+    }
     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));
     }
@@ -463,6 +472,12 @@ class Elem {
     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);
     }
+    as_ref() {
+        return new Elem(this.item, this.url, true, this.is_fill, this.text_width, this.font, this.margin, this.alignment, this.width);
+    }
+    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);
+    }
     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);
     }

package/dist/LayoutSchema.js

@@ -13,7 +13,6 @@ class LayoutSchema {
         return new LayoutSchema(schema_name, data_schema_name, Layout_1.SectionLayout.empty(), Layout_1.SectionLayout.empty());
     }
     static fromJson(json) {
-        console.error(json);
         return new LayoutSchema(json.schema_name, json.data_schema_name, Layout_1.SectionLayout.fromJson(json.header_layout_schema), Layout_1.SectionLayout.fromJson(json.item_layout_schema));
     }
     fonts() {

package/dist/LocalStorage.d.ts

@@ -15,7 +15,7 @@ export declare class LocalStorage {
     load_layout_schema(schema_name: string): LayoutSchema;
     load_resume_layout(schema_name: string): ResumeLayout;
     save_resume(resume_name: string, resume_data: Resume): void;
-    save_data_schema(data_schema: DataSchema): Promise<void>;
+    save_data_schema(data_schema: DataSchema): void;
     save_layout_schema(layout_schema: LayoutSchema): void;
     save_resume_layout(resume_layout: ResumeLayout): void;
     load_font(font: Font): Promise<Buffer>;

package/dist/LocalStorage.js

@@ -23,7 +23,7 @@ class LocalStorage {
             });
         }
         if (!localStorage.getItem("section_layouts")) {
-            fetch("https://d2bnplhbawocbk.cloudfront.net/data/layout-schemas2.json").then((response) => {
+            fetch("https://d2bnplhbawocbk.cloudfront.net/data/layout-schemas3.json").then((response) => {
                 response.json().then((section_layouts) => {
                     localStorage.setItem("section_layouts", JSON.stringify(section_layouts));
                 });
@@ -54,25 +54,23 @@ class LocalStorage {
         return schemas;
     }
     load_resume(resume_name) {
-        console.log(resume_name);
         const resume = JSON.parse(localStorage.getItem("resumes") || "[]").find((resume) => resume.name === resume_name);
         if (!resume) {
-            throw new Error("Resume not found");
+            throw new Error(`Resume(${resume_name}) not found`);
         }
         return Resume_1.Resume.fromJson(resume.data);
     }
     load_data_schema(schema_name) {
-        console.error(schema_name);
         const schema = JSON.parse(localStorage.getItem("data_schemas") || "[]").find((schema) => schema.schema_name === schema_name);
         if (!schema) {
-            throw new Error("Data schema not found");
+            throw new Error(`Data Schema(${schema_name}) not found`);
         }
         return DataSchema_1.DataSchema.fromJson(schema);
     }
     load_layout_schema(schema_name) {
         const schema = JSON.parse(localStorage.getItem("section_layouts") || "[]").find((schema) => schema.schema_name === schema_name);
         if (!schema) {
-            throw new Error("Layout schema not found");
+            throw new Error(`Layout Schema(${schema_name}) not found`);
         }
         return LayoutSchema_1.LayoutSchema.fromJson(schema);
     }
@@ -80,7 +78,7 @@ class LocalStorage {
         console.log(schema_name);
         const schema = JSON.parse(localStorage.getItem("resume_layouts") || "[]").find((schema) => schema.schema_name === schema_name);
         if (!schema) {
-            throw new Error("Resume layout not found");
+            throw new Error(`Resume Layout(${schema_name}) not found`);
         }
         console.info(schema);
         return ResumeLayout_1.ResumeLayout.fromJson(schema);
@@ -97,7 +95,17 @@ class LocalStorage {
         localStorage.setItem("resumes", JSON.stringify(resumes));
     }
     save_data_schema(data_schema) {
-        throw new Error("Method not implemented.");
+        const schemasDirectMapped = JSON.parse(localStorage.getItem("data_schemas") || "[]");
+        const schemas = schemasDirectMapped.map((schema) => DataSchema_1.DataSchema.fromJson(schema));
+        const schema = schemas.find((schema) => schema.schema_name === data_schema.schema_name);
+        if (!schema) {
+            schemas.push(data_schema);
+        }
+        else {
+            schema.header_schema = data_schema.header_schema;
+            schema.item_schema = data_schema.item_schema;
+        }
+        localStorage.setItem("data_schemas", JSON.stringify(schemas.map((schema) => schema.toJson())));
     }
     save_layout_schema(layout_schema) {
         const schemasDirectMapped = JSON.parse(localStorage.getItem("section_layouts") || "[]");
@@ -110,14 +118,12 @@ class LocalStorage {
             schema.header_layout_schema = layout_schema.header_layout_schema;
             schema.item_layout_schema = layout_schema.item_layout_schema;
         }
-        console.error(schemas);
         localStorage.setItem("section_layouts", JSON.stringify(schemas.map((schema) => schema.toJson())));
     }
     save_resume_layout(resume_layout) {
         throw new Error("Method not implemented.");
     }
     async load_font(font) {
-        console.error(font);
         const path = `fonts/${font.full_name()}.ttf`;
         if (!localStorage.getItem(path)) {
             const response = await fetch(`https://d2bnplhbawocbk.cloudfront.net/data/${path}`);

package/dist/Resume.js

@@ -35,8 +35,6 @@ class Resume {
         }
     }
     data_schemas() {
-        console.error(this.sections);
-        console.error(this.sections.map(section => section.data_schema));
         return this.sections.map(section => section.data_schema);
     }
     layout_schemas() {

package/package.json

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