@mojir/dvala 0.0.17 → 0.0.18

package/dist/cli/cli.js

@@ -478,7 +478,7 @@ function findAllOccurrences(input, pattern) {
 }
 //#endregion
 //#region package.json
-var version = "0.0.17";
+var version = "0.0.18";
 //#endregion
 //#region src/typeGuards/string.ts
 function isString(value, options = {}) {
@@ -24999,8 +24999,13 @@ const datatype = {
 		datatype: true,
 		title: "string",
 		category: "datatype",
-		description: "A `string`",
-		examples: ["\"hello\"", "\"\""]
+		description: "A `string`. Strings are written with double quotes. Template strings use backticks and support `${...}` interpolation — any expression can appear inside the braces.",
+		examples: [
+			"\"hello\"",
+			"\"\"",
+			"`Hello, World!`",
+			"`${2} * ${3} = ${2 * 3}`"
+		]
 	},
 	"-type-object": {
 		datatype: true,
@@ -26828,6 +26833,9 @@ function isStringToken(token) {
 function isA_BinaryOperatorToken(token) {
 	return token?.[0] === "Operator" && isBinaryOperator(token[1]);
 }
+function isTemplateStringToken(token) {
+	return token?.[0] === "TemplateString";
+}
 function throwUnexpectedToken(expected, expectedValue, actual) {
 	throw new DvalaError(`Unexpected token: ${actual ? `${actual[0]} '${actual[1]}'` : "end of input"}, expected ${expected}${expectedValue ? ` '${expectedValue}'` : ""}`, actual?.[2]);
 }
@@ -27122,6 +27130,176 @@ function parseNumber(ctx) {
 	return withSourceCodeInfo([NodeTypes.Number, negative ? -Number(numberString) : Number(numberString)], token[2]);
 }
 //#endregion
+//#region src/tokenizer/minifyTokenStream.ts
+function minifyTokenStream(tokenStream, { removeWhiteSpace }) {
+	const tokens = tokenStream.tokens.filter((token) => {
+		if (isSingleLineCommentToken(token) || isMultiLineCommentToken(token) || isShebangToken(token) || removeWhiteSpace && isWhitespaceToken(token)) return false;
+		return true;
+	});
+	return {
+		...tokenStream,
+		tokens
+	};
+}
+//#endregion
+//#region src/parser/subParsers/parseTemplateString.ts
+/**
+* Scan from `start` inside a `${...}` interpolation until the matching `}`.
+* Returns the expression source text (without the outer `${` and `}`) and
+* the number of characters consumed (including the closing `}`).
+*/
+function scanExpression(raw, start) {
+	let i = start;
+	let expr = "";
+	let depth = 1;
+	while (i < raw.length && depth > 0) {
+		const c = raw[i];
+		if (c === "{") {
+			depth++;
+			expr += c;
+			i++;
+		} else if (c === "}") {
+			depth--;
+			if (depth > 0) expr += c;
+			i++;
+		} else if (c === "\"") {
+			const { str, consumed } = scanString(raw, i);
+			expr += str;
+			i += consumed;
+		} else if (c === "'") {
+			const { str, consumed } = scanQuotedSymbol(raw, i);
+			expr += str;
+			i += consumed;
+		} else if (c === "`") {
+			const { str, consumed } = scanNestedTemplate(raw, i);
+			expr += str;
+			i += consumed;
+		} else {
+			expr += c;
+			i++;
+		}
+	}
+	return {
+		expr,
+		consumed: i - start
+	};
+}
+function scanString(raw, start) {
+	let i = start + 1;
+	let str = "\"";
+	let escaping = false;
+	while (i < raw.length) {
+		const c = raw[i];
+		str += c;
+		i++;
+		if (escaping) escaping = false;
+		else if (c === "\\") escaping = true;
+		else if (c === "\"") break;
+	}
+	return {
+		str,
+		consumed: i - start
+	};
+}
+function scanQuotedSymbol(raw, start) {
+	let i = start + 1;
+	let str = "'";
+	let escaping = false;
+	while (i < raw.length) {
+		const c = raw[i];
+		str += c;
+		i++;
+		if (escaping) escaping = false;
+		else if (c === "\\") escaping = true;
+		else if (c === "'") break;
+	}
+	return {
+		str,
+		consumed: i - start
+	};
+}
+/**
+* Scan a full nested template string starting at `start` (pointing at the opening backtick).
+* Handles ${...} spans inside the template recursively.
+*/
+function scanNestedTemplate(raw, start) {
+	let i = start + 1;
+	let str = "`";
+	while (i < raw.length) {
+		const c = raw[i];
+		if (c === "`") {
+			str += c;
+			i++;
+			break;
+		} else if (c === "$" && raw[i + 1] === "{") {
+			str += "${";
+			i += 2;
+			const { expr, consumed } = scanExpression(raw, i);
+			str += `${expr}}`;
+			i += consumed;
+		} else {
+			str += c;
+			i++;
+		}
+	}
+	return {
+		str,
+		consumed: i - start
+	};
+}
+/**
+* Split the raw content of a template string (between the surrounding backticks)
+* into alternating literal and expression segments.
+*/
+function splitSegments(raw) {
+	const segments = [];
+	let i = 0;
+	let literal = "";
+	while (i < raw.length) if (raw[i] === "$" && raw[i + 1] === "{") {
+		if (literal.length > 0) {
+			segments.push({
+				type: "literal",
+				value: literal
+			});
+			literal = "";
+		}
+		i += 2;
+		const { expr, consumed } = scanExpression(raw, i);
+		i += consumed;
+		segments.push({
+			type: "expression",
+			value: expr
+		});
+	} else {
+		literal += raw[i];
+		i++;
+	}
+	if (literal.length > 0) segments.push({
+		type: "literal",
+		value: literal
+	});
+	return segments;
+}
+function parseTemplateString(ctx, token) {
+	ctx.advance();
+	const sourceCodeInfo = token[2];
+	const segments = splitSegments(token[1].slice(1, -1));
+	if (segments.length === 0) return withSourceCodeInfo([NodeTypes.String, ""], sourceCodeInfo);
+	if (segments.length === 1 && segments[0].type === "literal") return withSourceCodeInfo([NodeTypes.String, segments[0].value], sourceCodeInfo);
+	const segmentNodes = [];
+	for (const segment of segments) if (segment.type === "literal") {
+		if (segment.value.length === 0) continue;
+		segmentNodes.push(withSourceCodeInfo([NodeTypes.String, segment.value], sourceCodeInfo));
+	} else {
+		if (segment.value.trim().length === 0) throw new DvalaError("Empty interpolation in template string", sourceCodeInfo);
+		const minified = minifyTokenStream(tokenize(segment.value, false, sourceCodeInfo?.filePath), { removeWhiteSpace: true });
+		for (const t of minified.tokens) if (t[0] === "Error") throw new DvalaError(`Template string interpolation error: ${t[3]}`, sourceCodeInfo);
+		const expr = parseExpression(createParserContext(minified), 0);
+		segmentNodes.push(expr);
+	}
+	return withSourceCodeInfo([NodeTypes.TemplateString, segmentNodes], sourceCodeInfo);
+}
+//#endregion
 //#region src/parser/subParsers/parseBindingTarget.ts
 function parseBindingTarget(ctx, { requireDefaultValue, noRest, allowLiteralPatterns } = {}) {
 	const firstToken = ctx.tryPeek();
@@ -27134,6 +27312,10 @@ function parseBindingTarget(ctx, { requireDefaultValue, noRest, allowLiteralPatt
 			const node = parseNumber(ctx);
 			return withSourceCodeInfo([bindingTargetTypes.literal, [node]], firstToken[2]);
 		}
+		if (isTemplateStringToken(firstToken)) {
+			const node = parseTemplateString(ctx, firstToken);
+			return withSourceCodeInfo([bindingTargetTypes.literal, [node]], firstToken[2]);
+		}
 		if (isStringToken(firstToken)) {
 			const node = parseString(ctx, firstToken);
 			return withSourceCodeInfo([bindingTargetTypes.literal, [node]], firstToken[2]);
@@ -27251,7 +27433,7 @@ function parseOptionalDefaulValue(ctx) {
 	}
 }
 function isLiteralToken(token) {
-	return isNumberToken(token) || isBasePrefixedNumberToken(token) || isStringToken(token) || isReservedSymbolToken(token, "true") || isReservedSymbolToken(token, "false") || isReservedSymbolToken(token, "null");
+	return isNumberToken(token) || isBasePrefixedNumberToken(token) || isStringToken(token) || isTemplateStringToken(token) || isReservedSymbolToken(token, "true") || isReservedSymbolToken(token, "false") || isReservedSymbolToken(token, "null");
 }
 //#endregion
 //#region src/parser/subParsers/parseLet.ts
@@ -27631,7 +27813,8 @@ function parseObject(ctx) {
 			params.push(withSourceCodeInfo([NodeTypes.Spread, ctx.parseExpression()], ctx.peekSourceCodeInfo()));
 		} else {
 			const token = ctx.tryPeek();
-			if (isStringToken(token)) {
+			if (isTemplateStringToken(token)) params.push(parseTemplateString(ctx, token));
+			else if (isStringToken(token)) {
 				const stringNode = parseString(ctx, token);
 				params.push(withSourceCodeInfo([NodeTypes.String, stringNode[1]], token[2]));
 			} else if (isSymbolToken(token)) {
@@ -27657,176 +27840,6 @@ function parseObject(ctx) {
 	return withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.object, params]], firstToken[2]);
 }
 //#endregion
-//#region src/tokenizer/minifyTokenStream.ts
-function minifyTokenStream(tokenStream, { removeWhiteSpace }) {
-	const tokens = tokenStream.tokens.filter((token) => {
-		if (isSingleLineCommentToken(token) || isMultiLineCommentToken(token) || isShebangToken(token) || removeWhiteSpace && isWhitespaceToken(token)) return false;
-		return true;
-	});
-	return {
-		...tokenStream,
-		tokens
-	};
-}
-//#endregion
-//#region src/parser/subParsers/parseTemplateString.ts
-/**
-* Scan from `start` inside a `${...}` interpolation until the matching `}`.
-* Returns the expression source text (without the outer `${` and `}`) and
-* the number of characters consumed (including the closing `}`).
-*/
-function scanExpression(raw, start) {
-	let i = start;
-	let expr = "";
-	let depth = 1;
-	while (i < raw.length && depth > 0) {
-		const c = raw[i];
-		if (c === "{") {
-			depth++;
-			expr += c;
-			i++;
-		} else if (c === "}") {
-			depth--;
-			if (depth > 0) expr += c;
-			i++;
-		} else if (c === "\"") {
-			const { str, consumed } = scanString(raw, i);
-			expr += str;
-			i += consumed;
-		} else if (c === "'") {
-			const { str, consumed } = scanQuotedSymbol(raw, i);
-			expr += str;
-			i += consumed;
-		} else if (c === "`") {
-			const { str, consumed } = scanNestedTemplate(raw, i);
-			expr += str;
-			i += consumed;
-		} else {
-			expr += c;
-			i++;
-		}
-	}
-	return {
-		expr,
-		consumed: i - start
-	};
-}
-function scanString(raw, start) {
-	let i = start + 1;
-	let str = "\"";
-	let escaping = false;
-	while (i < raw.length) {
-		const c = raw[i];
-		str += c;
-		i++;
-		if (escaping) escaping = false;
-		else if (c === "\\") escaping = true;
-		else if (c === "\"") break;
-	}
-	return {
-		str,
-		consumed: i - start
-	};
-}
-function scanQuotedSymbol(raw, start) {
-	let i = start + 1;
-	let str = "'";
-	let escaping = false;
-	while (i < raw.length) {
-		const c = raw[i];
-		str += c;
-		i++;
-		if (escaping) escaping = false;
-		else if (c === "\\") escaping = true;
-		else if (c === "'") break;
-	}
-	return {
-		str,
-		consumed: i - start
-	};
-}
-/**
-* Scan a full nested template string starting at `start` (pointing at the opening backtick).
-* Handles ${...} spans inside the template recursively.
-*/
-function scanNestedTemplate(raw, start) {
-	let i = start + 1;
-	let str = "`";
-	while (i < raw.length) {
-		const c = raw[i];
-		if (c === "`") {
-			str += c;
-			i++;
-			break;
-		} else if (c === "$" && raw[i + 1] === "{") {
-			str += "${";
-			i += 2;
-			const { expr, consumed } = scanExpression(raw, i);
-			str += `${expr}}`;
-			i += consumed;
-		} else {
-			str += c;
-			i++;
-		}
-	}
-	return {
-		str,
-		consumed: i - start
-	};
-}
-/**
-* Split the raw content of a template string (between the surrounding backticks)
-* into alternating literal and expression segments.
-*/
-function splitSegments(raw) {
-	const segments = [];
-	let i = 0;
-	let literal = "";
-	while (i < raw.length) if (raw[i] === "$" && raw[i + 1] === "{") {
-		if (literal.length > 0) {
-			segments.push({
-				type: "literal",
-				value: literal
-			});
-			literal = "";
-		}
-		i += 2;
-		const { expr, consumed } = scanExpression(raw, i);
-		i += consumed;
-		segments.push({
-			type: "expression",
-			value: expr
-		});
-	} else {
-		literal += raw[i];
-		i++;
-	}
-	if (literal.length > 0) segments.push({
-		type: "literal",
-		value: literal
-	});
-	return segments;
-}
-function parseTemplateString(ctx, token) {
-	ctx.advance();
-	const sourceCodeInfo = token[2];
-	const segments = splitSegments(token[1].slice(1, -1));
-	if (segments.length === 0) return withSourceCodeInfo([NodeTypes.String, ""], sourceCodeInfo);
-	if (segments.length === 1 && segments[0].type === "literal") return withSourceCodeInfo([NodeTypes.String, segments[0].value], sourceCodeInfo);
-	const segmentNodes = [];
-	for (const segment of segments) if (segment.type === "literal") {
-		if (segment.value.length === 0) continue;
-		segmentNodes.push(withSourceCodeInfo([NodeTypes.String, segment.value], sourceCodeInfo));
-	} else {
-		if (segment.value.trim().length === 0) throw new DvalaError("Empty interpolation in template string", sourceCodeInfo);
-		const minified = minifyTokenStream(tokenize(segment.value, false, sourceCodeInfo?.filePath), { removeWhiteSpace: true });
-		for (const t of minified.tokens) if (t[0] === "Error") throw new DvalaError(`Template string interpolation error: ${t[3]}`, sourceCodeInfo);
-		const expr = parseExpression(createParserContext(minified), 0);
-		segmentNodes.push(expr);
-	}
-	return withSourceCodeInfo([NodeTypes.TemplateString, segmentNodes], sourceCodeInfo);
-}
-//#endregion
 //#region src/parser/subParsers/parseOperand.ts
 function parseOperand(ctx) {
 	let operand = parseOperandPart(ctx);
@@ -32002,6 +32015,13 @@ var Cache = class {
 * a Dvala instance.
 */
 /**
+* Tokenize a Dvala source string into a token stream.
+* Pass `debug: true` to capture source positions (needed for the debugger).
+*/
+function tokenizeSource(source, debug = false, filePath) {
+	return tokenize(source, debug, filePath);
+}
+/**
 * Get all undefined symbols in a Dvala program.
 *
 * @param source - Dvala source code
@@ -33741,11 +33761,38 @@ const getInlineCodeRule = (fmt) => (text, index) => {
 		formattedText: ""
 	};
 };
+function getTemplateStringRule(fmt) {
+	return (text, index) => {
+		if (text[index] !== "`") return noMatch;
+		try {
+			const { tokens } = tokenizeSource(text.slice(index));
+			const first = tokens[0];
+			if (!first || first[0] !== "TemplateString") return noMatch;
+			const count = first[1].length;
+			const segments = splitSegments(first[1].slice(1, -1));
+			let formattedText = `${Colors.FgRed}\`${Colors.Reset}`;
+			for (const seg of segments) if (seg.type === "literal") formattedText += Colors.FgRed + seg.value + Colors.Reset;
+			else {
+				formattedText += `${Colors.Bright}${Colors.FgWhite}\${${Colors.Reset}`;
+				formattedText += getDvalaFormatter(fmt)(seg.value);
+				formattedText += `${Colors.Bright}${Colors.FgWhite}}${Colors.Reset}`;
+			}
+			formattedText += `${Colors.FgRed}\`${Colors.Reset}`;
+			return {
+				count,
+				formattedText
+			};
+		} catch {
+			return noMatch;
+		}
+	};
+}
 function getDvalaExpressionRules(cli) {
 	return [
 		commentRule,
 		stringRule,
 		shortcutStringRule,
+		getTemplateStringRule(cli),
 		functionNameRule,
 		getNumberRule(cli),
 		dvalaKeywordRule,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojir/dvala",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "dvala",
   "author": "Albert Mojir",
   "license": "MIT",