@api-client/core 0.5.4 → 0.5.7

package/src/runtime/store/FilesSdk.ts

@@ -1,17 +1,20 @@
-import { JsonPatch } from 'json8-patch';
-import { SdkBase, E_RESPONSE_STATUS, E_RESPONSE_NO_VALUE, E_INVALID_JSON, E_RESPONSE_UNKNOWN, E_RESPONSE_LOCATION } from './SdkBase.js';
+import WebSocketNode from 'ws';
+import { Patch } from '@api-client/json';
+import { SdkBase, E_RESPONSE_STATUS, E_RESPONSE_NO_VALUE, E_INVALID_JSON, E_RESPONSE_UNKNOWN, E_RESPONSE_LOCATION, ISdkRequestOptions } from './SdkBase.js';
 import { RouteBuilder } from './RouteBuilder.js';
 import { IListOptions, IListResponse } from '../../models/Backend.js';
-import { IWorkspace, Workspace, Kind as WorkspaceKind } from '../../models/Workspace.js';
 import { AccessOperation } from '../../models/store/Permission.js';
 import { IUser } from '../../models/store/User.js';
 import { IFile } from '../../models/store/File.js';
-import WebSocketNode from 'ws';
+import { Kind as ProjectKind } from '../../models/Project.js';
+import { Kind as WorkspaceKind } from '../../models/Workspace.js';
+import { IHttpProject } from '../../models/HttpProject.js';
+import { SdkError } from './Errors.js';
 
 export interface IFileCreateOptions {
   /**
-   * Optional parent space id.
-   * When set it creates a space under this parent.
+   * Optional parent file id.
+   * When set it creates a file under this parent.
    */
   parent?: string;
 }
@@ -19,18 +22,27 @@ export interface IFileCreateOptions {
 export class FilesSdk extends SdkBase {
   /**
    * Lists files (spaces, projects, etc) in the store.
+   * 
+   * @param kinds the list of kinds to list. Spaces are always included.
    * @param options Optional query options.
+   * @param request Optional request options.
    */
-  async list(options?: IListOptions): Promise<IListResponse<IFile>> {
-    const { token } = this.sdk;
+  async list(kinds: (typeof ProjectKind | typeof WorkspaceKind)[], options?: IListOptions, request: ISdkRequestOptions = {}): Promise<IListResponse<IFile>> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.files());
     this.sdk.appendListOptions(url, options);
+    kinds.forEach(k => url.searchParams.append('kind', k));
     const result = await this.sdk.http.get(url.toString(), { token });
-    this.inspectCommonStatusCodes(result.status);
-    const E_PREFIX = 'Unable to list spaces. ';
+    this.inspectCommonStatusCodes(result.status, result.body);
+    const E_PREFIX = 'Unable to list files. ';
     if (result.status !== 200) {
       this.logInvalidResponse(result);
-      throw new Error(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`);
+      let e = this.createGenericSdkError(result.body)
+      if (!e) {
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
+        e.response = result.body;
+      }
+      throw e;
     }
     if (!result.body) {
       throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
@@ -48,21 +60,29 @@ export class FilesSdk extends SdkBase {
   }
 
   /**
-   * Creates a workspace in the store.
-   * @param space The workspace definition.
-   * @returns The key of the creates space.
+   * Creates a file in the store.
+   * 
+   * @param file The definition of a file that extends the IFile interface or one of the supported by the server schemas.
+   * @param opts Optional options when creating a file
+   * @param request Optional request options.
+   * @returns The key of the creates file.
    */
-  async create(space: IWorkspace | Workspace, opts: IFileCreateOptions = {}): Promise<string> {
-    const { token } = this.sdk;
+  async create(file: IFile | IHttpProject, opts: IFileCreateOptions = {}, request: ISdkRequestOptions = {}): Promise<string> {
+    const token = request.token || this.sdk.token;
     const path = opts.parent ? RouteBuilder.file(opts.parent) : RouteBuilder.files();
     const url = this.sdk.getUrl(path);
-    const body = JSON.stringify(space);
+    const body = JSON.stringify(file);
     const result = await this.sdk.http.post(url.toString(), { token, body });
-    this.inspectCommonStatusCodes(result.status);
-    const E_PREFIX = 'Unable to create a user space. ';
+    this.inspectCommonStatusCodes(result.status, result.body);
+    const E_PREFIX = 'Unable to create a file. ';
     if (result.status !== 204) {
       this.logInvalidResponse(result);
-      throw new Error(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`);
+      let e = this.createGenericSdkError(result.body)
+      if (!e) {
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
+        e.response = result.body;
+      }
+      throw e;
     }
     const location = result.headers.get('location');
     if (!location) {
@@ -76,45 +96,53 @@ export class FilesSdk extends SdkBase {
    * Reads file metadata from the store.
    * 
    * @param key The file key
+   * @param request Optional request options.
    * @returns THe file metadata
    */
-  read(key: string, media: false): Promise<IFile>;
+  read(key: string, media: false, request?: ISdkRequestOptions): Promise<IFile>;
   /**
    * Reads file contents from the store.
    * 
    * @param key The file key
+   * @param request Optional request options.
    * @returns THe file contents
    */
-  read(key: string, media: true): Promise<unknown>;
+  read(key: string, media: true, request?: ISdkRequestOptions): Promise<unknown>;
 
   /**
    * Reads a user file definition from the store.
    * @param key The file key
    * @param media When true it reads file contents rather than metadata.
+   * @param request Optional request options.
    */
-  async read(key: string, media?: boolean): Promise<IFile | unknown> {
-    const { token } = this.sdk;
+  async read(key: string, media?: boolean, request: ISdkRequestOptions = {}): Promise<IFile | unknown> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.file(key));
     if (media) {
       url.searchParams.set('alt', 'media');
     }
     const result = await this.sdk.http.get(url.toString(), { token });
-    this.inspectCommonStatusCodes(result.status);
-    const E_PREFIX = 'Unable to read a user space. ';
+    this.inspectCommonStatusCodes(result.status, result.body);
+    const E_PREFIX = 'Unable to read a file. ';
     if (result.status !== 200) {
       this.logInvalidResponse(result);
-      throw new Error(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`);
+      let e = this.createGenericSdkError(result.body)
+      if (!e) {
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
+        e.response = result.body;
+      }
+      throw e;
     }
     if (!result.body) {
       throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
     }
-    let data: IWorkspace;
+    let data: IFile;
     try {
       data = JSON.parse(result.body);
     } catch (e) {
       throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`);
     }
-    if (data.kind !== WorkspaceKind) {
+    if (!data.kind) {
       throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`);
     }
     return data;
@@ -125,36 +153,44 @@ export class FilesSdk extends SdkBase {
    * 
    * @param key The file key
    * @param value The patch to apply.
+   * @param request Optional request options.
    */
-  patch(key: string, value: JsonPatch, media: false): Promise<JsonPatch>;
+  patch(key: string, value: Patch.JsonPatch, media: false, request?: ISdkRequestOptions): Promise<Patch.JsonPatch>;
 
   /**
    * Patches file's content in the store.
    * 
    * @param key The file key
    * @param value The patch to apply.
+   * @param request Optional request options.
    */
-  patch(key: string, value: JsonPatch, media: true): Promise<JsonPatch>;
+  patch(key: string, value: Patch.JsonPatch, media: true, request?: ISdkRequestOptions): Promise<Patch.JsonPatch>;
 
   /**
-   * Patches a user space in the store.
-   * @param key The key of the user space to patch
+   * Patches a file in the store.
+   * @param key The key of the file to patch
    * @param value The JSON patch to be processed.
-   * @returns The JSON patch to revert the change using the `json8-patch` library
+   * @param request Optional request options.
+   * @returns The JSON patch to revert the change using the `@api-client/json` library
    */
-  async patch(key: string, value: JsonPatch, media?: boolean): Promise<JsonPatch> {
-    const { token } = this.sdk;
+  async patch(key: string, value: Patch.JsonPatch, media?: boolean, request: ISdkRequestOptions = {}): Promise<Patch.JsonPatch> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.file(key));
     if (media) {
       url.searchParams.set('alt', 'media');
     }
     const body = JSON.stringify(value);
     const result = await this.sdk.http.patch(url.toString(), { token, body });
-    this.inspectCommonStatusCodes(result.status);
-    const E_PREFIX = 'Unable to patch a user space. ';
+    this.inspectCommonStatusCodes(result.status, result.body);
+    const E_PREFIX = 'Unable to patch a file. ';
     if (result.status !== 200) {
       this.logInvalidResponse(result);
-      throw new Error(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`);
+      let e = this.createGenericSdkError(result.body)
+      if (!e) {
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
+        e.response = result.body;
+      }
+      throw e;
     }
     if (!result.body) {
       throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
@@ -168,59 +204,77 @@ export class FilesSdk extends SdkBase {
     if (!data.revert) {
       throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`);
     }
-    return data.revert as JsonPatch;
+    return data.revert as Patch.JsonPatch;
   }
 
   /**
-   * Deletes the space in the store.
+   * Deletes the file in the store.
    * 
-   * @param key The key of the space to delete.
+   * @param key The key of the file to delete.
+   * @param request Optional request options.
    */
-  async delete(key: string): Promise<void> {
-    const { token } = this.sdk;
+  async delete(key: string, request: ISdkRequestOptions = {}): Promise<void> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.file(key));
     const result = await this.sdk.http.delete(url.toString(), { token });
-    this.inspectCommonStatusCodes(result.status);
-    const E_PREFIX = 'Unable to delete a user space. ';
+    this.inspectCommonStatusCodes(result.status, result.body);
+    const E_PREFIX = 'Unable to delete a file. ';
     if (result.status !== 204) {
       this.logInvalidResponse(result);
-      throw new Error(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`);
+      let e = this.createGenericSdkError(result.body)
+      if (!e) {
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
+        e.response = result.body;
+      }
+      throw e;
     }
   }
 
   /**
-   * Updates the sharing options of the space.
+   * Updates the sharing options of the file.
    * 
-   * @param key The user space key
-   * @param value The patch operation on the space's ACL
+   * @param key The file key
+   * @param value The patch operation on the file's ACL
+   * @param request Optional request options.
    */
-  async patchUsers(key: string, value: AccessOperation[]): Promise<void> {
-    const { token } = this.sdk;
+  async patchUsers(key: string, value: AccessOperation[], request: ISdkRequestOptions = {}): Promise<void> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.fileUsers(key));
     const body = JSON.stringify(value);
     const result = await this.sdk.http.patch(url.toString(), { token, body });
-    this.inspectCommonStatusCodes(result.status);
-    const E_PREFIX = 'Unable to patch a user space. ';
+    this.inspectCommonStatusCodes(result.status, result.body);
+    const E_PREFIX = 'Unable to patch a file. ';
     if (result.status !== 204) {
       this.logInvalidResponse(result);
-      throw new Error(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`);
+      let e = this.createGenericSdkError(result.body)
+      if (!e) {
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
+        e.response = result.body;
+      }
+      throw e;
     }
   }
 
   /**
-   * Lists uses having access to the user space.
+   * Lists uses having access to the file.
    * 
-   * @param key The user space key
+   * @param key The file key
+   * @param request Optional request options.
    */
-  async listUsers(key: string): Promise<IListResponse<IUser>> {
-    const { token } = this.sdk;
+  async listUsers(key: string, request: ISdkRequestOptions = {}): Promise<IListResponse<IUser>> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.fileUsers(key));
     const result = await this.sdk.http.get(url.toString(), { token });
-    this.inspectCommonStatusCodes(result.status);
-    const E_PREFIX = 'Unable to list users in the space. ';
+    this.inspectCommonStatusCodes(result.status, result.body);
+    const E_PREFIX = 'Unable to list users in the file. ';
     if (result.status !== 200) {
       this.logInvalidResponse(result);
-      throw new Error(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`);
+      let e = this.createGenericSdkError(result.body)
+      if (!e) {
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
+        e.response = result.body;
+      }
+      throw e;
     }
     if (!result.body) {
       throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
@@ -238,10 +292,11 @@ export class FilesSdk extends SdkBase {
   }
 
   /**
-   * Creates a WS client that listens to the spaces events.
+   * Creates a WS client that listens to the files events.
+   * @param request Optional request options.
    */
-  async observeFiles(): Promise<WebSocketNode | WebSocket> {
-    const { token } = this.sdk;
+  async observeFiles(request: ISdkRequestOptions = {}): Promise<WebSocketNode | WebSocket> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.files());
     return this.sdk.ws.createAndConnect(url.toString(), token);
   }

package/src/runtime/store/HistorySdk.ts

@@ -1,6 +1,6 @@
-import { SdkBase, E_RESPONSE_STATUS, E_RESPONSE_NO_VALUE, E_INVALID_JSON, E_RESPONSE_UNKNOWN, E_RESPONSE_LOCATION } from './SdkBase.js';
+import { SdkBase, E_RESPONSE_STATUS, E_RESPONSE_NO_VALUE, E_INVALID_JSON, E_RESPONSE_UNKNOWN, E_RESPONSE_LOCATION, ISdkRequestOptions } from './SdkBase.js';
 import { RouteBuilder } from './RouteBuilder.js';
-import { IListResponse, HistoryListOptions } from '../../models/Backend.js';
+import { IListResponse, HistoryListOptions, IHistoryRequestListOptions } from '../../models/Backend.js';
 import { IHttpHistory, IHttpHistoryBulkAdd, Kind as HttpHistoryKind } from '../../models/HttpHistory.js';
 
 export class HistorySdk extends SdkBase {
@@ -14,10 +14,11 @@ export class HistorySdk extends SdkBase {
    * Note, history objects cannot be updated. They can only be created or deleted.
    * 
    * @param history The history to create
+   * @param request Optional request options.
    * @returns The key of the created history.
    */
-  async create(history: IHttpHistory): Promise<string> {
-    const { token } = this.sdk;
+  async create(history: IHttpHistory, request: ISdkRequestOptions = {}): Promise<string> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.history());
     const body = JSON.stringify(history);
     const result = await this.sdk.http.post(url.toString(), { token, body });
@@ -39,9 +40,10 @@ export class HistorySdk extends SdkBase {
    * Creates a multiple history objects in a batch operation.
    * 
    * @param info The bulk create info object.
+   * @param request Optional request options.
    */
-  async createBulk(info: IHttpHistoryBulkAdd): Promise<string[]> {
-    const { token } = this.sdk;
+  async createBulk(info: IHttpHistoryBulkAdd, request: ISdkRequestOptions = {}): Promise<string[]> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.historyBatchCreate());
     const body = JSON.stringify(info);
     const result = await this.sdk.http.post(url.toString(), { token, body });
@@ -56,7 +58,7 @@ export class HistorySdk extends SdkBase {
     }
     let data: string[];
     try {
-      data = JSON.parse(result.body);
+      data = JSON.parse(result.body).data;
     } catch (e) {
       throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`);
     }
@@ -67,11 +69,12 @@ export class HistorySdk extends SdkBase {
    * Lists the history.
    * 
    * @param options Optional query options.
+   * @param request Optional request options.
    */
-  async list(options: HistoryListOptions): Promise<IListResponse> {
-    const { token } = this.sdk;
+  async list(options: HistoryListOptions, request: ISdkRequestOptions = {}): Promise<IListResponse<IHttpHistory>> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.history());
-    this.sdk.appendListOptions(url, options);
+    this.appendHistoryListParameters(url, options);
     const result = await this.sdk.http.get(url.toString(), { token });
     this.inspectCommonStatusCodes(result.status);
     const E_PREFIX = 'Unable to list history. ';
@@ -82,7 +85,7 @@ export class HistorySdk extends SdkBase {
     if (!result.body) {
       throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
     }
-    let data: IListResponse;
+    let data: IListResponse<IHttpHistory>;
     try {
       data = JSON.parse(result.body);
     } catch (e) {
@@ -94,24 +97,45 @@ export class HistorySdk extends SdkBase {
     return data;
   }
 
+  appendHistoryListParameters(url: URL, options: HistoryListOptions): void {
+    this.sdk.appendListOptions(url, options);
+    const { searchParams } = url;
+    if (options.type) {
+      searchParams.set('type', options.type);
+    }
+    const projectOptions = options as IHistoryRequestListOptions;
+    if (projectOptions.id) {
+      searchParams.set('id', projectOptions.id);
+    }
+    if (projectOptions.user) {
+      searchParams.set('user', 'true');
+    }
+    if (projectOptions.project) {
+      searchParams.set('project', projectOptions.project);
+    }
+  }
+
   /**
    * Deletes a history object form the store.
    * 
    * @param key The key returned by the store when created the history. Also available via the `key` property on the history object.
+   * @param request Optional request options.
    */
-  delete(key: string): Promise<void>;
+  delete(key: string, request?: ISdkRequestOptions): Promise<void>;
   /**
    * Deletes a list of history objects in a batch operation.
    * 
    * @param keys The keys returned by the store when created the history. Also available via the `key` property on the history object.
+   * @param request Optional request options.
    */
-  delete(keys: string[]): Promise<void>;
+  delete(keys: string[], request?: ISdkRequestOptions): Promise<void>;
   /**
    * Deletes a history or a list of history objects from the store.
    * @param key A key or a list of keys.
+   * @param request Optional request options.
    */
-  async delete(key: string | string[]): Promise<void> {
-    const { token } = this.sdk;
+  async delete(key: string | string[], request: ISdkRequestOptions = {}): Promise<void> {
+    const token = request.token || this.sdk.token;
     const isArray = Array.isArray(key);
     const path = isArray ? RouteBuilder.historyBatchDelete() : RouteBuilder.historyItem(key);
     const url = this.sdk.getUrl(path);
@@ -128,10 +152,11 @@ export class HistorySdk extends SdkBase {
   /**
    * Reads a history definition from the store.
    * @param key The history key
+   * @param request Optional request options.
    * @returns The history object
    */
-  async read(key: string): Promise<IHttpHistory> {
-    const { token } = this.sdk;
+  async read(key: string, request: ISdkRequestOptions = {}): Promise<IHttpHistory> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.historyItem(key));
     const result = await this.sdk.http.get(url.toString(), { token });
     this.inspectCommonStatusCodes(result.status);

package/src/runtime/store/Sdk.ts

@@ -51,6 +51,11 @@ export abstract class Sdk {
    */
   shared = new SharedSdk(this);
 
+  /**
+   * When set it limits log output to minimum.
+   */
+  silent = false;
+
 
   [baseUriSymbol] = '';
 

package/src/runtime/store/SdkBase.ts

@@ -1,16 +1,20 @@
 import { Headers } from '../../lib/headers/Headers.js';
 import { Sdk } from './Sdk.js';
+import { SdkError, IApiError } from './Errors.js';
 
-export interface IStoreRequestOptions {
-  method?: 'GET' | 'POST' | 'PATCH' | 'DELETE';
-  headers?: Record<string, string>,
-  body?: string | Buffer;
+export interface ISdkRequestOptions {
   /**
-   * Adds the token to the headers.
+   * Uses the provided token for authentication.
    */
   token?: string;
 }
 
+export interface IStoreRequestOptions extends ISdkRequestOptions {
+  method?: 'GET' | 'POST' | 'PATCH' | 'DELETE';
+  headers?: Record<string, string>,
+  body?: string | Buffer;
+}
+
 export interface IStoreResponse {
   status: number;
   headers: Headers;
@@ -42,6 +46,9 @@ export class SdkBase {
   constructor(public sdk: Sdk) {}
 
   protected logInvalidResponse(response: IStoreResponse): void {
+    if (this.sdk.silent) {
+      return;
+    }
     if (response.body) {
       try {
         const data = JSON.parse(response.body);
@@ -58,15 +65,62 @@ export class SdkBase {
    * Throws unified message for a common error status codes.
    * It handles 404, 403, and 401 status codes.
    */
-  protected inspectCommonStatusCodes(status: number): void {
+  protected inspectCommonStatusCodes(status: number, body?: string): void {
     if (status === 404) {
-      throw new Error(`Not found.`);
+      let e = this.createGenericSdkError(body)
+      if (!e) {
+        e = new SdkError(`Not found.`, 400);
+        e.response = body;
+      }
+      throw e;
     }
     if (status === 403) {
-      throw new Error(`You have no access to this resource.`);
+      let e = this.createGenericSdkError(body)
+      if (!e) {
+        e = new SdkError(`You have no access to this resource.`, 403);
+        e.response = body;
+      }
+      throw e;
     }
     if (status === 401) {
-      throw new Error(`Not authorized.`);
+      let e = this.createGenericSdkError(body)
+      if (!e) {
+        e = new SdkError(`Not authorized.`, 401);
+        e.response = body;
+      }
+      throw e;
+    }
+  }
+
+  /**
+   * Reads the response as ApiError
+   * @param body The message returned by the store.
+   * @returns The error schema or undefined when not an error;
+   */
+  protected readErrorResponse(body?: string): IApiError | undefined {
+    if (!body) {
+      return undefined;
+    }
+    let data: any;
+    try {
+      data = JSON.parse(body);
+    } catch (e) {
+      return undefined;
+    }
+    if (data.error && data.message) {
+      return data as IApiError;
+    }
+    return undefined;
+  }
+
+  protected createGenericSdkError(body?: string): SdkError | undefined {
+    const info = this.readErrorResponse(body);
+    if (!info) {
+      return undefined;
     }
+    const e = new SdkError(info.message, info.code);
+    e.detail = info.detail;
+    e.response = body;
+    return e;
   }
 }

package/src/runtime/store/SharedSdk.ts

@@ -1,34 +1,51 @@
-import { SdkBase, E_RESPONSE_STATUS, E_RESPONSE_NO_VALUE, E_INVALID_JSON, E_RESPONSE_UNKNOWN } from './SdkBase.js';
+import { SdkBase, E_RESPONSE_STATUS, E_RESPONSE_NO_VALUE, E_INVALID_JSON, E_RESPONSE_UNKNOWN, ISdkRequestOptions } from './SdkBase.js';
 import { RouteBuilder } from './RouteBuilder.js';
 import { IListOptions, IListResponse } from '../../models/Backend.js';
+import { Kind as ProjectKind } from '../../models/Project.js';
+import { Kind as WorkspaceKind } from '../../models/Workspace.js';
+import { IFile } from '../../models/store/File.js';
+import { SdkError } from './Errors.js';
 
 export class SharedSdk extends SdkBase {
   /**
    * Lists shared with the user spaces.
+   * 
+   * @param kinds the list of kinds to list. Spaces are always included.
    * @param options Optional query options.
+   * @param request Optional request options.
    */
-  async list(options?: IListOptions): Promise<IListResponse> {
-    const { token } = this.sdk;
+  async list(kinds: (typeof ProjectKind | typeof WorkspaceKind)[], options?: IListOptions, request: ISdkRequestOptions = {}): Promise<IListResponse<IFile>> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.shared());
     this.sdk.appendListOptions(url, options);
+    kinds.forEach(k => url.searchParams.append('kind', k));
     const result = await this.sdk.http.get(url.toString(), { token });
-    this.inspectCommonStatusCodes(result.status);
+    this.inspectCommonStatusCodes(result.status, result.body);
     const E_PREFIX = 'Unable to list spaces. ';
     if (result.status !== 200) {
       this.logInvalidResponse(result);
-      throw new Error(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`);
+      let e = this.createGenericSdkError(result.body)
+      if (!e) {
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
+        e.response = result.body;
+      }
+      throw e;
     }
     if (!result.body) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
+      throw new SdkError(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`, 0);
     }
-    let data: IListResponse;
+    let data: IListResponse<IFile>;
     try {
       data = JSON.parse(result.body);
     } catch (e) {
-      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`);
+      const err = new SdkError(`${E_PREFIX}${E_INVALID_JSON}.`, 0);
+      err.response = result.body;
+      throw err;
     }
     if (!Array.isArray(data.data)) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`);
+      const err = new SdkError(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`, 0);
+      err.response = result.body;
+      throw err;
     }
     return data;
   }

package/src/runtime/store/StoreSdkWeb.ts

@@ -5,7 +5,7 @@ import { Http } from './Http.js';
 import { WsClient } from './WsClient.js';
 
 export { IStoreTokenInfo, IStoreResponse, IStoreRequestOptions } from './SdkBase.js';
-export { IFileCreateOptions as ISpaceCreateOptions } from './FilesSdk.js';
+export { IFileCreateOptions } from './FilesSdk.js';
 
 /**
  * NodeJS API for API Client's net-store module.