@rex0220/kintone-sql-tools 1.1.1 → 1.2.0

package/dist-cli/ksql.js

@@ -34,7 +34,7 @@ __export(index_exports, {
   shouldExitOnEmpty: () => shouldExitOnEmpty
 });
 module.exports = __toCommonJS(index_exports);
-var import_fs = require("fs");
+var import_fs2 = require("fs");
 var import_path = require("path");
 var import_readline = require("readline");
 var import_os = require("os");
@@ -3299,6 +3299,62 @@ async function resolveDmlTargetIds(getRecords, app, query, options) {
   };
 }
 
+// src/core/optimization/wherePredicatePushdown.ts
+function extractTableCondition(where, tableAlias) {
+  switch (where.type) {
+    case "BINARY":
+      if (!isSingleTableField(where.left, tableAlias)) return null;
+      if (!isPushDownableRight(where.right)) return null;
+      return where;
+    case "NULL_CHECK":
+      if (!isSingleTableField(where.field, tableAlias)) return null;
+      return where;
+    case "LOGICAL":
+      if (where.op === "AND") {
+        const left = extractTableCondition(where.left, tableAlias);
+        const right = extractTableCondition(where.right, tableAlias);
+        if (left && right) return { ...where, left, right };
+        return left ?? right ?? null;
+      }
+      return referencesOnlyTable(where, tableAlias) ? where : null;
+    case "NOT":
+    case "GROUP":
+      return referencesOnlyTable(where, tableAlias) ? where : null;
+    case "EXISTS":
+      return null;
+  }
+}
+function isSingleTableField(field, tableAlias) {
+  if (field.type !== "FIELD") return false;
+  return field.tableAlias === tableAlias;
+}
+function isPushDownableRight(value) {
+  switch (value.type) {
+    case "STRING":
+    case "NUMBER":
+    case "KINTONE_FUNC":
+    case "IN_LIST":
+      return true;
+    default:
+      return false;
+  }
+}
+function referencesOnlyTable(expr, tableAlias) {
+  switch (expr.type) {
+    case "BINARY":
+      return isSingleTableField(expr.left, tableAlias) && isPushDownableRight(expr.right);
+    case "NULL_CHECK":
+      return isSingleTableField(expr.field, tableAlias);
+    case "LOGICAL":
+      return referencesOnlyTable(expr.left, tableAlias) && referencesOnlyTable(expr.right, tableAlias);
+    case "NOT":
+    case "GROUP":
+      return referencesOnlyTable(expr.expr, tableAlias);
+    case "EXISTS":
+      return false;
+  }
+}
+
 // src/engine/process.ts
 function flatten(record, alias) {
   const row = {};
@@ -3998,7 +4054,21 @@ async function executeFullScanSelect(stmt, client, options, cacheContext) {
   const parallel = options.fetchParallel ?? 1;
   await resolveSubqueries(stmt.where, client, options, cacheContext);
   await resolveSubqueries(stmt.having, client, options, cacheContext);
-  const mainRecords = await fetchTableRecordsForFullScan(
+  const tableConditions = /* @__PURE__ */ new Map();
+  if (stmt.where !== null) {
+    if (stmt.from.alias) {
+      const cond = extractTableCondition(stmt.where, stmt.from.alias);
+      if (cond) tableConditions.set(stmt.from.alias, cond);
+    }
+    for (const join2 of stmt.joins) {
+      if (join2.table.alias) {
+        const cond = extractTableCondition(stmt.where, join2.table.alias);
+        if (cond) tableConditions.set(join2.table.alias, cond);
+      }
+    }
+  }
+  const mainPushDown = stmt.from.alias ? tableConditions.get(stmt.from.alias) ?? null : null;
+  const mainFetch = fetchTableRecordsForFullScan(
     stmt,
     stmt.from,
     client,
@@ -4006,11 +4076,39 @@ async function executeFullScanSelect(stmt, client, options, cacheContext) {
     parallel,
     true,
     options.onLimitReached ?? "error",
-    warnings
+    warnings,
+    mainPushDown
   );
+  const parallelJoins = [];
+  const onOptJoins = [];
+  for (const join2 of stmt.joins) {
+    const jCond = join2.table.alias ? tableConditions.get(join2.table.alias) ?? null : null;
+    if (jCond !== null) {
+      parallelJoins.push({
+        join: join2,
+        promise: fetchTableRecordsForFullScan(
+          stmt,
+          join2.table,
+          client,
+          maxRecords,
+          parallel,
+          false,
+          options.onLimitReached ?? "error",
+          warnings,
+          jCond
+        )
+      });
+    } else {
+      onOptJoins.push(join2);
+    }
+  }
+  const mainRecords = await mainFetch;
   const tables = /* @__PURE__ */ new Map();
   tables.set(stmt.from.alias, mainRecords);
-  const joinFetches = stmt.joins.map(async (join2) => {
+  for (const { join: join2, promise } of parallelJoins) {
+    tables.set(join2.table.alias, await promise);
+  }
+  await Promise.all(onOptJoins.map(async (join2) => {
     const optimized = await tryFetchJoinRecordsBySourceKeys(
       stmt,
       join2,
@@ -4019,7 +4117,8 @@ async function executeFullScanSelect(stmt, client, options, cacheContext) {
       maxRecords,
       parallel,
       options.onLimitReached ?? "error",
-      warnings
+      warnings,
+      null
     );
     const joinRecords = optimized ?? await fetchTableRecordsForFullScan(
       stmt,
@@ -4029,11 +4128,11 @@ async function executeFullScanSelect(stmt, client, options, cacheContext) {
       parallel,
       false,
       options.onLimitReached ?? "error",
-      warnings
+      warnings,
+      null
     );
     tables.set(join2.table.alias, joinRecords);
-  });
-  await Promise.all(joinFetches);
+  }));
   const scalarCache = await resolveScalarColumns(stmt.columns, client, options, cacheContext);
   const optionOrders = await buildOptionOrdersForSelect(stmt, client, cacheContext);
   const sortKinds = await buildSortKindsForSelect(stmt, client, cacheContext);
@@ -4246,13 +4345,15 @@ function processRowToKintoneRecord(row) {
     Object.entries(row).map(([k, v]) => [k, { value: v ?? "" }])
   );
 }
-async function fetchTableRecordsForFullScan(stmt, table, client, maxRecords, parallel, isMainTable, onLimit, warnings) {
+async function fetchTableRecordsForFullScan(stmt, table, client, maxRecords, parallel, isMainTable, onLimit, warnings, pushDownCond = null) {
   const fields = selectToFetchAllFields(stmt, table);
   const onTruncate = (max) => {
     warnings.add(`\u53D6\u5F97\u4E0A\u9650\uFF08${max} \u4EF6\uFF09\u306B\u9054\u3057\u305F\u305F\u3081\u3001${max} \u4EF6\u3067\u6253\u3061\u5207\u3063\u3066\u8868\u793A\u3057\u3066\u3044\u307E\u3059\u3002`);
   };
   if (!table.subtableCode) {
-    const query = isMainTable ? selectToFetchAllParams(stmt, table.appId).query : "";
+    const baseQuery = isMainTable ? selectToFetchAllParams(stmt, table.appId).query : "";
+    const pushQuery = pushDownCond !== null ? whereToKintone(pushDownCond) : "";
+    const query = baseQuery && pushQuery ? `(${baseQuery}) and (${pushQuery})` : baseQuery || pushQuery;
     const resolved = await fetchRecordsForSharedPlan(client.getRecords, table.appId, query, fields, {
       parallel,
       maxRecords,
@@ -4287,7 +4388,7 @@ function splitChunks(items, size) {
 var JOIN_IN_CHUNK_SIZE = 50;
 var JOIN_IN_MAX_CHUNKS = 6;
 var JOIN_IN_MAX_KEYS = JOIN_IN_CHUNK_SIZE * JOIN_IN_MAX_CHUNKS;
-async function tryFetchJoinRecordsBySourceKeys(stmt, join2, tables, client, maxRecords, parallel, onLimit, warnings) {
+async function tryFetchJoinRecordsBySourceKeys(stmt, join2, tables, client, maxRecords, parallel, onLimit, warnings, pushDownCond = null) {
   if (join2.type !== "INNER") return null;
   if (!join2.table.alias) return null;
   if (join2.table.subtableCode) return null;
@@ -4320,7 +4421,7 @@ async function tryFetchJoinRecordsBySourceKeys(stmt, join2, tables, client, maxR
   if (values.length === 0) return [];
   if (values.length > JOIN_IN_MAX_KEYS) {
     warnings.add(
-      `JOIN\u30AD\u30FC\u304C ${values.length} \u4EF6\u306E\u305F\u3081 IN \u6700\u9069\u5316\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3001JOIN\u5148\u3092\u5168\u4EF6\u53D6\u5F97\u3057\u307E\u3059\uFF08\u4E0A\u9650 ${JOIN_IN_MAX_KEYS} \u4EF6\uFF09\u3002`
+      `JOIN\u30AD\u30FC\u304C ${values.length} \u4EF6\u306E\u305F\u3081 ON \u6700\u9069\u5316\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3001JOIN\u5148\u3092\u5168\u4EF6\u53D6\u5F97\u3057\u307E\u3059\uFF08\u4E0A\u9650 ${JOIN_IN_MAX_KEYS} \u4EF6\uFF09\u3002`
     );
     return null;
   }
@@ -4332,7 +4433,8 @@ async function tryFetchJoinRecordsBySourceKeys(stmt, join2, tables, client, maxR
   const merged = [];
   const seen = /* @__PURE__ */ new Set();
   for (const chunk2 of chunks) {
-    const query = `${joinField} in (${chunk2.map(sqlQuote).join(",")})`;
+    const inClause = `${joinField} in (${chunk2.map(sqlQuote).join(",")})`;
+    const query = pushDownCond !== null ? `(${inClause}) and (${whereToKintone(pushDownCond)})` : inClause;
     const resolved = await fetchRecordsForSharedPlan(client.getRecords, join2.table.appId, query, fields, {
       parallel,
       maxRecords,
@@ -5148,19 +5250,21 @@ function buildSelectPlan(stmt, label) {
     lines.push(`  kintone query: ${params.query || "(\u306A\u3057)"}`);
     lines.push(`  fields:        ${params.fields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : params.fields.join(", ")}`);
   } else {
-    const mainParams = selectToFetchAllParams(stmt, stmt.from.appId);
     const mainFields = selectToFetchAllFields(stmt, stmt.from);
-    const mainAlias = stmt.from.alias ? ` AS ${stmt.from.alias}` : "";
-    const mainQ = mainParams.query ? `${mainParams.query}  (\u6B8B\u308A\u306F JS \u8A55\u4FA1)` : "(\u5168\u4EF6\u53D6\u5F97)";
-    lines.push(`  app:           APP${stmt.from.appId}${mainAlias} (${stmt.from.appId})`);
+    const mainAliasStr = stmt.from.alias ? ` AS ${stmt.from.alias}` : "";
+    const mainPushDown = stmt.from.alias && stmt.where ? extractTableCondition(stmt.where, stmt.from.alias) : null;
+    const mainQ = mainPushDown !== null ? whereToKintone(mainPushDown) : "(\u5168\u4EF6\u53D6\u5F97)";
+    lines.push(`  app:           APP${stmt.from.appId}${mainAliasStr} (${stmt.from.appId})`);
     lines.push(`  kintone query: ${mainQ}`);
     lines.push(`  fields:        ${mainFields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : mainFields.join(", ")}`);
     for (const join2 of stmt.joins) {
       const joinFields = selectToFetchAllFields(stmt, join2.table);
-      const joinAlias = join2.table.alias ? ` AS ${join2.table.alias}` : "";
+      const joinAliasStr = join2.table.alias ? ` AS ${join2.table.alias}` : "";
       const joinType = join2.type === "INNER" ? "JOIN" : `${join2.type} JOIN`;
-      lines.push(`  ${joinType}:        APP${join2.table.appId}${joinAlias} (${join2.table.appId})`);
-      lines.push(`  kintone query: (\u5168\u4EF6\u53D6\u5F97)`);
+      const joinPushDown = join2.table.alias && stmt.where ? extractTableCondition(stmt.where, join2.table.alias) : null;
+      const joinQ = joinPushDown !== null ? whereToKintone(joinPushDown) : "(\u5168\u4EF6\u53D6\u5F97)";
+      lines.push(`  ${joinType}:        APP${join2.table.appId}${joinAliasStr} (${join2.table.appId})`);
+      lines.push(`  kintone query: ${joinQ}`);
       lines.push(`  fields:        ${joinFields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : joinFields.join(", ")}`);
     }
   }
@@ -5716,114 +5820,349 @@ function detectSortKind(fieldType, calcFormat) {
   return void 0;
 }
 
-// src/cli/index.ts
-var HELP_TEXT = `ksql - Execute SQL against kintone apps
-
-Usage:
-  ksql [options]
-  ksql -e "<SQL>"
-  ksql -f <file.sql>
-
-Options:
-  -e, --execute <sql>        Execute SQL string
-  -f, --file <path>          Execute SQL file
-  --console                  Start interactive console mode
-  --dry-run                  Parse and show execution plan only
-  --format <type>            Output format: table | json | jsonl | csv | markdown | md
-  --max-records <n>          Max records to fetch (default: 500)
-  --on-limit <mode>          On record limit: error | truncate
-  --timeout <ms>             Request timeout in milliseconds (default: 30000)
-  --config <path>            Config file path (default: ./ksql.config.json)
-  --profile <name>           Profile name in config
-  --base-url <url>           kintone base URL
-  --guest-space-id <id>      Guest space ID (uses /k/guest/<id>/v1 APIs)
-  --auth <type>              Auth type: token | userpass | auto
-  --username <name>          Login username (for userpass auth)
-  --password <pass>          Login password (for userpass auth)
-  --token <token>            Single-app token
-  --token-map <mapping>      App token map (APP100=...,APP101=...)
-  --token-file <path>        JSON file for app token map
-  --app <id>                 Default app id context
-  --diag-record-id <id>      Diagnostic: GET record.json by app+id
-  --no-header                Hide table header
-  --pretty                   Pretty-print JSON output
-  --user-format <mode>       User field format: full | name | code
-  --array-format <mode>      Array field format: full | join
-  --table-format <mode>      Subtable format: full | count
-  --date-format <mode>       Date format: full | local
-  --attachment-format <mode> Attachment format: full | name | fileKey
-  --output <path>            Write output to file
-  --no-color                 Disable ANSI colors
-  --quiet                    Suppress non-result logs
-  --debug                    Show request/response debug logs
-  --debug-url                Show only HTTP request URL debug logs
-  --debug-headers            Show request headers in debug logs (masked)
-  --exit-on-empty            Return exit code 1 when rowCount is 0
-  --allow-dml                Enable UPDATE/DELETE/INSERT/UPSERT execution
-  --yes                      Skip DML confirmation prompt
-  --allow-without-where      Allow UPDATE/DELETE without WHERE
-  --dml-max-rows <n>         Max affected rows for DML guard (default: 100)
-  -h, --help                 Show help
-  -v, --version              Show version
-`;
-function parseArgs(argv) {
-  const out = {
-    help: false,
-    version: false,
-    executeSql: null,
-    filePath: null,
-    console: false,
-    dryRun: false,
-    format: null,
-    maxRecords: null,
-    onLimit: null,
-    timeout: null,
-    configPath: null,
-    profile: null,
-    baseUrl: null,
-    guestSpaceId: null,
-    auth: null,
-    username: null,
-    password: null,
-    token: null,
-    tokenMap: {},
-    tokenFile: null,
-    app: null,
-    diagRecordId: null,
-    noHeader: false,
-    pretty: false,
-    outputPath: null,
-    noColor: false,
-    quiet: false,
-    debug: false,
-    debugUrl: false,
-    debugHeaders: false,
-    exitOnEmpty: false,
-    allowDml: false,
-    yes: false,
-    allowWithoutWhere: false,
-    dmlMaxRows: null,
-    userFormat: null,
-    arrayFormat: null,
-    tableFormat: null,
-    dateFormat: null,
-    attachmentFormat: null
+// src/node/appProfiles.ts
+var import_fs = require("fs");
+function parseTokenMap(raw) {
+  const out = {};
+  if (!raw.trim()) return out;
+  const pairs = raw.split(",");
+  for (const pair of pairs) {
+    const idx = pair.indexOf("=");
+    if (idx <= 0) throw new Error("ArgumentError: --token-map must be APPxxx=token pairs.");
+    const key = normalizeAppKey(pair.slice(0, idx).trim());
+    const value = pair.slice(idx + 1).trim();
+    if (!value) throw new Error(`ArgumentError: token is empty for ${key}.`);
+    out[key] = value;
+  }
+  return out;
+}
+function parseTokenFile(path) {
+  const raw = (0, import_fs.readFileSync)(path, "utf-8");
+  const parsed = JSON.parse(raw);
+  const out = {};
+  for (const [k, v] of Object.entries(parsed)) out[normalizeAppKey(k)] = String(v);
+  return out;
+}
+function normalizeAppKey(v) {
+  const m1 = v.match(/^APP(\d+)$/i);
+  if (m1) return `APP${m1[1]}`;
+  const m2 = v.match(/^(\d+)$/);
+  if (m2) return `APP${m2[1]}`;
+  throw new Error(`ArgumentError: invalid app key "${v}"`);
+}
+function extractAppIds(sql) {
+  const out = /* @__PURE__ */ new Set();
+  for (const m of sql.matchAll(/\bAPP(\d+)\b/gi)) out.add(Number(m[1]));
+  return [...out];
+}
+function isSqlIdentContinue(ch) {
+  if (!ch) return false;
+  const cp = ch.codePointAt(0);
+  return cp >= 65 && cp <= 90 || cp >= 97 && cp <= 122 || cp >= 48 && cp <= 57 || cp === 95 || cp === 36 || cp >= 12352 && cp <= 12543 || cp >= 13312 && cp <= 40959 || cp >= 63744 && cp <= 64255 || cp >= 65281 && cp <= 65376;
+}
+function isProfileNameChar(ch) {
+  if (!ch) return false;
+  const cp = ch.codePointAt(0);
+  return cp >= 65 && cp <= 90 || cp >= 97 && cp <= 122 || cp >= 48 && cp <= 57 || ch === "_" || ch === "-" || ch === "." || ch === "$";
+}
+function tryParseAppProfileToken(sql, start) {
+  const head = sql.slice(start, start + 3);
+  if (head.toUpperCase() !== "APP") return null;
+  const prev = start > 0 ? sql[start - 1] : "";
+  if (isSqlIdentContinue(prev)) return null;
+  let i = start + 3;
+  const digitStart = i;
+  while (i < sql.length && /[0-9]/.test(sql[i])) i++;
+  const digitEnd = i;
+  if (digitEnd === digitStart) return null;
+  if (sql[i] === "$") {
+    i++;
+    const subStart = i;
+    while (i < sql.length && isSqlIdentContinue(sql[i])) i++;
+    if (i === subStart) return null;
+  }
+  const appEnd = i;
+  let profile = null;
+  if (sql[i] === "@") {
+    i++;
+    const pStart = i;
+    while (i < sql.length && isProfileNameChar(sql[i])) i++;
+    if (i === pStart) return null;
+    profile = sql.slice(pStart, i);
+  }
+  const next = i < sql.length ? sql[i] : "";
+  if (isSqlIdentContinue(next)) return null;
+  return {
+    appId: Number(sql.slice(digitStart, digitEnd)),
+    profile,
+    start,
+    digitStart,
+    digitEnd,
+    appEnd,
+    fullEnd: i
   };
-  for (let i = 0; i < argv.length; i++) {
-    const a = argv[i];
-    if (a === "-h" || a === "--help") {
-      out.help = true;
+}
+function collectAppProfileTokens(sql) {
+  const tokens = [];
+  let i = 0;
+  while (i < sql.length) {
+    const ch = sql[i];
+    if (ch === "'") {
+      i++;
+      while (i < sql.length) {
+        if (sql[i] === "'") {
+          i++;
+          if (i < sql.length && sql[i] === "'") {
+            i++;
+            continue;
+          }
+          break;
+        }
+        i++;
+      }
       continue;
     }
-    if (a === "-v" || a === "--version") {
-      out.version = true;
+    if (ch === "`") {
+      i++;
+      while (i < sql.length && sql[i] !== "`") i++;
+      if (i < sql.length) i++;
       continue;
     }
-    if (a === "--console") {
-      out.console = true;
+    if (ch === "-" && sql[i + 1] === "-") {
+      i += 2;
+      while (i < sql.length && sql[i] !== "\n") i++;
       continue;
     }
-    if (a === "--dry-run") {
+    if (ch === "/" && sql[i + 1] === "*") {
+      i += 2;
+      while (i < sql.length) {
+        if (sql[i] === "*" && sql[i + 1] === "/") {
+          i += 2;
+          break;
+        }
+        i++;
+      }
+      continue;
+    }
+    const parsed = tryParseAppProfileToken(sql, i);
+    if (!parsed) {
+      i++;
+      continue;
+    }
+    tokens.push(parsed);
+    i = parsed.fullEnd;
+  }
+  return tokens;
+}
+function nextVirtualAppId(used) {
+  let id = 9e8;
+  while (used.has(id)) id++;
+  used.add(id);
+  return id;
+}
+function normalizeSqlAppProfiles(sql, defaultProfile = "dev") {
+  const tokens = collectAppProfileTokens(sql);
+  const hasProfileSyntax = tokens.some((t) => t.profile !== null);
+  const profilesByApp = /* @__PURE__ */ new Map();
+  const normalizedProfile = (profile) => profile ?? defaultProfile;
+  for (const t of tokens) {
+    const p = normalizedProfile(t.profile);
+    let set = profilesByApp.get(t.appId);
+    if (!set) {
+      set = /* @__PURE__ */ new Set();
+      profilesByApp.set(t.appId, set);
+    }
+    set.add(p.toLowerCase());
+  }
+  const usedAppIds = new Set(tokens.map((t) => t.appId));
+  const pairToMapped = /* @__PURE__ */ new Map();
+  const appBindingByMappedApp = /* @__PURE__ */ new Map();
+  for (const [appId, pSet] of profilesByApp.entries()) {
+    const profiles = [...pSet].sort();
+    if (profiles.length <= 1) continue;
+    for (const pLower of profiles) {
+      const mapped = nextVirtualAppId(usedAppIds);
+      pairToMapped.set(`${appId}@${pLower}`, mapped);
+      appBindingByMappedApp.set(mapped, { appId, profile: pLower });
+    }
+  }
+  const out = [];
+  let cursor = 0;
+  for (const t of tokens) {
+    const p = normalizedProfile(t.profile);
+    const pLower = p.toLowerCase();
+    const mapped = pairToMapped.get(`${t.appId}@${pLower}`) ?? t.appId;
+    appBindingByMappedApp.set(mapped, { appId: t.appId, profile: pLower });
+    out.push(sql.slice(cursor, t.start));
+    out.push(sql.slice(t.start, t.digitStart));
+    out.push(String(mapped));
+    out.push(sql.slice(t.digitEnd, t.appEnd));
+    cursor = t.fullEnd;
+  }
+  out.push(sql.slice(cursor));
+  return {
+    normalizedSql: out.join(""),
+    hasProfileSyntax,
+    appBindingByMappedApp
+  };
+}
+function buildCacheContext(defaultProfile, appBindingByMappedApp) {
+  if (appBindingByMappedApp.size === 0) return `default:${defaultProfile.toLowerCase()}`;
+  const pairs = [...appBindingByMappedApp.entries()].sort((a, b) => a[0] - b[0]).map(([mappedAppId, b]) => `M${mappedAppId}=APP${b.appId}@${b.profile}`);
+  return `apps:${pairs.join(",")}`;
+}
+function formatResolvedAppProfiles(sql, defaultProfile) {
+  const parsed = normalizeSqlAppProfiles(sql, defaultProfile);
+  if (parsed.appBindingByMappedApp.size === 0) return "(none)";
+  return [...parsed.appBindingByMappedApp.values()].map((b) => `APP${b.appId}->${b.profile}`).join(", ");
+}
+
+// src/node/dmlGuard.ts
+function getStatementType(stmt) {
+  if (!stmt || typeof stmt !== "object") return "UNKNOWN";
+  const obj = stmt;
+  return typeof obj.type === "string" ? obj.type : "UNKNOWN";
+}
+function isDmlType(type) {
+  return type === "INSERT" || type === "INSERT_SELECT" || type === "UPDATE" || type === "DELETE" || type === "UPSERT" || type === "UPSERT_SELECT" || type === "REORDER";
+}
+function hasWhereClause(stmt) {
+  if (!stmt || typeof stmt !== "object") return false;
+  const obj = stmt;
+  return obj.where !== null && obj.where !== void 0;
+}
+function isNoFromSelectStatement(stmt) {
+  if (!stmt || typeof stmt !== "object") return false;
+  const obj = stmt;
+  return obj.type === "SELECT" && obj.from?.appId === 0 && obj.from?.cteName === "__NO_FROM__";
+}
+function getInsertValuesCount(stmt) {
+  if (!stmt || typeof stmt !== "object") return null;
+  const obj = stmt;
+  if (obj.type !== "INSERT") return null;
+  return Array.isArray(obj.values) ? obj.values.length : null;
+}
+function collectDmlTargetFields(stmt) {
+  if (!stmt || typeof stmt !== "object") return [];
+  const obj = stmt;
+  if (!obj.type) return [];
+  if (obj.type === "UPDATE") {
+    return (obj.assignments ?? []).map((a) => a.field).filter((f) => Boolean(f));
+  }
+  if (obj.type === "INSERT" || obj.type === "INSERT_SELECT" || obj.type === "UPSERT" || obj.type === "UPSERT_SELECT") {
+    return [...obj.fields ?? [], ...obj.keyFields ?? []];
+  }
+  return [];
+}
+
+// src/cli/index.ts
+var HELP_TEXT = `ksql - Execute SQL against kintone apps
+
+Usage:
+  ksql [options]
+  ksql -e "<SQL>"
+  ksql -f <file.sql>
+
+Options:
+  -e, --execute <sql>        Execute SQL string
+  -f, --file <path>          Execute SQL file
+  --console                  Start interactive console mode
+  --dry-run                  Parse and show execution plan only
+  --format <type>            Output format: table | json | jsonl | csv | markdown | md
+  --max-records <n>          Max records to fetch (default: 500)
+  --on-limit <mode>          On record limit: error | truncate
+  --timeout <ms>             Request timeout in milliseconds (default: 30000)
+  --config <path>            Config file path (default: ./ksql.config.json)
+  --profile <name>           Profile name in config
+  --base-url <url>           kintone base URL
+  --guest-space-id <id>      Guest space ID (uses /k/guest/<id>/v1 APIs)
+  --auth <type>              Auth type: token | userpass | auto
+  --username <name>          Login username (for userpass auth)
+  --password <pass>          Login password (for userpass auth)
+  --token <token>            Single-app token
+  --token-map <mapping>      App token map (APP100=...,APP101=...)
+  --token-file <path>        JSON file for app token map
+  --app <id>                 Default app id context
+  --diag-record-id <id>      Diagnostic: GET record.json by app+id
+  --no-header                Hide table header
+  --pretty                   Pretty-print JSON output
+  --user-format <mode>       User field format: full | name | code
+  --array-format <mode>      Array field format: full | join
+  --table-format <mode>      Subtable format: full | count
+  --date-format <mode>       Date format: full | local
+  --attachment-format <mode> Attachment format: full | name | fileKey
+  --output <path>            Write output to file
+  --no-color                 Disable ANSI colors
+  --quiet                    Suppress non-result logs
+  --debug                    Show request/response debug logs
+  --debug-url                Show only HTTP request URL debug logs
+  --debug-headers            Show request headers in debug logs (masked)
+  --exit-on-empty            Return exit code 1 when rowCount is 0
+  --allow-dml                Enable UPDATE/DELETE/INSERT/UPSERT/REORDER execution
+  --yes                      Skip DML confirmation prompt
+  --allow-without-where      Allow UPDATE/DELETE without WHERE
+  --dml-max-rows <n>         Max affected rows for DML guard (default: 100)
+  -h, --help                 Show help
+  -v, --version              Show version
+`;
+function parseArgs(argv) {
+  const out = {
+    help: false,
+    version: false,
+    executeSql: null,
+    filePath: null,
+    console: false,
+    dryRun: false,
+    format: null,
+    maxRecords: null,
+    onLimit: null,
+    timeout: null,
+    configPath: null,
+    profile: null,
+    baseUrl: null,
+    guestSpaceId: null,
+    auth: null,
+    username: null,
+    password: null,
+    token: null,
+    tokenMap: {},
+    tokenFile: null,
+    app: null,
+    diagRecordId: null,
+    noHeader: false,
+    pretty: false,
+    outputPath: null,
+    noColor: false,
+    quiet: false,
+    debug: false,
+    debugUrl: false,
+    debugHeaders: false,
+    exitOnEmpty: false,
+    allowDml: false,
+    yes: false,
+    allowWithoutWhere: false,
+    dmlMaxRows: null,
+    userFormat: null,
+    arrayFormat: null,
+    tableFormat: null,
+    dateFormat: null,
+    attachmentFormat: null
+  };
+  for (let i = 0; i < argv.length; i++) {
+    const a = argv[i];
+    if (a === "-h" || a === "--help") {
+      out.help = true;
+      continue;
+    }
+    if (a === "-v" || a === "--version") {
+      out.version = true;
+      continue;
+    }
+    if (a === "--console") {
+      out.console = true;
+      continue;
+    }
+    if (a === "--dry-run") {
       out.dryRun = true;
       continue;
     }
@@ -6024,216 +6363,14 @@ function parseArgs(argv) {
 }
 function getVersion() {
   const pkgPath = (0, import_path.resolve)(__dirname, "../package.json");
-  const raw = (0, import_fs.readFileSync)(pkgPath, "utf-8");
+  const raw = (0, import_fs2.readFileSync)(pkgPath, "utf-8");
   const pkg = JSON.parse(raw);
   return pkg.version ?? "0.0.0";
 }
 function loadConfig(configPath) {
-  const raw = (0, import_fs.readFileSync)(configPath, "utf-8");
+  const raw = (0, import_fs2.readFileSync)(configPath, "utf-8");
   return JSON.parse(raw);
 }
-function parseTokenMap(raw) {
-  const out = {};
-  if (!raw.trim()) return out;
-  const pairs = raw.split(",");
-  for (const pair of pairs) {
-    const idx = pair.indexOf("=");
-    if (idx <= 0) throw new Error("ArgumentError: --token-map must be APPxxx=token pairs.");
-    const key = normalizeAppKey(pair.slice(0, idx).trim());
-    const value = pair.slice(idx + 1).trim();
-    if (!value) throw new Error(`ArgumentError: token is empty for ${key}.`);
-    out[key] = value;
-  }
-  return out;
-}
-function parseTokenFile(path) {
-  const raw = (0, import_fs.readFileSync)(path, "utf-8");
-  const parsed = JSON.parse(raw);
-  const out = {};
-  for (const [k, v] of Object.entries(parsed)) out[normalizeAppKey(k)] = String(v);
-  return out;
-}
-function normalizeAppKey(v) {
-  const m1 = v.match(/^APP(\d+)$/i);
-  if (m1) return `APP${m1[1]}`;
-  const m2 = v.match(/^(\d+)$/);
-  if (m2) return `APP${m2[1]}`;
-  throw new Error(`ArgumentError: invalid app key "${v}"`);
-}
-function extractAppIds(sql) {
-  const out = /* @__PURE__ */ new Set();
-  for (const m of sql.matchAll(/\bAPP(\d+)\b/gi)) out.add(Number(m[1]));
-  return [...out];
-}
-function isSqlIdentContinue(ch) {
-  if (!ch) return false;
-  const cp = ch.codePointAt(0);
-  return cp >= 65 && cp <= 90 || // A-Z
-  cp >= 97 && cp <= 122 || // a-z
-  cp >= 48 && cp <= 57 || // 0-9
-  cp === 95 || // _
-  cp === 36 || // $
-  cp >= 12352 && cp <= 12543 || cp >= 13312 && cp <= 40959 || cp >= 63744 && cp <= 64255 || cp >= 65281 && cp <= 65376;
-}
-function isProfileNameChar(ch) {
-  if (!ch) return false;
-  const cp = ch.codePointAt(0);
-  return cp >= 65 && cp <= 90 || // A-Z
-  cp >= 97 && cp <= 122 || // a-z
-  cp >= 48 && cp <= 57 || // 0-9
-  ch === "_" || ch === "-" || ch === "." || ch === "$";
-}
-function tryParseAppProfileToken(sql, start) {
-  const head = sql.slice(start, start + 3);
-  if (head.toUpperCase() !== "APP") return null;
-  const prev = start > 0 ? sql[start - 1] : "";
-  if (isSqlIdentContinue(prev)) return null;
-  let i = start + 3;
-  const digitStart = i;
-  while (i < sql.length && /[0-9]/.test(sql[i])) i++;
-  const digitEnd = i;
-  if (digitEnd === digitStart) return null;
-  if (sql[i] === "$") {
-    i++;
-    const subStart = i;
-    while (i < sql.length && isSqlIdentContinue(sql[i])) i++;
-    if (i === subStart) return null;
-  }
-  const appEnd = i;
-  let profile = null;
-  if (sql[i] === "@") {
-    i++;
-    const pStart = i;
-    while (i < sql.length && isProfileNameChar(sql[i])) i++;
-    if (i === pStart) return null;
-    profile = sql.slice(pStart, i);
-  }
-  const next = i < sql.length ? sql[i] : "";
-  if (isSqlIdentContinue(next)) return null;
-  return {
-    appId: Number(sql.slice(digitStart, digitEnd)),
-    profile,
-    start,
-    digitStart,
-    digitEnd,
-    appEnd,
-    fullEnd: i
-  };
-}
-function collectAppProfileTokens(sql) {
-  const tokens = [];
-  let i = 0;
-  while (i < sql.length) {
-    const ch = sql[i];
-    if (ch === "'") {
-      i++;
-      while (i < sql.length) {
-        if (sql[i] === "'") {
-          i++;
-          if (i < sql.length && sql[i] === "'") {
-            i++;
-            continue;
-          }
-          break;
-        }
-        i++;
-      }
-      continue;
-    }
-    if (ch === "`") {
-      i++;
-      while (i < sql.length && sql[i] !== "`") i++;
-      if (i < sql.length) i++;
-      continue;
-    }
-    if (ch === "-" && sql[i + 1] === "-") {
-      i += 2;
-      while (i < sql.length && sql[i] !== "\n") i++;
-      continue;
-    }
-    if (ch === "/" && sql[i + 1] === "*") {
-      i += 2;
-      while (i < sql.length) {
-        if (sql[i] === "*" && sql[i + 1] === "/") {
-          i += 2;
-          break;
-        }
-        i++;
-      }
-      continue;
-    }
-    const parsed = tryParseAppProfileToken(sql, i);
-    if (!parsed) {
-      i++;
-      continue;
-    }
-    tokens.push(parsed);
-    i = parsed.fullEnd;
-  }
-  return tokens;
-}
-function nextVirtualAppId(used) {
-  let id = 9e8;
-  while (used.has(id)) id++;
-  used.add(id);
-  return id;
-}
-function normalizeSqlAppProfiles(sql, defaultProfile = "dev") {
-  const tokens = collectAppProfileTokens(sql);
-  const hasProfileSyntax = tokens.some((t) => t.profile !== null);
-  const profilesByApp = /* @__PURE__ */ new Map();
-  const normalizedProfile = (profile) => profile ?? defaultProfile;
-  for (const t of tokens) {
-    const p = normalizedProfile(t.profile);
-    let set = profilesByApp.get(t.appId);
-    if (!set) {
-      set = /* @__PURE__ */ new Set();
-      profilesByApp.set(t.appId, set);
-    }
-    set.add(p.toLowerCase());
-  }
-  const usedAppIds = new Set(tokens.map((t) => t.appId));
-  const pairToMapped = /* @__PURE__ */ new Map();
-  const appBindingByMappedApp = /* @__PURE__ */ new Map();
-  for (const [appId, pSet] of profilesByApp.entries()) {
-    const profiles = [...pSet].sort();
-    if (profiles.length <= 1) continue;
-    for (const pLower of profiles) {
-      const mapped = nextVirtualAppId(usedAppIds);
-      pairToMapped.set(`${appId}@${pLower}`, mapped);
-      appBindingByMappedApp.set(mapped, { appId, profile: pLower });
-    }
-  }
-  const out = [];
-  let cursor = 0;
-  for (const t of tokens) {
-    const p = normalizedProfile(t.profile);
-    const pLower = p.toLowerCase();
-    const mapped = pairToMapped.get(`${t.appId}@${pLower}`) ?? t.appId;
-    appBindingByMappedApp.set(mapped, { appId: t.appId, profile: pLower });
-    out.push(sql.slice(cursor, t.start));
-    out.push(sql.slice(t.start, t.digitStart));
-    out.push(String(mapped));
-    out.push(sql.slice(t.digitEnd, t.appEnd));
-    cursor = t.fullEnd;
-  }
-  out.push(sql.slice(cursor));
-  return {
-    normalizedSql: out.join(""),
-    hasProfileSyntax,
-    appBindingByMappedApp
-  };
-}
-function buildCacheContext(defaultProfile, appBindingByMappedApp) {
-  if (appBindingByMappedApp.size === 0) return `default:${defaultProfile.toLowerCase()}`;
-  const pairs = [...appBindingByMappedApp.entries()].sort((a, b) => a[0] - b[0]).map(([mappedAppId, b]) => `M${mappedAppId}=APP${b.appId}@${b.profile}`);
-  return `apps:${pairs.join(",")}`;
-}
-function formatResolvedAppProfiles(sql, defaultProfile) {
-  const parsed = normalizeSqlAppProfiles(sql, defaultProfile);
-  if (parsed.appBindingByMappedApp.size === 0) return "(none)";
-  return [...parsed.appBindingByMappedApp.values()].map((b) => `APP${b.appId}->${b.profile}`).join(", ");
-}
 function resolveTokenValue(raw) {
   if (raw.startsWith("env:")) {
     const envKey = raw.slice(4);
@@ -6275,42 +6412,6 @@ function envAuth(name) {
   if (v === "token" || v === "userpass" || v === "auto") return v;
   return null;
 }
-function isDmlType(type) {
-  return type === "INSERT" || type === "INSERT_SELECT" || type === "UPDATE" || type === "DELETE" || type === "UPSERT" || type === "UPSERT_SELECT";
-}
-function hasWhereClause(stmt) {
-  if (!stmt || typeof stmt !== "object") return false;
-  const obj = stmt;
-  return obj.where !== null && obj.where !== void 0;
-}
-function getStatementType(stmt) {
-  if (!stmt || typeof stmt !== "object") return "UNKNOWN";
-  const obj = stmt;
-  return typeof obj.type === "string" ? obj.type : "UNKNOWN";
-}
-function isNoFromSelectStatement(stmt) {
-  if (!stmt || typeof stmt !== "object") return false;
-  const obj = stmt;
-  return obj.type === "SELECT" && obj.from?.appId === 0 && obj.from?.cteName === "__NO_FROM__";
-}
-function getInsertValuesCount(stmt) {
-  if (!stmt || typeof stmt !== "object") return null;
-  const obj = stmt;
-  if (obj.type !== "INSERT") return null;
-  return Array.isArray(obj.values) ? obj.values.length : null;
-}
-function collectDmlTargetFields(stmt) {
-  if (!stmt || typeof stmt !== "object") return [];
-  const obj = stmt;
-  if (!obj.type) return [];
-  if (obj.type === "UPDATE") {
-    return (obj.assignments ?? []).map((a) => a.field).filter((f) => Boolean(f));
-  }
-  if (obj.type === "INSERT" || obj.type === "INSERT_SELECT" || obj.type === "UPSERT" || obj.type === "UPSERT_SELECT") {
-    return [...obj.fields ?? [], ...obj.keyFields ?? []];
-  }
-  return [];
-}
 function normalizeUnique(values) {
   const out = [];
   const seen = /* @__PURE__ */ new Set();
@@ -6695,9 +6796,9 @@ function getHistoryPath() {
 }
 function loadHistory(maxItems = 200) {
   const p = getHistoryPath();
-  if (!(0, import_fs.existsSync)(p)) return [];
+  if (!(0, import_fs2.existsSync)(p)) return [];
   try {
-    const raw = (0, import_fs.readFileSync)(p, "utf-8");
+    const raw = (0, import_fs2.readFileSync)(p, "utf-8");
     const lines = raw.split(/\r?\n/).map((s) => s.trim()).filter((s) => s.length > 0);
     return lines.slice(-maxItems);
   } catch {
@@ -6707,26 +6808,26 @@ function loadHistory(maxItems = 200) {
 function appendHistory(sql) {
   const p = getHistoryPath();
   try {
-    (0, import_fs.appendFileSync)(p, `${sql.replace(/\s+/g, " ").trim()}
+    (0, import_fs2.appendFileSync)(p, `${sql.replace(/\s+/g, " ").trim()}
 `, "utf-8");
   } catch {
   }
 }
 function editBufferWithExternalEditor(current) {
   const editor = process.env.KSQL_EDITOR ?? process.env.VISUAL ?? process.env.EDITOR ?? (process.platform === "win32" ? "notepad" : "vi");
-  const dir = (0, import_fs.mkdtempSync)((0, import_path.join)((0, import_os.tmpdir)(), "ksql-edit-"));
+  const dir = (0, import_fs2.mkdtempSync)((0, import_path.join)((0, import_os.tmpdir)(), "ksql-edit-"));
   const filePath = (0, import_path.join)(dir, "query.sql");
   try {
-    (0, import_fs.writeFileSync)(filePath, current, "utf-8");
+    (0, import_fs2.writeFileSync)(filePath, current, "utf-8");
     const cmd = `"${editor}" "${filePath}"`;
     const res = (0, import_child_process.spawnSync)(cmd, { stdio: "inherit", shell: true });
     if (res.error) throw res.error;
     if ((res.status ?? 0) !== 0) {
       throw new Error(`Editor exited with code ${res.status ?? 1}`);
     }
-    return (0, import_fs.readFileSync)(filePath, "utf-8").replace(/\r\n/g, "\n");
+    return (0, import_fs2.readFileSync)(filePath, "utf-8").replace(/\r\n/g, "\n");
   } finally {
-    (0, import_fs.rmSync)(dir, { recursive: true, force: true });
+    (0, import_fs2.rmSync)(dir, { recursive: true, force: true });
   }
 }
 async function runConsole(base) {
@@ -6908,11 +7009,11 @@ async function runConsole(base) {
           }
           try {
             if (meta.append) {
-              (0, import_fs.appendFileSync)(meta.path, lastOutput, "utf-8");
+              (0, import_fs2.appendFileSync)(meta.path, lastOutput, "utf-8");
               process.stdout.write(`saved (append): ${meta.path}
 `);
             } else {
-              (0, import_fs.writeFileSync)(meta.path, lastOutput, "utf-8");
+              (0, import_fs2.writeFileSync)(meta.path, lastOutput, "utf-8");
               process.stdout.write(`saved: ${meta.path}
 `);
             }
@@ -7023,7 +7124,7 @@ async function run() {
   let isDmlStatement = false;
   if (args.diagRecordId === null) {
     sql = args.executeSql;
-    if (!sql && args.filePath) sql = (0, import_fs.readFileSync)(args.filePath, "utf-8");
+    if (!sql && args.filePath) sql = (0, import_fs2.readFileSync)(args.filePath, "utf-8");
     if (!sql || !sql.trim()) {
       process.stderr.write("ArgumentError: SQL is empty.\n");
       return 2;
@@ -7045,7 +7146,7 @@ async function run() {
       isDmlStatement = isDmlType(stmtType);
       hasWhere = hasWhereClause(stmt);
       insertValuesCount = getInsertValuesCount(stmt);
-      const supported = stmtType === "SELECT" || isDmlStatement;
+      const supported = stmtType === "SELECT" || stmtType === "UNION" || stmtType === "WITH" || stmtType === "EXPLAIN" || stmtType === "SHOW_APPS" || stmtType === "DESCRIBE" || isDmlStatement;
       if (!supported) {
         process.stderr.write(`ArgumentError: unsupported statement type in CLI: ${stmtType}
 `);
@@ -7093,7 +7194,7 @@ async function run() {
   const appIds = sql ? extractAppIds(sql) : [];
   const defaultApp = args.app ?? envInt("KSQL_APP") ?? profile.app ?? null;
   if (appIds.length === 0 && defaultApp !== null) appIds.push(defaultApp);
-  const allowNoFromSelect = isNoFromSelectStatement(parsedStmt);
+  const allowNoFromSelect = isNoFromSelectStatement(parsedStmt) || stmtType === "SHOW_APPS";
   if (appIds.length === 0 && !allowNoFromSelect && !args.dryRun && args.diagRecordId === null) {
     process.stderr.write("ArgumentError: no APPxxx found in SQL and --app is not set.\n");
     return 2;
@@ -7104,7 +7205,7 @@ async function run() {
       return 2;
     }
     if (!allowDml) {
-      process.stderr.write("ArgumentError: DML is disabled. Use --allow-dml to enable UPDATE/DELETE/INSERT/UPSERT.\n");
+      process.stderr.write("ArgumentError: DML is disabled. Use --allow-dml to enable UPDATE/DELETE/INSERT/UPSERT/REORDER.\n");
       return 2;
     }
     if ((stmtType === "UPDATE" || stmtType === "DELETE") && !hasWhere && !allowWithoutWhere) {
@@ -7380,7 +7481,7 @@ query=${label}`);
     });
     if (result.type !== "SELECT") {
       const output2 = buildMutationOutput(result, format, noHeader, pretty);
-      if (outputPath) (0, import_fs.writeFileSync)(outputPath, `${output2}
+      if (outputPath) (0, import_fs2.writeFileSync)(outputPath, `${output2}
 `, "utf-8");
       else if (output2) process.stdout.write(`${output2}
 `);
@@ -7389,7 +7490,7 @@ query=${label}`);
       return 0;
     }
     const output = buildOutput(result, format, noHeader, pretty, displayOptions);
-    if (outputPath) (0, import_fs.writeFileSync)(outputPath, `${output}
+    if (outputPath) (0, import_fs2.writeFileSync)(outputPath, `${output}
 `, "utf-8");
     else if (output) process.stdout.write(`${output}
 `);