@newlogic-digital/cli 1.3.0 → 1.4.1

package/src/commands/init/cms.mjs

@@ -1,229 +1,228 @@
+import { cancel, confirm, isCancel, select } from '@clack/prompts'
 import { execSync } from '../../utils.mjs'
 import { join, resolve } from 'path'
 import fs from 'fs'
+import { styleText } from 'node:util'
 import os from 'os'
-import pc from 'picocolors'
 import fse from 'fs-extra'
-import prompts from 'prompts'
 import { isAutoYes, normalizeEnum, normalizeYesNo } from './options.mjs'
 
 const tempDir = join(os.tmpdir(), 'newlogic-cms-web')
 
 async function move(path, options = {}) {
-    await fse.move(join(tempDir, path), resolve(process.cwd(), path), options).catch(err => console.log(`${pc.red(err)} - ${path}`))
+  await fse.move(join(tempDir, path), resolve(process.cwd(), path), options).catch(err => console.log(`${styleText('red', err)} - ${path}`))
 }
 
 async function clone(path, { variant, branch, clone: cloneOption, y, yes } = {}) {
-    if (variant === 'cms-web') {
-        variant = 'newlogic-cms-next-web'
-    } else if (variant === 'cms-eshop') {
-        variant = 'newlogic-cms-next-eshop'
+  if (variant === 'cms-web') {
+    variant = 'newlogic-cms-next-web'
+  }
+  else if (variant === 'cms-eshop') {
+    variant = 'newlogic-cms-next-eshop'
+  }
+
+  let cloneMethod = normalizeEnum(cloneOption, ['ssh', 'https'])
+  const autoYes = isAutoYes({ y, yes })
+
+  if (!cloneMethod) {
+    if (autoYes) {
+      cloneMethod = 'https'
     }
-
-    let cloneMethod = normalizeEnum(cloneOption, ['ssh', 'https'])
-    const autoYes = isAutoYes({ y, yes })
-
-    if (!cloneMethod) {
-        if (autoYes) {
-            cloneMethod = 'https'
-        } else {
-            const response = await prompts([
-                {
-                    type: 'select',
-                    name: 'clone',
-                    message: 'Clone with SSH or HTTPS?',
-                    choices: [
-                        { title: 'SSH', value: 'ssh' },
-                        { title: 'HTTPS', value: 'https' }
-                    ]
-                }
-            ])
-
-            cloneMethod = response.clone
-        }
+    else {
+      cloneMethod = await select({
+        message: 'Clone with SSH or HTTPS?',
+        options: [
+          { label: 'SSH', value: 'ssh' },
+          { label: 'HTTPS', value: 'https' },
+        ],
+      })
+
+      if (isCancel(cloneMethod)) {
+        cancel('Operation cancelled.')
+        process.exit(1)
+      }
     }
+  }
 
-    let url = ''
+  let url = ''
 
-    if (cloneMethod === 'ssh') {
-        url = 'git@git.newlogic.cz:newlogic-digital'
-    } else if (cloneMethod === 'https') {
-        url = 'https://git.newlogic.cz/newlogic-digital'
-    }
+  if (cloneMethod === 'ssh') {
+    url = 'git@git.newlogic.cz:newlogic-digital'
+  }
+  else if (cloneMethod === 'https') {
+    url = 'https://git.newlogic.cz/newlogic-digital'
+  }
 
-    execSync(`git clone -b ${branch} --single-branch --depth 1 ${url}/${variant}.git ${path}`)
+  execSync(`git clone -b ${branch} --single-branch --depth 1 ${url}/${variant}.git ${path}`)
 }
 
 async function install(name, branch, { install: installOption, y, yes } = {}) {
-    let install = normalizeYesNo(installOption)
-    const autoYes = isAutoYes({ y, yes })
-
-    if (!install) {
-        if (autoYes) {
-            install = 'yes'
-        } else {
-            const response = await prompts([
-                {
-                    type: 'select',
-                    name: 'install',
-                    message: 'Install project?',
-                    choices: [
-                        { title: 'yes', value: 'yes' },
-                        { title: 'no', value: 'no' }
-                    ]
-                }
-            ])
-
-            install = response.install
-        }
+  let install = normalizeYesNo(installOption)
+  const autoYes = isAutoYes({ y, yes })
+
+  if (!install) {
+    if (autoYes) {
+      install = 'yes'
     }
+    else {
+      const response = await confirm({
+        message: 'Install project?',
+        initialValue: true,
+      })
+
+      if (isCancel(response)) {
+        cancel('Operation cancelled.')
+        process.exit(1)
+      }
+
+      install = response ? 'yes' : 'no'
+    }
+  }
 
-    if (install === 'yes') {
-        execSync(`cd ${name || '.'} && composer install`)
-        execSync(`cd ${name || '.'} && composer install-${branch || ''}`)
+  if (install === 'yes') {
+    execSync(`cd ${name || '.'} && composer install`)
+    execSync(`cd ${name || '.'} && composer install-${branch || ''}`)
 
-        if (fs.existsSync(resolve(process.cwd(), 'package.json'))) {
-            execSync(`cd ${name || '.'} && npm i && npx vite build`)
-        }
+    if (fs.existsSync(resolve(process.cwd(), 'package.json'))) {
+      execSync(`cd ${name || '.'} && npm i && npx vite build`)
     }
+  }
 }
 
 async function dev(name, { dev: devOption, y, yes } = {}) {
-    let shouldStartDev = normalizeYesNo(devOption)
-    const autoYes = isAutoYes({ y, yes })
-
-    if (!shouldStartDev) {
-        if (autoYes) {
-            shouldStartDev = 'no'
-        } else {
-            const response = await prompts([
-                {
-                    type: 'select',
-                    name: 'install',
-                    message: 'Start dev server?',
-                    choices: [
-                        { title: 'yes', value: 'yes' },
-                        { title: 'no', value: 'no' }
-                    ]
-                }
-            ])
-
-            shouldStartDev = response.install
-        }
-    }
+  let shouldStartDev = normalizeYesNo(devOption)
+  const autoYes = isAutoYes({ y, yes })
 
-    if (shouldStartDev === 'yes') {
-        execSync(`cd ${name || '.'} && composer dev-headless`)
+  if (!shouldStartDev) {
+    if (autoYes) {
+      shouldStartDev = 'no'
     }
+    else {
+      const response = await confirm({
+        message: 'Start dev server?',
+        initialValue: true,
+      })
+
+      if (isCancel(response)) {
+        cancel('Operation cancelled.')
+        process.exit(1)
+      }
+
+      shouldStartDev = response ? 'yes' : 'no'
+    }
+  }
+
+  if (shouldStartDev === 'yes') {
+    execSync(`cd ${name || '.'} && composer dev-headless`)
+  }
 }
 
 async function migrations(name, { migrations: migrationsOption, y, yes } = {}) {
-    let shouldInitMigrations = normalizeYesNo(migrationsOption)
-    const autoYes = isAutoYes({ y, yes })
-
-    if (!shouldInitMigrations) {
-        if (autoYes) {
-            shouldInitMigrations = 'no'
-        } else {
-            const response = await prompts([
-                {
-                    type: 'select',
-                    name: 'install',
-                    message: 'Init phinx migrations and seed?',
-                    choices: [
-                        { title: 'yes', value: 'yes' },
-                        { title: 'no', value: 'no' }
-                    ]
-                }
-            ])
-
-            shouldInitMigrations = response.install
-        }
-    }
+  let shouldInitMigrations = normalizeYesNo(migrationsOption)
+  const autoYes = isAutoYes({ y, yes })
 
-    if (shouldInitMigrations === 'yes') {
-        execSync(`cd ${name || '.'} && composer phinx-init`)
+  if (!shouldInitMigrations) {
+    if (autoYes) {
+      shouldInitMigrations = 'no'
+    }
+    else {
+      const response = await confirm({
+        message: 'Init phinx migrations and seed?',
+        initialValue: true,
+      })
+
+      if (isCancel(response)) {
+        cancel('Operation cancelled.')
+        process.exit(1)
+      }
+
+      shouldInitMigrations = response ? 'yes' : 'no'
     }
+  }
+
+  if (shouldInitMigrations === 'yes') {
+    execSync(`cd ${name || '.'} && composer phinx-init`)
+  }
 }
 
 async function prepare({ prepare: prepareOption, y, yes } = {}) {
-    let shouldPrepare = normalizeYesNo(prepareOption)
-    const autoYes = isAutoYes({ y, yes })
-
-    if (!shouldPrepare) {
-        if (autoYes) {
-            shouldPrepare = 'no'
-        } else {
-            const response = await prompts([
-                {
-                    type: 'select',
-                    name: 'install',
-                    message: 'Prepare project with templates from frontend?',
-                    choices: [
-                        { title: 'yes', value: 'yes' },
-                        { title: 'no', value: 'no' }
-                    ]
-                }
-            ])
-
-            shouldPrepare = response.install
-        }
-    }
+  let shouldPrepare = normalizeYesNo(prepareOption)
+  const autoYes = isAutoYes({ y, yes })
 
-    if (shouldPrepare === 'yes') {
-        execSync('newlogic cms prepare')
+  if (!shouldPrepare) {
+    if (autoYes) {
+      shouldPrepare = 'no'
+    }
+    else {
+      const response = await confirm({
+        message: 'Prepare project with templates from frontend?',
+        initialValue: true,
+      })
+
+      if (isCancel(response)) {
+        cancel('Operation cancelled.')
+        process.exit(1)
+      }
+
+      shouldPrepare = response ? 'yes' : 'no'
     }
+  }
+
+  if (shouldPrepare === 'yes') {
+    execSync('newlogic cms prepare')
+  }
 }
 
 export default async function cms(name, { variant, branch, ...options } = {}) {
-    if (name) {
-        if (!fs.existsSync(resolve(process.cwd(), name))) {
-            await clone(name, { variant, branch, clone: options.clone, y: options.y, yes: options.yes })
-        }
-
-        await install(name, branch, { install: options.install, y: options.y, yes: options.yes })
-        await prepare({ prepare: options.prepare, y: options.y, yes: options.yes })
-        await dev(name, { dev: options.dev, y: options.y, yes: options.yes })
-        await migrations(name, { migrations: options.migrations, y: options.y, yes: options.yes })
-        return
-    }
-
-    if (!fs.existsSync(resolve(process.cwd(), 'composer.json'))) {
-        if (fs.existsSync(tempDir)) {
-            fse.removeSync(tempDir)
-        }
-
-        await clone(tempDir, { variant, branch, clone: options.clone, y: options.y, yes: options.yes })
-
-        await move('.docker')
-        await move('app')
-        await move('bin')
-        await move('config')
-        await move('log')
-        await move('public/index.php')
-        await move('src/views')
-        await move('storage')
-        await move('temp')
-        await move('tests')
-        await move('.gitignore', { overwrite: true })
-        await move('README.md', { overwrite: true })
-        await move('composer.json')
-        await move('composer.lock')
-        await move('docker-compose.yml')
-        await move('Makefile') // deprecated
-        await move('phpstan.neon')
-        await move('phpunit.xml')
-        await move('pint.json')
-        await move('rector.php')
-        await fse.move(join(tempDir, '.gitlab-ci.prod.yml'), resolve(process.cwd(), '.gitlab-ci.yml'), { overwrite: true }).catch(err => console.log(`${pc.red(err)} - .gitlab-ci.yml`))
-
-        fse.removeSync(tempDir)
-    } else {
-        console.log(pc.yellow('Project files already exist in the directory, skipping copy step (delete composer.json to force)'))
+  if (name) {
+    if (!fs.existsSync(resolve(process.cwd(), name))) {
+      await clone(name, { variant, branch, clone: options.clone, y: options.y, yes: options.yes })
     }
 
     await install(name, branch, { install: options.install, y: options.y, yes: options.yes })
     await prepare({ prepare: options.prepare, y: options.y, yes: options.yes })
     await dev(name, { dev: options.dev, y: options.y, yes: options.yes })
     await migrations(name, { migrations: options.migrations, y: options.y, yes: options.yes })
+    return
+  }
+
+  if (!fs.existsSync(resolve(process.cwd(), 'composer.json'))) {
+    if (fs.existsSync(tempDir)) {
+      fse.removeSync(tempDir)
+    }
+
+    await clone(tempDir, { variant, branch, clone: options.clone, y: options.y, yes: options.yes })
+
+    await move('.docker')
+    await move('app')
+    await move('bin')
+    await move('config')
+    await move('log')
+    await move('public/index.php')
+    await move('src/views')
+    await move('storage')
+    await move('temp')
+    await move('tests')
+    await move('.gitignore', { overwrite: true })
+    await move('README.md', { overwrite: true })
+    await move('composer.json')
+    await move('composer.lock')
+    await move('docker-compose.yml')
+    await move('Makefile') // deprecated
+    await move('phpstan.neon')
+    await move('phpunit.xml')
+    await move('pint.json')
+    await move('rector.php')
+    await fse.move(join(tempDir, '.gitlab-ci.prod.yml'), resolve(process.cwd(), '.gitlab-ci.yml'), { overwrite: true }).catch(err => console.log(`${styleText('red', err)} - .gitlab-ci.yml`))
+
+    fse.removeSync(tempDir)
+  }
+  else {
+    console.log(styleText('yellow', 'Project files already exist in the directory, skipping copy step (delete composer.json to force)'))
+  }
+
+  await install(name, branch, { install: options.install, y: options.y, yes: options.yes })
+  await prepare({ prepare: options.prepare, y: options.y, yes: options.yes })
+  await dev(name, { dev: options.dev, y: options.y, yes: options.yes })
+  await migrations(name, { migrations: options.migrations, y: options.y, yes: options.yes })
 }

package/src/commands/init/index.mjs

@@ -1,100 +1,85 @@
-import prompts from 'prompts'
+import { cancel, isCancel, select } from '@clack/prompts'
 import ui from './ui.mjs'
 import cms from './cms.mjs'
 import { isAutoYes, normalizeEnum } from './options.mjs'
 
 async function init(project, name, options = {}) {
-    const nameAsProject = (project && !project.match(/^(ui|cms)$/))
-    const autoYes = isAutoYes(options)
+  const nameAsProject = (project && !project.match(/^(ui|cms)$/))
+  const autoYes = isAutoYes(options)
 
-    name = nameAsProject ? project : name
+  name = nameAsProject ? project : name
 
-    if (!project || nameAsProject) {
-        if (autoYes) {
-            project = 'ui'
-        } else {
-            const response = await prompts([
-                {
-                    type: 'select',
-                    name: 'project',
-                    message: 'Select a project to init',
-                    choices: [
-                        { title: 'ui', value: 'ui' },
-                        { title: 'cms', value: 'cms' }
-                    ],
-                    onState: (state) => {
-                        if (state.aborted) {
-                            process.exit(1)
-                        }
-                    }
-                }
-            ])
-
-            project = response.project
-        }
+  if (!project || nameAsProject) {
+    if (autoYes) {
+      project = 'ui'
     }
+    else {
+      project = await select({
+        message: 'Select a project to init',
+        options: [
+          { label: 'ui', value: 'ui' },
+          { label: 'cms', value: 'cms' },
+        ],
+      })
 
-    let branch = normalizeEnum(options.branch, ['main', 'dev'])
+      if (isCancel(project)) {
+        cancel('Operation cancelled.')
+        process.exit(1)
+      }
+    }
+  }
 
-    if (!branch) {
-        if (autoYes) {
-            branch = 'main'
-        } else {
-            const response = await prompts([
-                {
-                    type: 'select',
-                    name: 'branch',
-                    message: 'Select a git branch',
-                    choices: [
-                        { title: 'main', value: 'main' },
-                        { title: 'dev', value: 'dev' }
-                    ],
-                    onState: (state) => {
-                        if (state.aborted) {
-                            process.exit(1)
-                        }
-                    }
-                }
-            ])
+  let branch = normalizeEnum(options.branch, ['main', 'dev'])
 
-            branch = response.branch
-        }
+  if (!branch) {
+    if (autoYes) {
+      branch = 'main'
     }
+    else {
+      branch = await select({
+        message: 'Select a git branch',
+        options: [
+          { label: 'main', value: 'main' },
+          { label: 'dev', value: 'dev' },
+        ],
+      })
 
-    if (project === 'ui') {
-        await ui(name, { ...options, branch })
+      if (isCancel(branch)) {
+        cancel('Operation cancelled.')
+        process.exit(1)
+      }
     }
+  }
 
-    if (project === 'cms') {
-        let variant = normalizeEnum(options.variant, ['cms-web', 'cms-eshop'])
+  if (project === 'ui') {
+    await ui(name, { ...options, branch })
+  }
 
-        if (!variant) {
-            if (autoYes) {
-                variant = 'cms-web'
-            } else {
-                const response = await prompts([
-                    {
-                        type: 'select',
-                        name: 'variant',
-                        message: 'Select a variant to install',
-                        choices: [
-                            { title: 'cms-web', value: 'cms-web' },
-                            { title: 'cms-eshop', value: 'cms-eshop' }
-                        ],
-                        onState: (state) => {
-                            if (state.aborted) {
-                                process.exit(1)
-                            }
-                        }
-                    }
-                ])
+  if (project === 'cms') {
+    let variant = normalizeEnum(options.variant, ['cms-web', 'cms-eshop'])
 
-                variant = response.variant
-            }
-        }
+    if (!variant) {
+      if (autoYes) {
+        variant = 'cms-web'
+      }
+      else {
+        variant = await select({
+          message: 'Select a variant to install',
+          options: [
+            { label: 'cms-web', value: 'cms-web' },
+            { label: 'cms-eshop', value: 'cms-eshop' },
+          ],
+        })
 
-        await cms(name, { ...options, branch, variant })
+        if (isCancel(variant)) {
+          cancel('Operation cancelled.')
+          process.exit(1)
+        }
+      }
     }
+
+    await cms(name, { ...options, branch, variant })
+  }
 }
 
 export default init

package/src/commands/init/options.mjs

@@ -1,47 +1,47 @@
 function normalizeEnum(value, allowed = []) {
-    if (typeof value !== 'string') {
-        return undefined
-    }
+  if (typeof value !== 'string') {
+    return undefined
+  }
 
-    const normalized = value.trim().toLowerCase()
+  const normalized = value.trim().toLowerCase()
 
-    if (!allowed.includes(normalized)) {
-        return undefined
-    }
+  if (!allowed.includes(normalized)) {
+    return undefined
+  }
 
-    return normalized
+  return normalized
 }
 
 function normalizeYesNo(value) {
-    if (typeof value === 'boolean') {
-        return value ? 'yes' : 'no'
-    }
+  if (typeof value === 'boolean') {
+    return value ? 'yes' : 'no'
+  }
 
-    if (typeof value !== 'string') {
-        return undefined
-    }
+  if (typeof value !== 'string') {
+    return undefined
+  }
 
-    const normalized = value.trim().toLowerCase()
+  const normalized = value.trim().toLowerCase()
 
-    if (['yes', 'y', 'true', '1'].includes(normalized)) {
-        return 'yes'
-    }
+  if (['yes', 'y', 'true', '1'].includes(normalized)) {
+    return 'yes'
+  }
 
-    if (['no', 'n', 'false', '0'].includes(normalized)) {
-        return 'no'
-    }
+  if (['no', 'n', 'false', '0'].includes(normalized)) {
+    return 'no'
+  }
 
-    return undefined
+  return undefined
 }
 
 function isAutoYes(options = {}) {
-    const values = [normalizeYesNo(options.y), normalizeYesNo(options.yes)]
+  const values = [normalizeYesNo(options.y), normalizeYesNo(options.yes)]
 
-    if (values.includes('no')) {
-        return false
-    }
+  if (values.includes('no')) {
+    return false
+  }
 
-    return values.includes('yes')
+  return values.includes('yes')
 }
 
 export { normalizeEnum, normalizeYesNo, isAutoYes }