@scryme/chat 2.85.1 → 2.91.2

package/dist/custom-instance.js

@@ -52,6 +52,9 @@ export var AXIOS_INSTANCE = axios.create({
     withCredentials: true,
 });
 AXIOS_INSTANCE.interceptors.request.use(function (config) {
+    if (!config.baseURL) {
+        config.baseURL = getBaseURL();
+    }
     if (!config.headers) {
         config.headers = {};
     }

package/dist/generated/v3-client.d.ts

@@ -320,6 +320,10 @@ export type V3OAuthControllerGetToken200 = {
     success?: boolean;
     timestamp?: string;
 };
+export type V10GuildsControllerGetMembersParams = {
+    limit: number;
+    after: string;
+};
 export type V10ChannelsControllerGetMessagesParams = {
     limit?: number;
     before?: string;
@@ -1464,9 +1468,9 @@ export declare const useV10GuildsControllerGetChannels: <TData = Awaited<ReturnT
 }) => UseQueryResult<TData, TError> & {
     queryKey: QueryKey;
 };
-export declare const v10GuildsControllerGetMembers: (guildId: string, options?: SecondParameter<typeof customInstance>, signal?: AbortSignal) => Promise<void>;
-export declare const getV10GuildsControllerGetMembersQueryKey: (guildId: string) => readonly [`/api/bot/v10/guilds/${string}/members`];
-export declare const getV10GuildsControllerGetMembersQueryOptions: <TData = Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError = ErrorType<unknown>>(guildId: string, options?: {
+export declare const v10GuildsControllerGetMembers: (guildId: string, params: V10GuildsControllerGetMembersParams, options?: SecondParameter<typeof customInstance>, signal?: AbortSignal) => Promise<void>;
+export declare const getV10GuildsControllerGetMembersQueryKey: (guildId: string, params: V10GuildsControllerGetMembersParams) => readonly [`/api/bot/v10/guilds/${string}/members`, ...V10GuildsControllerGetMembersParams[]];
+export declare const getV10GuildsControllerGetMembersQueryOptions: <TData = Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError = ErrorType<unknown>>(guildId: string, params: V10GuildsControllerGetMembersParams, options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseQueryOptions<Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError, TData> & {
@@ -1474,7 +1478,7 @@ export declare const getV10GuildsControllerGetMembersQueryOptions: <TData = Awai
 };
 export type V10GuildsControllerGetMembersQueryResult = NonNullable<Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>>;
 export type V10GuildsControllerGetMembersQueryError = ErrorType<unknown>;
-export declare const useV10GuildsControllerGetMembers: <TData = Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError = ErrorType<unknown>>(guildId: string, options?: {
+export declare const useV10GuildsControllerGetMembers: <TData = Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError = ErrorType<unknown>>(guildId: string, params: V10GuildsControllerGetMembersParams, options?: {
     query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
 }) => UseQueryResult<TData, TError> & {

package/dist/generated/v3-client.js

@@ -879,25 +879,25 @@ export var useV10GuildsControllerGetChannels = function (guildId, options) {
     query.queryKey = queryOptions.queryKey;
     return query;
 };
-export var v10GuildsControllerGetMembers = function (guildId, options, signal) {
-    return customInstance({ url: "/api/bot/v10/guilds/".concat(guildId, "/members"), method: 'GET', signal: signal
+export var v10GuildsControllerGetMembers = function (guildId, params, options, signal) {
+    return customInstance({ url: "/api/bot/v10/guilds/".concat(guildId, "/members"), method: 'GET', params: params, signal: signal
     }, options);
 };
-export var getV10GuildsControllerGetMembersQueryKey = function (guildId) {
-    return ["/api/bot/v10/guilds/".concat(guildId, "/members")];
+export var getV10GuildsControllerGetMembersQueryKey = function (guildId, params) {
+    return __spreadArray(["/api/bot/v10/guilds/".concat(guildId, "/members")], (params ? [params] : []), true);
 };
-export var getV10GuildsControllerGetMembersQueryOptions = function (guildId, options) {
+export var getV10GuildsControllerGetMembersQueryOptions = function (guildId, params, options) {
     var _a;
     var _b = options !== null && options !== void 0 ? options : {}, queryOptions = _b.query, requestOptions = _b.request;
-    var queryKey = (_a = queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.queryKey) !== null && _a !== void 0 ? _a : getV10GuildsControllerGetMembersQueryKey(guildId);
+    var queryKey = (_a = queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.queryKey) !== null && _a !== void 0 ? _a : getV10GuildsControllerGetMembersQueryKey(guildId, params);
     var queryFn = function (_a) {
         var signal = _a.signal;
-        return v10GuildsControllerGetMembers(guildId, requestOptions, signal);
+        return v10GuildsControllerGetMembers(guildId, params, requestOptions, signal);
     };
     return __assign({ queryKey: queryKey, queryFn: queryFn, enabled: !!(guildId) }, queryOptions);
 };
-export var useV10GuildsControllerGetMembers = function (guildId, options) {
-    var queryOptions = getV10GuildsControllerGetMembersQueryOptions(guildId, options);
+export var useV10GuildsControllerGetMembers = function (guildId, params, options) {
+    var queryOptions = getV10GuildsControllerGetMembersQueryOptions(guildId, params, options);
     var query = useQuery(queryOptions);
     query.queryKey = queryOptions.queryKey;
     return query;

package/dist/generated/v3-server.d.ts

@@ -326,6 +326,10 @@ export type V3OAuthControllerGetToken200 = {
     success?: boolean;
     timestamp?: string;
 };
+export type V10GuildsControllerGetMembersParams = {
+    limit: number;
+    after: string;
+};
 export type V10ChannelsControllerGetMessagesParams = {
     limit?: number;
     before?: string;
@@ -885,7 +889,7 @@ export declare const getSkyrmeChatAPI: () => {
     v10ChannelsControllerDeleteMessage: (id: string, messageId: string, options?: SecondParameter<typeof customInstance>) => Promise<void>;
     v10GuildsControllerGetGuild: (guildId: string, options?: SecondParameter<typeof customInstance>) => Promise<void>;
     v10GuildsControllerGetChannels: (guildId: string, options?: SecondParameter<typeof customInstance>) => Promise<void>;
-    v10GuildsControllerGetMembers: (guildId: string, options?: SecondParameter<typeof customInstance>) => Promise<void>;
+    v10GuildsControllerGetMembers: (guildId: string, params: V10GuildsControllerGetMembersParams, options?: SecondParameter<typeof customInstance>) => Promise<void>;
     v10GuildsControllerGetRoles: (guildId: string, options?: SecondParameter<typeof customInstance>) => Promise<void>;
     v10GuildsControllerAddMemberRole: (guildId: string, userId: string, roleId: string, options?: SecondParameter<typeof customInstance>) => Promise<void>;
     v10GuildsControllerRemoveMemberRole: (guildId: string, userId: string, roleId: string, options?: SecondParameter<typeof customInstance>) => Promise<void>;

package/dist/generated/v3-server.js

@@ -313,8 +313,9 @@ export var getSkyrmeChatAPI = function () {
     var v10GuildsControllerGetChannels = function (guildId, options) {
         return customInstance({ url: "/api/bot/v10/guilds/".concat(guildId, "/channels"), method: 'GET' }, options);
     };
-    var v10GuildsControllerGetMembers = function (guildId, options) {
-        return customInstance({ url: "/api/bot/v10/guilds/".concat(guildId, "/members"), method: 'GET' }, options);
+    var v10GuildsControllerGetMembers = function (guildId, params, options) {
+        return customInstance({ url: "/api/bot/v10/guilds/".concat(guildId, "/members"), method: 'GET', params: params
+        }, options);
     };
     var v10GuildsControllerGetRoles = function (guildId, options) {
         return customInstance({ url: "/api/bot/v10/guilds/".concat(guildId, "/roles"), method: 'GET' }, options);

package/dist/sdk.js

@@ -217,28 +217,32 @@ var ScrymeSDK = /** @class */ (function () {
                                 args[_i] = arguments[_i];
                             }
                             return __awaiter(_this, void 0, void 0, function () {
-                                var config, arity, newArgs, userOptions;
+                                var config, arity, cleanArgs, lastArg, isLastArgOptions, userOptions;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0: return [4 /*yield*/, this.getRequestConfig()];
                                         case 1:
                                             config = _a.sent();
                                             arity = originalMethod.length;
-                                            newArgs = __spreadArray([], args, true);
-                                            // Orval generated functions accept `options` as their last parameter.
-                                            // If the user provided options, we merge them with our default request config.
-                                            if (args.length >= arity && typeof args[args.length - 1] === 'object') {
-                                                userOptions = args[args.length - 1];
-                                                newArgs[args.length - 1] = __assign(__assign({}, userOptions), { baseURL: config.baseURL, headers: __assign(__assign({}, config.headers), userOptions === null || userOptions === void 0 ? void 0 : userOptions.headers) });
+                                            cleanArgs = __spreadArray([], args, true);
+                                            while (cleanArgs.length > 0 && cleanArgs[cleanArgs.length - 1] === undefined) {
+                                                cleanArgs.pop();
+                                            }
+                                            lastArg = cleanArgs.length > 0 ? cleanArgs[cleanArgs.length - 1] : undefined;
+                                            isLastArgOptions = cleanArgs.length === arity &&
+                                                typeof lastArg === 'object' &&
+                                                lastArg !== null;
+                                            if (isLastArgOptions) {
+                                                userOptions = lastArg;
+                                                cleanArgs[cleanArgs.length - 1] = __assign(__assign({}, userOptions), { baseURL: config.baseURL, headers: __assign(__assign({}, config.headers), userOptions.headers) });
                                             }
                                             else {
-                                                // Otherwise, we pad missing parameters with undefined and append our config as the options object.
-                                                while (newArgs.length < arity - 1) {
-                                                    newArgs.push(undefined);
+                                                while (cleanArgs.length < arity - 1) {
+                                                    cleanArgs.push(undefined);
                                                 }
-                                                newArgs.push(config);
+                                                cleanArgs.push(config);
                                             }
-                                            return [2 /*return*/, originalMethod.apply(void 0, newArgs)];
+                                            return [2 /*return*/, originalMethod.apply(void 0, cleanArgs)];
                                     }
                                 });
                             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scryme/chat",
-  "version": "2.85.1",
+  "version": "2.91.2",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -45,7 +45,7 @@
   },
   "scripts": {
     "generate:ts": "orval",
-    "generate:rust": "openapi-generator-cli generate -i ../../apps/api/openapi.json -g rust -o rust --skip-validate-spec --additional-properties=packageName=scryme-sdk,packageVersion=2.81.5,useSingleRequestParameter=true",
+    "generate:rust": "node -e \"const pkg=require('./package.json'); require('child_process').execSync('openapi-generator-cli generate -i ../../apps/api/openapi.json -g rust -o rust --skip-validate-spec --additional-properties=packageName=scryme-sdk,packageVersion=' + pkg.version + ',useSingleRequestParameter=true', {stdio: 'inherit'})\"",
     "generate": "pnpm generate:ts && pnpm generate:rust",
     "build": "tsc",
     "type-check": "tsc --noEmit",

package/src/__tests__/sdk.test.ts

@@ -328,7 +328,7 @@ describe('ScrymeSDK', () => {
   });
 
   describe('Nested DX Helper Namespaces', () => {
-    it('should support workspace namespace', async () => {
+    it('should support workspace namespace and correctly propagate baseURL and options when provisioning/creating', async () => {
       const sdk = new ScrymeSDK({
         baseURL: 'https://api.test.com',
         token: 'active-token',
@@ -336,9 +336,17 @@ describe('ScrymeSDK', () => {
 
       const listRes = await sdk.workspace.list() as any;
       expect(listRes.success).toBe(true);
+      expect(listRes.options.baseURL).toBe('https://api.test.com');
 
       const getRes = await sdk.workspace.get('acme') as any;
       expect(getRes.data.workspace.slug).toBe('acme');
+      expect(getRes.options.baseURL).toBe('https://api.test.com');
+
+      const provDto = { name: 'Acme', ownerEmail: 'a@acme.com', slug: 'acme' };
+      const createRes = await sdk.workspace.create(provDto) as any;
+      expect(createRes.success).toBe(true);
+      expect(createRes.options.baseURL).toBe('https://api.test.com');
+      expect(createRes.options.headers.Authorization).toBe('Bearer active-token');
     });
 
     it('should support workspace channels namespace', async () => {
@@ -467,6 +475,8 @@ describe('ScrymeSDK', () => {
       // m2m.workspace.provision
       const provRes = await sdk.m2m.workspace.provision({ name: 'Acme', ownerEmail: 'a@acme.com', slug: 'acme' }) as any;
       expect(provRes.data.name).toBe('Acme');
+      expect(provRes.options.baseURL).toBe('https://api.test.com');
+      expect(provRes.options.headers.Authorization).toBe('Bearer active-token');
 
       // m2m.member.add
       const addMem = await sdk.m2m.member.add('acme', { email: 'user@acme.com', role: 'admin' }) as any;

package/src/custom-instance.ts

@@ -56,6 +56,10 @@ export const AXIOS_INSTANCE = axios.create({
 });
 
 AXIOS_INSTANCE.interceptors.request.use(config => {
+  if (!config.baseURL) {
+    config.baseURL = getBaseURL();
+  }
+
   if (!config.headers) {
     config.headers = {} as any;
   }

package/src/generated/v3-client.ts

@@ -401,6 +401,11 @@ export type V3OAuthControllerGetToken200 = {
   timestamp?: string;
 };
 
+export type V10GuildsControllerGetMembersParams = {
+limit: number;
+after: string;
+};
+
 export type V10ChannelsControllerGetMessagesParams = {
 limit?: number;
 before?: string;
@@ -2741,32 +2746,36 @@ export const useV10GuildsControllerGetChannels = <TData = Awaited<ReturnType<typ
 
 export const v10GuildsControllerGetMembers = (
     guildId: string,
+    params: V10GuildsControllerGetMembersParams,
  options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
 ) => {
 
 
       return customInstance<void>(
-      {url: `/api/bot/v10/guilds/${guildId}/members`, method: 'GET', signal
+      {url: `/api/bot/v10/guilds/${guildId}/members`, method: 'GET',
+        params, signal
     },
       options);
     }
 
 
-export const getV10GuildsControllerGetMembersQueryKey = (guildId: string,) => {
-    return [`/api/bot/v10/guilds/${guildId}/members`] as const;
+export const getV10GuildsControllerGetMembersQueryKey = (guildId: string,
+    params: V10GuildsControllerGetMembersParams,) => {
+    return [`/api/bot/v10/guilds/${guildId}/members`, ...(params ? [params]: [])] as const;
     }
 
 
-export const getV10GuildsControllerGetMembersQueryOptions = <TData = Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError = ErrorType<unknown>>(guildId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+export const getV10GuildsControllerGetMembersQueryOptions = <TData = Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError = ErrorType<unknown>>(guildId: string,
+    params: V10GuildsControllerGetMembersParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 ) => {
 
 const {query: queryOptions, request: requestOptions} = options ?? {};
 
-  const queryKey =  queryOptions?.queryKey ?? getV10GuildsControllerGetMembersQueryKey(guildId);
+  const queryKey =  queryOptions?.queryKey ?? getV10GuildsControllerGetMembersQueryKey(guildId,params);
 
 
 
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>> = ({ signal }) => v10GuildsControllerGetMembers(guildId, requestOptions, signal);
+    const queryFn: QueryFunction<Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>> = ({ signal }) => v10GuildsControllerGetMembers(guildId,params, requestOptions, signal);
 
 
 
@@ -2779,11 +2788,12 @@ export type V10GuildsControllerGetMembersQueryResult = NonNullable<Awaited<Retur
 export type V10GuildsControllerGetMembersQueryError = ErrorType<unknown>
 
 export const useV10GuildsControllerGetMembers = <TData = Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError = ErrorType<unknown>>(
- guildId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+ guildId: string,
+    params: V10GuildsControllerGetMembersParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof v10GuildsControllerGetMembers>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
 
   ):  UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
 
-  const queryOptions = getV10GuildsControllerGetMembersQueryOptions(guildId,options)
+  const queryOptions = getV10GuildsControllerGetMembersQueryOptions(guildId,params,options)
 
   const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
 

package/src/generated/v3-server.ts

@@ -388,6 +388,11 @@ export type V3OAuthControllerGetToken200 = {
   timestamp?: string;
 };
 
+export type V10GuildsControllerGetMembersParams = {
+limit: number;
+after: string;
+};
+
 export type V10ChannelsControllerGetMessagesParams = {
 limit?: number;
 before?: string;
@@ -1366,9 +1371,11 @@ const v10GuildsControllerGetChannels = (
 
 const v10GuildsControllerGetMembers = (
     guildId: string,
+    params: V10GuildsControllerGetMembersParams,
  options?: SecondParameter<typeof customInstance>,) => {
       return customInstance<void>(
-      {url: `/api/bot/v10/guilds/${guildId}/members`, method: 'GET'
+      {url: `/api/bot/v10/guilds/${guildId}/members`, method: 'GET',
+        params
     },
       options);
     }

package/src/sdk.ts

@@ -751,29 +751,37 @@ export class ScrymeSDK {
           return async (...args: unknown[]) => {
             const config = await this.getRequestConfig();
             const arity = originalMethod.length;
-            const newArgs = [...args];
 
-            // Orval generated functions accept `options` as their last parameter.
-            // If the user provided options, we merge them with our default request config.
-            if (args.length >= arity && typeof args[args.length - 1] === 'object') {
-              const userOptions = args[args.length - 1] as AxiosRequestConfig;
-              newArgs[args.length - 1] = {
+            // Strip trailing undefined values to accurately check user-provided parameters
+            const cleanArgs = [...args];
+            while (cleanArgs.length > 0 && cleanArgs[cleanArgs.length - 1] === undefined) {
+              cleanArgs.pop();
+            }
+
+            const lastArg = cleanArgs.length > 0 ? cleanArgs[cleanArgs.length - 1] : undefined;
+            const isLastArgOptions =
+              cleanArgs.length === arity &&
+              typeof lastArg === 'object' &&
+              lastArg !== null;
+
+            if (isLastArgOptions) {
+              const userOptions = lastArg as AxiosRequestConfig;
+              cleanArgs[cleanArgs.length - 1] = {
                 ...userOptions,
                 baseURL: config.baseURL,
                 headers: {
                   ...config.headers,
-                  ...userOptions?.headers,
+                  ...userOptions.headers,
                 },
               };
             } else {
-              // Otherwise, we pad missing parameters with undefined and append our config as the options object.
-              while (newArgs.length < arity - 1) {
-                newArgs.push(undefined);
+              while (cleanArgs.length < arity - 1) {
+                cleanArgs.push(undefined);
               }
-              newArgs.push(config);
+              cleanArgs.push(config);
             }
 
-            return (originalMethod as (...a: unknown[]) => unknown)(...newArgs);
+            return (originalMethod as (...a: unknown[]) => unknown)(...cleanArgs);
           };
         }
         return originalMethod;