remult 0.17.0-exp.9 → 0.17.1

package/esm/{core/graphql.js → graphql.js}

@@ -48,37 +48,43 @@ export function remultGraphql(api) {
             types += "input " + key + "Filter{" + filterFields + "\n\tOR:[" + key + "Filter]\n}\n";
             query += "\n\t" + key + "(options: options, filter:" + key + "Filter): [" + key + "]";
             root[key] = async ({ options, filter }, req) => {
-                let remult = await api.getRemult(req);
-                let repo = remult.repo(e);
-                let dApi = new DataApi(repo, remult);
-                let result;
-                let err;
-                await dApi.getArray({
-                    success: x => result = x,
-                    created: undefined,
-                    deleted: undefined,
-                    error: x => err = x,
-                    forbidden: () => err = 'forbidden',
-                    notFound: () => err = 'not found',
-                    progress: undefined
-                }, {
-                    get: key => {
-                        if (options)
-                            switch (key) {
-                                case "_limit":
-                                    return options.limit;
-                                case "_page":
-                                    return options.page;
-                                case "_sort":
-                                    return options.sort;
-                                case "_order":
-                                    return options.order;
+                return new Promise(async (res, error) => {
+                    api.withRemult(req, undefined, async () => {
+                        let remult = await api.getRemult(req);
+                        let repo = remult.repo(e);
+                        let dApi = new DataApi(repo, remult);
+                        let result;
+                        let err;
+                        await dApi.getArray({
+                            success: x => result = x,
+                            created: undefined,
+                            deleted: undefined,
+                            error: x => err = x,
+                            forbidden: () => err = 'forbidden',
+                            notFound: () => err = 'not found',
+                            progress: undefined
+                        }, {
+                            get: key => {
+                                if (options)
+                                    switch (key) {
+                                        case "_limit":
+                                            return options.limit;
+                                        case "_page":
+                                            return options.page;
+                                        case "_sort":
+                                            return options.sort;
+                                        case "_order":
+                                            return options.order;
+                                    }
                             }
-                    }
-                }, filter);
-                if (err)
-                    throw err;
-                return result;
+                        }, filter);
+                        if (err) {
+                            error(err);
+                            return;
+                        }
+                        res(result);
+                    });
+                });
             };
         }
     }

package/{core/graphql.js → graphql.js}

@@ -98,43 +98,57 @@ function remultGraphql(api) {
             root[key] = function (_a, req) {
                 var options = _a.options, filter = _a.filter;
                 return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    var remult, repo, dApi, result, err;
+                    var _this = this;
                     return tslib_1.__generator(this, function (_b) {
-                        switch (_b.label) {
-                            case 0: return [4 /*yield*/, api.getRemult(req)];
-                            case 1:
-                                remult = _b.sent();
-                                repo = remult.repo(e);
-                                dApi = new data_api_1.DataApi(repo, remult);
-                                return [4 /*yield*/, dApi.getArray({
-                                        success: function (x) { return result = x; },
-                                        created: undefined,
-                                        deleted: undefined,
-                                        error: function (x) { return err = x; },
-                                        forbidden: function () { return err = 'forbidden'; },
-                                        notFound: function () { return err = 'not found'; },
-                                        progress: undefined
-                                    }, {
-                                        get: function (key) {
-                                            if (options)
-                                                switch (key) {
-                                                    case "_limit":
-                                                        return options.limit;
-                                                    case "_page":
-                                                        return options.page;
-                                                    case "_sort":
-                                                        return options.sort;
-                                                    case "_order":
-                                                        return options.order;
-                                                }
-                                        }
-                                    }, filter)];
-                            case 2:
-                                _b.sent();
-                                if (err)
-                                    throw err;
-                                return [2 /*return*/, result];
-                        }
+                        return [2 /*return*/, new Promise(function (res, error) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                var _this = this;
+                                return tslib_1.__generator(this, function (_a) {
+                                    api.withRemult(req, undefined, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                        var remult, repo, dApi, result, err;
+                                        return tslib_1.__generator(this, function (_a) {
+                                            switch (_a.label) {
+                                                case 0: return [4 /*yield*/, api.getRemult(req)];
+                                                case 1:
+                                                    remult = _a.sent();
+                                                    repo = remult.repo(e);
+                                                    dApi = new data_api_1.DataApi(repo, remult);
+                                                    return [4 /*yield*/, dApi.getArray({
+                                                            success: function (x) { return result = x; },
+                                                            created: undefined,
+                                                            deleted: undefined,
+                                                            error: function (x) { return err = x; },
+                                                            forbidden: function () { return err = 'forbidden'; },
+                                                            notFound: function () { return err = 'not found'; },
+                                                            progress: undefined
+                                                        }, {
+                                                            get: function (key) {
+                                                                if (options)
+                                                                    switch (key) {
+                                                                        case "_limit":
+                                                                            return options.limit;
+                                                                        case "_page":
+                                                                            return options.page;
+                                                                        case "_sort":
+                                                                            return options.sort;
+                                                                        case "_order":
+                                                                            return options.order;
+                                                                    }
+                                                            }
+                                                        }, filter)];
+                                                case 2:
+                                                    _a.sent();
+                                                    if (err) {
+                                                        error(err);
+                                                        return [2 /*return*/];
+                                                    }
+                                                    res(result);
+                                                    return [2 /*return*/];
+                                            }
+                                        });
+                                    }); });
+                                    return [2 /*return*/];
+                                });
+                            }); })];
                     });
                 });
             };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.17.0-exp.9",
+    "version": "0.17.1",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",
@@ -45,6 +45,14 @@
             },
             "import": "./esm/server/index.js"
         },
+        "./server/core": {
+            "require": "./server/core.js",
+            "node": {
+                "require": "./server/core.js",
+                "import": "./server/core.js"
+            },
+            "import": "./esm/server/core.js"
+        },
         "./remult-fastify": {
             "require": "./remult-fastify.js",
             "node": {