@codenotch/codenotch.cli 1.0.53 → 1.0.54

package/dist/commands/project/bump.js

@@ -0,0 +1,130 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerBump = registerBump;
+const chalk_1 = __importDefault(require("chalk"));
+const path_1 = require("path");
+const promises_1 = __importDefault(require("node:fs/promises"));
+const FileUtils_1 = __importDefault(require("../../utils/FileUtils"));
+const ConsoleUtils_1 = __importDefault(require("../../utils/ConsoleUtils"));
+const ProjectGeneratorUtils_1 = __importDefault(require("../../utils/ProjectGeneratorUtils"));
+const ManifestUtils_1 = require("../../utils/ManifestUtils");
+const shared_1 = require("./shared");
+const SEMVER = /^(\d+)\.(\d+)\.(\d+)$/;
+const RELEASES = ['major', 'minor', 'patch'];
+function registerBump(project) {
+    (0, shared_1.withProjectPathOption)(project
+        .command('bump')
+        .description('Raise the version of the project (manifest.json, and package.json when it carries one), then regenerate the derived files holding it')
+        .argument('[release]', `'${RELEASES.join("', '")}' or an explicit x.y.z version`, 'patch')
+        .option('--json', 'output the result in JSON format')
+        .addHelpText('after', `
+Examples:
+  $ cn project bump           0.1.4 -> 0.1.5
+  $ cn project bump minor     0.1.4 -> 0.2.0
+  $ cn project bump 2.0.0     set the version as is
+
+The version is the one the runtime shows for the project, and the one written in db-schema.xml
+and openapi.json, both regenerated here. The next 'cn project refresh' deploys it.
+`))
+        .action(async (release, options) => {
+        const abort = (message) => {
+            console.error(chalk_1.default.yellow(`Aborted: ${message}`));
+            if (options.json) {
+                ConsoleUtils_1.default.json({ error: message });
+            }
+            process.exitCode = 1;
+        };
+        const manifestPath = (0, path_1.join)(options.projectPath, 'manifest.json');
+        const manifest = await readJsonFile(manifestPath);
+        if (manifest === undefined) {
+            abort(`no manifest.json in '${options.projectPath}', run this inside a project or point '-p' at one.`);
+            return;
+        }
+        // A manifest without a usable version counts from the default one, like a new project
+        const previousVersion = typeof manifest.content.version === 'string' && SEMVER.test(manifest.content.version) ? manifest.content.version : undefined;
+        const version = nextVersion(previousVersion ?? ManifestUtils_1.DEFAULT_PROJECT_VERSION, release);
+        if (version === undefined) {
+            abort(`'${release}' is neither ${RELEASES.join(', ')} nor a x.y.z version.`);
+            return;
+        }
+        if (previousVersion === undefined) {
+            ConsoleUtils_1.default.checkWarning(`manifest.json had no x.y.z version, counting from ${ManifestUtils_1.DEFAULT_PROJECT_VERSION}.`);
+        }
+        const updated = [];
+        manifest.content.version = version;
+        if (!writeJsonFile(manifestPath, manifest)) {
+            abort(`could not write '${manifestPath}'.`);
+            return;
+        }
+        updated.push(manifestPath);
+        // The package.json of the project follows, when it carries a version
+        const packagePath = (0, path_1.join)(options.projectPath, 'package.json');
+        const pkg = await readJsonFile(packagePath);
+        if (pkg !== undefined && typeof pkg.content.version === 'string') {
+            pkg.content.version = version;
+            if (!writeJsonFile(packagePath, pkg)) {
+                abort(`could not write '${packagePath}'.`);
+                return;
+            }
+            updated.push(packagePath);
+        }
+        // db-schema.xml and openapi.json carry the version: rebuilt from the sources with it
+        const generated = await ProjectGeneratorUtils_1.default.generateAll(options.projectPath);
+        for (const warning of generated.warnings) {
+            ConsoleUtils_1.default.checkWarning(warning);
+        }
+        if (generated.error !== undefined) {
+            ConsoleUtils_1.default.error(generated.error);
+            process.exitCode = 1;
+        }
+        if (options.json) {
+            ConsoleUtils_1.default.json({ previousVersion: previousVersion ?? null, version, updated, regenerated: generated.written, ...(generated.error === undefined ? {} : { error: generated.error }) });
+            return;
+        }
+        console.log(chalk_1.default.green(`Version ${previousVersion ?? '(none)'} -> ${version}`));
+        ConsoleUtils_1.default.check(`Updated: ${updated.map(file => (0, path_1.basename)(file)).join(', ')}`);
+        if (generated.written.length > 0) {
+            ConsoleUtils_1.default.check(`Regenerated: ${generated.written.map(file => (0, path_1.basename)(file)).join(', ')}`);
+        }
+    });
+}
+/** The version after `release`: the next major/minor/patch of `current`, or `release` itself when it is a x.y.z version */
+function nextVersion(current, release) {
+    if (SEMVER.test(release)) {
+        return release;
+    }
+    const parts = SEMVER.exec(current);
+    if (parts === null) {
+        return undefined;
+    }
+    const [major, minor, patch] = [Number(parts[1]), Number(parts[2]), Number(parts[3])];
+    switch (release) {
+        case 'major': return `${major + 1}.0.0`;
+        case 'minor': return `${major}.${minor + 1}.0`;
+        case 'patch': return `${major}.${minor}.${patch + 1}`;
+        default: return undefined;
+    }
+}
+async function readJsonFile(filePath) {
+    if (await FileUtils_1.default.exists(filePath) === false) {
+        return undefined;
+    }
+    try {
+        const raw = await promises_1.default.readFile(filePath, 'utf8');
+        return {
+            content: JSON.parse(raw),
+            indent: /^\{\r?\n([ \t]+)/.exec(raw)?.[1] ?? '    ',
+            trailingNewline: raw.endsWith('\n')
+        };
+    }
+    catch {
+        return undefined;
+    }
+}
+function writeJsonFile(filePath, file) {
+    return FileUtils_1.default.writeFileSync(filePath, JSON.stringify(file.content, null, file.indent) + (file.trailingNewline ? '\n' : ''));
+}
+//# sourceMappingURL=bump.js.map

package/dist/commands/project/bump.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bump.js","sourceRoot":"","sources":["../../../src/commands/project/bump.ts"],"names":[],"mappings":"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"}

package/dist/commands/project/compile.js

@@ -6,23 +6,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerCompile = registerCompile;
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
+const ConsoleUtils_1 = __importDefault(require("../../utils/ConsoleUtils"));
 const ProjectUtils_1 = __importDefault(require("../../utils/ProjectUtils"));
 const shared_1 = require("./shared");
 function registerCompile(project) {
     (0, shared_1.withProjectPathOption)(project
         .command('compile')
         .description('Compile the project into .codenotch/compiled, the sources are left untouched')
-        .option('-o, --output-path <path>', 'output folder for the compiled project (default .codenotch/compiled)'))
+        .option('-o, --output-path <path>', 'output folder for the compiled project (default .codenotch/compiled)')
+        .option('--json', 'output the result in JSON format'))
         .action(async (options) => {
         const outputPath = options.outputPath ?? path_1.default.join(options.projectPath, '.codenotch', 'compiled');
         const compilation = await ProjectUtils_1.default.compileProjectTo(options.projectPath, outputPath);
-        if (compilation.errors.length > 0) {
+        const success = compilation.errors.length === 0;
+        if (options.json) {
+            ConsoleUtils_1.default.json({ success, outputPath, errors: compilation.errors, warnings: compilation.warnings });
+        }
+        else if (!success) {
             console.error(chalk_1.default.red("Compilation failed with errors:"));
             compilation.errors.forEach(err => console.error(chalk_1.default.red(`- ${err}`)));
         }
         else {
             console.log(chalk_1.default.green(`Project compiled successfully into ${outputPath}`));
         }
+        if (!success) {
+            process.exitCode = 1;
+        }
     });
 }
 //# sourceMappingURL=compile.js.map

package/dist/commands/project/compile.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../src/commands/project/compile.ts"],"names":[],"mappings":";;;;;AAMA,0CAgBC;AArBD,kDAA0B;AAC1B,gDAAwB;AACxB,4EAAoD;AACpD,qCAAyE;AAEzE,SAAgB,eAAe,CAAC,OAAgB;IAC5C,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,SAAS,CAAC;SAClB,WAAW,CAAC,8EAA8E,CAAC;SAC3F,MAAM,CAAC,0BAA0B,EAAE,sEAAsE,CAAC,CAAC;SAC3G,MAAM,CAAC,KAAK,EAAE,OAAyD,EAAE,EAAE;QACxE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;QAClG,MAAM,WAAW,GAAG,MAAM,sBAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACzF,IAAI,WAAW,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC,CAAC;YAC5D,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5E,CAAC;aACI,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,sCAAsC,UAAU,EAAE,CAAC,CAAC,CAAC;QACjF,CAAC;IACL,CAAC,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../../src/commands/project/compile.ts"],"names":[],"mappings":";;;;;AAOA,0CA0BC;AAhCD,kDAA0B;AAC1B,gDAAwB;AACxB,4EAAoD;AACpD,4EAAoD;AACpD,qCAAyE;AAEzE,SAAgB,eAAe,CAAC,OAAgB;IAC5C,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,SAAS,CAAC;SAClB,WAAW,CAAC,8EAA8E,CAAC;SAC3F,MAAM,CAAC,0BAA0B,EAAE,sEAAsE,CAAC;SAC1G,MAAM,CAAC,QAAQ,EAAE,kCAAkC,CAAC,CAAC;SACrD,MAAM,CAAC,KAAK,EAAE,OAAyE,EAAE,EAAE;QACxF,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;QAClG,MAAM,WAAW,GAAG,MAAM,sBAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACzF,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;QAEhD,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,sBAAY,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3G,CAAC;aACI,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC,CAAC;YAC5D,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5E,CAAC;aACI,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,sCAAsC,UAAU,EAAE,CAAC,CAAC,CAAC;QACjF,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACzB,CAAC;IACL,CAAC,CAAC,CAAC;AACX,CAAC"}

package/dist/commands/project/deploy.js

@@ -16,7 +16,8 @@ function registerDeploy(project) {
         .command('deploy')
         .description('Deploy a packaged project to the runtime')
         .argument('[service]', "service name of the project on the runtime (omitted: the serviceName of the manifest.json of the project)")
-        .argument('[zip]', "package to deploy, the zip written by 'cn project package' (omitted: pick one under .codenotch/)"))
+        .argument('[zip]', "package to deploy, the zip written by 'cn project package' (omitted: pick one under .codenotch/)")
+        .option('--json', 'output the result in JSON format'))
         .addHelpText('after', `
 Examples:
   $ cn project deploy                            service read from manifest.json, zip picked under .codenotch/
@@ -40,7 +41,14 @@ Examples:
             process.exitCode = 1;
             return;
         }
-        await RuntimeUtils_1.default.deployProject(serviceName, zipPath);
+        // The outcome is already reported on stderr, the JSON carries it for the scripts
+        const deployed = await RuntimeUtils_1.default.deployProject(serviceName, zipPath);
+        if (options.json) {
+            ConsoleUtils_1.default.json({ ...deployed, zip: zipPath });
+        }
+        if (!deployed.success) {
+            process.exitCode = 1;
+        }
     });
 }
 /**

package/dist/commands/project/deploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/commands/project/deploy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/commands/project/deploy.ts"],"names":[],"mappings":"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"}

package/dist/commands/project/index.js

@@ -11,6 +11,7 @@ const package_1 = require("./package");
 const deploy_1 = require("./deploy");
 const new_1 = require("./new");
 const remove_1 = require("./remove");
+const bump_1 = require("./bump");
 function registerProjectCommands(program) {
     const project = program
         .command('project') //TODO name subject to change
@@ -21,6 +22,7 @@ Examples:
   $ cn project start     build, deploy and start the local project
   $ cn project inspect   what the sources declare (processes, tables, apps, i18n...)
   $ cn project refresh   sync the changes with the running runtime
+  $ cn project bump      raise the version of the project (patch, minor, major or x.y.z)
 `);
     (0, inspect_1.registerInspect)(project);
     (0, open_1.registerOpen)(project);
@@ -32,5 +34,6 @@ Examples:
     (0, deploy_1.registerDeploy)(project);
     (0, new_1.registerNew)(project);
     (0, remove_1.registerRemove)(project);
+    (0, bump_1.registerBump)(project);
 }
 //# sourceMappingURL=index.js.map

package/dist/commands/project/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/project/index.ts"],"names":[],"mappings":";;AAYA,0DAsBC;AAjCD,uCAA4C;AAC5C,iCAAsC;AACtC,mCAAwC;AACxC,uCAA4C;AAC5C,iCAAsC;AACtC,uCAA4C;AAC5C,uCAA4C;AAC5C,qCAA0C;AAC1C,+BAAoC;AACpC,qCAA0C;AAE1C,SAAgB,uBAAuB,CAAC,OAAgB;IACpD,MAAM,OAAO,GAAG,OAAO;SAClB,OAAO,CAAC,SAAS,CAAC,CAAC,6BAA6B;SAChD,WAAW,CAAC,uJAAuJ,CAAC;SACpK,WAAW,CAAC,OAAO,EAAE;;;;;;CAM7B,CAAC,CAAC;IAEC,IAAA,yBAAe,EAAC,OAAO,CAAC,CAAC;IACzB,IAAA,mBAAY,EAAC,OAAO,CAAC,CAAC;IACtB,IAAA,qBAAa,EAAC,OAAO,CAAC,CAAC;IACvB,IAAA,yBAAe,EAAC,OAAO,CAAC,CAAC;IACzB,IAAA,mBAAY,EAAC,OAAO,CAAC,CAAC;IACtB,IAAA,yBAAe,EAAC,OAAO,CAAC,CAAC;IACzB,IAAA,yBAAe,EAAC,OAAO,CAAC,CAAC;IACzB,IAAA,uBAAc,EAAC,OAAO,CAAC,CAAC;IACxB,IAAA,iBAAW,EAAC,OAAO,CAAC,CAAC;IACrB,IAAA,uBAAc,EAAC,OAAO,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/project/index.ts"],"names":[],"mappings":";;AAaA,0DAwBC;AApCD,uCAA4C;AAC5C,iCAAsC;AACtC,mCAAwC;AACxC,uCAA4C;AAC5C,iCAAsC;AACtC,uCAA4C;AAC5C,uCAA4C;AAC5C,qCAA0C;AAC1C,+BAAoC;AACpC,qCAA0C;AAC1C,iCAAsC;AAEtC,SAAgB,uBAAuB,CAAC,OAAgB;IACpD,MAAM,OAAO,GAAG,OAAO;SAClB,OAAO,CAAC,SAAS,CAAC,CAAC,6BAA6B;SAChD,WAAW,CAAC,uJAAuJ,CAAC;SACpK,WAAW,CAAC,OAAO,EAAE;;;;;;;CAO7B,CAAC,CAAC;IAEC,IAAA,yBAAe,EAAC,OAAO,CAAC,CAAC;IACzB,IAAA,mBAAY,EAAC,OAAO,CAAC,CAAC;IACtB,IAAA,qBAAa,EAAC,OAAO,CAAC,CAAC;IACvB,IAAA,yBAAe,EAAC,OAAO,CAAC,CAAC;IACzB,IAAA,mBAAY,EAAC,OAAO,CAAC,CAAC;IACtB,IAAA,yBAAe,EAAC,OAAO,CAAC,CAAC;IACzB,IAAA,yBAAe,EAAC,OAAO,CAAC,CAAC;IACzB,IAAA,uBAAc,EAAC,OAAO,CAAC,CAAC;IACxB,IAAA,iBAAW,EAAC,OAAO,CAAC,CAAC;IACrB,IAAA,uBAAc,EAAC,OAAO,CAAC,CAAC;IACxB,IAAA,mBAAY,EAAC,OAAO,CAAC,CAAC;AAC1B,CAAC"}

package/dist/commands/project/open.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerOpen = registerOpen;
-const chalk_1 = __importDefault(require("chalk"));
 const RuntimeUtils_1 = __importDefault(require("../../utils/RuntimeUtils"));
 const ProjectUtils_1 = __importDefault(require("../../utils/ProjectUtils"));
 const OsUtils_1 = require("../../utils/OsUtils");
@@ -12,10 +11,11 @@ const shared_1 = require("./shared");
 function registerOpen(project) {
     (0, shared_1.withProjectPathOption)(project
         .command('open')
-        .description('Open the index page of the project in the default browser'))
+        .description('Open the index page of the project in the default browser (proposes to install/start the runtime when needed)'))
         .action(async (options) => {
-        if ((await RuntimeUtils_1.default.isRuntimeRunning()) === false) {
-            console.log(chalk_1.default.yellow(`Codenotch runtime is not running`));
+        // The page is served by the runtime: propose to install and/or start it rather than giving up
+        if (!await RuntimeUtils_1.default.ensureRuntimeIsRunning()) {
+            process.exitCode = 1;
             return;
         }
         const basePath = await RuntimeUtils_1.default.getRuntimeBaseUrl();

package/dist/commands/project/open.js.map

@@ -1 +1 @@
-{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../src/commands/project/open.ts"],"names":[],"mappings":";;;;;AAOA,oCAaC;AAnBD,kDAA0B;AAC1B,4EAAoD;AACpD,4EAAoD;AACpD,iDAA8C;AAC9C,qCAAyE;AAEzE,SAAgB,YAAY,CAAC,OAAgB;IACzC,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,2DAA2D,CAAC,CAAC;SACzE,MAAM,CAAC,KAAK,EAAE,OAA+B,EAAE,EAAE;QAC9C,IAAI,CAAC,MAAM,sBAAY,CAAC,gBAAgB,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC;YACpD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,kCAAkC,CAAC,CAAC,CAAC;YAC9D,OAAO;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,sBAAY,CAAC,iBAAiB,EAAE,CAAC;QACxD,MAAM,WAAW,GAAG,MAAM,sBAAY,CAAC,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAClF,iBAAO,CAAC,aAAa,CAAC,GAAG,QAAQ,IAAI,WAAW,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"open.js","sourceRoot":"","sources":["../../../src/commands/project/open.ts"],"names":[],"mappings":";;;;;AAMA,oCAeC;AApBD,4EAAoD;AACpD,4EAAoD;AACpD,iDAA8C;AAC9C,qCAAyE;AAEzE,SAAgB,YAAY,CAAC,OAAgB;IACzC,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,+GAA+G,CAAC,CAAC;SAC7H,MAAM,CAAC,KAAK,EAAE,OAA+B,EAAE,EAAE;QAE9C,8FAA8F;QAC9F,IAAI,CAAC,MAAM,sBAAY,CAAC,sBAAsB,EAAE,EAAE,CAAC;YAC/C,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,sBAAY,CAAC,iBAAiB,EAAE,CAAC;QACxD,MAAM,WAAW,GAAG,MAAM,sBAAY,CAAC,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAClF,iBAAO,CAAC,aAAa,CAAC,GAAG,QAAQ,IAAI,WAAW,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACX,CAAC"}

package/dist/commands/project/package.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,7 +39,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerPackage = registerPackage;
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
-const ProjectUtils_1 = __importDefault(require("../../utils/ProjectUtils"));
+const ConsoleUtils_1 = __importDefault(require("../../utils/ConsoleUtils"));
+const ProjectUtils_1 = __importStar(require("../../utils/ProjectUtils"));
 const shared_1 = require("./shared");
 function registerPackage(project) {
     (0, shared_1.withProjectPathOption)(project
@@ -14,12 +48,34 @@ function registerPackage(project) {
         .alias('build')
         .description('Compile and package the project, output a zip file')
         .option('-o, --output-path <path>', 'output path for the build zip file (default .codenotch/build.zip)')
-        .option('-i, --ignore-errors', 'ignore compilation errors and proceed with packaging', false))
+        .option('-i, --ignore-errors', 'ignore compilation errors and proceed with packaging', false)
+        .option('--json', 'output the result in JSON format'))
         .action(async (options) => {
         const outputPath = options.outputPath ?? path_1.default.join(options.projectPath, ".codenotch", "build.zip");
         const ignoreErrors = options.ignoreErrors ?? false;
-        await ProjectUtils_1.default.packageProject(options.projectPath, outputPath, ignoreErrors);
-        console.log(chalk_1.default.green(`Project built successfully at ${outputPath}`));
+        try {
+            const compilation = await ProjectUtils_1.default.packageProject(options.projectPath, outputPath, ignoreErrors);
+            if (options.json) {
+                ConsoleUtils_1.default.json({ success: true, outputPath, errors: compilation.errors, warnings: compilation.warnings });
+            }
+            else {
+                console.log(chalk_1.default.green(`Project built successfully at ${outputPath}`));
+            }
+        }
+        catch (error) {
+            // In text mode the failure is reported like any other; the JSON has to carry it
+            if (!options.json) {
+                throw error;
+            }
+            const compilationError = error instanceof ProjectUtils_1.CompilationError ? error : undefined;
+            ConsoleUtils_1.default.json({
+                success: false,
+                outputPath,
+                errors: compilationError?.errors ?? [error instanceof Error ? error.message : String(error)],
+                warnings: compilationError?.warnings ?? []
+            });
+            process.exitCode = 1;
+        }
     });
 }
 //# sourceMappingURL=package.js.map

package/dist/commands/project/package.js.map

@@ -1 +1 @@
-{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../src/commands/project/package.ts"],"names":[],"mappings":";;;;;AAMA,0CAaC;AAlBD,kDAA0B;AAC1B,gDAAwB;AACxB,4EAAoD;AACpD,qCAAyE;AAEzE,SAAgB,eAAe,CAAC,OAAgB;IAC5C,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,SAAS,CAAC;SAClB,KAAK,CAAC,OAAO,CAAC;SACd,WAAW,CAAC,oDAAoD,CAAC;SACjE,MAAM,CAAC,0BAA0B,EAAE,mEAAmE,CAAC;SACvG,MAAM,CAAC,qBAAqB,EAAE,sDAAsD,EAAE,KAAK,CAAC,CAAC;SAC7F,MAAM,CAAC,KAAK,EAAE,OAAiF,EAAE,EAAE;QAChG,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC;QACnD,MAAM,sBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;QACjF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,iCAAiC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../src/commands/project/package.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,0CAoCC;AA1CD,kDAA0B;AAC1B,gDAAwB;AACxB,4EAAoD;AACpD,yEAA0E;AAC1E,qCAAyE;AAEzE,SAAgB,eAAe,CAAC,OAAgB;IAC5C,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,SAAS,CAAC;SAClB,KAAK,CAAC,OAAO,CAAC;SACd,WAAW,CAAC,oDAAoD,CAAC;SACjE,MAAM,CAAC,0BAA0B,EAAE,mEAAmE,CAAC;SACvG,MAAM,CAAC,qBAAqB,EAAE,sDAAsD,EAAE,KAAK,CAAC;SAC5F,MAAM,CAAC,QAAQ,EAAE,kCAAkC,CAAC,CAAC;SACrD,MAAM,CAAC,KAAK,EAAE,OAAiG,EAAE,EAAE;QAChH,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC;QAEnD,IAAI,CAAC;YACD,MAAM,WAAW,GAAG,MAAM,sBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;YACrG,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACf,sBAAY,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;YACjH,CAAC;iBACI,CAAC;gBACF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,iCAAiC,UAAU,EAAE,CAAC,CAAC,CAAC;YAC5E,CAAC;QACL,CAAC;QACD,OAAO,KAAK,EAAE,CAAC;YACX,gFAAgF;YAChF,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAChB,MAAM,KAAK,CAAC;YAChB,CAAC;YACD,MAAM,gBAAgB,GAAG,KAAK,YAAY,+BAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/E,sBAAY,CAAC,IAAI,CAAC;gBACd,OAAO,EAAE,KAAK;gBACd,UAAU;gBACV,MAAM,EAAE,gBAAgB,EAAE,MAAM,IAAI,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC5F,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,IAAI,EAAE;aAC7C,CAAC,CAAC;YACH,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACzB,CAAC;IACL,CAAC,CAAC,CAAC;AACX,CAAC"}

package/dist/commands/project/refresh.js

@@ -15,13 +15,15 @@ function registerRefresh(project) {
         .alias('patch')
         .description('Sync the project with the runtime, deploy changes and restart if needed')
         .option('-i, --ignore-errors', 'deploy even when the compilation reports errors', false)
+        .option('--json', 'output the result in JSON format')
         .addHelpText('after', `
 Examples:
   $ cn project refresh                  package the sources and redeploy them on the runtime
   $ cn project refresh -p ./myproject
   $ cn project refresh --ignore-errors  deploy anyway when the compilation reports errors
 
-The runtime is started when it is not running, and a project it does not hold yet is deployed
+When the runtime is not installed or not running, the command proposes to install/start it
+(accepted by default outside a terminal). A project the runtime does not hold yet is deployed
 as a whole. 'cn project start' does the same and opens the project in the browser.
 `))
         .action(async (options) => {
@@ -38,13 +40,20 @@ as a whole. 'cn project start' does the same and opens the project in the browse
         ConsoleUtils_1.default.check(`Service '${serviceName}' (from manifest.json)`);
         try {
             const refreshed = await RuntimeUtils_1.default.refreshProject(options.projectPath, { ignoreErrors: options.ignoreErrors });
-            if (!refreshed) {
+            if (options.json) {
+                ConsoleUtils_1.default.json(refreshed);
+            }
+            if (!refreshed.success) {
                 process.exitCode = 1;
             }
         }
         catch (error) {
             // A compilation failure already listed its errors, only the outcome is left to report
-            console.error(chalk_1.default.red(`Refresh failed: ${error instanceof Error ? error.message : String(error)}`));
+            const message = error instanceof Error ? error.message : String(error);
+            console.error(chalk_1.default.red(`Refresh failed: ${message}`));
+            if (options.json) {
+                ConsoleUtils_1.default.json({ success: false, serviceName, errors: [message], warnings: [] });
+            }
             process.exitCode = 1;
         }
     });

package/dist/commands/project/refresh.js.map

@@ -1 +1 @@
-{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../src/commands/project/refresh.ts"],"names":[],"mappings":";;;;;AAOA,0CAyCC;AA/CD,kDAA0B;AAC1B,4EAAoD;AACpD,4EAAoD;AACpD,4EAAoD;AACpD,qCAAyE;AAEzE,SAAgB,eAAe,CAAC,OAAgB;IAC5C,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,SAAS,CAAC;SAClB,KAAK,CAAC,OAAO,CAAC;SACd,WAAW,CAAC,yEAAyE,CAAC;SACtF,MAAM,CAAC,qBAAqB,EAAE,iDAAiD,EAAE,KAAK,CAAC;SACvF,WAAW,CAAC,OAAO,EAAE;;;;;;;;CAQ7B,CAAC,CAAC;SACM,MAAM,CAAC,KAAK,EAAE,OAA2D,EAAE,EAAE;QAE1E,8FAA8F;QAC9F,IAAI,WAAmB,CAAC;QACxB,IAAI,CAAC;YACD,WAAW,GAAG,MAAM,sBAAY,CAAC,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAChF,CAAC;QACD,MAAM,CAAC;YACH,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,MAAM,CAAC,iCAAiC,OAAO,CAAC,WAAW,oDAAoD,CAAC,CAAC,CAAC;YACtI,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACX,CAAC;QACD,sBAAY,CAAC,KAAK,CAAC,YAAY,WAAW,wBAAwB,CAAC,CAAC;QAEpE,IAAI,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,sBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;YACjH,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACzB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,EAAE,CAAC;YACX,sFAAsF;YACtF,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,mBAAmB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;YACtG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACzB,CAAC;IACL,CAAC,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../src/commands/project/refresh.ts"],"names":[],"mappings":";;;;;AAOA,0CAkDC;AAxDD,kDAA0B;AAC1B,4EAAoD;AACpD,4EAAoD;AACpD,4EAAoD;AACpD,qCAAyE;AAEzE,SAAgB,eAAe,CAAC,OAAgB;IAC5C,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,SAAS,CAAC;SAClB,KAAK,CAAC,OAAO,CAAC;SACd,WAAW,CAAC,yEAAyE,CAAC;SACtF,MAAM,CAAC,qBAAqB,EAAE,iDAAiD,EAAE,KAAK,CAAC;SACvF,MAAM,CAAC,QAAQ,EAAE,kCAAkC,CAAC;SACpD,WAAW,CAAC,OAAO,EAAE;;;;;;;;;CAS7B,CAAC,CAAC;SACM,MAAM,CAAC,KAAK,EAAE,OAA2E,EAAE,EAAE;QAE1F,8FAA8F;QAC9F,IAAI,WAAmB,CAAC;QACxB,IAAI,CAAC;YACD,WAAW,GAAG,MAAM,sBAAY,CAAC,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAChF,CAAC;QACD,MAAM,CAAC;YACH,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,MAAM,CAAC,iCAAiC,OAAO,CAAC,WAAW,oDAAoD,CAAC,CAAC,CAAC;YACtI,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACX,CAAC;QACD,sBAAY,CAAC,KAAK,CAAC,YAAY,WAAW,wBAAwB,CAAC,CAAC;QAEpE,IAAI,CAAC;YACD,MAAM,SAAS,GAAG,MAAM,sBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;YACjH,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACf,sBAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACjC,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBACrB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACzB,CAAC;QACL,CAAC;QACD,OAAO,KAAK,EAAE,CAAC;YACX,sFAAsF;YACtF,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,mBAAmB,OAAO,EAAE,CAAC,CAAC,CAAC;YACvD,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACf,sBAAY,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YACxF,CAAC;YACD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACzB,CAAC;IACL,CAAC,CAAC,CAAC;AACX,CAAC"}

package/dist/commands/project/remove.js

@@ -27,7 +27,10 @@ Examples:
             process.exitCode = 1;
             return;
         }
-        await RuntimeUtils_1.default.removeProject(options.projectPath);
+        // False when there is no runtime to remove it from, or the user declined to start it
+        if (!await RuntimeUtils_1.default.removeProject(options.projectPath)) {
+            process.exitCode = 1;
+        }
     });
 }
 //# sourceMappingURL=remove.js.map

package/dist/commands/project/remove.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../src/commands/project/remove.ts"],"names":[],"mappings":";;;;;AAOA,wCAuBC;AA7BD,kDAA0B;AAC1B,4EAAoD;AACpD,4EAAoD;AACpD,sEAA8C;AAC9C,qCAAyE;AAEzE,SAAgB,cAAc,CAAC,OAAgB;IAC3C,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,6DAA6D,CAAC;SAC1E,MAAM,CAAC,WAAW,EAAE,6BAA6B,EAAE,KAAK,CAAC;SACzD,WAAW,CAAC,OAAO,EAAE;;;;CAI7B,CAAC,CAAC;SACM,MAAM,CAAC,KAAK,EAAE,OAAkD,EAAE,EAAE;QAEjE,MAAM,WAAW,GAAG,mBAAS,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAEnE,mFAAmF;QACnF,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,sBAAY,CAAC,OAAO,CAAC,mBAAmB,WAAW,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC;YAC5G,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,MAAM,CAAC,sEAAsE,CAAC,CAAC,CAAC;YACpG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACX,CAAC;QAED,MAAM,sBAAY,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../src/commands/project/remove.ts"],"names":[],"mappings":";;;;;AAOA,wCA0BC;AAhCD,kDAA0B;AAC1B,4EAAoD;AACpD,4EAAoD;AACpD,sEAA8C;AAC9C,qCAAyE;AAEzE,SAAgB,cAAc,CAAC,OAAgB;IAC3C,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,6DAA6D,CAAC;SAC1E,MAAM,CAAC,WAAW,EAAE,6BAA6B,EAAE,KAAK,CAAC;SACzD,WAAW,CAAC,OAAO,EAAE;;;;CAI7B,CAAC,CAAC;SACM,MAAM,CAAC,KAAK,EAAE,OAAkD,EAAE,EAAE;QAEjE,MAAM,WAAW,GAAG,mBAAS,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAEnE,mFAAmF;QACnF,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,sBAAY,CAAC,OAAO,CAAC,mBAAmB,WAAW,uBAAuB,EAAE,KAAK,CAAC,EAAE,CAAC;YAC5G,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,MAAM,CAAC,sEAAsE,CAAC,CAAC,CAAC;YACpG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACX,CAAC;QAED,qFAAqF;QACrF,IAAI,CAAC,MAAM,sBAAY,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YACzD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACzB,CAAC;IACL,CAAC,CAAC,CAAC;AACX,CAAC"}

package/dist/commands/project/start.js

@@ -11,14 +11,18 @@ const shared_1 = require("./shared");
 function registerStart(project) {
     (0, shared_1.withProjectPathOption)(project
         .command('start')
-        .description('Build, deploy and start the local project')
-        .option('-q, --quiet', 'do not open the project in the browser after starting', false)
+        .description('Build, deploy and start the local project (proposes to install/start the runtime when needed)')
+        .option('--no-open', 'do not open the project in the browser once started')
     //TODO expose runtime start args here ?
     //TODO --watch (auto apply chnages with patch without restarting the runtime, for development purposes)
     )
         .action(async (options) => {
-        await RuntimeUtils_1.default.startProject(options.projectPath);
-        if (!options.quiet) {
+        // A declined runtime or a failed deployment leaves nothing to open
+        if (!await RuntimeUtils_1.default.startProject(options.projectPath)) {
+            process.exitCode = 1;
+            return;
+        }
+        if (options.open) {
             const basePath = await RuntimeUtils_1.default.getRuntimeBaseUrl();
             const serviceName = await ProjectUtils_1.default.getProjectServiceName(options.projectPath);
             OsUtils_1.OsUtils.openInBrowser(`${basePath}/${serviceName}`);

package/dist/commands/project/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/project/start.ts"],"names":[],"mappings":";;;;;AAMA,sCAiBC;AAtBD,4EAAoD;AACpD,4EAAoD;AACpD,iDAA8C;AAC9C,qCAAyE;AAEzE,SAAgB,aAAa,CAAC,OAAgB;IAC1C,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,2CAA2C,CAAC;SACxD,MAAM,CAAC,aAAa,EAAE,uDAAuD,EAAE,KAAK,CAAC;IACtF,uCAAuC;IACvC,uGAAuG;KAC1G;SACI,MAAM,CAAC,KAAK,EAAE,OAAoD,EAAE,EAAE;QACnE,MAAM,sBAAY,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAErD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,QAAQ,GAAG,MAAM,sBAAY,CAAC,iBAAiB,EAAE,CAAC;YACxD,MAAM,WAAW,GAAG,MAAM,sBAAY,CAAC,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAClF,iBAAO,CAAC,aAAa,CAAC,GAAG,QAAQ,IAAI,WAAW,EAAE,CAAC,CAAC;QACxD,CAAC;IACL,CAAC,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/project/start.ts"],"names":[],"mappings":";;;;;AAMA,sCAsBC;AA3BD,4EAAoD;AACpD,4EAAoD;AACpD,iDAA8C;AAC9C,qCAAyE;AAEzE,SAAgB,aAAa,CAAC,OAAgB;IAC1C,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,+FAA+F,CAAC;SAC5G,MAAM,CAAC,WAAW,EAAE,qDAAqD,CAAC;IAC3E,uCAAuC;IACvC,uGAAuG;KAC1G;SACI,MAAM,CAAC,KAAK,EAAE,OAAmD,EAAE,EAAE;QAElE,mEAAmE;QACnE,IAAI,CAAC,MAAM,sBAAY,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YACxD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACX,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,QAAQ,GAAG,MAAM,sBAAY,CAAC,iBAAiB,EAAE,CAAC;YACxD,MAAM,WAAW,GAAG,MAAM,sBAAY,CAAC,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAClF,iBAAO,CAAC,aAAa,CAAC,GAAG,QAAQ,IAAI,WAAW,EAAE,CAAC,CAAC;QACxD,CAAC;IACL,CAAC,CAAC,CAAC;AACX,CAAC"}

package/dist/commands/project/test.js

@@ -4,17 +4,55 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerTest = registerTest;
+const chalk_1 = __importDefault(require("chalk"));
+const ConsoleUtils_1 = __importDefault(require("../../utils/ConsoleUtils"));
 const RuntimeUtils_1 = __importDefault(require("../../utils/RuntimeUtils"));
 const shared_1 = require("./shared");
 function registerTest(project) {
     (0, shared_1.withProjectPathOption)(project
         .command('test')
-        .description('Run tests for the project')
+        .description('Run tests for the project (proposes to install the runtime when it is missing)')
         .option('-f, --file-filter <pattern>', 'filter test files by pattern')
         .option('-t, --name-filter <pattern>', 'filter tests by name pattern')
-        .option('--in-place', 'if compilation is needed, compile and modify files directly in the project folder', false))
+        .option('--in-place', 'if compilation is needed, compile and modify files directly in the project folder', false)
+        .option('--json', 'output the result in JSON format')
+        .addHelpText('after', `
+Examples:
+  $ cn project test                     every test, the report goes to test-report.json
+  $ cn project test -t "create*"        the tests whose name matches
+  $ cn project test --json              the summary and each test as JSON, exit code 1 when one fails
+`))
         .action(async (options) => {
-        await RuntimeUtils_1.default.testProject(options.projectPath, options.fileFilter, options.nameFilter, options.inPlace);
+        // Undefined when the user declined to install the runtime the tests run on
+        const result = await RuntimeUtils_1.default.testProject(options.projectPath, options.fileFilter, options.nameFilter, options.inPlace);
+        if (result === undefined) {
+            process.exitCode = 1;
+            return;
+        }
+        const report = result.report;
+        if (options.json) {
+            ConsoleUtils_1.default.json({
+                success: report?.Success ?? false,
+                successCount: report?.SuccessCount ?? 0,
+                failureCount: report?.FailureCount ?? 0,
+                reportPath: result.reportPath,
+                tests: (report?.Tests ?? []).map(test => ({ name: test.Name, success: test.Success, errors: test.Errors }))
+            });
+        }
+        else if (report === undefined) {
+            ConsoleUtils_1.default.warn(`No test report was produced.`);
+        }
+        else {
+            const summary = `${report.SuccessCount + report.FailureCount} test(s): ${report.SuccessCount} passed, ${report.FailureCount} failed (report: ${result.reportPath})`;
+            console.log(report.Success ? chalk_1.default.green(summary) : chalk_1.default.red(summary));
+            for (const test of report.Tests.filter(test => !test.Success)) {
+                console.error(chalk_1.default.red(`  ✗ ${test.Name}${test.Errors.length > 0 ? `: ${test.Errors.join('; ')}` : ''}`));
+            }
+        }
+        // Failing tests are a failed command, for the CI and the scripts
+        if (report === undefined || !report.Success) {
+            process.exitCode = 1;
+        }
     });
 }
 //# sourceMappingURL=test.js.map

package/dist/commands/project/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/commands/project/test.ts"],"names":[],"mappings":";;;;;AAIA,oCAUC;AAbD,4EAAoD;AACpD,qCAAyE;AAEzE,SAAgB,YAAY,CAAC,OAAgB;IACzC,IAAA,8BAAqB,EAAC,OAAO;SACxB,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,2BAA2B,CAAC;SACxC,MAAM,CAAC,6BAA6B,EAAE,8BAA8B,CAAC;SACrE,MAAM,CAAC,6BAA6B,EAAE,8BAA8B,CAAC;SACrE,MAAM,CAAC,YAAY,EAAE,mFAAmF,EAAE,KAAK,CAAC,CAAC;SACjH,MAAM,CAAC,KAAK,EAAE,OAAiG,EAAE,EAAE;QAChH,MAAM,sBAAY,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACjH,CAAC,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/commands/project/test.ts"],"names":[],"mappings":"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"}

package/dist/commands/runtime/clear.js

@@ -24,6 +24,11 @@ Examples:
             process.exitCode = 1;
             return;
         }
+        // The data cannot be erased under a running runtime (open files, inconsistent state): stop it first
+        if (await RuntimeUtils_1.default.isRuntimeRunning()) {
+            ConsoleUtils_1.default.log(chalk_1.default.blue(`Stopping the runtime before erasing its data...`));
+            await RuntimeUtils_1.default.stopRuntime();
+        }
         await RuntimeUtils_1.default.clearRuntime();
     });
 }

package/dist/commands/runtime/clear.js.map

@@ -1 +1 @@
-{"version":3,"file":"clear.js","sourceRoot":"","sources":["../../../src/commands/runtime/clear.ts"],"names":[],"mappings":";;;;;AAKA,sCAqBC;AAzBD,kDAA0B;AAC1B,4EAAoD;AACpD,4EAAoD;AAEpD,SAAgB,aAAa,CAAC,OAAgB;IAC1C,OAAO;SACF,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,sGAAsG,CAAC;SACnH,MAAM,CAAC,WAAW,EAAE,6BAA6B,EAAE,KAAK,CAAC;SACzD,WAAW,CAAC,OAAO,EAAE;;;;CAI7B,CAAC;SACO,MAAM,CAAC,KAAK,EAAE,OAAyB,EAAE,EAAE;QAExC,qGAAqG;QACrG,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,sBAAY,CAAC,OAAO,CAAC,oDAAoD,EAAE,KAAK,CAAC,EAAE,CAAC;YAC3G,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,MAAM,CAAC,qEAAqE,CAAC,CAAC,CAAC;YACnG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACX,CAAC;QAED,MAAM,sBAAY,CAAC,YAAY,EAAE,CAAC;IACtC,CAAC,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"clear.js","sourceRoot":"","sources":["../../../src/commands/runtime/clear.ts"],"names":[],"mappings":";;;;;AAKA,sCA2BC;AA/BD,kDAA0B;AAC1B,4EAAoD;AACpD,4EAAoD;AAEpD,SAAgB,aAAa,CAAC,OAAgB;IAC1C,OAAO;SACF,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,sGAAsG,CAAC;SACnH,MAAM,CAAC,WAAW,EAAE,6BAA6B,EAAE,KAAK,CAAC;SACzD,WAAW,CAAC,OAAO,EAAE;;;;CAI7B,CAAC;SACO,MAAM,CAAC,KAAK,EAAE,OAAyB,EAAE,EAAE;QAExC,qGAAqG;QACrG,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,sBAAY,CAAC,OAAO,CAAC,oDAAoD,EAAE,KAAK,CAAC,EAAE,CAAC;YAC3G,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,MAAM,CAAC,qEAAqE,CAAC,CAAC,CAAC;YACnG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACX,CAAC;QAED,oGAAoG;QACpG,IAAI,MAAM,sBAAY,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACxC,sBAAY,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC,CAAC;YAChF,MAAM,sBAAY,CAAC,WAAW,EAAE,CAAC;QACrC,CAAC;QAED,MAAM,sBAAY,CAAC,YAAY,EAAE,CAAC;IACtC,CAAC,CAAC,CAAC;AACX,CAAC"}

package/dist/commands/runtime/info.js

@@ -28,7 +28,7 @@ function registerInfo(runtime) {
             return;
         }
         if (isInstalled === false) {
-            console.log(chalk_1.default.yellow(`Codenotch runtime is not installed. Use "codenotch runtime install" to install the latest version.`));
+            console.error(chalk_1.default.yellow(`Codenotch runtime is not installed. Use "codenotch runtime install" to install the latest version.`));
             return;
         }
         const version = await RuntimeUtils_1.default.getRuntimeVersion(); // Requires running the runtime which is a bit slow

package/dist/commands/runtime/info.js.map

@@ -1 +1 @@
-{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../src/commands/runtime/info.ts"],"names":[],"mappings":";;;;;AAIA,oCA0CC;AA7CD,kDAA0B;AAC1B,4EAAoD;AAEpD,SAAgB,YAAY,CAAC,OAAgB;IACzC,OAAO;SACF,OAAO,CAAC,MAAM,CAAC;SACf,KAAK,CAAC,QAAQ,CAAC;SACf,WAAW,CAAC,0DAA0D,CAAC;SACvE,MAAM,CAAC,QAAQ,EAAE,kCAAkC,CAAC;SACpD,MAAM,CAAC,KAAK,EAAE,OAA0B,EAAE,EAAE;QAEzC,MAAM,WAAW,GAAG,MAAM,sBAAY,CAAC,kBAAkB,EAAE,CAAC;QAC5D,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;gBACxB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;gBAClD,OAAO;YACX,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,sBAAY,CAAC,iBAAiB,EAAE,CAAC;YACvD,MAAM,WAAW,GAAG,sBAAY,CAAC,wBAAwB,EAAE,CAAC;YAC5D,MAAM,OAAO,GAAG,MAAM,sBAAY,CAAC,iBAAiB,EAAE,CAAC;YACvD,MAAM,SAAS,GAAG,MAAM,sBAAY,CAAC,gBAAgB,EAAE,CAAC;YACxD,MAAM,QAAQ,GAAG,MAAM,sBAAY,CAAC,kBAAkB,EAAE,CAAC;YACzD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;YACnI,OAAO;QACX,CAAC;QAED,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;YACxB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,oGAAoG,CAAC,CAAC,CAAC;YAChI,OAAO;QACX,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,sBAAY,CAAC,iBAAiB,EAAE,CAAC,CAAC,mDAAmD;QAC3G,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,sBAAY,CAAC,wBAAwB,EAAE,CAAC;QAC5D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,sCAAsC,WAAW,EAAE,CAAC,CAAC,CAAC;QAC9E,MAAM,OAAO,GAAG,MAAM,sBAAY,CAAC,iBAAiB,EAAE,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,QAAQ,OAAO,EAAE,CAAC,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,MAAM,sBAAY,CAAC,gBAAgB,EAAE,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,WAAW,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QAC7E,MAAM,QAAQ,GAAG,MAAM,sBAAY,CAAC,kBAAkB,EAAE,CAAC;QACzD,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,cAAc,QAAQ,EAAE,CAAC,CAAC,CAAC;QACvD,CAAC;QAED,8EAA8E;IAClF,CAAC,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../src/commands/runtime/info.ts"],"names":[],"mappings":";;;;;AAIA,oCA0CC;AA7CD,kDAA0B;AAC1B,4EAAoD;AAEpD,SAAgB,YAAY,CAAC,OAAgB;IACzC,OAAO;SACF,OAAO,CAAC,MAAM,CAAC;SACf,KAAK,CAAC,QAAQ,CAAC;SACf,WAAW,CAAC,0DAA0D,CAAC;SACvE,MAAM,CAAC,QAAQ,EAAE,kCAAkC,CAAC;SACpD,MAAM,CAAC,KAAK,EAAE,OAA0B,EAAE,EAAE;QAEzC,MAAM,WAAW,GAAG,MAAM,sBAAY,CAAC,kBAAkB,EAAE,CAAC;QAC5D,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;gBACxB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;gBAClD,OAAO;YACX,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,sBAAY,CAAC,iBAAiB,EAAE,CAAC;YACvD,MAAM,WAAW,GAAG,sBAAY,CAAC,wBAAwB,EAAE,CAAC;YAC5D,MAAM,OAAO,GAAG,MAAM,sBAAY,CAAC,iBAAiB,EAAE,CAAC;YACvD,MAAM,SAAS,GAAG,MAAM,sBAAY,CAAC,gBAAgB,EAAE,CAAC;YACxD,MAAM,QAAQ,GAAG,MAAM,sBAAY,CAAC,kBAAkB,EAAE,CAAC;YACzD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;YACnI,OAAO;QACX,CAAC;QAED,IAAI,WAAW,KAAK,KAAK,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,MAAM,CAAC,oGAAoG,CAAC,CAAC,CAAC;YAClI,OAAO;QACX,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,sBAAY,CAAC,iBAAiB,EAAE,CAAC,CAAC,mDAAmD;QAC3G,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC,CAAC;QAChD,MAAM,WAAW,GAAG,sBAAY,CAAC,wBAAwB,EAAE,CAAC;QAC5D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,sCAAsC,WAAW,EAAE,CAAC,CAAC,CAAC;QAC9E,MAAM,OAAO,GAAG,MAAM,sBAAY,CAAC,iBAAiB,EAAE,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,QAAQ,OAAO,EAAE,CAAC,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,MAAM,sBAAY,CAAC,gBAAgB,EAAE,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,WAAW,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QAC7E,MAAM,QAAQ,GAAG,MAAM,sBAAY,CAAC,kBAAkB,EAAE,CAAC;QACzD,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,cAAc,QAAQ,EAAE,CAAC,CAAC,CAAC;QACvD,CAAC;QAED,8EAA8E;IAClF,CAAC,CAAC,CAAC;AACX,CAAC"}