Merge pull request #443 from cosmology-tech/resolve-circular-deps

Resolve circular deps
cosmology-tech · Aug 16, 2023 · 782347a · 782347a
2 parents f2440c1 + 1b168ca
commit 782347a
Show file tree

Hide file tree

Showing 76 changed files with 619 additions and 524 deletions.
diff --git a/packages/ast/package.json b/packages/ast/package.json
@@ -84,13 +84,13 @@
     "regenerator-runtime": "^0.13.11",
     "rimraf": "5.0.0",
     "ts-jest": "^29.1.0",
-    "typescript": "5.0.4"
+    "typescript": "5.0.4",
+    "@cosmology/proto-parser": "^0.47.0"
   },
   "dependencies": {
     "@babel/parser": "^7.21.4",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "7.21.4",
-    "@cosmology/proto-parser": "^0.47.0",
     "@cosmology/types": "^0.38.0",
     "@cosmology/utils": "^0.13.0",
     "case": "1.6.3",

diff --git a/packages/ast/src/clients/lcd/aggregated/aggregated.test.ts b/packages/ast/src/clients/lcd/aggregated/aggregated.test.ts
@@ -1,7 +1,8 @@
 import {
     createAggregatedLCDClient,
 } from '../class';
-import { ProtoStore, traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { defaultTelescopeOptions, ProtoRef, ProtoService } from '@cosmology/types';
 import generate from '@babel/generator';
 import { GenericParseContext } from '../../../encoding';

diff --git a/packages/ast/src/clients/lcd/aggregated/convert.test.ts b/packages/ast/src/clients/lcd/aggregated/convert.test.ts
@@ -1,5 +1,6 @@
 import { createAggregatedLCDClient } from '../class';
-import { ProtoStore, traverse, getNestedProto } from '@cosmology/proto-parser';
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils';
 import {
   defaultTelescopeOptions,
   ProtoRef,

diff --git a/packages/ast/src/clients/lcd/class/lcd.arrowFunc.test.ts b/packages/ast/src/clients/lcd/class/lcd.arrowFunc.test.ts
@@ -1,5 +1,6 @@
 import { createLCDClient } from './lcd';
-import { traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { ProtoService } from '@cosmology/types';
 import { GenericParseContext } from '../../../encoding';
 import { getTestProtoStore, expectCode } from '../../../../test-utils';

diff --git a/packages/ast/src/clients/lcd/class/lcd.keepCase.test.ts b/packages/ast/src/clients/lcd/class/lcd.keepCase.test.ts
@@ -4,7 +4,8 @@ import {
     createLCDClient,
     makeTemplateTagLegacy
 } from './lcd';
-import { ProtoStore, traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { defaultTelescopeOptions, ProtoService } from '@cosmology/types';
 import generate from '@babel/generator';
 import { GenericParseContext } from '../../../encoding';

diff --git a/packages/ast/src/clients/lcd/class/lcd.test.ts b/packages/ast/src/clients/lcd/class/lcd.test.ts
@@ -4,7 +4,8 @@ import {
     createLCDClient,
     makeTemplateTagLegacy
 } from './lcd';
-import { ProtoStore, traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { defaultTelescopeOptions, ProtoService } from '@cosmology/types';
 import generate from '@babel/generator';
 import { GenericParseContext } from '../../../encoding';

diff --git a/packages/ast/src/clients/rpc/class/grpc-gateway/grpc-gateway.msg.test.ts b/packages/ast/src/clients/rpc/class/grpc-gateway/grpc-gateway.msg.test.ts
@@ -1,4 +1,5 @@
-import { ProtoStore, traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { defaultTelescopeOptions, ProtoService } from '@cosmology/types';
 import { expectCode, getTestProtoStore, printCode } from '../../../../../test-utils';
 import { GenericParseContext } from '../../../../encoding';
@@ -16,5 +17,5 @@ it('GRPC-Gateway Msg Client', () => {
 });
 
 
-// use static in interface declaration: 
+// use static in interface declaration:
 // https://stackoverflow.com/questions/13955157/how-to-define-static-property-in-typescript-interface
diff --git a/packages/ast/src/clients/rpc/class/grpc-gateway/grpc-gateway.query.test.ts b/packages/ast/src/clients/rpc/class/grpc-gateway/grpc-gateway.query.test.ts
@@ -1,4 +1,5 @@
-import { ProtoStore, traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { defaultTelescopeOptions, ProtoService } from '@cosmology/types';
 import { expectCode, getTestProtoStore, printCode } from '../../../../../test-utils';
 import { GenericParseContext } from '../../../../encoding';

diff --git a/packages/ast/src/clients/rpc/class/grpc-web/grpc-web.msg.test.ts b/packages/ast/src/clients/rpc/class/grpc-web/grpc-web.msg.test.ts
@@ -1,4 +1,5 @@
-import { ProtoStore, traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { defaultTelescopeOptions, ProtoService } from '@cosmology/types';
 import { expectCode, getTestProtoStore, printCode } from '../../../../../test-utils';
 import { GenericParseContext } from '../../../../encoding';

diff --git a/packages/ast/src/clients/rpc/class/grpc-web/grpc-web.query.test.ts b/packages/ast/src/clients/rpc/class/grpc-web/grpc-web.query.test.ts
@@ -1,4 +1,5 @@
-import { ProtoStore, traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { defaultTelescopeOptions, ProtoService } from '@cosmology/types';
 import { expectCode, getTestProtoStore, printCode } from '../../../../../test-utils';
 import { GenericParseContext } from '../../../../encoding';

diff --git a/packages/ast/src/clients/rpc/class/tendermint/rpc.arrowFunc.test.ts b/packages/ast/src/clients/rpc/class/tendermint/rpc.arrowFunc.test.ts
@@ -1,4 +1,5 @@
-import { traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { ProtoService } from '@cosmology/types';
 import { expectCode, getTestProtoStore, printCode } from '../../../../../test-utils';
 import { GenericParseContext } from '../../../../encoding';

diff --git a/packages/ast/src/clients/rpc/class/tendermint/rpc.msg.test.ts b/packages/ast/src/clients/rpc/class/tendermint/rpc.msg.test.ts
@@ -1,4 +1,5 @@
-import { ProtoStore, traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { defaultTelescopeOptions, ProtoService } from '@cosmology/types';
 import { expectCode, getTestProtoStore, printCode } from '../../../../../test-utils';
 import { GenericParseContext } from '../../../../encoding';

diff --git a/packages/ast/src/clients/rpc/class/tendermint/rpc.query.test.ts b/packages/ast/src/clients/rpc/class/tendermint/rpc.query.test.ts
@@ -1,4 +1,5 @@
-import { ProtoStore, traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { defaultTelescopeOptions, ProtoService } from '@cosmology/types';
 import { expectCode, getTestProtoStore, printCode } from '../../../../../test-utils';
 import { GenericParseContext } from '../../../../encoding';

diff --git a/packages/ast/src/clients/rpc/class/tendermint/rpc.service.test.ts b/packages/ast/src/clients/rpc/class/tendermint/rpc.service.test.ts
@@ -1,4 +1,5 @@
-import { ProtoStore, traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { defaultTelescopeOptions, ProtoService } from '@cosmology/types';
 import { expectCode, getTestProtoStore, printCode } from '../../../../../test-utils';
 import { GenericParseContext } from '../../../../encoding';

diff --git a/packages/ast/src/clients/rpc/extension/rpc.extension.test.ts b/packages/ast/src/clients/rpc/extension/rpc.extension.test.ts
@@ -1,4 +1,5 @@
-import { traverse, getNestedProto } from '@cosmology/proto-parser'
+import { traverse } from '@cosmology/proto-parser'
+import { getNestedProto } from '@cosmology/utils'
 import { defaultTelescopeOptions, ProtoService } from '@cosmology/types';
 import { expectCode, getTestProtoStore } from '../../../../test-utils';
 import { GenericParseContext } from '../../../encoding';