rxn-ui 0.6.2 → 0.6.4

package/cli/add.js

@@ -10,8 +10,10 @@ import { log } from './utils/logger.js'
 // Patterns to detect and rewrite import paths
 const IMPORT_PATTERNS = [
   { type: 'assets', regex: /\.\.\/\.\.\/assets\//g },
+  { type: 'assets', regex: /@\/assets\//g },
   { type: 'composables', regex: /\.\.\/\.\.\/composables\//g },
   { type: 'utils', regex: /\.\.\/\.\.\/utils\//g },
+  { type: 'components', regex: /\.\.\/([\w-]+)\//g },
 ]
 
 export async function add(componentName, cmdOptions = {}) {
@@ -49,6 +51,18 @@ export async function add(componentName, cmdOptions = {}) {
   // Скачиваем зависимости (assets, composables, utils)
   const depDirs = await downloadDependencies(entry, config)
 
+  // Скачиваем компонентные зависимости
+  if (entry.components) {
+    for (const compName of entry.components) {
+      const compEntry = registry[compName]
+      if (!compEntry) {
+        log.error(`Dependency "${compName}" not found`)
+        continue
+      }
+      await addDependency(compName, compEntry, config)
+    }
+  }
+
   // Скачиваем файлы компонента
   await downloadItems({
     type: entry.type,
@@ -61,6 +75,29 @@ export async function add(componentName, cmdOptions = {}) {
   rewriteImports(entry.files, destDir, depDirs, isMultipleFiles)
 }
 
+async function addDependency(compName, compEntry, config) {
+  const isMultipleFiles = compEntry.files.length > 1
+  const destDir = isMultipleFiles
+    ? path.join(cwd, config[compEntry.type], compName)
+    : path.join(cwd, config[compEntry.type])
+
+  log.bold(`\nAdding dependency ${compName}...`)
+
+  // Скачиваем зависимости компонента
+  const depDirs = await downloadDependencies(compEntry, config)
+
+  // Скачиваем файлы
+  await downloadItems({
+    type: compEntry.type,
+    componentName: compName,
+    files: compEntry.files,
+    destDir,
+  })
+
+  // Переписываем импорты
+  rewriteImports(compEntry.files, destDir, depDirs, isMultipleFiles)
+}
+
 async function downloadDependencies(entry, config) {
   const deps = entry.dependencies
   if (!deps) return {}
@@ -91,17 +128,26 @@ function rewriteImports(files, destDir, depDirs, isMultipleFiles) {
 
     for (const { type, regex } of IMPORT_PATTERNS) {
       if (!depDirs[type]) continue
-      if (!regex.test(content)) continue
 
       // Reset regex lastIndex
       regex.lastIndex = 0
 
+      if (!regex.test(content)) continue
+      regex.lastIndex = 0
+
       // Calculate relative path from component file to dependency dir
       const fileDir = isMultipleFiles ? destDir : path.dirname(filePath)
       const relPath = path.relative(fileDir, depDirs[type]).replace(/\\/g, '/')
       const importPath = relPath.startsWith('.') ? relPath : `./${relPath}`
 
-      content = content.replace(regex, `${importPath}/`)
+      if (type === 'components') {
+        // For component imports like ../button-base/ -> ./button-base/
+        content = content.replace(regex, (match, compName) => {
+          return `${importPath}/${compName}/`
+        })
+      } else {
+        content = content.replace(regex, `${importPath}/`)
+      }
     }
 
     fs.writeFileSync(filePath, content)

package/cli/init.js

@@ -3,7 +3,6 @@ import path from 'node:path'
 
 import { STYLES_FILES, GITHUB_RAW, cwd } from './constants.js'
 import { detectProject, loadConfig, saveConfig } from './utils/config.js'
-import { downloadItems } from './add.js'
 import { fetchFile } from './utils/fetch.js'
 import { log } from './utils/logger.js'
 
@@ -30,6 +29,18 @@ async function downloadStyles(stylesDir) {
   }
 }
 
+function getDefaultStylesDir() {
+  const hasSrc = fs.existsSync(path.join(cwd, 'src'))
+  const base = hasSrc ? 'src/app/styles' : 'styles'
+  const stylesPath = path.join(cwd, base)
+
+  if (fs.existsSync(stylesPath)) {
+    const dir = path.dirname(base)
+    return path.join(dir, 'rxn-styles')
+  }
+  return base
+}
+
 export async function init(cmdOptions = {}) {
   const configPath = path.join(cwd, 'rxn-ui.json')
 
@@ -38,7 +49,6 @@ export async function init(cmdOptions = {}) {
     log.info(`
 Already initialized at ${configPath}
 Components: ${existing.components}
-Styles: ${existing.styles}
 Assets: ${existing.assets}`)
     return
   }
@@ -48,22 +58,14 @@ Assets: ${existing.assets}`)
   if (cmdOptions.components) {
     config.components = cmdOptions.components
   }
-  if (cmdOptions.styles) {
-    config.styles = cmdOptions.styles
-  } else {
-    config.styles = 'styles'
-  }
   if (cmdOptions.composables) {
     config.composables = cmdOptions.composables
   }
-
-  // Check if styles dir exists, use 'rxn-styles' prefix to avoid conflicts
-  const stylesPath = path.join(cwd, config.styles)
-  if (fs.existsSync(stylesPath)) {
-    const base = path.basename(config.styles)
-    const dir = path.dirname(config.styles)
-    config.styles = path.join(dir, `rxn-${base}`)
-    log.info(`Styles directory "${config.styles}" (prefixed to avoid conflict)`)
+  if (cmdOptions.assets) {
+    config.assets = cmdOptions.assets
+  }
+  if (cmdOptions.utils) {
+    config.utils = cmdOptions.utils
   }
 
   saveConfig(config)
@@ -71,13 +73,12 @@ Assets: ${existing.assets}`)
   log(`\n
 Configuration saved to ${configPath}
   Components: ${config.components}
-  Styles: ${config.styles}
   Composables: ${config.composables}
   Assets: ${config.assets}
   Utils: ${config.utils}`)
 
-  // Download styles
-  const stylesDir = path.join(cwd, config.styles)
+  // Download styles to default location
+  const stylesDir = path.join(cwd, getDefaultStylesDir())
   await downloadStyles(stylesDir)
 
   log(`\nNow you can add components:

package/cli/registry.json

@@ -33,6 +33,21 @@
       "utils": ["cssParser.ts", "mergeDefaultProps.ts"]
     }
   },
+  "sidebar-base": {
+    "type": "components",
+    "files": [
+      "SidebarBase.vue",
+      "SidebarButton.vue",
+      "sidebar-context.ts",
+      "use-resize.ts",
+      "types.ts"
+    ],
+    "dependencies": {
+      "assets": ["ChevronDoubleIcon.vue"],
+      "composables": ["useRefWithLocalStorage.ts"]
+    },
+    "components": ["button-base"]
+  },
   "switch-base": {
     "type": "components",
     "files": ["SwitchBase.vue"]

package/cli/showHelp.js

@@ -15,8 +15,9 @@ ${colors.bold}Commands:${colors.reset}
 
 ${colors.bold}Options:${colors.reset}
   --components <path>  Custom components directory
-  --styles <path>      Custom styles directory
   --composables <path> Custom composables directory
+  --assets <path>      Custom assets directory
+  --utils <path>       Custom utils directory
 
 ${colors.bold}Examples:${colors.reset}
   npx rxn-ui init

package/cli/utils/config.js

@@ -21,7 +21,7 @@ export function detectProject() {
   return {
     components: hasSrc ? 'src/shared/components' : 'components',
     composables: hasSrc ? 'src/shared/composables' : 'composables',
-    assets: hasSrc ? 'src/assets' : 'assets',
+    assets: hasSrc ? 'src/shared/assets' : 'assets',
     utils: hasSrc ? 'src/shared/utils' : 'utils',
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rxn-ui",
   "description": "Vue 3 UI component library",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "license": "MIT",
   "private": false,
   "type": "module",
@@ -23,7 +23,8 @@
     "dev": "vite",
     "format": "prettier --write .",
     "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
+    "build-storybook": "storybook build",
+    "build": "vite build"
   },
   "peerDependencies": {
     "vue": "^3.5.0",