@wix/sdk 1.15.7 → 1.15.8

package/build/wixClient.d.ts

@@ -3,7 +3,6 @@ import { EmptyObject } from 'type-fest/source/empty-object.js';
 import type { GraphQLFormattedError } from 'graphql';
 import { EventHandlersClient } from './event-handlers-modules.js';
 import { ServicePluginsClient } from './service-plugin-modules.js';
-import { WebMethodClient, WebMethodModules } from './web-method-modules.js';
 export type ContextType = 'global' | 'module';
 type Headers = Record<string, string>;
 /**
@@ -47,13 +46,11 @@ export type WixClient<H extends Host<any> | undefined = undefined, Z extends Aut
     }>;
     webhooks: EventHandlersClient;
     servicePlugins: ServicePluginsClient;
-    webMethods: WebMethodClient;
 } & BuildDescriptors<T, H>;
 export declare function createClient<H extends Host<any> | undefined = undefined, Z extends AuthenticationStrategy<H> = AuthenticationStrategy<H>, T extends Descriptors = EmptyObject>(config: {
     modules?: H extends Host<any> ? AssertHostMatches<T, H> : T;
     auth?: Z;
     headers?: Headers;
     host?: H;
-    webMethods?: WebMethodModules;
 }): WixClient<H, Z, T>;
 export {};

package/build/wixClient.js

@@ -9,7 +9,6 @@ import { buildRESTDescriptor } from './rest-modules.js';
 import { eventHandlersModules, isEventHandlerModule, } from './event-handlers-modules.js';
 import { isServicePluginModule, servicePluginsModules, } from './service-plugin-modules.js';
 import { runWithoutContext } from '@wix/sdk-runtime/context';
-import { isWebMethodModules, webMethodModules, } from './web-method-modules.js';
 export function createClient(config) {
     const _headers = config.headers || { Authorization: '' };
     const authStrategy = config.auth ||
@@ -37,7 +36,6 @@ export function createClient(config) {
     };
     const { client: servicePluginsClient, initModule: initServicePluginModule } = servicePluginsModules(authStrategy);
     const { client: eventHandlersClient, initModule: initEventHandlerModule } = eventHandlersModules(authStrategy);
-    const { client: webMethodClient, initModule } = webMethodModules();
     const boundFetch = async (url, options) => {
         const authHeaders = await boundGetAuthHeaders();
         const defaultContentTypeHeader = getDefaultContentHeader(options);
@@ -65,9 +63,6 @@ export function createClient(config) {
         else if (isHostModule(modules) && config.host) {
             return buildHostModule(modules, config.host);
         }
-        else if (isWebMethodModules(modules)) {
-            return initModule(modules);
-        }
         else if (typeof modules === 'function') {
             // The generated namespaces all have the error classes on them and
             // a class is also a function, so we need to explicitly ignore these
@@ -167,7 +162,6 @@ export function createClient(config) {
             return { data: data ?? {}, errors };
         },
         webhooks: eventHandlersClient,
-        webMethods: webMethodClient,
         servicePlugins: servicePluginsClient,
     };
 }

package/cjs/build/wixClient.d.ts

@@ -3,7 +3,6 @@ import { EmptyObject } from 'type-fest/source/empty-object.js';
 import type { GraphQLFormattedError } from 'graphql';
 import { EventHandlersClient } from './event-handlers-modules.js';
 import { ServicePluginsClient } from './service-plugin-modules.js';
-import { WebMethodClient, WebMethodModules } from './web-method-modules.js';
 export type ContextType = 'global' | 'module';
 type Headers = Record<string, string>;
 /**
@@ -47,13 +46,11 @@ export type WixClient<H extends Host<any> | undefined = undefined, Z extends Aut
     }>;
     webhooks: EventHandlersClient;
     servicePlugins: ServicePluginsClient;
-    webMethods: WebMethodClient;
 } & BuildDescriptors<T, H>;
 export declare function createClient<H extends Host<any> | undefined = undefined, Z extends AuthenticationStrategy<H> = AuthenticationStrategy<H>, T extends Descriptors = EmptyObject>(config: {
     modules?: H extends Host<any> ? AssertHostMatches<T, H> : T;
     auth?: Z;
     headers?: Headers;
     host?: H;
-    webMethods?: WebMethodModules;
 }): WixClient<H, Z, T>;
 export {};

package/cjs/build/wixClient.js

@@ -12,7 +12,6 @@ const rest_modules_js_1 = require("./rest-modules.js");
 const event_handlers_modules_js_1 = require("./event-handlers-modules.js");
 const service_plugin_modules_js_1 = require("./service-plugin-modules.js");
 const context_1 = require("@wix/sdk-runtime/context");
-const web_method_modules_js_1 = require("./web-method-modules.js");
 function createClient(config) {
     const _headers = config.headers || { Authorization: '' };
     const authStrategy = config.auth ||
@@ -40,7 +39,6 @@ function createClient(config) {
     };
     const { client: servicePluginsClient, initModule: initServicePluginModule } = (0, service_plugin_modules_js_1.servicePluginsModules)(authStrategy);
     const { client: eventHandlersClient, initModule: initEventHandlerModule } = (0, event_handlers_modules_js_1.eventHandlersModules)(authStrategy);
-    const { client: webMethodClient, initModule } = (0, web_method_modules_js_1.webMethodModules)();
     const boundFetch = async (url, options) => {
         const authHeaders = await boundGetAuthHeaders();
         const defaultContentTypeHeader = (0, helpers_js_1.getDefaultContentHeader)(options);
@@ -68,9 +66,6 @@ function createClient(config) {
         else if ((0, host_modules_js_1.isHostModule)(modules) && config.host) {
             return (0, host_modules_js_1.buildHostModule)(modules, config.host);
         }
-        else if ((0, web_method_modules_js_1.isWebMethodModules)(modules)) {
-            return initModule(modules);
-        }
         else if (typeof modules === 'function') {
             // The generated namespaces all have the error classes on them and
             // a class is also a function, so we need to explicitly ignore these
@@ -170,7 +165,6 @@ function createClient(config) {
             return { data: data ?? {}, errors };
         },
         webhooks: eventHandlersClient,
-        webMethods: webMethodClient,
         servicePlugins: servicePluginsClient,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/sdk",
-  "version": "1.15.7",
+  "version": "1.15.8",
   "license": "UNLICENSED",
   "author": {
     "name": "Ronny Ringel",
@@ -38,10 +38,6 @@
     "./auth/velo": {
       "import": "./build/auth/VeloAuthStrategy.js",
       "require": "./cjs/build/auth/VeloAuthStrategy.js"
-    },
-    "./web-methods": {
-      "import": "./build/web-methods.js",
-      "require": "./cjs/build/web-methods.js"
     }
   },
   "sideEffects": false,
@@ -67,35 +63,34 @@
     "*.{js,ts}": "yarn lint"
   },
   "dependencies": {
-    "@wix/identity": "^1.0.98",
-    "@wix/image-kit": "^1.98.0",
-    "@wix/redirects": "^1.0.67",
+    "@wix/identity": "^1.0.104",
+    "@wix/image-kit": "^1.102.0",
+    "@wix/redirects": "^1.0.70",
     "@wix/sdk-context": "^0.0.1",
-    "@wix/sdk-runtime": "0.3.27",
-    "@wix/sdk-types": "^1.12.7",
+    "@wix/sdk-runtime": "0.3.30",
+    "@wix/sdk-types": "^1.13.1",
     "jose": "^5.9.6",
-    "serialize-error": "^8.1.0",
-    "type-fest": "^4.30.2"
+    "type-fest": "^4.32.0"
   },
   "optionalDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "devDependencies": {
     "@types/is-ci": "^3.0.4",
-    "@types/node": "^20.17.10",
+    "@types/node": "^20.17.12",
     "@vitest/ui": "^1.6.0",
-    "@wix/ecom": "^1.0.868",
-    "@wix/events": "^1.0.362",
+    "@wix/ecom": "^1.0.886",
+    "@wix/events": "^1.0.382",
     "@wix/metro": "^1.0.93",
-    "@wix/metro-runtime": "^1.1879.0",
-    "@wix/sdk-runtime": "0.3.27",
+    "@wix/metro-runtime": "^1.1891.0",
+    "@wix/sdk-runtime": "0.3.30",
     "eslint": "^8.57.1",
     "eslint-config-sdk": "0.0.0",
     "graphql": "^16.8.0",
     "is-ci": "^3.0.1",
     "jsdom": "^22.1.0",
     "msw": "^2.7.0",
-    "typescript": "^5.7.2",
+    "typescript": "^5.7.3",
     "vitest": "^1.6.0",
     "vitest-teamcity-reporter": "^0.3.1"
   },
@@ -122,5 +117,5 @@
   "wallaby": {
     "autoDetect": true
   },
-  "falconPackageHash": "1dff796e2f80d78d9e5087ee2a1ef6e462efd17cc6327c4c41c57736"
+  "falconPackageHash": "9905c8eae05242da532c991302bf08cdff3f1136a3daf62eb54b0500"
 }

package/build/web-method-modules.d.ts

@@ -1,23 +0,0 @@
-export declare const isWebMethodModules: (val: any) => val is WebMethodModules;
-export type WebMethodClient = {
-    processRequest(request: Request, devMode?: boolean): Promise<Response>;
-};
-declare enum Permissions {
-    Anyone = "anyone",
-    Admin = "admin",
-    SiteMember = "site-member"
-}
-type WebMethod<T extends unknown[], R> = {
-    handler: (...args: T) => R;
-    permission: Permissions;
-    __type: 'web-method-module';
-};
-type WebMethodModule = Record<string, WebMethod<unknown[], unknown>>;
-export type WebMethodModules = Record<string, () => Promise<WebMethodModule>>;
-export declare function webMethodModules(): {
-    initModule(webMethodModule: WebMethodModules): void;
-    client: {
-        processRequest(request: Request, devMode?: boolean | undefined): Promise<Response>;
-    };
-};
-export {};

package/build/web-method-modules.js

@@ -1,100 +0,0 @@
-import { serializeError } from 'serialize-error';
-import { getTokenInfo } from './get-token-info.js';
-export const isWebMethodModules = (val) => val.__type === 'web-method-module';
-var Permissions;
-(function (Permissions) {
-    Permissions["Anyone"] = "anyone";
-    Permissions["Admin"] = "admin";
-    Permissions["SiteMember"] = "site-member";
-})(Permissions || (Permissions = {}));
-async function checkPermission(request, permission) {
-    const accessToken = request.headers.get('Authorization');
-    if (!accessToken) {
-        throw new Error('Request is missing authentication data');
-    }
-    const { subjectType } = await getTokenInfo(accessToken);
-    switch (permission) {
-        case Permissions.Anyone: {
-            if (subjectType !== 'VISITOR' &&
-                subjectType !== 'MEMBER' &&
-                subjectType !== 'USER') {
-                throw new Error('Insufficient permissions');
-            }
-            break;
-        }
-        case Permissions.SiteMember: {
-            if (subjectType !== 'MEMBER' && subjectType !== 'USER') {
-                throw new Error('Insufficient permissions');
-            }
-            break;
-        }
-        case Permissions.Admin: {
-            if (subjectType !== 'USER') {
-                throw new Error('Insufficient permissions');
-            }
-            break;
-        }
-    }
-}
-const urlRegex = /\/_webMethods\/(.+\..+)\/(.+\..+)/;
-// /_webMethods/backend/my-module.web.js/multiply.ajax
-function extractUrlParts(url) {
-    const parts = url.match(urlRegex);
-    if (parts) {
-        return [parts[1], parts[2].replace('.ajax', '')];
-    }
-}
-function isRequestBodyValid(body) {
-    return !!body && typeof body === 'object' && Array.isArray(body);
-}
-const productionErrorMessage = 'Error: Unable to handle the request. Contact the site administrator or view site monitoring logs for more information.';
-export function webMethodModules() {
-    const webMethods = {};
-    const client = {
-        async processRequest(request, devMode = false) {
-            const urlParts = extractUrlParts(request.url);
-            if (!urlParts) {
-                return new Response('invalid request', { status: 400 });
-            }
-            const [file, method] = urlParts;
-            const body = (await request.json());
-            if (!isRequestBodyValid(body)) {
-                return new Response('invalid request', { status: 400 });
-            }
-            const loadWebMethodFile = webMethods[`/${file}`];
-            try {
-                if (!loadWebMethodFile) {
-                    throw new Error(`Error loading web module ${file}: Cannot find module '${file}'`);
-                }
-                const webMethodFile = await loadWebMethodFile();
-                const webMethod = webMethodFile[method];
-                if (!webMethod) {
-                    throw new Error(`Error loading function from web module ${file}: function '${method}' not found`);
-                }
-                await checkPermission(request, webMethod.permission);
-                return Response.json({
-                    result: await webMethod.handler(...body),
-                });
-            }
-            catch (error) {
-                const serializedError = serializeError(error, { maxDepth: 1 });
-                return Response.json({
-                    result: devMode || !(error instanceof Error)
-                        ? serializedError
-                        : {
-                            ...serializedError,
-                            message: productionErrorMessage,
-                            stack: productionErrorMessage,
-                        },
-                    exception: true,
-                });
-            }
-        },
-    };
-    return {
-        initModule(webMethodModule) {
-            Object.assign(webMethods, webMethodModule);
-        },
-        client,
-    };
-}

package/build/web-methods.d.ts

@@ -1,8 +0,0 @@
-type Options = {
-    baseURL: string;
-    filename: string;
-    method: string;
-    args: unknown[];
-};
-export declare const callWebMethod: (({ baseURL, filename, method, args }: Options) => Promise<any>) & ((restModuleOpts: import("@wix/sdk-types").HttpClient) => ({ baseURL, filename, method, args }: Options) => Promise<any>);
-export {};

package/build/web-methods.js

@@ -1,15 +0,0 @@
-import { createRESTModule } from '@wix/sdk-runtime/rest-modules';
-export const callWebMethod = createRESTModule((restModuleOpts) => {
-    return async ({ baseURL, filename, method, args }) => {
-        const response = await restModuleOpts.fetchWithAuth(`${baseURL}/_webMethods/${filename}/${method}.ajax`, {
-            body: JSON.stringify(args),
-            method: 'POST',
-        });
-        const json = await response.json();
-        // request failed
-        if (json.exception === true) {
-            throw json.result;
-        }
-        return json.result;
-    };
-});

package/cjs/build/web-method-modules.d.ts

@@ -1,23 +0,0 @@
-export declare const isWebMethodModules: (val: any) => val is WebMethodModules;
-export type WebMethodClient = {
-    processRequest(request: Request, devMode?: boolean): Promise<Response>;
-};
-declare enum Permissions {
-    Anyone = "anyone",
-    Admin = "admin",
-    SiteMember = "site-member"
-}
-type WebMethod<T extends unknown[], R> = {
-    handler: (...args: T) => R;
-    permission: Permissions;
-    __type: 'web-method-module';
-};
-type WebMethodModule = Record<string, WebMethod<unknown[], unknown>>;
-export type WebMethodModules = Record<string, () => Promise<WebMethodModule>>;
-export declare function webMethodModules(): {
-    initModule(webMethodModule: WebMethodModules): void;
-    client: {
-        processRequest(request: Request, devMode?: boolean | undefined): Promise<Response>;
-    };
-};
-export {};

package/cjs/build/web-method-modules.js

@@ -1,105 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWebMethodModules = void 0;
-exports.webMethodModules = webMethodModules;
-const serialize_error_1 = require("serialize-error");
-const get_token_info_js_1 = require("./get-token-info.js");
-const isWebMethodModules = (val) => val.__type === 'web-method-module';
-exports.isWebMethodModules = isWebMethodModules;
-var Permissions;
-(function (Permissions) {
-    Permissions["Anyone"] = "anyone";
-    Permissions["Admin"] = "admin";
-    Permissions["SiteMember"] = "site-member";
-})(Permissions || (Permissions = {}));
-async function checkPermission(request, permission) {
-    const accessToken = request.headers.get('Authorization');
-    if (!accessToken) {
-        throw new Error('Request is missing authentication data');
-    }
-    const { subjectType } = await (0, get_token_info_js_1.getTokenInfo)(accessToken);
-    switch (permission) {
-        case Permissions.Anyone: {
-            if (subjectType !== 'VISITOR' &&
-                subjectType !== 'MEMBER' &&
-                subjectType !== 'USER') {
-                throw new Error('Insufficient permissions');
-            }
-            break;
-        }
-        case Permissions.SiteMember: {
-            if (subjectType !== 'MEMBER' && subjectType !== 'USER') {
-                throw new Error('Insufficient permissions');
-            }
-            break;
-        }
-        case Permissions.Admin: {
-            if (subjectType !== 'USER') {
-                throw new Error('Insufficient permissions');
-            }
-            break;
-        }
-    }
-}
-const urlRegex = /\/_webMethods\/(.+\..+)\/(.+\..+)/;
-// /_webMethods/backend/my-module.web.js/multiply.ajax
-function extractUrlParts(url) {
-    const parts = url.match(urlRegex);
-    if (parts) {
-        return [parts[1], parts[2].replace('.ajax', '')];
-    }
-}
-function isRequestBodyValid(body) {
-    return !!body && typeof body === 'object' && Array.isArray(body);
-}
-const productionErrorMessage = 'Error: Unable to handle the request. Contact the site administrator or view site monitoring logs for more information.';
-function webMethodModules() {
-    const webMethods = {};
-    const client = {
-        async processRequest(request, devMode = false) {
-            const urlParts = extractUrlParts(request.url);
-            if (!urlParts) {
-                return new Response('invalid request', { status: 400 });
-            }
-            const [file, method] = urlParts;
-            const body = (await request.json());
-            if (!isRequestBodyValid(body)) {
-                return new Response('invalid request', { status: 400 });
-            }
-            const loadWebMethodFile = webMethods[`/${file}`];
-            try {
-                if (!loadWebMethodFile) {
-                    throw new Error(`Error loading web module ${file}: Cannot find module '${file}'`);
-                }
-                const webMethodFile = await loadWebMethodFile();
-                const webMethod = webMethodFile[method];
-                if (!webMethod) {
-                    throw new Error(`Error loading function from web module ${file}: function '${method}' not found`);
-                }
-                await checkPermission(request, webMethod.permission);
-                return Response.json({
-                    result: await webMethod.handler(...body),
-                });
-            }
-            catch (error) {
-                const serializedError = (0, serialize_error_1.serializeError)(error, { maxDepth: 1 });
-                return Response.json({
-                    result: devMode || !(error instanceof Error)
-                        ? serializedError
-                        : {
-                            ...serializedError,
-                            message: productionErrorMessage,
-                            stack: productionErrorMessage,
-                        },
-                    exception: true,
-                });
-            }
-        },
-    };
-    return {
-        initModule(webMethodModule) {
-            Object.assign(webMethods, webMethodModule);
-        },
-        client,
-    };
-}

package/cjs/build/web-methods.d.ts

@@ -1,8 +0,0 @@
-type Options = {
-    baseURL: string;
-    filename: string;
-    method: string;
-    args: unknown[];
-};
-export declare const callWebMethod: (({ baseURL, filename, method, args }: Options) => Promise<any>) & ((restModuleOpts: import("@wix/sdk-types").HttpClient) => ({ baseURL, filename, method, args }: Options) => Promise<any>);
-export {};

package/cjs/build/web-methods.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.callWebMethod = void 0;
-const rest_modules_1 = require("@wix/sdk-runtime/rest-modules");
-exports.callWebMethod = (0, rest_modules_1.createRESTModule)((restModuleOpts) => {
-    return async ({ baseURL, filename, method, args }) => {
-        const response = await restModuleOpts.fetchWithAuth(`${baseURL}/_webMethods/${filename}/${method}.ajax`, {
-            body: JSON.stringify(args),
-            method: 'POST',
-        });
-        const json = await response.json();
-        // request failed
-        if (json.exception === true) {
-            throw json.result;
-        }
-        return json.result;
-    };
-});