From f0b2d37f138aa24da16195e8c5201a00308aa82d Mon Sep 17 00:00:00 2001 From: Johan Groth Date: Mon, 21 Nov 2022 11:01:17 +0100 Subject: [PATCH] fixup! feat(compiler): copy dock block from component to generated types --- src/compiler/types/generate-app-types.ts | 7 ++++++- src/compiler/types/generate-component-types.ts | 2 +- test/karma/test-app/components.d.ts | 7 +++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/compiler/types/generate-app-types.ts b/src/compiler/types/generate-app-types.ts index 37063fd30e8d..c243c8ca1810 100644 --- a/src/compiler/types/generate-app-types.ts +++ b/src/compiler/types/generate-app-types.ts @@ -133,7 +133,12 @@ const generateComponentTypesFile = (config: d.Config, buildCtx: d.BuildCtx, areT c.push(`}`); c.push(`declare namespace LocalJSX {`); - c.push(...modules.map((m) => ` ${m.jsx}`)); + c.push( + ...modules.map((m) => { + const docs = components.find((c) => c.tagName === m.tagName).docs; + return addDocBlock(` ${m.jsx}`, docs, 4); + }) + ); c.push(` interface IntrinsicElements {`); c.push(...modules.map((m) => ` "${m.tagName}": ${m.tagNameAsPascal};`)); diff --git a/src/compiler/types/generate-component-types.ts b/src/compiler/types/generate-component-types.ts index 969aef7535cf..9e582625dc54 100644 --- a/src/compiler/types/generate-component-types.ts +++ b/src/compiler/types/generate-component-types.ts @@ -51,7 +51,7 @@ export const generateComponentTypes = ( tagNameAsPascal, htmlElementName, component: addDocBlock(` interface ${tagNameAsPascal} {\n${componentAttributes} }`, cmp.docs, 4), - jsx: addDocBlock(` interface ${tagNameAsPascal} {\n${jsxAttributes} }`, cmp.docs, 2), + jsx: ` interface ${tagNameAsPascal} {\n${jsxAttributes} }`, element: element.join(`\n`), }; }; diff --git a/test/karma/test-app/components.d.ts b/test/karma/test-app/components.d.ts index d7e88ef7b99e..0ea66ad381c8 100644 --- a/test/karma/test-app/components.d.ts +++ b/test/karma/test-app/components.d.ts @@ -1497,10 +1497,9 @@ declare namespace LocalJSX { interface ShadowDomBasicRoot { } /** - * - * @virtualProp {string} colormode - The mode determines which platform styles to use. - */ - interface ShadowDomMode { + * @virtualProp {string} colormode - The mode determines which platform styles to use. + */ + interface ShadowDomMode { /** * The mode determines which platform styles to use. */