Merge remote-tracking branch 'origin/main' into auto-expand

.github/workflows/nodejs.yml

@@ -6,10 +6,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [20.x]
-
     steps:
       - uses: actions/checkout@v4
         with:

CONTRIBUTING.md

@@ -38,3 +38,9 @@ If you are working in a fork, please go to the "Actions" tab of your fork and en
 ## Developer Certificate of Origin (DCO)
 
 Due to legal reasons, contributors will be asked to accept a DCO before they submit the first pull request to this projects, this happens in an automated fashion during the submission process. SAP uses [the standard DCO text of the Linux Foundation](https://developercertificate.org/).
+
+## Contributing with AI-generated code
+
+As artificial intelligence evolves, AI-generated code is becoming valuable for many software projects, including open-source initiatives. While we recognize the potential benefits of incorporating AI-generated content into our open-source projects there are certain requirements that need to be reflected and adhered to when making contributions.
+
+Please see our [guideline for AI-generated code contributions to SAP Open Source Software Projects](https://github.com/SAP/.github/blob/main/CONTRIBUTING_USING_GENAI.md) for these requirements.

README.md

@@ -12,6 +12,7 @@ This repository defines the following SAP vocabularies:
 - [Communication: Contact information based on vCard](vocabularies/Communication.md)
 - [DataIntegration: Data Integration](vocabularies/DataIntegration.md)
 - [DirectEdit: Terms for Direct-Edit User Interfaces](vocabularies/DirectEdit.md) - _experimental_
+- [EntityRelationship: Terms to document relationships outside of the current API context](vocabularies/EntityRelationship.md) - _experimental_
 - [Graph: SAP Graph](vocabularies/Graph.md) - _experimental_
 - [Hierarchy: Hierarchies](vocabularies/Hierarchy.md) - _experimental_
 - [HTML5: Rendering directives for UI5](vocabularies/HTML5.md)

examples/Common.SortOrder-sample.json

@@ -0,0 +1,25 @@
+{
+  "$Version": "4.0",
+  "$Reference": {
+    "https://sap.github.io/odata-vocabularies/vocabularies/Common.json": {
+      "$Include": [{ "$Namespace": "com.sap.vocabularies.Common.v1", "$Alias": "Common" }]
+    }
+  },
+  "sortorder.sample": {
+    "WorkerTimeSheet": {
+      "$Kind": "EntityType",
+      "ClockInDateTime": { "$Type": "Edm.DateTimeOffset", "$Nullable": true, "$Precision": 0 },
+      "ClockOutDateTime": { "$Type": "Edm.DateTimeOffset", "$Nullable": true, "$Precision": 0 }
+    },
+    "$Annotations": {
+      "timezone.sample.WorkerTimeSheet": {
+        "@Common.SortOrder#HeroesOfLabor": [
+          {
+            "Expression": { "$Sub": [{ "$Path": "ClockOutDateTime" }, { "$Path": "ClockInDateTime" }] },
+            "Descending": true
+          }
+        ]
+      }
+    }
+  }
+}

examples/Common.SortOrder-sample.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
+  <edmx:Reference Uri="https://sap.github.io/odata-vocabularies/vocabularies/Common.xml">
+    <edmx:Include Namespace="com.sap.vocabularies.Common.v1" Alias="Common" />
+  </edmx:Reference>
+  <edmx:DataServices>
+    <Schema Namespace="sortorder.sample" xmlns="http://docs.oasis-open.org/odata/ns/edm">
+      <EntityType Name="WorkerTimeSheet">
+        <Property Name="ClockInDateTime" Type="Edm.DateTimeOffset" />
+        <Property Name="ClockOutDateTime" Type="Edm.DateTimeOffset" />
+      </EntityType>
+      <Annotations Target="timezone.sample.WorkerTimeSheet">
+        <Annotation Term="Common.SortOrder" Qualifier="HeroesOfLabor">
+          <Collection>
+            <Record>
+              <PropertyValue Property="Expression">
+                <Sub>
+                  <Path>ClockOutDateTime</Path>
+                  <Path>ClockInDateTime</Path>
+                </Sub>
+              </PropertyValue>
+              <PropertyValue Property="Descending" Bool="true"/>
+            </Record>
+          </Collection>
+        </Annotation>
+      </Annotations>
+    </Schema>
+  </edmx:DataServices>
+</edmx:Edmx>

package.json

@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "eslint": "^8.56.0",
-    "express": "^4.19.2",
+    "express": "^4.21.1",
     "prettier": "^3.2.5"
   },
   "scripts": {

vocabularies/Analytics.md

@@ -86,7 +86,7 @@ Exactly one of `Property` and `DynamicProperty` must be present
 Property|Type|Description
 :-------|:---|:----------
 [Property](Analytics.xml#L150)|PropertyPath?|Property that is part of the analytical context
-[DynamicProperty](Analytics.xml#L153)|AnnotationPath?|Dynamic property introduced by annotations that is part of the analytical context<br>Allowed terms:<ul><li>[AggregatedProperty](#AggregatedProperty)</li><li>[CustomAggregate](https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Aggregation.V1.md#CustomAggregate)</li></ul>
+[DynamicProperty](Analytics.xml#L153)|AnnotationPath?|Dynamic property introduced by annotations that is part of the analytical context<br>Allowed Terms:<ul><li>[AggregatedProperty](#AggregatedProperty)</li><li>[CustomAggregate](https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Aggregation.V1.md#CustomAggregate)</li></ul>
 [Dimension](Analytics.xml#L162)|[Tag](https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Core.V1.md#Tag)|The property holds the key of a dimension
 [Measure](Analytics.xml#L165)|[Tag](https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Core.V1.md#Tag)|The property holds the numeric value of a measure
 [AccumulativeMeasure](Analytics.xml#L168)|[Tag](https://github.com/oasis-tcs/odata-vocabularies/blob/main/vocabularies/Org.OData.Core.V1.md#Tag)|The measure has non-negative and additive values; it can be used in whole-part charts, e.g. the Donut