foldcn 0.0.18 → 0.0.20

package/dist/bin.js

@@ -17,7 +17,7 @@ var __export = (target, all) => {
 // src/bin.ts
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { Effect as Effect12 } from "effect";
+import { Console as Console4, Effect as Effect12 } from "effect";
 
 // src/cli.ts
 import { Effect as Effect11 } from "effect";
@@ -62,7 +62,7 @@ var CssVars = Schema.Struct({
 var Css = Schema.Record(Schema.String, Schema.Union([Schema.String, Schema.suspend(() => Css)])).annotate({ identifier: "Foldcn.Registry.Css" });
 var Item = Schema.Struct({
   $schema: Schema.optionalKey(Schema.String),
-  name: Schema.String,
+  name: Schema.NonEmptyString,
   type: ItemType,
   title: Schema.optionalKey(Schema.String),
   description: Schema.optionalKey(Schema.String),
@@ -600,6 +600,18 @@ class RegistryNotConfiguredError extends Schema4.TaggedErrorClass()("RegistryNot
 }) {
 }
 
+class RegistryTemplateError extends Schema4.TaggedErrorClass()("RegistryTemplateError", {
+  namespace: Schema4.String,
+  template: Schema4.String
+}) {
+}
+
+class PackageManagerNotFoundError extends Schema4.TaggedErrorClass()("PackageManagerNotFoundError", {
+  packageManager: Schema4.String,
+  cause: Schema4.String
+}) {
+}
+
 class UnsafeTargetError extends Schema4.TaggedErrorClass()("UnsafeTargetError", {
   target: Schema4.String
 }) {
@@ -621,6 +633,22 @@ class StylesheetNotFoundError extends Schema4.TaggedErrorClass()("StylesheetNotF
   path: Schema4.String
 }) {
 }
+
+class FileReadError extends Schema4.TaggedErrorClass()("FileReadError", {
+  path: Schema4.String,
+  message: Schema4.String
+}) {
+}
+
+class DuplicateItemError extends Schema4.TaggedErrorClass()("DuplicateItemError", {
+  name: Schema4.String
+}) {
+}
+
+class NotAProjectError extends Schema4.TaggedErrorClass()("NotAProjectError", {
+  cwd: Schema4.String
+}) {
+}
 // src/installer/installer.ts
 import { Effect as Effect4, FileSystem as FileSystem2, Path } from "effect";
 import { ChildProcess } from "effect/unstable/process";
@@ -686,7 +714,7 @@ var install = (plan) => Effect4.gen(function* () {
         stderr: "inherit"
       });
       return yield* handle.exitCode;
-    }));
+    })).pipe(Effect4.catchTag("PlatformError", (error2) => Effect4.fail(new PackageManagerNotFoundError({ packageManager: plan.packageManager, cause: String(error2) }))));
     if (exitCode !== 0) {
       return yield* new InstallFailedError({
         packageManager: plan.packageManager,
@@ -757,6 +785,9 @@ var makeGetItem = (options) => Effect6.gen(function* () {
       if (template2 === undefined) {
         return yield* new RegistryNotConfiguredError({ namespace });
       }
+      if (!template2.includes(namePlaceholder)) {
+        return yield* new RegistryTemplateError({ namespace, template: template2 });
+      }
       return { location: template2.replace(namePlaceholder, name), template: template2 };
     }
     const originTemplate = Option2.flatMap(maybeOrigin, (origin) => Option2.fromNullishOr(keyTemplates.get(origin)));
@@ -850,7 +881,11 @@ var planFiles = (context, files) => Effect8.gen(function* () {
     const relativeToKind = stripRegistrySourcePrefix(file.path);
     const baseDir = file.type === "registry:lib" ? context.libDir : context.uiDir;
     const absolutePath = path.resolve(baseDir, relativeToKind);
-    planned.push({ absolutePath, relativePath: path.relative(context.cwd, absolutePath), content });
+    const relativeFromCwd = path.relative(context.cwd, absolutePath);
+    if (relativeFromCwd.startsWith("..") || path.isAbsolute(relativeFromCwd)) {
+      return yield* new UnsafeTargetError({ target: relativeFromCwd });
+    }
+    planned.push({ absolutePath, relativePath: relativeFromCwd, content });
   }
   return planned;
 });
@@ -874,6 +909,22 @@ var runAdd = ({ components, cwd, dryRun, overwrite, registry: registry2 }) => Ef
   }
   const writableFiles = tree.files.filter((file) => file.type !== "registry:example");
   const allPlanned = yield* planFiles(context, writableFiles);
+  if (dryRun) {
+    yield* Console.log(`Would write ${allPlanned.length} ${allPlanned.length === 1 ? "file" : "files"}:`);
+    for (const file of allPlanned) {
+      const exists = yield* fileSystem.exists(file.absolutePath);
+      const existing = exists ? yield* fileSystem.readFileString(file.absolutePath) : undefined;
+      const note = exists && existing !== file.content ? " (exists — needs --overwrite)" : exists ? " (unchanged)" : "";
+      yield* Console.log(`  ${file.relativePath}${note}`);
+    }
+    if (tree.dependencies.length > 0) {
+      yield* Console.log(`Would install: ${tree.dependencies.join(" ")}`);
+    }
+    if (tree.devDependencies.length > 0) {
+      yield* Console.log(`Would install (dev): ${tree.devDependencies.join(" ")}`);
+    }
+    return;
+  }
   const planned = [];
   const conflicts = [];
   for (const file of allPlanned) {
@@ -895,19 +946,6 @@ var runAdd = ({ components, cwd, dryRun, overwrite, registry: registry2 }) => Ef
   if (conflicts.length > 0) {
     return yield* new FileConflictError({ paths: conflicts });
   }
-  if (dryRun) {
-    yield* Console.log(`Would write ${planned.length} files:`);
-    for (const file of planned) {
-      yield* Console.log(`  ${file.relativePath}`);
-    }
-    if (tree.dependencies.length > 0) {
-      yield* Console.log(`Would install: ${tree.dependencies.join(" ")}`);
-    }
-    if (tree.devDependencies.length > 0) {
-      yield* Console.log(`Would install (dev): ${tree.devDependencies.join(" ")}`);
-    }
-    return;
-  }
   for (const file of planned) {
     yield* fileSystem.makeDirectory(path.dirname(file.absolutePath), { recursive: true });
     yield* fileSystem.writeFileString(file.absolutePath, file.content);
@@ -950,11 +988,17 @@ var registryArgument = Argument2.string("registry").pipe(Argument2.withDescripti
 var outputFlag = Flag2.string("output").pipe(Flag2.withAlias("o"), Flag2.withDescription("Destination directory for built registry JSON"), Flag2.withDefault("./public/r"));
 var cwdFlag2 = Flag2.string("cwd").pipe(Flag2.withAlias("c"), Flag2.withDescription("Working directory"), Flag2.withDefault("."));
 var isLocalName = (spec) => !spec.includes("://") && !spec.startsWith("@") && !spec.startsWith(".") && !spec.startsWith("/");
-var validateLocalDependencies = (manifest) => Effect9.gen(function* () {
-  const names = new Set(manifest.items.map((item) => item.name));
+var validateManifest = (manifest) => Effect9.gen(function* () {
+  const seen = new Set;
+  for (const item of manifest.items) {
+    if (seen.has(item.name)) {
+      return yield* new DuplicateItemError({ name: item.name });
+    }
+    seen.add(item.name);
+  }
   for (const item of manifest.items) {
     for (const dependency of item.registryDependencies ?? []) {
-      if (isLocalName(dependency) && !names.has(dependency)) {
+      if (isLocalName(dependency) && !seen.has(dependency)) {
         return yield* new UnknownRegistryDependencyError({ itemName: item.name, dependency });
       }
     }
@@ -965,14 +1009,21 @@ var buildCommand = Command2.make("build", { registry: registryArgument, output:
   const path = yield* Path5.Path;
   const cwdAbsolute = path.resolve(cwd);
   const manifestPath = path.resolve(cwdAbsolute, registry2);
-  const manifestJson = yield* readJsonFile(manifestPath);
+  const manifestJson = yield* readJsonFile(manifestPath).pipe(Effect9.catchTag("PlatformError", (error2) => Effect9.fail(new FileReadError({ path: manifestPath, message: `registry manifest not readable: ${error2}` }))));
   const manifest = yield* Schema7.decodeUnknownEffect(exports_registry.Manifest)(manifestJson);
-  yield* validateLocalDependencies(manifest);
+  yield* validateManifest(manifest);
   const outputDir = path.resolve(cwdAbsolute, output);
   yield* fileSystem.makeDirectory(outputDir, { recursive: true });
+  const existingEntries = yield* fileSystem.readDirectory(outputDir).pipe(Effect9.orElseSucceed(() => []));
+  yield* Effect9.forEach(existingEntries.filter((entry) => entry.endsWith(".json")), (entry) => fileSystem.remove(path.join(outputDir, entry)).pipe(Effect9.orElseSucceed(() => {
+    return;
+  })));
   for (const item of manifest.items) {
     const files = yield* Effect9.forEach(item.files ?? [], (file) => Effect9.gen(function* () {
-      const content = yield* fileSystem.readFileString(path.resolve(cwdAbsolute, file.path));
+      const content = yield* fileSystem.readFileString(path.resolve(cwdAbsolute, file.path)).pipe(Effect9.catchTag("PlatformError", (error2) => Effect9.fail(new FileReadError({
+        path: file.path,
+        message: `source file referenced by item "${item.name}" not readable: ${error2}`
+      }))));
       return { ...file, content };
     }));
     const builtItem = {
@@ -1076,7 +1127,7 @@ var initCommand = Command3.make("init", {
   const cwdAbsolute = path.resolve(cwd);
   const hasPackageJson = yield* fileSystem.exists(path.join(cwdAbsolute, "package.json"));
   if (!hasPackageJson) {
-    return yield* new ConfigNotFoundError({ cwd: cwdAbsolute });
+    return yield* new NotAProjectError({ cwd: cwdAbsolute });
   }
   const packageJson = yield* readJsonFile(path.join(cwdAbsolute, "package.json")).pipe(Effect10.orElseSucceed(() => ({})));
   const dependencies = packageJson.dependencies ?? {};
@@ -1123,4 +1174,38 @@ var run = Effect11.fn("FoldcnCli.run")(function* (argv) {
 var main = Command4.run(command, { version });
 
 // src/bin.ts
-NodeRuntime.runMain(main.pipe(Effect12.provide(NodeServices.layer)));
+var fail = (message) => Console4.error(message).pipe(Effect12.andThen(Effect12.sync(() => globalThis.process.exitCode = 1)));
+var handled = main.pipe(Effect12.catchTags({
+  ConfigNotFoundError: (error2) => fail(`No components.json found in ${error2.cwd}.
+Run \`foldcn init\` to create one, then try again.`),
+  NotAProjectError: (error2) => fail(`No package.json found in ${error2.cwd}.
+Run \`foldcn init\` from your project root (a FoldKit app).`),
+  JsonParseError: (error2) => fail(`Could not parse ${error2.path}:
+  ${error2.message}`),
+  FileReadError: (error2) => fail(`Could not read ${error2.path}:
+  ${error2.message}`),
+  DuplicateItemError: (error2) => fail(`The registry manifest declares two items named "${error2.name}". Item names must be unique.`),
+  RegistryFetchError: (error2) => fail(`Could not fetch registry item "${error2.spec}".
+  ${error2.message}
+Check the component name and your registry configuration.`),
+  RegistryNotConfiguredError: (error2) => fail(`No registry configured for "${error2.namespace}".
+Add it to the "registries" map in components.json.`),
+  RegistryTemplateError: (error2) => fail(`The registry template for "${error2.namespace}" is missing the {name} placeholder:
+  ${error2.template}
+Add {name} so each component resolves to its own file.`),
+  UnsafeTargetError: (error2) => fail(`Refusing to write outside the project: ${error2.target}
+Check the "aliases" in components.json and the item's target.`),
+  FileConflictError: (error2) => fail(`These files already exist and differ from the registry:
+${error2.paths.map((path) => `  ${path}`).join(`
+`)}
+Pass --overwrite to replace them.`),
+  InstallFailedError: (error2) => fail(`\`${error2.packageManager} ${error2.invocation}\` failed (exit ${error2.exitCode}).
+The component files were written; install the dependencies manually.`),
+  PackageManagerNotFoundError: (error2) => fail(`Could not run the package manager "${error2.packageManager}".
+  ${error2.cause}
+Install it (or use a project with a lockfile for another manager), then re-run.`),
+  StylesheetNotFoundError: (error2) => fail(`Stylesheet not found: ${error2.path}
+Check the "css" path in components.json.`),
+  UnknownRegistryDependencyError: (error2) => fail(`"${error2.itemName}" depends on "${error2.dependency}", which is not in the registry.`)
+}));
+NodeRuntime.runMain(handled.pipe(Effect12.provide(NodeServices.layer)));

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "foldcn",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "shadcn-style CLI for FoldKit: add copy-in components from a registry",
   "type": "module",
   "license": "MIT",