wasm-ast-types 0.17.0 → 0.18.1

package/main/client/test/ts-client.wager.spec.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _cwWager = _interopRequireDefault(require("../../../../../__fixtures__/wager/cw-wager.json"));
+
+var _client = require("../client");
+
+var _testUtils = require("../../../test-utils");
+
+var queryCtx = (0, _testUtils.makeContext)(_cwWager["default"].query);
+var executeCtx = (0, _testUtils.makeContext)(_cwWager["default"].execute);
+it('query', function () {
+  (0, _testUtils.expectCode)((0, _client.createTypeInterface)(queryCtx, _cwWager["default"].query));
+});
+it('execute', function () {
+  (0, _testUtils.expectCode)((0, _client.createTypeInterface)(executeCtx, _cwWager["default"].execute));
+});
+it('query classes', function () {
+  (0, _testUtils.expectCode)((0, _client.createQueryClass)(queryCtx, 'WagerQueryClient', 'WagerReadOnlyInstance', _cwWager["default"].query));
+});
+it('execute classes', function () {
+  (0, _testUtils.expectCode)((0, _client.createExecuteClass)(executeCtx, 'WagerClient', 'WagerInstance', null, _cwWager["default"].execute));
+}); // it('execute classes array types', () => {
+//     expectCode(createExecuteClass(
+//         ctx,
+//         'SG721Client',
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });
+// it('execute interfaces no extends', () => {
+//     expectCode(createExecuteInterface(
+//         ctx,
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });

package/main/utils/types.js

@@ -72,6 +72,12 @@ var getTypeOrRef = function getTypeOrRef(obj) {
 var getArrayTypeFromItems = function getArrayTypeFromItems(items) {
   // passing in [{"type":"string"}]
   if (Array.isArray(items)) {
+    var _items$;
+
+    if (((_items$ = items[0]) === null || _items$ === void 0 ? void 0 : _items$.type) === 'array') {
+      return t.tsArrayType(t.tsArrayType(getArrayTypeFromItems(items[0])));
+    }
+
     return t.tsArrayType(t.tsArrayType(getTypeOrRef(items[0])));
   } // passing in {"items": [{"type":"string"}]}
 
@@ -164,7 +170,13 @@ var getTypeInfo = function getTypeInfo(info) {
           throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
         }
       } else {
-        throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
+        if (Array.isArray(info.items)) {
+          type = getArrayTypeFromItems(info.items); // console.log(typeof info.items === 'object');
+          // console.log(Array.isArray(info.items));
+          // console.log(info);
+        } else {
+          throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
+        }
       }
     } else {
       var detect = detectType(info.type);

package/module/client/test/ts-client.wager.spec.js

@@ -0,0 +1,33 @@
+import wagerJson from '../../../../../__fixtures__/wager/cw-wager.json';
+import { createQueryClass, createExecuteClass, createTypeInterface } from '../client';
+import { expectCode, makeContext } from '../../../test-utils';
+const queryCtx = makeContext(wagerJson.query);
+const executeCtx = makeContext(wagerJson.execute);
+it('query', () => {
+  expectCode(createTypeInterface(queryCtx, wagerJson.query));
+});
+it('execute', () => {
+  expectCode(createTypeInterface(executeCtx, wagerJson.execute));
+});
+it('query classes', () => {
+  expectCode(createQueryClass(queryCtx, 'WagerQueryClient', 'WagerReadOnlyInstance', wagerJson.query));
+});
+it('execute classes', () => {
+  expectCode(createExecuteClass(executeCtx, 'WagerClient', 'WagerInstance', null, wagerJson.execute));
+}); // it('execute classes array types', () => {
+//     expectCode(createExecuteClass(
+//         ctx,
+//         'SG721Client',
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });
+// it('execute interfaces no extends', () => {
+//     expectCode(createExecuteInterface(
+//         ctx,
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });

package/module/utils/types.js

@@ -39,6 +39,10 @@ const getTypeOrRef = obj => {
 const getArrayTypeFromItems = items => {
   // passing in [{"type":"string"}]
   if (Array.isArray(items)) {
+    if (items[0]?.type === 'array') {
+      return t.tsArrayType(t.tsArrayType(getArrayTypeFromItems(items[0])));
+    }
+
     return t.tsArrayType(t.tsArrayType(getTypeOrRef(items[0])));
   } // passing in {"items": [{"type":"string"}]}
 
@@ -124,7 +128,13 @@ export const getTypeInfo = info => {
           throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
         }
       } else {
-        throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
+        if (Array.isArray(info.items)) {
+          type = getArrayTypeFromItems(info.items); // console.log(typeof info.items === 'object');
+          // console.log(Array.isArray(info.items));
+          // console.log(info);
+        } else {
+          throw new Error('[info.items] case not handled by transpiler. contact maintainers.');
+        }
       }
     } else {
       const detect = detectType(info.type);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.17.0",
+  "version": "0.18.1",
   "description": "CosmWasm TypeScript AST generation",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types#readme",
@@ -88,5 +88,5 @@
     "case": "1.6.3",
     "deepmerge": "4.2.2"
   },
-  "gitHead": "cffa2acebb86f3c1f96fb00c4abae5ba0987e63e"
+  "gitHead": "e6daf701507cad95127613a815fc0fca1a883f8a"
 }

package/src/client/test/__snapshots__/ts-client.wager.spec.ts.snap

@@ -0,0 +1,132 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`execute 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
+
+exports[`execute classes 1`] = `
+"export class WagerClient implements WagerInstance {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.updateConfig = this.updateConfig.bind(this);
+    this.setWinner = this.setWinner.bind(this);
+    this.wager = this.wager.bind(this);
+    this.cancel = this.cancel.bind(this);
+  }
+
+  updateConfig = async ({
+    params
+  }: {
+    params: ParamInfo;
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_config: {
+        params
+      }
+    }, fee, memo, funds);
+  };
+  setWinner = async ({
+    currentPrices,
+    prevPrices,
+    wagerKey
+  }: {
+    currentPrices: number[][];
+    prevPrices: number[][];
+    wagerKey: Addr[][][][];
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      set_winner: {
+        current_prices: currentPrices,
+        prev_prices: prevPrices,
+        wager_key: wagerKey
+      }
+    }, fee, memo, funds);
+  };
+  wager = async ({
+    againstCurrencies,
+    currency,
+    expiry,
+    token
+  }: {
+    againstCurrencies: Currency[];
+    currency: Currency;
+    expiry: number;
+    token: Addr[][];
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      wager: {
+        against_currencies: againstCurrencies,
+        currency,
+        expiry,
+        token
+      }
+    }, fee, memo, funds);
+  };
+  cancel = async ({
+    token
+  }: {
+    token: Addr[][];
+  }, fee: number | StdFee | \\"auto\\" = \\"auto\\", memo?: string, funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      cancel: {
+        token
+      }
+    }, fee, memo, funds);
+  };
+}"
+`;
+
+exports[`query 1`] = `"export type QueryMsg = QueryMsg;"`;
+
+exports[`query classes 1`] = `
+"export class WagerQueryClient implements WagerReadOnlyInstance {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.wagers = this.wagers.bind(this);
+    this.wager = this.wager.bind(this);
+    this.tokenStatus = this.tokenStatus.bind(this);
+    this.config = this.config.bind(this);
+  }
+
+  wagers = async (): Promise<WagersResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      wagers: {}
+    });
+  };
+  wager = async ({
+    token
+  }: {
+    token: Addr[][];
+  }): Promise<WagerResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      wager: {
+        token
+      }
+    });
+  };
+  tokenStatus = async ({
+    token
+  }: {
+    token: Addr[][];
+  }): Promise<TokenStatusResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      token_status: {
+        token
+      }
+    });
+  };
+  config = async (): Promise<ConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      config: {}
+    });
+  };
+}"
+`;

package/src/client/test/ts-client.wager.spec.ts

@@ -0,0 +1,63 @@
+import wagerJson from '../../../../../__fixtures__/wager/cw-wager.json';
+import {
+    createQueryClass,
+    createExecuteClass,
+    createExecuteInterface,
+    createTypeInterface
+} from '../client'
+import { expectCode, makeContext } from '../../../test-utils';
+
+const queryCtx = makeContext(wagerJson.query);
+const executeCtx = makeContext(wagerJson.execute);
+
+it('query', () => {
+    expectCode(createTypeInterface(
+        queryCtx,
+        wagerJson.query
+    ))
+})
+
+it('execute', () => {
+    expectCode(createTypeInterface(
+        executeCtx,
+        wagerJson.execute
+    ))
+})
+
+it('query classes', () => {
+    expectCode(createQueryClass(
+        queryCtx,
+        'WagerQueryClient',
+        'WagerReadOnlyInstance',
+        wagerJson.query
+    ))
+});
+
+it('execute classes', () => {
+    expectCode(createExecuteClass(
+        executeCtx,
+        'WagerClient',
+        'WagerInstance',
+        null,
+        wagerJson.execute
+    ))
+});
+
+// it('execute classes array types', () => {
+//     expectCode(createExecuteClass(
+//         ctx,
+//         'SG721Client',
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });
+
+// it('execute interfaces no extends', () => {
+//     expectCode(createExecuteInterface(
+//         ctx,
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });

package/src/utils/types.ts

@@ -48,6 +48,15 @@ const getTypeOrRef = (obj) => {
 const getArrayTypeFromItems = (items) => {
   // passing in [{"type":"string"}]
   if (Array.isArray(items)) {
+    if (items[0]?.type === 'array') {
+      return t.tsArrayType(
+        t.tsArrayType(
+          getArrayTypeFromItems(
+            items[0]
+          )
+        )
+      );
+    }
     return t.tsArrayType(
       t.tsArrayType(
         getTypeOrRef(items[0])
@@ -147,7 +156,14 @@ export const getTypeInfo = (info: JSONSchema) => {
           throw new Error('[info.items] case not handled by transpiler. contact maintainers.')
         }
       } else {
-        throw new Error('[info.items] case not handled by transpiler. contact maintainers.')
+        if (Array.isArray(info.items)) {
+          type = getArrayTypeFromItems(info.items);
+          // console.log(typeof info.items === 'object');
+          // console.log(Array.isArray(info.items));
+          // console.log(info);
+        } else {
+          throw new Error('[info.items] case not handled by transpiler. contact maintainers.')
+        }
       }
     } else {
       const detect = detectType(info.type);