Adjust generation sorting (#3785)

packages/typegen/src/generate/consts.ts

@@ -24,7 +24,6 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes,
     }, {});
 
     const modules = meta.asLatest.modules
-      .sort(compareName)
       .filter((mod) => mod.constants.length > 0)
       .map(({ constants, name }) => {
         if (!isStrict) {
@@ -32,7 +31,6 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes,
         }
 
         const items = constants
-          .sort(compareName)
           .map(({ docs, name, type }) => {
             const returnType = formatType(allDefs, type.toString(), imports);
 
@@ -43,13 +41,15 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes,
               name: stringCamelCase(name),
               type: returnType
             };
-          });
+          })
+          .sort(compareName);
 
         return {
           items,
           name: stringCamelCase(name)
         };
-      });
+      })
+      .sort(compareName);
 
     const types = [
       ...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({

packages/typegen/src/generate/errors.ts

@@ -19,17 +19,17 @@ function generateForMeta (meta: Metadata, dest: string, isStrict: boolean): void
     const imports = createImports({});
 
     const modules = meta.asLatest.modules
-      .sort(compareName)
       .filter((mod) => mod.errors.length > 0)
       .map(({ errors, name }) => ({
         items: errors
-          .sort(compareName)
           .map(({ docs, name }) => ({
             docs,
             name: name.toString()
-          })),
+          }))
+          .sort(compareName),
         name: stringCamelCase(name)
-      }));
+      }))
+      .sort(compareName);
 
     const types = [
       {

packages/typegen/src/generate/events.ts

@@ -24,7 +24,6 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes,
     }, {});
 
     const modules = meta.asLatest.modules
-      .sort(compareName)
       .filter((mod) => mod.events.isSome)
       .map(({ events, name }) => ({
         items: events
@@ -40,9 +39,10 @@ function generateForMeta (meta: Metadata, dest: string, extraTypes: ExtraTypes,
               name: name.toString(),
               type: types.join(', ')
             };
-          }),
+          }).sort(compareName),
         name: stringCamelCase(name)
-      }));
+      }))
+      .sort(compareName);
 
     const types = [
       ...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({

packages/typegen/src/generate/query.ts

@@ -101,7 +101,6 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
       .filter((mod) => !mod.storage.isNone)
       .map(({ name, storage }) => {
         const items = storage.unwrap().items
-          .sort(compareName)
           .map((storageEntry) => {
             const [args, params, returnType] = entrySignature(allDefs, registry, storageEntry, imports);
 
@@ -113,13 +112,15 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
               params,
               returnType
             };
-          });
+          })
+          .sort(compareName);
 
         return {
           items,
           name: stringCamelCase(name)
         };
-      });
+      })
+      .sort(compareName);
 
     imports.typesTypes.Observable = true;
 

packages/typegen/src/generate/tx.ts

@@ -37,13 +37,11 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
     }, {});
 
     const modules = meta.asLatest.modules
-      .sort(compareName)
       .filter(({ calls }) => calls.unwrapOr([]).length !== 0)
       .map(({ calls, name }) => {
         setImports(allDefs, imports, ['Call', 'Extrinsic', 'SubmittableExtrinsic']);
 
         const items = calls.unwrap()
-          .sort(compareName)
           .map(({ args, docs, name }) => {
             const params = args
               .map(({ name, type }) => {
@@ -62,13 +60,15 @@ function generateForMeta (registry: Registry, meta: Metadata, dest: string, extr
               name: stringCamelCase(name),
               params
             };
-          });
+          })
+          .sort(compareName);
 
         return {
           items,
           name: stringCamelCase(name)
         };
-      });
+      })
+      .sort(compareName);
 
     const types = [
       ...Object.keys(imports.localTypes).sort().map((packagePath): { file: string; types: string[] } => ({