@hasna/connectors 0.3.12 → 0.3.14

package/bin/index.js

@@ -6833,7 +6833,7 @@ var PRESETS = {
   commerce: { description: "Commerce and finance", connectors: ["stripe", "shopify", "revolut", "mercury", "pandadoc"] }
 };
 var program2 = new Command;
-program2.name("connectors").description("Install API connectors for your project").version("0.3.12").enablePositionalOptions();
+program2.name("connectors").description("Install API connectors for your project").version("0.3.14").enablePositionalOptions();
 program2.command("interactive", { isDefault: true }).alias("i").description("Interactive connector browser").action(() => {
   if (!isTTY) {
     console.log(`Non-interactive environment detected. Use a subcommand:
@@ -7951,27 +7951,48 @@ program2.command("export").option("-o, --output <file>", "Write to file instead
       if (!statSync3(entryPath).isDirectory() || !entry.startsWith("connect-"))
         continue;
       const connectorName = entry.replace(/^connect-/, "");
+      let credentials = undefined;
+      const credentialsPath = join6(entryPath, "credentials.json");
+      if (existsSync6(credentialsPath)) {
+        try {
+          credentials = JSON.parse(readFileSync5(credentialsPath, "utf-8"));
+        } catch {}
+      }
       const profilesDir = join6(entryPath, "profiles");
-      if (!existsSync6(profilesDir))
+      if (!existsSync6(profilesDir) && !credentials)
         continue;
       const profiles = {};
-      for (const pEntry of readdirSync4(profilesDir)) {
-        const pPath = join6(profilesDir, pEntry);
-        if (statSync3(pPath).isFile() && pEntry.endsWith(".json")) {
-          try {
-            profiles[pEntry.replace(/\.json$/, "")] = JSON.parse(readFileSync5(pPath, "utf-8"));
-          } catch {}
-        } else if (statSync3(pPath).isDirectory()) {
-          const configPath = join6(pPath, "config.json");
-          if (existsSync6(configPath)) {
+      if (existsSync6(profilesDir)) {
+        for (const pEntry of readdirSync4(profilesDir)) {
+          const pPath = join6(profilesDir, pEntry);
+          if (statSync3(pPath).isFile() && pEntry.endsWith(".json")) {
             try {
-              profiles[pEntry] = JSON.parse(readFileSync5(configPath, "utf-8"));
+              profiles[pEntry.replace(/\.json$/, "")] = JSON.parse(readFileSync5(pPath, "utf-8"));
             } catch {}
+          } else if (statSync3(pPath).isDirectory()) {
+            const configPath = join6(pPath, "config.json");
+            const tokensPath = join6(pPath, "tokens.json");
+            let merged = {};
+            if (existsSync6(configPath)) {
+              try {
+                merged = { ...merged, ...JSON.parse(readFileSync5(configPath, "utf-8")) };
+              } catch {}
+            }
+            if (existsSync6(tokensPath)) {
+              try {
+                merged = { ...merged, ...JSON.parse(readFileSync5(tokensPath, "utf-8")) };
+              } catch {}
+            }
+            if (Object.keys(merged).length > 0)
+              profiles[pEntry] = merged;
           }
         }
       }
-      if (Object.keys(profiles).length > 0)
-        result[connectorName] = { profiles };
+      const connectorData = { profiles };
+      if (credentials)
+        connectorData.credentials = credentials;
+      if (Object.keys(profiles).length > 0 || credentials)
+        result[connectorName] = connectorData;
     }
   }
   const exportPayload = options.includeSecrets ? { connectors: result, exportedAt: new Date().toISOString() } : { connectors: redactSecrets(result), exportedAt: new Date().toISOString(), redacted: true };
@@ -8031,9 +8052,15 @@ program2.command("import").argument("<file>", "JSON backup file to import (use -
   for (const [connectorName, connData] of Object.entries(data.connectors)) {
     if (!/^[a-z0-9-]+$/.test(connectorName))
       continue;
+    const connectorDir = join6(connectDir, `connect-${connectorName}`);
+    if (connData.credentials && typeof connData.credentials === "object") {
+      mkdirSync4(connectorDir, { recursive: true });
+      writeFileSync4(join6(connectorDir, "credentials.json"), JSON.stringify(connData.credentials, null, 2));
+      imported++;
+    }
     if (!connData.profiles || typeof connData.profiles !== "object")
       continue;
-    const profilesDir = join6(connectDir, `connect-${connectorName}`, "profiles");
+    const profilesDir = join6(connectorDir, "profiles");
     for (const [profileName, config] of Object.entries(connData.profiles)) {
       if (!config || typeof config !== "object")
         continue;
@@ -8049,7 +8076,7 @@ program2.command("import").argument("<file>", "JSON backup file to import (use -
   }
 });
 program2.command("upgrade").alias("self-update").option("--check", "Only check for updates, don't install", false).option("--json", "Output as JSON", false).description("Check for updates and upgrade to the latest version").action(async (options) => {
-  const currentVersion = "0.3.1";
+  const currentVersion = program2.version();
   try {
     const res = await fetch("https://registry.npmjs.org/@hasna/connectors/latest");
     if (!res.ok)

package/bin/mcp.js

@@ -20315,7 +20315,7 @@ async function getConnectorCommandHelp(name, command) {
 loadConnectorVersions();
 var server = new McpServer({
   name: "connectors",
-  version: "0.3.12"
+  version: "0.3.14"
 });
 server.registerTool("search_connectors", {
   title: "Search Connectors",

package/connectors/connect-googlecalendar/src/utils/config.ts

@@ -143,22 +143,41 @@ export function deleteProfile(profile: string): boolean {
 }
 
 /**
- * Load profile config
+ * Load profile config — checks both flat and directory patterns, merges tokens.json
  */
 export function loadProfile(profile?: string): ProfileConfig {
   ensureConfigDir();
   const profileName = profile || getCurrentProfile();
-  const profilePath = getProfilePath(profileName);
 
-  if (!existsSync(profilePath)) {
-    return {};
+  let config: ProfileConfig = {};
+
+  // Pattern 1: profiles/<name>.json (flat file)
+  const flatPath = getProfilePath(profileName);
+  if (existsSync(flatPath)) {
+    try { config = JSON.parse(readFileSync(flatPath, 'utf-8')); } catch {}
   }
 
-  try {
-    return JSON.parse(readFileSync(profilePath, 'utf-8'));
-  } catch {
-    return {};
+  // Pattern 2: profiles/<name>/config.json (directory)
+  const dirConfigPath = join(PROFILES_DIR, profileName, 'config.json');
+  if (existsSync(dirConfigPath)) {
+    try {
+      const dirConfig = JSON.parse(readFileSync(dirConfigPath, 'utf-8'));
+      config = { ...config, ...dirConfig };
+    } catch {}
   }
+
+  // Pattern 3: profiles/<name>/tokens.json (OAuth tokens)
+  const tokensPath = join(PROFILES_DIR, profileName, 'tokens.json');
+  if (existsSync(tokensPath)) {
+    try {
+      const tokens = JSON.parse(readFileSync(tokensPath, 'utf-8'));
+      if (tokens.accessToken && !config.accessToken) config.accessToken = tokens.accessToken;
+      if (tokens.refreshToken && !config.refreshToken) config.refreshToken = tokens.refreshToken;
+      if (tokens.expiresAt && !config.expiresAt) config.expiresAt = tokens.expiresAt;
+    } catch {}
+  }
+
+  return config;
 }
 
 /**

package/connectors/connect-googlecontacts/src/utils/config.ts

@@ -136,22 +136,41 @@ export function deleteProfile(profile: string): boolean {
 }
 
 /**
- * Load profile config
+ * Load profile config — checks both flat and directory patterns, merges tokens.json
  */
 export function loadProfile(profile?: string): ProfileConfig {
   ensureConfigDir();
   const profileName = profile || getCurrentProfile();
-  const profilePath = getProfilePath(profileName);
 
-  if (!existsSync(profilePath)) {
-    return {};
+  let config: ProfileConfig = {};
+
+  // Pattern 1: profiles/<name>.json (flat file)
+  const flatPath = getProfilePath(profileName);
+  if (existsSync(flatPath)) {
+    try { config = JSON.parse(readFileSync(flatPath, 'utf-8')); } catch {}
   }
 
-  try {
-    return JSON.parse(readFileSync(profilePath, 'utf-8'));
-  } catch {
-    return {};
+  // Pattern 2: profiles/<name>/config.json (directory)
+  const dirConfigPath = join(PROFILES_DIR, profileName, 'config.json');
+  if (existsSync(dirConfigPath)) {
+    try {
+      const dirConfig = JSON.parse(readFileSync(dirConfigPath, 'utf-8'));
+      config = { ...config, ...dirConfig };
+    } catch {}
   }
+
+  // Pattern 3: profiles/<name>/tokens.json (OAuth tokens)
+  const tokensPath = join(PROFILES_DIR, profileName, 'tokens.json');
+  if (existsSync(tokensPath)) {
+    try {
+      const tokens = JSON.parse(readFileSync(tokensPath, 'utf-8'));
+      if (tokens.accessToken && !config.accessToken) config.accessToken = tokens.accessToken;
+      if (tokens.refreshToken && !config.refreshToken) config.refreshToken = tokens.refreshToken;
+      if (tokens.expiresAt && !config.tokenExpiresAt) config.tokenExpiresAt = tokens.expiresAt;
+    } catch {}
+  }
+
+  return config;
 }
 
 /**

package/connectors/connect-googledrive/src/utils/config.ts

@@ -259,18 +259,37 @@ export function ensureImportsDir(): string {
 
 export function loadConfig(): CliConfig {
   ensureConfigDir();
-  const configFile = join(getConfigDirInternal(), 'config.json');
 
-  if (!existsSync(configFile)) {
-    return {};
+  let config: CliConfig = {};
+
+  // Pattern 1: profiles/<name>.json (flat file)
+  const profileName = getCurrentProfile();
+  const flatPath = join(getProfilesDir(), `${profileName}.json`);
+  if (existsSync(flatPath)) {
+    try { config = JSON.parse(readFileSync(flatPath, 'utf-8')); } catch {}
   }
 
-  try {
-    const content = readFileSync(configFile, 'utf-8');
-    return JSON.parse(content);
-  } catch {
-    return {};
+  // Pattern 2: profiles/<name>/config.json (directory)
+  const configFile = join(getConfigDirInternal(), 'config.json');
+  if (existsSync(configFile)) {
+    try {
+      const dirConfig = JSON.parse(readFileSync(configFile, 'utf-8'));
+      config = { ...config, ...dirConfig };
+    } catch {}
+  }
+
+  // Pattern 3: profiles/<name>/tokens.json (OAuth tokens)
+  const tokensPath = join(getConfigDirInternal(), 'tokens.json');
+  if (existsSync(tokensPath)) {
+    try {
+      const tokens = JSON.parse(readFileSync(tokensPath, 'utf-8'));
+      if (tokens.accessToken && !config.tokens) {
+        config.tokens = tokens;
+      }
+    } catch {}
   }
+
+  return config;
 }
 
 export function saveConfig(config: CliConfig): void {

package/connectors/connect-googlesheets/src/utils/config.ts

@@ -150,22 +150,41 @@ export function deleteProfile(profile: string): boolean {
 }
 
 /**
- * Load profile config
+ * Load profile config — checks both flat and directory patterns, merges tokens.json
  */
 export function loadProfile(profile?: string): ProfileConfig {
   ensureConfigDir();
   const profileName = profile || getCurrentProfile();
-  const profilePath = getProfilePath(profileName);
 
-  if (!existsSync(profilePath)) {
-    return {};
+  let config: ProfileConfig = {};
+
+  // Pattern 1: profiles/<name>.json (flat file)
+  const flatPath = getProfilePath(profileName);
+  if (existsSync(flatPath)) {
+    try { config = JSON.parse(readFileSync(flatPath, 'utf-8')); } catch {}
   }
 
-  try {
-    return JSON.parse(readFileSync(profilePath, 'utf-8'));
-  } catch {
-    return {};
+  // Pattern 2: profiles/<name>/config.json (directory)
+  const dirConfigPath = join(PROFILES_DIR, profileName, 'config.json');
+  if (existsSync(dirConfigPath)) {
+    try {
+      const dirConfig = JSON.parse(readFileSync(dirConfigPath, 'utf-8'));
+      config = { ...config, ...dirConfig };
+    } catch {}
   }
+
+  // Pattern 3: profiles/<name>/tokens.json (OAuth tokens)
+  const tokensPath = join(PROFILES_DIR, profileName, 'tokens.json');
+  if (existsSync(tokensPath)) {
+    try {
+      const tokens = JSON.parse(readFileSync(tokensPath, 'utf-8'));
+      if (tokens.accessToken && !config.accessToken) config.accessToken = tokens.accessToken;
+      if (tokens.refreshToken && !config.refreshToken) config.refreshToken = tokens.refreshToken;
+      if (tokens.expiresAt && !config.expiresAt) config.expiresAt = tokens.expiresAt;
+    } catch {}
+  }
+
+  return config;
 }
 
 /**

package/connectors/connect-googletasks/src/utils/config.ts

@@ -167,18 +167,36 @@ export function ensureConfigDir(): void {
 export function loadProfile(profile?: string): ProfileConfig {
   ensureConfigDir();
   const profileName = profile || getCurrentProfile();
-  const profileDir = join(getProfilesDir(), profileName);
-  const configFile = join(profileDir, 'config.json');
 
-  if (!existsSync(configFile)) {
-    return {};
+  let config: ProfileConfig = {};
+
+  // Pattern 1: profiles/<name>.json (flat file)
+  const flatPath = join(getProfilesDir(), `${profileName}.json`);
+  if (existsSync(flatPath)) {
+    try { config = JSON.parse(readFileSync(flatPath, 'utf-8')); } catch {}
   }
 
-  try {
-    return JSON.parse(readFileSync(configFile, 'utf-8'));
-  } catch {
-    return {};
+  // Pattern 2: profiles/<name>/config.json (directory)
+  const dirConfigPath = join(getProfilesDir(), profileName, 'config.json');
+  if (existsSync(dirConfigPath)) {
+    try {
+      const dirConfig = JSON.parse(readFileSync(dirConfigPath, 'utf-8'));
+      config = { ...config, ...dirConfig };
+    } catch {}
   }
+
+  // Pattern 3: profiles/<name>/tokens.json (OAuth tokens)
+  const tokensPath = join(getProfilesDir(), profileName, 'tokens.json');
+  if (existsSync(tokensPath)) {
+    try {
+      const tokens = JSON.parse(readFileSync(tokensPath, 'utf-8'));
+      if (tokens.accessToken && !config.accessToken) config.accessToken = tokens.accessToken;
+      if (tokens.refreshToken && !config.refreshToken) config.refreshToken = tokens.refreshToken;
+      if (tokens.expiresAt && !config.tokenExpiry) config.tokenExpiry = tokens.expiresAt;
+    } catch {}
+  }
+
+  return config;
 }
 
 export function saveProfile(config: ProfileConfig, profile?: string): void {

package/connectors/connect-mistral/src/utils/config.ts

@@ -77,10 +77,10 @@ export function setCurrentProfile(profile: string): void {
 }
 
 /**
- * Check if a profile exists
+ * Check if a profile exists (flat file or directory pattern)
  */
 export function profileExists(profile: string): boolean {
-  return existsSync(getProfilePath(profile));
+  return existsSync(getProfilePath(profile)) || existsSync(join(PROFILES_DIR, profile));
 }
 
 /**
@@ -93,10 +93,16 @@ export function listProfiles(): string[] {
     return [];
   }
 
-  return readdirSync(PROFILES_DIR)
-    .filter(f => f.endsWith('.json'))
-    .map(f => f.replace('.json', ''))
-    .sort();
+  const seen = new Set<string>();
+  const entries = readdirSync(PROFILES_DIR, { withFileTypes: true });
+  for (const entry of entries) {
+    if (entry.isDirectory()) {
+      seen.add(entry.name);
+    } else if (entry.name.endsWith('.json')) {
+      seen.add(entry.name.replace('.json', ''));
+    }
+  }
+  return Array.from(seen).sort();
 }
 
 /**
@@ -135,27 +141,53 @@ export function deleteProfile(profile: string): boolean {
     setCurrentProfile(DEFAULT_PROFILE);
   }
 
-  rmSync(getProfilePath(profile));
+  // Remove flat file pattern
+  const flatPath = getProfilePath(profile);
+  if (existsSync(flatPath)) {
+    rmSync(flatPath);
+  }
+
+  // Remove directory pattern
+  const dirPath = join(PROFILES_DIR, profile);
+  if (existsSync(dirPath)) {
+    rmSync(dirPath, { recursive: true });
+  }
+
   return true;
 }
 
 /**
- * Load profile config
+ * Load profile config.
+ * Checks both flat (profiles/<name>.json) and directory (profiles/<name>/config.json)
+ * patterns. Flat pattern takes precedence when both exist.
  */
 export function loadProfile(profile?: string): ProfileConfig {
   ensureConfigDir();
   const profileName = profile || getCurrentProfile();
-  const profilePath = getProfilePath(profileName);
 
-  if (!existsSync(profilePath)) {
-    return {};
+  let config: ProfileConfig = {};
+
+  // Pattern 2: profiles/<name>/config.json (directory pattern, used by dashboard)
+  const dirConfigPath = join(PROFILES_DIR, profileName, 'config.json');
+  if (existsSync(dirConfigPath)) {
+    try {
+      config = JSON.parse(readFileSync(dirConfigPath, 'utf-8'));
+    } catch {
+      // ignore
+    }
   }
 
-  try {
-    return JSON.parse(readFileSync(profilePath, 'utf-8'));
-  } catch {
-    return {};
+  // Pattern 1: profiles/<name>.json (flat pattern, used by CLI)
+  const profilePath = getProfilePath(profileName);
+  if (existsSync(profilePath)) {
+    try {
+      config = { ...config, ...JSON.parse(readFileSync(profilePath, 'utf-8')) };
+    } catch {
+      // ignore
+    }
   }
+
+  return config;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/connectors",
-  "version": "0.3.12",
+  "version": "0.3.14",
   "description": "Open source connector library - Install API connectors with a single command",
   "type": "module",
   "bin": {