build: Tidy imports, cleanup redundancy (#134)

* build: Tidy imports, cleanup redundancy

* Switched to cjs

* Switched to esm

* Switched back to cjs

.github/workflows/pull-request.yml

@@ -28,6 +28,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           # to override config-conventional rules, specify a relative path to your rules module, actions/checkout is required for this setting!
-          commitlintRulesPath: "./.github/linters/.commitlint.rules.js" # default: undefined
+          commitlintRulesPath: "./.github/linters/.commitlint.rules.cjs" # default: undefined
           # if the PR contains a single commit, fail if the commit message and the PR title do not match
           commitTitleMatch: false # default: 'true'

src/index.ts

@@ -1,11 +1,35 @@
-import { OfflineSigner, Registry } from '@cosmjs/proto-signing'
-import { DIDModule, MinimalImportableDIDModule, DidExtension } from './modules/did.js';
-import { MinimalImportableResourceModule, ResourceModule, ResourceExtension } from './modules/resource.js';
-import { AbstractCheqdSDKModule, applyMixins, instantiateCheqdSDKModule, instantiateCheqdSDKModuleRegistryTypes, instantiateCheqdSDKModuleQuerierExtensionSetup } from './modules/_.js';
+import {
+	OfflineSigner,
+	Registry
+} from '@cosmjs/proto-signing'
+import {
+	DIDModule,
+	MinimalImportableDIDModule,
+	DidExtension
+} from './modules/did.js';
+import {
+	MinimalImportableResourceModule,
+	ResourceModule,
+	ResourceExtension
+} from './modules/resource.js';
+import {
+	AbstractCheqdSDKModule,
+	applyMixins,
+	instantiateCheqdSDKModule,
+	instantiateCheqdSDKModuleRegistryTypes,
+	instantiateCheqdSDKModuleQuerierExtensionSetup
+} from './modules/_.js';
 import { createDefaultCheqdRegistry } from './registry.js'
 import { CheqdSigningStargateClient } from './signer.js'
-import { CheqdNetwork, IContext, IModuleMethodMap } from './types.js';
-import { GasPrice, QueryClient } from '@cosmjs/stargate'
+import {
+	CheqdNetwork,
+	IContext,
+	IModuleMethodMap
+} from './types.js';
+import {
+	GasPrice,
+	QueryClient
+} from '@cosmjs/stargate'
 import { CheqdQuerier } from './querier.js'
 import { Tendermint34Client } from '@cosmjs/tendermint-rpc'
 

src/modules/_.ts

@@ -1,7 +1,10 @@
 import { GeneratedType } from "@cosmjs/proto-signing"
 import { QueryClient } from "@cosmjs/stargate"
 import { CheqdSigningStargateClient } from '../signer.js'
-import { IModuleMethodMap, QueryExtensionSetup } from '../types.js';
+import {
+	IModuleMethodMap,
+	QueryExtensionSetup
+} from '../types.js';
 import { CheqdQuerier } from "../querier.js";
 
 export abstract class AbstractCheqdSDKModule {

src/modules/did.ts

@@ -39,7 +39,10 @@ import {
 	DidDoc,
 	Metadata
 } from "@cheqd/ts-proto/cheqd/did/v2/index.js"
-import { EncodeObject, GeneratedType } from "@cosmjs/proto-signing"
+import {
+	EncodeObject,
+	GeneratedType
+} from "@cosmjs/proto-signing"
 import { v4 } from "uuid"
 import { assert } from "@cosmjs/utils";
 import { PageRequest } from "@cheqd/ts-proto/cosmos/base/query/v1beta1/pagination.js";

src/querier.ts

@@ -1,6 +1,9 @@
 import { QueryClient } from "@cosmjs/stargate";
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc";
-import { QueryExtensionSetup, CheqdExtensions } from "./types.js";
+import {
+    QueryExtensionSetup,
+    CheqdExtensions
+} from "./types.js";
 
 export class CheqdQuerier extends QueryClient {
     constructor(tmClient: Tendermint34Client) {

src/registry.ts

@@ -3,9 +3,7 @@ import {
 	GeneratedType,
 } from '@cosmjs/proto-signing'
 
-import {
-	defaultRegistryTypes
-} from '@cosmjs/stargate'
+import { defaultRegistryTypes } from '@cosmjs/stargate'
 
 export function createDefaultCheqdRegistry(customTypes?: Iterable<[string, GeneratedType]>): Registry {
 	if (!customTypes) customTypes = [];

src/signer.ts

@@ -1,15 +1,54 @@
-import { EncodeObject, isOfflineDirectSigner, OfflineSigner, encodePubkey, TxBodyEncodeObject, makeSignDoc } from "@cosmjs/proto-signing"
-import { DeliverTxResponse, GasPrice, HttpEndpoint, SigningStargateClient, SigningStargateClientOptions, calculateFee, SignerData } from "@cosmjs/stargate"
+import {
+	EncodeObject,
+	isOfflineDirectSigner,
+	OfflineSigner,
+	encodePubkey,
+	TxBodyEncodeObject,
+	makeSignDoc
+} from "@cosmjs/proto-signing"
+import {
+	DeliverTxResponse,
+	GasPrice,
+	HttpEndpoint,
+	SigningStargateClient,
+	SigningStargateClientOptions,
+	calculateFee,
+	SignerData } from "@cosmjs/stargate"
 import { Tendermint34Client } from "@cosmjs/tendermint-rpc"
 import { createDefaultCheqdRegistry } from "./registry.js"
-import { MsgCreateDidDocPayload, SignInfo, MsgUpdateDidDocPayload, MsgDeactivateDidDocPayload, VerificationMethod } from '@cheqd/ts-proto/cheqd/did/v2';
-import { DidStdFee, ISignInputs, TSignerAlgo, VerificationMethods } from './types.js';
-import { base64ToBytes, EdDSASigner, hexToBytes, Signer, ES256Signer, ES256KSigner } from '../node_modules/did-jwt/lib/index.js';
-import { assert, assertDefined } from '@cosmjs/utils'
+import { 
+	MsgCreateDidDocPayload,
+	SignInfo,
+	MsgUpdateDidDocPayload,
+	MsgDeactivateDidDocPayload,
+	VerificationMethod 
+} from '@cheqd/ts-proto/cheqd/did/v2';
+import {
+	DidStdFee,
+	ISignInputs,
+	TSignerAlgo,
+	VerificationMethods
+} from './types.js';
+import {
+	base64ToBytes,
+	EdDSASigner,
+	hexToBytes,
+	Signer,
+	ES256Signer,
+	ES256KSigner
+} from 'did-jwt';
+import {
+	assert,
+	assertDefined
+} from '@cosmjs/utils'
 import { encodeSecp256k1Pubkey } from '@cosmjs/amino'
 import { Int53 } from '@cosmjs/math'
 import { fromBase64 } from '@cosmjs/encoding'
-import { AuthInfo, SignerInfo, TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx.js'
+import {
+	AuthInfo,
+	SignerInfo,
+	TxRaw
+} from 'cosmjs-types/cosmos/tx/v1beta1/tx.js'
 import { SignMode } from 'cosmjs-types/cosmos/tx/signing/v1beta1/signing.js'
 import { Any } from 'cosmjs-types/google/protobuf/any.js'
 import { Coin } from 'cosmjs-types/cosmos/base/v1beta1/coin.js'

src/types.ts

@@ -1,12 +1,21 @@
-import { Service as ProtobufService, VerificationMethod as ProtobufVerificationMethod } from "@cheqd/ts-proto/cheqd/did/v2"
+import {
+    Service as ProtobufService, 
+    VerificationMethod as ProtobufVerificationMethod
+} from "@cheqd/ts-proto/cheqd/did/v2"
 import { CheqdSDK } from "./index.js"
 import { Coin } from "@cosmjs/proto-signing"
 import { Signer } from "did-jwt"
 import { QueryClient } from "@cosmjs/stargate"
 import { DIDResolutionResult } from "did-resolver"
 import { DidExtension } from "./modules/did.js"
 import { ResourceExtension } from './modules/resource.js';
-export { DIDDocument, VerificationMethod, Service, ServiceEndpoint, JsonWebKey } from "did-resolver"
+export {
+    DIDDocument,
+    VerificationMethod,
+    Service,
+    ServiceEndpoint,
+    JsonWebKey
+} from "did-resolver"
 
 export enum CheqdNetwork {
     Mainnet = 'mainnet',

src/utils.ts

@@ -14,10 +14,17 @@ import {
     SpecValidationResult,
     JsonWebKey,
 } from "./types.js"
-import { fromString, toString } from 'uint8arrays'
+import {
+    fromString,
+    toString
+} from 'uint8arrays'
 import { bases } from "multiformats/basics"
 import { base64ToBytes } from "did-jwt"
-import { generateKeyPair, generateKeyPairFromSeed, KeyPair } from '@stablelib/ed25519'
+import {
+    generateKeyPair,
+    generateKeyPairFromSeed,
+    KeyPair
+} from '@stablelib/ed25519'
 import { sha256 } from '@cosmjs/crypto'
 import { v4 } from 'uuid'
 import {

tests/index.test.ts

@@ -1,13 +1,32 @@
-import { DirectSecp256k1HdWallet, GeneratedType } from '@cosmjs/proto-signing'
-import { createCheqdSDK, DIDModule, ICheqdSDKOptions, ResourceModule } from '../src/index'
-import { localnet, faucet } from './testutils.test'
+import {
+    DirectSecp256k1HdWallet,
+    GeneratedType
+} from '@cosmjs/proto-signing'
+import {
+    createCheqdSDK,
+    DIDModule,
+    ICheqdSDKOptions,
+    ResourceModule
+} from '../src/index'
+import {
+    localnet,
+    faucet
+} from './testutils.test'
 import { AbstractCheqdSDKModule } from '../src/modules/_'
 import { CheqdSigningStargateClient } from '../src/signer'
 import { createDefaultCheqdRegistry } from '../src/registry'
 import { CheqdQuerier } from '../src/querier'
-import { setupDidExtension, DidExtension, defaultDidExtensionKey } from '../src/modules/did';
+import {
+    setupDidExtension,
+    DidExtension,
+    defaultDidExtensionKey
+} from '../src/modules/did';
 import { QueryExtensionSetup } from '../src/types'
-import { setupResourceExtension, ResourceExtension, defaultResourceExtensionKey } from '../src/modules/resource';
+import {
+    setupResourceExtension,
+    ResourceExtension,
+    defaultResourceExtensionKey
+} from '../src/modules/resource';
 
 describe(
     'CheqdSDK', () => {

tests/modules/did.test.ts

@@ -1,14 +1,34 @@
 import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing"
 import { DeliverTxResponse } from "@cosmjs/stargate"
-import { fromString, toString } from 'uint8arrays'
+import {
+    fromString,
+    toString
+} from 'uint8arrays'
 import { DIDModule } from "../../src"
 import { createDefaultCheqdRegistry } from "../../src/registry"
 import { CheqdSigningStargateClient } from "../../src/signer"
-import { DIDDocument, ISignInputs, MethodSpecificIdAlgo, VerificationMethods } from "../../src/types"
-import { createDidPayload, createDidVerificationMethod, createKeyPairBase64, createVerificationKeys } from "../../src/utils"
-import { localnet, faucet, containsAll } from "../testutils.test"
+import {
+    DIDDocument,
+    ISignInputs,
+    MethodSpecificIdAlgo,
+    VerificationMethods
+} from "../../src/types"
+import {
+    createDidPayload,
+    createDidVerificationMethod,
+    createKeyPairBase64,
+    createVerificationKeys
+} from "../../src/utils"
+import {
+    localnet,
+    faucet,
+    containsAll
+} from "../testutils.test"
 import { CheqdQuerier } from '../../src/querier';
-import { setupDidExtension, DidExtension } from '../../src/modules/did';
+import {
+    setupDidExtension,
+    DidExtension
+} from '../../src/modules/did';
 import { v4 } from "uuid"
 
 const defaultAsyncTxTimeout = 30000

tests/modules/resource.test.ts

@@ -1,17 +1,51 @@
 import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing"
 import { DeliverTxResponse } from "@cosmjs/stargate"
-import { fromString, toString } from 'uint8arrays'
-import { DIDModule, ResourceModule } from "../../src"
+import {
+    fromString,
+    toString
+} from 'uint8arrays'
+import {
+    DIDModule,
+    ResourceModule
+} from "../../src"
 import { createDefaultCheqdRegistry } from "../../src/registry"
 import { CheqdSigningStargateClient } from "../../src/signer"
-import { ISignInputs, MethodSpecificIdAlgo, QueryExtensionSetup, VerificationMethods, CheqdExtensions } from '../../src/types';
-import { createDidPayload, createDidVerificationMethod, createKeyPairBase64, createVerificationKeys } from "../../src/utils"
-import { localnet, faucet, image_content, default_content, json_content, containsAllButOmittedFields } from '../testutils.test';
-import { AlternativeUri, Metadata, MsgCreateResourcePayload } from '@cheqd/ts-proto/cheqd/resource/v2';
+import {
+    ISignInputs,
+    MethodSpecificIdAlgo,
+    QueryExtensionSetup,
+    VerificationMethods,
+    CheqdExtensions
+} from '../../src/types';
+import {
+    createDidPayload,
+    createDidVerificationMethod,
+    createKeyPairBase64,
+    createVerificationKeys
+} from "../../src/utils"
+import {
+    localnet,
+    faucet,
+    image_content,
+    default_content,
+    json_content,
+    containsAllButOmittedFields
+} from '../testutils.test';
+import {
+    AlternativeUri,
+    Metadata,
+    MsgCreateResourcePayload
+} from '@cheqd/ts-proto/cheqd/resource/v2';
 import { v4 } from "uuid"
 import { CheqdQuerier } from "../../src/querier"
-import { setupResourceExtension, ResourceExtension } from '../../src/modules/resource';
-import { DidExtension, setupDidExtension } from "../../src/modules/did"
+import {
+    setupResourceExtension,
+    ResourceExtension
+} from '../../src/modules/resource';
+import {
+    DidExtension,
+    setupDidExtension
+} from "../../src/modules/did"
 import { sha256 } from "@cosmjs/crypto"
 
 const defaultAsyncTxTimeout = 30000

tests/signer.test.ts

@@ -1,12 +1,35 @@
-import { MsgCreateDidDoc, MsgCreateDidDocPayload, VerificationMethod } from "@cheqd/ts-proto/cheqd/did/v2"
-import { DirectSecp256k1HdWallet, Registry } from "@cosmjs/proto-signing"
+import {
+    MsgCreateDidDoc,
+    MsgCreateDidDocPayload,
+    VerificationMethod
+} from "@cheqd/ts-proto/cheqd/did/v2"
+import {
+    DirectSecp256k1HdWallet,
+    Registry
+} from "@cosmjs/proto-signing"
 import { EdDSASigner } from "did-jwt"
 import { typeUrlMsgCreateDidDoc } from '../src/modules/did'
 import { CheqdSigningStargateClient } from "../src/signer"
-import { ISignInputs, MethodSpecificIdAlgo, VerificationMethods } from "../src/types"
-import { fromString, toString } from 'uint8arrays'
-import { createDidPayload, createDidVerificationMethod, createKeyPairBase64, createVerificationKeys, validateSpecCompliantPayload } from '../src/utils';
-import { localnet, faucet } from "./testutils.test"
+import {
+    ISignInputs,
+    MethodSpecificIdAlgo,
+    VerificationMethods
+} from "../src/types"
+import {
+    fromString,
+    toString
+} from 'uint8arrays'
+import {
+    createDidPayload,
+    createDidVerificationMethod,
+    createKeyPairBase64,
+    createVerificationKeys,
+    validateSpecCompliantPayload
+} from '../src/utils';
+import {
+    localnet,
+    faucet
+} from "./testutils.test"
 import { verify } from "@stablelib/ed25519"
 import { v4 } from "uuid"