@signageos/cli 2.3.1 → 2.4.0

package/dist/Applet/Upload/appletUploadCommandHelper.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) {
@@ -8,40 +41,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAppletEntryFileRelativePath = exports.getAppletEntryFileAbsolutePath = exports.getAppletBinaryFileAbsolutePath = exports.getAppletDirectoryAbsolutePath = exports.APPLET_PATH_OPTION = exports.ENTRY_FILE_PATH_OPTION = void 0;
-var log_1 = require("@signageos/sdk/dist/Console/log");
-var fs = require("fs-extra");
-var path = require("path");
-var packageConfig_1 = require("@signageos/sdk/dist/FileSystem/packageConfig");
-var chalk_1 = require("chalk");
+exports.APPLET_PATH_OPTION = exports.ENTRY_FILE_PATH_OPTION = void 0;
+exports.getAppletDirectoryAbsolutePath = getAppletDirectoryAbsolutePath;
+exports.getAppletBinaryFileAbsolutePath = getAppletBinaryFileAbsolutePath;
+exports.getAppletEntryFileAbsolutePath = getAppletEntryFileAbsolutePath;
+exports.getAppletEntryFileRelativePath = getAppletEntryFileRelativePath;
+const log_1 = require("@signageos/sdk/dist/Console/log");
+const fs = __importStar(require("fs-extra"));
+const path = __importStar(require("path"));
+const packageConfig_1 = require("@signageos/sdk/dist/FileSystem/packageConfig");
+const chalk_1 = __importDefault(require("chalk"));
 exports.ENTRY_FILE_PATH_OPTION = {
     name: 'entry-file-path',
     type: String,
@@ -52,132 +65,104 @@ exports.APPLET_PATH_OPTION = {
     type: String,
     description: 'Path to the applet file or the project folder depending on the entry file. Relative to the command or absolute.',
 };
-var DEFAULT_APPLET_DIR_PATH = '.';
-var DEFAULT_APPLET_ENTRY_FILE_PATH = 'dist/index.html';
-var DEFAULT_APPLET_BINARY_FILE_PATH = 'dist/index.html';
+const DEFAULT_APPLET_DIR_PATH = '.';
+const DEFAULT_APPLET_ENTRY_FILE_PATH = 'dist/index.html';
+const DEFAULT_APPLET_BINARY_FILE_PATH = 'dist/index.html';
 function getAppletDirectoryAbsolutePath(currentDirectory, options) {
-    return __awaiter(this, void 0, void 0, function () {
-        var appletDirectoryPath, appletDirectoryPathExists, isDirectory;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    appletDirectoryPath = options['applet-path'];
-                    if (!appletDirectoryPath) {
-                        appletDirectoryPath = DEFAULT_APPLET_DIR_PATH;
-                    }
-                    if (!path.isAbsolute(appletDirectoryPath)) {
-                        appletDirectoryPath = path.join(currentDirectory, appletDirectoryPath);
-                    }
-                    if (appletDirectoryPath.length > 1 && appletDirectoryPath[appletDirectoryPath.length - 1] === '/') {
-                        appletDirectoryPath = appletDirectoryPath.substring(0, appletDirectoryPath.length - 1);
-                    }
-                    (0, log_1.log)('info', "\nUse applet project directory path: ".concat(appletDirectoryPath));
-                    return [4 /*yield*/, fs.pathExists(appletDirectoryPath)];
-                case 1:
-                    appletDirectoryPathExists = _a.sent();
-                    if (!appletDirectoryPathExists) {
-                        throw new Error("Applet project directory not found: ".concat(appletDirectoryPath));
-                    }
-                    return [4 /*yield*/, fs.stat(appletDirectoryPath)];
-                case 2:
-                    isDirectory = (_a.sent()).isDirectory();
-                    if (!isDirectory) {
-                        throw new Error("Applet project path is not a directory: ".concat(appletDirectoryPath));
-                    }
-                    return [2 /*return*/, appletDirectoryPath];
-            }
-        });
+    return __awaiter(this, void 0, void 0, function* () {
+        let appletDirectoryPath = options['applet-path'];
+        if (!appletDirectoryPath) {
+            appletDirectoryPath = DEFAULT_APPLET_DIR_PATH;
+        }
+        if (!path.isAbsolute(appletDirectoryPath)) {
+            appletDirectoryPath = path.join(currentDirectory, appletDirectoryPath);
+        }
+        // Handle trailing slashes (both / and \) for cross-platform compatibility
+        appletDirectoryPath = path.normalize(appletDirectoryPath);
+        if (appletDirectoryPath.length > 1 && (appletDirectoryPath.endsWith('/') || appletDirectoryPath.endsWith('\\'))) {
+            appletDirectoryPath = appletDirectoryPath.slice(0, -1);
+        }
+        (0, log_1.log)('info', `\nUse applet project directory path: ${appletDirectoryPath}`);
+        const appletDirectoryPathExists = yield fs.pathExists(appletDirectoryPath);
+        if (!appletDirectoryPathExists) {
+            throw new Error(`Applet project directory not found: ${appletDirectoryPath}`);
+        }
+        const isDirectory = (yield fs.stat(appletDirectoryPath)).isDirectory();
+        if (!isDirectory) {
+            throw new Error(`Applet project path is not a directory: ${appletDirectoryPath}`);
+        }
+        return appletDirectoryPath;
     });
 }
-exports.getAppletDirectoryAbsolutePath = getAppletDirectoryAbsolutePath;
 function getAppletBinaryFileAbsolutePath(currentDirectory, options) {
-    return __awaiter(this, void 0, void 0, function () {
-        var appletBinaryFilePath, appletBinaryFilePathExists, isFile;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    appletBinaryFilePath = options['applet-path'];
-                    if (!appletBinaryFilePath) {
-                        appletBinaryFilePath = DEFAULT_APPLET_BINARY_FILE_PATH;
-                    }
-                    if (!path.isAbsolute(appletBinaryFilePath)) {
-                        appletBinaryFilePath = path.join(currentDirectory, appletBinaryFilePath);
-                    }
-                    (0, log_1.log)('info', "\nUse applet binary file: ".concat(appletBinaryFilePath));
-                    return [4 /*yield*/, fs.pathExists(appletBinaryFilePath)];
-                case 1:
-                    appletBinaryFilePathExists = _a.sent();
-                    if (!appletBinaryFilePathExists) {
-                        throw new Error("Applet binary file not found: ".concat(appletBinaryFilePath));
-                    }
-                    return [4 /*yield*/, fs.stat(appletBinaryFilePath)];
-                case 2:
-                    isFile = (_a.sent()).isFile();
-                    if (!isFile) {
-                        throw new Error("Applet binary path is not a file: ".concat(appletBinaryFilePath));
-                    }
-                    return [2 /*return*/, appletBinaryFilePath];
-            }
-        });
+    return __awaiter(this, void 0, void 0, function* () {
+        let appletBinaryFilePath = options['applet-path'];
+        if (!appletBinaryFilePath) {
+            appletBinaryFilePath = DEFAULT_APPLET_BINARY_FILE_PATH;
+        }
+        if (!path.isAbsolute(appletBinaryFilePath)) {
+            appletBinaryFilePath = path.join(currentDirectory, appletBinaryFilePath);
+        }
+        // Normalize the path for cross-platform compatibility
+        appletBinaryFilePath = path.normalize(appletBinaryFilePath);
+        (0, log_1.log)('info', `\nUse applet binary file: ${appletBinaryFilePath}`);
+        const appletBinaryFilePathExists = yield fs.pathExists(appletBinaryFilePath);
+        if (!appletBinaryFilePathExists) {
+            throw new Error(`Applet binary file not found: ${appletBinaryFilePath}`);
+        }
+        const isFile = (yield fs.stat(appletBinaryFilePath)).isFile();
+        if (!isFile) {
+            throw new Error(`Applet binary path is not a file: ${appletBinaryFilePath}`);
+        }
+        return appletBinaryFilePath;
     });
 }
-exports.getAppletBinaryFileAbsolutePath = getAppletBinaryFileAbsolutePath;
 function getAppletEntryFileAbsolutePath(currentDirectory, options) {
-    return __awaiter(this, void 0, void 0, function () {
-        var appletEntryFilePath, packageConfig, appletEntryFilePathExists, isFile;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    appletEntryFilePath = options['entry-file-path'];
-                    if (!!appletEntryFilePath) return [3 /*break*/, 2];
-                    return [4 /*yield*/, (0, packageConfig_1.loadPackage)(currentDirectory)];
-                case 1:
-                    packageConfig = _a.sent();
-                    appletEntryFilePath = packageConfig === null || packageConfig === void 0 ? void 0 : packageConfig.main;
-                    _a.label = 2;
-                case 2:
-                    if (!appletEntryFilePath) {
-                        appletEntryFilePath = DEFAULT_APPLET_ENTRY_FILE_PATH;
-                    }
-                    if (!path.isAbsolute(appletEntryFilePath)) {
-                        appletEntryFilePath = path.join(currentDirectory, appletEntryFilePath);
-                    }
-                    (0, log_1.log)('info', "\nUse applet entry file: ".concat(appletEntryFilePath));
-                    return [4 /*yield*/, fs.pathExists(appletEntryFilePath)];
-                case 3:
-                    appletEntryFilePathExists = _a.sent();
-                    if (!appletEntryFilePathExists) {
-                        throw new Error("Applet entry file not found: ".concat(appletEntryFilePath, "\nDid you forget to build your applet by ").concat(chalk_1.default.green('sos applet build'), "?"));
-                    }
-                    return [4 /*yield*/, fs.stat(appletEntryFilePath)];
-                case 4:
-                    isFile = (_a.sent()).isFile();
-                    if (!isFile) {
-                        throw new Error("Applet entry path is not a file: ".concat(appletEntryFilePath));
-                    }
-                    return [2 /*return*/, appletEntryFilePath];
-            }
-        });
+    return __awaiter(this, void 0, void 0, function* () {
+        let appletEntryFilePath = options['entry-file-path'];
+        if (!appletEntryFilePath) {
+            const packageConfig = yield (0, packageConfig_1.loadPackage)(currentDirectory);
+            appletEntryFilePath = packageConfig === null || packageConfig === void 0 ? void 0 : packageConfig.main;
+        }
+        if (!appletEntryFilePath) {
+            appletEntryFilePath = DEFAULT_APPLET_ENTRY_FILE_PATH;
+        }
+        if (!path.isAbsolute(appletEntryFilePath)) {
+            appletEntryFilePath = path.join(currentDirectory, appletEntryFilePath);
+        }
+        // Normalize the path for cross-platform compatibility
+        appletEntryFilePath = path.normalize(appletEntryFilePath);
+        (0, log_1.log)('info', `\nUse applet entry file: ${appletEntryFilePath}`);
+        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')}?`);
+        }
+        const isFile = (yield fs.stat(appletEntryFilePath)).isFile();
+        if (!isFile) {
+            throw new Error(`Applet entry path is not a file: ${appletEntryFilePath}`);
+        }
+        return appletEntryFilePath;
     });
 }
-exports.getAppletEntryFileAbsolutePath = getAppletEntryFileAbsolutePath;
 function getAppletEntryFileRelativePath(entryFileAbsolutePath, appletDirectoryAbsolutePath) {
-    var appletDirectoryAbsolutePathNormalized = path.normalize(appletDirectoryAbsolutePath);
-    var entryFileAbsolutePathNormalized = path.normalize(entryFileAbsolutePath);
+    // Normalize paths to ensure consistent handling across platforms
+    const appletDirectoryAbsolutePathNormalized = path.normalize(appletDirectoryAbsolutePath);
+    const entryFileAbsolutePathNormalized = path.normalize(entryFileAbsolutePath);
     if (!path.isAbsolute(entryFileAbsolutePathNormalized)) {
-        throw new Error("Internal Error: Try input relative entry file path. Current path: ".concat(entryFileAbsolutePathNormalized));
+        throw new Error(`Internal Error: Try input relative entry file path. Current path: ${entryFileAbsolutePathNormalized}`);
     }
     if (!path.isAbsolute(appletDirectoryAbsolutePathNormalized)) {
-        throw new Error("Internal Error: Try input relative applet directory path. Current path: ".concat(appletDirectoryAbsolutePathNormalized));
+        throw new Error(`Internal Error: Try input relative applet directory path. Current path: ${appletDirectoryAbsolutePathNormalized}`);
     }
-    var isEntryFileInAppletDir = entryFileAbsolutePathNormalized.startsWith(appletDirectoryAbsolutePathNormalized);
+    // Use startsWith with normalized paths for cross-platform path checking
+    const isEntryFileInAppletDir = entryFileAbsolutePathNormalized.startsWith(appletDirectoryAbsolutePathNormalized);
     if (!isEntryFileInAppletDir) {
-        throw new Error("Applet entry file must be in the applet directory." +
-            "\nEntry file path: ".concat(entryFileAbsolutePathNormalized) +
-            "\nApplet directory path: ".concat(appletDirectoryAbsolutePathNormalized));
+        throw new Error(`Applet entry file must be in the applet directory.` +
+            `\nEntry file path: ${entryFileAbsolutePathNormalized}` +
+            `\nApplet directory path: ${appletDirectoryAbsolutePathNormalized}`);
     }
-    var entryFileRelativePath = entryFileAbsolutePathNormalized.substring(appletDirectoryAbsolutePathNormalized.length + 1);
-    return entryFileRelativePath;
+    // Use path.relative to get the relative path with correct platform separators
+    const entryFileRelativePath = path.relative(appletDirectoryAbsolutePathNormalized, entryFileAbsolutePathNormalized);
+    // Ensure forward slashes for cross-platform compatibility in returned paths
+    return entryFileRelativePath.split(path.sep).join('/');
 }
-exports.getAppletEntryFileRelativePath = getAppletEntryFileRelativePath;
-//# sourceMappingURL=appletUploadCommandHelper.js.map

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

@@ -19,7 +19,7 @@ export declare const updateMultiFileApplet: (parameters: {
         directoryPath: string;
         files: string[];
     };
-    progressBar?: ProgressBar | undefined;
+    progressBar?: ProgressBar;
 }) => Promise<void>;
 export declare const createSingleFileApplet: (parameters: {
     restApi: RestApi;
@@ -40,5 +40,5 @@ export declare const createMultiFileFileApplet: (parameters: {
         directoryPath: string;
         files: string[];
     };
-    progressBar?: ProgressBar | undefined;
+    progressBar?: ProgressBar;
 }) => Promise<void>;