@open-rpc/typings 1.12.4 → 1.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/build/go.js CHANGED
@@ -27,10 +27,13 @@ var getParamsTyping = function (method) {
27
27
  };
28
28
  var getMethodTyping = function (method) {
29
29
  var mResult = method.result;
30
- var mutableSchema = (mResult.schema === true || mResult.schema === false) ? mResult.schema : __assign({}, mResult.schema);
31
- var resultName = (0, utils_1.languageSafeName)((0, utils_1.getTitle)((0, titleizer_1.default)(mutableSchema)));
32
30
  var methodAliasName = (0, exports.getMethodAliasName)(method);
33
31
  var params = getParamsTyping(method);
32
+ if (mResult === undefined) {
33
+ return "\t".concat(methodAliasName, "(").concat(params, ") error");
34
+ }
35
+ var mutableSchema = (mResult.schema === true || mResult.schema === false) ? mResult.schema : __assign({}, mResult.schema);
36
+ var resultName = (0, utils_1.languageSafeName)((0, utils_1.getTitle)((0, titleizer_1.default)(mutableSchema)));
34
37
  return "\t".concat(methodAliasName, "(").concat(params, ") (").concat(resultName, ", error)");
35
38
  };
36
39
  var getMethodTypings = function (openrpcDocument) {
package/build/index.d.ts CHANGED
@@ -45,6 +45,7 @@ export default class MethodTypings {
45
45
  getMethodTypings(language: OpenRPCTypingsSupportedLanguages): string;
46
46
  getParamsTypings(language: OpenRPCTypingsSupportedLanguages): string;
47
47
  getParamsTyping(language: OpenRPCTypingsSupportedLanguages, method: MethodObject, joinString: string): string;
48
+ getEmptyResultType(language: OpenRPCTypingsSupportedLanguages): string;
48
49
  getTypingNames(language: OpenRPCTypingsSupportedLanguages, method: MethodObject): OpenRPCMethodTypingNames;
49
50
  /**
50
51
  * A configurable way to output the typings into a string.
package/build/index.js CHANGED
@@ -17,6 +17,16 @@ var generators = {
17
17
  rust: rust_1.default,
18
18
  typescript: typescript_1.default,
19
19
  };
20
+ var languageAliases = {
21
+ "ts": "typescript",
22
+ "rs": "rust",
23
+ "golang": "go",
24
+ "py": "python",
25
+ "rust": "rust",
26
+ "typescript": "typescript",
27
+ "go": "go",
28
+ "python": "python",
29
+ };
20
30
  /**
21
31
  * A class to handle all the tasks relating to types for the OpenRPC Document.
22
32
  */
@@ -59,8 +69,26 @@ var MethodTypings = /** @class */ (function () {
59
69
  MethodTypings.prototype.getParamsTyping = function (language, method, joinString) {
60
70
  return generators[language].getParamsTyping(method, joinString);
61
71
  };
72
+ MethodTypings.prototype.getEmptyResultType = function (language) {
73
+ var standardizedLanguage = languageAliases[language];
74
+ switch (standardizedLanguage) {
75
+ case "typescript":
76
+ return "Promise<void>";
77
+ case "rust":
78
+ return "RpcRequest<void>";
79
+ case "go":
80
+ return "void";
81
+ case "python":
82
+ return "None";
83
+ /* istanbul ignore next */
84
+ default:
85
+ /* istanbul ignore next */
86
+ throw new Error("Cannot resolve empty result type for unknown language: ".concat(language));
87
+ }
88
+ };
62
89
  MethodTypings.prototype.getTypingNames = function (language, method) {
63
- var gen = generators[language];
90
+ var standardizedLanguage = languageAliases[language];
91
+ var gen = generators[standardizedLanguage];
64
92
  var defaultedMethod = this.openrpcDocument.methods.find(function (_a) {
65
93
  var name = _a.name;
66
94
  return name === method.name;
@@ -73,7 +101,7 @@ var MethodTypings = /** @class */ (function () {
73
101
  var schema = _a.schema;
74
102
  return (0, utils_2.languageSafeName)((0, utils_2.getTitle)((0, titleizer_1.default)(schema)));
75
103
  }),
76
- result: (0, utils_2.languageSafeName)((0, utils_2.getTitle)((0, titleizer_1.default)(methodResult.schema))),
104
+ result: methodResult ? (0, utils_2.languageSafeName)((0, utils_2.getTitle)((0, titleizer_1.default)(methodResult.schema))) : this.getEmptyResultType(standardizedLanguage),
77
105
  };
78
106
  };
79
107
  /**
package/build/rust.js CHANGED
@@ -27,9 +27,12 @@ var getParamsTyping = function (method) {
27
27
  };
28
28
  var getMethodTyping = function (method) {
29
29
  var mResult = method.result;
30
- var mutableSchema = (mResult.schema === true || mResult.schema === false) ? mResult.schema : __assign({}, mResult.schema);
31
- var resultName = (0, utils_1.getTitle)((0, titleizer_1.default)(mutableSchema));
32
- var result = "RpcRequest<".concat((0, utils_1.languageSafeName)(resultName), ">");
30
+ var result = "RpcRequest<void>";
31
+ if (mResult !== undefined) {
32
+ var mutableSchema = (mResult.schema === true || mResult.schema === false) ? mResult.schema : __assign({}, mResult.schema);
33
+ var resultName = (0, utils_1.getTitle)((0, titleizer_1.default)(mutableSchema));
34
+ result = "RpcRequest<".concat((0, utils_1.languageSafeName)(resultName), ">");
35
+ }
33
36
  var methodAliasName = (0, exports.getMethodAliasName)(method);
34
37
  var params = getParamsTyping(method);
35
38
  var paramString = (params.length > 0) ? ", ".concat(params) : "";
@@ -29,12 +29,15 @@ var getParamsTyping = function (method, joinString) {
29
29
  return params;
30
30
  };
31
31
  var getMethodTyping = function (method) {
32
- var result = method.result;
33
- var mutableSchema = (result.schema === true || result.schema === false) ? result.schema : __assign({}, result.schema);
34
- var resultName = (0, utils_1.getTitle)((0, titleizer_1.default)(mutableSchema));
35
- var resultTypeName = "Promise<".concat((0, utils_1.languageSafeName)(resultName), ">");
36
32
  var methodAliasName = (0, exports.getMethodAliasName)(method);
37
33
  var params = getParamsTyping(method);
34
+ var result = method.result;
35
+ var resultTypeName = "Promise<void>";
36
+ if (result !== undefined) {
37
+ var mutableSchema = (result.schema === true || result.schema === false) ? result.schema : __assign({}, result.schema);
38
+ var resultName = (0, utils_1.getTitle)((0, titleizer_1.default)(mutableSchema));
39
+ resultTypeName = "Promise<".concat((0, utils_1.languageSafeName)(resultName), ">");
40
+ }
38
41
  return "export type ".concat(methodAliasName, " = (").concat(params, ") => ").concat(resultTypeName, ";");
39
42
  };
40
43
  var getMethodTypings = function (openrpcDocument) {
package/build/utils.js CHANGED
@@ -36,7 +36,7 @@ exports.flatten = flatten;
36
36
  var getSchemasForOpenRPCDocument = function (openrpcDocument) {
37
37
  var methods = openrpcDocument.methods;
38
38
  var params = (0, exports.flatten)(methods.map(function (method) { return method.params; }));
39
- var result = methods.map(function (method) { return method.result; });
39
+ var result = methods.map(function (method) { return method.result; }).filter(function (result) { return result !== undefined; });
40
40
  return params
41
41
  .concat(result)
42
42
  .map(function (_a) {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@open-rpc/typings",
3
3
  "private": false,
4
- "version": "1.12.4",
4
+ "version": "1.13.0",
5
5
  "description": "",
6
6
  "main": "build/index.js",
7
7
  "bin": {