@harperfast/harper 5.2.0-beta.1 → 5.2.0-beta.2

package/dist/resources/Table.js

@@ -1168,7 +1168,7 @@ function makeTable(options) {
                 // go back to the static search method so it gets a chance to override
                 return constructor.search(target, this.getContext());
             }
-            if (target && target.id === undefined && !target.toString()) {
+            if (target && target.id == null && !target.toString()) {
                 const description = {
                     // basically a describe call
                     records: './', // an href to the records themselves
@@ -1986,7 +1986,10 @@ function makeTable(options) {
                     let residencyId;
                     if (options?.residencyId != undefined)
                         residencyId = options.residencyId;
-                    const expiresAt = options?.expiresAt ?? context?.expiresAt ?? (expirationMs ? expirationMs + Date.now() : -1);
+                    // options/context expiresAt are the most specific overrides; a record @expiresAt field
+                    // (resolved below, once recordToStore is merged) overrides the table default in both
+                    // directions; the table default is the final fallback. -1 means no expiration.
+                    let expiresAt = options?.expiresAt ?? context?.expiresAt;
                     const additionalAuditRefs = []; // track additional audit refs to store
                     // Bulk base-copy snapshot apply: store current-state directly with no audit/transaction-log entry
                     // and no out-of-order resequencing/dedup (the source of the O(n) keyed-lookup spin in
@@ -2354,6 +2357,36 @@ function makeTable(options) {
                         }
                         residencyId = getResidencyId(residency);
                     }
+                    if (expiresAt == undefined) {
+                        // A schema @expiresAt attribute makes the record field authoritative over the table
+                        // default, in both directions: stamp it into the stored expiry metadata that governs
+                        // read-hiding and the cleanup sweep, not just the separate index-pruning sweep (which
+                        // only removes already-past records and so can never extend past the table default).
+                        // Read from recordToStore so the metadata matches exactly what the pruning sweep later
+                        // reads back. Falls back to the table default when the field is unset or not a timestamp.
+                        const fieldExpiresAt = expiresAtProperty ? recordToStore?.[expiresAtProperty.name] : undefined;
+                        // Coerce only genuine timestamp shapes: a number/bigint epoch, a Date, or a numeric/ISO
+                        // string. Booleans, empty/whitespace strings, and null/undefined fall through to NaN so a
+                        // nonsensical field value uses the table default rather than expiring the record at epoch 0.
+                        let fieldExpiresAtMs = NaN;
+                        if (typeof fieldExpiresAt === 'number' || typeof fieldExpiresAt === 'bigint')
+                            fieldExpiresAtMs = Number(fieldExpiresAt);
+                        else if (fieldExpiresAt instanceof Date)
+                            fieldExpiresAtMs = fieldExpiresAt.getTime();
+                        else if (typeof fieldExpiresAt === 'string' && fieldExpiresAt.trim() !== '') {
+                            const numeric = Number(fieldExpiresAt);
+                            fieldExpiresAtMs = Number.isFinite(numeric) ? numeric : Date.parse(fieldExpiresAt);
+                        }
+                        // Only a finite, non-negative epoch counts: negatives collide with the -1 "no expiration"
+                        // sentinel (the encoder omits HAS_EXPIRATION for <0, but the field sweep would still evict a
+                        // negative field value), so treat a negative/NaN field as unset and use the table default.
+                        expiresAt =
+                            Number.isFinite(fieldExpiresAtMs) && fieldExpiresAtMs >= 0
+                                ? fieldExpiresAtMs
+                                : expirationMs
+                                    ? expirationMs + Date.now()
+                                    : -1;
+                    }
                     if (!fullUpdate) {
                         // we use our own data as the basis for the audit record, which will include information about the incremental updates, even if it was overwritten by CRDT resolution
                         auditRecordToStore = recordUpdate;