lincd-cli 0.2.79 → 0.2.81

package/lib/cli-methods.js

@@ -1,18 +1,9 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.register = exports.createPackage = exports.startServer = exports.depCheck = exports.depCheckStaged = exports.checkImports = exports.createComponent = exports.createSetComponent = exports.createShape = exports.setNameVariables = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.warn = exports.createApp = void 0;
+exports.executeCommandForPackage = exports.addCapacitor = exports.addLinesToFile = exports.executeCommandForEachPackage = exports.buildUpdated = exports.publishPackage = exports.publishUpdated = exports.buildPackage = exports.register = exports.createPackage = exports.buildApp = exports.startServer = exports.ensureEnvironmentLoaded = exports.depCheck = exports.depCheckStaged = exports.checkImports = exports.createComponent = exports.createSetComponent = exports.createShape = exports.setNameVariables = exports.createOntology = exports.getLincdPackages = exports.buildAll = exports.developPackage = exports.warn = exports.createApp = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const depcheck_1 = __importDefault(require("depcheck"));
@@ -21,12 +12,14 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils");
 const fs_1 = require("fs");
+const find_nearest_package_json_1 = require("find-nearest-package-json");
+// const config = require('lincd-server/site.webpack.config');
 var glob = require('glob');
 var variables = {};
 var open = require('open');
 var stagedGitFiles = require('staged-git-files');
-const find_nearest_package_json_1 = require("find-nearest-package-json");
-const createApp = (name, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
+const webpack = require('webpack');
+const createApp = async (name, basePath = process.cwd()) => {
     if (!name) {
         console.warn('Please provide a name as the first argument');
     }
@@ -46,16 +39,16 @@ const createApp = (name, basePath = process.cwd()) => __awaiter(void 0, void 0,
     // fs.copySync(path.join(__dirname, '..', 'defaults', 'app'), targetFolder);
     log("Creating new LINCD application '" + name + "'");
     //replace variables in some copied files
-    yield replaceVariablesInFolder(targetFolder);
-    let hasYarn = yield hasYarnInstalled();
+    await replaceVariablesInFolder(targetFolder);
+    let hasYarn = await hasYarnInstalled();
     let installCommand = hasYarn
         ? 'export NODE_OPTIONS="--no-network-family-autoselection" && yarn install'
         : 'npm install';
-    yield (0, utils_1.execp)(`cd ${hyphenName} && ${installCommand}`, true).catch((err) => {
+    await (0, utils_1.execp)(`cd ${hyphenName} && ${installCommand}`, true).catch((err) => {
         console.warn('Could not install dependencies or start application');
     });
     log(`Your LINCD App is ready at ${chalk_1.default.blueBright(targetFolder)}`, `To start, run\n${chalk_1.default.blueBright(`cd ${hyphenName}`)} and then ${chalk_1.default.blueBright((hasYarn ? 'yarn' : 'npm') + ' start')}`);
-});
+};
 exports.createApp = createApp;
 function logHelp() {
     (0, utils_1.execp)('yarn exec lincd help');
@@ -185,7 +178,7 @@ function runOnPackagesGroupedByDependencies(lincdPackages, onBuildStack, onStack
     };
     let done = new Set();
     let results = [];
-    let runStack = (stack) => __awaiter(this, void 0, void 0, function* () {
+    let runStack = async (stack) => {
         let runFunction = onBuildStack(stack, dependencies);
         let stackPromise;
         if (sync) {
@@ -204,7 +197,7 @@ function runOnPackagesGroupedByDependencies(lincdPackages, onBuildStack, onStack
             }));
         }
         //wait till stack is completed
-        let stackResults = yield stackPromise;
+        let stackResults = await stackPromise;
         results = results.concat(stackResults);
         //clear stack for next round
         stack = [];
@@ -281,7 +274,7 @@ function runOnPackagesGroupedByDependencies(lincdPackages, onBuildStack, onStack
         else {
             onStackEnd(dependencies, results.filter(Boolean));
         }
-    });
+    };
     //starts the process
     runStack(startStack);
 }
@@ -347,7 +340,7 @@ function buildAll(options) {
             // log(stack);
         }
         (0, utils_1.debugInfo)('Now building: ' + chalk_1.default.blue(packageGroup.map((i) => i.packageName)));
-        return (pkg) => __awaiter(this, void 0, void 0, function* () {
+        return async (pkg) => {
             let command;
             let skipping = false;
             //if we're skipping builds until a certain package
@@ -409,7 +402,7 @@ function buildAll(options) {
                 }
                 return res;
             });
-        });
+        };
     }, (dependencies) => {
         //if no more packages to build but we never started building...
         if (!building) {
@@ -507,8 +500,8 @@ function setVariable(name, replacement) {
     name = name.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
     variables[name] = replacement;
 }
-var replaceVariablesInFile = (filePath) => __awaiter(void 0, void 0, void 0, function* () {
-    var fileContent = yield fs_extra_1.default.readFile(filePath, 'utf8').catch((err) => {
+var replaceVariablesInFile = async (filePath) => {
+    var fileContent = await fs_extra_1.default.readFile(filePath, 'utf8').catch((err) => {
         console.warn(chalk_1.default.red('Could not read file ' + filePath));
     });
     if (fileContent) {
@@ -518,7 +511,7 @@ var replaceVariablesInFile = (filePath) => __awaiter(void 0, void 0, void 0, fun
     else {
         return Promise.resolve();
     }
-});
+};
 var replaceCurlyVariables = function (string) {
     // var reg = new RegExp('\\$\\{'+key+'\\}','g');
     for (var key in variables) {
@@ -534,7 +527,7 @@ const camelCase = (str) => {
     }
     return str;
 };
-const createOntology = (prefix, uriBase, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
+const createOntology = async (prefix, uriBase, basePath = process.cwd()) => {
     if (!prefix) {
         console.warn('Please provide a suggested prefix as the first argument');
         return;
@@ -555,7 +548,7 @@ const createOntology = (prefix, uriBase, basePath = process.cwd()) => __awaiter(
     let targetDataFile2 = path_1.default.join(targetFolder, '..', 'data', hyphenName + '.json.d.ts');
     fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'package', 'src', 'data', 'example-ontology.json'), targetDataFile);
     fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'package', 'src', 'data', 'example-ontology.json.d.ts'), targetDataFile2);
-    yield replaceVariablesInFiles(targetFile, targetDataFile, targetDataFile2);
+    await replaceVariablesInFiles(targetFile, targetDataFile, targetDataFile2);
     log(`Prepared a new ontology data files in ${chalk_1.default.magenta(targetDataFile.replace(basePath, ''))}`, `And an ontology accessor file in ${chalk_1.default.magenta(targetFile.replace(basePath, ''))}`);
     //if this is not a lincd app (but a lincd package instead)
     if (!sourceFolder.includes('frontend')) {
@@ -563,7 +556,7 @@ const createOntology = (prefix, uriBase, basePath = process.cwd()) => __awaiter(
         let indexPath = addLineToIndex(`import './ontologies/${hyphenName}';`, 'ontologies');
         log(`Added an import of this file from ${chalk_1.default.magenta(indexPath)}`);
     }
-});
+};
 exports.createOntology = createOntology;
 const addLineToIndex = function (line, insertMatchString) {
     //import ontology in index
@@ -615,14 +608,12 @@ const replaceVariablesInFolder = function (folder) {
 const replaceVariablesInFilesWithRoot = function (root, ...files) {
     return replaceVariablesInFiles(...files.map((f) => path_1.default.join(root, f)));
 };
-const hasYarnInstalled = function () {
-    return __awaiter(this, void 0, void 0, function* () {
-        let version = (yield (0, utils_1.execPromise)('yarn --version').catch((err) => {
-            console.log('yarn probably not working');
-            return '';
-        }));
-        return version.toString().match(/[0-9]+/);
-    });
+const hasYarnInstalled = async function () {
+    let version = (await (0, utils_1.execPromise)('yarn --version').catch((err) => {
+        console.log('yarn probably not working');
+        return '';
+    }));
+    return version.toString().match(/[0-9]+/);
 };
 const ensureFolderExists = function (...folders) {
     let target;
@@ -674,7 +665,7 @@ function getSourceFolder(basePath = process.cwd()) {
         return path_1.default.join(basePath, 'src');
     }
 }
-const createShape = (name, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
+const createShape = async (name, basePath = process.cwd()) => {
     let sourceFolder = getSourceFolder(basePath);
     let targetFolder = ensureFolderExists(sourceFolder, 'shapes');
     let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
@@ -683,7 +674,7 @@ const createShape = (name, basePath = process.cwd()) => __awaiter(void 0, void 0
     let targetFile = path_1.default.join(targetFolder, hyphenName + '.ts');
     fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'shape.ts'), targetFile);
     //replace variables in some of the copied files
-    yield replaceVariablesInFiles(targetFile);
+    await replaceVariablesInFiles(targetFile);
     log(`Created a new shape class template in ${chalk_1.default.magenta(targetFile.replace(basePath, ''))}`);
     //if this is NOT a lincd app (but a lincd package)
     let indexPath;
@@ -691,9 +682,9 @@ const createShape = (name, basePath = process.cwd()) => __awaiter(void 0, void 0
         indexPath = addLineToIndex(`import './shapes/${hyphenName}';`, 'shapes');
         log(`Added an import of this file from ${chalk_1.default.magenta(indexPath)}`);
     }
-});
+};
 exports.createShape = createShape;
-const createSetComponent = (name, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
+const createSetComponent = async (name, basePath = process.cwd()) => {
     let targetFolder = ensureFolderExists(basePath, 'src', 'components');
     let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
     //copy default shape file
@@ -703,12 +694,12 @@ const createSetComponent = (name, basePath = process.cwd()) => __awaiter(void 0,
     let targetFile2 = path_1.default.join(targetFolder, hyphenName + '.scss');
     fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'component.scss'), targetFile2);
     //replace variables in some of the copied files
-    yield replaceVariablesInFiles(targetFile, targetFile2);
+    await replaceVariablesInFiles(targetFile, targetFile2);
     let indexPath = addLineToIndex(`import './components/${hyphenName}';`, 'components');
     log(`Created a new set component in ${chalk_1.default.magenta(targetFile.replace(basePath, ''))}`, `Created a new stylesheet in ${chalk_1.default.magenta(targetFile2.replace(basePath, ''))}`, `Added an import of this file from ${chalk_1.default.magenta(indexPath)}`);
-});
+};
 exports.createSetComponent = createSetComponent;
-const createComponent = (name, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
+const createComponent = async (name, basePath = process.cwd()) => {
     let sourceFolder = getSourceFolder(basePath);
     let targetFolder = ensureFolderExists(sourceFolder, 'components');
     let { hyphenName, camelCaseName, underscoreName } = (0, exports.setNameVariables)(name);
@@ -719,7 +710,7 @@ const createComponent = (name, basePath = process.cwd()) => __awaiter(void 0, vo
     let targetFile2 = path_1.default.join(targetFolder, hyphenName + '.scss');
     fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'component.scss'), targetFile2);
     //replace variables in some of the copied files
-    yield replaceVariablesInFiles(targetFile, targetFile2);
+    await replaceVariablesInFiles(targetFile, targetFile2);
     log(`Created a new component template in ${chalk_1.default.magenta(targetFile.replace(basePath, ''))}`, `Created component stylesheet template in ${chalk_1.default.magenta(targetFile2.replace(basePath, ''))}`);
     //if this is not a lincd app (but a lincd package instead)
     if (!sourceFolder.includes('frontend')) {
@@ -727,13 +718,13 @@ const createComponent = (name, basePath = process.cwd()) => __awaiter(void 0, vo
         let indexPath = addLineToIndex(`import './components/${hyphenName}';`, 'components');
         log(`Added an import of this file from ${chalk_1.default.magenta(indexPath)}`);
     }
-});
+};
 exports.createComponent = createComponent;
 //read the source of all ts/tsx files in the src folder
 //if there is an import that imports a lincd package with /src/ in it, then warn
 //if there is an import that imports outside of the src folder, then warn
-const checkImports = (sourceFolder = getSourceFolder(), depth = 0, // Used to check if the import is outside of the src folder
-invalidImports = new Map()) => __awaiter(void 0, void 0, void 0, function* () {
+const checkImports = async (sourceFolder = getSourceFolder(), depth = 0, // Used to check if the import is outside of the src folder
+invalidImports = new Map()) => {
     const dir = fs_extra_1.default.readdirSync(sourceFolder);
     // Start checking each file in the source folder
     for (const file of dir) {
@@ -743,14 +734,14 @@ invalidImports = new Map()) => __awaiter(void 0, void 0, void 0, function* () {
         //  i.e. the program not having access to check the file metadata
         if (!filename.match(/\.tsx?$/)) {
             if ((0, fs_1.statSync)(filename).isDirectory()) {
-                yield (0, exports.checkImports)(filename, depth + 1, invalidImports);
+                await (0, exports.checkImports)(filename, depth + 1, invalidImports);
             }
             // Ignore all files that aren't one of the following:
             // - .ts
             // - .tsx
             continue;
         }
-        const allImports = yield (0, utils_1.getFileImports)(filename);
+        const allImports = await (0, utils_1.getFileImports)(filename);
         const lincdImports = allImports.filter((i) => i.includes('lincd') || i.includes('..'));
         lincdImports.forEach((i) => {
             if (!(0, utils_1.isValidLINCDImport)(i, depth)) {
@@ -776,33 +767,31 @@ invalidImports = new Map()) => __awaiter(void 0, void 0, void 0, function* () {
         console.info('All imports OK');
         process.exit(0);
     }
-});
+};
 exports.checkImports = checkImports;
-const depCheckStaged = () => __awaiter(void 0, void 0, void 0, function* () {
+const depCheckStaged = async () => {
     console.log('Checking dependencies of staged files');
-    stagedGitFiles(function (err, results) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const packages = new Set();
-            yield Promise.all(results.map((file) => __awaiter(this, void 0, void 0, function* () {
-                // console.log('STAGED: ', file.filename);
-                let root = yield (0, find_nearest_package_json_1.findNearestPackageJson)(file.filename);
-                packages.add(root.path);
-            })));
-            [...packages].forEach((packageRoot) => {
-                const pack = JSON.parse(fs_extra_1.default.readFileSync(packageRoot, 'utf8'));
-                const srcPath = packageRoot.replace('package.json', '');
-                console.log('Checking dependencies of ' + chalk_1.default.blue(pack.name) + ':');
-                return (0, exports.depCheck)(process.cwd() + '/' + srcPath);
-                // console.log('check dependencies of ' + pack.name);
-                //
-                // console.log('ROOT of ' + file.filename + ': ' + root.path);
-                // console.log('ROOT of ' + file.filename + ': ' + root.data);
-            });
+    stagedGitFiles(async function (err, results) {
+        const packages = new Set();
+        await Promise.all(results.map(async (file) => {
+            // console.log('STAGED: ', file.filename);
+            let root = await (0, find_nearest_package_json_1.findNearestPackageJson)(file.filename);
+            packages.add(root.path);
+        }));
+        [...packages].forEach((packageRoot) => {
+            const pack = JSON.parse(fs_extra_1.default.readFileSync(packageRoot, 'utf8'));
+            const srcPath = packageRoot.replace('package.json', '');
+            console.log('Checking dependencies of ' + chalk_1.default.blue(pack.name) + ':');
+            return (0, exports.depCheck)(process.cwd() + '/' + srcPath);
+            // console.log('check dependencies of ' + pack.name);
+            //
+            // console.log('ROOT of ' + file.filename + ': ' + root.path);
+            // console.log('ROOT of ' + file.filename + ': ' + root.data);
         });
     });
-});
+};
 exports.depCheckStaged = depCheckStaged;
-const depCheck = (path = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
+const depCheck = async (path = process.cwd()) => {
     (0, depcheck_1.default)(path, {}, (results) => {
         if (results.missing) {
             let lincdPackages = getLocalLincdModules();
@@ -840,9 +829,9 @@ const depCheck = (path = process.cwd()) => __awaiter(void 0, void 0, void 0, fun
         //   console.warn("Unused dependencies: "+results.missing.join(", "));
         // }
     });
-});
+};
 exports.depCheck = depCheck;
-const ensureEnvironmentLoaded = () => __awaiter(void 0, void 0, void 0, function* () {
+const ensureEnvironmentLoaded = async () => {
     if (!process.env.NODE_ENV) {
         //load env-cmd for development environment
         let { GetEnvVars } = require('env-cmd');
@@ -851,7 +840,7 @@ const ensureEnvironmentLoaded = () => __awaiter(void 0, void 0, void 0, function
             console.warn('No .env-cmdrc.json found in this folder. Are you running this command from the root of a LINCD app?');
             process.exit();
         }
-        let vars = yield GetEnvVars({
+        let vars = await GetEnvVars({
             envFile: {
                 filePath: envCmdrcPath,
             },
@@ -859,7 +848,7 @@ const ensureEnvironmentLoaded = () => __awaiter(void 0, void 0, void 0, function
         let environments = Object.keys(vars);
         //if _main is present, load it first
         if (environments.includes('_main')) {
-            process.env = Object.assign(Object.assign({}, process.env), vars._main);
+            process.env = { ...process.env, ...vars._main };
         }
         //if --env is passed, load that environment
         let args = process.argv.splice(2);
@@ -868,7 +857,7 @@ const ensureEnvironmentLoaded = () => __awaiter(void 0, void 0, void 0, function
             let env = args[envIndex + 1];
             if (environments.includes(env)) {
                 console.log('Environment: ' + env);
-                process.env = Object.assign(Object.assign({}, process.env), vars[env]);
+                process.env = { ...process.env, ...vars[env] };
             }
             else {
                 console.warn('Environment ' +
@@ -879,17 +868,21 @@ const ensureEnvironmentLoaded = () => __awaiter(void 0, void 0, void 0, function
         }
         else {
             //chose development by default
-            process.env = Object.assign(Object.assign({}, process.env), vars.development);
+            process.env = { ...process.env, ...vars.development };
             console.log('No environment specified, using development');
         }
     }
-});
-const startServer = (initOnly = false) => __awaiter(void 0, void 0, void 0, function* () {
-    yield ensureEnvironmentLoaded();
+};
+exports.ensureEnvironmentLoaded = ensureEnvironmentLoaded;
+const startServer = async (initOnly = false) => {
+    await (0, exports.ensureEnvironmentLoaded)();
     const LincdServer = require('lincd-server/lib/shapes/LincdServer');
     let lincdConfig = require(path_1.default.join(process.cwd(), 'lincd.config'));
     require(path_1.default.join(process.cwd(), 'scripts', 'storage-config'));
-    let server = new LincdServer.LincdServer(Object.assign({ loadAppComponent: () => require(path_1.default.join(process.cwd(), 'src', 'App')).default }, lincdConfig));
+    let server = new LincdServer.LincdServer({
+        loadAppComponent: () => require(path_1.default.join(process.cwd(), 'src', 'App')).default,
+        ...lincdConfig,
+    });
     let args = process.argv.splice(2);
     //if --initOnly is passed, only initialize the server and don't start it
     if (args.includes('--initOnly') || initOnly) {
@@ -898,9 +891,53 @@ const startServer = (initOnly = false) => __awaiter(void 0, void 0, void 0, func
     else {
         return server.start();
     }
-});
+};
 exports.startServer = startServer;
-const createPackage = (name, uriBase, basePath = process.cwd()) => __awaiter(void 0, void 0, void 0, function* () {
+const buildApp = async () => {
+    await (0, exports.ensureEnvironmentLoaded)();
+    const webpackAppConfig = require('./config-webpack-app').webpackAppConfig;
+    console.log(chalk_1.default.magenta(`Building ${process.env.NODE_ENV} app bundles`));
+    return new Promise((resolve, reject) => {
+        webpack(webpackAppConfig, async (err, stats) => {
+            if (err) {
+                console.error(err.stack || err);
+                if (err.details) {
+                    console.error(err.details);
+                }
+                process.exit(1);
+            }
+            const info = stats.toJson();
+            if (stats.hasErrors()) {
+                console.log('Finished running webpack with errors.');
+                info.errors.forEach((e) => console.error(e));
+                // process.exit(1);
+                reject();
+            }
+            else {
+                console.log(stats.toString({
+                    chunks: false,
+                    assets: true,
+                    entryPoints: false,
+                    modules: false,
+                    moduleAssets: false,
+                    moduleChunks: false,
+                    colors: true,
+                }));
+                console.log('App build process finished');
+                resolve(true);
+                // console.log(
+                // 	chalk.green('\t'+Object.keys(stats.compilation.assets).join('\n\t')),
+                // );
+                //build metadata (JSON-LD files containing metadata about the lincd components, shapes & ontologies in this app or its packages)
+                // let updatedPaths = await buildMetadata();
+                // console.log(chalk.green("Updated metadata:\n")+" - "+updatedPaths.map(p => chalk.magenta(p.replace(process.cwd(),''))).join("\n - "));
+            }
+            // process.exit();
+        });
+    });
+};
+exports.buildApp = buildApp;
+const createPackage = async (name, uriBase, basePath = process.cwd()) => {
     //if ran with npx, basePath will be the root directory of the repository, even if we're executing from a sub folder (the root directory is where node_modules lives and package.json with workspaces)
     //so we manually find a packages folder, if it exists we go into that.
     if (fs_extra_1.default.existsSync(path_1.default.join(basePath, 'packages'))) {
@@ -930,7 +967,7 @@ const createPackage = (name, uriBase, basePath = process.cwd()) => __awaiter(voi
     log("Creating new LINCD package '" + name + "'");
     fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'package'), targetFolder);
     //replace variables in some of the copied files
-    yield Promise.all([
+    await Promise.all([
         'src/index.ts',
         'package.json',
         'Gruntfile.js',
@@ -956,18 +993,18 @@ const createPackage = (name, uriBase, basePath = process.cwd()) => __awaiter(voi
         console.log('rename ', path_1.default.join(targetFolder, f), path_1.default.join(targetFolder, ...newParts, newName));
         fs_extra_1.default.renameSync(path_1.default.join(targetFolder, f), path_1.default.join(targetFolder, ...newParts, newName));
     });
-    let version = (yield (0, utils_1.execPromise)('yarn --version').catch((err) => {
+    let version = (await (0, utils_1.execPromise)('yarn --version').catch((err) => {
         console.log('yarn probably not working');
         return '';
     }));
     let installCommand = version.toString().match(/[0-9]+/)
         ? 'yarn install'
         : 'npm install';
-    yield (0, utils_1.execp)(`cd ${targetFolder} && ${installCommand} && npm exec lincd build`, true).catch((err) => {
+    await (0, utils_1.execp)(`cd ${targetFolder} && ${installCommand} && npm exec lincd build`, true).catch((err) => {
         console.warn('Could not install dependencies');
     });
     log(`Prepared a new LINCD package in ${chalk_1.default.magenta(targetFolder)}`, `Run ${chalk_1.default.blueBright('yarn build')} from this directory to build once`, `Or ${chalk_1.default.blueBright('yarn dev')} to continuously rebuild on file changes`);
-});
+};
 exports.createPackage = createPackage;
 var getNextVersion = function (version) {
     let parts = version.split('.');
@@ -1148,7 +1185,7 @@ var publishUpdated = function (test = false) {
             }
             console.log('testing npm');
             return (0, utils_1.execPromise)('npm info ' + pckg.packageName + ' --json')
-                .then((output) => __awaiter(this, void 0, void 0, function* () {
+                .then(async (output) => {
                 console.log('testing npm done');
                 var info;
                 try {
@@ -1176,7 +1213,7 @@ var publishUpdated = function (test = false) {
                         // }
                         let lastPublishDate = new Date(lastPublish);
                         // let {lastModifiedTime, lastModifiedName, lastModified} = getLastModifiedSourceTime(pkg.path);
-                        let lastCommitInfo = yield (0, utils_1.getLastCommitTime)(pckg.path);
+                        let lastCommitInfo = await (0, utils_1.getLastCommitTime)(pckg.path);
                         if (!lastCommitInfo) {
                             shouldPublish = false;
                             (0, utils_1.debugInfo)('Could not determine last git commit');
@@ -1229,7 +1266,7 @@ var publishUpdated = function (test = false) {
                     return (0, exports.publishPackage)(pckg, test, info, version);
                 }
                 return (chalk_1.default.blue(pckg.packageName) + ' latest version is up to date');
-            }))
+            })
                 .catch(({ error, stdout, stderr }) => {
                 if (error) {
                     console.log(error.message);
@@ -1266,153 +1303,147 @@ var publishUpdated = function (test = false) {
     });
 };
 exports.publishUpdated = publishUpdated;
-function getEnvJsonPath(relativeToPath = process.cwd()) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let path = '';
-        if (!relativeToPath.endsWith('/')) {
-            relativeToPath += '/';
-        }
-        // let path = './';
-        for (let i = 0; i <= 10; i++) {
-            let envFile = yield (0, get_env_vars_1.getEnvFile)({
-                filePath: relativeToPath + path + '.env.json',
-            }).catch((err) => {
-                return null;
-            });
-            if (envFile) {
-                //note: we're getting the actual contents here, so we could also use that more directly?
-                return path + '.env.json';
-            }
-            path += '../';
+async function getEnvJsonPath(relativeToPath = process.cwd()) {
+    let path = '';
+    if (!relativeToPath.endsWith('/')) {
+        relativeToPath += '/';
+    }
+    // let path = './';
+    for (let i = 0; i <= 10; i++) {
+        let envFile = await (0, get_env_vars_1.getEnvFile)({
+            filePath: relativeToPath + path + '.env.json',
+        }).catch((err) => {
+            return null;
+        });
+        if (envFile) {
+            //note: we're getting the actual contents here, so we could also use that more directly?
+            return path + '.env.json';
         }
-    });
+        path += '../';
+    }
 }
-var publishPackage = function (pkg, test, info, publishVersion) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!pkg) {
-            let localPackageJson = (0, utils_1.getPackageJSON)();
-            pkg = {
-                path: process.cwd(),
-                packageName: localPackageJson.name,
-            };
-        }
-        if (!publishVersion) {
-            publishVersion = info ? getNextVersion(info.version) : 'patch';
-        }
-        if (test) {
-            (0, utils_1.debugInfo)('should publish ' + pkg.packageName + ' ' + publishVersion);
-            //when testing what needs to be published
-            return chalk_1.default.blue(pkg.packageName + ' should publish');
+var publishPackage = async function (pkg, test, info, publishVersion) {
+    if (!pkg) {
+        let localPackageJson = (0, utils_1.getPackageJSON)();
+        pkg = {
+            path: process.cwd(),
+            packageName: localPackageJson.name,
+        };
+    }
+    if (!publishVersion) {
+        publishVersion = info ? getNextVersion(info.version) : 'patch';
+    }
+    if (test) {
+        (0, utils_1.debugInfo)('should publish ' + pkg.packageName + ' ' + publishVersion);
+        //when testing what needs to be published
+        return chalk_1.default.blue(pkg.packageName + ' should publish');
+    }
+    console.log(chalk_1.default.blue('publishing ' + pkg.packageName + ' ' + publishVersion));
+    //looking for an .env.json file in our workspace, which may store our NPM AUTH key
+    let envJsonPath = await getEnvJsonPath(pkg.path);
+    return (0, utils_1.execPromise)(`cd ${pkg.path} && ${envJsonPath ? `env-cmd -f ${envJsonPath} --use-shell "` : ''}yarn version ${publishVersion} && yarn npm publish${envJsonPath ? `"` : ''}`, true, false, {}, true)
+        .then((res) => {
+        if (res.indexOf('Aborted due to warnings') !== -1 ||
+            res.indexOf('Could not publish') !== -1 ||
+            res.indexOf("Couldn't publish") !== -1) {
+            console.log(res);
+            return chalk_1.default.red(pkg.packageName + ' failed\n');
         }
-        console.log(chalk_1.default.blue('publishing ' + pkg.packageName + ' ' + publishVersion));
-        //looking for an .env.json file in our workspace, which may store our NPM AUTH key
-        let envJsonPath = yield getEnvJsonPath(pkg.path);
-        return (0, utils_1.execPromise)(`cd ${pkg.path} && ${envJsonPath ? `env-cmd -f ${envJsonPath} --use-shell "` : ''}yarn version ${publishVersion} && yarn npm publish${envJsonPath ? `"` : ''}`, true, false, {}, true)
-            .then((res) => {
-            if (res.indexOf('Aborted due to warnings') !== -1 ||
-                res.indexOf('Could not publish') !== -1 ||
-                res.indexOf("Couldn't publish") !== -1) {
-                console.log(res);
-                return chalk_1.default.red(pkg.packageName + ' failed\n');
-            }
-            console.log('Successfully published ' +
-                chalk_1.default.green(pkg.path) +
-                ' ' +
-                chalk_1.default.magenta(publishVersion));
-            return (chalk_1.default.green(pkg.packageName) +
-                ' published ' +
-                chalk_1.default.magenta(publishVersion));
-        })
-            .catch(({ error, stdout, stderr }) => {
-            console.log(chalk_1.default.red('Failed to publish: ' + error.message));
-            return chalk_1.default.red(pkg.packageName + ' failed to publish');
-        });
+        console.log('Successfully published ' +
+            chalk_1.default.green(pkg.path) +
+            ' ' +
+            chalk_1.default.magenta(publishVersion));
+        return (chalk_1.default.green(pkg.packageName) +
+            ' published ' +
+            chalk_1.default.magenta(publishVersion));
+    })
+        .catch(({ error, stdout, stderr }) => {
+        console.log(chalk_1.default.red('Failed to publish: ' + error.message));
+        return chalk_1.default.red(pkg.packageName + ' failed to publish');
     });
 };
 exports.publishPackage = publishPackage;
-var buildUpdated = function (back, target, target2, useGitForLastModified = false, test = false) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // back = back || 1;
-        // return execPromise(`git log -${back} --format=%ci`).then((result) => {
-        // let now = new Date();
-        let previousResult = '';
-        log(test
-            ? 'Checking which packages need to be rebuild'
-            : 'Building updated packages');
-        // let packages = getLocalLincdModules();
-        let packages = getLocalLincdPackageMap();
-        // console.log(packages);
-        let jsonldPkgUpdated = yield (0, utils_1.needsRebuilding)(packages.get('lincd-jsonld'), useGitForLastModified);
-        // let cliPkgUpdated = await needsRebuilding(packages.get('lincd-cli'), useGitForLastModified);
-        //if either cli or jsonldPkg needs to be rebuilt
-        // if (jsonldPkgUpdated || cliPkgUpdated) {
-        if (jsonldPkgUpdated) {
-            yield (0, utils_1.execPromise)('yarn exec tsc && echo "compiled lincd-jsonld"', false, false, {
-                cwd: packages.get('lincd-jsonld').path,
-            }, true);
-            // await execPromise('yarn build-core', false, false, {}, true);
-        }
-        let rebuildAllModules = false;
-        // if (cliPkgUpdated) {
-        //   rebuildAllModules = true;
-        //   log(chalk.magenta('Rebuilding all packages because the build tools (lincd-cli) got updated'));
-        // }
-        let packagesLeft = packages.size;
-        runOnPackagesGroupedByDependencies(packages, (packageGroup, dependencies) => {
-            (0, utils_1.debugInfo)('Now checking: ' + chalk_1.default.blue(packageGroup.map((i) => i.packageName)));
-            (0, utils_1.debugInfo)(packagesLeft + ' packages left.');
-            packagesLeft = packagesLeft - packageGroup.length;
-            return (pkg) => __awaiter(this, void 0, void 0, function* () {
-                // debugInfo('# Checking package ' + pkg.packageName);
-                let needRebuild = yield (0, utils_1.needsRebuilding)(pkg, useGitForLastModified);
-                if (pkg.packageName === 'lincd-jsonld' && jsonldPkgUpdated) {
-                    needRebuild = true;
-                }
-                if (needRebuild || rebuildAllModules) {
-                    //TODO: when building a pkg, also rebuild all packages that depend on this package.. and iteratively build packages that depend on those packages..
-                    // log(packageName+' modified since last commit on '+now.toString());
-                    if (test) {
-                        (0, utils_1.debugInfo)('Need to build ' + pkg.packageName);
-                        return chalk_1.default.blue(pkg.packageName + ' should be build');
-                    }
-                    log('Building ' + pkg.packageName);
-                    return (0, utils_1.execPromise)('cd ' +
-                        pkg.path +
-                        ' && yarn build' +
-                        (target ? ' ' + target : '') +
-                        (target2 ? ' ' + target2 : ''))
-                        .then((res) => {
-                        (0, utils_1.debugInfo)(chalk_1.default.green(pkg.packageName + ' successfully built'));
-                        return chalk_1.default.green(pkg.packageName + ' built');
-                    })
-                        .catch(({ error, stdout, stderr }) => {
-                        warn(chalk_1.default.red('Failed to build ' + pkg.packageName));
-                        console.log(stdout);
-                        process.exit(1);
-                        // let dependentModules = getDependentPackages(dependencies, pkg);
-                        // if (dependentModules.length > 0) {
-                        //   // printBuildResults(failedModules, done);
-                        //   warn(chalk.red(pkg.packageName + ' build failed'));
-                        //   warn(
-                        //     'Stopping build-updated process because ' +
-                        //       dependentModules.length +
-                        //       ' other packages depend on this package.\n',
-                        //   ); //"+dependentModules.map(d => d.packageName).join(", ")));
-                        // }
-                    });
-                }
-            });
-        }, (results) => {
-            if (results.length) {
-                log('Summary:');
-                log(results.join('\n'));
+var buildUpdated = async function (back, target, target2, useGitForLastModified = false, test = false) {
+    // back = back || 1;
+    // return execPromise(`git log -${back} --format=%ci`).then((result) => {
+    // let now = new Date();
+    let previousResult = '';
+    log(test
+        ? 'Checking which packages need to be rebuild'
+        : 'Building updated packages');
+    // let packages = getLocalLincdModules();
+    let packages = getLocalLincdPackageMap();
+    // console.log(packages);
+    let jsonldPkgUpdated = await (0, utils_1.needsRebuilding)(packages.get('lincd-jsonld'), useGitForLastModified);
+    // let cliPkgUpdated = await needsRebuilding(packages.get('lincd-cli'), useGitForLastModified);
+    //if either cli or jsonldPkg needs to be rebuilt
+    // if (jsonldPkgUpdated || cliPkgUpdated) {
+    if (jsonldPkgUpdated) {
+        await (0, utils_1.execPromise)('yarn exec tsc && echo "compiled lincd-jsonld"', false, false, {
+            cwd: packages.get('lincd-jsonld').path,
+        }, true);
+        // await execPromise('yarn build-core', false, false, {}, true);
+    }
+    let rebuildAllModules = false;
+    // if (cliPkgUpdated) {
+    //   rebuildAllModules = true;
+    //   log(chalk.magenta('Rebuilding all packages because the build tools (lincd-cli) got updated'));
+    // }
+    let packagesLeft = packages.size;
+    runOnPackagesGroupedByDependencies(packages, (packageGroup, dependencies) => {
+        (0, utils_1.debugInfo)('Now checking: ' + chalk_1.default.blue(packageGroup.map((i) => i.packageName)));
+        (0, utils_1.debugInfo)(packagesLeft + ' packages left.');
+        packagesLeft = packagesLeft - packageGroup.length;
+        return async (pkg) => {
+            // debugInfo('# Checking package ' + pkg.packageName);
+            let needRebuild = await (0, utils_1.needsRebuilding)(pkg, useGitForLastModified);
+            if (pkg.packageName === 'lincd-jsonld' && jsonldPkgUpdated) {
+                needRebuild = true;
             }
-            else {
-                log(chalk_1.default.green('Nothing to rebuild'));
+            if (needRebuild || rebuildAllModules) {
+                //TODO: when building a pkg, also rebuild all packages that depend on this package.. and iteratively build packages that depend on those packages..
+                // log(packageName+' modified since last commit on '+now.toString());
+                if (test) {
+                    (0, utils_1.debugInfo)('Need to build ' + pkg.packageName);
+                    return chalk_1.default.blue(pkg.packageName + ' should be build');
+                }
+                log('Building ' + pkg.packageName);
+                return (0, utils_1.execPromise)('cd ' +
+                    pkg.path +
+                    ' && yarn build' +
+                    (target ? ' ' + target : '') +
+                    (target2 ? ' ' + target2 : ''))
+                    .then((res) => {
+                    (0, utils_1.debugInfo)(chalk_1.default.green(pkg.packageName + ' successfully built'));
+                    return chalk_1.default.green(pkg.packageName + ' built');
+                })
+                    .catch(({ error, stdout, stderr }) => {
+                    warn(chalk_1.default.red('Failed to build ' + pkg.packageName));
+                    console.log(stdout);
+                    process.exit(1);
+                    // let dependentModules = getDependentPackages(dependencies, pkg);
+                    // if (dependentModules.length > 0) {
+                    //   // printBuildResults(failedModules, done);
+                    //   warn(chalk.red(pkg.packageName + ' build failed'));
+                    //   warn(
+                    //     'Stopping build-updated process because ' +
+                    //       dependentModules.length +
+                    //       ' other packages depend on this package.\n',
+                    //   ); //"+dependentModules.map(d => d.packageName).join(", ")));
+                    // }
+                });
             }
-        });
-        return;
+        };
+    }, (results) => {
+        if (results.length) {
+            log('Summary:');
+            log(results.join('\n'));
+        }
+        else {
+            log(chalk_1.default.green('Nothing to rebuild'));
+        }
     });
+    return;
 };
 exports.buildUpdated = buildUpdated;
 const printBuildResults = function (failed, done) {
@@ -1476,61 +1507,59 @@ var addLinesToFile = function (filePath, entries) {
     fs_extra_1.default.writeFileSync(filePath, fileContents);
 };
 exports.addLinesToFile = addLinesToFile;
-var addCapacitor = function (basePath = process.cwd()) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let targetFolder = ensureFolderExists(basePath);
-        log('Adding capacitor');
-        fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'app-static'), targetFolder);
-        fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'capacitor', 'scripts'), path_1.default.join(targetFolder, 'scripts'));
-        //update .env-cmdrc.json file
-        let envCmdPath = path_1.default.resolve(basePath, '.env-cmdrc.json');
-        let envCmd = JSON.parse(fs_extra_1.default.readFileSync(envCmdPath, { encoding: 'utf8' }));
-        envCmd['app-main'] = {
-            APP_ENV: true,
-            OUTPUT_PATH: './web/assets',
-            ASSET_PATH: './assets/',
-            ENTRY_PATH: './src/index-static.tsx',
-        };
-        envCmd['app-local-android'] = {
-            NODE_ENV: 'app',
-            SITE_ROOT: 'http://10.0.2.2:4000',
-        };
-        envCmd['app-local-ios'] = {
-            NODE_ENV: 'app',
-            SITE_ROOT: 'http://localhost:4000',
-        };
-        fs_extra_1.default.writeFile(envCmdPath, JSON.stringify(envCmd, null, 2));
-        log('Edited .env-cmdrc.json');
-        gitIgnore('android/app/build', 'android/**/capacitor.build.gradle', 'ios/App/App/public');
-        //update package.json scripts
-        let pack = (0, utils_1.getPackageJSON)(basePath);
-        pack.scripts['build-staging'] =
-            'env-cmd -e _main, staging node scripts/build.js';
-        pack.scripts['fix-app'] = 'node scripts/fix-namespace.js';
-        pack.scripts['app'] =
-            'env-cmd -e _main,production,app-main node scripts/build.js && npx cap sync && yarn run fix-app';
-        pack.scripts['app-local-ios'] =
-            'env-cmd -e _main,development,app-main,app-local-ios node scripts/build.js && npx cap sync && yarn run fix-app';
-        pack.scripts['app-local-android'] =
-            'env-cmd -e _main,development,app-main,app-local-android node scripts/build.js && npx cap sync && yarn run fix-app';
-        pack.scripts['cap:android'] = 'yarn cap open android';
-        pack.scripts['cap:ios'] = 'yarn cap open ios';
-        pack.scripts['cap:sync'] = 'yarn cap sync';
-        fs_extra_1.default.writeFile(path_1.default.resolve(basePath, 'package.json'), JSON.stringify(pack, null, 2));
-        log('Added new run script to package.json');
-        yield (0, utils_1.execPromise)(`yarn add -D @capacitor/cli`, true, false, null, true);
-        yield (0, utils_1.execPromise)(`yarn add @capacitor/android @capacitor/core @capacitor/app @capacitor/ios`, false, false, null, true);
-        // TODO: Do we need to add `npx cap init`? If yes, we should not copy capacitor config.ts yet
-        // await execPromise(`npx cap init`, true, false, null, true);
-        // got error:
-        // [error] Non-interactive shell detected.
-        // Run the command with --help to see a list of arguments that must be provided.
-        // [error] Non-interactive shell detected.
-        // Run the command with --help to see a list of arguments that must be provided.
-        log(`Done! Now update your Capacitor configuration by providing an app name, app ID, and web directory at ${chalk_1.default.blue('capacitor.config.ts')}`);
-        log(`And then run ${chalk_1.default.magenta('yarn cap add android')} and/or ${chalk_1.default.magenta('yarn cap add ios')}')`);
-        log(`Last, run ${chalk_1.default.magenta('yarn app')} or ${chalk_1.default.magenta('yarn app-local-ios')} or ${chalk_1.default.magenta('yarn app-local-android')}`);
-    });
+var addCapacitor = async function (basePath = process.cwd()) {
+    let targetFolder = ensureFolderExists(basePath);
+    log('Adding capacitor');
+    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'app-static'), targetFolder);
+    fs_extra_1.default.copySync(path_1.default.join(__dirname, '..', 'defaults', 'capacitor', 'scripts'), path_1.default.join(targetFolder, 'scripts'));
+    //update .env-cmdrc.json file
+    let envCmdPath = path_1.default.resolve(basePath, '.env-cmdrc.json');
+    let envCmd = JSON.parse(fs_extra_1.default.readFileSync(envCmdPath, { encoding: 'utf8' }));
+    envCmd['app-main'] = {
+        APP_ENV: true,
+        OUTPUT_PATH: './web/assets',
+        ASSET_PATH: './assets/',
+        ENTRY_PATH: './src/index-static.tsx',
+    };
+    envCmd['app-local-android'] = {
+        NODE_ENV: 'app',
+        SITE_ROOT: 'http://10.0.2.2:4000',
+    };
+    envCmd['app-local-ios'] = {
+        NODE_ENV: 'app',
+        SITE_ROOT: 'http://localhost:4000',
+    };
+    fs_extra_1.default.writeFile(envCmdPath, JSON.stringify(envCmd, null, 2));
+    log('Edited .env-cmdrc.json');
+    gitIgnore('android/app/build', 'android/**/capacitor.build.gradle', 'ios/App/App/public');
+    //update package.json scripts
+    let pack = (0, utils_1.getPackageJSON)(basePath);
+    pack.scripts['build-staging'] =
+        'env-cmd -e _main, staging node scripts/build.js';
+    pack.scripts['fix-app'] = 'node scripts/fix-namespace.js';
+    pack.scripts['app'] =
+        'env-cmd -e _main,production,app-main node scripts/build.js && npx cap sync && yarn run fix-app';
+    pack.scripts['app-local-ios'] =
+        'env-cmd -e _main,development,app-main,app-local-ios node scripts/build.js && npx cap sync && yarn run fix-app';
+    pack.scripts['app-local-android'] =
+        'env-cmd -e _main,development,app-main,app-local-android node scripts/build.js && npx cap sync && yarn run fix-app';
+    pack.scripts['cap:android'] = 'yarn cap open android';
+    pack.scripts['cap:ios'] = 'yarn cap open ios';
+    pack.scripts['cap:sync'] = 'yarn cap sync';
+    fs_extra_1.default.writeFile(path_1.default.resolve(basePath, 'package.json'), JSON.stringify(pack, null, 2));
+    log('Added new run script to package.json');
+    await (0, utils_1.execPromise)(`yarn add -D @capacitor/cli`, true, false, null, true);
+    await (0, utils_1.execPromise)(`yarn add @capacitor/android @capacitor/core @capacitor/app @capacitor/ios`, false, false, null, true);
+    // TODO: Do we need to add `npx cap init`? If yes, we should not copy capacitor config.ts yet
+    // await execPromise(`npx cap init`, true, false, null, true);
+    // got error:
+    // [error] Non-interactive shell detected.
+    // Run the command with --help to see a list of arguments that must be provided.
+    // [error] Non-interactive shell detected.
+    // Run the command with --help to see a list of arguments that must be provided.
+    log(`Done! Now update your Capacitor configuration by providing an app name, app ID, and web directory at ${chalk_1.default.blue('capacitor.config.ts')}`);
+    log(`And then run ${chalk_1.default.magenta('yarn cap add android')} and/or ${chalk_1.default.magenta('yarn cap add ios')}')`);
+    log(`Last, run ${chalk_1.default.magenta('yarn app')} or ${chalk_1.default.magenta('yarn app-local-ios')} or ${chalk_1.default.magenta('yarn app-local-android')}`);
 };
 exports.addCapacitor = addCapacitor;
 var executeCommandForPackage = function (packageName, command) {
@@ -1553,3 +1582,4 @@ var executeCommandForPackage = function (packageName, command) {
     }
 };
 exports.executeCommandForPackage = executeCommandForPackage;
+//# sourceMappingURL=cli-methods.js.map