preskok-ui 0.0.3 → 0.0.5

package/README.md

@@ -3,13 +3,13 @@
 Thin CLI wrapper around shadcn with Preskok registry wiring.
 
 ```bash
-npx preskok-ui@latest init
-npx preskok-ui@latest add button
+npx preskok-ui@latest init button
 ```
 
-The CLI delegates to `shadcn@latest`. `init` registers Preskok after shadcn setup, and `add` resolves bare component names through the Preskok registry.
+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.
 
 ```bash
 npx preskok-ui@latest registry
-npx preskok-ui@latest diff
+npx preskok-ui@latest view button
+npx preskok-ui@latest diff button
 ```

package/bin/preskok-ui.mjs

@@ -3,6 +3,7 @@ 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 CWD_OPTION_VALUES = new Set(["-c", "--cwd"])
 
 const args = process.argv.slice(2)
 const [command, ...commandArgs] = args
@@ -25,7 +26,9 @@ if (command === "add") {
 }
 
 if (command === "init") {
-  process.exit(runShadcn(["init", DEFAULT_REGISTRY_ITEM, ...commandArgs]))
+  process.exit(
+    runShadcn(["init", DEFAULT_REGISTRY_ITEM, ...toPreskokInitItems(commandArgs)])
+  )
 }
 
 if (command === "registry") {
@@ -34,6 +37,22 @@ if (command === "registry") {
   process.exit(runShadcn(["registry", "add", REGISTRY, ...registryArgs]))
 }
 
+if (command === "view") {
+  process.exit(
+    runShadcn(["view", ...toPreskokCommandItems(commandArgs, CWD_OPTION_VALUES)])
+  )
+}
+
+if (command === "diff") {
+  process.exit(
+    runShadcn([
+      "add",
+      ...toPreskokCommandItems(commandArgs, CWD_OPTION_VALUES),
+      "--diff",
+    ])
+  )
+}
+
 process.exit(runShadcn(args))
 
 function runShadcn(shadcnArgs) {
@@ -58,12 +77,63 @@ function runShadcn(shadcnArgs) {
 }
 
 function toPreskokItems(values) {
+  return values.map(toPreskokItem)
+}
+
+function toPreskokItem(value) {
+  if (value.startsWith("-") || value.startsWith("@") || value.includes("/")) {
+    return value
+  }
+
+  return `@preskok/${value.replace(/\.(tsx|ts|jsx|js|json)$/, "")}`
+}
+
+function toPreskokCommandItems(values, optionsWithValues) {
+  let skipNext = false
+
   return values.map((value) => {
-    if (value.startsWith("-") || value.startsWith("@") || value.includes("/")) {
+    if (skipNext) {
+      skipNext = false
+      return value
+    }
+
+    if (optionsWithValues.has(value)) {
+      skipNext = true
+      return value
+    }
+
+    return toPreskokItem(value)
+  })
+}
+
+function toPreskokInitItems(values) {
+  const initOptionsWithValues = new Set([
+    "-t",
+    "--template",
+    "-b",
+    "--base",
+    "-p",
+    "--preset",
+    "-c",
+    "--cwd",
+    "-n",
+    "--name",
+  ])
+
+  let skipNext = false
+
+  return values.map((value) => {
+    if (skipNext) {
+      skipNext = false
+      return value
+    }
+
+    if (initOptionsWithValues.has(value)) {
+      skipNext = true
       return value
     }
 
-    return `@preskok/${value}`
+    return toPreskokItems([value])[0]
   })
 }
 
@@ -71,13 +141,14 @@ function printHelp() {
   console.log(`Usage: preskok-ui <command> [options]
 
 Commands:
-  init                run shadcn init and register Preskok
+  init [items...]     run shadcn init with the Preskok base and optional 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 diff
+  npx preskok-ui@latest view button
+  npx preskok-ui@latest diff button
   npx preskok-ui@latest registry`)
 }

package/package.json

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