Skip to content

fix(schema): add missing definitions (ReferenceIdentifier, IdentifiableIdentifier, ReferableIdentifier, FragmentIdentifier, DescriptorIdentifier) #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aorzelskiGH wants to merge 1 commit into
base: IDTA-01004-3-1_Working
Choose a base branch
from
Open

fix(schema): add missing definitions (ReferenceIdentifier, IdentifiableIdentifier, ReferableIdentifier, FragmentIdentifier, DescriptorIdentifier) #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions documentation/IDTA-01004/modules/ROOT/partials/json/aas-queries-and-access-rules-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,30 @@
"type": "string",
"pattern": "^16#[0-9A-F]+$"
},
"IdentifiableIdentifier": {
"type": "string",
"description": "Identifier for an Identifiable (AAS, Submodel, ConceptDescription) as used in OBJECTS IDENTIFIABLE. Format: $aas(\"...\") | $sm(\"...\") | $cd(\"...\") | same with wildcard \"*\".",
"pattern": "^\\$(?:aas|sm|cd)\\((?:\"\\*\"|\"[^\"]*\")\\)$"
},
"ReferableIdentifier": {
"type": "string",
"description": "Identifier for a Referable (Submodel element) as used in OBJECTS REFERABLE. Format: $sme(\"...\").<idShortPath> | $sme(\"*\").<idShortPath>.",
"pattern": "^\\$sme\\((?:\"\\*\"|\"[^\"]*\")\\)\\.[^\\s]+$"
},
"FragmentIdentifier": {
"type": "string",
"description": "Fragment literal as used in OBJECTS FRAGMENT. Carries the fragment identifier as defined by <FragmentLiteral> in the BNF."
},
"DescriptorIdentifier": {
"type": "string",
"description": "Identifier for a Descriptor (AAS Descriptor, Submodel Descriptor) as used in OBJECTS DESCRIPTOR. Format: $aasdesc(\"...\") | $smdesc(\"...\") | same with wildcard \"*\".",

Check warning on line 39 in documentation/IDTA-01004/modules/ROOT/partials/json/aas-queries-and-access-rules-schema.json

View workflow job for this annotation

GitHub Actions / qodana

Typo 

Typo: In word 'aasdesc'

Check warning on line 39 in documentation/IDTA-01004/modules/ROOT/partials/json/aas-queries-and-access-rules-schema.json

View workflow job for this annotation

GitHub Actions / qodana

Typo 

Typo: In word 'smdesc'

Check warning

Code scanning / QDJVMC

Typo Warning documentation

Typo: In word 'aasdesc'

Check warning

Code scanning / QDJVMC

Typo Warning documentation

Typo: In word 'smdesc'
"pattern": "^\\$(?:aasdesc|smdesc)\\((?:\"\\*\"|\"[^\"]*\")\\)$"
},
"ReferenceIdentifier": {
"type": "string",
"description": "Identifier for a REFERENCE attribute as used by <ReferenceAttribute> in the BNF. Format: $aas(\"...\")#<FieldsAAS> | $sm(\"...\")#<FieldsSM> | $cd(\"...\")#<FieldsCD> | $sme(\"...\").<idShortPath>#<FieldsSME>.",
"pattern": "^\\$(?:aas|sm|cd)\\(\"[^\"]*\"\\)#[^\\s]+$|^\\$sme\\(\"[^\"]*\"\\)\\.[^#\\s]+#[^\\s]+$"
},
"dateTimeLiteralPattern": {
"type": "string",
"format": "date-time"
Expand Down
24 changes: 24 additions & 0 deletions documentation/IDTA-01004/modules/ROOT/partials/json/access-rule-model.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
{
"definitions": {
"IdentifiableIdentifier": {
"type": "string",
"description": "Identifier for an Identifiable (AAS, Submodel, ConceptDescription) as used in OBJECTS IDENTIFIABLE. Format: $aas(\"...\") | $sm(\"...\") | $cd(\"...\") | same with wildcard \"*\".",
"pattern": "^\\$(?:aas|sm|cd)\\((?:\"\\*\"|\"[^\"]*\")\\)$"
},
"ReferableIdentifier": {
"type": "string",
"description": "Identifier for a Referable (Submodel element) as used in OBJECTS REFERABLE. Format: $sme(\"...\").<idShortPath> | $sme(\"*\").<idShortPath>.",
"pattern": "^\\$sme\\((?:\"\\*\"|\"[^\"]*\")\\)\\.[^\\s]+$"
},
"FragmentIdentifier": {
"type": "string",
"description": "Fragment literal as used in OBJECTS FRAGMENT. Carries the fragment identifier as defined by <FragmentLiteral> in the BNF."
},
"DescriptorIdentifier": {
"type": "string",
"description": "Identifier for a Descriptor (AAS Descriptor, Submodel Descriptor) as used in OBJECTS DESCRIPTOR. Format: $aasdesc(\"...\") | $smdesc(\"...\") | same with wildcard \"*\".",

Check warning on line 19 in documentation/IDTA-01004/modules/ROOT/partials/json/access-rule-model.json

View workflow job for this annotation

GitHub Actions / qodana

Typo 

Typo: In word 'smdesc'

Check warning on line 19 in documentation/IDTA-01004/modules/ROOT/partials/json/access-rule-model.json

View workflow job for this annotation

GitHub Actions / qodana

Typo 

Typo: In word 'aasdesc'

Check warning

Code scanning / QDJVMC

Typo Warning documentation

Typo: In word 'aasdesc'

Check warning

Code scanning / QDJVMC

Typo Warning documentation

Typo: In word 'smdesc'
"pattern": "^\\$(?:aasdesc|smdesc)\\((?:\"\\*\"|\"[^\"]*\")\\)$"

Check warning on line 20 in documentation/IDTA-01004/modules/ROOT/partials/json/access-rule-model.json

View workflow job for this annotation

GitHub Actions / qodana

Typo 

Typo: In word 'smdesc'

Check warning on line 20 in documentation/IDTA-01004/modules/ROOT/partials/json/access-rule-model.json

View workflow job for this annotation

GitHub Actions / qodana

Typo 

Typo: In word 'aasdesc'

Check warning

Code scanning / QDJVMC

Typo Warning documentation

Typo: In word 'aasdesc'

Check warning

Code scanning / QDJVMC

Typo Warning documentation

Typo: In word 'smdesc'
},
"ReferenceIdentifier": {
"type": "string",
"description": "Identifier for a REFERENCE attribute as used by <ReferenceAttribute> in the BNF. Format: $aas(\"...\")#<FieldsAAS> | $sm(\"...\")#<FieldsSM> | $cd(\"...\")#<FieldsCD> | $sme(\"...\").<idShortPath>#<FieldsSME>.",
"pattern": "^\\$(?:aas|sm|cd)\\(\"[^\"]*\"\\)#[^\\s]+$|^\\$sme\\(\"[^\"]*\"\\)\\.[^#\\s]+#[^\\s]+$"
},
"attributeItem": {
"oneOf": [
{
Expand Down
Loading