cleanup

.github/workflows/deploy-functions.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: '14.x'
+          node-version: 16
       - run: npm install -g firebase-tools
       - run: |
           cp .npmrc functions

.github/workflows/functions-ci.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: '14.x'
+          node-version: 16
       - run: npm install -g firebase-tools
       - name: build functions
         run: |

.github/workflows/publish-types.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 16
       - name: Check if version has been updated
         id: check
         uses: EndBug/version-check@v1

.github/workflows/website-ci.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: '12.x'
+          node-version: 16
       - run: yarn install
       - run: yarn build
       - run: yarn test

functions/.gitignore

@@ -2,8 +2,7 @@
 ui-debug.log
 
 # Compiled JavaScript files
-lib/**/*.js
+lib
-lib/**/*.js.map
 
 # TypeScript v1 declaration files
 typings/

functions/src/publish.ts

@@ -98,19 +98,22 @@ async function getRawEntries(): Promise<T.DictionaryEntry[]> {
     async function deleteRow(r: number) {
         await rows[r].delete();
     }
-    const entries = makeEntries(rows, deleteRow);
+    return await makeEntries(rows, deleteRow);
-    return entries;
 }
 
-function makeEntries(rows: any[], deleteRow: (r: number) => Promise<void>): T.DictionaryEntry[] {
+async function makeEntries(rows: any[], deleteRow: (r: number) => Promise<void>): Promise<T.DictionaryEntry[]> {
     const entries: T.DictionaryEntry[] = [];
+    let sheetIndex = 0;
     for (let i = 0; i < rows.length; i++) {
+        sheetIndex++;
         const row = rows[i];
         const nextRow = rows[i+1] || undefined;
         if (row.ts === nextRow?.ts) {
+            if (row.p !== nextRow.p) throw new Error(`ts ${row.ts} is a duplicate of a different entry`);
             // this looks like a duplicate entry made by the sheets api
             // delete it and keep going
-            deleteRow(i);
+            await deleteRow(sheetIndex);
+            sheetIndex--;
             continue;
         }
         const e: T.DictionaryEntry = {