@vaadin/hilla-generator-utils 25.2.0-alpha7 → 25.2.0-alpha9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-utils",
-  "version": "25.2.0-alpha7",
+  "version": "25.2.0-alpha9",
   "description": "A set of utils for developing Hilla generator plugins",
   "main": "index.js",
   "type": "module",
@@ -29,7 +29,8 @@
     "./createSourceFile.js": "./createSourceFile.js",
     "./memoize.js": "./memoize.js",
     "./LoggerFactory.js": "./LoggerFactory.js",
-    "./PluginError.js": "./PluginError.js"
+    "./PluginError.js": "./PluginError.js",
+    "./tsc-template.js": "./tsc-template.js"
   },
   "repository": {
     "type": "git",

package/tsc-template.d.ts

@@ -0,0 +1,10 @@
+import { type Node, type SourceFile, type TransformerFactory, type VisitResult } from "typescript";
+export type Transformer = (node: Node) => VisitResult<Node | undefined>;
+export declare function createTransformer(transformer: Transformer): TransformerFactory<SourceFile>;
+declare const $templateResult: unique symbol;
+export type TemplateResult = Readonly<{
+	brand: typeof $templateResult
+	node: Node
+	source: SourceFile
+}>;
+export default function ast(parts: TemplateStringsArray, ...fillers: ReadonlyArray<TemplateResult | Node | string | null | undefined>): TemplateResult;

package/tsc-template.js

@@ -0,0 +1,72 @@
+import { createSourceFile, forEachChild, isIdentifier, ScriptKind, ScriptTarget, transform, visitEachChild } from "typescript";
+export function createTransformer(transformer) {
+	return (context) => (root) => {
+		const visitor = (node) => {
+			const transformed = transformer(node);
+			if (transformed !== node) {
+				return transformed;
+			}
+			return visitEachChild(transformed, visitor, context);
+		};
+		return visitEachChild(root, visitor, context);
+	};
+}
+const $templateResult = Symbol("TemplateResult");
+function isTemplateResult(value) {
+	return typeof value === "object" && value !== null && "brand" in value && value.brand === $templateResult;
+}
+const START_MARKER = /\/\*\*\s*@START\s*\*\//iu;
+const END_MARKER = /\/\*\*\s*@END\s*\*\//iu;
+function extractCodePart(str) {
+	const startMatch = START_MARKER.exec(str);
+	const afterStart = startMatch ? str.slice(startMatch.index + startMatch[0].length) : str;
+	const endMatch = END_MARKER.exec(afterStart);
+	const codePart = endMatch ? afterStart.slice(0, endMatch.index) : afterStart;
+	return codePart.trim();
+}
+function isInjectedNode(node) {
+	return node.pos < 0 || node.end < 0;
+}
+function findBestNode(file) {
+	const codePart = extractCodePart(file.getText());
+	let latest = file;
+	const find = (node) => {
+		if (!isInjectedNode(node) && node.getText(file) === codePart) {
+			latest = node;
+		} else if (latest !== file) {
+			return latest;
+		}
+		return forEachChild(node, find);
+	};
+	return forEachChild(file, find) ?? latest;
+}
+export default function ast(parts, ...fillers) {
+	let code = "";
+	const transformers = [];
+	for (let i = 0; i < parts.length; i++) {
+		const filler = fillers[i];
+		code += parts[i];
+		if (filler != null) {
+			if (typeof filler === "string") {
+				code += filler;
+			} else {
+				const id = `$${crypto.randomUUID().replaceAll("-", "_")}`;
+				code += id;
+				transformers.push(createTransformer((n) => isIdentifier(n) && n.text === id ? isTemplateResult(filler) ? filler.node : filler : n));
+			}
+		}
+	}
+	if (code.includes("%{") || code.includes("}%")) {
+		code = code.replaceAll("%{", "/** @START */").replaceAll("}%", "/** @END */");
+	}
+	if (code.indexOf("/** @START */") !== code.lastIndexOf("/** @START */") || code.indexOf("/** @END */") !== code.lastIndexOf("/** @END */")) {
+		throw new Error("Only one set of code extractors is allowed: %{ ... }% or /** @START */ ... /** @END */");
+	}
+	const [source] = transform(createSourceFile("", code, ScriptTarget.Latest, false, ScriptKind.TSX), transformers).transformed;
+	return {
+		brand: $templateResult,
+		node: findBestNode(source),
+		source
+	};
+}
+//# sourceMappingURL=./tsc-template.js.map

package/tsc-template.js.map

@@ -0,0 +1 @@
+{"mappings":"AAOA,SACE,kBACA,cACA,cAEA,YACA,cAEA,WAEA,kCAEkB;AAIpB,OAAO,SAAS,kBAAkBA,aAA0D;AAC1F,QAAO,CAAC,YAAY,CAAC,SAAS;EAC5B,MAAM,UAAU,CAACC,SAA8C;GAC7D,MAAM,cAAc,YAAY,KAAK;AACrC,OAAI,gBAAgB,MAAM;AACxB,WAAO;GACR;AACD,UAAO,eAAe,aAAa,SAAS,QAAQ;EACrD;AACD,SAAO,eAAe,MAAM,SAAS,QAAQ;CAC9C;AACF;AAED,MAAMC,kBAAiC,OAAO,iBAAiB;AAQ/D,SAAS,iBAAiBC,OAAyC;AACjE,eAAc,UAAU,YAAY,UAAU,QAAQ,WAAW,SAAS,MAAM,UAAU;AAC3F;AAID,MAAM,eAAe;AACrB,MAAM,aAAa;AAEnB,SAAS,gBAAgBC,KAAqB;CAC5C,MAAM,aAAa,aAAa,KAAK,IAAI;CACzC,MAAM,aAAa,aAAa,IAAI,MAAM,WAAW,QAAQ,WAAW,GAAG,OAAO,GAAG;CACrF,MAAM,WAAW,WAAW,KAAK,WAAW;CAC5C,MAAM,WAAW,WAAW,WAAW,MAAM,GAAG,SAAS,MAAM,GAAG;AAClE,QAAO,SAAS,MAAM;AACvB;AAED,SAAS,eAAeH,MAAqB;AAC3C,QAAO,KAAK,MAAM,KAAK,KAAK,MAAM;AACnC;AAED,SAAS,aAAaI,MAAwB;CAC5C,MAAM,WAAW,gBAAgB,KAAK,SAAS,CAAC;CAChD,IAAIC,SAAe;CACnB,MAAM,OAAO,CAACL,SAAiC;AAC7C,OAAK,eAAe,KAAK,IAAI,KAAK,QAAQ,KAAK,KAAK,UAAU;AAC5D,YAAS;EACV,WAAU,WAAW,MAAM;AAC1B,UAAO;EACR;AACD,SAAO,aAAa,MAAM,KAAK;CAChC;AACD,QAAO,aAAa,MAAM,KAAK,IAAI;AACpC;AAED,eAAe,SAAS,IACtBM,OACA,GAAG,SACa;CAChB,IAAI,OAAO;CACX,MAAMC,eAAsD,CAAE;AAE9D,MAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;EACrC,MAAM,SAAS,QAAQ;AACvB,UAAQ,MAAM;AACd,MAAI,UAAU,MAAM;AAClB,cAAW,WAAW,UAAU;AAC9B,YAAQ;GACT,OAAM;IACL,MAAM,MAAM,GAAG,OAAO,YAAY,CAAC,WAAW,KAAK,IAAI,CAAC;AACxD,YAAQ;AACR,iBAAa,KACX,kBAAkB,CAAC,MACjB,aAAa,EAAE,IAAI,EAAE,SAAS,KAAM,iBAAiB,OAAO,GAAG,OAAO,OAAO,SAAU,EACxF,CACF;GACF;EACF;CACF;AAED,KAAI,KAAK,SAAS,KAAK,IAAI,KAAK,SAAS,KAAK,EAAE;AAC9C,SAAO,KAAK,WAAW,MAAM,gBAAgB,CAAC,WAAW,MAAM,cAAc;CAC9E;AAED,KACE,KAAK,QAAQ,gBAAgB,KAAK,KAAK,YAAY,gBAAgB,IACnE,KAAK,QAAQ,cAAc,KAAK,KAAK,YAAY,cAAc,EAC/D;AACA,QAAM,IAAI,MAAM;CACjB;CAED,MAAM,CAAC,OAAO,GAAG,UACf,iBAAiB,IAAI,MAAM,aAAa,QAAQ,OAAO,WAAW,IAAI,EACtE,aACD,CAAC;AACF,QAAO;EAAE,OAAO;EAAiB,MAAM,aAAa,OAAO;EAAE;CAAQ;AACtE","names":["transformer: Transformer","node: Node","$templateResult: unique symbol","value: unknown","str: string","file: SourceFile","latest: Node","parts: TemplateStringsArray","transformers: Array<TransformerFactory<SourceFile>>"],"sources":["/opt/agent/work/649c11185a3798db/packages/ts/generator-utils/src/tsc-template.ts"],"sourcesContent":["/*\n * Adapted from `tsc-template` (https://github.com/ausginer/tsc-template),\n * © 2024 Vlad Rindevich, Apache-2.0 licensed.\n *\n * Inlined here so Hilla packages don't carry an external dependency whose\n * peerDependency on TypeScript lags behind ours.\n */\nimport {\n  createSourceFile,\n  forEachChild,\n  isIdentifier,\n  type Node,\n  ScriptKind,\n  ScriptTarget,\n  type SourceFile,\n  transform,\n  type TransformerFactory,\n  visitEachChild,\n  type VisitResult,\n} from 'typescript';\n\nexport type Transformer = (node: Node) => VisitResult<Node | undefined>;\n\nexport function createTransformer(transformer: Transformer): TransformerFactory<SourceFile> {\n  return (context) => (root) => {\n    const visitor = (node: Node): VisitResult<Node | undefined> => {\n      const transformed = transformer(node);\n      if (transformed !== node) {\n        return transformed;\n      }\n      return visitEachChild(transformed, visitor, context);\n    };\n    return visitEachChild(root, visitor, context);\n  };\n}\n\nconst $templateResult: unique symbol = Symbol('TemplateResult');\n\nexport type TemplateResult = Readonly<{\n  brand: typeof $templateResult;\n  node: Node;\n  source: SourceFile;\n}>;\n\nfunction isTemplateResult(value: unknown): value is TemplateResult {\n  return typeof value === 'object' && value !== null && 'brand' in value && value.brand === $templateResult;\n}\n\n// Anchored, fixed-length patterns — no nested or overlapping quantifiers, so\n// matching is linear in the input length (no ReDoS surface).\nconst START_MARKER = /\\/\\*\\*\\s*@START\\s*\\*\\//iu;\nconst END_MARKER = /\\/\\*\\*\\s*@END\\s*\\*\\//iu;\n\nfunction extractCodePart(str: string): string {\n  const startMatch = START_MARKER.exec(str);\n  const afterStart = startMatch ? str.slice(startMatch.index + startMatch[0].length) : str;\n  const endMatch = END_MARKER.exec(afterStart);\n  const codePart = endMatch ? afterStart.slice(0, endMatch.index) : afterStart;\n  return codePart.trim();\n}\n\nfunction isInjectedNode(node: Node): boolean {\n  return node.pos < 0 || node.end < 0;\n}\n\nfunction findBestNode(file: SourceFile): Node {\n  const codePart = extractCodePart(file.getText());\n  let latest: Node = file;\n  const find = (node: Node): Node | undefined => {\n    if (!isInjectedNode(node) && node.getText(file) === codePart) {\n      latest = node;\n    } else if (latest !== file) {\n      return latest;\n    }\n    return forEachChild(node, find);\n  };\n  return forEachChild(file, find) ?? latest;\n}\n\nexport default function ast(\n  parts: TemplateStringsArray,\n  ...fillers: ReadonlyArray<TemplateResult | Node | string | null | undefined>\n): TemplateResult {\n  let code = '';\n  const transformers: Array<TransformerFactory<SourceFile>> = [];\n\n  for (let i = 0; i < parts.length; i++) {\n    const filler = fillers[i];\n    code += parts[i];\n    if (filler != null) {\n      if (typeof filler === 'string') {\n        code += filler;\n      } else {\n        const id = `$${crypto.randomUUID().replaceAll('-', '_')}`;\n        code += id;\n        transformers.push(\n          createTransformer((n) =>\n            isIdentifier(n) && n.text === id ? (isTemplateResult(filler) ? filler.node : filler) : n,\n          ),\n        );\n      }\n    }\n  }\n\n  if (code.includes('%{') || code.includes('}%')) {\n    code = code.replaceAll('%{', '/** @START */').replaceAll('}%', '/** @END */');\n  }\n\n  if (\n    code.indexOf('/** @START */') !== code.lastIndexOf('/** @START */') ||\n    code.indexOf('/** @END */') !== code.lastIndexOf('/** @END */')\n  ) {\n    throw new Error('Only one set of code extractors is allowed: %{ ... }% or /** @START */ ... /** @END */');\n  }\n\n  const [source] = transform(\n    createSourceFile('', code, ScriptTarget.Latest, false, ScriptKind.TSX),\n    transformers,\n  ).transformed;\n  return { brand: $templateResult, node: findBestNode(source), source };\n}\n"],"version":3}