lowdefy 4.0.0-alpha.1 → 4.0.0-alpha.7

package/dist/commands/build/build.js

@@ -12,29 +12,31 @@
   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 fse from 'fs-extra';
-import getFederatedModule from '../../utils/getFederatedModule';
+*/ import getServer from '../../utils/getServer.js';
+import installServer from './installServer.js';
+import runLowdefyBuild from './runLowdefyBuild.js';
+import runNextBuild from './runNextBuild.js';
 async function build({ context  }) {
-    const { default: buildScript  } = await getFederatedModule({
-        module: 'build',
-        packageName: '@lowdefy/build',
-        version: context.lowdefyVersion,
+    context.print.info('Starting build.');
+    await getServer({
+        context,
+        packageName: '@lowdefy/server'
+    });
+    await installServer({
         context
     });
-    context.print.log(`Cleaning block meta cache at "${path.resolve(context.cacheDirectory, './meta')}".`);
-    await fse.emptyDir(path.resolve(context.cacheDirectory, './meta'));
-    context.print.info('Starting build.');
-    await buildScript({
-        blocksServerUrl: context.options.blocksServerUrl,
-        buildDirectory: context.buildDirectory,
-        cacheDirectory: context.cacheDirectory,
-        configDirectory: context.baseDirectory,
-        logger: context.print,
-        refResolver: context.options.refResolver
+    await runLowdefyBuild({
+        context
+    });
+    await installServer({
+        context
+    });
+    await runNextBuild({
+        context
+    });
+    await context.sendTelemetry({
+        sendTypes: true
     });
-    await context.sendTelemetry();
-    context.print.log(`Build artifacts saved at ${context.buildDirectory}.`);
     context.print.succeed(`Build successful.`);
 }
 export default build;

package/dist/commands/build/installServer.js

@@ -0,0 +1,43 @@
+/*
+  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 { spawnProcess } from '@lowdefy/node-utils';
+const args = {
+    npm: [
+        'install',
+        '--legacy-peer-deps'
+    ],
+    yarn: [
+        'install'
+    ]
+};
+async function installServer({ context  }) {
+    context.print.spin(`Running ${context.packageManager} install.`);
+    try {
+        await spawnProcess({
+            logger: context.print,
+            command: context.packageManager,
+            args: args[context.packageManager],
+            processOptions: {
+                cwd: context.directories.server
+            },
+            silent: false
+        });
+    } catch (error) {
+        console.log(error);
+        throw new Error(`${context.packageManager} install failed.`);
+    }
+    context.print.log(`${context.packageManager} install successful.`);
+}
+export default installServer;

package/dist/commands/build/runLowdefyBuild.js

@@ -0,0 +1,43 @@
+/*
+  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 { spawnProcess } from '@lowdefy/node-utils';
+async function runLowdefyBuild({ context  }) {
+    context.print.log('Running Lowdefy build.');
+    try {
+        await spawnProcess({
+            logger: context.print,
+            command: context.packageManager,
+            args: [
+                'run',
+                'build:lowdefy'
+            ],
+            processOptions: {
+                cwd: context.directories.server,
+                env: {
+                    ...process.env,
+                    LOWDEFY_BUILD_REF_RESOLVER: context.options.refResolver,
+                    LOWDEFY_DIRECTORY_BUILD: context.directories.build,
+                    LOWDEFY_DIRECTORY_CONFIG: context.directories.config,
+                    LOWDEFY_DIRECTORY_SERVER: context.directories.server
+                }
+            },
+            silent: false
+        });
+    } catch (error) {
+        throw new Error('Lowdefy build failed.');
+    }
+    context.print.log('Lowdefy build successful.');
+}
+export default runLowdefyBuild;

package/dist/commands/build/runNextBuild.js

@@ -0,0 +1,36 @@
+/*
+  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 { spawnProcess } from '@lowdefy/node-utils';
+async function runNextBuild({ context  }) {
+    context.print.log('Running Next build.');
+    try {
+        await spawnProcess({
+            logger: context.print,
+            command: context.packageManager,
+            args: [
+                'run',
+                'build:next'
+            ],
+            processOptions: {
+                cwd: context.directories.server
+            },
+            silent: false
+        });
+    } catch (error) {
+        throw new Error('Next build failed.');
+    }
+    context.print.log('Next build successful.');
+}
+export default runNextBuild;

package/dist/commands/dev/dev.js

@@ -12,69 +12,21 @@
   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 opener from 'opener';
-import buildWatcher from './buildWatcher.js';
-import envWatcher from './envWatcher.js';
-import getBuild from './getBuild.js';
-import getExpress from './getExpress.js';
-import getGraphQL from './getGraphQL.js';
-import prepare from './prepare.js';
-import versionWatcher from './versionWatcher.js';
-async function initialBuild({ context  }) {
-    const build = await getBuild({
-        context
-    });
-    try {
-        await build();
-    // eslint-disable-next-line no-empty
-    } catch (error) {
-    }
-    return build;
-}
-async function serverSetup({ context  }) {
-    const gqlServer = await getGraphQL({
-        context
-    });
-    return getExpress({
-        context,
-        gqlServer
-    });
-}
+*/ import installServer from './installServer.js';
+import runDevServer from './runDevServer.js';
+import getServer from '../../utils/getServer.js';
 async function dev({ context  }) {
-    await prepare({
-        context
-    });
-    const initialBuildPromise = initialBuild({
-        context
-    });
-    const serverSetupPromise = serverSetup({
-        context
-    });
-    const [build, { expressApp , reloadFn  }] = await Promise.all([
-        initialBuildPromise,
-        serverSetupPromise, 
-    ]);
-    buildWatcher({
-        build,
+    context.print.info('Starting development server.');
+    await getServer({
         context,
-        reloadFn
+        packageName: '@lowdefy/server-dev'
     });
-    envWatcher({
+    await installServer({
         context
     });
-    versionWatcher({
+    context.sendTelemetry();
+    await runDevServer({
         context
     });
-    context.print.log('Starting Lowdefy development server.');
-    const port = expressApp.get('port');
-    expressApp.listen(port, function() {
-        context.print.info(`Development server listening on port ${port}`);
-    });
-    opener(`http://localhost:${port}`);
-    await context.sendTelemetry({
-        data: {
-            type: 'startup'
-        }
-    });
 }
 export default dev;

package/dist/commands/dev/installServer.js

@@ -0,0 +1,43 @@
+/*
+  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 { spawnProcess } from '@lowdefy/node-utils';
+const args = {
+    npm: [
+        'install',
+        '--legacy-peer-deps'
+    ],
+    yarn: [
+        'install'
+    ]
+};
+async function installServer({ context  }) {
+    context.print.spin(`Running ${context.packageManager} install.`);
+    try {
+        await spawnProcess({
+            logger: context.print,
+            command: context.packageManager,
+            args: args[context.packageManager],
+            processOptions: {
+                cwd: context.directories.dev
+            },
+            silent: false
+        });
+    } catch (error) {
+        console.log(error);
+        throw new Error(`${context.packageManager} install failed.`);
+    }
+    context.print.log(`${context.packageManager} install successful.`);
+}
+export default installServer;

package/dist/commands/dev/runDevServer.js

@@ -0,0 +1,39 @@
+/*
+  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 { spawnProcess } from '@lowdefy/node-utils';
+async function runDevServer({ context  }) {
+    await spawnProcess({
+        logger: context.print,
+        args: [
+            'run',
+            'start'
+        ],
+        command: context.packageManager,
+        processOptions: {
+            cwd: context.directories.dev,
+            env: {
+                ...process.env,
+                LOWDEFY_BUILD_REF_RESOLVER: context.options.refResolver,
+                LOWDEFY_DIRECTORY_CONFIG: context.directories.config,
+                LOWDEFY_PACKAGE_MANAGER: context.packageManager,
+                LOWDEFY_SERVER_DEV_WATCH: JSON.stringify(context.options.watch),
+                LOWDEFY_SERVER_DEV_WATCH_IGNORE: JSON.stringify(context.options.watchIgnore),
+                PORT: context.options.port
+            }
+        },
+        silent: false
+    });
+}
+export default runDevServer;

package/dist/commands/init/init.js

@@ -23,18 +23,12 @@ async function init({ context  }) {
         throw new Error('Cannot initialize a Lowdefy project, a "lowdefy.yaml" file already exists');
     }
     context.print.log(`Initializing Lowdefy project`);
-    await writeFile({
-        filePath: lowdefyFilePath,
-        content: lowdefyFile({
-            version: context.cliVersion
-        })
-    });
+    await writeFile(lowdefyFilePath, lowdefyFile({
+        version: context.cliVersion
+    }));
     context.print.log(`Created 'lowdefy.yaml'.`);
-    await writeFile({
-        filePath: path.resolve('./.gitignore'),
-        content: `.lowdefy/**
-.env`
-    });
+    await writeFile(path.resolve('./.gitignore'), `.lowdefy/**
+.env`);
     context.print.log(`Created '.gitignore'.`);
     await context.sendTelemetry();
     context.print.succeed(`Project initialized.`);

package/dist/commands/init/lowdefyFile.js

@@ -36,7 +36,7 @@ pages:
                   title: Welcome to your Lowdefy app
                   subTitle: We are excited to see what you are going to build
                   icon:
-                    name: HeartTwoTone
+                    name: AiTwoToneHeart
                     color: '#f00'
                 areas:
                   extra:

package/dist/commands/start/runStart.js

@@ -0,0 +1,36 @@
+/*
+  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 { spawnProcess } from '@lowdefy/node-utils';
+async function runStart({ context  }) {
+    context.print.spin(`Running "${context.packageManager} run start".`);
+    await spawnProcess({
+        logger: context.print,
+        args: [
+            'run',
+            'start'
+        ],
+        command: context.packageManager,
+        processOptions: {
+            cwd: context.directories.server,
+            env: {
+                ...process.env,
+                LOWDEFY_DIRECTORY_CONFIG: context.directories.config,
+                PORT: context.options.port
+            }
+        },
+        silent: false
+    });
+}
+export default runStart;

package/dist/{utils/checkChildProcessError.js → commands/start/start.js}

@@ -12,10 +12,15 @@
   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 checkChildProcessError({ context , processOutput , message  }) {
-    if (processOutput.status === 1) {
-        context.print.error(processOutput.stderr.toString('utf8'));
-        throw new Error(message);
-    }
+*/ import runStart from './runStart.js';
+// TODO: Handle "spawn yarn ENOENT" error if no built server exists.
+async function build({ context  }) {
+    context.print.info('Starting server.');
+    context.sendTelemetry({
+        sendTypes: true
+    });
+    await runStart({
+        context
+    });
 }
-export default checkChildProcessError;
+export default build;

package/dist/index.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 /*
   Copyright 2020-2021 Lowdefy, Inc
 
@@ -13,64 +14,30 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import { readFile } from '@lowdefy/node-utils';
-import program from 'commander';
-// import build from './commands/build/build.js';
-// import dev from './commands/dev/dev.js';
+import { Command } from 'commander';
+import build from './commands/build/build.js';
+import dev from './commands/dev/dev.js';
 import init from './commands/init/init.js';
+import start from './commands/start/start.js';
 import runCommand from './utils/runCommand.js';
 const packageJson = JSON.parse(await readFile(new URL('../package.json', import.meta.url).pathname));
-const { description , version  } = packageJson;
-program.name('lowdefy').description(description).version(version, '-v, --version');
-// program
-//   .command('build')
-//   .description('Build a Lowdefy deployment.')
-//   .usage(`[options]`)
-//   .option(
-//     '--base-directory <base-directory>',
-//     'Change base directory. Default is the current working directory.'
-//   )
-//   .option(
-//     '--blocks-server-url <blocks-server-url>',
-//     'The URL from where Lowdefy blocks will be served.'
-//   )
-//   .option('--disable-telemetry', 'Disable telemetry.')
-//   .option(
-//     '--output-directory <output-directory>',
-//     'Change the directory to which build artifacts are saved. Default is "<base-directory>/.lowdefy/build".'
-//   )
-//   .option(
-//     '--ref-resolver <ref-resolver-function-path>',
-//     'Path to a JavaScript file containing a _ref resolver function to be used as the app default _ref resolver.'
-//   )
-//   .action(runCommand(build));
-// program
-//   .command('dev')
-//   .description('Start a Lowdefy development server.')
-//   .usage(`[options]`)
-//   .option(
-//     '--base-directory <base-directory>',
-//     'Change base directory. Default is the current working directory.'
-//   )
-//   .option(
-//     '--blocks-server-url <blocks-server-url>',
-//     'The URL from where Lowdefy blocks will be served.'
-//   )
-//   .option('--disable-telemetry', 'Disable telemetry.')
-//   .option('--port <port>', 'Change the port the server is hosted at. Default is 3000.')
-//   .option(
-//     '--ref-resolver <ref-resolver-function-path>',
-//     'Path to a JavaScript file containing a _ref resolver function to be used as the app default _ref resolver.'
-//   )
-//   .option(
-//     '--watch <paths...>',
-//     'A list of paths to files or directories that should be watched for changes.'
-//   )
-//   .option(
-//     '--watch-ignore <paths...>',
-//     'A list of paths to files or directories that should be ignored by the file watcher. Globs are supported.'
-//   )
-//   .action(runCommand(dev));
+const { description , version: cliVersion  } = packageJson;
+const program = new Command();
+program.name('lowdefy').description(description).version(cliVersion, '-v, --version');
+program.command('build').description('Build a Lowdefy production app.').usage(`[options]`).option('--config-directory <config-directory>', 'Change config directory. Default is the current working directory.').option('--disable-telemetry', 'Disable telemetry.').option('--output-directory <output-directory>', 'Change the directory to which build artifacts are saved. Default is "<config-directory>/.lowdefy".').option('--package-manager <package-manager>', 'The package manager to use. Options are "npm" or "yarn".').option('--ref-resolver <ref-resolver-function-path>', 'Path to a JavaScript file containing a _ref resolver function to be used as the app default _ref resolver.').option('--server-directory <server-directory>', 'Change the server directory. Default is "<config-directory>/.lowdefy/server".').action(runCommand({
+    cliVersion,
+    handler: build
+}));
+program.command('dev').description('Start a Lowdefy development server.').usage(`[options]`).option('--config-directory <config-directory>', 'Change config directory. Default is the current working directory.').option('--disable-telemetry', 'Disable telemetry.').option('--package-manager <package-manager>', 'The package manager to use. Options are "npm" or "yarn".').option('--port <port>', 'Change the port the development server is hosted at. Default is 3000.').option('--ref-resolver <ref-resolver-function-path>', 'Path to a JavaScript file containing a _ref resolver function to be used as the app default _ref resolver.').option('--watch <paths...>', 'A list of paths to files or directories that should be watched for changes. Globs are supported. Specify each path to watch separated by spaces.').option('--watch-ignore <paths...>', 'A list of paths to files or directories that should be ignored by the file watcher. Globs are supported. Specify each path to watch separated by spaces.').option('--dev-directory <dev-directory>', 'Change the development server directory. Default is "<config-directory>/.lowdefy/dev".').action(runCommand({
+    cliVersion,
+    handler: dev
+}));
 program.command('init').description('Initialize a Lowdefy project.').usage(`[options]`).action(runCommand({
-    cliVersion: version
-})(init));
+    cliVersion,
+    handler: init
+}));
+program.command('start').description('Start a Lowdefy production app.').usage(`[options]`).option('--config-directory <config-directory>', 'Change config directory. Default is the current working directory.').option('--disable-telemetry', 'Disable telemetry.').option('--output-directory <output-directory>', 'Change the directory to which build artifacts are saved. Default is "<config-directory>/.lowdefy".').option('--package-manager <package-manager>', 'The package manager to use. Options are "npm" or "yarn".').option('--port <port>', 'Change the port the server is hosted at. Default is 3000.').option('--server-directory <server-directory>', 'Change the server directory. Default is "<config-directory>/.lowdefy/server".').action(runCommand({
+    cliVersion,
+    handler: start
+}));
 program.parse(process.argv);

package/dist/utils/BatchChanges.js

@@ -13,7 +13,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ let BatchChanges = class BatchChanges {
-    newChange() {
+    newChange(...args) {
+        this.args.push(args);
         this.delay = this.minDelay;
         this._startTimer();
     }
@@ -21,28 +22,40 @@
         if (this.timer) {
             clearTimeout(this.timer);
         }
-        this.timer = setTimeout(this._call, this.delay);
+        if (this.running) {
+            this.repeat = true;
+        } else {
+            this.timer = setTimeout(this._call, this.delay);
+        }
     }
     async _call() {
+        this.running = true;
         try {
-            await this.fn();
+            const args = this.args;
+            this.args = [];
+            await this.fn(args);
+            this.running = false;
+            if (this.repeat) {
+                this.repeat = false;
+                this._call();
+            }
         } catch (error) {
-            this.context.print.error(error.message, {
-                timestamp: true
-            });
+            this.running = false;
+            this.context.print.error(error.message);
             this.delay *= 2;
-            this.context.print.warn(`Retrying in ${this.delay / 1000}s.`, {
-                timestamp: true
-            });
+            this.context.print.warn(`Retrying in ${this.delay / 1000}s.`);
             this._startTimer();
         }
     }
     constructor({ fn , context , minDelay  }){
-        this.fn = fn;
+        this._call = this._call.bind(this);
+        this.args = [];
         this.context = context;
         this.delay = minDelay || 500;
+        this.fn = fn;
         this.minDelay = minDelay || 500;
-        this._call = this._call.bind(this);
+        this.repeat = false;
+        this.running = false;
     }
 };
 export default BatchChanges;

package/dist/utils/checkForUpdatedVersions.js

@@ -14,6 +14,14 @@
   limitations under the License.
 */ import axios from 'axios';
 async function checkForUpdatedVersions({ cliVersion , lowdefyVersion , print  }) {
+    if (isExperimentalVersion(cliVersion) || isExperimentalVersion(lowdefyVersion)) {
+        print.warn(`
+---------------------------------------------------
+  You are using an experimental version of Lowdefy.
+  Features may change at any time.
+---------------------------------------------------`);
+        return;
+    }
     const registryUrl = 'https://registry.npmjs.org/lowdefy';
     try {
         const packageInfo = await axios.get(registryUrl);
@@ -39,4 +47,7 @@ async function checkForUpdatedVersions({ cliVersion , lowdefyVersion , print  })
         print.warn('Failed to check for latest Lowdefy version.');
     }
 }
+function isExperimentalVersion(version) {
+    return version.includes('alpha') || version.includes('beta') || version.includes('rc');
+}
 export default checkForUpdatedVersions;

package/dist/utils/{print.js → createPrint.js}

@@ -60,6 +60,7 @@ function createBasicPrint() {
 // Memoise print so that error handler can get the same spinner object
 let print;
 function createPrint() {
+    // TODO: Add debug
     if (print) return print;
     if (process.env.CI === 'true') {
         print = createBasicPrint();

package/dist/utils/errorHandler.js

@@ -13,9 +13,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import axios from 'axios';
-import createPrint from './print.js';
-async function logError({ error , context ={
-}  }) {
+import createPrint from './createPrint.js';
+async function logError({ error , context ={}  }) {
     try {
         await axios.request({
             method: 'post',

package/dist/utils/fetchNpmTarball.js

@@ -49,7 +49,8 @@ async function fetchNpmTarball({ packageName , version , directory  }) {
     await decompress(tarball.data, directory, {
         plugins: [
             decompressTargz()
-        ]
+        ],
+        strip: 1
     });
 }
 export default fetchNpmTarball;