@steedos/objectql 3.0.13-beta.5 → 3.0.13-beta.50

package/lib/functions/function.js

@@ -1,16 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runFunction = void 0;
-var tslib_1 = require("tslib");
-var NodeVM = require("vm2").NodeVM;
-var objectql = require("@steedos/objectql");
-function str2function(contents) {
-    var args = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        args[_i - 1] = arguments[_i];
-    }
+const { NodeVM } = require("vm2");
+const objectql = require("@steedos/objectql");
+function str2function(contents, ...args) {
     try {
-        var fn = new (Function.bind.apply(Function, tslib_1.__spreadArray(tslib_1.__spreadArray([void 0], tslib_1.__read(args), false), [contents], false)))();
+        let fn = new Function(...args, contents);
         return fn;
     }
     catch (e) {
@@ -18,85 +13,65 @@ function str2function(contents) {
         return null;
     }
 }
-var runFunction = function (func, thisArg) {
-    var args = [];
-    for (var _i = 2; _i < arguments.length; _i++) {
-        args[_i - 2] = arguments[_i];
-    }
-    return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-        var db, npm, vm, funcFileName, funcInSandbox, run, res, error_1, source, errorStack, newError;
-        return tslib_1.__generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    db = objectql.getDataSource("default").adapter;
-                    npm = {
-                        _: require("lodash"),
-                        lodash: require("lodash"),
-                        moment: require("moment"),
-                        validator: require("validator"),
-                        filters: require("@steedos/filters"),
-                        axios: require("axios"),
-                        formData: require("form-data"),
-                        mongodb: require("mongodb"),
-                        sequelize: require("sequelize"),
-                    };
-                    vm = new NodeVM({
-                        sandbox: {
-                            str2function: str2function,
-                            global: npm,
-                            npm: npm,
-                            objects: global.objects,
-                            db: db,
-                        },
-                        require: {
-                            external: true,
-                            root: "./",
-                        },
-                        env: process.env,
-                    });
-                    funcFileName = "".concat(func.objectApiName, ".").concat(func.name, ".function.js");
-                    funcInSandbox = vm.run("module.exports = async function(ctx){".concat(func.script, "};"), funcFileName);
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    run = function () {
-                        return tslib_1.__awaiter(this, void 0, void 0, function () {
-                            return tslib_1.__generator(this, function (_a) {
-                                return [2, new Promise(function (resolve, reject) {
-                                        funcInSandbox
-                                            .apply(thisArg, args)
-                                            .then(function (res) {
-                                            resolve(res);
-                                        })
-                                            .catch(function (error) {
-                                            reject(error);
-                                        });
-                                    })];
-                            });
-                        });
-                    };
-                    return [4, run()];
-                case 2:
-                    res = _a.sent();
-                    return [2, res];
-                case 3:
-                    error_1 = _a.sent();
-                    source = error_1.stack;
-                    errorStack = source
-                        .substring(source.indexOf("(") + 1, source.indexOf(")"))
-                        .replace(funcFileName, "对象「" + func.objectApiName + "」的「" + func.name + "」函数")
-                        .replace(":", " 行 ")
-                        .replace(":", " 列 ");
-                    newError = new Error(error_1.message);
-                    newError.stack = "Object Function Error: ".concat(error_1.message, "\n    at ").concat(errorStack);
-                    if (process.env.NODE_ENV === "development") {
-                        newError.message = newError.stack;
-                    }
-                    throw newError;
-                case 4: return [2];
-            }
-        });
+const runFunction = async (func, thisArg, ...args) => {
+    const db = objectql.getDataSource("default").adapter;
+    const npm = {
+        _: require("lodash"),
+        lodash: require("lodash"),
+        moment: require("moment"),
+        validator: require("validator"),
+        filters: require("@steedos/filters"),
+        axios: require("axios"),
+        formData: require("form-data"),
+        mongodb: require("mongodb"),
+        sequelize: require("sequelize"),
+    };
+    const vm = new NodeVM({
+        sandbox: {
+            str2function,
+            global: npm,
+            npm,
+            objects: global.objects,
+            db,
+        },
+        require: {
+            external: true,
+            root: "./",
+        },
+        env: process.env,
     });
+    const funcFileName = `${func.objectApiName}.${func.name}.function.js`;
+    let funcInSandbox = vm.run(`module.exports = async function(ctx){${func.script}};`, funcFileName);
+    try {
+        const run = async function () {
+            return new Promise((resolve, reject) => {
+                funcInSandbox
+                    .apply(thisArg, args)
+                    .then((res) => {
+                    resolve(res);
+                })
+                    .catch((error) => {
+                    reject(error);
+                });
+            });
+        };
+        const res = await run();
+        return res;
+    }
+    catch (error) {
+        const source = error.stack;
+        const errorStack = source
+            .substring(source.indexOf("(") + 1, source.indexOf(")"))
+            .replace(funcFileName, "对象「" + func.objectApiName + "」的「" + func.name + "」函数")
+            .replace(":", " 行 ")
+            .replace(":", " 列 ");
+        const newError = new Error(error.message);
+        newError.stack = `Object Function Error: ${error.message}\n    at ${errorStack}`;
+        if (process.env.NODE_ENV === "development") {
+            newError.message = newError.stack;
+        }
+        throw newError;
+    }
 };
 exports.runFunction = runFunction;
 //# sourceMappingURL=function.js.map

package/lib/functions/function.js.map

@@ -1 +1 @@
-{"version":3,"file":"function.js","sourceRoot":"","sources":["../../src/functions/function.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"function.js","sourceRoot":"","sources":["../../src/functions/function.ts"],"names":[],"mappings":"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"}

package/lib/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.broker = void 0;
-var tslib_1 = require("tslib");
-var broker_1 = require("./broker");
+const tslib_1 = require("tslib");
+const broker_1 = require("./broker");
 tslib_1.__exportStar(require("./types"), exports);
 tslib_1.__exportStar(require("./driver"), exports);
 tslib_1.__exportStar(require("./util"), exports);
@@ -12,7 +12,7 @@ tslib_1.__exportStar(require("./errors"), exports);
 tslib_1.__exportStar(require("./actions"), exports);
 tslib_1.__exportStar(require("./ts-types"), exports);
 tslib_1.__exportStar(require("@steedos/metadata-registrar"), exports);
-var validators_1 = require("./validators");
+const validators_1 = require("./validators");
 (0, validators_1.loadCoreValidators)();
 exports.broker = new broker_1.Broker();
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,mCAAkC;AASlC,kDAAwB;AACxB,mDAAyB;AACzB,iDAAuB;AACvB,oDAA0B;AAC1B,oDAA0B;AAC1B,mDAAyB;AACzB,oDAA0B;AAC1B,qDAA2B;AAC3B,sEAA4C;AAE5C,2CAAkD;AAClD,IAAA,+BAAkB,GAAE,CAAC;AAER,QAAA,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAkC;AASlC,kDAAwB;AACxB,mDAAyB;AACzB,iDAAuB;AACvB,oDAA0B;AAC1B,oDAA0B;AAC1B,mDAAyB;AACzB,oDAA0B;AAC1B,qDAA2B;AAC3B,sEAA4C;AAE5C,6CAAkD;AAClD,IAAA,+BAAkB,GAAE,CAAC;AAER,QAAA,MAAM,GAAG,IAAI,eAAM,EAAE,CAAC"}

package/lib/services/datasourceServiceFactory.js

@@ -1,131 +1,97 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDataSourceService = createDataSourceService;
-var tslib_1 = require("tslib");
-var index_1 = require("./index");
-var convert_1 = require("../util/convert");
-var datasource_1 = require("../types/datasource");
-var metadata_registrar_1 = require("@steedos/metadata-registrar");
-var lodash_1 = require("lodash");
-var clone = require("clone");
-var LocalDataSourceServices = {};
-function createDataSourceService(broker, dataSource) {
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var dataSourceName, serviceName, actions, service;
-        var _a;
-        return tslib_1.__generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    dataSourceName = dataSource.name;
-                    serviceName = (0, index_1.getDataSourceServiceName)(dataSourceName);
-                    if (LocalDataSourceServices[serviceName]) {
-                        return [2];
+const index_1 = require("./index");
+const convert_1 = require("../util/convert");
+const datasource_1 = require("../types/datasource");
+const metadata_registrar_1 = require("@steedos/metadata-registrar");
+const lodash_1 = require("lodash");
+const clone = require("clone");
+const LocalDataSourceServices = {};
+async function createDataSourceService(broker, dataSource) {
+    const dataSourceName = dataSource.name;
+    const serviceName = (0, index_1.getDataSourceServiceName)(dataSourceName);
+    if (LocalDataSourceServices[serviceName]) {
+        return;
+    }
+    const actions = {};
+    if (dataSourceName === "default") {
+        actions.encryptValue = {
+            async handler(ctx) {
+                const { value } = ctx.params;
+                return await dataSource.adapter.encryptValue(value);
+            },
+        };
+    }
+    let service = broker.createService({
+        name: serviceName,
+        events: {
+            [`${dataSourceName}.*.metadata.objects.inserted`]: {
+                async handler(ctx) {
+                    let objectConfig = ctx.params.data;
+                    (0, convert_1.jsonToObject)(objectConfig);
+                    if (!(0, metadata_registrar_1.getOriginalObjectConfig)(objectConfig.name)) {
+                        (0, metadata_registrar_1.addOriginalObjectConfigs)(objectConfig.name, dataSourceName, clone(objectConfig));
                     }
-                    actions = {};
+                    dataSource.initObject(objectConfig);
+                    await dataSource.initTypeORM();
                     if (dataSourceName === "default") {
-                        actions.encryptValue = {
-                            handler: function (ctx) {
-                                return tslib_1.__awaiter(this, void 0, void 0, function () {
-                                    var value;
-                                    return tslib_1.__generator(this, function (_a) {
-                                        switch (_a.label) {
-                                            case 0:
-                                                value = ctx.params.value;
-                                                return [4, dataSource.adapter.encryptValue(value)];
-                                            case 1: return [2, _a.sent()];
-                                        }
-                                    });
-                                });
-                            },
-                        };
+                        newCollection(objectConfig.name, dataSourceName);
                     }
-                    service = broker.createService({
-                        name: serviceName,
-                        events: (_a = {},
-                            _a["".concat(dataSourceName, ".*.metadata.objects.inserted")] = {
-                                handler: function (ctx) {
-                                    return tslib_1.__awaiter(this, void 0, void 0, function () {
-                                        var objectConfig;
-                                        return tslib_1.__generator(this, function (_a) {
-                                            switch (_a.label) {
-                                                case 0:
-                                                    objectConfig = ctx.params.data;
-                                                    (0, convert_1.jsonToObject)(objectConfig);
-                                                    if (!(0, metadata_registrar_1.getOriginalObjectConfig)(objectConfig.name)) {
-                                                        (0, metadata_registrar_1.addOriginalObjectConfigs)(objectConfig.name, dataSourceName, clone(objectConfig));
-                                                    }
-                                                    dataSource.initObject(objectConfig);
-                                                    return [4, dataSource.initTypeORM()];
-                                                case 1:
-                                                    _a.sent();
-                                                    if (dataSourceName === "default") {
-                                                        newCollection(objectConfig.name, dataSourceName);
-                                                    }
-                                                    return [2];
-                                            }
-                                        });
-                                    });
-                                },
-                            },
-                            _a["".concat(dataSourceName, ".*.metadata.objects.deleted")] = {
-                                handler: function (ctx) {
-                                    try {
-                                        (0, datasource_1.getDataSource)(dataSourceName).removeLocalObject(ctx.params.objectApiName);
-                                    }
-                                    catch (error) {
-                                        console.error(error);
-                                    }
-                                    if (this.timeoutId) {
-                                        clearTimeout(this.timeoutId);
-                                    }
-                                    this.timeoutId = setTimeout(function () {
-                                        try {
-                                            var datasource = (0, datasource_1.getDataSource)(dataSourceName);
-                                            if (datasource) {
-                                                datasource.flushCacheObjects();
-                                            }
-                                        }
-                                        catch (error) {
-                                            console.error(error);
-                                        }
-                                    }, 1000 * 0.1);
-                                },
-                            },
-                            _a),
-                        actions: actions,
-                    });
-                    if (!!broker.started) return [3, 2];
-                    return [4, broker._restartService(service)];
-                case 1:
-                    _b.sent();
-                    _b.label = 2;
-                case 2: return [4, broker.waitForServices(service.name, null, 10)];
-                case 3:
-                    _b.sent();
-                    LocalDataSourceServices[serviceName] = true;
-                    return [2, service];
-            }
-        });
+                },
+            },
+            [`${dataSourceName}.*.metadata.objects.deleted`]: {
+                handler(ctx) {
+                    try {
+                        (0, datasource_1.getDataSource)(dataSourceName).removeLocalObject(ctx.params.objectApiName);
+                    }
+                    catch (error) {
+                        console.error(error);
+                    }
+                    if (this.timeoutId) {
+                        clearTimeout(this.timeoutId);
+                    }
+                    this.timeoutId = setTimeout(function () {
+                        try {
+                            const datasource = (0, datasource_1.getDataSource)(dataSourceName);
+                            if (datasource) {
+                                datasource.flushCacheObjects();
+                            }
+                        }
+                        catch (error) {
+                            console.error(error);
+                        }
+                    }, 1000 * 0.1);
+                },
+            },
+        },
+        actions: actions,
     });
+    if (!broker.started) {
+        await broker._restartService(service);
+    }
+    await broker.waitForServices(service.name, null, 10);
+    LocalDataSourceServices[serviceName] = true;
+    return service;
 }
-var mongodriversCollectionNames = {};
+const mongodriversCollectionNames = {};
 function newCollection(tableName, datasourceName) {
     if (!datasourceName) {
         datasourceName = "default";
     }
-    var datasource = (0, datasource_1.getDataSource)(datasourceName);
-    var datasourceConfig = datasource.config;
-    var locale = (datasourceConfig === null || datasourceConfig === void 0 ? void 0 : datasourceConfig.locale) || "zh";
-    var documentDB = (datasourceConfig === null || datasourceConfig === void 0 ? void 0 : datasourceConfig.documentDB) || false;
-    var driver = (0, datasource_1.getDataSource)(datasourceName).adapter;
+    const datasource = (0, datasource_1.getDataSource)(datasourceName);
+    const datasourceConfig = datasource.config;
+    const locale = datasourceConfig?.locale || "zh";
+    const documentDB = datasourceConfig?.documentDB || false;
+    const driver = (0, datasource_1.getDataSource)(datasourceName).adapter;
     if (locale &&
         !(0, lodash_1.includes)(mongodriversCollectionNames[datasourceName], tableName)) {
         driver.connect().then(function () {
-            var collation = {};
-            var db = driver._client.db();
+            let collation = {};
+            const db = driver._client.db();
             if (!mongodriversCollectionNames[datasourceName]) {
                 mongodriversCollectionNames[datasourceName] = [];
-                db.listCollections().forEach(function (results) {
+                db.listCollections().forEach((results) => {
                     mongodriversCollectionNames[datasourceName].push(results.name);
                 });
             }

package/lib/services/datasourceServiceFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"datasourceServiceFactory.js","sourceRoot":"","sources":["../../src/services/datasourceServiceFactory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"datasourceServiceFactory.js","sourceRoot":"","sources":["../../src/services/datasourceServiceFactory.ts"],"names":[],"mappings":"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"}

package/lib/services/index.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getObjectServiceName = getObjectServiceName;
 exports.getDataSourceServiceName = getDataSourceServiceName;
-var tslib_1 = require("tslib");
+const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./datasourceServiceFactory"), exports);
 function getObjectServiceName(objectApiName) {
-    return "@".concat(objectApiName);
+    return `@${objectApiName}`;
 }
 function getDataSourceServiceName(dataSource) {
-    return "~dataSource-".concat(dataSource);
+    return `~dataSource-${dataSource}`;
 }
 //# sourceMappingURL=index.js.map

package/lib/services/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":";;AASA,oDAEC;AAED,4DAEC;;AARD,qEAA2C;AAE3C,SAAgB,oBAAoB,CAAC,aAAqB;IACtD,OAAO,WAAI,aAAa,CAAE,CAAC;AAC/B,CAAC;AAED,SAAgB,wBAAwB,CAAC,UAAkB;IACvD,OAAO,sBAAe,UAAU,CAAE,CAAC;AACvC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":";;AASA,oDAEC;AAED,4DAEC;;AARD,qEAA2C;AAE3C,SAAgB,oBAAoB,CAAC,aAAqB;IACtD,OAAO,IAAI,aAAa,EAAE,CAAC;AAC/B,CAAC;AAED,SAAgB,wBAAwB,CAAC,UAAkB;IACvD,OAAO,eAAe,UAAU,EAAE,CAAC;AACvC,CAAC"}