From 6df966a44ed978c4a596754628263ff0110f8237 Mon Sep 17 00:00:00 2001 From: Daniel O'Grady Date: Fri, 16 Oct 2026 15:24:42 +0200 Subject: [PATCH] Fix again --- lib/compile/csdl.js | 2 +- lib/compile/csdl2openapi.js | 27 ++++ test/lib/compile/csdl2openapi.test.js | 8 +- .../Northwind-key-as-segment.openapi3.json | 125 ++++++++++++++++++ test/lib/compile/data/People.openapi3.json | 20 +++ test/lib/compile/data/Products.openapi3.json | 26 ++++ test/lib/compile/data/TripPin.openapi3.json | 44 ++++++ .../compile/data/aggregation.openapi3.json | 14 ++ .../compile/data/annotations.openapi3.json | 65 ++++++++- .../compile/data/authorization.openapi3.json | 11 ++ .../data/autoexposed-codelist.openapi3.json | 14 ++ .../autoexposed-composition.openapi3.json | 14 ++ .../data/autoexposed-direct.openapi3.json | 14 ++ .../data/autoexposed-texts.openapi3.json | 14 ++ .../compile/data/back-reference.openapi3.json | 14 ++ .../compile/data/containment.openapi3.json | 53 ++++++++ test/lib/compile/data/csdl-16.1.openapi3.json | 29 ++++ .../data/custom-parameters.openapi3.json | 11 ++ .../data/description-fallback.openapi3.json | 11 ++ .../compile/data/descriptions.openapi3.json | 38 ++++++ test/lib/compile/data/example.openapi3.json | 38 ++++++ .../data/immutable-composition.openapi3.json | 11 ++ .../compile/data/miscellaneous.openapi3.json | 41 ++++++ .../compile/data/non-expandable.openapi3.json | 17 +++ ...meter-with-both-descriptions.openapi3.json | 11 ++ 25 files changed, 665 insertions(+), 7 deletions(-) diff --git a/lib/compile/csdl.js b/lib/compile/csdl.js index e223615..454b659 100644 --- a/lib/compile/csdl.js +++ b/lib/compile/csdl.js @@ -10,7 +10,7 @@ const CDS_TERMS = Object.freeze({ Authorization: ['Authorizations', 'SecuritySchemes'], Capabilities: ['BatchSupport', 'BatchSupported', 'ChangeTracking', 'CountRestrictions', 'DeleteRestrictions', 'DeepUpdateSupport', 'ExpandRestrictions', 'FilterRestrictions', 'IndexableByKey', 'InsertRestrictions', 'KeyAsSegmentSupported', 'NavigationRestrictions', 'OperationRestrictions', - 'ReadRestrictions', 'SearchRestrictions', 'SelectSupport', 'SkipSupported', 'SortRestrictions', 'TopSupported', 'UpdateRestrictions'], + 'ReadRestrictions', 'SearchRestrictions', 'SelectSupport', 'SkipSupported', 'SkipTokenSupported', 'SortRestrictions', 'TopSupported', 'UpdateRestrictions'], Core: ['AcceptableMediaTypes', 'Computed', 'ComputedDefaultValue', 'DefaultNamespace', 'Description', 'Example', 'Immutable', 'LongDescription', 'MediaType', 'OptionalParameter', 'Permissions', 'SchemaVersion'], JSON: ['Schema'], diff --git a/lib/compile/csdl2openapi.js b/lib/compile/csdl2openapi.js index b6cc326..5793001 100644 --- a/lib/compile/csdl2openapi.js +++ b/lib/compile/csdl2openapi.js @@ -856,6 +856,7 @@ module.exports.csdl2openapi = function ( if (collection) { optionTop(operation.parameters, target, restrictions); optionSkip(operation.parameters, target, restrictions); + if (isODataProtocol(protocol)) optionSkipToken(operation.parameters, target, restrictions); if (csdl.$Version >= '4.0') optionSearch(operation.parameters, target, restrictions); optionFilter(operation.parameters, target, restrictions); optionCount(operation.parameters, target); @@ -1332,6 +1333,24 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot } } + /** + * Add parameter for query option $skiptoken + * @param {Array} parameters Array of parameters to augment + * @param {null | TargetRestrictions} target Target container child of path + * @param {*} restrictions Navigation property restrictions of navigation segment + */ + function optionSkipToken(parameters, target, restrictions) { + const supported = restrictions.SkipTokenSupported !== undefined + ? restrictions.SkipTokenSupported + : target == null || target?.[meta.voc.Capabilities.SkipTokenSupported] !== false; + + if (supported) { + parameters.push({ + $ref: '#/components/parameters/skiptoken' + }); + } + } + /** * Add parameter for query option $top * @param {Array} parameters Array of parameters to augment @@ -2509,6 +2528,14 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot minimum: 0 } }, + skiptoken: { + name: `${queryOptionPrefix}skiptoken`, + in: 'query', + description: 'Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)', + schema: { + type: 'string' + } + }, count: { name: `${queryOptionPrefix}count`, in: 'query', diff --git a/test/lib/compile/csdl2openapi.test.js b/test/lib/compile/csdl2openapi.test.js index 9783774..2b641a2 100644 --- a/test/lib/compile/csdl2openapi.test.js +++ b/test/lib/compile/csdl2openapi.test.js @@ -642,7 +642,7 @@ describe("Edge cases", () => { const openapi = lib.csdl2openapi(csdl, {}); assert.deepStrictEqual( - openapi.paths["/sources"].get.parameters[5], + openapi.paths["/sources"].get.parameters[6], expected_sources_get_param ); }); @@ -1400,6 +1400,7 @@ describe("Edge cases", () => { parameters: [ { $ref: "#/components/parameters/top" }, { $ref: "#/components/parameters/skip" }, + { $ref: "#/components/parameters/skiptoken" }, { $ref: "#/components/parameters/search" }, { in: "query", @@ -1587,6 +1588,7 @@ describe("Edge cases", () => { parameters: [ { $ref: "#/components/parameters/top" }, { $ref: "#/components/parameters/skip" }, + { $ref: "#/components/parameters/skiptoken" }, { $ref: "#/components/parameters/search" }, { in: "query", @@ -1785,6 +1787,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot parameters: [ { $ref: "#/components/parameters/top" }, { $ref: "#/components/parameters/skip" }, + { $ref: "#/components/parameters/skiptoken" }, { $ref: "#/components/parameters/search" }, { in: "query", @@ -1973,6 +1976,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot parameters: [ { $ref: "#/components/parameters/top" }, { $ref: "#/components/parameters/skip" }, + { $ref: "#/components/parameters/skiptoken" }, { $ref: "#/components/parameters/search" }, { in: "query", @@ -2168,6 +2172,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot parameters: [ { $ref: "#/components/parameters/top" }, { $ref: "#/components/parameters/skip" }, + { $ref: "#/components/parameters/skiptoken" }, { in: "query", name: "$search", @@ -3501,6 +3506,7 @@ describe("CAP / CS01", () => { parameters: [ { $ref: "#/components/parameters/top" }, { $ref: "#/components/parameters/skip" }, + { $ref: "#/components/parameters/skiptoken" }, { $ref: "#/components/parameters/search" }, { in: "query", diff --git a/test/lib/compile/data/Northwind-key-as-segment.openapi3.json b/test/lib/compile/data/Northwind-key-as-segment.openapi3.json index 775dcf7..b7593ab 100644 --- a/test/lib/compile/data/Northwind-key-as-segment.openapi3.json +++ b/test/lib/compile/data/Northwind-key-as-segment.openapi3.json @@ -144,6 +144,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -432,6 +435,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -710,6 +716,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -884,6 +893,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1107,6 +1119,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1340,6 +1355,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1610,6 +1628,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1786,6 +1807,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2027,6 +2051,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2335,6 +2362,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2496,6 +2526,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2683,6 +2716,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -3112,6 +3148,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -3323,6 +3362,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -3523,6 +3565,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -3675,6 +3720,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -4093,6 +4141,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -4563,6 +4614,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -4875,6 +4929,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -5098,6 +5155,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -5595,6 +5655,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -5826,6 +5889,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -6131,6 +6197,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -6368,6 +6437,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -6748,6 +6820,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -6988,6 +7063,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -7211,6 +7289,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -7465,6 +7546,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -7735,6 +7819,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -7887,6 +7974,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -8128,6 +8218,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -8379,6 +8472,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -8653,6 +8749,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -8840,6 +8939,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -9067,6 +9169,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -9294,6 +9399,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -9604,6 +9712,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -9778,6 +9889,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -10054,6 +10168,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -14117,6 +14234,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/People.openapi3.json b/test/lib/compile/data/People.openapi3.json index 8c31b37..abf7bcc 100644 --- a/test/lib/compile/data/People.openapi3.json +++ b/test/lib/compile/data/People.openapi3.json @@ -75,6 +75,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -408,6 +411,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -822,6 +828,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1111,6 +1120,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1869,6 +1881,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/Products.openapi3.json b/test/lib/compile/data/Products.openapi3.json index 4dc62ad..c5af0b1 100644 --- a/test/lib/compile/data/Products.openapi3.json +++ b/test/lib/compile/data/Products.openapi3.json @@ -78,6 +78,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -484,6 +487,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -754,6 +760,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -919,6 +928,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1255,6 +1267,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1549,6 +1564,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2452,6 +2470,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/TripPin.openapi3.json b/test/lib/compile/data/TripPin.openapi3.json index 51e4cba..bcfec07 100644 --- a/test/lib/compile/data/TripPin.openapi3.json +++ b/test/lib/compile/data/TripPin.openapi3.json @@ -81,6 +81,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -303,6 +306,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -646,6 +652,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -971,6 +980,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1318,6 +1330,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1428,6 +1443,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1673,6 +1691,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1970,6 +1991,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2346,6 +2370,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2720,6 +2747,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2839,6 +2869,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -3093,6 +3126,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -4615,6 +4651,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/aggregation.openapi3.json b/test/lib/compile/data/aggregation.openapi3.json index 74e50b3..0c5f43c 100644 --- a/test/lib/compile/data/aggregation.openapi3.json +++ b/test/lib/compile/data/aggregation.openapi3.json @@ -72,6 +72,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -294,6 +297,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1206,6 +1212,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/annotations.openapi3.json b/test/lib/compile/data/annotations.openapi3.json index b3748ef..60ba966 100644 --- a/test/lib/compile/data/annotations.openapi3.json +++ b/test/lib/compile/data/annotations.openapi3.json @@ -69,6 +69,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -339,6 +342,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -494,7 +500,11 @@ "All Set", "Two Read Only Set" ], - "parameters": [], + "parameters": [ + { + "$ref": "#/components/parameters/skiptoken" + } + ], "responses": { "200": { "description": "Retrieved read only many", @@ -656,6 +666,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -789,7 +802,11 @@ "All Singleton", "Two Read Only Set" ], - "parameters": [], + "parameters": [ + { + "$ref": "#/components/parameters/skiptoken" + } + ], "responses": { "200": { "description": "Retrieved read only many", @@ -859,6 +876,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1118,6 +1138,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1388,6 +1411,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1479,7 +1505,11 @@ "tags": [ "Read List Only Set" ], - "parameters": [], + "parameters": [ + { + "$ref": "#/components/parameters/skiptoken" + } + ], "responses": { "200": { "description": "Retrieved read list only set", @@ -1551,6 +1581,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1691,6 +1724,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1783,7 +1819,11 @@ "Read Only Singleton", "Two Read Only Set" ], - "parameters": [], + "parameters": [ + { + "$ref": "#/components/parameters/skiptoken" + } + ], "responses": { "200": { "description": "Retrieved read only many", @@ -1853,6 +1893,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2141,7 +2184,11 @@ "tags": [ "Two Read Only Set" ], - "parameters": [], + "parameters": [ + { + "$ref": "#/components/parameters/skiptoken" + } + ], "responses": { "200": { "description": "Retrieved two read only set", @@ -2664,6 +2711,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/authorization.openapi3.json b/test/lib/compile/data/authorization.openapi3.json index 7b18809..8400a4d 100644 --- a/test/lib/compile/data/authorization.openapi3.json +++ b/test/lib/compile/data/authorization.openapi3.json @@ -69,6 +69,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -403,6 +406,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/autoexposed-codelist.openapi3.json b/test/lib/compile/data/autoexposed-codelist.openapi3.json index 7d3e73a..03b22f1 100644 --- a/test/lib/compile/data/autoexposed-codelist.openapi3.json +++ b/test/lib/compile/data/autoexposed-codelist.openapi3.json @@ -72,6 +72,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -224,6 +227,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -655,6 +661,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/autoexposed-composition.openapi3.json b/test/lib/compile/data/autoexposed-composition.openapi3.json index 2c7115a..d28b5c5 100644 --- a/test/lib/compile/data/autoexposed-composition.openapi3.json +++ b/test/lib/compile/data/autoexposed-composition.openapi3.json @@ -69,6 +69,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -335,6 +338,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -737,6 +743,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/autoexposed-direct.openapi3.json b/test/lib/compile/data/autoexposed-direct.openapi3.json index 1a49363..96f0ae4 100644 --- a/test/lib/compile/data/autoexposed-direct.openapi3.json +++ b/test/lib/compile/data/autoexposed-direct.openapi3.json @@ -72,6 +72,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -380,6 +383,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -655,6 +661,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/autoexposed-texts.openapi3.json b/test/lib/compile/data/autoexposed-texts.openapi3.json index 00378d7..4ea0b75 100644 --- a/test/lib/compile/data/autoexposed-texts.openapi3.json +++ b/test/lib/compile/data/autoexposed-texts.openapi3.json @@ -69,6 +69,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -335,6 +338,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -739,6 +745,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/back-reference.openapi3.json b/test/lib/compile/data/back-reference.openapi3.json index c4ff107..c39a917 100644 --- a/test/lib/compile/data/back-reference.openapi3.json +++ b/test/lib/compile/data/back-reference.openapi3.json @@ -69,6 +69,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -340,6 +343,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -888,6 +894,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/containment.openapi3.json b/test/lib/compile/data/containment.openapi3.json index 0a6160a..08f0293 100644 --- a/test/lib/compile/data/containment.openapi3.json +++ b/test/lib/compile/data/containment.openapi3.json @@ -41,6 +41,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -308,6 +311,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -593,6 +599,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -896,6 +905,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1217,6 +1229,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1556,6 +1571,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1788,6 +1806,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2059,6 +2080,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2365,6 +2389,9 @@ "The Whole" ], "parameters": [ + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/count" } @@ -2747,6 +2774,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -3175,6 +3205,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -3444,6 +3477,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -3733,6 +3769,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -4071,6 +4110,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -4569,6 +4611,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -5485,6 +5530,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/csdl-16.1.openapi3.json b/test/lib/compile/data/csdl-16.1.openapi3.json index 5f1fc9e..b4c183f 100644 --- a/test/lib/compile/data/csdl-16.1.openapi3.json +++ b/test/lib/compile/data/csdl-16.1.openapi3.json @@ -83,6 +83,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -353,6 +356,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -517,6 +523,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -870,6 +879,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1034,6 +1046,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1570,6 +1585,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1910,6 +1928,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2563,6 +2584,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/custom-parameters.openapi3.json b/test/lib/compile/data/custom-parameters.openapi3.json index 25d3894..7415e7e 100644 --- a/test/lib/compile/data/custom-parameters.openapi3.json +++ b/test/lib/compile/data/custom-parameters.openapi3.json @@ -163,6 +163,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1090,6 +1093,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/description-fallback.openapi3.json b/test/lib/compile/data/description-fallback.openapi3.json index d47aa7a..ad3dbc7 100644 --- a/test/lib/compile/data/description-fallback.openapi3.json +++ b/test/lib/compile/data/description-fallback.openapi3.json @@ -69,6 +69,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -448,6 +451,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/descriptions.openapi3.json b/test/lib/compile/data/descriptions.openapi3.json index 1a39357..b6795f4 100644 --- a/test/lib/compile/data/descriptions.openapi3.json +++ b/test/lib/compile/data/descriptions.openapi3.json @@ -247,6 +247,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -566,6 +569,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -914,6 +920,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1193,6 +1202,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1467,6 +1479,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1780,6 +1795,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2337,6 +2355,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2615,6 +2636,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2956,6 +2980,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -3234,6 +3261,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -3655,6 +3685,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/example.openapi3.json b/test/lib/compile/data/example.openapi3.json index 0b8ee59..c11e50a 100644 --- a/test/lib/compile/data/example.openapi3.json +++ b/test/lib/compile/data/example.openapi3.json @@ -87,6 +87,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -493,6 +496,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -763,6 +769,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -968,6 +977,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1383,6 +1395,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1716,6 +1731,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2052,6 +2070,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2346,6 +2367,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2706,6 +2730,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2996,6 +3023,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -4366,6 +4396,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/immutable-composition.openapi3.json b/test/lib/compile/data/immutable-composition.openapi3.json index 60711ce..a9382ad 100644 --- a/test/lib/compile/data/immutable-composition.openapi3.json +++ b/test/lib/compile/data/immutable-composition.openapi3.json @@ -69,6 +69,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -619,6 +622,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/miscellaneous.openapi3.json b/test/lib/compile/data/miscellaneous.openapi3.json index e7ef678..e52d5b1 100644 --- a/test/lib/compile/data/miscellaneous.openapi3.json +++ b/test/lib/compile/data/miscellaneous.openapi3.json @@ -93,6 +93,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -357,6 +360,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -506,6 +512,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -769,6 +778,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -885,6 +897,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1148,6 +1163,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1356,6 +1374,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1583,6 +1604,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1801,6 +1825,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2298,6 +2325,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -2516,6 +2546,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -3063,6 +3096,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/non-expandable.openapi3.json b/test/lib/compile/data/non-expandable.openapi3.json index 8865ca6..84ccfa5 100644 --- a/test/lib/compile/data/non-expandable.openapi3.json +++ b/test/lib/compile/data/non-expandable.openapi3.json @@ -72,6 +72,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -338,6 +341,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -711,6 +717,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -1236,6 +1245,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query", diff --git a/test/lib/compile/data/parameter-with-both-descriptions.openapi3.json b/test/lib/compile/data/parameter-with-both-descriptions.openapi3.json index 367dddf..326f867 100644 --- a/test/lib/compile/data/parameter-with-both-descriptions.openapi3.json +++ b/test/lib/compile/data/parameter-with-both-descriptions.openapi3.json @@ -69,6 +69,9 @@ { "$ref": "#/components/parameters/skip" }, + { + "$ref": "#/components/parameters/skiptoken" + }, { "$ref": "#/components/parameters/search" }, @@ -452,6 +455,14 @@ "minimum": 0 } }, + "skiptoken": { + "name": "$skiptoken", + "in": "query", + "description": "Continuation token for server-driven paging, see [Server-driven Paging](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-protocol.html#sec_ServerDrivenPaging)", + "schema": { + "type": "string" + } + }, "count": { "name": "$count", "in": "query",