@lowdefy/engine 4.0.0-alpha.9 → 4.0.0-rc.0

package/dist/Actions.js

@@ -165,6 +165,7 @@ let Actions = class Actions {
         });
         try {
             response = await this.actions[action.type]({
+                globals: this.context._internal.lowdefy._internal.globals,
                 methods: getActionMethods({
                     actions: responses,
                     arrayIndices,
@@ -172,9 +173,7 @@ let Actions = class Actions {
                     context: this.context,
                     event
                 }),
-                document: this.context._internal.lowdefy._internal.document,
-                params: parsedAction.params,
-                window: this.context._internal.lowdefy._internal.window
+                params: parsedAction.params
             });
             if (progress) {
                 progress();
@@ -227,8 +226,7 @@ let Actions = class Actions {
         };
     }
     displayMessage({ defaultMessage , duration , hideExplicitly , message , status  }) {
-        let close = ()=>undefined
-        ;
+        let close = ()=>undefined;
         if (hideExplicitly && message !== false || !hideExplicitly && !type.isNone(message)) {
             close = this.context._internal.lowdefy._internal.displayMessage({
                 content: type.isString(message) ? message : defaultMessage,

package/dist/Blocks.js

@@ -28,11 +28,13 @@ let Blocks = class Blocks {
         this.loopBlocks((block)=>{
             block.idPattern = block.id;
             block.blockIdPattern = block.blockId;
-            block.fieldPattern = block.field;
             block.id = applyArrayIndices(this.arrayIndices, block.idPattern);
             block.blockId = applyArrayIndices(this.arrayIndices, block.blockIdPattern);
-            block.field = !type.isNone(block.fieldPattern) ? applyArrayIndices(this.arrayIndices, block.fieldPattern) : block.blockId;
-            this.context._internal.RootBlocks.map[block.id] = block;
+            // CAUTION:
+            // map is not a direct reference to all blocks, blocks with duplicate ids will be overwritten in map
+            // which can cause issues with ambiguous config during call method since it will call only the method
+            // of the last initialized block for the referenced id.
+            this.context._internal.RootBlocks.map[block.blockId] = block;
             block.events = type.isNone(block.events) ? {} : block.events;
             block.layout = type.isNone(block.layout) ? {} : block.layout;
             block.loading = type.isNone(block.loading) ? false : block.loading;
@@ -56,6 +58,9 @@ let Blocks = class Blocks {
             } catch (error) {
                 throw new Error(`Block type ${block.type} not found at ${block.blockId}. Check your plugins to make sure the block is installed. For more info, see https://docs.lowdefy.com/plugins.`);
             }
+            if (block.meta?.category !== 'container' && block.meta?.category !== 'display' && block.meta?.category !== 'input' && block.meta?.category !== 'list') {
+                throw new Error(`Block type ${block.type}.meta.category must be either "container", "display", "input" or "list".`);
+            }
             if (!type.isNone(block.areas)) {
                 block.areasLayout = {};
                 Object.keys(block.areas).forEach((key)=>{
@@ -72,8 +77,7 @@ let Blocks = class Blocks {
             block.registerMethod = (methodName, method)=>{
                 block.methods[methodName] = method;
             };
-            // TODO: add callMethod on block to be used by actions and accessible in blocks
-            if (get(block, 'meta.category') === 'list') {
+            if (block.meta.category === 'list') {
                 // TODO: to initialize new object in array, the new value should be passed by method to unshiftItem and pushItem
                 block.unshiftItem = ()=>{
                     this.subBlocks[block.id].forEach((bl, i)=>{
@@ -90,7 +94,7 @@ let Blocks = class Blocks {
                         block,
                         initState: {}
                     }));
-                    this.context._internal.State.set(block.field, undefined);
+                    this.context._internal.State.set(block.blockId, undefined);
                     // set block and subBlock values undefined, so as not to pass values to new blocks
                     this.subBlocks[block.id][0].recSetUndefined();
                     block.update = true;
@@ -158,10 +162,10 @@ let Blocks = class Blocks {
                     this.context._internal.update();
                 };
             }
-            if (get(block, 'meta.category') === 'input') {
+            if (block.meta.category === 'input') {
                 block.setValue = (value)=>{
                     block.value = type.enforceType(block.meta.valueType, value);
-                    this.context._internal.State.set(block.field, block.value);
+                    this.context._internal.State.set(block.blockId, block.value);
                     block.update = true;
                     this.context._internal.update();
                 };
@@ -181,14 +185,14 @@ let Blocks = class Blocks {
         this.loopBlocks((block)=>{
             block.update = true;
             block.showValidation = false;
-            if (get(block, 'meta.category') === 'input' || get(block, 'meta.category') === 'list') {
-                let blockValue = get(initState, block.field);
+            if (block.meta.category === 'input' || block.meta.category === 'list') {
+                let blockValue = get(initState, block.blockId);
                 if (type.isUndefined(blockValue)) {
                     // default null value for block type
                     blockValue = type.isUndefined(block.meta.initValue) ? type.enforceType(block.meta.valueType, null) : block.meta.initValue;
-                    this.context._internal.State.set(block.field, block.value);
+                    this.context._internal.State.set(block.blockId, block.value);
                 }
-                if (get(block, 'meta.category') === 'list') {
+                if (block.meta.category === 'list') {
                     // load list value into list blocks
                     if (!type.isArray(this.subBlocks[block.id])) {
                         this.subBlocks[block.id] = [];
@@ -212,7 +216,7 @@ let Blocks = class Blocks {
                 } else {
                     block.value = blockValue;
                 }
-            } else if (get(block, 'meta.category') === 'container') {
+            } else if (block.meta.category === 'container') {
                 if (!type.isArray(this.subBlocks[block.id])) {
                     this.subBlocks[block.id] = [];
                 }
@@ -256,7 +260,7 @@ let Blocks = class Blocks {
         let repeat = false;
         this.loopBlocks((block)=>{
             if (block.meta.category === 'input') {
-                const stateValue = get(this.context.state, block.field);
+                const stateValue = get(this.context.state, block.blockId);
                 // TODO: related to #345
                 // enforce type here? should we reassign value here??
                 block.value = type.isUndefined(stateValue) ? block.value : stateValue;
@@ -370,7 +374,7 @@ let Blocks = class Blocks {
                     arrayIndices: this.arrayIndices
                 });
             }
-            if (get(block, 'meta.category') === 'container' || get(block, 'meta.category') === 'list') {
+            if (block.meta.category === 'container' || block.meta.category === 'list') {
                 if (this.subBlocks[block.id] && this.subBlocks[block.id].length > 0) {
                     this.subBlocks[block.id].forEach((blockClass)=>{
                         repeat = blockClass.recEval(block.visibleEval.output) || repeat;
@@ -390,25 +394,25 @@ let Blocks = class Blocks {
         const toDelete = new Set();
         this.loopBlocks((block)=>{
             if (block.visibleEval.output !== false) {
-                if (get(block, 'meta.category') === 'container' || get(block, 'meta.category') === 'list') {
+                if (block.meta.category === 'container' || block.meta.category === 'list') {
                     if (this.subBlocks[block.id] && this.subBlocks[block.id].length > 0) {
                         this.subBlocks[block.id].forEach((blockClass)=>{
                             blockClass.updateState();
                         });
                     } else {
-                        toSet.add(block.field);
-                        this.context._internal.State.set(block.field, type.enforceType(block.meta.valueType, null));
+                        toSet.add(block.blockId);
+                        this.context._internal.State.set(block.blockId, type.enforceType(block.meta.valueType, null));
                     }
-                } else if (get(block, 'meta.category') === 'input') {
-                    toSet.add(block.field);
-                    this.context._internal.State.set(block.field, block.value);
+                } else if (block.meta.category === 'input') {
+                    toSet.add(block.blockId);
+                    this.context._internal.State.set(block.blockId, block.value);
                 }
-            } else if (get(block, 'meta.category') === 'container') {
+            } else if (block.meta.category === 'container') {
                 this.subBlocks[block.id].forEach((blockClass)=>{
                     blockClass.recContainerDelState(toDelete);
                 });
             } else {
-                toDelete.add(block.field);
+                toDelete.add(block.blockId);
             }
         });
         toDelete.forEach((field)=>{
@@ -419,12 +423,12 @@ let Blocks = class Blocks {
     }
     recContainerDelState(toDelete) {
         this.loopBlocks((block)=>{
-            if (get(block, 'meta.category') === 'container') {
+            if (block.meta.category === 'container') {
                 this.subBlocks[block.id].forEach((blockClass)=>{
                     blockClass.recContainerDelState(toDelete);
                 });
             } else {
-                toDelete.add(block.field);
+                toDelete.add(block.blockId);
             }
         });
     }
@@ -444,7 +448,6 @@ let Blocks = class Blocks {
         this.loopBlocks((block)=>{
             block.blockId = applyArrayIndices(this.arrayIndices, block.blockIdPattern);
             this.context._internal.RootBlocks.map[block.blockId] = block;
-            block.field = !type.isNone(block.fieldPattern) ? applyArrayIndices(this.arrayIndices, block.fieldPattern) : block.blockId;
         });
         Object.keys(this.subBlocks).forEach((subKey)=>{
             this.subBlocks[subKey].forEach((subBlock)=>{
@@ -474,7 +477,7 @@ let Blocks = class Blocks {
     }
     recSetUndefined() {
         this.loopBlocks((block)=>{
-            this.context._internal.State.set(block.field, undefined);
+            this.context._internal.State.set(block.blockId, undefined);
         });
         Object.keys(this.subBlocks).forEach((subKey)=>{
             this.subBlocks[subKey].forEach((subBlock)=>{
@@ -548,10 +551,10 @@ let Blocks = class Blocks {
             });
         });
     }
-    constructor({ arrayIndices , areas , context  }){
+    constructor({ arrayIndices =[] , areas , context  }){
         this.id = Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 5);
         this.areas = serializer.copy(areas || []);
-        this.arrayIndices = type.isArray(arrayIndices) ? arrayIndices : [];
+        this.arrayIndices = arrayIndices;
         this.context = context;
         this.map = {};
         this.recCount = 0;

package/dist/Requests.js

@@ -14,82 +14,85 @@
   limitations under the License.
 */ import { get, serializer, type } from '@lowdefy/helpers';
 let Requests = class Requests {
-    callRequests({ actions , arrayIndices , event , params  } = {}) {
+    callRequests({ actions , arrayIndices , blockId , event , params  } = {}) {
         if (type.isObject(params) && params.all === true) {
             return Promise.all(Object.keys(this.requestConfig).map((requestId)=>this.callRequest({
-                    requestId,
+                    arrayIndices,
+                    blockId,
                     event,
-                    arrayIndices
-                })
-            ));
+                    requestId
+                })));
         }
         let requestIds = [];
         if (type.isString(params)) requestIds = [
             params
         ];
         if (type.isArray(params)) requestIds = params;
-        return Promise.all(requestIds.map((requestId)=>this.callRequest({
+        const requests = requestIds.map((requestId)=>this.callRequest({
                 actions,
                 requestId,
+                blockId,
                 event,
                 arrayIndices
-            })
-        ));
+            }));
+        this.context._internal.update(); // update to render request reset
+        return Promise.all(requests);
     }
-    callRequest({ actions , arrayIndices , event , requestId  }) {
-        const request = this.requestConfig[requestId];
-        if (!request) {
+    async callRequest({ actions , arrayIndices , blockId , event , requestId  }) {
+        const requestConfig = this.requestConfig[requestId];
+        if (!this.context.requests[requestId]) {
+            this.context.requests[requestId] = [];
+        }
+        if (!requestConfig) {
             const error = new Error(`Configuration Error: Request ${requestId} not defined on page.`);
-            this.context.requests[requestId] = {
+            this.context.requests[requestId].unshift({
+                blockId: 'block_id',
+                error,
                 loading: false,
-                response: null,
-                error: [
-                    error
-                ]
-            };
-            return Promise.reject(error);
-        }
-        if (!this.context.requests[requestId]) {
-            this.context.requests[requestId] = {
-                loading: true,
-                response: null,
-                error: []
-            };
+                requestId,
+                response: null
+            });
+            throw error;
         }
         const { output: payload , errors: parserErrors  } = this.context._internal.parser.parse({
             actions,
             event,
             arrayIndices,
-            input: request.payload,
+            input: requestConfig.payload,
             location: requestId
         });
-        // TODO: We are throwing this error differently to the request does not exist error
         if (parserErrors.length > 0) {
             throw parserErrors[0];
         }
-        return this.fetch({
+        const request = {
+            blockId,
+            loading: true,
+            payload,
             requestId,
-            payload
-        });
+            response: null
+        };
+        this.context.requests[requestId].unshift(request);
+        return this.fetch(request);
     }
-    async fetch({ requestId , payload  }) {
-        this.context.requests[requestId].loading = true;
+    async fetch(request) {
+        request.loading = true;
         try {
             const response = await this.context._internal.lowdefy._internal.callRequest({
+                blockId: request.blockId,
                 pageId: this.context.pageId,
-                payload: serializer.serialize(payload),
-                requestId
+                payload: serializer.serialize(request.payload),
+                requestId: request.requestId
             });
             const deserializedResponse = serializer.deserialize(get(response, 'response', {
                 default: null
             }));
-            this.context.requests[requestId].response = deserializedResponse;
-            this.context.requests[requestId].loading = false;
+            request.response = deserializedResponse;
+            request.loading = false;
             this.context._internal.update();
             return deserializedResponse;
         } catch (error) {
-            this.context.requests[requestId].error.unshift(error);
-            this.context.requests[requestId].loading = false;
+            request.error = error;
+            request.loading = false;
             this.context._internal.update();
             throw error;
         }

package/dist/actions/createGetUrlQuery.js

@@ -13,12 +13,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import getFromObject from './getFromObject.js';
+import { urlQuery } from '@lowdefy/helpers';
 function createGetUrlQuery({ arrayIndices , blockId , context  }) {
     return function getUrlQuery(params) {
+        const { window  } = context._internal.lowdefy._internal.globals;
+        if (!window?.location) {
+            throw new Error(`Browser window.location not available for getUrlQuery. Received: ${JSON.stringify(params)} on blockId: ${blockId}.`);
+        }
         return getFromObject({
             arrayIndices,
             location: blockId,
-            object: context._internal.lowdefy.urlQuery,
+            object: urlQuery.parse(window.location.search.slice(1)),
             method: 'getUrlQuery',
             params
         });

package/dist/actions/createLogout.js

@@ -13,8 +13,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ function createLogout({ context  }) {
-    return function logout() {
-        return context._internal.lowdefy._internal.auth.logout();
+    return function logout(params) {
+        return context._internal.lowdefy._internal.auth.logout(params);
     };
 }
 export default createLogout;

package/dist/actions/createRequest.js

@@ -12,11 +12,12 @@
   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.
-*/ function createRequest({ actions , arrayIndices , context , event  }) {
+*/ function createRequest({ actions , arrayIndices , blockId , context , event  }) {
     return async function request(params) {
         return await context._internal.Requests.callRequests({
             actions,
             arrayIndices,
+            blockId,
             event,
             params
         });

package/dist/actions/createReset.js

@@ -17,7 +17,6 @@ function createReset({ context  }) {
     return function reset() {
         context._internal.State.resetState();
         context._internal.RootBlocks.reset(serializer.deserializeFromString(context._internal.State.frozenState));
-        context._internal.update();
     };
 }
 export default createReset;

package/dist/actions/createSetGlobal.js

@@ -16,7 +16,7 @@
 const createSetGlobal = ({ arrayIndices , context  })=>{
     return function setGlobal(params) {
         Object.keys(params).forEach((key)=>{
-            set(context._internal.lowdefy._internal.lowdefyGlobal, applyArrayIndices(arrayIndices, key), params[key]);
+            set(context._internal.lowdefy.lowdefyGlobal, applyArrayIndices(arrayIndices, key), params[key]);
         });
         context._internal.RootBlocks.reset();
         context._internal.update();

package/dist/createLink.js

@@ -23,8 +23,7 @@ function createLink({ backLink , disabledLink , lowdefy , newOriginLink , noLink
             !props.back,
             !props.home,
             !props.url
-        ].filter((v)=>!v
-        ).length > 1) {
+        ].filter((v)=>!v).length > 1) {
             throw Error(`Invalid Link: To avoid ambiguity, only one of 'back', 'home', 'pageId' or 'url' can be defined.`);
         }
         if (props.back === true) {
@@ -39,7 +38,7 @@ function createLink({ backLink , disabledLink , lowdefy , newOriginLink , noLink
                 pathname,
                 query,
                 setInput: ()=>{
-                    lowdefy.inputs[`page:${lowdefy.home.pageId}`] = props.input || {};
+                    lowdefy.inputs[`page:${lowdefy.home.pageId}`] = props.input ?? {};
                 }
             });
         }
@@ -49,7 +48,7 @@ function createLink({ backLink , disabledLink , lowdefy , newOriginLink , noLink
                 pathname: `/${props.pageId}`,
                 query,
                 setInput: ()=>{
-                    lowdefy.inputs[`page:${props.pageId}`] = props.input || {};
+                    lowdefy.inputs[`page:${props.pageId}`] = props.input ?? {};
                 }
             });
         }

package/dist/getBlockMatcher.js

@@ -15,8 +15,7 @@
 */ import { type } from '@lowdefy/helpers';
 const getBlockMatcher = (params)=>{
     let testParams = params;
-    if (type.isNone(testParams)) return ()=>true
-    ;
+    if (type.isNone(testParams)) return ()=>true;
     if (type.isString(testParams)) {
         testParams = {
             blockIds: [
@@ -43,8 +42,7 @@ const getBlockMatcher = (params)=>{
         ];
     }
     if (type.isArray(testParams.regex)) {
-        testParams.regex = testParams.regex.map((regex)=>new RegExp(regex)
-        );
+        testParams.regex = testParams.regex.map((regex)=>new RegExp(regex));
     }
     return (id)=>{
         if (testParams.blockIds === true || type.isArray(testParams.blockIds) && testParams.blockIds.includes(id)) {

package/dist/getContext.js

@@ -33,8 +33,7 @@ const blockData = ({ areas , blockId , blocks , events , field , id , layout , p
         type,
         validate,
         visible
-    })
-;
+    });
 function getContext({ config , lowdefy , resetContext ={
     reset: false,
     setReset: ()=>undefined

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lowdefy/engine",
-  "version": "4.0.0-alpha.9",
-  "licence": "Apache-2.0",
+  "version": "4.0.0-rc.0",
+  "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
   "keywords": [
@@ -30,26 +30,28 @@
     "dist/*"
   ],
   "scripts": {
-    "build": "yarn swc",
+    "build": "swc src --out-dir dist --config-file ../../.swcrc --delete-dir-on-start",
     "clean": "rm -rf dist",
-    "prepare": "yarn build",
-    "swc": "swc src --out-dir dist --config-file ../../.swcrc --delete-dir-on-start",
-    "test:watch": "jest --coverage --watch",
-    "test": "jest --coverage"
+    "prepublishOnly": "pnpm build",
+    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
   },
   "dependencies": {
-    "@lowdefy/helpers": "4.0.0-alpha.9",
-    "@lowdefy/operators": "4.0.0-alpha.9"
+    "@lowdefy/helpers": "4.0.0-rc.0",
+    "@lowdefy/operators": "4.0.0-rc.0"
   },
   "devDependencies": {
-    "@lowdefy/operators-js": "4.0.0-alpha.9",
-    "@swc/cli": "0.1.55",
-    "@swc/core": "1.2.135",
-    "@swc/jest": "0.2.17",
-    "jest": "27.5.1"
+    "@jest/globals": "28.1.0",
+    "@lowdefy/actions-core": "4.0.0-rc.0",
+    "@lowdefy/build": "4.0.0-rc.0",
+    "@lowdefy/operators-js": "4.0.0-rc.0",
+    "@lowdefy/operators-mql": "4.0.0-rc.0",
+    "@swc/cli": "0.1.57",
+    "@swc/core": "1.2.194",
+    "@swc/jest": "0.2.21",
+    "jest": "28.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "98b544eca231bdcfca6c3a8601a891835d5ce571"
+  "gitHead": "f6872d7ff6da421710096536fce7b2016ef8f35c"
 }