create-mirta 0.0.2 → 0.0.3

package/dist/index.mjs

@@ -140,7 +140,7 @@ function usePrompts(messages) {
         cancel,
         prompt,
         step: p.log.step,
-        note: p.note,
+        message: p.log.message,
         inlineSub,
     };
 }
@@ -174,6 +174,10 @@ ${yellow$1('Feature flags:')}
     ${dim$1('Add store for state management')}
 
 ${yellow$1('Options:')}
+  --ssh
+    ${dim$1('Set SSH destination of deployment process as [username@][hostname][:port]')}
+  --rutoken
+    ${dim$1('Use Rutoken ECP as encrypted store of SSH private key')}
   -v, --version
     ${dim$1('Display the version number of this CLI')}
   -f, --force
@@ -203,6 +207,10 @@ ${yellow$1('Флаги функционала:')}
     ${dim$1('Добавить хранилище состояний')}
 
 ${yellow$1('Опции:')}
+  --ssh
+    ${dim$1('Настроить подключение SSH для деплоя в формате [username@][hostname][:port]')}
+  --rutoken
+    ${dim$1('Использовать Рутокен ЭЦП в качестве хранилища для закрытого ключа SSH')}
   -v, --version
     ${dim$1('Отобразить номер версии данного CLI')}
   -f, --force
@@ -232,6 +240,12 @@ const featureFlags = ({
 });
 const allOptions = ({
     ...featureFlags,
+    ssh: {
+        type: 'string',
+    },
+    rutoken: {
+        type: 'boolean',
+    },
     version: {
         type: 'boolean',
         short: 'v',
@@ -240,16 +254,23 @@ const allOptions = ({
         type: 'boolean',
         short: 'f',
     },
-    help: {
-        type: 'boolean',
-        short: 'h',
-    },
     bare: {
         type: 'boolean',
         short: 'b',
     },
+    help: {
+        type: 'boolean',
+        short: 'h',
+    },
 });
 
+const urlRegex = /(?:(?<username>.+?)@)?(?:(?<hostname>[^:@\s]+))?(?::(?<port>\d+))?/;
+function parseUrl(value) {
+    if (!value)
+        return {};
+    return (urlRegex.exec(value))?.groups ?? {};
+}
+
 const isObject = (val) => typeof val === 'object';
 
 function sortDependencies(packageJson) {
@@ -329,7 +350,7 @@ function renderTemplate(sourcePath, targetPath) {
         renderJson(sourcePath, targetPath, result => sortDependencies(result));
         return;
     }
-    if (['extensions.json', 'settings.json', 'tasks.json'].includes(filename) && fs.existsSync(targetPath)) {
+    if (['extensions.json', 'settings.json', 'tasks.json', 'tsconfig.json'].includes(filename) && fs.existsSync(targetPath)) {
         renderJson(sourcePath, targetPath);
         return;
     }
@@ -500,7 +521,7 @@ const featureOptions = [
         hint: messages.addVitest.hint,
     },
 ];
-const { prompt, cancel, step, inlineSub } = usePrompts(messages);
+const { prompt, cancel, step, message, inlineSub } = usePrompts(messages);
 function isValidPackageName(packageName) {
     return /^(?:@[a-z0-9-*~][a-z0-9-*._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/
         .test(packageName);
@@ -536,17 +557,26 @@ async function run() {
     const hasPositionalDir = targetDir && targetDir !== '.';
     const defaultProjectName = hasPositionalDir ? targetDir : 'wb-rules-mirta';
     const shouldOverwrite = argv.force;
+    const sshAddress = parseUrl(argv.ssh);
+    const sshDefaultUser = 'root';
+    const sshDefaultHost = '10.200.200.1';
+    const sshDefaultPort = '22';
+    const sshFullyDefined = !!(sshAddress.username && sshAddress.hostname);
     const scope = {
         projectName: defaultProjectName,
         projectRoot: '',
         packageName: defaultProjectName,
         shouldOverwrite,
         features: [],
+        sshUsername: sshAddress.username,
+        sshHostname: sshAddress.hostname,
+        sshPort: sshAddress.port,
+        rutoken: argv.rutoken,
     };
     console.log(banner);
     console.log(messages.title);
     console.log();
-    intro(chalk.bgYellow.black(` ${messages.intro} `));
+    intro(chalk.bgBlackBright.black(` ${messages.captions.intro} `));
     if (!targetDir) {
         const answer = await prompt(text({
             message: messages.projectName.message,
@@ -590,6 +620,58 @@ async function run() {
             process.exit(0);
         }
     }
+    message(chalk.bgBlackBright.black(` ${messages.captions.deploy} `));
+    if (!scope.sshUsername) {
+        scope.sshUsername = await prompt(text({
+            message: messages.ssh.username,
+            placeholder: sshDefaultUser,
+            defaultValue: sshDefaultUser,
+            validate: (value) => {
+                if (value.length !== 0 && value.trim().length === 0)
+                    return messages.validation.required;
+            },
+        }));
+    }
+    else {
+        step(`${messages.ssh.username}\n${dim(scope.sshUsername)}`);
+    }
+    if (!scope.sshHostname) {
+        scope.sshHostname = await prompt(text({
+            message: messages.ssh.host,
+            placeholder: sshDefaultHost,
+            defaultValue: sshDefaultHost,
+            validate: (value) => {
+                if (value.length !== 0 && value.trim().length === 0)
+                    return messages.validation.required;
+            },
+        }));
+    }
+    else {
+        step(`${messages.ssh.host}\n${dim(scope.sshHostname)}`);
+    }
+    if (!sshFullyDefined && !scope.sshPort) {
+        scope.sshPort = await prompt(text({
+            message: messages.ssh.port,
+            placeholder: sshDefaultPort,
+            defaultValue: sshDefaultPort,
+            validate: (value) => {
+                if (value.length !== 0 && value.trim().length === 0)
+                    return messages.validation.required;
+            },
+        }));
+    }
+    else if (scope.sshPort) {
+        step(`${messages.ssh.port}\n${dim(scope.sshPort)}`);
+    }
+    if (!sshFullyDefined && !scope.rutoken) {
+        scope.rutoken = await prompt(confirm({
+            message: `${messages.ssh.useRutoken} ${dim(messages.accent.ifConfigured)}`,
+            initialValue: false,
+        }));
+    }
+    else if (scope.rutoken) {
+        step(`${messages.ssh.useRutoken} ${dim(messages.accent.ifConfigured)}\n${dim('Yes')}`);
+    }
     if (!isFeatureFlagsUsed) {
         scope.features = await prompt(multiselect({
             message: `${messages.featureSelection.message}${inlineSub(dim(messages.featureSelection.hint))}`,
@@ -610,7 +692,30 @@ async function run() {
         fs.mkdirSync(root);
     }
     step(`${messages.status.scaffolding} ${yellow(root)}`);
-    const pkg = { name: scope.packageName, version: '0.0.0' };
+    const pkg = {
+        name: scope.packageName,
+        version: '0.0.0',
+        scripts: {
+            'wb:deploy': '',
+        },
+    };
+    const deployScript = ['rsync'];
+    if (process.platform === 'win32') {
+        // Run rsync trough WSL on Windows systems.
+        deployScript.unshift('wsl ');
+    }
+    if (scope.rutoken || scope.sshPort) {
+        deployScript.push(' -e \'ssh');
+        if (scope.rutoken)
+            deployScript.push(' -I /usr/lib/librtpkcs11ecp.so');
+        if (scope.sshPort)
+            deployScript.push(` -p ${scope.sshPort}`);
+        deployScript.push('\'');
+    }
+    deployScript.push(' -rltzvgO --progress --delete --exclude=\'alarms.conf\'');
+    deployScript.push(' --groupmap=\'*:developers\' dist/es5/*');
+    deployScript.push(` '${scope.sshUsername}@${scope.sshHostname}:/mnt/data/etc/'`);
+    pkg.scripts['wb:deploy'] = deployScript.join('');
     fs.writeFileSync(resolve(root, 'package.json'), JSON.stringify(pkg, null, 2));
     const templateRoot = fileURLToPath(new URL(templatesPath, import.meta.url));
     const render = function (templateName) {

package/dist/locales/en-US.json

@@ -1,6 +1,9 @@
 {
   "title": "The Framework to write wb-rules in TypeScript",
-  "intro": "Project Settings",
+  "captions": {
+    "intro": "Project Settings",
+    "deploy": "Deploy Settings"
+  },
   "projectName": {
     "message": "Project Name (target directory):"
   },
@@ -16,6 +19,12 @@
     "message": "is not empty.",
     "confirmDelete": "Remove existing files before continue?"
   },
+  "ssh": {
+    "username": "🔑 SSH Username:",
+    "host": "🌐 SSH Host:",
+    "port": "🚩 SSH Port:",
+    "useRutoken": "Use Rutoken ECP"
+  },
   "featureSelection": {
     "message": "Select features to include in your project:",
     "hint": "↑/↓ to navigate, space to select, A to toggle all, Enter to confirm"
@@ -44,7 +53,8 @@
     "installingDependencies": "Calling the package manager"
   },
   "accent": {
-    "recommended": "(recommended)"
+    "recommended": "(recommended)",
+    "ifConfigured": "(if configured)"
   },
   "dependencies": {
     "question": "Install project dependencies?",

package/dist/locales/ru-RU.json

@@ -1,6 +1,9 @@
 {
   "title": "Фреймворк для создания правил wb-rules на TypeScript",
-  "intro": "Параметры проекта",
+  "captions": {
+    "intro": "Параметры проекта",
+    "deploy": "Параметры деплоя на контроллер"
+  },
   "projectName": {
     "message": "Название (целевая директория):",
     "errorMessage": "Требуется указать значение"
@@ -17,6 +20,12 @@
     "message": "содержит файлы.",
     "confirmDelete": "Удалить их?"
   },
+  "ssh": {
+    "username": "🔑 Пользователь SSH:",
+    "host": "🌐 Хост SSH:",
+    "port": "🚩 Порт SSH:",
+    "useRutoken": "Использовать Рутокен ЭЦП?"
+  },
   "featureSelection": {
     "message": "Выберите добавляемый функционал:",
     "hint": "↑/↓ для навигации, пробел для выбора, A - выбрать всё, Enter - подтвердить"
@@ -45,7 +54,8 @@
     "installingDependencies": "Вызов менеджера пакетов"
   },
   "accent": {
-    "recommended": "(рекомендуется)"
+    "recommended": "(рекомендуется)",
+    "ifConfigured": "(если настроен)"
   },
   "dependencies": {
     "question": "Установить требуемые зависимости?",

package/dist/templates/base/package.json

@@ -8,10 +8,10 @@
     "build:dev": "cross-env NODE_ENV=development rollup -c"
   },
   "dependencies": {
-    "mirta": "0.0.2"
+    "mirta": "0.0.3"
   },
   "devDependencies": {
-    "@mirta/rollup": "0.0.2",
+    "@mirta/rollup": "0.0.3",
     "cross-env": "^7.0.3",
     "rollup": "^4.45.1"
   }

package/dist/templates/config/store/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@mirta/store": "0.0.2"
+    "@mirta/store": "0.0.3"
   }
 }

package/dist/templates/config/typescript/package.json

@@ -1,7 +1,7 @@
 {
   "devDependencies": {
-    "@mirta/globals": "0.0.2",
-    "@mirta/tsconfig": "0.0.2",
+    "@mirta/globals": "0.0.3",
+    "@mirta/tsconfig": "0.0.3",
     "@types/node": "^24.1.0",
     "typescript": "^5.8.3"
   }

package/dist/templates/config/typescript/tsconfig.json

@@ -2,12 +2,13 @@
   "extends": "@mirta/tsconfig",
   "compilerOptions": {
     "paths": {
-      "@wbm/*": ["./src/wb-rules-modules/*"]
+      "@wbm/*": [
+        "./src/wb-rules-modules/*"
+      ]
     },
     "types": [
       "@mirta/globals",
-      "node",
-      "vitest/globals"
+      "node"
     ]
   }
 }

package/dist/templates/config/vitest/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "types": [
+      "vitest/globals"
+    ]
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-mirta",
   "description": "🛠️ The recommended way to start a Mirta project.",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "license": "Unlicense",
   "keywords": [
     "mirta",