Merge pull request 'ver 0.1.5' (#1) from develop into master

6 files changed, 17 insertions, 21 deletions

diff --git a/dist/activity-manager.d.ts b/dist/activity-manager.d.ts
index 4a2d766..b889c19 100644
--- a/dist/activity-manager.d.ts
+++ b/dist/activity-manager.d.ts
@@ -1,6 +1,6 @@
-import { IActivitySpec } from "./types";
 import { Service } from "./service";
 import { Subscription } from "./subscription";
+import { IActivitySpec } from "./types";
 
 export interface ICreateDummyCallback {
 	activity: { name: string };
@@ -8,24 +8,24 @@ export interface ICreateDummyCallback {
 }
 
 export declare class ActivityManager {
-	public constructor(service: Service, idleTimeout: number);
-
 	public readonly idleTimeout: number;
 
 	public readonly service: Service;
 
+	private readonly _activities: { [id: string]: Subscription };
+
 	public exitOnTimeout: boolean;
 
 	public useDummyActivity: boolean;
 
-	private readonly _activities: { [id: string]: Subscription };
-
 	private _counter: number;
 
 	private _dummyActivityId: number;
 
 	private _idleTimer: NodeJS.Timeout | null;
 
+	public constructor(service: Service, idleTimeout: number);
+
 	public adopt(activity: Record<string, any>, callback?: (payload: Record<string, any>) => void): void;
 
 	public complete(activity: Record<string, any>, options?: Record<string, any>, callback?: (payload: Record<string, any>) => void): boolean | void;
diff --git a/dist/index.d.ts b/dist/index.d.ts
index 7e74212..735129e 100644
--- a/dist/index.d.ts
+++ b/dist/index.d.ts
@@ -4,10 +4,6 @@ import { Method } from "./method";
 import { Service } from "./service";
 import { Subscription } from "./subscription";
 
-declare module "webos-service" {
-	export default Service;
-}
-
 export {
 	ActivityManager,
 	Message,
diff --git a/dist/message.d.ts b/dist/message.d.ts
index 6e6ba48..77e8c95 100644
--- a/dist/message.d.ts
+++ b/dist/message.d.ts
@@ -2,9 +2,6 @@ import { ActivityManager } from "./activity-manager";
 import { Service } from "./service";
 
 export declare class Message {
-	// @todo Need to "palmbus"
-	public constructor(message: any, handle: any, activityManager: ActivityManager, service: Service);
-
 	public readonly activityManager: ActivityManager;
 
 	public readonly category: string;
@@ -29,6 +26,9 @@ export declare class Message {
 
 	public readonly uniqueToken: string;
 
+	// @todo Need to "palmbus"
+	public constructor(message: any, handle: any, activityManager: ActivityManager, service: Service);
+
 	public cancel(response: Record<string, any>): void;
 
 	public respond(response: Record<string, any>): boolean;
diff --git a/dist/method.d.ts b/dist/method.d.ts
index fac3163..9845709 100644
--- a/dist/method.d.ts
+++ b/dist/method.d.ts
@@ -1,12 +1,12 @@
 import { Message } from "./message";
 
 export declare class Method {
-	public constructor(methodName: string, description: Record<string, any>);
-
 	public readonly description: Record<string, any>;
 
 	public readonly name: string;
 
+	public constructor(methodName: string, description: Record<string, any>);
+
 	public on(event: "request", listener: (message: Message) => void): this;
 
 	public on(event: "cancel", listener: (message: Message) => void): this;
diff --git a/dist/service.d.ts b/dist/service.d.ts
index ac7940e..aba144a 100644
--- a/dist/service.d.ts
+++ b/dist/service.d.ts
@@ -9,8 +9,6 @@ export interface IServiceOptions {
 }
 
 export declare class Service {
-	public constructor(busId: string, activityManager?: ActivityManager, options?: IServiceOptions);
-
 	public readonly activityManager: ActivityManager;
 
 	public readonly busId: string;
@@ -27,6 +25,9 @@ export declare class Service {
 
 	public readonly subscriptions: { [id: string]: Message };
 
+	// @todo Need to "unified_service"
+	private readonly __serviceMainUnified: any;
+
 	public cleanupUnifiedDone: boolean;
 
 	// @todo Need to "palmbus"
@@ -45,8 +46,7 @@ export declare class Service {
 
 	public useACG: boolean;
 
-	// @todo Need to "unified_service"
-	private readonly __serviceMainUnified: any;
+	public constructor(busId: string, activityManager?: ActivityManager, options?: IServiceOptions);
 
 	public call(uri: string, args: Record<string, any>, callback: (message: Message) => void): void;
 
diff --git a/dist/subscription.d.ts b/dist/subscription.d.ts
index 3b803dd..5bc8394 100644
--- a/dist/subscription.d.ts
+++ b/dist/subscription.d.ts
@@ -1,7 +1,4 @@
 export declare class Subscription {
-	// @todo Need to "palmbus"
-	public constructor(handle: any, uri: string, args: Record<string, any>);
-
 	public readonly args: Record<string, any>;
 
 	// @todo Need to "palmbus"
@@ -12,5 +9,8 @@ export declare class Subscription {
 
 	public readonly uri: string;
 
+	// @todo Need to "palmbus"
+	public constructor(handle: any, uri: string, args: Record<string, any>);
+
 	public cancel(): void;
 }