nl2time 0.3.1 → 0.3.3

package/README.md

@@ -120,11 +120,11 @@ Every imported conformance case carries machine-readable provenance (upstream pr
 pip install nl2time
 ```
 
-The Python engine port lives in [`python/`](python/) (`whenever`-based time model): IR validation, `TimeContext`, and the full deterministic resolver at **100% bit-exact parity** with the JS reference across all 2,760 engine-parity fixtures (`corpus/ir/`), enforced in CI on every push. Parsers and `describe()` are JS-only so far — [docs/porting.md](docs/porting.md) has the strategy and the divergence gates.
+The Python engine port lives in [`python/`](python/) (`whenever`-based time model): IR validation, `TimeContext`, and the full deterministic resolver at **100% bit-exact parity** with the JS reference across all 2,790 engine-parity fixtures (`corpus/ir/`), enforced in CI on every push. Parsers and `describe()` are JS-only so far — [docs/porting.md](docs/porting.md) has the strategy and the divergence gates.
 
 ## Release history
 
-See **[CHANGELOG.md](CHANGELOG.md)** and [GitHub releases](https://github.com/AndyFooBlah/nl2time/releases). Current: v0.3.0 (JS, multilingual parsing) · py-v0.1.0 (Python engine). Releases publish to npm/PyPI automatically via OIDC trusted publishing — see [docs/RELEASING.md](docs/RELEASING.md).
+See **[CHANGELOG.md](CHANGELOG.md)** and [GitHub releases](https://github.com/AndyFooBlah/nl2time/releases). Current: v0.3.3 (JS) · py-v0.1.2 (Python engine). Releases publish to npm/PyPI automatically via OIDC trusted publishing — see [docs/RELEASING.md](docs/RELEASING.md).
 
 ## Development
 

package/dist/engine/resolve.js

@@ -179,7 +179,12 @@ function evalExprInner(expr, ctx, anchor) {
                     if (e.type !== 'interval')
                         continue;
                     const isPoint = Temporal_compare(e.zi.start, e.zi.end) === 0;
-                    const timeGrained = GRAIN_ORDER.indexOf(e.zi.grain) < GRAIN_ORDER.indexOf('day');
+                    // Clock-time semantics need a fine grain AND a sub-day extent: a
+                    // multi-day interval whose edges are snap points ("end of year" =
+                    // Jul 1 → Jan 1) carries grain 'instant' but is a calendar period,
+                    // not a time of day.
+                    const timeGrained = GRAIN_ORDER.indexOf(e.zi.grain) < GRAIN_ORDER.indexOf('day') &&
+                        (isPoint || Temporal_compare(e.zi.start.add({ days: 1 }), e.zi.end) > 0);
                     // Day-grain-or-coarser ends are conversationally inclusive:
                     // "between July 4th and July 10th" covers the 10th. Emit the
                     // inclusive reading (end operand contributes its END) first, with

package/dist/parse/en.js

@@ -612,9 +612,9 @@ function buildRange(a, b, scope, period, connWord) {
 }
 /**
  * Open-range connectors (#18): "since X" → [start(X), now]; "until X" /
- * "till X" / "through X" / "up to X" / "by X" (deadline) → [now, end(X)].
- * These only fire when the connector opens the range — "A until B" and
- * "from A through B" are consumed earlier by the range rule.
+ * "till X" / "through X" / "up to X" / "by X" / "before X" (deadline) →
+ * [now, end(X)]. These only fire when the connector opens the range —
+ * "A until B" and "from A through B" are consumed earlier by the range rule.
  */
 const ruleOpenRange = (tokens, i, ctx) => {
     const w = word(tokens[i]);
@@ -622,7 +622,7 @@ const ruleOpenRange = (tokens, i, ctx) => {
     let at = i + 1;
     if (w === 'since')
         mode = 'since';
-    else if (w === 'until' || w === 'till' || w === 'through' || w === 'thru' || w === 'by') {
+    else if (w === 'until' || w === 'till' || w === 'through' || w === 'thru' || w === 'by' || w === 'before') {
         mode = 'until';
     }
     else if (w === 'up' && word(tokens[i + 1]) === 'to') {
@@ -631,10 +631,13 @@ const ruleOpenRange = (tokens, i, ctx) => {
     }
     if (!mode)
         return undefined;
-    // "by the 15th": a bare article only before an explicit calendar date —
-    // NOT "through the week"-style prose, which stays unmatched.
-    if (word(tokens[at]) === 'the' && ruleCalendarDate(tokens, at + 1, ctx))
+    // "by the 15th" / "by the end of the month": a bare article only before an
+    // explicit calendar date or an edge phrase (#29) — NOT "through the
+    // week"-style prose, which stays unmatched.
+    if (word(tokens[at]) === 'the' &&
+        (ruleCalendarDate(tokens, at + 1, ctx) || ruleEndOf(tokens, at + 1, ctx))) {
         at += 1;
+    }
     const inner = ruleDeicticDay(tokens, at, ctx) ??
         ruleLastThisNext(tokens, at, ctx) ??
         ruleHoliday(tokens, at, ctx) ??
@@ -646,13 +649,29 @@ const ruleOpenRange = (tokens, i, ctx) => {
         ruleWeekdayAlone(tokens, at, ctx);
     if (!inner || inner.role === 'duration')
         return undefined;
-    // Boundary points ("by EOD", "by the end of the month") keep their point
-    // reading — the deadline instant is the answer there, not a range.
+    // Boundary points ("by EOD") keep their point reading — the deadline
+    // instant is the answer there, not a range.
     if (inner.expr.op === 'snap' && inner.expr.edge !== undefined)
         return undefined;
+    // Late-part edge phrases ("end of month/year/quarter/week") parse as the
+    // period's late part — between(offset(start), end). As a deadline the
+    // answer is the period's END point, not the whole late part: using the
+    // interval would make the engine emit the inclusive/exclusive pair (#17)
+    // as a spurious second candidate whenever `now` precedes the late-part
+    // start (#29). Symmetrically, "since the beginning of the month" opens at
+    // the period's START point.
+    let target = inner.expr;
+    if (target.op === 'between') {
+        if (mode === 'until' && target.end.op === 'snap' && target.end.edge === 'end') {
+            target = target.end;
+        }
+        else if (mode === 'since' && target.start.op === 'snap' && target.start.edge === 'start') {
+            target = target.start;
+        }
+    }
     const expr = mode === 'since'
-        ? { op: 'between', start: inner.expr, end: NOW }
-        : { op: 'between', start: NOW, end: inner.expr };
+        ? { op: 'between', start: target, end: NOW }
+        : { op: 'between', start: NOW, end: target };
     return { expr, consumed: at + inner.consumed - i, confidence: 0.9, role: 'datetime' };
 };
 /** "week of April 10th", "the first/last week of July", "the week starting on Feb 4". */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nl2time",
-  "version": "0.3.1",
-  "description": "Bidirectional natural language \u21c4 date/time: parse expressions like 'last week' into concrete intervals, and describe instants as '9pm last night' \u2014 deterministic core, optional LLM assist.",
+  "version": "0.3.3",
+  "description": "Bidirectional natural language ⇄ date/time: parse expressions like 'last week' into concrete intervals, and describe instants as '9pm last night' — deterministic core, optional LLM assist.",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -32,7 +32,8 @@
     "typecheck": "tsc --noEmit",
     "import:recognizers": "node scripts/import-recognizers.mjs",
     "baselines": "npm run build && node scripts/update-baselines.mjs",
-    "eval": "npm run build && node scripts/eval.mjs"
+    "eval": "npm run build && node scripts/eval.mjs",
+    "fixtures": "npm run build && node scripts/generate-ir-fixtures.mjs"
   },
   "keywords": [
     "date",
@@ -55,6 +56,6 @@
     "vitest": "^3.0.0"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
-}
+}