wasm-ast-types 0.16.0 → 0.18.0

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

@@ -0,0 +1,37 @@
+"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 array types', () => {
+//     expectCode(createExecuteClass(
+//         ctx,
+//         'SG721Client',
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });
+// it('execute interfaces no extends', () => {
+//     expectCode(createExecuteInterface(
+//         ctx,
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });

package/main/react-query/react-query.js

@@ -199,6 +199,8 @@ exports.createReactQueryHook = createReactQueryHook;
 ```
  */
 var createReactQueryMutationArgsInterface = function createReactQueryMutationArgsInterface(_ref4) {
+  var _createTypedObjectPar;
+
   var context = _ref4.context,
       ExecuteClient = _ref4.ExecuteClient,
       mutationHookParamsTypeName = _ref4.mutationHookParamsTypeName,
@@ -206,12 +208,15 @@ var createReactQueryMutationArgsInterface = function createReactQueryMutationArg
       jsonschema = _ref4.jsonschema;
   var typedUseMutationOptions = t.tsTypeReference(t.identifier('UseMutationOptions'), useMutationTypeParameter);
   var body = [(0, _utils.tsPropertySignature)(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(ExecuteClient))), false)];
-  var msgType = (0, _utils.createTypedObjectParams)(context, jsonschema).typeAnnotation;
+  var msgType = (_createTypedObjectPar = (0, _utils.createTypedObjectParams)(context, jsonschema)) === null || _createTypedObjectPar === void 0 ? void 0 : _createTypedObjectPar.typeAnnotation;
 
   if (msgType) {
-    body.push(t.tsPropertySignature(t.identifier('msg'), msgType));
+    body.push(t.tsPropertySignature(t.identifier('msg'), // @ts-ignore
+    msgType));
   }
 
+  context.addUtil('StdFee');
+  context.addUtil('Coin');
   var optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation( // @ts-ignore:next-line
   t.tsTypeLiteral(_client.FIXED_EXECUTE_PARAMS.map(function (param) {
     return (0, _babel.propertySignature)(param.name, // @ts-ignore:next-line

package/main/utils/types.js

@@ -164,7 +164,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,30 @@
+import wagerJson from '../../../../../__fixtures__/wager/cw-wager.json';
+import { createQueryClass, 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 array types', () => {
+//     expectCode(createExecuteClass(
+//         ctx,
+//         'SG721Client',
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });
+// it('execute interfaces no extends', () => {
+//     expectCode(createExecuteInterface(
+//         ctx,
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });

package/module/react-query/react-query.js

@@ -177,12 +177,15 @@ export const createReactQueryMutationArgsInterface = ({
 }) => {
   const typedUseMutationOptions = t.tsTypeReference(t.identifier('UseMutationOptions'), useMutationTypeParameter);
   const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(ExecuteClient))), false)];
-  const msgType = createTypedObjectParams(context, jsonschema).typeAnnotation;
+  const msgType = createTypedObjectParams(context, jsonschema)?.typeAnnotation;
 
   if (msgType) {
-    body.push(t.tsPropertySignature(t.identifier('msg'), msgType));
+    body.push(t.tsPropertySignature(t.identifier('msg'), // @ts-ignore
+    msgType));
   }
 
+  context.addUtil('StdFee');
+  context.addUtil('Coin');
   const optionalArgs = t.tsPropertySignature(t.identifier('args'), t.tsTypeAnnotation( // @ts-ignore:next-line
   t.tsTypeLiteral(FIXED_EXECUTE_PARAMS.map(param => propertySignature(param.name, // @ts-ignore:next-line
   param.typeAnnotation, param.optional)))));

package/module/utils/types.js

@@ -124,7 +124,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.16.0",
+  "version": "0.18.0",
   "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": "9724a2787e6427b62e874ece3b733b5bfa5be2af"
+  "gitHead": "857ca4b9661677f7c1a72d0327fb327b0a318e33"
 }

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

@@ -0,0 +1,54 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`execute 1`] = `"export type ExecuteMsg = ExecuteMsg;"`;
+
+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,53 @@
+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 array types', () => {
+//     expectCode(createExecuteClass(
+//         ctx,
+//         'SG721Client',
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });
+
+// it('execute interfaces no extends', () => {
+//     expectCode(createExecuteInterface(
+//         ctx,
+//         'SG721Instance',
+//         null,
+//         wagerJson
+//     ))
+// });

package/src/react-query/react-query.ts

@@ -407,16 +407,20 @@ export const createReactQueryMutationArgsInterface = ({
     )
   ];
 
-  const msgType = createTypedObjectParams(context, jsonschema).typeAnnotation as unknown as t.TSTypeAnnotation
+  const msgType = createTypedObjectParams(context, jsonschema)?.typeAnnotation
 
   if (msgType) {
     body.push(
       t.tsPropertySignature(
         t.identifier('msg'),
+        // @ts-ignore
         msgType
       ));
   }
 
+  context.addUtil('StdFee');
+  context.addUtil('Coin');
+
   const optionalArgs = t.tsPropertySignature(
     t.identifier('args'),
     t.tsTypeAnnotation(

package/src/utils/types.ts

@@ -147,7 +147,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);