wasm-ast-types 0.3.2 → 0.3.5

package/main/utils/types.js

@@ -23,6 +23,20 @@ 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 getTypeStrFromRef = function getTypeStrFromRef($ref) {
+  switch ($ref) {
+    case '#/definitions/Binary':
+      return 'Binary';
+
+    default:
+      if ($ref !== null && $ref !== void 0 && $ref.startsWith('#/definitions/')) {
+        return $ref.replace('#/definitions/', '');
+      }
+
+      throw new Error('what is $ref: ' + $ref);
+  }
+};
+
 var getTypeFromRef = function getTypeFromRef($ref) {
   switch ($ref) {
     case '#/definitions/Binary':
@@ -184,6 +198,7 @@ var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
       var isOptional = !((_jsonschema$required = jsonschema.required) !== null && _jsonschema$required !== void 0 && _jsonschema$required.includes(prop));
       var unionTypes = jsonschema.properties[prop].allOf.map(function (el) {
         if (el.title) return el.title;
+        if (el.$ref) return getTypeStrFromRef(el.$ref);
         return el.type;
       });
       var uniqUnionTypes = (0, _toConsumableArray2["default"])(new Set(unionTypes));
@@ -202,6 +217,7 @@ var createTypedObjectParams = function createTypedObjectParams(jsonschema) {
 
       var _unionTypes = jsonschema.properties[prop].oneOf.map(function (el) {
         if (el.title) return el.title;
+        if (el.$ref) return getTypeStrFromRef(el.$ref);
         return el.type;
       });
 

package/main/wasm.cw-named-groups.test.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _generator = _interopRequireDefault(require("@babel/generator"));
+
+var _execute_msg = _interopRequireDefault(require("./../../../__fixtures__/daodao/cw-named-groups/execute_msg.json"));
+
+var _wasm = require("./wasm");
+
+var expectCode = function expectCode(ast) {
+  expect((0, _generator["default"])(ast).code).toMatchSnapshot();
+};
+
+var printCode = function printCode(ast) {
+  console.log((0, _generator["default"])(ast).code);
+};
+
+it('execute_msg', function () {
+  expectCode((0, _wasm.createTypeInterface)(_execute_msg["default"]));
+});
+it('query classes', function () {
+  expectCode((0, _wasm.createQueryClass)('SG721QueryClient', 'SG721ReadOnlyInstance', _execute_msg["default"]));
+});
+it('execute classes array types', function () {
+  expectCode((0, _wasm.createExecuteClass)('SG721Client', 'SG721Instance', null, _execute_msg["default"]));
+});
+it('execute interfaces no extends', function () {
+  expectCode((0, _wasm.createExecuteInterface)('SG721Instance', null, _execute_msg["default"]));
+});

package/main/wasm.cw-proposal-single.test.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _generator = _interopRequireDefault(require("@babel/generator"));
+
+var _execute_msg = _interopRequireDefault(require("./../../../__fixtures__/daodao/cw-proposal-single/execute_msg.json"));
+
+var _query_msg = _interopRequireDefault(require("./../../../__fixtures__/daodao/cw-proposal-single/query_msg.json"));
+
+var _wasm = require("./wasm");
+
+var expectCode = function expectCode(ast) {
+  expect((0, _generator["default"])(ast).code).toMatchSnapshot();
+};
+
+var printCode = function printCode(ast) {
+  console.log((0, _generator["default"])(ast).code);
+};
+
+it('execute_msg_for', function () {
+  expectCode((0, _wasm.createTypeInterface)(_execute_msg["default"]));
+});
+it('query classes', function () {
+  expectCode((0, _wasm.createQueryClass)('SG721QueryClient', 'SG721ReadOnlyInstance', _query_msg["default"]));
+});
+it('execute classes array types', function () {
+  expectCode((0, _wasm.createExecuteClass)('SG721Client', 'SG721Instance', null, _execute_msg["default"]));
+});
+it('execute interfaces no extends', function () {
+  expectCode((0, _wasm.createExecuteInterface)('SG721Instance', null, _execute_msg["default"]));
+});

package/main/wasm.empty-enums.spec.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _generator = _interopRequireDefault(require("@babel/generator"));
+
+var _query_msg = _interopRequireDefault(require("./../../../__fixtures__/daodao/cw-admin-factory/query_msg.json"));
+
+var _wasm = require("./wasm");
+
+var expectCode = function expectCode(ast) {
+  expect((0, _generator["default"])(ast).code).toMatchSnapshot();
+};
+
+var printCode = function printCode(ast) {
+  console.log((0, _generator["default"])(ast).code);
+};
+
+it('query classes', function () {
+  expectCode((0, _wasm.createQueryClass)('SG721QueryClient', 'SG721ReadOnlyInstance', _query_msg["default"]));
+});
+it('query interface', function () {
+  expectCode((0, _wasm.createQueryInterface)('ReadOnlyInstance', _query_msg["default"]));
+});

package/main/wasm.spec.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _generator = _interopRequireDefault(require("@babel/generator"));
 
-var _execute_msg = _interopRequireDefault(require("./../../../__fixtures__/cw-named-groups/execute_msg.json"));
+var _execute_msg = _interopRequireDefault(require("./../../../__fixtures__/daodao/cw-named-groups/execute_msg.json"));
 
 var _query_msg = _interopRequireDefault(require("./../../../__fixtures__/basic/query_msg.json"));
 

package/module/utils/types.js

@@ -2,6 +2,20 @@ import * as t from '@babel/types';
 import { camel } from 'case';
 import { propertySignature } from './babel';
 
+const getTypeStrFromRef = $ref => {
+  switch ($ref) {
+    case '#/definitions/Binary':
+      return 'Binary';
+
+    default:
+      if ($ref?.startsWith('#/definitions/')) {
+        return $ref.replace('#/definitions/', '');
+      }
+
+      throw new Error('what is $ref: ' + $ref);
+  }
+};
+
 const getTypeFromRef = $ref => {
   switch ($ref) {
     case '#/definitions/Binary':
@@ -146,6 +160,7 @@ export const createTypedObjectParams = (jsonschema, camelize = true) => {
       const isOptional = !jsonschema.required?.includes(prop);
       const unionTypes = jsonschema.properties[prop].allOf.map(el => {
         if (el.title) return el.title;
+        if (el.$ref) return getTypeStrFromRef(el.$ref);
         return el.type;
       });
       const uniqUnionTypes = [...new Set(unionTypes)];
@@ -159,6 +174,7 @@ export const createTypedObjectParams = (jsonschema, camelize = true) => {
       const isOptional = !jsonschema.required?.includes(prop);
       const unionTypes = jsonschema.properties[prop].oneOf.map(el => {
         if (el.title) return el.title;
+        if (el.$ref) return getTypeStrFromRef(el.$ref);
         return el.type;
       });
       const uniqUnionTypes = [...new Set(unionTypes)];

package/module/wasm.cw-named-groups.test.js

@@ -0,0 +1,24 @@
+import generate from '@babel/generator';
+import execute_msg from './../../../__fixtures__/daodao/cw-named-groups/execute_msg.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from './wasm';
+
+const expectCode = ast => {
+  expect(generate(ast).code).toMatchSnapshot();
+};
+
+const printCode = ast => {
+  console.log(generate(ast).code);
+};
+
+it('execute_msg', () => {
+  expectCode(createTypeInterface(execute_msg));
+});
+it('query classes', () => {
+  expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', execute_msg));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass('SG721Client', 'SG721Instance', null, execute_msg));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface('SG721Instance', null, execute_msg));
+});

package/module/wasm.cw-proposal-single.test.js

@@ -0,0 +1,25 @@
+import generate from '@babel/generator';
+import execute_msg from './../../../__fixtures__/daodao/cw-proposal-single/execute_msg.json';
+import query_msg from './../../../__fixtures__/daodao/cw-proposal-single/query_msg.json';
+import { createQueryClass, createExecuteClass, createExecuteInterface, createTypeInterface } from './wasm';
+
+const expectCode = ast => {
+  expect(generate(ast).code).toMatchSnapshot();
+};
+
+const printCode = ast => {
+  console.log(generate(ast).code);
+};
+
+it('execute_msg_for', () => {
+  expectCode(createTypeInterface(execute_msg));
+});
+it('query classes', () => {
+  expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', query_msg));
+});
+it('execute classes array types', () => {
+  expectCode(createExecuteClass('SG721Client', 'SG721Instance', null, execute_msg));
+});
+it('execute interfaces no extends', () => {
+  expectCode(createExecuteInterface('SG721Instance', null, execute_msg));
+});

package/module/wasm.empty-enums.spec.js

@@ -0,0 +1,18 @@
+import generate from '@babel/generator';
+import query_msg from './../../../__fixtures__/daodao/cw-admin-factory/query_msg.json';
+import { createQueryClass, createQueryInterface } from './wasm';
+
+const expectCode = ast => {
+  expect(generate(ast).code).toMatchSnapshot();
+};
+
+const printCode = ast => {
+  console.log(generate(ast).code);
+};
+
+it('query classes', () => {
+  expectCode(createQueryClass('SG721QueryClient', 'SG721ReadOnlyInstance', query_msg));
+});
+it('query interface', () => {
+  expectCode(createQueryInterface('ReadOnlyInstance', query_msg));
+});

package/module/wasm.spec.js

@@ -1,5 +1,5 @@
 import generate from '@babel/generator';
-import execute_msg_named_groups from './../../../__fixtures__/cw-named-groups/execute_msg.json';
+import execute_msg_named_groups from './../../../__fixtures__/daodao/cw-named-groups/execute_msg.json';
 import query_msg from './../../../__fixtures__/basic/query_msg.json';
 import execute_msg from './../../../__fixtures__/basic/execute_msg_for__empty.json';
 import approval_response from './../../../__fixtures__/basic/approval_response.json';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wasm-ast-types",
-  "version": "0.3.2",
+  "version": "0.3.5",
   "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",
@@ -42,48 +42,48 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types"
+    "url": "https://github.com/pyramation/cosmwasm-typescript-gen"
   },
   "keywords": [],
   "bugs": {
-    "url": "https://github.com/pyramation/cosmwasm-typescript-gen/tree/master/packages/wasm-ast-types/issues"
+    "url": "https://github.com/pyramation/cosmwasm-typescript-gen/issues"
   },
   "devDependencies": {
-    "@babel/cli": "7.17.6",
-    "@babel/core": "7.17.8",
-    "@babel/eslint-parser": "^7.5.4",
-    "@babel/generator": "7.17.7",
-    "@babel/node": "^7.10.5",
-    "@babel/parser": "^7.17.8",
-    "@babel/plugin-proposal-class-properties": "7.16.7",
-    "@babel/plugin-proposal-export-default-from": "7.16.7",
-    "@babel/plugin-proposal-object-rest-spread": "7.17.3",
-    "@babel/plugin-transform-runtime": "7.17.0",
-    "@babel/preset-env": "7.16.11",
-    "@babel/preset-typescript": "^7.16.7",
-    "@babel/traverse": "7.17.3",
-    "@types/jest": "^27.4.1",
+    "@babel/cli": "7.17.10",
+    "@babel/core": "7.18.5",
+    "@babel/eslint-parser": "^7.18.2",
+    "@babel/generator": "7.18.2",
+    "@babel/node": "^7.18.5",
+    "@babel/parser": "^7.18.5",
+    "@babel/plugin-proposal-class-properties": "7.17.12",
+    "@babel/plugin-proposal-export-default-from": "7.17.12",
+    "@babel/plugin-proposal-object-rest-spread": "7.18.0",
+    "@babel/plugin-transform-runtime": "7.18.5",
+    "@babel/preset-env": "7.18.2",
+    "@babel/preset-typescript": "^7.17.12",
+    "@babel/traverse": "7.18.5",
+    "@types/jest": "^28.1.2",
     "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "27.5.1",
+    "babel-jest": "28.1.1",
     "babel-watch": "^7.0.0",
     "cross-env": "^7.0.2",
-    "eslint": "8.12.0",
+    "eslint": "8.17.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "glob": "7.2.0",
-    "jest": "^27.5.1",
+    "glob": "8.0.3",
+    "jest": "^28.1.1",
     "jest-in-case": "^1.0.2",
     "mkdirp": "1.0.4",
-    "prettier": "^2.6.2",
+    "prettier": "^2.7.1",
     "regenerator-runtime": "^0.13.7",
-    "ts-jest": "^27.1.4",
-    "typescript": "^4.6.2"
+    "ts-jest": "^28.0.5",
+    "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@babel/runtime": "^7.11.2",
-    "@babel/types": "7.17.0",
+    "@babel/runtime": "^7.18.3",
+    "@babel/types": "7.18.4",
     "ast-stringify": "0.1.0",
     "case": "1.6.3"
   },
-  "gitHead": "bf8f96d8f70a2bdfff2f210dc07c26c14575478b"
+  "gitHead": "63019a5cab0eb452ddb92261ab1271462d3e0048"
 }