wasm-ast-types 0.0.9 → 0.0.12

package/main/wasm.js

@@ -65,7 +65,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,6 +132,10 @@ 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
@@ -241,9 +245,30 @@ 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;
 
+  var camelize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   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) {
@@ -251,10 +276,10 @@ var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
         type = _getPropertyType2.type,
         optional = _getPropertyType2.optional;
 
-    return t.tsPropertySignature(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(t.identifier(prop), t.identifier(prop), false, true);
+    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);
   });
   var obj = t.objectPattern((0, _toConsumableArray2["default"])(params));
   obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral((0, _toConsumableArray2["default"])(typedParams)));
@@ -288,22 +313,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;
 

package/main/wasm.spec.js

@@ -77,7 +77,7 @@ it('query classes', function () {
   expectCode((0, _wasm.createQueryClass)('SG721QueryClient', 'SG721ReadOnlyInstance', _query_msg["default"]));
 });
 it('execute classes', function () {
-  printCode((0, _wasm.createExecuteClass)('SG721Client', 'SG721Instance', 'SG721QueryClient', _execute_msg_for__empty["default"]));
+  expectCode((0, _wasm.createExecuteClass)('SG721Client', 'SG721Instance', 'SG721QueryClient', _execute_msg_for__empty["default"]));
 });
 it('execute classes no extends', function () {
   expectCode((0, _wasm.createExecuteClass)('SG721Client', 'SG721Instance', null, _execute_msg_for__empty["default"]));

package/module/wasm.js

@@ -105,6 +105,10 @@ const getPropertyType = (schema, prop) => {
     throw new Error('cannot find type for ' + JSON.stringify(info));
   }
 
+  if (schema.required?.includes(prop)) {
+    optional = false;
+  }
+
   return {
     type,
     optional
@@ -187,7 +191,23 @@ 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 createTypedObjectParams = jsonschema => {
+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;
   const typedParams = keys.map(prop => {
@@ -195,10 +215,10 @@ export const createTypedObjectParams = jsonschema => {
       type,
       optional
     } = getPropertyType(jsonschema, prop);
-    return t.tsPropertySignature(t.identifier(prop), t.tsTypeAnnotation(type));
+    return propertySignature(camelize ? camel(prop) : prop, t.tsTypeAnnotation(type), optional);
   });
   const params = keys.map(prop => {
-    return t.objectProperty(t.identifier(prop), t.identifier(prop), false, true);
+    return t.objectProperty(camelize ? t.identifier(camel(prop)) : t.identifier(prop), camelize ? t.identifier(camel(prop)) : t.identifier(prop), false, true);
   });
   const obj = t.objectPattern([...params]);
   obj.typeAnnotation = t.tsTypeAnnotation(t.tsTypeLiteral([...typedParams]));
@@ -223,18 +243,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/module/wasm.spec.js

@@ -59,7 +59,7 @@ it('query classes', () => {
   expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', query_msg));
 });
 it('execute classes', () => {
-  printCode(createExecuteClass('SG721Client', 'SG721Instance', 'SG721QueryClient', execute_msg));
+  expectCode(createExecuteClass('SG721Client', 'SG721Instance', 'SG721QueryClient', execute_msg));
 });
 it('execute classes no extends', () => {
   expectCode(createExecuteClass('SG721Client', 'SG721Instance', null, execute_msg));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.0.9",
+  "version": "0.0.12",
   "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": "1d8886f8c415d2123010166ee491f88935c8ec1b"
+  "gitHead": "7b4d5701c31843fc5c49364e658ea6003e080b7e"
 }