@shushed/helpers 0.0.263 → 0.0.264

package/dist/cjs/src-public/airtable.js

@@ -28,6 +28,42 @@ class AirtableHelper extends runtime_1.default {
             this.viewId = airtableOpts.viewId;
         }
     }
+    static normalizeWebhookCellValues(cellValuesByFieldId) {
+        const isSelectOption = (v) => v && typeof v === 'object' && !Array.isArray(v) && typeof v.id === 'string' && v.id.startsWith('sel');
+        const isLinkedRecord = (v) => v && typeof v === 'object' && !Array.isArray(v) && typeof v.id === 'string' && v.id.startsWith('rec');
+        const normalizeValue = (v) => {
+            if (isSelectOption(v))
+                return v.name;
+            if (isLinkedRecord(v))
+                return v.id;
+            return v;
+        };
+        const normalized = {};
+        for (const fieldId in cellValuesByFieldId) {
+            const val = cellValuesByFieldId[fieldId];
+            if (val && typeof val === 'object' && !Array.isArray(val) && Array.isArray(val.linkedRecordIds)) {
+                if (val.valuesByLinkedRecordId) {
+                    normalized[fieldId] = val.linkedRecordIds.flatMap((id) => (val.valuesByLinkedRecordId[id] ?? []).map(normalizeValue));
+                }
+                else {
+                    normalized[fieldId] = val.linkedRecordIds;
+                }
+            }
+            else if (isSelectOption(val)) {
+                normalized[fieldId] = val.name;
+            }
+            else if (Array.isArray(val) && val.length > 0 && isSelectOption(val[0])) {
+                normalized[fieldId] = val.map((opt) => opt.name);
+            }
+            else if (Array.isArray(val) && val.length > 0 && isLinkedRecord(val[0])) {
+                normalized[fieldId] = val.map((rec) => rec.id);
+            }
+            else {
+                normalized[fieldId] = val;
+            }
+        }
+        return normalized;
+    }
     static translateFields(dictionary, y) {
         const nextFields = {};
         for (const k in dictionary) {
@@ -421,7 +457,11 @@ class AirtableHelper extends runtime_1.default {
         let collectedRecords = [];
         let resp = null;
         try {
-            resp = await fetch(`https://api.airtable.com/v0/bases/${this.baseId}/webhooks/${input.webhook.id}/payloads`, {
+            const payloadsUrl = new URL(`https://api.airtable.com/v0/bases/${this.baseId}/webhooks/${input.webhook.id}/payloads`);
+            if (startingCursor) {
+                payloadsUrl.searchParams.set('cursor', String(startingCursor));
+            }
+            resp = await fetch(payloadsUrl.toString(), {
                 method: 'GET',
                 headers: {
                     'Authorization': 'Bearer ' + this.apiKey,
@@ -450,11 +490,11 @@ class AirtableHelper extends runtime_1.default {
             this.logging.log(`Received ${res.payloads.length} records from the ${scope}.`);
             for (const payload of res.payloads) {
                 const changes = this.viewId
-                    ? payload.changedViewsById?.[this.viewId]
+                    ? payload.changedTablesById?.[this.tableId]?.changedViewsById?.[this.viewId]
                     : payload.changedTablesById?.[this.tableId];
                 const airtableCreated = Object.entries(changes?.createdRecordsById || {}).map(([k, v]) => ({
                     id: k,
-                    fields: AirtableHelper.translateFields(this.dictionary, { fields: v.cellValuesByFieldId || {} }).fields,
+                    fields: AirtableHelper.translateFields(this.dictionary, { fields: AirtableHelper.normalizeWebhookCellValues(v.cellValuesByFieldId || {}) }).fields,
                     created_at: v.createdTime || payload.timestamp,
                     last_modified_at: v.createdTime || payload.timestamp,
                     previous_fields: null
@@ -462,7 +502,7 @@ class AirtableHelper extends runtime_1.default {
                 const airtableChanged = Object.entries(changes?.changedRecordsById || {}).map(([k, v]) => ({
                     id: k,
                     fields: AirtableHelper.translateFields(this.dictionary, {
-                        fields: Object.assign({}, v.unchanged?.cellValuesByFieldId, v.current?.cellValuesByFieldId)
+                        fields: AirtableHelper.normalizeWebhookCellValues(Object.assign({}, v.unchanged?.cellValuesByFieldId, v.current?.cellValuesByFieldId))
                     }).fields,
                     last_modified_at: payload.timestamp
                 }));

package/dist/types/src-public/airtable.d.ts

@@ -22,6 +22,7 @@ declare class AirtableHelper<T extends Record<string, string>, K extends keyof T
         primaryKeyWritable?: boolean;
         viewId?: string;
     });
+    static normalizeWebhookCellValues(cellValuesByFieldId: Record<string, any>): Record<string, any>;
     static translateFields<T extends Record<string, string>, S extends {
         fields: Record<string, any>;
     }>(dictionary: T, y: S): S & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.263",
+  "version": "0.0.264",
   "author": "",
   "license": "UNLICENSED",
   "description": "",