@base44-preview/cli 0.0.30-pr.214.2479e76 → 0.0.30-pr.214.4036a54

package/dist/cli/index.js

@@ -153967,6 +153967,7 @@ async function removeConnector(integrationType) {
 }
 // src/core/resources/connector/config.ts
 import { join as join3 } from "node:path";
+import { isDeepStrictEqual } from "node:util";
 async function readConnectorFile(connectorPath) {
   const parsed = await readJsonFile(connectorPath);
   const result = ConnectorResourceSchema.safeParse(parsed);
@@ -153975,7 +153976,7 @@ async function readConnectorFile(connectorPath) {
   }
   return result.data;
 }
-async function readAllConnectors(connectorsDir) {
+async function readConnectorFiles(connectorsDir) {
   if (!await pathExists(connectorsDir)) {
     return [];
   }
@@ -153983,45 +153984,65 @@ async function readAllConnectors(connectorsDir) {
     cwd: connectorsDir,
     absolute: true
   });
-  const connectors = await Promise.all(files.map((filePath) => readConnectorFile(filePath)));
+  return await Promise.all(files.map(async (filePath) => ({
+    data: await readConnectorFile(filePath),
+    filePath
+  })));
+}
+async function readAllConnectors(connectorsDir) {
+  const entries = await readConnectorFiles(connectorsDir);
   const types = new Set;
-  for (const connector of connectors) {
-    if (types.has(connector.type)) {
-      throw new InvalidInputError(`Duplicate connector type "${connector.type}"`, {
+  for (const { data } of entries) {
+    if (types.has(data.type)) {
+      throw new InvalidInputError(`Duplicate connector type "${data.type}"`, {
         hints: [
           {
-            message: `Remove duplicate connectors with type "${connector.type}" - only one connector per type is allowed`
+            message: `Remove duplicate connectors with type "${data.type}" - only one connector per type is allowed`
           }
         ]
       });
     }
-    types.add(connector.type);
+    types.add(data.type);
   }
-  return connectors;
+  return entries.map((e2) => e2.data);
 }
 async function writeConnectors(connectorsDir, remoteConnectors) {
-  const existingConnectors = await readAllConnectors(connectorsDir);
+  const entries = await readConnectorFiles(connectorsDir);
+  const typeToEntry = new Map;
+  for (const entry of entries) {
+    if (typeToEntry.has(entry.data.type)) {
+      throw new InvalidInputError(`Duplicate connector type "${entry.data.type}"`, {
+        hints: [
+          {
+            message: `Remove duplicate connectors with type "${entry.data.type}" - only one connector per type is allowed`
+          }
+        ]
+      });
+    }
+    typeToEntry.set(entry.data.type, entry);
+  }
   const newTypes = new Set(remoteConnectors.map((c) => c.integration_type));
-  const toDelete = existingConnectors.filter((c) => !newTypes.has(c.type));
-  for (const connector of toDelete) {
-    const files = await globby(`${connector.type}.${CONFIG_FILE_EXTENSION_GLOB}`, {
-      cwd: connectorsDir,
-      absolute: true
-    });
-    for (const filePath of files) {
-      await deleteFile(filePath);
+  const deleted = [];
+  for (const [type, entry] of typeToEntry) {
+    if (!newTypes.has(type)) {
+      await deleteFile(entry.filePath);
+      deleted.push(type);
     }
   }
+  const written = [];
   for (const connector of remoteConnectors) {
-    const filePath = join3(connectorsDir, `${connector.integration_type}.${CONFIG_FILE_EXTENSION}`);
+    const existing = typeToEntry.get(connector.integration_type);
     const localConnector = {
       type: connector.integration_type,
       scopes: connector.scopes
     };
+    if (existing && isDeepStrictEqual(existing.data, localConnector)) {
+      continue;
+    }
+    const filePath = existing?.filePath ?? join3(connectorsDir, `${connector.integration_type}.${CONFIG_FILE_EXTENSION}`);
     await writeJsonFile(filePath, localConnector);
+    written.push(connector.integration_type);
   }
-  const written = remoteConnectors.map((c) => c.integration_type);
-  const deleted = toDelete.map((c) => c.type);
   return { written, deleted };
 }
 // node_modules/open/index.js
@@ -169928,14 +169949,11 @@ async function pullConnectorsAction() {
     successMessage: "Connectors fetched successfully",
     errorMessage: "Failed to fetch connectors"
   });
-  if (remoteConnectors.integrations.length === 0) {
-    return { outroMessage: "No connectors found on Base44" };
-  }
-  const { written, deleted } = await runTask("Writing connector files", async () => {
+  const { written, deleted } = await runTask("Syncing connector files", async () => {
     return await writeConnectors(connectorsDir, remoteConnectors.integrations);
   }, {
-    successMessage: "Connector files written successfully",
-    errorMessage: "Failed to write connector files"
+    successMessage: "Connector files synced successfully",
+    errorMessage: "Failed to sync connector files"
   });
   if (written.length > 0) {
     M2.success(`Written: ${written.join(", ")}`);
@@ -169943,6 +169961,9 @@ async function pullConnectorsAction() {
   if (deleted.length > 0) {
     M2.warn(`Deleted: ${deleted.join(", ")}`);
   }
+  if (written.length === 0 && deleted.length === 0) {
+    M2.info("All connectors are already up to date");
+  }
   return {
     outroMessage: `Pulled ${remoteConnectors.integrations.length} connectors to ${connectorsDir}`
   };
@@ -174998,4 +175019,4 @@ export {
   CLIExitError
 };
 
-//# debugId=32B5EDD5767F60C664756E2164756E21
+//# debugId=1B3CE6CF267E3DC164756E2164756E21