@newlogic-digital/cli 1.5.0-next.6 → 1.5.0-next.8

package/index.mjs

@@ -70,7 +70,6 @@ function printUnknownCommand(command) {
   console.log(lines.join('\n'))
 }
 
-
 const rawArgs = process.argv.slice(2)
 const command = rawArgs[0]
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newlogic-digital/cli",
-  "version": "1.5.0-next.6",
+  "version": "1.5.0-next.8",
   "main": "index.mjs",
   "bin": {
     "newlogic-cli": "index.mjs",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.1.0",
-    "ajv": "^8.17.1",
+    "ajv": "^8.18.0",
     "dedent": "^1.7.2",
     "es-toolkit": "^1.45.1",
     "fast-glob": "^3.3.3",
@@ -31,6 +31,7 @@
   },
   "devDependencies": {
     "@stylistic/eslint-plugin": "^5.10",
-    "oxlint": "^1.56.0"
+    "@types/fs-extra": "^11.0.4",
+    "oxlint": "^1.57.0"
   }
 }

package/src/commands/blocks/index.mjs

@@ -1,3 +1,4 @@
+import { spinner as createSpinner } from '@clack/prompts'
 import { styleText } from 'node:util'
 import { createBlocksService } from './service.mjs'
 
@@ -39,6 +40,7 @@ function formatErrorMessage(message) {
 function createSilentLogger() {
   return {
     info() {},
+    progress() {},
     warn() {},
   }
 }
@@ -100,14 +102,45 @@ function formatInfoMessage(message) {
 }
 
 function createCliLogger() {
+  const progress = createSpinner()
+  let hasActiveProgress = false
+
+  function clearProgress() {
+    if (!hasActiveProgress) {
+      return
+    }
+
+    progress.clear()
+    hasActiveProgress = false
+  }
+
   return {
+    progress(message) {
+      if (!message) {
+        clearProgress()
+        return
+      }
+
+      if (!hasActiveProgress) {
+        progress.start(message)
+        hasActiveProgress = true
+        return
+      }
+
+      progress.message(message)
+    },
+
     info(message) {
+      clearProgress()
       console.log(formatInfoMessage(message))
     },
 
     warn(message) {
+      clearProgress()
       console.log(`${label('yellow', 'warn')} ${styleText('yellow', highlightTokens(message))}`)
     },
+
+    clearProgress,
   }
 }
 
@@ -148,6 +181,8 @@ function printBlocksUsage() {
 }
 
 export default async function blocks(action, names = [], options = {}) {
+  let activeLogger
+
   if (!action || action === 'help' || action === '--help') {
     printBlocksUsage()
     return
@@ -167,7 +202,8 @@ export default async function blocks(action, names = [], options = {}) {
         throw new Error('Missing block name for "newlogic blocks add"')
       }
 
-      const service = createBlocksService({ logger: createCliLogger() })
+      activeLogger = createCliLogger()
+      const service = createBlocksService({ logger: activeLogger })
       await service.addBlocks(names, {
         target: options.target,
       })
@@ -179,13 +215,15 @@ export default async function blocks(action, names = [], options = {}) {
         throw new Error('Missing block name for "newlogic blocks remove"')
       }
 
-      const service = createBlocksService({ logger: createCliLogger() })
+      activeLogger = createCliLogger()
+      const service = createBlocksService({ logger: activeLogger })
       await service.removeBlocks(names)
       return
     }
 
     if (action === 'update') {
-      const service = createBlocksService({ logger: createCliLogger() })
+      activeLogger = createCliLogger()
+      const service = createBlocksService({ logger: activeLogger })
       await service.updateBlocks()
       return
     }
@@ -193,6 +231,7 @@ export default async function blocks(action, names = [], options = {}) {
     throw new Error(`Unknown blocks action "${action}"`)
   }
   catch (error) {
+    activeLogger?.clearProgress?.()
     console.log(`${label('red', 'error')} ${formatErrorMessage(error.message)}`)
     process.exit(1)
   }

package/src/commands/blocks/service.mjs

@@ -13,6 +13,7 @@ const BLOCK_TARGETS = new Set(['ui', 'cms'])
 function defaultLogger() {
   return {
     info: message => console.log(message),
+    progress() {},
     warn: message => console.warn(message),
   }
 }
@@ -264,7 +265,7 @@ function saveProjectConfig(configPath, config, blocks) {
     blocks: Object.fromEntries(
       blocks.map(block => [
         block.name,
-        { ...(block.config ?? {}) },
+        { ...block.config },
       ]),
     ),
   }
@@ -396,6 +397,8 @@ export function createBlocksService({
     assertBlockName(normalizedName)
 
     if (!metaCache.has(normalizedName)) {
+      validatorPromise ||= createMetaValidator(repository)
+      logger.progress?.(`Downloading block metadata: ${normalizedName}`)
       const meta = await repository.getMeta(normalizedName)
       await validateMeta(meta, `block "${normalizedName}"`)
       metaCache.set(normalizedName, meta)
@@ -546,6 +549,7 @@ export function createBlocksService({
       }
     }
 
+    logger.progress?.(`Downloading ${relativeTargetPath}`)
     const contents = await repository.getFileBuffer(blockName, rule.source)
 
     fse.ensureDirSync(path.dirname(targetPath))

package/src/commands/init/ui.mjs

@@ -1,4 +1,6 @@
 import { cancel, confirm, isCancel, select, text } from '@clack/prompts'
+import os from 'node:os'
+import { styleText } from 'node:util'
 import { execSync } from '../../utils.mjs'
 import fse from 'fs-extra'
 import { join, resolve } from 'path'
@@ -71,6 +73,23 @@ function prepareBlankInstall(projectPath) {
   fse.outputFileSync(join(pagesPath, 'index.json'), '{\n  "title": "Hello world"\n}\n')
 }
 
+function cloneExec(path, { branch, url }) {
+  execSync(`git clone -b ${branch} --single-branch --depth 1 ${url}/newlogic-ui.git ${path}`)
+}
+
+function scaffoldIntoExistingDirectory(projectPath, { branch, url }) {
+  const tempDir = fse.mkdtempSync(join(os.tmpdir(), 'newlogic-ui-'))
+
+  try {
+    cloneExec(tempDir, { branch, url })
+    fse.removeSync(join(tempDir, '.git'))
+    fse.copySync(tempDir, projectPath, { overwrite: false, errorOnExist: false })
+  }
+  finally {
+    fse.removeSync(tempDir)
+  }
+}
+
 export default async function ui(name, { branch, ...options } = {}) {
   const autoYes = isAutoYes(options)
   let clone = normalizeEnum(options.clone, ['ssh', 'https'])
@@ -125,12 +144,20 @@ export default async function ui(name, { branch, ...options } = {}) {
     url = 'https://git.newlogic.cz/newlogic-digital'
   }
 
-  execSync(`git clone -b ${branch} --single-branch --depth 1 ${url}/newlogic-ui.git ${name || '.'}`)
-
   const projectPath = name ? resolve(process.cwd(), name) : resolve(process.cwd())
+  const packageJsonPath = join(projectPath, 'package.json')
   const gitPath = join(projectPath, '.git')
 
-  fse.removeSync(gitPath)
+  if (!fse.existsSync(projectPath)) {
+    cloneExec(name || '.', { branch, url })
+    fse.removeSync(gitPath)
+  }
+  else if (!fse.existsSync(packageJsonPath)) {
+    scaffoldIntoExistingDirectory(projectPath, { branch, url })
+  }
+  else {
+    console.log(styleText('yellow', 'Project files already exist in the directory, skipping copy step (delete package.json to force)'))
+  }
 
   if (scope === 'blank') {
     prepareBlankInstall(projectPath)