refactor: adds and corrects types of ContentstackCollectin and marketplace functions

types/contentstackCollection.d.ts

@@ -3,7 +3,7 @@ export interface Response {
 }
 
 export interface ContentstackCollection<T> extends Response {
-    items: [T]
+    items: T[]
     count: number
 }
 

types/marketplace/hosting.d.ts → types/marketplace/app/hosting.d.ts

@@ -1,5 +1,5 @@
-import { AnyProperty, SystemFields } from '../utility/fields';
-import { ContentstackCollection } from '../contentstackCollection'
+import { AnyProperty, SystemFields } from '../../utility/fields';
+import { ContentstackCollection } from '../../contentstackCollection'
 export interface Hosting {
     isEnable(): Promise<AnyProperty>
     enable(): Promise<AnyProperty>

types/marketplace/app/index.d.ts

@@ -0,0 +1,89 @@
+import { ContentstackCollection } from "../../contentstackCollection";
+import { AnyProperty, SystemFields } from "../../utility/fields";
+import { Creatable, SystemFunction } from "../../utility/operations";
+import { Authorization } from '../authorization';
+import { Hosting } from './hosting';
+import { Installation } from "../installation";
+import { Oauth } from "./oath";
+
+export interface App extends SystemFields, SystemFunction<App> {
+
+    update(param?: AnyProperty): Promise<App>
+    fetch(param?: AnyProperty): Promise<App>
+    delete(param?: AnyProperty): Promise<App>
+    oauth(): Oauth
+    hosting(): Hosting
+    install(data: {targetUid: string, targetType: AppTarget}): Promise<Installation>
+    authorize(param: { 
+        responseType: string, 
+        clientId: string, 
+        redirectUri: string, 
+        scope: string, 
+        state: string }): Promise<AnyProperty>
+    authorization(): Authorization
+    listInstallations(): Promise<ContentstackCollection<App>>
+}
+
+export interface Apps extends Creatable<App, AppData> {
+    create(): Promise<App>
+}
+
+export interface AppData extends AnyProperty {
+    name: string
+    description?: string
+    icon?: string
+    target_type: AppTarget
+    ui_location?: UILocation 
+    webhook?: AppWebhook | AppWebhookChannel
+    oauth?: AppOAuth
+}
+
+export interface AppOAuth extends AnyProperty {
+    redirect_uri?: string
+    app_token_config?: TokenConfig
+    user_token_config?: UserTokenConfig
+}
+
+export interface TokenConfig extends AnyProperty {
+    enabled: boolean
+    scopes: string[]
+}
+
+export interface UserTokenConfig extends TokenConfig {
+    allow_pkce: boolean
+}
+
+export interface AppWebhookChannel extends AppWebhook {
+    target_url: string
+    channels: string[]
+}
+
+export interface AppWebhook extends AnyProperty {
+    signed: boolean
+    name: string
+    enabled?: boolean
+    app_lifecycle_enabled?: boolean
+    retry_policy?: string
+}
+
+export interface UILocation extends AnyProperty {
+    signed: boolean
+    base_url?: string
+    locations: Location[]
+}
+
+export interface Location extends AnyProperty {
+    type: string
+    meta: LocationMeta[]
+}
+
+export interface LocationMeta extends AnyProperty {
+    signed: boolean
+    path: string
+    name: string
+    data_type?: string
+}
+
+export type AppTarget =
+  | 'stack'
+  | 'organization'

types/marketplace/app/oath.d.ts

@@ -0,0 +1,8 @@
+import { AnyProperty } from '../../utility/fields';
+import { AppOAuth } from '.';
+
+export interface Oauth {
+  fetch(param?: AnyProperty): Promise<AppOAuth>
+  update(data: { config: AppOAuth, param?: AnyProperty }): Promise<AppOAuth>
+  getScopes(): Promise<AnyProperty>
+}

types/marketplace/index.d.ts

@@ -1,89 +1,17 @@
 import { ContentstackCollection } from "../contentstackCollection";
 import { AnyProperty, SystemFields } from "../utility/fields";
-import { Creatable, SystemFunction } from "../utility/operations";
-import { Pagination } from '../utility/pagination';
-import { Authorization } from './authorization';
-import { Hosting } from './hosting';
+import { SystemFunction } from "../utility/operations";
 import { Installation, Installations } from "./installation";
-import { Oauth } from "./oath";
+import { App, Apps } from "./app";
+import { AppRequest } from "./apprequest";
 
-export interface App extends SystemFields, SystemFunction<App> {
+export interface Marketplace extends SystemFields, SystemFunction<Marketplace> {
 
-    install(data: {targetUid: string, targetType: AppTarget}): Promise<Installation>
+    app(): Apps
+    app(uid: string): App
     installation(): Installations
     installation(uid: string): Installation
-    hosting(): Hosting
-    authorize(param: { 
-        responseType: string, 
-        clientId: string, 
-        redirectUri: string, 
-        scope: string, 
-        state: string }): Promise<AnyProperty>
-    listInstallations(): Promise<ContentstackCollection<App>>
-    authorization(): Authorization
-    oauth(): Oauth
+    appRequests(): AppRequest
+    findAllApps(param?: AnyProperty): Promise<ContentstackCollection<App>> 
+    findAllAuthorizedApps(param?: AnyProperty): Promise<AnyProperty>
 }
-
-export interface Apps extends Creatable<App, AppData> {
-    findAll(param?: AnyProperty): Promise<ContentstackCollection<App>>
-    findAllAuthorized(param?: Pagination & AnyProperty): Promise<AnyProperty>
-}
-
-export interface AppData extends AnyProperty {
-    name: string
-    description?: string
-    icon?: string
-    target_type: AppTarget
-    ui_location?: UILocation 
-    webhook?: AppWebhook | AppWebhookChannel
-    oauth?: AppOAuth
-}
-
-export interface AppOAuth extends AnyProperty {
-    redirect_uri?: string
-    app_token_config?: TokenConfig
-    user_token_config?: UserTokenConfig
-}
-
-export interface TokenConfig extends AnyProperty {
-    enabled: boolean
-    scopes: string[]
-}
-export interface UserTokenConfig extends TokenConfig {
-    allow_pkce: boolean
-}
-
-export interface AppWebhookChannel extends AppWebhook {
-    target_url: string
-    channels: string[]
-}
-
-export interface AppWebhook extends AnyProperty {
-    signed: boolean
-    name: string
-    enabled?: boolean
-    app_lifecycle_enabled?: boolean
-    retry_policy?: string
-}
-
-export interface UILocation extends AnyProperty {
-    signed: boolean
-    base_url?: string
-    locations: Location[]
-}
-
-export interface Location extends AnyProperty {
-    type: string
-    meta: LocationMeta[]
-}
-
-export interface LocationMeta extends AnyProperty {
-    signed: boolean
-    path: string
-    name: string
-    data_type?: string
-}
-
-export type AppTarget =
-  | 'stack'
-  | 'organization'

types/marketplace/installation.d.ts

@@ -7,11 +7,16 @@ export interface Installation extends SystemFields {
     uninstall(param?: AnyProperty): Promise<AnyProperty>
     configuration(param?: AnyProperty): Promise<AnyProperty>
     setConfiguration(config: AnyProperty): Promise<AnyProperty>
+    getConfigLocation(): Promise<AnyProperty>
     serverConfig(param?: AnyProperty): Promise<AnyProperty>
     setServerConfig(config: AnyProperty): Promise<AnyProperty>
     installationData(): Promise<AnyProperty>
+    webhooks(webhookUid: string): WebHooks
 }
 
 export interface Installations {
-    findAll(param?: AnyProperty): Promise<ContentstackCollection<Installation>>
+    fetchAll(param?: AnyProperty): Promise<ContentstackCollection<Installation>>
+    getInstalledApps(): Promise<AnyProperty>
+    getInstalledUsers(): Promise<AnyProperty>
+    getInstalledStacks(): Promise<AnyProperty>
 }

types/marketplace/webhooks.d.ts

@@ -0,0 +1,7 @@
+import { AnyProperty } from "../utility/fields";
+
+export interface WebHooks {
+  listExecutionLogs(): Promise<AnyProperty>
+  getExecutionLog(executionUid: string): Promise<AnyProperty>
+  retryExecution(executionUid: string): Promise<AnyProperty>
+}

types/organization.d.ts

@@ -5,8 +5,7 @@ import { Sorting } from './utility/sorting'
 import { Pagination } from './utility/pagination'
 import { AnyProperty, SystemFields } from './utility/fields'
 import { ContentstackCollection, Response } from './contentstackCollection'
-import { App, Apps } from './app'
-import { AppRequest } from './app/request'
+import { Marketplace } from '../lib/marketplace'
 
 export interface Organizations {
     fetchAll(params?: AnyProperty): Promise<ContentstackCollection<Organization>>
@@ -22,9 +21,7 @@ export interface Organization extends SystemFields {
     getInvitations(param?: Pagination & AnyProperty): Promise<ContentstackCollection<User>>
     resendInvitation(invitationUid: string): Promise<Response>
     roles(param?: Pagination & AnyProperty): Promise<ContentstackCollection<Role>>
-    app(): Apps
-    app(uid: string): App
-    appRequest(): AppRequest
+    marketplace(): Marketplace
 }
 
 export interface OrganizationInvite {