lowdefy 4.0.0-alpha.6 → 4.0.0-alpha.7

package/dist/commands/build/build.js

@@ -12,14 +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.
-*/ import getServer from './getServer.js';
+*/ 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  }) {
     context.print.info('Starting build.');
     await getServer({
-        context
+        context,
+        packageName: '@lowdefy/server'
     });
     await installServer({
         context

package/dist/commands/build/runLowdefyBuild.js

@@ -27,8 +27,9 @@ async function runLowdefyBuild({ context  }) {
                 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.base,
+                    LOWDEFY_DIRECTORY_CONFIG: context.directories.config,
                     LOWDEFY_DIRECTORY_SERVER: context.directories.server
                 }
             },

package/dist/commands/dev/dev.js

@@ -12,13 +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.
-*/ import getServer from './getServer.js';
-import installServer from './installServer.js';
+*/ import installServer from './installServer.js';
 import runDevServer from './runDevServer.js';
+import getServer from '../../utils/getServer.js';
 async function dev({ context  }) {
     context.print.info('Starting development server.');
     await getServer({
-        context
+        context,
+        packageName: '@lowdefy/server-dev'
     });
     await installServer({
         context

package/dist/commands/dev/installServer.js

@@ -30,7 +30,7 @@ async function installServer({ context  }) {
             command: context.packageManager,
             args: args[context.packageManager],
             processOptions: {
-                cwd: context.directories.devServer
+                cwd: context.directories.dev
             },
             silent: false
         });

package/dist/commands/dev/runDevServer.js

@@ -22,10 +22,15 @@ async function runDevServer({ context  }) {
         ],
         command: context.packageManager,
         processOptions: {
-            cwd: context.directories.devServer,
+            cwd: context.directories.dev,
             env: {
                 ...process.env,
-                LOWDEFY_DIRECTORY_CONFIG: context.directories.base
+                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

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

@@ -23,7 +23,12 @@ async function runStart({ context  }) {
         ],
         command: context.packageManager,
         processOptions: {
-            cwd: context.directories.server
+            cwd: context.directories.server,
+            env: {
+                ...process.env,
+                LOWDEFY_DIRECTORY_CONFIG: context.directories.config,
+                PORT: context.options.port
+            }
         },
         silent: false
     });

package/dist/index.js

@@ -14,29 +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 { 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 production app.').usage(`[options]`).option('--base-directory <base-directory>', 'Change base 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 "<base-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.').action(runCommand({
-    cliVersion: version
-})(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('--disable-telemetry', 'Disable telemetry.').option('--package-manager <package-manager>', 'The package manager to use. Options are "npm" or "yarn".')// TODO:
-.option('--port <port>', 'Change the port the server is hosted at. Default is 3000.')// TODO:
-.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.')// TODO:
-.option('--watch <paths...>', 'A list of paths to files or directories that should be watched for changes.')// TODO:
-.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({
-    cliVersion: version
-})(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));
-program.command('start').description('Start a Lowdefy production app.').usage(`[options]`).option('--base-directory <base-directory>', 'Change base 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 "<base-directory>/.lowdefy".').option('--package-manager <package-manager>', 'The package manager to use. Options are "npm" or "yarn".').action(runCommand({
-    cliVersion: version
-})(start));
+    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/errorHandler.js

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

package/dist/utils/getCliJson.js

@@ -15,17 +15,14 @@
 */ import path from 'path';
 import { readFile, writeFile } from '@lowdefy/node-utils';
 import { v4 as uuid } from 'uuid';
-async function getCliJson({ baseDirectory  }) {
-    const filePath = path.resolve(baseDirectory, './.lowdefy/cli.json');
+async function getCliJson({ configDirectory  }) {
+    const filePath = path.resolve(configDirectory, './.lowdefy/cli.json');
     const cliJson = await readFile(filePath);
     if (!cliJson) {
         const appId = uuid();
-        await writeFile({
-            filePath,
-            content: JSON.stringify({
-                appId
-            }, null, 2)
-        });
+        await writeFile(filePath, JSON.stringify({
+            appId
+        }, null, 2));
         return {
             appId
         };

package/dist/utils/getDirectories.js

@@ -13,19 +13,19 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 */ import path from 'path';
-function getDirectories({ baseDirectory , options  }) {
+function getDirectories({ configDirectory , options  }) {
     let dotLowdefy;
     if (options.outputDirectory) {
         dotLowdefy = path.resolve(options.outputDirectory);
     } else {
-        dotLowdefy = path.resolve(baseDirectory, '.lowdefy');
+        dotLowdefy = path.resolve(configDirectory, '.lowdefy');
     }
     return {
-        base: baseDirectory,
+        config: configDirectory,
         build: path.join(dotLowdefy, 'server', 'build'),
         dotLowdefy,
-        server: path.join(dotLowdefy, 'server'),
-        devServer: path.join(dotLowdefy, 'dev')
+        server: options.serverDirectory ? path.resolve(options.serverDirectory) : path.join(dotLowdefy, 'server'),
+        dev: options.devDirectory ? path.resolve(options.devDirectory) : path.join(dotLowdefy, 'dev')
     };
 }
 export default getDirectories;

package/dist/utils/getLowdefyYaml.js

@@ -15,17 +15,17 @@
 */ import path from 'path';
 import { get, type } from '@lowdefy/helpers';
 import { readFile } from '@lowdefy/node-utils';
-import YAML from 'js-yaml';
-async function getLowdefyYaml({ baseDirectory , command  }) {
-    let lowdefyYaml = await readFile(path.resolve(baseDirectory, 'lowdefy.yaml'));
+import YAML from 'yaml';
+async function getLowdefyYaml({ configDirectory , command  }) {
+    let lowdefyYaml = await readFile(path.resolve(configDirectory, 'lowdefy.yaml'));
     if (!lowdefyYaml) {
-        lowdefyYaml = await readFile(path.resolve(baseDirectory, 'lowdefy.yml'));
+        lowdefyYaml = await readFile(path.resolve(configDirectory, 'lowdefy.yml'));
     }
     if (!lowdefyYaml) {
         if (![
             'init'
         ].includes(command)) {
-            throw new Error(`Could not find "lowdefy.yaml" file in specified base directory ${baseDirectory}.`);
+            throw new Error(`Could not find "lowdefy.yaml" file in specified config directory ${configDirectory}.`);
         }
         return {
             cliConfig: {}
@@ -33,7 +33,7 @@ async function getLowdefyYaml({ baseDirectory , command  }) {
     }
     let lowdefy;
     try {
-        lowdefy = YAML.load(lowdefyYaml);
+        lowdefy = YAML.parse(lowdefyYaml);
     } catch (error) {
         throw new Error(`Could not parse "lowdefy.yaml" file. Received error ${error.message}.`);
     }

package/dist/{commands/build → utils}/getServer.js

@@ -15,8 +15,12 @@
 */ import fs from 'fs';
 import path from 'path';
 import { cleanDirectory, readFile } from '@lowdefy/node-utils';
-import fetchNpmTarball from '../../utils/fetchNpmTarball.js';
-async function getServer({ context  }) {
+import fetchNpmTarball from './fetchNpmTarball.js';
+async function getServer({ context , packageName  }) {
+    if (context.lowdefyVersion === 'local') {
+        context.print.warn(`Running local ${packageName}.`);
+        return;
+    }
     let fetchServer = false;
     const serverExists = fs.existsSync(path.join(context.directories.server, 'package.json'));
     if (!serverExists) fetchServer = true;
@@ -31,12 +35,11 @@ async function getServer({ context  }) {
     if (fetchServer) {
         context.print.spin('Fetching @lowdefy/server from npm.');
         await fetchNpmTarball({
-            packageName: '@lowdefy/server',
+            packageName,
             version: context.lowdefyVersion,
             directory: context.directories.server
         });
         context.print.log('Fetched @lowdefy/server from npm.');
-        return;
     }
 }
 export default getServer;

package/dist/utils/runCommand.js

@@ -14,29 +14,28 @@
   limitations under the License.
 */ import errorHandler from './errorHandler.js';
 import startUp from './startUp.js';
-const runCommand = ({ cliVersion  })=>(fn)=>{
-        async function run(options, command) {
-            const context = {
-                cliVersion
-            };
-            try {
-                await startUp({
-                    context,
-                    options,
-                    command
-                });
-                const res = await fn({
-                    context
-                });
-                return res;
-            } catch (error) {
-                await errorHandler({
-                    context,
-                    error
-                });
-            }
+const runCommand = ({ cliVersion , handler  })=>{
+    async function run(options, command) {
+        const context = {
+            cliVersion
+        };
+        try {
+            await startUp({
+                context,
+                options,
+                command
+            });
+            const res = await handler({
+                context
+            });
+            return res;
+        } catch (error) {
+            await errorHandler({
+                context,
+                error
+            });
         }
-        return run;
     }
-;
+    return run;
+};
 export default runCommand;

package/dist/utils/startUp.js

@@ -21,12 +21,12 @@ import getLowdefyYaml from './getLowdefyYaml.js';
 import getOptions from './getOptions.js';
 import getPackageManager from './getPackageManager.js';
 import getSendTelemetry from './getSendTelemetry.js';
-import createPrint from './print.js';
+import createPrint from './createPrint.js';
 async function startUp({ context , options ={} , command  }) {
     context.command = command.name();
     context.commandLineOptions = options;
     context.print = createPrint();
-    context.baseDirectory = path.resolve(options.baseDirectory || process.cwd());
+    context.configDirectory = path.resolve(options.configDirectory || process.cwd());
     const { cliConfig , lowdefyVersion  } = await getLowdefyYaml(context);
     context.cliConfig = cliConfig;
     context.lowdefyVersion = lowdefyVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowdefy",
-  "version": "4.0.0-alpha.6",
+  "version": "4.0.0-alpha.7",
   "license": "Apache-2.0",
   "description": "Lowdefy CLI",
   "homepage": "https://lowdefy.com",
@@ -37,28 +37,29 @@
     "start": "yarn node ./dist/index.js",
     "prepare": "yarn build",
     "swc": "swc src --out-dir dist --config-file ../../.swcrc --delete-dir-on-start",
-    "test": "FORCE_COLOR=3 jest --coverage"
+    "test": "FORCE_COLOR=3 yarn node --experimental-vm-modules $(yarn bin jest)"
   },
   "dependencies": {
-    "@lowdefy/helpers": "4.0.0-alpha.6",
-    "@lowdefy/node-utils": "4.0.0-alpha.6",
-    "axios": "0.24.0",
+    "@lowdefy/helpers": "4.0.0-alpha.7",
+    "@lowdefy/node-utils": "4.0.0-alpha.7",
+    "axios": "0.25.0",
     "chalk": "4.1.2",
-    "commander": "8.3.0",
+    "commander": "9.0.0",
     "decompress": "4.2.1",
     "decompress-targz": "4.1.1",
-    "js-yaml": "4.1.0",
-    "ora": "6.0.1",
-    "uuid": "8.3.2"
+    "ora": "5.4.1",
+    "uuid": "8.3.2",
+    "yaml": "2.0.0-10"
   },
   "devDependencies": {
+    "@jest/globals": "27.5.1",
     "@swc/cli": "0.1.55",
-    "@swc/core": "1.2.130",
+    "@swc/core": "1.2.135",
     "@swc/jest": "0.2.17",
-    "jest": "27.3.1"
+    "jest": "27.5.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2530e31af795b6a3c75ac8f72c8dbe0ab5d1251b"
+  "gitHead": "52ec14639d00de910cf9b8ab25bf933ca891cff5"
 }

package/dist/commands/dev/getServer.js

@@ -1,42 +0,0 @@
-/*
-  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 fs from 'fs';
-import path from 'path';
-import { cleanDirectory, readFile } from '@lowdefy/node-utils';
-import fetchNpmTarball from '../../utils/fetchNpmTarball.js';
-async function getServer({ context  }) {
-    let fetchServer = false;
-    const serverExists = fs.existsSync(path.join(context.directories.devServer, 'package.json'));
-    if (!serverExists) fetchServer = true;
-    if (serverExists) {
-        const serverPackageConfig = JSON.parse(await readFile(path.join(context.directories.devServer, 'package.json')));
-        if (serverPackageConfig.version !== context.lowdefyVersion) {
-            fetchServer = true;
-            context.print.warn(`Removing @lowdefy/server-dev with version ${serverPackageConfig.version}`);
-            await cleanDirectory(context.directories.devServer);
-        }
-    }
-    if (fetchServer) {
-        context.print.spin('Fetching @lowdefy/server-dev from npm.');
-        await fetchNpmTarball({
-            packageName: '@lowdefy/server-dev',
-            version: context.lowdefyVersion,
-            directory: context.directories.devServer
-        });
-        context.print.log('Fetched @lowdefy/server-dev from npm.');
-        return;
-    }
-}
-export default getServer;