@mojir/dvala 0.0.16 → 0.0.18

package/dist/cli/cli.js

@@ -118,7 +118,8 @@ const NodeTypes = {
 	SpecialBuiltinSymbol: 7,
 	ReservedSymbol: 8,
 	Binding: 9,
-	Spread: 10
+	Spread: 10,
+	TemplateString: 11
 };
 const NodeTypesSet = new Set(Object.values(NodeTypes));
 function getNodeTypeName(type) {
@@ -477,7 +478,7 @@ function findAllOccurrences(input, pattern) {
 }
 //#endregion
 //#region package.json
-var version = "0.0.16";
+var version = "0.0.18";
 //#endregion
 //#region src/typeGuards/string.ts
 function isString(value, options = {}) {
@@ -24998,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,
@@ -25810,6 +25816,94 @@ const tokenizeShebang = (input, position) => {
 	}
 	return NO_MATCH;
 };
+const tokenizeTemplateString = (input, position) => {
+	if (input[position] !== "`") return NO_MATCH;
+	let value = "`";
+	let length = 1;
+	while (position + length < input.length) {
+		const char = input[position + length];
+		if (char === "`") {
+			value += "`";
+			length += 1;
+			return [length, ["TemplateString", value]];
+		}
+		if (char === "$" && input[position + length + 1] === "{") {
+			value += "${";
+			length += 2;
+			let braceDepth = 1;
+			while (position + length < input.length && braceDepth > 0) {
+				const c = input[position + length];
+				if (c === "{") {
+					braceDepth += 1;
+					value += c;
+					length += 1;
+				} else if (c === "}") {
+					braceDepth -= 1;
+					value += c;
+					length += 1;
+				} else if (c === "\"") {
+					value += c;
+					length += 1;
+					let escaping = false;
+					while (position + length < input.length) {
+						const sc = input[position + length];
+						value += sc;
+						length += 1;
+						if (escaping) escaping = false;
+						else if (sc === "\\") escaping = true;
+						else if (sc === "\"") break;
+					}
+				} else if (c === "'") {
+					value += c;
+					length += 1;
+					let escaping = false;
+					while (position + length < input.length) {
+						const sc = input[position + length];
+						value += sc;
+						length += 1;
+						if (escaping) escaping = false;
+						else if (sc === "\\") escaping = true;
+						else if (sc === "'") break;
+					}
+				} else if (c === "`") {
+					const [nestedLength, nestedToken] = tokenizeTemplateString(input, position + length);
+					if (nestedLength === 0 || !nestedToken) return [length, [
+						"Error",
+						value,
+						void 0,
+						`Unclosed nested template string at position ${position + length}`
+					]];
+					if (nestedToken[0] === "Error") return [length + nestedLength, [
+						"Error",
+						value + nestedToken[1],
+						void 0,
+						nestedToken[3]
+					]];
+					value += nestedToken[1];
+					length += nestedLength;
+				} else {
+					value += c;
+					length += 1;
+				}
+			}
+			if (braceDepth > 0) return [length, [
+				"Error",
+				value,
+				void 0,
+				`Unclosed interpolation in template string at position ${position}`
+			]];
+		} else {
+			value += char;
+			length += 1;
+		}
+	}
+	return [length, [
+		"Error",
+		value,
+		void 0,
+		`Unclosed template string at position ${position}`
+	]];
+};
 const tokenizeSingleLineComment = (input, position) => {
 	if (input[position] === "/" && input[position + 1] === "/") {
 		let length = 2;
@@ -25834,6 +25928,7 @@ const tokenizers = [
 	tokenizeLBrace,
 	tokenizeRBrace,
 	tokenizeString,
+	tokenizeTemplateString,
 	tokenizeRegexpShorthand,
 	tokenizeBasePrefixedNumber,
 	tokenizeNumber,
@@ -26628,6 +26723,11 @@ function findUnresolvedSymbolsInNode(node, contextStack, builtin) {
 			});
 		}
 		case NodeTypes.Spread: return findUnresolvedSymbolsInNode(node[1], contextStack, builtin);
+		case NodeTypes.TemplateString: {
+			const unresolvedSymbols = /* @__PURE__ */ new Set();
+			for (const segment of node[1]) findUnresolvedSymbolsInNode(segment, contextStack, builtin)?.forEach((symbol) => unresolvedSymbols.add(symbol));
+			return unresolvedSymbols;
+		}
 		default: throw new DvalaError(`Unhandled node type: ${nodeType}`, node[2]);
 	}
 }
@@ -26733,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]);
 }
@@ -27027,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();
@@ -27039,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]);
@@ -27156,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
@@ -27536,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)) {
@@ -27616,6 +27894,7 @@ function parseOperandPart(ctx) {
 		case "Number":
 		case "BasePrefixedNumber": return parseNumber(ctx);
 		case "string": return parseString(ctx, token);
+		case "TemplateString": return parseTemplateString(ctx, token);
 		case "Symbol": {
 			ctx.storePosition();
 			const lamdaFunction = parseLambdaFunction(ctx);
@@ -27747,18 +28026,6 @@ function parse(tokenStream) {
 	return nodes;
 }
 //#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/evaluator/effectTypes.ts
 const SUSPENDED_MESSAGE = "Program suspended";
 /**
@@ -28439,9 +28706,33 @@ function stepNode(node, env, k) {
 		};
 		case NodeTypes.NormalExpression: return stepNormalExpression(node, env, k);
 		case NodeTypes.SpecialExpression: return stepSpecialExpression(node, env, k);
+		case NodeTypes.TemplateString: return stepTemplateString(node, env, k);
 		default: throw new DvalaError(`${getNodeTypeName(node[0])}-node cannot be evaluated`, node[2]);
 	}
 }
+function stepTemplateString(node, env, k) {
+	const segments = node[1];
+	const sourceCodeInfo = node[2];
+	if (segments.length === 0) return {
+		type: "Value",
+		value: "",
+		k
+	};
+	const frame = {
+		type: "TemplateStringBuild",
+		segments,
+		index: 0,
+		result: "",
+		env,
+		sourceCodeInfo
+	};
+	return {
+		type: "Eval",
+		node: segments[0],
+		env,
+		k: [frame, ...k]
+	};
+}
 /**
 * Normal expressions: evaluate arguments left-to-right, then dispatch.
 * Push EvalArgsFrame + NanCheckFrame, then start evaluating the first arg.
@@ -29371,6 +29662,7 @@ function applyFrame(frame, value, k) {
 		case "And": return applyAnd(frame, value, k);
 		case "Or": return applyOr(frame, value, k);
 		case "Qq": return applyQq(frame, value, k);
+		case "TemplateStringBuild": return applyTemplateStringBuild(frame, value, k);
 		case "ArrayBuild": return applyArrayBuild(frame, value, k);
 		case "ObjectBuild": return applyObjectBuild(frame, value, k);
 		case "LetBind": return applyLetBind(frame, value, k);
@@ -29657,6 +29949,27 @@ function advanceQq(frame, k) {
 function skipUndefinedQq(frame, k) {
 	return advanceQq(frame, k);
 }
+function applyTemplateStringBuild(frame, value, k) {
+	const { segments, env } = frame;
+	const result = frame.result + String(value);
+	const nextIndex = frame.index + 1;
+	if (nextIndex >= segments.length) return {
+		type: "Value",
+		value: result,
+		k
+	};
+	const newFrame = {
+		...frame,
+		index: nextIndex,
+		result
+	};
+	return {
+		type: "Eval",
+		node: segments[nextIndex],
+		env,
+		k: [newFrame, ...k]
+	};
+}
 function applyArrayBuild(frame, value, k) {
 	const { nodes, result, env, sourceCodeInfo } = frame;
 	if (frame.isSpread) {
@@ -31702,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
@@ -33441,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.16",
+  "version": "0.0.18",
   "description": "dvala",
   "author": "Albert Mojir",
   "license": "MIT",