svelte2tsx 0.7.12 → 0.7.14

package/index.js

@@ -1692,11 +1692,13 @@ transformations) {
     }
     let removeStart = start;
     const sortedMoves = [...moves].sort((t1, t2) => t1[0] - t2[0]);
+    // Remove everything between the transformations up until the end position
     for (const transformation of sortedMoves) {
         if (removeStart < transformation[0]) {
             if (deletePos !== moves.length &&
                 removeStart > deleteDest &&
-                !(removeStart < end && transformation[0] >= end)) {
+                removeStart < end &&
+                transformation[0] < end) {
                 str.move(removeStart, transformation[0], end);
             }
             if (transformation[0] < end) {
@@ -1835,6 +1837,8 @@ var svgAttributes = 'accent-height accumulate additive alignment-baseline allowR
 
 const IGNORE_START_COMMENT = '/*Ωignore_startΩ*/';
 const IGNORE_END_COMMENT = '/*Ωignore_endΩ*/';
+/** to tell tooling to ignore the character at this position; can for example be used to ignore everything starting at this position */
+const IGNORE_POSITION_COMMENT = '/*Ωignore_positionΩ*/';
 /**
  * Surrounds given string with a start/end comment which marks it
  * to be ignored by tooling.
@@ -2160,6 +2164,7 @@ class InlineComponent {
         this.startEndTransformation = [];
         this.propsTransformation = [];
         this.eventsTransformation = [];
+        this.snippetPropsTransformation = [];
         this.endTransformation = [];
         if (parent) {
             parent.child = this;
@@ -2247,6 +2252,10 @@ class InlineComponent {
         this.slotLetsTransformation = this.slotLetsTransformation || [['default'], []];
         this.slotLetsTransformation[1].push(...transformation, ',');
     }
+    addImplicitSnippetProp(name, transforms) {
+        this.addProp([name], transforms);
+        this.snippetPropsTransformation.push(this.str.original.slice(name[0], name[1]));
+    }
     /**
      * Add something right after the start tag end.
      */
@@ -2254,6 +2263,7 @@ class InlineComponent {
         this.startEndTransformation.push(...value);
     }
     performTransformation() {
+        var _a;
         const namedSlotLetTransformation = [];
         const defaultSlotLetTransformation = [];
         if (this.slotLetsTransformation) {
@@ -2270,6 +2280,10 @@ class InlineComponent {
             }
             this.endTransformation.push('}');
         }
+        const snippetPropVariables = (_a = this.snippetPropsTransformation) === null || _a === void 0 ? void 0 : _a.join(', ');
+        const snippetPropVariablesDeclaration = snippetPropVariables
+            ? surroundWithIgnoreComments(`const {${snippetPropVariables}} = ${this.name}.$$prop_def;`)
+            : '';
         if (this.isSelfclosing) {
             this.endTransformation.push('}');
             transform(this.str, this.startTagStart, this.startTagEnd, this.startTagEnd, [
@@ -2282,6 +2296,7 @@ class InlineComponent {
                 ...this.startEndTransformation,
                 ...this.eventsTransformation,
                 ...defaultSlotLetTransformation,
+                snippetPropVariablesDeclaration,
                 ...this.endTransformation
             ]);
         }
@@ -2301,6 +2316,7 @@ class InlineComponent {
                 ...this.propsTransformation,
                 ...this.startEndTransformation,
                 ...this.eventsTransformation,
+                snippetPropVariablesDeclaration,
                 ...defaultSlotLetTransformation
             ]);
             transform(this.str, endStart, this.node.end, this.node.end, this.endTransformation);
@@ -3080,9 +3096,9 @@ function handleTransitionDirective(str, attr, element) {
  * ```
  * --> if standalone:
  * ```ts
- * const foo = (bar) => {
+ * const foo = (bar) => { async () => {
  * ..
- * }
+ * };return return __sveltets_2_any(0)};
  * ```
  * --> if slot prop:
  * ```ts
@@ -3092,22 +3108,32 @@ function handleTransitionDirective(str, attr, element) {
  * ```
  */
 function handleSnippet(str, snippetBlock, component) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const isImplicitProp = component !== undefined;
     const endSnippet = str.original.lastIndexOf('{', snippetBlock.end - 1);
-    // Return something to silence the "snippet type not assignable to return type void" error
-    str.overwrite(endSnippet, snippetBlock.end, `};return __sveltets_2_any(0)}${isImplicitProp ? '' : ';'}`, {
+    const afterSnippet = isImplicitProp
+        ? `};return __sveltets_2_any(0)}`
+        : `};return __sveltets_2_any(0)};`;
+    str.overwrite(endSnippet, snippetBlock.end, afterSnippet, {
         contentOnly: true
     });
     const lastParameter = (_a = snippetBlock.parameters) === null || _a === void 0 ? void 0 : _a.at(-1);
     const startEnd = str.original.indexOf('}', (_d = (_c = (_b = lastParameter === null || lastParameter === void 0 ? void 0 : lastParameter.typeAnnotation) === null || _b === void 0 ? void 0 : _b.end) !== null && _c !== void 0 ? _c : lastParameter === null || lastParameter === void 0 ? void 0 : lastParameter.end) !== null && _d !== void 0 ? _d : snippetBlock.expression.end) + 1;
+    let parameters;
+    if ((_e = snippetBlock.parameters) === null || _e === void 0 ? void 0 : _e.length) {
+        const firstParameter = snippetBlock.parameters[0];
+        const start = (_h = (_g = (_f = firstParameter === null || firstParameter === void 0 ? void 0 : firstParameter.leadingComments) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.start) !== null && _h !== void 0 ? _h : firstParameter.start;
+        const end = (_k = (_j = lastParameter.typeAnnotation) === null || _j === void 0 ? void 0 : _j.end) !== null && _k !== void 0 ? _k : lastParameter.end;
+        parameters = [start, end];
+    }
+    // inner async function for potential #await blocks
+    const afterParameters = ` => { async ()${IGNORE_POSITION_COMMENT} => {`;
     if (isImplicitProp) {
         str.overwrite(snippetBlock.start, snippetBlock.expression.start, '', { contentOnly: true });
         const transforms = ['('];
-        if ((_e = snippetBlock.parameters) === null || _e === void 0 ? void 0 : _e.length) {
-            const start = snippetBlock.parameters[0].start;
-            const end = (_g = (_f = lastParameter.typeAnnotation) === null || _f === void 0 ? void 0 : _f.end) !== null && _g !== void 0 ? _g : lastParameter.end;
-            transforms.push([start, end]);
+        if (parameters) {
+            transforms.push(parameters);
+            const [start, end] = parameters;
             str.overwrite(snippetBlock.expression.end, start, '', {
                 contentOnly: true
             });
@@ -3116,47 +3142,22 @@ function handleSnippet(str, snippetBlock, component) {
         else {
             str.overwrite(snippetBlock.expression.end, startEnd, '', { contentOnly: true });
         }
-        transforms.push(') => {async () => {'); // inner async function for potential #await blocks
+        transforms.push(')' + afterParameters);
         transforms.push([startEnd, snippetBlock.end]);
-        component.addProp([[snippetBlock.expression.start, snippetBlock.expression.end]], transforms);
+        component.addImplicitSnippetProp([snippetBlock.expression.start, snippetBlock.expression.end], transforms);
     }
     else {
-        let generic = '';
-        if ((_h = snippetBlock.parameters) === null || _h === void 0 ? void 0 : _h.length) {
-            generic = `<[${snippetBlock.parameters
-                .map((p) => {
-                var _a, _b;
-                let typeAnnotation = p.typeAnnotation;
-                if (!typeAnnotation && p.type === 'AssignmentPattern') {
-                    typeAnnotation = (_a = p.left) === null || _a === void 0 ? void 0 : _a.typeAnnotation;
-                    if (!typeAnnotation) {
-                        typeAnnotation = (_b = p.right) === null || _b === void 0 ? void 0 : _b.typeAnnotation;
-                    }
-                }
-                // fall back to `any` to silence "implicit any" errors; JSDoc people can't add types to snippets
-                let type = 'any';
-                if (typeAnnotation === null || typeAnnotation === void 0 ? void 0 : typeAnnotation.typeAnnotation) {
-                    type = str.original.slice(typeAnnotation.typeAnnotation.start, typeAnnotation.typeAnnotation.end);
-                }
-                if (p.optional || p.type === 'AssignmentPattern') {
-                    type += '?';
-                }
-                return type;
-            })
-                .join(', ')}]>`;
-        }
-        const typeAnnotation = surroundWithIgnoreComments(`: import('svelte').Snippet${generic}`);
         const transforms = [
-            'var ',
+            'const ',
             [snippetBlock.expression.start, snippetBlock.expression.end],
-            typeAnnotation + ' = ('
+            IGNORE_POSITION_COMMENT,
+            ' = ('
         ];
-        if ((_j = snippetBlock.parameters) === null || _j === void 0 ? void 0 : _j.length) {
-            const start = snippetBlock.parameters[0].start;
-            const end = (_l = (_k = lastParameter.typeAnnotation) === null || _k === void 0 ? void 0 : _k.end) !== null && _l !== void 0 ? _l : lastParameter.end;
-            transforms.push([start, end]);
+        if (parameters) {
+            transforms.push(parameters);
         }
-        transforms.push(') => {async () => {'); // inner async function for potential #await blocks
+        transforms.push(')', surroundWithIgnoreComments(`: ReturnType<import('svelte').Snippet>`), // shows up nicely preserved on hover, other alternatives don't
+        afterParameters);
         transform(str, snippetBlock.start, startEnd, startEnd, transforms);
     }
 }
@@ -3180,7 +3181,9 @@ function handleImplicitChildren(componentNode, component) {
                 continue;
             }
         }
-        if (child.type === 'Comment' || (child.type === 'Text' && child.data.trim() === '')) {
+        if (child.type === 'Comment' ||
+            child.type === 'Slot' ||
+            (child.type === 'Text' && child.data.trim() === '')) {
             continue;
         }
         if (child.type !== 'SnippetBlock') {
@@ -3194,6 +3197,30 @@ function handleImplicitChildren(componentNode, component) {
     // it's enough to fake a children prop, we don't need to actually move the content inside (which would also reset control flow)
     component.addProp(['children'], ['() => { return __sveltets_2_any(0); }']);
 }
+function hoistSnippetBlock(str, blockOrEl) {
+    var _a;
+    if (blockOrEl.type === 'InlineComponent') {
+        // implicit props, handled in InlineComponent
+        return;
+    }
+    let targetPosition;
+    for (const node of (_a = blockOrEl.children) !== null && _a !== void 0 ? _a : []) {
+        if (node.type !== 'SnippetBlock') {
+            if (targetPosition === undefined && (node.type !== 'Text' || node.data.trim() !== '')) {
+                targetPosition = node.type === 'Text' ? node.end : node.start;
+            }
+            continue;
+        }
+        // already first
+        if (targetPosition === undefined) {
+            continue;
+        }
+        if (node.start === targetPosition) {
+            continue;
+        }
+        str.move(node.start, node.end, targetPosition);
+    }
+}
 
 /**
  * `{@render foo(x)}` --> `;foo(x);`
@@ -3223,6 +3250,7 @@ function convertHtmlxToJsx(str, ast, onWalk = null, onLeave = null, options = {
     stripDoctype(str);
     const rootSnippets = [];
     let element;
+    const pendingSnippetHoistCheck = new Set();
     walk(ast, {
         enter: (estreeTypedNode, estreeTypedParent, prop, index) => {
             const node = estreeTypedNode;
@@ -3250,6 +3278,9 @@ function convertHtmlxToJsx(str, ast, onWalk = null, onLeave = null, options = {
                             // root snippet -> move to instance script
                             rootSnippets.push([node.start, node.end]);
                         }
+                        else {
+                            pendingSnippetHoistCheck.add(parent);
+                        }
                         break;
                     case 'MustacheTag':
                         handleMustacheTag(str, node, parent);
@@ -3381,6 +3412,9 @@ function convertHtmlxToJsx(str, ast, onWalk = null, onLeave = null, options = {
             }
         }
     });
+    for (const node of pendingSnippetHoistCheck) {
+        hoistSnippetBlock(str, node);
+    }
     return rootSnippets;
 }
 
@@ -4948,22 +4982,31 @@ class ExportedNames {
         const names = Array.from(this.exports.entries());
         const others = names.filter(([, { isLet }]) => !isLet);
         const needsAccessors = this.usesAccessors && names.length > 0 && !this.usesRunes(); // runes mode doesn't support accessors
-        if (this.isSvelte5Plus && (others.length > 0 || this.usesRunes() || needsAccessors)) {
+        if (this.isSvelte5Plus) {
             let str = '';
-            if (others.length > 0 || needsAccessors) {
-                if (this.isTsFile) {
-                    str +=
-                        ', exports: {} as any as { ' +
-                            this.createReturnElementsType(needsAccessors ? names : others, undefined, true).join(',') +
-                            ' }';
+            if (others.length > 0 || this.usesRunes() || needsAccessors) {
+                if (others.length > 0 || needsAccessors) {
+                    if (this.isTsFile) {
+                        str +=
+                            ', exports: {} as any as { ' +
+                                this.createReturnElementsType(needsAccessors ? names : others, undefined, true).join(',') +
+                                ' }';
+                    }
+                    else {
+                        str += `, exports: /** @type {{${this.createReturnElementsType(needsAccessors ? names : others, false, true)}}} */ ({})`;
+                    }
                 }
                 else {
-                    str += `, exports: /** @type {{${this.createReturnElementsType(needsAccessors ? names : others, false, true)}}} */ ({})`;
+                    // Always add that, in TS5.5+ the type for Exports is infered to never when this is not present, which breaks types.
+                    // Don't cast to `Record<string, never>` because that will break the union type we use elsewhere
+                    str += ', exports: {}';
                 }
-            }
-            if (this.usesRunes()) {
                 str += `, bindings: ${this.createBindingsStr()}`;
             }
+            else {
+                // always add that, in TS5.5+ the type for Exports is infered to never when this is not present, which breaks types
+                str += `, exports: {}, bindings: ${this.createBindingsStr()}`;
+            }
             return str;
         }
         return '';
@@ -6921,7 +6964,30 @@ async function emitDts(config) {
     const { options, filenames } = loadTsconfig(config, svelteMap);
     const host = await createTsCompilerHost(options, svelteMap);
     const program = ts.createProgram(filenames, options, host);
-    program.emit();
+    const result = program.emit();
+    const likely_failed_files = result.diagnostics.filter((diagnostic) => {
+        // List of errors which hint at a failed d.ts generation
+        // https://github.com/microsoft/TypeScript/blob/main/src/compiler/diagnosticMessages.json
+        return diagnostic.code === 2527 || (diagnostic.code >= 4000 && diagnostic.code <= 4108);
+    });
+    if (likely_failed_files.length > 0) {
+        const failed_by_file = new Map();
+        likely_failed_files.forEach((diagnostic) => {
+            var _a;
+            const file = (_a = diagnostic.file) === null || _a === void 0 ? void 0 : _a.fileName;
+            if (file) {
+                const errors = failed_by_file.get(file) || [];
+                errors.push(ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'));
+                failed_by_file.set(file, errors);
+            }
+        });
+        console.warn('d.ts type declaration files for the following files were likely not generated due to the following errors:');
+        console.warn([...failed_by_file.entries()]
+            .map(([file, errors]) => {
+            return `${file}\n${errors.map((error) => `  - ${error}`).join('\n')}`;
+        })
+            .join('\n'));
+    }
 }
 function loadTsconfig(config, svelteMap) {
     var _a;
@@ -7031,16 +7097,16 @@ async function createTsCompilerHost(options, svelteMap) {
             fileName = pathPrefix ? path__namespace.join(pathPrefix, fileName) : fileName;
             if (fileName.endsWith('d.ts.map')) {
                 data = data.replace(/"sources":\["(.+?)"\]/, (_, sourcePath) => {
-                    // Due to our hack of treating .svelte files as .ts files, we need to adjust the extension
-                    if (sourcePath.endsWith('.svelte.ts')) {
-                        sourcePath = sourcePath.slice(0, -3);
-                    }
                     // The inverse of the pathPrefix adjustment
                     sourcePath =
                         pathPrefix && sourcePath.includes(pathPrefix)
                             ? sourcePath.slice(0, sourcePath.indexOf(pathPrefix)) +
                                 sourcePath.slice(sourcePath.indexOf(pathPrefix) + pathPrefix.length + 1)
                             : sourcePath;
+                    // Due to our hack of treating .svelte files as .ts files, we need to adjust the extension
+                    if (svelteMap.get(path__namespace.join(options.rootDir, toRealSvelteFilepath(sourcePath)))) {
+                        sourcePath = toRealSvelteFilepath(sourcePath);
+                    }
                     return `"sources":["${sourcePath}"]`;
                 });
             }
@@ -7109,10 +7175,13 @@ async function createSvelteMap(config) {
             version,
             noSvelteComponentTyped: noSvelteComponentTyped
         }).code;
-        svelteFiles.set(path, transformed);
+        svelteFiles.set(path.replace(/\\/g, '/'), transformed);
         return isTsFile;
     }
-    return { add, get: (key) => svelteFiles.get(key) };
+    return {
+        add,
+        get: (key) => svelteFiles.get(key.replace(/\\/g, '/'))
+    };
 }
 function isSvelteFilepath(filePath) {
     return filePath.endsWith('.svelte');

package/index.mjs

@@ -1672,11 +1672,13 @@ transformations) {
     }
     let removeStart = start;
     const sortedMoves = [...moves].sort((t1, t2) => t1[0] - t2[0]);
+    // Remove everything between the transformations up until the end position
     for (const transformation of sortedMoves) {
         if (removeStart < transformation[0]) {
             if (deletePos !== moves.length &&
                 removeStart > deleteDest &&
-                !(removeStart < end && transformation[0] >= end)) {
+                removeStart < end &&
+                transformation[0] < end) {
                 str.move(removeStart, transformation[0], end);
             }
             if (transformation[0] < end) {
@@ -1815,6 +1817,8 @@ var svgAttributes = 'accent-height accumulate additive alignment-baseline allowR
 
 const IGNORE_START_COMMENT = '/*Ωignore_startΩ*/';
 const IGNORE_END_COMMENT = '/*Ωignore_endΩ*/';
+/** to tell tooling to ignore the character at this position; can for example be used to ignore everything starting at this position */
+const IGNORE_POSITION_COMMENT = '/*Ωignore_positionΩ*/';
 /**
  * Surrounds given string with a start/end comment which marks it
  * to be ignored by tooling.
@@ -2140,6 +2144,7 @@ class InlineComponent {
         this.startEndTransformation = [];
         this.propsTransformation = [];
         this.eventsTransformation = [];
+        this.snippetPropsTransformation = [];
         this.endTransformation = [];
         if (parent) {
             parent.child = this;
@@ -2227,6 +2232,10 @@ class InlineComponent {
         this.slotLetsTransformation = this.slotLetsTransformation || [['default'], []];
         this.slotLetsTransformation[1].push(...transformation, ',');
     }
+    addImplicitSnippetProp(name, transforms) {
+        this.addProp([name], transforms);
+        this.snippetPropsTransformation.push(this.str.original.slice(name[0], name[1]));
+    }
     /**
      * Add something right after the start tag end.
      */
@@ -2234,6 +2243,7 @@ class InlineComponent {
         this.startEndTransformation.push(...value);
     }
     performTransformation() {
+        var _a;
         const namedSlotLetTransformation = [];
         const defaultSlotLetTransformation = [];
         if (this.slotLetsTransformation) {
@@ -2250,6 +2260,10 @@ class InlineComponent {
             }
             this.endTransformation.push('}');
         }
+        const snippetPropVariables = (_a = this.snippetPropsTransformation) === null || _a === void 0 ? void 0 : _a.join(', ');
+        const snippetPropVariablesDeclaration = snippetPropVariables
+            ? surroundWithIgnoreComments(`const {${snippetPropVariables}} = ${this.name}.$$prop_def;`)
+            : '';
         if (this.isSelfclosing) {
             this.endTransformation.push('}');
             transform(this.str, this.startTagStart, this.startTagEnd, this.startTagEnd, [
@@ -2262,6 +2276,7 @@ class InlineComponent {
                 ...this.startEndTransformation,
                 ...this.eventsTransformation,
                 ...defaultSlotLetTransformation,
+                snippetPropVariablesDeclaration,
                 ...this.endTransformation
             ]);
         }
@@ -2281,6 +2296,7 @@ class InlineComponent {
                 ...this.propsTransformation,
                 ...this.startEndTransformation,
                 ...this.eventsTransformation,
+                snippetPropVariablesDeclaration,
                 ...defaultSlotLetTransformation
             ]);
             transform(this.str, endStart, this.node.end, this.node.end, this.endTransformation);
@@ -3060,9 +3076,9 @@ function handleTransitionDirective(str, attr, element) {
  * ```
  * --> if standalone:
  * ```ts
- * const foo = (bar) => {
+ * const foo = (bar) => { async () => {
  * ..
- * }
+ * };return return __sveltets_2_any(0)};
  * ```
  * --> if slot prop:
  * ```ts
@@ -3072,22 +3088,32 @@ function handleTransitionDirective(str, attr, element) {
  * ```
  */
 function handleSnippet(str, snippetBlock, component) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const isImplicitProp = component !== undefined;
     const endSnippet = str.original.lastIndexOf('{', snippetBlock.end - 1);
-    // Return something to silence the "snippet type not assignable to return type void" error
-    str.overwrite(endSnippet, snippetBlock.end, `};return __sveltets_2_any(0)}${isImplicitProp ? '' : ';'}`, {
+    const afterSnippet = isImplicitProp
+        ? `};return __sveltets_2_any(0)}`
+        : `};return __sveltets_2_any(0)};`;
+    str.overwrite(endSnippet, snippetBlock.end, afterSnippet, {
         contentOnly: true
     });
     const lastParameter = (_a = snippetBlock.parameters) === null || _a === void 0 ? void 0 : _a.at(-1);
     const startEnd = str.original.indexOf('}', (_d = (_c = (_b = lastParameter === null || lastParameter === void 0 ? void 0 : lastParameter.typeAnnotation) === null || _b === void 0 ? void 0 : _b.end) !== null && _c !== void 0 ? _c : lastParameter === null || lastParameter === void 0 ? void 0 : lastParameter.end) !== null && _d !== void 0 ? _d : snippetBlock.expression.end) + 1;
+    let parameters;
+    if ((_e = snippetBlock.parameters) === null || _e === void 0 ? void 0 : _e.length) {
+        const firstParameter = snippetBlock.parameters[0];
+        const start = (_h = (_g = (_f = firstParameter === null || firstParameter === void 0 ? void 0 : firstParameter.leadingComments) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.start) !== null && _h !== void 0 ? _h : firstParameter.start;
+        const end = (_k = (_j = lastParameter.typeAnnotation) === null || _j === void 0 ? void 0 : _j.end) !== null && _k !== void 0 ? _k : lastParameter.end;
+        parameters = [start, end];
+    }
+    // inner async function for potential #await blocks
+    const afterParameters = ` => { async ()${IGNORE_POSITION_COMMENT} => {`;
     if (isImplicitProp) {
         str.overwrite(snippetBlock.start, snippetBlock.expression.start, '', { contentOnly: true });
         const transforms = ['('];
-        if ((_e = snippetBlock.parameters) === null || _e === void 0 ? void 0 : _e.length) {
-            const start = snippetBlock.parameters[0].start;
-            const end = (_g = (_f = lastParameter.typeAnnotation) === null || _f === void 0 ? void 0 : _f.end) !== null && _g !== void 0 ? _g : lastParameter.end;
-            transforms.push([start, end]);
+        if (parameters) {
+            transforms.push(parameters);
+            const [start, end] = parameters;
             str.overwrite(snippetBlock.expression.end, start, '', {
                 contentOnly: true
             });
@@ -3096,47 +3122,22 @@ function handleSnippet(str, snippetBlock, component) {
         else {
             str.overwrite(snippetBlock.expression.end, startEnd, '', { contentOnly: true });
         }
-        transforms.push(') => {async () => {'); // inner async function for potential #await blocks
+        transforms.push(')' + afterParameters);
         transforms.push([startEnd, snippetBlock.end]);
-        component.addProp([[snippetBlock.expression.start, snippetBlock.expression.end]], transforms);
+        component.addImplicitSnippetProp([snippetBlock.expression.start, snippetBlock.expression.end], transforms);
     }
     else {
-        let generic = '';
-        if ((_h = snippetBlock.parameters) === null || _h === void 0 ? void 0 : _h.length) {
-            generic = `<[${snippetBlock.parameters
-                .map((p) => {
-                var _a, _b;
-                let typeAnnotation = p.typeAnnotation;
-                if (!typeAnnotation && p.type === 'AssignmentPattern') {
-                    typeAnnotation = (_a = p.left) === null || _a === void 0 ? void 0 : _a.typeAnnotation;
-                    if (!typeAnnotation) {
-                        typeAnnotation = (_b = p.right) === null || _b === void 0 ? void 0 : _b.typeAnnotation;
-                    }
-                }
-                // fall back to `any` to silence "implicit any" errors; JSDoc people can't add types to snippets
-                let type = 'any';
-                if (typeAnnotation === null || typeAnnotation === void 0 ? void 0 : typeAnnotation.typeAnnotation) {
-                    type = str.original.slice(typeAnnotation.typeAnnotation.start, typeAnnotation.typeAnnotation.end);
-                }
-                if (p.optional || p.type === 'AssignmentPattern') {
-                    type += '?';
-                }
-                return type;
-            })
-                .join(', ')}]>`;
-        }
-        const typeAnnotation = surroundWithIgnoreComments(`: import('svelte').Snippet${generic}`);
         const transforms = [
-            'var ',
+            'const ',
             [snippetBlock.expression.start, snippetBlock.expression.end],
-            typeAnnotation + ' = ('
+            IGNORE_POSITION_COMMENT,
+            ' = ('
         ];
-        if ((_j = snippetBlock.parameters) === null || _j === void 0 ? void 0 : _j.length) {
-            const start = snippetBlock.parameters[0].start;
-            const end = (_l = (_k = lastParameter.typeAnnotation) === null || _k === void 0 ? void 0 : _k.end) !== null && _l !== void 0 ? _l : lastParameter.end;
-            transforms.push([start, end]);
+        if (parameters) {
+            transforms.push(parameters);
         }
-        transforms.push(') => {async () => {'); // inner async function for potential #await blocks
+        transforms.push(')', surroundWithIgnoreComments(`: ReturnType<import('svelte').Snippet>`), // shows up nicely preserved on hover, other alternatives don't
+        afterParameters);
         transform(str, snippetBlock.start, startEnd, startEnd, transforms);
     }
 }
@@ -3160,7 +3161,9 @@ function handleImplicitChildren(componentNode, component) {
                 continue;
             }
         }
-        if (child.type === 'Comment' || (child.type === 'Text' && child.data.trim() === '')) {
+        if (child.type === 'Comment' ||
+            child.type === 'Slot' ||
+            (child.type === 'Text' && child.data.trim() === '')) {
             continue;
         }
         if (child.type !== 'SnippetBlock') {
@@ -3174,6 +3177,30 @@ function handleImplicitChildren(componentNode, component) {
     // it's enough to fake a children prop, we don't need to actually move the content inside (which would also reset control flow)
     component.addProp(['children'], ['() => { return __sveltets_2_any(0); }']);
 }
+function hoistSnippetBlock(str, blockOrEl) {
+    var _a;
+    if (blockOrEl.type === 'InlineComponent') {
+        // implicit props, handled in InlineComponent
+        return;
+    }
+    let targetPosition;
+    for (const node of (_a = blockOrEl.children) !== null && _a !== void 0 ? _a : []) {
+        if (node.type !== 'SnippetBlock') {
+            if (targetPosition === undefined && (node.type !== 'Text' || node.data.trim() !== '')) {
+                targetPosition = node.type === 'Text' ? node.end : node.start;
+            }
+            continue;
+        }
+        // already first
+        if (targetPosition === undefined) {
+            continue;
+        }
+        if (node.start === targetPosition) {
+            continue;
+        }
+        str.move(node.start, node.end, targetPosition);
+    }
+}
 
 /**
  * `{@render foo(x)}` --> `;foo(x);`
@@ -3203,6 +3230,7 @@ function convertHtmlxToJsx(str, ast, onWalk = null, onLeave = null, options = {
     stripDoctype(str);
     const rootSnippets = [];
     let element;
+    const pendingSnippetHoistCheck = new Set();
     walk(ast, {
         enter: (estreeTypedNode, estreeTypedParent, prop, index) => {
             const node = estreeTypedNode;
@@ -3230,6 +3258,9 @@ function convertHtmlxToJsx(str, ast, onWalk = null, onLeave = null, options = {
                             // root snippet -> move to instance script
                             rootSnippets.push([node.start, node.end]);
                         }
+                        else {
+                            pendingSnippetHoistCheck.add(parent);
+                        }
                         break;
                     case 'MustacheTag':
                         handleMustacheTag(str, node, parent);
@@ -3361,6 +3392,9 @@ function convertHtmlxToJsx(str, ast, onWalk = null, onLeave = null, options = {
             }
         }
     });
+    for (const node of pendingSnippetHoistCheck) {
+        hoistSnippetBlock(str, node);
+    }
     return rootSnippets;
 }
 
@@ -4928,22 +4962,31 @@ class ExportedNames {
         const names = Array.from(this.exports.entries());
         const others = names.filter(([, { isLet }]) => !isLet);
         const needsAccessors = this.usesAccessors && names.length > 0 && !this.usesRunes(); // runes mode doesn't support accessors
-        if (this.isSvelte5Plus && (others.length > 0 || this.usesRunes() || needsAccessors)) {
+        if (this.isSvelte5Plus) {
             let str = '';
-            if (others.length > 0 || needsAccessors) {
-                if (this.isTsFile) {
-                    str +=
-                        ', exports: {} as any as { ' +
-                            this.createReturnElementsType(needsAccessors ? names : others, undefined, true).join(',') +
-                            ' }';
+            if (others.length > 0 || this.usesRunes() || needsAccessors) {
+                if (others.length > 0 || needsAccessors) {
+                    if (this.isTsFile) {
+                        str +=
+                            ', exports: {} as any as { ' +
+                                this.createReturnElementsType(needsAccessors ? names : others, undefined, true).join(',') +
+                                ' }';
+                    }
+                    else {
+                        str += `, exports: /** @type {{${this.createReturnElementsType(needsAccessors ? names : others, false, true)}}} */ ({})`;
+                    }
                 }
                 else {
-                    str += `, exports: /** @type {{${this.createReturnElementsType(needsAccessors ? names : others, false, true)}}} */ ({})`;
+                    // Always add that, in TS5.5+ the type for Exports is infered to never when this is not present, which breaks types.
+                    // Don't cast to `Record<string, never>` because that will break the union type we use elsewhere
+                    str += ', exports: {}';
                 }
-            }
-            if (this.usesRunes()) {
                 str += `, bindings: ${this.createBindingsStr()}`;
             }
+            else {
+                // always add that, in TS5.5+ the type for Exports is infered to never when this is not present, which breaks types
+                str += `, exports: {}, bindings: ${this.createBindingsStr()}`;
+            }
             return str;
         }
         return '';
@@ -6901,7 +6944,30 @@ async function emitDts(config) {
     const { options, filenames } = loadTsconfig(config, svelteMap);
     const host = await createTsCompilerHost(options, svelteMap);
     const program = ts.createProgram(filenames, options, host);
-    program.emit();
+    const result = program.emit();
+    const likely_failed_files = result.diagnostics.filter((diagnostic) => {
+        // List of errors which hint at a failed d.ts generation
+        // https://github.com/microsoft/TypeScript/blob/main/src/compiler/diagnosticMessages.json
+        return diagnostic.code === 2527 || (diagnostic.code >= 4000 && diagnostic.code <= 4108);
+    });
+    if (likely_failed_files.length > 0) {
+        const failed_by_file = new Map();
+        likely_failed_files.forEach((diagnostic) => {
+            var _a;
+            const file = (_a = diagnostic.file) === null || _a === void 0 ? void 0 : _a.fileName;
+            if (file) {
+                const errors = failed_by_file.get(file) || [];
+                errors.push(ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'));
+                failed_by_file.set(file, errors);
+            }
+        });
+        console.warn('d.ts type declaration files for the following files were likely not generated due to the following errors:');
+        console.warn([...failed_by_file.entries()]
+            .map(([file, errors]) => {
+            return `${file}\n${errors.map((error) => `  - ${error}`).join('\n')}`;
+        })
+            .join('\n'));
+    }
 }
 function loadTsconfig(config, svelteMap) {
     var _a;
@@ -7011,16 +7077,16 @@ async function createTsCompilerHost(options, svelteMap) {
             fileName = pathPrefix ? path.join(pathPrefix, fileName) : fileName;
             if (fileName.endsWith('d.ts.map')) {
                 data = data.replace(/"sources":\["(.+?)"\]/, (_, sourcePath) => {
-                    // Due to our hack of treating .svelte files as .ts files, we need to adjust the extension
-                    if (sourcePath.endsWith('.svelte.ts')) {
-                        sourcePath = sourcePath.slice(0, -3);
-                    }
                     // The inverse of the pathPrefix adjustment
                     sourcePath =
                         pathPrefix && sourcePath.includes(pathPrefix)
                             ? sourcePath.slice(0, sourcePath.indexOf(pathPrefix)) +
                                 sourcePath.slice(sourcePath.indexOf(pathPrefix) + pathPrefix.length + 1)
                             : sourcePath;
+                    // Due to our hack of treating .svelte files as .ts files, we need to adjust the extension
+                    if (svelteMap.get(path.join(options.rootDir, toRealSvelteFilepath(sourcePath)))) {
+                        sourcePath = toRealSvelteFilepath(sourcePath);
+                    }
                     return `"sources":["${sourcePath}"]`;
                 });
             }
@@ -7089,10 +7155,13 @@ async function createSvelteMap(config) {
             version,
             noSvelteComponentTyped: noSvelteComponentTyped
         }).code;
-        svelteFiles.set(path, transformed);
+        svelteFiles.set(path.replace(/\\/g, '/'), transformed);
         return isTsFile;
     }
-    return { add, get: (key) => svelteFiles.get(key) };
+    return {
+        add,
+        get: (key) => svelteFiles.get(key.replace(/\\/g, '/'))
+    };
 }
 function isSvelteFilepath(filePath) {
     return filePath.endsWith('.svelte');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte2tsx",
-  "version": "0.7.12",
+  "version": "0.7.14",
   "description": "Convert Svelte components to TSX for type checking",
   "author": "David Pershouse",
   "license": "MIT",

package/svelte-shims-v4.d.ts

@@ -145,10 +145,6 @@ declare function __sveltets_2_cssProp(prop: Record<string, any>): {};
 
 // @ts-ignore Svelte v3/v4 don't have this
 declare function __sveltets_2_ensureSnippet(val: ReturnType<import('svelte').Snippet> | undefined | null): any;
-// @ts-ignore Svelte v3/v4 don't have this
-declare function __sveltets_2_snippet(): import('svelte').Snippet;
-// @ts-ignore Svelte v3/v4 don't have this
-declare function __sveltets_2_snippet<T>(t: T): import('svelte').Snippet<[T]>;
 
 /** @internal PRIVATE API, DO NOT USE */
 type __sveltets_2_SvelteAnimationReturnType = {