@microsoft/connected-workbooks 2.1.16-beta → 2.1.24-beta

package/dist/utils/mashupDocumentParser.js

@@ -3,7 +3,11 @@
 // Licensed under the MIT license.
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -33,134 +37,127 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.replaceSingleQuery = void 0;
 const base64 = __importStar(require("base64-js"));
 const jszip_1 = __importDefault(require("jszip"));
 const constants_1 = require("./constants");
 const _1 = require(".");
-class MashupHandler {
-    constructor() {
-        this.setSection1m = (queryMashupDoc, zip) => {
-            var _a;
-            if (!((_a = zip.file(constants_1.section1mPath)) === null || _a === void 0 ? void 0 : _a.async(constants_1.textResultType))) {
-                throw new Error(constants_1.formulaSectionNotFoundErr);
+const replaceSingleQuery = (base64Str, queryName, queryMashupDoc) => __awaiter(void 0, void 0, void 0, function* () {
+    const { version, packageOPC, permissionsSize, permissions, metadata, endBuffer } = getPackageComponents(base64Str);
+    const newPackageBuffer = yield editSingleQueryPackage(packageOPC, queryMashupDoc);
+    const packageSizeBuffer = _1.arrayUtils.getInt32Buffer(newPackageBuffer.byteLength);
+    const permissionsSizeBuffer = _1.arrayUtils.getInt32Buffer(permissionsSize);
+    const newMetadataBuffer = editSingleQueryMetadata(metadata, { queryName });
+    const metadataSizeBuffer = _1.arrayUtils.getInt32Buffer(newMetadataBuffer.byteLength);
+    const newMashup = _1.arrayUtils.concatArrays(version, packageSizeBuffer, newPackageBuffer, permissionsSizeBuffer, permissions, metadataSizeBuffer, newMetadataBuffer, endBuffer);
+    return base64.fromByteArray(newMashup);
+});
+exports.replaceSingleQuery = replaceSingleQuery;
+const getPackageComponents = (base64Str) => {
+    const buffer = base64.toByteArray(base64Str).buffer;
+    const mashupArray = new _1.arrayUtils.ArrayReader(buffer);
+    const version = mashupArray.getBytes(4);
+    const packageSize = mashupArray.getInt32();
+    const packageOPC = mashupArray.getBytes(packageSize);
+    const permissionsSize = mashupArray.getInt32();
+    const permissions = mashupArray.getBytes(permissionsSize);
+    const metadataSize = mashupArray.getInt32();
+    const metadata = mashupArray.getBytes(metadataSize);
+    const endBuffer = mashupArray.getBytes();
+    return {
+        version,
+        packageOPC,
+        permissionsSize,
+        permissions,
+        metadata,
+        endBuffer,
+    };
+};
+const editSingleQueryPackage = (packageOPC, queryMashupDoc) => __awaiter(void 0, void 0, void 0, function* () {
+    const packageZip = yield jszip_1.default.loadAsync(packageOPC);
+    setSection1m(queryMashupDoc, packageZip);
+    return yield packageZip.generateAsync({ type: constants_1.uint8ArrayType });
+});
+const setSection1m = (queryMashupDoc, zip) => {
+    var _a;
+    if (!((_a = zip.file(constants_1.section1mPath)) === null || _a === void 0 ? void 0 : _a.async(constants_1.textResultType))) {
+        throw new Error(constants_1.formulaSectionNotFoundErr);
+    }
+    const newSection1m = queryMashupDoc;
+    zip.file(constants_1.section1mPath, newSection1m, {
+        compression: constants_1.emptyValue,
+    });
+};
+const editSingleQueryMetadata = (metadataArray, metadata) => {
+    var _a;
+    //extract metadataXml
+    const mashupArray = new _1.arrayUtils.ArrayReader(metadataArray.buffer);
+    const metadataVersion = mashupArray.getBytes(4);
+    const metadataXmlSize = mashupArray.getInt32();
+    const metadataXml = mashupArray.getBytes(metadataXmlSize);
+    const endBuffer = mashupArray.getBytes();
+    //parse metdataXml
+    const textDecoder = new TextDecoder();
+    const metadataString = textDecoder.decode(metadataXml);
+    const parser = new DOMParser();
+    const serializer = new XMLSerializer();
+    const parsedMetadata = parser.parseFromString(metadataString, constants_1.xmlTextResultType);
+    // Update InfoPaths to new QueryName
+    const itemPaths = parsedMetadata.getElementsByTagName(constants_1.element.itemPath);
+    if (itemPaths && itemPaths.length) {
+        for (let i = 0; i < itemPaths.length; i++) {
+            const itemPath = itemPaths[i];
+            const content = itemPath.innerHTML;
+            if (content.includes(constants_1.section1PathPrefix)) {
+                const strArr = content.split(constants_1.divider);
+                strArr[1] = metadata.queryName;
+                const newContent = strArr.join(constants_1.divider);
+                itemPath.textContent = newContent;
             }
-            const newSection1m = queryMashupDoc;
-            zip.file(constants_1.section1mPath, newSection1m, {
-                compression: constants_1.emptyValue,
+        }
+    }
+    const entries = parsedMetadata.getElementsByTagName(constants_1.element.entry);
+    if (entries && entries.length) {
+        for (let i = 0; i < entries.length; i++) {
+            const entry = entries[i];
+            const entryAttributes = entry.attributes;
+            const entryAttributesArr = [...entryAttributes];
+            const entryProp = entryAttributesArr.find((prop) => {
+                return (prop === null || prop === void 0 ? void 0 : prop.name) === constants_1.elementAttributes.type;
             });
-        };
-        this.editSingleQueryMetadata = (metadataArray, metadata) => {
-            var _a;
-            //extract metadataXml
-            const mashupArray = new _1.arrayUtils.ArrayReader(metadataArray.buffer);
-            const metadataVersion = mashupArray.getBytes(4);
-            const metadataXmlSize = mashupArray.getInt32();
-            const metadataXml = mashupArray.getBytes(metadataXmlSize);
-            const endBuffer = mashupArray.getBytes();
-            //parse metdataXml
-            const textDecoder = new TextDecoder();
-            const metadataString = textDecoder.decode(metadataXml);
-            const parser = new DOMParser();
-            const serializer = new XMLSerializer();
-            const parsedMetadata = parser.parseFromString(metadataString, constants_1.xmlTextResultType);
-            // Update InfoPaths to new QueryName
-            const itemPaths = parsedMetadata.getElementsByTagName(constants_1.element.itemPath);
-            if (itemPaths && itemPaths.length) {
-                for (let i = 0; i < itemPaths.length; i++) {
-                    const itemPath = itemPaths[i];
-                    const content = itemPath.innerHTML;
-                    if (content.includes(constants_1.section1PathPrefix)) {
-                        const strArr = content.split(constants_1.divider);
-                        strArr[1] = metadata.queryName;
-                        const newContent = strArr.join(constants_1.divider);
-                        itemPath.textContent = newContent;
-                    }
+            if ((entryProp === null || entryProp === void 0 ? void 0 : entryProp.nodeValue) == constants_1.elementAttributes.relationshipInfo) {
+                const newValue = (_a = entry
+                    .getAttribute(constants_1.elementAttributes.value)) === null || _a === void 0 ? void 0 : _a.replace(/Query1/g, metadata.queryName);
+                if (newValue) {
+                    entry.setAttribute(constants_1.elementAttributes.value, newValue);
                 }
             }
-            const entries = parsedMetadata.getElementsByTagName(constants_1.element.entry);
-            if (entries && entries.length) {
-                for (let i = 0; i < entries.length; i++) {
-                    const entry = entries[i];
-                    const entryAttributes = entry.attributes;
-                    const entryAttributesArr = [...entryAttributes];
-                    const entryProp = entryAttributesArr.find((prop) => {
-                        return (prop === null || prop === void 0 ? void 0 : prop.name) === constants_1.elementAttributes.type;
-                    });
-                    if ((entryProp === null || entryProp === void 0 ? void 0 : entryProp.nodeValue) == constants_1.elementAttributes.relationshipInfo) {
-                        const newValue = (_a = entry
-                            .getAttribute(constants_1.elementAttributes.value)) === null || _a === void 0 ? void 0 : _a.replace(/Query1/g, metadata.queryName);
-                        if (newValue) {
-                            entry.setAttribute(constants_1.elementAttributes.value, newValue);
-                        }
-                    }
-                    if ((entryProp === null || entryProp === void 0 ? void 0 : entryProp.nodeValue) == constants_1.elementAttributes.resultType) {
-                        entry.setAttribute(constants_1.elementAttributes.value, constants_1.elementAttributesValues.tableResultType());
-                    }
-                    if ((entryProp === null || entryProp === void 0 ? void 0 : entryProp.nodeValue) == constants_1.elementAttributes.fillColumnNames) {
-                        const oldValue = entry.getAttribute(constants_1.elementAttributes.value);
-                        if (oldValue) {
-                            entry.setAttribute(constants_1.elementAttributes.value, oldValue.replace(constants_1.defaults.queryName, metadata.queryName));
-                        }
-                    }
-                    if ((entryProp === null || entryProp === void 0 ? void 0 : entryProp.nodeValue) == constants_1.elementAttributes.fillTarget) {
-                        const oldValue = entry.getAttribute(constants_1.elementAttributes.value);
-                        if (oldValue) {
-                            entry.setAttribute(constants_1.elementAttributes.value, oldValue.replace(constants_1.defaults.queryName, metadata.queryName));
-                        }
-                    }
-                    if ((entryProp === null || entryProp === void 0 ? void 0 : entryProp.nodeValue) == constants_1.elementAttributes.fillLastUpdated) {
-                        const nowTime = new Date().toISOString();
-                        entry.setAttribute(constants_1.elementAttributes.value, (constants_1.elementAttributes.day + nowTime).replace(/Z/, "0000Z"));
-                    }
+            if ((entryProp === null || entryProp === void 0 ? void 0 : entryProp.nodeValue) == constants_1.elementAttributes.resultType) {
+                entry.setAttribute(constants_1.elementAttributes.value, constants_1.elementAttributesValues.tableResultType());
+            }
+            if ((entryProp === null || entryProp === void 0 ? void 0 : entryProp.nodeValue) == constants_1.elementAttributes.fillColumnNames) {
+                const oldValue = entry.getAttribute(constants_1.elementAttributes.value);
+                if (oldValue) {
+                    entry.setAttribute(constants_1.elementAttributes.value, oldValue.replace(constants_1.defaults.queryName, metadata.queryName));
                 }
             }
-            // Convert new metadataXml to Uint8Array
-            const newMetadataString = serializer.serializeToString(parsedMetadata);
-            const encoder = new TextEncoder();
-            const newMetadataXml = encoder.encode(newMetadataString);
-            const newMetadataXmlSize = _1.arrayUtils.getInt32Buffer(newMetadataXml.byteLength);
-            const newMetadataArray = _1.arrayUtils.concatArrays(metadataVersion, newMetadataXmlSize, newMetadataXml, endBuffer);
-            return newMetadataArray;
-        };
-    }
-    ReplaceSingleQuery(base64Str, queryName, queryMashupDoc) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { version, packageOPC, permissionsSize, permissions, metadata, endBuffer } = this.getPackageComponents(base64Str);
-            const newPackageBuffer = yield this.editSingleQueryPackage(packageOPC, queryMashupDoc);
-            const packageSizeBuffer = _1.arrayUtils.getInt32Buffer(newPackageBuffer.byteLength);
-            const permissionsSizeBuffer = _1.arrayUtils.getInt32Buffer(permissionsSize);
-            const newMetadataBuffer = this.editSingleQueryMetadata(metadata, { queryName });
-            const metadataSizeBuffer = _1.arrayUtils.getInt32Buffer(newMetadataBuffer.byteLength);
-            const newMashup = _1.arrayUtils.concatArrays(version, packageSizeBuffer, newPackageBuffer, permissionsSizeBuffer, permissions, metadataSizeBuffer, newMetadataBuffer, endBuffer);
-            return base64.fromByteArray(newMashup);
-        });
-    }
-    getPackageComponents(base64Str) {
-        const buffer = base64.toByteArray(base64Str).buffer;
-        const mashupArray = new _1.arrayUtils.ArrayReader(buffer);
-        const version = mashupArray.getBytes(4);
-        const packageSize = mashupArray.getInt32();
-        const packageOPC = mashupArray.getBytes(packageSize);
-        const permissionsSize = mashupArray.getInt32();
-        const permissions = mashupArray.getBytes(permissionsSize);
-        const metadataSize = mashupArray.getInt32();
-        const metadata = mashupArray.getBytes(metadataSize);
-        const endBuffer = mashupArray.getBytes();
-        return {
-            version,
-            packageOPC,
-            permissionsSize,
-            permissions,
-            metadata,
-            endBuffer,
-        };
-    }
-    editSingleQueryPackage(packageOPC, queryMashupDoc) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const packageZip = yield jszip_1.default.loadAsync(packageOPC);
-            this.setSection1m(queryMashupDoc, packageZip);
-            return yield packageZip.generateAsync({ type: constants_1.uint8ArrayType });
-        });
+            if ((entryProp === null || entryProp === void 0 ? void 0 : entryProp.nodeValue) == constants_1.elementAttributes.fillTarget) {
+                const oldValue = entry.getAttribute(constants_1.elementAttributes.value);
+                if (oldValue) {
+                    entry.setAttribute(constants_1.elementAttributes.value, oldValue.replace(constants_1.defaults.queryName, metadata.queryName));
+                }
+            }
+            if ((entryProp === null || entryProp === void 0 ? void 0 : entryProp.nodeValue) == constants_1.elementAttributes.fillLastUpdated) {
+                const nowTime = new Date().toISOString();
+                entry.setAttribute(constants_1.elementAttributes.value, (constants_1.elementAttributes.day + nowTime).replace(/Z/, "0000Z"));
+            }
+        }
     }
-}
-exports.default = MashupHandler;
+    // Convert new metadataXml to Uint8Array
+    const newMetadataString = serializer.serializeToString(parsedMetadata);
+    const encoder = new TextEncoder();
+    const newMetadataXml = encoder.encode(newMetadataString);
+    const newMetadataXmlSize = _1.arrayUtils.getInt32Buffer(newMetadataXml.byteLength);
+    const newMetadataArray = _1.arrayUtils.concatArrays(metadataVersion, newMetadataXmlSize, newMetadataXml, endBuffer);
+    return newMetadataArray;
+};

package/dist/utils/pqUtils.js

@@ -10,11 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const iconv_lite_1 = __importDefault(require("iconv-lite"));
 const constants_1 = require("./constants");
 const generators_1 = require("../generators");
 const getBase64 = (zip) => __awaiter(void 0, void 0, void 0, function* () {
@@ -22,8 +18,8 @@ const getBase64 = (zip) => __awaiter(void 0, void 0, void 0, function* () {
     return mashup.value;
 });
 const setBase64 = (zip, base64) => __awaiter(void 0, void 0, void 0, function* () {
-    const newXml = generators_1.generateMashupXMLTemplate(base64);
-    const encoded = iconv_lite_1.default.encode(newXml, "UCS2", { addBOM: true });
+    const newXml = (0, generators_1.generateMashupXMLTemplate)(base64);
+    const encoded = Buffer.from(constants_1.BOM + newXml, 'ucs2');
     const mashup = yield getDataMashupFile(zip);
     zip.file(mashup === null || mashup === void 0 ? void 0 : mashup.path, encoded);
 });
@@ -41,7 +37,7 @@ const getDataMashupFile = (zip) => __awaiter(void 0, void 0, void 0, function* (
     }
     return mashup;
 });
-const getCustomXmlFile = (zip, url, encoding = "UTF-16") => __awaiter(void 0, void 0, void 0, function* () {
+const getCustomXmlFile = (zip, url, encoding = 'utf16le') => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
     const parser = new DOMParser();
     const itemsArray = yield zip.file(/customXml\/item\d.xml/);
@@ -53,12 +49,12 @@ const getCustomXmlFile = (zip, url, encoding = "UTF-16") => __awaiter(void 0, vo
     let xmlString;
     let value;
     for (let i = 1; i <= itemsArray.length; i++) {
-        path = generators_1.generateCustomXmlFilePath(i);
+        path = (0, generators_1.generateCustomXmlFilePath)(i);
         const xmlValue = yield ((_a = zip.file(path)) === null || _a === void 0 ? void 0 : _a.async("uint8array"));
         if (xmlValue === undefined) {
             break;
         }
-        xmlString = iconv_lite_1.default.decode(xmlValue.buffer, encoding);
+        xmlString = Buffer.from(xmlValue).toString(encoding).replace(/^\ufeff/, '');
         const doc = parser.parseFromString(xmlString, "text/xml");
         found = ((_b = doc === null || doc === void 0 ? void 0 : doc.documentElement) === null || _b === void 0 ? void 0 : _b.namespaceURI) === url;
         if (found) {

package/dist/utils/tableUtils.js

@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const types_1 = require("../types");
 const constants_1 = require("./constants");
 const documentUtils_1 = __importDefault(require("./documentUtils"));
 const uuid_1 = require("uuid");
@@ -55,35 +54,34 @@ const updateTablesInitialData = (tableXmlString, tableData, updateQueryTable = f
     const tableDoc = parser.parseFromString(tableXmlString, constants_1.xmlTextResultType);
     const tableColumns = tableDoc.getElementsByTagName(constants_1.element.tableColumns)[0];
     tableColumns.textContent = "";
-    tableData.columnMetadata.forEach((col, columnIndex) => {
+    tableData.columnNames.forEach((column, columnIndex) => {
         const tableColumn = tableDoc.createElementNS(tableDoc.documentElement.namespaceURI, constants_1.element.tableColumn);
         tableColumn.setAttribute(constants_1.elementAttributes.id, (columnIndex + 1).toString());
-        tableColumn.setAttribute(constants_1.elementAttributes.name, col.name);
+        tableColumn.setAttribute(constants_1.elementAttributes.name, column);
         tableColumns.appendChild(tableColumn);
-        tableColumn.setAttribute(constants_1.elementAttributes.xr3uid, "{" + uuid_1.v4().toUpperCase() + "}");
+        tableColumn.setAttribute(constants_1.elementAttributes.xr3uid, "{" + (0, uuid_1.v4)().toUpperCase() + "}");
         if (updateQueryTable) {
             tableColumn.setAttribute(constants_1.elementAttributes.uniqueName, (columnIndex + 1).toString());
             tableColumn.setAttribute(constants_1.elementAttributes.queryTableFieldId, (columnIndex + 1).toString());
         }
     });
-    tableColumns.setAttribute(constants_1.elementAttributes.count, tableData.columnMetadata.length.toString());
+    tableColumns.setAttribute(constants_1.elementAttributes.count, tableData.columnNames.length.toString());
     tableDoc
         .getElementsByTagName(constants_1.element.table)[0]
-        .setAttribute(constants_1.elementAttributes.reference, `A1:${documentUtils_1.default.getCellReferenceRelative(tableData.columnMetadata.length - 1, tableData.rows.length + 1)}`);
+        .setAttribute(constants_1.elementAttributes.reference, `A1:${documentUtils_1.default.getCellReferenceRelative(tableData.columnNames.length - 1, tableData.rows.length + 1)}`);
     tableDoc
         .getElementsByTagName(constants_1.element.autoFilter)[0]
-        .setAttribute(constants_1.elementAttributes.reference, `A1:${documentUtils_1.default.getCellReferenceRelative(tableData.columnMetadata.length - 1, tableData.rows.length + 1)}`);
+        .setAttribute(constants_1.elementAttributes.reference, `A1:${documentUtils_1.default.getCellReferenceRelative(tableData.columnNames.length - 1, tableData.rows.length + 1)}`);
     return serializer.serializeToString(tableDoc);
 });
-const updateWorkbookInitialData = (workbookXmlString, tableData, queryName) => __awaiter(void 0, void 0, void 0, function* () {
+const updateWorkbookInitialData = (workbookXmlString, tableData) => __awaiter(void 0, void 0, void 0, function* () {
     const newParser = new DOMParser();
     const newSerializer = new XMLSerializer();
     const workbookDoc = newParser.parseFromString(workbookXmlString, constants_1.xmlTextResultType);
     const definedName = workbookDoc.getElementsByTagName(constants_1.element.definedName)[0];
-    const prefix = queryName === undefined ? constants_1.defaults.queryName : queryName;
     definedName.textContent =
-        prefix +
-            `!$A$1:${documentUtils_1.default.getCellReferenceAbsolute(tableData.columnMetadata.length - 1, tableData.rows.length + 1)}`;
+        constants_1.defaults.sheetName +
+            `!$A$1:${documentUtils_1.default.getCellReferenceAbsolute(tableData.columnNames.length - 1, tableData.rows.length + 1)}`;
     return newSerializer.serializeToString(workbookDoc);
 });
 const updateQueryTablesInitialData = (queryTableXmlString, tableData) => __awaiter(void 0, void 0, void 0, function* () {
@@ -92,17 +90,17 @@ const updateQueryTablesInitialData = (queryTableXmlString, tableData) => __await
     const queryTableDoc = parser.parseFromString(queryTableXmlString, constants_1.xmlTextResultType);
     const queryTableFields = queryTableDoc.getElementsByTagName(constants_1.element.queryTableFields)[0];
     queryTableFields.textContent = "";
-    tableData.columnMetadata.forEach((col, columnIndex) => {
+    tableData.columnNames.forEach((column, columnIndex) => {
         const queryTableField = queryTableDoc.createElementNS(queryTableDoc.documentElement.namespaceURI, constants_1.element.queryTableField);
         queryTableField.setAttribute(constants_1.elementAttributes.id, (columnIndex + 1).toString());
-        queryTableField.setAttribute(constants_1.elementAttributes.name, col.name);
+        queryTableField.setAttribute(constants_1.elementAttributes.name, column);
         queryTableField.setAttribute(constants_1.elementAttributes.tableColumnId, (columnIndex + 1).toString());
         queryTableFields.appendChild(queryTableField);
     });
-    queryTableFields.setAttribute(constants_1.elementAttributes.count, tableData.columnMetadata.length.toString());
+    queryTableFields.setAttribute(constants_1.elementAttributes.count, tableData.columnNames.length.toString());
     queryTableDoc
         .getElementsByTagName(constants_1.element.queryTableRefresh)[0]
-        .setAttribute(constants_1.elementAttributes.nextId, (tableData.columnMetadata.length + 1).toString());
+        .setAttribute(constants_1.elementAttributes.nextId, (tableData.columnNames.length + 1).toString());
     return serializer.serializeToString(queryTableDoc);
 });
 const updateSheetsInitialData = (sheetsXmlString, tableData) => __awaiter(void 0, void 0, void 0, function* () {
@@ -114,10 +112,10 @@ const updateSheetsInitialData = (sheetsXmlString, tableData) => __awaiter(void 0
     let rowIndex = 0;
     const columnRow = sheetsDoc.createElementNS(sheetsDoc.documentElement.namespaceURI, constants_1.element.row);
     columnRow.setAttribute(constants_1.elementAttributes.row, (rowIndex + 1).toString());
-    columnRow.setAttribute(constants_1.elementAttributes.spans, "1:" + tableData.columnMetadata.length);
+    columnRow.setAttribute(constants_1.elementAttributes.spans, "1:" + tableData.columnNames.length);
     columnRow.setAttribute(constants_1.elementAttributes.x14acDyDescent, "0.3");
-    tableData.columnMetadata.forEach((col, colIndex) => {
-        columnRow.appendChild(documentUtils_1.default.createCell(sheetsDoc, colIndex, rowIndex, types_1.DataTypes.string, col.name));
+    tableData.columnNames.forEach((col, colIndex) => {
+        columnRow.appendChild(documentUtils_1.default.createCell(sheetsDoc, colIndex, rowIndex, col));
     });
     sheetData.appendChild(columnRow);
     rowIndex++;
@@ -127,7 +125,7 @@ const updateSheetsInitialData = (sheetsXmlString, tableData) => __awaiter(void 0
         newRow.setAttribute(constants_1.elementAttributes.spans, "1:" + row.length);
         newRow.setAttribute(constants_1.elementAttributes.x14acDyDescent, "0.3");
         row.forEach((cellContent, colIndex) => {
-            newRow.appendChild(documentUtils_1.default.createCell(sheetsDoc, colIndex, rowIndex, tableData.columnMetadata[colIndex].type, cellContent));
+            newRow.appendChild(documentUtils_1.default.createCell(sheetsDoc, colIndex, rowIndex, cellContent));
         });
         sheetData.appendChild(newRow);
         rowIndex++;

package/dist/utils/xmlPartsUtils.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const constants_1 = require("./constants");
-const mashupDocumentParser_1 = __importDefault(require("./mashupDocumentParser"));
+const mashupDocumentParser_1 = require("./mashupDocumentParser");
 const pqUtils_1 = __importDefault(require("./pqUtils"));
 const xmlInnerPartsUtils_1 = __importDefault(require("./xmlInnerPartsUtils"));
 const tableUtils_1 = __importDefault(require("./tableUtils"));
@@ -26,7 +26,7 @@ const updateWorkbookPowerQueryDocument = (zip, queryName, queryMashupDoc) => __a
     if (!old_base64) {
         throw new Error(constants_1.base64NotFoundErr);
     }
-    const new_base64 = yield new mashupDocumentParser_1.default().ReplaceSingleQuery(old_base64, queryName, queryMashupDoc);
+    const new_base64 = yield (0, mashupDocumentParser_1.replaceSingleQuery)(old_base64, queryName, queryMashupDoc);
     yield pqUtils_1.default.setBase64(zip, new_base64);
 });
 const updateWorkbookSingleQueryAttributes = (zip, queryName, refreshOnOpen) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/workbookManager.d.ts

@@ -1,8 +1,5 @@
-import { DocProps, QueryInfo, Grid } from "./types";
-declare const _default: {
-    generateSingleQueryWorkbook: (query: QueryInfo, initialDataGrid?: Grid | undefined, templateFile?: File | undefined, docProps?: DocProps | undefined) => Promise<Blob>;
-    generateTableWorkbookFromHtml: (htmlTable: HTMLTableElement, docProps?: DocProps | undefined) => Promise<Blob>;
-    generateTableWorkbookFromGrid: (initialDataGrid: Grid, docProps?: DocProps | undefined) => Promise<Blob>;
-    downloadWorkbook: (file: Blob, filename: string) => void;
-};
-export default _default;
+import { DocProps, QueryInfo, Grid, FileConfigs } from "./types";
+export declare const generateSingleQueryWorkbook: (query: QueryInfo, initialDataGrid?: Grid, fileConfigs?: FileConfigs) => Promise<Blob>;
+export declare const generateTableWorkbookFromHtml: (htmlTable: HTMLTableElement, docProps?: DocProps) => Promise<Blob>;
+export declare const generateTableWorkbookFromGrid: (grid: Grid, docProps?: DocProps) => Promise<Blob>;
+export declare const downloadWorkbook: (file: Blob, filename: string) => void;

package/dist/workbookManager.js

@@ -14,39 +14,41 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.downloadWorkbook = exports.generateTableWorkbookFromGrid = exports.generateTableWorkbookFromHtml = exports.generateSingleQueryWorkbook = void 0;
 const jszip_1 = __importDefault(require("jszip"));
 const utils_1 = require("./utils");
-const workbookTemplate_1 = __importDefault(require("./workbookTemplate"));
+const workbookTemplate_1 = require("./workbookTemplate");
 const constants_1 = require("./utils/constants");
-const types_1 = require("./types");
-const TableDataParserFactory_1 = __importDefault(require("./TableDataParserFactory"));
 const generators_1 = require("./generators");
 const htmlUtils_1 = require("./utils/htmlUtils");
-const generateSingleQueryWorkbook = (query, initialDataGrid, templateFile, docProps) => __awaiter(void 0, void 0, void 0, function* () {
+const GridParser_1 = require("./GridParser");
+const generateSingleQueryWorkbook = (query, initialDataGrid, fileConfigs) => __awaiter(void 0, void 0, void 0, function* () {
     if (!query.queryMashup) {
         throw new Error(constants_1.emptyQueryMashupErr);
     }
     if (!query.queryName) {
         query.queryName = constants_1.defaults.queryName;
     }
+    const templateFile = fileConfigs === null || fileConfigs === void 0 ? void 0 : fileConfigs.templateFile;
     if (templateFile !== undefined && initialDataGrid !== undefined) {
         throw new Error(constants_1.templateWithInitialDataErr);
     }
     utils_1.pqUtils.validateQueryName(query.queryName);
     const zip = templateFile === undefined
-        ? yield jszip_1.default.loadAsync(workbookTemplate_1.default.SIMPLE_QUERY_WORKBOOK_TEMPLATE, { base64: true })
+        ? yield jszip_1.default.loadAsync(workbookTemplate_1.SIMPLE_QUERY_WORKBOOK_TEMPLATE, { base64: true })
         : yield jszip_1.default.loadAsync(templateFile);
     const tableData = yield parseInitialDataGrid(initialDataGrid);
-    return yield generateSingleQueryWorkbookFromZip(zip, query, docProps, tableData);
+    return yield generateSingleQueryWorkbookFromZip(zip, query, fileConfigs === null || fileConfigs === void 0 ? void 0 : fileConfigs.docProps, tableData);
 });
+exports.generateSingleQueryWorkbook = generateSingleQueryWorkbook;
 const generateTableWorkbookFromHtml = (htmlTable, docProps) => __awaiter(void 0, void 0, void 0, function* () {
-    const [headers, gridData] = htmlUtils_1.extractTableValues(htmlTable);
-    const header = headers.map((column) => ({ name: column, type: types_1.DataTypes.autodetect }));
-    return yield generateTableWorkbookFromGrid({ gridData, header }, docProps);
+    const gridData = (0, htmlUtils_1.extractTableValues)(htmlTable);
+    return yield (0, exports.generateTableWorkbookFromGrid)({ data: gridData, promoteHeaders: false }, docProps);
 });
-const generateTableWorkbookFromGrid = (initialDataGrid, docProps) => __awaiter(void 0, void 0, void 0, function* () {
-    const zip = yield jszip_1.default.loadAsync(workbookTemplate_1.default.SIMPLE_BLANK_TABLE_TEMPLATE, { base64: true });
-    const tableData = yield parseInitialDataGrid(initialDataGrid);
+exports.generateTableWorkbookFromHtml = generateTableWorkbookFromHtml;
+const generateTableWorkbookFromGrid = (grid, docProps) => __awaiter(void 0, void 0, void 0, function* () {
+    const zip = yield jszip_1.default.loadAsync(workbookTemplate_1.SIMPLE_BLANK_TABLE_TEMPLATE, { base64: true });
+    const tableData = yield parseInitialDataGrid(grid);
     if (tableData === undefined) {
         throw new Error(constants_1.tableNotFoundErr);
     }
@@ -56,19 +58,19 @@ const generateTableWorkbookFromGrid = (initialDataGrid, docProps) => __awaiter(v
         mimeType: constants_1.application,
     });
 });
-const parseInitialDataGrid = (initialDataGrid) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!initialDataGrid) {
+exports.generateTableWorkbookFromGrid = generateTableWorkbookFromGrid;
+const parseInitialDataGrid = (grid) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!grid) {
         return undefined;
     }
-    const parser = TableDataParserFactory_1.default.createParser(initialDataGrid);
-    const tableData = parser.parseToTableData(initialDataGrid);
+    const tableData = (0, GridParser_1.parseToTableData)(grid);
     return tableData;
 });
 const generateSingleQueryWorkbookFromZip = (zip, query, docProps, tableData) => __awaiter(void 0, void 0, void 0, function* () {
     if (!query.queryName) {
         query.queryName = constants_1.defaults.queryName;
     }
-    yield utils_1.xmlPartsUtils.updateWorkbookPowerQueryDocument(zip, query.queryName, generators_1.generateSingleQueryMashup(query.queryName, query.queryMashup));
+    yield utils_1.xmlPartsUtils.updateWorkbookPowerQueryDocument(zip, query.queryName, (0, generators_1.generateSingleQueryMashup)(query.queryName, query.queryMashup));
     yield utils_1.xmlPartsUtils.updateWorkbookSingleQueryAttributes(zip, query.queryName, query.refreshOnOpen);
     yield utils_1.xmlPartsUtils.updateWorkbookInitialDataIfNeeded(zip, docProps, tableData, true /*updateQueryTable*/);
     return yield zip.generateAsync({
@@ -95,9 +97,4 @@ const downloadWorkbook = (file, filename) => {
         }, 0);
     }
 };
-exports.default = {
-    generateSingleQueryWorkbook,
-    generateTableWorkbookFromHtml,
-    generateTableWorkbookFromGrid,
-    downloadWorkbook,
-};
+exports.downloadWorkbook = downloadWorkbook;