svelte-docinfo 0.14.0 → 0.15.0

package/README.md

@@ -64,7 +64,9 @@ Given a project with a `tsconfig.json` (at or above the project root) and two fi
  * @param b - second number
  * @returns the sum
  */
-export const add = (a: number, b: number): number => a + b;
+export function add(a: number, b: number): number {
+	return a + b;
+}
 ```
 
 and `src/lib/Calculator.svelte`:

package/dist/analyze-core.d.ts

@@ -65,14 +65,14 @@ import { type FileExists, type IsEmittedFile } from './typescript-extract-shared
 export type OnDuplicates = 'diagnostic' | 'warn' | 'throw';
 declare const AnalyzeResultJsonEntries: v.StrictObjectSchema<{
     readonly modules: v.OptionalSchema<v.ArraySchema<import("./types.js").ModuleJsonSchema, undefined>, () => never[]>;
-    readonly diagnostics: v.OptionalSchema<v.ArraySchema<v.VariantSchema<"kind", [import("./diagnostics.js").TypeExtractionDiagnosticSchema, import("./diagnostics.js").SignatureAnalysisDiagnosticSchema, import("./diagnostics.js").ClassMemberDiagnosticSchema, import("./diagnostics.js").SveltePropDiagnosticSchema, import("./diagnostics.js").ModuleSkippedDiagnosticSchema, import("./diagnostics.js").ModuleUnreadableDiagnosticSchema, import("./diagnostics.js").ImportParseDiagnosticSchema, import("./diagnostics.js").DuplicateCommentDiagnosticSchema, import("./diagnostics.js").MisplacedTagDiagnosticSchema, import("./diagnostics.js").UnknownParamDiagnosticSchema, import("./diagnostics.js").SourceMapFailedDiagnosticSchema, import("./diagnostics.js").DuplicateDeclarationDiagnosticSchema, import("./diagnostics.js").TransformFailedDiagnosticSchema, import("./diagnostics.js").ResolverFailedDiagnosticSchema, import("./diagnostics.js").AliasLostDiagnosticSchema], undefined>, undefined>, () => never[]>;
+    readonly diagnostics: v.OptionalSchema<v.ArraySchema<v.VariantSchema<"kind", [import("./diagnostics.js").TypeExtractionDiagnosticSchema, import("./diagnostics.js").SignatureAnalysisDiagnosticSchema, import("./diagnostics.js").ClassMemberDiagnosticSchema, import("./diagnostics.js").SveltePropDiagnosticSchema, import("./diagnostics.js").ModuleSkippedDiagnosticSchema, import("./diagnostics.js").ModuleUnreadableDiagnosticSchema, import("./diagnostics.js").ImportParseDiagnosticSchema, import("./diagnostics.js").DuplicateCommentDiagnosticSchema, import("./diagnostics.js").ComponentCommentMismatchDiagnosticSchema, import("./diagnostics.js").MisplacedTagDiagnosticSchema, import("./diagnostics.js").UnknownParamDiagnosticSchema, import("./diagnostics.js").SourceMapFailedDiagnosticSchema, import("./diagnostics.js").DuplicateDeclarationDiagnosticSchema, import("./diagnostics.js").TransformFailedDiagnosticSchema, import("./diagnostics.js").ResolverFailedDiagnosticSchema, import("./diagnostics.js").AliasLostDiagnosticSchema], undefined>, undefined>, () => never[]>;
 }, undefined>;
 /** @nodocs */
 export interface AnalyzeResultJsonEntriesInput extends Named<v.InferInput<typeof AnalyzeResultJsonEntries>> {
 }
 declare const AnalyzeResultJsonImpl: v.SchemaWithPipe<readonly [v.CustomSchema<AnalyzeResultJsonEntriesInput, v.ErrorMessage<v.CustomIssue> | undefined>, v.StrictObjectSchema<{
     readonly modules: v.OptionalSchema<v.ArraySchema<import("./types.js").ModuleJsonSchema, undefined>, () => never[]>;
-    readonly diagnostics: v.OptionalSchema<v.ArraySchema<v.VariantSchema<"kind", [import("./diagnostics.js").TypeExtractionDiagnosticSchema, import("./diagnostics.js").SignatureAnalysisDiagnosticSchema, import("./diagnostics.js").ClassMemberDiagnosticSchema, import("./diagnostics.js").SveltePropDiagnosticSchema, import("./diagnostics.js").ModuleSkippedDiagnosticSchema, import("./diagnostics.js").ModuleUnreadableDiagnosticSchema, import("./diagnostics.js").ImportParseDiagnosticSchema, import("./diagnostics.js").DuplicateCommentDiagnosticSchema, import("./diagnostics.js").MisplacedTagDiagnosticSchema, import("./diagnostics.js").UnknownParamDiagnosticSchema, import("./diagnostics.js").SourceMapFailedDiagnosticSchema, import("./diagnostics.js").DuplicateDeclarationDiagnosticSchema, import("./diagnostics.js").TransformFailedDiagnosticSchema, import("./diagnostics.js").ResolverFailedDiagnosticSchema, import("./diagnostics.js").AliasLostDiagnosticSchema], undefined>, undefined>, () => never[]>;
+    readonly diagnostics: v.OptionalSchema<v.ArraySchema<v.VariantSchema<"kind", [import("./diagnostics.js").TypeExtractionDiagnosticSchema, import("./diagnostics.js").SignatureAnalysisDiagnosticSchema, import("./diagnostics.js").ClassMemberDiagnosticSchema, import("./diagnostics.js").SveltePropDiagnosticSchema, import("./diagnostics.js").ModuleSkippedDiagnosticSchema, import("./diagnostics.js").ModuleUnreadableDiagnosticSchema, import("./diagnostics.js").ImportParseDiagnosticSchema, import("./diagnostics.js").DuplicateCommentDiagnosticSchema, import("./diagnostics.js").ComponentCommentMismatchDiagnosticSchema, import("./diagnostics.js").MisplacedTagDiagnosticSchema, import("./diagnostics.js").UnknownParamDiagnosticSchema, import("./diagnostics.js").SourceMapFailedDiagnosticSchema, import("./diagnostics.js").DuplicateDeclarationDiagnosticSchema, import("./diagnostics.js").TransformFailedDiagnosticSchema, import("./diagnostics.js").ResolverFailedDiagnosticSchema, import("./diagnostics.js").AliasLostDiagnosticSchema], undefined>, undefined>, () => never[]>;
 }, undefined>]>;
 /** @nodocs */
 export interface AnalyzeResultJsonSchema extends Named<typeof AnalyzeResultJsonImpl> {

package/dist/diagnostics.d.ts

@@ -80,7 +80,7 @@ export type DiagnosticSeverity = v.InferOutput<typeof DiagnosticSeverity>;
  * Severity is a stable per-kind property: `transform_failed` and
  * `module_unreadable` are always `error`, every other kind always `warning`.
  */
-export declare const DiagnosticKind: v.PicklistSchema<["type_extraction_failed", "signature_analysis_failed", "class_member_failed", "svelte_prop_failed", "module_skipped", "module_unreadable", "import_parse_failed", "duplicate_comment", "misplaced_tag", "unknown_param", "source_map_failed", "duplicate_declaration", "transform_failed", "resolver_failed", "alias_lost"], undefined>;
+export declare const DiagnosticKind: v.PicklistSchema<["type_extraction_failed", "signature_analysis_failed", "class_member_failed", "svelte_prop_failed", "module_skipped", "module_unreadable", "import_parse_failed", "duplicate_comment", "component_comment_mismatch", "misplaced_tag", "unknown_param", "source_map_failed", "duplicate_declaration", "transform_failed", "resolver_failed", "alias_lost"], undefined>;
 export type DiagnosticKind = v.InferOutput<typeof DiagnosticKind>;
 declare const TypeExtractionDiagnosticImpl: v.StrictObjectSchema<{
     /** Name of the symbol whose type couldn't be extracted. */
@@ -257,6 +257,30 @@ export interface DuplicateCommentDiagnosticSchema extends Named<typeof Duplicate
  */
 export declare const DuplicateCommentDiagnostic: DuplicateCommentDiagnosticSchema;
 export type DuplicateCommentDiagnostic = v.InferOutput<typeof DuplicateCommentDiagnostic>;
+declare const ComponentCommentMismatchDiagnosticImpl: v.StrictObjectSchema<{
+    readonly file: v.StringSchema<undefined>;
+    readonly line: v.OptionalSchema<v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.SafeIntegerAction<number, undefined>, v.MinValueAction<number, 1, undefined>]>, undefined>;
+    readonly column: v.OptionalSchema<v.SchemaWithPipe<readonly [v.NumberSchema<undefined>, v.SafeIntegerAction<number, undefined>, v.MinValueAction<number, 1, undefined>]>, undefined>;
+    readonly message: v.StringSchema<undefined>;
+    readonly severity: v.PicklistSchema<["error", "warning"], undefined>;
+    readonly kind: v.LiteralSchema<"component_comment_mismatch", undefined>;
+}, undefined>;
+/** @nodocs */
+export interface ComponentCommentMismatchDiagnosticSchema extends Named<typeof ComponentCommentMismatchDiagnosticImpl> {
+}
+/**
+ * svelte2tsx, and so editor hover, documents a component with a different
+ * HTML comment than the analyzer does.
+ *
+ * The analyzer reads the first HTML comment with a line starting
+ * `@component`; svelte2tsx takes the last one containing `@component`
+ * anywhere, so a second component comment or a mid-prose mention (a
+ * backticked `@component` in a module comment) takes its slot. `line` is the
+ * comment svelte2tsx picks; reword its `@component` to agree. Not emitted
+ * when in-script JSDoc supplies the component's doc.
+ */
+export declare const ComponentCommentMismatchDiagnostic: ComponentCommentMismatchDiagnosticSchema;
+export type ComponentCommentMismatchDiagnostic = v.InferOutput<typeof ComponentCommentMismatchDiagnostic>;
 declare const MisplacedTagDiagnosticImpl: v.StrictObjectSchema<{
     /**
      * The tag name without the `@` prefix (e.g., `'example'`, `'deprecated'`).
@@ -484,6 +508,7 @@ export declare const Diagnostic: v.VariantSchema<'kind', [
     typeof ModuleUnreadableDiagnostic,
     typeof ImportParseDiagnostic,
     typeof DuplicateCommentDiagnostic,
+    typeof ComponentCommentMismatchDiagnostic,
     typeof MisplacedTagDiagnostic,
     typeof UnknownParamDiagnostic,
     typeof SourceMapFailedDiagnostic,

package/dist/diagnostics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostics.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/diagnostics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"diagnostics.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/diagnostics.ts"],"names":[],"mappings":"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"}

package/dist/diagnostics.js

@@ -90,6 +90,7 @@ export const DiagnosticKind = v.picklist([
     'module_unreadable',
     'import_parse_failed',
     'duplicate_comment',
+    'component_comment_mismatch',
     'misplaced_tag',
     'unknown_param',
     'source_map_failed',
@@ -254,6 +255,22 @@ const DuplicateCommentDiagnosticImpl = v.strictObject({
  * or both HTML `@component` and JSDoc for component `docComment`).
  */
 export const DuplicateCommentDiagnostic = DuplicateCommentDiagnosticImpl;
+const ComponentCommentMismatchDiagnosticImpl = v.strictObject({
+    kind: v.literal('component_comment_mismatch'),
+    ...baseDiagnosticFields
+});
+/**
+ * svelte2tsx, and so editor hover, documents a component with a different
+ * HTML comment than the analyzer does.
+ *
+ * The analyzer reads the first HTML comment with a line starting
+ * `@component`; svelte2tsx takes the last one containing `@component`
+ * anywhere, so a second component comment or a mid-prose mention (a
+ * backticked `@component` in a module comment) takes its slot. `line` is the
+ * comment svelte2tsx picks; reword its `@component` to agree. Not emitted
+ * when in-script JSDoc supplies the component's doc.
+ */
+export const ComponentCommentMismatchDiagnostic = ComponentCommentMismatchDiagnosticImpl;
 const MisplacedTagDiagnosticImpl = v.strictObject({
     kind: v.literal('misplaced_tag'),
     ...baseDiagnosticFields,
@@ -440,6 +457,7 @@ export const Diagnostic = v.variant('kind', [
     ModuleUnreadableDiagnostic,
     ImportParseDiagnostic,
     DuplicateCommentDiagnostic,
+    ComponentCommentMismatchDiagnostic,
     MisplacedTagDiagnostic,
     UnknownParamDiagnostic,
     SourceMapFailedDiagnostic,

package/dist/svelte-scripts.d.ts

@@ -33,6 +33,18 @@ export interface ScannedScriptTag extends SvelteScriptTag {
      */
     provenTopLevel: boolean;
 }
+/** An HTML comment's raw content (between `<!--` and `-->`) and where the comment starts. */
+export interface HtmlComment {
+    content: string;
+    /** Offset of the `<!--` in the Svelte source. */
+    start: number;
+}
+/**
+ * Collect the HTML comments (`<!-- ... -->`) in Svelte source, in source
+ * order, skipping script and style text, as Svelte's parser and svelte2tsx do:
+ * a `<!--` in a script's string literal isn't a comment.
+ */
+export declare const findHtmlComments: (svelteSource: string) => Array<HtmlComment>;
 /**
  * Scan Svelte source for script tags with content, in source order, and mark
  * the ones the scan itself proves top-level.

package/dist/svelte-scripts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"svelte-scripts.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/svelte-scripts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,oGAAoG;AACpG,MAAM,WAAW,eAAe;IAC/B,wEAAwE;IACxE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,6FAA6F;IAC7F,KAAK,EAAE,MAAM,CAAC;CACd;AAED,yFAAyF;AACzF,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACxD,yFAAyF;IACzF,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;CACxB;AAwCD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,eAAO,MAAM,cAAc,GAAI,cAAc,MAAM,KAAG,KAAK,CAAC,gBAAgB,CA8B3E,CAAC;AAiBF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,KAAG,OACL,CAAC;AAuDpE,oEAAoE;AACpE,MAAM,WAAW,qBAAqB;IACrC,6DAA6D;IAC7D,QAAQ,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACpC,2DAA2D;IAC3D,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAClC;AAED;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,aAAa,EAAE,MAAM,KAAK,qBAAqB,CAAC;AAUnF;;;;;;;;GAQG;AACH,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEhE,qCAAqC;AACrC,MAAM,WAAW,eAAe;IAC/B,oDAAoD;IACpD,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7B,SAAS,EAAE,kBAAkB,CAAC;CAC9B;AAED,oCAAoC;AACpC,MAAM,WAAW,qBAAqB;IACrC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAQD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,cAAc,GAC1B,cAAc,MAAM,EACpB,UAAU,qBAAqB,KAC7B,eAwBF,CAAC"}
+{"version":3,"file":"svelte-scripts.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/svelte-scripts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,oGAAoG;AACpG,MAAM,WAAW,eAAe;IAC/B,wEAAwE;IACxE,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,6FAA6F;IAC7F,KAAK,EAAE,MAAM,CAAC;CACd;AAED,yFAAyF;AACzF,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACxD,yFAAyF;IACzF,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;CACxB;AA4BD,6FAA6F;AAC7F,MAAM,WAAW,WAAW;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,iDAAiD;IACjD,KAAK,EAAE,MAAM,CAAC;CACd;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,cAAc,MAAM,KAAG,KAAK,CAAC,WAAW,CASxE,CAAC;AAuBF;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,eAAO,MAAM,cAAc,GAAI,cAAc,MAAM,KAAG,KAAK,CAAC,gBAAgB,CA8B3E,CAAC;AAiBF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GAAI,YAAY,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,KAAG,OACL,CAAC;AAuDpE,oEAAoE;AACpE,MAAM,WAAW,qBAAqB;IACrC,6DAA6D;IAC7D,QAAQ,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACpC,2DAA2D;IAC3D,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAClC;AAED;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,aAAa,EAAE,MAAM,KAAK,qBAAqB,CAAC;AAUnF;;;;;;;;GAQG;AACH,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEhE,qCAAqC;AACrC,MAAM,WAAW,eAAe;IAC/B,oDAAoD;IACpD,IAAI,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7B,SAAS,EAAE,kBAAkB,CAAC;CAC9B;AAED,oCAAoC;AACpC,MAAM,WAAW,qBAAqB;IACrC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAQD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,cAAc,GAC1B,cAAc,MAAM,EACpB,UAAU,qBAAqB,KAC7B,eAwBF,CAAC"}

package/dist/svelte-scripts.js

@@ -27,6 +27,29 @@ import { parse } from 'svelte/compiler';
 const SCRIPT_TAG_MATCHER = /<!--[^]*?-->|<script((?:\s+[^=>'"/\s]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"/\s]+)*\s*)(?:\/>|>([^]*?)<\/script\s*>)/dg;
 /** `SCRIPT_TAG_MATCHER` for style tags, whose content is blanked before parsing. */
 const STYLE_TAG_MATCHER = /<!--[^]*?-->|<style(?:\s+[^=>'"/\s]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"/\s]+)*\s*>([^]*?)<\/style\s*>/dg;
+/**
+ * Matches, left to right, an HTML comment (its content captured), a script
+ * tag, or a style tag. The tag alternatives are `SCRIPT_TAG_MATCHER`'s and
+ * `STYLE_TAG_MATCHER`'s, uncaptured: they consume the tags' raw text, where
+ * a `<!--` doesn't start a comment.
+ */
+const HTML_COMMENT_MATCHER = /<!--([^]*?)-->|<script(?:\s+[^=>'"/\s]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"/\s]+)*\s*(?:\/>|>[^]*?<\/script\s*>)|<style(?:\s+[^=>'"/\s]+=(?:"[^"]*"|'[^']*'|[^>\s]+)|\s+[^=>'"/\s]+)*\s*>[^]*?<\/style\s*>/g;
+/**
+ * Collect the HTML comments (`<!-- ... -->`) in Svelte source, in source
+ * order, skipping script and style text, as Svelte's parser and svelte2tsx do:
+ * a `<!--` in a script's string literal isn't a comment.
+ */
+export const findHtmlComments = (svelteSource) => {
+    const comments = [];
+    HTML_COMMENT_MATCHER.lastIndex = 0;
+    let match;
+    while ((match = HTML_COMMENT_MATCHER.exec(svelteSource)) !== null) {
+        const content = match[1];
+        if (content !== undefined)
+            comments.push({ content, start: match.index });
+    }
+    return comments;
+};
 /**
  * The attribute spellings the scan's proof accepts: names of word characters,
  * values double-quoted, single-quoted, or bare word characters, whitespace

package/dist/svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"svelte.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/svelte.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"svelte.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/svelte.ts"],"names":[],"mappings":"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"}

package/dist/svelte.js

@@ -28,18 +28,18 @@ import { TraceMap, originalPositionFor } from '@jridgewell/trace-mapping';
 import { VERSION } from 'svelte/compiler';
 import { svelte2tsx } from 'svelte2tsx';
 import ts from 'typescript';
-import { parseComment, applyToDeclaration, hasDocContent, hasModuleTag, parseModuleComment, toModuleDocFields } from './tsdoc.js';
+import { parseComment, applyToDeclaration, hasDocContent, hasModuleTag, parseCommentText, parseModuleComment, toModuleDocFields } from './tsdoc.js';
 import { parseGenericParam, filterDocumentedProperties, getTypeSignature, createExtractContext, optionalWidened, extractSignatureParameters, applyReturnType, isExternalSignature } from './typescript-extract-shared.js';
 import { referenceSymbolName, resolveTypeInfo, restElementForms, tupleElementName, tupleElements } from './typescript-extract-type-json.js';
 import { extractModuleComment, analyzeExports, warnModuleCommentTags } from './typescript-exports.js';
-import { getComponentName, isSvelte2tsxGeneratedExport, SVELTE_COMPONENT_ALIAS_SUFFIX, SVELTE_VIRTUAL_SUFFIX } from './source.js';
+import { getComponentName, isSvelte2tsxGeneratedExport, SVELTE_VIRTUAL_SUFFIX } from './source.js';
 import { extractDependencies } from './source-config.js';
 import { compareStrings } from './postprocess.js';
 import {} from './diagnostics.js';
 import { toErrorMessage } from './error.js';
 import { toPosixPath } from './paths.js';
 import { resolveLegacyPropsAnchor, scanLegacyExports } from './svelte-legacy.js';
-import { findScriptTags, isModuleScript } from './svelte-scripts.js';
+import { findHtmlComments, findScriptTags, isModuleScript } from './svelte-scripts.js';
 /**
  * Pre-transform a Svelte source file via svelte2tsx.
  *
@@ -139,9 +139,7 @@ const SVELTE2TSX_IDENTIFIERS = {
     /** Identifier for `$props()` rune. */
     PROPS_RUNE: '$props',
     /** Identifier for `$bindable()` rune. */
-    BINDABLE_RUNE: '$bindable',
-    /** Suffix on the synthesized component const/type alias (shared constant — `isSvelte2tsxInternal` in `source.ts` filters on it too). */
-    COMPONENT_ALIAS_SUFFIX: SVELTE_COMPONENT_ALIAS_SUFFIX
+    BINDABLE_RUNE: '$bindable'
 };
 /**
  * Lazily validated Svelte major version.
@@ -179,11 +177,6 @@ const findComponentNodes = (virtualSource) => {
                 nodes.renderClass = statement;
             }
         }
-        else if (ts.isVariableStatement(statement) &&
-            statement.declarationList.declarations.some((declaration) => ts.isIdentifier(declaration.name) &&
-                declaration.name.text.endsWith(SVELTE2TSX_IDENTIFIERS.COMPONENT_ALIAS_SUFFIX))) {
-            nodes.componentAlias = statement;
-        }
     }
     return nodes;
 };
@@ -348,16 +341,6 @@ export const extractScriptContent = (svelteSource) => findScriptTags(svelteSourc
  * @returns the module script tag content, or undefined if no module script is found
  */
 export const extractModuleScriptContent = (svelteSource) => findScriptTags(svelteSource).tags.find((tag) => isModuleScript(tag.attributes))?.content;
-/** Collect the raw content of each HTML comment (`<!-- ... -->`) in source order. */
-const findHtmlComments = (svelteSource) => {
-    const commentRegex = /<!--([^]*?)-->/g;
-    const contents = [];
-    let match;
-    while ((match = commentRegex.exec(svelteSource)) !== null) {
-        contents.push(match[1]);
-    }
-    return contents;
-};
 /**
  * Parse script-tag content as standalone TypeScript for syntactic scans.
  *
@@ -422,8 +405,8 @@ const dedentHtmlComment = (rawContent) => {
  *   comment is found or it holds nothing but `@module`
  */
 export const extractHtmlModuleComment = (svelteSource) => {
-    for (const rawContent of findHtmlComments(svelteSource)) {
-        const cleaned = dedentHtmlComment(rawContent);
+    for (const { content } of findHtmlComments(svelteSource)) {
+        const cleaned = dedentHtmlComment(content);
         if (cleaned && hasModuleTag(cleaned))
             return parseModuleComment(cleaned);
     }
@@ -441,37 +424,63 @@ export const extractHtmlModuleComment = (svelteSource) => {
  * @returns the parsed module comment, or undefined if none is found
  */
 export const extractSvelteModuleComment = (scriptContent) => extractModuleComment(parseScriptContent(scriptContent));
+/** A line that starts with the `@component` tag, as opposed to a mention in prose. */
+const COMPONENT_TAG_LINE = /^(\s*)@component\b[ \t]*/;
 /**
- * Check if the original Svelte source contains an HTML `@component` comment.
- *
- * Only checks HTML comments (`<!-- @component ... -->`), not JSDoc in `<script>`.
- * Used for duplicate `docComment` detection.
+ * The HTML component comment: the first HTML comment with a line starting
+ * `@component`, the rule `@module` follows. A backticked or mid-prose mention
+ * doesn't count.
+ *
+ * svelte2tsx, and so editor hover, picks differently: the *last* HTML comment
+ * containing `@component` anywhere (`svelte2tsxComponentComment`), which
+ * `analyzeSvelteModule` warns about as `component_comment_mismatch` when the
+ * two disagree.
  */
-const hasHtmlComponentComment = (svelteSource) => findHtmlComments(svelteSource).some((content) => /(?:^|\n)\s*@component\b/.test(content));
+const findHtmlComponentComment = (comments) => comments.find(({ content }) => dedentHtmlComment(content)
+    .split('\n')
+    .some((line) => COMPONENT_TAG_LINE.test(line)));
+/** The comment svelte2tsx documents the component with: the last one containing `@component`. */
+const svelte2tsxComponentComment = (comments) => comments.findLast(({ content }) => content.includes('@component'));
+/**
+ * Parse an HTML component comment with `parseCommentText`, after removing the
+ * `@component` tag from each line it starts. Text after the tag on its line
+ * stays prose (`<!-- @component A button. -->`), and the lines' common
+ * indentation is stripped (`dedentHtmlComment`), as for an HTML module comment.
+ */
+const parseHtmlComponentComment = (comment) => {
+    const text = dedentHtmlComment(comment.content)
+        .split('\n')
+        .map((line) => line.replace(COMPONENT_TAG_LINE, '$1'))
+        .join('\n')
+        .trim();
+    const parsed = parseCommentText(text);
+    return parsed && hasDocContent(parsed) ? parsed : undefined;
+};
 /**
- * Extract component-level TSDoc comment from svelte2tsx transformed output.
+ * Extract the component-level TSDoc comment.
  *
  * Two authoring forms reach here, searched in precedence order:
  *
- * 1. in-script JSDoc — the instance `<script>` becomes the body of the
- *    `$$render()` function, so the comment rides the props destructuring (or an
- *    earlier statement in that body)
- * 2. the HTML `@component` comment — re-emitted as JSDoc on the synthesized
- *    `<Name>__SvelteComponent_` const at the end of the virtual source
+ * 1. in-script JSDoc, read from the svelte2tsx output — the instance
+ *    `<script>` becomes the body of the `$$render()` function, so the comment
+ *    rides the props destructuring (or an earlier statement in that body)
+ * 2. the HTML `@component` comment, read from the original source
+ *    (`findHtmlComponentComment`), not from the JSDoc svelte2tsx re-emits for
+ *    it, since svelte2tsx picks the comment by a looser rule
  *
- * Scoping the search to those two regions is what keeps `<script module>` out:
- * its declarations hoist above `$$render`, and a whole-file walk would take the
- * first one's JSDoc — which documents that export, not the component.
+ * Scoping the in-script search to `$$render` is what keeps `<script module>`
+ * out: its declarations hoist above `$$render`, and a whole-file walk would
+ * take the first one's JSDoc — which documents that export, not the component.
  */
-const extractComponentTsdoc = (nodes, sourceFile) => {
+const extractComponentTsdoc = (nodes, sourceFile, htmlComponentComment) => {
     const renderBody = nodes.renderFunction?.body;
     if (renderBody) {
         const tsdoc = findInstanceTsdoc(renderBody, sourceFile);
         if (tsdoc)
             return { tsdoc, source: 'script' };
     }
-    if (nodes.componentAlias) {
-        const tsdoc = findComponentTsdoc(nodes.componentAlias, sourceFile);
+    if (htmlComponentComment) {
+        const tsdoc = parseHtmlComponentComment(htmlComponentComment);
         if (tsdoc)
             return { tsdoc, source: 'html' };
     }
@@ -1448,15 +1457,32 @@ export const analyzeSvelteModule = (sourceFile, modulePath, checker, options, di
     if (genericParams?.length) {
         componentDecl.genericParams = genericParams;
     }
-    // Extract component-level TSDoc from virtual source
-    const componentTsdoc = extractComponentTsdoc(componentNodes, virtualTsSource);
+    // Extract component-level TSDoc: in-script JSDoc from the virtual source,
+    // else the HTML `@component` comment from the original
+    const htmlComments = findHtmlComments(sourceFile.content);
+    const htmlComponentComment = findHtmlComponentComment(htmlComments);
+    const componentTsdoc = extractComponentTsdoc(componentNodes, virtualTsSource, htmlComponentComment);
     applyToDeclaration(componentDecl, componentTsdoc?.tsdoc);
     // Extract source line via source map (maps $$render back to <script> tag)
     componentDecl.sourceLine = extractComponentSourceLine(componentNodes, virtualTsSource, virtualFile.sourceMap);
+    // Warn when svelte2tsx (and so editor hover) would document the component
+    // with a different HTML comment than the one read here; moot when in-script
+    // JSDoc supplies the doc
+    const svelte2tsxComment = svelte2tsxComponentComment(htmlComments);
+    if (componentTsdoc?.source !== 'script' && svelte2tsxComment !== htmlComponentComment) {
+        const svelte2tsxLine = lineOfOffset(sourceFile.content, svelte2tsxComment.start);
+        diagnostics.push({
+            kind: 'component_comment_mismatch',
+            file: diagnosticFile,
+            line: svelte2tsxLine,
+            message: htmlComponentComment
+                ? `svelte2tsx and editor hover document the component with the HTML comment at line ${svelte2tsxLine}, the last one containing @component; using the one at line ${lineOfOffset(sourceFile.content, htmlComponentComment.start)}, the first with @component at a line start.`
+                : `The HTML comment at line ${svelte2tsxLine} mentions @component, so svelte2tsx and editor hover use it as the component's docs; no line starts with @component, so the component has none here.`,
+            severity: 'warning'
+        });
+    }
     // Warn if both HTML @component and script JSDoc provide docComment
-    if (componentDecl.docComment &&
-        componentTsdoc?.source === 'script' &&
-        hasHtmlComponentComment(sourceFile.content)) {
+    if (componentDecl.docComment && componentTsdoc?.source === 'script' && htmlComponentComment) {
         diagnostics.push({
             kind: 'duplicate_comment',
             commentType: 'doc_comment',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-docinfo",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "static analysis for TypeScript and Svelte",
   "glyph": "📜",
   "logo": "logo.svg",