Browse Source

Merge pull request #5 from Lezek123/js-playground-inject-joy-types

Prevent namespace conflicts
Mokhtar Naamani 4 years ago
parent
commit
c0970d01a9
1 changed files with 50 additions and 48 deletions
  1. 50 48
      types/src/index.ts

+ 50 - 48
types/src/index.ts

@@ -1,39 +1,41 @@
 
 import { getTypeRegistry } from "@polkadot/types";
 
-import { registerCommonTypes } from "./common";
-import { registerMembershipTypes } from "./members";
-import { registerCouncilAndElectionTypes } from "./council";
-import { registerRolesTypes } from "./roles";
-import { registerForumTypes } from "./forum";
-import { registerStakeTypes } from "./stake";
-import { registerMintTypes } from "./mint";
-import { registerRecurringRewardsTypes } from "./recurring-rewards";
-import { registerHiringTypes } from "./hiring";
-import { registerVersionedStoreTypes } from "./versioned-store";
-import { registerVersionedStorePermissionsTypes } from "./versioned-store/permissions";
-import { registerContentWorkingGroupTypes } from "./content-working-group";
-import { registerWorkingGroupTypes } from "./working-group";
-import { registerDiscoveryTypes } from "./discovery";
-import { registerMediaTypes } from "./media";
-import { registerProposalTypes } from "./proposals";
+import * as common from "./common";
+import * as members from "./members";
+import * as council from "./council";
+import * as roles from "./roles";
+import * as forum from "./forum";
+import * as stake from "./stake";
+import * as mint from "./mint";
+import * as recurringRewards from "./recurring-rewards";
+import * as hiring from "./hiring";
+import * as versionedStore from "./versioned-store";
+import * as versionedStorePermissions from "./versioned-store/permissions";
+import * as contentWorkingGroup from "./content-working-group";
+import * as workingGroup from "./working-group";
+import * as discovery from "./discovery";
+import * as media from "./media";
+import * as proposals from "./proposals";
 
-export * from "./common";
-export * from "./members";
-export * from "./council";
-export * from "./roles";
-export * from "./forum";
-export * from "./stake";
-export * from "./mint";
-export * from "./recurring-rewards";
-// export * from "./hiring"; // name clashes with working-group
-export * from "./versioned-store";
-export * from "./versioned-store/permissions";
-// export * from "./content-working-group"; // clashes with content-working-group
-export * from "./working-group";
-export * from "./discovery";
-export * from "./media";
-export * from "./proposals";
+export {
+  common,
+  members,
+  council,
+  roles,
+  forum,
+  stake,
+  mint,
+  recurringRewards,
+  hiring,
+  versionedStore,
+  versionedStorePermissions,
+  contentWorkingGroup,
+  workingGroup,
+  discovery,
+  media,
+  proposals
+};
 
 export function registerJoystreamTypes() {
   const typeRegistry = getTypeRegistry();
@@ -42,20 +44,20 @@ export function registerJoystreamTypes() {
     MemoText: "Text", // for the memo module
   });
 
-  registerCommonTypes();
-  registerMembershipTypes();
-  registerCouncilAndElectionTypes();
-  registerRolesTypes();
-  registerForumTypes();
-  registerStakeTypes();
-  registerMintTypes();
-  registerRecurringRewardsTypes();
-  registerHiringTypes();
-  registerVersionedStoreTypes();
-  registerVersionedStorePermissionsTypes();
-  registerContentWorkingGroupTypes();
-  registerWorkingGroupTypes();
-  registerDiscoveryTypes();
-  registerMediaTypes();
-  registerProposalTypes();
+  common.registerCommonTypes();
+  members.registerMembershipTypes();
+  council.registerCouncilAndElectionTypes();
+  roles.registerRolesTypes();
+  forum.registerForumTypes();
+  stake.registerStakeTypes();
+  mint.registerMintTypes();
+  recurringRewards.registerRecurringRewardsTypes();
+  hiring.registerHiringTypes();
+  versionedStore.registerVersionedStoreTypes();
+  versionedStorePermissions.registerVersionedStorePermissionsTypes();
+  contentWorkingGroup.registerContentWorkingGroupTypes();
+  workingGroup.registerWorkingGroupTypes();
+  discovery.registerDiscoveryTypes();
+  media.registerMediaTypes();
+  proposals.registerProposalTypes();
 }