remult 0.17.0 → 0.17.1

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.
Files changed (3) hide show
  1. package/esm/graphql.js +36 -30
  2. package/graphql.js +50 -36
  3. package/package.json +1 -1
package/esm/graphql.js CHANGED
@@ -48,37 +48,43 @@ export function remultGraphql(api) {
48
48
  types += "input " + key + "Filter{" + filterFields + "\n\tOR:[" + key + "Filter]\n}\n";
49
49
  query += "\n\t" + key + "(options: options, filter:" + key + "Filter): [" + key + "]";
50
50
  root[key] = async ({ options, filter }, req) => {
51
- let remult = await api.getRemult(req);
52
- let repo = remult.repo(e);
53
- let dApi = new DataApi(repo, remult);
54
- let result;
55
- let err;
56
- await dApi.getArray({
57
- success: x => result = x,
58
- created: undefined,
59
- deleted: undefined,
60
- error: x => err = x,
61
- forbidden: () => err = 'forbidden',
62
- notFound: () => err = 'not found',
63
- progress: undefined
64
- }, {
65
- get: key => {
66
- if (options)
67
- switch (key) {
68
- case "_limit":
69
- return options.limit;
70
- case "_page":
71
- return options.page;
72
- case "_sort":
73
- return options.sort;
74
- case "_order":
75
- return options.order;
51
+ return new Promise(async (res, error) => {
52
+ api.withRemult(req, undefined, async () => {
53
+ let remult = await api.getRemult(req);
54
+ let repo = remult.repo(e);
55
+ let dApi = new DataApi(repo, remult);
56
+ let result;
57
+ let err;
58
+ await dApi.getArray({
59
+ success: x => result = x,
60
+ created: undefined,
61
+ deleted: undefined,
62
+ error: x => err = x,
63
+ forbidden: () => err = 'forbidden',
64
+ notFound: () => err = 'not found',
65
+ progress: undefined
66
+ }, {
67
+ get: key => {
68
+ if (options)
69
+ switch (key) {
70
+ case "_limit":
71
+ return options.limit;
72
+ case "_page":
73
+ return options.page;
74
+ case "_sort":
75
+ return options.sort;
76
+ case "_order":
77
+ return options.order;
78
+ }
76
79
  }
77
- }
78
- }, filter);
79
- if (err)
80
- throw err;
81
- return result;
80
+ }, filter);
81
+ if (err) {
82
+ error(err);
83
+ return;
84
+ }
85
+ res(result);
86
+ });
87
+ });
82
88
  };
83
89
  }
84
90
  }
package/graphql.js CHANGED
@@ -98,43 +98,57 @@ function remultGraphql(api) {
98
98
  root[key] = function (_a, req) {
99
99
  var options = _a.options, filter = _a.filter;
100
100
  return tslib_1.__awaiter(_this, void 0, void 0, function () {
101
- var remult, repo, dApi, result, err;
101
+ var _this = this;
102
102
  return tslib_1.__generator(this, function (_b) {
103
- switch (_b.label) {
104
- case 0: return [4 /*yield*/, api.getRemult(req)];
105
- case 1:
106
- remult = _b.sent();
107
- repo = remult.repo(e);
108
- dApi = new data_api_1.DataApi(repo, remult);
109
- return [4 /*yield*/, dApi.getArray({
110
- success: function (x) { return result = x; },
111
- created: undefined,
112
- deleted: undefined,
113
- error: function (x) { return err = x; },
114
- forbidden: function () { return err = 'forbidden'; },
115
- notFound: function () { return err = 'not found'; },
116
- progress: undefined
117
- }, {
118
- get: function (key) {
119
- if (options)
120
- switch (key) {
121
- case "_limit":
122
- return options.limit;
123
- case "_page":
124
- return options.page;
125
- case "_sort":
126
- return options.sort;
127
- case "_order":
128
- return options.order;
129
- }
130
- }
131
- }, filter)];
132
- case 2:
133
- _b.sent();
134
- if (err)
135
- throw err;
136
- return [2 /*return*/, result];
137
- }
103
+ return [2 /*return*/, new Promise(function (res, error) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
104
+ var _this = this;
105
+ return tslib_1.__generator(this, function (_a) {
106
+ api.withRemult(req, undefined, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
107
+ var remult, repo, dApi, result, err;
108
+ return tslib_1.__generator(this, function (_a) {
109
+ switch (_a.label) {
110
+ case 0: return [4 /*yield*/, api.getRemult(req)];
111
+ case 1:
112
+ remult = _a.sent();
113
+ repo = remult.repo(e);
114
+ dApi = new data_api_1.DataApi(repo, remult);
115
+ return [4 /*yield*/, dApi.getArray({
116
+ success: function (x) { return result = x; },
117
+ created: undefined,
118
+ deleted: undefined,
119
+ error: function (x) { return err = x; },
120
+ forbidden: function () { return err = 'forbidden'; },
121
+ notFound: function () { return err = 'not found'; },
122
+ progress: undefined
123
+ }, {
124
+ get: function (key) {
125
+ if (options)
126
+ switch (key) {
127
+ case "_limit":
128
+ return options.limit;
129
+ case "_page":
130
+ return options.page;
131
+ case "_sort":
132
+ return options.sort;
133
+ case "_order":
134
+ return options.order;
135
+ }
136
+ }
137
+ }, filter)];
138
+ case 2:
139
+ _a.sent();
140
+ if (err) {
141
+ error(err);
142
+ return [2 /*return*/];
143
+ }
144
+ res(result);
145
+ return [2 /*return*/];
146
+ }
147
+ });
148
+ }); });
149
+ return [2 /*return*/];
150
+ });
151
+ }); })];
138
152
  });
139
153
  });
140
154
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "remult",
3
- "version": "0.17.0",
3
+ "version": "0.17.1",
4
4
  "description": "A CRUD framework for full-stack TypeScript",
5
5
  "main": "index.js",
6
6
  "types": "index.d.ts",