@spaethtech/svelte-ui 0.7.0 → 0.7.1-dev.37.ab40d6b

package/dist/components/Query.svelte

@@ -265,6 +265,14 @@
         </tbody>
       </table>
     </div>
+    <div>
+      <h4 class="mb-1 font-semibold">Dynamic dates</h4>
+      <p class="mb-1 text-xs [color:color-mix(in_srgb,var(--ui-color-text)_70%,transparent)]">
+        <code class="font-mono">now()</code> is the current time; add a signed offset
+        <code class="font-mono">now()±&lt;n&gt;&lt;unit&gt;</code> — units <code>s m h d w</code>
+        (e.g. <code>now()-7d</code>, <code>now()+1h</code>). Resolved when the query runs.
+      </p>
+    </div>
     <div>
       <h4 class="mb-1 font-semibold">Examples</h4>
       <pre
@@ -272,6 +280,7 @@
           >$status == active
 $email ~= /@gmail\.com$/i
 $price |= [20..50) && $role |= [admin, ops]
+$created >= now()-7d && $status == open
 $ip|inet |= [10.0.0.0|inet..10.255.255.255|inet]
 "lemon balm" || $featured == true</code
         ></pre>

package/dist/data/query/ast.d.ts

@@ -1,5 +1,26 @@
 export type CompareOp = "eq" | "ne" | "gt" | "gte" | "lt" | "lte" | "contains" | "ncontains" | "starts" | "ends";
 export type Scalar = string | number | boolean;
+/** Relative-time unit for a `now()` offset: seconds/minutes/hours/days/weeks. */
+export type TimeUnit = "s" | "m" | "h" | "d" | "w";
+/** A dynamic `now()` value — the current instant, optionally shifted by a signed offset
+ *  (`now()-7d`, `now()+1h`). Resolved at EVALUATION time, not parse time (so it's always "now" when
+ *  the query runs, and the server can push it down to the DB's own `now()`). Carried in the AST as a
+ *  marker; `resolveNow` turns it into a `Date`, or the consumer's `toConditions` emits DB SQL. */
+export interface NowValue {
+    now: true;
+    /** Signed amount + unit, e.g. `{ n: -7, unit: "d" }` for `now()-7d`. Absent = the current instant. */
+    offset?: {
+        n: number;
+        unit: TimeUnit;
+    };
+}
+/** A comparison operand: a literal scalar or a dynamic value (`now()`). */
+export type Value = Scalar | NowValue;
+/** Narrow a `Value` to the dynamic `now()` marker. */
+export declare function isNow(v: Value): v is NowValue;
+/** Resolve a `NowValue` to a concrete `Date` (defaults to the real current instant). For client-side
+ *  evaluation; server code typically maps the marker to the DB's `now()` in `toConditions` instead. */
+export declare function resolveNow(v: NowValue, at?: Date): Date;
 /** Explicit value/column cast on a comparison, e.g. `$ip |inet >= 10.0.0.0 |inet`. Storage-agnostic:
  *  the query layer only carries the marker; the consumer (`toConditions`) decides the SQL (e.g.
  *  Postgres `::inet`). `number`/`string`/`bool` also retype the literal at parse time. */
@@ -8,7 +29,7 @@ export type Cast = "number" | "string" | "bool" | "date" | "inet";
 export type MemberMode = "any" | "all";
 /** One end of an interval. `inclusive` reflects the bracket: `[`/`]` inclusive, `(`/`)` exclusive. */
 export type Bound = {
-    value: Scalar;
+    value: Value;
     inclusive: boolean;
 };
 /** `null` bound = open/unbounded on that side (e.g. `[20..)` -> upper is null). */
@@ -29,7 +50,7 @@ export type QueryNode = {
     kind: "cmp";
     col: string;
     op: CompareOp;
-    value: Scalar;
+    value: Value;
     cast?: Cast;
 } | {
     kind: "match";
@@ -41,7 +62,7 @@ export type QueryNode = {
     kind: "in";
     col: string;
     mode: MemberMode;
-    values: Scalar[];
+    values: Value[];
     cast?: Cast;
 } | {
     kind: "range";

package/dist/data/query/ast.js

@@ -1,5 +1,22 @@
 // AST for the data-table query language. Framework-agnostic — no Svelte/Drizzle/SvelteKit deps,
 // so it runs in the browser (Query input), on the server (toConditions), and in unit tests.
+/** Narrow a `Value` to the dynamic `now()` marker. */
+export function isNow(v) {
+    return typeof v === "object" && v !== null && v.now === true;
+}
+const UNIT_MS = {
+    s: 1_000,
+    m: 60_000,
+    h: 3_600_000,
+    d: 86_400_000,
+    w: 604_800_000,
+};
+/** Resolve a `NowValue` to a concrete `Date` (defaults to the real current instant). For client-side
+ *  evaluation; server code typically maps the marker to the DB's `now()` in `toConditions` instead. */
+export function resolveNow(v, at = new Date()) {
+    const base = at.getTime();
+    return new Date(v.offset ? base + v.offset.n * UNIT_MS[v.offset.unit] : base);
+}
 export class QueryError extends Error {
     position;
     constructor(message, 

package/dist/data/query/parser.js

@@ -159,7 +159,35 @@ class Parser {
         }
         throw new QueryError("Expected an operator after the column", opTok.start);
     }
+    /** `now()` (+ optional signed offset like `-7d`, `+1h`) → a dynamic value. `now` alone (no parens)
+     *  is an ordinary literal. Returns undefined if the cursor isn't on a `now()`. */
+    tryNow() {
+        const t = this.peek();
+        if (t.type !== "word" ||
+            t.value !== "now" ||
+            this.tokens[this.pos + 1]?.type !== "lparen" ||
+            this.tokens[this.pos + 2]?.type !== "rparen")
+            return undefined;
+        this.next(); // now
+        this.next(); // (
+        this.next(); // )
+        let offset;
+        const nx = this.peek();
+        if (nx.type === "word") {
+            const m = /^([+-])(\d+)([smhdw])$/.exec(nx.value);
+            if (m) {
+                this.next();
+                offset = { n: (m[1] === "-" ? -1 : 1) * parseInt(m[2], 10), unit: m[3] };
+            }
+            // a following word that ISN'T an offset is left for the outer parser (adjacent-terms error).
+        }
+        this.castAfter(); // a redundant `|date` is allowed and recorded, but not required
+        return { now: true, offset };
+    }
     parseScalar() {
+        const now = this.tryNow();
+        if (now)
+            return now;
         const t = this.next();
         let raw;
         let value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spaethtech/svelte-ui",
-  "version": "0.7.0",
+  "version": "0.7.1-dev.37.ab40d6b",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/spaethtech/svelte-ui.git"