@catalystsoftware/ui 1.0.18 → 1.0.19

package/dist/index.js

@@ -200879,11 +200879,11 @@ function extractImportsFromFile(fileContent, filename) {
   visit(sourceFile);
   return imports;
 }
-async function installAllLibraries(includeAll) {
+async function installAllLibraries(includeAll, targetPath) {
   const libsPath = path2.join(SOURCE_DATA_FOLDER, "requiredLibs.ts");
   const { requiredLibs, requiredLibsAll } = await import(libsPath);
   const libs = includeAll ? requiredLibsAll : requiredLibs;
-  await installDependencies(libs.split(" "));
+  await installDependencies(libs.split(" "), targetPath);
 }
 async function ensureUtilsFile(targetPath, config) {
   const componentsBase = config?.components || "app/";
@@ -200945,12 +200945,12 @@ async function fullInstall(includePremium, useNgin, targetPath, config) {
   }
   await ensureUtilsFile(targetPath, config);
 }
-async function installComponentsAndLibs(includePremium) {
-  await installAllComponents(includePremium);
-  await installAllLibraries(includePremium);
-  await ensureUtilsFile();
+async function installComponentsAndLibs(includePremium, targetPath, config) {
+  await installAllComponents(includePremium, targetPath, config);
+  await installAllLibraries(includePremium, targetPath);
+  await ensureUtilsFile(targetPath, config);
 }
-async function selectComponentsInteractive(includePremium) {
+async function selectComponentsInteractive(includePremium, targetPath, config) {
   const allComponents = await getComponentsData(includePremium);
   const categories = [...new Set(allComponents.map((c) => c.category))];
   const { selectedCategory } = await lib_default.prompt([
@@ -200984,25 +200984,67 @@ async function selectComponentsInteractive(includePremium) {
   for (const componentValue of selectedComponents) {
     const component = componentsToShow.find((c) => c.value === componentValue);
     if (component) {
-      await createComponentFile(component);
+      await createComponentFile(component, targetPath, config);
     }
   }
-  await ensureUtilsFile();
-  await createIndexFiles();
+  await ensureUtilsFile(targetPath, config);
+  await createIndexFiles(targetPath, config);
   spinner.succeed(source_default.green(`Installed ${selectedComponents.length} components`));
 }
 async function configureProjectPaths(targetPath, config) {
   const spinner = ora2("Configuring project paths...").start();
-  const base = config?.components || "app/";
+  let base = config?.components;
+  if (!base) {
+    const possibleRoots = ["app", "src", "lib"];
+    for (const root of possibleRoots) {
+      try {
+        await fs.access(path2.join(targetPath, root));
+        base = root;
+        break;
+      } catch {
+        continue;
+      }
+    }
+    if (!base)
+      base = "app";
+  }
+  base = base.trim().replace(/\/+$/, "") + "/";
   const pathsToAdd = {
+    "#icons": "@catalystsoftware/icons",
+    "#catalyst": `./${base}components/catalyst-ui/index.ts`,
     "#catalyst/*": `./${base}components/catalyst-ui/*`,
-    "#icons": "@catalystsoftware/icons"
+    "#utils": `./${base}components/catalyst-ui/utils/index.ts`,
+    "#utils/*": `./${base}components/catalyst-ui/utils/*`,
+    "#blocks": `./${base}components/catalyst-ui/blocks/index.ts`,
+    "#blocks/*": `./${base}components/catalyst-ui/blocks/*`,
+    "#hooks": `./${base}components/catalyst-ui/hooks/index.ts`,
+    "#hooks/*": `./${base}components/catalyst-ui/hooks/*`,
+    "#prisma": `./${base}components/catalyst-ui/utils/prisma.ts`,
+    "#auth": `./${base}components/catalyst-ui/utils/auth.ts`,
+    "#auth_session": `./${base}components/catalyst-ui/utils/auth_session.ts`,
+    "#access": `./${base}components/catalyst-ui/utils/user-based-access-rules.tsx`
   };
   try {
     const pkgPath = path2.join(targetPath, "package.json");
     const pkg = JSON.parse(await fs.readFile(pkgPath, "utf-8"));
     pkg.imports = { ...pkg.imports, ...pathsToAdd };
     await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2));
+    const tsPath = path2.join(targetPath, "tsconfig.json");
+    let exists = false;
+    try {
+      await fs.access(tsPath);
+      exists = true;
+    } catch {}
+    if (exists) {
+      const tsConfig = JSON.parse(await fs.readFile(tsPath, "utf-8"));
+      tsConfig.compilerOptions = tsConfig.compilerOptions || {};
+      tsConfig.compilerOptions.paths = tsConfig.compilerOptions.paths || {};
+      Object.entries(pathsToAdd).forEach(([key, value]) => {
+        const tsValue = value.startsWith("./") ? [value] : [`node_modules/${value}`];
+        tsConfig.compilerOptions.paths[key] = tsValue;
+      });
+      await fs.writeFile(tsPath, JSON.stringify(tsConfig, null, 2));
+    }
     spinner.succeed(source_default.green("Aliases added to package.json"));
   } catch (e) {
     spinner.fail(source_default.red("Alias configuration failed"));
@@ -201105,7 +201147,7 @@ async function main2() {
     customPath = path2.resolve(args[pathFlagIndex + 1]);
     args.splice(pathFlagIndex, 2);
   }
-  const config = await loadConfig();
+  const config = await loadConfig(customPath);
   const hasSecretAccess = await checkSecretAccess(args);
   const cleanArgs = args.filter((arg) => !arg.startsWith("-") && arg.length <= 50);
   const componentArg = cleanArgs.find((arg) => arg.length < 50 && !arg.includes("/"));
@@ -201250,7 +201292,7 @@ async function main2() {
 `));
     const spinner = ora2({ frames: ["\u28F7", "\u28EF", "\u28DF", "\u287F", "\u28BF", "\u28FB", "\u28FD", "\u28FE"], suffixText: "Installing component..." }).start();
     try {
-      await installSpecificComponent(componentArg, hasSecretAccess, config);
+      await installSpecificComponent(componentArg, hasSecretAccess, customPath, config);
       spinner.succeed(source_default.green(`Successfully installed ${componentArg}`));
     } catch (error) {
       spinner.fail(source_default.red(`Failed to install ${componentArg}`));
@@ -201264,7 +201306,7 @@ async function main2() {
 \u2605 Auto-installing based on catalyst.config.jsonc
 `));
     const useNgin = config["configure-tailwind.config"] === "ngin";
-    await fullInstall(hasSecretAccess, useNgin, config);
+    await fullInstall(hasSecretAccess, useNgin, customPath, config);
     console.log(source_default.green(`
 \u2714 Auto-installation complete!`));
     return;
@@ -201275,6 +201317,6 @@ async function main2() {
   } else {
     action = await showFreeMenu();
   }
-  await handleAction(action, hasSecretAccess);
+  await handleAction(action, hasSecretAccess, customPath, config);
 }
 main2().catch(console.error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catalystsoftware/ui",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "Catalyst UI Component Library CLI",
   "type": "module",
   "main": "dist/index.js",