formalconf 2.0.16 → 2.0.18

package/dist/formalconf.js

@@ -470,7 +470,7 @@ function StatusIndicator({
 // package.json
 var package_default = {
   name: "formalconf",
-  version: "2.0.16",
+  version: "2.0.18",
   description: "Dotfiles management TUI for macOS and Linux - config management, package sync, and theme switching",
   type: "module",
   main: "./dist/formalconf.js",
@@ -2189,6 +2189,9 @@ async function detectAvailablePackageManagers() {
       managers.push("flatpak");
     }
   }
+  if (await commandExists("cargo")) {
+    managers.push("cargo");
+  }
   return managers;
 }
 async function getPlatformInfo() {
@@ -3116,6 +3119,98 @@ class Flatpak {
   }
 }
 
+// src/lib/package-managers/cargo.ts
+init_runtime();
+init_runtime();
+async function runCargoCommand(args, callbacks) {
+  const cmd = ["cargo", ...args];
+  if (callbacks?.onLog) {
+    const exitCode = await execStreaming(cmd, callbacks.onLog);
+    return exitCode === 0;
+  }
+  const result = await exec(cmd);
+  return result.success;
+}
+
+class Cargo {
+  type = "cargo";
+  displayName = "Cargo";
+  async isAvailable() {
+    return commandExists("cargo");
+  }
+  async update(callbacks) {
+    return true;
+  }
+  async install(packages, callbacks) {
+    if (packages.length === 0)
+      return true;
+    for (const pkg of packages) {
+      const success = await runCargoCommand(["install", pkg], callbacks);
+      if (!success)
+        return false;
+    }
+    return true;
+  }
+  async uninstall(packages, callbacks) {
+    if (packages.length === 0)
+      return true;
+    for (const pkg of packages) {
+      const success = await runCargoCommand(["uninstall", pkg], callbacks);
+      if (!success)
+        return false;
+    }
+    return true;
+  }
+  async upgrade(packages, callbacks) {
+    if (packages && packages.length > 0) {
+      for (const pkg of packages) {
+        const success = await runCargoCommand(["install", "--force", pkg], callbacks);
+        if (!success)
+          return false;
+      }
+      return true;
+    }
+    const installed = await this.listInstalled();
+    for (const pkg of installed) {
+      await runCargoCommand(["install", "--force", pkg.name], callbacks);
+    }
+    return true;
+  }
+  async listInstalled() {
+    const result = await exec(["cargo", "install", "--list"]);
+    if (!result.success)
+      return [];
+    const packages = [];
+    const lines = result.stdout.split(`
+`);
+    for (const line of lines) {
+      const match = line.match(/^(\S+)\s+v([\d.]+(?:-[\w.]+)?)/);
+      if (match) {
+        packages.push({
+          name: match[1],
+          version: match[2]
+        });
+      }
+    }
+    return packages;
+  }
+  async listOutdated() {
+    return [];
+  }
+  async cleanup(callbacks) {
+    return true;
+  }
+  async isInstalled(packages) {
+    const result = new Map;
+    const installed = await this.listInstalled();
+    const installedSet = new Set(installed.map((p) => p.name));
+    for (const pkg of packages) {
+      result.set(pkg, installedSet.has(pkg));
+    }
+    return result;
+  }
+}
+
 // src/lib/package-managers/index.ts
 var managerInstances = new Map;
 function getPackageManager(type) {
@@ -3148,6 +3243,9 @@ function getPackageManager(type) {
     case "flatpak":
       manager = new Flatpak;
       break;
+    case "cargo":
+      manager = new Cargo;
+      break;
     default:
       throw new Error(`Unknown package manager type: ${type}`);
   }
@@ -3449,6 +3547,16 @@ async function getPackageSetsForPlatform(config, platform) {
         packages: masIds
       });
     }
+    const cargo = getPackageManager("cargo");
+    const globalCargo = config.global?.cargo || [];
+    const macosCargo = config.macos?.cargo || [];
+    const allMacosCargo = [...globalCargo, ...macosCargo];
+    if (allMacosCargo.length > 0 && await cargo.isAvailable()) {
+      sets.push({
+        manager: cargo,
+        packages: allMacosCargo
+      });
+    }
   } else {
     const distro = platform.distro;
     const globalPkgs = config.global?.packages || [];
@@ -3514,6 +3622,16 @@ async function getPackageSetsForPlatform(config, platform) {
         packages: flatpakApps
       });
     }
+    const cargo = getPackageManager("cargo");
+    const globalCargo = config.global?.cargo || [];
+    const linuxCargo = config.linux?.cargo || [];
+    const allLinuxCargo = [...globalCargo, ...linuxCargo];
+    if (allLinuxCargo.length > 0 && await cargo.isAvailable()) {
+      sets.push({
+        manager: cargo,
+        packages: allLinuxCargo
+      });
+    }
   }
   return sets;
 }
@@ -5921,6 +6039,25 @@ var COLOR_VARIABLES = [
 function isColorVariable(name) {
   return COLOR_VARIABLES.includes(name);
 }
+function getNestedValue(obj, path) {
+  return path.split(".").reduce((acc, key) => {
+    if (acc && typeof acc === "object" && key in acc) {
+      return acc[key];
+    }
+    return;
+  }, obj);
+}
+function processConditionals(template, context) {
+  template = template.replace(/\{\{#if\s+(\S+)\}\}([\s\S]*?)\{\{\/if\}\}/g, (_, variable, content) => {
+    const value = getNestedValue(context, variable);
+    return value ? content : "";
+  });
+  template = template.replace(/\{\{#unless\s+(\S+)\}\}([\s\S]*?)\{\{\/unless\}\}/g, (_, variable, content) => {
+    const value = getNestedValue(context, variable);
+    return !value ? content : "";
+  });
+  return template;
+}
 function getContextValue(context, variableName, modifier) {
   if (variableName.startsWith("theme.")) {
     const key = variableName.slice(6);
@@ -5932,6 +6069,13 @@ function getContextValue(context, variableName, modifier) {
     const value = context.gtk[key];
     return value !== undefined ? String(value) : undefined;
   }
+  if (variableName.startsWith("neovim.")) {
+    if (!context.neovim)
+      return;
+    const key = variableName.slice(7);
+    const value = context.neovim[key];
+    return value !== undefined ? String(value) : undefined;
+  }
   if (variableName === "mode") {
     return context.mode;
   }
@@ -5942,7 +6086,8 @@ function getContextValue(context, variableName, modifier) {
   return;
 }
 function renderTemplate(template, context) {
-  return template.replace(VARIABLE_REGEX, (match, variable) => {
+  let result = processConditionals(template, context);
+  result = result.replace(VARIABLE_REGEX, (match, variable) => {
     const { name, modifier } = parseVariableReference(variable);
     const value = getContextValue(context, name, modifier);
     if (value === undefined) {
@@ -5950,9 +6095,11 @@ function renderTemplate(template, context) {
     }
     return value;
   });
+  return result;
 }
 function renderDualModeTemplate(template, contexts) {
-  let result = template.replace(/\{\{dark\.([a-zA-Z0-9_.]+)\}\}/g, (match, variable) => {
+  let result = processConditionals(template, contexts);
+  result = result.replace(/\{\{dark\.([a-zA-Z0-9_.]+)\}\}/g, (match, variable) => {
     const { name, modifier } = parseVariableReference(variable);
     const value = getContextValue(contexts.dark, name, modifier);
     return value ?? match;
@@ -6066,10 +6213,11 @@ async function installAllTemplates() {
     await installTemplate(name);
   }
 }
-function getTemplateType(filename) {
-  const dualModeTemplates = ["ghostty.conf.template", "neovim.lua.template", "lynk.css.template"];
-  if (dualModeTemplates.includes(filename)) {
-    return "dual";
+async function getTemplateType(filename) {
+  const manifest = await loadBundledManifest();
+  const meta = manifest.templates[filename];
+  if (meta?.mode) {
+    return meta.mode;
   }
   if (filename.includes("-dark.") || filename.includes("-light.")) {
     return "partial";
@@ -6083,33 +6231,18 @@ function getPartialMode(filename) {
     return "light";
   return;
 }
-function getOutputFilename(templateName) {
-  let output = templateName.replace(/\.template$/, "");
-  if (templateName.startsWith("kitty-dark")) {
-    return "dark-theme.auto.conf";
-  }
-  if (templateName.startsWith("kitty-light")) {
-    return "light-theme.auto.conf";
-  }
-  if (templateName.startsWith("waybar-dark")) {
-    return "style-dark.css";
+async function getOutputFilename(templateName) {
+  const manifest = await loadBundledManifest();
+  const meta = manifest.templates[templateName];
+  if (meta?.output) {
+    return meta.output;
   }
-  if (templateName.startsWith("waybar-light")) {
-    return "style-light.css";
-  }
-  if (templateName === "ghostty-dark.theme.template") {
-    return "formalconf-dark";
-  }
-  if (templateName === "ghostty-light.theme.template") {
-    return "formalconf-light";
-  }
-  if (templateName.startsWith("btop-dark")) {
-    return "formalconf-dark.theme";
-  }
-  if (templateName.startsWith("btop-light")) {
-    return "formalconf-light.theme";
-  }
-  return output;
+  return templateName.replace(/\.template$/, "");
+}
+async function getTemplateTargets(templateName) {
+  const manifest = await loadBundledManifest();
+  const meta = manifest.templates[templateName];
+  return meta?.targets ?? [];
 }
 async function listInstalledTemplates() {
   if (!existsSync11(TEMPLATES_DIR)) {
@@ -6122,97 +6255,16 @@ async function listInstalledTemplates() {
       templates.push({
         name: entry.name,
         path: join9(TEMPLATES_DIR, entry.name),
-        outputName: getOutputFilename(entry.name),
-        type: getTemplateType(entry.name),
-        partialMode: getPartialMode(entry.name)
+        outputName: await getOutputFilename(entry.name),
+        type: await getTemplateType(entry.name),
+        partialMode: getPartialMode(entry.name),
+        targets: await getTemplateTargets(entry.name)
       });
     }
   }
   return templates;
 }
 
-// src/lib/neovim/generator.ts
-function toLua(value, indent = 2) {
-  const spaces = " ".repeat(indent);
-  if (value === null || value === undefined) {
-    return "nil";
-  }
-  if (typeof value === "boolean") {
-    return value ? "true" : "false";
-  }
-  if (typeof value === "number") {
-    return String(value);
-  }
-  if (typeof value === "string") {
-    const escaped = value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
-    return `"${escaped}"`;
-  }
-  if (Array.isArray(value)) {
-    if (value.length === 0) {
-      return "{}";
-    }
-    const items = value.map((v) => `${spaces}${toLua(v, indent + 2)}`);
-    return `{
-${items.join(`,
-`)}
-${" ".repeat(indent - 2)}}`;
-  }
-  if (typeof value === "object") {
-    const entries = Object.entries(value);
-    if (entries.length === 0) {
-      return "{}";
-    }
-    const items = entries.map(([k, v]) => {
-      const key = /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(k) ? k : `["${k}"]`;
-      return `${spaces}${key} = ${toLua(v, indent + 2)}`;
-    });
-    return `{
-${items.join(`,
-`)}
-${" ".repeat(indent - 2)}}`;
-  }
-  return "nil";
-}
-function generateOptsSection(opts) {
-  if (!opts || Object.keys(opts).length === 0) {
-    return "";
-  }
-  return `    opts = ${toLua(opts, 6)},`;
-}
-function generateNeovimConfig(theme, mode) {
-  if (!theme.neovim) {
-    return "";
-  }
-  const { repo, colorscheme, light_colorscheme, opts } = theme.neovim;
-  const effectiveColorscheme = mode === "light" && light_colorscheme ? light_colorscheme : colorscheme;
-  const optsSection = generateOptsSection(opts);
-  const hasDualMode = light_colorscheme && light_colorscheme !== colorscheme;
-  const lines = [
-    `-- ${theme.title} (${mode}) - Generated by FormalConf`,
-    `-- Neovim colorscheme configuration for LazyVim`,
-    ``,
-    `return {`,
-    `  {`,
-    `    "${repo}",`,
-    `    name = "${theme.title.toLowerCase().replace(/\s+/g, "-")}",`,
-    `    priority = 1000,`
-  ];
-  if (optsSection) {
-    lines.push(optsSection);
-  }
-  lines.push(`  },`, `  {`, `    "LazyVim/LazyVim",`, `    opts = {`, `      colorscheme = "${effectiveColorscheme}",`, `    },`, `  },`);
-  if (hasDualMode) {
-    lines.push(`  {`, `    "f-person/auto-dark-mode.nvim",`, `    opts = {`, `      update_background = false,`, `      set_dark_mode = function()`, `        vim.cmd("colorscheme ${colorscheme}")`, `      end,`, `      set_light_mode = function()`, `        vim.cmd("colorscheme ${light_colorscheme}")`, `      end,`, `    },`, `  },`);
-  }
-  lines.push(`}`);
-  return lines.join(`
-`) + `
-`;
-}
-function hasNeovimConfig(theme) {
-  return !!theme.neovim?.repo && !!theme.neovim?.colorscheme;
-}
-
 // src/lib/template-engine/engine.ts
 function buildThemeMetadata(theme, mode) {
   return {
@@ -6232,7 +6284,7 @@ function buildGtkMetadata(theme, mode) {
   };
 }
 function buildTemplateContext(theme, palette, mode) {
-  return {
+  const context = {
     color0: hexToColorVariable(palette.color0),
     color1: hexToColorVariable(palette.color1),
     color2: hexToColorVariable(palette.color2),
@@ -6260,6 +6312,15 @@ function buildTemplateContext(theme, palette, mode) {
     gtk: buildGtkMetadata(theme, mode),
     mode
   };
+  if (theme.neovim) {
+    context.neovim = {
+      repo: theme.neovim.repo,
+      colorscheme: theme.neovim.colorscheme,
+      light_colorscheme: theme.neovim.light_colorscheme,
+      opts: theme.neovim.opts
+    };
+  }
+  return context;
 }
 function buildDualModeContext(theme) {
   if (!theme.dark || !theme.light) {
@@ -6332,31 +6393,9 @@ async function writeRenderedTemplates(results) {
     await writeFile(result.outputPath, result.content);
   }
 }
-async function generateNeovimConfigFile(theme, mode) {
-  if (!hasNeovimConfig(theme)) {
-    return null;
-  }
-  const content = generateNeovimConfig(theme, mode);
-  const outputPath = join10(GENERATED_DIR, "neovim.lua");
-  await writeFile(outputPath, content);
-  return {
-    template: {
-      name: "neovim.lua",
-      path: "",
-      outputName: "neovim.lua",
-      type: "single"
-    },
-    content,
-    outputPath
-  };
-}
 async function generateThemeConfigs(theme, mode) {
   const results = await renderAllTemplates(theme, mode);
   await writeRenderedTemplates(results);
-  const neovimResult = await generateNeovimConfigFile(theme, mode);
-  if (neovimResult) {
-    results.push(neovimResult);
-  }
   return results;
 }
 
@@ -6827,12 +6866,13 @@ async function applyJsonTheme(themePath, mode, saveMapping, identifier) {
     rmSync(BACKGROUNDS_TARGET_DIR, { recursive: true, force: true });
   }
   const results = await generateThemeConfigs(theme, mode);
-  const ghosttyThemesDir = join13(HOME_DIR, ".config", "ghostty", "themes");
   for (const result of results) {
     const filename = basename4(result.outputPath);
-    if (filename === "formalconf-dark" || filename === "formalconf-light") {
-      await ensureDir2(ghosttyThemesDir);
-      const targetPath2 = join13(ghosttyThemesDir, filename);
+    const templateTargets = result.template.targets ?? [];
+    for (const target of templateTargets) {
+      const expandedTarget = target.replace(/^~/, HOME_DIR);
+      await ensureDir2(expandedTarget);
+      const targetPath2 = join13(expandedTarget, filename);
       copyFileSync2(result.outputPath, targetPath2);
     }
     const targetPath = join13(THEME_TARGET_DIR, filename);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "formalconf",
-  "version": "2.0.16",
+  "version": "2.0.18",
   "description": "Dotfiles management TUI for macOS and Linux - config management, package sync, and theme switching",
   "type": "module",
   "main": "./dist/formalconf.js",