@signageos/cli 2.8.0 → 3.0.0-rc.0

package/README.md

@@ -45,12 +45,6 @@ sos autocomplete uninstall
 This will remove the completion script and the source line from your shell configuration file.
 
 
-## Test
-```bash
-cp .env.amy .env
-npm test
-```
-
 ## API reference
 ### General
 | Argument                   | Description                     | Default value                                     |

package/dist/Applet/Build/appletBuildCommand.js

@@ -21,6 +21,7 @@ const dist_1 = require("@signageos/sdk/dist");
 const appletFacade_1 = require("../appletFacade");
 const log_1 = require("@signageos/sdk/dist/Console/log");
 const debug_1 = __importDefault(require("debug"));
+const appletValidation_1 = require("../appletValidation");
 const Debug = (0, debug_1.default)('@signageos/cli:Applet:Build:appletBuildCommand');
 exports.OPTION_LIST = [organizationFacade_1.NO_DEFAULT_ORGANIZATION_OPTION, organizationFacade_1.ORGANIZATION_UID_OPTION, appletFacade_1.APPLET_UID_OPTION];
 /**
@@ -56,6 +57,7 @@ exports.appletBuild = (0, commandDefinition_1.createCommandDefinition)({
     run(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const currentDirectory = process.cwd();
+            yield (0, appletValidation_1.validateAppletDirectory)(currentDirectory);
             const organizationUid = yield (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options);
             const organization = yield (0, organizationFacade_1.getOrganization)(organizationUid);
             const restApi = yield (0, helper_1.createOrganizationRestApi)(organization);

package/dist/Applet/Generate/appletGenerateCommand.js

@@ -47,9 +47,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.appletGenerate = void 0;
 const fs = __importStar(require("fs-extra"));
-const child_process = __importStar(require("child_process"));
+const child_process = __importStar(require("node:child_process"));
 const chalk_1 = __importDefault(require("chalk"));
-const path = __importStar(require("path"));
+const path = __importStar(require("node:path"));
 const prompts_1 = __importDefault(require("prompts"));
 const log_1 = require("@signageos/sdk/dist/Console/log");
 const git_1 = require("../../Lib/git");
@@ -80,7 +80,7 @@ var Packager;
 const NAME_REGEXP = /^\w(\w|\d|-)*\w$/;
 let PACKAGER_EXECUTABLE = 'npm';
 const OPTION_LIST = [
-    { name: 'name', type: String, description: `Applet name. Match RegExp: /^\\w(\\w|\\d|-)*\\w$/` },
+    { name: 'name', type: String, description: String.raw `Applet name. Match RegExp: /^\w(\w|\d|-)*\w$/` },
     { name: 'applet-version', type: String, description: 'Applet initial version. Use semantic version', defaultValue: '0.0.0' },
     { name: 'target-dir', type: String, description: 'Directory where will be the applet generated to' },
     { name: 'git', type: String, description: 'Init applet as git repository "no" (default) or "yes"' },
@@ -122,7 +122,7 @@ const RUNSCRIPTS = {
     webpack: {
         start: 'webpack serve --mode development',
         build: 'webpack --mode production',
-        connect: 'echo "Deprecated command \\"npm run connect\\". Use \\"npm run watch\\" instead." && npm run watch',
+        connect: String.raw `echo "Deprecated command \"npm run connect\". Use \"npm run watch\" instead." && npm run watch`,
         watch: 'webpack --watch',
     },
     rspack: {
@@ -180,9 +180,9 @@ exports.appletGenerate = (0, commandDefinition_1.createCommandDefinition)({
         return __awaiter(this, void 0, void 0, function* () {
             const currentDirectory = process.cwd();
             // Detect if the command has been called with optional parameters
-            const excludedKeys = ['command', 'applet-version'];
+            const excludedKeys = new Set(['command', 'applet-version']);
             const argumentsFound = Object.entries(options)
-                .filter(([key]) => !excludedKeys.includes(key))
+                .filter(([key]) => !excludedKeys.has(key))
                 .map(([key, value]) => ({ [key]: value })).length > 0;
             console.info('sOS CLI started with params:', options);
             // Create file index
@@ -303,8 +303,8 @@ exports.appletGenerate = (0, commandDefinition_1.createCommandDefinition)({
                     RUNSCRIPTS.common = {
                         prepare: 'pnpm run clean && pnpm run build',
                         upload: 'sos applet upload',
-                        clean: 'pnpx rimraf dist',
-                        escheck: 'pnpx es-check@9.4.0 --module es5 "./dist/**/*.js"',
+                        clean: 'npx rimraf dist',
+                        escheck: 'pnpm es-check --module es5 "./dist/**/*.js"',
                         postbuild: 'pnpm run escheck',
                     };
                     break;
@@ -339,8 +339,7 @@ exports.appletGenerate = (0, commandDefinition_1.createCommandDefinition)({
                 generateFiles.push({
                     path: path.join(appletRootDirectory, 'src', 'index.ts'),
                     content: createIndexTs(),
-                });
-                generateFiles.push({
+                }, {
                     path: path.join(appletRootDirectory, 'tsconfig.json'),
                     content: createTsConfig(),
                 });
@@ -359,12 +358,10 @@ exports.appletGenerate = (0, commandDefinition_1.createCommandDefinition)({
             }
             // Create styles
             // TODO sass support
-            {
-                generateFiles.push({
-                    path: path.join(appletRootDirectory, 'src', 'index.css'),
-                    content: createIndexCss(),
-                });
-            }
+            generateFiles.push({
+                path: path.join(appletRootDirectory, 'src', 'index.css'),
+                content: createIndexCss(),
+            });
             // Create custom npm registry config
             if (typeof options['npm-registry'] === 'string') {
                 generateFiles.push({
@@ -379,12 +376,10 @@ exports.appletGenerate = (0, commandDefinition_1.createCommandDefinition)({
             generateFiles.push({
                 path: path.join(appletRootDirectory, 'package.json'),
                 content: JSON.stringify(yield createPackageConfig(appletName, String(options['applet-version']), bundler, language), undefined, 2) + '\n',
-            });
-            generateFiles.push({
+            }, {
                 path: path.join(appletRootDirectory, 'CHANGELOG.md'),
                 content: createChangelogFile(),
-            });
-            generateFiles.push({
+            }, {
                 path: path.join(appletRootDirectory, 'README.md'),
                 content: createReadmeFile(),
             });
@@ -408,12 +403,10 @@ exports.appletGenerate = (0, commandDefinition_1.createCommandDefinition)({
             generateFiles.push({
                 path: path.join(appletRootDirectory, 'public', 'index.html'),
                 content: createIndexHtml(appletName),
-            });
-            generateFiles.push({
+            }, {
                 path: path.join(appletRootDirectory, '.sosignore'),
                 content: 'node_modules/\n',
-            });
-            generateFiles.push({
+            }, {
                 path: path.join(appletRootDirectory, 'sos.config.local.json'),
                 content: '{}\n',
             });
@@ -421,7 +414,7 @@ exports.appletGenerate = (0, commandDefinition_1.createCommandDefinition)({
             if (git === GitOptions.Yes && gitFound) {
                 generateFiles.push({
                     path: path.join(appletRootDirectory, '.gitignore'),
-                    content: 'node_modules/\n./dist\nsos.config.local.json',
+                    content: 'node_modules/\n/dist/\nsos.config.local.json',
                 });
                 yield (0, git_1.initGitRepository)(appletRootDirectory, true).catch((error) => {
                     console.error(`Git repository initialization failed: ${error}`);
@@ -439,29 +432,18 @@ exports.appletGenerate = (0, commandDefinition_1.createCommandDefinition)({
             if (packagerFound) {
                 // Install dependencies
                 process.chdir(appletRootDirectory);
-                // Ensure the default .npmrc file will be loaded from project root
-                // Yarn 2+ uses .yarnrc.yml, but we can use this flag to override user's .npmrc
-                const packagerPrefix = ''; // 'NPM_CONFIG_USERCONFIG=/dev/null';
-                // Apply packager specific options
-                let configFlag = '';
-                switch (packager) {
-                    case Packager.Yarn:
-                        // Prevent Yarn from automatically detecting yarnrc and npmrc files
-                        configFlag = '--no-default-rc';
-                        break;
-                    case Packager.Bun:
-                        // Prevent Bun from failing on issues related to lockfile permissions
-                        configFlag = '--frozen-lockfile';
-                        break;
-                    default:
-                    // Other packagers (npm, pnpm) currently do not require any special config
-                }
                 const installCommand = packager === Packager.Yarn ? 'add' : 'install';
                 // Log the command being executed
-                console.info(`Installing dependencies: ${packagerPrefix} ${PACKAGER_EXECUTABLE} ${installCommand} ${configFlag} --save-dev ${mergedDeps.join(' ')}`);
-                const child = child_process.spawn(PACKAGER_EXECUTABLE, [packagerPrefix, installCommand, configFlag, '--save-dev', ...mergedDeps], {
+                console.info(`Installing dependencies: ${PACKAGER_EXECUTABLE} ${installCommand} --save-dev ${mergedDeps.join(' ')}`);
+                // Override registry env so the spawned process doesn't inherit a private
+                // registry from the parent project's .npmrc or global config.
+                // npm_config_registry is recognised by npm, bun and pnpm.
+                const registryUrl = typeof options['npm-registry'] === 'string' ? options['npm-registry'] : 'https://registry.npmjs.org/';
+                const spawnEnv = Object.assign(Object.assign({}, process.env), { npm_config_registry: registryUrl });
+                const child = child_process.spawn(PACKAGER_EXECUTABLE, [installCommand, '--save-dev', ...mergedDeps], {
                     stdio: 'pipe', // Use 'pipe' to capture stdout and stderr
                     shell: true,
+                    env: spawnEnv,
                 });
                 // Capture and log stdout
                 child.stdout.on('data', (data) => {
@@ -471,23 +453,33 @@ exports.appletGenerate = (0, commandDefinition_1.createCommandDefinition)({
                 child.stderr.on('data', (data) => {
                     console.error(`${data.toString()}`);
                 });
-                // Handle errors
-                child.on('error', (error) => {
-                    console.error(`Error executing command: ${error.message}`);
-                });
-                // Handle process exit
-                child.on('close', (code) => {
-                    if (code === 0) {
-                        (0, log_1.log)('info', `\nApplet ${chalk_1.default.green(appletName)} created!`);
-                        (0, log_1.log)('info', `\nContinue with ${chalk_1.default.green(`cd ${appletRootDirectoryName}`)} and ${chalk_1.default.green(`${PACKAGER_EXECUTABLE} start`)}`);
-                    }
-                    else {
-                        console.error(`Command exited with code ${code}`);
-                    }
+                // Wait for the install process to finish before returning
+                yield new Promise((resolve, reject) => {
+                    child.on('error', (error) => {
+                        console.error(`Error executing command: ${error.message}`);
+                        reject(error);
+                    });
+                    child.on('close', (code) => {
+                        if (code === 0) {
+                            (0, log_1.log)('info', `\nApplet ${chalk_1.default.green(appletName)} created!`);
+                            const cdCommand = chalk_1.default.green(`cd ${appletRootDirectoryName}`);
+                            const startCommand = chalk_1.default.green(`${PACKAGER_EXECUTABLE} start`);
+                            (0, log_1.log)('info', `\nContinue with ${cdCommand} and ${startCommand}`);
+                            resolve();
+                        }
+                        else {
+                            console.error(`Command exited with code ${code}`);
+                            resolve(); // Don't reject — let the CLI exit gracefully
+                        }
+                    });
                 });
             }
             else {
-                (0, log_1.log)('info', `${chalk_1.default.red(`Please first install ${PACKAGER_EXECUTABLE} globally.`)}\nContinue with ${chalk_1.default.green(`cd ${appletRootDirectoryName}`)}, ${chalk_1.default.green(`${PACKAGER_EXECUTABLE} install`)} and ${chalk_1.default.green(`${PACKAGER_EXECUTABLE} start`)}`);
+                const installMessage = chalk_1.default.red(`Please first install ${PACKAGER_EXECUTABLE} globally.`);
+                const cdMessage = chalk_1.default.green(`cd ${appletRootDirectoryName}`);
+                const installCmd = chalk_1.default.green(`${PACKAGER_EXECUTABLE} install`);
+                const startCmd = chalk_1.default.green(`${PACKAGER_EXECUTABLE} start`);
+                (0, log_1.log)('info', `${installMessage}\nContinue with ${cdMessage}, ${installCmd} and ${startCmd}`);
                 (0, log_1.log)('info', `\nApplet ${chalk_1.default.white(appletName)} created!`);
             }
         });
@@ -530,7 +522,7 @@ const createPackageConfig = (name, version, bundler, language) => __awaiter(void
 const createWebpackConfig = () => importFileAsString('./Templates/webpack.config.js.template');
 const createRspackConfig = () => importFileAsString('./Templates/rspack.config.mjs.template');
 const createIndexHtml = (title) => {
-    return importFileAsString('./Templates/index.html.template').replace(/\$\{title\}/g, title);
+    return importFileAsString('./Templates/index.html.template').replaceAll('${title}', title);
 };
 const createIndexCss = () => importFileAsString('./Templates/index.css.template');
 const createIndexJs = () => importFileAsString('./Templates/index.js.template');

package/dist/Applet/Start/appletStartCommand.js

@@ -24,6 +24,7 @@ const wait_1 = __importDefault(require("../../Timer/wait"));
 const appletServerHelper_1 = require("../appletServerHelper");
 const log_1 = require("@signageos/sdk/dist/Console/log");
 const parameters_1 = require("../../parameters");
+const appletValidation_1 = require("../appletValidation");
 const DEFAULT_PORT = 8090;
 const PORT_OPTION = {
     name: 'port',
@@ -96,8 +97,9 @@ exports.appletStart = (0, commandDefinition_1.createCommandDefinition)({
             var _a, _b;
             const currentDirectory = process.cwd();
             const organizationUid = yield (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options);
-            const entryFileAbsolutePath = yield (0, appletUploadCommandHelper_1.getAppletEntryFileAbsolutePath)(currentDirectory, options);
             const appletPath = yield (0, appletUploadCommandHelper_1.getAppletDirectoryAbsolutePath)(currentDirectory, options);
+            yield (0, appletValidation_1.validateAppletDirectory)(appletPath);
+            const entryFileAbsolutePath = yield (0, appletUploadCommandHelper_1.getAppletEntryFileAbsolutePath)(currentDirectory, options);
             const entryFileRelativePath = (0, appletUploadCommandHelper_1.getAppletEntryFileRelativePath)(entryFileAbsolutePath, appletPath);
             const emulatorUid = yield (0, emulatorFacade_1.loadEmulatorOrCreateNewAndReturnUid)(organizationUid);
             const dev = (0, dist_1.createDevelopment)({

package/dist/Applet/Test/Upload/appletTestRunCommand.js

@@ -21,9 +21,11 @@ const appletFacade_1 = require("../../appletFacade");
 const progressBarFactory_1 = require("../../../CommandLine/progressBarFactory");
 const deviceFacade_1 = require("../../../Device/deviceFacade");
 const appletTestRunFacade_1 = require("./appletTestRunFacade");
+const paginationHelper_1 = require("../../../helper/paginationHelper");
 const wait_1 = __importDefault(require("../../../Timer/wait"));
 const commandDefinition_1 = require("../../../Command/commandDefinition");
 const log_1 = require("@signageos/sdk/dist/Console/log");
+const appletValidation_1 = require("../../appletValidation");
 const OPTION_LIST = [
     organizationFacade_1.NO_DEFAULT_ORGANIZATION_OPTION,
     deviceFacade_1.DEVICE_UID_OPTION,
@@ -75,7 +77,8 @@ exports.appletTestRun = (0, commandDefinition_1.createCommandDefinition)({
             const skipConfirmation = !!options.yes;
             let tests = options.test;
             const currentDirectory = process.cwd();
-            const organizationUid = yield (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options);
+            yield (0, appletValidation_1.validateAppletDirectory)(currentDirectory);
+            const organizationUid = yield (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options, skipConfirmation);
             const organization = yield (0, organizationFacade_1.getOrganization)(organizationUid);
             const restApi = yield (0, helper_1.createOrganizationRestApi)(organization);
             const deviceUid = yield (0, deviceFacade_1.getDeviceUid)(restApi, options);
@@ -84,12 +87,14 @@ exports.appletTestRun = (0, commandDefinition_1.createCommandDefinition)({
             const appletUid = yield (0, appletFacade_1.getAppletUid)(restApi, options);
             const applet = yield restApi.applet.get(appletUid);
             const appletVersion = yield restApi.applet.version.get(appletUid, version);
-            const testSuites = yield restApi.applet.tests.list(applet.uid, appletVersion.version);
+            const testSuites = yield (0, paginationHelper_1.getAllPages)(yield restApi.applet.tests.list(applet.uid, appletVersion.version));
             if (!tests || tests.length === 0) {
                 tests = testSuites.map((testSuite) => testSuite.identifier);
             }
-            (0, appletTestRunFacade_1.validateTestIdentifiers)(tests, testSuites);
-            printRunTests(tests);
+            // At this point tests should be defined, but TypeScript doesn't know that
+            const testsToRun = tests || [];
+            (0, appletTestRunFacade_1.validateTestIdentifiers)(testsToRun, testSuites);
+            printRunTests(testsToRun);
             if (!skipConfirmation) {
                 const response = yield (0, prompts_1.default)({
                     type: 'confirm',
@@ -104,10 +109,10 @@ exports.appletTestRun = (0, commandDefinition_1.createCommandDefinition)({
             const progressBar = (0, progressBarFactory_1.createProgressBar)();
             try {
                 progressBar.init({
-                    size: tests.length,
+                    size: testsToRun.length,
                     name: RUNNING_TEST_TITLE,
                 });
-                yield restApi.device.appletTest.run(device.uid, applet.uid, appletVersion.version, tests);
+                yield restApi.device.appletTest.run(device.uid, applet.uid, appletVersion.version, testsToRun);
                 let deviceAppletTest;
                 do {
                     yield (0, wait_1.default)(1e3);

package/dist/Applet/Test/Upload/appletTestUploadCommand.js

@@ -21,8 +21,10 @@ const appletTestUploadFacade_1 = require("./appletTestUploadFacade");
 const appletFacade_1 = require("../../appletFacade");
 const progressBarFactory_1 = require("../../../CommandLine/progressBarFactory");
 const packageConfig_1 = require("@signageos/sdk/dist/FileSystem/packageConfig");
+const paginationHelper_1 = require("../../../helper/paginationHelper");
 const commandDefinition_1 = require("../../../Command/commandDefinition");
 const log_1 = require("@signageos/sdk/dist/Console/log");
+const appletValidation_1 = require("../../appletValidation");
 const OPTION_LIST = [
     organizationFacade_1.NO_DEFAULT_ORGANIZATION_OPTION,
     organizationFacade_1.ORGANIZATION_UID_OPTION,
@@ -79,7 +81,8 @@ exports.appletTestUpload = (0, commandDefinition_1.createCommandDefinition)({
             const isVerbose = !!options.verbose;
             const skipConfirmation = !!options.yes;
             const currentDirectory = process.cwd();
-            const organizationUid = yield (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options);
+            yield (0, appletValidation_1.validateAppletDirectory)(currentDirectory);
+            const organizationUid = yield (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options, skipConfirmation);
             const organization = yield (0, organizationFacade_1.getOrganization)(organizationUid);
             const restApi = yield (0, helper_1.createOrganizationRestApi)(organization);
             const version = yield (0, appletFacade_1.getAppletVersion)(currentDirectory);
@@ -95,7 +98,7 @@ exports.appletTestUpload = (0, commandDefinition_1.createCommandDefinition)({
             if (isVerbose) {
                 printMatchedFiles(testFiles);
             }
-            const testSuites = yield restApi.applet.tests.list(applet.uid, appletVersion.version);
+            const testSuites = yield (0, paginationHelper_1.getAllPages)(yield restApi.applet.tests.list(applet.uid, appletVersion.version));
             const testSuitesMap = {};
             for (const testSuite of testSuites) {
                 testSuitesMap[testSuite.identifier] = testSuite;
@@ -151,8 +154,8 @@ exports.appletTestUpload = (0, commandDefinition_1.createCommandDefinition)({
     },
 });
 function displaySuccessMessage(appletName, appletVersion) {
-    (0, log_1.log)('info', `Applet ${chalk_1.default.green(appletName)} version ${chalk_1.default.green(appletVersion)} tests has been uploaded.`);
-    (0, log_1.log)('info', `To run the tests, use command ${chalk_1.default.blue(`sos applet test run`)}`);
+    (0, log_1.log)('info', `\nApplet ${chalk_1.default.green(appletName)} version ${chalk_1.default.green(appletVersion)} tests has been uploaded.`);
+    (0, log_1.log)('info', `To run the tests, use command ${chalk_1.default.green(`sos applet test run`)}`);
 }
 function printMatchedFiles(testFiles) {
     if (testFiles.length > 0) {

package/dist/Applet/Upload/appletUploadCommand.d.ts

@@ -56,14 +56,28 @@ export declare const OPTION_LIST: readonly [{
  * # Upload with organization override
  * sos applet upload --organization-uid abc123def456
  *
- * # Skip confirmation prompts
+ * # Skip confirmation prompts (auto-selects if only 1 org available)
  * sos applet upload --yes
  *
+ * # CI/CD: Non-interactive upload with specific organization
+ * sos applet upload --yes --organization-uid abc123def456
+ *
  * # Verbose output with detailed file information
  * sos applet upload --verbose
  *
  * # Update package.json with new applet UID
  * sos applet upload --update-package-config
+ *
+ * # Complete CI/CD example
+ * sos applet upload --yes --organization-uid abc123def456 --update-package-config
+ * ```
+ *
+ * **Note for CI/CD and --yes flag:**
+ * When using `--yes` with multiple organizations:
+ * - If you have only 1 organization: it will be auto-selected
+ * - If you have multiple organizations: you MUST specify `--organization-uid`
+ * - Alternative: Set a default organization with `sos organization set-default`
+ *
  * ```
  *
  * @throws {Error} When package.json is missing or invalid

package/dist/Applet/Upload/appletUploadCommand.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 __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) {
@@ -15,8 +48,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.appletUpload = exports.OPTION_LIST = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const prompts_1 = __importDefault(require("prompts"));
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs-extra"));
 const helper_1 = require("../../helper");
-const parameters_1 = require("../../parameters");
 const organizationFacade_1 = require("../../Organization/organizationFacade");
 const appletFacade_1 = require("../appletFacade");
 const appletUploadFacade_1 = require("./appletUploadFacade");
@@ -30,6 +64,7 @@ const log_1 = require("@signageos/sdk/dist/Console/log");
 const sdk_1 = require("@signageos/sdk");
 const GatewayError_1 = __importDefault(require("@signageos/sdk/dist/RestApi/Error/GatewayError"));
 const NotFoundError_1 = __importDefault(require("@signageos/sdk/dist/RestApi/Error/NotFoundError"));
+const appletValidation_1 = require("../appletValidation");
 exports.OPTION_LIST = [
     appletUploadCommandHelper_1.APPLET_PATH_OPTION,
     appletUploadCommandHelper_1.ENTRY_FILE_PATH_OPTION,
@@ -77,14 +112,28 @@ exports.OPTION_LIST = [
  * # Upload with organization override
  * sos applet upload --organization-uid abc123def456
  *
- * # Skip confirmation prompts
+ * # Skip confirmation prompts (auto-selects if only 1 org available)
  * sos applet upload --yes
  *
+ * # CI/CD: Non-interactive upload with specific organization
+ * sos applet upload --yes --organization-uid abc123def456
+ *
  * # Verbose output with detailed file information
  * sos applet upload --verbose
  *
  * # Update package.json with new applet UID
  * sos applet upload --update-package-config
+ *
+ * # Complete CI/CD example
+ * sos applet upload --yes --organization-uid abc123def456 --update-package-config
+ * ```
+ *
+ * **Note for CI/CD and --yes flag:**
+ * When using `--yes` with multiple organizations:
+ * - If you have only 1 organization: it will be auto-selected
+ * - If you have multiple organizations: you MUST specify `--organization-uid`
+ * - Alternative: Set a default organization with `sos organization set-default`
+ *
  * ```
  *
  * @throws {Error} When package.json is missing or invalid
@@ -103,25 +152,44 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
     run(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const currentDirectory = process.cwd();
-            const organizationUid = yield (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options);
+            const skipPrompts = options.yes;
+            const organizationUid = yield (0, organizationFacade_1.getOrganizationUidOrDefaultOrSelect)(options, skipPrompts);
             const organization = yield (0, organizationFacade_1.getOrganization)(organizationUid);
             const restApi = yield (0, helper_1.createOrganizationRestApi)(organization);
-            const { name: appletName, version: appletVersion, frontAppletVersion } = yield (0, appletFacade_1.getApplet)(currentDirectory);
             const appletPathOption = options['applet-path'];
             const appletEntryOption = options['entry-file-path'];
             const updatePackageConfig = options['update-package-config'];
             let appletBinaryFilePath = undefined;
             let appletDirectoryPath = undefined;
             let appletEntryFilePath = undefined;
-            const isSingleFileApplet = !!(appletPathOption && !appletEntryOption);
+            // Determine if this is a single file applet by checking if applet-path points to a file
+            let isSingleFileApplet = false;
+            if (appletPathOption) {
+                const appletPath = path.isAbsolute(appletPathOption) ? appletPathOption : path.join(currentDirectory, appletPathOption);
+                if (yield fs.pathExists(appletPath)) {
+                    const stats = yield fs.stat(appletPath);
+                    isSingleFileApplet = stats.isFile();
+                }
+                else {
+                    // If path doesn't exist, fall back to the original logic
+                    isSingleFileApplet = !appletEntryOption;
+                }
+            }
             if (isSingleFileApplet) {
                 displaySingleFileAppletDeprecationNote();
                 appletBinaryFilePath = yield (0, appletUploadCommandHelper_1.getAppletBinaryFileAbsolutePath)(currentDirectory, options);
             }
             else {
                 appletDirectoryPath = yield (0, appletUploadCommandHelper_1.getAppletDirectoryAbsolutePath)(currentDirectory, options);
-                appletEntryFilePath = yield (0, appletUploadCommandHelper_1.getAppletEntryFileAbsolutePath)(currentDirectory, options);
+                // For multi-file applets, use the applet directory as the base for resolving the entry file
+                appletEntryFilePath = yield (0, appletUploadCommandHelper_1.getAppletEntryFileAbsolutePath)(appletDirectoryPath, options);
             }
+            // Validate that the applet directory contains a valid applet
+            // For multi-file applets, validate the resolved applet directory
+            // For single-file applets (deprecated), validate the current directory
+            const directoryToValidate = appletDirectoryPath !== null && appletDirectoryPath !== void 0 ? appletDirectoryPath : currentDirectory;
+            yield (0, appletValidation_1.validateAppletDirectory)(directoryToValidate);
+            const { name: appletName, version: appletVersion, frontAppletVersion } = yield (0, appletFacade_1.getApplet)(directoryToValidate);
             let overrideAppletVersionConfirmed = false;
             let createNewAppletVersionConfirmed = false;
             let appletUid;
@@ -138,7 +206,10 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
             }
             finally {
                 if (updatePackageConfig) {
-                    yield (0, packageConfig_1.saveToPackage)(currentDirectory, { sos: { appletUid } });
+                    // For multi-file applets, save to the applet directory's package.json
+                    // For single-file applets, save to the current directory's package.json
+                    const packageConfigDirectory = isSingleFileApplet ? currentDirectory : appletDirectoryPath || currentDirectory;
+                    yield (0, packageConfig_1.saveToPackage)(packageConfigDirectory, { sos: { appletUid } });
                 }
             }
             const applet = yield restApi.applet.get(appletUid);
@@ -233,7 +304,7 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
                             progressBar: progressBar,
                         });
                     }
-                    displaySuccessMessage(applet.uid, applet.name, appletVersion, parameters_1.parameters.boxHost);
+                    displaySuccessMessage(applet.uid, applet.name, appletVersion);
                 }
                 else if (createNewAppletVersionConfirmed) {
                     if (isSingleFileApplet) {
@@ -262,7 +333,7 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
                             progressBar,
                         });
                     }
-                    displaySuccessMessage(applet.uid, applet.name, appletVersion, parameters_1.parameters.boxHost);
+                    displaySuccessMessage(applet.uid, applet.name, appletVersion);
                 }
             }
             catch (error) {
@@ -274,10 +345,8 @@ exports.appletUpload = (0, commandDefinition_1.createCommandDefinition)({
         });
     },
 });
-function displaySuccessMessage(appletUid, appletName, appletVersion, boxHost) {
-    (0, log_1.log)('info', `Applet ${chalk_1.default.green(appletName)} version ${chalk_1.default.green(appletVersion)} has been uploaded.`);
-    const appletBoxUri = `https://${boxHost}/applet/${appletUid}/${appletVersion}/build`;
-    (0, log_1.log)('info', `To build specific applications (Tizen, WebOS, SSSP, BrightSign, RPi, Android etc.) go to ${chalk_1.default.blue(appletBoxUri)}`);
+function displaySuccessMessage(appletUid, appletName, appletVersion) {
+    (0, log_1.log)('info', `\nApplet ${chalk_1.default.green(appletName)} version ${chalk_1.default.green(appletVersion)} (${chalk_1.default.blue(appletUid)}) uploaded successfully.`);
 }
 function displaySingleFileAppletDeprecationNote() {
     (0, log_1.log)('warning', `${chalk_1.default.red(`Applets with only applet-path file are ${chalk_1.default.bold(`deprecated`)}.`)} Please find more information at our website.`);

package/dist/Applet/Upload/appletUploadCommandHelper.js

@@ -82,7 +82,7 @@ function getAppletDirectoryAbsolutePath(currentDirectory, options) {
         if (appletDirectoryPath.length > 1 && (appletDirectoryPath.endsWith('/') || appletDirectoryPath.endsWith('\\'))) {
             appletDirectoryPath = appletDirectoryPath.slice(0, -1);
         }
-        (0, log_1.log)('info', `\nUse applet project directory path: ${appletDirectoryPath}`);
+        (0, log_1.log)('info', chalk_1.default.white(`Use applet project directory path: ${appletDirectoryPath}`) + '\n');
         const appletDirectoryPathExists = yield fs.pathExists(appletDirectoryPath);
         if (!appletDirectoryPathExists) {
             throw new Error(`Applet project directory not found: ${appletDirectoryPath}`);
@@ -105,7 +105,7 @@ function getAppletBinaryFileAbsolutePath(currentDirectory, options) {
         }
         // Normalize the path for cross-platform compatibility
         appletBinaryFilePath = path.normalize(appletBinaryFilePath);
-        (0, log_1.log)('info', `\nUse applet binary file: ${appletBinaryFilePath}`);
+        (0, log_1.log)('info', chalk_1.default.white(`Use applet binary file: ${appletBinaryFilePath}` + '\n'));
         const appletBinaryFilePathExists = yield fs.pathExists(appletBinaryFilePath);
         if (!appletBinaryFilePathExists) {
             throw new Error(`Applet binary file not found: ${appletBinaryFilePath}`);
@@ -132,7 +132,7 @@ function getAppletEntryFileAbsolutePath(currentDirectory, options) {
         }
         // Normalize the path for cross-platform compatibility
         appletEntryFilePath = path.normalize(appletEntryFilePath);
-        (0, log_1.log)('info', `\nUse applet entry file: ${appletEntryFilePath}`);
+        (0, log_1.log)('info', chalk_1.default.white(`Use applet entry file: ${appletEntryFilePath}`) + '\n');
         const appletEntryFilePathExists = yield fs.pathExists(appletEntryFilePath);
         if (!appletEntryFilePathExists) {
             throw new Error(`Applet entry file not found: ${appletEntryFilePath}\nDid you forget to build your applet by ${chalk_1.default.green('sos applet build')}?`);