@hyperweb/telescope 1.17.1 → 1.17.3

package/module/helpers/helper-func-types-interface.js

@@ -5,8 +5,8 @@ import { BinaryReader, BinaryWriter } from "./binary${options.restoreImportExten
 import { getRpcClient } from "./extern${options.restoreImportExtension ?? ""}";` : ''}
 import { isRpc, Rpc } from "./helpers${options.restoreImportExtension ?? ""}";${!options.isGeneratingCosmosTypes ? `
 import { TelescopeGeneratedCodec, DeliverTxResponse, Message, StdFee } from "./types${options.restoreImportExtension ?? ""}";` : ''}${!options.isGeneratingCosmosTypes ? `
-import { toConverters, toEncoders } from "@interchainjs/cosmos/utils";
-import { ISigningClient } from "@interchainjs/cosmos/types/signing-client${options.restoreImportExtension ?? ""}";` : ''}
+import { toConverters, toEncoders } from "@interchainjs/cosmos";
+import { ISigningClient } from "@interchainjs/cosmos";` : ''}
 
 export interface QueryBuilderOptions<TReq, TRes> {
   encode: (request: TReq, writer?: BinaryWriter) => BinaryWriter

package/module/helpers/helper-func-types.js

@@ -5,8 +5,8 @@ import { BinaryReader, BinaryWriter } from "./binary${options.restoreImportExten
 import { getRpcClient } from "./extern${options.restoreImportExtension ?? ""}";` : ''}
 import { isRpc, Rpc } from "./helpers${options.restoreImportExtension ?? ""}";${!options.isGeneratingCosmosTypes ? `
 import { TelescopeGeneratedCodec, DeliverTxResponse, Message, StdFee } from "./types${options.restoreImportExtension ?? ""}";` : ''}${!options.isGeneratingCosmosTypes ? `
-import { toConverters, toEncoders } from "@interchainjs/cosmos/utils";
-import { ISigningClient } from "@interchainjs/cosmos/types/signing-client${options.restoreImportExtension ?? ""}";` : ''}
+import { toConverters, toEncoders } from "@interchainjs/cosmos";
+import { ISigningClient } from "@interchainjs/cosmos";` : ''}
 
 export interface QueryBuilderOptions<TReq, TRes> {
   encode: (request: TReq, writer?: BinaryWriter) => BinaryWriter

package/module/helpers/internal-for-bigint.js

@@ -1,6 +1,7 @@
 export const getHelperForBigint = (options) => {
-    return `
-declare var self: any | undefined;
+    return `${options.useInterchainJs ?
+        'export { fromBase64 as bytesFromBase64, toBase64 as base64FromBytes } from \'@interchainjs/encoding\';' :
+        `declare var self: any | undefined;
 declare var window: any | undefined;
 declare var global: any | undefined;
 var globalThis: any = (() => {
@@ -34,7 +35,7 @@ export function base64FromBytes(arr: Uint8Array): string {
     bin.push(String.fromCharCode(byte));
   });
   return btoa(bin.join(''));
-}
+}`}
 
 export interface AminoHeight {
   readonly revision_number?: string;

package/module/helpers/internal.js

@@ -11,7 +11,9 @@ if (_m0.util.Long !== Long) {
 
 export { Long };
 
-declare var self: any | undefined;
+${options.useInterchainJs ?
+        'export { fromBase64 as bytesFromBase64, toBase64 as base64FromBytes } from \'@interchainjs/encoding\';' :
+        `declare var self: any | undefined;
 declare var window: any | undefined;
 declare var global: any | undefined;
 var globalThis: any = (() => {
@@ -43,7 +45,7 @@ export function base64FromBytes(arr: Uint8Array): string {
         bin.push(String.fromCharCode(byte));
     });
     return btoa(bin.join(''));
-}
+}`}
 
 export interface AminoHeight {
     readonly revision_number?: string;

package/module/helpers/react-query-hooks-icjs.js

@@ -9,7 +9,7 @@ import {
   ITxArgs,
   EndpointOrRpc,
 } from './helper-func-types${options.restoreImportExtension ?? ""}'
-import { ISigningClient, isISigningClient } from "@interchainjs/cosmos/types/signing-client${options.restoreImportExtension ?? ""}";
+import { ISigningClient, isISigningClient } from "@interchainjs/cosmos";
 import {
   StdFee,
   DeliverTxResponse,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperweb/telescope",
-  "version": "1.17.1",
+  "version": "1.17.3",
   "description": "A TypeScript Transpiler for Cosmos Protobufs",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/hyperweb-io/telescope/tree/master/packages/telescope#readme",
@@ -111,5 +111,5 @@
     "rimraf": "5.0.0",
     "yaml": "^2.3.4"
   },
-  "gitHead": "264734b693e5e98c4601799b56c84221d2a992fa"
+  "gitHead": "a8d5404c05996b49916a64f05586e771d87629dd"
 }

package/src/generators/create-bundle.ts

@@ -5,7 +5,11 @@ import {
   exportTypesWithAlias,
   recursiveModuleBundle,
 } from "@cosmology/ast";
-import { duplicateImportPathsWithExt, makeAliasName, makeAliasNameWithPackageAtEnd } from "@cosmology/utils";
+import {
+  duplicateImportPathsWithExt,
+  makeAliasName,
+  makeAliasNameWithPackageAtEnd,
+} from "@cosmology/utils";
 
 export const plugin = (builder: TelescopeBuilder, bundler: Bundler) => {
   if (!builder.options.bundle.enabled) {
@@ -56,29 +60,29 @@ export const plugin = (builder: TelescopeBuilder, bundler: Bundler) => {
       );
       if (duplicatedTypeNames.length > 0) {
         // export each, some duplicated with alias
-        const typesWithAlias = exportObj.exportedIdentifiers.map((identifier) => {
-          const duplicatedType = duplicatedTypeNames.find((type) => type === identifier);
-          if (duplicatedType) {
-            let alias: string;
-            if (exportObj.isHelperFunc) {
-              const serialNumber = builder.store.getAndIncTypeSerialNumber(identifier);
-              if (serialNumber > 0) {
-                alias = makeAliasNameWithPackageAtEnd({ package: exportObj.pkg, name: identifier });
-              } else {
-                alias = identifier;
-              }
-            } else {
-              const serialNumber = builder.store.getAndIncTypeSerialNumber(identifier);
-              if (serialNumber > 0) {
-                alias = makeAliasName({ package: exportObj.pkg, name: identifier });
+        const typesWithAlias = exportObj.exportedIdentifiers.map(
+          (identifier) => {
+            const duplicatedType = duplicatedTypeNames.find(
+              (type) => type === identifier
+            );
+            if (duplicatedType) {
+              let alias: string;
+              if (exportObj.isHelperFunc) {
+                alias = makeAliasNameWithPackageAtEnd({
+                  package: exportObj.pkg,
+                  name: identifier,
+                });
               } else {
-                alias = identifier;
+                alias = makeAliasName({
+                  package: exportObj.pkg,
+                  name: identifier,
+                });
               }
+              return { name: identifier, alias: alias };
             }
-            return { name: identifier, alias: alias };
+            return { name: identifier, alias: identifier };
           }
-          return { name: identifier, alias: identifier };
-        });
+        );
         prog.push(exportTypesWithAlias(typesWithAlias, exportObj.relativePath));
       } else {
         // export *