@nathapp/na-cli 1.0.1-rc.6 → 1.0.2

package/dist/templates/vuexy-portal/src/plugins/iconify/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

package/dist/templates/vuexy-portal/src/views/account-settings/AccountSettingsSecurity.vue

@@ -0,0 +1,179 @@
+<script lang="ts" setup>
+import { md5 } from 'js-md5'
+import { useAppToasts } from '@/@custom/composables/toasts'
+import { useValidators } from '@/@custom/composables/validator'
+
+const { t } = useI18n()
+const { requiredValidator, passwordValidator, confirmedPasswordValidator } = useValidators()
+const { toastLocalizeSuccess } = useAppToasts()
+const isCurrentPasswordVisible = ref(false)
+const isNewPasswordVisible = ref(false)
+const isConfirmPasswordVisible = ref(false)
+const currentPassword = ref('')
+const newPassword = ref('')
+const confirmPassword = ref('')
+const refForm = ref()
+const actionLoading = ref(false)
+
+const passwordRequirements = computed(() => (
+  [
+    t('changePassword.passwordRequirement1'),
+    t('changePassword.passwordRequirement2'),
+    t('changePassword.passwordRequirement3'),
+    t('changePassword.passwordRequirement4'),
+    t('changePassword.passwordRequirement5'),
+  ]
+))
+
+const onChangePassword = async () => {
+  const validateResult = await refForm.value?.validate()
+
+  if (validateResult?.valid) {
+    try {
+      actionLoading.value = true
+
+      const result = await userApi.changePassword({
+        existingPassword: md5(currentPassword.value),
+        password: md5(newPassword.value),
+      })
+
+      if (result.ret === 0) {
+        toastLocalizeSuccess('changePassword.passwordChangeSuccess')
+        nextTick(() => {
+          refForm.value?.reset()
+          refForm.value?.resetValidation()
+        })
+      }
+    }
+    catch (e) {
+      console.log('change password error', e)
+    }
+    finally {
+      actionLoading.value = false
+    }
+  }
+}
+</script>
+
+<template>
+  <VRow>
+    <!-- SECTION: Change Password -->
+    <VCol cols="12">
+      <VCard :title="$t('changePassword.changePassword')">
+        <VForm ref="refForm">
+          <VCardText class="pt-0">
+            <!-- 👉 Current Password -->
+            <VRow>
+              <VCol
+                cols="12"
+                md="6"
+              >
+                <!-- 👉 current password -->
+                <AppTextField
+                  v-model="currentPassword"
+                  :rules="[requiredValidator]"
+                  :type="isCurrentPasswordVisible ? 'text' : 'password'"
+                  :append-inner-icon="isCurrentPasswordVisible ? 'tabler-eye-off' : 'tabler-eye'"
+                  :label="$t('changePassword.currentPassword')"
+                  autocomplete="on"
+                  placeholder="············"
+                  @click:append-inner="isCurrentPasswordVisible = !isCurrentPasswordVisible"
+                />
+              </VCol>
+            </VRow>
+
+            <!-- 👉 New Password -->
+            <VRow>
+              <VCol
+                cols="12"
+                md="6"
+              >
+                <!-- 👉 new password -->
+                <AppTextField
+                  v-model="newPassword"
+                  :rules="[requiredValidator, passwordValidator]"
+                  :type="isNewPasswordVisible ? 'text' : 'password'"
+                  :append-inner-icon="isNewPasswordVisible ? 'tabler-eye-off' : 'tabler-eye'"
+                  :label="$t('changePassword.newPassword')"
+                  autocomplete="on"
+                  placeholder="············"
+                  @click:append-inner="isNewPasswordVisible = !isNewPasswordVisible"
+                />
+              </VCol>
+
+              <VCol
+                cols="12"
+                md="6"
+              >
+                <!-- 👉 confirm password -->
+                <AppTextField
+                  v-model="confirmPassword"
+                  :rules="[requiredValidator, confirmedPasswordValidator(confirmPassword, newPassword)]"
+                  :type="isConfirmPasswordVisible ? 'text' : 'password'"
+                  :append-inner-icon="isConfirmPasswordVisible ? 'tabler-eye-off' : 'tabler-eye'"
+                  :label="$t('changePassword.confirmPassword')"
+                  autocomplete="on"
+                  placeholder="············"
+                  @click:append-inner="isConfirmPasswordVisible = !isConfirmPasswordVisible"
+                />
+              </VCol>
+            </VRow>
+          </VCardText>
+
+          <!-- 👉 Password Requirements -->
+          <VCardText>
+            <h6 class="text-h6 text-medium-emphasis mb-4">
+              {{ $t('changePassword.passwordRequirements') }}
+            </h6>
+
+            <VList class="card-list">
+              <VListItem
+                v-for="item in passwordRequirements"
+                :key="item"
+                :title="item"
+                class="text-medium-emphasis"
+              >
+                <template #prepend>
+                  <VIcon
+                    size="10"
+                    icon="tabler-circle-filled"
+                  />
+                </template>
+              </VListItem>
+            </VList>
+          </VCardText>
+
+          <!-- 👉 Action Buttons -->
+          <VCardText class="d-flex flex-wrap gap-4">
+            <VBtn
+              type="submit"
+              :loading="actionLoading"
+              @click.prevent="onChangePassword"
+            >
+              {{ $t('common.saveChanges') }}
+            </VBtn>
+
+            <VBtn
+              type="reset"
+              color="secondary"
+              variant="tonal"
+            >
+              {{ $t('common.reset') }}
+            </VBtn>
+          </VCardText>
+        </VForm>
+      </VCard>
+    </VCol>
+    <!-- !SECTION -->
+  </VRow>
+</template>
+
+<style lang="scss" scoped>
+.card-list {
+  --v-card-list-gap: 16px;
+}
+
+.server-close-btn {
+  inset-inline-end: 0.5rem;
+}
+</style>

package/dist/templates/vuexy-portal/typed-router.d.ts

@@ -0,0 +1,146 @@
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-router. ‼️ DO NOT MODIFY THIS FILE ‼️
+// It's recommended to commit this file.
+// Make sure to add this file to your tsconfig.json file as an "includes" or "files" entry.
+
+/// <reference types="unplugin-vue-router/client" />
+
+import type {
+  // type safe route locations
+  RouteLocationTypedList,
+  RouteLocationResolvedTypedList,
+  RouteLocationNormalizedTypedList,
+  RouteLocationNormalizedLoadedTypedList,
+  RouteLocationAsString,
+  RouteLocationAsRelativeTypedList,
+  RouteLocationAsPathTypedList,
+
+  // helper types
+  // route definitions
+  RouteRecordInfo,
+  ParamValue,
+  ParamValueOneOrMore,
+  ParamValueZeroOrMore,
+  ParamValueZeroOrOne,
+
+  // vue-router extensions
+  _RouterTyped,
+  RouterLinkTyped,
+  RouterLinkPropsTyped,
+  NavigationGuard,
+  UseLinkFnTyped,
+
+  // data fetching
+  _DataLoader,
+  _DefineLoaderOptions,
+} from 'unplugin-vue-router/types'
+
+declare module 'vue-router/auto/routes' {
+  export interface RouteNamedMap {
+    'root': RouteRecordInfo<'root', '/', Record<never, never>, Record<never, never>>,
+    '$error': RouteRecordInfo<'$error', '/:error(.*)', { error: ParamValue<true> }, { error: ParamValue<false> }>,
+    'account-settings-tab': RouteRecordInfo<'account-settings-tab', '/account-settings/:tab', { tab: ParamValue<true> }, { tab: ParamValue<false> }>,
+    'login': RouteRecordInfo<'login', '/login', Record<never, never>, Record<never, never>>,
+    'not-authorized': RouteRecordInfo<'not-authorized', '/not-authorized', Record<never, never>, Record<never, never>>,
+    'second-page': RouteRecordInfo<'second-page', '/second-page', Record<never, never>, Record<never, never>>,
+  }
+}
+
+declare module 'vue-router/auto' {
+  import type { RouteNamedMap } from 'vue-router/auto/routes'
+
+  export type RouterTyped = _RouterTyped<RouteNamedMap>
+
+  /**
+   * Type safe version of `RouteLocationNormalized` (the type of `to` and `from` in navigation guards).
+   * Allows passing the name of the route to be passed as a generic.
+   */
+  export type RouteLocationNormalized<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = RouteLocationNormalizedTypedList<RouteNamedMap>[Name]
+
+  /**
+   * Type safe version of `RouteLocationNormalizedLoaded` (the return type of `useRoute()`).
+   * Allows passing the name of the route to be passed as a generic.
+   */
+  export type RouteLocationNormalizedLoaded<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = RouteLocationNormalizedLoadedTypedList<RouteNamedMap>[Name]
+
+  /**
+   * Type safe version of `RouteLocationResolved` (the returned route of `router.resolve()`).
+   * Allows passing the name of the route to be passed as a generic.
+   */
+  export type RouteLocationResolved<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = RouteLocationResolvedTypedList<RouteNamedMap>[Name]
+
+  /**
+   * Type safe version of `RouteLocation` . Allows passing the name of the route to be passed as a generic.
+   */
+  export type RouteLocation<Name extends keyof RouteNamedMap = keyof RouteNamedMap> = RouteLocationTypedList<RouteNamedMap>[Name]
+
+  /**
+   * Type safe version of `RouteLocationRaw` . Allows passing the name of the route to be passed as a generic.
+   */
+  export type RouteLocationRaw<Name extends keyof RouteNamedMap = keyof RouteNamedMap> =
+    | RouteLocationAsString<RouteNamedMap>
+    | RouteLocationAsRelativeTypedList<RouteNamedMap>[Name]
+    | RouteLocationAsPathTypedList<RouteNamedMap>[Name]
+
+  /**
+   * Generate a type safe params for a route location. Requires the name of the route to be passed as a generic.
+   */
+  export type RouteParams<Name extends keyof RouteNamedMap> = RouteNamedMap[Name]['params']
+  /**
+   * Generate a type safe raw params for a route location. Requires the name of the route to be passed as a generic.
+   */
+  export type RouteParamsRaw<Name extends keyof RouteNamedMap> = RouteNamedMap[Name]['paramsRaw']
+
+  export function useRouter(): RouterTyped
+  export function useRoute<Name extends keyof RouteNamedMap = keyof RouteNamedMap>(name?: Name): RouteLocationNormalizedLoadedTypedList<RouteNamedMap>[Name]
+
+  export const useLink: UseLinkFnTyped<RouteNamedMap>
+
+  export function onBeforeRouteLeave(guard: NavigationGuard<RouteNamedMap>): void
+  export function onBeforeRouteUpdate(guard: NavigationGuard<RouteNamedMap>): void
+
+  export const RouterLink: RouterLinkTyped<RouteNamedMap>
+  export const RouterLinkProps: RouterLinkPropsTyped<RouteNamedMap>
+
+  // Experimental Data Fetching
+
+  export function defineLoader<
+    P extends Promise<any>,
+    Name extends keyof RouteNamedMap = keyof RouteNamedMap,
+    isLazy extends boolean = false,
+  >(
+    name: Name,
+    loader: (route: RouteLocationNormalizedLoaded<Name>) => P,
+    options?: _DefineLoaderOptions<isLazy>,
+  ): _DataLoader<Awaited<P>, isLazy>
+  export function defineLoader<
+    P extends Promise<any>,
+    isLazy extends boolean = false,
+  >(
+    loader: (route: RouteLocationNormalizedLoaded) => P,
+    options?: _DefineLoaderOptions<isLazy>,
+  ): _DataLoader<Awaited<P>, isLazy>
+
+  export {
+    _definePage as definePage,
+    _HasDataLoaderMeta as HasDataLoaderMeta,
+    _setupDataFetchingGuard as setupDataFetchingGuard,
+    _stopDataFetchingScope as stopDataFetchingScope,
+  } from 'unplugin-vue-router/runtime'
+}
+
+declare module 'vue-router' {
+  import type { RouteNamedMap } from 'vue-router/auto/routes'
+
+  export interface TypesConfig {
+    beforeRouteUpdate: NavigationGuard<RouteNamedMap>
+    beforeRouteLeave: NavigationGuard<RouteNamedMap>
+
+    $route: RouteLocationNormalizedLoadedTypedList<RouteNamedMap>[keyof RouteNamedMap]
+    $router: _RouterTyped<RouteNamedMap>
+
+    RouterLink: RouterLinkTyped<RouteNamedMap>
+  }
+}

package/dist/utils/template.js

@@ -65,6 +65,7 @@ var TEMPLATE_NAME;
     TEMPLATE_NAME["MXW_BASE_API"] = "mxw-base-api-express";
     TEMPLATE_NAME["TS_LIBRARY"] = "ts-library";
     TEMPLATE_NAME["NESTJS_API"] = "nestjs-api";
+    TEMPLATE_NAME["VUEXY_PORTAL"] = "vuexy-portal";
 })(TEMPLATE_NAME = exports.TEMPLATE_NAME || (exports.TEMPLATE_NAME = {}));
 var NESTJS_API_PLATFORM;
 (function (NESTJS_API_PLATFORM) {
@@ -100,7 +101,7 @@ function render(content, data) {
 exports.render = render;
 function generateTemplate(templateDir, targetDirectory) {
     return __awaiter(this, void 0, void 0, function () {
-        var templateChoices, template_specific, should_ask_install, should_ask_author, QUESTIONS;
+        var templateChoices, template_specific, should_ask_install, should_ask_author, QUESTIONS, inputAnswers;
         return __generator(this, function (_a) {
             templateChoices = fs.readdirSync(templateDir);
             template_specific = function (answer, templateName) {
@@ -113,9 +114,13 @@ function generateTemplate(templateDir, targetDirectory) {
                     projectChoice !== TEMPLATE_NAME.K8S_DEPLOYMENT &&
                     projectChoice !== TEMPLATE_NAME.K8S_DEPLOY_CHART;
             };
-            should_ask_author = function (answer) {
-                var projectChoice = answer["template"];
-                return !yargs.argv['author'] && projectChoice !== TEMPLATE_NAME.DB_SCHEMA
+            should_ask_author = function (answers) {
+                var isNonInteractive = !!(yargs.argv['template'] && yargs.argv['name']);
+                if (isNonInteractive)
+                    return false;
+                var projectChoice = answers["template"] || yargs.argv['template'];
+                var authorArg = yargs.argv['author'];
+                return !authorArg && projectChoice !== TEMPLATE_NAME.DB_SCHEMA
                     && projectChoice !== TEMPLATE_NAME.K8S_DEPLOYMENT &&
                     projectChoice !== TEMPLATE_NAME.K8S_DEPLOY_CHART;
             };
@@ -125,13 +130,13 @@ function generateTemplate(templateDir, targetDirectory) {
                     type: 'list',
                     message: 'What project template would you like to generate?',
                     choices: templateChoices,
-                    when: function () { return !yargs.argv['template']; }
+                    when: function (answers) { return !answers['template'] && !yargs.argv['template']; }
                 },
                 {
                     name: 'name',
                     type: 'input',
                     message: 'Project name:',
-                    when: function () { return !yargs.argv['name']; },
+                    when: function (answers) { return !answers['name'] && !yargs.argv['name']; },
                     validate: function (input) {
                         if (/^([A-Za-z\-\_\d])+$/.test(input))
                             return true;
@@ -143,26 +148,41 @@ function generateTemplate(templateDir, targetDirectory) {
                     name: 'author',
                     type: 'input',
                     message: 'Author:',
-                    when: function (answer) { return should_ask_author(answer); }
+                    when: function (answers) { return !answers['author'] && should_ask_author(answers); }
                 },
                 {
                     name: "nestjs_api_platform",
                     type: "list",
                     message: "what is the nestjs-api platform?",
                     choices: [NESTJS_API_PLATFORM.FASTIFY, NESTJS_API_PLATFORM.EXPRESS],
-                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.NESTJS_API); }
+                    when: function (answers) {
+                        var isNonInteractive = !!(yargs.argv['template'] && yargs.argv['name']);
+                        if (isNonInteractive)
+                            return false;
+                        return !answers['nestjs_api_platform'] && template_specific(answers, TEMPLATE_NAME.NESTJS_API);
+                    }
                 },
                 {
                     name: "run_install",
                     type: "confirm",
                     message: "Do you want to run npm install after template created?",
-                    when: function (answer) { return should_ask_install(answer); }
+                    when: function (answers) {
+                        var isNonInteractive = !!(yargs.argv['template'] && yargs.argv['name']);
+                        if (isNonInteractive)
+                            return false;
+                        return !answers['run_install'] && yargs.argv['install'] === undefined && should_ask_install(answers);
+                    }
                 },
                 {
                     name: "db_master",
                     type: "input",
                     message: "what is the master database name?",
-                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.DB_SCHEMA); }
+                    when: function (answers) {
+                        var isNonInteractive = !!(yargs.argv['template'] && yargs.argv['name']);
+                        if (isNonInteractive)
+                            return false;
+                        return !answers['db_master'] && template_specific(answers, TEMPLATE_NAME.DB_SCHEMA);
+                    }
                 },
                 /** TEMPLATE_NAME.K8S_DEPLOY_CHART */
                 {
@@ -170,56 +190,77 @@ function generateTemplate(templateDir, targetDirectory) {
                     type: "list",
                     message: "what is the registry host?",
                     choices: [K8S_REGISTRY_HOST.ALIYUN, K8S_REGISTRY_HOST.AWS, K8S_REGISTRY_HOST.DOCKER_HUB, K8S_REGISTRY_HOST.CUSTOM],
-                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART); }
+                    when: function (answers) { return !answers['k8s_chart_registry_host'] && template_specific(answers, TEMPLATE_NAME.K8S_DEPLOY_CHART); }
                 },
                 {
                     name: "k8s_chart_aws_account_id",
                     type: "input",
                     message: "please enter AWS Account ID?",
-                    when: function (answer) {
-                        var registryHost = answer === null || answer === void 0 ? void 0 : answer.k8s_chart_registry_host;
-                        return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART) && registryHost == K8S_REGISTRY_HOST.AWS;
+                    default: "123456789",
+                    when: function (answers) {
+                        var isNonInteractive = !!(yargs.argv['template'] && yargs.argv['name']);
+                        if (isNonInteractive)
+                            return false;
+                        var registryHost = (answers === null || answers === void 0 ? void 0 : answers.k8s_chart_registry_host) || yargs.argv['k8s_chart_registry_host'];
+                        return !answers['k8s_chart_aws_account_id'] && template_specific(answers, TEMPLATE_NAME.K8S_DEPLOY_CHART) && registryHost == K8S_REGISTRY_HOST.AWS;
                     }
                 },
                 {
                     name: "k8s_chart_custom_registry_host",
                     type: "input",
                     message: "please enter custom registry host",
-                    when: function (answer) {
-                        var registryHost = answer === null || answer === void 0 ? void 0 : answer.k8s_chart_registry_host;
-                        return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART) && registryHost == K8S_REGISTRY_HOST.CUSTOM;
+                    when: function (answers) {
+                        var isNonInteractive = !!(yargs.argv['template'] && yargs.argv['name']);
+                        if (isNonInteractive)
+                            return false;
+                        var registryHost = (answers === null || answers === void 0 ? void 0 : answers.k8s_chart_registry_host) || yargs.argv['k8s_chart_registry_host'];
+                        return !answers['k8s_chart_custom_registry_host'] && template_specific(answers, TEMPLATE_NAME.K8S_DEPLOY_CHART) && registryHost == K8S_REGISTRY_HOST.CUSTOM;
                     }
                 },
                 {
                     name: "k8s_chart_registry_region",
                     type: "list",
                     message: "what is the registry region?",
-                    choices: function (answer) {
-                        var registryHost = answer === null || answer === void 0 ? void 0 : answer.k8s_chart_registry_host;
+                    default: "ap-southeast-3",
+                    choices: function (answers) {
+                        var registryHost = (answers === null || answers === void 0 ? void 0 : answers.k8s_chart_registry_host) || yargs.argv['k8s_chart_registry_host'];
                         if (registryHost == K8S_REGISTRY_HOST.ALIYUN)
                             return ALIYUN_REGION;
                         else if (registryHost == K8S_REGISTRY_HOST.AWS)
                             return AWS_REGION;
                         return ["none"];
                     },
-                    when: function (answer) {
-                        var registryHost = answer === null || answer === void 0 ? void 0 : answer.k8s_chart_registry_host;
-                        return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART) && (registryHost == K8S_REGISTRY_HOST.ALIYUN || registryHost == K8S_REGISTRY_HOST.AWS);
+                    when: function (answers) {
+                        var isNonInteractive = !!(yargs.argv['template'] && yargs.argv['name']);
+                        if (isNonInteractive)
+                            return false;
+                        var registryHost = (answers === null || answers === void 0 ? void 0 : answers.k8s_chart_registry_host) || yargs.argv['k8s_chart_registry_host'];
+                        return !answers['k8s_chart_registry_region'] && template_specific(answers, TEMPLATE_NAME.K8S_DEPLOY_CHART) && (registryHost == K8S_REGISTRY_HOST.ALIYUN || registryHost == K8S_REGISTRY_HOST.AWS);
                     }
                 },
                 {
                     name: "k8s_image_name",
                     type: "input",
                     message: "what is the image name include namespace (eg: bitnami/kafka)?",
-                    when: function (answer) {
-                        return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART);
+                    default: "bitnami/kafka",
+                    when: function (answers) {
+                        var isNonInteractive = !!(yargs.argv['template'] && yargs.argv['name']);
+                        if (isNonInteractive)
+                            return false;
+                        return !answers['k8s_image_name'] && template_specific(answers, TEMPLATE_NAME.K8S_DEPLOY_CHART);
                     }
                 },
                 {
                     name: "k8s_image_version",
                     type: "input",
                     message: "what is the image version?",
-                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART); }
+                    default: "1.0.0",
+                    when: function (answers) {
+                        var isNonInteractive = !!(yargs.argv['template'] && yargs.argv['name']);
+                        if (isNonInteractive)
+                            return false;
+                        return !answers['k8s_image_version'] && template_specific(answers, TEMPLATE_NAME.K8S_DEPLOY_CHART);
+                    }
                 },
                 {
                     name: "k8s_chart_kind",
@@ -227,12 +268,18 @@ function generateTemplate(templateDir, targetDirectory) {
                     message: "what is the chart kind?",
                     choices: ["Deployment", "StatefulSet", "CronJob"],
                     default: "Deployment",
-                    when: function (answer) { return template_specific(answer, TEMPLATE_NAME.K8S_DEPLOY_CHART); }
+                    when: function (answers) {
+                        var isNonInteractive = !!(yargs.argv['template'] && yargs.argv['name']);
+                        if (isNonInteractive)
+                            return false;
+                        return !answers['k8s_chart_kind'] && template_specific(answers, TEMPLATE_NAME.K8S_DEPLOY_CHART);
+                    }
                 },
                 /** END TEMPLATE_NAME.K8S_DEPLOY_CHART */
             ];
             console.log("Welcome to ".concat(name, " version ").concat(version));
-            return [2 /*return*/, inquirer.prompt(QUESTIONS)
+            inputAnswers = Object.assign({}, yargs.argv);
+            return [2 /*return*/, inquirer.prompt(QUESTIONS, inputAnswers)
                     .then(function (answers) {
                     answers = Object.assign({}, answers, yargs.argv);
                     // @ts-ignore
@@ -240,16 +287,35 @@ function generateTemplate(templateDir, targetDirectory) {
                     // @ts-ignore
                     var projectName = answers['name'];
                     // @ts-ignore
-                    var author = answers['author'];
+                    var author = answers['author'] || yargs.argv['author'] || "na-cli";
                     // @ts-ignore
-                    var runInstall = answers['run_install'] || false;
-                    var masterDbName = answers['db_master'] || "master";
+                    var runInstall = answers['run_install'] || yargs.argv['install'] || false;
+                    var masterDbName = answers['db_master'] || yargs.argv['db_master'] || "master";
                     var templatePath = path.join(templateDir, projectChoice);
-                    var targetPath = path.join(targetDirectory, projectName);
+                    var finalTargetDirectory = targetDirectory;
+                    if (projectChoice === TEMPLATE_NAME.K8S_DEPLOY_CHART) {
+                        var servicesChartsPath = path.join(targetDirectory, 'services', 'charts');
+                        var resourcesChartsPath = path.join(targetDirectory, 'resources', 'charts');
+                        var servicesPath = path.join(targetDirectory, 'services');
+                        var resourcesPath = path.join(targetDirectory, 'resources');
+                        if (fs.existsSync(servicesChartsPath)) {
+                            finalTargetDirectory = servicesChartsPath;
+                        }
+                        else if (fs.existsSync(resourcesChartsPath)) {
+                            finalTargetDirectory = resourcesChartsPath;
+                        }
+                        else if (fs.existsSync(servicesPath)) {
+                            finalTargetDirectory = servicesPath;
+                        }
+                        else if (fs.existsSync(resourcesPath)) {
+                            finalTargetDirectory = resourcesPath;
+                        }
+                    }
+                    var targetPath = path.join(finalTargetDirectory, projectName);
                     var templateConfig = getTemplateConfig(templatePath);
                     var k8sChartParams = getK8sDeployChartParams(answers);
                     var nestjsApiParams = getNestJsApiParams(answers);
-                    var params = __assign(__assign({ masterDbName: masterDbName }, k8sChartParams), nestjsApiParams);
+                    var params = __assign(__assign(__assign({ masterDbName: masterDbName }, k8sChartParams), nestjsApiParams), { k8s_image_name: answers['k8s_image_name'] || yargs.argv['k8s_image_name'] || "bitnami/kafka", k8s_image_version: answers['k8s_image_version'] || yargs.argv['k8s_image_version'] || "1.0.0", k8s_chart_kind: answers['k8s_chart_kind'] || yargs.argv['k8s_chart_kind'] || "Deployment", k8s_chart_registry_region: answers['k8s_chart_registry_region'] || yargs.argv['k8s_chart_registry_region'] || "ap-southeast-3", k8s_chart_aws_account_id: answers['k8s_chart_aws_account_id'] || yargs.argv['k8s_chart_aws_account_id'] || "123456789" });
                     var options = {
                         projectName: projectName,
                         templateName: projectChoice,
@@ -260,7 +326,7 @@ function generateTemplate(templateDir, targetDirectory) {
                     if (!createProject(targetPath)) {
                         return;
                     }
-                    createDirectoryContents(targetDirectory, templatePath, projectName, templateConfig, author, params);
+                    createDirectoryContents(finalTargetDirectory, templatePath, projectName, templateConfig, author, params);
                     if (runInstall && !postProcess(options)) {
                         return;
                     }
@@ -363,32 +429,41 @@ function createDirectoryContents(targetDirectory, projectTemplatePath, projectNa
 function getK8sDeployChartParams(answer) {
     var params = {};
     // @ts-ignore
-    var projectChoice = answer['template'];
-    if (projectChoice != TEMPLATE_NAME.K8S_DEPLOY_CHART || !answer) {
+    var projectChoice = answer['template'] || yargs.argv['template'];
+    if (projectChoice != TEMPLATE_NAME.K8S_DEPLOY_CHART) {
         return params;
     }
-    if (answer.k8s_chart_registry_host == K8S_REGISTRY_HOST.ALIYUN) {
-        params.containerRegistry = "registry-intl.".concat(answer.k8s_chart_registry_region, ".aliyuncs.com/").concat(answer.k8s_image_name);
+    var registryHost = answer['k8s_chart_registry_host'] || yargs.argv['k8s_chart_registry_host'];
+    var region = answer['k8s_chart_registry_region'] || yargs.argv['k8s_chart_registry_region'] || "ap-southeast-3";
+    var imageName = answer['k8s_image_name'] || yargs.argv['k8s_image_name'] || "bitnami/kafka";
+    var awsId = answer['k8s_chart_aws_account_id'] || yargs.argv['k8s_chart_aws_account_id'] || "123456789";
+    var customHost = answer['k8s_chart_custom_registry_host'] || yargs.argv['k8s_chart_custom_registry_host'];
+    if (registryHost == K8S_REGISTRY_HOST.ALIYUN) {
+        params.containerRegistry = "registry-intl.".concat(region, ".aliyuncs.com/").concat(imageName);
     }
-    else if (answer.k8s_chart_registry_host == K8S_REGISTRY_HOST.AWS) {
-        params.containerRegistry = "".concat(answer.k8s_chart_aws_account_id.replace("-", ""), ".dkr.ecr.").concat(answer.k8s_chart_registry_region, ".amazonaws.com/").concat(answer.k8s_image_name);
+    else if (registryHost == K8S_REGISTRY_HOST.AWS) {
+        params.containerRegistry = "".concat(awsId.replace("-", ""), ".dkr.ecr.").concat(region, ".amazonaws.com/").concat(imageName);
     }
-    else if (answer.k8s_chart_registry_host == K8S_REGISTRY_HOST.CUSTOM) {
-        params.containerRegistry = "".concat(answer.k8s_chart_custom_registry_host, "/").concat(answer.k8s_image_name);
+    else if (registryHost == K8S_REGISTRY_HOST.CUSTOM) {
+        params.containerRegistry = "".concat(customHost, "/").concat(imageName);
+    }
+    else {
+        // Fallback for Dockerhub or unspecified
+        params.containerRegistry = imageName;
     }
-    params.chartName = answer.name;
-    params.containerVersion = answer.k8s_image_version;
-    params.chartKind = answer.k8s_chart_kind;
+    params.chartName = answer.name || yargs.argv['name'];
+    params.containerVersion = answer.k8s_image_version || yargs.argv['k8s_image_version'] || "1.0.0";
+    params.chartKind = answer.k8s_chart_kind || yargs.argv['k8s_chart_kind'] || "Deployment";
     return params;
 }
 function getNestJsApiParams(answer) {
     var params = {};
     // @ts-ignore
-    var projectChoice = answer['template'];
-    if (projectChoice != TEMPLATE_NAME.NESTJS_API || !answer) {
+    var projectChoice = answer['template'] || yargs.argv['template'];
+    if (projectChoice != TEMPLATE_NAME.NESTJS_API) {
         return params;
     }
-    params.nestjsPlatform = answer.nestjs_api_platform;
+    params.nestjsPlatform = answer.nestjs_api_platform || yargs.argv['nestjs_api_platform'] || NESTJS_API_PLATFORM.FASTIFY;
     var isFastify = params.nestjsPlatform == NESTJS_API_PLATFORM.FASTIFY;
     params.isFastify = isFastify;
     return params;