@arcote.tech/arc-adapter-db-postgres 0.7.27 → 0.7.28

package/dist/index.js

@@ -1829,9 +1829,12 @@ class LocalEventPublisher {
       store: EVENT_TABLES.events,
       changes: [{ type: "set", data: storedEvent }]
     });
-    if (event.payload && typeof event.payload === "object") {
+    const tagFields = event.definition?.tagFields ?? [];
+    if (tagFields.length > 0 && event.payload && typeof event.payload === "object") {
+      const payload = event.payload;
       const tagChanges = [];
-      for (const [key, value] of Object.entries(event.payload)) {
+      for (const key of tagFields) {
+        const value = payload[key];
         if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
           tagChanges.push({
             type: "set",
@@ -2055,6 +2058,11 @@ class ArcOptional {
       return false;
     return this.parent.validate(value);
   }
+  coerce(value) {
+    if (value == null)
+      return;
+    return this.parent.coerce(value);
+  }
   toJsonSchema() {
     const parentSchema = this.parent.toJsonSchema?.() ?? {};
     return {
@@ -2101,6 +2109,9 @@ class ArcBranded {
   validate(value) {
     return this.parent.validate(value);
   }
+  coerce(value) {
+    return this.parent.coerce(value);
+  }
   toJsonSchema() {
     return this.parent.toJsonSchema?.() ?? {};
   }
@@ -2125,6 +2136,11 @@ class ArcDefault {
       return false;
     return this.parent.validate(value);
   }
+  coerce(value) {
+    if (value === undefined || value === null)
+      return;
+    return this.parent.coerce(value);
+  }
   parse(value) {
     if (value)
       return this.parent.parse(value);
@@ -2207,6 +2223,9 @@ class ArcAbstract {
     }
     return false;
   }
+  coerce(value) {
+    return this.validate(value) ? undefined : value;
+  }
   pipeValidation(name, validator) {
     const newInstance = this.clone();
     newInstance.validations = [...this.validations, { name, validator }];
@@ -2344,6 +2363,17 @@ class ArcArray extends ArcAbstract {
         return { msg: "array is empty" };
     });
   }
+  coerce(value) {
+    if (!Array.isArray(value))
+      return;
+    const out = [];
+    for (const item of value) {
+      const coerced = this.parent.coerce(item);
+      if (coerced !== undefined)
+        out.push(coerced);
+    }
+    return this.validate(out) ? undefined : out;
+  }
   parse(value) {
     return value.map((v) => this.parent.parse(v));
   }
@@ -2415,6 +2445,19 @@ class ArcObject extends ArcAbstract {
     ]);
     this.rawShape = rawShape;
   }
+  coerce(value) {
+    if (value == null || typeof value !== "object" || Array.isArray(value)) {
+      return;
+    }
+    const src = value;
+    const out = {};
+    for (const [key, element] of Object.entries(this.rawShape)) {
+      const coerced = element.coerce(src[key]);
+      if (coerced !== undefined)
+        out[key] = coerced;
+    }
+    return this.validate(out) ? undefined : out;
+  }
   parse(value) {
     return Object.entries(this.rawShape).reduce((acc, [key, element]) => {
       acc[key] = element.parse(value[key]);
@@ -2664,6 +2707,25 @@ class ArcAuthorizationError extends Error {
     this.name = "ArcAuthorizationError";
   }
 }
+function collectFieldPaths(errors, prefix = "") {
+  if (!errors || typeof errors !== "object")
+    return [];
+  const schema = errors.schema;
+  if (!schema || typeof schema !== "object")
+    return [];
+  const out = [];
+  for (const [field, fieldError] of Object.entries(schema)) {
+    if (!fieldError)
+      continue;
+    const path = prefix ? `${prefix}.${field}` : field;
+    const nested = collectFieldPaths(fieldError, path);
+    if (nested.length > 0)
+      out.push(...nested);
+    else
+      out.push(path);
+  }
+  return out;
+}
 
 class ArcValidationError extends Error {
   arcCode = "VALIDATION";
@@ -2671,7 +2733,8 @@ class ArcValidationError extends Error {
   constructor(errors, message = "Invalid parameters") {
     super(message);
     this.name = "ArcValidationError";
-    this.fields = errors && typeof errors === "object" ? Object.keys(errors) : [];
+    const paths = collectFieldPaths(errors);
+    this.fields = paths.length > 0 ? paths : errors && typeof errors === "object" ? Object.keys(errors) : [];
   }
 }
 class ArcPrimitive extends ArcAbstract {
@@ -3038,7 +3101,8 @@ class ArcEvent extends ArcContextElement {
           payload,
           id: this.eventId.generate(),
           createdAt: new Date,
-          authContext
+          authContext,
+          definition: this
         };
         await adapters.eventPublisher.publish(event);
       }
@@ -3091,8 +3155,8 @@ class ArcEvent extends ArcContextElement {
     const tagsSchema = new ArcObject({
       _id: new ArcString().primaryKey(),
       eventId: new ArcString().index(),
-      tagKey: new ArcString().index(),
-      tagValue: new ArcString().index()
+      tagKey: new ArcString,
+      tagValue: new ArcString
     });
     const syncStatusSchema = new ArcObject({
       _id: new ArcString().primaryKey(),
@@ -4033,16 +4097,57 @@ function resolveQueryChange(currentResult, event3, options) {
   }
   const shouldBeInResult = checkItemMatchesWhere(event3.item, options.where);
   if (isInCurrentResult && shouldBeInResult) {
-    const newResult = currentResult.toSpliced(index, 1, event3.item);
-    return applyOrderByAndLimit(newResult, options);
+    if (!options.orderBy) {
+      return applyLimit(currentResult.toSpliced(index, 1, event3.item), options);
+    }
+    const cmp = compareByOrderBy(options.orderBy);
+    if (cmp(currentResult[index], event3.item) === 0) {
+      return applyLimit(currentResult.toSpliced(index, 1, event3.item), options);
+    }
+    const without = currentResult.toSpliced(index, 1);
+    const at = upperBound(without, event3.item, cmp);
+    return applyLimit(without.toSpliced(at, 0, event3.item), options);
   } else if (isInCurrentResult && !shouldBeInResult) {
     return currentResult.toSpliced(index, 1);
   } else if (!isInCurrentResult && shouldBeInResult) {
-    const newResult = [...currentResult, event3.item];
-    return applyOrderByAndLimit(newResult, options);
+    if (!options.orderBy) {
+      return applyLimit([...currentResult, event3.item], options);
+    }
+    const cmp = compareByOrderBy(options.orderBy);
+    const at = upperBound(currentResult, event3.item, cmp);
+    return applyLimit(currentResult.toSpliced(at, 0, event3.item), options);
   }
   return false;
 }
+function compareByOrderBy(orderBy) {
+  const entries = Object.entries(orderBy);
+  return (a, b) => {
+    for (const [key, direction] of entries) {
+      const aVal = a[key];
+      const bVal = b[key];
+      if (aVal < bVal)
+        return direction === "asc" ? -1 : 1;
+      if (aVal > bVal)
+        return direction === "asc" ? 1 : -1;
+    }
+    return 0;
+  };
+}
+function upperBound(arr, item, cmp) {
+  let lo = 0;
+  let hi = arr.length;
+  while (lo < hi) {
+    const mid = lo + hi >> 1;
+    if (cmp(arr[mid], item) <= 0)
+      lo = mid + 1;
+    else
+      hi = mid;
+  }
+  return lo;
+}
+function applyLimit(result, options) {
+  return options.limit !== undefined && result.length > options.limit ? result.slice(0, options.limit) : result;
+}
 function checkItemMatchesWhere(item, where) {
   if (!where) {
     return true;
@@ -4078,27 +4183,6 @@ function checkItemMatchesWhere(item, where) {
     });
   });
 }
-function applyOrderByAndLimit(result, options) {
-  let sorted = result;
-  if (options.orderBy) {
-    sorted = [...result].sort((a, b) => {
-      for (const [key, direction] of Object.entries(options.orderBy)) {
-        const aVal = a[key];
-        const bVal = b[key];
-        if (aVal < bVal)
-          return direction === "asc" ? -1 : 1;
-        if (aVal > bVal)
-          return direction === "asc" ? 1 : -1;
-      }
-      return 0;
-    });
-  }
-  if (options.limit !== undefined) {
-    sorted = sorted.slice(0, options.limit);
-  }
-  return sorted;
-}
-
 class ObservableDataStorage {
   source;
   onChange;
@@ -6817,6 +6901,40 @@ function osUsername() {
 }
 
 // src/postgres-adapter.ts
+var MAX_SAFE_INT = BigInt(Number.MAX_SAFE_INTEGER);
+var MIN_SAFE_INT = BigInt(Number.MIN_SAFE_INTEGER);
+function unsafeIntMessage(raw, columnName) {
+  const where = columnName ? ` w kolumnie "${columnName}"` : "";
+  return `[PostgreSQL] Wartość całkowita ${raw}${where} przekracza bezpieczny zakres ` + `JS Number (±2^53-1). Odczyt jako number cicho straciłby precyzję. ` + `Użyj kolumny TEXT/NUMERIC i obsłuż wartość jako string/BigInt.`;
+}
+function coercePgNumber(value, columnName) {
+  if (value === null || value === undefined)
+    return value;
+  if (typeof value === "number")
+    return value;
+  if (typeof value === "bigint") {
+    if (value > MAX_SAFE_INT || value < MIN_SAFE_INT) {
+      throw new Error(unsafeIntMessage(value.toString(), columnName));
+    }
+    return Number(value);
+  }
+  if (typeof value === "string") {
+    const s = value.trim();
+    if (s === "")
+      return value;
+    if (/^[+-]?\d+$/.test(s)) {
+      const big = BigInt(s);
+      if (big > MAX_SAFE_INT || big < MIN_SAFE_INT) {
+        throw new Error(unsafeIntMessage(s, columnName));
+      }
+      return Number(big);
+    }
+    const n = Number(s);
+    return Number.isNaN(n) ? value : n;
+  }
+  return value;
+}
+
 class PostgreSQLReadTransaction {
   db;
   tables;
@@ -6838,7 +6956,27 @@ class PostgreSQLReadTransaction {
   deserializeValue(value, column) {
     if (value === null || value === undefined)
       return null;
-    switch (column.type.toLowerCase()) {
+    const type = column.type.toLowerCase().split("(")[0].trim();
+    switch (type) {
+      case "bigint":
+      case "int8":
+      case "bigserial":
+      case "serial8":
+      case "serial":
+      case "serial4":
+      case "integer":
+      case "int":
+      case "int4":
+      case "smallint":
+      case "int2":
+      case "numeric":
+      case "decimal":
+      case "real":
+      case "double precision":
+      case "float":
+      case "float4":
+      case "float8":
+        return coercePgNumber(value, column.name);
       case "json":
       case "jsonb":
         if (typeof value === "string") {
@@ -7489,7 +7627,15 @@ class PostgresJsDatabase {
 }
 var createPostgreSQLAdapterFactoryFromUrl = (connectionString) => {
   const sql = src_default(connectionString, {
-    onnotice: () => {}
+    onnotice: () => {},
+    types: {
+      bigint: {
+        to: 20,
+        from: [20],
+        serialize: (v) => v.toString(),
+        parse: (v) => coercePgNumber(v)
+      }
+    }
   });
   const db = new PostgresJsDatabase(sql);
   return createPostgreSQLAdapterFactory(db);
@@ -7497,5 +7643,6 @@ var createPostgreSQLAdapterFactoryFromUrl = (connectionString) => {
 export {
   createPostgreSQLAdapterFactoryFromUrl,
   createPostgreSQLAdapterFactory,
+  coercePgNumber,
   PostgreSQLAdapter
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcote.tech/arc-adapter-db-postgres",
-  "version": "0.7.27",
+  "version": "0.7.28",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -23,7 +23,7 @@
     "postgres": "^3.4.4"
   },
   "peerDependencies": {
-    "@arcote.tech/arc": "^0.7.27"
+    "@arcote.tech/arc": "^0.7.28"
   },
   "devDependencies": {
     "@types/pg": "^8.11.0",