md-spreadsheet-parser 1.1.2 → 1.1.3

package/dist/index.d.ts

@@ -24,6 +24,7 @@ export declare class Table {
     startLine: number | undefined;
     endLine: number | undefined;
     constructor(data?: Partial<Table>);
+    toDTO(): any;
     toModels(schemaCls: any, conversionSchema?: any): any;
     toMarkdown(schema?: any): any;
     updateCell(rowIdx: any, colIdx: any, value: any): any;
@@ -38,6 +39,7 @@ export declare class Sheet {
     tables: any[] | undefined;
     metadata: any | undefined;
     constructor(data?: Partial<Sheet>);
+    toDTO(): any;
     getTable(name: any): any;
     toMarkdown(schema?: any): any;
 }
@@ -45,6 +47,7 @@ export declare class Workbook {
     sheets: any[] | undefined;
     metadata: any | undefined;
     constructor(data?: Partial<Workbook>);
+    toDTO(): any;
     getSheet(name: any): any;
     toMarkdown(schema: any): any;
     addSheet(name: any): any;
@@ -57,6 +60,7 @@ export declare class ParsingSchema {
     stripWhitespace: boolean | undefined;
     convertBrToNewline: boolean | undefined;
     constructor(data?: Partial<ParsingSchema>);
+    toDTO(): any;
 }
 export declare class MultiTableParsingSchema {
     columnSeparator: string | undefined;
@@ -69,12 +73,14 @@ export declare class MultiTableParsingSchema {
     tableHeaderLevel: number | undefined;
     captureDescription: boolean | undefined;
     constructor(data?: Partial<MultiTableParsingSchema>);
+    toDTO(): any;
 }
 export declare class ConversionSchema {
     booleanPairs: string | undefined;
     customConverters: string | undefined;
     fieldConverters: string | undefined;
     constructor(data?: Partial<ConversionSchema>);
+    toDTO(): any;
 }
 export declare class ExcelParsingSchema {
     headerRows: number | undefined;
@@ -82,4 +88,5 @@ export declare class ExcelParsingSchema {
     delimiter: string | undefined;
     headerSeparator: string | undefined;
     constructor(data?: Partial<ExcelParsingSchema>);
+    toDTO(): any;
 }

package/dist/index.js

@@ -77,10 +77,14 @@ export class Table {
             this.endLine = data.endLine;
         }
     }
-    toModels(schemaCls, conversionSchema) {
+    toDTO() {
         const dto = { ...this };
         if (dto.metadata)
             dto.metadata = JSON.stringify(dto.metadata);
+        return dto;
+    }
+    toModels(schemaCls, conversionSchema) {
+        const dto = this.toDTO();
         const clientRes = clientSideToModels(this.headers, this.rows || [], schemaCls);
         if (clientRes) {
             return clientRes;
@@ -89,56 +93,42 @@ export class Table {
         return res.map((x) => JSON.parse(x));
     }
     toMarkdown(schema) {
-        const dto = { ...this };
-        if (dto.metadata)
-            dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableToMarkdown(dto, schema);
         return res;
     }
     updateCell(rowIdx, colIdx, value) {
-        const dto = { ...this };
-        if (dto.metadata)
-            dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableUpdateCell(dto, rowIdx, colIdx, value);
         Object.assign(this, res);
         return this;
     }
     deleteRow(rowIdx) {
-        const dto = { ...this };
-        if (dto.metadata)
-            dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableDeleteRow(dto, rowIdx);
         Object.assign(this, res);
         return this;
     }
     deleteColumn(colIdx) {
-        const dto = { ...this };
-        if (dto.metadata)
-            dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableDeleteColumn(dto, colIdx);
         Object.assign(this, res);
         return this;
     }
     clearColumnData(colIdx) {
-        const dto = { ...this };
-        if (dto.metadata)
-            dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableClearColumnData(dto, colIdx);
         Object.assign(this, res);
         return this;
     }
     insertRow(rowIdx) {
-        const dto = { ...this };
-        if (dto.metadata)
-            dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableInsertRow(dto, rowIdx);
         Object.assign(this, res);
         return this;
     }
     insertColumn(colIdx) {
-        const dto = { ...this };
-        if (dto.metadata)
-            dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableInsertColumn(dto, colIdx);
         Object.assign(this, res);
         return this;
@@ -152,17 +142,21 @@ export class Sheet {
             this.metadata = (typeof data.metadata === 'string') ? JSON.parse(data.metadata) : data.metadata;
         }
     }
-    getTable(name) {
+    toDTO() {
         const dto = { ...this };
+        if (dto.tables)
+            dto.tables = dto.tables.map((x) => x.toDTO ? x.toDTO() : x);
         if (dto.metadata)
             dto.metadata = JSON.stringify(dto.metadata);
+        return dto;
+    }
+    getTable(name) {
+        const dto = this.toDTO();
         const res = _sheetGetTable(dto, name);
-        return res;
+        return res ? new Table(res) : undefined;
     }
     toMarkdown(schema) {
-        const dto = { ...this };
-        if (dto.metadata)
-            dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _sheetToMarkdown(dto, schema);
         return res;
     }
@@ -174,32 +168,32 @@ export class Workbook {
             this.metadata = (typeof data.metadata === 'string') ? JSON.parse(data.metadata) : data.metadata;
         }
     }
-    getSheet(name) {
+    toDTO() {
         const dto = { ...this };
+        if (dto.sheets)
+            dto.sheets = dto.sheets.map((x) => x.toDTO ? x.toDTO() : x);
         if (dto.metadata)
             dto.metadata = JSON.stringify(dto.metadata);
+        return dto;
+    }
+    getSheet(name) {
+        const dto = this.toDTO();
         const res = _workbookGetSheet(dto, name);
-        return res;
+        return res ? new Sheet(res) : undefined;
     }
     toMarkdown(schema) {
-        const dto = { ...this };
-        if (dto.metadata)
-            dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _workbookToMarkdown(dto, schema);
         return res;
     }
     addSheet(name) {
-        const dto = { ...this };
-        if (dto.metadata)
-            dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _workbookAddSheet(dto, name);
         Object.assign(this, res);
         return this;
     }
     deleteSheet(index) {
-        const dto = { ...this };
-        if (dto.metadata)
-            dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _workbookDeleteSheet(dto, index);
         Object.assign(this, res);
         return this;
@@ -215,6 +209,10 @@ export class ParsingSchema {
             this.convertBrToNewline = data.convertBrToNewline;
         }
     }
+    toDTO() {
+        const dto = { ...this };
+        return dto;
+    }
 }
 export class MultiTableParsingSchema {
     constructor(data) {
@@ -230,6 +228,10 @@ export class MultiTableParsingSchema {
             this.captureDescription = data.captureDescription;
         }
     }
+    toDTO() {
+        const dto = { ...this };
+        return dto;
+    }
 }
 export class ConversionSchema {
     constructor(data) {
@@ -239,6 +241,14 @@ export class ConversionSchema {
             this.fieldConverters = (typeof data.fieldConverters === 'string') ? JSON.parse(data.fieldConverters) : data.fieldConverters;
         }
     }
+    toDTO() {
+        const dto = { ...this };
+        if (dto.customConverters)
+            dto.customConverters = JSON.stringify(dto.customConverters);
+        if (dto.fieldConverters)
+            dto.fieldConverters = JSON.stringify(dto.fieldConverters);
+        return dto;
+    }
 }
 export class ExcelParsingSchema {
     constructor(data) {
@@ -249,4 +259,8 @@ export class ExcelParsingSchema {
             this.headerSeparator = data.headerSeparator;
         }
     }
+    toDTO() {
+        const dto = { ...this };
+        return dto;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "md-spreadsheet-parser",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "description": "A robust Markdown table parser and manipulator, powered by Python and WebAssembly.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",

package/src/index.ts

@@ -105,9 +105,14 @@ export class Table {
         }
     }
 
-    toModels(schemaCls: any, conversionSchema?: any): any {
+    toDTO(): any {
         const dto = { ...this } as any;
         if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        return dto;
+    }
+
+    toModels(schemaCls: any, conversionSchema?: any): any {
+        const dto = this.toDTO();
         const clientRes = clientSideToModels(this.headers, this.rows || [], schemaCls);
         if (clientRes) {
             return clientRes;
@@ -117,55 +122,48 @@ export class Table {
     }
 
     toMarkdown(schema?: any): any {
-        const dto = { ...this } as any;
-        if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableToMarkdown(dto, schema);
         return res;
     }
 
     updateCell(rowIdx: any, colIdx: any, value: any): any {
-        const dto = { ...this } as any;
-        if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableUpdateCell(dto, rowIdx, colIdx, value);
         Object.assign(this, res);
         return this;
     }
 
     deleteRow(rowIdx: any): any {
-        const dto = { ...this } as any;
-        if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableDeleteRow(dto, rowIdx);
         Object.assign(this, res);
         return this;
     }
 
     deleteColumn(colIdx: any): any {
-        const dto = { ...this } as any;
-        if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableDeleteColumn(dto, colIdx);
         Object.assign(this, res);
         return this;
     }
 
     clearColumnData(colIdx: any): any {
-        const dto = { ...this } as any;
-        if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableClearColumnData(dto, colIdx);
         Object.assign(this, res);
         return this;
     }
 
     insertRow(rowIdx: any): any {
-        const dto = { ...this } as any;
-        if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableInsertRow(dto, rowIdx);
         Object.assign(this, res);
         return this;
     }
 
     insertColumn(colIdx: any): any {
-        const dto = { ...this } as any;
-        if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _tableInsertColumn(dto, colIdx);
         Object.assign(this, res);
         return this;
@@ -185,16 +183,21 @@ export class Sheet {
         }
     }
 
-    getTable(name: any): any {
+    toDTO(): any {
         const dto = { ...this } as any;
+        if (dto.tables) dto.tables = dto.tables.map((x: any) => x.toDTO ? x.toDTO() : x);
         if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        return dto;
+    }
+
+    getTable(name: any): any {
+        const dto = this.toDTO();
         const res = _sheetGetTable(dto, name);
-        return res;
+        return res ? new Table(res) : undefined;
     }
 
     toMarkdown(schema?: any): any {
-        const dto = { ...this } as any;
-        if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _sheetToMarkdown(dto, schema);
         return res;
     }
@@ -211,31 +214,34 @@ export class Workbook {
         }
     }
 
-    getSheet(name: any): any {
+    toDTO(): any {
         const dto = { ...this } as any;
+        if (dto.sheets) dto.sheets = dto.sheets.map((x: any) => x.toDTO ? x.toDTO() : x);
         if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        return dto;
+    }
+
+    getSheet(name: any): any {
+        const dto = this.toDTO();
         const res = _workbookGetSheet(dto, name);
-        return res;
+        return res ? new Sheet(res) : undefined;
     }
 
     toMarkdown(schema: any): any {
-        const dto = { ...this } as any;
-        if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _workbookToMarkdown(dto, schema);
         return res;
     }
 
     addSheet(name: any): any {
-        const dto = { ...this } as any;
-        if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _workbookAddSheet(dto, name);
         Object.assign(this, res);
         return this;
     }
 
     deleteSheet(index: any): any {
-        const dto = { ...this } as any;
-        if (dto.metadata) dto.metadata = JSON.stringify(dto.metadata);
+        const dto = this.toDTO();
         const res = _workbookDeleteSheet(dto, index);
         Object.assign(this, res);
         return this;
@@ -258,6 +264,11 @@ export class ParsingSchema {
             this.convertBrToNewline = data.convertBrToNewline;
         }
     }
+
+    toDTO(): any {
+        const dto = { ...this } as any;
+        return dto;
+    }
 }
 
 export class MultiTableParsingSchema {
@@ -284,6 +295,11 @@ export class MultiTableParsingSchema {
             this.captureDescription = data.captureDescription;
         }
     }
+
+    toDTO(): any {
+        const dto = { ...this } as any;
+        return dto;
+    }
 }
 
 export class ConversionSchema {
@@ -298,6 +314,13 @@ export class ConversionSchema {
             this.fieldConverters = (typeof data.fieldConverters === 'string') ? JSON.parse(data.fieldConverters) : data.fieldConverters;
         }
     }
+
+    toDTO(): any {
+        const dto = { ...this } as any;
+        if (dto.customConverters) dto.customConverters = JSON.stringify(dto.customConverters);
+        if (dto.fieldConverters) dto.fieldConverters = JSON.stringify(dto.fieldConverters);
+        return dto;
+    }
 }
 
 export class ExcelParsingSchema {
@@ -314,4 +337,9 @@ export class ExcelParsingSchema {
             this.headerSeparator = data.headerSeparator;
         }
     }
+
+    toDTO(): any {
+        const dto = { ...this } as any;
+        return dto;
+    }
 }