v2.24.3: Add --skip-config to rebalance to not reload the config since it's been loaded by the tmux caller already; improve shellQuote() cosmetics

Author: dimikot

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@clickup/pg-microsharding",
   "description": "Microshards support for PostgreSQL",
-  "version": "2.24.2",
+  "version": "2.24.3",
   "license": "MIT",
   "keywords": [
     "postgresql",

package.json

@@ -47,7 +47,6 @@ export async function actionRebalance(args: Args): Promise<boolean> {
   const parallelism = Number(args["parallelism"] ?? "") || 3;
   const deactivateSQL = String(args["deactivate-sql"] || "") || undefined;
   const wait = args["wait"];
-  const skipConfig = args["skip-config"];
 
   const { islandNosToDsn, islands } = await calcIslandWeights({
     dsns,
@@ -159,7 +158,7 @@ export async function actionRebalance(args: Args): Promise<boolean> {
           : []),
         ...(deactivateSQL ? ["--deactivate-sql", deactivateSQL] : []),
         ...(wait ? ["--wait"] : []),
-        ...(skipConfig ? ["--skip-config"] : []),
+        "--skip-config",
       ],
     })),
   );

src/actions/actionRebalance.ts

@@ -0,0 +1,46 @@
+import { shellQuote } from "../quote";
+
+test("shellQuote should escape semicolon", () => {
+  expect(shellQuote(";")).toBe("\\;");
+});
+
+test("shellQuote should return safe strings unchanged", () => {
+  expect(shellQuote("hello")).toBe("hello");
+  expect(shellQuote("test_123")).toBe("test_123");
+  expect(shellQuote("path/to/file.txt")).toBe("path/to/file.txt");
+  expect(shellQuote("[email protected]")).toBe("[email protected]");
+  expect(shellQuote("key1=value1,key2=value2")).toBe("key1=value1,key2=value2");
+});
+
+test("shellQuote should handle key=value pattern", () => {
+  expect(shellQuote("key=value with spaces")).toBe("key='value with spaces'");
+  expect(shellQuote("database=my database")).toBe("database='my database'");
+});
+
+test("shellQuote should handle --key=value pattern", () => {
+  expect(shellQuote("--verbose=true")).toBe("--verbose=true");
+  expect(shellQuote("--database=my database")).toBe("--database='my database'");
+});
+
+test("shellQuote should quote strings with special characters", () => {
+  expect(shellQuote("hello world")).toBe("'hello world'");
+  expect(shellQuote("path with spaces")).toBe("'path with spaces'");
+  expect(shellQuote("special!@#$%")).toBe("'special!@#$%'");
+});
+
+test("shellQuote should escape single quotes in quoted strings", () => {
+  expect(shellQuote("don't")).toBe("'don'\\''t'");
+  expect(shellQuote("it's a test")).toBe("'it'\\''s a test'");
+  expect(shellQuote("'quoted'")).toBe("''\\''quoted'\\'''");
+});
+
+test("shellQuote should handle key=value with single quotes in value", () => {
+  expect(shellQuote("name=John's file")).toBe("name='John'\\''s file'");
+  expect(shellQuote("--title=Bob's Project")).toBe(
+    "--title='Bob'\\''s Project'",
+  );
+});
+
+test("shellQuote should handle empty string", () => {
+  expect(shellQuote("")).toBe("''");
+});

src/internal/__tests__/quote.test.ts

@@ -4,9 +4,17 @@ export type Value = string | number | null | Sql | Ident;
  * Quotes the value to be used as a shell argument.
  */
 export function shellQuote(s: string): string {
-  return s.match(/^[-=a-zA-Z_0-9:/@.]+$/)
-    ? s
-    : "'" + s.replace(/'/g, "'\\''") + "'";
+  function quote(s: string): string {
+    return "'" + s.replace(/'/g, "'\\''") + "'";
+  }
+
+  return s === ";"
+    ? "\\;"
+    : s.match(/^[-a-z_0-9:/@.=,]+$/is)
+      ? s
+      : s.match(/^((?:--)?[-a-z_0-9]+=)(.*)$/is)
+        ? RegExp.$1 + quote(RegExp.$2)
+        : quote(s);
 }
 
 /**