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

bugfix/different url operations #1063

Merged
merged 3 commits into from
Feb 9, 2024
Merged

bugfix/different url operations #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fece2b1
- code-gen: client refresh for doc comment, deduped error mappings an…
baywet Feb 8, 2024
e4770a1
- fixes a bug where uri template would be different from operation to…
baywet Feb 8, 2024
1a2a455
Publish
baywet Feb 8, 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
32 changes: 16 additions & 16 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/abstractions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/kiota-abstractions",
"version": "1.0.0-preview.41",
"version": "1.0.0-preview.42",
"description": "Core abstractions for kiota generated libraries in TypeScript and JavaScript",
"main": "dist/cjs/src/index.js",
"module": "dist/es/src/index.js",
Expand Down
35 changes: 17 additions & 18 deletions packages/abstractions/src/apiClientProxifier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,11 @@ function sendAsync(
export function apiClientProxifier<T extends object>(
requestAdapter: RequestAdapter,
pathParameters: Record<string, unknown>,
urlTemplate: string,
navigationMetadata?: Record<string, NavigationMetadata>,
requestsMetadata?: RequestsMetadata,
): T {
if (!requestAdapter) throw new Error("requestAdapter cannot be undefined");
if (!pathParameters) throw new Error("pathParameters cannot be undefined");
if (!urlTemplate) throw new Error("urlTemplate cannot be undefined");
return new Proxy({} as T, {
get(target, property) {
const name = String(property);
Expand All @@ -198,7 +196,6 @@ export function apiClientProxifier<T extends object>(
return apiClientProxifier(
requestAdapter,
getPathParameters(rawUrl),
urlTemplate,
navigationMetadata,
requestsMetadata,
);
Expand All @@ -212,10 +209,12 @@ export function apiClientProxifier<T extends object>(
switch (name) {
case "get":
return (
requestConfiguration?: RequestConfiguration<object> | undefined,
requestConfiguration?:
| RequestConfiguration<object>
| undefined,
) => {
const requestInfo = toRequestInformation(
urlTemplate,
metadata.uriTemplate,
pathParameters,
metadata,
requestAdapter,
Expand All @@ -229,7 +228,7 @@ export function apiClientProxifier<T extends object>(
case "patch":
return (...args: any[]) => {
const requestInfo = toRequestInformation(
urlTemplate,
metadata.uriTemplate,
pathParameters,
metadata,
requestAdapter,
Expand All @@ -243,7 +242,7 @@ export function apiClientProxifier<T extends object>(
case "put":
return (...args: any[]) => {
const requestInfo = toRequestInformation(
urlTemplate,
metadata.uriTemplate,
pathParameters,
metadata,
requestAdapter,
Expand All @@ -257,7 +256,7 @@ export function apiClientProxifier<T extends object>(
case "delete":
return (...args: any[]) => {
const requestInfo = toRequestInformation(
urlTemplate,
metadata.uriTemplate,
pathParameters,
metadata,
requestAdapter,
Expand All @@ -271,7 +270,7 @@ export function apiClientProxifier<T extends object>(
case "post":
return (...args: any[]) => {
const requestInfo = toRequestInformation(
urlTemplate,
metadata.uriTemplate,
pathParameters,
metadata,
requestAdapter,
Expand All @@ -283,9 +282,11 @@ export function apiClientProxifier<T extends object>(
return sendAsync(requestAdapter, requestInfo, metadata);
};
case "toGetRequestInformation":
return (requestConfiguration?: RequestConfiguration<object>) => {
return (
requestConfiguration?: RequestConfiguration<object>,
) => {
return toRequestInformation(
urlTemplate,
metadata.uriTemplate,
pathParameters,
metadata,
requestAdapter,
Expand All @@ -298,7 +299,7 @@ export function apiClientProxifier<T extends object>(
case "toPatchRequestInformation":
return (...args: any[]) => {
return toRequestInformation(
urlTemplate,
metadata.uriTemplate,
pathParameters,
metadata,
requestAdapter,
Expand All @@ -311,7 +312,7 @@ export function apiClientProxifier<T extends object>(
case "toPutRequestInformation":
return (...args: any[]) => {
return toRequestInformation(
urlTemplate,
metadata.uriTemplate,
pathParameters,
metadata,
requestAdapter,
Expand All @@ -324,7 +325,7 @@ export function apiClientProxifier<T extends object>(
case "toDeleteRequestInformation":
return (...args: any[]) => {
return toRequestInformation(
urlTemplate,
metadata.uriTemplate,
pathParameters,
metadata,
requestAdapter,
Expand All @@ -337,7 +338,7 @@ export function apiClientProxifier<T extends object>(
case "toPostRequestInformation":
return (...args: any[]) => {
return toRequestInformation(
urlTemplate,
metadata.uriTemplate,
pathParameters,
metadata,
requestAdapter,
Expand All @@ -364,7 +365,6 @@ export function apiClientProxifier<T extends object>(
return apiClientProxifier(
requestAdapter,
getPathParameters(pathParameters),
navigationCandidate.uriTemplate,
navigationCandidate.navigationMetadata,
navigationCandidate.requestsMetadata,
);
Expand All @@ -386,7 +386,6 @@ export function apiClientProxifier<T extends object>(
return apiClientProxifier(
requestAdapter,
downWardPathParameters,
navigationCandidate.uriTemplate,
navigationCandidate.navigationMetadata,
navigationCandidate.requestsMetadata,
);
Expand Down Expand Up @@ -415,6 +414,7 @@ export interface RequestMetadata {
| PrimitiveTypesForDeserialization;
requestInformationContentSetMethod?: keyof RequestInformationSetContent;
queryParametersMapper?: Record<string, string>;
uriTemplate: string;
}
export interface RequestsMetadata {
delete?: RequestMetadata;
Expand All @@ -429,7 +429,6 @@ export interface RequestsMetadata {
type KeysOfRequestsMetadata = keyof RequestsMetadata;

export interface NavigationMetadata {
uriTemplate: string;
requestsMetadata?: RequestsMetadata;
navigationMetadata?: Record<string, NavigationMetadata>;
pathParametersMappings?: string[];
Expand Down
4 changes: 2 additions & 2 deletions packages/authentication/azure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/kiota-authentication-azure",
"version": "1.0.0-preview.36",
"version": "1.0.0-preview.37",
"description": "Authentication provider for Kiota using Azure Identity",
"main": "dist/cjs/src/index.js",
"module": "dist/es/src/index.js",
Expand Down Expand Up @@ -30,7 +30,7 @@
"homepage": "https://github.com/microsoft/kiota-typescript#readme",
"dependencies": {
"@azure/core-auth": "^1.5.0",
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
"@opentelemetry/api": "^1.7.0",
"tslib": "^2.6.2"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/authentication/spfx/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/kiota-authentication-spfx",
"version": "1.0.0-preview.31",
"version": "1.0.0-preview.32",
"description": "Authentication provider for using Kiota in SPFx solutions",
"main": "dist/cjs/src/index.js",
"module": "dist/es/src/index.js",
Expand Down Expand Up @@ -39,7 +39,7 @@
},
"homepage": "https://github.com/microsoft/kiota-typescript#readme",
"dependencies": {
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
"@microsoft/sp-http": "^1.15.2",
"@opentelemetry/api": "^1.7.0",
"tslib": "^2.6.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/http/fetch/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/kiota-http-fetchlibrary",
"version": "1.0.0-preview.40",
"version": "1.0.0-preview.41",
"description": "Kiota request adapter implementation with fetch",
"keywords": [
"Kiota",
Expand Down Expand Up @@ -38,7 +38,7 @@
"test:cjs": "mocha 'dist/cjs/test/common/**/*.js' && mocha 'dist/cjs/test/node/**/*.js'"
},
"dependencies": {
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
"@opentelemetry/api": "^1.7.0",
"guid-typescript": "^1.0.9",
"node-fetch": "^2.7.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/serialization/form/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/kiota-serialization-form",
"version": "1.0.0-preview.30",
"version": "1.0.0-preview.31",
"description": "Implementation of Kiota Serialization interfaces for URI from encoded",
"main": "dist/cjs/src/index.js",
"browser": {
Expand Down Expand Up @@ -39,7 +39,7 @@
},
"homepage": "https://github.com/microsoft/kiota-typescript#readme",
"dependencies": {
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
"guid-typescript": "^1.0.9",
"tslib": "^2.6.2"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/serialization/json/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/kiota-serialization-json",
"version": "1.0.0-preview.41",
"version": "1.0.0-preview.42",
"description": "Implementation of Kiota Serialization interfaces for JSON",
"main": "dist/cjs/src/index.js",
"browser": {
Expand Down Expand Up @@ -39,7 +39,7 @@
},
"homepage": "https://github.com/microsoft/kiota-typescript#readme",
"dependencies": {
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
"guid-typescript": "^1.0.9",
"tslib": "^2.6.2"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/serialization/multipart/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/kiota-serialization-multipart",
"version": "1.0.0-preview.20",
"version": "1.0.0-preview.21",
"description": "Implementation of Kiota Serialization interfaces for multipart form data",
"main": "dist/cjs/src/index.js",
"module": "dist/es/src/index.js",
Expand Down Expand Up @@ -35,12 +35,12 @@
},
"homepage": "https://github.com/microsoft/kiota-typescript#readme",
"dependencies": {
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
"guid-typescript": "^1.0.9",
"tslib": "^2.6.2"
},
"devDependencies": {
"@microsoft/kiota-serialization-json": "^1.0.0-preview.41"
"@microsoft/kiota-serialization-json": "^1.0.0-preview.42"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions packages/serialization/text/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@microsoft/kiota-serialization-text",
"version": "1.0.0-preview.38",
"version": "1.0.0-preview.39",
"description": "Implementation of Kiota Serialization interfaces for text",
"main": "dist/cjs/src/index.js",
"browser": {
Expand Down Expand Up @@ -39,7 +39,7 @@
},
"homepage": "https://github.com/microsoft/kiota-typescript#readme",
"dependencies": {
"@microsoft/kiota-abstractions": "^1.0.0-preview.41",
"@microsoft/kiota-abstractions": "^1.0.0-preview.42",
"guid-typescript": "^1.0.9",
"tslib": "^2.6.2"
},
Expand Down
Loading