ensure undefined values are converted to nulls

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-source-google-spreadsheets",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "A source plugin for Gatsby that allows reading data from Google Sheets.",
   "main": "index.js",
   "scripts": {

src/fetchSheet.spec.ts

@@ -24,6 +24,23 @@ if (withPrivateKey == it.skip) {
   );
 }
 
+declare global {
+  namespace jest {
+    interface Matchers<R> {
+      toBeBoolean(): R;
+    }
+  }
+}
+
+expect.extend({
+  toBeBoolean(received) {
+    return {
+      message: () => `expected ${received} to be boolean or null`,
+      pass: typeof received === 'boolean',
+    };
+  },
+});
+
 describe('fetching remote sheet from google', () => {
   withAPIKey('public sheets require API credential', async () => {
     const sheet = await fetchSheet(SPREADSHEET_ID, undefined, GOOGLE_API_KEY);
@@ -56,4 +73,14 @@ describe('fetching remote sheet from google', () => {
     expect(sheet.id).toBeDefined();
     expect(sheet.inventory).toBeDefined();
   });
+
+  withAPIKey('undefineds on sheets to be correct', async () => {
+    const sheet = await fetchSheet(
+      '1QfQ-DvRe1O-w2t87AIA_XcQFgMEwylrVVeBetZW9plI',
+      undefined,
+      GOOGLE_API_KEY,
+    );
+    expect(sheet).toBeDefined();
+    expect(sheet.id).toBeDefined();
+  });
 });

src/fetchSheet/cleanRows.spec.ts

@@ -100,19 +100,45 @@ describe('cleaning rows from GSheets response', () => {
       },
       {
         number: '2',
-        string: 'nothing',
+        string: '',
         null: null,
         'boolean-value': null,
       },
+      {
+        number: null,
+        string: null,
+        null: null,
+        'boolean-value': null,
+      },
+      {
+        number: undefined,
+        string: undefined,
+        null: undefined,
+        'boolean-value': undefined,
+      },
     ];
     const cleaned = cleanRows(rows);
-    expect(cleaned.map(row => row.number)).toEqual([0, 1, 2]);
+    expect(cleaned.map(row => row.number)).toEqual([0, 1, 2, null, null]);
     expect(cleaned.map(row => row.string)).toEqual([
       'something',
       'anything',
-      'nothing',
+      null,
+      null,
+      null,
+    ]);
+    expect(cleaned.map(row => row.null)).toEqual([
+      null,
+      null,
+      null,
+      null,
+      null,
+    ]);
+    expect(cleaned.map(row => row.booleanValue)).toEqual([
+      true,
+      false,
+      false,
+      false,
+      false,
     ]);
-    expect(cleaned.map(row => row.null)).toEqual([null, null, null]);
-    expect(cleaned.map(row => row.booleanValue)).toEqual([true, false, false]);
   });
 });

src/fetchSheet/cleanRows.ts

@@ -22,11 +22,16 @@ export const cleanRows = (rows: SpreadsheetRow[]): SpreadsheetRow[] => {
 function convertCell(columnTypes: ColumnTypes, key: string, val: any): any {
   switch (columnTypes[key]) {
     case 'number':
-      return Number(val.replace(/,/g, ''));
+      return isNull(val) ? null : Number(val.replace(/,/g, ''));
     case 'boolean':
       // when column contains null we return false, otherwise check boolean value
-      return val === null ? false : val === 'TRUE';
+      return isNull(val) ? false : val === 'TRUE';
     default:
-      return val === '' ? null : val;
+      // We cast all possible null types to actually be null
+      return isNull(val) ? null : val;
   }
 }
+
+function isNull(val: any): boolean {
+  return val === null || val === undefined || val === '';
+}