attlaz-client 1.12.0 → 1.12.2

package/dist/Http/Data/QueryString.d.ts

@@ -1,6 +1,12 @@
+import { CursorPagination } from '../../Model/Pagination/CursorPagination.js';
+import { State } from '../../Model/State.js';
 export declare class QueryString {
+    private readonly command;
     private parameters;
+    constructor(command: string);
     set(parameter: string, value: string | number | boolean | string[]): void;
+    addPagination(pagination: CursorPagination | null): void;
+    addStateFilter(states: State[] | null): void;
     getParameters(): {
         parameter: string;
         value: string | number | boolean | string[];

package/dist/Http/Data/QueryString.js

@@ -1,14 +1,36 @@
 export class QueryString {
+    command;
     parameters = [];
+    constructor(command) {
+        this.command = command;
+    }
     set(parameter, value) {
         this.parameters.push({ parameter, value });
     }
+    addPagination(pagination) {
+        if (pagination !== null && pagination !== undefined) {
+            if (pagination.limit !== null && pagination.limit !== undefined) {
+                this.set('limit', pagination.limit);
+            }
+            if (pagination.startingAfter !== null && pagination.startingAfter !== undefined && pagination.startingAfter !== '') {
+                this.set('starting_after', pagination.startingAfter);
+            }
+            if (pagination.endingBefore !== null && pagination.endingBefore !== undefined && pagination.endingBefore !== '') {
+                this.set('ending_before', pagination.endingBefore);
+            }
+        }
+    }
+    addStateFilter(states) {
+        if (states !== null) {
+            this.set('state', states);
+        }
+    }
     getParameters() {
         return this.parameters;
     }
     build() {
         if (this.parameters.length === 0) {
-            return '';
+            return this.command;
         }
         const output = [];
         for (const parameter of this.parameters) {
@@ -18,6 +40,6 @@ export class QueryString {
             }
             output.push(parameter.parameter + '=' + value);
         }
-        return '?' + output.join('&');
+        return this.command + '?' + output.join('&');
     }
 }

package/dist/Service/ChannelEndpoint.d.ts

@@ -2,11 +2,12 @@ import { Endpoint } from './Endpoint.js';
 import { Channel } from '../Model/Messaging/Channel/Channel.js';
 import { ChannelHistory } from '../Model/Messaging/ChannelHistory.js';
 import { CollectionResult } from '../Model/Result/CollectionResult.js';
+import { CursorPagination } from '../Model/Pagination/CursorPagination.js';
 export declare class ChannelEndpoint extends Endpoint {
     getById(channelId: string): Promise<Channel | null>;
-    getByWorkspace(workspaceId: string): Promise<CollectionResult<Channel>>;
-    getByOwner(): Promise<CollectionResult<Channel>>;
-    getMessages(channelId: string): Promise<CollectionResult<ChannelHistory>>;
+    getByWorkspace(workspaceId: string, pagination?: CursorPagination | null): Promise<CollectionResult<Channel>>;
+    getByOwner(pagination?: CursorPagination | null): Promise<CollectionResult<Channel>>;
+    getMessages(channelId: string, pagination?: CursorPagination | null): Promise<CollectionResult<ChannelHistory>>;
     save(subscriberChannel: Channel): Promise<Channel>;
     testChannel(subscriberChannel: Channel): Promise<boolean>;
 }

package/dist/Service/ChannelEndpoint.js

@@ -1,6 +1,7 @@
 import { Endpoint } from './Endpoint.js';
 import { Channel } from '../Model/Messaging/Channel/Channel.js';
 import { ChannelHistory } from '../Model/Messaging/ChannelHistory.js';
+import { QueryString } from '../Http/Data/QueryString.js';
 export class ChannelEndpoint extends Endpoint {
     async getById(channelId) {
         try {
@@ -19,9 +20,11 @@ export class ChannelEndpoint extends Endpoint {
             throw ex;
         }
     }
-    async getByWorkspace(workspaceId) {
+    async getByWorkspace(workspaceId, pagination = null) {
         try {
-            const result = await this.requestCollection('/workspaces/' + workspaceId + '/channels', Channel.parse);
+            const queryString = new QueryString('/workspaces/' + workspaceId + '/channels');
+            queryString.addPagination(pagination);
+            const result = await this.requestCollection(queryString, Channel.parse);
             return result;
         }
         catch (ex) {
@@ -31,9 +34,11 @@ export class ChannelEndpoint extends Endpoint {
             throw ex;
         }
     }
-    async getByOwner() {
+    async getByOwner(pagination = null) {
         try {
-            const result = await this.requestCollection('/channels', Channel.parse);
+            const queryString = new QueryString('channels');
+            queryString.addPagination(pagination);
+            const result = await this.requestCollection(queryString, Channel.parse);
             return result;
         }
         catch (ex) {
@@ -43,29 +48,12 @@ export class ChannelEndpoint extends Endpoint {
             throw ex;
         }
     }
-    async getMessages(channelId) {
+    async getMessages(channelId, pagination = null) {
         try {
-            const result = await this.requestCollection('/channels/' + channelId + '/messages', ChannelHistory.parse);
+            const querystring = new QueryString('/channels/' + channelId + '/messages');
+            querystring.addPagination(pagination);
+            const result = await this.requestCollection(querystring, ChannelHistory.parse);
             return result;
-            // const data: ChannelHistory[] = [];
-            //
-            // const resultData: any | null = rawChannelHistory.getData();
-            // if (resultData !== null) {
-            //     const orig: ChannelHistory[] = resultData;
-            //
-            //     for (const rawChannelMessage of orig) {
-            //         data.push(ChannelHistory.parse(rawChannelMessage));
-            //     }
-            // }
-            //
-            // rawChannelHistory.setData(data);
-            //
-            // return rawChannelHistory;
-            // let subscriberChannels: Channel[] = [];
-            // for (let rawChannel of rawChannels) {
-            //     subscriberChannels.push(Channel.parse(rawChannel));
-            // }
-            // return subscriberChannels;
         }
         catch (ex) {
             if (this.httpClient.isDebugEnabled()) {

package/dist/Service/Endpoint.d.ts

@@ -2,16 +2,14 @@ import { OAuthClient } from '../Http/OAuthClient.js';
 import { CollectionResult } from '../Model/Result/CollectionResult.js';
 import { ObjectResult } from '../Model/Result/ObjectResult.js';
 import { Parameters } from '../Http/Data/Parameters.js';
-import { CursorPagination } from '../Model/Pagination/CursorPagination.js';
 import { QueryString } from '../Http/Data/QueryString.js';
 export declare abstract class Endpoint {
     protected httpClient: OAuthClient;
     constructor(httpClient: OAuthClient);
     private formatParameters;
     private formatKey;
-    requestCollection<T>(action: string, parser: (input: any) => T, parameters?: Parameters, method?: string, signWithOauthToken?: boolean): Promise<CollectionResult<T>>;
+    requestCollection<T>(action: string | QueryString, parser: (input: any) => T, parameters?: Parameters, method?: string, signWithOauthToken?: boolean): Promise<CollectionResult<T>>;
     requestObject<T>(action: string, parameters: Parameters | undefined, parser: (input: any) => T, method?: string, signWithOauthToken?: boolean): Promise<ObjectResult<T>>;
     parseCollection<T>(rawData: object[], parser: (input: any) => T): T[];
     private parseObject;
-    protected buildQuery(pagination: CursorPagination | null): QueryString;
 }

package/dist/Service/Endpoint.js

@@ -71,6 +71,9 @@ export class Endpoint {
     }
     async requestCollection(action, parser, parameters = null, method = 'GET', signWithOauthToken = true) {
         parameters = this.formatParameters(parameters);
+        if (action instanceof QueryString) {
+            action = action.build();
+        }
         const requestResponse = await this.httpClient.request(action, parameters, method, signWithOauthToken);
         const result = new CollectionResult();
         /**
@@ -151,19 +154,4 @@ export class Endpoint {
         }
         return null;
     }
-    buildQuery(pagination) {
-        const queryString = new QueryString();
-        if (pagination !== null && pagination !== undefined) {
-            if (pagination.limit !== null && pagination.limit !== undefined) {
-                queryString.set('limit', pagination.limit);
-            }
-            if (pagination.startingAfter !== null && pagination.startingAfter !== undefined && pagination.startingAfter !== '') {
-                queryString.set('starting_after', pagination.startingAfter);
-            }
-            if (pagination.endingBefore !== null && pagination.endingBefore !== undefined && pagination.endingBefore !== '') {
-                queryString.set('ending_before', pagination.endingBefore);
-            }
-        }
-        return queryString;
-    }
 }

package/dist/Service/FlowRunEndpoint.js

@@ -4,6 +4,7 @@ import { HttpClient } from '../Http/HttpClient.js';
 import { FlowRun } from '../Model/Flow/FlowRun.js';
 import { FlowRunSummary } from '../Model/Flow/FlowRunSummary.js';
 import { FlowRunHistory } from '../Model/Flow/FlowRunHistory.js';
+import { QueryString } from '../Http/Data/QueryString.js';
 export class FlowRunEndpoint extends Endpoint {
     async getFlowRuns(flowId) {
         const result = await this.requestCollection('/flows/' + flowId + '/runs', FlowRun.parse);
@@ -11,7 +12,8 @@ export class FlowRunEndpoint extends Endpoint {
     }
     async getFlowRunSummaries(flowId, flowRunStatuses = null, pagination = null, projectEnvironmentId = null) {
         try {
-            const queryString = this.buildQuery(pagination);
+            const queryString = new QueryString('/flows/' + flowId + '/runsummaries');
+            queryString.addPagination(pagination);
             // if (from !== null && from !== undefined) {
             //
             //     params = {};
@@ -36,7 +38,7 @@ export class FlowRunEndpoint extends Endpoint {
             //     }
             //     params.statuses = flowRunStatuses;
             // }
-            const result = await this.requestCollection('/flows/' + flowId + '/runsummaries' + queryString.build(), FlowRunSummary.parse);
+            const result = await this.requestCollection(queryString.build(), FlowRunSummary.parse);
             return result;
         }
         catch (error) {

package/dist/Service/LogEndpoint.js

@@ -4,6 +4,7 @@ import { Utils } from '../Utils.js';
 import { LogStreamId } from '../Model/Log/LogStreamId.js';
 import { LogStreamInformation } from '../Model/Log/LogStreamInformation.js';
 import { LogStream } from '../Model/Log/LogStream.js';
+import { QueryString } from '../Http/Data/QueryString.js';
 export class LogEndpoint extends Endpoint {
     async getLogs(logQuery) {
         const arrQuery = [];
@@ -41,7 +42,8 @@ export class LogEndpoint extends Endpoint {
         return result;
     }
     async getCursoredLogEntries(logStreamId, pagination, filter) {
-        const queryString = this.buildQuery(pagination);
+        const queryString = new QueryString('/logstreams/' + Utils.base64encode(logStreamId.id) + '/logs');
+        queryString.addPagination(pagination);
         if (filter !== null && filter !== undefined) {
             if (filter.tags !== null && filter.tags.length > 0) {
                 const arrTags = [];
@@ -57,8 +59,7 @@ export class LogEndpoint extends Endpoint {
                 queryString.set('filter_log_levels', filter.logLevels.join(','));
             }
         }
-        const cmd = '/logstreams/' + Utils.base64encode(logStreamId.id) + '/logs' + queryString.build();
-        const result = await this.requestCollection(cmd, Log.parse);
+        const result = await this.requestCollection(queryString, Log.parse);
         return result;
     }
     async save(log) {

package/dist/Service/ProjectEndpoint.d.ts

@@ -2,9 +2,10 @@ import { Endpoint } from './Endpoint.js';
 import { Project } from '../Model/Project/Project.js';
 import { CollectionResult } from '../Model/Result/CollectionResult.js';
 import { State } from '../Model/State.js';
+import { CursorPagination } from '../Model/Pagination/CursorPagination.js';
 export declare class ProjectEndpoint extends Endpoint {
     getAll(): Promise<CollectionResult<Project>>;
-    getByWorkspace(workspaceId: string, states?: State[] | null): Promise<CollectionResult<Project>>;
+    getByWorkspace(workspaceId: string, pagination?: CursorPagination | null, states?: State[] | null): Promise<CollectionResult<Project>>;
     getById(projectId: string): Promise<Project | null>;
     save(project: Project): Promise<Project>;
 }

package/dist/Service/ProjectEndpoint.js

@@ -14,13 +14,12 @@ export class ProjectEndpoint extends Endpoint {
             throw e;
         }
     }
-    async getByWorkspace(workspaceId, states = null) {
+    async getByWorkspace(workspaceId, pagination = null, states = null) {
         try {
-            const queryString = new QueryString();
-            if (states !== null) {
-                queryString.set('state', states);
-            }
-            const result = await this.requestCollection('workspaces/' + workspaceId + '/projects' + queryString.build(), Project.parse);
+            const queryString = new QueryString('workspaces/' + workspaceId + '/projects');
+            queryString.addPagination(pagination);
+            queryString.addStateFilter(states);
+            const result = await this.requestCollection(queryString, Project.parse);
             return result;
         }
         catch (e) {

package/dist/Service/SourcesAccountEndpoint.d.ts

@@ -4,12 +4,13 @@ import { CodeSource } from '../Model/Deployment/CodeSource.js';
 import { CollectionResult } from '../Model/Result/CollectionResult.js';
 import { SourcesAccountRepository } from '../Model/Deployment/SourcesAccountRepository.js';
 import { SourcesAccountRepositoryBranch } from '../Model/Deployment/SourcesAccountRepositoryBranch.js';
+import { CursorPagination } from '../Model/Pagination/CursorPagination.js';
 export declare class SourcesAccountEndpoint extends Endpoint {
-    getAllCodeSources(workspaceId: string): Promise<CollectionResult<CodeSource>>;
-    getAllCodeSourceAccounts(workspaceId: string): Promise<CollectionResult<CodeSourceAccount>>;
+    getAllCodeSources(workspaceId: string, pagination?: CursorPagination | null): Promise<CollectionResult<CodeSource>>;
+    getAllCodeSourceAccounts(workspaceId: string, pagination?: CursorPagination | null): Promise<CollectionResult<CodeSourceAccount>>;
     getCodeSourceAccountById(id: string): Promise<CodeSourceAccount | null>;
     getCodeSourceById(codeSourceId: string): Promise<CodeSource | null>;
-    getRepositories(codeSourceAccountId: string): Promise<CollectionResult<SourcesAccountRepository>>;
-    getRepositoryBranches(codeSourceAccountId: string, repositoryKey: string): Promise<CollectionResult<SourcesAccountRepositoryBranch>>;
+    getRepositories(codeSourceAccountId: string, pagination?: CursorPagination | null): Promise<CollectionResult<SourcesAccountRepository>>;
+    getRepositoryBranches(codeSourceAccountId: string, repositoryKey: string, pagination?: CursorPagination | null): Promise<CollectionResult<SourcesAccountRepositoryBranch>>;
     saveCodeSource(codeSource: CodeSource): Promise<CodeSource>;
 }

package/dist/Service/SourcesAccountEndpoint.js

@@ -5,13 +5,18 @@ import { CodeSource } from '../Model/Deployment/CodeSource.js';
 import { HttpClient } from '../Http/HttpClient.js';
 import { SourcesAccountRepository } from '../Model/Deployment/SourcesAccountRepository.js';
 import { SourcesAccountRepositoryBranch } from '../Model/Deployment/SourcesAccountRepositoryBranch.js';
+import { QueryString } from '../Http/Data/QueryString.js';
 export class SourcesAccountEndpoint extends Endpoint {
-    async getAllCodeSources(workspaceId) {
-        const result = await this.requestCollection('workspaces/' + workspaceId + '/codesources', CodeSource.parse);
+    async getAllCodeSources(workspaceId, pagination = null) {
+        const queryString = new QueryString('workspaces/' + workspaceId + '/codesources');
+        queryString.addPagination(pagination);
+        const result = await this.requestCollection(queryString, CodeSource.parse);
         return result;
     }
-    async getAllCodeSourceAccounts(workspaceId) {
-        const result = await this.requestCollection('workspaces/' + workspaceId + '/codesourceaccounts', CodeSourceAccount.parse);
+    async getAllCodeSourceAccounts(workspaceId, pagination = null) {
+        const queryString = new QueryString('workspaces/' + workspaceId + '/codesourceaccounts');
+        queryString.addPagination(pagination);
+        const result = await this.requestCollection(queryString, CodeSourceAccount.parse);
         return result;
     }
     async getCodeSourceAccountById(id) {
@@ -49,13 +54,17 @@ export class SourcesAccountEndpoint extends Endpoint {
             throw error;
         }
     }
-    async getRepositories(codeSourceAccountId) {
-        const rawSourcesAccountRepositories = await this.requestCollection('codesourceaccounts/' + codeSourceAccountId + '/repositories', SourcesAccountRepository.parse);
+    async getRepositories(codeSourceAccountId, pagination = null) {
+        const queryString = new QueryString('codesourceaccounts/' + codeSourceAccountId + '/repositories');
+        queryString.addPagination(pagination);
+        const rawSourcesAccountRepositories = await this.requestCollection(queryString, SourcesAccountRepository.parse);
         return rawSourcesAccountRepositories;
     }
-    async getRepositoryBranches(codeSourceAccountId, repositoryKey) {
+    async getRepositoryBranches(codeSourceAccountId, repositoryKey, pagination = null) {
+        const queryString = new QueryString('codesourceaccounts/' + codeSourceAccountId + '/repositories/' + repositoryKey + '/branches');
+        queryString.addPagination(pagination);
         repositoryKey = Utils.base64encode(repositoryKey);
-        const rawBranches = await this.requestCollection('codesourceaccounts/' + codeSourceAccountId + '/repositories/' + repositoryKey + '/branches', SourcesAccountRepositoryBranch.parse);
+        const rawBranches = await this.requestCollection(queryString, SourcesAccountRepositoryBranch.parse);
         return rawBranches;
     }
     async saveCodeSource(codeSource) {

package/dist/Service/WorkspaceMemberEndpoint.d.ts

@@ -4,8 +4,9 @@ import { WorkspaceMember } from '../Model/Workspace/WorkspaceMember.js';
 import { WorkspaceMemberInvite } from '../Model/Workspace/WorkspaceMemberInvite.js';
 import { WorkspaceMemberInvite2 } from '../Model/Workspace/WorkspaceMemberInvite2.js';
 import { CollectionResult } from '../Model/Result/CollectionResult.js';
+import { CursorPagination } from '../Model/Pagination/CursorPagination.js';
 export declare class WorkspaceMemberEndpoint extends Endpoint {
-    getByWorkspace(workspaceId: string): Promise<CollectionResult<WorkspaceMember>>;
+    getByWorkspace(workspaceId: string, pagination?: CursorPagination | null): Promise<CollectionResult<WorkspaceMember>>;
     invite(workspaceId: string, invites: WorkspaceMemberInvite[]): Promise<boolean>;
     getWorkspaceInviteByCode(inviteCode: string): Promise<WorkspaceMemberInvite2 | null>;
     getWorkspaceMemberEvents(workspaceId: string, memberId: string): Promise<CollectionResult<UserAction>>;

package/dist/Service/WorkspaceMemberEndpoint.js

@@ -7,9 +7,11 @@ import { WorkspaceMember } from '../Model/Workspace/WorkspaceMember.js';
 import { WorkspaceMemberRole } from '../Model/Workspace/WorkspaceMemberRole.js';
 import { WorkspaceMemberInviteState } from '../Model/Workspace/WorkspaceMemberInviteState.js';
 import { WorkspaceMemberInvite2 } from '../Model/Workspace/WorkspaceMemberInvite2.js';
+import { QueryString } from '../Http/Data/QueryString.js';
 export class WorkspaceMemberEndpoint extends Endpoint {
-    async getByWorkspace(workspaceId) {
-        const cmd = '/workspaces/' + workspaceId + '/members';
+    async getByWorkspace(workspaceId, pagination = null) {
+        const queryString = new QueryString('workspaces/' + workspaceId + '/members');
+        queryString.addPagination(pagination);
         const parser = (rawMember) => {
             const member = new WorkspaceMember();
             member.id = rawMember.id;
@@ -28,7 +30,7 @@ export class WorkspaceMemberEndpoint extends Endpoint {
             }
             return member;
         };
-        const result = await this.requestCollection(cmd, parser);
+        const result = await this.requestCollection(queryString, parser);
         return result;
     }
     async invite(workspaceId, invites) {

package/dist/main.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/main.js

@@ -1 +1 @@
-"use strict";
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attlaz-client",
-  "version": "1.12.0",
+  "version": "1.12.2",
   "description": "Javascript Client to access Attlaz API",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",