@fluixi/ts-plugin 0.1.0-alpha.11 → 0.1.0-alpha.12

package/dist/index.js

@@ -376,79 +376,6 @@ var N = class {
 function b(e, t = {}) {
   return new N(e, t).parse();
 }
-function I(e) {
-  let t = [], i2 = 0;
-  return e.forEach((n, r) => {
-    t.push({ kind: "static", text: n, start: i2 }), i2 += n.length, r < e.length - 1 && t.push({ kind: "hole", index: r, start: i2, end: i2 });
-  }), t;
-}
-function Q(e, t = {}) {
-  return b(I(e), t);
-}
-
-// src/collect.ts
-var UNUSED_CODES = /* @__PURE__ */ new Set([6133, 6196, 6198, 6199, 6205, 6138, 6192]);
-function isUnusedCode(code) {
-  return UNUSED_CODES.has(code);
-}
-function usedComponentTags(ts, sourceFile) {
-  const tags = /* @__PURE__ */ new Set();
-  const visit = (node) => {
-    if (ts.isTaggedTemplateExpression(node) && ts.isIdentifier(node.tag) && (node.tag.text === "html" || node.tag.text === "svg")) {
-      collectTags(Q(templateStatics(ts, node.template)).root.children, tags);
-    }
-    ts.forEachChild(node, visit);
-  };
-  visit(sourceFile);
-  return tags;
-}
-function templateStatics(ts, tpl) {
-  if (ts.isNoSubstitutionTemplateLiteral(tpl)) return [tpl.text];
-  const out = [tpl.head.text];
-  for (const span of tpl.templateSpans) out.push(span.literal.text);
-  return out;
-}
-function collectTags(nodes, out) {
-  for (const node of nodes) {
-    if (node.kind === "Component" && node.tag) out.add(node.tag.split(".")[0]);
-    if ("children" in node && node.children) collectTags(node.children, out);
-  }
-}
-function shouldSuppress(ts, sourceFile, diagnostic, used) {
-  if (diagnostic.start === void 0 || !isUnusedCode(diagnostic.code)) return false;
-  const spanText = sourceFile.text.substr(diagnostic.start, diagnostic.length ?? 0);
-  const decl = importDeclarationAt(ts, sourceFile, diagnostic.start);
-  if (decl) {
-    const names = importedNames(ts, decl);
-    if (names.includes(spanText)) return used.has(spanText);
-    return names.some((n) => used.has(n));
-  }
-  return used.has(spanText);
-}
-function importDeclarationAt(ts, sourceFile, pos) {
-  let found;
-  const visit = (node) => {
-    if (found) return;
-    if (ts.isImportDeclaration(node) && node.getStart(sourceFile) <= pos && node.getEnd() >= pos) {
-      found = node;
-      return;
-    }
-    ts.forEachChild(node, visit);
-  };
-  visit(sourceFile);
-  return found;
-}
-function importedNames(ts, decl) {
-  const bindings = decl.importClause?.namedBindings;
-  const names = [];
-  if (decl.importClause?.name) names.push(decl.importClause.name.text);
-  if (bindings && ts.isNamedImports(bindings)) {
-    for (const el of bindings.elements) names.push(el.name.text);
-  } else if (bindings && ts.isNamespaceImport(bindings)) {
-    names.push(bindings.name.text);
-  }
-  return names;
-}
 
 // src/pieces.ts
 function rawContent(ts, node, sf) {
@@ -491,9 +418,17 @@ function parseCached(ts, sf, tpl) {
   return result;
 }
 var templates = /* @__PURE__ */ new WeakMap();
+function mayHaveTemplate(text) {
+  return text.includes("html`") || text.includes("svg`");
+}
+var NONE = [];
 function templatesIn(ts, sf) {
   const hit = templates.get(sf);
   if (hit) return hit;
+  if (!mayHaveTemplate(sf.text)) {
+    templates.set(sf, NONE);
+    return NONE;
+  }
   const found = [];
   const visit = (node) => {
     if (ts.isTaggedTemplateExpression(node) && ts.isIdentifier(node.tag) && (node.tag.text === "html" || node.tag.text === "svg")) {
@@ -516,6 +451,64 @@ function templateAtCached(ts, sf, pos) {
   return match;
 }
 
+// src/collect.ts
+var UNUSED_CODES = /* @__PURE__ */ new Set([6133, 6196, 6198, 6199, 6205, 6138, 6192]);
+function isUnusedCode(code) {
+  return UNUSED_CODES.has(code);
+}
+var tagCache = /* @__PURE__ */ new WeakMap();
+function usedComponentTags(ts, sourceFile) {
+  const hit = tagCache.get(sourceFile);
+  if (hit) return hit;
+  const tags = /* @__PURE__ */ new Set();
+  for (const template of templatesIn(ts, sourceFile)) {
+    collectTags(parseCached(ts, sourceFile, template.template).root.children, tags);
+  }
+  tagCache.set(sourceFile, tags);
+  return tags;
+}
+function collectTags(nodes, out) {
+  for (const node of nodes) {
+    if (node.kind === "Component" && node.tag) out.add(node.tag.split(".")[0]);
+    if ("children" in node && node.children) collectTags(node.children, out);
+  }
+}
+function shouldSuppress(ts, sourceFile, diagnostic, used) {
+  if (diagnostic.start === void 0 || !isUnusedCode(diagnostic.code)) return false;
+  const spanText = sourceFile.text.substr(diagnostic.start, diagnostic.length ?? 0);
+  const decl = importDeclarationAt(ts, sourceFile, diagnostic.start);
+  if (decl) {
+    const names = importedNames(ts, decl);
+    if (names.includes(spanText)) return used.has(spanText);
+    return names.some((n) => used.has(n));
+  }
+  return used.has(spanText);
+}
+function importDeclarationAt(ts, sourceFile, pos) {
+  let found;
+  const visit = (node) => {
+    if (found) return;
+    if (ts.isImportDeclaration(node) && node.getStart(sourceFile) <= pos && node.getEnd() >= pos) {
+      found = node;
+      return;
+    }
+    ts.forEachChild(node, visit);
+  };
+  visit(sourceFile);
+  return found;
+}
+function importedNames(ts, decl) {
+  const bindings = decl.importClause?.namedBindings;
+  const names = [];
+  if (decl.importClause?.name) names.push(decl.importClause.name.text);
+  if (bindings && ts.isNamedImports(bindings)) {
+    for (const el of bindings.elements) names.push(el.name.text);
+  } else if (bindings && ts.isNamespaceImport(bindings)) {
+    names.push(bindings.name.text);
+  }
+  return names;
+}
+
 // ../compiler/dist/resolve/builtins.mjs
 var s = ["Show", "For", "Index", "Switch", "Match", "Portal", "Dynamic", "ErrorBoundary"];
 var i = ["Suspense", "SuspenseList", "Await"];

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@fluixi/ts-plugin",
-  "version": "0.1.0-alpha.11",
+  "version": "0.1.0-alpha.12",
   "license": "MIT",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "description": "TypeScript language-service plugin for Fluixi: teaches tsserver that component tags used inside html`` templates (e.g. <UserCard/>) count as references, so they aren't flagged as unused.",
+  "description": "gives html`` templates the editor support JSX already gets; a component used only as a tag is no longer reported as unused",
   "type": "commonjs",
   "files": [
     "dist",
@@ -16,8 +16,8 @@
   ],
   "main": "./dist/index.js",
   "dependencies": {
-    "@fluixi/template-parser": "0.1.0-alpha.3",
-    "@fluixi/compiler": "1.0.0-alpha.77"
+    "@fluixi/template-parser": "0.1.0-alpha.4",
+    "@fluixi/compiler": "1.0.0-alpha.78"
   },
   "devDependencies": {
     "esbuild": "^0.24.0",