preskok-ui 0.0.5 → 0.0.7

package/README.md

@@ -3,10 +3,11 @@
 Thin CLI wrapper around shadcn with Preskok registry wiring.
 
 ```bash
+npx preskok-ui@latest init
 npx preskok-ui@latest init button
 ```
 
-The CLI delegates to `shadcn@latest`. `init` installs the Preskok base and optional components in one pass, and `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,9 +1,26 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process"
 
-const REGISTRY = "@preskok=https://ui-three-mu.vercel.app/r/{name}.json"
-const DEFAULT_REGISTRY_ITEM = "https://ui-three-mu.vercel.app/r/default.json"
+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 INIT_OPTION_VALUES = new Set([
+  "-t",
+  "--template",
+  "-b",
+  "--base",
+  "-p",
+  "--preset",
+  "-c",
+  "--cwd",
+  "-n",
+  "--name",
+])
 
 const args = process.argv.slice(2)
 const [command, ...commandArgs] = args
@@ -14,20 +31,57 @@ if (!command || command === "-h" || command === "--help") {
 }
 
 if (command === "add") {
-  const registryStatus = runShadcn(["registry", "add", REGISTRY])
+  const registryStatus = runShadcn([
+    "registry",
+    "add",
+    REGISTRY,
+    ...getCommandOptions(commandArgs, CWD_OPTION_VALUES),
+  ])
 
   if (registryStatus !== 0) {
     process.exit(registryStatus)
   }
 
   process.exit(
-    runShadcn(["add", "--overwrite", "--yes", ...toPreskokItems(commandArgs)])
+    runShadcn([
+      "add",
+      "--yes",
+      ...toPreskokCommandItems(commandArgs, ADD_OPTION_VALUES),
+    ])
   )
 }
 
 if (command === "init") {
+  const { initArgs, items } = splitInitArgs(commandArgs)
+
+  const initStatus = runShadcn(["init", DEFAULT_REGISTRY_ITEM, ...initArgs])
+
+  if (initStatus !== 0) {
+    process.exit(initStatus)
+  }
+
+  const registryStatus = runShadcn([
+    "registry",
+    "add",
+    REGISTRY,
+    ...getCommandOptions(initArgs, CWD_OPTION_VALUES),
+  ])
+
+  if (registryStatus !== 0) {
+    process.exit(registryStatus)
+  }
+
+  if (items.length === 0) {
+    process.exit(0)
+  }
+
   process.exit(
-    runShadcn(["init", DEFAULT_REGISTRY_ITEM, ...toPreskokInitItems(commandArgs)])
+    runShadcn([
+      "add",
+      "--yes",
+      ...getCommandOptions(initArgs, CWD_OPTION_VALUES),
+      ...toPreskokItems(items),
+    ])
   )
 }
 
@@ -39,7 +93,10 @@ if (command === "registry") {
 
 if (command === "view") {
   process.exit(
-    runShadcn(["view", ...toPreskokCommandItems(commandArgs, CWD_OPTION_VALUES)])
+    runShadcn([
+      "view",
+      ...toPreskokCommandItems(commandArgs, CWD_OPTION_VALUES),
+    ])
   )
 }
 
@@ -63,7 +120,7 @@ function runShadcn(shadcnArgs) {
       "exec",
       "--yes",
       "--package",
-      "shadcn@latest",
+      `shadcn@${SHADCN_VERSION}`,
       "--",
       "shadcn",
       ...shadcnArgs,
@@ -106,46 +163,77 @@ function toPreskokCommandItems(values, optionsWithValues) {
   })
 }
 
-function toPreskokInitItems(values) {
-  const initOptionsWithValues = new Set([
-    "-t",
-    "--template",
-    "-b",
-    "--base",
-    "-p",
-    "--preset",
-    "-c",
-    "--cwd",
-    "-n",
-    "--name",
-  ])
+function getCommandOptions(values, optionsWithValues) {
+  let skipNext = false
+  const options = []
+
+  for (const value of values) {
+    if (skipNext) {
+      skipNext = false
+      options.push(value)
+      continue
+    }
+
+    if (optionsWithValues.has(value)) {
+      skipNext = true
+      options.push(value)
+      continue
+    }
+
+    if (hasInlineOptionValue(value, optionsWithValues)) {
+      options.push(value)
+    }
+  }
 
+  return options
+}
+
+function splitInitArgs(values) {
   let skipNext = false
+  const initArgs = []
+  const items = []
 
-  return values.map((value) => {
+  for (const value of values) {
     if (skipNext) {
       skipNext = false
-      return value
+      initArgs.push(value)
+      continue
     }
 
-    if (initOptionsWithValues.has(value)) {
+    if (INIT_OPTION_VALUES.has(value)) {
       skipNext = true
-      return value
+      initArgs.push(value)
+      continue
     }
 
-    return toPreskokItems([value])[0]
-  })
+    if (
+      hasInlineOptionValue(value, INIT_OPTION_VALUES) ||
+      value.startsWith("-")
+    ) {
+      initArgs.push(value)
+      continue
+    }
+
+    items.push(value)
+  }
+
+  return { initArgs, items }
+}
+
+function hasInlineOptionValue(value, options) {
+  return [...options].some((option) => value.startsWith(`${option}=`))
 }
 
 function printHelp() {
   console.log(`Usage: preskok-ui <command> [options]
 
 Commands:
-  init [items...]     run shadcn init with the Preskok base and optional items
+  init [items...]     run shadcn init, register Preskok, and optionally add items
   add <items...>      register Preskok and add items by name
   registry            register the @preskok namespace in components.json
 
 Examples:
+  npx preskok-ui@latest init
   npx preskok-ui@latest init button
   npx preskok-ui@latest add button
   npx preskok-ui@latest view button

package/package.json

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