@lowdefy/operators 4.0.0-alpha.1 → 4.0.0-alpha.10

package/dist/getFromArray.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/getFromObject.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/index.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -12,6 +12,10 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-*/ import NodeParser from './nodeParser.js';
+*/ import getFromArray from './getFromArray.js';
+import getFromObject from './getFromObject.js';
+import NodeParser from './nodeParser.js';
+import runClass from './runClass.js';
+import runInstance from './runInstance.js';
 import WebParser from './webParser.js';
-export { NodeParser, WebParser };
+export { getFromArray, getFromObject, NodeParser, runClass, runInstance, WebParser };

package/dist/nodeParser.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,22 +13,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { serializer, type } from '@lowdefy/helpers';
-import commonOperators from './common/index.js';
-import nodeOperators from './node/index.js';
 let NodeParser = class NodeParser {
-    async init() {
+    parse({ args , input , location , operatorPrefix ='_'  }) {
+        const env = this.env;
         const operators = this.operators;
-        const operations = this.operations;
-        await Promise.all(Object.keys(operators).map(async (operator)=>{
-            const fn = await import(`./${operators[operator]}.js`);
-            operations[operator] = fn.default;
-            if (operations[operator].init) {
-                await operations[operator].init();
-            }
-        }));
-    }
-    parse({ args , input , location  }) {
-        const operations = this.operations;
         const secrets = this.secrets;
         const payload = this.payload;
         const user = this.user;
@@ -41,38 +29,37 @@ let NodeParser = class NodeParser {
         if (args && !type.isArray(args)) {
             throw new Error('Operator parser args must be an array.');
         }
-        if (location && !type.isString(location)) {
+        if (!type.isString(location)) {
             throw new Error('Operator parser location must be a string.');
         }
         const errors = [];
         const reviver = (_, value)=>{
-            if (type.isObject(value) && Object.keys(value).length === 1) {
-                const key = Object.keys(value)[0];
-                const [op, methodName] = key.split('.');
-                try {
-                    if (!type.isUndefined(operations[op])) {
-                        const res = operations[op]({
-                            args,
-                            arrayIndices: [],
-                            env: 'node',
-                            location,
-                            methodName,
-                            operations: operations,
-                            params: value[key],
-                            secrets,
-                            payload,
-                            user,
-                            parser: this
-                        });
-                        return res;
-                    }
-                } catch (e) {
-                    errors.push(e);
-                    console.error(e);
-                    return null;
-                }
+            if (!type.isObject(value) || Object.keys(value).length !== 1) return value;
+            const key = Object.keys(value)[0];
+            if (!key.startsWith(operatorPrefix)) return value;
+            const [op, methodName] = `_${key.substring(operatorPrefix.length)}`.split('.');
+            if (type.isUndefined(operators[op])) return value;
+            try {
+                const res = operators[op]({
+                    args,
+                    arrayIndices: [],
+                    env,
+                    location,
+                    methodName,
+                    operators: operators,
+                    params: value[key],
+                    operatorPrefix,
+                    parser: this,
+                    payload,
+                    secrets,
+                    user
+                });
+                return res;
+            } catch (e) {
+                errors.push(e);
+                console.error(e);
+                return null;
             }
-            return value;
         };
         return {
             output: serializer.copy(input, {
@@ -81,18 +68,13 @@ let NodeParser = class NodeParser {
             errors
         };
     }
-    constructor({ payload , secrets , user  } = {
-    }){
+    constructor({ env , payload , secrets , user , operators  }){
+        this.env = env;
+        this.operators = operators;
         this.payload = payload;
         this.secrets = secrets;
         this.user = user;
         this.parse = this.parse.bind(this);
-        this.operators = {
-            ...commonOperators,
-            ...nodeOperators
-        };
-        this.operations = {
-        };
     }
 };
 export default NodeParser;

package/dist/runClass.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/runInstance.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

package/dist/webParser.js

@@ -1,5 +1,5 @@
 /*
-  Copyright 2020-2021 Lowdefy, Inc
+  Copyright 2020-2022 Lowdefy, Inc
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -13,30 +13,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { applyArrayIndices, serializer, type } from '@lowdefy/helpers';
-import commonOperators from './common/index.js';
-import webOperators from './web/index.js';
 let WebParser = class WebParser {
-    async init() {
-        if (!type.isObject(this.context._internal.lowdefy)) {
-            throw new Error('context._internal.lowdefy must be an object.');
-        }
-        if (!type.isArray(this.context._internal.operators)) {
-            throw new Error('context._internal.operators must be an array.');
-        }
+    parse({ actions , args , arrayIndices , event , input , location , operatorPrefix ='_'  }) {
         const operators = this.operators;
-        const operations = this.operations;
-        await Promise.all(this.context._internal.operators.map(async (operator)=>{
-            if (operators[operator]) {
-                const fn = await import(`./${operators[operator]}.js`);
-                operations[operator] = fn.default;
-                if (operations[operator].init) {
-                    await operations[operator].init();
-                }
-            }
-        }));
-    }
-    parse({ actions , args , arrayIndices , event , input , location  }) {
-        const operations = this.operations;
         const context = this.context;
         if (type.isUndefined(input)) {
             return {
@@ -50,52 +29,45 @@ let WebParser = class WebParser {
         if (args && !type.isArray(args)) {
             throw new Error('Operator parser args must be an array.');
         }
-        if (location && !type.isString(location)) {
+        if (!type.isString(location)) {
             throw new Error('Operator parser location must be a string.');
         }
         const errors = [];
         const { inputs , lowdefyGlobal , menus , urlQuery , user  } = context._internal.lowdefy;
         const reviver = (_, value)=>{
-            if (type.isObject(value) && Object.keys(value).length === 1) {
-                const key = Object.keys(value)[0];
-                const [op, methodName] = key.split('.');
-                try {
-                    if (!type.isUndefined(operations[op])) {
-                        const res = operations[op]({
-                            eventLog: context.eventLog,
-                            actions,
-                            args,
-                            arrayIndices,
-                            context: context,
-                            env: 'web',
-                            event,
-                            input: inputs ? inputs[context.id] : {
-                            },
-                            location: location ? applyArrayIndices(arrayIndices, location) : null,
-                            lowdefyGlobal: lowdefyGlobal || {
-                            },
-                            menus: menus || {
-                            },
-                            methodName,
-                            operations: operations,
-                            params: value[key],
-                            requests: context.requests,
-                            state: context.state,
-                            urlQuery: urlQuery || {
-                            },
-                            user: user || {
-                            },
-                            parser: this
-                        });
-                        return res;
-                    }
-                } catch (e) {
-                    errors.push(e);
-                    console.error(e);
-                    return null;
-                }
+            if (!type.isObject(value) || Object.keys(value).length !== 1) return value;
+            const key = Object.keys(value)[0];
+            if (!key.startsWith(operatorPrefix)) return value;
+            const [op, methodName] = `_${key.substring(operatorPrefix.length)}`.split('.');
+            if (type.isUndefined(operators[op])) return value;
+            try {
+                const res = operators[op]({
+                    eventLog: context.eventLog,
+                    actions,
+                    args,
+                    arrayIndices,
+                    context,
+                    event,
+                    input: inputs ? inputs[context.id] : {},
+                    location: applyArrayIndices(arrayIndices, location),
+                    lowdefyGlobal: lowdefyGlobal || {},
+                    menus: menus || {},
+                    methodName,
+                    operators,
+                    operatorPrefix,
+                    params: value[key],
+                    requests: context.requests,
+                    state: context.state,
+                    urlQuery: urlQuery || {},
+                    user: user || {},
+                    parser: this
+                });
+                return res;
+            } catch (e) {
+                errors.push(e);
+                console.error(e);
+                return null;
             }
-            return value;
         };
         return {
             output: serializer.copy(input, {
@@ -104,16 +76,10 @@ let WebParser = class WebParser {
             errors
         };
     }
-    constructor({ context  }){
+    constructor({ context , operators  }){
         this.context = context;
-        this.init = this.init.bind(this);
         this.parse = this.parse.bind(this);
-        this.operators = {
-            ...commonOperators,
-            ...webOperators
-        };
-        this.operations = {
-        };
+        this.operators = operators;
     }
 };
 export default WebParser;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/operators",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-alpha.10",
   "licence": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -18,6 +18,10 @@
     {
       "name": "Gerrie van Wyk",
       "url": "https://github.com/Gervwyk"
+    },
+    {
+      "name": "Johann Möller",
+      "url": "https://github.com/JohannMoller"
     }
   ],
   "repository": {
@@ -38,23 +42,16 @@
     "test:watch": "jest --coverage --watch"
   },
   "dependencies": {
-    "@lowdefy/format": "4.0.0-alpha.1",
-    "@lowdefy/helpers": "4.0.0-alpha.1",
-    "@lowdefy/nunjucks": "4.0.0-alpha.1",
-    "change-case": "4.1.2",
-    "deep-diff": "1.0.2",
-    "js-yaml": "4.1.0",
-    "mingo": "4.2.0",
-    "uuid": "8.3.2"
+    "@lowdefy/helpers": "4.0.0-alpha.10"
   },
   "devDependencies": {
-    "@swc/cli": "0.1.52",
-    "@swc/core": "1.2.112",
-    "@swc/jest": "0.2.9",
-    "jest": "27.3.1"
+    "@swc/cli": "0.1.55",
+    "@swc/core": "1.2.135",
+    "@swc/jest": "0.2.17",
+    "jest": "27.5.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c97a8fa6b5a641e7d50df09f5601a9c586eeb65a"
+  "gitHead": "d697b4b5f354697d9481a371b90a00ca0944f486"
 }

package/dist/common/and.js

@@ -1,23 +0,0 @@
-/*
-  Copyright 2020-2021 Lowdefy, Inc
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/ import { type } from '@lowdefy/helpers';
-function _and({ params , location  }) {
-    if (!type.isArray(params)) {
-        throw new Error(`Operator Error: _and takes an array type. Received: ${JSON.stringify(params)} at ${location}.`);
-    }
-    return !!params.reduce((acc, el)=>acc && el
-    , true);
-}
-export default _and;

package/dist/common/args.js

@@ -1,25 +0,0 @@
-/*
-  Copyright 2020-2021 Lowdefy, Inc
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/ import getFromObject from '../getFromObject.js';
-function _args({ args , arrayIndices , location , params  }) {
-    return getFromObject({
-        arrayIndices,
-        location,
-        object: args,
-        operator: '_args',
-        params
-    });
-}
-export default _args;

package/dist/common/array.js

@@ -1,261 +0,0 @@
-/*
-  Copyright 2020-2021 Lowdefy, Inc
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/ import { type } from '@lowdefy/helpers';
-import runInstance from '../runInstance.js';
-const prep = (args)=>{
-    if (type.isNone(args[0])) {
-        args[0] = [];
-    }
-    return args;
-};
-const meta = {
-    concat: {
-        prep,
-        validTypes: [
-            'array'
-        ]
-    },
-    copyWithin: {
-        namedArgs: [
-            'on',
-            'target',
-            'start',
-            'end'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    every: {
-        namedArgs: [
-            'on',
-            'callback'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    fill: {
-        namedArgs: [
-            'on',
-            'value',
-            'start',
-            'end'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    filter: {
-        namedArgs: [
-            'on',
-            'callback'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    find: {
-        namedArgs: [
-            'on',
-            'callback'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    findIndex: {
-        namedArgs: [
-            'on',
-            'callback'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    flat: {
-        namedArgs: [
-            'on',
-            'depth'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    includes: {
-        namedArgs: [
-            'on',
-            'value'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    indexOf: {
-        namedArgs: [
-            'on',
-            'value'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    join: {
-        namedArgs: [
-            'on',
-            'separator'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    lastIndexOf: {
-        namedArgs: [
-            'on',
-            'value'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    map: {
-        namedArgs: [
-            'on',
-            'callback'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    reduce: {
-        namedArgs: [
-            'on',
-            'callback',
-            'initialValue'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    reduceRight: {
-        namedArgs: [
-            'on',
-            'callback',
-            'initialValue'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    reverse: {
-        prep,
-        validTypes: [
-            'array'
-        ],
-        singleArg: true
-    },
-    slice: {
-        namedArgs: [
-            'on',
-            'start',
-            'end'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    some: {
-        namedArgs: [
-            'on',
-            'callback'
-        ],
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    sort: {
-        namedArgs: [
-            'on'
-        ],
-        prep,
-        validTypes: [
-            'array'
-        ]
-    },
-    splice: {
-        namedArgs: [
-            'on',
-            'start',
-            'deleteCount'
-        ],
-        spreadArgs: 'insert',
-        returnInstance: true,
-        prep,
-        validTypes: [
-            'array',
-            'object'
-        ]
-    },
-    length: {
-        validTypes: [
-            'array'
-        ],
-        prep,
-        property: true
-    }
-};
-function _array({ params , location , methodName  }) {
-    return runInstance({
-        location,
-        meta,
-        methodName,
-        operator: '_array',
-        params,
-        instanceType: 'array'
-    });
-}
-export default _array;