@svelte-vitals/core 0.37.0 → 0.38.0

package/dist/index.d.ts

@@ -1643,13 +1643,11 @@ declare const APP_SCRIPT: string;
 declare function renderAppShell(snapshot: AppSnapshot): string;
 /**
  * Static (non-live) document over a prebuilt JsonReport — kept as the public name the
- * html reporter has always exported. `routeBadges` preserves the old opts shape.
+ * html reporter has always exported.
  */
 declare function buildHtmlDocument(report: JsonReport, meta: {
     version: string;
     coreVersion?: string;
-}, opts?: {
-    routeBadges?: Record<string, RouteBadge>;
 }): string;
 /** Render results as the self-contained HTML report (the CLI's `--reporter html`). */
 declare function formatHtmlReport(results: Result[], config: Config, meta: {

package/dist/index.js

@@ -167,17 +167,9 @@ function collectEachBlocks(node, source, acc) {
   }
 }
 var WALK_IGNORED_KEYS = /* @__PURE__ */ new Set(["type", "start", "end", "loc", "range"]);
+var NO_BOUNDARIES = /* @__PURE__ */ new Set();
 function walkEstree(node, visit) {
-  if (Array.isArray(node)) {
-    for (const child of node) walkEstree(child, visit);
-    return;
-  }
-  if (!node || typeof node !== "object" || typeof node.type !== "string") return;
-  visit(node);
-  for (const key of Object.keys(node)) {
-    if (WALK_IGNORED_KEYS.has(key)) continue;
-    walkEstree(node[key], visit);
-  }
+  walkEvalScope(node, (n) => void visit(n), /* @__PURE__ */ new Set(), NO_BOUNDARIES);
 }
 function isEffectCall(node) {
   const c = node?.callee;
@@ -280,18 +272,7 @@ function scopeIntroducedNames(node) {
   return introduced;
 }
 function walkScoped(node, visit, shadowed = /* @__PURE__ */ new Set()) {
-  if (Array.isArray(node)) {
-    for (const child of node) walkScoped(child, visit, shadowed);
-    return;
-  }
-  if (!node || typeof node !== "object" || typeof node.type !== "string") return;
-  const introduced = scopeIntroducedNames(node);
-  const scope = introduced.size > 0 ? /* @__PURE__ */ new Set([...shadowed, ...introduced]) : shadowed;
-  visit(node, scope);
-  for (const key of Object.keys(node)) {
-    if (WALK_IGNORED_KEYS.has(key)) continue;
-    walkScoped(node[key], visit, scope);
-  }
+  walkEvalScope(node, (n, scope) => void visit(n, scope), shadowed, NO_BOUNDARIES);
 }
 function collectStateWrites(root, stateNames, acc, kinds) {
   const record = (name, kind) => {
@@ -769,7 +750,7 @@ function collectPropNames(program, includeBindable) {
   let seen = 0;
   let ambiguous = false;
   walkEstree(program, (n) => {
-    if (n.type !== "VariableDeclarator" || !n.init || !isPropsCall(n.init)) return;
+    if (n.type !== "VariableDeclarator" || !n.init || !isPropsCall(unwrapTs(n.init))) return;
     seen++;
     if (n.id?.type === "Identifier") {
       names.add(n.id.name);
@@ -842,7 +823,7 @@ function countProps(program) {
   let seen = 0;
   let uncountable = false;
   walkEstree(program, (n) => {
-    if (n.type !== "VariableDeclarator" || !n.init || !isPropsCall(n.init)) return;
+    if (n.type !== "VariableDeclarator" || !n.init || !isPropsCall(unwrapTs(n.init))) return;
     seen++;
     const props = n.id?.type === "ObjectPattern" ? n.id.properties : void 0;
     if (!Array.isArray(props) || props.some((p) => p?.type === "RestElement")) {
@@ -958,19 +939,19 @@ var EVAL_SCOPE_BOUNDARIES = /* @__PURE__ */ new Set([
   "ClassDeclaration",
   "ClassExpression"
 ]);
-function walkEvalScope(node, visit, shadowed = /* @__PURE__ */ new Set()) {
+function walkEvalScope(node, visit, shadowed = /* @__PURE__ */ new Set(), boundaries = EVAL_SCOPE_BOUNDARIES) {
   if (Array.isArray(node)) {
-    for (const child of node) walkEvalScope(child, visit, shadowed);
+    for (const child of node) walkEvalScope(child, visit, shadowed, boundaries);
     return;
   }
   if (!node || typeof node !== "object" || typeof node.type !== "string") return;
   const introduced = scopeIntroducedNames(node);
   const scope = introduced.size > 0 ? /* @__PURE__ */ new Set([...shadowed, ...introduced]) : shadowed;
   if (visit(node, scope)) return;
-  if (EVAL_SCOPE_BOUNDARIES.has(node.type)) return;
+  if (boundaries.has(node.type)) return;
   for (const key of Object.keys(node)) {
     if (WALK_IGNORED_KEYS.has(key)) continue;
-    walkEvalScope(node[key], visit, scope);
+    walkEvalScope(node[key], visit, scope, boundaries);
   }
 }
 function collectEvalScopeCalls(root, source, matcher, skipSubtree, initialShadowed) {
@@ -1261,13 +1242,13 @@ function collectModuleStateDecls(program, source) {
     const decl = unwrapExport(stmt);
     if (decl?.type === "VariableDeclaration") {
       for (const d of decl.declarations ?? []) {
-        if (d?.id?.type === "Identifier" && d.init && isStateDeclaration(d.init)) {
+        if (d?.id?.type === "Identifier" && d.init && isStateDeclaration(unwrapTs(d.init))) {
           out.push({ name: d.id.name, line: lineOf(source, d.start) });
         }
       }
     } else if (decl?.type === "ClassDeclaration" && decl.id?.type === "Identifier") {
       const hasStateField = (decl.body?.body ?? []).some(
-        (m) => m?.type === "PropertyDefinition" && m.value && isStateDeclaration(m.value)
+        (m) => m?.type === "PropertyDefinition" && m.value && isStateDeclaration(unwrapTs(m.value))
       );
       if (hasStateField) statefulClasses.add(decl.id.name);
     }
@@ -1303,6 +1284,17 @@ function parseModuleFacts(source, filename) {
     for (const l of raw) basePathLinks.push({ ...l, line: shift(l.line) });
     basePathLinks.sort((a, b) => a.line - b.line);
   }
+  const importSpans = [];
+  const namespaceImports = [];
+  if (program) {
+    const rawImportSpans = [];
+    collectImportSources(program, wrapped, rawImportSpans);
+    for (const s of rawImportSpans) importSpans.push({ ...s, line: shift(s.line) });
+    const rawNamespaceImports = [];
+    collectNamespaceImports(program, wrapped, rawNamespaceImports);
+    for (const n of rawNamespaceImports) namespaceImports.push({ ...n, line: shift(n.line) });
+  }
+  const imports = importSpans.map((s) => s.source);
   return {
     eachBlocks: [],
     effects: [],
@@ -1310,9 +1302,9 @@ function parseModuleFacts(source, filename) {
     javascriptUrls: [],
     loc: 0,
     propCount: 0,
-    imports: [],
-    importSpans: [],
-    namespaceImports: [],
+    imports,
+    importSpans,
+    namespaceImports,
     constableStates: [],
     mutatedProps: [],
     stalePropDerivations: [],
@@ -1409,11 +1401,12 @@ function parseComponentFacts(source, filename) {
     const stateDecls = [];
     walkEstree(program, (n) => {
       if (n.type !== "VariableDeclarator" || !n.init) return;
-      if (isStateDeclaration(n.init) && n.id?.type === "Identifier") {
+      const init = unwrapTs(n.init);
+      if (isStateDeclaration(init) && n.id?.type === "Identifier") {
         stateNames.add(n.id.name);
         stateDecls.push({ name: n.id.name, line: lineOf(source, n.start) });
       }
-      if (isStateDeclaration(n.init) || isDerivedDeclaration(n.init) || isPropsCall(n.init))
+      if (isStateDeclaration(init) || isDerivedDeclaration(init) || isPropsCall(init))
         addBoundNames(n.id, reactiveNames);
     });
     walkEstree(program, (n) => {
@@ -1440,8 +1433,10 @@ function parseComponentFacts(source, filename) {
     for (const stmt of program.body ?? []) {
       if (stmt?.type !== "VariableDeclaration") continue;
       for (const d of stmt.declarations ?? []) {
-        if (d?.id?.type !== "Identifier" || !d.init || !isPlainStateCall(d.init)) continue;
-        const arg = unwrapTs(d.init.arguments?.[0]);
+        if (d?.id?.type !== "Identifier" || !d.init) continue;
+        const init = unwrapTs(d.init);
+        if (!isPlainStateCall(init)) continue;
+        const arg = unwrapTs(init.arguments?.[0]);
         if (arg?.type === "ObjectExpression" || arg?.type === "ArrayExpression") {
           rawableCandidates.push({ name: d.id.name, line: lineOf(source, d.start) });
         }
@@ -1475,8 +1470,10 @@ function parseComponentFacts(source, filename) {
     for (const stmt of program.body ?? []) {
       if (stmt?.type !== "VariableDeclaration") continue;
       for (const d of stmt.declarations ?? []) {
-        if (d?.id?.type !== "Identifier" || !d.init || !isPlainStateCall(d.init)) continue;
-        const arg = unwrapTs(d.init.arguments?.[0]);
+        if (d?.id?.type !== "Identifier" || !d.init) continue;
+        const init = unwrapTs(d.init);
+        if (!isPlainStateCall(init)) continue;
+        const arg = unwrapTs(init.arguments?.[0]);
         if (arg?.type === "NewExpression" && arg.callee?.type === "Identifier" && BUILTIN_STATE_TYPES.has(arg.callee.name)) {
           builtinCandidates.set(d.id.name, { type: arg.callee.name, line: lineOf(source, d.start) });
         }
@@ -3514,7 +3511,6 @@ var PLACEHOLDER_RES = [
   /yourcompany/i,
   /your name here/i
 ];
-var PLACEHOLDERS = PLACEHOLDER_RES.map((r) => r.source);
 function hasPlaceholder(s) {
   return PLACEHOLDER_RES.some((re) => re.test(s));
 }
@@ -3746,14 +3742,12 @@ var seoJsonLdRequiredProps = jsonldRule({
 });
 
 // src/rules/seo/text-metrics.ts
-var segmenter = typeof Intl !== "undefined" && typeof Intl.Segmenter === "function" ? new Intl.Segmenter() : void 0;
+var segmenter = new Intl.Segmenter();
 function collapseWhitespace(s) {
   return s.trim().replace(/\s+/g, " ");
 }
 function visibleLength(s) {
-  const collapsed = collapseWhitespace(s);
-  if (!segmenter) return [...collapsed].length;
-  return [...segmenter.segment(collapsed)].length;
+  return [...segmenter.segment(collapseWhitespace(s))].length;
 }
 
 // src/rules/seo/length-rule.ts
@@ -7202,13 +7196,10 @@ function renderAppShell(snapshot) {
   const title = snapshot.live ? "svelte-vitals dashboard" : "svelte-vitals report";
   return `<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>${title}</title><style>${APP_STYLE}</style></head><body><div class="dv-app" id="dv-app"><header class="dv-topbar" id="dv-topbar"></header><nav class="dv-sidebar" id="dv-sidebar"></nav><main class="dv-detail" id="dv-detail"></main></div><script type="application/json" id="svelte-vitals-data">${embedJson(safe)}</script><script>${APP_SCRIPT}</script></body></html>`;
 }
-function buildHtmlDocument(report, meta, opts) {
-  const badges = Object.fromEntries(
-    Object.entries(opts?.routeBadges ?? {}).filter(([, b]) => b === "measured" || b === "static")
-  );
+function buildHtmlDocument(report, meta) {
   return renderAppShell({
     report,
-    badges,
+    badges: {},
     analyzing: false,
     sequence: 0,
     live: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@svelte-vitals/core",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "description": "Shared, runtime-agnostic core for svelte-vitals (types, rule engine, scorer, reporter).",
   "type": "module",
   "license": "MIT",