@wiztivi/dana-cli 0.0.12 → 0.0.13

package/dana_completion.sh

@@ -23,7 +23,7 @@ direction_opts="-d --direction"
 navigation_opts="-n --navigation"
 cyclic_opts="-c --cyclic"
 margin_opts="-m --itemMargin"
-custom_opts="-cm --custom"
+custom_opts="--cm --custom"
 item_view_opts="-i --itemView"
 org_opts="-o --org"
 device_opts="-d --device"

package/dist/commands/addComponent/addMenu/addMenuDefinition.js

@@ -6,7 +6,7 @@ const addMenuDefinition = () => {
     command
         .description(translation["command.menu.description"])
         .argument("[name]", translation["command.component.name"])
-        .option("-cm, --custom", translation["command.component.customization"])
+        .option("--cm, --custom", translation["command.component.customization"])
         .option("-i, --itemView <itemView>", translation["command.menu.option.itemView"])
         .option("-m, --itemMargin <itemMargin>", translation["command.menu.option.itemMargin"])
         .option("-d, --direction <direction>", translation["command.rail.option.direction"])

package/dist/commands/addComponent/addRail/addRailDefinition.js

@@ -8,7 +8,7 @@ const addRailDefinition = () => {
     command
         .description(translation["command.rail.description"])
         .argument("[name]", translation["command.component.name"])
-        .option("-cm, --custom", translation["command.component.customization"])
+        .option("--cm, --custom", translation["command.component.customization"])
         .option("-n, --navigation <navigation>", translation["command.rail.option.navigation"])
         .option("-d, --direction <direction>", translation["command.rail.option.direction"])
         .option("-c, --cyclic", translation["command.rail.option.cyclic"])

package/dist/commands/addComponent/addScrollView/addScrollViewDefinition.js

@@ -5,7 +5,7 @@ const addScrollViewDefinition = () => {
     return new Command("add-scrollView")
         .description(translation["command.scrollView.description"])
         .argument("[name]", translation["command.component.name"])
-        .option("-cm, --custom", translation["command.component.customization"])
+        .option("--cm, --custom", translation["command.component.customization"])
         .option("-i, --itemView <itemView>", translation["command.menu.option.itemView"])
         .option("-m, --itemMargin <itemMargin>", translation["command.menu.option.itemMargin"])
         .action(addScrollView);

package/dist/commands/addDevice/add-device.js

@@ -86,6 +86,5 @@ const addDevice = async () => {
     }
     spinner.stop(translation["task.installation.end"]);
     prompts.outro("Everything is ready ! Don't forget to commit your change.");
-    return;
 };
 export default addDevice;

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

@@ -16,13 +16,7 @@ import ComponentHelper from "../../addComponent/helper/ComponentHelper.js";
 import * as prompts from "@clack/prompts";
 import colors from "picocolors";
 import { clean } from "semver-ts";
-import { maxSatisfying } from "semver";
-import { validInputLength, validAppId, validAppVersion, validAppVersionCode, } from "../../../common/helpers/InputValidator.js";
-import translation from "../../../common/translation/translation.js";
-import { CredentialsHelper } from "../../authentication/helper/CredentialsHelper.js";
-import { ListPackageVersionsCommand } from "@aws-sdk/client-codeartifact";
-import { createCodeArtifactClient } from "../../authentication/helper/CodeArtifactHelper.js";
-import { DOMAIN, DOMAIN_OWNER } from "../../authentication/authentConst.js";
+import { validAppId, validAppVersion, validAppVersionCode, validInputLength, } from "../../../common/helpers/InputValidator.js";
 import addDeviceHelper from "../helper/addDeviceHelper.js";
 const AndroidtvConfig = class extends DeviceConfig {
     /**
@@ -80,33 +74,13 @@ const AndroidtvConfig = class extends DeviceConfig {
      * Call aws to get latest android version
      */
     static _getWtvAndroidVersion = async () => {
-        let wtvAndroidVersion;
-        try {
-            const credentials = CredentialsHelper.get();
-            const client = createCodeArtifactClient(credentials.aws);
-            const command = new ListPackageVersionsCommand({
-                package: "v8-runtime",
-                domain: DOMAIN,
-                domainOwner: DOMAIN_OWNER,
-                repository: "internal-android-repository",
-                format: "maven",
-                namespace: "com.dana.androidtv",
-            });
-            const response = await client.send(command);
-            const versionListArray = response.versions?.map((v) => v.version).filter(Boolean);
-            // need to use semver-ts to avoid this error
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-assignment
-            wtvAndroidVersion = maxSatisfying(versionListArray, "*");
-            if (wtvAndroidVersion) {
-                return wtvAndroidVersion;
-            }
-            else {
-                throw new Error(translation["command.device.version.error"]);
-            }
-        }
-        catch (error) {
-            throw new Error(error.message ?? translation["error.common.start.message"]);
-        }
+        const requestParams = {
+            packageName: "v8-runtime",
+            repository: "internal-android-repository",
+            format: "maven",
+            namespace: "com.dana.androidtv",
+        };
+        return await addDeviceHelper.getLatestPackageVersion(requestParams);
     };
     static getConfig = async () => {
         prompts.log.info(colors.bold("Let's configure Android !"));

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

@@ -24,4 +24,7 @@ interface WebosDevice {
     largeIcon: string;
     disableBackHistoryAPI: boolean;
 }
-export { AndroidDevice, AndroidConfig, TizenConf, WebosConf, WebosDevice };
+interface TvosConf {
+    jscVersion: string;
+}
+export { AndroidDevice, AndroidConfig, TizenConf, WebosConf, WebosDevice, TvosConf };

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

@@ -34,10 +34,11 @@ const TizenConfig = class extends DeviceConfig {
             },
         },
     };
+    // eslint-disable-next-line @typescript-eslint/require-await
     static getConfig = async () => {
-        return Promise.resolve({
+        return {
             renderers: [LIGHTNING],
-        });
+        };
     };
     static setConfig = ({ directory, config }) => {
         const filePath = path.join(directory, "profiles", "app.config.tizen.json");

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

@@ -1,3 +1,4 @@
+import { TvosConf } from "./configTypes.js";
 declare const TvosConfig: {
     new (): {};
     /**
@@ -6,8 +7,12 @@ declare const TvosConfig: {
     readonly setConfig: ({ directory }: {
         directory: string;
     }) => Promise<string>;
+    readonly getConfig: () => Promise<TvosConf>;
+    /**
+     * Call aws to get latest jsc version
+     */
+    readonly getJscVersion: () => Promise<string>;
     readonly appConfig: {};
-    getConfig(..._: string[]): Promise<unknown>;
     updateProfileJsonWithRenderers(jsonData: Record<string, unknown>, renderers: string[]): object;
 };
 export default TvosConfig;

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

@@ -12,16 +12,34 @@
 import fs from "node:fs";
 import DeviceConfig from "./deviceConfig.js";
 import path from "node:path";
+import addDeviceHelper from "../helper/addDeviceHelper.js";
 const TvosConfig = class extends DeviceConfig {
     /**
      * Set config for TVOS
      */
-    static setConfig = ({ directory }) => {
+    static setConfig = async ({ directory }) => {
         const update = `\n# For TVOS\napp_tvos/build \napp_tvos/libs`;
         const filePath = path.join(directory, ".gitignore");
         const data = fs.readFileSync(filePath, { encoding: "utf8" });
         fs.writeFileSync(filePath, data + update);
         return Promise.resolve(".gitignore updated");
     };
+    static getConfig = async () => {
+        return {
+            jscVersion: await TvosConfig.getJscVersion(),
+        };
+    };
+    /**
+     * Call aws to get latest jsc version
+     */
+    static getJscVersion = async () => {
+        const requestParams = {
+            packageName: "jscmodule",
+            repository: "internal-apple-repository",
+            format: "swift",
+            namespace: "dana",
+        };
+        return await addDeviceHelper.getLatestPackageVersion(requestParams);
+    };
 };
 export default TvosConfig;

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

@@ -1,3 +1,4 @@
+import { PackageFormat } from "@aws-sdk/client-codeartifact";
 export interface PromptFactoryParams {
     errorMessage?: string;
     promptMessage: string;
@@ -21,5 +22,11 @@ declare const AddDeviceHelper: {
      */
     readonly getAppIcon: () => Promise<string>;
     readonly promptTextFactory: ({ errorMessage, promptMessage, validationFunction, placeholder, initialValue, }: PromptFactoryParams) => Promise<string>;
+    readonly getLatestPackageVersion: ({ packageName, repository, format, namespace, }: {
+        packageName: string;
+        repository: string;
+        format: PackageFormat;
+        namespace: string;
+    }) => Promise<string>;
 };
 export default AddDeviceHelper;

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

@@ -4,6 +4,12 @@ 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";
+import { CredentialsHelper } from "../../authentication/helper/CredentialsHelper.js";
+import { createCodeArtifactClient } from "../../authentication/helper/CodeArtifactHelper.js";
+import { ListPackageVersionsCommand } from "@aws-sdk/client-codeartifact";
+import { DOMAIN, DOMAIN_OWNER } from "../../authentication/authentConst.js";
+import translation from "../../../common/translation/translation.js";
+import { maxSatisfying } from "semver";
 const AddDeviceHelper = class {
     /**
      * clean on error
@@ -49,5 +55,34 @@ const AddDeviceHelper = class {
         ComponentHelper.handleCancellation(result);
         return result;
     };
+    static getLatestPackageVersion = async ({ packageName, repository, format, namespace, }) => {
+        let packageVersion;
+        try {
+            const credentials = CredentialsHelper.get();
+            const client = createCodeArtifactClient(credentials.aws);
+            const command = new ListPackageVersionsCommand({
+                package: packageName,
+                domain: DOMAIN,
+                domainOwner: DOMAIN_OWNER,
+                repository,
+                format,
+                namespace,
+            });
+            const response = await client.send(command);
+            const versionListArray = response.versions?.map((v) => v.version).filter(Boolean);
+            // need to use semver-ts to avoid this error
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-assignment
+            packageVersion = maxSatisfying(versionListArray, "*");
+            if (packageVersion) {
+                return packageVersion;
+            }
+            else {
+                throw new Error(translation["command.device.version.error"]);
+            }
+        }
+        catch (error) {
+            throw new Error(error.message ?? translation["error.common.start.message"]);
+        }
+    };
 };
 export default AddDeviceHelper;

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

@@ -84,8 +84,9 @@ declare const CreateAppHelper: {
         readonly setConfig: ({ directory }: {
             directory: string;
         }) => Promise<string>;
+        readonly getConfig: () => Promise<import("../../addDevice/deviceConfig/configTypes.js").TvosConf>;
+        readonly getJscVersion: () => Promise<string>;
         readonly appConfig: {};
-        getConfig(..._: string[]): Promise<unknown>;
         updateProfileJsonWithRenderers(jsonData: Record<string, unknown>, renderers: string[]): object;
     } | {
         new (): {};

package/dist/commands/createApp/helpers/SetupChecker.js

@@ -52,7 +52,7 @@ class SetupChecker {
      * @returns {Promise}
      */
     static async validateNodeVersion() {
-        const minimalNodeVersion = 20;
+        const minimalNodeVersion = 22;
         const currentVersion = Number.parseInt(process.version.slice(1).split(".")[0], 10);
         return currentVersion >= minimalNodeVersion
             ? Promise.resolve("Node version ok !")

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

@@ -19,6 +19,7 @@ declare class CreateFileHelper {
         selectedDevices: string[];
         directory: string;
     }) => Promise<string>;
+    private static runGruntCommand;
     /**
      * Execute grunt tasks
      */

package/dist/common/helpers/CreateFileHelper.js

@@ -11,9 +11,8 @@
  */
 import fs from "node:fs";
 import path from "node:path";
-import { execSync } from "node:child_process";
-import { ANDROIDTV } from "../const/deviceConst.js";
-import translation from "../translation/translation.js";
+import { spawnSync } from "node:child_process";
+import { ANDROIDTV, TVOS } from "../const/deviceConst.js";
 import { CredentialsHelper } from "../../commands/authentication/helper/CredentialsHelper.js";
 import { getRepositoryEndpoint } from "../../commands/authentication/helper/CodeArtifactHelper.js";
 import ComponentHelper from "../../commands/addComponent/helper/ComponentHelper.js";
@@ -49,6 +48,15 @@ class CreateFileHelper {
         }
         return Promise.resolve("Config file(s) copied");
     };
+    static runGruntCommand(args, directory) {
+        const gruntAndroid = spawnSync("grunt", args, { cwd: directory });
+        if (gruntAndroid.status === 0) {
+            return Promise.resolve("Grunt task(s) done");
+        }
+        else {
+            throw new Error("Grunt task(s) failed");
+        }
+    }
     /**
      * Execute grunt tasks
      */
@@ -60,17 +68,25 @@ class CreateFileHelper {
                 credentials: credentials?.aws,
                 format: "maven",
             });
-            let gruntOptions = `--appUrl="${registryAccount}" --organization="${credentials.org}" `;
+            const args = ["copyProjectAndroidTv", `--appUrl=${registryAccount}`, `--organization=${credentials.org}`];
             const optionsToAdd = ["appId", "appName", "appVersion", "appVersionCode", "wtvAndroidVersion"];
             for (const option of optionsToAdd) {
-                gruntOptions += `--${option}="${config.androidtv?.device[option]}" `;
+                args.push(`--${option}=${config.androidtv?.device[option]}`);
+            }
+            try {
+                await CreateFileHelper.runGruntCommand(args, directory);
+            }
+            catch (error) {
+                throw new Error(`Failed to execute grunt tasks: ${error.message}`);
             }
+        }
+        if (selectedDevices.includes(TVOS)) {
             try {
-                execSync(`cd ${directory} && grunt copyProjectAndroidTv ${gruntOptions.trim()}`);
+                const args = ["copyProjectTvos", `--jscVersion=${config.tvos?.jscVersion}`];
+                await CreateFileHelper.runGruntCommand(args, directory);
             }
-            catch (e) {
-                const message = e instanceof Error ? e.message : translation["error.common.start.message"];
-                throw new Error(message);
+            catch (error) {
+                throw new Error(`Failed to execute grunt tasks: ${error.message}`);
             }
         }
         return "Grunt task(s) done";

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

@@ -20,6 +20,7 @@ declare class InstallHelper {
      * Install grunt globally
      */
     static readonly installGrunt: () => Promise<string>;
+    private static runGitCommand;
     /**
      * Initialize git repository and do first commit
      * @returns {Promise<String>}

package/dist/common/helpers/InstallHelper.js

@@ -9,7 +9,7 @@
  * This software MAY NOT be used, modified or rewritten without prior written permission from Wiztivi.
  *
  */
-import { exec } from "node:child_process";
+import { exec, spawn } from "node:child_process";
 import { BASIC_DEPENDENCIES, PLATFORM_CONFIG } from "../const/deviceConst.js";
 import translation from "../translation/translation.js";
 import path from "node:path";
@@ -22,18 +22,26 @@ class InstallHelper {
     static installDependencies = ({ directory, selectedDevices, config, }) => {
         const devDependencies = InstallHelper.getDependenciesList(selectedDevices, config);
         return new Promise((resolve, reject) => {
-            exec(`npm i --prefix ${directory} --silent`, {}, (async () => {
-                try {
-                    const dependenciesString = devDependencies.join(" ").trim();
-                    await InstallHelper.installSingleDependency(dependenciesString, directory);
-                    InstallHelper.updateSemver(directory);
-                    resolve("Dependencies updated");
+            const npmInstall = spawn("npm", ["i", "--prefix", directory, "--silent"]);
+            npmInstall.on("close", (code) => {
+                if (code === 0) {
+                    InstallHelper.installSingleDependency(devDependencies, directory)
+                        .then(() => {
+                        InstallHelper.updateSemver(directory);
+                        resolve("Dependencies updated");
+                    })
+                        .catch((error) => {
+                        reject(new Error("Dependencies update failed : " +
+                            (error.message ?? translation["error.common.start.message"])));
+                    });
                 }
-                catch (error) {
-                    reject(new Error("Dependencies update failed : " +
-                        (error.message ?? translation["error.common.start.message"])));
+                else {
+                    reject(new Error("FAILURE during dependencies installation"));
                 }
-            }));
+            });
+            npmInstall.on("error", (data) => {
+                reject(new Error(`FAILURE during dependency installation : ${data}`));
+            });
         });
     };
     static getDependenciesList(selectedDevices, config) {
@@ -45,14 +53,18 @@ class InstallHelper {
     }
     static installSingleDependency = (depName, directory) => {
         return new Promise((resolveInstall, rejectInstall) => {
-            exec(`npm i ${depName} --prefix '${directory}' --save-dev --save-exact`, {}, (error) => {
-                if (error) {
-                    rejectInstall(new Error(`FAILURE during ${depName} dependency installation ${error.message}`));
+            const npmInstall = spawn("npm", ["i", ...depName, "--prefix", directory, "--save-dev", "--save-exact"]);
+            npmInstall.on("close", (code) => {
+                if (code === 0) {
+                    resolveInstall();
                 }
                 else {
-                    resolveInstall();
+                    rejectInstall(new Error(`FAILURE during dependency installation`));
                 }
             });
+            npmInstall.on("error", (error) => {
+                rejectInstall(new Error(`FAILURE during dependency installation : ${error.message}`));
+            });
         });
     };
     static updateSemver = (directory) => {
@@ -95,28 +107,36 @@ class InstallHelper {
             });
         });
     };
+    static runGitCommand(args, directory) {
+        return new Promise((resolve, reject) => {
+            const gitProcess = spawn("git", args, { cwd: directory });
+            gitProcess.on("close", (code) => {
+                if (code === 0) {
+                    resolve();
+                }
+                else {
+                    reject(new Error(`Git ${args[0]} failed`));
+                }
+            });
+            gitProcess.on("error", (error) => {
+                reject(new Error(`Git ${args[0]} failed: ${error.message}`));
+            });
+        });
+    }
     /**
      * Initialize git repository and do first commit
      * @returns {Promise<String>}
      */
-    static initGit = function ({ directory }) {
-        return new Promise((resolve, reject) => {
-            try {
-                exec(`cd ${directory} && git init && git add -A && git commit -m "Initial commit from Create DANA App"`, { maxBuffer: 1024 * 1024 * 64 }, // 64MB
-                (error) => {
-                    if (error) {
-                        reject(error);
-                    }
-                    else {
-                        resolve("Git initialised");
-                    }
-                });
-            }
-            catch (e) {
-                const message = e instanceof Error ? e.message : translation["error.common.start.message"];
-                reject(new Error("Git hasn't been initialised" + message));
-            }
-        });
+    static initGit = async function ({ directory }) {
+        try {
+            await InstallHelper.runGitCommand(["init"], directory);
+            await InstallHelper.runGitCommand(["add", "."], directory);
+            await InstallHelper.runGitCommand(["commit", "-m", "Initial commit from Create DANA App"], directory);
+            return "Git initialized";
+        }
+        catch (e) {
+            throw new Error("Git hasn't been initialised: " + e.message);
+        }
     };
 }
 export default InstallHelper;

package/dist/common/types/helperTypes.d.ts

@@ -1,5 +1,5 @@
 import { ANDROIDTV, TIZEN, TVOS, WEBOS } from "../const/deviceConst.js";
-import { AndroidConfig, AndroidDevice, TizenConf, WebosConf, WebosDevice } from "../../commands/addDevice/deviceConfig/configTypes.js";
+import { AndroidConfig, AndroidDevice, TizenConf, WebosConf, WebosDevice, TvosConf } from "../../commands/addDevice/deviceConfig/configTypes.js";
 interface Task {
     title: string;
     task: () => Promise<string>;
@@ -13,7 +13,7 @@ interface Data {
     awsProfile: string;
 }
 interface Config {
-    [TVOS]?: never;
+    [TVOS]?: TvosConf;
     [ANDROIDTV]?: AndroidConfig;
     [WEBOS]?: WebosConf;
     [TIZEN]?: TizenConf;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wiztivi/dana-cli",
-    "version": "0.0.12",
+    "version": "0.0.13",
     "description": "Dana create app CLI",
     "type": "module",
     "exports": "./dist/index.js",
@@ -26,25 +26,25 @@
         "README.md"
     ],
     "dependencies": {
-        "@aws-sdk/client-codeartifact": "^3.859.0",
-        "@clack/prompts": "0.10.0",
-        "@wiztivi/dana-templates": "^0.0.12",
+        "@aws-sdk/client-codeartifact": "3.936.0",
+        "@clack/prompts": "0.11.0",
+        "@wiztivi/dana-templates": "^0.0.13",
         "child_process": "1.0.x",
         "command-exists": "1.2.9",
-        "commander": "11.1.x",
-        "express": "^5.1.0",
-        "get-port": "^7.1.0",
-        "grunt-cli": "1.4.x",
-        "handlebars": "^4.7.8",
-        "jsonwebtoken": "^9.0.2",
-        "open": "^10.1.2",
-        "picocolors": "1.0.x",
-        "url": "^0.11.4",
-        "semver": "^7.7.1",
-        "semver-ts": "^1.0.3"
+        "commander": "14.0.x",
+        "express": "5.1.0",
+        "get-port": "7.1.0",
+        "grunt-cli": "1.5.x",
+        "handlebars": "4.7.8",
+        "jsonwebtoken": "9.0.2",
+        "open": "11.0.0",
+        "picocolors": "1.1.x",
+        "url": "0.11.4",
+        "semver": "7.7.3",
+        "semver-ts": "1.0.3"
     },
     "devDependencies": {
-        "@types/express": "^5.0.3",
-        "@types/jsonwebtoken": "^9.0.10"
+        "@types/express": "5.0.5",
+        "@types/jsonwebtoken": "9.0.10"
     }
 }