Skip to content

Commit e86e70a

Browse files
baywetbaywet
authored
Merge pull request #1063 from microsoft/bugfix/different-url-operations
bugfix/different url operations
2 parents 02309ee + 1a2a455 commit e86e70a

File tree

62 files changed

+816
-776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+816
-776
lines changed

‎package-lock.json

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/abstractions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-abstractions",
3-
"version": "1.0.0-preview.41",
3+
"version": "1.0.0-preview.42",
44
"description": "Core abstractions for kiota generated libraries in TypeScript and JavaScript",
55
"main": "dist/cjs/src/index.js",
66
"module": "dist/es/src/index.js",

‎packages/abstractions/src/apiClientProxifier.ts

+17-18
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,11 @@ function sendAsync(
182182
export function apiClientProxifier<T extends object>(
183183
requestAdapter: RequestAdapter,
184184
pathParameters: Record<string, unknown>,
185-
urlTemplate: string,
186185
navigationMetadata?: Record<string, NavigationMetadata>,
187186
requestsMetadata?: RequestsMetadata,
188187
): T {
189188
if (!requestAdapter) throw new Error("requestAdapter cannot be undefined");
190189
if (!pathParameters) throw new Error("pathParameters cannot be undefined");
191-
if (!urlTemplate) throw new Error("urlTemplate cannot be undefined");
192190
return new Proxy({} as T, {
193191
get(target, property) {
194192
const name = String(property);
@@ -198,7 +196,6 @@ export function apiClientProxifier<T extends object>(
198196
return apiClientProxifier(
199197
requestAdapter,
200198
getPathParameters(rawUrl),
201-
urlTemplate,
202199
navigationMetadata,
203200
requestsMetadata,
204201
);
@@ -212,10 +209,12 @@ export function apiClientProxifier<T extends object>(
212209
switch (name) {
213210
case "get":
214211
return (
215-
requestConfiguration?: RequestConfiguration<object> | undefined,
212+
requestConfiguration?:
213+
| RequestConfiguration<object>
214+
| undefined,
216215
) => {
217216
const requestInfo = toRequestInformation(
218-
urlTemplate,
217+
metadata.uriTemplate,
219218
pathParameters,
220219
metadata,
221220
requestAdapter,
@@ -229,7 +228,7 @@ export function apiClientProxifier<T extends object>(
229228
case "patch":
230229
return (...args: any[]) => {
231230
const requestInfo = toRequestInformation(
232-
urlTemplate,
231+
metadata.uriTemplate,
233232
pathParameters,
234233
metadata,
235234
requestAdapter,
@@ -243,7 +242,7 @@ export function apiClientProxifier<T extends object>(
243242
case "put":
244243
return (...args: any[]) => {
245244
const requestInfo = toRequestInformation(
246-
urlTemplate,
245+
metadata.uriTemplate,
247246
pathParameters,
248247
metadata,
249248
requestAdapter,
@@ -257,7 +256,7 @@ export function apiClientProxifier<T extends object>(
257256
case "delete":
258257
return (...args: any[]) => {
259258
const requestInfo = toRequestInformation(
260-
urlTemplate,
259+
metadata.uriTemplate,
261260
pathParameters,
262261
metadata,
263262
requestAdapter,
@@ -271,7 +270,7 @@ export function apiClientProxifier<T extends object>(
271270
case "post":
272271
return (...args: any[]) => {
273272
const requestInfo = toRequestInformation(
274-
urlTemplate,
273+
metadata.uriTemplate,
275274
pathParameters,
276275
metadata,
277276
requestAdapter,
@@ -283,9 +282,11 @@ export function apiClientProxifier<T extends object>(
283282
return sendAsync(requestAdapter, requestInfo, metadata);
284283
};
285284
case "toGetRequestInformation":
286-
return (requestConfiguration?: RequestConfiguration<object>) => {
285+
return (
286+
requestConfiguration?: RequestConfiguration<object>,
287+
) => {
287288
return toRequestInformation(
288-
urlTemplate,
289+
metadata.uriTemplate,
289290
pathParameters,
290291
metadata,
291292
requestAdapter,
@@ -298,7 +299,7 @@ export function apiClientProxifier<T extends object>(
298299
case "toPatchRequestInformation":
299300
return (...args: any[]) => {
300301
return toRequestInformation(
301-
urlTemplate,
302+
metadata.uriTemplate,
302303
pathParameters,
303304
metadata,
304305
requestAdapter,
@@ -311,7 +312,7 @@ export function apiClientProxifier<T extends object>(
311312
case "toPutRequestInformation":
312313
return (...args: any[]) => {
313314
return toRequestInformation(
314-
urlTemplate,
315+
metadata.uriTemplate,
315316
pathParameters,
316317
metadata,
317318
requestAdapter,
@@ -324,7 +325,7 @@ export function apiClientProxifier<T extends object>(
324325
case "toDeleteRequestInformation":
325326
return (...args: any[]) => {
326327
return toRequestInformation(
327-
urlTemplate,
328+
metadata.uriTemplate,
328329
pathParameters,
329330
metadata,
330331
requestAdapter,
@@ -337,7 +338,7 @@ export function apiClientProxifier<T extends object>(
337338
case "toPostRequestInformation":
338339
return (...args: any[]) => {
339340
return toRequestInformation(
340-
urlTemplate,
341+
metadata.uriTemplate,
341342
pathParameters,
342343
metadata,
343344
requestAdapter,
@@ -364,7 +365,6 @@ export function apiClientProxifier<T extends object>(
364365
return apiClientProxifier(
365366
requestAdapter,
366367
getPathParameters(pathParameters),
367-
navigationCandidate.uriTemplate,
368368
navigationCandidate.navigationMetadata,
369369
navigationCandidate.requestsMetadata,
370370
);
@@ -386,7 +386,6 @@ export function apiClientProxifier<T extends object>(
386386
return apiClientProxifier(
387387
requestAdapter,
388388
downWardPathParameters,
389-
navigationCandidate.uriTemplate,
390389
navigationCandidate.navigationMetadata,
391390
navigationCandidate.requestsMetadata,
392391
);
@@ -415,6 +414,7 @@ export interface RequestMetadata {
415414
| PrimitiveTypesForDeserialization;
416415
requestInformationContentSetMethod?: keyof RequestInformationSetContent;
417416
queryParametersMapper?: Record<string, string>;
417+
uriTemplate: string;
418418
}
419419
export interface RequestsMetadata {
420420
delete?: RequestMetadata;
@@ -429,7 +429,6 @@ export interface RequestsMetadata {
429429
type KeysOfRequestsMetadata = keyof RequestsMetadata;
430430

431431
export interface NavigationMetadata {
432-
uriTemplate: string;
433432
requestsMetadata?: RequestsMetadata;
434433
navigationMetadata?: Record<string, NavigationMetadata>;
435434
pathParametersMappings?: string[];

‎packages/authentication/azure/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-authentication-azure",
3-
"version": "1.0.0-preview.36",
3+
"version": "1.0.0-preview.37",
44
"description": "Authentication provider for Kiota using Azure Identity",
55
"main": "dist/cjs/src/index.js",
66
"module": "dist/es/src/index.js",
@@ -30,7 +30,7 @@
3030
"homepage": "https://github.com/microsoft/kiota-typescript#readme",
3131
"dependencies": {
3232
"@azure/core-auth": "^1.5.0",
33-
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
33+
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
3434
"@opentelemetry/api": "^1.7.0",
3535
"tslib": "^2.6.2"
3636
},

‎packages/authentication/spfx/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-authentication-spfx",
3-
"version": "1.0.0-preview.31",
3+
"version": "1.0.0-preview.32",
44
"description": "Authentication provider for using Kiota in SPFx solutions",
55
"main": "dist/cjs/src/index.js",
66
"module": "dist/es/src/index.js",
@@ -39,7 +39,7 @@
3939
},
4040
"homepage": "https://github.com/microsoft/kiota-typescript#readme",
4141
"dependencies": {
42-
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
42+
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
4343
"@microsoft/sp-http": "^1.15.2",
4444
"@opentelemetry/api": "^1.7.0",
4545
"tslib": "^2.6.2"

‎packages/http/fetch/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-http-fetchlibrary",
3-
"version": "1.0.0-preview.40",
3+
"version": "1.0.0-preview.41",
44
"description": "Kiota request adapter implementation with fetch",
55
"keywords": [
66
"Kiota",
@@ -38,7 +38,7 @@
3838
"test:cjs": "mocha 'dist/cjs/test/common/**/*.js' && mocha 'dist/cjs/test/node/**/*.js'"
3939
},
4040
"dependencies": {
41-
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
41+
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
4242
"@opentelemetry/api": "^1.7.0",
4343
"guid-typescript": "^1.0.9",
4444
"node-fetch": "^2.7.0",

‎packages/serialization/form/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-serialization-form",
3-
"version": "1.0.0-preview.30",
3+
"version": "1.0.0-preview.31",
44
"description": "Implementation of Kiota Serialization interfaces for URI from encoded",
55
"main": "dist/cjs/src/index.js",
66
"browser": {
@@ -39,7 +39,7 @@
3939
},
4040
"homepage": "https://github.com/microsoft/kiota-typescript#readme",
4141
"dependencies": {
42-
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
42+
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
4343
"guid-typescript": "^1.0.9",
4444
"tslib": "^2.6.2"
4545
},

‎packages/serialization/json/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-serialization-json",
3-
"version": "1.0.0-preview.41",
3+
"version": "1.0.0-preview.42",
44
"description": "Implementation of Kiota Serialization interfaces for JSON",
55
"main": "dist/cjs/src/index.js",
66
"browser": {
@@ -39,7 +39,7 @@
3939
},
4040
"homepage": "https://github.com/microsoft/kiota-typescript#readme",
4141
"dependencies": {
42-
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
42+
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
4343
"guid-typescript": "^1.0.9",
4444
"tslib": "^2.6.2"
4545
},

‎packages/serialization/multipart/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-serialization-multipart",
3-
"version": "1.0.0-preview.20",
3+
"version": "1.0.0-preview.21",
44
"description": "Implementation of Kiota Serialization interfaces for multipart form data",
55
"main": "dist/cjs/src/index.js",
66
"module": "dist/es/src/index.js",
@@ -35,12 +35,12 @@
3535
},
3636
"homepage": "https://github.com/microsoft/kiota-typescript#readme",
3737
"dependencies": {
38-
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
38+
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
3939
"guid-typescript": "^1.0.9",
4040
"tslib": "^2.6.2"
4141
},
4242
"devDependencies": {
43-
"@microsoft/kiota-serialization-json": "^1.0.0-preview.41"
43+
"@microsoft/kiota-serialization-json": "^1.0.0-preview.42"
4444
},
4545
"publishConfig": {
4646
"access": "public"

‎packages/serialization/text/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/kiota-serialization-text",
3-
"version": "1.0.0-preview.38",
3+
"version": "1.0.0-preview.39",
44
"description": "Implementation of Kiota Serialization interfaces for text",
55
"main": "dist/cjs/src/index.js",
66
"browser": {
@@ -39,7 +39,7 @@
3939
},
4040
"homepage": "https://github.com/microsoft/kiota-typescript#readme",
4141
"dependencies": {
42-
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
42+
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
4343
"guid-typescript": "^1.0.9",
4444
"tslib": "^2.6.2"
4545
},

0 commit comments

Comments
 (0)