@metabase/cli 0.3.2 → 0.4.0

package/dist/cli.mjs

@@ -189,18 +189,283 @@ function toAliasArray(alias) {
 	if (alias === void 0) return [];
 	return Array.isArray(alias) ? alias : [alias];
 }
-function normalizeFlag(value) {
-	return value.replace(/^-+/, "").replace(/-/g, "").toLowerCase();
-}
-function flagConsumesValue(token, argsDef) {
-	if (token.includes("=")) return false;
-	const name = normalizeFlag(token);
+const NEGATION_PREFIX = "--no-";
+const INLINE_VALUE = "=";
+const LONG_PREFIX = "--";
+const SHORT_PREFIX = "-";
+const SHORT_FLAG_LENGTH = 2;
+const WORD_SEPARATORS = /* @__PURE__ */ new Set([
+	"-",
+	"_",
+	"/",
+	"."
+]);
+const NEGATIVE_NUMBER = /^-\.?\d/;
+const DIGIT = /\d/;
+function flagSpellings(argsDef) {
+	const spellings = /* @__PURE__ */ new Map();
 	for (const [key, def] of Object.entries(argsDef)) {
-		if (def.type !== "string" && def.type !== "enum") continue;
-		if (normalizeFlag(key) === name) return true;
-		if (toAliasArray(def.alias).some((alias) => normalizeFlag(alias) === name)) return true;
+		if (def.type === "positional") continue;
+		const takes = flagTakes(def);
+		const aliases = "alias" in def ? toAliasArray(def.alias) : [];
+		const words = splitWords(key);
+		for (const name of /* @__PURE__ */ new Set([
+			key,
+			camelCase(words),
+			kebabCase(words),
+			...aliases
+		])) {
+			spellings.set(`${LONG_PREFIX}${name}`, {
+				key,
+				negated: false,
+				takes
+			});
+			spellings.set(`${NEGATION_PREFIX}${name}`, {
+				key,
+				negated: true,
+				takes
+			});
+		}
+		for (const letter of aliases.filter((alias) => alias.length === 1)) spellings.set(`${SHORT_PREFIX}${letter}`, {
+			key,
+			negated: false,
+			takes
+		});
+	}
+	return spellings;
+}
+function flagTakes(def) {
+	if (def.type === "string" && "list" in def && def.list === true) return "list";
+	return def.type === "string" || def.type === "enum" ? "value" : "nothing";
+}
+function parseFlagToken(token, spellings) {
+	const equals = token.indexOf(INLINE_VALUE);
+	const name = equals === -1 ? token : token.slice(0, equals);
+	const inlineValue = equals === -1 ? null : readInlineValue(token, name);
+	const flag = spellings.get(name);
+	if (flag !== void 0) return {
+		name,
+		flag: flag.negated && inlineValue !== null ? null : flag,
+		inlineValue
+	};
+	const short = name.slice(0, SHORT_FLAG_LENGTH);
+	const shortFlag = name.startsWith(LONG_PREFIX) ? void 0 : spellings.get(short);
+	if (shortFlag !== void 0 && shortFlag.takes !== "nothing") return {
+		name: short,
+		flag: shortFlag,
+		inlineValue: readInlineValue(token, short)
+	};
+	return {
+		name,
+		flag: null,
+		inlineValue
+	};
+}
+function readInlineValue(token, name) {
+	const start = name.startsWith(LONG_PREFIX) ? name.length + 1 : name.length;
+	return token.slice(start);
+}
+function isFlagToken(token) {
+	return token.startsWith(SHORT_PREFIX) && token !== SHORT_PREFIX && !NEGATIVE_NUMBER.test(token);
+}
+function isNegativeNumber(token) {
+	return NEGATIVE_NUMBER.test(token);
+}
+function* readArgv(rawArgs, spellings, start = 0) {
+	let index = start;
+	while (index < rawArgs.length) {
+		const token = rawArgs[index];
+		if (token === void 0) return;
+		if (token === "--") {
+			yield {
+				kind: "separator",
+				index
+			};
+			for (const [offset, rest] of rawArgs.slice(index + 1).entries()) yield {
+				kind: "positional",
+				index: index + 1 + offset,
+				token: rest
+			};
+			return;
+		}
+		if (!isFlagToken(token)) {
+			yield {
+				kind: "positional",
+				index,
+				token
+			};
+			index += 1;
+			continue;
+		}
+		const item = readFlag(rawArgs, index, parseFlagToken(token, spellings));
+		yield item;
+		index = item.end;
+	}
+}
+function readFlag(rawArgs, index, parsed) {
+	const { flag } = parsed;
+	const consumesNext = flag !== null && flag.takes !== "nothing" && !flag.negated && parsed.inlineValue === null;
+	const next = consumesNext ? rawArgs[index + 1] : void 0;
+	const end = next === void 0 ? index + 1 : index + 2;
+	const value = consumesNext ? next ?? null : parsed.inlineValue;
+	return {
+		kind: "flag",
+		index,
+		...parsed,
+		consumesNext,
+		value,
+		end
+	};
+}
+function splitWords(name) {
+	const words = [];
+	let word = "";
+	let previousUpper = null;
+	for (const char of name) {
+		if (WORD_SEPARATORS.has(char)) {
+			words.push(word);
+			word = "";
+			previousUpper = null;
+			continue;
+		}
+		const upper = DIGIT.test(char) ? null : char !== char.toLowerCase();
+		if (previousUpper === false && upper === true) {
+			words.push(word);
+			word = char;
+		} else if (previousUpper === true && upper === false && word.length > 1) {
+			words.push(word.slice(0, -1));
+			word = `${word.slice(-1)}${char}`;
+		} else word += char;
+		previousUpper = upper;
 	}
-	return false;
+	words.push(word);
+	return words;
+}
+function camelCase(words) {
+	const pascal = words.map((word) => `${word.charAt(0).toUpperCase()}${word.slice(1)}`).join("");
+	return `${pascal.charAt(0).toLowerCase()}${pascal.slice(1)}`;
+}
+function kebabCase(words) {
+	return words.map((word) => word.toLowerCase()).join("-");
+}
+function parseCsv(raw) {
+	return raw.split(",").map((part) => part.trim()).filter((part) => part.length > 0);
+}
+function parseEnumCsv(raw, schema, flagName) {
+	if (raw === void 0) return;
+	const allowed = Object.values(schema.enum).join(", ");
+	const parts = parseCsv(raw);
+	if (parts.length === 0) throw new ConfigError(`invalid ${flagName} value: "${raw}" (expected one of: ${allowed})`);
+	const accepted = [];
+	const rejected = [];
+	for (const part of parts) {
+		const result = schema.safeParse(part);
+		if (result.success) accepted.push(result.data);
+		else rejected.push(part);
+	}
+	if (rejected.length > 0) throw new ConfigError(`invalid ${flagName} value: ${rejected.join(", ")} (expected one of: ${allowed})`);
+	return accepted;
+}
+function parseEnum(raw, schema, flagName) {
+	if (raw === void 0 || raw === "") return;
+	const result = schema.safeParse(raw);
+	if (!result.success) throw new ConfigError(`invalid ${flagName} value: "${raw}" (expected one of: ${Object.values(schema.enum).join(", ")})`);
+	return result.data;
+}
+//#endregion
+//#region src/commands/argv.ts
+const BUILTIN_FLAGS = [
+	"--help",
+	"-h",
+	"--version",
+	"-v"
+];
+const SHELL_SAFE_WORD = /^[\w.,:/@%+=-]+$/;
+function commandSpellings(argsDef) {
+	const builtins = BUILTIN_FLAGS.map((flag) => [flag, {
+		key: flag,
+		negated: false,
+		takes: "nothing"
+	}]);
+	return new Map([...builtins, ...flagSpellings(argsDef)]);
+}
+function separatePositionals(rawArgs, argsDef) {
+	const flagTokens = [];
+	const positionals = [];
+	for (const item of readArgv(rawArgs, commandSpellings(argsDef))) if (item.kind === "flag") flagTokens.push(...rawArgs.slice(item.index, item.end));
+	else if (item.kind === "positional") positionals.push(item.token);
+	if (!positionals.some(isNegativeNumber)) return [...rawArgs];
+	return [
+		...flagTokens,
+		"--",
+		...positionals
+	];
+}
+function givenFlagKeys(rawArgs, argsDef) {
+	const keys = /* @__PURE__ */ new Set();
+	for (const item of readArgv(rawArgs, flagSpellings(argsDef))) if (item.kind === "flag" && item.flag !== null && !item.flag.negated) keys.add(item.flag.key);
+	return keys;
+}
+function assertArgv(rawArgs, argsDef) {
+	const spellings = commandSpellings(argsDef);
+	const valueFlags = [];
+	const positionals = [];
+	for (const item of readArgv(rawArgs, spellings)) if (item.kind === "positional") positionals.push(item.token);
+	else if (item.kind === "flag") {
+		const valueFlag = readValueFlag(item, spellings);
+		if (valueFlag !== null) valueFlags.push(valueFlag);
+	}
+	assertEachGivenOnce(valueFlags);
+	assertPositionalCount(positionals, argsDef);
+}
+function readValueFlag(item, spellings) {
+	const { flag, name } = item;
+	if (flag === null) throw new ConfigError(`unknown flag: ${name}`);
+	if (flag.takes === "nothing") return null;
+	if (flag.negated) throw new ConfigError(`${name}: ${`--${name.slice(5)}`} takes a value, so it cannot be negated`);
+	return {
+		name,
+		flag,
+		value: readFlagValue(item, spellings)
+	};
+}
+function assertPositionalCount(positionals, argsDef) {
+	const declared = Object.entries(argsDef).filter(([, def]) => def.type === "positional").map(([name]) => `<${name}>`);
+	const extra = positionals[declared.length];
+	if (extra === void 0) return;
+	throw new ConfigError(`unexpected argument: "${extra}" (${declared.length === 0 ? "this command takes no positional arguments" : `this command takes ${declared.join(" ")}; quote an argument that contains spaces`})`);
+}
+function assertEachGivenOnce(valueFlags) {
+	const first = /* @__PURE__ */ new Map();
+	for (const repeat of valueFlags) {
+		const earlier = first.get(repeat.flag.key);
+		if (earlier === void 0) {
+			first.set(repeat.flag.key, repeat);
+			continue;
+		}
+		const also = earlier.name === repeat.name ? "" : ` (also as ${earlier.name})`;
+		const joined = joinedSpelling(repeat, valueFlags);
+		throw new ConfigError(`${repeat.name} is given more than once${also}; pass it once${joined}`);
+	}
+}
+function joinedSpelling(repeat, valueFlags) {
+	if (repeat.flag.takes !== "list") return "";
+	const joined = valueFlags.filter((valueFlag) => valueFlag.flag.key === repeat.flag.key).map((valueFlag) => valueFlag.value).join(",");
+	return `, as --${repeat.flag.key}=${quoteForShell(joined)}`;
+}
+function quoteForShell(value) {
+	if (SHELL_SAFE_WORD.test(value)) return value;
+	return `'${value.replaceAll("'", `'\\''`)}'`;
+}
+function readFlagValue(item, spellings) {
+	const { name, value, consumesNext } = item;
+	if (value === null || consumesNext && value === "--") throw new ConfigError(`${name} needs a value`);
+	if (consumesNext && readsAsFlag(value, spellings)) throw new ConfigError(`${name} needs a value, but the flag ${parseFlagToken(value, spellings).name} follows it; write ${name}=<value> for a value that starts with "-"`);
+	return value;
+}
+function readsAsFlag(value, spellings) {
+	if (!isFlagToken(value)) return false;
+	return value.startsWith("--no-") || parseFlagToken(value, spellings).flag !== null;
 }
 //#endregion
 //#region src/output/types.ts
@@ -231,7 +496,13 @@ function listEnvelopeShape(item) {
 }
 //#endregion
 //#region src/commands/flags.ts
-const outputFlags = {
+function listFlag(def) {
+	return {
+		...def,
+		list: true
+	};
+}
+const formatFlags = {
 	format: {
 		type: "string",
 		description: "auto | json | text",
@@ -240,15 +511,18 @@ const outputFlags = {
 	json: {
 		type: "boolean",
 		description: "Shorthand for --format json"
-	},
+	}
+};
+const outputFlags = {
+	...formatFlags,
 	full: {
 		type: "boolean",
 		description: "Return the full object (default: compact)"
 	},
-	fields: {
+	fields: listFlag({
 		type: "string",
 		description: "Dot-paths, comma separated (mutually exclusive with --full)"
-	},
+	}),
 	maxBytes: {
 		type: "string",
 		description: "Output size cap; 0 disables",
@@ -300,50 +574,32 @@ const connectionFlags = {
 };
 //#endregion
 //#region src/commands/global-flags.ts
-const ARGUMENT_SEPARATOR = "--";
-const NEGATION_PREFIX = "no-";
-const GLOBAL_FLAG_ARGS = {
+const GLOBAL_FLAG_SPELLINGS = flagSpellings({
 	...outputFlags,
 	...listFlags,
 	...profileFlag,
 	...connectionFlags
-};
-const GLOBAL_FLAG_NAMES = buildGlobalFlagNames();
-function buildGlobalFlagNames() {
-	const names = /* @__PURE__ */ new Set();
-	for (const [key, def] of Object.entries(GLOBAL_FLAG_ARGS)) {
-		names.add(normalizeFlag(key));
-		if ("alias" in def) for (const alias of toAliasArray(def.alias)) names.add(normalizeFlag(alias));
-	}
-	return names;
-}
-function isGlobalFlag(token) {
-	if (!token.startsWith("-") || token === ARGUMENT_SEPARATOR) return false;
-	const raw = token.includes("=") ? token.slice(0, token.indexOf("=")) : token;
-	const name = normalizeFlag(raw);
-	if (GLOBAL_FLAG_NAMES.has(name)) return true;
-	const bare = raw.replace(/^-+/, "");
-	if (bare.startsWith(NEGATION_PREFIX)) return GLOBAL_FLAG_NAMES.has(normalizeFlag(bare.slice(3)));
-	return false;
-}
+});
 function hoistGlobalFlags(rawArgs) {
-	const leading = [];
-	let index = 0;
-	while (index < rawArgs.length) {
-		const token = rawArgs[index];
-		if (token === void 0 || !isGlobalFlag(token)) break;
-		leading.push(token);
-		index += 1;
-		if (flagConsumesValue(token, GLOBAL_FLAG_ARGS) && index < rawArgs.length) {
-			const value = rawArgs[index];
-			if (value !== void 0) {
-				leading.push(value);
-				index += 1;
-			}
-		}
+	const end = leadingGlobalFlagsEnd(rawArgs);
+	if (end === 0) return [...rawArgs];
+	const leading = rawArgs.slice(0, end);
+	const rest = rawArgs.slice(end);
+	const separator = rest.indexOf("--");
+	if (separator === -1) return [...rest, ...leading];
+	return [
+		...rest.slice(0, separator),
+		...leading,
+		...rest.slice(separator)
+	];
+}
+function leadingGlobalFlagsEnd(rawArgs) {
+	let end = 0;
+	for (const item of readArgv(rawArgs, GLOBAL_FLAG_SPELLINGS)) {
+		if (item.kind !== "flag" || item.flag === null) return end;
+		end = item.end;
 	}
-	if (leading.length === 0) return [...rawArgs];
-	return [...rawArgs.slice(index), ...leading];
+	return end;
 }
 //#endregion
 //#region src/core/system-ca.ts
@@ -358,7 +614,7 @@ function trustSystemCa() {
 //#endregion
 //#region package.json
 var name = "@metabase/cli";
-var version = "0.3.2";
+var version = "0.4.0";
 var description = "Metabase CLI";
 //#endregion
 //#region src/runtime/command-augment.ts
@@ -378,36 +634,38 @@ const main = defineCommand({
 		description
 	},
 	subCommands: {
-		auth: () => import("./auth-DJn5T6zA.mjs").then((mod) => mod.default),
-		db: () => import("./db-BRHPjshe.mjs").then((mod) => mod.default),
-		table: () => import("./table-Di-EY7pg.mjs").then((mod) => mod.default),
-		field: () => import("./field-CHZByaXa.mjs").then((mod) => mod.default),
-		upload: () => import("./upload-VXBFKzLT.mjs").then((mod) => mod.default),
-		"content-translation": () => import("./content-translation-CqB3peU9.mjs").then((mod) => mod.default),
-		card: () => import("./card-ByOzVxpI.mjs").then((mod) => mod.default),
-		dashboard: () => import("./dashboard-Bzjz2v6u.mjs").then((mod) => mod.default),
-		subscription: () => import("./subscription-CofRU47d.mjs").then((mod) => mod.default),
-		alert: () => import("./alert-DCLhfwdv.mjs").then((mod) => mod.default),
-		collection: () => import("./collection-BGbW7u_Q.mjs").then((mod) => mod.default),
-		library: () => import("./library-Dgq_5BFh.mjs").then((mod) => mod.default),
-		document: () => import("./document-DqJ7Cysa.mjs").then((mod) => mod.default),
-		transform: () => import("./transform-8XK1LIgC.mjs").then((mod) => mod.default),
-		"transform-job": () => import("./transform-job-CTizQkWy.mjs").then((mod) => mod.default),
-		"transform-tag": () => import("./transform-tag-BLp_p9J-.mjs").then((mod) => mod.default),
-		setting: () => import("./setting-DR9bj232.mjs").then((mod) => mod.default),
-		search: () => import("./search-DxiuY5EV.mjs").then((mod) => mod.default),
-		"git-sync": () => import("./git-sync-NhfLSZA6.mjs").then((mod) => mod.default),
-		setup: () => import("./setup-DGa2LLEp.mjs").then((mod) => mod.default),
-		snippet: () => import("./snippet-g9JTDxqu.mjs").then((mod) => mod.default),
-		segment: () => import("./segment-DiRJcbam.mjs").then((mod) => mod.default),
-		measure: () => import("./measure-LY9Tp9QZ.mjs").then((mod) => mod.default),
-		timeline: () => import("./timeline-D7EsWZm6.mjs").then((mod) => mod.default),
-		"timeline-event": () => import("./timeline-event-D-h0A_oh.mjs").then((mod) => mod.default),
-		eid: () => import("./eid-BtlRU1E0.mjs").then((mod) => mod.default),
-		query: () => import("./query-BPtIy79s.mjs").then((mod) => mod.default),
-		uuid: () => import("./uuid-B4eij1d7.mjs").then((mod) => mod.default),
-		upgrade: () => import("./upgrade-BRgw0fvn.mjs").then((mod) => mod.default),
-		skills: () => import("./skills-CCn7cyMP.mjs").then((mod) => mod.default)
+		auth: () => import("./auth-DdLhXCn-.mjs").then((mod) => mod.default),
+		db: () => import("./db-BFSeETMO.mjs").then((mod) => mod.default),
+		table: () => import("./table-CZnT6d9x.mjs").then((mod) => mod.default),
+		field: () => import("./field-BARgq5I9.mjs").then((mod) => mod.default),
+		upload: () => import("./upload-BKxOpSz3.mjs").then((mod) => mod.default),
+		"content-translation": () => import("./content-translation-C19SqZWp.mjs").then((mod) => mod.default),
+		card: () => import("./card-CFd-GUEM.mjs").then((mod) => mod.default),
+		dashboard: () => import("./dashboard-AWrXqQ7a.mjs").then((mod) => mod.default),
+		subscription: () => import("./subscription-Dr-YHARg.mjs").then((mod) => mod.default),
+		alert: () => import("./alert-Dt6La9tK.mjs").then((mod) => mod.default),
+		collection: () => import("./collection-BKNShKcY.mjs").then((mod) => mod.default),
+		library: () => import("./library-B7wDH-Nc.mjs").then((mod) => mod.default),
+		document: () => import("./document-BRaba87v.mjs").then((mod) => mod.default),
+		glossary: () => import("./glossary-CWIX8Zh6.mjs").then((mod) => mod.default),
+		transform: () => import("./transform-g4-HHzDp.mjs").then((mod) => mod.default),
+		"transform-job": () => import("./transform-job-DqBtnTrG.mjs").then((mod) => mod.default),
+		"transform-tag": () => import("./transform-tag-nTb0Ivpj.mjs").then((mod) => mod.default),
+		setting: () => import("./setting-CPkvkc4H.mjs").then((mod) => mod.default),
+		search: () => import("./search-BrQQuNmh.mjs").then((mod) => mod.default),
+		"git-sync": () => import("./git-sync-DKcaddkV.mjs").then((mod) => mod.default),
+		setup: () => import("./setup-Be3xDXHi.mjs").then((mod) => mod.default),
+		snippet: () => import("./snippet-QirK70R_.mjs").then((mod) => mod.default),
+		segment: () => import("./segment-Bi6eqj3e.mjs").then((mod) => mod.default),
+		measure: () => import("./measure-D2qq5e8f.mjs").then((mod) => mod.default),
+		dependency: () => import("./dependency-DBUJwXqv.mjs").then((mod) => mod.default),
+		timeline: () => import("./timeline-CUzx6uXi.mjs").then((mod) => mod.default),
+		"timeline-event": () => import("./timeline-event-DpNm4dkn.mjs").then((mod) => mod.default),
+		eid: () => import("./eid-Dz-mP40j.mjs").then((mod) => mod.default),
+		query: () => import("./query-BJXTIDhy.mjs").then((mod) => mod.default),
+		uuid: () => import("./uuid-Blpv_e0S.mjs").then((mod) => mod.default),
+		upgrade: () => import("./upgrade-Tj_reACv.mjs").then((mod) => mod.default),
+		skills: () => import("./skills-DyiLycMY.mjs").then((mod) => mod.default)
 	}
 });
 setMetabaseAugment(main, {
@@ -580,6 +838,18 @@ function jsonByteLength(value) {
 function isPlainObject(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+const JAVA_WHITESPACE = "	\n\v\f\r            \u2028\u2029 　";
+const UNICODE_ESCAPE_DIGITS = 4;
+function unicodeEscape(char) {
+	return `\\u${char.charCodeAt(0).toString(16).padStart(UNICODE_ESCAPE_DIGITS, "0")}`;
+}
+const JAVA_WHITESPACE_ESCAPED = [...JAVA_WHITESPACE].map(unicodeEscape).join("");
+/** Matches a string Metabase reads as not blank: one holding a character that is not Java whitespace. */
+const NOT_BLANK = new RegExp(`[^${JAVA_WHITESPACE_ESCAPED}]`);
+/** Whether Metabase reads `value` as blank: empty, or Java whitespace only. */
+function isBlank(value) {
+	return !NOT_BLANK.test(value);
+}
 //#endregion
 //#region src/output/projection.ts
 function projectForList(item, view, opts) {
@@ -672,7 +942,7 @@ function renderRows(head, rows) {
 	return table.toString();
 }
 function formatCell(row, column) {
-	const value = row[column.key];
+	const value = column.value === void 0 ? row[column.key] : column.value(row);
 	if (column.format !== void 0) return column.format(value);
 	return formatScalar(value);
 }
@@ -880,6 +1150,11 @@ const FEATURE_RULES = {
 		since: 63,
 		tokenFeature: "remote_sync"
 	},
+	remoteSyncBranchGuard: { since: 63 },
+	remoteSyncMerge: {
+		since: 63,
+		tokenFeature: "remote_sync"
+	},
 	contentTranslation: {
 		since: 58,
 		tokenFeature: "content_translation"
@@ -896,6 +1171,10 @@ const FEATURE_RULES = {
 	transformJobRunIdIsNumeric: { since: 64 },
 	transformCheckpointReset: { since: 60 },
 	fieldDataSensitivity: { since: 64 },
+	fieldRemappingAppendsDisplayColumns: {
+		since: 58,
+		until: 59
+	},
 	transformDagRuns: { since: 64 },
 	unifiedTransformRuns: { since: 64 },
 	transformTests: {
@@ -907,6 +1186,10 @@ const FEATURE_RULES = {
 	invalidMbqlIsBadRequest: { since: 59 },
 	boxplotDisplay: { since: 59 },
 	nativeTableTemplateTag: { since: 59 },
+	compiledQueryOmitsCollection: {
+		since: 59,
+		until: 62
+	},
 	smartLinkMeasureModel: { since: 60 },
 	dashboardSubscriptionFilters: {
 		since: 58,
@@ -920,15 +1203,22 @@ const FEATURE_RULES = {
 		since: 59,
 		tokenFeature: "dependencies"
 	},
-	dependencyKebabCaseFilters: { since: 60 },
+	dependencyAsyncBackfill: {
+		since: 60,
+		tokenFeature: "dependencies"
+	},
+	measureDependencyGraph: { since: 59 },
 	tableListAccessFilters: { since: 59 },
 	tableListTransformTargets: { since: 60 },
+	tableListPublishedFilter: { since: 63 },
 	tableUnusedFilter: {
 		since: 58,
 		tokenFeature: "dependencies"
 	},
 	tableDataLayerTiers: { since: 59 },
 	bulkTableEdit: { since: 59 },
+	tableUserValueWithdrawal: { since: 64 },
+	bulkTableSync: { since: 59 },
 	erd: {
 		since: 62,
 		tokenFeature: "schema-viewer"
@@ -952,7 +1242,8 @@ const FEATURE_RULES = {
 	},
 	metricDefinitionQuery: { since: 60 },
 	metricDimensionListing: { since: 64 },
-	oauthFullAccessScope: { since: 63 }
+	oauthFullAccessScope: { since: 63 },
+	exportCsvByteOrderMark: { since: 63 }
 };
 function isFeatureName(name) {
 	return Object.hasOwn(FEATURE_RULES, name);
@@ -990,7 +1281,6 @@ const METHOD_REQUIREMENTS = {
 	"card.exportQuery": [],
 	"card.queryMetadata": [],
 	"collection.list": [],
-	"collection.listWithLibrary": [],
 	"collection.get": [],
 	"collection.create": [],
 	"collection.update": [],
@@ -1034,6 +1324,7 @@ const METHOD_REQUIREMENTS = {
 	"erd.get": ["erd"],
 	"field.get": [],
 	"field.update": [],
+	"field.setDataSensitivity": ["fieldDataSensitivity"],
 	"field.search": [],
 	"field.remapping": [],
 	"field.summary": [],
@@ -1053,6 +1344,7 @@ const METHOD_REQUIREMENTS = {
 	"gitSync.syncedCollections": ["remoteSync"],
 	"gitSync.remoteUrl": [],
 	"gitSync.branch": [],
+	"gitSync.trackedBranch": [],
 	"gitSync.waitForTask": ["remoteSync"],
 	"glossary.list": [],
 	"glossary.create": [],
@@ -1116,7 +1408,11 @@ const METHOD_REQUIREMENTS = {
 	"table.fks": [],
 	"table.syncSchema": [],
 	"table.rescanValues": [],
+	"table.discardValues": [],
 	"table.bulkEdit": ["bulkTableEdit"],
+	"table.bulkSyncSchema": ["bulkTableSync"],
+	"table.bulkRescanValues": ["bulkTableSync"],
+	"table.bulkDiscardValues": ["bulkTableSync"],
 	"table.appendCsv": [],
 	"table.replaceCsv": [],
 	"timeline.list": [],
@@ -1453,7 +1749,9 @@ async function walkCommandPath(root, rawArgs) {
 		const match = await findSubCommand(subCommands, token);
 		if (match === null) return {
 			segments,
-			unknownToken: token
+			unknownToken: token,
+			command: current,
+			argsStart: index
 		};
 		segments.push(match.name);
 		current = match.command;
@@ -1461,7 +1759,17 @@ async function walkCommandPath(root, rawArgs) {
 	}
 	return {
 		segments,
-		unknownToken: null
+		unknownToken: null,
+		command: current,
+		argsStart: index
+	};
+}
+async function resolveLeafArgv(root, rawArgs) {
+	const path = await walkCommandPath(root, rawArgs);
+	if (path.unknownToken !== null || await resolveCitty(path.command.subCommands) !== void 0) return null;
+	return {
+		argsDef: await resolveCitty(path.command.args) ?? {},
+		argsStart: path.argsStart
 	};
 }
 async function resolveBreadcrumb(root, rawArgs) {
@@ -1472,16 +1780,11 @@ async function findUnknownCommand(root, rawArgs) {
 	return (await walkCommandPath(root, rawArgs)).unknownToken;
 }
 function skipFlags(rawArgs, start, argsDef) {
-	let index = start;
-	while (index < rawArgs.length) {
-		const token = rawArgs[index];
-		if (token === void 0) return index;
-		if (token === "--") return rawArgs.length;
-		if (!token.startsWith("-")) return index;
-		if (flagConsumesValue(token, argsDef)) index += 1;
-		index += 1;
+	for (const item of readArgv(rawArgs, flagSpellings(argsDef), start)) {
+		if (item.kind === "positional") return item.index;
+		if (item.kind === "separator") return rawArgs.length;
 	}
-	return index;
+	return rawArgs.length;
 }
 async function findSubCommand(subCommands, token) {
 	const direct = subCommands[token];
@@ -1531,7 +1834,7 @@ const JSON_HELP_FLAG = "--json";
 async function run() {
 	installInterruptHandler((code) => process.exit(code));
 	trustSystemCa();
-	const rawArgs = hoistGlobalFlags(process.argv.slice(2));
+	const rawArgs = await normalizeArgv(process.argv.slice(2));
 	const wantsJsonHelp = rawArgs.includes(JSON_HELP_FLAG);
 	const showUsageWithBreadcrumb = async (cmd, parent) => {
 		const breadcrumb = await resolveBreadcrumb(main, rawArgs);
@@ -1557,8 +1860,15 @@ async function run() {
 		rawArgs
 	});
 }
+async function normalizeArgv(argv) {
+	const hoisted = hoistGlobalFlags(argv);
+	const leaf = await resolveLeafArgv(main, hoisted);
+	if (leaf === null) return hoisted;
+	const leafArgs = separatePositionals(hoisted.slice(leaf.argsStart), leaf.argsDef);
+	return [...hoisted.slice(0, leaf.argsStart), ...leafArgs];
+}
 run().catch((error) => {
 	reportError(error);
 });
 //#endregion
-export { InternalError as $, ENV_SKILLS_DIR as A, listFlags as B, promptSelect as C, ENV_API_KEY as D, warn as E, ProfileRefreshedError as F, listEnvelopeSchema as G, outputFlags as H, setMetabaseAugment as I, normalizeFlag as J, listEnvelopeSchemaWithExtras as K, name as L, ENV_URL as M, consumeLegacyEnvWarnings as N, ENV_DISABLE_KEYRING as O, readEnv as P, ConfigError as Q, version as R, promptPassword as S, listTruncationNotice as T, profileFlag as U, listFlagsWithDefaultLimit as V, DEFAULT_MAX_BYTES as W, AbortError as X, toAliasArray as Y, ChainedRequestError as Z, formatScalar as _, Features as a, ValidationError as at, isPlainObject as b, ruleGap as c, KNOWN_RANGE as ct, renderList as d, MetabaseError as et, renderListWithExtras as f, MALFORMED_CELL as g, writeText as h, FEATURE_RULES as i, UnknownError as it, ENV_SKIP_PREFLIGHT as j, ENV_PROFILE as k, reportError as l, escapeJsonPointerSegment as lt, writeJson as m, methodRequirements as n, ResponseShapeError as nt, evaluateFeatures as o, errorMessage as ot, renderSummary as p, flagConsumesValue as q, FEATURE_NAMES as r, TimeoutError as rt, isFeatureName as s, isFileNotFoundError as st, interruptSignal as t, NetworkError as tt, renderItem as u, renderRows as v, promptText as w, promptConfirm as x, projectForList as y, connectionFlags as z };
+export { givenFlagKeys as $, ENV_API_KEY as A, name as B, isPlainObject as C, promptText as D, promptSelect as E, ENV_URL as F, listFlags as G, connectionFlags as H, consumeLegacyEnvWarnings as I, profileFlag as J, listFlagsWithDefaultLimit as K, readEnv as L, ENV_PROFILE as M, ENV_SKILLS_DIR as N, listTruncationNotice as O, ENV_SKIP_PREFLIGHT as P, assertArgv as Q, ProfileRefreshedError as R, isBlank as S, promptPassword as T, formatFlags as U, version as V, listFlag as W, listEnvelopeSchema as X, DEFAULT_MAX_BYTES as Y, listEnvelopeSchemaWithExtras as Z, MALFORMED_CELL as _, escapeJsonPointerSegment as _t, Features as a, ConfigError as at, projectForList as b, ruleGap as c, NetworkError as ct, renderList as d, UnknownError as dt, parseCsv as et, renderListWithExtras as f, ValidationError as ft, writeText as g, KNOWN_RANGE as gt, writeJson as h, isFileNotFoundError as ht, FEATURE_RULES as i, ChainedRequestError as it, ENV_DISABLE_KEYRING as j, warn as k, reportError as l, ResponseShapeError as lt, serializeJson as m, formatZodIssue as mt, methodRequirements as n, parseEnumCsv as nt, evaluateFeatures as o, InternalError as ot, renderSummary as p, errorMessage as pt, outputFlags as q, FEATURE_NAMES as r, AbortError as rt, isFeatureName as s, MetabaseError as st, interruptSignal as t, parseEnum as tt, renderItem as u, TimeoutError as ut, formatScalar as v, promptConfirm as w, NOT_BLANK as x, renderRows as y, setMetabaseAugment as z };