@microsoft/connected-workbooks 2.1.24-beta → 3.0.0

package/dist/tests/xmlInnerPartsUtils.test.js

@@ -0,0 +1,51 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const mocks_1 = require("./mocks");
+const utils_1 = require("../src/utils");
+describe("Workbook Manager tests", () => {
+    const mockConnectionString = `<connections xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:xr16="http://schemas.microsoft.com/office/spreadsheetml/2017/revision16" mc:Ignorable="xr16">
+        <connection id="1" xr16:uid="{86BA784C-6640-4989-A85E-EB4966B9E741}" keepAlive="1" name="Query - Query1" description="Connection to the 'Query1' query in the workbook." type="5" refreshedVersion="7" background="1" saveData="1">
+        <dbPr connection="Provider=Microsoft.Mashup.OleDb.1;Data Source=$Workbook$;Location=Query1;" command="SELECT * FROM [Query1]"/></connection></connections>`;
+    test("Connection XML attributes contain new query name", () => __awaiter(void 0, void 0, void 0, function* () {
+        const { connectionXmlFileString } = yield utils_1.xmlInnerPartsUtils.updateConnections(mockConnectionString, "newQueryName", true);
+        expect(connectionXmlFileString.replace(/ /g, "")).toContain('command="SELECT * FROM [newQueryName]'.replace(/ /g, ""));
+        expect(connectionXmlFileString.replace(/ /g, "")).toContain('name="Query - newQueryName"'.replace(/ /g, ""));
+        expect(connectionXmlFileString.replace(/ /g, "")).toContain(`description="Connection to the 'newQueryName' query in the workbook."`.replace(/ /g, ""));
+    }));
+    test("Connection XML attributes contain refreshOnLoad value", () => __awaiter(void 0, void 0, void 0, function* () {
+        const { connectionXmlFileString } = yield utils_1.xmlInnerPartsUtils.updateConnections(mockConnectionString, "newQueryName", true);
+        expect(connectionXmlFileString.replace(/ /g, "")).toContain('refreshOnLoad="1"');
+    }));
+    test("SharedStrings XML contains new query name", () => __awaiter(void 0, void 0, void 0, function* () {
+        const { newSharedStrings } = yield utils_1.xmlInnerPartsUtils.updateSharedStrings('<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="1" uniqueCount="1"><si><t>Query1</t></si><si><t/></si></sst>', "newQueryName");
+        expect(newSharedStrings.replace(/ /g, "")).toContain(mocks_1.sharedStringsXmlMock.replace(/ /g, ""));
+    }));
+    test("Tests SharedStrings update when XML contains query name", () => __awaiter(void 0, void 0, void 0, function* () {
+        const { newSharedStrings } = yield utils_1.xmlInnerPartsUtils.updateSharedStrings('<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="1" uniqueCount="1"><si><t>newQueryName</t></si><si><t/></si></sst>', "newQueryName");
+        expect(newSharedStrings.replace(/ /g, "")).toContain(mocks_1.existingSharedStringsXmlMock.replace(/ /g, ""));
+    }));
+    test("SharedStrings XML returns new index", () => __awaiter(void 0, void 0, void 0, function* () {
+        const { sharedStringIndex } = yield utils_1.xmlInnerPartsUtils.updateSharedStrings('<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="1" uniqueCount="1"><si><t>Query1</t></si><si><t/></si></sst>', "newQueryName");
+        expect(sharedStringIndex).toEqual(2);
+    }));
+    test("SharedStrings XML returns existing index", () => __awaiter(void 0, void 0, void 0, function* () {
+        const { sharedStringIndex } = yield utils_1.xmlInnerPartsUtils.updateSharedStrings('<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="1" uniqueCount="1"><si><t>newQueryName</t></si><si><t/></si></sst>', "newQueryName");
+        expect(sharedStringIndex).toEqual(1);
+    }));
+    test("Table XML contains refrshonload value", () => __awaiter(void 0, void 0, void 0, function* () {
+        const { sharedStringIndex, newSharedStrings } = yield utils_1.xmlInnerPartsUtils.updateSharedStrings('<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="1" uniqueCount="1"><si><t>Query1</t></si><si><t/></si></sst>', "newQueryName");
+        expect(sharedStringIndex).toEqual(2);
+        expect(newSharedStrings.replace(/ /g, "")).toContain(mocks_1.sharedStringsXmlMock.replace(/ /g, ""));
+    }));
+});

package/dist/types.d.ts

@@ -19,11 +19,14 @@ export interface Metadata {
 export interface TableData {
     columnNames: string[];
     rows: string[][];
-    columnwidth?: number;
 }
 export interface Grid {
     data: (string | number | boolean)[][];
+    config?: GridConfig;
+}
+export interface GridConfig {
     promoteHeaders?: boolean;
+    adjustColumnNames?: boolean;
 }
 export interface FileConfigs {
     templateFile?: File;

package/dist/utils/constants.js

@@ -2,8 +2,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaults = exports.elementAttributesValues = exports.dataTypeKind = exports.elementAttributes = exports.element = exports.BOM = exports.falseStr = exports.trueStr = exports.maxQueryLength = exports.divider = exports.section1PathPrefix = exports.emptyValue = exports.falseValue = exports.trueValue = exports.pivotCachesPathPrefix = exports.xmlTextResultType = exports.textResultType = exports.application = exports.uint8ArrayType = exports.blobFileType = exports.stylesNotFoundErr = exports.EmptyQueryNameErr = exports.QueryNameMaxLengthErr = exports.invalidDataTypeErr = exports.headerNotFoundErr = exports.invalidValueInColumnErr = exports.gridNotFoundErr = exports.tableNotFoundErr = exports.queryTableNotFoundErr = exports.templateWithInitialDataErr = exports.formulaSectionNotFoundErr = exports.queryConnectionNotFoundErr = exports.queryAndPivotTableNotFoundErr = exports.queryNameNotFoundErr = exports.emptyQueryMashupErr = exports.base64NotFoundErr = exports.sheetsNotFoundErr = exports.connectionsNotFoundErr = exports.sharedStringsNotFoundErr = exports.docPropsRootElement = exports.docPropsCoreXmlPath = exports.section1mPath = exports.pivotCachesPath = exports.queryTablesPath = exports.workbookXmlPath = exports.queryTableXmlPath = exports.tableXmlPath = exports.sheetsXmlPath = exports.sharedStringsXmlPath = exports.connectionsXmlPath = void 0;
-exports.URLS = void 0;
+exports.maxQueryLength = exports.divider = exports.section1PathPrefix = exports.emptyValue = exports.falseValue = exports.trueValue = exports.pivotCachesPathPrefix = exports.xmlTextResultType = exports.textResultType = exports.application = exports.uint8ArrayType = exports.blobFileType = exports.relsNotFoundErr = exports.templateFileNotSupportedErr = exports.arrayIsntMxNErr = exports.unexpectedErr = exports.promotedHeadersCannotBeUsedWithoutAdjustingColumnNamesErr = exports.InvalidColumnNameErr = exports.stylesNotFoundErr = exports.EmptyQueryNameErr = exports.QueryNameInvalidCharsErr = exports.QueryNameMaxLengthErr = exports.invalidDataTypeErr = exports.headerNotFoundErr = exports.invalidValueInColumnErr = exports.tableNotFoundErr = exports.queryTableNotFoundErr = exports.templateWithInitialDataErr = exports.formulaSectionNotFoundErr = exports.queryConnectionNotFoundErr = exports.queryAndPivotTableNotFoundErr = exports.queryNameNotFoundErr = exports.emptyQueryMashupErr = exports.base64NotFoundErr = exports.sheetsNotFoundErr = exports.connectionsNotFoundErr = exports.sharedStringsNotFoundErr = exports.docPropsRootElement = exports.docMetadataXmlPath = exports.relsXmlPath = exports.docPropsCoreXmlPath = exports.section1mPath = exports.pivotCachesPath = exports.queryTablesPath = exports.workbookXmlPath = exports.queryTableXmlPath = exports.tableXmlPath = exports.sheetsXmlPath = exports.sharedStringsXmlPath = exports.connectionsXmlPath = void 0;
+exports.URLS = exports.defaults = exports.elementAttributesValues = exports.dataTypeKind = exports.elementAttributes = exports.element = exports.BOM = exports.falseStr = exports.trueStr = void 0;
 exports.connectionsXmlPath = "xl/connections.xml";
 exports.sharedStringsXmlPath = "xl/sharedStrings.xml";
 exports.sheetsXmlPath = "xl/worksheets/sheet1.xml";
@@ -14,6 +14,8 @@ exports.queryTablesPath = "xl/queryTables/";
 exports.pivotCachesPath = "xl/pivotCache/";
 exports.section1mPath = "Formulas/Section1.m";
 exports.docPropsCoreXmlPath = "docProps/core.xml";
+exports.relsXmlPath = "_rels/.rels";
+exports.docMetadataXmlPath = "docMetadata";
 exports.docPropsRootElement = "cp:coreProperties";
 exports.sharedStringsNotFoundErr = "SharedStrings were not found in template";
 exports.connectionsNotFoundErr = "Connections were not found in template";
@@ -24,16 +26,22 @@ exports.queryNameNotFoundErr = "Query name was not found";
 exports.queryAndPivotTableNotFoundErr = "No such query found in Query Table or Pivot Table found in given template";
 exports.queryConnectionNotFoundErr = "No connection found for query";
 exports.formulaSectionNotFoundErr = "Formula section wasn't found in template";
-exports.templateWithInitialDataErr = "Cannot receive template file with initial data";
+exports.templateWithInitialDataErr = "Cannot use a template file with initial data";
 exports.queryTableNotFoundErr = "Query table wasn't found in template";
 exports.tableNotFoundErr = "Table wasn't found in template";
-exports.gridNotFoundErr = "Invalid JSON file, grid data is missing";
 exports.invalidValueInColumnErr = "Invalid cell value in column";
 exports.headerNotFoundErr = "Invalid JSON file, header is missing";
 exports.invalidDataTypeErr = "Invalid JSON file, invalid data type";
 exports.QueryNameMaxLengthErr = "Query names are limited to 80 characters";
+exports.QueryNameInvalidCharsErr = 'Query names cannot contain periods or quotation marks. (. ")';
 exports.EmptyQueryNameErr = "Query name cannot be empty";
 exports.stylesNotFoundErr = "Styles were not found in template";
+exports.InvalidColumnNameErr = "Invalid column name";
+exports.promotedHeadersCannotBeUsedWithoutAdjustingColumnNamesErr = "Headers cannot be promoted without adjusting column names";
+exports.unexpectedErr = "Unexpected error";
+exports.arrayIsntMxNErr = "Array isn't MxN";
+exports.templateFileNotSupportedErr = "Template file is not supported for this API call";
+exports.relsNotFoundErr = ".rels were not found in template";
 exports.blobFileType = "blob";
 exports.uint8ArrayType = "uint8array";
 exports.application = "application/xlsx";
@@ -48,7 +56,7 @@ exports.divider = "/";
 exports.maxQueryLength = 80;
 exports.trueStr = "true";
 exports.falseStr = "false";
-exports.BOM = '\ufeff';
+exports.BOM = "\ufeff";
 exports.element = {
     sharedStringTable: "sst",
     text: "t",
@@ -75,7 +83,8 @@ exports.element = {
     sheetData: "sheetData",
     row: "row",
     dimension: "dimension",
-    kindCell: "c"
+    selection: "selection",
+    kindCell: "c",
 };
 exports.elementAttributes = {
     connection: "connection",
@@ -100,6 +109,7 @@ exports.elementAttributes = {
     uniqueName: "uniqueName",
     queryTableFieldId: "queryTableFieldId",
     reference: "ref",
+    sqref: "sqref",
     tableColumnId: "tableColumnId",
     nextId: "nextId",
     row: "r",
@@ -115,13 +125,14 @@ exports.dataTypeKind = {
 exports.elementAttributesValues = {
     connectionName: (queryName) => `Query - ${queryName}`,
     connectionDescription: (queryName) => `Connection to the '${queryName}' query in the workbook.`,
-    connection: (queryName) => `Provider=Microsoft.Mashup.OleDb.1;Data Source=$Workbook$;Location=${queryName};`,
+    connection: (queryName) => `Provider=Microsoft.Mashup.OleDb.1;Data Source=$Workbook$;Location="${queryName}";`,
     connectionCommand: (queryName) => `SELECT * FROM [${queryName}]`,
-    tableResultType: () => "sTable"
+    tableResultType: () => "sTable",
 };
 exports.defaults = {
     queryName: "Query1",
-    sheetName: "Sheet1"
+    sheetName: "Sheet1",
+    columnName: "Column",
 };
 exports.URLS = {
     PQ: [

package/dist/utils/documentUtils.js

@@ -59,12 +59,12 @@ const createCellElement = (doc, colIndex, rowIndex, data) => {
     const cell = doc.createElementNS(doc.documentElement.namespaceURI, constants_1.element.kindCell);
     cell.setAttribute(constants_1.elementAttributes.row, getCellReferenceRelative(colIndex, rowIndex + 1));
     const cellData = doc.createElementNS(doc.documentElement.namespaceURI, constants_1.element.cellValue);
-    updateCellData(data, cell, cellData);
+    updateCellData(data, cell, cellData, rowIndex === 0);
     cell.appendChild(cellData);
     return cell;
 };
-const updateCellData = (data, cell, cellData) => {
-    switch (resolveType(data)) {
+const updateCellData = (data, cell, cellData, rowHeader) => {
+    switch (resolveType(data, rowHeader)) {
         case types_1.DataTypes.string:
             cell.setAttribute(constants_1.element.text, constants_1.dataTypeKind.string);
             break;
@@ -77,11 +77,15 @@ const updateCellData = (data, cell, cellData) => {
     }
     cellData.textContent = data;
 };
-const resolveType = (originalData) => {
+const resolveType = (originalData, rowHeader) => {
     const data = originalData;
+    if (rowHeader) {
+        // Headers should be string by default.
+        return types_1.DataTypes.string;
+    }
     let dataType = isNaN(Number(data)) ? types_1.DataTypes.string : types_1.DataTypes.number;
     if (dataType == types_1.DataTypes.string) {
-        if (data.toLowerCase().trim() == constants_1.trueStr || data.toLowerCase().trim() == constants_1.falseStr) {
+        if (data.trim() == constants_1.trueStr || data.trim() == constants_1.falseStr) {
             dataType = types_1.DataTypes.boolean;
         }
     }

package/dist/utils/gridUtils.js

@@ -0,0 +1,103 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+const constants_1 = require("../utils/constants");
+const parseToTableData = (grid) => {
+    var _a, _b, _c, _d;
+    if (grid === null || grid === undefined) {
+        grid = { data: [] };
+    }
+    if (grid.data === null || grid.data === undefined) {
+        grid.data = [];
+    }
+    const mergedGrid = {
+        config: {
+            promoteHeaders: (_b = (_a = grid.config) === null || _a === void 0 ? void 0 : _a.promoteHeaders) !== null && _b !== void 0 ? _b : false,
+            adjustColumnNames: (_d = (_c = grid.config) === null || _c === void 0 ? void 0 : _c.adjustColumnNames) !== null && _d !== void 0 ? _d : true,
+        },
+        data: grid.data.map((row) => row.map((value) => { var _a; return (_a = value === null || value === void 0 ? void 0 : value.toString()) !== null && _a !== void 0 ? _a : ""; })),
+    };
+    correctGrid(mergedGrid);
+    validateGrid(mergedGrid);
+    let columnNames = [];
+    if (mergedGrid.config.promoteHeaders && mergedGrid.config.adjustColumnNames) {
+        columnNames = getAdjustedColumnNames(mergedGrid.data.shift());
+    }
+    else if (mergedGrid.config.promoteHeaders && !mergedGrid.config.adjustColumnNames) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        columnNames = mergedGrid.data.shift();
+    }
+    else {
+        columnNames = Array.from({ length: mergedGrid.data[0].length }, (_, index) => `${constants_1.defaults.columnName} ${index + 1}`);
+    }
+    return { columnNames: columnNames, rows: mergedGrid.data };
+};
+const correctGrid = (grid) => {
+    if (grid.data.length === 0) {
+        // empty grid fix
+        grid.config.promoteHeaders = false;
+        grid.data.push([""]);
+        return;
+    }
+    const getEmptyArray = (n) => Array.from({ length: n }, () => "");
+    if (grid.data[0].length === 0) {
+        grid.data[0] = [""];
+    }
+    // replace empty rows
+    grid.data.forEach((row, index) => {
+        if (row.length === 0) {
+            grid.data[index] = getEmptyArray(grid.data[0].length);
+        }
+    });
+    if (grid.config.promoteHeaders && grid.data.length === 1) {
+        // table in Excel should have at least 2 rows
+        grid.data.push(getEmptyArray(grid.data[0].length));
+    }
+};
+/*
+ * Validates the grid, throws an error if the grid is invalid.
+ * A valid grid has:
+ * - MxN structure.
+ * - If promoteHeaders is true - has at least 1 row, and in case adjustColumnNames is false, first row is unique and non empty.
+ */
+const validateGrid = (grid) => {
+    validateDataArrayDimensions(grid.data);
+    if (grid.config.promoteHeaders && grid.config.adjustColumnNames === false && !validateUniqueAndValidDataArray(grid.data[0])) {
+        throw new Error(constants_1.promotedHeadersCannotBeUsedWithoutAdjustingColumnNamesErr);
+    }
+};
+const validateDataArrayDimensions = (arr) => {
+    if (arr.length === 0 || arr[0].length === 0) {
+        throw new Error(constants_1.unexpectedErr);
+    }
+    if (!arr.every((innerArr) => innerArr.length === arr[0].length)) {
+        throw new Error(constants_1.arrayIsntMxNErr);
+    }
+};
+const validateUniqueAndValidDataArray = (arr) => {
+    if (arr.some((element) => element === "")) {
+        return false; // Array contains empty elements
+    }
+    const uniqueSet = new Set(arr);
+    return uniqueSet.size === arr.length;
+};
+const getAdjustedColumnNames = (columnNames) => {
+    if (columnNames === undefined) {
+        throw new Error(constants_1.unexpectedErr);
+    }
+    let i = 1;
+    // replace empty column names with default names, can still conflict if columns exist, but we handle that later
+    columnNames = columnNames.map((columnName) => columnName || `${constants_1.defaults.columnName} ${i++}`);
+    const uniqueNames = new Set();
+    return columnNames.map((name) => {
+        let uniqueName = name;
+        i = 1;
+        while (uniqueNames.has(uniqueName)) {
+            uniqueName = `${name} (${i++})`;
+        }
+        uniqueNames.add(uniqueName);
+        return uniqueName;
+    });
+};
+exports.default = { parseToTableData };

package/dist/utils/htmlUtils.js

@@ -1,8 +1,8 @@
 "use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractTableValues = void 0;
 const extractTableValues = (table) => {
-    const headers = [];
     const rows = [];
     // Extract values from each row
     for (let i = 0; i < table.rows.length; i++) {
@@ -16,4 +16,4 @@ const extractTableValues = (table) => {
     }
     return rows;
 };
-exports.extractTableValues = extractTableValues;
+exports.default = { extractTableValues };

package/dist/utils/index.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableUtils = exports.xmlInnerPartsUtils = exports.xmlPartsUtils = exports.documentUtils = exports.arrayUtils = exports.pqUtils = void 0;
+exports.gridUtils = exports.htmlUtils = exports.tableUtils = exports.xmlInnerPartsUtils = exports.xmlPartsUtils = exports.documentUtils = exports.arrayUtils = exports.pqUtils = void 0;
 var pqUtils_1 = require("./pqUtils");
 Object.defineProperty(exports, "pqUtils", { enumerable: true, get: function () { return __importDefault(pqUtils_1).default; } });
 var arrayUtils_1 = require("./arrayUtils");
@@ -18,3 +18,7 @@ var xmlInnerPartsUtils_1 = require("./xmlInnerPartsUtils");
 Object.defineProperty(exports, "xmlInnerPartsUtils", { enumerable: true, get: function () { return __importDefault(xmlInnerPartsUtils_1).default; } });
 var tableUtils_1 = require("./tableUtils");
 Object.defineProperty(exports, "tableUtils", { enumerable: true, get: function () { return __importDefault(tableUtils_1).default; } });
+var htmlUtils_1 = require("./htmlUtils");
+Object.defineProperty(exports, "htmlUtils", { enumerable: true, get: function () { return __importDefault(htmlUtils_1).default; } });
+var gridUtils_1 = require("./gridUtils");
+Object.defineProperty(exports, "gridUtils", { enumerable: true, get: function () { return __importDefault(gridUtils_1).default; } });

package/dist/utils/mashupDocumentParser.js

@@ -37,17 +37,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceSingleQuery = void 0;
+exports.editSingleQueryMetadata = exports.getPackageComponents = exports.replaceSingleQuery = void 0;
 const base64 = __importStar(require("base64-js"));
 const jszip_1 = __importDefault(require("jszip"));
 const constants_1 = require("./constants");
 const _1 = require(".");
 const replaceSingleQuery = (base64Str, queryName, queryMashupDoc) => __awaiter(void 0, void 0, void 0, function* () {
-    const { version, packageOPC, permissionsSize, permissions, metadata, endBuffer } = getPackageComponents(base64Str);
+    const { version, packageOPC, permissionsSize, permissions, metadata, endBuffer } = (0, exports.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 newMetadataBuffer = (0, exports.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);
@@ -73,6 +73,7 @@ const getPackageComponents = (base64Str) => {
         endBuffer,
     };
 };
+exports.getPackageComponents = getPackageComponents;
 const editSingleQueryPackage = (packageOPC, queryMashupDoc) => __awaiter(void 0, void 0, void 0, function* () {
     const packageZip = yield jszip_1.default.loadAsync(packageOPC);
     setSection1m(queryMashupDoc, packageZip);
@@ -89,7 +90,6 @@ const setSection1m = (queryMashupDoc, zip) => {
     });
 };
 const editSingleQueryMetadata = (metadataArray, metadata) => {
-    var _a;
     //extract metadataXml
     const mashupArray = new _1.arrayUtils.ArrayReader(metadataArray.buffer);
     const metadataVersion = mashupArray.getBytes(4);
@@ -110,7 +110,7 @@ const editSingleQueryMetadata = (metadataArray, metadata) => {
             const content = itemPath.innerHTML;
             if (content.includes(constants_1.section1PathPrefix)) {
                 const strArr = content.split(constants_1.divider);
-                strArr[1] = metadata.queryName;
+                strArr[1] = encodeURIComponent(metadata.queryName);
                 const newContent = strArr.join(constants_1.divider);
                 itemPath.textContent = newContent;
             }
@@ -125,28 +125,9 @@ const editSingleQueryMetadata = (metadataArray, metadata) => {
             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"));
@@ -161,3 +142,4 @@ const editSingleQueryMetadata = (metadataArray, metadata) => {
     const newMetadataArray = _1.arrayUtils.concatArrays(metadataVersion, newMetadataXmlSize, newMetadataXml, endBuffer);
     return newMetadataArray;
 };
+exports.editSingleQueryMetadata = editSingleQueryMetadata;

package/dist/utils/pqUtils.js

@@ -13,13 +13,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const constants_1 = require("./constants");
 const generators_1 = require("../generators");
+const buffer_1 = require("buffer");
 const getBase64 = (zip) => __awaiter(void 0, void 0, void 0, function* () {
     const mashup = yield getDataMashupFile(zip);
     return mashup.value;
 });
 const setBase64 = (zip, base64) => __awaiter(void 0, void 0, void 0, function* () {
     const newXml = (0, generators_1.generateMashupXMLTemplate)(base64);
-    const encoded = Buffer.from(constants_1.BOM + newXml, 'ucs2');
+    const encoded = buffer_1.Buffer.from(constants_1.BOM + newXml, "ucs2");
     const mashup = yield getDataMashupFile(zip);
     zip.file(mashup === null || mashup === void 0 ? void 0 : mashup.path, encoded);
 });
@@ -37,7 +38,7 @@ const getDataMashupFile = (zip) => __awaiter(void 0, void 0, void 0, function* (
     }
     return mashup;
 });
-const getCustomXmlFile = (zip, url, encoding = 'utf16le') => __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/);
@@ -54,7 +55,9 @@ const getCustomXmlFile = (zip, url, encoding = 'utf16le') => __awaiter(void 0, v
         if (xmlValue === undefined) {
             break;
         }
-        xmlString = Buffer.from(xmlValue).toString(encoding).replace(/^\ufeff/, '');
+        xmlString = buffer_1.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) {
@@ -81,7 +84,7 @@ const validateQueryName = (queryName) => {
             throw new Error(constants_1.QueryNameMaxLengthErr);
         }
         if (queryNameHasInvalidChars(queryName)) {
-            throw new Error(constants_1.QueryNameMaxLengthErr);
+            throw new Error(constants_1.QueryNameInvalidCharsErr);
         }
     }
     if (!queryName.trim()) {

package/dist/utils/tableUtils.js

@@ -1,4 +1,6 @@
 "use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -24,7 +26,7 @@ const updateTableInitialDataIfNeeded = (zip, tableData, updateQueryTable) => __a
     if (sheetsXmlString === undefined) {
         throw new Error(constants_1.sheetsNotFoundErr);
     }
-    const newSheet = yield updateSheetsInitialData(sheetsXmlString, tableData);
+    const newSheet = updateSheetsInitialData(sheetsXmlString, tableData);
     zip.file(constants_1.sheetsXmlPath, newSheet);
     if (updateQueryTable) {
         const queryTableXmlString = yield ((_b = zip.file(constants_1.queryTableXmlPath)) === null || _b === void 0 ? void 0 : _b.async(constants_1.textResultType));
@@ -38,17 +40,17 @@ const updateTableInitialDataIfNeeded = (zip, tableData, updateQueryTable) => __a
         if (workbookXmlString === undefined) {
             throw new Error(constants_1.sheetsNotFoundErr);
         }
-        const newWorkbook = yield updateWorkbookInitialData(workbookXmlString, tableData);
+        const newWorkbook = updateWorkbookInitialData(workbookXmlString, tableData);
         zip.file(constants_1.workbookXmlPath, newWorkbook);
     }
     const tableXmlString = yield ((_d = zip.file(constants_1.tableXmlPath)) === null || _d === void 0 ? void 0 : _d.async(constants_1.textResultType));
     if (tableXmlString === undefined) {
         throw new Error(constants_1.tableNotFoundErr);
     }
-    const newTable = yield updateTablesInitialData(tableXmlString, tableData, updateQueryTable);
+    const newTable = updateTablesInitialData(tableXmlString, tableData, updateQueryTable);
     zip.file(constants_1.tableXmlPath, newTable);
 });
-const updateTablesInitialData = (tableXmlString, tableData, updateQueryTable = false) => __awaiter(void 0, void 0, void 0, function* () {
+const updateTablesInitialData = (tableXmlString, tableData, updateQueryTable = false) => {
     const parser = new DOMParser();
     const serializer = new XMLSerializer();
     const tableDoc = parser.parseFromString(tableXmlString, constants_1.xmlTextResultType);
@@ -73,18 +75,17 @@ const updateTablesInitialData = (tableXmlString, tableData, updateQueryTable = f
         .getElementsByTagName(constants_1.element.autoFilter)[0]
         .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) => __awaiter(void 0, void 0, void 0, function* () {
+};
+const updateWorkbookInitialData = (workbookXmlString, tableData) => {
     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];
     definedName.textContent =
-        constants_1.defaults.sheetName +
-            `!$A$1:${documentUtils_1.default.getCellReferenceAbsolute(tableData.columnNames.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* () {
+};
+const updateQueryTablesInitialData = (queryTableXmlString, tableData) => {
     const parser = new DOMParser();
     const serializer = new XMLSerializer();
     const queryTableDoc = parser.parseFromString(queryTableXmlString, constants_1.xmlTextResultType);
@@ -98,12 +99,10 @@ const updateQueryTablesInitialData = (queryTableXmlString, tableData) => __await
         queryTableFields.appendChild(queryTableField);
     });
     queryTableFields.setAttribute(constants_1.elementAttributes.count, tableData.columnNames.length.toString());
-    queryTableDoc
-        .getElementsByTagName(constants_1.element.queryTableRefresh)[0]
-        .setAttribute(constants_1.elementAttributes.nextId, (tableData.columnNames.length + 1).toString());
+    queryTableDoc.getElementsByTagName(constants_1.element.queryTableRefresh)[0].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* () {
+};
+const updateSheetsInitialData = (sheetsXmlString, tableData) => {
     const parser = new DOMParser();
     const serializer = new XMLSerializer();
     const sheetsDoc = parser.parseFromString(sheetsXmlString, constants_1.xmlTextResultType);
@@ -130,11 +129,11 @@ const updateSheetsInitialData = (sheetsXmlString, tableData) => __awaiter(void 0
         sheetData.appendChild(newRow);
         rowIndex++;
     });
-    sheetsDoc
-        .getElementsByTagName(constants_1.element.dimension)[0]
-        .setAttribute(constants_1.elementAttributes.reference, documentUtils_1.default.getTableReference(tableData.rows[0].length - 1, tableData.rows.length));
+    const reference = documentUtils_1.default.getTableReference(tableData.rows[0].length - 1, tableData.rows.length + 1);
+    sheetsDoc.getElementsByTagName(constants_1.element.dimension)[0].setAttribute(constants_1.elementAttributes.reference, reference);
+    sheetsDoc.getElementsByTagName(constants_1.element.selection)[0].setAttribute(constants_1.elementAttributes.sqref, reference);
     return serializer.serializeToString(sheetsDoc);
-});
+};
 exports.default = {
     updateTableInitialDataIfNeeded,
     updateSheetsInitialData,