@fresh-editor/fresh-editor 0.2.2 → 0.2.4

package/plugins/pkg.ts

@@ -118,6 +118,7 @@ interface PackageManifest {
   repository?: string;
   fresh?: {
     min_version?: string;
+    min_api_version?: number;
     entry?: string;
     themes?: Array<{
       file: string;
@@ -191,6 +192,8 @@ interface InstalledPackage {
   version: string;
   commit?: string;
   manifest?: PackageManifest;
+  /** Original local path if installed from a local directory */
+  localSource?: string;
 }
 
 interface LockfileEntry {
@@ -554,6 +557,7 @@ function getInstalledPackages(type: "plugin" | "theme" | "language" | "bundle"):
         // Try to get git remote
         const gitConfigPath = editor.pathJoin(pkgPath, ".git", "config");
         let source = "";
+        let localSource: string | undefined;
         if (editor.fileExists(gitConfigPath)) {
           const gitConfig = editor.readFile(gitConfigPath);
           if (gitConfig) {
@@ -564,13 +568,24 @@ function getInstalledPackages(type: "plugin" | "theme" | "language" | "bundle"):
           }
         }
 
+        // Check for .fresh-source.json (local path or monorepo installs)
+        if (!source) {
+          const freshSourcePath = editor.pathJoin(pkgPath, ".fresh-source.json");
+          const freshSource = readJsonFile<{ local_path?: string; original_url?: string }>(freshSourcePath);
+          if (freshSource?.local_path) {
+            localSource = freshSource.local_path;
+            source = freshSource.original_url || freshSource.local_path;
+          }
+        }
+
         packages.push({
           name: entry.name,
           path: pkgPath,
           type,
           source,
           version: manifest?.version || "unknown",
-          manifest
+          manifest,
+          localSource,
         });
       }
     }
@@ -641,6 +656,18 @@ function validatePackage(packageDir: string, packageName: string): ValidationRes
     };
   }
 
+  // Warn if package requires a newer plugin API version
+  if (manifest.fresh?.min_api_version) {
+    const currentApi = editor.apiVersion();
+    if (manifest.fresh.min_api_version > currentApi) {
+      editor.warn(
+        `[pkg] Package '${packageName}' requires plugin API version ${manifest.fresh.min_api_version}, ` +
+        `but this editor only supports version ${currentApi}. Some features may not work. ` +
+        `Update Fresh to get the latest plugin API.`
+      );
+    }
+  }
+
   // For plugins, validate entry file exists
   if (manifest.type === "plugin") {
     const entryFile = manifest.fresh?.entry || `${manifest.name}.ts`;
@@ -1348,6 +1375,85 @@ async function updatePackage(pkg: InstalledPackage): Promise<boolean> {
   }
 }
 
+/**
+ * Reinstall a package from its original local path.
+ * Removes the installed copy and re-copies from the source directory.
+ */
+async function reinstallPackage(pkg: InstalledPackage): Promise<boolean> {
+  if (!pkg.localSource) {
+    editor.setStatus(`Cannot reinstall ${pkg.name}: no local source path`);
+    return false;
+  }
+
+  const sourcePath = pkg.localSource;
+
+  if (!editor.fileExists(sourcePath)) {
+    editor.setStatus(`Source path no longer exists: ${sourcePath}`);
+    return false;
+  }
+
+  editor.setStatus(`Reinstalling ${pkg.name} from ${sourcePath}...`);
+
+  // Unload plugin first if applicable
+  if (pkg.type === "plugin") {
+    const loadedPlugins = await editor.listPlugins();
+    const plugin = loadedPlugins.find((p: { path: string }) => p.path.startsWith(pkg.path));
+    if (plugin) {
+      await editor.unloadPlugin(plugin.name).catch(() => {});
+    }
+  }
+
+  // Remove old copy
+  const rmResult = await editor.spawnProcess("rm", ["-rf", pkg.path]);
+  if (rmResult.exit_code !== 0) {
+    editor.setStatus(`Failed to remove old copy: ${rmResult.stderr}`);
+    return false;
+  }
+
+  // Re-copy from source
+  const copyResult = await editor.spawnProcess("cp", ["-r", sourcePath, pkg.path]);
+  if (copyResult.exit_code !== 0) {
+    editor.setStatus(`Failed to copy from source: ${copyResult.stderr}`);
+    return false;
+  }
+
+  // Re-write the .fresh-source.json marker
+  const sourceInfo = {
+    local_path: sourcePath,
+    original_url: pkg.source,
+    installed_at: new Date().toISOString()
+  };
+  await writeJsonFile(editor.pathJoin(pkg.path, ".fresh-source.json"), sourceInfo);
+
+  // Re-read manifest for validation and reload
+  const validation = validatePackage(pkg.path, pkg.name);
+  if (!validation.valid) {
+    editor.setStatus(`Reinstalled ${pkg.name} but package is invalid: ${validation.error}`);
+    return false;
+  }
+
+  const manifest = validation.manifest;
+
+  // Reload
+  if (manifest?.type === "plugin" && validation.entryPath) {
+    await editor.loadPlugin(validation.entryPath);
+    editor.setStatus(`Reinstalled and activated ${pkg.name}`);
+  } else if (manifest?.type === "theme") {
+    editor.reloadThemes();
+    editor.setStatus(`Reinstalled theme ${pkg.name}`);
+  } else if (manifest?.type === "language") {
+    await loadLanguagePack(pkg.path, manifest);
+    editor.setStatus(`Reinstalled language pack ${pkg.name}`);
+  } else if (manifest?.type === "bundle") {
+    await loadBundle(pkg.path, manifest);
+    editor.setStatus(`Reinstalled bundle ${pkg.name}`);
+  } else {
+    editor.setStatus(`Reinstalled ${pkg.name}`);
+  }
+
+  return true;
+}
+
 /**
  * Remove a package
  */
@@ -1401,14 +1507,24 @@ async function updateAllPackages(): Promise<void> {
 
   for (const pkg of all) {
     editor.setStatus(`Updating ${pkg.name} (${updated + failed + 1}/${all.length})...`);
-    const result = await gitCommand(["-C", `${pkg.path}`, "pull", "--ff-only"]);
 
-    if (result.exit_code === 0) {
-      if (!result.stdout.includes("Already up to date")) {
+    if (pkg.localSource) {
+      // Local packages: reinstall from source path
+      const ok = await reinstallPackage(pkg);
+      if (ok) {
         updated++;
+      } else {
+        failed++;
       }
     } else {
-      failed++;
+      const result = await gitCommand(["-C", `${pkg.path}`, "pull", "--ff-only"]);
+      if (result.exit_code === 0) {
+        if (!result.stdout.includes("Already up to date")) {
+          updated++;
+        }
+      } else {
+        failed++;
+      }
     }
   }
 
@@ -1851,6 +1967,9 @@ function getActionButtons(): string[] {
   const item = items[pkgState.selectedIndex];
 
   if (item.installed) {
+    if (item.installedPackage?.localSource) {
+      return ["Reinstall", "Uninstall"];
+    }
     return item.updateAvailable ? ["Update", "Uninstall"] : ["Uninstall"];
   } else {
     return ["Install"];
@@ -2539,7 +2658,11 @@ globalThis.pkg_activate = async function(): Promise<void> {
     const actions = getActionButtons();
     const actionName = actions[focus.index];
 
-    if (actionName === "Update" && item.installedPackage) {
+    if (actionName === "Reinstall" && item.installedPackage) {
+      await reinstallPackage(item.installedPackage);
+      pkgState.items = buildPackageList();
+      updatePkgManagerView();
+    } else if (actionName === "Update" && item.installedPackage) {
       await updatePackage(item.installedPackage);
       pkgState.items = buildPackageList();
       updatePkgManagerView();
@@ -2752,12 +2875,16 @@ globalThis.pkg_update = function(): void {
     id: "pkg-update",
     format: (pkg) => ({
       label: pkg.name,
-      description: `${pkg.type} | ${pkg.version}`,
+      description: `${pkg.type} | ${pkg.version}${pkg.localSource ? " (local)" : ""}`,
       metadata: pkg
     }),
     preview: false,
     onSelect: async (pkg) => {
-      await updatePackage(pkg);
+      if (pkg.localSource) {
+        await reinstallPackage(pkg);
+      } else {
+        await updatePackage(pkg);
+      }
     }
   });
 

package/plugins/schemas/package.schema.json

@@ -52,6 +52,11 @@
           "pattern": "^\\d+\\.\\d+\\.\\d+",
           "description": "Minimum required Fresh version"
         },
+        "min_api_version": {
+          "type": "integer",
+          "minimum": 1,
+          "description": "Minimum required plugin API version (integer, e.g. 2)"
+        },
         "entry": {
           "type": "string",
           "description": "Plugin entry point file (for plugins)"

package/plugins/schemas/theme.schema.json

@@ -136,6 +136,15 @@
             38,
             30
           ]
+        },
+        "ruler_bg": {
+          "description": "Vertical ruler background color",
+          "$ref": "#/$defs/ColorDef",
+          "default": [
+            50,
+            50,
+            50
+          ]
         }
       }
     },

package/plugins/theme_editor.i18n.json

@@ -124,6 +124,8 @@
     "field.line_number_fg_desc": "řádek číslo text barva",
     "field.line_number_bg": "řádek číslo pozadí",
     "field.line_number_bg_desc": "řádek číslo okraj pozadí",
+    "field.ruler_bg": "Pozadí pravítka",
+    "field.ruler_bg_desc": "Barva svislé čáry pravítka",
     "field.diff_add_bg": "Diff Added pozadí",
     "field.diff_add_bg_desc": "Diff added řádek pozadí",
     "field.diff_remove_bg": "Diff Removed pozadí",
@@ -395,6 +397,8 @@
     "field.line_number_fg_desc": "Textfarbe der Zeilennummern",
     "field.line_number_bg": "Zeilennummer Hintergrund",
     "field.line_number_bg_desc": "Hintergrund des Zeilennummern-Bereichs",
+    "field.ruler_bg": "Lineal Hintergrund",
+    "field.ruler_bg_desc": "Farbe der vertikalen Lineallinie",
     "field.tab_active_fg": "Aktiver Tab Vordergrund",
     "field.tab_active_fg_desc": "Textfarbe des aktiven Tabs",
     "field.tab_active_bg": "Aktiver Tab Hintergrund",
@@ -712,6 +716,8 @@
     "field.line_number_fg_desc": "Line number text color",
     "field.line_number_bg": "Line Number Background",
     "field.line_number_bg_desc": "Line number gutter background",
+    "field.ruler_bg": "Ruler Background",
+    "field.ruler_bg_desc": "Vertical ruler line color",
     "field.diff_add_bg": "Diff Added Background",
     "field.diff_add_bg_desc": "Diff added line background",
     "field.diff_remove_bg": "Diff Removed Background",
@@ -983,6 +989,8 @@
     "field.line_number_fg_desc": "Color de texto del numero de linea",
     "field.line_number_bg": "Fondo de numero de linea",
     "field.line_number_bg_desc": "Fondo del margen de numeros de linea",
+    "field.ruler_bg": "Fondo de regla",
+    "field.ruler_bg_desc": "Color de linea de regla vertical",
     "field.tab_active_fg": "Primer plano de pestana activa",
     "field.tab_active_fg_desc": "Color de texto de pestana activa",
     "field.tab_active_bg": "Fondo de pestana activa",
@@ -1277,6 +1285,8 @@
     "field.line_number_fg_desc": "Couleur du texte des numeros de ligne",
     "field.line_number_bg": "Arriere-plan des numeros de ligne",
     "field.line_number_bg_desc": "Arriere-plan de la gouttiere des numeros",
+    "field.ruler_bg": "Arriere-plan de la regle",
+    "field.ruler_bg_desc": "Couleur de la ligne de regle verticale",
     "field.tab_active_fg": "Premier plan onglet actif",
     "field.tab_active_fg_desc": "Couleur du texte de l'onglet actif",
     "field.tab_active_bg": "Arriere-plan onglet actif",
@@ -1571,6 +1581,8 @@
     "field.line_number_fg_desc": "行番号のテキスト色",
     "field.line_number_bg": "行番号背景",
     "field.line_number_bg_desc": "行番号ガターの背景",
+    "field.ruler_bg": "ルーラー背景",
+    "field.ruler_bg_desc": "垂直ルーラーの線の色",
     "field.tab_active_fg": "アクティブタブ前景",
     "field.tab_active_fg_desc": "アクティブタブのテキスト色",
     "field.tab_active_bg": "アクティブタブ背景",
@@ -1888,6 +1900,8 @@
     "field.line_number_fg_desc": "줄 숫자 텍스트 색상",
     "field.line_number_bg": "줄 숫자 배경",
     "field.line_number_bg_desc": "줄 숫자 여백 배경",
+    "field.ruler_bg": "눈금자 배경",
+    "field.ruler_bg_desc": "수직 눈금자 선 색상",
     "field.diff_add_bg": "Diff Added 배경",
     "field.diff_add_bg_desc": "Diff added 줄 배경",
     "field.diff_remove_bg": "Diff Removed 배경",
@@ -2182,6 +2196,8 @@
     "field.line_number_fg_desc": "linha número texto cor",
     "field.line_number_bg": "linha número fundo",
     "field.line_number_bg_desc": "linha número margem fundo",
+    "field.ruler_bg": "Fundo da regua",
+    "field.ruler_bg_desc": "Cor da linha da regua vertical",
     "field.diff_add_bg": "Diff Added fundo",
     "field.diff_add_bg_desc": "Diff added linha fundo",
     "field.diff_remove_bg": "Diff Removed fundo",
@@ -2476,6 +2492,8 @@
     "field.line_number_fg_desc": "строка число текст цвет",
     "field.line_number_bg": "строка число фон",
     "field.line_number_bg_desc": "строка число поле фон",
+    "field.ruler_bg": "Фон линейки",
+    "field.ruler_bg_desc": "Цвет вертикальной линии линейки",
     "field.diff_add_bg": "Diff Added фон",
     "field.diff_add_bg_desc": "Diff added строка фон",
     "field.diff_remove_bg": "Diff Removed фон",
@@ -2770,6 +2788,8 @@
     "field.line_number_fg_desc": "บรรทัด ตัวเลข ข้อความ สี",
     "field.line_number_bg": "บรรทัด ตัวเลข พื้นหลัง",
     "field.line_number_bg_desc": "บรรทัด ตัวเลข ขอบ พื้นหลัง",
+    "field.ruler_bg": "พื้นหลังไม้บรรทัด",
+    "field.ruler_bg_desc": "สีเส้นไม้บรรทัดแนวตั้ง",
     "field.diff_add_bg": "Diff Added พื้นหลัง",
     "field.diff_add_bg_desc": "Diff added บรรทัด พื้นหลัง",
     "field.diff_remove_bg": "Diff Removed พื้นหลัง",
@@ -3064,6 +3084,8 @@
     "field.line_number_fg_desc": "рядок число текст колір",
     "field.line_number_bg": "рядок число фон",
     "field.line_number_bg_desc": "рядок число поле фон",
+    "field.ruler_bg": "Фон лінійки",
+    "field.ruler_bg_desc": "Колір вертикальної лінії лінійки",
     "field.diff_add_bg": "Diff Added фон",
     "field.diff_add_bg_desc": "Diff added рядок фон",
     "field.diff_remove_bg": "Diff Removed фон",
@@ -3358,6 +3380,8 @@
     "field.line_number_fg_desc": "Màu văn bản số dòng",
     "field.line_number_bg": "Nền số dòng",
     "field.line_number_bg_desc": "Nền lề số dòng",
+    "field.ruler_bg": "Nền thước kẻ",
+    "field.ruler_bg_desc": "Màu đường thước kẻ dọc",
     "field.diff_add_bg": "Nền diff thêm",
     "field.diff_add_bg_desc": "Nền dòng diff được thêm",
     "field.diff_remove_bg": "Nền diff xóa",
@@ -3629,6 +3653,8 @@
     "field.line_number_fg_desc": "行号文本颜色",
     "field.line_number_bg": "行号背景",
     "field.line_number_bg_desc": "行号区域背景",
+    "field.ruler_bg": "标尺背景",
+    "field.ruler_bg_desc": "垂直标尺线颜色",
     "field.tab_active_fg": "活动标签页前景",
     "field.tab_active_fg_desc": "活动标签页文本颜色",
     "field.tab_active_bg": "活动标签页背景",
@@ -3923,6 +3949,8 @@
     "field.line_number_fg_desc": "Colore del testo del numero di riga",
     "field.line_number_bg": "Sfondo numero riga",
     "field.line_number_bg_desc": "Sfondo del margine dei numeri di riga",
+    "field.ruler_bg": "Sfondo del righello",
+    "field.ruler_bg_desc": "Colore della linea del righello verticale",
     "field.diff_add_bg": "Sfondo Diff Aggiunta",
     "field.diff_add_bg_desc": "Sfondo della riga aggiunta nel diff",
     "field.diff_remove_bg": "Sfondo Diff Rimozione",