@adobe/helix-onedrive-support 8.1.1 → 8.2.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [8.2.0](https://github.com/adobe/helix-onedrive-support/compare/v8.1.3...v8.2.0) (2022-07-29)
+
+
+### Features
+
+* add table ([#288](https://github.com/adobe/helix-onedrive-support/issues/288)) ([fd02048](https://github.com/adobe/helix-onedrive-support/commit/fd020486af2d355cf31e61a190bcf522031a15c2))
+
+## [8.1.3](https://github.com/adobe/helix-onedrive-support/compare/v8.1.2...v8.1.3) (2022-07-23)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([9dd4257](https://github.com/adobe/helix-onedrive-support/commit/9dd4257c57978057d277c1eee30426b4906c27de))
+
+## [8.1.2](https://github.com/adobe/helix-onedrive-support/compare/v8.1.1...v8.1.2) (2022-07-16)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([0417ab1](https://github.com/adobe/helix-onedrive-support/commit/0417ab1a6f59cfea67f25992e7848424a8b1eb90))
+
 ## [8.1.1](https://github.com/adobe/helix-onedrive-support/compare/v8.1.0...v8.1.1) (2022-07-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-onedrive-support",
-  "version": "8.1.1",
+  "version": "8.2.0",
   "description": "Helix OneDrive Support",
   "main": "src/index.js",
   "exports": {
@@ -10,8 +10,8 @@
   "type": "module",
   "types": "src/index.d.ts",
   "scripts": {
-    "test": "c8 mocha",
-    "test-ci": "c8 mocha && codecov",
+    "test": "c8 mocha --spec=test/**/*.test.js",
+    "test-ci": "c8 mocha  --spec=test/**/*.test.js && codecov",
     "lint": "./node_modules/.bin/eslint .",
     "semantic-release": "semantic-release",
     "docs": "npx jsdoc2md -c .jsdoc.json --files 'src/*.js'  > docs/API.md",
@@ -29,8 +29,8 @@
   "homepage": "https://github.com/adobe/helix-onedrive-support#readme",
   "dependencies": {
     "@adobe/helix-fetch": "3.1.1",
-    "@aws-sdk/client-s3": "3.121.0",
-    "@azure/msal-node": "1.11.0",
+    "@aws-sdk/client-s3": "3.135.0",
+    "@azure/msal-node": "1.12.0",
     "jose": "4.8.3"
   },
   "devDependencies": {
@@ -38,10 +38,10 @@
     "@semantic-release/changelog": "6.0.1",
     "@semantic-release/git": "10.0.1",
     "ajv": "8.11.0",
-    "c8": "7.11.3",
+    "c8": "7.12.0",
     "codecov": "3.8.3",
     "dotenv": "16.0.1",
-    "eslint": "8.19.0",
+    "eslint": "8.20.0",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.26.0",
     "husky": "8.0.1",
@@ -52,15 +52,14 @@
     "lint-staged": "13.0.3",
     "mocha": "10.0.0",
     "mocha-multi-reporters": "1.5.1",
-    "nock": "13.2.8",
-    "npm": "8.13.2",
+    "nock": "13.2.9",
+    "npm": "8.15.0",
     "semantic-release": "19.0.3"
   },
   "lint-staged": {
     "*.js": "eslint"
   },
   "mocha": {
-    "spec": "test/**/*.test.js",
     "require": "test/setup-env.js",
     "reporter": "mocha-multi-reporters",
     "reporter-options": "configFile=.mocha-multi.json"

package/src/OneDriveMock.js

@@ -60,79 +60,84 @@ function handleNamedItems(sheet, segs, method, body) {
  * @returns {object} The response value
  */
 function handleTable(sheet, segs, method, body) {
+  const first = segs.shift();
+  if (!first) {
+    return { value: sheet.tables.map((table) => ({ name: table.name })) };
+  }
+  if (first === 'add') {
+    const len = sheet.tables.push({
+      name: `Table${sheet.tables.length + 1}`,
+    });
+    return sheet.tables[len - 1];
+  }
+  const table = sheet.tables.find((t) => t.name === first);
+  if (!table) {
+    throw new StatusCodeError(first, 404);
+  }
+  let command;
+  let name;
   if (segs[0]) {
-    const tableName = segs.shift();
-    const table = sheet.tables.find((t) => t.name === tableName);
-    if (!table) {
-      throw new StatusCodeError(tableName, 404);
-    }
-    let command;
-    let name;
-    if (segs[0]) {
-      [, command, , name] = segs.shift().match(/([^?(]+)(\('([^)]+)'\))?(\?(.+))?/);
-    }
-    switch (command) {
-      case 'dataBodyRange':
-        return { rowCount: table.rows.length };
-      case 'headerRowRange':
-        return { values: [table.headerNames] };
-      case 'rows': {
-        if (!segs[0]) {
-          return { value: table.rows.map((row) => ({ values: [row] })) };
-        }
-        const subCommand = segs.shift();
-        if (subCommand === 'add') {
-          table.rows.push(...body.values);
-          return { index: table.rows.length - 1 };
-        }
-        const index = parseInt(subCommand.replace(/itemAt\(index=([0-9]+)\)/, '$1'), 10);
-        if (index < 0 || index >= table.rows.length) {
-          throw new StatusCodeError(`Index out of range: ${index}`, 400);
-        }
-        if (method === 'DELETE') {
-          table.rows.splice(index, 1);
-          return null;
-        }
-        if (body) {
-          [table.rows[index]] = body.values;
-        }
-        return { values: [table.rows[index]] };
+    [, command, , name] = segs.shift().match(/([^?(]+)(\('([^)]+)'\))?(\?(.+))?/);
+  }
+  switch (command) {
+    case 'dataBodyRange':
+      return { rowCount: table.rows.length };
+    case 'headerRowRange':
+      return { values: [table.headerNames] };
+    case 'rows': {
+      if (!segs[0]) {
+        return { value: table.rows.map((row) => ({ values: [row] })) };
+      }
+      const subCommand = segs.shift();
+      if (subCommand === 'add') {
+        table.rows.push(...body.values);
+        return { index: table.rows.length - 1 };
+      }
+      const index = parseInt(subCommand.replace(/itemAt\(index=([0-9]+)\)/, '$1'), 10);
+      if (index < 0 || index >= table.rows.length) {
+        throw new StatusCodeError(`Index out of range: ${index}`, 400);
       }
-      case 'columns': {
-        if (!name) {
-          const cols = table.headerNames.map((n) => ({
-            name: n,
-            values: [[n]],
-          }));
-          table.rows.forEach((row) => {
-            row.forEach((value, idx) => {
-              cols[idx].values.push([value]);
-            });
+      if (method === 'DELETE') {
+        table.rows.splice(index, 1);
+        return null;
+      }
+      if (body) {
+        [table.rows[index]] = body.values;
+      }
+      return { values: [table.rows[index]] };
+    }
+    case 'columns': {
+      if (!name) {
+        const cols = table.headerNames.map((n) => ({
+          name: n,
+          values: [[n]],
+        }));
+        table.rows.forEach((row) => {
+          row.forEach((value, idx) => {
+            cols[idx].values.push([value]);
           });
-          return {
-            value: cols,
-          };
-        }
-        const columnName = name;
-        const index = table.headerNames.findIndex((n) => n === columnName);
-        if (index === -1) {
-          throw new StatusCodeError(`Column name not found: ${columnName}`, 400);
-        }
+        });
         return {
-          values: [
-            [table.headerNames[index]],
-            ...table.rows.map((row) => [row[index]]),
-          ],
+          value: cols,
         };
       }
-      default:
-        if (body) {
-          table.name = body.name;
-        }
-        return { values: table.name };
+      const columnName = name;
+      const index = table.headerNames.findIndex((n) => n === columnName);
+      if (index === -1) {
+        throw new StatusCodeError(`Column name not found: ${columnName}`, 400);
+      }
+      return {
+        values: [
+          [table.headerNames[index]],
+          ...table.rows.map((row) => [row[index]]),
+        ],
+      };
     }
-  } else {
-    return { value: sheet.tables.map((table) => ({ name: table.name })) };
+    default:
+      if (body) {
+        table.name = body.name;
+      }
+      return { values: table.name };
   }
 }
 
@@ -309,7 +314,8 @@ export class OneDriveMock extends OneDrive {
     }
 
     // handle the operations on the workbook / worksheet
-    switch (segs.shift()) {
+    const type = segs.shift();
+    switch (type) {
       case 'usedRange':
         return sheet.usedRange;
       case 'tables':
@@ -317,6 +323,11 @@ export class OneDriveMock extends OneDrive {
       case 'names':
         return handleNamedItems(sheet, segs, method, body);
       default:
+        if (type && type.startsWith('range(address=')) {
+          return {
+            address: type.match(/range\(address='([^)]+)'\)/)[1],
+          };
+        }
         // default return the data
         return { value: data };
     }

package/src/excel/Table.js

@@ -125,6 +125,10 @@ export class Table {
     });
   }
 
+  get name() {
+    return this._name;
+  }
+
   get uri() {
     return `${this._prefix}/${this._name}`;
   }

package/src/excel/Workbook.d.ts

@@ -42,6 +42,17 @@ export declare interface Workbook {
    */
   table(name: string): Table;
 
+  /**
+   * Add a table to a workbook. If a name is passed that is not
+   * identical to one automatically given, the table gets
+   * automatically renamed.
+   *
+   * @param address address of table, e.g. Sheet1!A1:C1
+   * @param hasHeaders whether the table has headers
+   * @param name optional name
+   */
+   addTable(address: string, hasHeaders: boolean, name?: string): Promise<Table>;
+
   /**
    * Return the named items in a work book
    * @returns array of named items when resolved

package/src/excel/Workbook.js

@@ -10,6 +10,7 @@
  * governing permissions and limitations under the License.
  */
 import { NamedItemContainer } from './NamedItemContainer.js';
+import { StatusCodeError } from '../StatusCodeError.js';
 import { Table } from './Table.js';
 import { Worksheet } from './Worksheet.js';
 
@@ -47,6 +48,27 @@ export class Workbook extends NamedItemContainer {
     return new Table(this._oneDrive, `${this._uri}/tables`, name, this._log);
   }
 
+  async addTable(address, hasHeaders, name) {
+    if (name) {
+      const names = await this.getTableNames();
+      if (names.includes(name)) {
+        throw new StatusCodeError(`Table name already exists: ${name}`, 409);
+      }
+    }
+    const result = await this._oneDrive.doFetch(`${this.uri}/tables/add`, false, {
+      method: 'POST',
+      body: {
+        address,
+        hasHeaders,
+      },
+    });
+    const table = this.table(result.name);
+    if (name && name !== table.name) {
+      await table.rename(name);
+    }
+    return table;
+  }
+
   get uri() {
     return this._uri;
   }

package/src/excel/Worksheet.d.ts

@@ -57,6 +57,17 @@ export declare interface Worksheet {
    */
   table(name: string): Table;
 
+  /**
+   * Add a table to a workbook. If a name is passed that is not
+   * identical to one automatically given, the table gets
+   * automatically renamed.
+   *
+   * @param address address of table in sheet, e.g. A1:C1
+   * @param hasHeaders whether the table has headers
+   * @param name optional name
+   */
+  addTable(address: string, hasHeaders: boolean, name?: string): Promise<Table>;
+
   /**
    * Returns the use name.
    */

package/src/excel/Worksheet.js

@@ -10,6 +10,7 @@
  * governing permissions and limitations under the License.
  */
 import { NamedItemContainer } from './NamedItemContainer.js';
+import { StatusCodeError } from '../StatusCodeError.js';
 import { Table } from './Table.js';
 import { Range } from './Range.js';
 
@@ -46,6 +47,27 @@ export class Worksheet extends NamedItemContainer {
     return new Table(this._oneDrive, `${this._uri}/tables`, name, this._log);
   }
 
+  async addTable(address, hasHeaders, name) {
+    if (name) {
+      const names = await this.getTableNames();
+      if (names.includes(name)) {
+        throw new StatusCodeError(`Table name already exists: ${name}`, 409);
+      }
+    }
+    const result = await this._oneDrive.doFetch(`${this.uri}/tables/add`, false, {
+      method: 'POST',
+      body: {
+        address,
+        hasHeaders,
+      },
+    });
+    const table = this.table(result.name);
+    if (name && name !== table.name) {
+      await table.rename(name);
+    }
+    return table;
+  }
+
   usedRange() {
     return new Range(this._oneDrive, `${this._uri}/usedRange`, this._log);
   }