Align augmentation with an import-first approach (#5032)

packages/api-augment/src/kusama/consts.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/consts';
+
 import type { ApiTypes, AugmentedConst } from '@polkadot/api-base/types';
 import type { Bytes, Option, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { Codec } from '@polkadot/types-codec/types';

packages/api-augment/src/kusama/errors.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/errors';
+
 import type { ApiTypes, AugmentedError } from '@polkadot/api-base/types';
 
 export type __AugmentedError<ApiType extends ApiTypes> = AugmentedError<ApiType>;

packages/api-augment/src/kusama/events.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/events';
+
 import type { ApiTypes, AugmentedEvent } from '@polkadot/api-base/types';
 import type { Bytes, Null, Option, Result, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { ITuple } from '@polkadot/types-codec/types';

packages/api-augment/src/kusama/query.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/storage';
+
 import type { ApiTypes, AugmentedQuery, QueryableStorageEntry } from '@polkadot/api-base/types';
 import type { Data } from '@polkadot/types';
 import type { BTreeMap, Bytes, Null, Option, U8aFixed, Vec, WrapperKeepOpaque, WrapperOpaque, bool, u128, u32, u64 } from '@polkadot/types-codec';

packages/api-augment/src/kusama/runtime.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import  '@polkadot/api-base/types/calls';
+
 import type { ApiTypes, AugmentedCall, DecoratedCallBase } from '@polkadot/api-base/types';
 import type { Bytes, Null, Option, Result, Vec, bool, u32 } from '@polkadot/types-codec';
 import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';

packages/api-augment/src/kusama/tx.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/submittable';
+
 import type { ApiTypes, AugmentedSubmittable, SubmittableExtrinsic, SubmittableExtrinsicFunction } from '@polkadot/api-base/types';
 import type { Data } from '@polkadot/types';
 import type { Bytes, Compact, Option, U8aFixed, Vec, WrapperKeepOpaque, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';

packages/api-augment/src/polkadot/consts.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/consts';
+
 import type { ApiTypes, AugmentedConst } from '@polkadot/api-base/types';
 import type { Bytes, Option, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { Codec } from '@polkadot/types-codec/types';

packages/api-augment/src/polkadot/errors.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/errors';
+
 import type { ApiTypes, AugmentedError } from '@polkadot/api-base/types';
 
 export type __AugmentedError<ApiType extends ApiTypes> = AugmentedError<ApiType>;

packages/api-augment/src/polkadot/events.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/events';
+
 import type { ApiTypes, AugmentedEvent } from '@polkadot/api-base/types';
 import type { Bytes, Null, Option, Result, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { ITuple } from '@polkadot/types-codec/types';

packages/api-augment/src/polkadot/query.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/storage';
+
 import type { ApiTypes, AugmentedQuery, QueryableStorageEntry } from '@polkadot/api-base/types';
 import type { Data } from '@polkadot/types';
 import type { BTreeMap, Bytes, Null, Option, U8aFixed, Vec, WrapperKeepOpaque, WrapperOpaque, bool, u128, u32, u64 } from '@polkadot/types-codec';

packages/api-augment/src/polkadot/runtime.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import  '@polkadot/api-base/types/calls';
+
 import type { ApiTypes, AugmentedCall, DecoratedCallBase } from '@polkadot/api-base/types';
 import type { Bytes, Null, Option, Result, Vec, bool, u32 } from '@polkadot/types-codec';
 import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';

packages/api-augment/src/polkadot/tx.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/submittable';
+
 import type { ApiTypes, AugmentedSubmittable, SubmittableExtrinsic, SubmittableExtrinsicFunction } from '@polkadot/api-base/types';
 import type { Data } from '@polkadot/types';
 import type { Bytes, Compact, Option, U8aFixed, Vec, WrapperKeepOpaque, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';

packages/api-augment/src/substrate/consts.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/consts';
+
 import type { ApiTypes, AugmentedConst } from '@polkadot/api-base/types';
 import type { Option, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { Codec } from '@polkadot/types-codec/types';

packages/api-augment/src/substrate/errors.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/errors';
+
 import type { ApiTypes, AugmentedError } from '@polkadot/api-base/types';
 
 export type __AugmentedError<ApiType extends ApiTypes> = AugmentedError<ApiType>;

packages/api-augment/src/substrate/events.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/events';
+
 import type { ApiTypes, AugmentedEvent } from '@polkadot/api-base/types';
 import type { Bytes, Null, Option, Result, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { ITuple } from '@polkadot/types-codec/types';

packages/api-augment/src/substrate/query.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/storage';
+
 import type { ApiTypes, AugmentedQuery, QueryableStorageEntry } from '@polkadot/api-base/types';
 import type { Data } from '@polkadot/types';
 import type { BTreeMap, Bytes, Null, Option, U8aFixed, Vec, WrapperKeepOpaque, WrapperOpaque, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';

packages/api-augment/src/substrate/runtime.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import  '@polkadot/api-base/types/calls';
+
 import type { ApiTypes, AugmentedCall, DecoratedCallBase } from '@polkadot/api-base/types';
 import type { Bytes, Null, Option, Result, Vec, u32, u64 } from '@polkadot/types-codec';
 import type { AnyNumber, ITuple } from '@polkadot/types-codec/types';

packages/api-augment/src/substrate/tx.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/api-base/types/submittable';
+
 import type { ApiTypes, AugmentedSubmittable, SubmittableExtrinsic, SubmittableExtrinsicFunction } from '@polkadot/api-base/types';
 import type { Data } from '@polkadot/types';
 import type { Bytes, Compact, Option, U8aFixed, Vec, WrapperKeepOpaque, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';

packages/rpc-augment/src/augment/jsonrpc.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-chain`, do not edit
 /* eslint-disable */
 
+import '@polkadot/rpc-core/types/jsonrpc';
+
 import type { AugmentedRpc } from '@polkadot/rpc-core/types';
 import type { Metadata, StorageKey } from '@polkadot/types';
 import type { Bytes, HashMap, Json, Null, Option, Text, U256, U64, Vec, bool, f64, u32, u64 } from '@polkadot/types-codec';

packages/typegen/src/templates/calls.hbs

@@ -1,5 +1,7 @@
 {{> header }}
 
+import  '@polkadot/api-base/types/calls';
+
 {{{ importsAll }}}
 
 export type __AugmentedCall<ApiType extends ApiTypes> = AugmentedCall<ApiType>;

packages/typegen/src/templates/consts.hbs

@@ -1,5 +1,7 @@
 {{> header }}
 
+import '@polkadot/api-base/types/consts';
+
 {{{ importsAll }}}
 
 export type __AugmentedConst<ApiType extends ApiTypes> = AugmentedConst<ApiType>;

packages/typegen/src/templates/errors.hbs

@@ -1,5 +1,7 @@
 {{> header }}
 
+import '@polkadot/api-base/types/errors';
+
 {{{ importsAll }}}
 
 export type __AugmentedError<ApiType extends ApiTypes> = AugmentedError<ApiType>;

packages/typegen/src/templates/events.hbs

@@ -1,5 +1,7 @@
 {{> header }}
 
+import '@polkadot/api-base/types/events';
+
 {{{ importsAll }}}
 
 export type __AugmentedEvent<ApiType extends ApiTypes> = AugmentedEvent<ApiType>;

packages/typegen/src/templates/interfaceRegistry.hbs

@@ -1,5 +1,7 @@
 {{> header }}
 
+import '@polkadot/types/types/registry';
+
 {{{ importsAll }}}
 
 declare module '@polkadot/types/types/registry' {

packages/typegen/src/templates/lookup/types.hbs

@@ -1,5 +1,7 @@
 {{> header }}
 
+import '@polkadot/types/lookup';
+
 {{{ importsAll }}}
 
 declare module '@polkadot/types/lookup' {

packages/typegen/src/templates/query.hbs

@@ -1,5 +1,7 @@
 {{> header }}
 
+import '@polkadot/api-base/types/storage';
+
 {{{ importsAll }}}
 
 export type __AugmentedQuery<ApiType extends ApiTypes> = AugmentedQuery<ApiType, () => unknown>;

packages/typegen/src/templates/rpc.hbs

@@ -1,5 +1,7 @@
 {{> header }}
 
+import '@polkadot/rpc-core/types/jsonrpc';
+
 {{{ importsAll }}}
 
 declare module '@polkadot/rpc-core/types/jsonrpc' {

packages/typegen/src/templates/tx.hbs

@@ -1,5 +1,7 @@
 {{> header }}
 
+import '@polkadot/api-base/types/submittable';
+
 {{{ importsAll }}}
 
 export type __AugmentedSubmittable = AugmentedSubmittable<() => unknown>;

packages/types-augment/src/lookup/types-kusama.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
+import '@polkadot/types/lookup';
+
 import type { Compact, Enum, Null, Struct, Vec, u16, u32 } from '@polkadot/types-codec';
 import type { ITuple } from '@polkadot/types-codec/types';
 import type { PerU16 } from '@polkadot/types/interfaces/runtime';

packages/types-augment/src/lookup/types-polkadot.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
+import '@polkadot/types/lookup';
+
 import type { BitVec, Bytes, Compact, Enum, Null, Option, Result, Struct, U8aFixed, Vec, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { ITuple } from '@polkadot/types-codec/types';
 import type { EthereumAddress } from '@polkadot/types/interfaces/eth';

packages/types-augment/src/lookup/types-substrate.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
+import '@polkadot/types/lookup';
+
 import type { Data } from '@polkadot/types';
 import type { BTreeMap, Bytes, Compact, Enum, Null, Option, Result, Set, Struct, Text, U256, U8aFixed, Vec, WrapperKeepOpaque, bool, u128, u16, u32, u64, u8 } from '@polkadot/types-codec';
 import type { ITuple } from '@polkadot/types-codec/types';

packages/types-augment/src/registry/interfaces.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
+import '@polkadot/types/types/registry';
+
 import type { Data, StorageKey } from '@polkadot/types';
 import type { BitVec, Bool, Bytes, F32, F64, I128, I16, I256, I32, I64, I8, Json, Null, OptionBool, Raw, Text, Type, U128, U16, U256, U32, U64, U8, USize, bool, f32, f64, i128, i16, i256, i32, i64, i8, u128, u16, u256, u32, u64, u8, usize } from '@polkadot/types-codec';
 import type { AssetApproval, AssetApprovalKey, AssetBalance, AssetDestroyWitness, AssetDetails, AssetMetadata, TAssetBalance, TAssetDepositBalance } from '@polkadot/types/interfaces/assets';

packages/types-augment/src/registry/kusama.ts

@@ -1,6 +1,8 @@
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
 
+import '@polkadot/types/types/registry';
+
 import type { KusamaRuntimeNposCompactSolution24, KusamaRuntimeOriginCaller, KusamaRuntimeProxyType, KusamaRuntimeRuntime, KusamaRuntimeSessionKeys } from '@polkadot/types/lookup';
 
 declare module '@polkadot/types/types/registry' {

packages/types-create/src/types/augmentRegistry.ts

@@ -1,11 +1,13 @@
 // Copyright 2017-2022 @polkadot/types-create authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import '@polkadot/types-codec/types/registry';
+
 import type { Codec, CodecClass, ICompact, INumber } from '@polkadot/types-codec/types';
 import type { ILookup, TypeDef } from '@polkadot/types-create/types';
 
 declare module '@polkadot/types-codec/types/registry' {
-  export interface Registry {
+  interface Registry {
     readonly lookup: ILookup;
 
     createLookupType (lookupId: ICompact<INumber> | number): string;

packages/types/src/types/augmentLookup.ts

@@ -1,13 +1,15 @@
 // Copyright 2017-2022 @polkadot/types authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import '@polkadot/types-create/types/lookup';
+
 import type { Vec } from '@polkadot/types-codec';
 import type { TypeDef } from '@polkadot/types-create/types';
 import type { PortableType } from '../interfaces/metadata';
 import type { SiLookupTypeId, SiType } from '../interfaces/scaleInfo';
 
 declare module '@polkadot/types-create/types/lookup' {
-  export interface ILookup {
+  interface ILookup {
     readonly names: string[];
     readonly types: Vec<PortableType>;
 

packages/types/src/types/augmentRegistry.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import '@polkadot/types-create/types/augmentRegistry';
+import '@polkadot/types-codec/types/registry';
 
 import type { Codec, CodecClass } from '@polkadot/types-codec/types';
 import type { TypeDef } from '@polkadot/types-create/types';
@@ -15,11 +16,11 @@ import type { DetectCodec } from './detect';
 import type { CodecHasher, RegisteredTypes } from './registry';
 
 declare module '@polkadot/types-codec/types/registry' {
-  export interface RegistryError {
+  interface RegistryError {
     fields: SiField[];
   }
 
-  export interface Registry {
+  interface Registry {
     readonly firstCallIndex: Uint8Array;
     readonly knownTypes: RegisteredTypes;
     readonly metadata: MetadataLatest;