Adjust type generation to correctly cater for ambient definitions (#5034)

packages/types/src/types/augmentLookup.ts

@@ -1,6 +1,8 @@
 // Copyright 2017-2022 @polkadot/types authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+// import type lookup before we augment - in some environments
+// this is required to allow for ambient/previous definitions
 import '@polkadot/types-create/types/lookup';
 
 import type { Vec } from '@polkadot/types-codec';

packages/types/src/types/augmentRegistry.ts

@@ -1,8 +1,10 @@
 // Copyright 2017-2022 @polkadot/types authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import '@polkadot/types-create/types/augmentRegistry';
+// import type lookup before we augment - in some environments
+// this is required to allow for ambient/previous definitions
 import '@polkadot/types-codec/types/registry';
+import '@polkadot/types-create/types/augmentRegistry';
 
 import type { Codec, CodecClass } from '@polkadot/types-codec/types';
 import type { TypeDef } from '@polkadot/types-create/types';

packages/types/src/types/index.ts

@@ -1,13 +1,17 @@
 // Copyright 2017-2022 @polkadot/types authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+// augment our internal Lookup & Registry interfaces
 import './augmentLookup';
 import './augmentRegistry';
 
-// used inside augmented definitions
-export type { Observable } from 'rxjs';
+// augmented exports
 export * from '@polkadot/types/types/registry';
 
+// used inside augmented definitions
+export type { Observable } from 'rxjs';
+
+// other exports
 export * from '../create/types';
 export * from './calls';
 export * from './codec';
@@ -16,4 +20,3 @@ export * from './detect';
 export * from './events';
 export * from './extrinsic';
 export * from './interfaces';
-export * from './registry';