@gabrielbryk/jq-ts 1.3.4 → 1.3.6

package/dist/index.cjs

@@ -279,7 +279,7 @@ const lex = (text) => {
 			const raw = text.slice(start, pos);
 			const keyword = keywordKinds[raw];
 			if (keyword === "Null" || keyword === "True" || keyword === "False") pushToken(keyword, start, pos);
-			else if (keyword) pushToken(keyword, start, pos);
+			else if (keyword) pushToken(keyword, start, pos, raw);
 			else pushToken("Identifier", start, pos, raw);
 			continue;
 		}
@@ -445,7 +445,7 @@ var Parser = class {
 				span: spanBetween(start.span, body.span)
 			};
 		}
-		let expr = allowComma ? this.parseComma() : this.parseAssignment();
+		let expr = this.parsePipe(allowComma);
 		while (this.match("As")) {
 			const varToken = this.consume("Variable", "Expected variable name after \"as\"");
 			this.consume("Pipe", "Expected \"|\" after variable binding");
@@ -460,8 +460,22 @@ var Parser = class {
 		}
 		return expr;
 	}
-	parseComma() {
+	parsePipe(allowComma = true) {
+		let expr = this.parseComma(allowComma);
+		while (this.match("Pipe")) {
+			const right = this.parseComma(allowComma);
+			expr = {
+				kind: "Pipe",
+				left: expr,
+				right,
+				span: spanBetween(expr.span, right.span)
+			};
+		}
+		return expr;
+	}
+	parseComma(allowComma = true) {
 		let expr = this.parseAssignment();
+		if (!allowComma) return expr;
 		while (this.match("Comma")) {
 			const right = this.parseAssignment();
 			expr = {
@@ -474,7 +488,7 @@ var Parser = class {
 		return expr;
 	}
 	parseAssignment() {
-		const expr = this.parsePipe();
+		const expr = this.parseAlt();
 		if (this.match("Eq") || this.match("BarEq") || this.match("PlusEq") || this.match("MinusEq") || this.match("StarEq") || this.match("SlashEq") || this.match("PercentEq") || this.match("AltEq")) {
 			const opToken = this.previous();
 			const right = this.parseAssignment();
@@ -516,19 +530,6 @@ var Parser = class {
 		}
 		return expr;
 	}
-	parsePipe() {
-		let expr = this.parsePipeOperand();
-		while (this.match("Pipe")) {
-			const right = this.parsePipeOperand();
-			expr = {
-				kind: "Pipe",
-				left: expr,
-				right,
-				span: spanBetween(expr.span, right.span)
-			};
-		}
-		return expr;
-	}
 	parsePipeOperand() {
 		return this.parseAlt();
 	}
@@ -622,16 +623,6 @@ var Parser = class {
 		return expr;
 	}
 	parseUnary() {
-		if (this.match("Not")) {
-			const op = this.previous();
-			const expr = this.parseUnary();
-			return {
-				kind: "Unary",
-				op: "Not",
-				expr,
-				span: spanBetween(op.span, expr.span)
-			};
-		}
 		if (this.match("Minus")) {
 			const op = this.previous();
 			const expr = this.parseUnary();
@@ -748,11 +739,8 @@ var Parser = class {
 			kind: "Recurse",
 			span: this.previous().span
 		};
-		if (this.match("DotDot")) return {
-			kind: "Recurse",
-			span: this.previous().span
-		};
 		if (this.match("Break")) return this.parseBreak(this.previous());
+		if (this.match("Not")) return this.finishIdentifier(this.previous());
 		throw this.error(this.peek(), "Unexpected token");
 	}
 	parseBreak(start) {
@@ -1306,7 +1294,10 @@ const emit$1 = (value, span, tracker) => {
 	return value;
 };
 const ensureIndex = (val) => {
-	if (typeof val === "number" && Number.isInteger(val)) return val;
+	if (typeof val === "number") {
+		if (!Number.isFinite(val)) return void 0;
+		return Math.trunc(val);
+	}
 	if (typeof val === "string" && /^-?\d+$/.test(val)) return parseInt(val, 10);
 };
 const stableStringify = (value) => {
@@ -1378,6 +1369,13 @@ const stdBuiltins = [
 			yield emit$1(isTruthy(input), span, tracker);
 		}
 	},
+	{
+		name: "not",
+		arity: 0,
+		apply: function* (input, _args, _env, tracker, _eval, span) {
+			yield emit$1(!isTruthy(input), span, tracker);
+		}
+	},
 	{
 		name: "walk",
 		arity: 1,
@@ -2119,6 +2117,29 @@ const evaluatePath = function* (node, input, env, tracker, evaluate$1) {
 				return;
 			}
 			throw new RuntimeError(`Function ${node.name} not supported in path expression`, node.span);
+		case "Slice": {
+			const parentPaths = Array.from(evaluatePath(node.target, input, env, tracker, evaluate$1));
+			const startRes = node.start ? Array.from(evaluate$1(node.start, input, env, tracker)) : [null];
+			const endRes = node.end ? Array.from(evaluate$1(node.end, input, env, tracker)) : [null];
+			for (const startVal of startRes) for (const endVal of endRes) {
+				const sliceSpec = {
+					start: typeof startVal === "number" ? startVal : null,
+					end: typeof endVal === "number" ? endVal : null
+				};
+				for (const p of parentPaths) yield [...p, sliceSpec];
+			}
+			return;
+		}
+		case "Try":
+			try {
+				yield* evaluatePath(node.body, input, env, tracker, evaluate$1);
+			} catch (e) {
+				if (!(e instanceof RuntimeError)) throw e;
+			}
+			return;
+		case "Var":
+			yield [];
+			return;
 		default: throw new RuntimeError("Invalid path expression", node.span);
 	}
 };
@@ -2139,11 +2160,11 @@ function* traversePaths(root, currentPath, span, tracker) {
 }
 const isPath = (val) => {
 	if (!Array.isArray(val)) return false;
-	return val.every((p) => typeof p === "string" || typeof p === "number" && Number.isInteger(p));
+	return val.every((p) => typeof p === "string" || typeof p === "number" && Number.isInteger(p) || isPlainObject(p) && ("start" in p || "end" in p));
 };
 const ensurePath = (val, span) => {
 	if (isPath(val)) return val;
-	throw new RuntimeError("Path must be an array of strings or integers", span);
+	throw new RuntimeError("Path must be an array of strings, integers, or slice objects", span);
 };
 const getPath = (root, path) => {
 	let curr = root;
@@ -2190,7 +2211,17 @@ const updatePath = (root, path, updateFn, span, depth = 0) => {
 		} else arr[idx] = newVal;
 		return arr;
 	}
-	throw new RuntimeError(`Path segment must be string or integer`, span);
+	if (typeof head === "object" && head !== null) {
+		if (!Array.isArray(root)) throw new RuntimeError(`Cannot slice ${describeType(root)}`, span);
+		const arr = [...root];
+		const start = head.start ?? 0;
+		const end = head.end ?? arr.length;
+		const newSliceVal = updateFn(arr.slice(start, end));
+		if (!Array.isArray(newSliceVal)) throw new RuntimeError("Assignment to a slice must be an array", span);
+		arr.splice(start, end - start, ...newSliceVal);
+		return arr;
+	}
+	throw new RuntimeError(`Path segment must be string, integer, or slice object`, span);
 };
 const deletePaths = (root, paths, span) => {
 	if (paths.some((p) => p.length === 0)) return null;
@@ -3065,15 +3096,21 @@ const emit = (value, span, tracker) => {
 	return value;
 };
 /**
-* Ensures a value is an integer. Throws a RuntimeError otherwise.
+* Converts a value to an array index.
+* Truncates floats to integers. Returns null if input is null.
+* Throws a RuntimeError for non-numeric types.
 *
-* @param value - The value to check.
+* @param value - The value to convert.
 * @param span - To report error.
-* @returns The integer value.
+* @returns The integer index or null.
 */
-const ensureInteger = (value, span) => {
-	if (typeof value === "number" && Number.isInteger(value)) return value;
-	throw new RuntimeError("Expected integer", span);
+const toIndex = (value, span) => {
+	if (value === null) return null;
+	if (typeof value === "number") {
+		if (!Number.isFinite(value)) return null;
+		return Math.trunc(value);
+	}
+	throw new RuntimeError("Expected numeric index", span);
 };
 
 //#endregion
@@ -3301,7 +3338,11 @@ const evalIndex = function* (node, input, env, tracker, evaluate$1) {
 		}
 		if (isValueArray(container)) {
 			for (const idxValue of indexValues) {
-				const index = ensureInteger(idxValue, node.span);
+				const index = toIndex(idxValue, node.span);
+				if (index === null) {
+					yield emit(null, node.span, tracker);
+					continue;
+				}
 				const resolved = index < 0 ? container.length + index : index;
 				if (resolved < 0 || resolved >= container.length) yield emit(null, node.span, tracker);
 				else yield emit(container[resolved], node.span, tracker);

package/dist/index.mjs

@@ -278,7 +278,7 @@ const lex = (text) => {
 			const raw = text.slice(start, pos);
 			const keyword = keywordKinds[raw];
 			if (keyword === "Null" || keyword === "True" || keyword === "False") pushToken(keyword, start, pos);
-			else if (keyword) pushToken(keyword, start, pos);
+			else if (keyword) pushToken(keyword, start, pos, raw);
 			else pushToken("Identifier", start, pos, raw);
 			continue;
 		}
@@ -444,7 +444,7 @@ var Parser = class {
 				span: spanBetween(start.span, body.span)
 			};
 		}
-		let expr = allowComma ? this.parseComma() : this.parseAssignment();
+		let expr = this.parsePipe(allowComma);
 		while (this.match("As")) {
 			const varToken = this.consume("Variable", "Expected variable name after \"as\"");
 			this.consume("Pipe", "Expected \"|\" after variable binding");
@@ -459,8 +459,22 @@ var Parser = class {
 		}
 		return expr;
 	}
-	parseComma() {
+	parsePipe(allowComma = true) {
+		let expr = this.parseComma(allowComma);
+		while (this.match("Pipe")) {
+			const right = this.parseComma(allowComma);
+			expr = {
+				kind: "Pipe",
+				left: expr,
+				right,
+				span: spanBetween(expr.span, right.span)
+			};
+		}
+		return expr;
+	}
+	parseComma(allowComma = true) {
 		let expr = this.parseAssignment();
+		if (!allowComma) return expr;
 		while (this.match("Comma")) {
 			const right = this.parseAssignment();
 			expr = {
@@ -473,7 +487,7 @@ var Parser = class {
 		return expr;
 	}
 	parseAssignment() {
-		const expr = this.parsePipe();
+		const expr = this.parseAlt();
 		if (this.match("Eq") || this.match("BarEq") || this.match("PlusEq") || this.match("MinusEq") || this.match("StarEq") || this.match("SlashEq") || this.match("PercentEq") || this.match("AltEq")) {
 			const opToken = this.previous();
 			const right = this.parseAssignment();
@@ -515,19 +529,6 @@ var Parser = class {
 		}
 		return expr;
 	}
-	parsePipe() {
-		let expr = this.parsePipeOperand();
-		while (this.match("Pipe")) {
-			const right = this.parsePipeOperand();
-			expr = {
-				kind: "Pipe",
-				left: expr,
-				right,
-				span: spanBetween(expr.span, right.span)
-			};
-		}
-		return expr;
-	}
 	parsePipeOperand() {
 		return this.parseAlt();
 	}
@@ -621,16 +622,6 @@ var Parser = class {
 		return expr;
 	}
 	parseUnary() {
-		if (this.match("Not")) {
-			const op = this.previous();
-			const expr = this.parseUnary();
-			return {
-				kind: "Unary",
-				op: "Not",
-				expr,
-				span: spanBetween(op.span, expr.span)
-			};
-		}
 		if (this.match("Minus")) {
 			const op = this.previous();
 			const expr = this.parseUnary();
@@ -747,11 +738,8 @@ var Parser = class {
 			kind: "Recurse",
 			span: this.previous().span
 		};
-		if (this.match("DotDot")) return {
-			kind: "Recurse",
-			span: this.previous().span
-		};
 		if (this.match("Break")) return this.parseBreak(this.previous());
+		if (this.match("Not")) return this.finishIdentifier(this.previous());
 		throw this.error(this.peek(), "Unexpected token");
 	}
 	parseBreak(start) {
@@ -1305,7 +1293,10 @@ const emit$1 = (value, span, tracker) => {
 	return value;
 };
 const ensureIndex = (val) => {
-	if (typeof val === "number" && Number.isInteger(val)) return val;
+	if (typeof val === "number") {
+		if (!Number.isFinite(val)) return void 0;
+		return Math.trunc(val);
+	}
 	if (typeof val === "string" && /^-?\d+$/.test(val)) return parseInt(val, 10);
 };
 const stableStringify = (value) => {
@@ -1377,6 +1368,13 @@ const stdBuiltins = [
 			yield emit$1(isTruthy(input), span, tracker);
 		}
 	},
+	{
+		name: "not",
+		arity: 0,
+		apply: function* (input, _args, _env, tracker, _eval, span) {
+			yield emit$1(!isTruthy(input), span, tracker);
+		}
+	},
 	{
 		name: "walk",
 		arity: 1,
@@ -2118,6 +2116,29 @@ const evaluatePath = function* (node, input, env, tracker, evaluate$1) {
 				return;
 			}
 			throw new RuntimeError(`Function ${node.name} not supported in path expression`, node.span);
+		case "Slice": {
+			const parentPaths = Array.from(evaluatePath(node.target, input, env, tracker, evaluate$1));
+			const startRes = node.start ? Array.from(evaluate$1(node.start, input, env, tracker)) : [null];
+			const endRes = node.end ? Array.from(evaluate$1(node.end, input, env, tracker)) : [null];
+			for (const startVal of startRes) for (const endVal of endRes) {
+				const sliceSpec = {
+					start: typeof startVal === "number" ? startVal : null,
+					end: typeof endVal === "number" ? endVal : null
+				};
+				for (const p of parentPaths) yield [...p, sliceSpec];
+			}
+			return;
+		}
+		case "Try":
+			try {
+				yield* evaluatePath(node.body, input, env, tracker, evaluate$1);
+			} catch (e) {
+				if (!(e instanceof RuntimeError)) throw e;
+			}
+			return;
+		case "Var":
+			yield [];
+			return;
 		default: throw new RuntimeError("Invalid path expression", node.span);
 	}
 };
@@ -2138,11 +2159,11 @@ function* traversePaths(root, currentPath, span, tracker) {
 }
 const isPath = (val) => {
 	if (!Array.isArray(val)) return false;
-	return val.every((p) => typeof p === "string" || typeof p === "number" && Number.isInteger(p));
+	return val.every((p) => typeof p === "string" || typeof p === "number" && Number.isInteger(p) || isPlainObject(p) && ("start" in p || "end" in p));
 };
 const ensurePath = (val, span) => {
 	if (isPath(val)) return val;
-	throw new RuntimeError("Path must be an array of strings or integers", span);
+	throw new RuntimeError("Path must be an array of strings, integers, or slice objects", span);
 };
 const getPath = (root, path) => {
 	let curr = root;
@@ -2189,7 +2210,17 @@ const updatePath = (root, path, updateFn, span, depth = 0) => {
 		} else arr[idx] = newVal;
 		return arr;
 	}
-	throw new RuntimeError(`Path segment must be string or integer`, span);
+	if (typeof head === "object" && head !== null) {
+		if (!Array.isArray(root)) throw new RuntimeError(`Cannot slice ${describeType(root)}`, span);
+		const arr = [...root];
+		const start = head.start ?? 0;
+		const end = head.end ?? arr.length;
+		const newSliceVal = updateFn(arr.slice(start, end));
+		if (!Array.isArray(newSliceVal)) throw new RuntimeError("Assignment to a slice must be an array", span);
+		arr.splice(start, end - start, ...newSliceVal);
+		return arr;
+	}
+	throw new RuntimeError(`Path segment must be string, integer, or slice object`, span);
 };
 const deletePaths = (root, paths, span) => {
 	if (paths.some((p) => p.length === 0)) return null;
@@ -3064,15 +3095,21 @@ const emit = (value, span, tracker) => {
 	return value;
 };
 /**
-* Ensures a value is an integer. Throws a RuntimeError otherwise.
+* Converts a value to an array index.
+* Truncates floats to integers. Returns null if input is null.
+* Throws a RuntimeError for non-numeric types.
 *
-* @param value - The value to check.
+* @param value - The value to convert.
 * @param span - To report error.
-* @returns The integer value.
+* @returns The integer index or null.
 */
-const ensureInteger = (value, span) => {
-	if (typeof value === "number" && Number.isInteger(value)) return value;
-	throw new RuntimeError("Expected integer", span);
+const toIndex = (value, span) => {
+	if (value === null) return null;
+	if (typeof value === "number") {
+		if (!Number.isFinite(value)) return null;
+		return Math.trunc(value);
+	}
+	throw new RuntimeError("Expected numeric index", span);
 };
 
 //#endregion
@@ -3300,7 +3337,11 @@ const evalIndex = function* (node, input, env, tracker, evaluate$1) {
 		}
 		if (isValueArray(container)) {
 			for (const idxValue of indexValues) {
-				const index = ensureInteger(idxValue, node.span);
+				const index = toIndex(idxValue, node.span);
+				if (index === null) {
+					yield emit(null, node.span, tracker);
+					continue;
+				}
 				const resolved = index < 0 ? container.length + index : index;
 				if (resolved < 0 || resolved >= container.length) yield emit(null, node.span, tracker);
 				else yield emit(container[resolved], node.span, tracker);