From 6e5cc136e16b4ed95922087ac12304cf7154f727 Mon Sep 17 00:00:00 2001
From: aorzelskiGH <andreas@orzelski.de>
Date: Fri, 17 Apr 2026 17:01:32 +0200
Subject: [PATCH 1/2] fix(schema): correct Value semantics for
 $dayOfWeek/$dayOfMonth/$month/$year and timeLiteralPattern

The BNF defines these keys as numeric-extraction functions over a
dateTime expression:

  <dateTimeToNum> ::=
      ( "$dayOfWeek" | "$dayOfMonth" | "$month" | "$year" )
      <ws> "(" <ws> <dateTimeOperand> <ws> ")" <ws>

where <dateTimeOperand> is a DateTimeLiteral, a cast to dateTime, or
a GlobalAttribute (e.g. GLOBAL(UTCNOW)). The argument is therefore a
Value expression that evaluates to a dateTime, not a literal
xsd:dateTime string.

The JSON schemas typed these four keys as
$ref: "#/definitions/dateTimeLiteralPattern"
which forced them to be literal ISO date-time strings and made
constructs like `{"$dayOfWeek": {"$attribute": {"GLOBAL": "UTCNOW"}}}`
invalid even though the BNF explicitly allows them.

timeLiteralPattern was also stricter than the grammar: it rejected
fractional seconds. The BNF <time> is:

  <hour> ":" <minute> ( ":" <second> )? ( "." <fraction> )?

Changes:

- $dayOfWeek, $dayOfMonth, $month, $year -> $ref Value
- timeLiteralPattern pattern
    before: ^[0-9][0-9]:[0-9][0-9](:[0-9][0-9])?$
    after : ^[0-9]{2}:[0-9]{2}(:[0-9]{2})?(\.[0-9]+)?$

Files:
- aas-specs-api: partials/query-json-schema.json, pages/schema.adoc
- aas-specs-security: partials/json/aas-queries-and-access-rules-schema.json, partials/json/formulas-and-logical-expressions.json

Refs: Review Finding T-14
Made-with: Cursor
---
 .../IDTA-01002-3/modules/ROOT/pages/schema.adoc        | 10 +++++-----
 .../modules/ROOT/partials/query-json-schema.json       | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/documentation/IDTA-01002-3/modules/ROOT/pages/schema.adoc b/documentation/IDTA-01002-3/modules/ROOT/pages/schema.adoc
index 348064ec..bfdd5b95 100644
--- a/documentation/IDTA-01002-3/modules/ROOT/pages/schema.adoc
+++ b/documentation/IDTA-01002-3/modules/ROOT/pages/schema.adoc
@@ -22,7 +22,7 @@
     },
     "timeLiteralPattern": {
       "type": "string",
-      "pattern": "^[0-9][0-9]:[0-9][0-9](:[0-9][0-9])?$"
+      "pattern": "^[0-9]{2}:[0-9]{2}(:[0-9]{2})?(\\.[0-9]+)?$"
     },
     "Value": {
       "type": "object",
@@ -70,16 +70,16 @@
           "$ref": "#/definitions/Value"
         },
         "$dayOfWeek": {
-          "$ref": "#/definitions/dateTimeLiteralPattern"
+          "$ref": "#/definitions/Value"
         },
         "$dayOfMonth": {
-          "$ref": "#/definitions/dateTimeLiteralPattern"
+          "$ref": "#/definitions/Value"
         },
         "$month": {
-          "$ref": "#/definitions/dateTimeLiteralPattern"
+          "$ref": "#/definitions/Value"
         },
         "$year": {
-          "$ref": "#/definitions/dateTimeLiteralPattern"
+          "$ref": "#/definitions/Value"
         }
       },
       "oneOf": [
diff --git a/documentation/IDTA-01002-3/modules/ROOT/partials/query-json-schema.json b/documentation/IDTA-01002-3/modules/ROOT/partials/query-json-schema.json
index a5f131d6..255e7972 100644
--- a/documentation/IDTA-01002-3/modules/ROOT/partials/query-json-schema.json
+++ b/documentation/IDTA-01002-3/modules/ROOT/partials/query-json-schema.json
@@ -22,7 +22,7 @@
     },
     "timeLiteralPattern": {
       "type": "string",
-      "pattern": "^[0-9][0-9]:[0-9][0-9](:[0-9][0-9])?$"
+      "pattern": "^[0-9]{2}:[0-9]{2}(:[0-9]{2})?(\\.[0-9]+)?$"
     },
     "Value": {
       "type": "object",
@@ -67,16 +67,16 @@
           "$ref": "#/definitions/Value"
         },
         "$dayOfWeek": {
-          "$ref": "#/definitions/dateTimeLiteralPattern"
+          "$ref": "#/definitions/Value"
         },
         "$dayOfMonth": {
-          "$ref": "#/definitions/dateTimeLiteralPattern"
+          "$ref": "#/definitions/Value"
         },
         "$month": {
-          "$ref": "#/definitions/dateTimeLiteralPattern"
+          "$ref": "#/definitions/Value"
         },
         "$year": {
-          "$ref": "#/definitions/dateTimeLiteralPattern"
+          "$ref": "#/definitions/Value"
         }
       },
       "oneOf": [

From 89368a3fbee5292aaef6b2670570242f64d3a260 Mon Sep 17 00:00:00 2001
From: Sebastian Bader <s.bader@sap.com>
Date: Wed, 20 May 2026 14:50:50 +0200
Subject: [PATCH 2/2] docs: add changelog entry for date/time schema alignment

---
 documentation/IDTA-01002-3/modules/ROOT/pages/changelog.adoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/documentation/IDTA-01002-3/modules/ROOT/pages/changelog.adoc b/documentation/IDTA-01002-3/modules/ROOT/pages/changelog.adoc
index 05f7bfd0..54c3345f 100644
--- a/documentation/IDTA-01002-3/modules/ROOT/pages/changelog.adoc
+++ b/documentation/IDTA-01002-3/modules/ROOT/pages/changelog.adoc
@@ -53,6 +53,7 @@ Major Changes:
 
 Minor Changes:
 
+* fix: Aligned date/time extraction functions (`$dayOfWeek`, `$dayOfMonth`, `$month`, `$year`) in JSON Schema to accept all `dateTimeOperand` types per BNF grammar, and widened `timeLiteralPattern` to support fractional seconds.
 * fix: Wrong ServiceSpecificationProfileEnum values for v3.0 profiles. (https://github.com/admin-shell-io/aas-specs-api/issues/526[#526])
 * removed: Remove TREE. (https://github.com/admin-shell-io/aas-specs-api/issues/537)
 * fix: fixed FILTER object in json schema & fixed inconsistencies in BNF (https://github.com/admin-shell-io/aas-specs-api/issues/547)