@lowdefy/build 4.0.0-alpha.6 → 4.0.0-alpha.7

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/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/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/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/runTransformer.js

@@ -19,7 +19,11 @@ async function runTransformer({ context , parsedFile , refDef  }) {
             context,
             filePath: refDef.transformer
         });
-        return transformerFn(parsedFile, refDef.vars);
+        try {
+            return transformerFn(parsedFile, refDef.vars);
+        } catch (error) {
+            throw Error(`Error calling transformer "${refDef.transformer}" from "${refDef.path}": ${error.message}`);
+        }
     }
     return parsedFile;
 }

package/dist/build/buildTypes.js

@@ -12,10 +12,14 @@
   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] = {
@@ -27,6 +31,9 @@
 }
 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: {},
@@ -37,41 +44,43 @@ function buildTypes({ components , context  }) {
             server: {}
         }
     };
-    // buildTypeClass({
-    //   counter: typeCounters.actions,
-    //   definitions: context.types.actions,
-    //   store: components.types.actions,
-    //   typeClass: 'Action',
-    // });
-    buildTypeClass({
+    buildTypeClass(context, {
+        counter: typeCounters.actions,
+        definitions: context.types.actions,
+        store: components.types.actions,
+        typeClass: 'Action'
+    });
+    buildTypeClass(context, {
         counter: typeCounters.blocks,
         definitions: context.types.blocks,
         store: components.types.blocks,
         typeClass: 'Block'
     });
-    buildTypeClass({
+    buildTypeClass(context, {
         counter: typeCounters.connections,
         definitions: context.types.connections,
         store: components.types.connections,
         typeClass: 'Connection'
     });
-    buildTypeClass({
+    buildTypeClass(context, {
         counter: typeCounters.requests,
         definitions: context.types.requests,
         store: components.types.requests,
         typeClass: 'Request'
     });
-    buildTypeClass({
+    buildTypeClass(context, {
         counter: typeCounters.operators.client,
         definitions: context.types.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,
         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

@@ -40,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/validateConfig.js

@@ -34,6 +34,11 @@ async function validateConfig({ components  }) {
     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,
         data: components.config.auth

package/dist/build/writeApp.js

@@ -13,9 +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;

package/dist/build/writeConfig.js

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

package/dist/build/writeConnections.js

@@ -19,10 +19,7 @@ async function writeConnections({ components , context  }) {
         throw new Error(`Connections is not an array.`);
     }
     const writePromises = components.connections.map(async (connection)=>{
-        await context.writeBuildArtifact({
-            filePath: `connections/${connection.connectionId}.json`,
-            content: JSON.stringify(connection, null, 2)
-        });
+        await context.writeBuildArtifact(`connections/${connection.connectionId}.json`, JSON.stringify(connection, null, 2));
     });
     return Promise.all(writePromises);
 }

package/dist/build/writeGlobal.js

@@ -20,9 +20,6 @@ async function writeGlobal({ components , context  }) {
     if (!type.isObject(components.global)) {
         throw new Error('Global is not an object.');
     }
-    await context.writeBuildArtifact({
-        filePath: 'global.json',
-        content: JSON.stringify(components.global, null, 2)
-    });
+    await context.writeBuildArtifact('global.json', JSON.stringify(components.global, null, 2));
 }
 export default writeGlobal;

package/dist/build/writeMenus.js

@@ -17,9 +17,6 @@ async function writeMenus({ components , context  }) {
     if (!type.isArray(components.menus)) {
         throw new Error('Menus is not an array.');
     }
-    await context.writeBuildArtifact({
-        filePath: 'menus.json',
-        content: JSON.stringify(components.menus, null, 2)
-    });
+    await context.writeBuildArtifact('menus.json', JSON.stringify(components.menus, null, 2));
 }
 export default writeMenus;

package/dist/build/writePages.js

@@ -12,21 +12,10 @@
   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 { type } from '@lowdefy/helpers';
-async function writePage({ page , context  }) {
-    if (!type.isObject(page)) {
-        throw new Error(`Page is not an object. Received ${JSON.stringify(page)}`);
-    }
-    await context.writeBuildArtifact({
-        filePath: `pages/${page.pageId}/${page.pageId}.json`,
-        content: JSON.stringify(page, null, 2)
-    });
+*/ async function writePage({ page , context  }) {
+    await context.writeBuildArtifact(`pages/${page.pageId}/${page.pageId}.json`, JSON.stringify(page, null, 2));
 }
 async function writePages({ components , context  }) {
-    if (type.isNone(components.pages)) return;
-    if (!type.isArray(components.pages)) {
-        throw new Error(`Pages is not an array.`);
-    }
     const writePromises = components.pages.map((page)=>writePage({
             page,
             context

package/dist/build/writePluginImports/writeActionImports.js

@@ -0,0 +1,22 @@
+/*
+  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 generateImportFile from './generateImportFile.js';
+async function writeActionImports({ components , context  }) {
+    await context.writeBuildArtifact('plugins/actions.js', generateImportFile({
+        types: components.types.actions,
+        importPath: 'actions'
+    }));
+}
+export default writeActionImports;

package/dist/build/writePluginImports/writeBlockImports.js

@@ -14,12 +14,9 @@
   limitations under the License.
 */ import generateImportFile from './generateImportFile.js';
 async function writeBlockImports({ components , context  }) {
-    await context.writeBuildArtifact({
-        filePath: 'plugins/blocks.js',
-        content: generateImportFile({
-            types: components.types.blocks,
-            importPath: 'blocks'
-        })
-    });
+    await context.writeBuildArtifact('plugins/blocks.js', generateImportFile({
+        types: components.types.blocks,
+        importPath: 'blocks'
+    }));
 }
 export default writeBlockImports;

package/dist/build/writePluginImports/writeConnectionImports.js

@@ -14,12 +14,9 @@
   limitations under the License.
 */ import generateImportFile from './generateImportFile.js';
 async function writeConnectionImports({ components , context  }) {
-    await context.writeBuildArtifact({
-        filePath: 'plugins/connections.js',
-        content: generateImportFile({
-            types: components.types.connections,
-            importPath: 'connections'
-        })
-    });
+    await context.writeBuildArtifact('plugins/connections.js', generateImportFile({
+        types: components.types.connections,
+        importPath: 'connections'
+    }));
 }
 export default writeConnectionImports;

package/dist/build/writePluginImports/writeIconImports.js

@@ -24,11 +24,8 @@ export default {
 };`;
 async function writeIconImports({ components , context  }) {
     const templateFn = nunjucksFunction(template);
-    await context.writeBuildArtifact({
-        filePath: 'plugins/icons.js',
-        content: templateFn({
-            packages: components.icons
-        })
-    });
+    await context.writeBuildArtifact('plugins/icons.js', templateFn({
+        packages: components.icons
+    }));
 }
 export default writeIconImports;

package/dist/build/writePluginImports/writeOperatorImports.js

@@ -14,20 +14,13 @@
   limitations under the License.
 */ import generateImportFile from './generateImportFile.js';
 async function writeOperatorImports({ components , context  }) {
-    // TODO: import _not and _type for validation.
-    await context.writeBuildArtifact({
-        filePath: 'plugins/operatorsClient.js',
-        content: generateImportFile({
-            types: components.types.operators.client,
-            importPath: 'operators/client'
-        })
-    });
-    await context.writeBuildArtifact({
-        filePath: 'plugins/operatorsServer.js',
-        content: generateImportFile({
-            types: components.types.operators.server,
-            importPath: 'operators/server'
-        })
-    });
+    await context.writeBuildArtifact('plugins/operatorsClient.js', generateImportFile({
+        types: components.types.operators.client,
+        importPath: 'operators/client'
+    }));
+    await context.writeBuildArtifact('plugins/operatorsServer.js', generateImportFile({
+        types: components.types.operators.server,
+        importPath: 'operators/server'
+    }));
 }
 export default writeOperatorImports;

package/dist/build/writePluginImports/writeStyleImports.js

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

package/dist/build/writeRequests.js

@@ -12,13 +12,9 @@
   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 { type } from '@lowdefy/helpers';
-async function writeRequestsOnPage({ page , context  }) {
+*/ async function writeRequestsOnPage({ page , context  }) {
     return Promise.all(page.requests.map(async (request)=>{
-        await context.writeBuildArtifact({
-            filePath: `pages/${page.pageId}/requests/${request.requestId}.json`,
-            content: JSON.stringify(request, null, 2)
-        });
+        await context.writeBuildArtifact(`pages/${page.pageId}/requests/${request.requestId}.json`, JSON.stringify(request, null, 2));
         delete request.properties;
         delete request.type;
         delete request.connectionId;
@@ -26,7 +22,6 @@ async function writeRequestsOnPage({ page , context  }) {
     }));
 }
 async function writeRequests({ components , context  }) {
-    if (type.isNone(components.pages)) return;
     const writePromises = components.pages.map((page)=>writeRequestsOnPage({
             page,
             context

package/dist/build/writeTypes.js

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