@wiztivi/dana-cli 0.0.7 → 0.0.9

package/{dist/README.md → README.md}

@@ -38,6 +38,7 @@ Use the CLI to:
 - create a new app project
 - add device(s) easily to deploy your project on more platforms: `npx @wiztivi/dana-cli add-device`,
 - add built-in components to your project: eg `npx @wiztivi/dana-cli add-menu`
+- get autocompletion script for dana commands: `npx @wiztivi/dana-cli completion <shell>`
 
 To get all available options and more information:`npx @wiztivi/dana-cli help`
 

package/dist/commands/addDevice/deviceConfig/androidtvConfig.d.ts

@@ -1,10 +1,6 @@
 import { AndroidConfig } from "./configTypes.js";
 declare const AndroidtvConfig: {
     new (): {};
-    /**
-     * Get the app icon url
-     */
-    readonly _getAppIcon: () => Promise<string>;
     /**
      * Ask the appId
      */

package/dist/commands/addDevice/deviceConfig/androidtvConfig.js

@@ -12,7 +12,6 @@
 import fs from "node:fs";
 import path from "node:path";
 import DeviceConfig from "./deviceConfig.js";
-import { DEFAULT_IMAGE_URL } from "../../createApp/const/setupConst.js";
 import ComponentHelper from "../../addComponent/helper/ComponentHelper.js";
 import * as prompts from "@clack/prompts";
 import colors from "picocolors";
@@ -24,13 +23,8 @@ import { CredentialsHelper } from "../../authentication/helper/CredentialsHelper
 import { ListPackageVersionsCommand } from "@aws-sdk/client-codeartifact";
 import { createCodeArtifactClient } from "../../authentication/helper/CodeArtifactHelper.js";
 import { DOMAIN, DOMAIN_OWNER } from "../../authentication/authentConst.js";
+import addDeviceHelper from "../helper/addDeviceHelper.js";
 const AndroidtvConfig = class extends DeviceConfig {
-    /**
-     * Get the app icon url
-     */
-    static _getAppIcon = () => {
-        return Promise.resolve(DEFAULT_IMAGE_URL);
-    };
     /**
      * Ask the appId
      */
@@ -122,7 +116,7 @@ const AndroidtvConfig = class extends DeviceConfig {
                 appName: () => this._askAppName(),
                 appVersion: () => this._askAppVersion(),
                 appVersionCode: () => this._askAppVersionCode(),
-                icon: () => this._getAppIcon(),
+                icon: () => addDeviceHelper.getAppIcon(),
                 wtvAndroidVersion: () => this._getWtvAndroidVersion(),
             }, {
                 onCancel: () => {

package/dist/commands/addDevice/deviceConfig/configTypes.d.ts

@@ -9,8 +9,19 @@ interface AndroidDevice {
 interface AndroidConfig {
     device: AndroidDevice;
 }
+interface TizenDevice {
+    type?: string;
+    profileName?: string;
+    icon: string;
+    application: {
+        requiredVersion: string;
+        package: string;
+        id: string;
+    };
+}
 interface TizenConf {
     renderers: string[];
+    device: TizenDevice;
 }
 interface WebosConf {
     device: WebosDevice;
@@ -24,4 +35,4 @@ interface WebosDevice {
     largeIcon: string;
     disableBackHistoryAPI: boolean;
 }
-export { AndroidDevice, AndroidConfig, TizenConf, WebosConf, WebosDevice };
+export { AndroidDevice, AndroidConfig, TizenConf, TizenDevice, WebosConf, WebosDevice };

package/dist/commands/addDevice/deviceConfig/tizenConfig.js

@@ -13,6 +13,11 @@ import fs from "node:fs";
 import path from "node:path";
 import DeviceConfig from "./deviceConfig.js";
 import { LIGHTNING } from "../../../common/const/deviceConst.js";
+import * as prompts from "@clack/prompts";
+import colors from "picocolors";
+import addDeviceHelper from "../helper/addDeviceHelper.js";
+import { validAppVersion, validInputLength } from "../../../common/helpers/InputValidator.js";
+import { clean } from "semver-ts";
 const TizenConfig = class extends DeviceConfig {
     static appConfig = {
         css: {
@@ -34,16 +39,42 @@ const TizenConfig = class extends DeviceConfig {
             },
         },
     };
-    static getConfig = () => {
-        const tizenConfig = {
+    static getConfig = async () => {
+        prompts.log.info(colors.bold("Let's configure Tizen !"));
+        const applicationConfig = await prompts.group({
+            requiredVersion: async () => {
+                const requiredVersion = await addDeviceHelper.promptTextFactory({
+                    promptMessage: "What is the application requiredVersion ?",
+                    validationFunction: (value) => validAppVersion(value),
+                    placeholder: "1.0.0",
+                    initialValue: "1.0.0",
+                });
+                return clean(requiredVersion);
+            },
+            package: async () => addDeviceHelper.promptTextFactory({
+                errorMessage: "Package name is required !",
+                promptMessage: "What is the package name ? Should be unique.",
+                validationFunction: (value) => validInputLength(value, "Package name is required !"),
+            }),
+            id: async () => addDeviceHelper.promptTextFactory({
+                errorMessage: "Package id is required !",
+                promptMessage: "What is the package id ?",
+                validationFunction: (value) => validInputLength(value, "Package id is required !"),
+            }),
+        });
+        return {
             renderers: [LIGHTNING],
+            device: {
+                icon: await addDeviceHelper.getAppIcon(),
+                application: { ...applicationConfig },
+            },
         };
-        return Promise.resolve(tizenConfig);
     };
     static setConfig = ({ directory, config }) => {
         const filePath = path.join(directory, "profiles", "app.config.tizen.json");
         let jsonData = JSON.parse(fs.readFileSync(filePath).toString());
         jsonData = this.updateProfileJsonWithRenderers(jsonData, config.renderers);
+        jsonData.tizen.device = { ...jsonData.tizen.device, ...config.device };
         fs.writeFileSync(filePath, JSON.stringify(jsonData, null, 4));
         return Promise.resolve("Tizen configuration done");
     };

package/dist/commands/addDevice/helper/addDeviceHelper.d.ts

@@ -1,3 +1,10 @@
+export interface PromptFactoryParams {
+    errorMessage?: string;
+    promptMessage: string;
+    validationFunction: (value: string, errorMessage?: string) => string | undefined;
+    placeholder?: string;
+    initialValue?: string;
+}
 declare const AddDeviceHelper: {
     new (): {};
     /**
@@ -9,5 +16,10 @@ declare const AddDeviceHelper: {
      * We use script so we can get renderers for smartTv
      */
     readonly getInstalledDevices: (directory: string) => string[];
+    /**
+     * Get the app icon url
+     */
+    readonly getAppIcon: () => Promise<string>;
+    readonly promptTextFactory: ({ errorMessage, promptMessage, validationFunction, placeholder, initialValue, }: PromptFactoryParams) => Promise<string>;
 };
 export default AddDeviceHelper;

package/dist/commands/addDevice/helper/addDeviceHelper.js

@@ -1,6 +1,9 @@
 import { execSync } from "node:child_process";
 import { readFileSync } from "node:fs";
 import path from "node:path";
+import * as prompts from "@clack/prompts";
+import { DEFAULT_IMAGE_URL } from "../../createApp/const/setupConst.js";
+import ComponentHelper from "../../addComponent/helper/ComponentHelper.js";
 const AddDeviceHelper = class {
     /**
      * clean on error
@@ -30,5 +33,21 @@ const AddDeviceHelper = class {
         }
         return installedDevices;
     };
+    /**
+     * Get the app icon url
+     */
+    static getAppIcon = () => {
+        return Promise.resolve(DEFAULT_IMAGE_URL);
+    };
+    static promptTextFactory = async ({ errorMessage, promptMessage, validationFunction, placeholder, initialValue, }) => {
+        const result = (await prompts.text({
+            message: promptMessage,
+            placeholder,
+            initialValue,
+            validate: (value) => validationFunction(value, errorMessage),
+        }));
+        ComponentHelper.handleCancellation(result);
+        return result;
+    };
 };
 export default AddDeviceHelper;

package/dist/commands/authentication/AuthenticationManager.d.ts

@@ -0,0 +1,22 @@
+import { AwsCredentials, DanaToken } from "./helper/CredentialsHelper.js";
+import { JwtPayload } from "jsonwebtoken";
+export interface CognitoIdToken extends JwtPayload {
+    given_name: string;
+    family_name: string;
+    email: string;
+}
+export interface AuthCredentials {
+    aws: AwsCredentials;
+    dana: DanaToken;
+    org: string;
+}
+export declare class AuthenticationManager {
+    private static getAPIURL;
+    static login(organization: string): Promise<AuthCredentials>;
+    static refresh(organization: string, token: string): Promise<AuthCredentials>;
+    static isTokenExpired(token: string): boolean;
+    static loginNPM(organization: string, credentials: AwsCredentials): Promise<{
+        token: string;
+        expiration?: Date;
+    }>;
+}

package/dist/commands/authentication/AuthenticationManager.js

@@ -0,0 +1,92 @@
+import getPort from "get-port";
+import express from "express";
+import { CredentialsHelper } from "./helper/CredentialsHelper.js";
+import open from "open";
+import jwt from "jsonwebtoken";
+import { createCodeArtifactClient, getRepositoryEndpoint } from "./helper/CodeArtifactHelper.js";
+import { GetAuthorizationTokenCommand } from "@aws-sdk/client-codeartifact";
+import { DOMAIN, DOMAIN_OWNER } from "./authentConst.js";
+import { execSync } from "node:child_process";
+export class AuthenticationManager {
+    static getAPIURL(organization) {
+        return `https://api.${organization}.dana-framework.com`; // Or http://localhost:3001
+    }
+    static async login(organization) {
+        const app = express();
+        app.disable("x-powered-by");
+        const promise = new Promise((resolve, reject) => {
+            app.get("/callback", (req, res) => {
+                try {
+                    if (req.query.error) {
+                        res.send("Login failed. Check the CLI for details.");
+                        return reject(new Error(req.query.error));
+                    }
+                    const token = JSON.parse(req.query.token);
+                    const awsCredentials = JSON.parse(req.query.aws);
+                    const creds = { aws: awsCredentials, dana: token, org: organization };
+                    res.send("Login successful! You can close this window.");
+                    CredentialsHelper.store(creds);
+                    resolve(creds);
+                }
+                catch (err) {
+                    res.send("Login failed. Check the CLI for details.");
+                    reject(err);
+                }
+            });
+        });
+        const port = await getPort();
+        const server = app.listen(port);
+        await open(`${AuthenticationManager.getAPIURL(organization)}/login?port=${port}`);
+        return promise.finally(() => {
+            server.closeAllConnections();
+            server.close();
+        });
+    }
+    static async refresh(organization, token) {
+        const data = await fetch(`${AuthenticationManager.getAPIURL(organization)}/login?refresh_token=${token}`);
+        if (!data.ok) {
+            return AuthenticationManager.login(organization);
+        }
+        const refreshedCreds = (await data.json());
+        const creds = {
+            aws: refreshedCreds.aws,
+            dana: {
+                ...refreshedCreds.token,
+                refresh_token: token,
+            },
+            org: organization,
+        };
+        CredentialsHelper.store(creds);
+        return creds;
+    }
+    static isTokenExpired(token) {
+        const payload = jwt.decode(token);
+        if (!payload.exp) {
+            return true;
+        }
+        const expirationDate = new Date(payload.exp * 1000);
+        return expirationDate <= new Date();
+    }
+    static async loginNPM(organization, credentials) {
+        // Create CodeArtifact client with credentials
+        const client = createCodeArtifactClient(credentials);
+        // Get authorization token
+        const tokenCommand = new GetAuthorizationTokenCommand({
+            domain: DOMAIN,
+            domainOwner: DOMAIN_OWNER,
+        });
+        const { authorizationToken, expiration } = await client.send(tokenCommand);
+        if (!authorizationToken) {
+            throw new Error("Authorization token not found");
+        }
+        // Get repository endpoint
+        const repositoryEndpoint = await getRepositoryEndpoint({ organization, credentials, client, format: "npm" });
+        // Configure npm with the repository and token
+        execSync(`npm config set @dana:registry=${repositoryEndpoint}`);
+        execSync(`npm config set //${repositoryEndpoint.replace(/^https?:\/\//, "")}:_authToken=${authorizationToken}`);
+        return {
+            token: authorizationToken,
+            expiration,
+        };
+    }
+}

package/dist/commands/authentication/authDefinition.js

@@ -2,12 +2,11 @@ import { Command } from "commander";
 import translation from "../../common/translation/translation.js";
 import login from "./commands/login.js";
 import { statusAction } from "./commands/status.js";
-import { DEFAULT_ORG } from "./authentConst.js";
 const addAuthDefinition = () => {
     const command = new Command("auth").description(translation["command.auth.description"]);
     const loginCmd = new Command("login")
         .description(translation["command.auth.login.description"])
-        .option("-o, --org <organization>", translation["command.auth.login.option.org"], DEFAULT_ORG)
+        .option("-o, --org <organization>", translation["command.auth.login.option.org"])
         .action(login);
     command.addCommand(loginCmd);
     const statusCmd = new Command("status")

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

@@ -1 +1 @@
-export declare const authHook: () => void;
+export declare const authHook: () => Promise<void>;

package/dist/commands/authentication/authHook.js

@@ -9,11 +9,24 @@
  * This software MAY NOT be used, modified or rewritten without prior written permission from Wiztivi.
  *
  */
-import { status, LOGIN_STATUS } from "./commands/status.js";
+import * as prompts from "@clack/prompts";
+import { CredentialsHelper } from "./helper/CredentialsHelper.js";
+import { AuthenticationManager } from "./AuthenticationManager.js";
 import { LOGIN_ERROR } from "../../common/const/exitCodeConst.js";
-export const authHook = () => {
-    const isLogged = status() === LOGIN_STATUS.LOGGED;
-    if (!isLogged) {
+export const authHook = async () => {
+    const credentials = CredentialsHelper.get();
+    try {
+        if (!credentials.dana?.id_token || !credentials.dana?.refresh_token) {
+            await AuthenticationManager.login(credentials.org);
+            return;
+        }
+        if (AuthenticationManager.isTokenExpired(credentials.dana.id_token) ||
+            (credentials.aws && new Date(credentials.aws.expiration) < new Date())) {
+            await AuthenticationManager.refresh(credentials.org, credentials.dana.refresh_token);
+        }
+    }
+    catch (error) {
+        prompts.log.error(error.message);
         process.exit(LOGIN_ERROR);
     }
 };

package/dist/commands/authentication/commands/login.js

@@ -1,77 +1,26 @@
-import { GetAuthorizationTokenCommand } from "@aws-sdk/client-codeartifact";
 import * as prompts from "@clack/prompts";
-import { execSync } from "node:child_process";
-import express from "express";
-import getPort from "get-port";
-import open from "open";
 import colors from "picocolors";
 import { LOGIN_ERROR } from "../../../common/const/exitCodeConst.js";
 import { CredentialsHelper } from "../helper/CredentialsHelper.js";
-import { DEFAULT_ORG, DOMAIN, DOMAIN_OWNER } from "../authentConst.js";
-import { getRepositoryEndpoint, createCodeArtifactClient } from "../helper/CodeArtifactHelper.js";
+import { AuthenticationManager } from "../AuthenticationManager.js";
 /*
 Login to DANA backend (with aws and cognito) and connect to npm codeartifact
 More info: https://github.com/wiztivi-rd/dana-cli/wiki/Login
 */
-const login = async ({ org = DEFAULT_ORG }) => {
-    const apiUrl = `https://api.${org}.dana-framework.com`; // Or http://localhost:3001
-    const credentials = CredentialsHelper.get();
-    if (credentials) {
-        try {
-            if (new Date(credentials.aws.expiration) < new Date()) {
-                const data = await fetch(`${apiUrl}/login?refresh_token=${credentials.dana.refresh_token}`);
-                if (!data.ok) {
-                    throw new Error("Unable to refresh token");
-                }
-                const refreshedCreds = (await data.json());
-                credentials.aws = refreshedCreds.aws;
-                credentials.dana = {
-                    ...refreshedCreds.token,
-                    refresh_token: credentials.dana.refresh_token,
-                };
-                CredentialsHelper.store(credentials);
-            }
-            prompts.log.info(`Retrieved credentials for ${org} from local cache`);
-            await codeartifactLogin(org, credentials.aws);
-            return;
-        }
-        catch (error) {
-            // Log message and start nominal login process
-            prompts.log.error(error.message);
-        }
-    }
-    prompts.intro(`Login to ${org}...`);
+const login = async ({ org }) => {
+    const credentials = CredentialsHelper.get(org);
     try {
-        const port = await getPort();
-        const app = express();
-        app.disable("x-powered-by");
-        const server = app.listen(port);
-        app.get("/callback", async (req, res) => {
-            try {
-                if (req.query.error) {
-                    throw new Error(req.query.error);
-                }
-                const token = JSON.parse(req.query.token);
-                const awsCredentials = JSON.parse(req.query.aws);
-                CredentialsHelper.store({ aws: awsCredentials, dana: token, org });
-                // Login to codeartifact repository
-                await codeartifactLogin(org, awsCredentials);
-                prompts.outro(colors.green("✓") + ` Login successfull`);
-                res.send("Login successful! You can close this window.");
-            }
-            catch (err) {
-                console.error(err);
-                res.send("Login failed. Check the CLI for details.");
-                handleError(err);
-            }
-            finally {
-                server.close();
-            }
-        });
-        await open(`${apiUrl}/login?port=${port}`);
+        prompts.intro(`Login to organization ${credentials.org} ...`);
+        const validCredentials = await AuthenticationManager.login(credentials.org);
+        prompts.outro(colors.green("✓") + ` Login successful`);
+        const npmToken = await AuthenticationManager.loginNPM(credentials.org, validCredentials.aws);
+        let stepText = "Successfully logged in to npm repository.";
+        if (npmToken.expiration) {
+            stepText += `\nLogin expires in 12 hours at: ${npmToken.expiration.toLocaleString()}`;
+        }
+        prompts.log.step(stepText);
     }
     catch (error) {
-        console.error(error);
         handleError(error);
     }
 };
@@ -80,24 +29,4 @@ const handleError = (error) => {
     prompts.outro(colors.red(`An issue occurred :` + message));
     process.exit(LOGIN_ERROR);
 };
-const codeartifactLogin = async (organization, credentials) => {
-    // Create CodeArtifact client with credentials
-    const client = createCodeArtifactClient(credentials);
-    // Get authorization token
-    const tokenCommand = new GetAuthorizationTokenCommand({
-        domain: DOMAIN,
-        domainOwner: DOMAIN_OWNER,
-    });
-    const { authorizationToken, expiration } = await client.send(tokenCommand);
-    if (!authorizationToken) {
-        throw new Error("Authorization token not found");
-    }
-    // Get repository endpoint
-    const repositoryEndpoint = await getRepositoryEndpoint({ organization, credentials, client, format: "npm" });
-    // Configure npm with the repository and token
-    execSync(`npm config set @dana:registry=${repositoryEndpoint}`);
-    execSync(`npm config set //${repositoryEndpoint.replace(/^https?:\/\//, "")}:_authToken=${authorizationToken}`);
-    const expiresAt = expiration ? new Date(expiration).toLocaleString() : "unknown";
-    prompts.log.step(`Successfully configured npm to use AWS CodeArtifact repository ${repositoryEndpoint}. \nLogin expires in 12 hours at: ${expiresAt}`);
-};
 export default login;

package/dist/commands/authentication/helper/CredentialsHelper.d.ts

@@ -8,20 +8,29 @@ export interface AwsCredentials {
 export interface DanaToken {
     id_token: string;
     access_token: string;
-    refresh_token?: string;
+    refresh_token: string;
     expires_in: number;
     token_type: string;
 }
+export interface OrgCredentials {
+    aws: AwsCredentials;
+    dana: DanaToken;
+}
+export interface DanaConfig {
+    lastUsedOrg: string;
+    credentials: Record<string, OrgCredentials>;
+}
 export declare class CredentialsHelper {
     static readonly filePath: string;
+    private static getConfig;
     static store(credentials: {
         aws: AwsCredentials;
         dana: DanaToken;
         org: string;
     }): void;
-    static get(): {
-        aws: AwsCredentials;
-        dana: DanaToken;
+    static get(org?: string): {
+        aws?: AwsCredentials;
+        dana?: DanaToken;
         org: string;
-    } | null;
+    };
 }

package/dist/commands/authentication/helper/CredentialsHelper.js

@@ -1,15 +1,35 @@
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import path from "node:path";
+import { DEFAULT_ORG } from "../authentConst.js";
 export class CredentialsHelper {
     static filePath = path.join(homedir(), ".dana.json");
-    static store(credentials) {
-        writeFileSync(this.filePath, JSON.stringify(credentials, null, 4));
-    }
-    static get() {
+    static getConfig() {
         if (!existsSync(this.filePath)) {
             return null;
         }
-        return JSON.parse(readFileSync(this.filePath).toString());
+        return JSON.parse(readFileSync(this.filePath, { encoding: "utf-8" }));
+    }
+    static store(credentials) {
+        let config = this.getConfig();
+        config ??= { lastUsedOrg: credentials.org, credentials: {} };
+        config.credentials ??= {};
+        config.lastUsedOrg = credentials.org;
+        config.credentials[credentials.org] = { aws: credentials.aws, dana: credentials.dana };
+        writeFileSync(this.filePath, JSON.stringify(config, null, 4));
+    }
+    static get(org) {
+        const config = this.getConfig();
+        const organization = org ?? config?.lastUsedOrg ?? DEFAULT_ORG;
+        const creds = {
+            org: organization,
+        };
+        if (config?.credentials?.[organization]?.aws) {
+            creds.aws = config?.credentials[organization]?.aws;
+        }
+        if (config?.credentials?.[organization]?.dana) {
+            creds.dana = config?.credentials[organization]?.dana;
+        }
+        return creds;
     }
 }

package/dist/commands/createApp/helpers/CreateAppHelper.d.ts

@@ -89,7 +89,6 @@ declare const CreateAppHelper: {
         updateProfileJsonWithRenderers(jsonData: Record<string, unknown>, renderers: string[]): object;
     } | {
         new (): {};
-        readonly _getAppIcon: () => Promise<string>;
         readonly _askAppId: () => Promise<string>;
         readonly _askAppName: () => Promise<string>;
         readonly _askAppVersion: () => Promise<string>;

package/dist/common/const/deviceConst.js

@@ -29,7 +29,7 @@ const BASIC_SETUP = {
     [TIZEN]: {
         label: "Samsung",
         package: "@dana/vendor-tizen",
-        dependencies: ["@dana/vendor-tizen", "@dana/vendor-shaka"],
+        dependencies: ["@dana/vendor-tizen", "@dana/vendor-shaka", "@dana/tools-smarttv-grunt"],
     },
 };
 //Devices that need a subscription to be added in project

package/dist/common/helpers/InstallHelper.d.ts

@@ -11,6 +11,7 @@ declare class InstallHelper {
     }) => Promise<string>;
     private static getDependenciesList;
     private static readonly installSingleDependency;
+    private static readonly updateSemver;
     /**
      * Get a list of all dependencies needed by the different devices chosen by user
      */

package/dist/common/helpers/InstallHelper.js

@@ -12,6 +12,8 @@
 import { exec } from "node:child_process";
 import { BASIC_DEPENDENCIES, PLATFORM_CONFIG } from "../const/deviceConst.js";
 import translation from "../translation/translation.js";
+import path from "node:path";
+import fs from "node:fs";
 class InstallHelper {
     /**
      * Install dependencies with npm
@@ -22,9 +24,9 @@ class InstallHelper {
         return new Promise((resolve, reject) => {
             exec(`npm i --prefix ${directory} --silent`, {}, (async () => {
                 try {
-                    for (const depName of devDependencies) {
-                        await InstallHelper.installSingleDependency(depName, directory);
-                    }
+                    const dependenciesString = devDependencies.join(" ").trim();
+                    await InstallHelper.installSingleDependency(dependenciesString, directory);
+                    InstallHelper.updateSemver(directory);
                     resolve("Dependencies updated");
                 }
                 catch (error) {
@@ -53,6 +55,16 @@ class InstallHelper {
             });
         });
     };
+    static updateSemver = (directory) => {
+        const filePath = path.join(directory, "package.json");
+        const packageJson = JSON.parse(fs.readFileSync(filePath).toString());
+        packageJson.devDependencies = Object.entries(packageJson.devDependencies).reduce((acc, [key, value]) => {
+            acc[key] =
+                key.includes("@dana") || key.includes("@wiztivi") ? value.replace(/(\d+\.\d+\.)\d$/, "$1x") : value;
+            return acc;
+        }, {});
+        fs.writeFileSync(filePath, JSON.stringify(packageJson, null, 4));
+    };
     /**
      * Get a list of all dependencies needed by the different devices chosen by user
      */

package/dist/common/helpers/UpdateFileHelper.js

@@ -16,6 +16,7 @@ import { templateGenerator } from "./handlebarsHelper.js";
 import { CredentialsHelper } from "../../commands/authentication/helper/CredentialsHelper.js";
 import { getRepositoryEndpoint } from "../../commands/authentication/helper/CodeArtifactHelper.js";
 import { REGISTRY_KEY } from "../../commands/createApp/const/setupConst.js";
+import { formatToCamelCase } from "./stringHelper.js";
 class UpdateFileHelper {
     /**
      * Update app.Config files with mandatory Data
@@ -54,7 +55,9 @@ class UpdateFileHelper {
         const filePath = path.join(directory, "package.json");
         const packageJson = JSON.parse(fs.readFileSync(filePath).toString());
         if (name) {
-            packageJson.name = name;
+            //https://docs.npmjs.com/cli/v10/configuring-npm/package-json?v=true
+            const unsafeCharRegex = /[^A-Za-z0-9._-]/g;
+            packageJson.name = name.replaceAll(unsafeCharRegex, "").toLowerCase();
         }
         for (const device of selectedDevices) {
             const deviceConfig = config[device];
@@ -87,7 +90,7 @@ class UpdateFileHelper {
     };
     static applyTemplatesToFiles = function ({ directory, name, }) {
         const routesFilePath = path.join(directory, "scripts", "app");
-        const appName = `${name[0].toUpperCase()}${name.substring(1)}`;
+        const appName = `${formatToCamelCase(name)}`;
         const filesToUpdate = [
             {
                 fromPath: path.join(routesFilePath, "TemplateAppRoutes.js.hbs"),
@@ -117,7 +120,12 @@ class UpdateFileHelper {
         return Promise.resolve("Files templated");
     };
     static getConfigFileOutput = function (directory) {
-        const configFiles = ["gitignoreTemplate.hbs", "editorConfigTemplate.hbs", "eslintrc.jsonTemplate.hbs"];
+        const configFiles = [
+            "gitignoreTemplate.hbs",
+            "editorConfigTemplate.hbs",
+            "eslintrc.jsonTemplate.hbs",
+            "nvmrcTemplate.hbs",
+        ];
         const filesToUpdate = [];
         for (const configFile of configFiles) {
             filesToUpdate.push({

package/dist/common/helpers/UserInputGetter.js

@@ -44,7 +44,7 @@ class UserInputGetter {
         return UserInputGetter.formatAppName(name);
     }
     static formatAppName(input) {
-        const separatorRegex = /[ \-_.]+/;
+        const separatorRegex = /[ /]+/;
         return input
             .trim()
             .split(separatorRegex)
@@ -60,6 +60,8 @@ class UserInputGetter {
     static getAvailableDevices() {
         const availableDevices = [];
         const unavailableDevices = [];
+        const spinner = prompts.spinner();
+        spinner.start();
         for (const [key, value] of Object.entries(EXTENDED_SETUP)) {
             try {
                 execSync(`npm view ${value.package} --silent`, { encoding: "utf-8" });
@@ -69,6 +71,7 @@ class UserInputGetter {
                 unavailableDevices.push(EXTENDED_SETUP[key].label);
             }
         }
+        spinner.stop("Available devices checked");
         return Promise.resolve({ availableDevices, unavailableDevices });
     }
     /**

package/dist/common/helpers/stringHelper.d.ts

@@ -1,3 +1,8 @@
 import { OptionList } from "../types/helperTypes.js";
 export declare const capitalizeFirstLetter: (input: string) => string;
 export declare const optionsListString: (input: OptionList) => string;
+/**
+ * Remove separator characters from string and convert it to camelCase
+ */
+export declare const formatToCamelCase: (input: string) => string;
+export declare const formatWordToCamelCase: (input: string) => string;

package/dist/common/helpers/stringHelper.js

@@ -4,3 +4,15 @@ export const capitalizeFirstLetter = (input) => {
 export const optionsListString = (input) => {
     return input.map((option) => option.command).join(", ");
 };
+/**
+ * Remove separator characters from string and convert it to camelCase
+ */
+export const formatToCamelCase = (input) => {
+    const separatorRegex = /[./_\-\\ ]/g;
+    return input
+        .trim()
+        .split(separatorRegex)
+        .map((el, index) => (index === 0 ? el.toLowerCase() : formatWordToCamelCase(el)))
+        .join("");
+};
+export const formatWordToCamelCase = (input) => `${input[0].toUpperCase()}${input.substring(1).toLowerCase()}`;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wiztivi/dana-cli",
-    "version": "0.0.7",
+    "version": "0.0.9",
     "description": "Dana create app CLI",
     "type": "module",
     "exports": "./dist/index.js",
@@ -14,18 +14,21 @@
         "lint": "eslint src tests",
         "test": "vitest",
         "test:coverage": "vitest run --coverage",
-        "build": "rimraf ./dist tsconfig.tsbuildinfo && tsc --build && npm run add_files_to_dist",
+        "build": "npm run _clean:dist && tsc --build && npm run _add_files:dist",
+        "build:watch": "npm run _clean:dist && tsc --build --watch",
         "ci": "npm run build && npm run lint && npm run test:coverage",
-        "add_files_to_dist": "cp dana_completion.sh ../../README.md dist/"
+        "_add_files:dist": "cp ../../README.md .",
+        "_clean:dist": "rimraf ./dist tsconfig.tsbuildinfo"
     },
     "files": [
         "dist",
-        "dana_completion.sh"
+        "dana_completion.sh",
+        "README.md"
     ],
     "dependencies": {
         "@aws-sdk/client-codeartifact": "^3.859.0",
         "@clack/prompts": "0.10.0",
-        "@wiztivi/dana-templates": "^0.0.7",
+        "@wiztivi/dana-templates": "^0.0.9",
         "child_process": "1.0.x",
         "command-exists": "1.2.9",
         "commander": "11.1.x",

package/dist/dana_completion.sh

@@ -1,153 +0,0 @@
-#!/usr/bin/env sh
-
-# Unified completion script for dana CLI
-# Detects shell and loads appropriate completion
-
-# Shared command list
-dana_commands=(
-'add-device'
-'add-menu'
-'add-rail'
-'add-scrollView'
-'add-screen'
-'auth'
-'create-app'
-)
-
-# Shared subcommand declarations
-login_sub="login"
-logout_sub="logout"
-status_sub="status"
-# Shared option declarations
-direction_opts="-d --direction"
-navigation_opts="-n --navigation"
-cyclic_opts="-c --cyclic"
-margin_opts="-m --itemMargin"
-custom_opts="-cm --custom"
-item_view_opts="-i --itemView"
-org_opts="-o --org"
-device_opts="-d --device"
-tutorial_opts="-t, --tutorial"
-
-# Shared option values
-direction_values="h v"
-navigation_values="fixed lmr lr paginated"
-org_values="preprod"
-# Detect shell and load appropriate completion
-if [ -n "$BASH_VERSION" ]; then
-    # Bash completion
-    _dana()
-    {
-       local cur prev opts
-       cur="${COMP_WORDS[COMP_CWORD]}"
-       prev="${COMP_WORDS[COMP_CWORD-1]}"
-       # Complete option values
-       case "$prev" in
-         -d|--direction)
-           COMPREPLY=($(compgen -W "$direction_values" -- "$cur"))
-           return 0
-           ;;
-         -n|--navigation)
-           COMPREPLY=($(compgen -W "$navigation_values" -- "$cur"))
-           return 0
-           ;;
-         -o|--org)
-           COMPREPLY=($(compgen -W "$org_values" -- "$cur"))
-           return 0
-           ;;
-       esac
-       # If we're completing the first argument (command)
-       if [[ $COMP_CWORD -eq 1 ]]; then
-         COMPREPLY=($(compgen -W "${dana_commands[*]}" -- "$cur"))
-         return 0
-       fi
-       # If we're completing options for specific commands
-       local cmd="${COMP_WORDS[1]}"
-       case "$cmd" in
-         add-rail)
-           opts="$navigation_opts $cyclic_opts $direction_opts $custom_opts $item_view_opts"
-           COMPREPLY=($(compgen -W "$opts" -- "$cur"))
-           ;;
-         add-menu)
-           opts="$direction_opts $margin_opts $custom_opts $item_view_opts"
-           COMPREPLY=($(compgen -W "$opts" -- "$cur"))
-           ;;
-         add-scrollView)
-           opts="$custom_opts $item_view_opts $margin_opts"
-           COMPREPLY=($(compgen -W "$opts" -- "$cur"))
-           ;;
-         auth)
-            if [[ $COMP_CWORD -eq 2 ]]; then
-              opts="$login_sub $logout_sub $status_sub"
-            else
-              opts="$org_opts"
-            fi
-            COMPREPLY=($(compgen -W "$opts" -- "$cur"))
-            ;;
-         create-app)
-           opts="$device_opts $tutorial_opts"
-           COMPREPLY=($(compgen -W "$opts" -- "$cur"))
-           ;;
-         *)
-           COMPREPLY=()
-           ;;
-       esac
-    }
-    complete -F _dana dana
-elif [ -n "$ZSH_VERSION" ]; then
-    # Zsh completion
-    _dana() {
-      # Main commands
-      if (( CURRENT == 2 )); then
-        local -a commands
-        commands=(${dana_commands[@]})
-        compadd -a commands
-        return
-      fi
-      # Complete option values
-      local prev=${words[CURRENT-1]}
-      case "$prev" in
-        -d|--direction)
-          compadd -- ${=direction_values}
-          return
-          ;;
-        -n|--navigation)
-          compadd -- ${=navigation_values}
-          return
-          ;;
-        -o|--org)
-          compadd -- ${=org_values}
-          return
-          ;;
-        login|logout|status)
-          compadd -- ${=org_opts}
-          return
-          ;;
-      esac
-      # Complete options for commands
-      local cmd=${words[2]}
-      case "$cmd" in
-        add-rail)
-          compadd -- ${=navigation_opts} ${=cyclic_opts} ${=direction_opts} ${=custom_opts} ${=item_view_opts}
-          ;;
-        add-menu)
-          compadd -- ${=direction_opts} ${=margin_opts} ${=custom_opts} ${=item_view_opts}
-          ;;
-        add-scrollView)
-          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
-          ;;
-        create-app)
-          compadd -- ${device_opts} $={tutorial_opts}
-      esac
-    }
-
-    # Register the completion
-    compdef _dana dana
-fi