@api-client/core 0.5.2 → 0.5.5

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/RouteBuilder.ts

@@ -3,45 +3,31 @@
  */
 export class RouteBuilder {
   /**
-   * @returns The path to the /spaces route.
+   * @returns The path to the /files route.
    */
-  static spaces(): string {
-    return '/spaces';
+  static files(): string {
+    return '/files';
   }
 
   /**
-   * @returns The path to the /spaces/[id] route.
+   * @returns The path to the /files/[id] route.
    */
-  static space(key: string): string {
-    return `/spaces/${key}`;
+  static file(key: string): string {
+    return `/files/${key}`;
   }
 
   /**
-   * @returns The path to the /spaces/[id]/users route.
+   * @returns The path to the /files/[id]/users route.
    */
-  static spaceUsers(key: string): string {
-    return `/spaces/${key}/users`;
+  static fileUsers(key: string): string {
+    return `/files/${key}/users`;
   }
 
   /**
-   * @returns The path to the /spaces/[id]/projects route.
+   * @returns The path to the /file/[id]/revisions route.
    */
-  static spaceProjects(key: string): string {
-    return `/spaces/${key}/projects`;
-  }
-
-  /**
-   * @returns The path to the /spaces/[id]/projects/[id] route.
-   */
-  static spaceProject(space: string, project: string): string {
-    return `/spaces/${space}/projects/${project}`;
-  }
-
-  /**
-   * @returns The path to the /spaces/[id]/projects/[id]/revisions route.
-   */
-  static projectRevisions(space: string, project: string): string {
-    return `/spaces/${space}/projects/${project}/revisions`;
+  static fileRevisions(file: string): string {
+    return `/file/${file}/revisions`;
   }
 
   /**
@@ -87,7 +73,7 @@ export class RouteBuilder {
     return `/history/${key}`;
   }
 
-  static sharedSpaces(): string {
-    return '/shared/spaces';
+  static shared(): string {
+    return '/shared';
   }
 }

package/src/runtime/store/Sdk.ts

@@ -3,8 +3,7 @@ import { Http } from './Http.js';
 import { WsClient } from './WsClient.js';
 import { AuthSdk } from './AuthSdk.js';
 import { BackendSdk } from './BackendSdk.js';
-import { SpacesSdk } from './SpacesSdk.js';
-import { ProjectsSdk } from './ProjectsSdk.js';
+import { FilesSdk } from './FilesSdk.js';
 import { UsersSdk } from './UsersSdk.js';
 import { HistorySdk } from './HistorySdk.js';
 import { SharedSdk } from './SharedSdk.js';
@@ -30,11 +29,7 @@ export abstract class Sdk {
   /**
    * The user spaces features.
    */
-  space = new SpacesSdk(this);
-  /**
-   * The user projects features.
-   */
-  project = new ProjectsSdk(this);
+  file = new FilesSdk(this);
   /**
    * Reads user information.
    */
@@ -56,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;
-    const url = this.sdk.getUrl(RouteBuilder.sharedSpaces());
+  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/StoreSdkNode.ts

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

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 { ISpaceCreateOptions } from './SpacesSdk.js';
+export { IFileCreateOptions as ISpaceCreateOptions } from './FilesSdk.js';
 
 /**
  * NodeJS API for API Client's net-store module.

package/src/runtime/store/UsersSdk.ts

@@ -1,11 +1,15 @@
-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 { IUser } from '../../models/store/User.js';
 
 export class UsersSdk extends SdkBase {
-  async me(): Promise<IUser> {
-    const { token } = this.sdk;
+  /**
+   * Reads the current user.
+   * @param request Optional request options.
+   */
+  async me(request: ISdkRequestOptions = {}): Promise<IUser> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.usersMe());
     const result = await this.sdk.http.get(url.toString(), { token });
     this.inspectCommonStatusCodes(result.status);
@@ -33,9 +37,10 @@ export class UsersSdk extends SdkBase {
    * Lists users in the store
    * 
    * @param options Optional query options.
+   * @param request Optional request options.
    */
-  async list(options?: IListOptions): Promise<IListResponse> {
-    const { token } = this.sdk;
+  async list(options?: IListOptions, request: ISdkRequestOptions = {}): Promise<IListResponse<IUser>> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.users());
     this.sdk.appendListOptions(url, options);
     const result = await this.sdk.http.get(url.toString(), { token });
@@ -48,7 +53,7 @@ export class UsersSdk extends SdkBase {
     if (!result.body) {
       throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
     }
-    let data: IListResponse;
+    let data: IListResponse<IUser>;
     try {
       data = JSON.parse(result.body);
     } catch (e) {
@@ -63,10 +68,11 @@ export class UsersSdk extends SdkBase {
   /**
    * Reads a user information from the store.
    * @param key The user key.
+   * @param request Optional request options.
    * @returns The user object
    */
-  async read(key: string): Promise<IUser> {
-    const { token } = this.sdk;
+  async read(key: string, request: ISdkRequestOptions = {}): Promise<IUser> {
+    const token = request.token || this.sdk.token;
     const url = this.sdk.getUrl(RouteBuilder.user(key));
     const result = await this.sdk.http.get(url.toString(), { token });
     this.inspectCommonStatusCodes(result.status);

package/build/src/models/HttpProjectListItem.d.ts

@@ -1,23 +0,0 @@
-export declare const Kind = "Core#HttpProjectListItem";
-/**
- * The HTTP Project definition to be used in lists.
- */
-export interface IHttpProjectListItem {
-    /**
-     * The data store key of the project.
-     */
-    key: string;
-    /**
-     * Project's name
-     */
-    name: string;
-    /**
-     * Whether the project is one of the favourites.
-     * May be used by an UI to add projects to favourites.
-     */
-    favourite?: boolean;
-    /**
-     * The timestamp when the project was last updated.
-     */
-    updated: number;
-}

package/build/src/models/HttpProjectListItem.js

@@ -1,2 +0,0 @@
-export const Kind = 'Core#HttpProjectListItem';
-//# sourceMappingURL=HttpProjectListItem.js.map

package/build/src/models/HttpProjectListItem.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"HttpProjectListItem.js","sourceRoot":"","sources":["../../../src/models/HttpProjectListItem.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,IAAI,GAAG,0BAA0B,CAAC"}

package/build/src/runtime/store/ProjectsSdk.d.ts

@@ -1,43 +0,0 @@
-import { JsonPatch } from 'json8-patch';
-import { SdkBase } from './SdkBase.js';
-import { IListOptions, IListResponse } from '../../models/Backend.js';
-import { HttpProject, IHttpProject } from '../../models/HttpProject.js';
-export declare class ProjectsSdk extends SdkBase {
-    /**
-     * Creates a project in a user space.
-     *
-     * @param space The user space key
-     * @param project THe project to create
-     * @returns The key of the created project.
-     */
-    create(space: string, project: IHttpProject | HttpProject): Promise<string>;
-    /**
-     * Reads a project definition from the store.
-     * @param space The user space key
-     * @param project The project key
-     * @returns The definition of the project.
-     */
-    read(space: string, project: string): Promise<IHttpProject>;
-    /**
-     * Lists projects in the space
-     *
-     * @param space The user space key
-     * @param options Optional query options.
-     */
-    list(space: string, options?: IListOptions): Promise<IListResponse>;
-    /**
-     * Deletes a project form the store.
-     *
-     * @param space The key of the parent space.
-     * @param project The key of the project to delete.
-     */
-    delete(space: string, project: string): Promise<void>;
-    /**
-     * Patches a project in the store.
-     * @param space The key of the parent user space
-     * @param project The key of project to patch.
-     * @param value The JSON patch to be processed.
-     * @returns The JSON patch to revert the change using the `json8-patch` library
-     */
-    patch(space: string, project: string, value: JsonPatch): Promise<JsonPatch>;
-}