@lowdefy/build 4.0.0-alpha.12 → 4.0.0-alpha.13

package/dist/build/addDefaultPages/addDefaultPages.js

@@ -14,7 +14,7 @@
   limitations under the License.
 */ import { type } from '@lowdefy/helpers';
 import page404 from './404.js';
-async function addDefaultPages({ components  }) {
+function addDefaultPages({ components  }) {
     // If not copied, the same object is mutated by build every time
     // build runs for dev server. See #647
     const defaultPages = [
@@ -33,8 +33,7 @@ async function addDefaultPages({ components  }) {
         return page.id;
     });
     // deep copy to avoid mutating defaultConfig
-    const filteredDefaultPages = defaultPages.filter((defaultPage)=>!pageIds.includes(defaultPage.id)
-    );
+    const filteredDefaultPages = defaultPages.filter((defaultPage)=>!pageIds.includes(defaultPage.id));
     components.pages = [
         ...components.pages,
         ...filteredDefaultPages

package/dist/build/buildAuth/buildAuth.js

@@ -12,13 +12,16 @@
   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 buildAuthPlugins from './buildAuthPlugins.js';
+*/ import { type } from '@lowdefy/helpers';
+import buildAuthPlugins from './buildAuthPlugins.js';
 import buildPageAuth from './buildPageAuth.js';
 import validateAuthConfig from './validateAuthConfig.js';
 function buildAuth({ components , context  }) {
+    const configured = !type.isNone(components.auth);
     validateAuthConfig({
         components
     });
+    components.auth.configured = configured;
     buildPageAuth({
         components
     });

package/dist/build/buildAuth/getProtectedPages.js

@@ -14,12 +14,10 @@
   limitations under the License.
 */ import { type } from '@lowdefy/helpers';
 function getProtectedPages({ components  }) {
-    const pageIds = (components.pages || []).map((page)=>page.id
-    );
+    const pageIds = (components.pages || []).map((page)=>page.id);
     let protectedPages = [];
     if (type.isArray(components.auth.pages.public)) {
-        protectedPages = pageIds.filter((pageId)=>!components.auth.pages.public.includes(pageId)
-        );
+        protectedPages = pageIds.filter((pageId)=>!components.auth.pages.public.includes(pageId));
     } else if (components.auth.pages.protected === true) {
         protectedPages = pageIds;
     } else if (type.isArray(components.auth.pages.protected)) {

package/dist/build/buildConnections.js

@@ -15,7 +15,7 @@
 */ import { type } from '@lowdefy/helpers';
 import countOperators from '../utils/countOperators.js';
 import createCheckDuplicateId from '../utils/createCheckDuplicateId.js';
-async function buildConnections({ components , context  }) {
+function buildConnections({ components , context  }) {
     const checkDuplicateConnectionId = createCheckDuplicateId({
         message: 'Duplicate connectionId "{{ id }}".'
     });

package/dist/build/buildImports/buildIconImports.js

@@ -38,24 +38,20 @@
 function getConfigIcons({ components , icons , regex  }) {
     [
         ...JSON.stringify(components.global || {}).matchAll(regex)
-    ].map((match)=>icons.add(match[1])
-    );
+    ].map((match)=>icons.add(match[1]));
     [
         ...JSON.stringify(components.menus || []).matchAll(regex)
-    ].map((match)=>icons.add(match[1])
-    );
+    ].map((match)=>icons.add(match[1]));
     [
         ...JSON.stringify(components.pages || []).matchAll(regex)
-    ].map((match)=>icons.add(match[1])
-    );
+    ].map((match)=>icons.add(match[1]));
 }
 function getBlockDefaultIcons({ blocks , context , icons , regex  }) {
     blocks.forEach((block)=>{
         (context.typesMap.icons[block.typeName] || []).forEach((icon)=>{
             [
                 ...JSON.stringify(icon).matchAll(regex)
-            ].map((match)=>icons.add(match[1])
-            );
+            ].map((match)=>icons.add(match[1]));
         });
     });
 }

package/dist/build/buildImports/buildImportsDev.js

@@ -38,9 +38,7 @@ function buildImportClassDev({ pluginPackages , map  }) {
             originalTypeName: type.originalTypeName,
             package: type.package,
             typeName
-        })
-    ).filter((type)=>pluginPackages.has(type.package)
-    );
+        })).filter((type)=>pluginPackages.has(type.package));
 }
 function buildImportsDev({ components , context  }) {
     const pluginPackages = getPluginPackages({

package/dist/build/buildImports/buildImportsProd.js

@@ -20,8 +20,7 @@ function buildImportClassProd(types) {
             originalTypeName: type.originalTypeName,
             package: type.package,
             typeName
-        })
-    );
+        }));
 }
 function buildImportsProd({ components , context  }) {
     const blocks = buildImportClassProd(components.types.blocks);

package/dist/build/buildImports/buildStyleImports.js

@@ -15,14 +15,11 @@
 */ function buildStyleImports({ blocks , context  }) {
     const styles = new Set();
     blocks.forEach((block)=>{
-        styles.add(...(context.typesMap.styles.packages[block.package] || []).map((style)=>`${block.package}/${style}`
-        ));
-        styles.add(...(context.typesMap.styles.blocks[block.typeName] || []).map((style)=>`${block.package}/${style}`
-        ));
+        styles.add(...(context.typesMap.styles.packages[block.package] || []).map((style)=>`${block.package}/${style}`));
+        styles.add(...(context.typesMap.styles.blocks[block.typeName] || []).map((style)=>`${block.package}/${style}`));
     });
     return [
         ...styles
-    ].filter((style)=>!!style
-    );
+    ].filter((style)=>!!style);
 }
 export default buildStyleImports;

package/dist/build/buildMenu.js

@@ -14,7 +14,7 @@
   limitations under the License.
 */ import { type } from '@lowdefy/helpers';
 import createCheckDuplicateId from '../utils/createCheckDuplicateId.js';
-async function buildDefaultMenu({ components , context  }) {
+function buildDefaultMenu({ components , context  }) {
     context.logger.warn('No menus found. Building default menu.');
     const pages = type.isArray(components.pages) ? components.pages : [];
     const menus = [
@@ -25,9 +25,7 @@ async function buildDefaultMenu({ components , context  }) {
                     type: 'MenuLink',
                     pageId: page.pageId,
                     auth: page.auth
-                })
-            ).filter((page)=>page.pageId !== '404'
-            )
+                })).filter((page)=>page.pageId !== '404')
         }, 
     ];
     return menus;
@@ -37,8 +35,7 @@ function loopItems({ parent , menuId , pages , missingPageWarnings , checkDuplic
         parent.links.forEach((menuItem)=>{
             if (menuItem.type === 'MenuLink') {
                 if (type.isString(menuItem.pageId)) {
-                    const page = pages.find((pg)=>pg.pageId === menuItem.pageId
-                    );
+                    const page = pages.find((pg)=>pg.pageId === menuItem.pageId);
                     if (!page) {
                         missingPageWarnings.push({
                             menuItemId: menuItem.id,
@@ -75,14 +72,13 @@ function loopItems({ parent , menuId , pages , missingPageWarnings , checkDuplic
                 checkDuplicateMenuItemId
             });
         });
-        parent.links = parent.links.filter((item)=>item.remove !== true
-        );
+        parent.links = parent.links.filter((item)=>item.remove !== true);
     }
 }
-async function buildMenu({ components , context  }) {
+function buildMenu({ components , context  }) {
     const pages = type.isArray(components.pages) ? components.pages : [];
     if (type.isUndefined(components.menus) || components.menus.length === 0) {
-        components.menus = await buildDefaultMenu({
+        components.menus = buildDefaultMenu({
             components,
             context
         });
@@ -114,9 +110,9 @@ async function buildMenu({ components , context  }) {
             checkDuplicateMenuItemId
         });
     });
-    await Promise.all(missingPageWarnings.map(async (warning)=>{
-        await context.logger.warn(`Page "${warning.pageId}" referenced in menu link "${warning.menuItemId}" not found.`);
-    }));
+    missingPageWarnings.map(async (warning)=>{
+        context.logger.warn(`Page "${warning.pageId}" referenced in menu link "${warning.menuItemId}" not found.`);
+    });
     return components;
 }
 export default buildMenu;

package/dist/build/buildPages/buildBlock/buildBlock.js

@@ -21,7 +21,7 @@ import moveSubBlocksToArea from './moveSubBlocksToArea.js';
 import moveSkeletonBlocksToArea from './moveSkeletonBlocksToArea.js';
 import setBlockId from './setBlockId.js';
 import validateBlock from './validateBlock.js';
-async function buildBlock(block, pageContext) {
+function buildBlock(block, pageContext) {
     validateBlock(block, pageContext);
     setBlockId(block, pageContext);
     countBlockOperators(block, pageContext);
@@ -30,6 +30,6 @@ async function buildBlock(block, pageContext) {
     moveSubBlocksToArea(block, pageContext);
     moveSkeletonBlocksToArea(block, pageContext);
     countBlockTypes(block, pageContext);
-    await buildSubBlocks(block, pageContext);
+    buildSubBlocks(block, pageContext);
 }
 export default buildBlock;

package/dist/build/buildPages/buildBlock/buildEvents.js

@@ -35,6 +35,9 @@ function checkAction(action, { blockId , checkDuplicateActionId , eventId , page
 function buildEvents(block, pageContext) {
     if (block.events) {
         Object.keys(block.events).map((key)=>{
+            if (!type.isArray(block.events[key]) && !type.isObject(block.events[key]) || type.isObject(block.events[key]) && type.isNone(block.events[key].try)) {
+                throw new Error(`Actions must be an array at "${block.blockId}" in event "${key}" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].try)}`);
+            }
             if (type.isArray(block.events[key])) {
                 block.events[key] = {
                     try: block.events[key],
@@ -42,13 +45,10 @@ function buildEvents(block, pageContext) {
                 };
             }
             if (!type.isArray(block.events[key].try)) {
-                throw new Error(`Events must be an array of actions at "${block.blockId}" in event "${key}" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].try)}`);
-            }
-            if (type.isNone(block.events[key].catch)) {
-                block.events[key].catch = [];
+                throw new Error(`Try actions must be an array at "${block.blockId}" in event "${key}.try" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].try)}`);
             }
             if (!type.isArray(block.events[key].catch)) {
-                throw new Error(`Catch events must be an array of actions at "${block.blockId}" in event "${key}" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].catch)}`);
+                throw new Error(`Catch actions must be an array at "${block.blockId}" in event "${key}.catch" on page "${pageContext.pageId}". Received ${JSON.stringify(block.events[key].catch)}`);
             }
             const checkDuplicateActionId = createCheckDuplicateId({
                 message: 'Duplicate actionId "{{ id }}" on event "{{ eventId }}" on block "{{ blockId }}" on page "{{ pageId }}".'
@@ -59,16 +59,14 @@ function buildEvents(block, pageContext) {
                     typeCounters: pageContext.typeCounters,
                     pageId: pageContext.pageId,
                     checkDuplicateActionId
-                })
-            );
+                }));
             block.events[key].catch.map((action)=>checkAction(action, {
                     eventId: key,
                     blockId: block.blockId,
                     typeCounters: pageContext.typeCounters,
                     pageId: pageContext.pageId,
                     checkDuplicateActionId
-                })
-            );
+                }));
         });
     }
 }

package/dist/build/buildPages/buildBlock/buildSubBlocks.js

@@ -14,9 +14,8 @@
   limitations under the License.
 */ import { type } from '@lowdefy/helpers';
 import buildBlock from './buildBlock.js';
-async function buildSubBlocks(block, pageContext) {
+function buildSubBlocks(block, pageContext) {
     if (type.isObject(block.areas)) {
-        let promises = [];
         Object.keys(block.areas).forEach((key)=>{
             if (type.isNone(block.areas[key].blocks)) {
                 block.areas[key].blocks = [];
@@ -24,12 +23,8 @@ async function buildSubBlocks(block, pageContext) {
             if (!type.isArray(block.areas[key].blocks)) {
                 throw new Error(`Expected blocks to be an array at ${block.blockId} in area ${key} on page ${pageContext.pageId}. Received ${JSON.stringify(block.areas[key].blocks)}`);
             }
-            const blockPromises = block.areas[key].blocks.map(async (blk)=>{
-                await buildBlock(blk, pageContext);
-            });
-            promises = promises.concat(blockPromises);
+            block.areas[key].blocks.map((blk)=>buildBlock(blk, pageContext));
         });
-        await Promise.all(promises);
     }
 }
 export default buildSubBlocks;

package/dist/build/buildPages/buildPage.js

@@ -16,7 +16,7 @@
 import buildBlock from './buildBlock/buildBlock.js';
 import createCheckDuplicateId from '../../utils/createCheckDuplicateId.js';
 import createCounter from '../../utils/createCounter.js';
-async function buildPage({ page , index , context , checkDuplicatePageId  }) {
+function buildPage({ page , index , context , checkDuplicatePageId  }) {
     if (type.isUndefined(page.id)) {
         throw new Error(`Page id missing at page ${index}.`);
     }
@@ -29,7 +29,7 @@ async function buildPage({ page , index , context , checkDuplicatePageId  }) {
     page.pageId = page.id;
     const requests = [];
     const operators = new Set();
-    await buildBlock(page, {
+    buildBlock(page, {
         auth: page.auth,
         blockIdCounter: createCounter(),
         checkDuplicateRequestId: createCheckDuplicateId({

package/dist/build/buildPages/buildPages.js

@@ -15,19 +15,17 @@
 */ import { type } from '@lowdefy/helpers';
 import buildPage from './buildPage.js';
 import createCheckDuplicateId from '../../utils/createCheckDuplicateId.js';
-async function buildPages({ components , context  }) {
+function buildPages({ components , context  }) {
     const pages = type.isArray(components.pages) ? components.pages : [];
     const checkDuplicatePageId = createCheckDuplicateId({
         message: 'Duplicate pageId "{{ id }}".'
     });
-    const pageBuildPromises = pages.map((page, index)=>buildPage({
+    pages.map((page, index)=>buildPage({
             page,
             index,
             context,
             checkDuplicatePageId
-        })
-    );
-    await Promise.all(pageBuildPromises);
+        }));
     return components;
 }
 export default buildPages;

package/dist/build/buildPages/buildTestPage.js

@@ -0,0 +1,46 @@
+/*
+  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.
+  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.
+*/ // Used in @lowdefy/engine tests
+import buildAuth from '../buildAuth/buildAuth.js';
+import buildPages from './buildPages.js';
+import createContext from '../../createContext.js';
+function buildTestPage({ pageConfig  }) {
+    const context = createContext({
+        customTypesMap: {},
+        directories: {},
+        logger: {
+            debug: ()=>{},
+            log: ()=>{},
+            warn: ()=>{},
+            error: ()=>{}
+        },
+        stage: 'test'
+    });
+    const components = {
+        pages: [
+            pageConfig
+        ]
+    };
+    buildAuth({
+        components,
+        context
+    });
+    buildPages({
+        components,
+        context
+    });
+    return components.pages[0];
+}
+export default buildTestPage;

package/dist/build/buildRefs/evaluateBuildOperators.js

@@ -21,13 +21,12 @@ async function evaluateBuildOperators({ context , input , refDef  }) {
     });
     const { output , errors  } = operatorsParser.parse({
         input,
-        location: refDef.path,
+        location: refDef.path ?? refDef.resolver,
         operatorPrefix: '_build.'
     });
     if (errors.length > 0) {
         await context.logger.warn('Build operator errors.');
-        const promises = errors.map((error)=>context.logger.warn(error.message)
-        );
+        const promises = errors.map((error)=>context.logger.warn(error.message));
         await promises;
     }
     return output;

package/dist/build/buildTypes.js

@@ -39,10 +39,8 @@ function buildTypes({ components , context  }) {
     typeCounters.operators.client.increment('_not');
     typeCounters.operators.client.increment('_type');
     // Add loaders and basic
-    basicTypes.blocks.forEach((block)=>typeCounters.blocks.increment(block)
-    );
-    loaderTypes.blocks.forEach((block)=>typeCounters.blocks.increment(block)
-    );
+    basicTypes.blocks.forEach((block)=>typeCounters.blocks.increment(block));
+    loaderTypes.blocks.forEach((block)=>typeCounters.blocks.increment(block));
     typeCounters.blocks.increment('Message'); // Used for DisplayMessage in @lowdefy/client
     components.types = {
         actions: {},

package/dist/build/testSchema.js

@@ -15,19 +15,18 @@
 */ import { validate } from '@lowdefy/ajv';
 import lowdefySchema from '../lowdefySchema.js';
 import formatErrorMessage from '../utils/formatErrorMessage.js';
-async function testSchema({ components , context  }) {
+function testSchema({ components , context  }) {
     const { valid , errors  } = validate({
         schema: lowdefySchema,
         data: components,
         returnErrors: true
     });
     if (!valid) {
-        await context.logger.warn('Schema not valid.');
-        await Promise.all(errors.map((error)=>context.logger.warn(formatErrorMessage({
+        context.logger.warn('Schema not valid.');
+        errors.map((error)=>context.logger.warn(formatErrorMessage({
                 error,
                 components
-            }))
-        ));
+            })));
     }
 }
 export default testSchema;

package/dist/build/validateApp.js

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { type } from '@lowdefy/helpers';
-async function validateApp({ components  }) {
+function validateApp({ components  }) {
     if (type.isNone(components.app)) {
         components.app = {};
     }

package/dist/build/validateConfig.js

@@ -13,7 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { type } from '@lowdefy/helpers';
-async function validateConfig({ components  }) {
+function validateConfig({ components  }) {
     if (type.isNone(components.config)) {
         components.config = {};
     }

package/dist/build/writePages.js

@@ -19,8 +19,7 @@ async function writePages({ components , context  }) {
     const writePromises = components.pages.map((page)=>writePage({
             page,
             context
-        })
-    );
+        }));
     return Promise.all(writePromises);
 }
 export default writePages;

package/dist/build/writeRequests.js

@@ -25,8 +25,7 @@ async function writeRequests({ components , context  }) {
     const writePromises = components.pages.map((page)=>writeRequestsOnPage({
             page,
             context
-        })
-    );
+        }));
     return Promise.all(writePromises);
 }
 export default writeRequests;

package/dist/createContext.js

@@ -0,0 +1,54 @@
+/* eslint-disable no-console */ /*
+  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.
+  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 { mergeObjects } from '@lowdefy/helpers';
+import createCounter from './utils/createCounter.js';
+import createReadConfigFile from './utils/readConfigFile.js';
+import createWriteBuildArtifact from './utils/writeBuildArtifact.js';
+import defaultTypesMap from './defaultTypesMap.js';
+function createContext({ customTypesMap , directories , logger , refResolver , stage ='prod'  }) {
+    const context = {
+        directories,
+        logger,
+        readConfigFile: createReadConfigFile({
+            directories
+        }),
+        refResolver,
+        stage,
+        typeCounters: {
+            actions: createCounter(),
+            auth: {
+                callbacks: createCounter(),
+                events: createCounter(),
+                providers: createCounter()
+            },
+            blocks: createCounter(),
+            connections: createCounter(),
+            requests: createCounter(),
+            operators: {
+                client: createCounter(),
+                server: createCounter()
+            }
+        },
+        typesMap: mergeObjects([
+            defaultTypesMap,
+            customTypesMap
+        ]),
+        writeBuildArtifact: createWriteBuildArtifact({
+            directories
+        })
+    };
+    return context;
+}
+export default createContext;