export json types from utils package

Author: dynst

.pnp.cjs

@@ -39,6 +39,7 @@
   },
   "dependencies": {
     "@cosmjs/stream": "workspace:^",
+    "@cosmjs/utils": "workspace:^",
     "xstream": "^11.14.0"
   },
   "devDependencies": {

packages/json-rpc/package.json

@@ -4,7 +4,8 @@ import {
   isJsonCompatibleValue,
   JsonCompatibleDictionary,
   JsonCompatibleValue,
-} from "./compatibility";
+} from "@cosmjs/utils";
+
 import {
   JsonRpcError,
   JsonRpcErrorResponse,

packages/json-rpc/src/parse.ts

@@ -1,4 +1,4 @@
-import { JsonCompatibleArray, JsonCompatibleDictionary, JsonCompatibleValue } from "./compatibility";
+import type { JsonCompatibleArray, JsonCompatibleDictionary, JsonCompatibleValue } from "@cosmjs/utils";
 
 export type JsonRpcId = number | string;
 

packages/json-rpc/src/types.ts

@@ -2,7 +2,8 @@
 
 // for testing only
 
-import { isJsonCompatibleDictionary } from "../compatibility";
+import { isJsonCompatibleDictionary } from "@cosmjs/utils";
+
 import { parseJsonRpcId, parseJsonRpcRequest } from "../parse";
 import {
   jsonRpcCode,

packages/json-rpc/src/workers/dummyservice.worker.ts

@@ -1,4 +1,6 @@
 export { arrayContentEquals, arrayContentStartsWith } from "./arrays";
 export { assert, assertDefined, assertDefinedAndNotNull } from "./assert";
+export type { JsonCompatibleArray, JsonCompatibleDictionary, JsonCompatibleValue } from "./json";
+export { isJsonCompatibleArray, isJsonCompatibleDictionary, isJsonCompatibleValue } from "./json";
 export { sleep } from "./sleep";
 export { isDefined, isNonNullObject, isUint8Array } from "./typechecks";

packages/utils/src/index.ts

@@ -1,4 +1,4 @@
-import { isJsonCompatibleArray, isJsonCompatibleDictionary, isJsonCompatibleValue } from "./compatibility";
+import { isJsonCompatibleArray, isJsonCompatibleDictionary, isJsonCompatibleValue } from "./json";
 
 describe("json", () => {
   function sum(a: number, b: number): number {

packages/json-rpc/src/compatibility.spec.ts renamed to packages/utils/src/json.spec.ts

@@ -450,6 +450,7 @@ __metadata:
   resolution: "@cosmjs/json-rpc@workspace:packages/json-rpc"
   dependencies:
     "@cosmjs/stream": "workspace:^"
+    "@cosmjs/utils": "workspace:^"
     "@istanbuljs/nyc-config-typescript": "npm:^1.0.1"
     "@types/jasmine": "npm:^4"
     "@types/karma-firefox-launcher": "npm:^2"