@wix/sdk 1.12.4 → 1.12.5

package/build/context.d.ts

@@ -1,6 +1,5 @@
-import { WixClient } from './wixClient.js';
 import { RESTFunctionDescriptor } from '@wix/sdk-types';
 export declare function elevate<T extends RESTFunctionDescriptor>(restModule: T): T;
-export declare const fetchWithAuth: WixClient['fetchWithAuth'];
-export declare const graphql: WixClient['graphql'];
+export declare const fetchWithAuth: typeof fetch & ((restModuleOpts: import("@wix/sdk-types").HttpClient) => typeof fetch);
+export { graphql } from './graphql.js';
 export { setGlobalWixContext } from './wix-context.js';

package/build/context.js

@@ -1,20 +1,9 @@
-import { resolveContext } from '@wix/sdk-runtime/context';
 import { createRESTModule } from '@wix/sdk-runtime/rest-modules';
 export function elevate(restModule) {
     return createRESTModule(restModule, true);
 }
-export const fetchWithAuth = async (...args) => {
-    const context = resolveContext();
-    if (!context) {
-        throw new Error('Wix context is not available. Make sure to initialize the Wix context before using SDK modules');
-    }
-    return context.fetchWithAuth(...args);
-};
-export const graphql = async (...args) => {
-    const context = resolveContext();
-    if (!context) {
-        throw new Error('Wix context is not available. Make sure to initialize the Wix context before using SDK modules');
-    }
-    return context.graphql(...args);
-};
+export const fetchWithAuth = createRESTModule((restModuleOpts) => {
+    return ((url, options) => restModuleOpts.fetchWithAuth(url, options));
+});
+export { graphql } from './graphql.js';
 export { setGlobalWixContext } from './wix-context.js';

package/build/graphql.d.ts

@@ -0,0 +1,28 @@
+import { DocumentNode, GraphQLFormattedError } from 'graphql';
+export type TypedQueryInput<Result = {
+    [key: string]: any;
+}, Variables = {
+    [key: string]: any;
+}> = {
+    /**
+     * Type to support `@graphql-typed-document-node/core`
+     * @internal
+     */
+    __apiType?: (variables: Variables) => Result;
+    /**
+     * Type to support `TypedQueryDocumentNode` from `graphql`
+     * @internal
+     */
+    __ensureTypesOfVariablesAndResultMatching?: (variables: Variables) => Result;
+};
+export declare const graphql: ((query: string | String | DocumentNode | TypedQueryInput<unknown, any>, variables?: any, opts?: {
+    apiVersion: string;
+}) => Promise<{
+    data: unknown;
+    errors?: GraphQLFormattedError[] | undefined;
+}>) & ((restModuleOpts: import("@wix/sdk-types").HttpClient) => (query: string | String | DocumentNode | TypedQueryInput<unknown, any>, variables?: any, opts?: {
+    apiVersion: string;
+}) => Promise<{
+    data: unknown;
+    errors?: GraphQLFormattedError[] | undefined;
+}>);

package/build/graphql.js

@@ -0,0 +1,21 @@
+import { createRESTModule } from '@wix/sdk-runtime/rest-modules';
+import { FetchErrorResponse } from './fetch-error.js';
+export const graphql = createRESTModule((restModuleOpts) => {
+    // eslint-disable-next-line @typescript-eslint/no-shadow
+    return async function graphql(query, variables, opts = {
+        apiVersion: 'alpha',
+    }) {
+        const res = await restModuleOpts.wixAPIFetch(`/graphql/${opts.apiVersion}`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({ query, variables }),
+        });
+        if (res.status !== 200) {
+            throw new FetchErrorResponse(`GraphQL request failed with status ${res.status}`, res);
+        }
+        const { data, errors } = await res.json();
+        return { data: data ?? {}, errors };
+    };
+});

package/build/rest-modules.d.ts

@@ -3,4 +3,4 @@ export type RESTModuleOptions = {
     HTTPHost?: string;
 };
 export declare const getDefaultDomain: (_method: string, _url: string) => string;
-export declare function buildRESTDescriptor<T extends RESTFunctionDescriptor>(origFunc: T, publicMetadata: PublicMetadata, boundFetch: (url: string | URL, init?: RequestInit) => Promise<Response>, options?: RESTModuleOptions): BuildRESTFunction<T>;
+export declare function buildRESTDescriptor<T extends RESTFunctionDescriptor>(origFunc: T, publicMetadata: PublicMetadata, boundFetch: typeof fetch, wixAPIFetch: (relativeUrl: string, options: RequestInit) => Promise<Response>, options?: RESTModuleOptions): BuildRESTFunction<T>;

package/build/rest-modules.js

@@ -1,7 +1,7 @@
 import { biHeaderGenerator } from './bi/biHeaderGenerator.js';
 import { API_URL } from './common.js';
 export const getDefaultDomain = (_method, _url) => API_URL;
-export function buildRESTDescriptor(origFunc, publicMetadata, boundFetch, options) {
+export function buildRESTDescriptor(origFunc, publicMetadata, boundFetch, wixAPIFetch, options) {
     return origFunc({
         request: async (factory) => {
             const requestOptions = factory({ host: options?.HTTPHost || API_URL });
@@ -56,6 +56,7 @@ export function buildRESTDescriptor(origFunc, publicMetadata, boundFetch, option
             }
         },
         fetchWithAuth: boundFetch,
+        wixAPIFetch,
     });
 }
 const errorBuilder = (code, description, details, data) => {

package/build/wixClient.d.ts

@@ -29,6 +29,9 @@ type TypedQueryInput<Result = {
 export type WixClient<H extends Host<any> | undefined = undefined, Z extends AuthenticationStrategy<H> = AuthenticationStrategy<H>, T extends Descriptors = {}> = {
     setHeaders(headers: Headers): void;
     auth: Omit<Z, 'getAuthHeaders'> & BoundAuthenticationStrategy;
+    /**
+     * @deprecated Use `fetchWithAuth` instead
+     */
     fetch(relativeUrl: string, options: RequestInit): Promise<Response>;
     fetchWithAuth: typeof fetch;
     use<R extends Descriptors = EmptyObject>(modules: H extends Host<any> ? AssertHostMatches<R, H> : R): BuildDescriptors<R, H>;

package/build/wixClient.js

@@ -65,7 +65,12 @@ export function createClient(config) {
                     options: ambassadorModuleOptions(),
                 }
                 : { module: modules, options: undefined };
-            return buildRESTDescriptor(module, metadata ?? {}, boundFetch, options);
+            return buildRESTDescriptor(module, metadata ?? {}, boundFetch, (relativeUrl, fetchOptions) => {
+                const finalUrl = new URL(relativeUrl, `https://${API_URL}`);
+                finalUrl.host = API_URL;
+                finalUrl.protocol = 'https';
+                return boundFetch(finalUrl.toString(), fetchOptions);
+            }, options);
         }
         else if (isObject(modules)) {
             return Object.fromEntries(Object.entries(modules).map(([key, value]) => {

package/cjs/build/context.d.ts

@@ -1,6 +1,5 @@
-import { WixClient } from './wixClient.js';
 import { RESTFunctionDescriptor } from '@wix/sdk-types';
 export declare function elevate<T extends RESTFunctionDescriptor>(restModule: T): T;
-export declare const fetchWithAuth: WixClient['fetchWithAuth'];
-export declare const graphql: WixClient['graphql'];
+export declare const fetchWithAuth: typeof fetch & ((restModuleOpts: import("@wix/sdk-types").HttpClient) => typeof fetch);
+export { graphql } from './graphql.js';
 export { setGlobalWixContext } from './wix-context.js';

package/cjs/build/context.js

@@ -1,27 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setGlobalWixContext = exports.graphql = exports.fetchWithAuth = exports.elevate = void 0;
-const context_1 = require("@wix/sdk-runtime/context");
 const rest_modules_1 = require("@wix/sdk-runtime/rest-modules");
 function elevate(restModule) {
     return (0, rest_modules_1.createRESTModule)(restModule, true);
 }
 exports.elevate = elevate;
-const fetchWithAuth = async (...args) => {
-    const context = (0, context_1.resolveContext)();
-    if (!context) {
-        throw new Error('Wix context is not available. Make sure to initialize the Wix context before using SDK modules');
-    }
-    return context.fetchWithAuth(...args);
-};
-exports.fetchWithAuth = fetchWithAuth;
-const graphql = async (...args) => {
-    const context = (0, context_1.resolveContext)();
-    if (!context) {
-        throw new Error('Wix context is not available. Make sure to initialize the Wix context before using SDK modules');
-    }
-    return context.graphql(...args);
-};
-exports.graphql = graphql;
+exports.fetchWithAuth = (0, rest_modules_1.createRESTModule)((restModuleOpts) => {
+    return ((url, options) => restModuleOpts.fetchWithAuth(url, options));
+});
+var graphql_js_1 = require("./graphql.js");
+Object.defineProperty(exports, "graphql", { enumerable: true, get: function () { return graphql_js_1.graphql; } });
 var wix_context_js_1 = require("./wix-context.js");
 Object.defineProperty(exports, "setGlobalWixContext", { enumerable: true, get: function () { return wix_context_js_1.setGlobalWixContext; } });

package/cjs/build/graphql.d.ts

@@ -0,0 +1,28 @@
+import { DocumentNode, GraphQLFormattedError } from 'graphql';
+export type TypedQueryInput<Result = {
+    [key: string]: any;
+}, Variables = {
+    [key: string]: any;
+}> = {
+    /**
+     * Type to support `@graphql-typed-document-node/core`
+     * @internal
+     */
+    __apiType?: (variables: Variables) => Result;
+    /**
+     * Type to support `TypedQueryDocumentNode` from `graphql`
+     * @internal
+     */
+    __ensureTypesOfVariablesAndResultMatching?: (variables: Variables) => Result;
+};
+export declare const graphql: ((query: string | String | DocumentNode | TypedQueryInput<unknown, any>, variables?: any, opts?: {
+    apiVersion: string;
+}) => Promise<{
+    data: unknown;
+    errors?: GraphQLFormattedError[] | undefined;
+}>) & ((restModuleOpts: import("@wix/sdk-types").HttpClient) => (query: string | String | DocumentNode | TypedQueryInput<unknown, any>, variables?: any, opts?: {
+    apiVersion: string;
+}) => Promise<{
+    data: unknown;
+    errors?: GraphQLFormattedError[] | undefined;
+}>);

package/cjs/build/graphql.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.graphql = void 0;
+const rest_modules_1 = require("@wix/sdk-runtime/rest-modules");
+const fetch_error_js_1 = require("./fetch-error.js");
+exports.graphql = (0, rest_modules_1.createRESTModule)((restModuleOpts) => {
+    // eslint-disable-next-line @typescript-eslint/no-shadow
+    return async function graphql(query, variables, opts = {
+        apiVersion: 'alpha',
+    }) {
+        const res = await restModuleOpts.wixAPIFetch(`/graphql/${opts.apiVersion}`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({ query, variables }),
+        });
+        if (res.status !== 200) {
+            throw new fetch_error_js_1.FetchErrorResponse(`GraphQL request failed with status ${res.status}`, res);
+        }
+        const { data, errors } = await res.json();
+        return { data: data ?? {}, errors };
+    };
+});

package/cjs/build/rest-modules.d.ts

@@ -3,4 +3,4 @@ export type RESTModuleOptions = {
     HTTPHost?: string;
 };
 export declare const getDefaultDomain: (_method: string, _url: string) => string;
-export declare function buildRESTDescriptor<T extends RESTFunctionDescriptor>(origFunc: T, publicMetadata: PublicMetadata, boundFetch: (url: string | URL, init?: RequestInit) => Promise<Response>, options?: RESTModuleOptions): BuildRESTFunction<T>;
+export declare function buildRESTDescriptor<T extends RESTFunctionDescriptor>(origFunc: T, publicMetadata: PublicMetadata, boundFetch: typeof fetch, wixAPIFetch: (relativeUrl: string, options: RequestInit) => Promise<Response>, options?: RESTModuleOptions): BuildRESTFunction<T>;

package/cjs/build/rest-modules.js

@@ -5,7 +5,7 @@ const biHeaderGenerator_js_1 = require("./bi/biHeaderGenerator.js");
 const common_js_1 = require("./common.js");
 const getDefaultDomain = (_method, _url) => common_js_1.API_URL;
 exports.getDefaultDomain = getDefaultDomain;
-function buildRESTDescriptor(origFunc, publicMetadata, boundFetch, options) {
+function buildRESTDescriptor(origFunc, publicMetadata, boundFetch, wixAPIFetch, options) {
     return origFunc({
         request: async (factory) => {
             const requestOptions = factory({ host: options?.HTTPHost || common_js_1.API_URL });
@@ -60,6 +60,7 @@ function buildRESTDescriptor(origFunc, publicMetadata, boundFetch, options) {
             }
         },
         fetchWithAuth: boundFetch,
+        wixAPIFetch,
     });
 }
 exports.buildRESTDescriptor = buildRESTDescriptor;

package/cjs/build/wixClient.d.ts

@@ -29,6 +29,9 @@ type TypedQueryInput<Result = {
 export type WixClient<H extends Host<any> | undefined = undefined, Z extends AuthenticationStrategy<H> = AuthenticationStrategy<H>, T extends Descriptors = {}> = {
     setHeaders(headers: Headers): void;
     auth: Omit<Z, 'getAuthHeaders'> & BoundAuthenticationStrategy;
+    /**
+     * @deprecated Use `fetchWithAuth` instead
+     */
     fetch(relativeUrl: string, options: RequestInit): Promise<Response>;
     fetchWithAuth: typeof fetch;
     use<R extends Descriptors = EmptyObject>(modules: H extends Host<any> ? AssertHostMatches<R, H> : R): BuildDescriptors<R, H>;

package/cjs/build/wixClient.js

@@ -68,7 +68,12 @@ function createClient(config) {
                     options: (0, ambassador_modules_js_1.ambassadorModuleOptions)(),
                 }
                 : { module: modules, options: undefined };
-            return (0, rest_modules_js_1.buildRESTDescriptor)(module, metadata ?? {}, boundFetch, options);
+            return (0, rest_modules_js_1.buildRESTDescriptor)(module, metadata ?? {}, boundFetch, (relativeUrl, fetchOptions) => {
+                const finalUrl = new URL(relativeUrl, `https://${common_js_1.API_URL}`);
+                finalUrl.host = common_js_1.API_URL;
+                finalUrl.protocol = 'https';
+                return boundFetch(finalUrl.toString(), fetchOptions);
+            }, options);
         }
         else if ((0, helpers_js_1.isObject)(modules)) {
             return Object.fromEntries(Object.entries(modules).map(([key, value]) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/sdk",
-  "version": "1.12.4",
+  "version": "1.12.5",
   "license": "UNLICENSED",
   "author": {
     "name": "Ronny Ringel",
@@ -68,8 +68,8 @@
     "@wix/image-kit": "^1.73.0",
     "@wix/redirects": "^1.0.41",
     "@wix/sdk-context": "^0.0.1",
-    "@wix/sdk-runtime": "0.3.9",
-    "@wix/sdk-types": "^1.9.1",
+    "@wix/sdk-runtime": "0.3.10",
+    "@wix/sdk-types": "^1.9.2",
     "crypto-js": "^4.2.0",
     "jose": "^5.2.1",
     "pkce-challenge": "^3.1.0",
@@ -88,7 +88,7 @@
     "@wix/events": "^1.0.179",
     "@wix/metro": "^1.0.73",
     "@wix/metro-runtime": "^1.1677.0",
-    "@wix/sdk-runtime": "0.3.9",
+    "@wix/sdk-runtime": "0.3.10",
     "eslint": "^8.56.0",
     "eslint-config-sdk": "0.0.0",
     "graphql": "^16.8.0",
@@ -122,5 +122,5 @@
   "wallaby": {
     "autoDetect": true
   },
-  "falconPackageHash": "426069986cecb4df61b6a603251e92b202e9969f72e82615ba31ee78"
+  "falconPackageHash": "9b0f25d6117aad528752157be42ad190b1e1bac5458a8dac29e8e34b"
 }