@object-ui/core 5.4.1 → 6.0.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @object-ui/core
 
+## 6.0.0
+
+### Patch Changes
+
+- @object-ui/types@6.0.0
+
+## 5.4.2
+
+### Patch Changes
+
+- @object-ui/types@5.4.2
+
 ## 5.4.1
 
 ### Patch Changes

package/dist/utils/date-macros.d.ts

@@ -27,10 +27,17 @@
  *   - next_week_start / next_month_start / next_quarter_start / next_year_start
  *
  * Parameterised tokens (match `N` as any positive integer):
- *   - {N_days_ago} / {N_days_from_now}
- *   - {N_weeks_ago} / {N_weeks_from_now}
- *   - {N_months_ago} / {N_months_from_now}
- *   - {N_years_ago} / {N_years_from_now}
+ *   - {N_minutes_ago} / {N_minutes_from_now}       (returns full ISO timestamp)
+ *   - {N_hours_ago}   / {N_hours_from_now}         (returns full ISO timestamp)
+ *   - {N_days_ago}    / {N_days_from_now}
+ *   - {N_weeks_ago}   / {N_weeks_from_now}
+ *   - {N_months_ago}  / {N_months_from_now}
+ *   - {N_years_ago}   / {N_years_from_now}
+ *
+ * The canonical grammar is also published as part of the platform contract at
+ * `@objectstack/spec` → `DATE_MACRO_TOKENS` / `DATE_MACRO_PARAM_RE`. Keep this
+ * file in sync with the spec; the duplication is temporary until the next
+ * coordinated `@objectstack/spec` release.
  *
  * Walks any plain-object / array structure recursively. Non-string values
  * (and unknown tokens) are passed through untouched.

package/dist/utils/date-macros.js

@@ -27,10 +27,17 @@
  *   - next_week_start / next_month_start / next_quarter_start / next_year_start
  *
  * Parameterised tokens (match `N` as any positive integer):
- *   - {N_days_ago} / {N_days_from_now}
- *   - {N_weeks_ago} / {N_weeks_from_now}
- *   - {N_months_ago} / {N_months_from_now}
- *   - {N_years_ago} / {N_years_from_now}
+ *   - {N_minutes_ago} / {N_minutes_from_now}       (returns full ISO timestamp)
+ *   - {N_hours_ago}   / {N_hours_from_now}         (returns full ISO timestamp)
+ *   - {N_days_ago}    / {N_days_from_now}
+ *   - {N_weeks_ago}   / {N_weeks_from_now}
+ *   - {N_months_ago}  / {N_months_from_now}
+ *   - {N_years_ago}   / {N_years_from_now}
+ *
+ * The canonical grammar is also published as part of the platform contract at
+ * `@objectstack/spec` → `DATE_MACRO_TOKENS` / `DATE_MACRO_PARAM_RE`. Keep this
+ * file in sync with the spec; the duplication is temporary until the next
+ * coordinated `@objectstack/spec` release.
  *
  * Walks any plain-object / array structure recursively. Non-string values
  * (and unknown tokens) are passed through untouched.
@@ -113,8 +120,8 @@ export function resolveDateMacros(filter, now = new Date()) {
     for (const [from, to] of Object.entries(aliases)) {
         macros[from] = macros[to];
     }
-    // Parameterised tokens: {N_days_ago}, {N_weeks_from_now}, ...
-    const paramRe = /^(\d+)_(days?|weeks?|months?|years?)_(ago|from_now)$/;
+    // Parameterised tokens: {N_days_ago}, {N_weeks_from_now}, {N_hours_ago}, ...
+    const paramRe = /^(\d+)_(minutes?|hours?|days?|weeks?|months?|years?)_(ago|from_now)$/;
     const resolveParam = (tok) => {
         const m = tok.match(paramRe);
         if (!m)
@@ -124,6 +131,12 @@ export function resolveDateMacros(filter, now = new Date()) {
             return null;
         const sign = m[3] === 'ago' ? -1 : 1;
         const unit = m[2].replace(/s$/, '');
+        if (unit === 'minute') {
+            return new Date(now.getTime() + sign * n * 60 * 1000).toISOString();
+        }
+        if (unit === 'hour') {
+            return new Date(now.getTime() + sign * n * 60 * 60 * 1000).toISOString();
+        }
         if (unit === 'day')
             return isoDate(addDays(now, sign * n));
         if (unit === 'week')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@object-ui/core",
-  "version": "5.4.1",
+  "version": "6.0.0",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",
@@ -28,7 +28,7 @@
     "@objectstack/spec": "^5.2.0",
     "lodash": "^4.18.1",
     "zod": "^4.4.3",
-    "@object-ui/types": "5.4.1"
+    "@object-ui/types": "6.0.0"
   },
   "devDependencies": {
     "typescript": "^6.0.3",