wasm-ast-types 0.0.11 → 0.1.1

package/main/wasm.js

@@ -23,6 +23,13 @@ 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 getMessageProperties = function getMessageProperties(msg) {
+  if (msg.anyOf) return msg.anyOf;
+  if (msg.oneOf) return msg.oneOf;
+  if (msg.allOf) return msg.allOf;
+  throw new Error('Message case not handled yet, contact maintainers.');
+};
+
 var getTypeFromRef = function getTypeFromRef($ref) {
   switch ($ref) {
     case '#/definitions/Binary':
@@ -65,7 +72,7 @@ var getType = function getType(type) {
 };
 
 var getPropertyType = function getPropertyType(schema, prop) {
-  var _schema$properties, _schema$required;
+  var _schema$properties, _schema$required, _schema$required2;
 
   var props = (_schema$properties = schema.properties) !== null && _schema$properties !== void 0 ? _schema$properties : {};
   var info = props[prop];
@@ -132,20 +139,16 @@ var getPropertyType = function getPropertyType(schema, prop) {
     throw new Error('cannot find type for ' + JSON.stringify(info));
   }
 
+  if ((_schema$required2 = schema.required) !== null && _schema$required2 !== void 0 && _schema$required2.includes(prop)) {
+    optional = false;
+  }
+
   return {
     type: type,
     optional: optional
   };
 };
 
-var getProperty = function getProperty(schema, prop) {
-  var _getPropertyType = getPropertyType(schema, prop),
-      type = _getPropertyType.type,
-      optional = _getPropertyType.optional;
-
-  return (0, _utils.typedIdentifier)((0, _case.camel)(prop), t.tsTypeAnnotation(type), optional);
-};
-
 var createWasmQueryMethod = function createWasmQueryMethod(jsonschema) {
   var _jsonschema$propertie;
 
@@ -164,13 +167,13 @@ var createWasmQueryMethod = function createWasmQueryMethod(jsonschema) {
 exports.createWasmQueryMethod = createWasmQueryMethod;
 
 var createQueryClass = function createQueryClass(className, implementsClassName, queryMsg) {
-  var propertyNames = queryMsg.oneOf.map(function (method) {
+  var propertyNames = getMessageProperties(queryMsg).map(function (method) {
     var _Object$keys;
 
     return (_Object$keys = Object.keys(method.properties)) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0];
   }).filter(Boolean);
   var bindings = propertyNames.map(_case.camel).map(_utils.bindMethod);
-  var methods = queryMsg.oneOf.map(function (schema) {
+  var methods = getMessageProperties(queryMsg).map(function (schema) {
     return createWasmQueryMethod(schema);
   });
   return t.exportNamedDeclaration((0, _utils.classDeclaration)(className, [// client
@@ -200,13 +203,13 @@ var createWasmExecMethod = function createWasmExecMethod(jsonschema) {
 exports.createWasmExecMethod = createWasmExecMethod;
 
 var createExecuteClass = function createExecuteClass(className, implementsClassName, extendsClassName, execMsg) {
-  var propertyNames = execMsg.oneOf.map(function (method) {
+  var propertyNames = getMessageProperties(execMsg).map(function (method) {
     var _Object$keys2;
 
     return (_Object$keys2 = Object.keys(method.properties)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2[0];
   }).filter(Boolean);
   var bindings = propertyNames.map(_case.camel).map(_utils.bindMethod);
-  var methods = execMsg.oneOf.map(function (schema) {
+  var methods = getMessageProperties(execMsg).map(function (schema) {
     return createWasmExecMethod(schema);
   });
   var blockStmt = [];
@@ -228,7 +231,7 @@ var createExecuteClass = function createExecuteClass(className, implementsClassN
 exports.createExecuteClass = createExecuteClass;
 
 var createExecuteInterface = function createExecuteInterface(className, extendsClassName, execMsg) {
-  var methods = execMsg.oneOf.map(function (jsonschema) {
+  var methods = getMessageProperties(execMsg).map(function (jsonschema) {
     var underscoreName = Object.keys(jsonschema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
     return createPropertyFunctionWithObjectParams(methodName, 'ExecuteResult', jsonschema.properties[underscoreName]);
@@ -241,6 +244,26 @@ var createExecuteInterface = function createExecuteInterface(className, extendsC
 
 exports.createExecuteInterface = createExecuteInterface;
 
+var propertySignature = function propertySignature(name, typeAnnotation) {
+  var optional = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  // prop.leadingComments = [{
+  //   type: 'Comment',
+  //   value: ' Data on the token itself'
+  // }];
+  // prop.leadingComments = [{
+  //   type: 'CommentBlock',
+  //   value: '* Data on the token itself'
+  // }];
+  return {
+    type: 'TSPropertySignature',
+    key: t.identifier(name),
+    typeAnnotation: typeAnnotation,
+    optional: optional
+  };
+};
+
+exports.propertySignature = propertySignature;
+
 var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
   var _jsonschema$propertie3;
 
@@ -248,11 +271,11 @@ var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
   var keys = Object.keys((_jsonschema$propertie3 = jsonschema.properties) !== null && _jsonschema$propertie3 !== void 0 ? _jsonschema$propertie3 : {});
   if (!keys.length) return;
   var typedParams = keys.map(function (prop) {
-    var _getPropertyType2 = getPropertyType(jsonschema, prop),
-        type = _getPropertyType2.type,
-        optional = _getPropertyType2.optional;
+    var _getPropertyType = getPropertyType(jsonschema, prop),
+        type = _getPropertyType.type,
+        optional = _getPropertyType.optional;
 
-    return t.tsPropertySignature(camelize ? t.identifier((0, _case.camel)(prop)) : t.identifier(prop), t.tsTypeAnnotation(type));
+    return propertySignature(camelize ? (0, _case.camel)(prop) : prop, t.tsTypeAnnotation(type), optional);
   });
   var params = keys.map(function (prop) {
     return t.objectProperty(camelize ? t.identifier((0, _case.camel)(prop)) : t.identifier(prop), camelize ? t.identifier((0, _case.camel)(prop)) : t.identifier(prop), false, true);
@@ -277,7 +300,7 @@ var createPropertyFunctionWithObjectParams = function createPropertyFunctionWith
 exports.createPropertyFunctionWithObjectParams = createPropertyFunctionWithObjectParams;
 
 var createQueryInterface = function createQueryInterface(className, queryMsg) {
-  var methods = queryMsg.oneOf.map(function (jsonschema) {
+  var methods = getMessageProperties(queryMsg).map(function (jsonschema) {
     var underscoreName = Object.keys(jsonschema.properties)[0];
     var methodName = (0, _case.camel)(underscoreName);
     var responseType = (0, _case.pascal)("".concat(methodName, "Response"));
@@ -289,22 +312,6 @@ var createQueryInterface = function createQueryInterface(className, queryMsg) {
 
 exports.createQueryInterface = createQueryInterface;
 
-var propertySignature = function propertySignature(name, typeAnnotation) {
-  var optional = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  var prop = t.tsPropertySignature(t.identifier(name), typeAnnotation); // prop.leadingComments = [{
-  //   type: 'Comment',
-  //   value: ' Data on the token itself'
-  // }];
-  // prop.leadingComments = [{
-  //   type: 'CommentBlock',
-  //   value: '* Data on the token itself'
-  // }];
-
-  return prop;
-};
-
-exports.propertySignature = propertySignature;
-
 var createTypeOrInterface = function createTypeOrInterface(Type, jsonschema) {
   var _jsonschema$propertie4;
 
@@ -313,9 +320,9 @@ var createTypeOrInterface = function createTypeOrInterface(Type, jsonschema) {
   }
 
   var props = Object.keys((_jsonschema$propertie4 = jsonschema.properties) !== null && _jsonschema$propertie4 !== void 0 ? _jsonschema$propertie4 : {}).map(function (prop) {
-    var _getPropertyType3 = getPropertyType(jsonschema, prop),
-        type = _getPropertyType3.type,
-        optional = _getPropertyType3.optional;
+    var _getPropertyType2 = getPropertyType(jsonschema, prop),
+        type = _getPropertyType2.type,
+        optional = _getPropertyType2.optional;
 
     return propertySignature((0, _case.camel)(prop), t.tsTypeAnnotation(type), optional);
   });

package/module/wasm.js

@@ -2,6 +2,13 @@ import * as t from '@babel/types';
 import { camel, pascal } from 'case';
 import { bindMethod, typedIdentifier, promiseTypeAnnotation, classDeclaration, classProperty, arrowFunctionExpression } from './utils';
 
+const getMessageProperties = msg => {
+  if (msg.anyOf) return msg.anyOf;
+  if (msg.oneOf) return msg.oneOf;
+  if (msg.allOf) return msg.allOf;
+  throw new Error('Message case not handled yet, contact maintainers.');
+};
+
 const getTypeFromRef = $ref => {
   switch ($ref) {
     case '#/definitions/Binary':
@@ -105,20 +112,16 @@ const getPropertyType = (schema, prop) => {
     throw new Error('cannot find type for ' + JSON.stringify(info));
   }
 
+  if (schema.required?.includes(prop)) {
+    optional = false;
+  }
+
   return {
     type,
     optional
   };
 };
 
-const getProperty = (schema, prop) => {
-  const {
-    type,
-    optional
-  } = getPropertyType(schema, prop);
-  return typedIdentifier(camel(prop), t.tsTypeAnnotation(type), optional);
-};
-
 export const createWasmQueryMethod = jsonschema => {
   const underscoreName = Object.keys(jsonschema.properties)[0];
   const methodName = camel(underscoreName);
@@ -132,9 +135,9 @@ export const createWasmQueryMethod = jsonschema => {
   return t.classProperty(t.identifier(methodName), arrowFunctionExpression(obj ? [obj] : [], t.blockStatement([t.returnStatement(t.callExpression(t.memberExpression(t.memberExpression(t.thisExpression(), t.identifier('client')), t.identifier('queryContractSmart')), [t.memberExpression(t.thisExpression(), t.identifier('contractAddress')), t.objectExpression([actionArg])]))]), t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier(responseType))]))), true));
 };
 export const createQueryClass = (className, implementsClassName, queryMsg) => {
-  const propertyNames = queryMsg.oneOf.map(method => Object.keys(method.properties)?.[0]).filter(Boolean);
+  const propertyNames = getMessageProperties(queryMsg).map(method => Object.keys(method.properties)?.[0]).filter(Boolean);
   const bindings = propertyNames.map(camel).map(bindMethod);
-  const methods = queryMsg.oneOf.map(schema => {
+  const methods = getMessageProperties(queryMsg).map(schema => {
     return createWasmQueryMethod(schema);
   });
   return t.exportNamedDeclaration(classDeclaration(className, [// client
@@ -156,9 +159,9 @@ export const createWasmExecMethod = jsonschema => {
   t.tsTypeAnnotation(t.tsTypeReference(t.identifier('Promise'), t.tsTypeParameterInstantiation([t.tSTypeReference(t.identifier('ExecuteResult'))]))), true));
 };
 export const createExecuteClass = (className, implementsClassName, extendsClassName, execMsg) => {
-  const propertyNames = execMsg.oneOf.map(method => Object.keys(method.properties)?.[0]).filter(Boolean);
+  const propertyNames = getMessageProperties(execMsg).map(method => Object.keys(method.properties)?.[0]).filter(Boolean);
   const bindings = propertyNames.map(camel).map(bindMethod);
-  const methods = execMsg.oneOf.map(schema => {
+  const methods = getMessageProperties(execMsg).map(schema => {
     return createWasmExecMethod(schema);
   });
   const blockStmt = [];
@@ -177,7 +180,7 @@ export const createExecuteClass = (className, implementsClassName, extendsClassN
   t.classMethod('constructor', t.identifier('constructor'), [typedIdentifier('client', t.tsTypeAnnotation(t.tsTypeReference(t.identifier('SigningCosmWasmClient')))), typedIdentifier('sender', t.tsTypeAnnotation(t.tsStringKeyword())), typedIdentifier('contractAddress', t.tsTypeAnnotation(t.tsStringKeyword()))], t.blockStatement(blockStmt)), ...methods], [t.tSExpressionWithTypeArguments(t.identifier(implementsClassName))], extendsClassName ? t.identifier(extendsClassName) : null));
 };
 export const createExecuteInterface = (className, extendsClassName, execMsg) => {
-  const methods = execMsg.oneOf.map(jsonschema => {
+  const methods = getMessageProperties(execMsg).map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
     return createPropertyFunctionWithObjectParams(methodName, 'ExecuteResult', jsonschema.properties[underscoreName]);
@@ -187,6 +190,22 @@ export const createExecuteInterface = (className, extendsClassName, execMsg) =>
   t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), // contract address
   t.tSPropertySignature(t.identifier('sender'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
 };
+export const propertySignature = (name, typeAnnotation, optional = false) => {
+  // prop.leadingComments = [{
+  //   type: 'Comment',
+  //   value: ' Data on the token itself'
+  // }];
+  // prop.leadingComments = [{
+  //   type: 'CommentBlock',
+  //   value: '* Data on the token itself'
+  // }];
+  return {
+    type: 'TSPropertySignature',
+    key: t.identifier(name),
+    typeAnnotation,
+    optional
+  };
+};
 export const createTypedObjectParams = (jsonschema, camelize = true) => {
   const keys = Object.keys(jsonschema.properties ?? {});
   if (!keys.length) return;
@@ -195,7 +214,7 @@ export const createTypedObjectParams = (jsonschema, camelize = true) => {
       type,
       optional
     } = getPropertyType(jsonschema, prop);
-    return t.tsPropertySignature(camelize ? t.identifier(camel(prop)) : t.identifier(prop), t.tsTypeAnnotation(type));
+    return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(type), optional);
   });
   const params = keys.map(prop => {
     return t.objectProperty(camelize ? t.identifier(camel(prop)) : t.identifier(prop), camelize ? t.identifier(camel(prop)) : t.identifier(prop), false, true);
@@ -214,7 +233,7 @@ export const createPropertyFunctionWithObjectParams = (methodName, responseType,
   return t.tSPropertySignature(t.identifier(methodName), t.tsTypeAnnotation(func));
 };
 export const createQueryInterface = (className, queryMsg) => {
-  const methods = queryMsg.oneOf.map(jsonschema => {
+  const methods = getMessageProperties(queryMsg).map(jsonschema => {
     const underscoreName = Object.keys(jsonschema.properties)[0];
     const methodName = camel(underscoreName);
     const responseType = pascal(`${methodName}Response`);
@@ -223,18 +242,6 @@ export const createQueryInterface = (className, queryMsg) => {
   });
   return t.exportNamedDeclaration(t.tsInterfaceDeclaration(t.identifier(className), null, [], t.tSInterfaceBody([t.tSPropertySignature(t.identifier('contractAddress'), t.tsTypeAnnotation(t.tsStringKeyword())), ...methods])));
 };
-export const propertySignature = (name, typeAnnotation, optional = false) => {
-  const prop = t.tsPropertySignature(t.identifier(name), typeAnnotation); // prop.leadingComments = [{
-  //   type: 'Comment',
-  //   value: ' Data on the token itself'
-  // }];
-  // prop.leadingComments = [{
-  //   type: 'CommentBlock',
-  //   value: '* Data on the token itself'
-  // }];
-
-  return prop;
-};
 export const createTypeOrInterface = (Type, jsonschema) => {
   if (jsonschema.type !== 'object') {
     return t.exportNamedDeclaration(t.tsTypeAliasDeclaration(t.identifier(Type), null, getType(jsonschema.type)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.0.11",
+  "version": "0.1.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",
@@ -85,5 +85,5 @@
     "ast-stringify": "0.1.0",
     "case": "1.6.3"
   },
-  "gitHead": "972a1b8c212c531cd23d7f15ba8944841e938ba9"
+  "gitHead": "205c770b11ce9ea868d58af0567e5ff006cc5381"
 }