@hasna/connectors 1.3.35 → 1.3.37

package/bin/index.js

@@ -1909,7 +1909,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/connectors",
-    version: "1.3.35",
+    version: "1.3.37",
     description: "Open source connector library - Install API connectors with a single command",
     type: "module",
     bin: {
@@ -1928,16 +1928,20 @@ var init_package = __esm(() => {
       ".": {
         import: "./dist/index.js",
         types: "./dist/index.d.ts"
+      },
+      "./social": {
+        import: "./dist/social/index.js",
+        types: "./dist/.types/src/social/index.d.ts"
       }
     },
     main: "./dist/index.js",
     types: "./dist/index.d.ts",
     scripts: {
-      build: "cd dashboard && bun run build && cd .. && bun build ./src/cli/index.tsx --outdir ./bin --target bun --external ink --external react --external chalk --external conf && bun build ./src/mcp/index.ts --outfile ./bin/mcp.js --target bun && bun build ./src/server/index.ts --outfile ./bin/serve.js --target bun && bun build ./src/index.ts --outdir ./dist --target bun && tsc --emitDeclarationOnly --outDir ./dist",
+      build: "cd dashboard && bun run build && cd .. && bun build ./src/cli/index.tsx --outdir ./bin --target bun --external ink --external react --external chalk --external conf && bun build ./src/mcp/index.ts --outfile ./bin/mcp.js --target bun && bun build ./src/server/index.ts --outfile ./bin/serve.js --target bun && bun build ./src/index.ts --outdir ./dist --target bun && bun build ./src/social/index.ts --outfile ./dist/social/index.js --target bun && tsc --emitDeclarationOnly --outDir ./dist && tsc -p tsconfig.social.json",
       "build:dashboard": "cd dashboard && bun run build",
       postinstall: 'mkdir -p $HOME/.hasna/connectors 2>/dev/null || true; [ "$SKIP_DASHBOARD" = "1" ] || [ ! -f dashboard/package.json ] || [ -d dashboard/node_modules ] || (cd dashboard && bun install)',
       dev: "bun run ./src/cli/index.tsx",
-      typecheck: "tsc --noEmit",
+      typecheck: "tsc --noEmit && tsc -p tsconfig.social.json --noEmit",
       test: "bun test",
       "sdk:build": "cd sdk && bun run build",
       prepublishOnly: "bun run build && bun test"
@@ -1965,7 +1969,7 @@ var init_package = __esm(() => {
     },
     dependencies: {
       "@hasna/cloud": "0.1.24",
-      "@hasna/events": "^0.1.3",
+      "@hasna/events": "^0.1.7",
       "@modelcontextprotocol/sdk": "^1.26.0",
       chalk: "^5.3.0",
       commander: "^12.1.0",
@@ -7806,8 +7810,8 @@ __export(exports_dist, {
   ensureConflictsTable: () => ensureConflictsTable,
   ensureAllPgDatabases: () => ensureAllPgDatabases,
   enableAutoSync: () => enableAutoSync,
-  discoverSyncableServicesV2: () => discoverSyncableServices2,
-  discoverSyncableServices: () => discoverSyncableServices,
+  discoverSyncableServicesV2: () => discoverSyncableServices,
+  discoverSyncableServices: () => discoverSyncableServices2,
   discoverServices: () => discoverServices,
   detectConflicts: () => detectConflicts,
   createDatabase: () => createDatabase,
@@ -7833,18 +7837,18 @@ import { join as join5, relative } from "path";
 import { existsSync as existsSync22, mkdirSync as mkdirSync22, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
 import { homedir as homedir22 } from "os";
 import { join as join22 } from "path";
-import { readdirSync as readdirSync32, existsSync as existsSync6 } from "fs";
-import { join as join6 } from "path";
-import { homedir as homedir5 } from "os";
-import { hostname } from "os";
-import { existsSync as existsSync32, readFileSync as readFileSync22 } from "fs";
-import { homedir as homedir32 } from "os";
+import { readdirSync as readdirSync22, existsSync as existsSync32 } from "fs";
 import { join as join32 } from "path";
-import { existsSync as existsSync42, readdirSync as readdirSync22 } from "fs";
+import { homedir as homedir32 } from "os";
+import { hostname } from "os";
+import { existsSync as existsSync42, readFileSync as readFileSync22 } from "fs";
+import { homedir as homedir42 } from "os";
 import { join as join42 } from "path";
-import { join as join52, dirname as dirname2 } from "path";
-import { existsSync as existsSync52, writeFileSync as writeFileSync22, unlinkSync, mkdirSync as mkdirSync32 } from "fs";
-import { homedir as homedir42, platform } from "os";
+import { existsSync as existsSync52, readdirSync as readdirSync32 } from "fs";
+import { join as join52 } from "path";
+import { join as join6, dirname as dirname2 } from "path";
+import { existsSync as existsSync6, writeFileSync as writeFileSync22, unlinkSync, mkdirSync as mkdirSync32 } from "fs";
+import { homedir as homedir5, platform } from "os";
 function __accessProp2(key) {
   return this[key];
 }
@@ -8816,11 +8820,11 @@ function isSyncExcludedTable(table) {
   return SYNC_EXCLUDED_TABLE_PATTERNS.some((p) => p.test(table));
 }
 function discoverServices() {
-  const dataDir = join6(homedir5(), ".hasna");
-  if (!existsSync6(dataDir))
+  const dataDir = join32(homedir32(), ".hasna");
+  if (!existsSync32(dataDir))
     return [];
   try {
-    const entries = readdirSync32(dataDir, { withFileTypes: true });
+    const entries = readdirSync22(dataDir, { withFileTypes: true });
     return entries.filter((e) => {
       if (!e.isDirectory())
         return false;
@@ -8832,30 +8836,30 @@ function discoverServices() {
     return [];
   }
 }
-function discoverSyncableServices2() {
+function discoverSyncableServices() {
   const local = discoverServices();
   const pgSet = new Set(KNOWN_PG_SERVICES);
   return local.filter((s) => pgSet.has(s));
 }
 function getServiceDbPath(service) {
-  const dataDir = join6(homedir5(), ".hasna", service);
-  if (!existsSync6(dataDir))
+  const dataDir = join32(homedir32(), ".hasna", service);
+  if (!existsSync32(dataDir))
     return null;
   const candidates = [
-    join6(dataDir, `${service}.db`),
-    join6(dataDir, "data.db"),
-    join6(dataDir, "database.db")
+    join32(dataDir, `${service}.db`),
+    join32(dataDir, "data.db"),
+    join32(dataDir, "database.db")
   ];
   try {
-    const files = readdirSync32(dataDir);
+    const files = readdirSync22(dataDir);
     for (const f of files) {
       if (f.endsWith(".db") && !f.endsWith("-wal") && !f.endsWith("-shm")) {
-        candidates.push(join6(dataDir, f));
+        candidates.push(join32(dataDir, f));
       }
     }
   } catch {}
   for (const p of candidates) {
-    if (existsSync6(p))
+    if (existsSync32(p))
       return p;
   }
   return null;
@@ -9774,7 +9778,7 @@ function resetAllSyncMeta(db) {
 }
 function getAutoSyncConfig() {
   try {
-    if (!existsSync32(AUTO_SYNC_CONFIG_PATH)) {
+    if (!existsSync42(AUTO_SYNC_CONFIG_PATH)) {
       return { ...DEFAULT_AUTO_SYNC_CONFIG };
     }
     const raw = JSON.parse(readFileSync22(AUTO_SYNC_CONFIG_PATH, "utf-8"));
@@ -9786,7 +9790,7 @@ function getAutoSyncConfig() {
     return { ...DEFAULT_AUTO_SYNC_CONFIG };
   }
 }
-function executeAutoSync(event, local, remote, tables) {
+async function executeAutoSync(event, serviceName, local, tables) {
   const direction = event === "start" ? "pull" : "push";
   const result = {
     event,
@@ -9796,18 +9800,31 @@ function executeAutoSync(event, local, remote, tables) {
     total_rows_synced: 0,
     errors: []
   };
+  let remote = null;
   try {
-    const stats = direction === "pull" ? incrementalSyncPull(remote, local, tables) : incrementalSyncPush(local, remote, tables);
-    for (const s of stats) {
-      if (s.errors.length === 0) {
+    const connStr = getConnectionString(serviceName);
+    remote = new PgAdapterAsync(connStr);
+    const syncTables = tables.length > 0 ? tables.filter((t) => !isSyncExcludedTable(t)) : direction === "push" ? listSqliteTables(local).filter((t) => !isSyncExcludedTable(t)) : (await listPgTables(remote)).filter((t) => !isSyncExcludedTable(t));
+    if (syncTables.length === 0) {
+      result.success = true;
+      return result;
+    }
+    const results = direction === "pull" ? await syncPull(remote, local, { tables: syncTables }) : await syncPush(local, remote, { tables: syncTables });
+    for (const r of results) {
+      if (r.errors.length === 0)
         result.tables_synced++;
-      }
-      result.total_rows_synced += s.synced_rows;
-      result.errors.push(...s.errors);
+      result.total_rows_synced += r.rowsWritten;
+      result.errors.push(...r.errors);
     }
     result.success = result.errors.length === 0;
   } catch (err) {
     result.errors.push(err?.message ?? String(err));
+  } finally {
+    if (remote) {
+      try {
+        await remote.close();
+      } catch {}
+    }
   }
   return result;
 }
@@ -9815,80 +9832,76 @@ function installSignalHandlers() {
   if (signalHandlersInstalled)
     return;
   signalHandlersInstalled = true;
-  const handleExit = () => {
+  const handleExit = async () => {
     for (const fn of cleanupHandlers) {
       try {
-        fn();
+        await fn();
       } catch {}
     }
   };
-  process.on("SIGTERM", () => {
-    handleExit();
+  process.on("SIGTERM", async () => {
+    await handleExit();
     process.exit(0);
   });
-  process.on("SIGINT", () => {
-    handleExit();
+  process.on("SIGINT", async () => {
+    await handleExit();
     process.exit(0);
   });
-  process.on("beforeExit", () => {
-    handleExit();
+  process.on("beforeExit", async () => {
+    await handleExit();
   });
 }
 function setupAutoSync(serviceName, server, local, remote, tables) {
   const config = getAutoSyncConfig();
   const cloudConfig = getCloudConfig();
   const isSyncEnabled = cloudConfig.mode === "hybrid" || cloudConfig.mode === "cloud";
-  const syncOnStart = () => {
+  const syncOnStart = async () => {
     if (!config.auto_sync_on_start || !isSyncEnabled)
       return null;
-    return executeAutoSync("start", local, remote, tables);
+    return executeAutoSync("start", serviceName, local, tables);
   };
-  const syncOnStop = () => {
+  const syncOnStop = async () => {
     if (!config.auto_sync_on_stop || !isSyncEnabled)
       return null;
-    return executeAutoSync("stop", local, remote, tables);
+    return executeAutoSync("stop", serviceName, local, tables);
   };
   if (server && typeof server.onconnect === "function") {
     const origOnConnect = server.onconnect;
-    server.onconnect = (...args) => {
-      syncOnStart();
+    server.onconnect = async (...args) => {
+      await syncOnStart();
       return origOnConnect.apply(server, args);
     };
   } else if (server && typeof server.on === "function") {
-    server.on("connect", () => {
-      syncOnStart();
-    });
+    server.on("connect", () => syncOnStart());
   }
   if (server && typeof server.ondisconnect === "function") {
     const origOnDisconnect = server.ondisconnect;
-    server.ondisconnect = (...args) => {
-      syncOnStop();
+    server.ondisconnect = async (...args) => {
+      await syncOnStop();
       return origOnDisconnect.apply(server, args);
     };
   } else if (server && typeof server.on === "function") {
-    server.on("disconnect", () => {
-      syncOnStop();
-    });
+    server.on("disconnect", () => syncOnStop());
   }
   installSignalHandlers();
-  cleanupHandlers.push(() => {
-    syncOnStop();
+  cleanupHandlers.push(async () => {
+    await syncOnStop();
   });
   return { syncOnStart, syncOnStop, config };
 }
 function enableAutoSync(serviceName, mcpServer, local, remote, tables) {
   setupAutoSync(serviceName, mcpServer, local, remote, tables);
 }
-function discoverSyncableServices() {
+function discoverSyncableServices2() {
   const hasnaDir = getHasnaDir();
   const services = [];
   try {
-    const entries = readdirSync22(hasnaDir, { withFileTypes: true });
+    const entries = readdirSync32(hasnaDir, { withFileTypes: true });
     for (const entry of entries) {
       if (!entry.isDirectory())
         continue;
-      const dbPath = join42(hasnaDir, entry.name, `${entry.name}.db`);
-      if (existsSync42(dbPath)) {
+      const dbPath = join52(hasnaDir, entry.name, `${entry.name}.db`);
+      if (existsSync52(dbPath)) {
         services.push(entry.name);
       }
     }
@@ -9899,7 +9912,7 @@ async function runScheduledSync() {
   const config = getCloudConfig();
   if (config.mode === "local")
     return [];
-  const services = discoverSyncableServices();
+  const services = discoverSyncableServices2();
   const results = [];
   let remote = null;
   for (const service of services) {
@@ -9910,8 +9923,8 @@ async function runScheduledSync() {
       errors: []
     };
     try {
-      const dbPath = join42(getDataDir(service), `${service}.db`);
-      if (!existsSync42(dbPath)) {
+      const dbPath = join52(getDataDir(service), `${service}.db`);
+      if (!existsSync52(dbPath)) {
         continue;
       }
       const local = new SqliteAdapter(dbPath);
@@ -9992,34 +10005,34 @@ function minutesToCron(minutes) {
 }
 function getWorkerPath() {
   const dir = typeof import.meta.dir === "string" ? import.meta.dir : dirname2(import.meta.url.replace("file://", ""));
-  const tsPath = join52(dir, "scheduled-sync.ts");
-  const jsPath = join52(dir, "scheduled-sync.js");
+  const tsPath = join6(dir, "scheduled-sync.ts");
+  const jsPath = join6(dir, "scheduled-sync.js");
   try {
-    if (existsSync52(tsPath))
+    if (existsSync6(tsPath))
       return tsPath;
   } catch {}
   return jsPath;
 }
 function getBunPath() {
   const candidates = [
-    join52(homedir42(), ".bun", "bin", "bun"),
+    join6(homedir5(), ".bun", "bin", "bun"),
     "/usr/local/bin/bun",
     "/usr/bin/bun"
   ];
   for (const p of candidates) {
-    if (existsSync52(p))
+    if (existsSync6(p))
       return p;
   }
   return "bun";
 }
 function getLaunchdPlistPath() {
-  return join52(homedir42(), "Library", "LaunchAgents", `com.hasna.cloud-sync.plist`);
+  return join6(homedir5(), "Library", "LaunchAgents", `com.hasna.cloud-sync.plist`);
 }
 function createLaunchdPlist(intervalMinutes) {
   const workerPath = getWorkerPath();
   const bunPath = getBunPath();
-  const logPath = join52(CONFIG_DIR2, "sync.log");
-  const errorLogPath = join52(CONFIG_DIR2, "sync-error.log");
+  const logPath = join6(CONFIG_DIR2, "sync.log");
+  const errorLogPath = join6(CONFIG_DIR2, "sync-error.log");
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -10045,7 +10058,7 @@ function createLaunchdPlist(intervalMinutes) {
     <key>PATH</key>
     <string>${process.env.PATH || "/usr/local/bin:/usr/bin:/bin"}</string>
     <key>HOME</key>
-    <string>${homedir42()}</string>
+    <string>${homedir5()}</string>
   </dict>
 </dict>
 </plist>`;
@@ -10070,7 +10083,7 @@ async function removeLaunchd() {
   } catch {}
 }
 function getSystemdDir() {
-  return join52(homedir42(), ".config", "systemd", "user");
+  return join6(homedir5(), ".config", "systemd", "user");
 }
 function createSystemdService() {
   const workerPath = getWorkerPath();
@@ -10082,7 +10095,7 @@ After=network.target
 [Service]
 Type=oneshot
 ExecStart=${bunPath} run ${workerPath}
-Environment=HOME=${homedir42()}
+Environment=HOME=${homedir5()}
 Environment=PATH=${process.env.PATH || "/usr/local/bin:/usr/bin:/bin"}
 
 [Install]
@@ -10105,8 +10118,8 @@ WantedBy=timers.target
 async function registerSystemd(intervalMinutes) {
   const dir = getSystemdDir();
   mkdirSync32(dir, { recursive: true });
-  writeFileSync22(join52(dir, `${SERVICE_NAME}.service`), createSystemdService());
-  writeFileSync22(join52(dir, `${SERVICE_NAME}.timer`), createSystemdTimer(intervalMinutes));
+  writeFileSync22(join6(dir, `${SERVICE_NAME}.service`), createSystemdService());
+  writeFileSync22(join6(dir, `${SERVICE_NAME}.timer`), createSystemdTimer(intervalMinutes));
   await Bun.spawn(["systemctl", "--user", "daemon-reload"]).exited;
   await Bun.spawn(["systemctl", "--user", "enable", "--now", `${SERVICE_NAME}.timer`]).exited;
 }
@@ -10116,10 +10129,10 @@ async function removeSystemd() {
   } catch {}
   const dir = getSystemdDir();
   try {
-    unlinkSync(join52(dir, `${SERVICE_NAME}.service`));
+    unlinkSync(join6(dir, `${SERVICE_NAME}.service`));
   } catch {}
   try {
-    unlinkSync(join52(dir, `${SERVICE_NAME}.timer`));
+    unlinkSync(join6(dir, `${SERVICE_NAME}.timer`));
   } catch {}
   try {
     await Bun.spawn(["systemctl", "--user", "daemon-reload"]).exited;
@@ -10156,9 +10169,9 @@ function getSyncScheduleStatus() {
   let mechanism = "none";
   if (registered) {
     if (platform() === "darwin") {
-      mechanism = existsSync52(getLaunchdPlistPath()) ? "launchd" : "none";
+      mechanism = existsSync6(getLaunchdPlistPath()) ? "launchd" : "none";
     } else {
-      mechanism = existsSync52(join52(getSystemdDir(), `${SERVICE_NAME}.timer`)) ? "systemd" : "none";
+      mechanism = existsSync6(join6(getSystemdDir(), `${SERVICE_NAME}.timer`)) ? "systemd" : "none";
     }
   }
   return {
@@ -18741,7 +18754,7 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
   __export2(exports_discover, {
     isSyncExcludedTable: () => isSyncExcludedTable,
     getServiceDbPath: () => getServiceDbPath,
-    discoverSyncableServices: () => discoverSyncableServices2,
+    discoverSyncableServices: () => discoverSyncableServices,
     discoverServices: () => discoverServices,
     SYNC_EXCLUDED_TABLE_PATTERNS: () => SYNC_EXCLUDED_TABLE_PATTERNS,
     KNOWN_PG_SERVICES: () => KNOWN_PG_SERVICES
@@ -18796,8 +18809,10 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
   init_config();
   init_config();
   init_dotfile();
+  init_adapter();
   init_config();
-  AUTO_SYNC_CONFIG_PATH = join32(homedir32(), ".hasna", "cloud", "config.json");
+  init_discover();
+  AUTO_SYNC_CONFIG_PATH = join42(homedir42(), ".hasna", "cloud", "config.json");
   DEFAULT_AUTO_SYNC_CONFIG = {
     auto_sync_on_start: true,
     auto_sync_on_stop: true
@@ -18807,7 +18822,7 @@ See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode de
   init_adapter();
   init_dotfile();
   init_config();
-  CONFIG_DIR2 = join52(homedir42(), ".hasna", "cloud");
+  CONFIG_DIR2 = join6(homedir5(), ".hasna", "cloud");
   init_adapter();
   init_config();
   init_discover();
@@ -27180,6 +27195,13 @@ var init_social_media = __esm(() => {
       category: "Social Media",
       tags: ["social", "fediverse", "decentralized"]
     },
+    {
+      name: "bluesky",
+      displayName: "Bluesky",
+      description: "AT Protocol social network - posts, threads, mentions",
+      category: "Social Media",
+      tags: ["social", "atproto", "decentralized"]
+    },
     {
       name: "brandblast",
       displayName: "BrandBlast",
@@ -35628,7 +35650,7 @@ var init_types3 = __esm(() => {
   ProgressTokenSchema = union([string2(), number2().int()]);
   CursorSchema = string2();
   TaskCreationParamsSchema = looseObject({
-    ttl: number2().optional(),
+    ttl: union([number2(), _null3()]).optional(),
     pollInterval: number2().optional()
   });
   TaskMetadataSchema = object({
@@ -35776,8 +35798,7 @@ var init_types3 = __esm(() => {
     roots: object({
       listChanged: boolean2().optional()
     }).optional(),
-    tasks: ClientTasksCapabilitySchema.optional(),
-    extensions: record(string2(), AssertObjectSchema).optional()
+    tasks: ClientTasksCapabilitySchema.optional()
   });
   InitializeRequestParamsSchema = BaseRequestParamsSchema.extend({
     protocolVersion: string2(),
@@ -35802,8 +35823,7 @@ var init_types3 = __esm(() => {
     tools: object({
       listChanged: boolean2().optional()
     }).optional(),
-    tasks: ServerTasksCapabilitySchema.optional(),
-    extensions: record(string2(), AssertObjectSchema).optional()
+    tasks: ServerTasksCapabilitySchema.optional()
   });
   InitializeResultSchema = ResultSchema.extend({
     protocolVersion: string2(),
@@ -35918,7 +35938,6 @@ var init_types3 = __esm(() => {
     uri: string2(),
     description: optional(string2()),
     mimeType: optional(string2()),
-    size: optional(number2()),
     annotations: AnnotationsSchema.optional(),
     _meta: optional(looseObject({}))
   });
@@ -42522,9 +42541,6 @@ var require_data = __commonJS((exports, module) => {
 var require_utils3 = __commonJS((exports, module) => {
   var isUUID = RegExp.prototype.test.bind(/^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iu);
   var isIPv4 = RegExp.prototype.test.bind(/^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u);
-  var isHexPair = RegExp.prototype.test.bind(/^[\da-f]{2}$/iu);
-  var isUnreserved = RegExp.prototype.test.bind(/^[\da-z\-._~]$/iu);
-  var isPathCharacter = RegExp.prototype.test.bind(/^[\da-z\-._~!$&'()*+,;=:@/]$/iu);
   function stringArrayToHexStripped(input) {
     let acc = "";
     let code = 0;
@@ -42718,77 +42734,27 @@ var require_utils3 = __commonJS((exports, module) => {
     }
     return output.join("");
   }
-  var HOST_DELIMS = { "@": "%40", "/": "%2F", "?": "%3F", "#": "%23", ":": "%3A" };
-  var HOST_DELIM_RE = /[@/?#:]/g;
-  var HOST_DELIM_NO_COLON_RE = /[@/?#]/g;
-  function reescapeHostDelimiters(host, isIP) {
-    const re = isIP ? HOST_DELIM_NO_COLON_RE : HOST_DELIM_RE;
-    re.lastIndex = 0;
-    return host.replace(re, (ch) => HOST_DELIMS[ch]);
-  }
-  function normalizePercentEncoding(input, decodeUnreserved = false) {
-    if (input.indexOf("%") === -1) {
-      return input;
+  function normalizeComponentEncoding(component, esc2) {
+    const func = esc2 !== true ? escape : unescape;
+    if (component.scheme !== undefined) {
+      component.scheme = func(component.scheme);
     }
-    let output = "";
-    for (let i = 0;i < input.length; i++) {
-      if (input[i] === "%" && i + 2 < input.length) {
-        const hex = input.slice(i + 1, i + 3);
-        if (isHexPair(hex)) {
-          const normalizedHex = hex.toUpperCase();
-          const decoded = String.fromCharCode(parseInt(normalizedHex, 16));
-          if (decodeUnreserved && isUnreserved(decoded)) {
-            output += decoded;
-          } else {
-            output += "%" + normalizedHex;
-          }
-          i += 2;
-          continue;
-        }
-      }
-      output += input[i];
+    if (component.userinfo !== undefined) {
+      component.userinfo = func(component.userinfo);
     }
-    return output;
-  }
-  function normalizePathEncoding(input) {
-    let output = "";
-    for (let i = 0;i < input.length; i++) {
-      if (input[i] === "%" && i + 2 < input.length) {
-        const hex = input.slice(i + 1, i + 3);
-        if (isHexPair(hex)) {
-          const normalizedHex = hex.toUpperCase();
-          const decoded = String.fromCharCode(parseInt(normalizedHex, 16));
-          if (decoded !== "." && isUnreserved(decoded)) {
-            output += decoded;
-          } else {
-            output += "%" + normalizedHex;
-          }
-          i += 2;
-          continue;
-        }
-      }
-      if (isPathCharacter(input[i])) {
-        output += input[i];
-      } else {
-        output += escape(input[i]);
-      }
+    if (component.host !== undefined) {
+      component.host = func(component.host);
     }
-    return output;
-  }
-  function escapePreservingEscapes(input) {
-    let output = "";
-    for (let i = 0;i < input.length; i++) {
-      if (input[i] === "%" && i + 2 < input.length) {
-        const hex = input.slice(i + 1, i + 3);
-        if (isHexPair(hex)) {
-          output += "%" + hex.toUpperCase();
-          i += 2;
-          continue;
-        }
-      }
-      output += escape(input[i]);
+    if (component.path !== undefined) {
+      component.path = func(component.path);
     }
-    return output;
+    if (component.query !== undefined) {
+      component.query = func(component.query);
+    }
+    if (component.fragment !== undefined) {
+      component.fragment = func(component.fragment);
+    }
+    return component;
   }
   function recomposeAuthority(component) {
     const uriTokens = [];
@@ -42803,7 +42769,7 @@ var require_utils3 = __commonJS((exports, module) => {
         if (ipV6res.isIPV6 === true) {
           host = `[${ipV6res.escapedHost}]`;
         } else {
-          host = reescapeHostDelimiters(host, false);
+          host = component.host;
         }
       }
       uriTokens.push(host);
@@ -42817,10 +42783,7 @@ var require_utils3 = __commonJS((exports, module) => {
   module.exports = {
     nonSimpleDomain,
     recomposeAuthority,
-    reescapeHostDelimiters,
-    normalizePercentEncoding,
-    normalizePathEncoding,
-    escapePreservingEscapes,
+    normalizeComponentEncoding,
     removeDotSegments,
     isIPv4,
     isUUID,
@@ -43005,11 +42968,11 @@ var require_schemes = __commonJS((exports, module) => {
 
 // node_modules/fast-uri/index.js
 var require_fast_uri = __commonJS((exports, module) => {
-  var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizePercentEncoding, normalizePathEncoding, escapePreservingEscapes, reescapeHostDelimiters, isIPv4, nonSimpleDomain } = require_utils3();
+  var { normalizeIPv6, removeDotSegments, recomposeAuthority, normalizeComponentEncoding, isIPv4, nonSimpleDomain } = require_utils3();
   var { SCHEMES, getSchemeHandler } = require_schemes();
   function normalize(uri, options) {
     if (typeof uri === "string") {
-      uri = normalizeString(uri, options);
+      uri = serialize(parse6(uri, options), options);
     } else if (typeof uri === "object") {
       uri = parse6(serialize(uri, options), options);
     }
@@ -43075,9 +43038,19 @@ var require_fast_uri = __commonJS((exports, module) => {
     return target;
   }
   function equal(uriA, uriB, options) {
-    const normalizedA = normalizeComparableURI(uriA, options);
-    const normalizedB = normalizeComparableURI(uriB, options);
-    return normalizedA !== undefined && normalizedB !== undefined && normalizedA.toLowerCase() === normalizedB.toLowerCase();
+    if (typeof uriA === "string") {
+      uriA = unescape(uriA);
+      uriA = serialize(normalizeComponentEncoding(parse6(uriA, options), true), { ...options, skipEscape: true });
+    } else if (typeof uriA === "object") {
+      uriA = serialize(normalizeComponentEncoding(uriA, true), { ...options, skipEscape: true });
+    }
+    if (typeof uriB === "string") {
+      uriB = unescape(uriB);
+      uriB = serialize(normalizeComponentEncoding(parse6(uriB, options), true), { ...options, skipEscape: true });
+    } else if (typeof uriB === "object") {
+      uriB = serialize(normalizeComponentEncoding(uriB, true), { ...options, skipEscape: true });
+    }
+    return uriA.toLowerCase() === uriB.toLowerCase();
   }
   function serialize(cmpts, opts) {
     const component = {
@@ -43103,12 +43076,12 @@ var require_fast_uri = __commonJS((exports, module) => {
       schemeHandler.serialize(component, options);
     if (component.path !== undefined) {
       if (!options.skipEscape) {
-        component.path = escapePreservingEscapes(component.path);
+        component.path = escape(component.path);
         if (component.scheme !== undefined) {
           component.path = component.path.split("%3A").join(":");
         }
       } else {
-        component.path = normalizePercentEncoding(component.path);
+        component.path = unescape(component.path);
       }
     }
     if (options.reference !== "suffix" && component.scheme) {
@@ -43143,16 +43116,7 @@ var require_fast_uri = __commonJS((exports, module) => {
     return uriTokens.join("");
   }
   var URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u;
-  function getParseError(parsed, matches) {
-    if (matches[2] !== undefined && parsed.path && parsed.path[0] !== "/") {
-      return 'URI path must start with "/" when authority is present.';
-    }
-    if (typeof parsed.port === "number" && (parsed.port < 0 || parsed.port > 65535)) {
-      return "URI port is malformed.";
-    }
-    return;
-  }
-  function parseWithStatus(uri, opts) {
+  function parse6(uri, opts) {
     const options = Object.assign({}, opts);
     const parsed = {
       scheme: undefined,
@@ -43163,7 +43127,6 @@ var require_fast_uri = __commonJS((exports, module) => {
       query: undefined,
       fragment: undefined
     };
-    let malformedAuthorityOrPort = false;
     let isIP = false;
     if (options.reference === "suffix") {
       if (options.scheme) {
@@ -43184,11 +43147,6 @@ var require_fast_uri = __commonJS((exports, module) => {
       if (isNaN(parsed.port)) {
         parsed.port = matches[5];
       }
-      const parseError = getParseError(parsed, matches);
-      if (parseError !== undefined) {
-        parsed.error = parsed.error || parseError;
-        malformedAuthorityOrPort = true;
-      }
       if (parsed.host) {
         const ipv4result = isIPv4(parsed.host);
         if (ipv4result === false) {
@@ -43227,18 +43185,14 @@ var require_fast_uri = __commonJS((exports, module) => {
             parsed.scheme = unescape(parsed.scheme);
           }
           if (parsed.host !== undefined) {
-            parsed.host = reescapeHostDelimiters(unescape(parsed.host), isIP);
+            parsed.host = unescape(parsed.host);
           }
         }
         if (parsed.path) {
-          parsed.path = normalizePathEncoding(parsed.path);
+          parsed.path = escape(unescape(parsed.path));
         }
         if (parsed.fragment) {
-          try {
-            parsed.fragment = encodeURI(decodeURIComponent(parsed.fragment));
-          } catch {
-            parsed.error = parsed.error || "URI malformed";
-          }
+          parsed.fragment = encodeURI(decodeURIComponent(parsed.fragment));
         }
       }
       if (schemeHandler && schemeHandler.parse) {
@@ -43247,29 +43201,7 @@ var require_fast_uri = __commonJS((exports, module) => {
     } else {
       parsed.error = parsed.error || "URI can not be parsed.";
     }
-    return { parsed, malformedAuthorityOrPort };
-  }
-  function parse6(uri, opts) {
-    return parseWithStatus(uri, opts).parsed;
-  }
-  function normalizeString(uri, opts) {
-    return normalizeStringWithStatus(uri, opts).normalized;
-  }
-  function normalizeStringWithStatus(uri, opts) {
-    const { parsed, malformedAuthorityOrPort } = parseWithStatus(uri, opts);
-    return {
-      normalized: malformedAuthorityOrPort ? uri : serialize(parsed, opts),
-      malformedAuthorityOrPort
-    };
-  }
-  function normalizeComparableURI(uri, opts) {
-    if (typeof uri === "string") {
-      const { normalized, malformedAuthorityOrPort } = normalizeStringWithStatus(uri, opts);
-      return malformedAuthorityOrPort ? undefined : normalized;
-    }
-    if (typeof uri === "object") {
-      return serialize(uri, opts);
-    }
+    return parsed;
   }
   var fastUri = {
     SCHEMES,
@@ -43404,7 +43336,7 @@ var require_core = __commonJS((exports) => {
     constructor(opts = {}) {
       this.schemas = {};
       this.refs = {};
-      this.formats = Object.create(null);
+      this.formats = {};
       this._compilations = new Set;
       this._loading = {};
       this._cache = new Map;