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

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,13 +39,16 @@ 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: {},
+        auth: {
+            callbacks: {},
+            events: {},
+            providers: {}
+        },
         blocks: {},
         connections: {},
         requests: {},
@@ -60,6 +63,24 @@ function buildTypes({ components , context  }) {
         store: components.types.actions,
         typeClass: 'Action'
     });
+    buildTypeClass(context, {
+        counter: typeCounters.auth.callbacks,
+        definitions: context.typesMap.auth.callbacks,
+        store: components.types.auth.callbacks,
+        typeClass: 'Auth callback'
+    });
+    buildTypeClass(context, {
+        counter: typeCounters.auth.events,
+        definitions: context.typesMap.auth.events,
+        store: components.types.auth.events,
+        typeClass: 'Auth event'
+    });
+    buildTypeClass(context, {
+        counter: typeCounters.auth.providers,
+        definitions: context.typesMap.auth.providers,
+        store: components.types.auth.providers,
+        typeClass: 'Auth provider'
+    });
     buildTypeClass(context, {
         counter: typeCounters.blocks,
         definitions: context.typesMap.blocks,

package/dist/build/testSchema.js

@@ -15,20 +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.');
-        const promises = errors.map((error)=>context.logger.warn(formatErrorMessage({
+        context.logger.warn('Schema not valid.');
+        errors.map((error)=>context.logger.warn(formatErrorMessage({
                 error,
                 components
-            }))
-        );
-        await promises;
+            })));
     }
 }
 export default testSchema;

package/dist/build/updateServerPackageJson.js

@@ -25,6 +25,9 @@ async function updateServerPackageJson({ components , context  }) {
         });
     }
     getPackages(components.types.actions);
+    getPackages(components.types.auth.callbacks);
+    getPackages(components.types.auth.events);
+    getPackages(components.types.auth.providers);
     getPackages(components.types.blocks);
     getPackages(components.types.connections);
     getPackages(components.types.requests);

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,24 +13,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { type } from '@lowdefy/helpers';
-import { validate } from '@lowdefy/ajv';
-import lowdefySchema from '../lowdefySchema.js';
-async function validateConfig({ components  }) {
+function validateConfig({ components  }) {
     if (type.isNone(components.config)) {
         components.config = {};
     }
     if (!type.isObject(components.config)) {
         throw new Error('lowdefy.config is not an object.');
     }
-    if (type.isNone(components.config.auth)) {
-        components.config.auth = {};
-    }
-    if (type.isNone(components.config.auth.pages)) {
-        components.config.auth.pages = {};
-    }
-    if (type.isNone(components.config.auth.pages.roles)) {
-        components.config.auth.pages.roles = {};
-    }
     if (type.isNone(components.config.theme)) {
         components.config.theme = {};
     }
@@ -39,19 +28,6 @@ async function validateConfig({ components  }) {
             throw Error('Base path must start with "/".');
         }
     }
-    validate({
-        schema: lowdefySchema.definitions.authConfig,
-        data: components.config.auth
-    });
-    if (components.config.auth.pages.protected === true && components.config.auth.pages.public === true || type.isArray(components.config.auth.pages.protected) && type.isArray(components.config.auth.pages.public)) {
-        throw new Error('Protected and public pages are mutually exclusive. When protected pages are listed, all unlisted pages are public by default and visa versa.');
-    }
-    if (components.config.auth.pages.protected === false) {
-        throw new Error('Protected pages can not be set to false.');
-    }
-    if (components.config.auth.pages.public === false) {
-        throw new Error('Public pages can not be set to false.');
-    }
     return components;
 }
 export default validateConfig;

package/dist/build/writeAuth.js

@@ -0,0 +1,18 @@
+/*
+  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.
+*/ async function writeAuth({ components , context  }) {
+    await context.writeBuildArtifact('auth.json', JSON.stringify(components.auth || {}, null, 2));
+}
+export default writeAuth;

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/writePluginImports/generateImportFile.js

@@ -21,13 +21,8 @@ export default {
   {{ import.typeName }},
   {% endfor -%}
 };`;
-function generateImportFile({ types , importPath  }) {
+function generateImportFile({ imports , importPath  }) {
     const templateFn = nunjucksFunction(template);
-    const imports = Object.keys(types).map((typeName)=>({
-            typeName,
-            ...types[typeName]
-        })
-    );
     return templateFn({
         imports,
         importPath

package/dist/build/writePluginImports/writeActionImports.js

@@ -15,7 +15,7 @@
 */ import generateImportFile from './generateImportFile.js';
 async function writeActionImports({ components , context  }) {
     await context.writeBuildArtifact('plugins/actions.js', generateImportFile({
-        types: components.types.actions,
+        imports: components.imports.actions,
         importPath: 'actions'
     }));
 }

package/dist/build/writePluginImports/writeAuthImports.js

@@ -0,0 +1,30 @@
+/*
+  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 generateImportFile from './generateImportFile.js';
+async function writeAuthImports({ components , context  }) {
+    await context.writeBuildArtifact('plugins/auth/callbacks.js', generateImportFile({
+        imports: components.imports.auth.callbacks,
+        importPath: 'auth/callbacks'
+    }));
+    await context.writeBuildArtifact('plugins/auth/events.js', generateImportFile({
+        imports: components.imports.auth.events,
+        importPath: 'auth/events'
+    }));
+    await context.writeBuildArtifact('plugins/auth/providers.js', generateImportFile({
+        imports: components.imports.auth.providers,
+        importPath: 'auth/providers'
+    }));
+}
+export default writeAuthImports;

package/dist/build/writePluginImports/writeBlockImports.js

@@ -15,7 +15,7 @@
 */ import generateImportFile from './generateImportFile.js';
 async function writeBlockImports({ components , context  }) {
     await context.writeBuildArtifact('plugins/blocks.js', generateImportFile({
-        types: components.types.blocks,
+        imports: components.imports.blocks,
         importPath: 'blocks'
     }));
 }

package/dist/build/writePluginImports/writeConnectionImports.js

@@ -15,7 +15,7 @@
 */ import generateImportFile from './generateImportFile.js';
 async function writeConnectionImports({ components , context  }) {
     await context.writeBuildArtifact('plugins/connections.js', generateImportFile({
-        types: components.types.connections,
+        imports: components.imports.connections,
         importPath: 'connections'
     }));
 }

package/dist/build/writePluginImports/writeIconImports.js

@@ -25,7 +25,7 @@ export default {
 async function writeIconImports({ components , context  }) {
     const templateFn = nunjucksFunction(template);
     await context.writeBuildArtifact('plugins/icons.js', templateFn({
-        packages: components.icons
+        packages: components.imports.icons
     }));
 }
 export default writeIconImports;

package/dist/build/writePluginImports/writeOperatorImports.js

@@ -14,12 +14,12 @@
   limitations under the License.
 */ import generateImportFile from './generateImportFile.js';
 async function writeOperatorImports({ components , context  }) {
-    await context.writeBuildArtifact('plugins/operatorsClient.js', generateImportFile({
-        types: components.types.operators.client,
+    await context.writeBuildArtifact('plugins/operators/client.js', generateImportFile({
+        imports: components.imports.operators.client,
         importPath: 'operators/client'
     }));
-    await context.writeBuildArtifact('plugins/operatorsServer.js', generateImportFile({
-        types: components.types.operators.server,
+    await context.writeBuildArtifact('plugins/operators/server.js', generateImportFile({
+        imports: components.imports.operators.server,
         importPath: 'operators/server'
     }));
 }

package/dist/build/writePluginImports/writePluginImports.js

@@ -0,0 +1,52 @@
+/*
+  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 writeActionImports from './writeActionImports.js';
+import writeAuthImports from './writeAuthImports.js';
+import writeBlockImports from './writeBlockImports.js';
+import writeConnectionImports from './writeConnectionImports.js';
+import writeIconImports from './writeIconImports.js';
+import writeOperatorImports from './writeOperatorImports.js';
+import writeStyleImports from './writeStyleImports.js';
+async function writePluginImports({ components , context  }) {
+    await writeActionImports({
+        components,
+        context
+    });
+    await writeAuthImports({
+        components,
+        context
+    });
+    await writeBlockImports({
+        components,
+        context
+    });
+    await writeConnectionImports({
+        components,
+        context
+    });
+    await writeIconImports({
+        components,
+        context
+    });
+    await writeOperatorImports({
+        components,
+        context
+    });
+    await writeStyleImports({
+        components,
+        context
+    });
+}
+export default writePluginImports;

package/dist/build/writePluginImports/writeStyleImports.js

@@ -22,7 +22,7 @@ const template = `@import '@lowdefy/layout/style.less';
 async function writeStyleImports({ components , context  }) {
     const templateFn = nunjucksFunction(template);
     await context.writeBuildArtifact('plugins/styles.less', templateFn({
-        styles: components.styles
+        styles: components.imports.styles
     }));
 }
 export default writeStyleImports;

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;