Skip to content
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

Jump to bottom

Resolve paths in CSDL XML documents #291

Draft
wants to merge 52 commits into
base: main
Choose a base branch
from
Draft

Resolve paths in CSDL XML documents #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
95b8d90
First test
HeikoTheissen Apr 12, 2024
6992c47
Separation of non-final and final segments
HeikoTheissen Apr 12, 2024
4611d82
Edmx version
HeikoTheissen Apr 12, 2024
e59fc2f
indentation
HeikoTheissen Apr 12, 2024
c2f5707
Merge branch 'main' into resolve-paths
HeikoTheissen Apr 12, 2024
eb61cc8
namespaces for non-final and final segments
HeikoTheissen Apr 12, 2024
eb7913c
External targeting
HeikoTheissen Apr 12, 2024
c9d2c42
Immutability example
HeikoTheissen Apr 12, 2024
f1d671f
external targeting 2
HeikoTheissen Apr 15, 2024
994f428
NavigationPropertyBinding
HeikoTheissen Apr 15, 2024
4e28656
outermost
HeikoTheissen Apr 15, 2024
92f9d8e
API_SalesOrder example
HeikoTheissen Apr 15, 2024
4b9dc8a
API_SalesOrder OpenAPI
HeikoTheissen Apr 15, 2024
9e777ff
move file
HeikoTheissen Apr 15, 2024
6b2c5b8
First round of testing
HeikoTheissen Apr 15, 2024
f78b494
Align syntax with ABAP XSLT
HeikoTheissen Apr 15, 2024
f0cb37d
mode="ids"
HeikoTheissen Apr 15, 2024
d64ebeb
$ReturnType
HeikoTheissen Apr 16, 2024
4724f00
mode="path-remainder"
HeikoTheissen Apr 16, 2024
170c42d
<xsl:template match="*" mode="path">
HeikoTheissen Apr 16, 2024
6f8d7c2
ids everywhere
HeikoTheissen Apr 16, 2024
dd52f8e
test="self::*"
HeikoTheissen Apr 16, 2024
414edde
corrected p1:Type
HeikoTheissen Apr 16, 2024
1e3fb40
more robust
HeikoTheissen Apr 16, 2024
28a33a6
absolute paths
HeikoTheissen Apr 16, 2024
8ac3b6c
No support for function overload paths
HeikoTheissen Apr 16, 2024
8dba89b
DTD
HeikoTheissen Apr 17, 2024
87acf77
ID
HeikoTheissen Apr 17, 2024
3dda9d8
More paths
HeikoTheissen Apr 18, 2024
9910976
Abolish xsl:text
HeikoTheissen Apr 18, 2024
894d296
Merge branch 'main' into resolve-paths
HeikoTheissen Apr 18, 2024
fbc42c9
Rudimentary treatment of term casts
HeikoTheissen Apr 18, 2024
545ecba
Abolish qname prefix
HeikoTheissen Apr 18, 2024
0834067
Term cast example
HeikoTheissen Apr 18, 2024
f6b2bf5
Overloads
HeikoTheissen Apr 18, 2024
937422f
Overloads with collections
HeikoTheissen Apr 19, 2024
6419560
Don't work around https://saxonica.plan.io/issues/6393
HeikoTheissen Apr 24, 2024
51871a9
Merge branch 'main' into resolve-paths
HeikoTheissen Apr 24, 2024
3b81ddb
transform.cmd
HeikoTheissen Apr 25, 2024
083ee0f
Smaller example
HeikoTheissen Apr 25, 2024
9421df9
Merge branch 'main' into resolve-paths
HeikoTheissen Apr 25, 2024
61b0c1a
Report path syntax errors
HeikoTheissen Apr 25, 2024
129fa10
Correct id in error message
HeikoTheissen Apr 25, 2024
7709c1b
Qualified name checker
HeikoTheissen Apr 25, 2024
6dc4c14
Allow Collection(Edm.*)
HeikoTheissen May 2, 2024
575021b
2.0 output
HeikoTheissen May 2, 2024
1ab68c2
No redundantly resolved targets
HeikoTheissen May 6, 2024
eb0e430
empty paths
HeikoTheissen May 7, 2024
50f7d54
simplified patterns
HeikoTheissen May 7, 2024
8755f9d
quotes
HeikoTheissen May 7, 2024
ab10f5b
Inline literals to attributes
HeikoTheissen May 28, 2024
5a7bb8e
correction
HeikoTheissen May 28, 2024
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
12 changes: 9 additions & 3 deletions tools/V4-CSDL-to-OpenAPI.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" xmlns:edm="http://docs.oasis-open.org/odata/ns/edm">
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" xmlns:edm="http://docs.oasis-open.org/odata/ns/edm"
xmlns:p1="http://docs.oasis-open.org/odata/ns/edm/final-segment"
xmlns:p2="http://docs.oasis-open.org/odata/ns/edm/termcast-segment">

<!--
This style sheet transforms OData 4.0 CSDL XML documents into OpenAPI 2.0 or OpenAPI 3.0.0 JSON

Expand Down Expand Up @@ -1528,8 +1531,11 @@
<xsl:choose>
<xsl:when test="$suffix='-update'">
<!-- only updatable non-key properties -->
<xsl:for-each select="$structuredType/edm:Property[not(@Name=$immutable or concat($qualifiedName,'/',@Name) = $immutable-ext or concat($aliasQualifiedName,'/',@Name) = $immutable-ext
or @Name=$computed or concat($qualifiedName,'/',@Name) = $computed-ext or concat($aliasQualifiedName,'/',@Name) = $computed-ext
<xsl:for-each select="$structuredType/edm:Property[not(
@id=//edm:Annotation[@p2:Term='Org.OData.Core.V1.Immutable']/@target
and not(@id=//edm:Annotation[@p2:Term='Org.OData.Measures.V1.Unit'
or @p2:Term='Org.OData.Measures.V1.ISOCurrency']//@p1:*)
or @id=//edm:Annotation[@p2:Term='Org.OData.Core.V1.Computed']/@target
or @Name=$read-only or @Name=../edm:Key/edm:PropertyRef/@Name)]">
<xsl:call-template name="property">
<xsl:with-param name="suffix" select="'-update'" />
Expand Down
71 changes: 71 additions & 0 deletions tools/csdl-ext.dtd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<!ATTLIST Schema id ID #IMPLIED>
<!ATTLIST Annotations id ID #IMPLIED>
<!ATTLIST EntityType id ID #IMPLIED>
<!ATTLIST Key id ID #IMPLIED>
<!ATTLIST PropertyRef id ID #IMPLIED>
<!ATTLIST Property id ID #IMPLIED>
<!ATTLIST NavigationProperty id ID #IMPLIED>
<!ATTLIST ReferentialConstraint id ID #IMPLIED>
<!ATTLIST OnDelete id ID #IMPLIED>
<!ATTLIST ComplexType id ID #IMPLIED>
<!ATTLIST EnumType id ID #IMPLIED>
<!ATTLIST Member id ID #IMPLIED>
<!ATTLIST TypeDefinition id ID #IMPLIED>
<!ATTLIST Action id ID #IMPLIED>
<!ATTLIST Function id ID #IMPLIED>
<!ATTLIST ReturnType id ID #IMPLIED>
<!ATTLIST Parameter id ID #IMPLIED>
<!ATTLIST EntityContainer id ID #IMPLIED>
<!ATTLIST EntitySet id ID #IMPLIED>
<!ATTLIST Singleton id ID #IMPLIED>
<!ATTLIST NavigationPropertyBinding id ID #IMPLIED>
<!ATTLIST ActionImport id ID #IMPLIED>
<!ATTLIST FunctionImport id ID #IMPLIED>
<!ATTLIST Term id ID #IMPLIED>
<!ATTLIST Annotation id ID #IMPLIED>
<!ATTLIST Binary id ID #IMPLIED>
<!ATTLIST Bool id ID #IMPLIED>
<!ATTLIST Date id ID #IMPLIED>
<!ATTLIST DateTimeOffset id ID #IMPLIED>
<!ATTLIST Decimal id ID #IMPLIED>
<!ATTLIST Duration id ID #IMPLIED>
<!ATTLIST EnumMember id ID #IMPLIED>
<!ATTLIST Float id ID #IMPLIED>
<!ATTLIST Guid id ID #IMPLIED>
<!ATTLIST Int id ID #IMPLIED>
<!ATTLIST String id ID #IMPLIED>
<!ATTLIST TimeOfDay id ID #IMPLIED>
<!ATTLIST AnnotationPath id ID #IMPLIED>
<!ATTLIST ModelElementPath id ID #IMPLIED>
<!ATTLIST NavigationPropertyPath id ID #IMPLIED>
<!ATTLIST PropertyPath id ID #IMPLIED>
<!ATTLIST Path id ID #IMPLIED>
<!ATTLIST And id ID #IMPLIED>
<!ATTLIST Or id ID #IMPLIED>
<!ATTLIST Not id ID #IMPLIED>
<!ATTLIST Eq id ID #IMPLIED>
<!ATTLIST Ne id ID #IMPLIED>
<!ATTLIST Gt id ID #IMPLIED>
<!ATTLIST Ge id ID #IMPLIED>
<!ATTLIST Lt id ID #IMPLIED>
<!ATTLIST Le id ID #IMPLIED>
<!ATTLIST Has id ID #IMPLIED>
<!ATTLIST In id ID #IMPLIED>
<!ATTLIST Neg id ID #IMPLIED>
<!ATTLIST Add id ID #IMPLIED>
<!ATTLIST Sub id ID #IMPLIED>
<!ATTLIST Mul id ID #IMPLIED>
<!ATTLIST Div id ID #IMPLIED>
<!ATTLIST DivBy id ID #IMPLIED>
<!ATTLIST Mod id ID #IMPLIED>
<!ATTLIST Apply id ID #IMPLIED>
<!ATTLIST Cast id ID #IMPLIED>
<!ATTLIST Collection id ID #IMPLIED>
<!ATTLIST If id ID #IMPLIED>
<!ATTLIST UrlRef id ID #IMPLIED>
<!ATTLIST LabeledElement id ID #IMPLIED>
<!ATTLIST LabeledElementReference id ID #IMPLIED>
<!ATTLIST Null id ID #IMPLIED>
<!ATTLIST Record id ID #IMPLIED>
<!ATTLIST PropertyValue id ID #IMPLIED>
<!ATTLIST UrlRef id ID #IMPLIED>
Loading