rxn-ui 0.5.6 → 0.5.7

package/cli/add.js

@@ -1,73 +1,79 @@
-import fs from 'node:fs'
-import path from 'node:path'
-
-import { STYLES_FILES, cwd, getRegistryUrl } from './constants.js'
-import { loadConfig } from './utils/config.js'
-import { fetchFile, fetchJSON } from './utils/fetch.js'
-import { getSourceUrl } from './utils/getSourceUrl.js'
-import { log } from './utils/logger.js'
-
-export async function add(name, cmdOptions = {}) {
-  const config = loadConfig()
-  if (!config) {
-    log.error('Not initialized. Run: npx rxn-ui init')
-    process.exit(1)
-  }
-
-  const tag = cmdOptions.tag || null
-  const registryUrl = getRegistryUrl(tag)
-
-  let registry
-  try {
-    registry = await fetchJSON(registryUrl)
-  } catch (err) {
-    log.error(`Failed to fetch registry: ${err.message}`)
-    process.exit(1)
-  }
-
-  const entry = registry[name]
-  if (!entry) {
-    log.error(`Component "${name}" not found`)
-    log.info(`Available components: ${Object.keys(registry).join(', ')}`)
-    process.exit(1)
-  }
-
-  const type = name.startsWith('use-') ? 'composables' : 'components'
-  const itemsToDownload = [
-    { type, name, files: entry.files, dir: config[type] },
-    { type: 'styles', name: null, files: STYLES_FILES, dir: config.styles },
-  ]
-
-  log.bold(`\nAdding ${name}...`)
-
-  for (const item of itemsToDownload) {
-    const destDir = path.join(cwd, item.dir)
-    fs.mkdirSync(destDir, { recursive: true })
-    await downloadItems({ type: item.type, name: item.name, files: item.files, tag, destDir })
-  }
-
-  if (entry.imports) {
-    log.bold(`\nUsage:`)
-    for (const imp of entry.imports) {
-      log(`  ${imp}`)
-    }
-  }
-}
-
-async function downloadItems({ type, name, files, tag, destDir }) {
-  log.bold(`\nAdding ${type}...`)
-  for (const file of files) {
-    const url = getSourceUrl(type, name, file, tag)
-    const destDirNested = name ? path.join(destDir, name) : destDir
-    const destPath = path.join(destDirNested, file)
-
-    try {
-      const content = await fetchFile(url)
-      fs.mkdirSync(destDirNested, { recursive: true })
-      fs.writeFileSync(destPath, content)
-      log.success(`Added ${path.relative(cwd, destPath)}`)
-    } catch (err) {
-      log.error(`Failed to download ${file}: ${err.message}`)
-    }
-  }
-}
+import fs from 'node:fs'
+import path from 'node:path'
+
+import { STYLES_FILES, cwd, getRegistryUrl } from './constants.js'
+import { loadConfig } from './utils/config.js'
+import { fetchFile, fetchJSON } from './utils/fetch.js'
+import { getSourceUrl } from './utils/getSourceUrl.js'
+import { log } from './utils/logger.js'
+
+export async function add(componentName, cmdOptions = {}) {
+  const config = loadConfig()
+  if (!config) {
+    log.error('Not initialized. Run: npx rxn-ui init')
+    process.exit(1)
+  }
+
+  const tag = cmdOptions.tag || null
+  const registryUrl = getRegistryUrl(tag)
+
+  let registry
+  try {
+    registry = await fetchJSON(registryUrl)
+  } catch (err) {
+    log.error(`Failed to fetch registry: ${err.message}`)
+    process.exit(1)
+  }
+
+  const entry = registry[componentName]
+  if (!entry) {
+    log.error(`Component "${componentName}" not found`)
+    log.info(`Available components: ${Object.keys(registry).join(', ')}`)
+    process.exit(1)
+  }
+
+  // Если файлов больше одного — скачиваем в папку с именем компонента
+  const isMultipleFiles = entry.files.length > 1
+  const destDir = isMultipleFiles
+    ? path.join(cwd, config[entry.type], componentName)
+    : path.join(cwd, config[entry.type])
+
+  log.bold(`\nAdding ${componentName}...`)
+
+  // Скачиваем файлы компонента
+  await downloadItems({
+    type: entry.type,
+    componentName: isMultipleFiles ? componentName : null,
+    files: entry.files,
+    tag,
+    destDir,
+  })
+
+  // Скачиваем стили
+  const stylesDir = path.join(cwd, config.styles)
+  await downloadItems({
+    type: 'styles',
+    componentName: null,
+    files: STYLES_FILES,
+    tag,
+    destDir: stylesDir,
+  })
+}
+
+async function downloadItems({ type, componentName, files, tag, destDir }) {
+  log.bold(`\nAdding ${type}...`)
+  fs.mkdirSync(destDir, { recursive: true })
+
+  for (const file of files) {
+    const url = getSourceUrl(type, componentName, file, tag)
+    const destPath = path.join(destDir, file)
+
+    try {
+      const content = await fetchFile(url)
+      fs.writeFileSync(destPath, content)
+      log.success(`Added ${path.relative(cwd, destPath)}`)
+    } catch (err) {
+      log.error(`Failed to download ${file}: ${err.message}`)
+    }
+  }
+}

package/cli/constants.js

@@ -1,11 +1,11 @@
-import process from 'node:process'
-
-export const GITHUB_REPO = 'r2-h/artharexian-ui'
-export const GITHUB_RAW = `https://raw.githubusercontent.com/${GITHUB_REPO}/main`
-
-export const cwd = process.env.INIT_CWD || process.cwd()
-export const STYLES_FILES = ['style.css', 'variables.css']
-
-export function getRegistryUrl(tag) {
-  return tag ? `${GITHUB_RAW}/cli/registry.json?ref=${tag}` : `${GITHUB_RAW}/cli/registry.json`
-}
+import process from 'node:process'
+
+export const GITHUB_REPO = 'r2-h/artharexian-ui'
+export const GITHUB_RAW = `https://raw.githubusercontent.com/${GITHUB_REPO}/main`
+
+export const cwd = process.env.INIT_CWD || process.cwd()
+export const STYLES_FILES = ['style.css', 'variables.css']
+
+export function getRegistryUrl(tag) {
+  return tag ? `${GITHUB_RAW}/cli/registry.json?ref=${tag}` : `${GITHUB_RAW}/cli/registry.json`
+}

package/cli/registry.json

@@ -1,12 +1,12 @@
 {
   "button-base": {
-    "description": "Accessible button primitive",
+    "type": "components",
     "files": ["ButtonBase.vue", "types.ts"],
-    "dependencies": [],
-    "imports": ["import { ButtonBase } from '@/components/button-base'"]
+    "description": "Accessible button primitive",
+    "dependencies": []
   },
   "card-base": {
-    "description": "Card container components",
+    "type": "components",
     "files": [
       "CardBase.vue",
       "CardContent.vue",
@@ -15,37 +15,35 @@
       "CardHeader.vue",
       "CardTitle.vue"
     ],
-    "dependencies": [],
-    "imports": [
-      "import { CardBase, CardHeader, CardTitle, CardDescription, CardContent, CardFooter } from '@/components/card-base'"
-    ]
+    "description": "Card container components",
+    "dependencies": []
   },
   "checkbox-base": {
-    "description": "Checkbox input primitive",
+    "type": "components",
     "files": ["CheckboxBase.vue"],
-    "dependencies": [],
-    "imports": ["import { CheckboxBase } from '@/components/checkbox-base'"]
+    "description": "Checkbox input primitive",
+    "dependencies": []
   },
   "input-base": {
-    "description": "Text input primitive",
+    "type": "components",
     "files": ["InputBase.vue", "types.ts"],
-    "dependencies": [],
-    "imports": ["import { InputBase } from '@/components/input-base'"]
+    "description": "Text input primitive",
+    "dependencies": []
   },
   "range-base": {
-    "description": "Range slider primitive",
+    "type": "components",
     "files": ["RangeBase.vue", "RangeOutput.vue", "types.ts"],
-    "dependencies": [],
-    "imports": ["import { RangeBase, RangeOutput } from '@/components/range-base'"]
+    "description": "Range slider primitive",
+    "dependencies": []
   },
   "switch-base": {
-    "description": "Toggle switch primitive",
+    "type": "components",
     "files": ["SwitchBase.vue"],
-    "dependencies": [],
-    "imports": ["import { SwitchBase } from '@/components/switch-base'"]
+    "description": "Toggle switch primitive",
+    "dependencies": []
   },
   "tabs": {
-    "description": "Tab navigation components",
+    "type": "components",
     "files": [
       "context.ts",
       "TabsBase.vue",
@@ -55,15 +53,13 @@
       "TabsTab.vue",
       "types.ts"
     ],
-    "dependencies": [],
-    "imports": [
-      "import { TabsBase, TabsList, TabsTab, TabsIndicator, TabsPanel } from '@/components/tabs'"
-    ]
+    "description": "Tab navigation components",
+    "dependencies": []
   },
   "use-theme": {
-    "description": "Composable theme switcher",
+    "type": "composables",
     "files": ["useTheme.ts"],
-    "dependencies": [],
-    "imports": ["import { useTheme } from '@/composables/useTheme'"]
+    "description": "Composable theme switcher",
+    "dependencies": []
   }
 }

package/cli/utils/fetch.js

@@ -1,25 +1,25 @@
-/**
- * Fetch file content from URL
- * @param {string} url - URL to fetch
- * @returns {Promise<string>}
- */
-export async function fetchFile(url) {
-  const res = await fetch(url)
-  if (!res.ok) {
-    if (res.status === 404) {
-      throw new Error(`File not found: ${url}`)
-    }
-    throw new Error(`Failed to fetch: ${url} (${res.status})`)
-  }
-  return res.text()
-}
-
-/**
- * Fetch and parse JSON from URL
- * @param {string} url - URL to fetch
- * @returns {Promise<object>}
- */
-export async function fetchJSON(url) {
-  const content = await fetchFile(url)
-  return JSON.parse(content)
-}
+/**
+ * Fetch file content from URL
+ * @param {string} url - URL to fetch
+ * @returns {Promise<string>}
+ */
+export async function fetchFile(url) {
+  const res = await fetch(url)
+  if (!res.ok) {
+    if (res.status === 404) {
+      throw new Error(`File not found: ${url}`)
+    }
+    throw new Error(`Failed to fetch: ${url} (${res.status})`)
+  }
+  return res.text()
+}
+
+/**
+ * Fetch and parse JSON from URL
+ * @param {string} url - URL to fetch
+ * @returns {Promise<object>}
+ */
+export async function fetchJSON(url) {
+  const content = await fetchFile(url)
+  return JSON.parse(content)
+}

package/cli/utils/getSourceUrl.js

@@ -1,10 +1,14 @@
 import { GITHUB_RAW } from '../constants.js'
 
-export function getSourceUrl(type, name, file, tag) {
+export function getSourceUrl(type, componentName, file, tag) {
   const ref = tag ? `?ref=${tag}` : ''
   const paths = {
-    components: `/src/components/${name}/${file}`,
-    composables: `/src/composables/${file}`,
+    components: componentName
+      ? `/src/components/${componentName}/${file}`
+      : `/src/components/${file}`,
+    composables: componentName
+      ? `/src/composables/${componentName}/${file}`
+      : `/src/composables/${file}`,
     styles: `/src/styles/${file}`,
   }
   return `${GITHUB_RAW}${paths[type]}${ref}`

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rxn-ui",
   "description": "Vue 3 UI component library",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "license": "MIT",
   "private": false,
   "type": "module",