fix: executor

Author: irsyadadl

bun.lock

@@ -12,7 +12,7 @@
         "figlet": "^1.8.1",
         "nanoid": "^5.1.5",
         "rc9": "^2.1.2",
-        "shadcn": "^2.6.0",
+        "shadcn": "^2.7.0",
       },
       "devDependencies": {
         "@biomejs/biome": "^1.9.4",
@@ -1080,7 +1080,7 @@
 
     "setprototypeof": ["setprototypeof@1.2.0", "", {}, "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="],
 
-    "shadcn": ["shadcn@2.6.0", "", { "dependencies": { "@antfu/ni": "^23.2.0", "@babel/core": "^7.22.1", "@babel/parser": "^7.22.6", "@babel/plugin-transform-typescript": "^7.22.5", "@modelcontextprotocol/sdk": "^1.10.2", "commander": "^10.0.0", "cosmiconfig": "^8.1.3", "deepmerge": "^4.3.1", "diff": "^5.1.0", "execa": "^7.0.0", "fast-glob": "^3.3.2", "fs-extra": "^11.1.0", "https-proxy-agent": "^6.2.0", "kleur": "^4.1.5", "msw": "^2.7.1", "node-fetch": "^3.3.0", "ora": "^6.1.2", "postcss": "^8.4.24", "prompts": "^2.4.2", "recast": "^0.23.2", "stringify-object": "^5.0.0", "ts-morph": "^18.0.0", "tsconfig-paths": "^4.2.0", "zod": "^3.20.2", "zod-to-json-schema": "^3.24.5" }, "bin": { "shadcn": "dist/index.js" } }, "sha512-Z/yN3TnVPvdnr623Ln4RIOs20++6HFEAEMQObDOsU3+qkoQ0Y/gAP+S8/paAnUAXj849hDNtu4SJEvhW9XqJUA=="],
+    "shadcn": ["shadcn@2.7.0", "", { "dependencies": { "@antfu/ni": "^23.2.0", "@babel/core": "^7.22.1", "@babel/parser": "^7.22.6", "@babel/plugin-transform-typescript": "^7.22.5", "@modelcontextprotocol/sdk": "^1.10.2", "commander": "^10.0.0", "cosmiconfig": "^8.1.3", "deepmerge": "^4.3.1", "diff": "^5.1.0", "execa": "^7.0.0", "fast-glob": "^3.3.2", "fs-extra": "^11.1.0", "https-proxy-agent": "^6.2.0", "kleur": "^4.1.5", "msw": "^2.7.1", "node-fetch": "^3.3.0", "ora": "^6.1.2", "postcss": "^8.4.24", "prompts": "^2.4.2", "recast": "^0.23.2", "stringify-object": "^5.0.0", "ts-morph": "^18.0.0", "tsconfig-paths": "^4.2.0", "zod": "^3.20.2", "zod-to-json-schema": "^3.24.5" }, "bin": { "shadcn": "dist/index.js" } }, "sha512-NzkUf58HI3AxcrdnmAgdN3oT0f2J5CyFKMi2exdVLtoRW+A5GxADxWqhWKRvBmdWoiPDuqYeb3ScZxhlS9aflA=="],
 
     "shebang-command": ["shebang-command@2.0.0", "", { "dependencies": { "shebang-regex": "^3.0.0" } }, "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="],
 

package.json

@@ -9,12 +9,7 @@
     "intentui": "dist/index.js",
     "shadcnClone": "dist/shadcn/index.js"
   },
-  "files": [
-    "dist",
-    "LICENSE",
-    "README.md",
-    "package.json"
-  ],
+  "files": ["dist", "LICENSE", "README.md", "package.json"],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/intentuilabs/cli.git"
@@ -34,12 +29,7 @@
     "release": "export GITHUB_TOKEN=$(cat .github_token) && release-it",
     "typecheck": "tsc --noEmit"
   },
-  "keywords": [
-    "cli",
-    "intentui cli",
-    "Intent UI",
-    "design-system"
-  ],
+  "keywords": ["cli", "intentui cli", "Intent UI", "design-system"],
   "author": "Irsyad A. Panjaitan",
   "license": "MIT",
   "devDependencies": {
@@ -64,7 +54,7 @@
     "figlet": "^1.8.1",
     "nanoid": "^5.1.5",
     "rc9": "^2.1.2",
-    "shadcn": "^2.6.0"
+    "shadcn": "^2.7.0"
   },
   "release-it": {
     "git": {

src/commands/add.command.ts

@@ -18,6 +18,7 @@ import {
   isNextWithoutSrc,
   isRemix,
 } from "~/lib/check-current-user-project"
+import { resolveShadcnClone } from "~/lib/resolve-shadnc-clone"
 import { walkFiles } from "~/lib/walk-files"
 import { Component } from "~/schema/component"
 
@@ -61,7 +62,7 @@ export const addCommand = Command.make(
         if (overwrite) args.push("--overwrite")
         args.push(...components)
         return yield* pipe(
-          RawCommand.make("shadcnClone", ...args).pipe(
+          RawCommand.make("node", resolveShadcnClone(), ...args).pipe(
             RawCommand.stdin("inherit"),
             RawCommand.stdout("inherit"),
             RawCommand.stderr("inherit"),
@@ -90,7 +91,7 @@ export const addCommand = Command.make(
       args.push(...componentPaths)
 
       const exitCode = yield* pipe(
-        RawCommand.make("shadcnClone", ...args).pipe(
+        RawCommand.make("node", resolveShadcnClone(), ...args).pipe(
           RawCommand.stdin("inherit"),
           RawCommand.stdout("inherit"),
           RawCommand.stderr("inherit"),
@@ -141,7 +142,6 @@ export const addCommand = Command.make(
             }
           }
         }
-
       }
 
       return exitCode

src/commands/block.command.ts

@@ -2,6 +2,7 @@ import { Args, Command, Options } from "@effect/cli"
 import { Command as RawCommand } from "@effect/platform"
 import { Console, Effect, pipe } from "effect"
 import { BLOCKS_REGISTRY_URL } from "~/consts"
+import { resolveShadcnClone } from "~/lib/resolve-shadnc-clone"
 import { getApiKey } from "./login.command"
 
 export const blockName = Args.text({ name: "blockName" })
@@ -42,7 +43,7 @@ export const addBlockCommand = Command.make(
       args.push(componentPath)
 
       return yield* pipe(
-        RawCommand.make("shadcnClone", ...args).pipe(
+        RawCommand.make("node", resolveShadcnClone(), ...args).pipe(
           RawCommand.stdin("inherit"),
           RawCommand.stdout("inherit"),
           RawCommand.stderr("inherit"),

src/commands/init.command.ts

@@ -6,11 +6,13 @@ import { Console, Effect } from "effect"
 import { REGISTRY_URL } from "~/consts"
 
 import { NodeCommandExecutor } from "@effect/platform-node"
-const shadcnInit = RawCommand.make("shadcnClone", "init", `${REGISTRY_URL}/r/style/default`).pipe(
-  RawCommand.stdin("inherit"),
-  RawCommand.stdout("inherit"),
-  RawCommand.stderr("inherit"),
-)
+import { resolveShadcnClone } from "~/lib/resolve-shadnc-clone"
+const shadcnInit = RawCommand.make(
+  "node",
+  resolveShadcnClone(),
+  "init",
+  `${REGISTRY_URL}/r/style/default`,
+).pipe(RawCommand.stdin("inherit"), RawCommand.stdout("inherit"), RawCommand.stderr("inherit"))
 
 export const initCommand = Command.make("init", {}, () =>
   Effect.gen(function* () {

src/commands/theme.command.ts

@@ -3,14 +3,15 @@ import { Effect } from "effect"
 import { REGISTRY_URL } from "~/consts"
 
 import { Command as RawCommand } from "@effect/platform"
+import { resolveShadcnClone } from "~/lib/resolve-shadnc-clone"
 
 export const theme = Args.text({ name: "theme" })
 
 export const themeCommand = Command.make("theme", { theme }, (config) =>
   Effect.gen(function* () {
     const themePath = `${REGISTRY_URL}/r/style/${config.theme}`
 
-    const exitCode = yield* RawCommand.make("shadcnClone", "add", themePath).pipe(
+    const exitCode = yield* RawCommand.make("node", resolveShadcnClone(), "add", themePath).pipe(
       RawCommand.stdin("inherit"),
       RawCommand.stdout("inherit"),
       RawCommand.stderr("inherit"),

src/lib/resolve-shadnc-clone.ts

@@ -0,0 +1,5 @@
+import * as Path from "node:path"
+
+export function resolveShadcnClone() {
+  return Path.resolve(__dirname, "../../dist/shadcn/index.js")
+}

src/lib/walk-files.ts

@@ -1,12 +1,9 @@
+import * as Path from "node:path"
 // biome-ignore lint/style/useImportType: <explanation>
 import * as FS from "@effect/platform/FileSystem"
-import * as Path from "node:path"
 import { Effect } from "effect"
 
-export function walkFiles(
-  fs: FS.FileSystem,
-  dir: string,
-): Effect.Effect<string[], unknown> {
+export function walkFiles(fs: FS.FileSystem, dir: string): Effect.Effect<string[], unknown> {
   return Effect.gen(function* () {
     const entries = yield* fs.readDirectory(dir)
     const out: string[] = []