@lowdefy/engine 4.0.0-alpha.8 → 4.0.0-alpha.9

package/dist/Actions.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.
@@ -31,7 +31,7 @@ let Actions = class Actions {
             console.error(error);
         }
     }
-    async callActionLoop({ actions , arrayIndices , block , event , responses  }) {
+    async callActionLoop({ actions , arrayIndices , block , event , progress , responses  }) {
         for (const [index, action] of actions.entries()){
             try {
                 if (action.async === true) {
@@ -41,6 +41,7 @@ let Actions = class Actions {
                         block,
                         event,
                         index,
+                        progress,
                         responses
                     });
                 } else {
@@ -50,6 +51,7 @@ let Actions = class Actions {
                         block,
                         event,
                         index,
+                        progress,
                         responses
                     });
                     responses[action.id] = response;
@@ -63,7 +65,7 @@ let Actions = class Actions {
             }
         }
     }
-    async callActions({ actions , arrayIndices , block , catchActions , event , eventName  }) {
+    async callActions({ actions , arrayIndices , block , catchActions , event , eventName , progress  }) {
         const startTimestamp = new Date();
         const responses = {};
         try {
@@ -72,7 +74,8 @@ let Actions = class Actions {
                 arrayIndices,
                 block,
                 event,
-                responses
+                responses,
+                progress
             });
         } catch (error) {
             console.error(error);
@@ -82,7 +85,8 @@ let Actions = class Actions {
                     arrayIndices,
                     block,
                     event,
-                    responses
+                    responses,
+                    progress
                 });
             } catch (errorCatch) {
                 console.error(errorCatch);
@@ -122,7 +126,7 @@ let Actions = class Actions {
             success: true
         };
     }
-    async callAction({ action , arrayIndices , block , event , index , responses  }) {
+    async callAction({ action , arrayIndices , block , event , index , progress , responses  }) {
         if (!this.actions[action.type]) {
             throw {
                 error: new Error(`Invalid action type "${action.type}" at "${block.blockId}".`),
@@ -172,6 +176,9 @@ let Actions = class Actions {
                 params: parsedAction.params,
                 window: this.context._internal.lowdefy._internal.window
             });
+            if (progress) {
+                progress();
+            }
         } catch (error) {
             responses[action.id] = {
                 error,

package/dist/Blocks.js

@@ -1,5 +1,5 @@
 /* eslint-disable no-param-reassign */ /*
-  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.
@@ -14,7 +14,6 @@
   limitations under the License.
 */ import { applyArrayIndices, get, serializer, swap, type } from '@lowdefy/helpers';
 import Events from './Events.js';
-import getFieldValues from './getFieldValues.js';
 let Blocks = class Blocks {
     loopBlocks(fn) {
         if (type.isObject(this.areas)) {
@@ -34,21 +33,29 @@ let Blocks = class Blocks {
             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;
-            block.visible = type.isNone(block.visible) ? true : block.visible;
-            block.required = type.isNone(block.required) ? false : block.required;
-            block.validate = type.isArray(block.validate) ? block.validate : [];
+            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;
             block.properties = type.isNone(block.properties) ? {} : block.properties;
+            block.required = type.isNone(block.required) ? false : block.required;
+            block.skeleton = type.isNone(block.skeleton) ? null : block.skeleton;
             block.style = type.isNone(block.style) ? {} : block.style;
-            block.layout = type.isNone(block.layout) ? {} : block.layout;
-            block.events = type.isNone(block.events) ? {} : block.events;
+            block.validate = type.isNone(block.validate) ? [] : block.validate;
+            block.visible = type.isNone(block.visible) ? true : block.visible;
             block.areasLayoutEval = {};
             block.layoutEval = {};
+            block.loadingEval = {};
             block.propertiesEval = {};
             block.requiredEval = {};
+            block.skeletonEval = {};
             block.styleEval = {};
             block.validationEval = {};
             block.visibleEval = {};
-            block.meta = this.context._internal.lowdefy._internal.blockComponents[block.type].meta;
+            try {
+                block.meta = this.context._internal.lowdefy._internal.blockComponents[block.type].meta;
+            } 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 (!type.isNone(block.areas)) {
                 block.areasLayout = {};
                 Object.keys(block.areas).forEach((key)=>{
@@ -61,7 +68,6 @@ let Blocks = class Blocks {
             } else {
                 block.areasLayout = {};
             }
-            block.requestKeys = getFieldValues('_request', block.style, block.properties, block.validate, block.visible, block.required);
             block.methods = {};
             block.registerMethod = (methodName, method)=>{
                 block.methods[methodName] = method;
@@ -236,8 +242,10 @@ let Blocks = class Blocks {
         return serializer.serializeToString({
             areasLayoutEval: block.areasLayoutEval,
             layoutEval: block.layoutEval,
+            loadingEval: block.loadingEval,
             propertiesEval: block.propertiesEval,
             requiredEval: block.requiredEval,
+            skeletonEval: block.skeletonEval,
             styleEval: block.styleEval,
             validationEval: block.validationEval,
             value: block.value,
@@ -346,6 +354,16 @@ let Blocks = class Blocks {
                     location: block.blockId,
                     arrayIndices: this.arrayIndices
                 });
+                block.loadingEval = this.context._internal.parser.parse({
+                    input: block.loading,
+                    location: block.blockId,
+                    arrayIndices: this.arrayIndices
+                });
+                block.skeletonEval = this.context._internal.parser.parse({
+                    input: block.skeleton,
+                    location: block.blockId,
+                    arrayIndices: this.arrayIndices
+                });
                 block.areasLayoutEval = this.context._internal.parser.parse({
                     input: block.areasLayout,
                     location: block.blockId,
@@ -505,12 +523,12 @@ let Blocks = class Blocks {
         this.loopBlocks((block)=>{
             if (block.update) {
                 block.update = false;
-                block.loading = block.requestKeys.reduce((acc, key)=>acc || (this.context.requests[key] ? this.context.requests[key].loading : true)
-                , false);
                 block.eval = {
                     areas: block.areasLayoutEval.output,
                     events: type.isNone(block.Events.events) ? null : block.Events.events,
                     properties: block.propertiesEval.output,
+                    loading: block.loadingEval.output,
+                    skeleton: block.skeletonEval.output,
                     required: block.requiredEval.output,
                     layout: block.layoutEval.output,
                     style: block.styleEval.output,
@@ -530,21 +548,6 @@ let Blocks = class Blocks {
             });
         });
     }
-    setBlocksLoadingCache() {
-        this.loopBlocks((block)=>{
-            block.loading_prev = block.loading;
-            block.loading = block.requestKeys.reduce((acc, key)=>acc || (this.context.requests[key] ? this.context.requests[key].loading : true)
-            , false);
-            if (block.loading_prev !== block.loading) {
-                this.context._internal.lowdefy._internal.updateBlock(block.id);
-            }
-        });
-        Object.keys(this.subBlocks).forEach((subKey)=>{
-            this.subBlocks[subKey].forEach((subBlock)=>{
-                subBlock.setBlocksLoadingCache();
-            });
-        });
-    }
     constructor({ arrayIndices , areas , context  }){
         this.id = Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 5);
         this.areas = serializer.copy(areas || []);
@@ -565,7 +568,6 @@ let Blocks = class Blocks {
         this.resetValidation = this.resetValidation.bind(this);
         this.resetValidationRec = this.resetValidationRec.bind(this);
         this.setBlocksCache = this.setBlocksCache.bind(this);
-        this.setBlocksLoadingCache = this.setBlocksLoadingCache.bind(this);
         this.update = this.update.bind(this);
         this.updateState = this.updateState.bind(this);
         this.updateStateFromRoot = this.updateStateFromRoot.bind(this);

package/dist/Events.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.
@@ -31,7 +31,7 @@ let Events = class Events {
     registerEvent({ name , actions  }) {
         this.events[name] = this.initEvent(actions);
     }
-    async triggerEvent({ name , event  }) {
+    async triggerEvent({ name , event , progress  }) {
         const eventDescription = this.events[name];
         let result = {
             blockId: this.block.blockId,
@@ -57,7 +57,8 @@ let Events = class Events {
                 block: this.block,
                 catchActions: eventDescription.catchActions,
                 event,
-                eventName: name
+                eventName: name,
+                progress
             });
             eventDescription.history.unshift(res);
             this.context.eventLog.unshift(res);

package/dist/Requests.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.
@@ -74,9 +74,6 @@ let Requests = class Requests {
     }
     async fetch({ requestId , payload  }) {
         this.context.requests[requestId].loading = true;
-        if (this.context._internal.RootBlocks) {
-            this.context._internal.RootBlocks.setBlocksLoadingCache();
-        }
         try {
             const response = await this.context._internal.lowdefy._internal.callRequest({
                 pageId: this.context.pageId,

package/dist/State.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/actions/createCallMethod.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/actions/createDisplayMessage.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/actions/createGetActions.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/actions/createGetBlockId.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/actions/createGetEvent.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/actions/createGetGlobal.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/actions/createGetInput.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/actions/createGetPageId.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/actions/createGetRequestDetails.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/actions/createGetState.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/actions/createGetUrlQuery.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/actions/createGetUser.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/actions/createLink.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/actions/createLogin.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/actions/createLogout.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/actions/createRequest.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/actions/createReset.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/actions/createResetValidation.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/actions/createSetGlobal.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/actions/createSetState.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/actions/createValidate.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/actions/getActionMethods.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/actions/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/createLink.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/getBlockMatcher.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/getContext.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.
@@ -35,15 +35,20 @@ const blockData = ({ areas , blockId , blocks , events , field , id , layout , p
         visible
     })
 ;
-async function getContext({ config , lowdefy , development =false  }) {
+function getContext({ config , lowdefy , resetContext ={
+    reset: false,
+    setReset: ()=>undefined
+} ,  }) {
     if (!config) {
         throw new Error('A page must be provided to get context.');
     }
     const { id  } = config;
-    if (lowdefy.contexts[id] && !development) {
+    if (lowdefy.contexts[id] && !resetContext.reset) {
+        // memoize context if already created, eg between page transitions, unless the reset flag is raised
         lowdefy.contexts[id]._internal.update();
         return lowdefy.contexts[id];
     }
+    resetContext.setReset(false); // lower context reset flag.
     if (!lowdefy.inputs[id]) {
         lowdefy.inputs[id] = {};
     }
@@ -64,7 +69,6 @@ async function getContext({ config , lowdefy , development =false  }) {
         context: ctx,
         operators: lowdefy._internal.operators
     });
-    await _internal.parser.init();
     _internal.State = new State(ctx);
     _internal.Actions = new Actions(ctx);
     _internal.Requests = new Requests(ctx);
@@ -82,14 +86,28 @@ async function getContext({ config , lowdefy , development =false  }) {
     _internal.update = ()=>{
         _internal.RootBlocks.update();
     };
-    await _internal.RootBlocks.map[ctx.id].triggerEvent({
-        name: 'onInit'
-    });
-    _internal.update();
-    _internal.State.freezeState();
-    _internal.RootBlocks.map[ctx.id].triggerEvent({
-        name: 'onInitAsync'
-    });
+    _internal.runOnInit = async (progress)=>{
+        progress();
+        if (!_internal.onInitDone) {
+            await _internal.RootBlocks.areas.root.blocks[0].triggerEvent({
+                name: 'onInit',
+                progress
+            });
+            _internal.update();
+            _internal.State.freezeState();
+            _internal.onInitDone = true;
+        }
+    };
+    _internal.runOnInitAsync = async (progress)=>{
+        if (_internal.onInitDone && !_internal.onInitAsyncDone) {
+            await _internal.RootBlocks.areas.root.blocks[0].triggerEvent({
+                name: 'onInitAsync',
+                progress
+            });
+            _internal.onInitAsyncDone = true;
+        }
+    };
+    ctx._internal.update();
     lowdefy.contexts[id] = ctx;
     return ctx;
 }

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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/engine",
-  "version": "4.0.0-alpha.8",
+  "version": "4.0.0-alpha.9",
   "licence": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -38,11 +38,11 @@
     "test": "jest --coverage"
   },
   "dependencies": {
-    "@lowdefy/helpers": "4.0.0-alpha.8",
-    "@lowdefy/operators": "4.0.0-alpha.8"
+    "@lowdefy/helpers": "4.0.0-alpha.9",
+    "@lowdefy/operators": "4.0.0-alpha.9"
   },
   "devDependencies": {
-    "@lowdefy/operators-js": "4.0.0-alpha.8",
+    "@lowdefy/operators-js": "4.0.0-alpha.9",
     "@swc/cli": "0.1.55",
     "@swc/core": "1.2.135",
     "@swc/jest": "0.2.17",
@@ -51,5 +51,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9d56b83cf45e868afe3a1eeba750fe826eb74c8c"
+  "gitHead": "98b544eca231bdcfca6c3a8601a891835d5ce571"
 }

package/dist/getFieldValues.js

@@ -1,35 +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 { serializer } from '@lowdefy/helpers';
-function getFieldValues(operatorName, ...args) {
-    const result = new Set();
-    function reviver(key, value) {
-        if (key === operatorName) {
-            result.add(value);
-        }
-        return value;
-    }
-    [
-        ...args
-    ].forEach((element)=>{
-        serializer.deserializeFromString(serializer.serializeToString(element), {
-            reviver
-        });
-    });
-    return [
-        ...result
-    ];
-}
-export default getFieldValues;