@hasna/connectors 1.3.23 → 1.3.24

package/bin/index.js

@@ -65,7 +65,7 @@ var __export = (target, all) => {
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = import.meta.require;
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/commander/lib/error.js
+// node_modules/commander/lib/error.js
 var require_error = __commonJS((exports) => {
   class CommanderError extends Error {
     constructor(exitCode, code, message) {
@@ -89,7 +89,7 @@ var require_error = __commonJS((exports) => {
   exports.InvalidArgumentError = InvalidArgumentError;
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/commander/lib/argument.js
+// node_modules/commander/lib/argument.js
 var require_argument = __commonJS((exports) => {
   var { InvalidArgumentError } = require_error();
 
@@ -168,7 +168,7 @@ var require_argument = __commonJS((exports) => {
   exports.humanReadableArgName = humanReadableArgName;
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/commander/lib/help.js
+// node_modules/commander/lib/help.js
 var require_help = __commonJS((exports) => {
   var { humanReadableArgName } = require_argument();
 
@@ -417,7 +417,7 @@ var require_help = __commonJS((exports) => {
   exports.Help = Help;
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/commander/lib/option.js
+// node_modules/commander/lib/option.js
 var require_option = __commonJS((exports) => {
   var { InvalidArgumentError } = require_error();
 
@@ -568,7 +568,7 @@ var require_option = __commonJS((exports) => {
   exports.DualOptions = DualOptions;
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/commander/lib/suggestSimilar.js
+// node_modules/commander/lib/suggestSimilar.js
 var require_suggestSimilar = __commonJS((exports) => {
   var maxDistance = 3;
   function editDistance(a, b) {
@@ -641,7 +641,7 @@ var require_suggestSimilar = __commonJS((exports) => {
   exports.suggestSimilar = suggestSimilar;
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/commander/lib/command.js
+// node_modules/commander/lib/command.js
 var require_command = __commonJS((exports) => {
   var EventEmitter = __require("events").EventEmitter;
   var childProcess = __require("child_process");
@@ -1884,7 +1884,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
   exports.Command = Command;
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/commander/index.js
+// node_modules/commander/index.js
 var require_commander = __commonJS((exports) => {
   var { Argument } = require_argument();
   var { Command } = require_command();
@@ -1909,7 +1909,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/connectors",
-    version: "1.3.23",
+    version: "1.3.24",
     description: "Open source connector library - Install API connectors with a single command",
     type: "module",
     bin: {
@@ -2081,7 +2081,7 @@ var init_registry = __esm(() => {
   init_connector();
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/zod/v3/helpers/util.js
+// node_modules/zod/v3/helpers/util.js
 var util, objectUtil, ZodParsedType, getParsedType = (data) => {
   const t = typeof data;
   switch (t) {
@@ -2212,7 +2212,7 @@ var init_util = __esm(() => {
   ]);
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/zod/v3/ZodError.js
+// node_modules/zod/v3/ZodError.js
 var ZodIssueCode, quotelessJson = (obj) => {
   const json = JSON.stringify(obj, null, 2);
   return json.replace(/"([^"]+)":/g, "$1:");
@@ -2333,7 +2333,7 @@ var init_ZodError = __esm(() => {
   };
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/zod/v3/locales/en.js
+// node_modules/zod/v3/locales/en.js
 var errorMap = (issue, _ctx) => {
   let message;
   switch (issue.code) {
@@ -2440,7 +2440,7 @@ var init_en = __esm(() => {
   en_default = errorMap;
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/zod/v3/errors.js
+// node_modules/zod/v3/errors.js
 function setErrorMap(map) {
   overrideErrorMap = map;
 }
@@ -2453,7 +2453,7 @@ var init_errors2 = __esm(() => {
   overrideErrorMap = en_default;
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/zod/v3/helpers/parseUtil.js
+// node_modules/zod/v3/helpers/parseUtil.js
 function addIssueToContext(ctx, issueData) {
   const overrideMap = getErrorMap();
   const issue = makeIssue({
@@ -2558,10 +2558,10 @@ var init_parseUtil = __esm(() => {
   });
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/zod/v3/helpers/typeAliases.js
+// node_modules/zod/v3/helpers/typeAliases.js
 var init_typeAliases = () => {};
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/zod/v3/helpers/errorUtil.js
+// node_modules/zod/v3/helpers/errorUtil.js
 var errorUtil;
 var init_errorUtil = __esm(() => {
   (function(errorUtil2) {
@@ -2570,7 +2570,7 @@ var init_errorUtil = __esm(() => {
   })(errorUtil || (errorUtil = {}));
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/zod/v3/types.js
+// node_modules/zod/v3/types.js
 class ParseInputLazyPath {
   constructor(parent, value, path, key) {
     this._cachedPath = [];
@@ -5921,7 +5921,7 @@ var init_types = __esm(() => {
   NEVER = INVALID;
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/zod/v3/external.js
+// node_modules/zod/v3/external.js
 var exports_external = {};
 __export(exports_external, {
   void: () => voidType,
@@ -6041,7 +6041,7 @@ var init_external = __esm(() => {
   init_ZodError();
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/zod/index.js
+// node_modules/zod/index.js
 var init_zod = __esm(() => {
   init_external();
   init_external();
@@ -6913,7 +6913,7 @@ Commands:
   });
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/@hasna/cloud/dist/index.js
+// node_modules/@hasna/cloud/dist/index.js
 var exports_dist = {};
 __export(exports_dist, {
   translateSql: () => translateSql,
@@ -8325,9 +8325,9 @@ async function syncTransfer(source, target, options, _direction) {
           const batch = rows.slice(offset, offset + batchSize);
           try {
             if (isAsyncAdapter(target)) {
-              await batchUpsertPg(target, table, columns, updateCols, pkColumns, batch);
+              await batchUpsertPg(target, table, columns, updateCols, pkColumns, batch, columns.includes(conflictColumn) ? conflictColumn : undefined);
             } else {
-              batchUpsertSqlite(target, table, columns, updateCols, pkColumns, batch);
+              batchUpsertSqlite(target, table, columns, updateCols, pkColumns, batch, columns.includes(conflictColumn) ? conflictColumn : undefined);
             }
             result.rowsWritten += batch.length;
           } catch (err) {
@@ -8374,7 +8374,7 @@ async function syncTransfer(source, target, options, _direction) {
   }
   return results;
 }
-async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, batch) {
+async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, batch, conflictColumn) {
   if (batch.length === 0)
     return;
   const colList = columns.map((c) => `"${c}"`).join(", ");
@@ -8384,20 +8384,22 @@ async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, ba
   }).join(", ");
   const pkList = primaryKeys.map((c) => `"${c}"`).join(", ");
   const setClause = updateCols.length > 0 ? updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`).join(", ") : `"${primaryKeys[0]}" = EXCLUDED."${primaryKeys[0]}"`;
+  const whereClause = conflictColumn && updateCols.includes(conflictColumn) ? ` WHERE "${table}"."${conflictColumn}" IS NULL OR EXCLUDED."${conflictColumn}" >= "${table}"."${conflictColumn}"` : "";
   const sql = `INSERT INTO "${table}" (${colList}) VALUES ${valuePlaceholders}
-    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}`;
+    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}${whereClause}`;
   const params = batch.flatMap((row) => columns.map((c) => row[c] ?? null));
   await target.run(sql, ...params);
 }
-function batchUpsertSqlite(target, table, columns, updateCols, primaryKeys, batch) {
+function batchUpsertSqlite(target, table, columns, updateCols, primaryKeys, batch, conflictColumn) {
   if (batch.length === 0)
     return;
   const colList = columns.map((c) => `"${c}"`).join(", ");
   const valuePlaceholders = batch.map(() => `(${columns.map(() => "?").join(", ")})`).join(", ");
   const pkList = primaryKeys.map((c) => `"${c}"`).join(", ");
   const setClause = updateCols.length > 0 ? updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`).join(", ") : `"${primaryKeys[0]}" = EXCLUDED."${primaryKeys[0]}"`;
+  const whereClause = conflictColumn && updateCols.includes(conflictColumn) ? ` WHERE "${table}"."${conflictColumn}" IS NULL OR EXCLUDED."${conflictColumn}" >= "${table}"."${conflictColumn}"` : "";
   const sql = `INSERT INTO "${table}" (${colList}) VALUES ${valuePlaceholders}
-    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}`;
+    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}${whereClause}`;
   const params = batch.flatMap((row) => columns.map((c) => coerceForSqlite(row[c])));
   target.run(sql, ...params);
 }
@@ -9467,7 +9469,7 @@ async function ensureAllPgDatabases() {
   }
   return results;
 }
-function registerCloudTools(server, serviceName) {
+function registerCloudTools(server, serviceName, opts = {}) {
   server.tool(`${serviceName}_cloud_status`, "Show cloud configuration and connection health", {}, async () => {
     const config = getCloudConfig();
     const lines = [
@@ -9500,8 +9502,13 @@ function registerCloudTools(server, serviceName) {
         isError: true
       };
     }
-    const local = new SqliteAdapter(getDbPath(serviceName));
+    const local = new SqliteAdapter(opts.dbPath ?? getDbPath(serviceName));
     const cloud = new PgAdapterAsync(getConnectionString(serviceName));
+    if (opts.migrations?.length) {
+      for (const sql of opts.migrations) {
+        await cloud.run(sql);
+      }
+    }
     const tableList = tablesStr ? tablesStr.split(",").map((t) => t.trim()) : listSqliteTables(local);
     const results = await syncPush(local, cloud, { tables: tableList });
     local.close();
@@ -9523,7 +9530,7 @@ function registerCloudTools(server, serviceName) {
         isError: true
       };
     }
-    const local = new SqliteAdapter(getDbPath(serviceName));
+    const local = new SqliteAdapter(opts.dbPath ?? getDbPath(serviceName));
     const cloud = new PgAdapterAsync(getConnectionString(serviceName));
     let tableList;
     if (tablesStr) {
@@ -26525,7 +26532,7 @@ var init_registry2 = __esm(() => {
   ];
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/cli-spinners/spinners.json
+// node_modules/cli-spinners/spinners.json
 var require_spinners = __commonJS((exports, module) => {
   module.exports = {
     dots: {
@@ -28151,7 +28158,7 @@ var require_spinners = __commonJS((exports, module) => {
   };
 });
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/cli-spinners/index.js
+// node_modules/cli-spinners/index.js
 var require_cli_spinners = __commonJS((exports, module) => {
   var spinners = Object.assign({}, require_spinners());
   var spinnersList = Object.keys(spinners);
@@ -30568,7 +30575,7 @@ var init_serve = __esm(() => {
 // src/cli/index.tsx
 import { render as render2 } from "ink";
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/commander/esm.mjs
+// node_modules/commander/esm.mjs
 var import__ = __toESM(require_commander(), 1);
 var {
   program,
@@ -30592,11 +30599,11 @@ init_registry2();
 import { useState as useState7 } from "react";
 import { Box as Box8, Text as Text10, useApp, useInput as useInput5 } from "ink";
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/ink-select-input/build/Indicator.js
+// node_modules/ink-select-input/build/Indicator.js
 import React from "react";
 import { Box, Text } from "ink";
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/is-unicode-supported/index.js
+// node_modules/is-unicode-supported/index.js
 import process2 from "process";
 function isUnicodeSupported() {
   const { env } = process2;
@@ -30607,7 +30614,7 @@ function isUnicodeSupported() {
   return Boolean(env.WT_SESSION) || Boolean(env.TERMINUS_SUBLIME) || env.ConEmuTask === "{cmd::Cmder}" || TERM_PROGRAM === "Terminus-Sublime" || TERM_PROGRAM === "vscode" || TERM === "xterm-256color" || TERM === "alacritty" || TERM === "rxvt-unicode" || TERM === "rxvt-unicode-256color" || env.TERMINAL_EMULATOR === "JetBrains-JediTerm";
 }
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/figures/index.js
+// node_modules/figures/index.js
 var common = {
   circleQuestionMark: "(?)",
   questionMarkPrefix: "(?)",
@@ -30883,23 +30890,23 @@ var figures = shouldUseMain ? mainSymbols : fallbackSymbols;
 var figures_default = figures;
 var replacements = Object.entries(specialMainSymbols);
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/ink-select-input/build/Indicator.js
+// node_modules/ink-select-input/build/Indicator.js
 function Indicator({ isSelected = false }) {
   return React.createElement(Box, { marginRight: 1 }, isSelected ? React.createElement(Text, { color: "blue" }, figures_default.pointer) : React.createElement(Text, null, " "));
 }
 var Indicator_default = Indicator;
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/ink-select-input/build/Item.js
+// node_modules/ink-select-input/build/Item.js
 import * as React2 from "react";
 import { Text as Text2 } from "ink";
 function Item({ isSelected = false, label }) {
   return React2.createElement(Text2, { color: isSelected ? "blue" : undefined }, label);
 }
 var Item_default = Item;
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/ink-select-input/build/SelectInput.js
+// node_modules/ink-select-input/build/SelectInput.js
 import { isDeepStrictEqual } from "util";
 import React3, { useState, useEffect, useRef, useCallback } from "react";
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/to-rotated/index.js
+// node_modules/to-rotated/index.js
 function toRotated(array, steps) {
   if (!Array.isArray(array)) {
     throw new TypeError(`Expected an array, got \`${typeof array}\`.`);
@@ -30921,7 +30928,7 @@ function toRotated(array, steps) {
   ];
 }
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/ink-select-input/build/SelectInput.js
+// node_modules/ink-select-input/build/SelectInput.js
 import { Box as Box2, useInput } from "ink";
 function SelectInput({ items = [], isFocused = true, initialIndex = 0, indicatorComponent = Indicator_default, itemComponent = Item_default, limit: customLimit, onSelect, onHighlight }) {
   const hasLimit = typeof customLimit === "number" && items.length > customLimit;
@@ -31334,7 +31341,7 @@ function ConnectorSelect({
 import { useState as useState4, useEffect as useEffect3, useMemo as useMemo2 } from "react";
 import { Box as Box6, Text as Text7, useInput as useInput4 } from "ink";
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/ink-text-input/build/index.js
+// node_modules/ink-text-input/build/index.js
 import React5, { useState as useState3, useEffect as useEffect2 } from "react";
 import { Text as Text6, useInput as useInput3 } from "ink";
 import chalk from "chalk";
@@ -31722,7 +31729,7 @@ function SearchView({
 import { useState as useState6, useEffect as useEffect5 } from "react";
 import { Box as Box7, Text as Text9 } from "ink";
 
-// ../../../home/hasna/workspace/hasna/opensource/open-connectors/node_modules/ink-spinner/build/index.js
+// node_modules/ink-spinner/build/index.js
 var import_cli_spinners = __toESM(require_cli_spinners(), 1);
 import React7, { useState as useState5, useEffect as useEffect4 } from "react";
 import { Text as Text8 } from "ink";