Fix decoding dates

Author: simolus3

libs/lib-services/package.json

@@ -21,6 +21,7 @@
   "keywords": [],
   "dependencies": {
     "@powersync/service-errors": "workspace:*",
+    "@powersync/service-sync-rules": "workspace:*",
     "ajv": "^8.12.0",
     "better-ajv-errors": "^1.2.0",
     "bson": "^6.10.3",

libs/lib-services/src/codec/codecs.ts

@@ -1,5 +1,6 @@
 import * as t from 'ts-codec';
 import * as bson from 'bson';
+import { TimeValue } from '@powersync/service-sync-rules';
 
 export const buffer = t.codec<Buffer, string>(
   'Buffer',
@@ -12,7 +13,7 @@ export const buffer = t.codec<Buffer, string>(
   (buffer) => Buffer.from(buffer, 'base64')
 );
 
-export const date = t.codec<Date, string>(
+export const date = t.codec<Date, string | TimeValue>(
   'Date',
   (date) => {
     if (!(date instanceof Date)) {
@@ -21,7 +22,9 @@ export const date = t.codec<Date, string>(
     return date.toISOString();
   },
   (date) => {
-    const parsed = new Date(date);
+    // In our jpgwire wrapper, we patch the row decoding logic to map timestamps into TimeValue instances, so we need to
+    // support those here.
+    const parsed = new Date(date instanceof TimeValue ? date.iso8601Representation : date);
     if (isNaN(parsed.getTime())) {
       throw new t.TransformError([`Invalid date`]);
     }

modules/module-mongodb/src/replication/MongoRelation.ts

@@ -3,6 +3,7 @@ import { storage } from '@powersync/service-core';
 import { JSONBig, JsonContainer } from '@powersync/service-jsonbig';
 import {
   CustomSqliteValue,
+  DatabaseInputValue,
   SqliteInputRow,
   SqliteInputValue,
   SqliteRow,
@@ -98,7 +99,7 @@ export function toMongoSyncRulesValue(data: any): SqliteInputValue {
 
 const DEPTH_LIMIT = 20;
 
-function filterJsonData(data: any, depth = 0): any {
+function filterJsonData(data: any, depth = 0): DatabaseInputValue | undefined {
   const autoBigNum = true;
   if (depth > DEPTH_LIMIT) {
     // This is primarily to prevent infinite recursion

packages/jpgwire/src/pgwire_types.ts

@@ -179,14 +179,7 @@ export class PgType {
           const decoded = this.decode(unescaped, elemTypeOid);
           stack[0].push(decoded);
         }
-
-        if (ch == 0x7d /*}*/) {
-          const entry = stack.shift();
-          result = entry;
-        } else {
-          result = false;
-        }
-
+        result = ch == 0x7d /*}*/ && stack.shift();
         elStart = i + 1; // TODO dry
       }
     }

packages/sync-rules/src/types/custom_sqlite_value.ts

@@ -25,7 +25,7 @@ export abstract class CustomSqliteValue {
 
   abstract get sqliteType(): SqliteValueType;
 
-  static wrapArray(elements: DatabaseInputValue[]): SqliteInputValue {
+  static wrapArray(elements: (DatabaseInputValue | undefined)[]): SqliteInputValue {
     const hasCustomValue = elements.some((v) => v instanceof CustomSqliteValue);
     if (hasCustomValue) {
       // We need access to the compatibility context before encoding contents as JSON.
@@ -38,7 +38,7 @@ export abstract class CustomSqliteValue {
 }
 
 class CustomArray extends CustomSqliteValue {
-  constructor(private readonly elements: DatabaseInputValue[]) {
+  constructor(private readonly elements: (DatabaseInputValue | undefined)[]) {
     super();
   }
 

packages/sync-rules/src/utils.ts

@@ -69,7 +69,7 @@ export function isJsonValue(value: SqliteValue): value is SqliteJsonValue {
   return value == null || typeof value == 'string' || typeof value == 'number' || typeof value == 'bigint';
 }
 
-function filterJsonData(data: any, depth = 0): any {
+function filterJsonData(data: any, depth = 0): SqliteInputValue | undefined {
   if (depth > DEPTH_LIMIT) {
     // This is primarily to prevent infinite recursion
     // TODO: Proper error class
@@ -93,13 +93,13 @@ function filterJsonData(data: any, depth = 0): any {
     return undefined;
   } else if (data instanceof JsonContainer) {
     // Can be stringified directly when using our JSONBig implementation
-    return data;
+    return data as any;
   } else if (typeof data == 'object') {
     let record: Record<string, any> = {};
     for (let key of Object.keys(data)) {
       record[key] = filterJsonData(data[key], depth + 1);
     }
-    return record;
+    return record as any;
   } else {
     return undefined;
   }