@kontent-ai/core-sdk 12.0.0-preview.24 → 12.0.0-preview.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  export const coreSdkInfo = {
2
2
  host: "npmjs.com",
3
- version: "12.0.0-preview.24",
3
+ version: "12.0.0-preview.25",
4
4
  name: "@kontent-ai/core-sdk",
5
5
  };
6
6
  //# sourceMappingURL=core-sdk-info.js.map
@@ -38,7 +38,7 @@ export type HttpResponse<TPayload extends AdapterPayload, TRequestBody extends H
38
38
  readonly adapterResponse: AdapterResponse<TPayload>;
39
39
  }>;
40
40
  export type ExecuteRequestOptions<TRequestBody extends HttpRequestBody> = {
41
- readonly url: URL | string;
41
+ readonly url: string | URL;
42
42
  readonly method: HttpMethod;
43
43
  readonly body?: TRequestBody;
44
44
  readonly requestHeaders?: readonly Header[];
@@ -1,7 +1,3 @@
1
- /**
2
- * Shared query models/types intended to be reused across SDKs (e.g. Sync, Delivery, Management)
3
- * to keep common code and behavior consistent.
4
- */
5
1
  import type { JsonValue } from "../../models/json.models.js";
6
2
  import type { FetchQuery, FetchQueryRequest } from "../sdk-models.js";
7
3
  export declare function createFetchQuery<TResponsePayload extends JsonValue, TMeta, TError>(data: FetchQueryRequest<TResponsePayload, TMeta, TError>): FetchQuery<TResponsePayload, TMeta, TError>;
@@ -1,16 +1,16 @@
1
- import { resolveQuery } from "../resolve-query.js";
1
+ import { prepareQuery, resolveQuery } from "../resolve-query.js";
2
2
  export function createFetchQuery(data) {
3
- const fetchSafe = async () => await resolveQuery({
4
- ...data,
5
- method: "GET",
6
- request: {
7
- ...data.request,
8
- body: null,
9
- },
10
- });
3
+ const getQueryData = () => prepareQuery({ ...data, method: "GET", body: null });
4
+ const fetchSafe = async () => {
5
+ const { success, data: resolvedQueryData, error } = getQueryData();
6
+ if (!success) {
7
+ return { success: false, error };
8
+ }
9
+ return await resolveQuery(resolvedQueryData);
10
+ };
11
11
  return {
12
12
  schema: data.zodSchema,
13
- url: data.request.url,
13
+ getQueryData,
14
14
  fetchSafe,
15
15
  fetch: async () => {
16
16
  const { success, response, error } = await fetchSafe();
@@ -1 +1 @@
1
- {"version":3,"file":"fetch-sdk-query.js","sourceRoot":"","sources":["../../../lib/sdk/queries/fetch-sdk-query.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,MAAM,UAAU,gBAAgB,CAC/B,IAAwD;IAExD,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE,CAC5B,MAAM,YAAY,CAAwC;QACzD,GAAG,IAAI;QACP,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACR,GAAG,IAAI,CAAC,OAAO;YACf,IAAI,EAAE,IAAI;SACV;KACD,CAAC,CAAC;IACJ,OAAO;QACN,MAAM,EAAE,IAAI,CAAC,SAAS;QACtB,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;QACrB,SAAS;QACT,KAAK,EAAE,KAAK,IAAI,EAAE;YACjB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,SAAS,EAAE,CAAC;YACvD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,MAAM,KAAK,CAAC;YACb,CAAC;YACD,OAAO,QAAQ,CAAC;QACjB,CAAC;KACD,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"fetch-sdk-query.js","sourceRoot":"","sources":["../../../lib/sdk/queries/fetch-sdk-query.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGjE,MAAM,UAAU,gBAAgB,CAC/B,IAAwD;IAExD,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,YAAY,CAAwC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACvH,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;QAC5B,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,CAAC;QACnE,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO,EAAE,OAAO,EAAE,KAAc,EAAE,KAAK,EAAE,CAAC;QAC3C,CAAC;QACD,OAAO,MAAM,YAAY,CAAwC,iBAAiB,CAAC,CAAC;IACrF,CAAC,CAAC;IAEF,OAAO;QACN,MAAM,EAAE,IAAI,CAAC,SAAS;QACtB,YAAY;QACZ,SAAS;QACT,KAAK,EAAE,KAAK,IAAI,EAAE;YACjB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,SAAS,EAAE,CAAC;YACvD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,MAAM,KAAK,CAAC;YACb,CAAC;YACD,OAAO,QAAQ,CAAC;QACjB,CAAC;KACD,CAAC;AACH,CAAC"}
@@ -1,4 +1,4 @@
1
1
  import type { HttpRequestBody } from "../../http/http.models.js";
2
2
  import type { JsonValue } from "../../models/json.models.js";
3
3
  import type { MutationQuery, MutationQueryRequest } from "../sdk-models.js";
4
- export declare function createMutationQuery<TResponsePayload extends JsonValue, TRequestBody extends HttpRequestBody, TMeta, TError>(data: MutationQueryRequest<TResponsePayload, TRequestBody, TMeta, TError>): MutationQuery<TResponsePayload, TMeta, TError>;
4
+ export declare function createMutationQuery<TResponsePayload extends JsonValue, TRequestBody extends HttpRequestBody, TMeta, TError>(data: MutationQueryRequest<TResponsePayload, TRequestBody, TMeta, TError>): MutationQuery<TResponsePayload, TRequestBody, TMeta, TError>;
@@ -1,9 +1,16 @@
1
- import { resolveQuery } from "../resolve-query.js";
1
+ import { prepareQuery, resolveQuery } from "../resolve-query.js";
2
2
  export function createMutationQuery(data) {
3
- const executeSafe = async () => await resolveQuery(data);
3
+ const getQueryData = () => prepareQuery(data);
4
+ const executeSafe = async () => {
5
+ const { success, data: resolvedQueryData, error } = getQueryData();
6
+ if (!success) {
7
+ return { success: false, error };
8
+ }
9
+ return await resolveQuery(resolvedQueryData);
10
+ };
4
11
  return {
5
12
  schema: data.zodSchema,
6
- url: data.request.url,
13
+ getQueryData,
7
14
  executeSafe,
8
15
  execute: async () => {
9
16
  const { success, response, error } = await executeSafe();
@@ -1 +1 @@
1
- {"version":3,"file":"mutation-sdk-query.js","sourceRoot":"","sources":["../../../lib/sdk/queries/mutation-sdk-query.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,MAAM,UAAU,mBAAmB,CAClC,IAAyE;IAEzE,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE,CAAC,MAAM,YAAY,CAAgD,IAAI,CAAC,CAAC;IAExG,OAAO;QACN,MAAM,EAAE,IAAI,CAAC,SAAS;QACtB,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;QACrB,WAAW;QACX,OAAO,EAAE,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,WAAW,EAAE,CAAC;YACzD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,MAAM,KAAK,CAAC;YACb,CAAC;YACD,OAAO,QAAQ,CAAC;QACjB,CAAC;KACD,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"mutation-sdk-query.js","sourceRoot":"","sources":["../../../lib/sdk/queries/mutation-sdk-query.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGjE,MAAM,UAAU,mBAAmB,CAClC,IAAyE;IAEzE,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,YAAY,CAAgD,IAAI,CAAC,CAAC;IAC7F,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;QAC9B,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,CAAC;QACnE,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO,EAAE,OAAO,EAAE,KAAc,EAAE,KAAK,EAAE,CAAC;QAC3C,CAAC;QACD,OAAO,MAAM,YAAY,CAAgD,iBAAiB,CAAC,CAAC;IAC7F,CAAC,CAAC;IAEF,OAAO;QACN,MAAM,EAAE,IAAI,CAAC,SAAS;QACtB,YAAY;QACZ,WAAW;QACX,OAAO,EAAE,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,WAAW,EAAE,CAAC;YACzD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,MAAM,KAAK,CAAC;YACb,CAAC;YACD,OAAO,QAAQ,CAAC;QACjB,CAAC;KACD,CAAC;AACH,CAAC"}
@@ -7,16 +7,13 @@ export function createPagedFetchQuery(data) {
7
7
  method: "GET",
8
8
  pageIndex: 0,
9
9
  paginationConfig: config ?? {},
10
- request: {
11
- ...data.request,
12
- body: null,
13
- },
10
+ body: null,
14
11
  };
15
12
  };
16
13
  const fetchQuery = createFetchQuery(data);
17
14
  return {
18
15
  schema: fetchQuery.schema,
19
- url: fetchQuery.url,
16
+ getQueryData: () => fetchQuery.getQueryData(),
20
17
  fetchPage: async () => await fetchQuery.fetch(),
21
18
  fetchPageSafe: async () => await fetchQuery.fetchSafe(),
22
19
  fetchAllPages: async (config) => {
@@ -47,14 +44,11 @@ async function* createPagingQueryIterator(data) {
47
44
  let nextPageState = { hasNextPage: true, pageSource: "firstRequest" };
48
45
  let pageIndex = 0;
49
46
  while (isNextPageAvailable(nextPageState)) {
50
- const urlToUse = nextPageState?.nextPageUrl ?? data.request.url;
47
+ const urlToUse = nextPageState?.nextPageUrl ?? data.url;
51
48
  const { success, response, error } = await createFetchQuery({
52
49
  ...data,
53
- request: {
54
- ...data.request,
55
- url: urlToUse,
56
- continuationToken: nextPageState.continuationToken,
57
- },
50
+ url: urlToUse,
51
+ continuationToken: nextPageState.continuationToken,
58
52
  }).fetchSafe();
59
53
  if (!success) {
60
54
  yield { success: false, error };
@@ -1 +1 @@
1
- {"version":3,"file":"paged-fetch-sdk-query.js","sourceRoot":"","sources":["../../../lib/sdk/queries/paged-fetch-sdk-query.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"paged-fetch-sdk-query.js","sourceRoot":"","sources":["../../../lib/sdk/queries/paged-fetch-sdk-query.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,12 @@
1
- /**
2
- * Shared query models/types intended to be reused across SDKs (e.g. Sync, Delivery, Management)
3
- * to keep common code and behavior consistent.
4
- */
5
1
  import type { HttpRequestBody } from "../http/http.models.js";
2
+ import type { ErrorDetailsFor, KontentSdkError } from "../models/error.models.js";
6
3
  import type { JsonValue } from "../models/json.models.js";
7
- import type { QueryPromiseResult, ResolveQueryData } from "./sdk-models.js";
8
- export declare function resolveQuery<TResponsePayload extends JsonValue, TRequestBody extends HttpRequestBody, TMeta, TError>({ config, request, mapMetadata, zodSchema, sdkInfo, method, abortSignal, mapError, }: ResolveQueryData<TResponsePayload, TRequestBody, TMeta, TError>): QueryPromiseResult<TResponsePayload, TMeta, TError>;
4
+ import { type TryCatchResult } from "../utils/try-catch.utils.js";
5
+ import type { QueryInputData, QueryPromiseResult, ResolvedQueryData } from "./sdk-models.js";
6
+ export declare function prepareQuery<TResponsePayload extends JsonValue, TRequestBody extends HttpRequestBody, TMeta, TError>(data: QueryInputData<TResponsePayload, TRequestBody, TMeta, TError>): TryCatchResult<ResolvedQueryData<TResponsePayload, TRequestBody, TMeta, TError>, TError>;
7
+ export declare function resolveQuery<TResponsePayload extends JsonValue, TRequestBody extends HttpRequestBody, TMeta, TError>({ url, requestHeaders, httpService, body, method, abortSignal, zodSchema, responseValidation, mapError, mapMetadata, }: ResolvedQueryData<TResponsePayload, TRequestBody, TMeta, TError>): QueryPromiseResult<TResponsePayload, TMeta, TError>;
8
+ export declare function resolveUrl<TError>({ url, baseUrl, mapError, }: {
9
+ readonly url: string | URL;
10
+ readonly baseUrl: string | undefined;
11
+ readonly mapError: (error: KontentSdkError<ErrorDetailsFor<"invalidUrl">>) => TError;
12
+ }): TryCatchResult<URL, TError>;
@@ -1,44 +1,48 @@
1
- /**
2
- * Shared query models/types intended to be reused across SDKs (e.g. Sync, Delivery, Management)
3
- * to keep common code and behavior consistent.
4
- */
5
1
  import { getDefaultHttpService } from "../http/http.service.js";
6
2
  import { createSdkError } from "../utils/error.utils.js";
7
3
  import { createAuthorizationHeader, createContinuationHeader, extractContinuationToken, getSdkIdHeader } from "../utils/header.utils.js";
8
4
  import { tryCatch } from "../utils/try-catch.utils.js";
9
- export async function resolveQuery({ config, request, mapMetadata, zodSchema, sdkInfo, method, abortSignal, mapError, }) {
10
- const { success: urlSuccess, data: urlToUse, error: urlError } = getUrlToUse(request.url, config.baseUrl);
11
- if (!urlSuccess) {
12
- return {
13
- success: false,
14
- error: mapError(urlError),
15
- };
5
+ export function prepareQuery(data) {
6
+ const { success, data: resolvedUrl, error } = resolveUrl({ url: data.url, baseUrl: data.config.baseUrl, mapError: data.mapError });
7
+ if (!success) {
8
+ return { success: false, error };
16
9
  }
17
- const { success, response, error } = await getHttpService(config).request({
18
- body: request.body,
19
- url: urlToUse,
10
+ return {
11
+ success: true,
12
+ data: {
13
+ url: resolvedUrl,
14
+ requestHeaders: getCombinedRequestHeaders({
15
+ requestHeaders: data.requestHeaders ?? [],
16
+ continuationToken: data.continuationToken,
17
+ authorizationApiKey: data.authorizationApiKey,
18
+ sdkInfo: data.sdkInfo,
19
+ }),
20
+ httpService: getHttpService(data.config),
21
+ body: data.body,
22
+ method: data.method,
23
+ abortSignal: data.abortSignal,
24
+ zodSchema: data.zodSchema,
25
+ responseValidation: data.config.responseValidation,
26
+ mapError: data.mapError,
27
+ mapMetadata: data.mapMetadata,
28
+ },
29
+ };
30
+ }
31
+ export async function resolveQuery({ url, requestHeaders, httpService, body, method, abortSignal, zodSchema, responseValidation, mapError, mapMetadata, }) {
32
+ const { success, response, error } = await httpService.request({
33
+ body,
34
+ url,
20
35
  method,
21
36
  abortSignal,
22
- requestHeaders: getCombinedRequestHeaders({
23
- requestHeaders: request.requestHeaders ?? [],
24
- continuationToken: request.continuationToken,
25
- authorizationApiKey: request.authorizationApiKey,
26
- sdkInfo,
27
- }),
37
+ requestHeaders,
28
38
  });
29
39
  if (!success) {
30
- return {
31
- success: false,
32
- error: mapError(error),
33
- };
40
+ return { success: false, error: mapError(error) };
34
41
  }
35
- if (config.responseValidation?.enable) {
42
+ if (responseValidation?.enable) {
36
43
  const validationError = await validateResponse({ url: response.adapterResponse.url, response, zodSchema });
37
44
  if (validationError) {
38
- return {
39
- success: false,
40
- error: mapError(validationError.error),
41
- };
45
+ return { success: false, error: mapError(validationError.error) };
42
46
  }
43
47
  }
44
48
  const continuationTokenFromResponse = extractContinuationToken(response.adapterResponse.responseHeaders);
@@ -56,21 +60,37 @@ export async function resolveQuery({ config, request, mapMetadata, zodSchema, sd
56
60
  },
57
61
  };
58
62
  }
59
- function getUrlToUse(url, baseUrl) {
60
- const { success, data: parsedUrl, error } = tryCatch(() => new URL(url));
61
- if (!success) {
63
+ export function resolveUrl({ url, baseUrl, mapError, }) {
64
+ const returnWithBaseUrl = (parsedUrl) => {
65
+ if (!baseUrl) {
66
+ return {
67
+ success: true,
68
+ data: parsedUrl,
69
+ };
70
+ }
71
+ const { success, data: parsedUrlWithBaseUrl, error } = setBaseUrl(parsedUrl, baseUrl);
72
+ if (!success) {
73
+ return {
74
+ success: false,
75
+ error: mapError(error),
76
+ };
77
+ }
62
78
  return {
63
- success: false,
64
- error: createInvalidUrlError(url, error),
79
+ success: true,
80
+ data: parsedUrlWithBaseUrl,
65
81
  };
66
- }
67
- if (baseUrl) {
68
- return setBaseUrl(parsedUrl, baseUrl);
69
- }
70
- return {
71
- success: true,
72
- data: parsedUrl,
73
82
  };
83
+ if (typeof url === "string") {
84
+ const { success, data: parsedUrl, error } = tryCatch(() => new URL(url));
85
+ if (!success) {
86
+ return {
87
+ success: false,
88
+ error: mapError(createInvalidUrlError(url, error)),
89
+ };
90
+ }
91
+ return returnWithBaseUrl(parsedUrl);
92
+ }
93
+ return returnWithBaseUrl(url);
74
94
  }
75
95
  function createInvalidUrlError(invalidUrl, error) {
76
96
  return createSdkError({
@@ -1 +1 @@
1
- {"version":3,"file":"resolve-query.js","sourceRoot":"","sources":["../../lib/sdk/resolve-query.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resolve-query.js","sourceRoot":"","sources":["../../lib/sdk/resolve-query.ts"],"names":[],"mappings":"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"}
@@ -9,7 +9,7 @@ import type { Header, HttpMethod, SDKInfo } from "../models/core.models.js";
9
9
  import type { KontentSdkError } from "../models/error.models.js";
10
10
  import type { JsonValue } from "../models/json.models.js";
11
11
  import type { PickStringLiteral } from "../models/utility.types.js";
12
- import type { Failure, Success } from "../utils/try-catch.utils.js";
12
+ import type { Failure, Success, TryCatchResult } from "../utils/try-catch.utils.js";
13
13
  export type QueryResponseMeta<TMeta> = Pick<AdapterResponse<AdapterPayload>, "status" | "responseHeaders" | "url"> & {
14
14
  readonly continuationToken: string | undefined;
15
15
  } & TMeta;
@@ -45,15 +45,15 @@ export type SdkConfig = {
45
45
  readonly enable: boolean;
46
46
  };
47
47
  };
48
- export type Query<TResponsePayload> = {
48
+ export type Query<TResponsePayload extends JsonValue, TBody extends HttpRequestBody, TMeta, TError> = {
49
49
  readonly schema: z.ZodType<TResponsePayload>;
50
- readonly url: string;
50
+ readonly getQueryData: () => TryCatchResult<ResolvedQueryData<TResponsePayload, TBody, TMeta, TError>, TError>;
51
51
  };
52
- export type FetchQuery<TResponsePayload, TMeta, TError> = Query<TResponsePayload> & {
52
+ export type FetchQuery<TResponsePayload extends JsonValue, TMeta, TError> = Query<TResponsePayload, null, TMeta, TError> & {
53
53
  fetchSafe(): Promise<QueryResult<QueryResponse<TResponsePayload, TMeta>, TError>>;
54
54
  fetch(): Promise<QueryResponse<TResponsePayload, TMeta>>;
55
55
  };
56
- export type PagedFetchQuery<TResponsePayload, TMeta, TError> = Query<TResponsePayload> & {
56
+ export type PagedFetchQuery<TResponsePayload extends JsonValue, TMeta, TError> = Query<TResponsePayload, null, TMeta, TError> & {
57
57
  fetchPageSafe(): Promise<QueryResult<QueryResponse<TResponsePayload, TMeta>, TError>>;
58
58
  fetchPage(): Promise<QueryResponse<TResponsePayload, TMeta>>;
59
59
  fetchAllPagesSafe(config?: PaginationConfig): Promise<SafePagingQueryResult<QueryResponse<TResponsePayload, TMeta>, TError>>;
@@ -61,7 +61,7 @@ export type PagedFetchQuery<TResponsePayload, TMeta, TError> = Query<TResponsePa
61
61
  pagesSafe(config?: PaginationConfig): AsyncGenerator<QueryResult<QueryResponse<TResponsePayload, TMeta>, TError>>;
62
62
  pages(config?: PaginationConfig): AsyncGenerator<QueryResponse<TResponsePayload, TMeta>>;
63
63
  };
64
- export type MutationQuery<TResponsePayload, TMeta, TError> = Query<TResponsePayload> & {
64
+ export type MutationQuery<TResponsePayload extends JsonValue, TRequestBody extends HttpRequestBody, TMeta, TError> = Query<TResponsePayload, TRequestBody, TMeta, TError> & {
65
65
  executeSafe(): Promise<QueryResult<QueryResponse<TResponsePayload, TMeta>, TError>>;
66
66
  execute(): Promise<QueryResponse<TResponsePayload, TMeta>>;
67
67
  };
@@ -108,19 +108,32 @@ export type PagingQueryResult<TResponsePayload> = {
108
108
  readonly lastContinuationToken: string | undefined;
109
109
  };
110
110
  export type QueryPromiseResult<TResponsePayload extends JsonValue, TMeta, TError> = ReturnType<Pick<FetchQuery<TResponsePayload, TMeta, TError>, "fetchSafe">["fetchSafe"]>;
111
- export type FetchQueryRequest<TResponsePayload extends JsonValue, TMeta, TError> = Pick<ResolveQueryData<TResponsePayload, null, TMeta, TError>, "config" | "zodSchema" | "sdkInfo" | "mapMetadata" | "abortSignal" | "mapError"> & {
112
- readonly request: RequestDataWithoutBody;
113
- };
114
- export type MutationQueryRequest<TResponsePayload extends JsonValue, TRequestBody extends HttpRequestBody, TMeta, TError> = Pick<ResolveQueryData<TResponsePayload, TRequestBody, TMeta, TError>, "config" | "zodSchema" | "sdkInfo" | "mapMetadata" | "abortSignal" | "request" | "mapError"> & {
111
+ export type FetchQueryRequest<TResponsePayload extends JsonValue, TMeta, TError> = Pick<QueryInputData<TResponsePayload, null, TMeta, TError>, "config" | "zodSchema" | "sdkInfo" | "mapMetadata" | "abortSignal" | "mapError"> & RequestDataWithoutBody;
112
+ export type MutationQueryRequest<TResponsePayload extends JsonValue, TRequestBody extends HttpRequestBody, TMeta, TError> = Pick<QueryInputData<TResponsePayload, TRequestBody, TMeta, TError>, "config" | "zodSchema" | "sdkInfo" | "mapMetadata" | "abortSignal" | "mapError"> & {
115
113
  readonly method: MutationHttpMethod;
116
- };
117
- export type ResolveQueryData<TResponsePayload extends JsonValue, TRequestBody extends HttpRequestBody, TMeta, TError> = {
114
+ } & RequestData<TRequestBody>;
115
+ export type QueryInputData<TResponsePayload extends JsonValue, TRequestBody extends HttpRequestBody, TMeta, TError> = {
118
116
  readonly method: HttpMethod;
119
- readonly request: RequestData<TRequestBody>;
120
117
  readonly config: SdkConfig;
121
118
  readonly zodSchema: ZodType<TResponsePayload>;
122
119
  readonly sdkInfo: SDKInfo;
123
120
  readonly abortSignal?: AbortSignal | undefined;
121
+ readonly url: string | URL;
122
+ readonly body: TRequestBody;
123
+ readonly requestHeaders?: readonly Header[];
124
+ readonly continuationToken?: string | undefined;
125
+ readonly authorizationApiKey?: string | undefined;
126
+ readonly mapError: (error: KontentSdkError) => TError;
127
+ } & MetadataMapperConfig<TResponsePayload, TRequestBody, TMeta>;
128
+ export type ResolvedQueryData<TResponsePayload extends JsonValue, TRequestBody extends HttpRequestBody, TMeta, TError> = {
129
+ readonly url: URL;
130
+ readonly requestHeaders: readonly Header[];
131
+ readonly httpService: HttpService;
132
+ readonly body: TRequestBody;
133
+ readonly method: HttpMethod;
134
+ readonly abortSignal?: AbortSignal | undefined;
135
+ readonly zodSchema: ZodType<TResponsePayload>;
136
+ readonly responseValidation: SdkConfig["responseValidation"];
124
137
  readonly mapError: (error: KontentSdkError) => TError;
125
138
  } & MetadataMapperConfig<TResponsePayload, TRequestBody, TMeta>;
126
139
  type MetadataMapperConfig<TResponsePayload extends JsonValue, TRequestBody extends HttpRequestBody, TMeta> = {
@@ -131,7 +144,7 @@ type MetadataContextData = {
131
144
  readonly continuationToken: string | undefined;
132
145
  };
133
146
  type RequestData<TRequestBody extends HttpRequestBody> = {
134
- readonly url: string;
147
+ readonly url: string | URL;
135
148
  readonly body: TRequestBody;
136
149
  readonly requestHeaders?: readonly Header[];
137
150
  readonly continuationToken?: string | undefined;
@@ -1,6 +1,8 @@
1
+ import type { HttpRequestBody } from "../http/http.models.js";
2
+ import type { JsonValue } from "../models/json.models.js";
1
3
  import type { PagedFetchQuery, Query } from "./sdk-models.js";
2
4
  /**
3
5
  * Checks if a query is a paging query.
4
6
  *
5
7
  */
6
- export declare function isPagingQuery<T, TBody = null, TError = unknown>(query: Query<T> | PagedFetchQuery<T, TBody, TError>): query is PagedFetchQuery<T, TBody, TError>;
8
+ export declare function isPagingQuery<TResponsePayload extends JsonValue, TBody extends HttpRequestBody, TMeta, TError>(query: Query<TResponsePayload, TBody, TMeta, TError> | PagedFetchQuery<TResponsePayload, TMeta, TError>): query is PagedFetchQuery<TResponsePayload, TMeta, TError>;
@@ -1 +1 @@
1
- {"version":3,"file":"sdk-utils.js","sourceRoot":"","sources":["../../lib/sdk/sdk-utils.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,UAAU,aAAa,CAC5B,KAAmD;IAEnD,OAAO,CACN,WAAW,IAAI,KAAK;QACpB,eAAe,IAAI,KAAK;QACxB,eAAe,IAAI,KAAK;QACxB,mBAAmB,IAAI,KAAK;QAC5B,OAAO,IAAI,KAAK;QAChB,WAAW,IAAI,KAAK,CACpB,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"sdk-utils.js","sourceRoot":"","sources":["../../lib/sdk/sdk-utils.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,MAAM,UAAU,aAAa,CAC5B,KAAuG;IAEvG,OAAO,CACN,WAAW,IAAI,KAAK;QACpB,eAAe,IAAI,KAAK;QACxB,eAAe,IAAI,KAAK;QACxB,mBAAmB,IAAI,KAAK;QAC5B,OAAO,IAAI,KAAK;QAChB,WAAW,IAAI,KAAK,CACpB,CAAC;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kontent-ai/core-sdk",
3
- "version": "12.0.0-preview.24",
3
+ "version": "12.0.0-preview.25",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/kontent-ai/core-sdk-js"
@@ -37,15 +37,15 @@
37
37
  "zod": "^4"
38
38
  },
39
39
  "devDependencies": {
40
- "@biomejs/biome": "2.4.10",
40
+ "@biomejs/biome": "2.4.11",
41
41
  "@kontent-ai/biome-config": "0.7.0",
42
42
  "@kontent-ai/eslint-config": "2.4.1",
43
- "@types/node": "25.5.0",
44
- "@vitest/coverage-v8": "^4.1.2",
45
- "eslint": "10.1.0",
43
+ "@types/node": "25.6.0",
44
+ "@vitest/coverage-v8": "4.1.4",
45
+ "eslint": "10.2.0",
46
46
  "tsx": "4.21.0",
47
47
  "typescript": "6.0.2",
48
- "vitest": "4.1.2"
48
+ "vitest": "4.1.4"
49
49
  },
50
50
  "scripts": {
51
51
  "build": "pnpm run lint && pnpm run clean && tsc --p tsconfig.json && tsc --p tsconfig.build.json && pnpm run update:version",