@base44-preview/cli 0.0.31-pr.214.ad2828d → 0.0.31-pr.217.335fc35

package/dist/cli/index.js

@@ -17446,7 +17446,7 @@ var require_lodash2 = __commonJS((exports, module) => {
         }
         return mapped.length && mapped[0] === arrays[0] ? baseIntersection(mapped, undefined2, comparator) : [];
       });
-      function join12(array2, separator) {
+      function join10(array2, separator) {
         return array2 == null ? "" : nativeJoin.call(array2, separator);
       }
       function last(array2) {
@@ -19378,7 +19378,7 @@ __p += '`;
       lodash.isUndefined = isUndefined;
       lodash.isWeakMap = isWeakMap;
       lodash.isWeakSet = isWeakSet;
-      lodash.join = join12;
+      lodash.join = join10;
       lodash.kebabCase = kebabCase2;
       lodash.last = last;
       lodash.lastIndexOf = lastIndexOf;
@@ -20007,7 +20007,7 @@ function cleanDoc(doc2) {
   return mapDoc(doc2, (currentDoc) => cleanDocFn(currentDoc));
 }
 function replaceEndOfLine(doc2, replacement = literalline) {
-  return mapDoc(doc2, (currentDoc) => typeof currentDoc === "string" ? join12(replacement, currentDoc.split(`
+  return mapDoc(doc2, (currentDoc) => typeof currentDoc === "string" ? join10(replacement, currentDoc.split(`
 `)) : currentDoc);
 }
 function canBreakFn(doc2) {
@@ -20087,7 +20087,7 @@ function indentIfBreak(contents, options) {
     negate: options.negate
   };
 }
-function join12(separator, docs) {
+function join10(separator, docs) {
   assertDoc(separator);
   assertDocArray(docs);
   const parts = [];
@@ -20798,7 +20798,7 @@ var init_doc = __esm(() => {
   MODE_FLAT = Symbol("MODE_FLAT");
   DOC_FILL_PRINTED_LENGTH = Symbol("DOC_FILL_PRINTED_LENGTH");
   builders = {
-    join: join12,
+    join: join10,
     line,
     softline,
     hardline,
@@ -125712,7 +125712,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
       return mapDoc2(doc2, (currentDoc) => cleanDocFn2(currentDoc));
     }
     function replaceEndOfLine2(doc2, replacement = literalline2) {
-      return mapDoc2(doc2, (currentDoc) => typeof currentDoc === "string" ? join14(replacement, currentDoc.split(`
+      return mapDoc2(doc2, (currentDoc) => typeof currentDoc === "string" ? join12(replacement, currentDoc.split(`
 `)) : currentDoc);
     }
     function canBreakFn2(doc2) {
@@ -125798,7 +125798,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
         negate: options8.negate
       };
     }
-    function join14(separator, docs) {
+    function join12(separator, docs) {
       assertDoc2(separator);
       assertDocArray2(docs);
       const parts = [];
@@ -126463,7 +126463,7 @@ Expected it to be ${EXPECTED_TYPE_VALUES}.`;
       }
     }
     var builders2 = {
-      join: join14,
+      join: join12,
       line: line3,
       softline: softline2,
       hardline: hardline4,
@@ -155678,10 +155678,10 @@ var require_view = __commonJS((exports, module) => {
   var debug = require_src4()("express:view");
   var path18 = __require("node:path");
   var fs28 = __require("node:fs");
-  var dirname11 = path18.dirname;
+  var dirname10 = path18.dirname;
   var basename4 = path18.basename;
   var extname2 = path18.extname;
-  var join15 = path18.join;
+  var join13 = path18.join;
   var resolve5 = path18.resolve;
   module.exports = View;
   function View(name2, options8) {
@@ -155717,7 +155717,7 @@ var require_view = __commonJS((exports, module) => {
     for (var i5 = 0;i5 < roots.length && !path19; i5++) {
       var root2 = roots[i5];
       var loc = resolve5(root2, name2);
-      var dir = dirname11(loc);
+      var dir = dirname10(loc);
       var file2 = basename4(loc);
       path19 = this.resolve(dir, file2);
     }
@@ -155743,12 +155743,12 @@ var require_view = __commonJS((exports, module) => {
   };
   View.prototype.resolve = function resolve6(dir, file2) {
     var ext = this.ext;
-    var path19 = join15(dir, file2);
+    var path19 = join13(dir, file2);
     var stat2 = tryStat(path19);
     if (stat2 && stat2.isFile()) {
       return path19;
     }
-    path19 = join15(dir, basename4(file2, ext), "index" + ext);
+    path19 = join13(dir, basename4(file2, ext), "index" + ext);
     stat2 = tryStat(path19);
     if (stat2 && stat2.isFile()) {
       return path19;
@@ -159443,7 +159443,7 @@ var require_send = __commonJS((exports, module) => {
   var Stream2 = __require("stream");
   var util2 = __require("util");
   var extname2 = path18.extname;
-  var join15 = path18.join;
+  var join13 = path18.join;
   var normalize = path18.normalize;
   var resolve5 = path18.resolve;
   var sep = path18.sep;
@@ -159615,7 +159615,7 @@ var require_send = __commonJS((exports, module) => {
         return res;
       }
       parts = path19.split(sep);
-      path19 = normalize(join15(root2, path19));
+      path19 = normalize(join13(root2, path19));
     } else {
       if (UP_PATH_REGEXP.test(path19)) {
         debug('malicious path "%s"', path19);
@@ -159755,7 +159755,7 @@ var require_send = __commonJS((exports, module) => {
           return self2.onStatError(err);
         return self2.error(404);
       }
-      var p4 = join15(path19, self2._index[i5]);
+      var p4 = join13(path19, self2._index[i5]);
       debug('stat "%s"', p4);
       fs28.stat(p4, function(err2, stat2) {
         if (err2)
@@ -162834,7 +162834,7 @@ var {
 } = import__.default;
 
 // src/cli/commands/agents/pull.ts
-import { dirname as dirname7, join as join9 } from "node:path";
+import { dirname as dirname7, join as join8 } from "node:path";
 
 // node_modules/@clack/core/dist/index.mjs
 var import_sisteransi = __toESM(require_src(), 1);
@@ -184871,7 +184871,7 @@ var generateGlobTasks = normalizeArguments(generateTasks);
 var generateGlobTasksSync = normalizeArgumentsSync(generateTasksSync);
 
 // src/core/project/config.ts
-import { dirname as dirname5, join as join6 } from "node:path";
+import { dirname as dirname5, join as join5 } from "node:path";
 
 // src/core/resources/agent/schema.ts
 var EntityOperationSchema = exports_external.enum(["create", "update", "delete", "read"]);
@@ -185145,9 +185145,6 @@ async function listConnectors() {
   }
   return result.data;
 }
-async function fetchConnectors() {
-  return await listConnectors();
-}
 async function setConnector(integrationType, scopes) {
   const appClient = getAppClient();
   let response;
@@ -185200,8 +185197,6 @@ async function removeConnector(integrationType) {
   return result.data;
 }
 // src/core/resources/connector/config.ts
-import { join as join4 } from "node:path";
-import { isDeepStrictEqual } from "node:util";
 async function readConnectorFile(connectorPath) {
   const parsed = await readJsonFile(connectorPath);
   const result = ConnectorResourceSchema.safeParse(parsed);
@@ -185210,7 +185205,7 @@ async function readConnectorFile(connectorPath) {
   }
   return result.data;
 }
-async function readConnectorFiles(connectorsDir) {
+async function readAllConnectors(connectorsDir) {
   if (!await pathExists(connectorsDir)) {
     return [];
   }
@@ -185218,66 +185213,24 @@ async function readConnectorFiles(connectorsDir) {
     cwd: connectorsDir,
     absolute: true
   });
-  return await Promise.all(files.map(async (filePath) => ({
-    data: await readConnectorFile(filePath),
-    filePath
-  })));
+  const connectors = await Promise.all(files.map((filePath) => readConnectorFile(filePath)));
+  assertNoDuplicateConnectors(connectors);
+  return connectors;
 }
-async function readAllConnectors(connectorsDir) {
-  const entries = await readConnectorFiles(connectorsDir);
+function assertNoDuplicateConnectors(connectors) {
   const types = new Set;
-  for (const { data } of entries) {
-    if (types.has(data.type)) {
-      throw new InvalidInputError(`Duplicate connector type "${data.type}"`, {
+  for (const connector of connectors) {
+    if (types.has(connector.type)) {
+      throw new InvalidInputError(`Duplicate connector type "${connector.type}"`, {
         hints: [
           {
-            message: `Remove duplicate connectors with type "${data.type}" - only one connector per type is allowed`
+            message: `Remove duplicate connectors with type "${connector.type}" - only one connector per type is allowed`
           }
         ]
       });
     }
-    types.add(data.type);
+    types.add(connector.type);
   }
-  return entries.map((e2) => e2.data);
-}
-async function writeConnectors(connectorsDir, remoteConnectors) {
-  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 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 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 ?? join4(connectorsDir, `${connector.integration_type}.${CONFIG_FILE_EXTENSION}`);
-    await writeJsonFile(filePath, localConnector);
-    written.push(connector.integration_type);
-  }
-  return { written, deleted };
 }
 // src/core/resources/connector/push.ts
 async function pushConnectors(connectors) {
@@ -185618,7 +185571,7 @@ async function deployFunctions(functions) {
   return result.data;
 }
 // src/core/resources/function/config.ts
-import { dirname as dirname4, join as join5 } from "node:path";
+import { dirname as dirname4, join as join4 } from "node:path";
 async function readFunctionConfig(configPath) {
   const parsed = await readJsonFile(configPath);
   const result = FunctionConfigSchema.safeParse(parsed);
@@ -185630,7 +185583,7 @@ async function readFunctionConfig(configPath) {
 async function readFunction(configPath) {
   const config5 = await readFunctionConfig(configPath);
   const functionDir = dirname4(configPath);
-  const entryPath = join5(functionDir, config5.entry);
+  const entryPath = join4(functionDir, config5.entry);
   if (!await pathExists(entryPath)) {
     throw new FileNotFoundError(`Function entry file not found: ${entryPath} (referenced in ${configPath})`);
   }
@@ -185719,10 +185672,10 @@ async function readProjectConfig(projectRoot) {
   const project = result.data;
   const configDir = dirname5(configPath);
   const [entities, functions, agents, connectors] = await Promise.all([
-    entityResource.readAll(join6(configDir, project.entitiesDir)),
-    functionResource.readAll(join6(configDir, project.functionsDir)),
-    agentResource.readAll(join6(configDir, project.agentsDir)),
-    connectorResource.readAll(join6(configDir, project.connectorsDir))
+    entityResource.readAll(join5(configDir, project.entitiesDir)),
+    functionResource.readAll(join5(configDir, project.functionsDir)),
+    agentResource.readAll(join5(configDir, project.agentsDir)),
+    connectorResource.readAll(join5(configDir, project.connectorsDir))
   ]);
   return {
     project: { ...project, root, configPath },
@@ -185819,7 +185772,7 @@ async function readAppConfig(projectRoot) {
 // src/core/project/template.ts
 var import_ejs = __toESM(require_ejs(), 1);
 var import_front_matter = __toESM(require_front_matter(), 1);
-import { dirname as dirname6, join as join7 } from "node:path";
+import { dirname as dirname6, join as join6 } from "node:path";
 async function listTemplates() {
   const parsed = await readJsonFile(getTemplatesIndexPath());
   const result = TemplatesConfigSchema.safeParse(parsed);
@@ -185829,23 +185782,23 @@ async function listTemplates() {
   return result.data.templates;
 }
 async function renderTemplate(template, destPath, data) {
-  const templateDir = join7(getTemplatesDir(), template.path);
+  const templateDir = join6(getTemplatesDir(), template.path);
   const files = await globby("**/*", {
     cwd: templateDir,
     dot: true,
     onlyFiles: true
   });
   for (const file2 of files) {
-    const srcPath = join7(templateDir, file2);
+    const srcPath = join6(templateDir, file2);
     try {
       if (file2.endsWith(".ejs")) {
         const rendered = await import_ejs.default.renderFile(srcPath, data);
         const { attributes, body } = import_front_matter.default(rendered);
-        const destFile = attributes.outputFileName ? join7(dirname6(file2), attributes.outputFileName) : file2.replace(/\.ejs$/, "");
-        const destFilePath = join7(destPath, destFile);
+        const destFile = attributes.outputFileName ? join6(dirname6(file2), attributes.outputFileName) : file2.replace(/\.ejs$/, "");
+        const destFilePath = join6(destPath, destFile);
         await writeFile(destFilePath, body);
       } else {
-        const destFilePath = join7(destPath, file2);
+        const destFilePath = join6(destPath, file2);
         await copyFile(srcPath, destFilePath);
       }
     } catch (error48) {
@@ -185947,7 +185900,7 @@ async function getSiteFilePaths(outputDir) {
 // src/core/site/deploy.ts
 import { randomUUID } from "node:crypto";
 import { tmpdir } from "node:os";
-import { join as join8 } from "node:path";
+import { join as join7 } from "node:path";
 async function deploySite(siteOutputDir) {
   if (!await pathExists(siteOutputDir)) {
     throw new FileNotFoundError(`Output directory does not exist: ${siteOutputDir}. Make sure to build your project first.`, {
@@ -185964,7 +185917,7 @@ async function deploySite(siteOutputDir) {
       ]
     });
   }
-  const archivePath = join8(tmpdir(), `base44-site-${randomUUID()}.tar.gz`);
+  const archivePath = join7(tmpdir(), `base44-site-${randomUUID()}.tar.gz`);
   try {
     await createArchive(siteOutputDir, archivePath);
     return await uploadSite(archivePath);
@@ -193641,7 +193594,7 @@ function getDashboardUrl(projectId) {
 async function pullAgentsAction() {
   const { project: project2 } = await readProjectConfig();
   const configDir = dirname7(project2.configPath);
-  const agentsDir = join9(configDir, project2.agentsDir);
+  const agentsDir = join8(configDir, project2.agentsDir);
   const remoteAgents = await runTask("Fetching agents from Base44", async () => {
     return await fetchAgents();
   }, {
@@ -193734,43 +193687,6 @@ function getWhoamiCommand(context) {
   });
 }
 
-// src/cli/commands/connectors/pull.ts
-import { dirname as dirname8, join as join10 } from "node:path";
-async function pullConnectorsAction() {
-  const { project: project2 } = await readProjectConfig();
-  const configDir = dirname8(project2.configPath);
-  const connectorsDir = join10(configDir, project2.connectorsDir);
-  const remoteConnectors = await runTask("Fetching connectors from Base44", async () => {
-    return await fetchConnectors();
-  }, {
-    successMessage: "Connectors fetched successfully",
-    errorMessage: "Failed to fetch connectors"
-  });
-  const { written, deleted } = await runTask("Syncing connector files", async () => {
-    return await writeConnectors(connectorsDir, remoteConnectors.integrations);
-  }, {
-    successMessage: "Connector files synced successfully",
-    errorMessage: "Failed to sync connector files"
-  });
-  if (written.length > 0) {
-    M2.success(`Written: ${written.join(", ")}`);
-  }
-  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}`
-  };
-}
-function getConnectorsPullCommand(context) {
-  return new Command("pull").description("Pull connectors from Base44 to local files (replaces all local connector configs)").action(async () => {
-    await runCommand(pullConnectorsAction, { requireAuth: true }, context);
-  });
-}
-
 // node_modules/open/index.js
 import process20 from "node:process";
 import path16 from "node:path";
@@ -194378,6 +194294,52 @@ defineLazyProperty(apps, "safari", () => detectPlatformBinary({
 var open_default = open;
 
 // src/cli/commands/connectors/push.ts
+var POLL_INTERVAL_MS = 2000;
+var POLL_TIMEOUT_MS = 2 * 60 * 1000;
+async function runOAuthFlowWithSkip(params) {
+  await open_default(params.redirectUrl);
+  let finalStatus = "PENDING";
+  let skipped = false;
+  const s = Y2();
+  const originalExit = process.exit;
+  process.exit = () => {
+    skipped = true;
+    s.stop(`${params.type} skipped`);
+  };
+  s.start(`Waiting for ${params.type} authorization... (Esc to skip)`);
+  try {
+    await pWaitFor(async () => {
+      if (skipped) {
+        finalStatus = "SKIPPED";
+        return true;
+      }
+      const response = await getOAuthStatus(params.type, params.connectionId);
+      finalStatus = response.status;
+      return response.status !== "PENDING";
+    }, {
+      interval: POLL_INTERVAL_MS,
+      timeout: POLL_TIMEOUT_MS
+    }).catch((err) => {
+      if (err instanceof TimeoutError2) {
+        finalStatus = "PENDING";
+      } else {
+        throw err;
+      }
+    });
+  } finally {
+    process.exit = originalExit;
+    if (!skipped) {
+      if (finalStatus === "ACTIVE") {
+        s.stop(`${params.type} authorization complete`);
+      } else if (finalStatus === "FAILED") {
+        s.stop(`${params.type} authorization failed`);
+      } else {
+        s.stop(`${params.type} authorization timed out`);
+      }
+    }
+  }
+  return { type: params.type, status: finalStatus };
+}
 function isPendingOAuth(r2) {
   return r2.action === "needs_oauth" && !!r2.redirectUrl && !!r2.connectionId;
 }
@@ -194385,6 +194347,7 @@ function printSummary(results, oauthOutcomes) {
   const synced = [];
   const added = [];
   const removed = [];
+  const skipped = [];
   const failed = [];
   for (const r2 of results) {
     const oauthStatus = oauthOutcomes.get(r2.type);
@@ -194397,6 +194360,8 @@ function printSummary(results, oauthOutcomes) {
     } else if (r2.action === "needs_oauth") {
       if (oauthStatus === "ACTIVE") {
         added.push(r2.type);
+      } else if (oauthStatus === "SKIPPED") {
+        skipped.push(r2.type);
       } else if (oauthStatus === "PENDING") {
         failed.push({ type: r2.type, error: "authorization timed out" });
       } else if (oauthStatus === "FAILED") {
@@ -194417,6 +194382,9 @@ function printSummary(results, oauthOutcomes) {
   if (removed.length > 0) {
     M2.info(theme.styles.dim(`Removed: ${removed.join(", ")}`));
   }
+  if (skipped.length > 0) {
+    M2.warn(`Skipped: ${skipped.join(", ")}`);
+  }
   for (const r2 of failed) {
     M2.error(`Failed: ${r2.type}${r2.error ? ` - ${r2.error}` : ""}`);
   }
@@ -194457,28 +194425,12 @@ async function pushConnectorsAction() {
         try {
           M2.info(`
 Opening browser for '${connector2.type}'...`);
-          await open_default(connector2.redirectUrl);
-          let finalStatus = "PENDING";
-          await runTask(`Waiting for '${connector2.type}' authorization...`, async () => {
-            await pWaitFor(async () => {
-              const response = await getOAuthStatus(connector2.type, connector2.connectionId);
-              finalStatus = response.status;
-              return response.status !== "PENDING";
-            }, {
-              interval: 2000,
-              timeout: 2 * 60 * 1000
-            });
-          }, {
-            successMessage: `'${connector2.type}' authorization complete`,
-            errorMessage: `'${connector2.type}' authorization failed`
-          }).catch((err) => {
-            if (err instanceof TimeoutError2) {
-              finalStatus = "PENDING";
-            } else {
-              throw err;
-            }
+          const oauthResult = await runOAuthFlowWithSkip({
+            type: connector2.type,
+            redirectUrl: connector2.redirectUrl,
+            connectionId: connector2.connectionId
           });
-          oauthOutcomes.set(connector2.type, finalStatus);
+          oauthOutcomes.set(connector2.type, oauthResult.status);
         } catch (err) {
           M2.error(`Failed to authorize '${connector2.type}': ${err instanceof Error ? err.message : String(err)}`);
           oauthOutcomes.set(connector2.type, "FAILED");
@@ -194497,7 +194449,7 @@ function getConnectorsPushCommand(context) {
 
 // src/cli/commands/connectors/index.ts
 function getConnectorsCommand(context) {
-  return new Command("connectors").description("Manage project connectors (OAuth integrations)").addCommand(getConnectorsPullCommand(context)).addCommand(getConnectorsPushCommand(context));
+  return new Command("connectors").description("Manage project connectors (OAuth integrations)").addCommand(getConnectorsPushCommand(context));
 }
 
 // src/cli/commands/dashboard/open.ts
@@ -194591,7 +194543,7 @@ function getFunctionsDeployCommand(context) {
 }
 
 // src/cli/commands/project/create.ts
-import { basename as basename3, join as join11, resolve as resolve2 } from "node:path";
+import { basename as basename3, join as join9, resolve as resolve2 } from "node:path";
 var import_lodash = __toESM(require_lodash(), 1);
 var DEFAULT_TEMPLATE_ID = "backend-only";
 async function getTemplateById(templateId) {
@@ -194727,7 +194679,7 @@ async function executeCreate({
         updateMessage("Building project...");
         await execa({ cwd: resolvedPath, shell: true })`${buildCommand}`;
         updateMessage("Deploying site...");
-        return await deploySite(join11(resolvedPath, outputDirectory));
+        return await deploySite(join9(resolvedPath, outputDirectory));
       }, {
         successMessage: theme.colors.base44Orange("Site deployed successfully"),
         errorMessage: "Failed to deploy site"
@@ -195108,10 +195060,10 @@ function toPascalCase(name2) {
   return name2.split(/[-_\s]+/).map((w9) => w9.charAt(0).toUpperCase() + w9.slice(1)).join("");
 }
 // src/core/types/update-project.ts
-import { join as join14 } from "node:path";
+import { join as join12 } from "node:path";
 var TYPES_INCLUDE_PATH = `${PROJECT_SUBDIR}/${TYPES_OUTPUT_SUBDIR}/*.d.ts`;
 async function updateProjectConfig(projectRoot) {
-  const tsconfigPath = join14(projectRoot, "tsconfig.json");
+  const tsconfigPath = join12(projectRoot, "tsconfig.json");
   if (!await pathExists(tsconfigPath)) {
     return false;
   }
@@ -195480,7 +195432,7 @@ function nanoid3(size = 21) {
 }
 
 // node_modules/posthog-node/dist/extensions/error-tracking/modifiers/module.node.mjs
-import { dirname as dirname11, posix, sep } from "path";
+import { dirname as dirname10, posix, sep } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -195489,7 +195441,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname11(process.argv[1]) : process.cwd(), isWindows4 = sep === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname10(process.argv[1]) : process.cwd(), isWindows4 = sep === "\\") {
   const normalizedBase = isWindows4 ? normalizeWindowsPath2(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -199708,4 +199660,4 @@ export {
   CLIExitError
 };
 
-//# debugId=0FF6B9CB62D0B1EE64756E2164756E21
+//# debugId=2F410FC4ADBC6DC764756E2164756E21