@lowdefy/build 4.0.0-alpha.5 → 4.0.0-alpha.8

package/dist/build/addDefaultPages/404.js

@@ -12,45 +12,40 @@
   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.
-*/ // TODO: temp fix while waiting for blocks-antd
-export default {
+*/ export default {
     id: '404',
-    type: 'Box'
-}; // export default {
- //   id: '404',
- //   type: 'Result',
- //   style: {
- //     minHeight: '100vh',
- //   },
- //   properties: {
- //     status: 404,
- //     title: '404',
- //     subTitle: 'Sorry, the page you are visiting does not exist.',
- //   },
- //   areas: {
- //     extra: {
- //       blocks: [
- //         {
- //           id: 'home',
- //           type: 'Button',
- //           properties: {
- //             title: 'Go to home page',
- //             type: 'Link',
- //             icon: 'HomeOutlined',
- //           },
- //           events: {
- //             onClick: [
- //               {
- //                 id: 'home',
- //                 type: 'Link',
- //                 params: {
- //                   home: true,
- //                 },
- //               },
- //             ],
- //           },
- //         },
- //       ],
- //     },
- //   },
- // };
+    type: 'Result',
+    style: {
+        minHeight: '100vh'
+    },
+    properties: {
+        status: 404,
+        title: '404',
+        subTitle: 'Sorry, the page you are visiting does not exist.'
+    },
+    areas: {
+        extra: {
+            blocks: [
+                {
+                    id: 'home',
+                    type: 'Button',
+                    properties: {
+                        title: 'Go to home page',
+                        type: 'Link'
+                    },
+                    events: {
+                        onClick: [
+                            {
+                                id: 'home',
+                                type: 'Link',
+                                params: {
+                                    home: true
+                                }
+                            }, 
+                        ]
+                    }
+                }, 
+            ]
+        }
+    }
+};

package/dist/build/addDefaultPages/addDefaultPages.js

@@ -26,8 +26,12 @@ async function addDefaultPages({ components  }) {
     if (!type.isArray(components.pages)) {
         throw new Error('lowdefy.pages is not an array.');
     }
-    const pageIds = components.pages.map((page)=>page.id
-    );
+    const pageIds = components.pages.map((page, index)=>{
+        if (!type.isObject(page)) {
+            throw new Error(`pages[${index}] is not an object. Received ${JSON.stringify(page)}`);
+        }
+        return page.id;
+    });
     // deep copy to avoid mutating defaultConfig
     const filteredDefaultPages = defaultPages.filter((defaultPage)=>!pageIds.includes(defaultPage.id)
     );

package/dist/build/buildAuth/getPageRoles.js

@@ -14,8 +14,7 @@
   limitations under the License.
 */ function getPageRoles({ components  }) {
     const roles = components.config.auth.pages.roles;
-    const pageRoles = {
-    };
+    const pageRoles = {};
     Object.keys(roles).forEach((roleName)=>{
         roles[roleName].forEach((pageId)=>{
             if (!pageRoles[pageId]) {

package/dist/build/buildConnections.js

@@ -36,8 +36,7 @@ async function buildConnections({ components , context  }) {
             context.typeCounters.connections.increment(connection.type);
             connection.connectionId = connection.id;
             connection.id = `connection:${connection.id}`;
-            countOperators(connection.properties || {
-            }, {
+            countOperators(connection.properties || {}, {
                 counter: context.typeCounters.operators.server
             });
         });

package/dist/build/buildIcons.js

@@ -35,23 +35,51 @@
     'react-icons/wi': /"(Wi[A-Z0-9]\w*)"/gm,
     'react-icons/cg': /"(Cg[A-Z0-9]\w*)"/gm
 };
-function buildIcons({ components  }) {
+function getConfigIcons({ components , icons , regex  }) {
+    [
+        ...JSON.stringify(components.global || {}).matchAll(regex)
+    ].map((match)=>icons.add(match[1])
+    );
+    [
+        ...JSON.stringify(components.menus || []).matchAll(regex)
+    ].map((match)=>icons.add(match[1])
+    );
+    [
+        ...JSON.stringify(components.pages || []).matchAll(regex)
+    ].map((match)=>icons.add(match[1])
+    );
+}
+function getBlockDefaultIcons({ components , context , icons , regex  }) {
+    Object.keys(components.types.blocks).forEach((blockName)=>{
+        (context.typesMap.icons[blockName] || []).forEach((icon)=>{
+            [
+                ...JSON.stringify(icon).matchAll(regex)
+            ].map((match)=>icons.add(match[1])
+            );
+        });
+    });
+}
+function buildIcons({ components , context  }) {
     components.icons = [];
     Object.entries(iconPackages).forEach(([iconPackage, regex])=>{
         const icons = new Set();
-        [
-            ...JSON.stringify(components.global || {
-            }).matchAll(regex)
-        ].map((match)=>icons.add(match[1])
-        );
-        [
-            ...JSON.stringify(components.menus || []).matchAll(regex)
-        ].map((match)=>icons.add(match[1])
-        );
-        [
-            ...JSON.stringify(components.pages || []).matchAll(regex)
-        ].map((match)=>icons.add(match[1])
-        );
+        // TODO: Can we do better than this?
+        // Add default icons
+        if (iconPackage === 'react-icons/ai') {
+            icons.add('AiOutlineLoading3Quarters');
+            icons.add('AiOutlineExclamationCircle');
+        }
+        getConfigIcons({
+            components,
+            icons,
+            regex
+        });
+        getBlockDefaultIcons({
+            components,
+            context,
+            icons,
+            regex
+        });
         components.icons.push({
             icons: [
                 ...icons

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

@@ -44,7 +44,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.isArray(block.events[key].catch) && !type.isNone(block.events[key].catch)) {
+            if (type.isNone(block.events[key].catch)) {
+                block.events[key].catch = [];
+            }
+            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)}`);
             }
             const checkDuplicateActionId = createCheckDuplicateId({

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

@@ -32,8 +32,7 @@ function buildRequest(request, pageContext) {
         throw new Error(`Request type is not a string at at request at "${request.id}" at page "${pageId}". Received ${JSON.stringify(request.type)}.`);
     }
     typeCounters.requests.increment(request.type);
-    if (type.isUndefined(request.payload)) request.payload = {
-    };
+    if (type.isUndefined(request.payload)) request.payload = {};
     if (!type.isObject(request.payload)) {
         throw new Error(`Request "${request.id}" at page "${pageId}" payload should be an object.`);
     }

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

@@ -20,12 +20,10 @@ function countBlockOperators(block, { typeCounters  }) {
         counter: typeCounters.operators.client
     });
     (requests || []).forEach((request)=>{
-        countOperators(request.payload || {
-        }, {
+        countOperators(request.payload || {}, {
             counter: typeCounters.operators.client
         });
-        countOperators(request.properties || {
-        }, {
+        countOperators(request.properties || {}, {
             counter: typeCounters.operators.server
         });
     });

package/dist/build/buildRefs/buildRefs.js

@@ -14,13 +14,13 @@
   limitations under the License.
 */ import recursiveBuild from './recursiveBuild.js';
 import makeRefDefinition from './makeRefDefinition.js';
+// TODO: build operators aren't evaluated in lowdefy.yaml file. Move recursive call up a layer or something.
 async function buildRefs({ context  }) {
     const components = await recursiveBuild({
         context,
         refDef: makeRefDefinition('lowdefy.yaml'),
         count: 0
     });
-    return components || {
-    };
+    return components || {};
 }
 export default buildRefs;

package/dist/build/buildRefs/evaluateBuildOperators.js

@@ -0,0 +1,35 @@
+/*
+  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 { NodeParser } from '@lowdefy/operators';
+import operators from '@lowdefy/operators-js/operators/build';
+async function evaluateBuildOperators({ context , input , refDef  }) {
+    const operatorsParser = new NodeParser({
+        env: process.env,
+        operators
+    });
+    const { output , errors  } = operatorsParser.parse({
+        input,
+        location: refDef.path,
+        operatorPrefix: '_build.'
+    });
+    if (errors.length > 0) {
+        await context.logger.warn('Build operator errors.');
+        const promises = errors.map((error)=>context.logger.warn(error.message)
+        );
+        await promises;
+    }
+    return output;
+}
+export default evaluateBuildOperators;

package/dist/build/buildRefs/getRefContent.js

@@ -17,7 +17,7 @@ import parseRefContent from './parseRefContent.js';
 import runRefResolver from './runRefResolver.js';
 async function getRefContent({ context , refDef , referencedFrom  }) {
     let content;
-    if (refDef.path === 'lowdefy.yaml') {
+    if (refDef.path === 'lowdefy.yaml' || refDef.path === 'lowdefy.yml') {
         content = await getConfigFile({
             context,
             refDef,

package/dist/build/buildRefs/getUserJavascriptFunction.js

@@ -13,9 +13,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import path from 'path';
-import { readFile } from '@lowdefy/node-utils';
 async function getUserJavascriptFunction({ context , filePath  }) {
-    const jsFile = await readFile(path.resolve(context.directories.config, filePath));
-    return eval(jsFile);
+    try {
+        return (await import(path.resolve(context.directories.config, filePath))).default;
+    } catch (error) {
+        context.logger.error(`Error importing ${filePath}.`);
+        throw Error(error);
+    }
 }
 export default getUserJavascriptFunction;

package/dist/build/buildRefs/makeRefDefinition.js

@@ -23,8 +23,7 @@ function makeRefDefinition(refDefinition) {
         resolver: get(refDefinition, 'resolver'),
         transformer: get(refDefinition, 'transformer'),
         vars: get(refDefinition, 'vars', {
-            default: {
-            }
+            default: {}
         })
     };
 }

package/dist/build/buildRefs/parseRefContent.js

@@ -15,7 +15,7 @@
 */ import { type } from '@lowdefy/helpers';
 import { getFileExtension, getFileSubExtension } from '@lowdefy/node-utils';
 import JSON5 from 'json5';
-import YAML from 'js-yaml';
+import YAML from 'yaml';
 import parseNunjucks from './parseNunjucks.js';
 function parseRefContent({ content , refDef  }) {
     const { path , vars  } = refDef;
@@ -26,7 +26,7 @@ function parseRefContent({ content , refDef  }) {
             ext = getFileSubExtension(path);
         }
         if (ext === 'yaml' || ext === 'yml') {
-            return YAML.load(content);
+            return YAML.parse(content);
         }
         if (ext === 'json') {
             return JSON5.parse(content);

package/dist/build/buildRefs/recursiveBuild.js

@@ -12,7 +12,8 @@
   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 getRefContent from './getRefContent.js';
+*/ import evaluateBuildOperators from './evaluateBuildOperators.js';
+import getRefContent from './getRefContent.js';
 import getRefsFromFile from './getRefsFromFile.js';
 import populateRefs from './populateRefs.js';
 import runTransformer from './runTransformer.js';
@@ -27,8 +28,7 @@ async function recursiveParseFile({ context , refDef , count , referencedFrom  }
         referencedFrom
     });
     const { foundRefs , fileContentBuiltRefs  } = getRefsFromFile(fileContent);
-    const parsedFiles = {
-    };
+    const parsedFiles = {};
     // Since we can have references in the variables of a reference, we need to first parse
     // the deeper nodes, so we can use those parsed files in references higher in the tree.
     // To do this, since foundRefs is an array of ref definitions that are in order of the
@@ -47,9 +47,14 @@ async function recursiveParseFile({ context , refDef , count , referencedFrom  }
             count: count + 1,
             referencedFrom: refDef.path
         });
+        const evaluatedOperators = await evaluateBuildOperators({
+            context,
+            input: parsedFile,
+            refDef: parsedRefDef
+        });
         const transformedFile = await runTransformer({
             context,
-            parsedFile,
+            input: evaluatedOperators,
             refDef: parsedRefDef
         });
         parsedFiles[newRefDef.id] = transformedFile;

package/dist/build/buildRefs/runTransformer.js

@@ -13,14 +13,18 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import getUserJavascriptFunction from './getUserJavascriptFunction.js';
-async function runTransformer({ context , parsedFile , refDef  }) {
+async function runTransformer({ context , input , refDef  }) {
     if (refDef.transformer) {
         const transformerFn = await getUserJavascriptFunction({
             context,
             filePath: refDef.transformer
         });
-        return transformerFn(parsedFile, refDef.vars);
+        try {
+            return transformerFn(input, refDef.vars);
+        } catch (error) {
+            throw Error(`Error calling transformer "${refDef.transformer}" from "${refDef.path}": ${error.message}`);
+        }
     }
-    return parsedFile;
+    return input;
 }
 export default runTransformer;

package/dist/build/buildStyles.js

@@ -16,9 +16,9 @@
     components.styles = [];
     const styles = new Set();
     Object.entries(components.types.blocks).forEach(([blockName, block])=>{
-        styles.add(...(context.types.styles[block.package].default || []).map((style)=>`${block.package}/${style}`
+        styles.add(...(context.typesMap.styles.packages[block.package] || []).map((style)=>`${block.package}/${style}`
         ));
-        styles.add(...(context.types.styles[block.package][blockName] || []).map((style)=>`${block.package}/${style}`
+        styles.add(...(context.typesMap.styles.blocks[blockName] || []).map((style)=>`${block.package}/${style}`
         ));
     });
     components.styles = [

package/dist/build/buildTypes.js

@@ -12,13 +12,18 @@
   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 buildTypeClass({ counter , definitions , store , typeClass  }) {
+*/ function buildTypeClass(context, { counter , definitions , store , typeClass , warnIfMissing =false  }) {
     const counts = counter.getCounts();
     Object.keys(counts).forEach((typeName)=>{
         if (!definitions[typeName]) {
+            if (warnIfMissing) {
+                context.logger.warn(`${typeClass} type "${typeName}" was used but is not defined.`);
+                return;
+            }
             throw new Error(`${typeClass} type "${typeName}" was used but is not defined.`);
         }
         store[typeName] = {
+            originalTypeName: definitions[typeName].originalTypeName,
             package: definitions[typeName].package,
             version: definitions[typeName].version,
             count: counts[typeName]
@@ -27,57 +32,56 @@
 }
 function buildTypes({ components , context  }) {
     const { typeCounters  } = context;
+    // Add operators used by form validation
+    typeCounters.operators.client.increment('_not');
+    typeCounters.operators.client.increment('_type');
     components.types = {
-        actions: {
-        },
-        blocks: {
-        },
-        connections: {
-        },
-        requests: {
-        },
+        actions: {},
+        blocks: {},
+        connections: {},
+        requests: {},
         operators: {
-            client: {
-            },
-            server: {
-            }
+            client: {},
+            server: {}
         }
     };
-    // buildTypeClass({
-    //   counter: typeCounters.actions,
-    //   definitions: context.types.actions,
-    //   store: components.types.actions,
-    //   typeClass: 'Action',
-    // });
-    buildTypeClass({
+    buildTypeClass(context, {
+        counter: typeCounters.actions,
+        definitions: context.typesMap.actions,
+        store: components.types.actions,
+        typeClass: 'Action'
+    });
+    buildTypeClass(context, {
         counter: typeCounters.blocks,
-        definitions: context.types.blocks,
+        definitions: context.typesMap.blocks,
         store: components.types.blocks,
         typeClass: 'Block'
     });
-    buildTypeClass({
+    buildTypeClass(context, {
         counter: typeCounters.connections,
-        definitions: context.types.connections,
+        definitions: context.typesMap.connections,
         store: components.types.connections,
         typeClass: 'Connection'
     });
-    buildTypeClass({
+    buildTypeClass(context, {
         counter: typeCounters.requests,
-        definitions: context.types.requests,
+        definitions: context.typesMap.requests,
         store: components.types.requests,
         typeClass: 'Request'
     });
-    buildTypeClass({
+    buildTypeClass(context, {
         counter: typeCounters.operators.client,
-        definitions: context.types.operators.client,
+        definitions: context.typesMap.operators.client,
         store: components.types.operators.client,
-        typeClass: 'Operator'
+        typeClass: 'Operator',
+        warnIfMissing: true
     });
-    buildTypeClass({
+    buildTypeClass(context, {
         counter: typeCounters.operators.server,
-        definitions: context.types.operators.server,
+        definitions: context.typesMap.operators.server,
         store: components.types.operators.server,
-        typeClass: 'Operator'
+        typeClass: 'Operator',
+        warnIfMissing: true
     });
 }
 export default buildTypes;

package/dist/build/cleanBuildDirectory.js

@@ -14,6 +14,6 @@
   limitations under the License.
 */ import { cleanDirectory } from '@lowdefy/node-utils';
 async function cleanBuildDirectory({ context  }) {
-    return cleanDirectory(context.directories.build);
+    await cleanDirectory(context.directories.build);
 }
 export default cleanBuildDirectory;

package/dist/build/copyPublicFolder.js

@@ -0,0 +1,23 @@
+/*
+  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 path from 'path';
+import fs from 'fs';
+import { copyDirectory } from '@lowdefy/node-utils';
+async function copyPublicFolder({ context  }) {
+    if (context.directories.config === context.directories.server) return;
+    if (!fs.existsSync(path.resolve(context.directories.config, 'public'))) return;
+    await copyDirectory(path.resolve(context.directories.config, 'public'), path.resolve(context.directories.server, 'public'));
+}
+export default copyPublicFolder;

package/dist/build/updateServerPackageJson.js

@@ -31,8 +31,7 @@ async function updateServerPackageJson({ components , context  }) {
     getPackages(components.types.operators.client);
     getPackages(components.types.operators.server);
     // Sort dependencies
-    packageJson.dependencies = {
-    };
+    packageJson.dependencies = {};
     Object.keys(dependencies).sort().forEach((name)=>{
         packageJson.dependencies[name] = dependencies[name];
     });
@@ -41,10 +40,7 @@ async function updateServerPackageJson({ components , context  }) {
     // be watching the file to trigger reinstalls
     if (newPackageJsonContent !== packageJsonContent) {
         context.logger.warn('Plugin dependencies have changed. Updating "package.json".');
-        await writeFile({
-            filePath,
-            content: newPackageJsonContent
-        });
+        await writeFile(filePath, newPackageJsonContent);
     }
 }
 export default updateServerPackageJson;

package/dist/build/validateApp.js

@@ -15,19 +15,13 @@
 */ import { type } from '@lowdefy/helpers';
 async function validateApp({ components  }) {
     if (type.isNone(components.app)) {
-        components.app = {
-        };
+        components.app = {};
     }
     if (!type.isObject(components.app)) {
         throw new Error('lowdefy.app is not an object.');
     }
     if (type.isNone(components.app.html)) {
-        components.app.html = {
-        };
-    }
-    if (type.isNone(components.app.styles)) {
-        components.app.styles = {
-        };
+        components.app.html = {};
     }
     if (type.isNone(components.app.html.appendBody)) {
         components.app.html.appendBody = '';

package/dist/build/validateConfig.js

@@ -17,23 +17,27 @@ import { validate } from '@lowdefy/ajv';
 import lowdefySchema from '../lowdefySchema.js';
 async function validateConfig({ components  }) {
     if (type.isNone(components.config)) {
-        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 = {
-        };
+        components.config.auth = {};
     }
     if (type.isNone(components.config.auth.pages)) {
-        components.config.auth.pages = {
-        };
+        components.config.auth.pages = {};
     }
     if (type.isNone(components.config.auth.pages.roles)) {
-        components.config.auth.pages.roles = {
-        };
+        components.config.auth.pages.roles = {};
+    }
+    if (type.isNone(components.config.theme)) {
+        components.config.theme = {};
+    }
+    if (type.isString(components.config.basePath)) {
+        if (components.config.basePath[0] !== '/') {
+            throw Error('Base path must start with "/".');
+        }
     }
     validate({
         schema: lowdefySchema.definitions.authConfig,

package/dist/build/writeApp.js

@@ -13,10 +13,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ async function writeApp({ components , context  }) {
-    await context.writeBuildArtifact({
-        filePath: 'app.json',
-        content: JSON.stringify(components.app || {
-        }, null, 2)
-    });
+    await context.writeBuildArtifact('app.json', JSON.stringify(components.app || {}, null, 2));
 }
 export default writeApp;