@fresh-editor/fresh-editor 0.3.7 → 0.3.9

package/plugins/pkg.ts

@@ -232,6 +232,12 @@ interface ParsedPackageUrl {
   name: string;
   /** Whether this is a local file path (not a remote URL) */
   isLocal: boolean;
+  /**
+   * Whether the URL points directly to a single downloadable file (e.g. a
+   * theme JSON) rather than to a git repository. When true, the URL should
+   * be fetched over HTTP instead of cloned with git.
+   */
+  isDirectFile: boolean;
 }
 
 // =============================================================================
@@ -296,6 +302,24 @@ function isLocalPath(str: string): boolean {
   return false;
 }
 
+/**
+ * File extensions that indicate a URL points to a single downloadable file
+ * (e.g. a Fresh theme JSON) rather than to a git repository.
+ */
+const DIRECT_FILE_EXTENSIONS = /\.(jsonc?|JSONC?)$/;
+
+/**
+ * Check if a URL points directly to a single downloadable file rather than
+ * to a git repository. Examples:
+ * - `https://github.com/user-attachments/files/123/synthwave-84.json` → true
+ * - `https://github.com/user/repo` → false
+ */
+function isDirectFileUrl(url: string): boolean {
+  // Strip query string for extension check
+  const pathOnly = url.split("?")[0];
+  return DIRECT_FILE_EXTENSIONS.test(pathOnly);
+}
+
 /**
  * Parse a package URL that may contain a subpath fragment.
  *
@@ -305,6 +329,7 @@ function isLocalPath(str: string): boolean {
  * - `https://github.com/user/repo.git#packages/my-plugin` - with .git suffix
  * - `/path/to/local/repo#subdir` - local path with subpath
  * - `/path/to/local/package` - direct local package path
+ * - `https://example.com/path/to/theme.json` - direct file (downloaded over HTTP)
  *
  * The fragment (after #) specifies a subdirectory within the repo.
  */
@@ -329,19 +354,28 @@ function parsePackageUrl(url: string): ParsedPackageUrl {
   // Determine if this is a local path
   const isLocal = isLocalPath(repoUrl);
 
+  // A remote URL ending in a recognized file extension (and without a
+  // subpath fragment) is treated as a direct file download, not a git repo.
+  const isDirectFile = !isLocal && !subpath && isDirectFileUrl(repoUrl);
+
   // Extract package name
   let name: string;
   if (subpath) {
     // For monorepo/directory, use the last component of the subpath
     const parts = subpath.split("/");
     name = parts[parts.length - 1].replace(/^fresh-/, "");
+  } else if (isDirectFile) {
+    // For direct file downloads, use the filename without the extension
+    const pathOnly = repoUrl.split("?")[0];
+    const match = pathOnly.match(/\/([^\/]+?)\.(jsonc?|JSONC?)$/);
+    name = match ? match[1].replace(/^fresh-/, "") : "unknown";
   } else {
     // For regular repo/path, use the last component
     const match = repoUrl.match(/\/([^\/]+?)(\.git)?$/);
     name = match ? match[1].replace(/^fresh-/, "") : "unknown";
   }
 
-  return { repoUrl, subpath, name, isLocal };
+  return { repoUrl, subpath, name, isLocal, isDirectFile };
 }
 
 /**
@@ -784,11 +818,12 @@ function validatePackage(packageDir: string, packageName: string): ValidationRes
 }
 
 /**
- * Install a package from git URL or local path.
+ * Install a package from a git URL, direct file URL, or local path.
  *
  * Supports:
  * - `https://github.com/user/repo` - standard git repo
  * - `https://github.com/user/repo#packages/my-plugin` - monorepo with subpath
+ * - `https://example.com/path/to/theme.json` - direct file download (theme JSON)
  * - `/path/to/local/repo#subdir` - local path with subpath
  * - `/path/to/local/package` - direct local package path
  *
@@ -808,6 +843,9 @@ async function installPackage(
   if (parsed.isLocal) {
     // Local path installation: copy directly
     return await installFromLocalPath(parsed, packageName);
+  } else if (parsed.isDirectFile) {
+    // Direct file URL (e.g. theme JSON): download with curl, not git clone
+    return await installFromDirectFile(parsed.repoUrl, packageName);
   } else if (parsed.subpath) {
     // Remote monorepo installation: clone to temp, copy subdirectory
     return await installFromMonorepo(parsed, packageName, version);
@@ -817,6 +855,133 @@ async function installPackage(
   }
 }
 
+/**
+ * Install from a direct file URL (e.g. a single theme JSON hosted on a CDN
+ * or GitHub user-attachments). Downloads the file with curl, validates it
+ * looks like a Fresh package (currently themes only), and writes it into
+ * the appropriate packages directory with a synthetic package.json manifest.
+ *
+ * Supported file types:
+ * - `.json` / `.jsonc` containing a Fresh theme (object with a `name` field
+ *   and at least one theme section like `editor`, `ui`, `syntax`, etc.)
+ */
+async function installFromDirectFile(
+  url: string,
+  packageName: string
+): Promise<boolean> {
+  const tempFile = editor.pathJoin(
+    editor.getTempDir(),
+    `fresh-pkg-file-${hashString(url)}-${Date.now()}.json`
+  );
+
+  editor.setStatus(`Downloading ${url}...`);
+  const result = await editor.httpFetch(url, tempFile);
+
+  if (result.exit_code !== 0) {
+    // exit_code mirrors editor.httpFetch's contract: 0 on 2xx, the HTTP
+    // status code on non-2xx, -1 on transport errors.
+    const errorMsg = result.exit_code === 404
+      ? "File not found"
+      : result.exit_code > 0
+      ? `HTTP ${result.exit_code}`
+      : result.stderr.split("\n")[0] || "Download failed";
+    editor.setStatus(`Failed to download ${packageName}: ${errorMsg}`);
+    editor.removePath(tempFile);
+    return false;
+  }
+
+  const content = editor.readFile(tempFile);
+  if (!content) {
+    editor.setStatus(`Failed to read downloaded file`);
+    editor.removePath(tempFile);
+    return false;
+  }
+
+  let parsed: Record<string, unknown>;
+  try {
+    parsed = JSON.parse(content) as Record<string, unknown>;
+  } catch (e) {
+    editor.setStatus(`Downloaded file is not valid JSON: ${e}`);
+    editor.removePath(tempFile);
+    return false;
+  }
+
+  // Heuristic: a Fresh theme JSON has a `name` string and at least one of
+  // the recognized theme sections. This rules out arbitrary JSON files
+  // (configs, package manifests, etc.) being installed as themes.
+  const themeName = typeof parsed.name === "string" ? parsed.name : null;
+  const looksLikeTheme = themeName !== null && (
+    parsed.editor !== undefined ||
+    parsed.ui !== undefined ||
+    parsed.syntax !== undefined ||
+    parsed.search !== undefined ||
+    parsed.diagnostics !== undefined ||
+    parsed.base !== undefined
+  );
+
+  if (!looksLikeTheme) {
+    editor.setStatus(
+      `Unrecognized file format at ${url} - direct file install currently supports Fresh theme JSON only`
+    );
+    editor.removePath(tempFile);
+    return false;
+  }
+
+  // Use the theme's own name as the package name when available.
+  if (themeName) packageName = themeName;
+
+  // Sanitize for use as a directory name.
+  const safeName = packageName.replace(/[^a-zA-Z0-9_.-]/g, "-");
+  const targetDir = editor.pathJoin(THEMES_PACKAGES_DIR, safeName);
+
+  if (editor.fileExists(targetDir)) {
+    editor.setStatus(`Package '${safeName}' is already installed`);
+    editor.removePath(tempFile);
+    return false;
+  }
+
+  ensureDir(THEMES_PACKAGES_DIR);
+  if (!ensureDir(targetDir)) {
+    editor.setStatus(`Failed to create package directory ${targetDir}`);
+    editor.removePath(tempFile);
+    return false;
+  }
+
+  const themeFileName = "theme.json";
+  if (!editor.writeFile(editor.pathJoin(targetDir, themeFileName), content)) {
+    editor.setStatus(`Failed to write theme file`);
+    editor.removePath(tempFile);
+    editor.removePath(targetDir);
+    return false;
+  }
+
+  const manifest: PackageManifest = {
+    name: safeName,
+    version: "1.0.0",
+    description: `Theme installed from ${url}`,
+    type: "theme",
+    fresh: {
+      themes: [{ file: themeFileName, name: themeName ?? safeName }],
+    },
+  };
+  if (!await writeJsonFile(editor.pathJoin(targetDir, "package.json"), manifest)) {
+    editor.setStatus(`Failed to write package manifest`);
+    editor.removePath(tempFile);
+    editor.removePath(targetDir);
+    return false;
+  }
+
+  await writeJsonFile(editor.pathJoin(targetDir, ".fresh-source.json"), {
+    url,
+    installed_at: new Date().toISOString(),
+  });
+
+  editor.removePath(tempFile);
+  editor.reloadThemes();
+  editor.setStatus(`Installed theme ${themeName ?? safeName}`);
+  return true;
+}
+
 /**
  * Install from a standard git repository (no subpath)
  * Clones to temp first to detect type, then moves to correct location.
@@ -2748,7 +2913,7 @@ async function pkg_install_theme() : Promise<void> {
 registerHandler("pkg_install_theme", pkg_install_theme);
 
 /**
- * Install from git URL or local path
+ * Install from git URL, direct file URL, or local path
  */
 function pkg_install_url() : void {
   editor.startPrompt("Git URL or local path:", "pkg-install-url");

package/plugins/schemas/theme.schema.json

@@ -73,6 +73,9 @@
           38,
           30
         ],
+        "diff_add_collision_fg": null,
+        "diff_remove_collision_fg": null,
+        "diff_modify_collision_fg": null,
         "ruler_bg": [
           50,
           50,
@@ -202,17 +205,17 @@
           79,
           120
         ],
+        "text_input_selection_bg": [
+          58,
+          79,
+          120
+        ],
         "popup_selection_fg": [
           255,
           255,
           255
         ],
         "popup_text_fg": "White",
-        "text_input_selection_bg": [
-          58,
-          79,
-          120
-        ],
         "suggestion_bg": [
           30,
           30,
@@ -577,6 +580,42 @@
             30
           ]
         },
+        "diff_add_collision_fg": {
+          "description": "Fallback fg for cells whose existing fg matches `diff_add_bg`\n(e.g. ANSI Green-on-Green). Only applied on collision; other\ntokens keep their syntax colour.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/ColorDef"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
+        "diff_remove_collision_fg": {
+          "description": "Collision-only fallback fg for `diff_remove_bg`.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/ColorDef"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
+        "diff_modify_collision_fg": {
+          "description": "Collision-only fallback fg for `diff_modify_bg`.",
+          "anyOf": [
+            {
+              "$ref": "#/$defs/ColorDef"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
         "ruler_bg": {
           "description": "Vertical ruler background color",
           "$ref": "#/$defs/ColorDef",
@@ -953,6 +992,15 @@
             120
           ]
         },
+        "text_input_selection_bg": {
+          "description": "Selection background inside a widget Text input. Reads\nagainst `prompt_bg`, so it needs higher contrast against\nthat tint than `editor.selection_bg` (which targets the\neditor surface). Defaults to the same `popup_selection_bg`\nblue used everywhere \"selected item inside a chrome\nsurface\" is shown — same key the prompt selection uses, so\nthe cue reads consistently across selection UIs.",
+          "$ref": "#/$defs/ColorDef",
+          "default": [
+            58,
+            79,
+            120
+          ]
+        },
         "popup_selection_fg": {
           "description": "Popup selected item text color",
           "$ref": "#/$defs/ColorDef",
@@ -967,15 +1015,6 @@
           "$ref": "#/$defs/ColorDef",
           "default": "White"
         },
-        "text_input_selection_bg": {
-          "description": "Selection background inside a widget Text input. Reads against prompt_bg, so it needs higher contrast against that tint than editor.selection_bg.",
-          "$ref": "#/$defs/ColorDef",
-          "default": [
-            58,
-            79,
-            120
-          ]
-        },
         "suggestion_bg": {
           "description": "Autocomplete suggestion background",
           "$ref": "#/$defs/ColorDef",