wasm-ast-types 0.3.5 → 0.4.0

package/main/react-query.js

@@ -25,7 +25,16 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var createReactQueryHooks = function createReactQueryHooks(queryMsg, contractName, QueryClient) {
+var DEFAULT_OPTIONS = {
+  optionalClient: false
+};
+
+var createReactQueryHooks = function createReactQueryHooks(_ref) {
+  var queryMsg = _ref.queryMsg,
+      contractName = _ref.contractName,
+      QueryClient = _ref.QueryClient,
+      _ref$options = _ref.options,
+      options = _ref$options === void 0 ? DEFAULT_OPTIONS : _ref$options;
   return (0, _utils.getMessageProperties)(queryMsg).reduce(function (m, schema) {
     var underscoreName = Object.keys(schema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
@@ -38,29 +47,33 @@ var createReactQueryHooks = function createReactQueryHooks(queryMsg, contractNam
       hookParamsTypeName: hookParamsTypeName,
       responseType: responseType,
       QueryClient: QueryClient,
-      jsonschema: jsonschema
+      jsonschema: jsonschema,
+      options: options
     }), createReactQueryHook({
       methodName: methodName,
       hookName: hookName,
       hookParamsTypeName: hookParamsTypeName,
       responseType: responseType,
       hookKeyName: getterKey,
-      jsonschema: jsonschema
+      jsonschema: jsonschema,
+      options: options
     })].concat((0, _toConsumableArray2["default"])(m));
   }, []);
 };
 
 exports.createReactQueryHooks = createReactQueryHooks;
 
-var createReactQueryHook = function createReactQueryHook(_ref) {
+var createReactQueryHook = function createReactQueryHook(_ref2) {
   var _jsonschema$propertie;
 
-  var hookName = _ref.hookName,
-      hookParamsTypeName = _ref.hookParamsTypeName,
-      responseType = _ref.responseType,
-      hookKeyName = _ref.hookKeyName,
-      methodName = _ref.methodName,
-      jsonschema = _ref.jsonschema;
+  var hookName = _ref2.hookName,
+      hookParamsTypeName = _ref2.hookParamsTypeName,
+      responseType = _ref2.responseType,
+      hookKeyName = _ref2.hookKeyName,
+      methodName = _ref2.methodName,
+      jsonschema = _ref2.jsonschema,
+      _ref2$options = _ref2.options,
+      options = _ref2$options === void 0 ? DEFAULT_OPTIONS : _ref2$options;
   var keys = Object.keys((_jsonschema$propertie = jsonschema.properties) !== null && _jsonschema$propertie !== void 0 ? _jsonschema$propertie : {});
   var args = [];
 
@@ -78,17 +91,19 @@ var createReactQueryHook = function createReactQueryHook(_ref) {
 
   return t.exportNamedDeclaration(t.functionDeclaration(t.identifier(hookName), [(0, _utils.tsObjectPattern)((0, _toConsumableArray2["default"])(props.map(function (prop) {
     return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
-  })), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName))))], t.blockStatement([t.returnStatement((0, _utils.callExpression)(t.identifier('useQuery'), [t.arrayExpression([t.stringLiteral(hookKeyName), t.memberExpression(t.identifier('client'), t.identifier('contractAddress'))]), t.arrowFunctionExpression([], t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), false), t.identifier('options')], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))])))])));
+  })), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName))))], t.blockStatement([t.returnStatement((0, _utils.callExpression)(t.identifier('useQuery'), [t.arrayExpression([t.stringLiteral(hookKeyName), t.optionalMemberExpression(t.identifier('client'), t.identifier('contractAddress'), false, options.optionalClient)]), t.arrowFunctionExpression([], (0, _babel.optionalConditionalExpression)(t.identifier('client'), t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), t.identifier('undefined'), options.optionalClient), false), options.optionalClient ? t.objectExpression([t.spreadElement(t.identifier('options')), t.objectProperty(t.identifier('enabled'), t.logicalExpression('&&', t.unaryExpression('!', t.unaryExpression('!', t.identifier('client'))), t.optionalMemberExpression(t.identifier('options'), t.identifier('enabled'), false, true)))]) : t.identifier('options')], t.tsTypeParameterInstantiation([(0, _babel.typeRefOrOptionalUnion)(t.identifier(responseType), options.optionalClient), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))])))])));
 };
 
 exports.createReactQueryHook = createReactQueryHook;
 
-var createReactQueryHookInterface = function createReactQueryHookInterface(_ref2) {
-  var QueryClient = _ref2.QueryClient,
-      hookParamsTypeName = _ref2.hookParamsTypeName,
-      responseType = _ref2.responseType,
-      jsonschema = _ref2.jsonschema;
-  var body = [t.tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient)))), (0, _utils.tsPropertySignature)(t.identifier('options'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))]))), true)];
+var createReactQueryHookInterface = function createReactQueryHookInterface(_ref3) {
+  var QueryClient = _ref3.QueryClient,
+      hookParamsTypeName = _ref3.hookParamsTypeName,
+      responseType = _ref3.responseType,
+      jsonschema = _ref3.jsonschema,
+      _ref3$options = _ref3.options,
+      options = _ref3$options === void 0 ? DEFAULT_OPTIONS : _ref3$options;
+  var body = [(0, _utils.tsPropertySignature)(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient))), options.optionalClient), (0, _utils.tsPropertySignature)(t.identifier('options'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([(0, _babel.typeRefOrOptionalUnion)(t.identifier(responseType), options.optionalClient), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))]))), true)];
   var props = getProps(jsonschema, true);
 
   if (props.length) {

package/main/react-query.spec.js

@@ -34,6 +34,22 @@ var printCode = function printCode(ast) {
 
 
 it('createReactQueryHooks', function () {
-  expectCode(t.program((0, _reactQuery.createReactQueryHooks)(_query_msg["default"], 'Sg721', 'Sg721QueryClient')));
-  expectCode(t.program((0, _reactQuery.createReactQueryHooks)(_query_msg["default"], 'Sg721', 'Sg721QueryClient')));
+  expectCode(t.program((0, _reactQuery.createReactQueryHooks)({
+    queryMsg: _query_msg["default"],
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient'
+  })));
+  expectCode(t.program((0, _reactQuery.createReactQueryHooks)({
+    queryMsg: _query_msg["default"],
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient'
+  })));
+  expectCode(t.program((0, _reactQuery.createReactQueryHooks)({
+    queryMsg: _query_msg["default"],
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient',
+    options: {
+      optionalClient: true
+    }
+  })));
 });

package/main/utils/babel.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.typedIdentifier = exports.tsTypeOperator = exports.tsPropertySignature = exports.tsObjectPattern = exports.shorthandProperty = exports.recursiveNamespace = exports.propertySignature = exports.promiseTypeAnnotation = exports.memberExpressionOrIdentifierSnake = exports.memberExpressionOrIdentifier = exports.importStmt = exports.importAminoMsg = exports.identifier = exports.getMessageProperties = exports.getFieldDimensionality = exports.classProperty = exports.classDeclaration = exports.callExpression = exports.bindMethod = exports.arrowFunctionExpression = exports.arrayTypeNDimensions = exports.FieldTypeAsts = void 0;
+exports.typedIdentifier = exports.typeRefOrOptionalUnion = exports.tsTypeOperator = exports.tsPropertySignature = exports.tsObjectPattern = exports.shorthandProperty = exports.recursiveNamespace = exports.propertySignature = exports.promiseTypeAnnotation = exports.optionalConditionalExpression = exports.memberExpressionOrIdentifierSnake = exports.memberExpressionOrIdentifier = exports.importStmt = exports.importAminoMsg = exports.identifier = exports.getMessageProperties = exports.getFieldDimensionality = exports.classProperty = exports.classDeclaration = exports.callExpression = exports.bindMethod = exports.arrowFunctionExpression = exports.arrayTypeNDimensions = exports.FieldTypeAsts = void 0;
 
 var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 
@@ -259,5 +259,24 @@ var memberExpressionOrIdentifierSnake = function memberExpressionOrIdentifierSna
 
   return t.memberExpression(memberExpressionOrIdentifierSnake(rest), t.identifier((0, _case.snake)(name)));
 };
+/**
+ * If optional, return a conditional, otherwise just the expression
+ */
 
-exports.memberExpressionOrIdentifierSnake = memberExpressionOrIdentifierSnake;
+
+exports.memberExpressionOrIdentifierSnake = memberExpressionOrIdentifierSnake;
+
+var optionalConditionalExpression = function optionalConditionalExpression(test, expression, alternate) {
+  var optional = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  return optional ? t.conditionalExpression(test, expression, alternate) : expression;
+};
+
+exports.optionalConditionalExpression = optionalConditionalExpression;
+
+var typeRefOrOptionalUnion = function typeRefOrOptionalUnion(identifier) {
+  var optional = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var typeReference = t.tsTypeReference(identifier);
+  return optional ? t.tsUnionType([typeReference, t.tsUndefinedKeyword()]) : typeReference;
+};
+
+exports.typeRefOrOptionalUnion = typeRefOrOptionalUnion;

package/module/react-query.js

@@ -1,9 +1,17 @@
 import * as t from '@babel/types';
 import { camel, pascal } from 'case';
 import { tsPropertySignature, tsObjectPattern, callExpression, getMessageProperties } from './utils';
-import { propertySignature } from './utils/babel';
+import { typeRefOrOptionalUnion, propertySignature, optionalConditionalExpression } from './utils/babel';
 import { getPropertyType } from './utils/types';
-export const createReactQueryHooks = (queryMsg, contractName, QueryClient) => {
+const DEFAULT_OPTIONS = {
+  optionalClient: false
+};
+export const createReactQueryHooks = ({
+  queryMsg,
+  contractName,
+  QueryClient,
+  options = DEFAULT_OPTIONS
+}) => {
   return getMessageProperties(queryMsg).reduce((m, schema) => {
     const underscoreName = Object.keys(schema.properties)[0];
     const methodName = camel(underscoreName);
@@ -16,14 +24,16 @@ export const createReactQueryHooks = (queryMsg, contractName, QueryClient) => {
       hookParamsTypeName,
       responseType,
       QueryClient,
-      jsonschema
+      jsonschema,
+      options
     }), createReactQueryHook({
       methodName,
       hookName,
       hookParamsTypeName,
       responseType,
       hookKeyName: getterKey,
-      jsonschema
+      jsonschema,
+      options
     }), ...m];
   }, []);
 };
@@ -33,7 +43,8 @@ export const createReactQueryHook = ({
   responseType,
   hookKeyName,
   methodName,
-  jsonschema
+  jsonschema,
+  options = DEFAULT_OPTIONS
 }) => {
   const keys = Object.keys(jsonschema.properties ?? {});
   let args = [];
@@ -52,15 +63,16 @@ export const createReactQueryHook = ({
 
   return t.exportNamedDeclaration(t.functionDeclaration(t.identifier(hookName), [tsObjectPattern([...props.map(prop => {
     return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
-  })], t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName))))], t.blockStatement([t.returnStatement(callExpression(t.identifier('useQuery'), [t.arrayExpression([t.stringLiteral(hookKeyName), t.memberExpression(t.identifier('client'), t.identifier('contractAddress'))]), t.arrowFunctionExpression([], t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), false), t.identifier('options')], t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))])))])));
+  })], t.tsTypeAnnotation(t.tsTypeReference(t.identifier(hookParamsTypeName))))], t.blockStatement([t.returnStatement(callExpression(t.identifier('useQuery'), [t.arrayExpression([t.stringLiteral(hookKeyName), t.optionalMemberExpression(t.identifier('client'), t.identifier('contractAddress'), false, options.optionalClient)]), t.arrowFunctionExpression([], optionalConditionalExpression(t.identifier('client'), t.callExpression(t.memberExpression(t.identifier('client'), t.identifier(methodName)), args), t.identifier('undefined'), options.optionalClient), false), options.optionalClient ? t.objectExpression([t.spreadElement(t.identifier('options')), t.objectProperty(t.identifier('enabled'), t.logicalExpression('&&', t.unaryExpression('!', t.unaryExpression('!', t.identifier('client'))), t.optionalMemberExpression(t.identifier('options'), t.identifier('enabled'), false, true)))]) : t.identifier('options')], t.tsTypeParameterInstantiation([typeRefOrOptionalUnion(t.identifier(responseType), options.optionalClient), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))])))])));
 };
 export const createReactQueryHookInterface = ({
   QueryClient,
   hookParamsTypeName,
   responseType,
-  jsonschema
+  jsonschema,
+  options = DEFAULT_OPTIONS
 }) => {
-  const body = [t.tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient)))), tsPropertySignature(t.identifier('options'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([t.tsTypeReference(t.identifier(responseType)), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))]))), true)];
+  const body = [tsPropertySignature(t.identifier('client'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier(QueryClient))), options.optionalClient), tsPropertySignature(t.identifier('options'), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('UseQueryOptions'), t.tsTypeParameterInstantiation([typeRefOrOptionalUnion(t.identifier(responseType), options.optionalClient), t.tsTypeReference(t.identifier('Error')), t.tsTypeReference(t.identifier(responseType)), t.tsArrayType(t.tsParenthesizedType(t.tsUnionType([t.tsStringKeyword(), t.tsUndefinedKeyword()])))]))), true)];
   const props = getProps(jsonschema, true);
 
   if (props.length) {

package/module/react-query.spec.js

@@ -21,6 +21,22 @@ const printCode = ast => {
 
 
 it('createReactQueryHooks', () => {
-  expectCode(t.program(createReactQueryHooks(query_msg, 'Sg721', 'Sg721QueryClient')));
-  expectCode(t.program(createReactQueryHooks(query_msg, 'Sg721', 'Sg721QueryClient')));
+  expectCode(t.program(createReactQueryHooks({
+    queryMsg: query_msg,
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient'
+  })));
+  expectCode(t.program(createReactQueryHooks({
+    queryMsg: query_msg,
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient'
+  })));
+  expectCode(t.program(createReactQueryHooks({
+    queryMsg: query_msg,
+    contractName: 'Sg721',
+    QueryClient: 'Sg721QueryClient',
+    options: {
+      optionalClient: true
+    }
+  })));
 });

package/module/utils/babel.js

@@ -153,4 +153,15 @@ export const memberExpressionOrIdentifierSnake = names => {
 
   const [name, ...rest] = names;
   return t.memberExpression(memberExpressionOrIdentifierSnake(rest), t.identifier(snake(name)));
+};
+/**
+ * If optional, return a conditional, otherwise just the expression
+ */
+
+export const optionalConditionalExpression = (test, expression, alternate, optional = false) => {
+  return optional ? t.conditionalExpression(test, expression, alternate) : expression;
+};
+export const typeRefOrOptionalUnion = (identifier, optional = false) => {
+  const typeReference = t.tsTypeReference(identifier);
+  return optional ? t.tsUnionType([typeReference, t.tsUndefinedKeyword()]) : typeReference;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.3.5",
+  "version": "0.4.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",
@@ -23,9 +23,8 @@
     "build": "npm run build:module && npm run build:main",
     "build:ts": "tsc --project ./tsconfig.json",
     "prepare": "npm run build",
-    "dev": "cross-env NODE_ENV=development babel-node src/index",
-    "watch": "cross-env NODE_ENV=development babel-watch src/index",
-    "lint": "eslint src --fix",
+    "lint": "eslint .",
+    "format": "eslint . --fix",
     "test": "jest",
     "test:ast": "cross-env NODE_ENV=development babel-node scripts/test-ast.js",
     "test:watch": "jest --watch",
@@ -85,5 +84,5 @@
     "ast-stringify": "0.1.0",
     "case": "1.6.3"
   },
-  "gitHead": "63019a5cab0eb452ddb92261ab1271462d3e0048"
+  "gitHead": "bf5da4cc0e89f0d718d4d02fcc00d3db5424321b"
 }

package/types/react-query.d.ts

@@ -1,5 +1,12 @@
 import * as t from '@babel/types';
 import { QueryMsg } from './types';
+
+interface ReactQueryHooks {
+    queryMsg: QueryMsg
+    contractName: string
+    QueryClient: string
+    options?: ReactQueryOptions
+}
 interface ReactQueryHookQuery {
     hookName: string;
     hookParamsTypeName: string;
@@ -8,7 +15,11 @@ interface ReactQueryHookQuery {
     methodName: string;
     jsonschema: any;
 }
-export declare const createReactQueryHooks: (queryMsg: QueryMsg, contractName: string, QueryClient: string) => any;
+
+export declare interface ReactQueryOptions {
+    optionalClient?: boolean
+}
+export declare const createReactQueryHooks: ({ queryMsg, contractName, QueryClient, options }: ReactQueryHooks) => any;
 export declare const createReactQueryHook: ({ hookName, hookParamsTypeName, responseType, hookKeyName, methodName, jsonschema }: ReactQueryHookQuery) => t.ExportNamedDeclaration;
 interface ReactQueryHookQueryInterface {
     QueryClient: string;
@@ -17,4 +28,4 @@ interface ReactQueryHookQueryInterface {
     jsonschema: any;
 }
 export declare const createReactQueryHookInterface: ({ QueryClient, hookParamsTypeName, responseType, jsonschema }: ReactQueryHookQueryInterface) => t.ExportNamedDeclaration;
-export {};
+export { };

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Dan Lynch <pyramation@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.