fix for zero-length data

itanka9 · Dec 18, 2024 · 4f11bf8 · 4f11bf8
1 parent bfb1635
commit 4f11bf8
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 26 deletions.
diff --git a/src/json2pbf.d.ts b/src/json2pbf.d.ts
diff --git a/src/json2pbf.ts b/src/json2pbf.ts
@@ -200,7 +200,7 @@ export function packJson(val: any, options?: PackOptions): ArrayBuffer {
             }
             const fcol = Object.keys(val)[0];
             const clen = val?.[fcol]?.length;
-            if (!clen) {
+            if (clen === undefined) {
                 throw new Error('Cannot determine columnar data length');
             }
             pbf.writeFixed32(clen);
@@ -219,8 +219,8 @@ export function packJson(val: any, options?: PackOptions): ArrayBuffer {
                 throw new Error('No columns');
             }
             const rlen = val?.length;
-            if (!rlen) {
-                throw new Error('Cannot determine columnar data length');
+            if (rlen === undefined) {
+                throw new Error('Cannot determine row data length');
             }
             pbf.writeFixed32(rlen);
             writeColumns(columns, pbf);

diff --git a/tests/json2pbf.spec.ts b/tests/json2pbf.spec.ts
@@ -1,7 +1,7 @@
 import { test, expect } from '@playwright/test';
 import { codecs } from '../demo/config';
-import { packJson, unpackJson } from 'src/json2pbf';
-import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { JsonType, packJson, PackMethod, PackOptions, unpackJson } from 'src/json2pbf';
+import { readFileSync } from 'fs';
 
 type Configuration = { arraySize: number, iterations: number };  
 
@@ -49,6 +49,41 @@ test.describe('basic cases', () => {
     });
   }
 
+  const rowCases = [
+    [],
+    [{ id: 'foo', hidden: 1 }],
+    [
+      { id: 'foo', hidden: 1 },
+      { id: 'bar', hidden: 0 }
+    ],
+  ];
+
+  for (const content of rowCases) {
+    const packOptions: PackOptions = {
+      method: PackMethod.Row,
+      columns: { id: JsonType.String, hidden: JsonType.Number }
+    };
+    test(`row pack(unpack(${JSON.stringify(content)})) === ${JSON.stringify(content)}`, () => {
+      expect(unpackJson(packJson(content, packOptions))).toStrictEqual(content)
+    });
+  }
+
+  const columnCases = [
+    { id: [], hidden: [] },
+    { id: ['foo'], hidden: [1] },
+    { id: ['foo', 'bar'], hidden: [1, 0] }
+  ];
+
+  for (const content of columnCases) {
+    const packOptions: PackOptions = {
+      method: PackMethod.Columnar,
+      columns: { id: JsonType.String, hidden: JsonType.Number }
+    };
+    test(`col pack(unpack(${JSON.stringify(content)})) === ${JSON.stringify(content)}`, () => {
+      expect(unpackJson(packJson(content, packOptions))).toStrictEqual(content)
+    });
+  }
+
   const versions = [1];
 
   const serializeCases = [