preskok-ui 0.0.6 → 0.0.7

package/README.md

@@ -7,7 +7,7 @@ npx preskok-ui@latest init
 npx preskok-ui@latest init button
 ```
 
-The CLI delegates to `shadcn@latest`. `init` installs the Preskok base for new projects, only registers the Preskok namespace in projects that already have `components.json`, and can add optional components in one pass. `add` resolves bare component names through the Preskok registry.
+The CLI delegates to `shadcn@4.9.0` by default. Set `PRESKOK_SHADCN_VERSION` to test another shadcn CLI version. Use `init` for new projects, `registry` for existing shadcn projects, and `add` to resolve bare component names through the Preskok registry.
 
 ```bash
 npx preskok-ui@latest registry

package/bin/preskok-ui.mjs

@@ -1,21 +1,14 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process"
-import { existsSync, readFileSync, unlinkSync, writeFileSync } from "node:fs"
-import path from "node:path"
 
 const REGISTRY_BASE_URL = (
   process.env.PRESKOK_REGISTRY_URL ?? "https://ui-three-mu.vercel.app"
 ).replace(/\/$/, "")
+const SHADCN_VERSION = process.env.PRESKOK_SHADCN_VERSION ?? "4.9.0"
 const REGISTRY = `@preskok=${REGISTRY_BASE_URL}/r/{name}.json`
 const DEFAULT_REGISTRY_ITEM = `${REGISTRY_BASE_URL}/r/default.json`
 const CWD_OPTION_VALUES = new Set(["-c", "--cwd"])
 const ADD_OPTION_VALUES = new Set(["-c", "--cwd", "-p", "--path", "--diff"])
-const DEPENDENCY_SECTIONS = [
-  "dependencies",
-  "devDependencies",
-  "optionalDependencies",
-  "peerDependencies",
-]
 const INIT_OPTION_VALUES = new Set([
   "-t",
   "--template",
@@ -31,14 +24,6 @@ const INIT_OPTION_VALUES = new Set([
 
 const args = process.argv.slice(2)
 const [command, ...commandArgs] = args
-const LOCKFILES = [
-  "package-lock.json",
-  "npm-shrinkwrap.json",
-  "pnpm-lock.yaml",
-  "yarn.lock",
-  "bun.lock",
-  "bun.lockb",
-]
 
 if (!command || command === "-h" || command === "--help") {
   printHelp()
@@ -58,20 +43,21 @@ if (command === "add") {
   }
 
   process.exit(
-    runPreskokAdd(toPreskokCommandItems(commandArgs, ADD_OPTION_VALUES))
+    runShadcn([
+      "add",
+      "--yes",
+      ...toPreskokCommandItems(commandArgs, ADD_OPTION_VALUES),
+    ])
   )
 }
 
 if (command === "init") {
   const { initArgs, items } = splitInitArgs(commandArgs)
-  const cwd = getCwd(initArgs)
 
-  if (!existsSync(path.join(cwd, "components.json"))) {
-    const initStatus = runShadcn(["init", DEFAULT_REGISTRY_ITEM, ...initArgs])
+  const initStatus = runShadcn(["init", DEFAULT_REGISTRY_ITEM, ...initArgs])
 
-    if (initStatus !== 0) {
-      process.exit(initStatus)
-    }
+  if (initStatus !== 0) {
+    process.exit(initStatus)
   }
 
   const registryStatus = runShadcn([
@@ -90,7 +76,9 @@ if (command === "init") {
   }
 
   process.exit(
-    runPreskokAdd([
+    runShadcn([
+      "add",
+      "--yes",
       ...getCommandOptions(initArgs, CWD_OPTION_VALUES),
       ...toPreskokItems(items),
     ])
@@ -132,7 +120,7 @@ function runShadcn(shadcnArgs) {
       "exec",
       "--yes",
       "--package",
-      "shadcn@latest",
+      `shadcn@${SHADCN_VERSION}`,
       "--",
       "shadcn",
       ...shadcnArgs,
@@ -145,14 +133,6 @@ function runShadcn(shadcnArgs) {
   return result.status ?? 1
 }
 
-function runPreskokAdd(addArgs) {
-  const packageState = capturePackageState(addArgs)
-  const status = runShadcn(["add", "--yes", ...addArgs])
-  restorePackageState(packageState)
-
-  return status
-}
-
 function toPreskokItems(values) {
   return values.map(toPreskokItem)
 }
@@ -240,123 +220,10 @@ function splitInitArgs(values) {
   return { initArgs, items }
 }
 
-function getCwd(values) {
-  for (let index = 0; index < values.length; index++) {
-    const value = values[index]
-
-    if (value === "-c" || value === "--cwd") {
-      return path.resolve(values[index + 1] ?? process.cwd())
-    }
-
-    if (value.startsWith("--cwd=")) {
-      return path.resolve(value.slice("--cwd=".length))
-    }
-  }
-
-  return process.cwd()
-}
-
 function hasInlineOptionValue(value, options) {
   return [...options].some((option) => value.startsWith(`${option}=`))
 }
 
-function capturePackageState(values) {
-  const cwd = getCwd(values)
-  const packageJsonPath = path.join(cwd, "package.json")
-
-  if (!existsSync(packageJsonPath)) {
-    return null
-  }
-
-  const packageJsonContent = readFileSync(packageJsonPath, "utf8")
-  const packageJson = JSON.parse(packageJsonContent)
-  const lockfiles = new Map()
-
-  for (const lockfile of LOCKFILES) {
-    const lockfilePath = path.join(cwd, lockfile)
-
-    if (existsSync(lockfilePath)) {
-      lockfiles.set(lockfile, readFileSync(lockfilePath))
-    }
-  }
-
-  return {
-    cwd,
-    lockfiles,
-    packageJson,
-    packageJsonContent,
-    packageJsonPath,
-  }
-}
-
-function restorePackageState(packageState) {
-  if (!packageState || !existsSync(packageState.packageJsonPath)) {
-    return
-  }
-
-  const packageJson = JSON.parse(
-    readFileSync(packageState.packageJsonPath, "utf8")
-  )
-  const beforeDependencyNames = getDependencyNames(packageState.packageJson)
-  const afterDependencyNames = getDependencyNames(packageJson)
-  const hasNewDependencies = [...afterDependencyNames].some((dependency) => {
-    return !beforeDependencyNames.has(dependency)
-  })
-
-  if (!hasNewDependencies) {
-    writeFileSync(packageState.packageJsonPath, packageState.packageJsonContent)
-    restoreLockfiles(packageState)
-    return
-  }
-
-  restoreExistingDependencySpecs(packageState.packageJson, packageJson)
-  writeFileSync(
-    packageState.packageJsonPath,
-    `${JSON.stringify(packageJson, null, 2)}\n`
-  )
-}
-
-function getDependencyNames(packageJson) {
-  const names = new Set()
-
-  for (const section of DEPENDENCY_SECTIONS) {
-    for (const dependency of Object.keys(packageJson[section] ?? {})) {
-      names.add(dependency)
-    }
-  }
-
-  return names
-}
-
-function restoreExistingDependencySpecs(sourcePackageJson, targetPackageJson) {
-  for (const section of DEPENDENCY_SECTIONS) {
-    const sourceDependencies = sourcePackageJson[section] ?? {}
-    const targetDependencies = targetPackageJson[section] ?? {}
-
-    for (const [dependency, version] of Object.entries(sourceDependencies)) {
-      if (targetDependencies[dependency] !== undefined) {
-        targetDependencies[dependency] = version
-      }
-    }
-  }
-}
-
-function restoreLockfiles(packageState) {
-  for (const lockfile of LOCKFILES) {
-    const lockfilePath = path.join(packageState.cwd, lockfile)
-    const content = packageState.lockfiles.get(lockfile)
-
-    if (content) {
-      writeFileSync(lockfilePath, content)
-      continue
-    }
-
-    if (existsSync(lockfilePath)) {
-      unlinkSync(lockfilePath)
-    }
-  }
-}
-
 function printHelp() {
   console.log(`Usage: preskok-ui <command> [options]
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "preskok-ui",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "license": "MIT",
   "type": "module",
   "bin": {