@gabrielbryk/jq-ts 1.3.5 → 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;
 		}
@@ -623,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();
@@ -749,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) {
@@ -1307,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) => {
@@ -1379,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,
@@ -3099,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
@@ -3335,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;
 		}
@@ -622,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();
@@ -748,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) {
@@ -1306,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) => {
@@ -1378,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,
@@ -3098,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
@@ -3334,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);