feat: uniform query return types

neutron-org · Apr 8, 2024 · 99179b2 · 99179b2
1 parent 17ee8a6
commit 99179b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -20,6 +20,7 @@
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-var-requires": "off",
     "@typescript-eslint/no-empty-interface": "off",
+    "@typescript-eslint/ban-types": "off",
     "@typescript-eslint/no-unused-vars": [
       "error",
       { "ignoreRestSiblings": true }

diff --git a/lib/schemaToTs.js b/lib/schemaToTs.js
@@ -50,11 +50,9 @@ import { StdFee } from "@cosmjs/amino";
         };
         for (const [fnName, value] of Object.entries(file.responses)) {
             const title = value.title;
-            const newTitle = lodash_1.default.upperFirst(title
-                .replace(/Array_of_/, 'ArrayOf')
-                .replace(/Tuple_of/, 'TupleOf')
-                .replace(/_and_/, 'And_'));
-            log(value.title);
+            log('old title', title);
+            const newTitle = lodash_1.default.upperFirst(lodash_1.default.camelCase(title));
+            log('new title', newTitle);
             fixEnum(value);
             if (value.title === 'Coin') {
                 hasCoin = true;
@@ -124,10 +122,7 @@ export class Client {
         let wasRequired = false;
         for (const query of file.query.oneOf) {
             const queryName = query.required ? query.required[0] : query.enum[0];
-            const outType = queryMap[queryName]
-                .replace('_for_', 'For_')
-                .replace('_of_', 'Of_')
-                .replace('_and_', 'And_');
+            const outType = queryMap[queryName];
             const inType = query.properties && query.properties[queryName];
             log('generating query', queryName);
             if (inType && inType.properties) {

diff --git a/src/schemaToTs.ts b/src/schemaToTs.ts
@@ -55,13 +55,9 @@ import { StdFee } from "@cosmjs/amino";
     };
     for (const [fnName, value] of Object.entries(file.responses)) {
       const title = (value as any).title;
-      const newTitle = _.upperFirst(
-        title
-          .replace(/Array_of_/, 'ArrayOf')
-          .replace(/Tuple_of/, 'TupleOf')
-          .replace(/_and_/, 'And_'),
-      );
-      log((value as any).title);
+      log('old title', title);
+      const newTitle = _.upperFirst(_.camelCase(title));
+      log('new title', newTitle);
       fixEnum(value);
       if ((value as any).title === 'Coin') {
         hasCoin = true;
@@ -133,10 +129,7 @@ export class Client {
     let wasRequired = false;
     for (const query of file.query.oneOf) {
       const queryName = query.required ? query.required[0] : query.enum[0];
-      const outType = queryMap[queryName]
-        .replace('_for_', 'For_')
-        .replace('_of_', 'Of_')
-        .replace('_and_', 'And_');
+      const outType = queryMap[queryName];
       const inType = query.properties && query.properties[queryName];
       log('generating query', queryName);
       if (inType && inType.properties) {