@wiztivi/dana-cli 0.0.1-beta-9 → 0.0.1-beta-10

package/dana_completion.sh

@@ -78,8 +78,7 @@ if [ -n "$BASH_VERSION" ]; then
            opts="$custom_opts $item_view_opts $margin_opts"
            COMPREPLY=($(compgen -W "$opts" -- "$cur"))
            ;;
-
-          auth)
+         auth)
             if [[ $COMP_CWORD -eq 2 ]]; then
               opts="$login_sub $logout_sub $status_sub"
             else
@@ -87,7 +86,6 @@ if [ -n "$BASH_VERSION" ]; then
             fi
             COMPREPLY=($(compgen -W "$opts" -- "$cur"))
             ;;
-
          *)
            COMPREPLY=()
            ;;
@@ -141,12 +139,12 @@ elif [ -n "$ZSH_VERSION" ]; then
           compadd -- ${=custom_opts} ${=item_view_opts} ${=margin_opts}
           ;;
         auth)
-  if (( CURRENT == 3 )); then
-    compadd -- ${=login_sub} ${=logout_sub} ${=status_sub}
-  else
-    compadd -- ${=org_opts}
-  fi
-  ;;
+          if (( CURRENT == 3 )); then
+            compadd -- ${=login_sub} ${=logout_sub} ${=status_sub}
+          else
+            compadd -- ${=org_opts}
+          fi
+          ;;
       esac
     }
 

package/dist/commands/add-device.js

@@ -63,7 +63,6 @@ const addDevice = async () => {
     prompts.intro(`Add device(s) to ${path_1.default.basename(node_process_1.default.cwd())} !`);
     const data = {};
     try {
-        CliHelper_1.default.checkGitStatus();
         data.directory = "./";
         data.awsConfig = CliHelper_1.default.getAwsConfig();
         const { availableDevices, unavailableDevices } = await UserInputGetter_1.default.getAvailableDevices();
@@ -75,6 +74,10 @@ const addDevice = async () => {
         if (filteredAvailableDevices.length) {
             data.selectedDevices = await ScriptHelper_1.default.promptSelectDevices(filteredAvailableDevices);
         }
+        if (!data.selectedDevices?.length) {
+            prompts.outro(translation_1.default["command.device.no_selection"]);
+            return Promise.resolve();
+        }
         data.config = await UserInputGetter_1.default.getDevicesConfig(data);
     }
     catch (e) {

package/dist/commands/add-menu.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const CliHelper_1 = __importDefault(require("../helpers/CliHelper"));
 const componentConst_1 = require("../const/componentConst");
 const createComponent_1 = __importDefault(require("./createComponent"));
 const node_process_1 = __importDefault(require("node:process"));
@@ -24,7 +23,6 @@ const fs_1 = require("fs");
 const ComponentConfig_1 = __importDefault(require("../configs/ComponentConfig"));
 const defaultConfig_1 = require("../const/defaultConfig");
 const addMenu = async (name, options) => {
-    CliHelper_1.default.checkGitStatus();
     const data = { ...options };
     if (name) {
         data.name = name;
@@ -35,7 +33,7 @@ const addMenu = async (name, options) => {
     };
     const componentList = [menuConfig];
     if (!data.custom) {
-        componentList.push({ type: componentConst_1.BUTTON_VIEW, name: data.itemView ?? defaultConfig_1.MENU_DEFAULT_CONFIG.itemView });
+        componentList.push({ type: componentConst_1.BUTTON_ITEM_VIEW, name: data.itemView ?? defaultConfig_1.MENU_DEFAULT_CONFIG.itemView });
     }
     (0, createComponent_1.default)(componentList);
     if (!data.custom) {

package/dist/commands/add-rail.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const CliHelper_1 = __importDefault(require("../helpers/CliHelper"));
 const componentConst_1 = require("../const/componentConst");
 const createComponent_1 = __importDefault(require("./createComponent"));
 const node_process_1 = __importDefault(require("node:process"));
@@ -24,7 +23,6 @@ const fs_1 = require("fs");
 const ComponentConfig_1 = __importDefault(require("../configs/ComponentConfig"));
 const defaultConfig_1 = require("../const/defaultConfig");
 const addRail = async (name, options) => {
-    CliHelper_1.default.checkGitStatus();
     const data = { ...options };
     if (name) {
         data.name = name;

package/dist/commands/add-screen.d.ts

@@ -1,2 +1,5 @@
-declare const addScreen: (name?: string) => void;
+interface CommandOptions {
+    screenType?: string;
+}
+declare const addScreen: (name?: string, options?: CommandOptions) => Promise<void>;
 export default addScreen;

package/dist/commands/add-screen.js

@@ -10,19 +10,62 @@
  * This software MAY NOT be used, modified or rewritten without prior written permission from Wiztivi.
  *
  */
+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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const CliHelper_1 = __importDefault(require("../helpers/CliHelper"));
 const componentConst_1 = require("../const/componentConst");
 const createComponent_1 = __importDefault(require("./createComponent"));
-const addScreen = (name) => {
-    CliHelper_1.default.checkGitStatus();
-    const data = {
-        name: name ?? "Mock",
-        type: componentConst_1.SCREEN,
-    };
-    (0, createComponent_1.default)([data]);
+const add_menu_1 = __importDefault(require("./add-menu"));
+const add_scrollView_1 = __importDefault(require("./add-scrollView"));
+const prompts = __importStar(require("@clack/prompts"));
+const addScreen = async (name, options) => {
+    try {
+        const data = {
+            name: name ?? "Mock",
+            type: options?.screenType ?? componentConst_1.SCREEN,
+        };
+        if (options?.screenType === componentConst_1.VOD_SCREEN) {
+            await (0, add_menu_1.default)(componentConst_1.VOD_SCREEN, {});
+            await (0, add_scrollView_1.default)(componentConst_1.VOD_SCREEN, {});
+        }
+        (0, createComponent_1.default)([data]);
+    }
+    catch {
+        prompts.log.info("Error creating screen");
+    }
 };
 exports.default = addScreen;

package/dist/commands/add-scrollView.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const CliHelper_1 = __importDefault(require("../helpers/CliHelper"));
 const componentConst_1 = require("../const/componentConst");
 const createComponent_1 = __importDefault(require("./createComponent"));
 const node_process_1 = __importDefault(require("node:process"));
@@ -13,7 +12,6 @@ const fs_1 = require("fs");
 const defaultConfig_1 = require("../const/defaultConfig");
 const ComponentConfig_1 = __importDefault(require("../configs/ComponentConfig"));
 const addScrollView = async (name, options) => {
-    CliHelper_1.default.checkGitStatus();
     const data = { ...options };
     if (name) {
         data.name = name;

package/dist/commands/auth/status.js

@@ -40,20 +40,22 @@ const prompts = __importStar(require("@clack/prompts"));
 const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const picocolors_1 = __importDefault(require("picocolors"));
 const CredentialsHelper_1 = require("../../helpers/CredentialsHelper");
+const translation_1 = __importDefault(require("../../translation/translation"));
 const status = () => {
     const credentials = CredentialsHelper_1.CredentialsHelper.get();
     if (!credentials) {
-        prompts.log.error("You're not logged in. Please run dana auth login command");
+        prompts.log.error(`${translation_1.default["login.error.not_logged"]} ${translation_1.default["login.info.please_login"]}`);
         return;
     }
     const id_token = credentials.dana.id_token;
     const { given_name, family_name, email, exp } = jsonwebtoken_1.default.decode(id_token);
     const expiration = exp && new Date(exp * 1000);
     if (expiration && new Date() > expiration) {
-        prompts.log.error("Your token has expired, Pease run dana auth login command");
+        prompts.log.error(`${translation_1.default["login.info.token_expired"]} ${translation_1.default["login.info.please_login"]}`);
         return;
     }
     const expStr = expiration ? `\nToken expires on ${expiration.toUTCString()}` : "";
-    prompts.log.success(`You're currently logged in to Dana ${picocolors_1.default.bold(credentials.org)} as ${picocolors_1.default.bold(given_name + " " + family_name)} (${email})${expStr}`);
+    prompts.log.success(`${translation_1.default["login.info.logged"]} ${picocolors_1.default.bold(credentials.org)}: ${picocolors_1.default.bold(given_name + " " + family_name)} (${email})${expStr}
+        `);
 };
 exports.default = status;

package/dist/commands/commandDefinitions/addDeviceDefinition.js

@@ -6,7 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const add_device_1 = __importDefault(require("../add-device"));
 const translation_1 = __importDefault(require("../../translation/translation"));
+const authHook_1 = require("../hooks/authHook");
 const addDeviceDefinition = () => {
-    return new commander_1.Command("add-device").description(translation_1.default["command.device.description"]).action(add_device_1.default);
+    return new commander_1.Command("add-device")
+        .description(translation_1.default["command.device.description"])
+        .hook("preAction", authHook_1.authHook)
+        .action(add_device_1.default);
 };
 exports.default = addDeviceDefinition;

package/dist/commands/commandDefinitions/addScreenDefinition.js

@@ -11,6 +11,7 @@ const addScreenDefinition = () => {
     command
         .description(translation_1.default["command.screen.description"])
         .argument("[name]", translation_1.default["command.component.name"])
+        .option("-s, --screenType [screenType]", translation_1.default["command.screen.option.type"])
         .action(add_screen_1.default);
     return command;
 };

package/dist/commands/commandDefinitions/createAppDefinition.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const createApp_1 = __importDefault(require("../createApp"));
 const translation_1 = __importDefault(require("../../translation/translation"));
+const authHook_1 = require("../hooks/authHook");
 const createAppDefinition = () => {
     const command = new commander_1.Command("create-app");
     command
@@ -16,6 +17,7 @@ const createAppDefinition = () => {
         .option("-d, --devices", translation_1.default["command.create_app.devices"])
         .option("-p, --profile <awsProfile>", translation_1.default["command.create_app.aws_profile"])
         .option("-r, --repository <awsRepository>", translation_1.default["command.create_app.aws_repository"])
+        .hook("preAction", authHook_1.authHook)
         .action(createApp_1.default);
     return command;
 };

package/dist/commands/hooks/authHook.d.ts

@@ -0,0 +1 @@
+export declare const authHook: () => void;

package/dist/commands/hooks/authHook.js

@@ -0,0 +1,20 @@
+"use strict";
+/*
+ * Copyright (c) 2014-2025 Wiztivi - contact@wiztivi.com
+ * All Rights Reserved
+ *
+ * All information contained herein is proprietary and confidential.
+ * Dissemination of this information or reproduction of this file or material, via any medium is strictly forbidden unless
+ * prior written permission is obtained from Wiztivi.
+ * No warranty, explicit or implicit, provided.
+ * This software MAY NOT be used, modified or rewritten without prior written permission from Wiztivi.
+ *
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.authHook = void 0;
+const status_1 = __importDefault(require("../auth/status"));
+const authHook = () => (0, status_1.default)();
+exports.authHook = authHook;

package/dist/const/componentConst.d.ts

@@ -3,5 +3,6 @@ export declare const RAIL = "wtvRailListView";
 export declare const TILE_VIEW = "tileView";
 export declare const SCROLL_VIEW = "scrollView";
 export declare const SCROLL_ITEM = "scrollItemView";
-export declare const BUTTON_VIEW = "ButtonView";
+export declare const BUTTON_ITEM_VIEW = "ButtonItemView";
 export declare const SCREEN = "screen";
+export declare const VOD_SCREEN = "vod";

package/dist/const/componentConst.js

@@ -11,11 +11,12 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SCREEN = exports.BUTTON_VIEW = exports.SCROLL_ITEM = exports.SCROLL_VIEW = exports.TILE_VIEW = exports.RAIL = exports.MENU = void 0;
+exports.VOD_SCREEN = exports.SCREEN = exports.BUTTON_ITEM_VIEW = exports.SCROLL_ITEM = exports.SCROLL_VIEW = exports.TILE_VIEW = exports.RAIL = exports.MENU = void 0;
 exports.MENU = "wtvMenuListView";
 exports.RAIL = "wtvRailListView";
 exports.TILE_VIEW = "tileView";
 exports.SCROLL_VIEW = "scrollView";
 exports.SCROLL_ITEM = "scrollItemView";
-exports.BUTTON_VIEW = "ButtonView";
+exports.BUTTON_ITEM_VIEW = "ButtonItemView";
 exports.SCREEN = "screen";
+exports.VOD_SCREEN = "vod";

package/dist/const/defaultConfig.js

@@ -14,7 +14,7 @@ exports.RAIL_DEFAULT_CONFIG = {
 exports.MENU_DEFAULT_CONFIG = {
     name: "mockMenu",
     itemMargin: 20,
-    itemView: "Button",
+    itemView: "ButtonItem",
     direction: "horizontal",
     addMock: true,
     type: componentConst_1.MENU,

package/dist/const/exitCodeConst.d.ts

@@ -1,5 +1,4 @@
 export declare const APP_CREATION_ERROR = 1;
-export declare const GIT_ERROR = 2;
 export declare const COMPONENT_ERROR = 3;
 export declare const CANCEL = 4;
 export declare const DEVICE_ERROR = 5;

package/dist/const/exitCodeConst.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SETUP_ERROR = exports.COMMAND_ERROR = exports.LOGIN_ERROR = exports.DEVICE_ERROR = exports.CANCEL = exports.COMPONENT_ERROR = exports.GIT_ERROR = exports.APP_CREATION_ERROR = void 0;
+exports.SETUP_ERROR = exports.COMMAND_ERROR = exports.LOGIN_ERROR = exports.DEVICE_ERROR = exports.CANCEL = exports.COMPONENT_ERROR = exports.APP_CREATION_ERROR = void 0;
 exports.APP_CREATION_ERROR = 1;
-exports.GIT_ERROR = 2;
 exports.COMPONENT_ERROR = 3;
 exports.CANCEL = 4;
 exports.DEVICE_ERROR = 5;

package/dist/dana_completion.sh

@@ -78,8 +78,7 @@ if [ -n "$BASH_VERSION" ]; then
            opts="$custom_opts $item_view_opts $margin_opts"
            COMPREPLY=($(compgen -W "$opts" -- "$cur"))
            ;;
-
-          auth)
+         auth)
             if [[ $COMP_CWORD -eq 2 ]]; then
               opts="$login_sub $logout_sub $status_sub"
             else
@@ -87,7 +86,6 @@ if [ -n "$BASH_VERSION" ]; then
             fi
             COMPREPLY=($(compgen -W "$opts" -- "$cur"))
             ;;
-
          *)
            COMPREPLY=()
            ;;
@@ -141,12 +139,12 @@ elif [ -n "$ZSH_VERSION" ]; then
           compadd -- ${=custom_opts} ${=item_view_opts} ${=margin_opts}
           ;;
         auth)
-  if (( CURRENT == 3 )); then
-    compadd -- ${=login_sub} ${=logout_sub} ${=status_sub}
-  else
-    compadd -- ${=org_opts}
-  fi
-  ;;
+          if (( CURRENT == 3 )); then
+            compadd -- ${=login_sub} ${=logout_sub} ${=status_sub}
+          else
+            compadd -- ${=org_opts}
+          fi
+          ;;
       esac
     }
 

package/dist/helpers/CliHelper.d.ts

@@ -11,9 +11,5 @@ declare const CliHelper: {
      * We use script so we can get renderers for smartTv
      */
     readonly getInstalledDevices: (directory: string) => string[];
-    /**
-     * Check git status before proceeding
-     */
-    readonly checkGitStatus: () => void;
 };
 export default CliHelper;

package/dist/helpers/CliHelper.js

@@ -1,37 +1,4 @@
 "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 };
 };
@@ -39,10 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
-const prompts = __importStar(require("@clack/prompts"));
-const translation_1 = __importDefault(require("../translation/translation"));
-const node_process_1 = __importDefault(require("node:process"));
-const exitCodeConst_1 = require("../const/exitCodeConst");
 const CliHelper = class {
     static getAwsConfig = () => {
         let awsConfig;
@@ -82,20 +45,5 @@ const CliHelper = class {
         }
         return installedDevices;
     };
-    /**
-     * Check git status before proceeding
-     */
-    static checkGitStatus = () => {
-        try {
-            const result = (0, child_process_1.execSync)("git status --porcelain", { encoding: "utf8" });
-            if (result.trim()) {
-                throw new Error("Failed to check GitStatus");
-            }
-        }
-        catch {
-            prompts.log.error(translation_1.default["helper.git.status.error"]);
-            node_process_1.default.exit(exitCodeConst_1.GIT_ERROR);
-        }
-    };
 };
 exports.default = CliHelper;

package/dist/helpers/ComponentHelper.js

@@ -84,7 +84,10 @@ const ComponentHelper = class {
             case componentConst_1.SCROLL_ITEM:
                 return `${uppercaseName}ScrollItemView.js`;
             case componentConst_1.SCREEN:
+            case componentConst_1.VOD_SCREEN:
                 return `${uppercaseName}Screen.js`;
+            case componentConst_1.BUTTON_ITEM_VIEW:
+                return `${uppercaseName}View.js`;
             default:
                 return `${uppercaseName}.js`;
         }

package/dist/helpers/createApp/SetupChecker.js

@@ -51,7 +51,6 @@ const prompts = __importStar(require("@clack/prompts"));
 const picocolors_1 = __importDefault(require("picocolors"));
 const child_process_1 = require("child_process");
 const translation_1 = __importDefault(require("../../translation/translation"));
-const fs_1 = require("fs");
 const exitCodeConst_1 = require("../../const/exitCodeConst");
 class SetupChecker {
     static checkSetup = async () => {
@@ -91,7 +90,7 @@ class SetupChecker {
      * @returns {Promise}
      */
     static async validateNodeVersion() {
-        const minimalNodeVersion = parseInt((0, fs_1.readFileSync)(".nvmrc", "utf8").trim(), 10);
+        const minimalNodeVersion = parseInt(process.version.substring(1, process.version.length));
         const currentVersion = parseInt(process.version.slice(1).split(".")[0], 10);
         return currentVersion >= minimalNodeVersion
             ? Promise.resolve("Node version ok !")

package/dist/translation/en.json

@@ -10,6 +10,7 @@
     "command.rail.option.direction": "Navigation direction. Default: horizontal",
     "command.rail.option.cyclic": "True if cyclic. Default: false",
     "command.device.description": "Add device(s) to your Dana app",
+    "command.device.no_selection": "Nothing selected or no device available. Exit",
     "help.custom.devices": "Use the CLI to add the following devices:",
     "help.custom.commands": "Add devices and built-in components to your DANA app:",
     "help.option.title": "Available command options:",
@@ -42,7 +43,7 @@
     "node.error": "Node version should be >=",
     "setup.ok": "Configuration ok",
     "setup.ko": "Prerequisite not met",
-    "device.unavailable": "Enhance your experience by adding device(s):",
+    "device.unavailable": "Enhance your experience by adding device(s) to your subscription:",
     "device.selection": "Press space key to select additional device(s).",
     "renderer.selection": "Select AT LEAST one renderer for",
     "input.name": "What is your project's name ?",
@@ -52,5 +53,9 @@
     "error.common.start.message": "An error occurred",
     "command.completion.description": "Install shell completion (bash or zsh)",
     "command.completion.argument": "Shell. Bash or zsh",
-    "command.completion.success": "Completion installed to "
+    "command.completion.success": "Completion installed to ",
+    "login.info.token_expired": "Your token has expired.",
+    "login.info.please_login": "Please run dana auth login command",
+    "login.error.not_logged": "You're not logged in.",
+    "login.info.logged": "You're currently logged in to Dana"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wiztivi/dana-cli",
-    "version": "0.0.1-beta-9",
+    "version": "0.0.1-beta-10",
     "description": "Dana create app CLI",
     "main": "dist/index.js",
     "bin": {