metaobjects 1.1.3__tar.gz → 1.1.4__tar.gz

{metaobjects-1.1.3 → metaobjects-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: metaobjects
-Version: 1.1.3
+Version: 1.1.4
 Summary: Cross-language metadata standard: declare typed entities once, generate idiomatic drift-checked code across languages — Python port.
 Project-URL: Homepage, https://metaobjects.dev
 Project-URL: Repository, https://github.com/metaobjectsdev/metaobjects

{metaobjects-1.1.3 → metaobjects-1.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "metaobjects"
-version = "1.1.3"
+version = "1.1.4"
 description = "Cross-language metadata standard: declare typed entities once, generate idiomatic drift-checked code across languages — Python port."
 readme = "README.md"
 requires-python = ">=3.11"

{metaobjects-1.1.3 → metaobjects-1.1.4}/src/metaobjects/loader/validate_reporting.py

@@ -96,6 +96,8 @@ from ..meta.core.reporting.reporting_constants import (
     AGG_MIN,
     AGG_SUM,
     FILTER_RELATIVE_NOW,
+    FILTER_RELATIVE_START_OF,
+    RELATIVE_START_OF_UNITS,
     GRAIN_HOUR,
     ISO_DURATION_RE,
     MEASURE_SUBTYPE_AGGREGATE,
@@ -310,7 +312,7 @@ def _is_document_field(field: MetaData) -> bool:
 
 def _is_relative_value(v: object) -> TypeGuard[dict[str, object]]:
     """An object operand carrying a ``now`` key — a relative-date value, well-formed
-    (exactly ``{ now }``) or not. A malformed one is refused, never read as data."""
+    (``{ now }`` plus an optional ``startOf``) or not. A malformed one is refused, never read as data."""
     return isinstance(v, dict) and FILTER_RELATIVE_NOW in v
 
 
@@ -861,10 +863,10 @@ def _check_filter(
             relative = _relative_operand(operand)
             if relative is None:
                 continue
-            if len(relative) != 1:
+            if not set(relative) <= {FILTER_RELATIVE_NOW, FILTER_RELATIVE_START_OF}:
                 err(
                     f"@filter on '{key}' has a malformed relative date {_js_json(relative)}; a relative date is "
-                    f'exactly {{ now: "<ISO-8601 duration>" }} with no other keys.'
+                    f'{{ now: "<ISO-8601 duration>" }} with an optional startOf, and no other keys.'
                 )
                 continue
             if field.sub_type not in _TEMPORAL_FIELD_SUBTYPES:
@@ -885,6 +887,14 @@ def _check_filter(
                     f"@filter on '{key}' has relative date '{_quote_value(duration)}', which is not an ISO-8601 "
                     f"duration (e.g. '-P7D', '-PT12H')."
                 )
+                continue
+            if FILTER_RELATIVE_START_OF in relative:
+                start_of = relative[FILTER_RELATIVE_START_OF]
+                if not isinstance(start_of, str) or start_of not in RELATIVE_START_OF_UNITS:
+                    err(
+                        f"@filter on '{key}' has startOf '{_quote_value(start_of)}'; startOf is one of "
+                        f"{', '.join(RELATIVE_START_OF_UNITS)}."
+                    )
 
 
 # ---------------------------------------------------------------------------

{metaobjects-1.1.3 → metaobjects-1.1.4}/src/metaobjects/meta/core/reporting/reporting_constants.py

@@ -107,6 +107,13 @@ REPORT_DIMENSION_GRAIN_SEPARATOR = ":"
 #: Legal only in the ``@filter`` of a ``segment``, ``measure.aggregate`` or ``object.report``.
 FILTER_RELATIVE_NOW = "now"
 
+#: The optional second key of a relative-date value: ``{ "now": "-P90D", "startOf": "day" }``
+#: truncates the instant (after the duration is applied) to the start of that UTC calendar unit.
+FILTER_RELATIVE_START_OF = "startOf"
+
+#: The calendar units ``startOf`` accepts. A week is the ISO week, Monday start.
+RELATIVE_START_OF_UNITS: tuple[str, ...] = ("day", "week", "month")
+
 #: A signed ISO-8601 duration (``-P7D``, ``P1Y2M``, ``-PT12H``). The lookaheads refuse
 #: the degenerate ``P`` and ``PT`` forms (a designator with no component). The pattern
 #: is the rule table's verbatim; ``\Z`` stands in for JS ``$`` (Python ``$`` would also

{metaobjects-1.1.3 → metaobjects-1.1.4}/src/metaobjects/registry_manifest.py

@@ -255,7 +255,7 @@ def _sorted_children(definition: TypeDefinition) -> list[dict[str, object]]:
     return children
 
 
-METAMODEL_VERSION = "1.1"
+METAMODEL_VERSION = "1.2"
 """Rolled-up spec-version for the cross-port registry manifest.
 
 ``"0"`` = pre-1.0 / unstable (semver major-0). Flips to ``"1.0"`` at the

{metaobjects-1.1.3 → metaobjects-1.1.4}/src/metaobjects/runtime/dialect.py

@@ -68,6 +68,12 @@ class Dialect:
         """``col LIKE pattern`` with the pattern verbatim and the match case-SENSITIVE."""
         return f"{quoted_column} LIKE {self.placeholder}", [pattern]
 
+    def order_term(self, quoted_column: str, descending: bool) -> str:
+        """One ``ORDER BY`` term with nulls LARGER than any value: ASC puts them last, DESC
+        first, on every engine. That is Postgres's own default, so this is its native form;
+        SQLite and MySQL would put nulls first on ASC."""
+        return f"{quoted_column} {'DESC NULLS FIRST' if descending else 'ASC NULLS LAST'}"
+
     def false_predicate(self) -> str:
         return "FALSE"
 
@@ -270,6 +276,11 @@ class MySqlDialect(Dialect):
     default_values = "() VALUES ()"
     unbounded_limit = "18446744073709551615"
 
+    def order_term(self, quoted_column: str, descending: bool) -> str:
+        # No NULLS FIRST/LAST on MySQL: a leading `col IS NULL` key (0 for a value, 1 for null).
+        d = "DESC" if descending else "ASC"
+        return f"({quoted_column} IS NULL) {d}, {quoted_column} {d}"
+
     def quote(self, ident: str) -> str:
         if "`" in ident:
             raise ValueError(f"unsafe identifier: {ident}")

{metaobjects-1.1.3 → metaobjects-1.1.4}/src/metaobjects/runtime/object_manager.py

@@ -634,8 +634,7 @@ class ObjectManager:
             for field_name, direction in sort:
                 f = entity.find_field(field_name)
                 col = _column_of(f, self._column_naming) if f is not None else field_name
-                d = "DESC" if direction.lower() == "desc" else "ASC"
-                order_parts.append(f"{self._d.quote(col)} {d}")
+                order_parts.append(self._d.order_term(self._d.quote(col), direction.lower() == "desc"))
             if order_parts:
                 sql += " ORDER BY " + ", ".join(order_parts)
         if limit is not None:

{metaobjects-1.1.3 → metaobjects-1.1.4}/tests/runtime/test_object_manager_dialects.py

@@ -113,7 +113,7 @@ def test_sqlite_read_uses_qmark_placeholders_and_double_quotes() -> None:
     sql, params = rec.sql[-1]
     assert sql == (
         'SELECT "id", "label", "qty", "active", "price", "ref", "madeOn", "seenAt" FROM "items" '
-        'WHERE "qty" >= ? AND "label" = ? ORDER BY "qty" DESC LIMIT 5 OFFSET 10'
+        'WHERE "qty" >= ? AND "label" = ? ORDER BY "qty" DESC NULLS FIRST LIMIT 5 OFFSET 10'
     )
     assert params == (2, "a")
 
@@ -264,7 +264,7 @@ def test_mysql_read_uses_backticks_and_percent_placeholders() -> None:
     sql, params = conn.sql[-1]
     assert sql == (
         "SELECT `id`, `label`, `qty`, `active`, `price`, `ref`, `madeOn`, `seenAt` FROM `items` "
-        "WHERE `qty` >= %s AND `label` LIKE BINARY %s ORDER BY `qty` ASC "
+        "WHERE `qty` >= %s AND `label` LIKE BINARY %s ORDER BY (`qty` IS NULL) ASC, `qty` ASC "
         "LIMIT 18446744073709551615 OFFSET 4"
     )
     assert params == (2, "A%")
@@ -415,3 +415,14 @@ def test_a_mysql_decimal_operand_is_cast_to_a_decimal() -> None:
     sql, _ = _op_clause("amount", "in", [Decimal("1"), Decimal("2")], f, MYSQL)
     assert sql.count("CAST(%s AS DECIMAL(65,30))") == 2
     assert _op_clause("amount", "eq", Decimal("1.5"), f, POSTGRES)[0] == '"amount" = %s'
+
+
+def test_order_term_puts_nulls_largest_on_every_dialect() -> None:
+    from metaobjects.runtime.dialect import MySqlDialect, PostgresDialect, SqliteDialect
+
+    for d in (PostgresDialect(), SqliteDialect()):
+        assert d.order_term('"c"', False) == '"c" ASC NULLS LAST'
+        assert d.order_term('"c"', True) == '"c" DESC NULLS FIRST'
+    my = MySqlDialect()
+    assert my.order_term("`c`", False) == "(`c` IS NULL) ASC, `c` ASC"
+    assert my.order_term("`c`", True) == "(`c` IS NULL) DESC, `c` DESC"

{metaobjects-1.1.3 → metaobjects-1.1.4}/tests/runtime/test_object_manager_report.py

@@ -152,7 +152,7 @@ def test_filter_sort_limit_on_derived_fields() -> None:
         "ProgramMinutes", {"weeks": {"gte": 2}}, sort=[("totalMinutes", "desc")], limit=1
     )
     sql = drv.sql[0]
-    assert sql.endswith('FROM "v_program_minutes" WHERE "weeks" >= %s ORDER BY "totalMinutes" DESC LIMIT 1')
+    assert sql.endswith('FROM "v_program_minutes" WHERE "weeks" >= %s ORDER BY "totalMinutes" DESC NULLS FIRST LIMIT 1')
     assert drv.params[0] == (2,)
 
 

{metaobjects-1.1.3 → metaobjects-1.1.4}/tests/unit/test_reporting_accessors.py

@@ -333,7 +333,7 @@ def test_malformed_relative_value_is_refused() -> None:
         (
             ErrorCode.ERR_BAD_ATTR_FILTER,
             "report 'acme::shop::DailyRevenue': @filter on 'purchasedAt' has a malformed relative date "
-            '{"now":"-P7D","x":1}; a relative date is exactly { now: "<ISO-8601 duration>" } with no other keys.',
+            '{"now":"-P7D","x":1}; a relative date is { now: "<ISO-8601 duration>" } with an optional startOf, and no other keys.',
         )
     ]
 

{metaobjects-1.1.3 → metaobjects-1.1.4}/uv.lock

@@ -259,7 +259,7 @@ wheels = [
 
 [[package]]
 name = "metaobjects"
-version = "1.1.3"
+version = "1.1.4"
 source = { editable = "." }
 dependencies = [
     { name = "pyyaml" },