Introduce bundle exports (#3742)

* Introduce bundle exports

* Move memo

* Cleanup imports

* Move DoNotConstruct

packages/api-contract/src/base/Code.spec.ts

@@ -4,7 +4,7 @@
 import fs from 'fs';
 import path from 'path';
 
-import { decorateMethod } from '@polkadot/api/promise';
+import { decorateMethodPromise } from '@polkadot/api';
 
 import contractFlipper from '../../test/contracts/ink/flipper.contract.json';
 import abiFlipper from '../../test/contracts/ink/flipper.json';
@@ -16,13 +16,13 @@ const wasmFlipper = fs.readFileSync(path.join(__dirname, '../../test/contracts/i
 describe('Code', (): void => {
   it('can construct with an individual ABI/WASM combo', (): void => {
     expect(
-      () => new Code(mockApi, abiFlipper, wasmFlipper, decorateMethod)
+      () => new Code(mockApi, abiFlipper, wasmFlipper, decorateMethodPromise)
     ).not.toThrow();
   });
 
   it('can construct with an .contract ABI', (): void => {
     expect(
-      () => new Code(mockApi, contractFlipper, null, decorateMethod)
+      () => new Code(mockApi, contractFlipper, null, decorateMethodPromise)
     ).not.toThrow();
   });
 });

packages/api-contract/src/bundle.ts

@@ -0,0 +1,7 @@
+// Copyright 2017-2021 @polkadot/api-contract authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export { Abi } from './Abi';
+export { packageInfo } from './packageInfo';
+export { Blueprint as BlueprintPromise, Code as CodePromise, Contract as ContractPromise } from './promise';
+export { Blueprint as BlueprintRx, Code as CodeRx, Contract as ContractRx } from './rx';

packages/api-contract/src/index.ts

@@ -3,7 +3,4 @@
 
 import './detectPackage';
 
-export { Abi } from './Abi';
-export { packageInfo } from './packageInfo';
-export { Blueprint as BlueprintPromise, Code as CodePromise, Contract as ContractPromise } from './promise';
-export { Blueprint as BlueprintRx, Code as CodeRx, Contract as ContractRx } from './rx';
+export * from './bundle';

packages/api-contract/src/promise/Blueprint.ts

@@ -4,14 +4,13 @@
 import type { Hash } from '@polkadot/types/interfaces';
 import type { AnyJson } from '@polkadot/types/types';
 
-import { ApiPromise } from '@polkadot/api';
-import { decorateMethod } from '@polkadot/api/promise';
+import { ApiPromise, decorateMethodPromise } from '@polkadot/api';
 
 import { Abi } from '../Abi';
 import { Blueprint as BaseBlueprint } from '../base';
 
 export class Blueprint extends BaseBlueprint<'promise'> {
   constructor (api: ApiPromise, abi: AnyJson | Abi, codeHash: string | Hash) {
-    super(api, abi, codeHash, decorateMethod);
+    super(api, abi, codeHash, decorateMethodPromise);
   }
 }

packages/api-contract/src/promise/Code.ts

@@ -4,13 +4,13 @@
 import type { ApiPromise } from '@polkadot/api';
 import type { AnyJson } from '@polkadot/types/types';
 
-import { decorateMethod } from '@polkadot/api/promise';
+import { decorateMethodPromise } from '@polkadot/api';
 
 import { Abi } from '../Abi';
 import { Code as BaseCode } from '../base';
 
 export class Code extends BaseCode<'promise'> {
   constructor (api: ApiPromise, abi: AnyJson | Abi, wasm: Uint8Array | string | Buffer | null | undefined) {
-    super(api, abi, wasm, decorateMethod);
+    super(api, abi, wasm, decorateMethodPromise);
   }
 }

packages/api-contract/src/promise/Contract.ts

@@ -4,14 +4,13 @@
 import type { AccountId } from '@polkadot/types/interfaces';
 import type { AnyJson } from '@polkadot/types/types';
 
-import { ApiPromise } from '@polkadot/api';
-import { decorateMethod } from '@polkadot/api/promise';
+import { ApiPromise, decorateMethodPromise } from '@polkadot/api';
 
 import { Abi } from '../Abi';
 import { Contract as BaseContract } from '../base';
 
 export class Contract extends BaseContract<'promise'> {
   constructor (api: ApiPromise, abi: AnyJson | Abi, address: string | AccountId) {
-    super(api, abi, address, decorateMethod);
+    super(api, abi, address, decorateMethodPromise);
   }
 }

packages/api-contract/src/rx/Blueprint.ts

@@ -4,14 +4,13 @@
 import type { Hash } from '@polkadot/types/interfaces';
 import type { AnyJson } from '@polkadot/types/types';
 
-import { ApiRx } from '@polkadot/api';
-import { decorateMethod } from '@polkadot/api/rx';
+import { ApiRx, decorateMethodRx } from '@polkadot/api';
 
 import { Abi } from '../Abi';
 import { Blueprint as BaseBlueprint } from '../base';
 
 export class Blueprint extends BaseBlueprint<'rxjs'> {
   constructor (api: ApiRx, abi: AnyJson | Abi, codeHash: string | Hash) {
-    super(api, abi, codeHash, decorateMethod);
+    super(api, abi, codeHash, decorateMethodRx);
   }
 }

packages/api-contract/src/rx/Code.ts

@@ -4,13 +4,13 @@
 import type { ApiRx } from '@polkadot/api';
 import type { AnyJson } from '@polkadot/types/types';
 
-import { decorateMethod } from '@polkadot/api/rx';
+import { decorateMethodRx } from '@polkadot/api';
 
 import { Abi } from '../Abi';
 import { Code as BaseCode } from '../base';
 
 export class Code extends BaseCode<'rxjs'> {
   constructor (api: ApiRx, abi: AnyJson | Abi, wasm: Uint8Array | string | Buffer | null | undefined) {
-    super(api, abi, wasm, decorateMethod);
+    super(api, abi, wasm, decorateMethodRx);
   }
 }

packages/api-contract/src/rx/Contract.ts

@@ -4,14 +4,13 @@
 import type { AccountId } from '@polkadot/types/interfaces';
 import type { AnyJson } from '@polkadot/types/types';
 
-import { ApiRx } from '@polkadot/api';
-import { decorateMethod } from '@polkadot/api/rx';
+import { ApiRx, decorateMethodRx } from '@polkadot/api';
 
 import { Abi } from '../Abi';
 import { Contract as BaseContract } from '../base';
 
 export class Contract extends BaseContract<'rxjs'> {
   constructor (api: ApiRx, abi: AnyJson | Abi, address: string | AccountId) {
-    super(api, abi, address, decorateMethod);
+    super(api, abi, address, decorateMethodRx);
   }
 }