Merge pull request #615 from pusher/unremove-previously-exported-types

Fix: Restore previously exported types

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 7.3.0
+
+* [FIXED] Restore previously exported types
+
 ## 7.2.0
 
 * [ADDED] Add support for subscription_count event

index.d.ts

@@ -1,20 +1,29 @@
 export {
   DeprecatedAuthOptions,
-  ChannelAuthorizerGenerator,
+  ChannelAuthorizerGenerator
 } from './types/src/core/auth/deprecated_channel_authorizer';
 export {
-  AuthOptions,
+  UserAuthenticationOptions,
+  ChannelAuthorizationOptions,
   ChannelAuthorizationHandler,
   UserAuthenticationHandler,
   ChannelAuthorizationCallback,
-  UserAuthenticationCallback,
+  UserAuthenticationCallback
 } from './types/src/core/auth/options';
-export { Options } from './types/src/core/options'
+export { Options } from './types/src/core/options';
 
-export {default as Channel} from './types/src/core/channels/channel';
-export {default as PresenceChannel} from './types/src/core/channels/presence_channel';
-export {default as Members} from './types/src/core/channels/members';
-export {default as  Runtime}  from './types/src/runtimes/interface'
-export {default as ConnectionManager}  from './types/src/core/connection/connection_manager'
+export { default as Channel } from './types/src/core/channels/channel';
+export { default as PresenceChannel } from './types/src/core/channels/presence_channel';
+export { default as Members } from './types/src/core/channels/members';
+export { default as Runtime } from './types/src/runtimes/interface';
+export { default as ConnectionManager } from './types/src/core/connection/connection_manager';
 
-export {default} from './types/src/core/pusher'
+export { default } from './types/src/core/pusher';
+
+// The following types are provided for backward compatability
+export {
+  DeprecatedAuthOptions as AuthOptions,
+  DeprecatedChannelAuthorizer as Authorizer,
+  ChannelAuthorizerGenerator as AuthorizerGenerator
+} from './types/src/core/auth/deprecated_channel_authorizer';
+export { ChannelAuthorizationCallback as AuthorizerCallback } from './types/src/core/auth/options';

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pusher-js",
-  "version": "7.2.0",
+  "version": "7.3.0",
   "description": "Pusher Channels JavaScript library for browsers, React Native, NodeJS and web workers",
   "main": "dist/node/pusher.js",
   "browser": "dist/web/pusher.js",

react-native/index.d.ts

@@ -1,8 +1,14 @@
 export {
-  Authorizer,
-  AuthOptions,
-  AuthorizerGenerator,
-  AuthorizerCallback,
+  DeprecatedAuthOptions,
+  ChannelAuthorizerGenerator
+} from '../types/src/core/auth/deprecated_channel_authorizer';
+export {
+  UserAuthenticationOptions,
+  ChannelAuthorizationOptions,
+  ChannelAuthorizationHandler,
+  UserAuthenticationHandler,
+  ChannelAuthorizationCallback,
+  UserAuthenticationCallback
 } from '../types/src/core/auth/options';
 export { Options } from '../types/src/core/options';
 
@@ -13,3 +19,11 @@ export { default as Runtime } from '../types/src/runtimes/interface';
 export { default as ConnectionManager } from '../types/src/core/connection/connection_manager';
 
 export { default } from '../types/src/core/pusher';
+
+// The following types are provided for backward compatability
+export {
+  DeprecatedAuthOptions as AuthOptions,
+  DeprecatedChannelAuthorizer as Authorizer,
+  ChannelAuthorizerGenerator as AuthorizerGenerator
+} from '../types/src/core/auth/deprecated_channel_authorizer';
+export { ChannelAuthorizationCallback as AuthorizerCallback } from '../types/src/core/auth/options';

src/core/auth/options.ts

@@ -51,14 +51,21 @@ export type AuthTransportCallback =
   | ChannelAuthorizationCallback
   | UserAuthenticationCallback;
 
-export interface AuthOptions<AuthHandler> {
+export interface AuthOptionsT<AuthHandler> {
   transport: 'ajax' | 'jsonp';
   endpoint: string;
   params?: any;
   headers?: any;
   customHandler?: AuthHandler;
 }
 
+export declare type UserAuthenticationOptions = AuthOptionsT<
+  UserAuthenticationHandler
+>;
+export declare type ChannelAuthorizationOptions = AuthOptionsT<
+  ChannelAuthorizationHandler
+>;
+
 export interface InternalAuthOptions {
   transport: 'ajax' | 'jsonp';
   endpoint: string;

src/core/config.ts

@@ -3,7 +3,7 @@ import Defaults from './defaults';
 import {
   ChannelAuthorizationHandler,
   UserAuthenticationHandler,
-  AuthOptions
+  ChannelAuthorizationOptions
 } from './auth/options';
 import UserAuthenticator from './auth/user_authenticator';
 import ChannelAuthorizer from './auth/channel_authorizer';
@@ -150,11 +150,8 @@ function buildUserAuthenticator(opts: Options): UserAuthenticationHandler {
   return UserAuthenticator(userAuthentication);
 }
 
-function buildChannelAuth(
-  opts: Options,
-  pusher
-): AuthOptions<ChannelAuthorizationHandler> {
-  let channelAuthorization: AuthOptions<ChannelAuthorizationHandler>;
+function buildChannelAuth(opts: Options, pusher): ChannelAuthorizationOptions {
+  let channelAuthorization: ChannelAuthorizationOptions;
   if ('channelAuthorization' in opts) {
     channelAuthorization = {
       ...Defaults.channelAuthorization,

src/core/defaults.ts

@@ -1,7 +1,6 @@
 import {
-  AuthOptions,
-  ChannelAuthorizationHandler,
-  UserAuthenticationHandler
+  ChannelAuthorizationOptions,
+  UserAuthenticationOptions
 } from './auth/options';
 import { AuthTransport } from './config';
 
@@ -22,8 +21,8 @@ export interface DefaultConfig {
   pongTimeout: number;
   unavailableTimeout: number;
   cluster: string;
-  userAuthentication: AuthOptions<UserAuthenticationHandler>;
-  channelAuthorization: AuthOptions<ChannelAuthorizationHandler>;
+  userAuthentication: UserAuthenticationOptions;
+  channelAuthorization: ChannelAuthorizationOptions;
 
   cdn_http?: string;
   cdn_https?: string;

src/core/options.ts

@@ -1,8 +1,7 @@
 import ConnectionManager from './connection/connection_manager';
 import {
-  AuthOptions,
-  ChannelAuthorizationHandler,
-  UserAuthenticationHandler
+  ChannelAuthorizationOptions,
+  UserAuthenticationOptions
 } from './auth/options';
 import {
   ChannelAuthorizerGenerator,
@@ -19,8 +18,8 @@ export interface Options {
   authTransport?: AuthTransport; // DEPRECATED use channelAuthorization instead
   authorizer?: ChannelAuthorizerGenerator; // DEPRECATED use channelAuthorization instead
 
-  channelAuthorization?: AuthOptions<ChannelAuthorizationHandler>;
-  userAuthentication?: AuthOptions<UserAuthenticationHandler>;
+  channelAuthorization?: ChannelAuthorizationOptions;
+  userAuthentication?: UserAuthenticationOptions;
 
   cluster?: string;
   enableStats?: boolean;

types/src/core/auth/options.d.ts

@@ -27,13 +27,15 @@ export interface UserAuthenticationHandler {
     (params: UserAuthenticationRequestParams, callback: UserAuthenticationCallback): void;
 }
 export declare type AuthTransportCallback = ChannelAuthorizationCallback | UserAuthenticationCallback;
-export interface AuthOptions<AuthHandler> {
+export interface AuthOptionsT<AuthHandler> {
     transport: 'ajax' | 'jsonp';
     endpoint: string;
     params?: any;
     headers?: any;
     customHandler?: AuthHandler;
 }
+export declare type UserAuthenticationOptions = AuthOptionsT<UserAuthenticationHandler>;
+export declare type ChannelAuthorizationOptions = AuthOptionsT<ChannelAuthorizationHandler>;
 export interface InternalAuthOptions {
     transport: 'ajax' | 'jsonp';
     endpoint: string;

types/src/core/defaults.d.ts

@@ -1,4 +1,4 @@
-import { AuthOptions, ChannelAuthorizationHandler, UserAuthenticationHandler } from './auth/options';
+import { ChannelAuthorizationOptions, UserAuthenticationOptions } from './auth/options';
 import { AuthTransport } from './config';
 export interface DefaultConfig {
     VERSION: string;
@@ -17,8 +17,8 @@ export interface DefaultConfig {
     pongTimeout: number;
     unavailableTimeout: number;
     cluster: string;
-    userAuthentication: AuthOptions<UserAuthenticationHandler>;
-    channelAuthorization: AuthOptions<ChannelAuthorizationHandler>;
+    userAuthentication: UserAuthenticationOptions;
+    channelAuthorization: ChannelAuthorizationOptions;
     cdn_http?: string;
     cdn_https?: string;
     dependency_suffix?: string;

types/src/core/options.d.ts

@@ -1,4 +1,4 @@
-import { AuthOptions, ChannelAuthorizationHandler, UserAuthenticationHandler } from './auth/options';
+import { ChannelAuthorizationOptions, UserAuthenticationOptions } from './auth/options';
 import { ChannelAuthorizerGenerator, DeprecatedAuthOptions } from './auth/deprecated_channel_authorizer';
 import { AuthTransport, Transport } from './config';
 import * as nacl from 'tweetnacl';
@@ -8,8 +8,8 @@ export interface Options {
     authEndpoint?: string;
     authTransport?: AuthTransport;
     authorizer?: ChannelAuthorizerGenerator;
-    channelAuthorization?: AuthOptions<ChannelAuthorizationHandler>;
-    userAuthentication?: AuthOptions<UserAuthenticationHandler>;
+    channelAuthorization?: ChannelAuthorizationOptions;
+    userAuthentication?: UserAuthenticationOptions;
     cluster?: string;
     enableStats?: boolean;
     disableStats?: boolean;

with-encryption/index.d.ts

@@ -1,8 +1,14 @@
 export {
-  Authorizer,
-  AuthOptions,
-  AuthorizerGenerator,
-  AuthorizerCallback
+  DeprecatedAuthOptions,
+  ChannelAuthorizerGenerator
+} from '../types/src/core/auth/deprecated_channel_authorizer';
+export {
+  ChannelAuthorizationOptions,
+  UserAuthenticationOptions,
+  ChannelAuthorizationHandler,
+  UserAuthenticationHandler,
+  ChannelAuthorizationCallback,
+  UserAuthenticationCallback
 } from '../types/src/core/auth/options';
 export { Options } from '../types/src/core/options';
 
@@ -13,3 +19,11 @@ export { default as Runtime } from '../types/src/runtimes/interface';
 export { default as ConnectionManager } from '../types/src/core/connection/connection_manager';
 
 export { default } from '../types/src/core/pusher';
+
+// The following types are provided for backward compatability
+export {
+  DeprecatedAuthOptions as AuthOptions,
+  DeprecatedChannelAuthorizer as Authorizer,
+  ChannelAuthorizerGenerator as AuthorizerGenerator
+} from '../types/src/core/auth/deprecated_channel_authorizer';
+export { ChannelAuthorizationCallback as AuthorizerCallback } from '../types/src/core/auth/options';

worker/index.d.ts

@@ -1,8 +1,14 @@
 export {
-  Authorizer,
-  AuthOptions,
-  AuthorizerGenerator,
-  AuthorizerCallback,
+  DeprecatedAuthOptions,
+  ChannelAuthorizerGenerator
+} from '../types/src/core/auth/deprecated_channel_authorizer';
+export {
+  ChannelAuthorizationOptions,
+  UserAuthenticationOptions,
+  ChannelAuthorizationHandler,
+  UserAuthenticationHandler,
+  ChannelAuthorizationCallback,
+  UserAuthenticationCallback
 } from '../types/src/core/auth/options';
 export { Options } from '../types/src/core/options';
 
@@ -13,3 +19,11 @@ export { default as Runtime } from '../types/src/runtimes/interface';
 export { default as ConnectionManager } from '../types/src/core/connection/connection_manager';
 
 export { default } from '../types/src/core/pusher';
+
+// The following types are provided for backward compatability
+export {
+  DeprecatedAuthOptions as AuthOptions,
+  DeprecatedChannelAuthorizer as Authorizer,
+  ChannelAuthorizerGenerator as AuthorizerGenerator
+} from '../types/src/core/auth/deprecated_channel_authorizer';
+export { ChannelAuthorizationCallback as AuthorizerCallback } from '../types/src/core/auth/options';