BUGFIX align with api spec

documentation/IDTA-01004/modules/ROOT/pages/changelog.adoc

@@ -16,6 +16,9 @@ SPDX-License-Identifier: CC-BY-4.0
 Bugfixes:
 
 * removed: TREE
+* fix: error in datetime BNF ObjectGroup
+* fix: naming inconsistencies inside BNF and json schema (https://github.com/admin-shell-io/aas-specs-api/issues/547)
+* fix: aligned BNF and json schema to api spec (https://github.com/admin-shell-io/aas-specs-api/issues/547)
 
 == Changes w.r.t. V3.0.1 vs. V3.0
 

documentation/IDTA-01004/modules/ROOT/partials/bnf/access-rule-model.bnf

@@ -2,7 +2,7 @@
     ( "DEFATTRIBUTES" <ws> <StringLiteral> <ws> <AttributeGroup> <ws> )*
     ( "DEFACLS" <ws> <StringLiteral> <ws> <ACL> <ws> )*
     ( "DEFOBJECTS" <ws> <StringLiteral> <ws> <ObjectGroup> <ws> )*
-    ( "DEFFORMULAS" <ws> <StringLiteral> <ws> <Condition> <ws> )*
+    ( "DEFFORMULAS" <ws> <StringLiteral> <ws> <logicalExpression> <ws> )*
     ( <AccessPermissionRule> <ws> )*
 
 <AccessPermissionRule> ::=
@@ -11,6 +11,5 @@
     "OBJECTS:" <ws>
     ( <SingleObject> <ws> )*
     ( <UseObjectGroup> <ws> )*
-    "FORMULA:" <ws>
-    ( <Condition> | <UseFormula> ) <ws>
-    ( "FILTER:" <ws> <FragmentObject> <ws> ( <Condition> | <UseFormula> ) <ws> )?
+    ( ( "FORMULA:" <ws> <logicalExpression> <ws> ) | ( <UseFormula> <ws> ) )
+    ( "FILTER:" <ws> <SecurityQueryFilter> )?

documentation/IDTA-01004/modules/ROOT/partials/bnf/access-rules.bnf

@@ -2,7 +2,7 @@
     ( "DEFATTRIBUTES" <ws> <StringLiteral> <ws> <AttributeGroup> <ws> )*
     ( "DEFACLS" <ws> <StringLiteral> <ws> <ACL> <ws> )*
     ( "DEFOBJECTS" <ws> <StringLiteral> <ws> <ObjectGroup> <ws> )*
-    ( "DEFFORMULAS" <ws> <StringLiteral> <ws> <Condition> <ws> )*
+    ( "DEFFORMULAS" <ws> <StringLiteral> <ws> <logicalExpression> <ws> )*
     ( <AccessPermissionRule> <ws> )*
 
 <AccessPermissionRule> ::=
@@ -11,9 +11,12 @@
     "OBJECTS:" <ws>
     ( <SingleObject> <ws> )*
     ( <UseObjectGroup> <ws> )*
-    "FORMULA:" <ws>
-    ( <Condition> | <UseFormula> ) <ws>
-    ( "FILTER:" <ws> <FragmentObject> <ws> ( <Condition> | <UseFormula> ) <ws> )?
+    ( ( "FORMULA:" <ws> <logicalExpression> <ws> ) | ( <UseFormula> <ws> ) )
+    ( "FILTER:" <ws> <SecurityQueryFilter> )?
+
+<SecurityQueryFilter> ::=
+    <FragmentObject> <ws>
+    ( ( "CONDITION:" <ws> <logicalExpression> <ws> ) | ( <UseFormula> <ws> ) )
 
 <ACL> ::=
     "ATTRIBUTES:" <ws>
@@ -23,7 +26,7 @@
     "ACCESS:" <ws> <Access> <ws>
 
 <UseACL> ::=
-    "USEACLS" <ws> <StringLiteral> <ws>
+    "USEACL" <ws> <StringLiteral> <ws>
 
 <Right> ::=
     "CREATE" | "READ" | "UPDATE" | "DELETE" | "EXECUTE" | "VIEW" | "ALL"
@@ -76,10 +79,7 @@
     "USEOBJECTS" <ws> <StringLiteral> <ws>
 
 <UseFormula> ::=
-    "USEFORMULAS" <ws> <StringLiteral> <ws>
-
-<Condition> ::= <logicalExpression> <ws>
-
+    "USEFORMULA" <ws> <StringLiteral> <ws>
 
 <logicalExpression> ::= <logicalNestedExpression> | <logicalOrExpression> | <logicalAndExpression> |
 <logicalNotExpression> | <matchExpression> | <BoolLiteral> | <castToBool> | <singleComparison>
@@ -166,7 +166,7 @@
 
 <DateTimeLiteral> ::= <datetime> <ws>
 <TimeLiteral> ::= <time> <ws>
-<datetime> ::= <date> ( "T" | "" ) <time> ( <timezone> )?
+<datetime> ::= <date> ( "T" )? <time> ( <timezone> )?
 <date> ::= <year> "-" <month> "-" <day>
 <year> ::= <digit> <digit> <digit> <digit>
 <month> ::= <digit> <digit>

documentation/IDTA-01004/modules/ROOT/partials/bnf/acl.bnf

@@ -6,7 +6,7 @@
     "ACCESS:" <ws> <Access> <ws>
 
 <UseACL> ::=
-    "USEACLS" <ws> <StringLiteral> <ws>
+    "USEACL" <ws> <StringLiteral> <ws>
 
 <Right> ::=
     "CREATE" | "READ" | "UPDATE" | "DELETE" | "EXECUTE" | "VIEW" | "ALL"

documentation/IDTA-01004/modules/ROOT/partials/bnf/formulas.bnf

@@ -1,7 +1,5 @@
 <UseFormula> ::=
-    "USEFORMULAS" <ws> <StringLiteral> <ws>
-
-<Condition> ::= <logicalExpression> <ws>
+    "USEFORMULA" <ws> <StringLiteral> <ws>
 
 <logicalExpression> ::= <logicalNestedExpression> | <logicalOrExpression> | <logicalAndExpression> |
 <logicalNotExpression> | <matchExpression> | <BoolLiteral> | <castToBool> | <singleComparison>
@@ -28,8 +26,8 @@
 
 <numericalComparison> ::=
     ( <numericalOperand> <ws> <allComparisons> <ws> <numericalOperand> <ws> ) |
-    ( <numericalOperand> <ws> <allComparisons> <ws> <FieldIdentifierString> <ws> ) |
-    ( <FieldIdentifierString> <ws> <allComparisons> <ws> <numericalOperand> <ws> )
+    ( <numericalOperand> <ws> <allComparisons> <ws> <FieldIdentifier> <ws> ) |
+    ( <FieldIdentifier> <ws> <allComparisons> <ws> <numericalOperand> <ws> )
 
 <hexComparison> ::=
     <hexOperand> <ws> <allComparisons> <ws> <hexOperand> <ws>
@@ -49,7 +47,7 @@
 <operand> ::= <stringOperand> | <numericalOperand> | <hexOperand> | <boolOperand> | <dateTimeOperand> | <timeOperand>
 
 <stringOperand> ::=
-    <FieldIdentifierString> | <StringLiteral> | <castToString> | <SingleAttribute>
+    <FieldIdentifier> | <StringLiteral> | <castToString> | <SingleAttribute>
 
 <numericalOperand> ::=
     <NumericalLiteral> | <castToNumerical> | <dateTimeToNum>

documentation/IDTA-01004/modules/ROOT/partials/examples/filter.bnf

@@ -20,6 +20,7 @@ ACCESSRULE:
     )
   FILTER:
     FRAGMENT "$aasdesc#specificAssetIds[]"
+    CONDITION:
     $or(
       $match(
         $aasdesc#specificAssetIds[].name  $eq "manufacturerPartId",

documentation/IDTA-01004/modules/ROOT/partials/examples/reuse-acl-object-formula.bnf

@@ -19,8 +19,7 @@
   )
 
 ACCESSRULE:
-  USEACLS "acl1"
+  USEACL "acl1"
   OBJECTS:
     USEOBJECTS "Properties"
-  FORMULA:
-    USEFORMULAS "allowSubjectGroup1"
+  USEFORMULA "allowSubjectGroup1"

documentation/IDTA-01004/modules/ROOT/partials/json/aas-queries-and-access-rules-schema.json

@@ -2,14 +2,15 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Common JSON Schema for AAS Queries and Access Rules",
   "description": "This schema contains the AAS Access Rule Language.",
+  "$ref": "#/definitions/AllAccessPermissionRules",
   "definitions": {
     "standardString": {
       "type": "string",
-      "pattern": "^(?!\\$).*"
+      "pattern": "^[A-Za-z0-9/\\*\\[\\]\\(\\) _@#\\\\+\\-\\.,:\\$\\^]+$"
     },
     "modelStringPattern": {
       "type": "string",
-      "pattern": "^(?:\\$aas#(?:idShort|id|assetInformation\\.assetKind|assetInformation\\.assetType|assetInformation\\.globalAssetId|assetInformation\\.(?:specificAssetIds\\[[0-9]*\\](?:\\.(?:name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(?:type|value))?)?)?)|submodels\\.(?:type|keys\\[\\d*\\](?:\\.(?:type|value))?))|submodels\\.(type|keys\\[\\d*\\](?:\\.(type|value))?))|(?:\\$sm#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id))|(?:\\$sme(?:\\.[a-zA-Z][a-zA-Z0-9_]*\\[[0-9]*\\]?(?:\\.[a-zA-Z][a-zA-Z0-9_]*\\[[0-9]*\\]?)*)?#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|value|valueType|language))|(?:\\$cd#(?:idShort|id)))|(?:\\$aasdesc#(?:idShort|id|assetKind|assetType|globalAssetId|specificAssetIds\\[[0-9]*\\]?(?:\\.(name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?)?)|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href)|submodelDescriptors\\[[0-9]*\\]\\.(semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href))))|(?:\\$smdesc#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href)))$"
+      "pattern": "^(?:\\$aas#(?:idShort|id|assetInformation\\.assetKind|assetInformation\\.assetType|assetInformation\\.globalAssetId|assetInformation\\.specificAssetIds\\[[0-9]*\\]\\.(?:name|value|externalSubjectId(?:\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))?)|submodels\\[[0-9]*\\]\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))|\\$sm#(?:semanticId(?:\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))?|idShort|id)|\\$sme(?:\\.[A-Za-z](?:[A-Za-z0-9_-]*[A-Za-z0-9_])?(?:\\[[0-9]*\\])*(?:\\.[A-Za-z](?:[A-Za-z0-9_-]*[A-Za-z0-9_])?(?:\\[[0-9]*\\])*)*)?#(?:semanticId(?:\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))?|idShort|value|valueType|language)|\\$cd#(?:idShort|id)|\\$aasdesc#(?:idShort|id|assetKind|assetType|globalAssetId|specificAssetIds\\[[0-9]*\\]\\.(?:name|value|externalSubjectId(?:\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))?)|endpoints\\[[0-9]*\\]\\.(?:interface|protocolinformation\\.href)|submodelDescriptors\\[[0-9]*\\]\\.(?:semanticId(?:\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))?|idShort|id|endpoints\\[[0-9]*\\]\\.(?:interface|protocolinformation\\.href)))|\\$smdesc#(?:semanticId(?:\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))?|idShort|id|endpoints\\[[0-9]*\\]\\.(?:interface|protocolinformation\\.href)))$"
     },
     "hexLiteralPattern": {
       "type": "string",
@@ -650,56 +651,76 @@
           "type": "string"
         },
         "FILTER": {
-          "type": "object",
-	          "properties": {
-	            "FRAGMENT": { "type": "string" },
-              "CONDITION": {
-                "$ref": "#/definitions/logicalExpression",
-			          "additionalProperties": false
-        			    },
-        			  "USEFORMULA": { "type": "string" }
-        			},
-        			"oneOf": [
-        			  {
-			            "required": ["FRAGMENT", "CONDITION"],
-        			    "not": { "required": ["USEFORMULA"] }
-        			  },
-        			  {
-			            "required": ["FRAGMENT", "USEFORMULA"],
-        			    "not": { "required": ["CONDITION"] }
-		            }
-			        ],
+          "$ref": "#/definitions/SecurityQueryFilter",
           "additionalProperties": false
         }
       },
-      "oneOf": [
+      "allOf": [
         {
-          "required": [
-            "ACL"
+          "oneOf": [
+            {
+              "required": [
+                "ACL"
+              ]
+            },
+            {
+              "required": [
+                "USEACL"
+              ]
+            }
           ]
         },
         {
-          "required": [
-            "USEACL"
-          ]
-        }
-      ],
-      "oneOf": [
-        {
-          "required": [
-            "OBJECTS"
+          "oneOf": [
+            {
+              "required": [
+                "OBJECTS"
+              ]
+            },
+            {
+              "required": [
+                "USEOBJECTS"
+              ]
+            }
           ]
         },
         {
-          "required": [
-            "USEOBJECTS"
+          "oneOf": [
+            {
+              "required": [
+                "FORMULA"
+              ]
+            },
+            {
+              "required": [
+                "USEFORMULA"
+              ]
+            }
           ]
         }
       ],
+      "additionalProperties": false
+    },
+    "SecurityQueryFilter": {
+      "type": "object",
+      "properties": {
+        "FRAGMENT": {
+          "type": "string"
+        },
+        "CONDITION": {
+          "$ref": "#/definitions/logicalExpression"
+        },
+        "USEFORMULA": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "FRAGMENT"
+      ],
       "oneOf": [
         {
           "required": [
-            "FORMULA"
+            "CONDITION"
           ]
         },
         {
@@ -709,10 +730,23 @@
         }
       ],
       "additionalProperties": false
-    }
-  },
-  "type": "object",
-  "properties": {
+    },
+    "Query": {
+      "type": "object",
+      "properties": {
+        "$select": {
+          "type": "string",
+          "pattern": "^id$"
+        },
+        "$condition": {
+          "$ref": "#/definitions/logicalExpression"
+        }
+      },
+      "required": [
+        "$condition"
+      ],
+      "additionalProperties": false
+    },
     "AllAccessPermissionRules": {
       "type": "object",
       "properties": {
@@ -828,8 +862,5 @@
       "additionalProperties": false
     }
   },
-  "required": [
-    "AllAccessPermissionRules"
-  ],
   "additionalProperties": false
 }

documentation/IDTA-01004/modules/ROOT/partials/json/access-rule-model.json

@@ -171,25 +171,7 @@
           "type": "string"
         },
         "FILTER": {
-          "type": "object",
-	          "properties": {
-	            "FRAGMENT": { "type": "string" },
-              "CONDITION": {
-                "$ref": "#/definitions/logicalExpression",
-			          "additionalProperties": false
-			            },
-			          "USEFORMULA": { "type": "string" }
-			        },
-			        "oneOf": [
-			          {
-			            "required": ["FRAGMENT", "CONDITION"],
-			            "not": { "required": ["USEFORMULA"] }
-			          },
-			          {
-			            "required": ["FRAGMENT", "USEFORMULA"],
-			            "not": { "required": ["CONDITION"] }
-		            }
-			        ],
+          "$ref": "#/definitions/SecurityQueryFilter",
           "additionalProperties": false
         }
       },
@@ -230,6 +212,36 @@
         }
       ],
       "additionalProperties": false
+    },
+    "SecurityQueryFilter": {
+      "type": "object",
+      "properties": {
+        "FRAGMENT": {
+          "type": "string"
+        },
+        "CONDITION": {
+          "$ref": "#/definitions/logicalExpression"
+        },
+        "USEFORMULA": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "FRAGMENT"
+      ],
+      "oneOf": [
+        {
+          "required": [
+            "CONDITION"
+          ]
+        },
+        {
+          "required": [
+            "USEFORMULA"
+          ]
+        }
+      ],
+      "additionalProperties": false
     }
   },
   "type": "object",

documentation/IDTA-01004/modules/ROOT/partials/json/formulas-and-logical-expressions.json

@@ -1,11 +1,12 @@
+{ 
   "definitions": {
     "standardString": {
       "type": "string",
-      "pattern": "^(?!\\$).*"
+      "pattern": "^[A-Za-z0-9/\\*\\[\\]\\(\\) _@#\\\\+\\-\\.,:\\$\\^]+$"
     },
     "modelStringPattern": {
       "type": "string",
-      "pattern": "^(?:\\$aas#(?:idShort|id|assetInformation\\.assetKind|assetInformation\\.assetType|assetInformation\\.globalAssetId|assetInformation\\.(?:specificAssetIds\\[[0-9]*\\](?:\\.(?:name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(?:type|value))?)?)?)|submodels\\.(?:type|keys\\[\\d*\\](?:\\.(?:type|value))?))|submodels\\.(type|keys\\[\\d*\\](?:\\.(type|value))?))|(?:\\$sm#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id))|(?:\\$sme(?:\\.[a-zA-Z][a-zA-Z0-9_]*\\[[0-9]*\\]?(?:\\.[a-zA-Z][a-zA-Z0-9_]*\\[[0-9]*\\]?)*)?#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|value|valueType|language))|(?:\\$cd#(?:idShort|id)))|(?:\\$aasdesc#(?:idShort|id|assetKind|assetType|globalAssetId|specificAssetIds\\[[0-9]*\\]?(?:\\.(name|value|externalSubjectId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?)?)|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href)|submodelDescriptors\\[[0-9]*\\]\\.(semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href))))|(?:\\$smdesc#(?:semanticId(?:\\.type|\\.keys\\[\\d*\\](?:\\.(type|value))?)?|idShort|id|endpoints\\[[0-9]*\\]\\.(interface|protocolinformation\\.href)))$"
+      "pattern": "^(?:\\$aas#(?:idShort|id|assetInformation\\.assetKind|assetInformation\\.assetType|assetInformation\\.globalAssetId|assetInformation\\.specificAssetIds\\[[0-9]*\\]\\.(?:name|value|externalSubjectId(?:\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))?)|submodels\\[[0-9]*\\]\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))|\\$sm#(?:semanticId(?:\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))?|idShort|id)|\\$sme(?:\\.[A-Za-z](?:[A-Za-z0-9_-]*[A-Za-z0-9_])?(?:\\[[0-9]*\\])*(?:\\.[A-Za-z](?:[A-Za-z0-9_-]*[A-Za-z0-9_])?(?:\\[[0-9]*\\])*)*)?#(?:semanticId(?:\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))?|idShort|value|valueType|language)|\\$cd#(?:idShort|id)|\\$aasdesc#(?:idShort|id|assetKind|assetType|globalAssetId|specificAssetIds\\[[0-9]*\\]\\.(?:name|value|externalSubjectId(?:\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))?)|endpoints\\[[0-9]*\\]\\.(?:interface|protocolinformation\\.href)|submodelDescriptors\\[[0-9]*\\]\\.(?:semanticId(?:\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))?|idShort|id|endpoints\\[[0-9]*\\]\\.(?:interface|protocolinformation\\.href)))|\\$smdesc#(?:semanticId(?:\\.(?:type|keys\\[[0-9]*\\]\\.(?:type|value)))?|idShort|id|endpoints\\[[0-9]*\\]\\.(?:interface|protocolinformation\\.href)))$"
     },
     "hexLiteralPattern": {
       "type": "string",
@@ -476,3 +477,4 @@
       "additionalProperties": false
     }
   }
+}