@morya-ui/setup 0.3.3 → 0.3.5

package/src/copy-template.mjs

@@ -1,78 +1,78 @@
-import { cpSync, existsSync, mkdirSync, readdirSync, statSync } from 'node:fs'
-import { dirname, join, relative } from 'node:path'
-
-/**
- * Recursively list files under dir (relative to dir).
- * @param {string} dir
- * @returns {string[]}
- */
-function listFiles(dir) {
-  const out = []
-  function walk(current) {
-    for (const name of readdirSync(current)) {
-      const full = join(current, name)
-      const st = statSync(full)
-      if (st.isDirectory()) walk(full)
-      else out.push(relative(dir, full))
-    }
-  }
-  walk(dir)
-  return out
-}
-
-/**
- * @param {string} rel
- * @param {string[] | undefined} include
- */
-function matchesInclude(rel, include) {
-  if (!include || include.length === 0) return true
-  const norm = rel.replace(/\\/g, '/')
-  return include.some((prefix) => {
-    const p = prefix.replace(/\\/g, '/')
-    return norm === p || norm.startsWith(`${p}/`)
-  })
-}
-
-/**
- * Copy template tree into target cwd.
- * @param {string} templateRoot
- * @param {string} cwd
- * @param {{ force?: boolean, dryRun?: boolean, include?: string[] }} [options]
- * @returns {{ copied: string[], skipped: string[], forced: string[] }}
- */
-export function copyTemplate(templateRoot, cwd, { force = false, dryRun = false, include } = {}) {
-  const copied = []
-  const skipped = []
-  const forced = []
-
-  if (!existsSync(templateRoot)) {
-    throw new Error(
-      `Template missing at ${templateRoot}. Run sync-template / build before publishing.`,
-    )
-  }
-
-  const files = listFiles(templateRoot).filter((rel) => matchesInclude(rel, include))
-  for (const rel of files) {
-    const from = join(templateRoot, rel)
-    const to = join(cwd, rel)
-    const exists = existsSync(to)
-
-    if (exists && !force) {
-      skipped.push(rel)
-      continue
-    }
-
-    if (dryRun) {
-      if (exists) forced.push(rel)
-      else copied.push(rel)
-      continue
-    }
-
-    mkdirSync(dirname(to), { recursive: true })
-    cpSync(from, to)
-    if (exists) forced.push(rel)
-    else copied.push(rel)
-  }
-
-  return { copied, skipped, forced }
-}
+import { cpSync, existsSync, mkdirSync, readdirSync, statSync } from 'node:fs'
+import { dirname, join, relative } from 'node:path'
+
+/**
+ * Recursively list files under dir (relative to dir).
+ * @param {string} dir
+ * @returns {string[]}
+ */
+function listFiles(dir) {
+  const out = []
+  function walk(current) {
+    for (const name of readdirSync(current)) {
+      const full = join(current, name)
+      const st = statSync(full)
+      if (st.isDirectory()) walk(full)
+      else out.push(relative(dir, full))
+    }
+  }
+  walk(dir)
+  return out
+}
+
+/**
+ * @param {string} rel
+ * @param {string[] | undefined} include
+ */
+function matchesInclude(rel, include) {
+  if (!include || include.length === 0) return true
+  const norm = rel.replace(/\\/g, '/')
+  return include.some((prefix) => {
+    const p = prefix.replace(/\\/g, '/')
+    return norm === p || norm.startsWith(`${p}/`)
+  })
+}
+
+/**
+ * Copy template tree into target cwd.
+ * @param {string} templateRoot
+ * @param {string} cwd
+ * @param {{ force?: boolean, dryRun?: boolean, include?: string[] }} [options]
+ * @returns {{ copied: string[], skipped: string[], forced: string[] }}
+ */
+export function copyTemplate(templateRoot, cwd, { force = false, dryRun = false, include } = {}) {
+  const copied = []
+  const skipped = []
+  const forced = []
+
+  if (!existsSync(templateRoot)) {
+    throw new Error(
+      `Template missing at ${templateRoot}. Run sync-template / build before publishing.`,
+    )
+  }
+
+  const files = listFiles(templateRoot).filter((rel) => matchesInclude(rel, include))
+  for (const rel of files) {
+    const from = join(templateRoot, rel)
+    const to = join(cwd, rel)
+    const exists = existsSync(to)
+
+    if (exists && !force) {
+      skipped.push(rel)
+      continue
+    }
+
+    if (dryRun) {
+      if (exists) forced.push(rel)
+      else copied.push(rel)
+      continue
+    }
+
+    mkdirSync(dirname(to), { recursive: true })
+    cpSync(from, to)
+    if (exists) forced.push(rel)
+    else copied.push(rel)
+  }
+
+  return { copied, skipped, forced }
+}

package/src/fs-utils.mjs

@@ -1,24 +1,24 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
-import { dirname } from 'node:path'
-
-export function readJson(path) {
-  const text = readFileSync(path, 'utf8').replace(/^\uFEFF/, '')
-  return JSON.parse(text)
-}
-
-export function writeJson(path, value, { dryRun = false } = {}) {
-  const text = `${JSON.stringify(value, null, 2)}\n`
-  if (dryRun) return text
-  mkdirSync(dirname(path), { recursive: true })
-  writeFileSync(path, text, 'utf8')
-  return text
-}
-
-export function ensureDir(path, { dryRun = false } = {}) {
-  if (dryRun || existsSync(path)) return
-  mkdirSync(path, { recursive: true })
-}
-
-export function fileExists(path) {
-  return existsSync(path)
-}
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { dirname } from 'node:path'
+
+export function readJson(path) {
+  const text = readFileSync(path, 'utf8').replace(/^\uFEFF/, '')
+  return JSON.parse(text)
+}
+
+export function writeJson(path, value, { dryRun = false } = {}) {
+  const text = `${JSON.stringify(value, null, 2)}\n`
+  if (dryRun) return text
+  mkdirSync(dirname(path), { recursive: true })
+  writeFileSync(path, text, 'utf8')
+  return text
+}
+
+export function ensureDir(path, { dryRun = false } = {}) {
+  if (dryRun || existsSync(path)) return
+  mkdirSync(path, { recursive: true })
+}
+
+export function fileExists(path) {
+  return existsSync(path)
+}

package/src/install.mjs

@@ -1,63 +1,134 @@
-import { existsSync } from 'node:fs'
-import { join } from 'node:path'
-import { execSync } from 'node:child_process'
-
-const LOCKFILES = [
-  { pm: 'pnpm', file: 'pnpm-lock.yaml' },
-  { pm: 'yarn', file: 'yarn.lock' },
-  { pm: 'npm', file: 'package-lock.json' },
-]
-
-export function detectPackageManager(cwd, explicit) {
-  if (explicit) {
-    if (!['pnpm', 'yarn', 'npm'].includes(explicit)) {
-      throw new Error(`Unsupported --pm value: ${explicit}. Use pnpm, yarn, or npm.`)
-    }
-    return explicit
-  }
-  for (const { pm, file } of LOCKFILES) {
-    if (existsSync(join(cwd, file))) return pm
-  }
-  return 'pnpm'
-}
-
-function installCommand(pm) {
-  switch (pm) {
-    case 'pnpm':
-      return 'pnpm add morya-ui'
-    case 'yarn':
-      return 'yarn add morya-ui'
-    case 'npm':
-      return 'npm install morya-ui'
-    default:
-      throw new Error(`Unknown package manager: ${pm}`)
-  }
-}
-
-/**
- * @returns {{ pm: string, command: string, skipped?: boolean, reason?: string }}
- */
-export function installMoryaUi(cwd, { pm, dryRun = false, skipInstall = false } = {}) {
-  const resolved = detectPackageManager(cwd, pm)
-  const command = installCommand(resolved)
-
-  if (skipInstall) {
-    return { pm: resolved, command, skipped: true, reason: 'skip-install' }
-  }
-
-  if (!existsSync(join(cwd, 'package.json'))) {
-    return {
-      pm: resolved,
-      command,
-      skipped: true,
-      reason: 'no-package-json',
-    }
-  }
-
-  if (dryRun) {
-    return { pm: resolved, command, skipped: true, reason: 'dry-run' }
-  }
-
-  execSync(command, { cwd, stdio: 'inherit', shell: true })
-  return { pm: resolved, command }
-}
+import { existsSync } from 'node:fs'
+import { join } from 'node:path'
+import { execSync } from 'node:child_process'
+import { readJson } from './fs-utils.mjs'
+
+const LOCKFILES = [
+  { pm: 'pnpm', file: 'pnpm-lock.yaml' },
+  { pm: 'yarn', file: 'yarn.lock' },
+  { pm: 'npm', file: 'package-lock.json' },
+]
+
+const CORE_PACKAGE = 'morya-ui'
+const SCOPE_PREFIX = '@morya-ui/'
+
+export function detectPackageManager(cwd, explicit) {
+  if (explicit) {
+    if (!['pnpm', 'yarn', 'npm'].includes(explicit)) {
+      throw new Error(`Unsupported --pm value: ${explicit}. Use pnpm, yarn, or npm.`)
+    }
+    return explicit
+  }
+  for (const { pm, file } of LOCKFILES) {
+    if (existsSync(join(cwd, file))) return pm
+  }
+  return 'pnpm'
+}
+
+/**
+ * Collect morya-ui / @morya-ui/* names from package.json.
+ * Always includes `morya-ui` when ensureCore is true (full / app).
+ * @param {Record<string, unknown> | null} pkg
+ * @param {{ ensureCore?: boolean }} [opts]
+ * @returns {string[]}
+ */
+export function collectMoryaPackages(pkg, { ensureCore = true } = {}) {
+  const names = new Set()
+  if (pkg && typeof pkg === 'object') {
+    for (const field of ['dependencies', 'devDependencies', 'optionalDependencies']) {
+      const deps = pkg[field]
+      if (!deps || typeof deps !== 'object') continue
+      for (const name of Object.keys(deps)) {
+        if (name === CORE_PACKAGE || name.startsWith(SCOPE_PREFIX)) {
+          names.add(name)
+        }
+      }
+    }
+  }
+  if (ensureCore) names.add(CORE_PACKAGE)
+  return [...names].sort()
+}
+
+/**
+ * @param {string} pm
+ * @param {string[]} packages bare package names
+ */
+export function installCommand(pm, packages) {
+  const specs = packages.map((name) => `${name}@latest`)
+  const joined = specs.join(' ')
+  switch (pm) {
+    case 'pnpm':
+      return `pnpm add ${joined}`
+    case 'yarn':
+      return `yarn add ${joined}`
+    case 'npm':
+      return `npm install ${joined}`
+    default:
+      throw new Error(`Unknown package manager: ${pm}`)
+  }
+}
+
+/**
+ * Install / upgrade `morya-ui` and any existing `@morya-ui/*` deps to the npm `latest` tag.
+ * @returns {{
+ *   pm: string,
+ *   command: string,
+ *   packages: string[],
+ *   skipped?: boolean,
+ *   reason?: string,
+ * }}
+ */
+export function installMoryaUi(cwd, {
+  pm,
+  dryRun = false,
+  skipInstall = false,
+  ensureCore = true,
+} = {}) {
+  const resolved = detectPackageManager(cwd, pm)
+  const pkgPath = join(cwd, 'package.json')
+
+  let pkg = null
+  if (existsSync(pkgPath)) {
+    try {
+      pkg = readJson(pkgPath)
+    } catch {
+      pkg = null
+    }
+  }
+
+  const packages = collectMoryaPackages(pkg, { ensureCore })
+  const command = packages.length
+    ? installCommand(resolved, packages)
+    : installCommand(resolved, [CORE_PACKAGE])
+
+  if (skipInstall) {
+    return { pm: resolved, command, packages, skipped: true, reason: 'skip-install' }
+  }
+
+  if (!existsSync(pkgPath)) {
+    return {
+      pm: resolved,
+      command,
+      packages,
+      skipped: true,
+      reason: 'no-package-json',
+    }
+  }
+
+  if (!packages.length) {
+    return {
+      pm: resolved,
+      command,
+      packages,
+      skipped: true,
+      reason: 'no-morya-packages',
+    }
+  }
+
+  if (dryRun) {
+    return { pm: resolved, command, packages, skipped: true, reason: 'dry-run' }
+  }
+
+  execSync(command, { cwd, stdio: 'inherit', shell: true })
+  return { pm: resolved, command, packages }
+}

package/src/mcp.mjs

@@ -1,50 +1,50 @@
-import { existsSync } from 'node:fs'
-import { join } from 'node:path'
-import { readJson, writeJson } from './fs-utils.mjs'
-
-const SERVER_NAME = 'morya-ui'
-const SERVER_CONFIG = {
-  command: 'npx',
-  args: ['-y', '@morya-ui/mcp'],
-}
-
-/**
- * Merge Cursor MCP config for morya-ui.
- * @returns {{ path: string, action: 'created' | 'merged' | 'skipped' | 'forced', dryRun?: boolean }}
- */
-export function mergeMcpConfig(cwd, { force = false, dryRun = false } = {}) {
-  const path = join(cwd, '.cursor', 'mcp.json')
-  const exists = existsSync(path)
-
-  let data = { mcpServers: {} }
-  if (exists) {
-    try {
-      data = readJson(path)
-    } catch {
-      throw new Error(`Invalid JSON in ${path}`)
-    }
-    if (!data || typeof data !== 'object') {
-      throw new Error(`Invalid MCP config shape in ${path}`)
-    }
-    if (!data.mcpServers || typeof data.mcpServers !== 'object') {
-      data.mcpServers = {}
-    }
-  }
-
-  const hasExisting = Boolean(data.mcpServers[SERVER_NAME])
-  if (hasExisting && !force) {
-    return { path, action: 'skipped' }
-  }
-
-  data.mcpServers[SERVER_NAME] = { ...SERVER_CONFIG }
-
-  if (!dryRun) {
-    writeJson(path, data)
-  }
-
-  let action = 'created'
-  if (exists && hasExisting && force) action = 'forced'
-  else if (exists) action = 'merged'
-
-  return { path, action, dryRun }
-}
+import { existsSync } from 'node:fs'
+import { join } from 'node:path'
+import { readJson, writeJson } from './fs-utils.mjs'
+
+const SERVER_NAME = 'morya-ui'
+const SERVER_CONFIG = {
+  command: 'npx',
+  args: ['-y', '@morya-ui/mcp@latest'],
+}
+
+/**
+ * Merge Cursor MCP config for morya-ui.
+ * @returns {{ path: string, action: 'created' | 'merged' | 'skipped' | 'forced', dryRun?: boolean }}
+ */
+export function mergeMcpConfig(cwd, { force = false, dryRun = false } = {}) {
+  const path = join(cwd, '.cursor', 'mcp.json')
+  const exists = existsSync(path)
+
+  let data = { mcpServers: {} }
+  if (exists) {
+    try {
+      data = readJson(path)
+    } catch {
+      throw new Error(`Invalid JSON in ${path}`)
+    }
+    if (!data || typeof data !== 'object') {
+      throw new Error(`Invalid MCP config shape in ${path}`)
+    }
+    if (!data.mcpServers || typeof data.mcpServers !== 'object') {
+      data.mcpServers = {}
+    }
+  }
+
+  const hasExisting = Boolean(data.mcpServers[SERVER_NAME])
+  if (hasExisting && !force) {
+    return { path, action: 'skipped' }
+  }
+
+  data.mcpServers[SERVER_NAME] = { ...SERVER_CONFIG }
+
+  if (!dryRun) {
+    writeJson(path, data)
+  }
+
+  let action = 'created'
+  if (exists && hasExisting && force) action = 'forced'
+  else if (exists) action = 'merged'
+
+  return { path, action, dryRun }
+}

package/src/package-json.mjs

@@ -1,30 +1,30 @@
-import { existsSync } from 'node:fs'
-import { join } from 'node:path'
-import { readJson, writeJson } from './fs-utils.mjs'
-
-const CHECK_COLORS = 'node scripts/check-raw-colors.mjs'
-
-/**
- * @returns {{ action: 'added' | 'skipped' | 'missing-package-json', dryRun?: boolean }}
- */
-export function ensureCheckColorsScript(cwd, { force = false, dryRun = false } = {}) {
-  const path = join(cwd, 'package.json')
-  if (!existsSync(path)) {
-    return { action: 'missing-package-json' }
-  }
-
-  const pkg = readJson(path)
-  pkg.scripts = pkg.scripts || {}
-
-  if (pkg.scripts['check:colors'] && !force) {
-    return { action: 'skipped' }
-  }
-
-  pkg.scripts['check:colors'] = CHECK_COLORS
-
-  if (!dryRun) {
-    writeJson(path, pkg)
-  }
-
-  return { action: 'added', dryRun }
-}
+import { existsSync } from 'node:fs'
+import { join } from 'node:path'
+import { readJson, writeJson } from './fs-utils.mjs'
+
+const CHECK_COLORS = 'node scripts/check-raw-colors.mjs'
+
+/**
+ * @returns {{ action: 'added' | 'skipped' | 'missing-package-json', dryRun?: boolean }}
+ */
+export function ensureCheckColorsScript(cwd, { force = false, dryRun = false } = {}) {
+  const path = join(cwd, 'package.json')
+  if (!existsSync(path)) {
+    return { action: 'missing-package-json' }
+  }
+
+  const pkg = readJson(path)
+  pkg.scripts = pkg.scripts || {}
+
+  if (pkg.scripts['check:colors'] && !force) {
+    return { action: 'skipped' }
+  }
+
+  pkg.scripts['check:colors'] = CHECK_COLORS
+
+  if (!dryRun) {
+    writeJson(path, pkg)
+  }
+
+  return { action: 'added', dryRun }
+}