diff --git a/package.json b/package.json index b74048576..5f6d5b13a 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "lint": "prettier --check ." }, "dependencies": { - "typescript": "^5.7.2" + "typescript": "^5.8.2" }, "devDependencies": { "cross-env": "^7.0.2", diff --git a/packages/language-server/package.json b/packages/language-server/package.json index 616962025..96a2754df 100644 --- a/packages/language-server/package.json +++ b/packages/language-server/package.json @@ -62,10 +62,10 @@ "prettier-plugin-svelte": "^3.3.0", "svelte": "^4.2.19", "svelte2tsx": "workspace:~", - "typescript": "^5.7.2", + "typescript": "^5.8.2", "typescript-auto-import-cache": "^0.3.5", - "vscode-css-languageservice": "~6.3.0", - "vscode-html-languageservice": "~5.3.0", + "vscode-css-languageservice": "~6.3.2", + "vscode-html-languageservice": "~5.3.2", "vscode-languageserver": "9.0.1", "vscode-languageserver-protocol": "3.17.5", "vscode-languageserver-types": "3.17.5", diff --git a/packages/language-server/src/lib/documents/utils.ts b/packages/language-server/src/lib/documents/utils.ts index 66043af0e..374fdb07a 100644 --- a/packages/language-server/src/lib/documents/utils.ts +++ b/packages/language-server/src/lib/documents/utils.ts @@ -312,12 +312,14 @@ export function updateRelativeImport(oldPath: string, newPath: string, relativeI */ export function getNodeIfIsInComponentStartTag( html: HTMLDocument, + document: Document, offset: number ): Node | undefined { const node = html.findNodeAt(offset); if ( !!node.tag && - node.tag[0] === node.tag[0].toUpperCase() && + (node.tag[0] === node.tag[0].toUpperCase() || + (document.isSvelte5 && node.tag.includes('.'))) && (!node.startTagEnd || offset < node.startTagEnd) ) { return node; diff --git a/packages/language-server/src/plugins/html/HTMLPlugin.ts b/packages/language-server/src/plugins/html/HTMLPlugin.ts index 75d1c3193..c72324469 100644 --- a/packages/language-server/src/plugins/html/HTMLPlugin.ts +++ b/packages/language-server/src/plugins/html/HTMLPlugin.ts @@ -217,7 +217,7 @@ export class HTMLPlugin } private isInComponentTag(html: HTMLDocument, document: Document, position: Position) { - return !!getNodeIfIsInComponentStartTag(html, document.offsetAt(position)); + return !!getNodeIfIsInComponentStartTag(html, document, document.offsetAt(position)); } private getLangCompletions(completions: CompletionItem[]): CompletionItem[] { diff --git a/packages/language-server/src/plugins/typescript/features/CallHierarchyProvider.ts b/packages/language-server/src/plugins/typescript/features/CallHierarchyProvider.ts index 2151038b9..be0d87b57 100644 --- a/packages/language-server/src/plugins/typescript/features/CallHierarchyProvider.ts +++ b/packages/language-server/src/plugins/typescript/features/CallHierarchyProvider.ts @@ -27,6 +27,7 @@ import { toGeneratedSvelteComponentName } from '../utils'; import { findNodeAtSpan, gatherDescendants, SnapshotMap } from './utils'; +import { internalHelpers } from 'svelte2tsx'; const ENSURE_COMPONENT_HELPER = '__sveltets_2_ensureComponent'; @@ -200,7 +201,7 @@ export class CallHierarchyProviderImpl implements CallHierarchyProvider { .find( (statement): statement is ts.FunctionDeclaration => ts.isFunctionDeclaration(statement) && - statement.name?.getText() === 'render' + statement.name?.getText() === internalHelpers.renderName ) ?.name?.getStart() : -1; @@ -304,7 +305,7 @@ export class CallHierarchyProviderImpl implements CallHierarchyProvider { return this.toComponentCallHierarchyItem(snapshot, item); } - if (item.name === 'render') { + if (item.name === internalHelpers.renderName) { const end = item.selectionSpan.start + item.selectionSpan.length; const renderFunction = sourceFile.statements.find( (statement) => diff --git a/packages/language-server/src/plugins/typescript/features/CodeActionsProvider.ts b/packages/language-server/src/plugins/typescript/features/CodeActionsProvider.ts index c114fc4b6..8723629bf 100644 --- a/packages/language-server/src/plugins/typescript/features/CodeActionsProvider.ts +++ b/packages/language-server/src/plugins/typescript/features/CodeActionsProvider.ts @@ -56,6 +56,7 @@ import { import { DiagnosticCode } from './DiagnosticsProvider'; import { createGetCanonicalFileName } from '../../../utils'; import { LanguageServiceContainer } from '../service'; +import { internalHelpers } from 'svelte2tsx'; /** * TODO change this to protocol constant if it's part of the protocol @@ -1319,10 +1320,13 @@ export class CodeActionsProviderImpl implements CodeActionsProvider { ...refactor, title: refactor.title .replace( - "Extract to inner function in function 'render'", + `Extract to inner function in function '${internalHelpers.renderName}'`, 'Extract to function' ) - .replace("Extract to constant in function 'render'", 'Extract to constant') + .replace( + `Extract to constant in function '${internalHelpers.renderName}'`, + 'Extract to constant' + ) })) ); } diff --git a/packages/language-server/src/plugins/typescript/features/CodeLensProvider.ts b/packages/language-server/src/plugins/typescript/features/CodeLensProvider.ts index 99484b3d1..731051924 100644 --- a/packages/language-server/src/plugins/typescript/features/CodeLensProvider.ts +++ b/packages/language-server/src/plugins/typescript/features/CodeLensProvider.ts @@ -8,6 +8,7 @@ import { SvelteDocumentSnapshot } from '../DocumentSnapshot'; import { LSAndTSDocResolver } from '../LSAndTSDocResolver'; import { convertRange } from '../utils'; import { isTextSpanInGeneratedCode } from './utils'; +import { internalHelpers } from 'svelte2tsx'; type CodeLensType = 'reference' | 'implementation'; @@ -79,7 +80,9 @@ export class CodeLensProviderImpl implements CodeLensProvider { } const navigationTree = lang.getNavigationTree(tsDoc.filePath); - const renderFunction = navigationTree?.childItems?.find((item) => item.text === 'render'); + const renderFunction = navigationTree?.childItems?.find( + (item) => item.text === internalHelpers.renderName + ); if (renderFunction) { // pretty rare that there is anything to show in the template, so we skip it const notTemplate = renderFunction.childItems?.filter( diff --git a/packages/language-server/src/plugins/typescript/features/DiagnosticsProvider.ts b/packages/language-server/src/plugins/typescript/features/DiagnosticsProvider.ts index fcad1ec85..bf1174f97 100644 --- a/packages/language-server/src/plugins/typescript/features/DiagnosticsProvider.ts +++ b/packages/language-server/src/plugins/typescript/features/DiagnosticsProvider.ts @@ -24,6 +24,7 @@ import { import { not, flatten, passMap, swapRangeStartEndIfNecessary, memoize } from '../../../utils'; import { LSConfigManager } from '../../../ls-config'; import { isAttributeName, isEventHandler } from '../svelte-ast-utils'; +import { internalHelpers } from 'svelte2tsx'; export enum DiagnosticCode { MODIFIERS_CANNOT_APPEAR_HERE = 1184, // "Modifiers cannot appear here." @@ -546,7 +547,8 @@ function get$$PropsDef(lang: ts.LanguageService, snapshot: SvelteDocumentSnapsho const renderFunction = sourceFile.statements.find( (statement): statement is ts.FunctionDeclaration => - ts.isFunctionDeclaration(statement) && statement.name?.getText() === 'render' + ts.isFunctionDeclaration(statement) && + statement.name?.getText() === internalHelpers.renderName ); return renderFunction?.body?.statements.find( (node): node is ts.TypeAliasDeclaration | ts.InterfaceDeclaration => diff --git a/packages/language-server/src/plugins/typescript/features/SemanticTokensProvider.ts b/packages/language-server/src/plugins/typescript/features/SemanticTokensProvider.ts index 2103371f2..0b0184af9 100644 --- a/packages/language-server/src/plugins/typescript/features/SemanticTokensProvider.ts +++ b/packages/language-server/src/plugins/typescript/features/SemanticTokensProvider.ts @@ -11,6 +11,7 @@ import { SvelteDocumentSnapshot } from '../DocumentSnapshot'; import { LSAndTSDocResolver } from '../LSAndTSDocResolver'; import { convertToTextSpan } from '../utils'; import { isInGeneratedCode } from './utils'; +import { internalHelpers } from 'svelte2tsx'; const CONTENT_LENGTH_LIMIT = 50000; @@ -111,7 +112,8 @@ export class SemanticTokensProviderImpl implements SemanticTokensProvider { if ( isInGeneratedCode(text, generatedOffset, generatedOffset + generatedLength) || (encodedClassification === 2817 /* top level function */ && - text.substring(generatedOffset, generatedOffset + generatedLength) === 'render') + text.substring(generatedOffset, generatedOffset + generatedLength) === + internalHelpers.renderName) ) { return; } diff --git a/packages/language-server/src/plugins/typescript/features/utils.ts b/packages/language-server/src/plugins/typescript/features/utils.ts index dba13177a..368397ca3 100644 --- a/packages/language-server/src/plugins/typescript/features/utils.ts +++ b/packages/language-server/src/plugins/typescript/features/utils.ts @@ -13,6 +13,7 @@ import { or } from '../../../utils'; import { FileMap } from '../../../lib/documents/fileCollection'; import { LSConfig } from '../../../ls-config'; import { LanguageServiceContainer } from '../service'; +import { internalHelpers } from 'svelte2tsx'; type NodePredicate = (node: ts.Node) => boolean; @@ -40,7 +41,7 @@ export function getComponentAtPosition( return null; } - const node = getNodeIfIsInComponentStartTag(doc.html, doc.offsetAt(originalPosition)); + const node = getNodeIfIsInComponentStartTag(doc.html, doc, doc.offsetAt(originalPosition)); if (!node) { return null; } @@ -79,7 +80,7 @@ export function isComponentAtPosition( return false; } - return !!getNodeIfIsInComponentStartTag(doc.html, doc.offsetAt(originalPosition)); + return !!getNodeIfIsInComponentStartTag(doc.html, doc, doc.offsetAt(originalPosition)); } export const IGNORE_START_COMMENT = '/*Ωignore_startΩ*/'; @@ -299,7 +300,11 @@ function nodeAndParentsSatisfyRespectivePredicates( const isRenderFunction = nodeAndParentsSatisfyRespectivePredicates< ts.FunctionDeclaration & { name: ts.Identifier } ->((node) => ts.isFunctionDeclaration(node) && node?.name?.getText() === 'render', ts.isSourceFile); +>( + (node) => + ts.isFunctionDeclaration(node) && node?.name?.getText() === internalHelpers.renderName, + ts.isSourceFile +); const isRenderFunctionBody = nodeAndParentsSatisfyRespectivePredicates( ts.isBlock, @@ -309,11 +314,11 @@ const isRenderFunctionBody = nodeAndParentsSatisfyRespectivePredicates( export const isReactiveStatement = nodeAndParentsSatisfyRespectivePredicates( (node) => ts.isLabeledStatement(node) && node.label.getText() === '$', or( - // function render() { + // function $$render() { // $: x2 = __sveltets_2_invalidate(() => x * x) // } isRenderFunctionBody, - // function render() { + // function $$render() { // ;() => {$: x, update(); // } nodeAndParentsSatisfyRespectivePredicates( diff --git a/packages/language-server/src/plugins/typescript/module-loader.ts b/packages/language-server/src/plugins/typescript/module-loader.ts index 4cbde00b8..6c96ec172 100644 --- a/packages/language-server/src/plugins/typescript/module-loader.ts +++ b/packages/language-server/src/plugins/typescript/module-loader.ts @@ -7,8 +7,7 @@ import { ensureRealSvelteFilePath, getExtensionFromScriptKind, isSvelteFilePath, - isVirtualSvelteFilePath, - toVirtualSvelteFilePath + isVirtualSvelteFilePath } from './utils'; const CACHE_KEY_SEPARATOR = ':::'; @@ -89,8 +88,6 @@ class ModuleResolutionCache { } class ImpliedNodeFormatResolver { - private alreadyResolved = new FileMap>(); - constructor(private readonly tsSystem: ts.System) {} resolve( @@ -106,39 +103,17 @@ class ImpliedNodeFormatResolver { let mode: ReturnType = undefined; if (sourceFile) { - this.cacheImpliedNodeFormat(sourceFile, compilerOptions); mode = ts.getModeForResolutionAtIndex(sourceFile, importIdxInFile, compilerOptions); } return mode; } - private cacheImpliedNodeFormat(sourceFile: ts.SourceFile, compilerOptions: ts.CompilerOptions) { - if (!sourceFile.impliedNodeFormat && isSvelteFilePath(sourceFile.fileName)) { - // impliedNodeFormat is not set for Svelte files, because the TS function which - // calculates this works with a fixed set of file extensions, - // which .svelte is obv not part of. Make it work by faking a TS file. - if (!this.alreadyResolved.has(sourceFile.fileName)) { - sourceFile.impliedNodeFormat = ts.getImpliedNodeFormatForFile( - toVirtualSvelteFilePath(sourceFile.fileName) as any, - undefined, - this.tsSystem, - compilerOptions - ); - this.alreadyResolved.set(sourceFile.fileName, sourceFile.impliedNodeFormat); - } else { - sourceFile.impliedNodeFormat = this.alreadyResolved.get(sourceFile.fileName); - } - } - } - resolveForTypeReference( entry: string | ts.FileReference, - sourceFile: ts.SourceFile | undefined, - compilerOptions: ts.CompilerOptions + sourceFile: ts.SourceFile | undefined ) { let mode = undefined; if (sourceFile) { - this.cacheImpliedNodeFormat(sourceFile, compilerOptions); mode = ts.getModeForFileReference(entry, sourceFile?.impliedNodeFormat); } return mode; @@ -266,7 +241,14 @@ export function createSvelteModuleLoader( redirectedReference: ts.ResolvedProjectReference | undefined, option: ts.CompilerOptions ): ts.ResolvedModuleWithFailedLookupLocations { - const mode = impliedNodeFormatResolver.resolve(name, index, containingSourceFile, option); + const mode = impliedNodeFormatResolver.resolve( + name, + index, + containingSourceFile, + // use the same compiler options as resolveModuleName + // otherwise it might not find the module because of inconsistent module resolution strategy + redirectedReference?.commandLine.options ?? option + ); const resolvedModuleWithFailedLookup = tsModule.resolveModuleName( name, containingFile, @@ -315,8 +297,7 @@ export function createSvelteModuleLoader( const entry = getTypeReferenceResolutionName(typeDirectiveName); const mode = impliedNodeFormatResolver.resolveForTypeReference( entry, - containingSourceFile, - options + containingSourceFile ); const key = `${entry}|${mode}`; diff --git a/packages/language-server/src/plugins/typescript/service.ts b/packages/language-server/src/plugins/typescript/service.ts index 3c295129a..a45f04ecd 100644 --- a/packages/language-server/src/plugins/typescript/service.ts +++ b/packages/language-server/src/plugins/typescript/service.ts @@ -26,7 +26,8 @@ import { findTsConfigPath, getNearestWorkspaceUri, hasTsExtensions, - isSvelteFilePath + isSvelteFilePath, + toVirtualSvelteFilePath } from './utils'; import { createProject, ProjectService } from './serviceCache'; import { internalHelpers } from 'svelte2tsx'; @@ -974,14 +975,19 @@ async function createLanguageService( } const oldProgram = project?.program; - const program = languageService.getProgram(); + let program: ts.Program | undefined; + try { + program = languageService.getProgram(); + } finally { + // mark as clean even if the update fails, at least we can still try again next time there is a change + dirty = false; + } svelteModuleLoader.clearPendingInvalidations(); if (project) { project.program = program; } - dirty = false; compilerHost = undefined; if (!skipSvelteInputCheck) { @@ -1376,38 +1382,93 @@ function getOrCreateDocumentRegistry( registry = ts.createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory); - // impliedNodeFormat is always undefined when the svelte source file is created - // We might patched it later but the registry doesn't know about it - const releaseDocumentWithKey = registry.releaseDocumentWithKey; - registry.releaseDocumentWithKey = ( + const acquireDocumentWithKey = registry.acquireDocumentWithKey; + registry.acquireDocumentWithKey = ( + fileName: string, path: ts.Path, + compilationSettingsOrHost: ts.CompilerOptions | ts.MinimalResolutionCacheHost, key: ts.DocumentRegistryBucketKey, - scriptKind: ts.ScriptKind, - impliedNodeFormat?: ts.ResolutionMode + scriptSnapshot: ts.IScriptSnapshot, + version: string, + scriptKind?: ts.ScriptKind, + sourceFileOptions?: ts.CreateSourceFileOptions | ts.ScriptTarget ) => { - if (isSvelteFilePath(path)) { - releaseDocumentWithKey(path, key, scriptKind, undefined); - return; - } + ensureImpliedNodeFormat(compilationSettingsOrHost, fileName, sourceFileOptions); - releaseDocumentWithKey(path, key, scriptKind, impliedNodeFormat); + return acquireDocumentWithKey( + fileName, + path, + compilationSettingsOrHost, + key, + scriptSnapshot, + version, + scriptKind, + sourceFileOptions + ); }; - registry.releaseDocument = ( + const updateDocumentWithKey = registry.updateDocumentWithKey; + registry.updateDocumentWithKey = ( fileName: string, - compilationSettings: ts.CompilerOptions, - scriptKind: ts.ScriptKind, - impliedNodeFormat?: ts.ResolutionMode + path: ts.Path, + compilationSettingsOrHost: ts.CompilerOptions | ts.MinimalResolutionCacheHost, + key: ts.DocumentRegistryBucketKey, + scriptSnapshot: ts.IScriptSnapshot, + version: string, + scriptKind?: ts.ScriptKind, + sourceFileOptions?: ts.CreateSourceFileOptions | ts.ScriptTarget ) => { - if (isSvelteFilePath(fileName)) { - registry?.releaseDocument(fileName, compilationSettings, scriptKind, undefined); - return; - } + ensureImpliedNodeFormat(compilationSettingsOrHost, fileName, sourceFileOptions); - registry?.releaseDocument(fileName, compilationSettings, scriptKind, impliedNodeFormat); + return updateDocumentWithKey( + fileName, + path, + compilationSettingsOrHost, + key, + scriptSnapshot, + version, + scriptKind, + sourceFileOptions + ); }; documentRegistries.set(key, registry); return registry; + + function ensureImpliedNodeFormat( + compilationSettingsOrHost: ts.CompilerOptions | ts.MinimalResolutionCacheHost, + fileName: string, + sourceFileOptions: ts.CreateSourceFileOptions | ts.ScriptTarget | undefined + ) { + const compilationSettings = getCompilationSettings(compilationSettingsOrHost); + const host: ts.MinimalResolutionCacheHost | undefined = + compilationSettingsOrHost === compilationSettings + ? undefined + : (compilationSettingsOrHost as ts.MinimalResolutionCacheHost); + if ( + host && + isSvelteFilePath(fileName) && + typeof sourceFileOptions === 'object' && + !sourceFileOptions.impliedNodeFormat + ) { + const format = ts.getImpliedNodeFormatForFile( + toVirtualSvelteFilePath(fileName), + host?.getCompilerHost?.()?.getModuleResolutionCache?.()?.getPackageJsonInfoCache(), + host, + compilationSettings + ); + + sourceFileOptions.impliedNodeFormat = format; + } + } + + function getCompilationSettings( + settingsOrHost: ts.CompilerOptions | ts.MinimalResolutionCacheHost + ) { + if (typeof settingsOrHost.getCompilationSettings === 'function') { + return (settingsOrHost as ts.MinimalResolutionCacheHost).getCompilationSettings(); + } + return settingsOrHost as ts.CompilerOptions; + } } diff --git a/packages/language-server/test/plugins/typescript/TypescriptPlugin.test.ts b/packages/language-server/test/plugins/typescript/TypescriptPlugin.test.ts index d92d452b2..44ad520db 100644 --- a/packages/language-server/test/plugins/typescript/TypescriptPlugin.test.ts +++ b/packages/language-server/test/plugins/typescript/TypescriptPlugin.test.ts @@ -17,6 +17,7 @@ import { __resetCache } from '../../../src/plugins/typescript/service'; import { ignoredBuildDirectories } from '../../../src/plugins/typescript/SnapshotManager'; import { pathToUrl } from '../../../src/utils'; import { serviceWarmup } from './test-utils'; +import { internalHelpers } from 'svelte2tsx'; const testDir = path.join(__dirname, 'testfiles'); @@ -89,7 +90,7 @@ describe('TypescriptPlugin', function () { } } }, - containerName: 'render' + containerName: internalHelpers.renderName }, { name: 'hello', @@ -107,7 +108,7 @@ describe('TypescriptPlugin', function () { } } }, - containerName: 'render' + containerName: internalHelpers.renderName }, { name: "$: if (hello) {\n console.log('hi');\n }", @@ -125,7 +126,7 @@ describe('TypescriptPlugin', function () { } } }, - containerName: 'render' + containerName: internalHelpers.renderName }, { name: '$on("click") callback', diff --git a/packages/language-server/test/plugins/typescript/features/CodeActionsProvider.test.ts b/packages/language-server/test/plugins/typescript/features/CodeActionsProvider.test.ts index 53fadc529..19374f004 100644 --- a/packages/language-server/test/plugins/typescript/features/CodeActionsProvider.test.ts +++ b/packages/language-server/test/plugins/typescript/features/CodeActionsProvider.test.ts @@ -22,6 +22,7 @@ import { pathToUrl } from '../../../../src/utils'; import { recursiveServiceWarmup } from '../test-utils'; import { DiagnosticCode } from '../../../../src/plugins/typescript/features/DiagnosticsProvider'; import { VERSION } from 'svelte/compiler'; +import { internalHelpers } from 'svelte2tsx'; const testDir = path.join(__dirname, '..'); const indent = ' '.repeat(4); @@ -1880,8 +1881,8 @@ describe('CodeActionsProvider', function () { }, // is from generated code textRange: { - pos: 179, - end: 213 + pos: 181, + end: 215 } } ], @@ -2028,13 +2029,13 @@ describe('CodeActionsProvider', function () { }, // is from generated code textRange: { - pos: 179, - end: 213 + pos: 181, + end: 215 } } ], command: 'function_scope_0', - title: "Extract to inner function in function 'render'" + title: `Extract to inner function in function '${internalHelpers.renderName}'` }, title: 'Extract to function' }); diff --git a/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/component-handler/expectedv2.json b/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/component-handler/expectedv2.json index 614c9f646..d36c82693 100644 --- a/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/component-handler/expectedv2.json +++ b/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/component-handler/expectedv2.json @@ -12,8 +12,8 @@ "value": "MouseEvent", "location": { "range": { - "start": { "line": 16152, "character": 10 }, - "end": { "line": 16152, "character": 20 } + "start": { "line": 16546, "character": 10 }, + "end": { "line": 16546, "character": 20 } }, "uri": "/typescript/lib/lib.dom.d.ts" } diff --git a/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/element-handler/expectedv2.json b/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/element-handler/expectedv2.json index eccc501c8..0d85aa1e4 100644 --- a/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/element-handler/expectedv2.json +++ b/packages/language-server/test/plugins/typescript/features/inlayHints/fixtures/element-handler/expectedv2.json @@ -6,8 +6,8 @@ "value": "MouseEvent", "location": { "range": { - "start": { "line": 16152, "character": 10 }, - "end": { "line": 16152, "character": 20 } + "start": { "line": 16546, "character": 10 }, + "end": { "line": 16546, "character": 20 } }, "uri": "/typescript/lib/lib.dom.d.ts" } @@ -21,8 +21,8 @@ "value": "EventTarget", "location": { "range": { - "start": { "line": 8694, "character": 10 }, - "end": { "line": 8694, "character": 21 } + "start": { "line": 8857, "character": 10 }, + "end": { "line": 8857, "character": 21 } }, "uri": "/typescript/lib/lib.dom.d.ts" } @@ -32,8 +32,8 @@ "value": "HTMLButtonElement", "location": { "range": { - "start": { "line": 10145, "character": 10 }, - "end": { "line": 10145, "character": 27 } + "start": { "line": 10333, "character": 10 }, + "end": { "line": 10333, "character": 27 } }, "uri": "/typescript/lib/lib.dom.d.ts" } diff --git a/packages/language-server/test/plugins/typescript/service.test.ts b/packages/language-server/test/plugins/typescript/service.test.ts index 360848fad..88d7393cd 100644 --- a/packages/language-server/test/plugins/typescript/service.test.ts +++ b/packages/language-server/test/plugins/typescript/service.test.ts @@ -281,6 +281,57 @@ describe('service', () => { }); }); + it('do not throw when script tag is nuked', async () => { + // testing this because the patch rely on ts implementation details + // and we want to be aware of the changes + + const dirPath = getRandomVirtualDirPath(testDir); + const { virtualSystem, lsDocumentContext, rootUris } = setup(); + + virtualSystem.writeFile( + path.join(dirPath, 'tsconfig.json'), + JSON.stringify({ + compilerOptions: { + module: 'NodeNext', + moduleResolution: 'NodeNext' + } + }) + ); + + virtualSystem.writeFile( + path.join(dirPath, 'random.svelte'), + '' + ); + virtualSystem.writeFile( + path.join(dirPath, 'random2.svelte'), + '' + ); + + const ls = await getService( + path.join(dirPath, 'random.svelte'), + rootUris, + lsDocumentContext + ); + + const document = new Document(pathToUrl(path.join(dirPath, 'random.svelte')), ''); + document.openedByClient = true; + ls.updateSnapshot(document); + + const document2 = new Document( + pathToUrl(path.join(dirPath, 'random2.svelte')), + virtualSystem.readFile(path.join(dirPath, 'random2.svelte'))! + ); + document.openedByClient = true; + ls.updateSnapshot(document2); + + const lang = ls.getService(); + lang.getProgram(); + + document2.update(' Promise @@ -548,6 +599,54 @@ describe('service', () => { assert.deepStrictEqual(getSemanticDiagnosticsMessages(ls, importing), []); }); + it('resolve module with source project reference redirect having different module resolution', async () => { + const dirPath = getRandomVirtualDirPath(testDir); + const { virtualSystem, lsDocumentContext, rootUris } = setup(); + + const package1 = path.join(dirPath, 'package1'); + + virtualSystem.writeFile( + path.join(package1, 'tsconfig.json'), + JSON.stringify({ + references: [{ path: '../package2' }], + files: ['index.ts'], + compilerOptions: { + moduleResolution: 'Bundler', + module: 'ESNext', + paths: { + package2: ['../package2'] + } + } + }) + ); + + const package2 = path.join(dirPath, 'package2'); + virtualSystem.writeFile( + path.join(package2, 'tsconfig.json'), + JSON.stringify({ + compilerOptions: { + composite: true, + strict: true, + moduleResolution: 'NodeNext' + }, + files: ['index.ts'] + }) + ); + + const importing = path.join(package1, 'index.ts'); + virtualSystem.writeFile(importing, 'import { hi } from "package2"; hi((a) => `${a}`);'); + + const reExport = path.join(package2, 'index.ts'); + virtualSystem.writeFile(reExport, 'export * from "./foo"'); + + const exportFile = path.join(package2, 'foo.ts'); + virtualSystem.writeFile(exportFile, 'export function hi(cb: (num: number) => string) {}'); + + const ls = await getService(importing, rootUris, lsDocumentContext); + + assert.deepStrictEqual(getSemanticDiagnosticsMessages(ls, importing), []); + }); + it('skip directory watching if directory is root', async () => { const dirPath = getRandomVirtualDirPath(path.join(testDir, 'Test')); const { virtualSystem, lsDocumentContext } = setup(); diff --git a/packages/svelte-check/package.json b/packages/svelte-check/package.json index 3d6c82829..c43cc6b25 100644 --- a/packages/svelte-check/package.json +++ b/packages/svelte-check/package.json @@ -54,7 +54,7 @@ "rollup-plugin-copy": "^3.4.0", "svelte": "^4.2.19", "svelte-language-server": "workspace:*", - "typescript": "^5.7.2", + "typescript": "^5.8.2", "vscode-languageserver": "8.0.2", "vscode-languageserver-protocol": "3.17.2", "vscode-languageserver-types": "3.17.2", diff --git a/packages/svelte-vscode/package.json b/packages/svelte-vscode/package.json index de78f975b..809dfaf47 100644 --- a/packages/svelte-vscode/package.json +++ b/packages/svelte-vscode/package.json @@ -738,7 +738,7 @@ "@types/vscode": "^1.67", "js-yaml": "^3.14.0", "tslib": "^2.4.0", - "typescript": "^5.7.2", + "typescript": "^5.8.2", "vscode-tmgrammar-test": "^0.0.11" }, "dependencies": { diff --git a/packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml b/packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml index 786d70adc..9ad16d850 100644 --- a/packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml +++ b/packages/svelte-vscode/syntaxes/svelte.tmLanguage.src.yaml @@ -246,8 +246,13 @@ repository: - include: '#destructuring-const' # Variable. - begin: \G\s*([_$[:alpha:]][_$[:alnum:]]+)\s* - end: (?=\=) + end: (?=[:=]) beginCaptures: { 1: { name: variable.other.constant.svelte } } + # Type annotation (starting with ":"). + - begin: (?=:) + end: (?=\=) + name: meta.type.annotation.svelte + patterns: [ include: source.ts ] # Expression (starting with "="). - begin: (?=\=) name: meta.embedded.expression.svelte source.ts diff --git a/packages/svelte2tsx/index.d.ts b/packages/svelte2tsx/index.d.ts index 87c2fda52..206565422 100644 --- a/packages/svelte2tsx/index.d.ts +++ b/packages/svelte2tsx/index.d.ts @@ -174,6 +174,7 @@ export const internalHelpers: { hasTypeDefinition: boolean; } >, + renderName: string }; /** @@ -194,4 +195,4 @@ export namespace InternalHelpers { universalHooksPath: string; paramsPath: string; } -} +} \ No newline at end of file diff --git a/packages/svelte2tsx/package.json b/packages/svelte2tsx/package.json index 4797af3bc..376e6ac33 100644 --- a/packages/svelte2tsx/package.json +++ b/packages/svelte2tsx/package.json @@ -1,6 +1,6 @@ { "name": "svelte2tsx", - "version": "0.7.25", + "version": "0.7.35", "description": "Convert Svelte components to TSX for type checking", "author": "David Pershouse", "license": "MIT", @@ -40,7 +40,7 @@ "svelte": "~4.2.19", "tiny-glob": "^0.2.6", "tslib": "^2.4.0", - "typescript": "^5.7.2" + "typescript": "^5.8.2" }, "peerDependencies": { "svelte": "^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0", diff --git a/packages/svelte2tsx/repl/index.svelte b/packages/svelte2tsx/repl/index.svelte index 9334f7ac0..fb72eb302 100644 --- a/packages/svelte2tsx/repl/index.svelte +++ b/packages/svelte2tsx/repl/index.svelte @@ -1,8 +1,11 @@ - - v, new_v => v = new_v} /> + -
-
+{#snippet hoistable1()} +
hello
+{/snippet} - - v, new_v => v = new_v} /> +{#snippet hoistable2()} +
{foo}
+{/snippet} diff --git a/packages/svelte2tsx/src/emitDts.ts b/packages/svelte2tsx/src/emitDts.ts index 3740a66c3..fb312a36d 100644 --- a/packages/svelte2tsx/src/emitDts.ts +++ b/packages/svelte2tsx/src/emitDts.ts @@ -277,7 +277,7 @@ interface SvelteMap { * those transformed source later on. */ async function createSvelteMap(config: EmitDtsConfig): Promise { - const svelteFiles = new Map(); + const svelteFiles = new Map(); // TODO detect Svelte version in here and set shimsPath accordingly if not given from above const noSvelteComponentTyped = config.svelteShimsPath @@ -286,6 +286,12 @@ async function createSvelteMap(config: EmitDtsConfig): Promise { const version = noSvelteComponentTyped ? undefined : '3.42.0'; function add(path: string): boolean { + const normalizedPath = path.replace(/\\/g, '/'); + + if (svelteFiles.has(normalizedPath)) { + return svelteFiles.get(normalizedPath)!.isTsFile; + } + const code = ts.sys.readFile(path, 'utf-8'); const isTsFile = /]*?lang=('|")(ts|typescript)('|")/.test(code); const transformed = svelte2tsx(code, { @@ -295,13 +301,13 @@ async function createSvelteMap(config: EmitDtsConfig): Promise { version, noSvelteComponentTyped: noSvelteComponentTyped }).code; - svelteFiles.set(path.replace(/\\/g, '/'), transformed); + svelteFiles.set(normalizedPath, { transformed, isTsFile }); return isTsFile; } return { add, - get: (key: string) => svelteFiles.get(key.replace(/\\/g, '/')) + get: (key: string) => svelteFiles.get(key.replace(/\\/g, '/'))?.transformed }; } diff --git a/packages/svelte2tsx/src/helpers/index.ts b/packages/svelte2tsx/src/helpers/index.ts index 57ed548b7..813268d8c 100644 --- a/packages/svelte2tsx/src/helpers/index.ts +++ b/packages/svelte2tsx/src/helpers/index.ts @@ -25,5 +25,6 @@ export const internalHelpers = { toVirtualPos, toOriginalPos, findExports, - get_global_types + get_global_types, + renderName: '$$render' }; diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/index.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/index.ts index 2e5ac14d3..65a06be0a 100644 --- a/packages/svelte2tsx/src/htmlxtojsx_v2/index.ts +++ b/packages/svelte2tsx/src/htmlxtojsx_v2/index.ts @@ -54,7 +54,7 @@ export interface TemplateProcessResult { scriptTag: BaseNode; moduleScriptTag: BaseNode; /** Start/end positions of snippets that should be moved to the instance script or possibly even module script */ - rootSnippets: Array<[start: number, end: number, globals: Map]>; + rootSnippets: Array<[start: number, end: number, globals: Map, string]>; /** To be added later as a comment on the default class export */ componentDocumentation: ComponentDocumentation; events: ComponentEvents; @@ -93,7 +93,7 @@ export function convertHtmlxToJsx( stripDoctype(str); - const rootSnippets: Array<[number, number, Map]> = []; + const rootSnippets: Array<[number, number, Map, string]> = []; let element: Element | InlineComponent | undefined; const pendingSnippetHoistCheck = new Set(); @@ -264,7 +264,12 @@ export function convertHtmlxToJsx( } }); - rootSnippets.push([node.start, node.end, result.globals]); + rootSnippets.push([ + node.start, + node.end, + result.globals, + node.expression.name + ]); } else { pendingSnippetHoistCheck.add(parent); } diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Attribute.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Attribute.ts index d68e24078..8a4221b88 100644 --- a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Attribute.ts +++ b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Attribute.ts @@ -160,7 +160,7 @@ export function handleAttribute( const attributeValue: TransformationArray = []; if (attr.value === true) { - attributeValue.push('true'); + attributeValue.push(attr.name === 'popover' ? '""' : 'true'); addAttribute(attributeName, attributeValue); return; } diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Element.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Element.ts index e7d1b4a55..b3ef9233c 100644 --- a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Element.ts +++ b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/Element.ts @@ -225,11 +225,19 @@ export class Element { ...this.startEndTransformation ]); + const closingTag = this.str.original.substring( + this.str.original.lastIndexOf('fooo

anothertag

` - const endStart = tagEndIdx === -1 ? this.node.end : tagEndIdx + this.node.start; + const endStart = + tagEndIdx === -1 || closingTag.trim() !== this.node.name + ? this.node.end + : tagEndIdx + this.node.start; transform(this.str, endStart, this.node.end, this.endTransformation); } } diff --git a/packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts b/packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts index c4f016398..9e9454773 100644 --- a/packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts +++ b/packages/svelte2tsx/src/svelte2tsx/addComponentExport.ts @@ -6,6 +6,7 @@ import { ComponentDocumentation } from './nodes/ComponentDocumentation'; import { Generics } from './nodes/Generics'; import { surroundWithIgnoreComments } from '../utils/ignore'; import { ComponentEvents } from './nodes/ComponentEvents'; +import { internalHelpers } from '../helpers'; export interface AddComponentExportPara { str: MagicString; @@ -71,13 +72,13 @@ function addGenericsComponentExport({ let statement = ` class __sveltets_Render${genericsDef} { props() { - return ${props(true, canHaveAnyProp, exportedNames, `render${genericsRef}()`)}.props; + return ${props(true, canHaveAnyProp, exportedNames, `${internalHelpers.renderName}${genericsRef}()`)}.props; } events() { - return ${_events(events.hasStrictEvents() || exportedNames.usesRunes(), `render${genericsRef}()`)}.events; + return ${_events(events.hasStrictEvents() || exportedNames.usesRunes(), `${internalHelpers.renderName}${genericsRef}()`)}.events; } slots() { - return render${genericsRef}().slots; + return ${internalHelpers.renderName}${genericsRef}().slots; } `; @@ -85,15 +86,15 @@ class __sveltets_Render${genericsDef} { if (isSvelte5 && !isTsFile && exportedNames.usesRunes()) { statement = ` class __sveltets_Render${genericsDef} { - props(): ReturnType['props'] { return null as any; } - events(): ReturnType['events'] { return null as any; } - slots(): ReturnType['slots'] { return null as any; } + props(): ReturnType['props'] { return null as any; } + events(): ReturnType['events'] { return null as any; } + slots(): ReturnType['slots'] { return null as any; } `; } statement += isSvelte5 ? ` bindings() { return ${exportedNames.createBindingsStr()}; } - exports() { return ${exportedNames.hasExports() ? `render${genericsRef}().exports` : '{}'}; } + exports() { return ${exportedNames.hasExports() ? `${internalHelpers.renderName}${genericsRef}().exports` : '{}'}; } }\n` : '}\n'; @@ -181,7 +182,7 @@ function addSimpleComponentExport({ isTsFile, canHaveAnyProp, exportedNames, - _events(events.hasStrictEvents(), 'render()') + _events(events.hasStrictEvents(), `${internalHelpers.renderName}()`) ); const doc = componentDocumentation.getFormatted(); @@ -192,7 +193,7 @@ function addSimpleComponentExport({ if (mode === 'dts') { if (isSvelte5 && exportedNames.usesRunes() && !usesSlots && !events.hasEvents()) { statement = - `\n${doc}const ${componentName} = __sveltets_2_fn_component(render());\n` + + `\n${doc}const ${componentName} = __sveltets_2_fn_component(${internalHelpers.renderName}());\n` + `type ${componentName} = ReturnType;\n` + `export default ${componentName};`; } else if (isSvelte5) { @@ -258,7 +259,7 @@ declare function $$__sveltets_2_isomorphic_component< if (isSvelte5) { if (exportedNames.usesRunes() && !usesSlots && !events.hasEvents()) { statement = - `\n${doc}const ${componentName} = __sveltets_2_fn_component(render());\n` + + `\n${doc}const ${componentName} = __sveltets_2_fn_component(${internalHelpers.renderName}());\n` + `type ${componentName} = ReturnType;\n` + `export default ${componentName};`; } else { diff --git a/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts b/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts index 16f65d207..81f5d91b4 100644 --- a/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts +++ b/packages/svelte2tsx/src/svelte2tsx/createRenderFunction.ts @@ -7,6 +7,7 @@ import { IGNORE_START_COMMENT, surroundWithIgnoreComments } from '../utils/ignore'; +import { internalHelpers } from '../helpers'; export interface CreateRenderFunctionPara extends InstanceScriptProcessResult { str: MagicString; @@ -75,7 +76,8 @@ export function createRenderFunction({ start++; end--; } - str.overwrite(scriptTag.start + 1, start - 1, `function render`); + + str.overwrite(scriptTag.start + 1, start - 1, `function ${internalHelpers.renderName}`); str.overwrite(start - 1, start, isTsFile ? '<' : `<${IGNORE_START_COMMENT}`); // if the generics are unused, only this char is colored opaque str.overwrite( end, @@ -86,7 +88,7 @@ export function createRenderFunction({ str.overwrite( scriptTag.start + 1, scriptTagEnd, - `function render${generics.toDefinitionString(true)}() {${propsDecl}\n` + `function ${internalHelpers.renderName}${generics.toDefinitionString(true)}() {${propsDecl}\n` ); } @@ -98,7 +100,8 @@ export function createRenderFunction({ } else { str.prependRight( scriptDestination, - `;function render() {` + `${propsDecl}${slotsDeclaration}\nasync () => {` + `;function ${internalHelpers.renderName}() {` + + `${propsDecl}${slotsDeclaration}\nasync () => {` ); } diff --git a/packages/svelte2tsx/src/svelte2tsx/index.ts b/packages/svelte2tsx/src/svelte2tsx/index.ts index 207903fa0..a3b45221f 100644 --- a/packages/svelte2tsx/src/svelte2tsx/index.ts +++ b/packages/svelte2tsx/src/svelte2tsx/index.ts @@ -165,6 +165,10 @@ export function svelte2tsx( } } + if (moduleScriptTag && rootSnippets.length > 0) { + exportedNames.hoistableInterfaces.analyzeSnippets(rootSnippets); + } + if (moduleScriptTag || scriptTag) { for (const [start, end, globals] of rootSnippets) { const hoist_to_module = diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts index b8851b23c..454cb2a3d 100644 --- a/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts +++ b/packages/svelte2tsx/src/svelte2tsx/nodes/ExportedNames.ts @@ -506,7 +506,10 @@ export class ExportedNames { if (this.usesRunes()) { // In runes mode, exports are no longer part of props return Array.from(this.getters) - .map((name) => `\n get ${name}() { return render${generics}().exports.${name} }`) + .map( + (name) => + `\n get ${name}() { return ${internalHelpers.renderName}${generics}().exports.${name} }` + ) .join(''); } else { return Array.from(this.getters) diff --git a/packages/svelte2tsx/src/svelte2tsx/nodes/HoistableInterfaces.ts b/packages/svelte2tsx/src/svelte2tsx/nodes/HoistableInterfaces.ts index 8fd726ff6..7d95d1c73 100644 --- a/packages/svelte2tsx/src/svelte2tsx/nodes/HoistableInterfaces.ts +++ b/packages/svelte2tsx/src/svelte2tsx/nodes/HoistableInterfaces.ts @@ -19,6 +19,28 @@ export class HoistableInterfaces { value_deps: new Set() }; + analyzeSnippets( + rootSnippets: [start: number, end: number, globals: Map, string][] + ) { + let prev_disallowed_values_size; + // we need to recalculate the disallowed values until they are stable because + // one snippet might depend on another snippet which was previously hoistable + while ( + prev_disallowed_values_size == null || + this.disallowed_values.size !== prev_disallowed_values_size + ) { + prev_disallowed_values_size = this.disallowed_values.size; + for (const [, , globals, name] of rootSnippets) { + const hoist_to_module = + globals.size === 0 || + [...globals.keys()].every((id) => this.isAllowedReference(id)); + if (!hoist_to_module) { + this.disallowed_values.add(name); + } + } + } + } + /** should be called before analyzeInstanceScriptNode */ analyzeModuleScriptNode(node: ts.Node) { // Handle Import Declarations diff --git a/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts b/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts index 4790739cb..d6f0ebdf6 100644 --- a/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts +++ b/packages/svelte2tsx/src/svelte2tsx/processInstanceScriptContent.ts @@ -1,6 +1,6 @@ import MagicString from 'magic-string'; import { Node } from 'estree-walker'; -import ts from 'typescript'; +import ts, { VariableDeclaration } from 'typescript'; import { getBinaryAssignmentExpr, isNotPropertyNameOfImport, moveNode } from './utils/tsAst'; import { ExportedNames, is$$PropsDeclaration } from './nodes/ExportedNames'; import { ImplicitTopLevelNames } from './nodes/ImplicitTopLevelNames'; @@ -32,6 +32,7 @@ interface PendingStoreResolution { node: ts.Identifier; parent: ts.Node; scope: Scope; + isPropsId: boolean; } export function processInstanceScriptContent( @@ -82,13 +83,19 @@ export function processInstanceScriptContent( //track if we are in a declaration scope let isDeclaration = false; + //track the variable declaration node + let variableDeclarationNode: VariableDeclaration | null = null; + //track $store variables since we are only supposed to give top level scopes special treatment, and users can declare $blah variables at higher scopes //which prevents us just changing all instances of Identity that start with $ - const pendingStoreResolutions: PendingStoreResolution[] = []; + let pendingStoreResolutions: PendingStoreResolution[] = []; let scope = new Scope(); const rootScope = scope; + //track is the variable declared as `props` comes from `$props()` + let isPropsDeclarationRune = false; + const pushScope = () => (scope = new Scope(scope)); const popScope = () => (scope = scope.parent); @@ -124,6 +131,17 @@ export function processInstanceScriptContent( return; } + //if we are in a variable declaration and the identifier is `props` we check the initializer + if ( + ident.text === 'props' && + variableDeclarationNode && + variableDeclarationNode.initializer && + ts.isCallExpression(variableDeclarationNode.initializer) && + variableDeclarationNode.initializer.getText() === '$props()' + ) { + isPropsDeclarationRune = true; + } + if (isDeclaration || ts.isParameter(parent)) { if ( isNotPropertyNameOfImport(ident) && @@ -148,6 +166,17 @@ export function processInstanceScriptContent( !ts.isTypeAliasDeclaration(parent) && !ts.isInterfaceDeclaration(parent) ) { + let isPropsId = false; + if ( + text === '$props' && + ts.isPropertyAccessExpression(parent) && + parent.parent && + ts.isCallExpression(parent.parent) && + parent.parent.arguments.length === 0 + ) { + const text = parent.getText(); + isPropsId = text === '$props.id'; + } // Handle the const { ...props } = $props() case const is_rune = (text === '$props' || text === '$derived' || text === '$state') && @@ -155,7 +184,7 @@ export function processInstanceScriptContent( ts.isVariableDeclaration(parent.parent) && parent.parent.name.getText().includes(text.slice(1)); if (!is_rune) { - pendingStoreResolutions.push({ node: ident, parent, scope }); + pendingStoreResolutions.push({ node: ident, parent, scope, isPropsId }); } } } @@ -234,7 +263,11 @@ export function processInstanceScriptContent( if (ts.isVariableDeclaration(parent) && parent.name == node) { isDeclaration = true; - onLeaveCallbacks.push(() => (isDeclaration = false)); + variableDeclarationNode = parent; + onLeaveCallbacks.push(() => { + isDeclaration = false; + variableDeclarationNode = null; + }); } if (ts.isBindingElement(parent) && parent.name == node) { @@ -295,6 +328,10 @@ export function processInstanceScriptContent( tsAst.forEachChild((n) => walk(n, tsAst)); //resolve stores + if (isPropsDeclarationRune) { + //we filter out every pendingStore resolution that `isPropsId` if the variable names `props` comes from `$props()` + pendingStoreResolutions = pendingStoreResolutions.filter(({ isPropsId }) => !isPropsId); + } pendingStoreResolutions.map(resolveStore); // declare implicit reactive variables we found in the script diff --git a/packages/svelte2tsx/src/svelte2tsx/processModuleScriptTag.ts b/packages/svelte2tsx/src/svelte2tsx/processModuleScriptTag.ts index d66d4630b..ce3ae99f2 100644 --- a/packages/svelte2tsx/src/svelte2tsx/processModuleScriptTag.ts +++ b/packages/svelte2tsx/src/svelte2tsx/processModuleScriptTag.ts @@ -25,6 +25,7 @@ export function createModuleAst(str: MagicString, script: Node): ModuleAst { true, ts.ScriptKind.TS ); + const astOffset = script.content.start; return { htmlx, tsAst, astOffset }; diff --git a/packages/svelte2tsx/test/emitDts/samples/typescript-declarationMap/expected/Test.svelte.d.ts.map b/packages/svelte2tsx/test/emitDts/samples/typescript-declarationMap/expected/Test.svelte.d.ts.map index e755104b1..fb7d11bf8 100644 --- a/packages/svelte2tsx/test/emitDts/samples/typescript-declarationMap/expected/Test.svelte.d.ts.map +++ b/packages/svelte2tsx/test/emitDts/samples/typescript-declarationMap/expected/Test.svelte.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Test.svelte.d.ts","sourceRoot":"","sources":["../src/Test.svelte"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAE5C;AAeD,QAAA,MAAM,SAAS;;iBADiC,MAAM;;;;;;;;;;;;CACC,CAAC;AACxD,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,KAAK,CAAC;AAC/C,MAAM,MAAM,UAAU,GAAG,OAAO,SAAS,CAAC,MAAM,CAAC;AACjD,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,KAAK,CAAC;AAE/C,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,oBAAoB,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC;IACpF,IAAI,OAAO,WAA+D;CAC7E"} \ No newline at end of file +{"version":3,"file":"Test.svelte.d.ts","sourceRoot":"","sources":["../src/Test.svelte"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAE5C;AAeD,QAAA,MAAM,SAAS;;iBADiC,MAAM;;;;;;;;;;;;CACG,CAAC;AAC1D,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,KAAK,CAAC;AAC/C,MAAM,MAAM,UAAU,GAAG,OAAO,SAAS,CAAC,MAAM,CAAC;AACjD,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAC,KAAK,CAAC;AAE/C,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,oBAAoB,CAAC,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC;IACpF,IAAI,OAAO,WAA+D;CAC7E"} \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-bare/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-bare/expectedv2.js index da491855c..b2a9e7e8a 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-bare/expectedv2.js +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-bare/expectedv2.js @@ -1 +1,5 @@ - { const $$_tnenopmoCemoS0C = __sveltets_2_ensureComponent(SomeComponent); new $$_tnenopmoCemoS0C({ target: __sveltets_2_any(), props: {"relaxed":true,}});} \ No newline at end of file + { const $$_tnenopmoCemoS0C = __sveltets_2_ensureComponent(SomeComponent); new $$_tnenopmoCemoS0C({ target: __sveltets_2_any(), props: {"relaxed":true,}});} + { svelteHTML.createElement("input", {"disabled":true,});} + + + { svelteHTML.createElement("div", {"popover":"",}); } \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-bare/input.svelte b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-bare/input.svelte index 8e7660e90..0528d4170 100644 --- a/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-bare/input.svelte +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/attribute-bare/input.svelte @@ -1 +1,5 @@ - \ No newline at end of file + + + + +
diff --git a/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx index 9864b0bcc..8ede9ab23 100644 --- a/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx +++ b/packages/svelte2tsx/test/sourcemaps/samples/action-directive/mappings.jsx @@ -1,5 +1,5 @@ /// -;function render() { {/** +;function $$render() { {/** ------------------------------------------------------------------------------------------------------------------------------------------------------ */} async () => { {const $$action_0 = __sveltets_2_ensureAction(action(svelteHTML.mapElementTag('element')));{ svelteHTML.createElement("element", __sveltets_2_union($$action_0), { });}}{/** ============# Originless mappings @@ -143,5 +143,5 @@ async•()•=>•{•{const•$$action_0•=•__sveltets_2_ensureAction(action ------------------------------------------------------------------------------------------------------------------------------------------------------ */} return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx index 8e81cad42..8048c60ff 100644 --- a/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx +++ b/packages/svelte2tsx/test/sourcemaps/samples/await-block/mappings.jsx @@ -1,5 +1,5 @@ /// -;function render() { {/** +;function $$render() { {/** ------------------------------------------------------------------------------------------------------------------------------------------------------ */} async () => { { const $$_value = await (promise);{ const value = $$_value; {/** ============# Originless mappings @@ -148,5 +148,5 @@ await•( [generated] subset ------------------------------------------------------------------------------------------------------------------------------------------------------ */} return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx index e19b69c73..c4a301de5 100644 --- a/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx +++ b/packages/svelte2tsx/test/sourcemaps/samples/component-props/mappings.jsx @@ -1,5 +1,5 @@ /// -;function render() { {/** +;function $$render() { {/** ------------------------------------------------------------------------------------------------------------------------------------------------------ */} async () => { { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: {"foo":true,}});}{/** ============# Originless mappings @@ -110,5 +110,5 @@ async•()•=>•{••{•const•$$_tnenopmoC0C•=•__sveltets_2_ensureCom ------------------------------------------------------------------------------------------------------------------------------------------------------ */} return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx index 7e934b571..c76fd6137 100644 --- a/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx +++ b/packages/svelte2tsx/test/sourcemaps/samples/each-block/mappings.jsx @@ -1,5 +1,5 @@ /// -;function render() { {/** +;function $$render() { {/** ------------------------------------------------------------------------------------------------------------------------------------------------------ */} async () => { for(let item of __sveltets_2_ensureArray(items)){ {/** ============# Originless mappings @@ -152,5 +152,5 @@ async•()•=>•{••for(let•item•of•__sveltets_2_ensureArray(items)){ }; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx index f6aa46383..0ff7ce0f0 100644 --- a/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx +++ b/packages/svelte2tsx/test/sourcemaps/samples/element-attributes/mappings.jsx @@ -1,5 +1,5 @@ /// -;function render() { {/** +;function $$render() { {/** ------------------------------------------------------------------------------------------------------------------------------------------------------ */} async () => { { svelteHTML.createElement("element", {"foo":true,});} {/** ============# Originless mappings @@ -155,5 +155,5 @@ async•()•=>•{•{•svelteHTML.createElement("element",•{"foo":true,});} ------------------------------------------------------------------------------------------------------------------------------------------------------ */} return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx index 3c627419d..b6d364930 100644 --- a/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx +++ b/packages/svelte2tsx/test/sourcemaps/samples/event-binding/mappings.jsx @@ -1,5 +1,5 @@ /// -;function render() { {/** +;function $$render() { {/** ------------------------------------------------------------------------------------------------------------------------------------------------------ */} async () => { { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});$$_tnenopmoC0.$on("click", $check ? method1 : method2);}{/** ============# Originless mappings @@ -18,5 +18,5 @@ async•()•=>•{•{•const•$$_tnenopmoC0C•=•__sveltets_2_ensureCompon ------------------------------------------------------------------------------------------------------------------------------------------------------ */} return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx index f76cef7ba..7b28ab33a 100644 --- a/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx +++ b/packages/svelte2tsx/test/sourcemaps/samples/if-block/mappings.jsx @@ -1,5 +1,5 @@ /// -;function render() { {/** +;function $$render() { {/** ------------------------------------------------------------------------------------------------------------------------------------------------------ */} async () => {if(foo){ {/** ============# Originless mappings @@ -79,5 +79,5 @@ if(foo){↲ [generated] line 9 ------------------------------------------------------------------------------------------------------------------------------------------------------ */} return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/sourcemaps/samples/import-equal/mappings.jsx b/packages/svelte2tsx/test/sourcemaps/samples/import-equal/mappings.jsx index e1548fcb1..99a2dca06 100644 --- a/packages/svelte2tsx/test/sourcemaps/samples/import-equal/mappings.jsx +++ b/packages/svelte2tsx/test/sourcemaps/samples/import-equal/mappings.jsx @@ -1,9 +1,9 @@ /// //---------------------------------------------------------------------------------------------------------------------------------------------------- -;function render() { {/** -;function•render()•{↲ [generated] line 2 +;function $$render() { {/** +;function•$$render()•{↲ [generated] line 2 ↲ [original] line 1 (rest generated at line 3) + + +{id} {props} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-not-$props-init.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-not-$props-init.v5/expectedv2.ts new file mode 100644 index 000000000..4ca5bbfd3 --- /dev/null +++ b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-not-$props-init.v5/expectedv2.ts @@ -0,0 +1,13 @@ +/// +;function $$render() { + + let props = {}/*Ωignore_startΩ*/;let $props = __sveltets_2_store_get(props);/*Ωignore_endΩ*/; + let id = $props.id(); +; +async () => { + +id; props;}; +return { props: /** @type {Record} */ ({}), exports: {}, bindings: "", slots: {}, events: {} }} +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))); +/*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; +/*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-not-$props-init.v5/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-not-$props-init.v5/input.svelte new file mode 100644 index 000000000..bbda4b80b --- /dev/null +++ b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-not-$props-init.v5/input.svelte @@ -0,0 +1,6 @@ + + +{id} {props} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-spread.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-spread.v5/expectedv2.ts new file mode 100644 index 000000000..7016df35d --- /dev/null +++ b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-spread.v5/expectedv2.ts @@ -0,0 +1,13 @@ +/// +;function $$render() { + + let/** @typedef {Record} $$ComponentProps *//** @type {$$ComponentProps} */ {...props} = $props(); + let id = $props.id(); +; +async () => { + +id; props;}; +return { props: /** @type {$$ComponentProps} */({}), exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); +type Input__SvelteComponent_ = ReturnType; +export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-spread.v5/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-spread.v5/input.svelte new file mode 100644 index 000000000..754e52c42 --- /dev/null +++ b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id-spread.v5/input.svelte @@ -0,0 +1,6 @@ + + +{id} {props} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id.v5/expectedv2.ts new file mode 100644 index 000000000..c897e5063 --- /dev/null +++ b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id.v5/expectedv2.ts @@ -0,0 +1,13 @@ +/// +;function $$render() { + + let props = $props(); + let id = $props.id(); +; +async () => { + +id; props;}; +return { props: /** @type {$$ComponentProps} */({}), exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); +type Input__SvelteComponent_ = ReturnType; +export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id.v5/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id.v5/input.svelte new file mode 100644 index 000000000..8a93516e4 --- /dev/null +++ b/packages/svelte2tsx/test/svelte2tsx/samples/props-variable-and-$props.id.v5/input.svelte @@ -0,0 +1,6 @@ + + +{id} {props} diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expectedv2.ts index 9d1178389..de1166ee1 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-$store-destructuring/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let { count } = __sveltets_2_invalidate(() => $data); let { count2 } = __sveltets_2_invalidate(() => $data) @@ -20,5 +20,5 @@ $: ([ bla4, bla5 ] = __sveltets_2_invalidate(() => $data)) async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-assignment-type-cast/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-assignment-type-cast/expectedv2.ts index 2e67aafbd..fa1e06cc5 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-assignment-type-cast/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-assignment-type-cast/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { type Team = any; let team = __sveltets_2_invalidate(() => ({ search: "Real", players: [] } as Team)); @@ -7,5 +7,5 @@ async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expectedv2.ts index f1b68ad9d..8aa75fc15 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-block/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let a: 1 | 2 = 1; ;() => {$: { @@ -9,5 +9,5 @@ let a: 1 | 2 = 1; async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expectedv2.ts index efd37dd9a..34de7bc8b 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-break-$/expectedv2.ts @@ -1,10 +1,10 @@ /// -;function render() { +;function $$render() { ;() => {$: { break $; }} ; async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-destructuring/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-destructuring/expectedv2.ts index 9f809fe47..17708a1a2 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-destructuring/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-destructuring/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let { a } = __sveltets_2_invalidate(() => ({ a: '' })); let { b: d } = __sveltets_2_invalidate(() => ({ b: '' })); @@ -11,5 +11,5 @@ let { b: g = 1} = __sveltets_2_invalidate(() => ({ b: 1 })); async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-express-starts-with-object/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-express-starts-with-object/expectedv2.ts index 6dfb5b477..c47838205 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-express-starts-with-object/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-express-starts-with-object/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let b = __sveltets_2_invalidate(() => ({ a: 1 }['a'])); @@ -11,5 +11,5 @@ let f = __sveltets_2_invalidate(() => ({a: 1}[c] ? '' : '1')); async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expectedv2.ts index 77000da7d..2b94c6e8c 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-object/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let b = __sveltets_2_invalidate(() => ({ a: 1 })); @@ -7,5 +7,5 @@ let b = __sveltets_2_invalidate(() => ({ a: 1 })); async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-function-parameter/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-function-parameter/expectedv2.ts index 2cedf21fa..3184f68e8 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-function-parameter/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-function-parameter/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { const a = function (shadowed1) {} const b = (shadowed2) => {} @@ -14,5 +14,5 @@ let shadowed4 = __sveltets_2_invalidate(() => 1) async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-import/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-import/expectedv2.ts index 04130cabb..12acffdf3 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-import/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare-same-name-as-import/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import { b as c } from "foo"; -function render() { +function $$render() { let b = __sveltets_2_invalidate(() => 7); @@ -12,5 +12,5 @@ $: a = __sveltets_2_invalidate(() => 5); async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expectedv2.ts index 90a681e7d..03a8e0d66 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-declare/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let b = __sveltets_2_invalidate(() => 7); @@ -10,5 +10,5 @@ $: a = __sveltets_2_invalidate(() => 5); async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-statements-store/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-statements-store/expectedv2.ts index cc66d565d..571d86632 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-statements-store/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-statements-store/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { const uid = readable('')/*Ωignore_startΩ*/;let $uid = __sveltets_2_store_get(uid);/*Ωignore_endΩ*/ let foo1 = __sveltets_2_invalidate(() => getFoo1($uid));/*Ωignore_startΩ*/;let $foo1 = __sveltets_2_store_get(foo1);/*Ωignore_endΩ*/ @@ -17,5 +17,5 @@ async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expectedv2.ts index 838d48989..a43584b3d 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/reactive-store-set/expectedv2.ts @@ -1,10 +1,10 @@ /// -;function render() { +;function $$render() { $: $store = __sveltets_2_invalidate(() => $store + 1); ; async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports-runes.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports-runes.v5/expectedv2.ts index 5208d8a9b..c6cb7da3e 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports-runes.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports-runes.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let name = "world" let name2 = "world" @@ -9,6 +9,6 @@ async () => { { svelteHTML.createElement("svelte:options", {"runes":true,});} }; return { props: /** @type {Record} */ ({}), exports: /** @type {{name3: typeof name,name4: typeof name2}} */ ({}), bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expectedv2.ts index 3e8fcbec7..de36df6dc 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/renamed-exports/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let name = "world" let name2 = "world" @@ -8,5 +8,5 @@ async () => {}; return { props: {name3: name , name4: name2}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['name3','name4'], __sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['name3','name4'], __sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/runes-best-effort-types.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/runes-best-effort-types.v5/expectedv2.ts index 72cffb46c..7fc526271 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/runes-best-effort-types.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/runes-best-effort-types.v5/expectedv2.ts @@ -1,10 +1,10 @@ /// -;function render() { +;function $$render() { let/** @typedef {{ a: any, b?: boolean, c?: number, d?: string, e?: any, f?: Record, g?: typeof foo, h?: any[], i?: any, j?: any, k?: number, l?: Function }} $$ComponentProps *//** @type {$$ComponentProps} */ { a, b = true, c = 1, d = '', e = null, f = {}, g = foo, h = [], i = undefined, j = $bindable(), k = $bindable(1), l = () => {} } = $props(); ; async () => {}; return { props: /** @type {$$ComponentProps} */({}), exports: {}, bindings: __sveltets_$$bindings('j', 'k'), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/runes-bindable.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/runes-bindable.v5/expectedv2.ts index f392054d8..6824a2fc6 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/runes-bindable.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/runes-bindable.v5/expectedv2.ts @@ -1,10 +1,10 @@ /// -;function render() { +;function $$render() { let/** @typedef {{ a: any, b?: any }} $$ComponentProps *//** @type {$$ComponentProps} */ { a, b = $bindable() } = $props(); ; async () => {}; return { props: /** @type {$$ComponentProps} */({}), exports: {}, bindings: __sveltets_$$bindings('b'), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/runes-looking-like-stores.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/runes-looking-like-stores.v5/expectedv2.ts index 555322c0a..a61103f23 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/runes-looking-like-stores.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/runes-looking-like-stores.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let/** @typedef {{ props: any }} $$ComponentProps *//** @type {$$ComponentProps} */ { props } = $props(); let state = $state(0); @@ -9,6 +9,6 @@ async () => { state; derived;}; return { props: /** @type {$$ComponentProps} */({}), exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/runes-only-export.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/runes-only-export.v5/expectedv2.ts index 854ee6a94..d0224b7ce 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/runes-only-export.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/runes-only-export.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let x = $state(); function foo() { return true; } @@ -8,6 +8,6 @@ async () => { x;}; return { props: /** @type {Record} */ ({}), exports: /** @type {{foo: typeof foo}} */ ({}), bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/runes-with-slots.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/runes-with-slots.v5/expectedv2.ts index 776d92ced..e55cb1323 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/runes-with-slots.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/runes-with-slots.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { /** @type {SomeType} */ let { a, b } = $props(); @@ -11,6 +11,6 @@ async () => { { __sveltets_createSlot("default", { x,y,});}}; return { props: /** @type {SomeType} */({}), exports: {}, bindings: __sveltets_$$bindings(''), slots: {'default': {x:x, y:y}}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component_slots(__sveltets_2_with_any_event(render())); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component_slots(__sveltets_2_with_any_event($$render())); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/runes.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/runes.v5/expectedv2.ts index 06698e763..940a297c2 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/runes.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/runes.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { /** @typedef {{a: number, b: string}} $$ComponentProps *//** @type {$$ComponentProps} */ let { a, b } = $props(); @@ -8,6 +8,6 @@ ; async () => {}; return { props: /** @type {$$ComponentProps} */({}), exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-and-module-script/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/script-and-module-script/expectedv2.ts index 16688bc5e..355ef9ec3 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/script-and-module-script/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-and-module-script/expectedv2.ts @@ -2,7 +2,7 @@ ; export function preload() {} let b = 5; -;;function render() { +;;function $$render() { let world = "name" ; @@ -11,5 +11,5 @@ async () => { }; return { props: {world: world}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['world'], __sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['world'], __sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-in-rawhtml/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/script-in-rawhtml/expectedv2.ts index e1ff2325a..312db5bdf 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/script-in-rawhtml/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-in-rawhtml/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { const schema = { key: "value" @@ -10,5 +10,5 @@ async () => { ``;}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expectedv2.ts index 2dc466656..67711d7d8 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-inside-head-after-toplevel-script/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let b = 'top level'; ; @@ -17,5 +17,5 @@ async () => { { svelteHTML.createElement("div", {}); }}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expectedv2.ts index f8e247d73..20f4c445a 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-on-bottom/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let world = "name" ; @@ -7,5 +7,5 @@ async () => { { svelteHTML.createElement("h1", {}); world; } }; return { props: {world: world}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['world'], __sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['world'], __sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expected-svelte5.ts index 276e071cf..df3e6e1ba 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let Script, Style; ; @@ -10,6 +10,6 @@ async () => { Script} { const $$_elytS0C = __sveltets_2_ensureComponent(Style); new $$_elytS0C({ target: __sveltets_2_any(), props: {}});}}; return { props: /** @type {Record} */ ({}), exports: {}, bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event(render()))); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expectedv2.ts index eafe796d5..4a889991f 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-style-like-component/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let Script, Style; ; @@ -11,5 +11,5 @@ async () => { { const $$_elytS0C = __sveltets_2_ensureComponent(Style); new $$_elytS0C({ target: __sveltets_2_any(), props: {}});}}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/script-with-src/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/script-with-src/expectedv2.ts index 340e83b24..62f7817b0 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/script-with-src/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/script-with-src/expectedv2.ts @@ -1,9 +1,9 @@ /// -;function render() { +;function $$render() { ; async () => { }; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expectedv2.ts index 50f161762..b28e15a94 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/self-closing-component/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import Test from './Test.svelte'; -function render() { +function $$render() { let a = 'b'; @@ -10,5 +10,5 @@ async () => { { const $$_tseT0C = __sveltets_2_ensureComponent(Test); new $$_tse }; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expectedv2.ts index de6b58a91..542b9cf3d 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/single-element/expectedv2.ts @@ -1,7 +1,7 @@ /// -;function render() { +;function $$render() { async () => { { svelteHTML.createElement("h1", {}); }}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expectedv2.ts index 249c77d9d..e75c35dfd 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/single-export/expectedv2.ts @@ -1,10 +1,10 @@ /// -;function render() { +;function $$render() { let name = "world" ; async () => {}; return { props: {name: name}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['name'], __sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['name'], __sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expectedv2.ts index 26a0a2530..be6c8d2c9 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/slot-bind-this/expectedv2.ts @@ -1,8 +1,8 @@ /// -;function render() { +;function $$render() { /*Ωignore_startΩ*/;const __sveltets_createSlot = __sveltets_2_createCreateSlot();/*Ωignore_endΩ*/ async () => { { const $$_slot0 = __sveltets_createSlot("s", { });s = $$_slot0;}}; return { props: /** @type {Record} */ ({}), slots: {'s': {}}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-instance-script.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-instance-script.v5/expectedv2.ts index 106c29183..2c6a56df5 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-instance-script.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-instance-script.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { const bar/*Ωignore_positionΩ*/ = ()/*Ωignore_startΩ*/: ReturnType/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => { foo; };return __sveltets_2_any(0)}; let foo = true; @@ -9,6 +9,6 @@ async () => { }; return { props: /** @type {Record} */ ({}), exports: {}, bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event(render()))); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-1.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-1.v5/expectedv2.ts index 0c2610728..74da5fc1b 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-1.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-1.v5/expectedv2.ts @@ -23,7 +23,7 @@ import { imported } from './x'; };return __sveltets_2_any(0)}; const hoistable9/*Ωignore_positionΩ*/ = (props: HTMLAttributes)/*Ωignore_startΩ*/: ReturnType/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => { };return __sveltets_2_any(0)}; const hoistable10/*Ωignore_positionΩ*/ = (foo)/*Ωignore_startΩ*/: ReturnType/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => { const bar = foo; bar; -};return __sveltets_2_any(0)};function render() { +};return __sveltets_2_any(0)};function $$render() { const not_hoistable/*Ωignore_positionΩ*/ = ()/*Ωignore_startΩ*/: ReturnType/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => { { svelteHTML.createElement("div", {});foo; } };return __sveltets_2_any(0)}; @@ -56,6 +56,6 @@ async () => { }; return { props: /** @type {Record} */ ({}), exports: {}, bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event(render()))); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-2.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-2.v5/expectedv2.ts index 90505a1e5..1dbe9f153 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-2.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-2.v5/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import { imported } from './x'; -function render() { +function $$render() { const hoistable/*Ωignore_positionΩ*/ = ()/*Ωignore_startΩ*/: ReturnType/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => { { svelteHTML.createElement("div", {}); } };return __sveltets_2_any(0)}; const not_hoistable/*Ωignore_positionΩ*/ = ()/*Ωignore_startΩ*/: ReturnType/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => { @@ -16,6 +16,6 @@ async () => { }; return { props: /** @type {Record} */ ({}), exports: {}, bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event(render()))); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-3.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-3.v5/expectedv2.ts index a48aa0ae9..67a5d3f9d 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-3.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-3.v5/expectedv2.ts @@ -5,13 +5,13 @@ { svelteHTML.createElement("div", {}); } };return __sveltets_2_any(0)}; const hoistable2/*Ωignore_positionΩ*/ = ()/*Ωignore_startΩ*/: ReturnType/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => { { svelteHTML.createElement("div", {});foo; } -};return __sveltets_2_any(0)};;function render() { +};return __sveltets_2_any(0)};;function $$render() { async () => { }; return { props: /** @type {Record} */ ({}), exports: {}, bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event(render()))); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-4.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-4.v5/expectedv2.ts new file mode 100644 index 000000000..6340d572d --- /dev/null +++ b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-4.v5/expectedv2.ts @@ -0,0 +1,30 @@ +/// +; + +;; const hoistable/*Ωignore_positionΩ*/ = ()/*Ωignore_startΩ*/: ReturnType/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => { + { svelteHTML.createElement("h1", {}); } +};return __sveltets_2_any(0)};function $$render() { + const chain/*Ωignore_positionΩ*/ = ()/*Ωignore_startΩ*/: ReturnType/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => { + { svelteHTML.createElement("div", {});foo; } +};return __sveltets_2_any(0)}; const chain2/*Ωignore_positionΩ*/ = ()/*Ωignore_startΩ*/: ReturnType/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => { + ;__sveltets_2_ensureSnippet(chain()); +};return __sveltets_2_any(0)}; const chain3/*Ωignore_positionΩ*/ = ()/*Ωignore_startΩ*/: ReturnType/*Ωignore_endΩ*/ => { async ()/*Ωignore_positionΩ*/ => { + ;__sveltets_2_ensureSnippet(chain2()); +};return __sveltets_2_any(0)}; + let foo = true; +; +async () => { + + + + + + + + + +}; +return { props: /** @type {Record} */ ({}), exports: {}, bindings: "", slots: {}, events: {} }} +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))); +/*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; +/*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-4.v5/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-4.v5/input.svelte new file mode 100644 index 000000000..e1c049400 --- /dev/null +++ b/packages/svelte2tsx/test/svelte2tsx/samples/snippet-module-hoist-4.v5/input.svelte @@ -0,0 +1,23 @@ + + + + +{#snippet chain()} +
{foo}
+{/snippet} + +{#snippet chain2()} + {@render chain()} +{/snippet} + +{#snippet chain3()} + {@render chain2()} +{/snippet} + +{#snippet hoistable()} +

hoist me

+{/snippet} \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expectedv2.ts index d4c6bcc42..157c41de1 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-destructuring/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { const store = fromSomewhere()/*Ωignore_startΩ*/;let $store = __sveltets_2_store_get(store);/*Ωignore_endΩ*/; const { store1, store2, noStore } = fromSomewhere()/*Ωignore_startΩ*/;let $store1 = __sveltets_2_store_get(store1);;let $store2 = __sveltets_2_store_get(store2);/*Ωignore_endΩ*/; @@ -13,5 +13,5 @@ async () => { { svelteHTML.createElement("p", {});$store4; }}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expectedv2.ts index 9fa4a010c..9baf7831c 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-module/expectedv2.ts @@ -3,7 +3,7 @@ import {store1, store2} from './store'; const store3 = writable('')/*Ωignore_startΩ*/;let $store3 = __sveltets_2_store_get(store3);/*Ωignore_endΩ*/; const store4 = writable('')/*Ωignore_startΩ*/;let $store4 = __sveltets_2_store_get(store4);/*Ωignore_endΩ*/; -;;function render() { +;;function $$render() { /*Ωignore_startΩ*/;let $store1 = __sveltets_2_store_get(store1);;let $store2 = __sveltets_2_store_get(store2);/*Ωignore_endΩ*/ $store1; $store3; @@ -16,5 +16,5 @@ async () => { { svelteHTML.createElement("p", {});$store4; }}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-reactive-assignment/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-reactive-assignment/expectedv2.ts index c8d13a1f4..1b0568f64 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/store-from-reactive-assignment/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-from-reactive-assignment/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let store = __sveltets_2_invalidate(() => fromSomewhere());/*Ωignore_startΩ*/;let $store = __sveltets_2_store_get(store);/*Ωignore_endΩ*/ let { store1, noStore } = __sveltets_2_invalidate(() => fromSomewhere());/*Ωignore_startΩ*/;let $store1 = __sveltets_2_store_get(store1);/*Ωignore_endΩ*/ @@ -11,5 +11,5 @@ async () => { { svelteHTML.createElement("p", {});$store2; }}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expectedv2.ts index 705c65d77..2d28bafa9 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-import/expectedv2.ts @@ -3,7 +3,7 @@ import storeA from './store'; import { storeB } from './store'; import { storeB as storeC } from './store'; -function render() { +function $$render() { /*Ωignore_startΩ*/;let $storeA = __sveltets_2_store_get(storeA);;let $storeB = __sveltets_2_store_get(storeB);;let $storeC = __sveltets_2_store_get(storeC);/*Ωignore_endΩ*/ @@ -16,5 +16,5 @@ async () => { { svelteHTML.createElement("p", {});$storeC; }}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expectedv2.ts index 5b55bcb6f..e87dc2269 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/store-property-access/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { const store = someStore()/*Ωignore_startΩ*/;let $store = __sveltets_2_store_get(store);/*Ωignore_endΩ*/; $store; @@ -24,5 +24,5 @@ async () => { { svelteHTML.createElement("p", {});$store?.prop?.anotherProp; }}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/stores-looking-like-runes/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/stores-looking-like-runes/expectedv2.ts index 847615f9a..d25830c19 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/stores-looking-like-runes/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/stores-looking-like-runes/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { const props = null/*Ωignore_startΩ*/;let $props = __sveltets_2_store_get(props);/*Ωignore_endΩ*/; $props; @@ -13,5 +13,5 @@ async () => { state; derived;}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expectedv2.ts index 2a62b80c8..cc9d200c7 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/stores-mustache/expectedv2.ts @@ -1,7 +1,7 @@ /// -;function render() { +;function $$render() { async () => { { const $$_eM0C = __sveltets_2_ensureComponent(Me); new $$_eM0C({ target: __sveltets_2_any(), props: { "f":`${$s} `,}});}}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style-after-selfclosing-iframe/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/style-after-selfclosing-iframe/expectedv2.ts index ff48fbc26..58db7d3c1 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/style-after-selfclosing-iframe/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-after-selfclosing-iframe/expectedv2.ts @@ -1,8 +1,8 @@ /// -;function render() { +;function $$render() { async () => { { svelteHTML.createElement("iframe", {"src":"",});} }; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expectedv2.ts index 714e2132e..20ac31551 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute-bare/expectedv2.ts @@ -1,10 +1,10 @@ /// -;function render() { +;function $$render() { async () => { true === true;}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expectedv2.ts index 7e13e098a..cb021cbac 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-attribute/expectedv2.ts @@ -1,7 +1,7 @@ /// -;function render() { +;function $$render() { async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style-in-script/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/style-in-script/expectedv2.ts index e7485e718..643347b4d 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/style-in-script/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/style-in-script/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { const config = { branding: { primaryColor: '#012345' } }, branding = config?.branding; @@ -11,5 +11,5 @@ async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/style/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/style/expectedv2.ts index 7e13e098a..cb021cbac 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/style/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/style/expectedv2.ts @@ -1,7 +1,7 @@ /// -;function render() { +;function $$render() { async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/expectedv2.ts index e7a454dc5..9c14cf7c9 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/svelte-element/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let tag = 'div'; ; @@ -13,5 +13,5 @@ async () => { { svelteHTML.createElement('a', { "data-sveltekit-preload-data":true,"href":`https://kit.svelte.dev`,});}}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/svelte-self-forward-event/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/svelte-self-forward-event/expectedv2.ts index c85a3eb7b..a80196962 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/svelte-self-forward-event/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/svelte-self-forward-event/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import { createEventDispatcher } from "svelte"; -function render() { +function $$render() { @@ -19,5 +19,5 @@ return { props: /** @type {Record} */ ({}), slots: {}, events: {. foo: string }>()} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes-$props-rune-no-changes.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes-$props-rune-no-changes.v5/expectedv2.ts index 5e21dd042..a004f3084 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes-$props-rune-no-changes.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes-$props-rune-no-changes.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { /** @typedef {{form: boolean, data: true }} $$ComponentProps *//** @type {$$ComponentProps} */ let { form, data } = $props(); @@ -8,6 +8,6 @@ ; async () => {}; return { props: /** @type {$$ComponentProps} */({}), exports: /** @type {{snapshot: typeof snapshot}} */ ({}), bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Page__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Page__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Page__SvelteComponent_ = ReturnType; export default Page__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes-$props-rune.v5/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes-$props-rune.v5/expected-svelte5.ts index b5014a5d2..68660ef9f 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes-$props-rune.v5/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes-$props-rune.v5/expected-svelte5.ts @@ -1,11 +1,11 @@ /// -;function render() { +;function $$render() { let/** @typedef {{ form: import('./$types.js').ActionData, data: import('./$types.js').PageData }} $$ComponentProps *//** @type {$$ComponentProps} */ { form, data } = $props(); const snapshot/*Ωignore_startΩ*/: import('./$types.js').Snapshot/*Ωignore_endΩ*/ = {}; ; async () => {}; return { props: /** @type {$$ComponentProps} */({}), exports: /** @type {{snapshot: typeof snapshot}} */ ({}), bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Page__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_with_any_event(render())); +const Page__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_with_any_event($$render())); /*Ωignore_startΩ*/type Page__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Page__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes-$props-rune.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes-$props-rune.v5/expectedv2.ts index b88689f8f..57c83fd0b 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes-$props-rune.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes-$props-rune.v5/expectedv2.ts @@ -1,11 +1,11 @@ /// -;function render() { +;function $$render() { let/** @typedef {{ form: import('./$types.js').ActionData, data: import('./$types.js').PageData }} $$ComponentProps *//** @type {$$ComponentProps} */ { form, data } = $props(); const snapshot/*Ωignore_startΩ*/: import('./$types.js').Snapshot/*Ωignore_endΩ*/ = {}; ; async () => {}; return { props: /** @type {$$ComponentProps} */({}), exports: /** @type {{snapshot: typeof snapshot}} */ ({}), bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Page__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Page__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Page__SvelteComponent_ = ReturnType; export default Page__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes/expected-svelte5.ts index 6d7411185..053e4b80b 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let data/*Ωignore_startΩ*/: import('./$types.js').PageData;data = __sveltets_2_any(data);/*Ωignore_endΩ*/; let form/*Ωignore_startΩ*/: import('./$types.js').ActionData;form = __sveltets_2_any(form);/*Ωignore_endΩ*/; @@ -11,6 +11,6 @@ ; async () => {}; return { props: {data: data , form: form , snapshot: snapshot , nope: nope}, exports: /** @type {{snapshot: typeof snapshot}} */ ({}), bindings: "", slots: {}, events: {} }} -const Page__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(['form','snapshot'], __sveltets_2_with_any_event(render()))); +const Page__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(['form','snapshot'], __sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Page__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Page__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes/expectedv2.ts index d5fab74b9..45349f3b3 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/sveltekit-autotypes/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let data/*Ωignore_startΩ*/: import('./$types.js').PageData;data = __sveltets_2_any(data);/*Ωignore_endΩ*/; let form/*Ωignore_startΩ*/: import('./$types.js').ActionData;form = __sveltets_2_any(form);/*Ωignore_endΩ*/; @@ -12,6 +12,6 @@ async () => {}; return { props: {data: data , form: form , snapshot: snapshot , nope: nope}, slots: {}, events: {} }} -export default class Page__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['form','snapshot'], __sveltets_2_with_any_event(render()))) { +export default class Page__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['form','snapshot'], __sveltets_2_with_any_event($$render()))) { get snapshot() { return __sveltets_2_nonNullable(this.$$prop_def.snapshot) } } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/transforms-interfaces-dts/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/transforms-interfaces-dts/expected-svelte5.ts index 2cc91a067..d8fa30703 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/transforms-interfaces-dts/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/transforms-interfaces-dts/expected-svelte5.ts @@ -2,7 +2,7 @@ import { SvelteComponentTyped } from "svelte" ; import type { Foo } from './foo'; -function render() { +function $$render() { let foo: Foo/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/; @@ -31,6 +31,6 @@ interface $$__sveltets_2_IsomorphicComponent = declare function $$__sveltets_2_isomorphic_component< Props extends Record, Events extends Record, Slots extends Record, Exports extends Record, Bindings extends string >(klass: {props: Props, events: Events, slots: Slots, exports?: Exports, bindings?: Bindings }): $$__sveltets_2_IsomorphicComponent; -const Input = $$__sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event(render()))); +const Input = $$__sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input = InstanceType; /*Ωignore_endΩ*/export default Input; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/transforms-interfaces-dts/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/transforms-interfaces-dts/expectedv2.ts index 53829f7df..fc525148a 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/transforms-interfaces-dts/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/transforms-interfaces-dts/expectedv2.ts @@ -2,7 +2,7 @@ import { SvelteComponentTyped } from "svelte" ; import type { Foo } from './foo'; -function render() { +function $$render() { let foo: Foo/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/; @@ -22,10 +22,10 @@ function render() { ; async () => {}; return { props: {foo: foo , bar: bar}, slots: {}, events: {} }} -const __propDef = __sveltets_2_partial(__sveltets_2_with_any_event(render())); +const __propDef = __sveltets_2_partial(__sveltets_2_with_any_event($$render())); /** @typedef {typeof __propDef.props} InputProps */ /** @typedef {typeof __propDef.events} InputEvents */ /** @typedef {typeof __propDef.slots} InputSlots */ -export default class Input extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface-only-props/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface-only-props/expectedv2.ts index 74560eaac..ee32bcd5c 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface-only-props/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface-only-props/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { type $$Props = { exported1: string; @@ -13,5 +13,5 @@ async () => {}; return { props: { ...__sveltets_2_ensureRightProps<{}>(__sveltets_2_any("") as $$Props)} as $$Props, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface/expected-svelte5.ts index ef44cd600..656e23042 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { type $$Props = { @@ -32,6 +32,6 @@ ; async () => {}; return { props: { ...__sveltets_2_ensureRightProps<{exported1: string,exported2?: string,name1?: string,name2: string,renamed1?: string,renamed2: string}>(__sveltets_2_any("") as $$Props)} as {Foo?: typeof Foo,bar?: typeof bar,baz?: string,RenamedFoo?: typeof RenameFoo,renamedbar?: typeof renamebar,renamedbaz?: string} & $$Props, exports: {} as any as { Foo: typeof Foo,bar: typeof bar,baz: string,RenamedFoo: typeof RenameFoo,renamedbar: typeof renamebar,renamedbaz: string }, bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_with_any_event(render())); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_with_any_event($$render())); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface/expectedv2.ts index 024668f3d..ff5fb78a3 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-interface/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { type $$Props = { @@ -33,5 +33,5 @@ async () => {}; return { props: { ...__sveltets_2_ensureRightProps<{exported1: string,exported2?: string,name1?: string,name2: string,renamed1?: string,renamed2: string}>(__sveltets_2_any("") as $$Props)} as {Foo?: typeof Foo,bar?: typeof bar,baz?: string,RenamedFoo?: typeof RenameFoo,renamedbar?: typeof renamebar,renamedbaz?: string} & $$Props, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-type/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-type/expected-svelte5.ts index ee27ee843..799f41dbe 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-type/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-type/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { interface $$Props { @@ -32,6 +32,6 @@ ; async () => {}; return { props: { ...__sveltets_2_ensureRightProps<{exported1: string,exported2?: string,name1?: string,name2: string,renamed1?: string,renamed2: string}>(__sveltets_2_any("") as $$Props)} as {Foo?: typeof Foo,bar?: typeof bar,baz?: string,RenamedFoo?: typeof RenameFoo,renamedbar?: typeof renamebar,renamedbaz?: string} & $$Props, exports: {} as any as { Foo: typeof Foo,bar: typeof bar,baz: string,RenamedFoo: typeof RenameFoo,renamedbar: typeof renamebar,renamedbaz: string }, bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_with_any_event(render())); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_with_any_event($$render())); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-type/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-type/expectedv2.ts index 3a24ccebc..658a67ff6 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-type/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-type/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { interface $$Props { @@ -33,5 +33,5 @@ async () => {}; return { props: { ...__sveltets_2_ensureRightProps<{exported1: string,exported2?: string,name1?: string,name2: string,renamed1?: string,renamed2: string}>(__sveltets_2_any("") as $$Props)} as {Foo?: typeof Foo,bar?: typeof bar,baz?: string,RenamedFoo?: typeof RenameFoo,renamedbar?: typeof renamebar,renamedbaz?: string} & $$Props, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-with-$$props/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-with-$$props/expected-svelte5.ts index 5c2f23a16..05f8846d4 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-with-$$props/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-with-$$props/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { let $$props = __sveltets_2_allPropsType(); +;function $$render() { let $$props = __sveltets_2_allPropsType(); interface $$Props { /** @@ -14,6 +14,6 @@ async () => { $$props;}; return { props: { ...__sveltets_2_ensureRightProps<{}>(__sveltets_2_any("") as $$Props)} as {c?: typeof c} & $$Props, exports: {} as any as { c: typeof c }, bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_with_any_event(render())); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_with_any_event($$render())); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-with-$$props/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-with-$$props/expectedv2.ts index ad01f24cd..d2781d146 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-with-$$props/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-with-$$props/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { let $$props = __sveltets_2_allPropsType(); +;function $$render() { let $$props = __sveltets_2_allPropsType(); interface $$Props { /** @@ -15,6 +15,6 @@ async () => { $$props;}; return { props: { ...__sveltets_2_ensureRightProps<{}>(__sveltets_2_any("") as $$Props)} as {c?: typeof c} & $$Props, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { get c() { return __sveltets_2_nonNullable(this.$$prop_def.c) } } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor-dts/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor-dts/expected-svelte5.ts index f896140ed..101915ff9 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor-dts/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor-dts/expected-svelte5.ts @@ -1,6 +1,6 @@ import { SvelteComponentTyped } from "svelte" -;function render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { +;function $$render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { @@ -12,16 +12,16 @@ async () => { return { props: {a: a} as {a: A}, exports: {} as any as { a: A }, bindings: "", slots: {}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } bindings() { return ""; } - exports() { return render().exports; } + exports() { return $$render().exports; } } interface $$IsomorphicComponent { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor-dts/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor-dts/expectedv2.ts index c9d011b2f..5b9d4f727 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor-dts/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor-dts/expectedv2.ts @@ -1,6 +1,6 @@ import { SvelteComponentTyped } from "svelte" -;function render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { +;function $$render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { @@ -12,13 +12,13 @@ async () => { return { props: {a: a} as {a: A}, slots: {}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } } export type InputProps = ReturnType<__sveltets_Render['props']>; diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor/expected-svelte5.ts index 8ecc14758..d07b8705d 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { +;function $$render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { @@ -11,16 +11,16 @@ async () => { return { props: {a: a} as {a: A}, exports: {} as any as { a: A }, bindings: "", slots: {}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } bindings() { return ""; } - exports() { return render().exports; } + exports() { return $$render().exports; } } interface $$IsomorphicComponent { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor/expectedv2.ts index 4e67c97e4..13fb382d4 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-accessor/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { +;function $$render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { @@ -11,13 +11,13 @@ async () => { return { props: {a: a} as {a: A}, slots: {}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expected-svelte5.ts index 87da535f7..03d7a4675 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expected-svelte5.ts @@ -2,7 +2,7 @@ import { SvelteComponentTyped } from "svelte" ; import { createEventDispatcher } from 'svelte'; -function render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { +function $$render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { @@ -26,16 +26,16 @@ async () => { return { props: {a: a , b: b , c: c , getA: getA} as {a: A, b: B, c: C, getA?: typeof getA}, exports: {} as any as { getA: typeof getA }, bindings: "", slots: {'default': {c:c}}, events: {...__sveltets_2_toEventTypings<{a: A}>()} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } bindings() { return ""; } - exports() { return render().exports; } + exports() { return $$render().exports; } } interface $$IsomorphicComponent { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expectedv2.ts index 221fa6a8d..b36a5ee37 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expectedv2.ts @@ -2,7 +2,7 @@ import { SvelteComponentTyped } from "svelte" ; import { createEventDispatcher } from 'svelte'; -function render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { +function $$render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { @@ -26,13 +26,13 @@ async () => { return { props: {a: a , b: b , c: c , getA: getA} as {a: A, b: B, c: C, getA?: typeof getA}, slots: {'default': {c:c}}, events: {...__sveltets_2_toEventTypings<{a: A}>()} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } } export type InputProps = ReturnType<__sveltets_Render['props']>; diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-interface-references/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-interface-references/expected-svelte5.ts index 199ab21c7..6ed516f78 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-interface-references/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-interface-references/expected-svelte5.ts @@ -5,7 +5,7 @@ interface ReferencedByGeneric { b: true; f: Foo; } -function render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { +function $$render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { interface ReferencesGeneric { @@ -23,13 +23,13 @@ async () => {}; return { props: {a: a , b: b} as {a: ReferencesGeneric, b: B}, exports: {}, bindings: "", slots: {}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } bindings() { return ""; } exports() { return {}; } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-interface-references/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-interface-references/expectedv2.ts index 5d63bc95e..ee3d3e3b3 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-interface-references/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-interface-references/expectedv2.ts @@ -5,7 +5,7 @@ interface ReferencedByGeneric { b: true; f: Foo; } -function render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { +function $$render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { interface ReferencesGeneric { @@ -23,13 +23,13 @@ async () => {}; return { props: {a: a , b: b} as {a: ReferencesGeneric, b: B}, slots: {}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expected-svelte5.ts index fd88a69e2..670e6c61d 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expected-svelte5.ts @@ -1,7 +1,7 @@ /// ; import { createEventDispatcher } from 'svelte'; -function render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { +function $$render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { @@ -26,16 +26,16 @@ async () => { return { props: {a: a , b: b , c: c , getA: getA} as {a: A, b: B, c: C, getA?: typeof getA}, exports: {} as any as { getA: typeof getA }, bindings: "", slots: {'default': {c:c}}, events: {...__sveltets_2_toEventTypings<{a: A}>()} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } bindings() { return ""; } - exports() { return render().exports; } + exports() { return $$render().exports; } } interface $$IsomorphicComponent { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expectedv2.ts index e08603058..37b759ad2 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import { createEventDispatcher } from 'svelte'; -function render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { +function $$render/*Ωignore_startΩ*//*Ωignore_endΩ*/() { @@ -26,13 +26,13 @@ async () => { return { props: {a: a , b: b , c: c , getA: getA} as {a: A, b: B, c: C, getA?: typeof getA}, slots: {'default': {c:c}}, events: {...__sveltets_2_toEventTypings<{a: A}>()} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expected-svelte5.ts index 8e2f675c3..8fd811ab7 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expected-svelte5.ts @@ -6,7 +6,7 @@ import { SvelteComponentTyped } from "svelte" import Bar from './bar'; import { createEventDispatcher } from 'svelte'; -function render() { +function $$render() { @@ -37,6 +37,6 @@ type $$__sveltets_2_PropsWithChildren = Props & declare function $$__sveltets_2_isomorphic_component_slots< Props extends Record, Events extends Record, Slots extends Record, Exports extends Record, Bindings extends string >(klass: {props: Props, events: Events, slots: Slots, exports?: Exports, bindings?: Bindings }): $$__sveltets_2_IsomorphicComponent<$$__sveltets_2_PropsWithChildren, Events, Slots, Exports, Bindings>; -const Input = $$__sveltets_2_isomorphic_component_slots(__sveltets_2_with_any_event(render())); +const Input = $$__sveltets_2_isomorphic_component_slots(__sveltets_2_with_any_event($$render())); /*Ωignore_startΩ*/type Input = InstanceType; /*Ωignore_endΩ*/export default Input; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expectedv2.ts index 075731345..0f6257a30 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-creates-dts/expectedv2.ts @@ -6,7 +6,7 @@ import { SvelteComponentTyped } from "svelte" import Bar from './bar'; import { createEventDispatcher } from 'svelte'; -function render() { +function $$render() { @@ -23,7 +23,7 @@ async () => { { svelteHTML.createElement("button", { "on:click":undefined,}); } { __sveltets_createSlot("default", {bar,}); }}; return { props: {bar: bar , foobar: foobar} as {bar: Bar, foobar?: typeof foobar}, slots: {'default': {bar:bar}}, events: {...__sveltets_2_toEventTypings<{swipe: string}>(), 'click':__sveltets_2_mapElementEvent('click')} }} -const __propDef = __sveltets_2_with_any_event(render()); +const __propDef = __sveltets_2_with_any_event($$render()); export type InputProps = typeof __propDef.props; export type InputEvents = typeof __propDef.events; export type InputSlots = typeof __propDef.slots; diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed-non-literal/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed-non-literal/expectedv2.ts index 7458f0642..ed685376a 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed-non-literal/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed-non-literal/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import { createEventDispatcher } from "svelte"; -function render() { +function $$render() { @@ -25,5 +25,5 @@ async () => { { svelteHTML.createElement("button", { "on:click":() => dispatch('btn', ''),}); }}; return { props: {} as Record, slots: {}, events: {...__sveltets_2_toEventTypings()} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed/expectedv2.ts index 31ef63ebf..a26e7c567 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatcher-typed/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import { createEventDispatcher, abc } from "svelte"; -function render() { +function $$render() { @@ -46,5 +46,5 @@ return { props: {} as Record, slots: {}, events: {...__sveltets_2 // not this btn: string;}>()} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers-same-event/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers-same-event/expectedv2.ts index c9d7c0e35..a8135889c 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers-same-event/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers-same-event/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import { createEventDispatcher, abc } from "svelte"; -function render() { +function $$render() { @@ -27,5 +27,5 @@ return { props: {} as Record, slots: {}, events: {...__sveltets_2 hi: boolean; }>(), ...__sveltets_2_toEventTypings<{hi: string;}>(), 'click':__sveltets_2_mapElementEvent('click'), 'hi': __sveltets_2_customEvent, 'bye': __sveltets_2_customEvent} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers/expectedv2.ts index 949192756..a4e2b4121 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-event-dispatchers/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import { createEventDispatcher, abc } from "svelte"; -function render() { +function $$render() { @@ -27,5 +27,5 @@ return { props: {} as Record, slots: {}, events: {...__sveltets_2 hi: boolean; }>(), ...__sveltets_2_toEventTypings<{btn: string;}>(), 'click':__sveltets_2_mapElementEvent('click'), 'bye': __sveltets_2_customEvent} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expectedv2.ts index 669e13319..4b215ff60 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-arrow-function/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let f = (a: number, b: number) => { let c = a + b; @@ -9,5 +9,5 @@ async () => {}; return { props: {f: f} as {f?: typeof f}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expectedv2.ts index 3109f4994..700d66204 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-boolean/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let bla = false/*Ωignore_startΩ*/;bla = __sveltets_2_any(bla);/*Ωignore_endΩ*/; let blubb = true/*Ωignore_startΩ*/;blubb = __sveltets_2_any(blubb);/*Ωignore_endΩ*/; @@ -10,5 +10,5 @@ async () => {}; return { props: {bla: bla , blubb: blubb , bla1: bla1 , blubb1: blubb1 , a1: a1 , a2: a2 , b1: b1 , b2: b2} as {bla?: typeof bla, blubb?: typeof blubb, bla1?: boolean, blubb1?: boolean, a1?: typeof a1, a2?: typeof a2, b1?: boolean, b2?: boolean}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected-svelte5.ts index c30d953ed..d909a109b 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expected-svelte5.ts @@ -1,11 +1,11 @@ /// -;function render() { +;function $$render() { const name: string = "world"; const SOME = 1, CONSTANT = 2; ; async () => {}; return { props: {name: name , SOME: SOME , CONSTANT: CONSTANT} as {name?: string, SOME?: typeof SOME, CONSTANT?: typeof CONSTANT}, exports: {} as any as { name: string,SOME: typeof SOME,CONSTANT: typeof CONSTANT }, bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_with_any_event(render())); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_with_any_event($$render())); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expectedv2.ts index 134fdf030..bf4edcb3c 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { const name: string = "world"; const SOME = 1, CONSTANT = 2; @@ -7,7 +7,7 @@ async () => {}; return { props: {name: name , SOME: SOME , CONSTANT: CONSTANT} as {name?: string, SOME?: typeof SOME, CONSTANT?: typeof CONSTANT}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { get name() { return __sveltets_2_nonNullable(this.$$prop_def.name) } get SOME() { return __sveltets_2_nonNullable(this.$$prop_def.SOME) } get CONSTANT() { return __sveltets_2_nonNullable(this.$$prop_def.CONSTANT) } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expectedv2.ts index ce077c522..9ae28c17b 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc-typedef/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { /** * @typedef {'FOO'} FOO @@ -18,5 +18,5 @@ return { props: { * */a: a}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expectedv2.ts index 43298cd07..6703f58b5 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-doc/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { /** * DOCS! @@ -23,5 +23,5 @@ return { props: {a: a , b: b , c: c , d: d} as { * MORE DOCS! */b?: typeof b, c: typeof c, d: typeof d}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expectedv2.ts index a5e37bdc3..86b61ca8f 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-initializer/expectedv2.ts @@ -1,10 +1,10 @@ /// -;function render() { +;function $$render() { let a = ''; ; async () => {}; return { props: {a: a} as {a?: typeof a}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expectedv2.ts index 95cf3d8ba..69a833151 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-has-type/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { interface A {} let a: A/*Ωignore_startΩ*/;a = __sveltets_2_any(a);/*Ωignore_endΩ*/; @@ -8,5 +8,5 @@ async () => {}; return { props: {a: a , b: b} as {a: A, b?: A}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expectedv2.ts index 251f219fe..18285155e 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-interface/expectedv2.ts @@ -1,9 +1,9 @@ /// ; export interface A {} -;;function render() { +;;function $$render() { async () => {}; return { props: {} as Record, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list-runes.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list-runes.v5/expectedv2.ts index 1a1d1cf83..4f1adc400 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list-runes.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list-runes.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let name1: string = "world"/*Ωignore_startΩ*/;name1 = __sveltets_2_any(name1);/*Ωignore_endΩ*/ let name2: string/*Ωignore_startΩ*/;name2 = __sveltets_2_any(name2);/*Ωignore_endΩ*/; @@ -21,6 +21,6 @@ async () => { { svelteHTML.createElement("svelte:options", {"runes":true,});} }; return { props: {} as Record, exports: {} as any as { name1: string,name2: string,name3: string,name4: string,renamed1: string,renamed2: string,Foo: typeof Foo,bar: typeof bar,baz: string,RenamedFoo: typeof RenameFoo,renamedbar: typeof renamebar,renamedbaz: string }, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list/expected-svelte5.ts index f264e2330..2090c18d9 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let name1: string = "world"/*Ωignore_startΩ*/;name1 = __sveltets_2_any(name1);/*Ωignore_endΩ*/ let name2: string/*Ωignore_startΩ*/;name2 = __sveltets_2_any(name2);/*Ωignore_endΩ*/; @@ -20,6 +20,6 @@ ; async () => {}; return { props: {name1: name1 , name2: name2 , name3: name3 , name4: name4 , renamed1: rename1 , renamed2: rename2 , Foo: Foo , bar: bar , baz: baz , RenamedFoo: RenameFoo , renamedbar: renamebar , renamedbaz: renamebaz} as {name1?: string, name2: string, name3?: string, name4: string, renamed1?: string, renamed2: string, Foo?: typeof Foo, bar?: typeof bar, baz?: string, RenamedFoo?: typeof RenameFoo, renamedbar?: typeof renamebar, renamedbaz?: string}, exports: {} as any as { Foo: typeof Foo,bar: typeof bar,baz: string,RenamedFoo: typeof RenameFoo,renamedbar: typeof renamebar,renamedbaz: string }, bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_with_any_event(render())); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_with_any_event($$render())); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list/expectedv2.ts index 88fc4e8d7..8b8bfc712 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-list/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let name1: string = "world"/*Ωignore_startΩ*/;name1 = __sveltets_2_any(name1);/*Ωignore_endΩ*/ let name2: string/*Ωignore_startΩ*/;name2 = __sveltets_2_any(name2);/*Ωignore_endΩ*/; @@ -21,5 +21,5 @@ async () => {}; return { props: {name1: name1 , name2: name2 , name3: name3 , name4: name4 , renamed1: rename1 , renamed2: rename2 , Foo: Foo , bar: bar , baz: baz , RenamedFoo: RenameFoo , renamedbar: renamebar , renamedbaz: renamebaz} as {name1?: string, name2: string, name3?: string, name4: string, renamed1?: string, renamed2: string, Foo?: typeof Foo, bar?: typeof bar, baz?: string, RenamedFoo?: typeof RenameFoo, renamedbar?: typeof renamebar, renamedbaz?: string}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/expectedv2.ts index 4738911f0..990c6f408 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-required-props/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let a: number/*Ωignore_startΩ*/;a = __sveltets_2_any(a);/*Ωignore_endΩ*/; let b: number | undefined/*Ωignore_startΩ*/;b = __sveltets_2_any(b);/*Ωignore_endΩ*/; @@ -8,5 +8,5 @@ async () => {}; return { props: {a: a , b: b , c: c} as {a: number, b: number | undefined, c?: number}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-function-type-scope/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-function-type-scope/expectedv2.ts index e2f14bf2f..285c618e2 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-function-type-scope/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-function-type-scope/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let callback: (id: string) => void; let callback2: {( id: string): void} @@ -11,5 +11,5 @@ async () => {}; return { props: {} as Record, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expected-svelte5.ts index 90ca76530..f4aefe187 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let items: T/*Ωignore_startΩ*/;items = __sveltets_2_any(items);/*Ωignore_endΩ*/; ; @@ -7,13 +7,13 @@ async () => {}; return { props: {items: items} as {items: T}, exports: {}, bindings: "", slots: {}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } bindings() { return ""; } exports() { return {}; } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expectedv2.ts index 59aa438d6..dbacf2890 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generic-attribute-const-modifier/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let items: T/*Ωignore_startΩ*/;items = __sveltets_2_any(items);/*Ωignore_endΩ*/; ; @@ -7,13 +7,13 @@ async () => {}; return { props: {items: items} as {items: T}, slots: {}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute1/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute1/expected-svelte5.ts index e1b84e913..b70a4fd51 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute1/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute1/expected-svelte5.ts @@ -1,7 +1,7 @@ /// ; import { createEventDispatcher } from 'svelte'; -function render() { +function $$render() { @@ -22,16 +22,16 @@ async () => { return { props: {a: a , b: b , c: c , getA: getA} as {a: A, b: B, c: C, getA?: typeof getA}, exports: {} as any as { getA: typeof getA }, bindings: "", slots: {'default': {c:c}}, events: {...__sveltets_2_toEventTypings<{a: A}>()} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } bindings() { return ""; } - exports() { return render().exports; } + exports() { return $$render().exports; } } interface $$IsomorphicComponent { diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute1/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute1/expectedv2.ts index bf76800a4..1076711dd 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute1/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute1/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import { createEventDispatcher } from 'svelte'; -function render() { +function $$render() { @@ -22,13 +22,13 @@ async () => { return { props: {a: a , b: b , c: c , getA: getA} as {a: A, b: B, c: C, getA?: typeof getA}, slots: {'default': {c:c}}, events: {...__sveltets_2_toEventTypings<{a: A}>()} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute2/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute2/expected-svelte5.ts index cb4028424..264201010 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute2/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute2/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let a: T/*Ωignore_startΩ*/;a = __sveltets_2_any(a);/*Ωignore_endΩ*/; ; @@ -7,13 +7,13 @@ async () => {}; return { props: {a: a} as {a: T}, exports: {}, bindings: "", slots: {}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } bindings() { return ""; } exports() { return {}; } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute2/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute2/expectedv2.ts index 4f7e9aa0e..e72f9e4f3 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute2/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-generics-attribute2/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let a: T/*Ωignore_startΩ*/;a = __sveltets_2_any(a);/*Ωignore_endΩ*/; ; @@ -7,13 +7,13 @@ async () => {}; return { props: {a: a} as {a: T}, slots: {}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expectedv2.ts index ab5c66bdc..6846c442f 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-multiple-export/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let number1: number/*Ωignore_startΩ*/;number1 = __sveltets_2_any(number1);/*Ωignore_endΩ*/ let number2: number/*Ωignore_startΩ*/;number2 = __sveltets_2_any(number2);/*Ωignore_endΩ*/ @@ -8,5 +8,5 @@ async () => { { svelteHTML.createElement("h1", {});number1; number2; number1 + number2; }}; return { props: {number1: number1 , number2: number2} as {number1: number, number2: number}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-best-effort-types.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-best-effort-types.v5/expectedv2.ts index b819a0c69..d13f47516 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-best-effort-types.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-best-effort-types.v5/expectedv2.ts @@ -1,10 +1,10 @@ /// -;function render() { +;function $$render() { /*Ωignore_startΩ*/;type $$ComponentProps = { a: any, b?: boolean, c?: number, d?: string, e?: any, f?: Record, g?: typeof foo, h?: Bar, i?: Baz, j?: any[], k?: any, l?: any, m?: number, n?: Function };/*Ωignore_endΩ*/ let { a, b = true, c = 1, d = '', e = null, f = {}, g = foo, h = null as Bar, i = null as any as Baz, j = [], k = undefined, l = $bindable(), m = $bindable(1), n = () => {} }: $$ComponentProps = $props(); ; async () => {}; return { props: {} as any as $$ComponentProps, exports: {}, bindings: __sveltets_$$bindings('l', 'm'), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-bindable.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-bindable.v5/expectedv2.ts index 22c641cf8..a5cb626cc 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-bindable.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-bindable.v5/expectedv2.ts @@ -1,10 +1,10 @@ /// -;function render() { +;function $$render() { /*Ωignore_startΩ*/;type $$ComponentProps = { a: any, b?: any, c?: number };/*Ωignore_endΩ*/ let { a, b = $bindable(), c = $bindable(0) as number }: $$ComponentProps = $props(); ; async () => {}; return { props: {} as any as $$ComponentProps, exports: {}, bindings: __sveltets_$$bindings('b', 'c'), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-generics.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-generics.v5/expectedv2.ts index d87b3a3ee..723dac3a0 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-generics.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-generics.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { ;type $$ComponentProps = { a: T, b: string }; let { a, b }:/*Ωignore_startΩ*/$$ComponentProps/*Ωignore_endΩ*/ = $props(); let x = $state(0); @@ -9,13 +9,13 @@ async () => {}; return { props: {} as any as $$ComponentProps, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return render().events; + return $$render().events; } slots() { - return render().slots; + return $$render().slots; } bindings() { return __sveltets_$$bindings(''); } exports() { return {}; } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-1.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-1.v5/expectedv2.ts index 2687887c0..8ffd31293 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-1.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-1.v5/expectedv2.ts @@ -13,7 +13,7 @@ interface Props { a: Dependency; b: T; - };function render() { + };function $$render() { @@ -25,6 +25,6 @@ async () => { }; return { props: {} as any as Props, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-2.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-2.v5/expectedv2.ts index b66a2a1d8..591e41f52 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-2.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-2.v5/expectedv2.ts @@ -6,7 +6,7 @@ a: number; b: typeof value; }; -;type $$ComponentProps = { a: Dependency, b: string };function render() { +;type $$ComponentProps = { a: Dependency, b: string };function $$render() { @@ -16,6 +16,6 @@ async () => { }; return { props: {} as any as $$ComponentProps, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-4.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-4.v5/expectedv2.ts index 28978197d..e1c027860 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-4.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-4.v5/expectedv2.ts @@ -6,7 +6,7 @@ interface Props { [k: string]: Dependency; - };function render() { + };function $$render() { @@ -15,6 +15,6 @@ ; async () => {}; return { props: {} as any as Props, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-5.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-5.v5/expectedv2.ts index e3b3517c3..8af046611 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-5.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-5.v5/expectedv2.ts @@ -9,7 +9,7 @@ import { readable } from 'svelte/store'; /** I should not be sandwitched between the imports */ interface Props { foo?: string; - };function render() { + };function $$render() { @@ -23,6 +23,6 @@ async () => { $store;}; return { props: {} as any as Props, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-1.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-1.v5/expectedv2.ts index abd2b797d..87569df87 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-1.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-1.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { interface Props { foo: C; @@ -12,6 +12,6 @@ ; async () => {}; return { props: {} as any as Props, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-2.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-2.v5/expectedv2.ts index 9aaaa85e8..45e9ac904 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-2.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-2.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { const a: string = ''; @@ -11,6 +11,6 @@ ; async () => {}; return { props: {} as any as Props, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-3.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-3.v5/expectedv2.ts index bec5d85d2..ba8b281e5 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-3.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-3.v5/expectedv2.ts @@ -2,7 +2,7 @@ ; type SomeType = T; type T = unknown; -;;function render() { +;;function $$render() { ;type $$ComponentProps = { someProp: SomeType; }; let { someProp }:/*Ωignore_startΩ*/$$ComponentProps/*Ωignore_endΩ*/ = $props(); ; @@ -12,13 +12,13 @@ async () => { return { props: {} as any as $$ComponentProps, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return render().events; + return $$render().events; } slots() { - return render().slots; + return $$render().slots; } bindings() { return __sveltets_$$bindings(''); } exports() { return {}; } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-4.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-4.v5/expectedv2.ts index d7fe39298..2c075b45b 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-4.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-4.v5/expectedv2.ts @@ -1,7 +1,7 @@ /// ; let a = ''; -;;function render() { +;;function $$render() { let a = true;;type $$ComponentProps = { someProp: typeof a }; let { someProp }:/*Ωignore_startΩ*/$$ComponentProps/*Ωignore_endΩ*/ = $props(); @@ -10,6 +10,6 @@ async () => { }; return { props: {} as any as $$ComponentProps, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-5.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-5.v5/expectedv2.ts index 9455873cb..f63e341ec 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-5.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-5.v5/expectedv2.ts @@ -1,7 +1,7 @@ /// ; type Shadowed = string; -;;function render() { +;;function $$render() { type Shadowed = boolean;;type $$ComponentProps = { someProp: Shadowed }; let { someProp }:/*Ωignore_startΩ*/$$ComponentProps/*Ωignore_endΩ*/ = $props(); @@ -10,6 +10,6 @@ async () => { }; return { props: {} as any as $$ComponentProps, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-6.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-6.v5/expectedv2.ts index 23dd09fb8..7bcd60c2d 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-6.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-6.v5/expectedv2.ts @@ -1,11 +1,11 @@ /// -;function render() { +;function $$render() { let store = null/*Ωignore_startΩ*/;let $store = __sveltets_2_store_get(store);/*Ωignore_endΩ*/;;type $$ComponentProps = { someProp: typeof $store }; let { someProp }:/*Ωignore_startΩ*/$$ComponentProps/*Ωignore_endΩ*/ = $props(); ; async () => {}; return { props: {} as any as $$ComponentProps, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-7.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-7.v5/expectedv2.ts index c5bbee061..fb7aa141a 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-7.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-hoistable-props-false-7.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let { destructured } = {}; type Props = { @@ -9,6 +9,6 @@ ; async () => {}; return { props: {} as any as Props, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-with-slot.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-with-slot.v5/expectedv2.ts index d34195b64..f7cb93a27 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-with-slot.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes-with-slot.v5/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { type Props = { a: T, b: string }; let { a, b }: Props = $props(); @@ -13,13 +13,13 @@ async () => { return { props: {} as any as Props, exports: {}, bindings: __sveltets_$$bindings(''), slots: {'default': {x:x, y:y}}, events: {} }} class __sveltets_Render { props() { - return render().props; + return $$render().props; } events() { - return render().events; + return $$render().events; } slots() { - return render().slots; + return $$render().slots; } bindings() { return __sveltets_$$bindings(''); } exports() { return {}; } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes.v5/expectedv2.ts index ae5caf1a7..3c25c967e 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-runes.v5/expectedv2.ts @@ -1,6 +1,6 @@ /// ; -;type $$ComponentProps = { a: number, b: string };function render() { +;type $$ComponentProps = { a: number, b: string };function $$render() { let { a, b }:/*Ωignore_startΩ*/$$ComponentProps/*Ωignore_endΩ*/ = $props(); let x = $state(0); @@ -8,6 +8,6 @@ ; async () => {}; return { props: {} as any as $$ComponentProps, exports: {}, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Input__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Input__SvelteComponent_ = ReturnType; export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-script-tag-generics/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-script-tag-generics/expected-svelte5.ts index 4ead2232a..01a8cb6df 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-script-tag-generics/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-script-tag-generics/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render>() { +;function $$render>() { let init: T/*Ωignore_startΩ*/;init = __sveltets_2_any(init);/*Ωignore_endΩ*/; ; @@ -7,13 +7,13 @@ async () => {}; return { props: {init: init} as {init: T}, exports: {}, bindings: "", slots: {}, events: {} }} class __sveltets_Render> { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } bindings() { return ""; } exports() { return {}; } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-script-tag-generics/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-script-tag-generics/expectedv2.ts index 8c208e3b7..73e6e8252 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-script-tag-generics/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-script-tag-generics/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render>() { +;function $$render>() { let init: T/*Ωignore_startΩ*/;init = __sveltets_2_any(init);/*Ωignore_endΩ*/; ; @@ -7,13 +7,13 @@ async () => {}; return { props: {init: init} as {init: T}, slots: {}, events: {} }} class __sveltets_Render> { props() { - return render().props; + return $$render().props; } events() { - return __sveltets_2_with_any_event(render()).events; + return __sveltets_2_with_any_event($$render()).events; } slots() { - return render().slots; + return $$render().slots; } } diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expectedv2.ts index d21757754..002acb408 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-style-and-script/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let foo:string/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/; ; @@ -7,5 +7,5 @@ async () => { }; return { props: {foo: foo} as {foo: string}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-sveltekit-autotypes-$props-rune-unchanged.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-sveltekit-autotypes-$props-rune-unchanged.v5/expectedv2.ts index 385c54c68..c788dc05e 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-sveltekit-autotypes-$props-rune-unchanged.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-sveltekit-autotypes-$props-rune-unchanged.v5/expectedv2.ts @@ -1,12 +1,12 @@ /// ; -;type $$ComponentProps = {form: boolean, data: true };function render() { +;type $$ComponentProps = {form: boolean, data: true };function $$render() { const snapshot: any = {}; let { form, data }:/*Ωignore_startΩ*/$$ComponentProps/*Ωignore_endΩ*/ = $props(); ; async () => {}; return { props: {} as any as $$ComponentProps, exports: {} as any as { snapshot: any }, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Page__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Page__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Page__SvelteComponent_ = ReturnType; export default Page__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-sveltekit-autotypes-$props-rune.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-sveltekit-autotypes-$props-rune.v5/expectedv2.ts index 9bc14ba91..ce2a45ef9 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-sveltekit-autotypes-$props-rune.v5/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-sveltekit-autotypes-$props-rune.v5/expectedv2.ts @@ -1,11 +1,11 @@ /// -;function render() { +;function $$render() { const snapshot/*Ωignore_startΩ*/: import('./$types.js').Snapshot/*Ωignore_endΩ*/ = {};/*Ωignore_startΩ*/;type $$ComponentProps = { form: import('./$types.js').ActionData, data: import('./$types.js').PageData };/*Ωignore_endΩ*/ let { form, data }: $$ComponentProps = $props(); ; async () => {}; return { props: {} as any as $$ComponentProps, exports: {} as any as { snapshot: typeof snapshot }, bindings: __sveltets_$$bindings(''), slots: {}, events: {} }} -const Page__SvelteComponent_ = __sveltets_2_fn_component(render()); +const Page__SvelteComponent_ = __sveltets_2_fn_component($$render()); type Page__SvelteComponent_ = ReturnType; export default Page__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expectedv2.ts index 460b26b3f..4e5eb7d9c 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-type-assertion/expectedv2.ts @@ -1,7 +1,7 @@ /// ; let a = '' as string; -;;function render() { +;;function $$render() { let a = document.querySelector('#id'); ; @@ -10,5 +10,5 @@ async () => { }; return { props: {} as Record, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expectedv2.ts index 5c2cf0ce8..e0a672987 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-typed-export-with-default/expectedv2.ts @@ -1,10 +1,10 @@ /// -;function render() { +;function $$render() { let name: string | number = "world"/*Ωignore_startΩ*/;name = __sveltets_2_any(name);/*Ωignore_endΩ*/ ; async () => {}; return { props: {name: name} as {name?: string | number}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event(render())) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any_event($$render())) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expectedv2.ts index e3c216a02..1ce81a169 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/ts-uses-$$props/expectedv2.ts @@ -1,9 +1,9 @@ /// -;function render() { let $$props = __sveltets_2_allPropsType(); +;function $$render() { let $$props = __sveltets_2_allPropsType(); ; async () => { { svelteHTML.createElement("h1", {});$$props['name']; }}; return { props: {}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_with_any(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/typeof-$store/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/typeof-$store/expectedv2.ts index 8e478fddf..30bf2dd4b 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/typeof-$store/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/typeof-$store/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import {writable} from "svelte/store"; -function render() { +function $$render() { const foo = writable(1)/*Ωignore_startΩ*/;let $foo = __sveltets_2_store_get(foo);/*Ωignore_endΩ*/; @@ -10,5 +10,5 @@ function render() { async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/expected.error.json b/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/expected.error.json new file mode 100644 index 000000000..e6cbf2d51 --- /dev/null +++ b/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/expected.error.json @@ -0,0 +1,16 @@ +{ + "code": "unclosed-element", + "start": { + "line": 1, + "column": 0, + "character": 0 + }, + "end": { + "line": 1, + "column": 1, + "character": 1 + }, + "pos": 0, + "frame": "1:
\n ^\n2: \n3:
", + "name": "ParseError" +} \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/expectedv2.ts new file mode 100644 index 000000000..a899c5e8d --- /dev/null +++ b/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/expectedv2.ts @@ -0,0 +1,10 @@ +/// +;function $$render() { +async () => { { svelteHTML.createElement("div", {}); + { svelteHTML.createElement("p", {}); } + + { svelteHTML.createElement("div", {}); }}}; +return { props: /** @type {Record} */ ({}), exports: {}, bindings: "", slots: {}, events: {} }} +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))); +/*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; +/*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/input.svelte b/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/input.svelte new file mode 100644 index 000000000..03ae1f316 --- /dev/null +++ b/packages/svelte2tsx/test/svelte2tsx/samples/unclosed-tag-containing-tag.v5/input.svelte @@ -0,0 +1,4 @@ +
+

+ +
\ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expectedv2.ts index fafe1b21c..9d9d01a1e 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props-script/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { let $$props = __sveltets_2_allPropsType(); +;function $$render() { let $$props = __sveltets_2_allPropsType(); let name = $$props['name']; ; @@ -7,5 +7,5 @@ async () => { { svelteHTML.createElement("h1", {});name; } }; return { props: {}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial_with_any(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial_with_any(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expectedv2.ts index 298e2fb5e..b9ee0b3d7 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$props/expectedv2.ts @@ -1,7 +1,7 @@ /// -;function render() { let $$props = __sveltets_2_allPropsType(); +;function $$render() { let $$props = __sveltets_2_allPropsType(); async () => { { svelteHTML.createElement("h1", {});$$props['name']; }}; return { props: {}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial_with_any(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial_with_any(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expectedv2.ts index 7adca1938..a9394760e 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps-script/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { let $$restProps = __sveltets_2_restPropsType(); +;function $$render() { let $$restProps = __sveltets_2_restPropsType(); let name = $$restProps['name']; ; @@ -7,5 +7,5 @@ async () => { { svelteHTML.createElement("h1", {});name; } }; return { props: {}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial_with_any(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial_with_any(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expectedv2.ts index 83554f0ea..5f1ec958e 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$restProps/expectedv2.ts @@ -1,7 +1,7 @@ /// -;function render() { let $$restProps = __sveltets_2_restPropsType(); +;function $$render() { let $$restProps = __sveltets_2_restPropsType(); async () => { { svelteHTML.createElement("h1", {});$$restProps['name']; }}; return { props: {}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial_with_any(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial_with_any(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expectedv2.ts index 1ac74f8c9..921ea2731 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots-script/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { let $$slots = __sveltets_2_slotsType({'foo': '', 'dashed-name': '', 'default': ''}); +;function $$render() { let $$slots = __sveltets_2_slotsType({'foo': '', 'dashed-name': '', 'default': ''}); let name = $$slots.foo; let dashedName = $$slots['dashed-name']; @@ -13,5 +13,5 @@ async () => { { __sveltets_createSlot("default", {});}}; return { props: /** @type {Record} */ ({}), slots: {'foo': {}, 'dashed-name': {}, 'default': {}}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expectedv2.ts index 1fa7400a5..6738517ff 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$$slots/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { let $$slots = __sveltets_2_slotsType({'foo': '', 'dashed-name': '', 'default': ''}); +;function $$render() { let $$slots = __sveltets_2_slotsType({'foo': '', 'dashed-name': '', 'default': ''}); /*Ωignore_startΩ*/;const __sveltets_createSlot = __sveltets_2_createCreateSlot();/*Ωignore_endΩ*/ async () => { { svelteHTML.createElement("h1", {});$$slots.foo; } { svelteHTML.createElement("h1", {});$$slots['dashed-name']; } @@ -9,5 +9,5 @@ async () => { { svelteHTML.createElement("h1", {});$$slots.foo; } { __sveltets_createSlot("default", {});}}; return { props: /** @type {Record} */ ({}), slots: {'foo': {}, 'dashed-name': {}, 'default': {}}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expectedv2.ts index efb90a0d0..3433b81df 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$property/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { interface A { $bla: boolean; @@ -14,5 +14,5 @@ async () => {}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expectedv2.ts index 229b04e74..68c689753 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-in-event-binding/expectedv2.ts @@ -1,8 +1,8 @@ /// -;function render() { +;function $$render() { async () => { { const $$_tnenopmoC0C = __sveltets_2_ensureComponent(Component); const $$_tnenopmoC0 = new $$_tnenopmoC0C({ target: __sveltets_2_any(), props: { }});$$_tnenopmoC0.$on("click", $check ? method1 : method2);} { svelteHTML.createElement("button", { "on:click":$check ? method1 : method2,}); }}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-multiple-variable-declaration/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-multiple-variable-declaration/expectedv2.ts index e74a2d6c0..ec3eb79a2 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-multiple-variable-declaration/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-multiple-variable-declaration/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { const store1 = '', store2 = ''/*Ωignore_startΩ*/;let $store1 = __sveltets_2_store_get(store1);/*Ωignore_endΩ*//*Ωignore_startΩ*/;let $store2 = __sveltets_2_store_get(store2);/*Ωignore_endΩ*/; const { store3, store4 } = '', [ store5, store6 ] = ''/*Ωignore_startΩ*/;let $store3 = __sveltets_2_store_get(store3);;let $store4 = __sveltets_2_store_get(store4);/*Ωignore_endΩ*//*Ωignore_startΩ*/;let $store5 = __sveltets_2_store_get(store5);;let $store6 = __sveltets_2_store_get(store6);/*Ωignore_endΩ*/; @@ -20,5 +20,5 @@ $store9; $store10;}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-assignment-operators/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-assignment-operators/expectedv2.ts index 46705bee2..8dce37ae3 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-assignment-operators/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-assignment-operators/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import { writable } from 'svelte/store'; -function render() { +function $$render() { const count = writable(0)/*Ωignore_startΩ*/;let $count = __sveltets_2_store_get(count);/*Ωignore_endΩ*/; @@ -35,5 +35,5 @@ async () => { { svelteHTML.createElement("button", { "on:click":() => $count |= myvar,}); }}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-increments/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-increments/expectedv2.ts index ad8e14c55..df0ce39a5 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-increments/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-increments/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import { writable } from 'svelte/store'; -function render() { +function $$render() { const count = writable(0)/*Ωignore_startΩ*/;let $count = __sveltets_2_store_get(count);/*Ωignore_endΩ*/; @@ -15,5 +15,5 @@ async () => { { svelteHTML.createElement("button", { "on:click":() => $count++,}); }}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-unary-operators/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-unary-operators/expectedv2.ts index fbde8abc5..3355e3202 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-unary-operators/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store-with-unary-operators/expectedv2.ts @@ -1,7 +1,7 @@ /// ; import { writable } from 'svelte/store'; -function render() { +function $$render() { const count = writable(0)/*Ωignore_startΩ*/;let $count = __sveltets_2_store_get(count);/*Ωignore_endΩ*/; @@ -18,5 +18,5 @@ async () => { { svelteHTML.createElement("button", { "on:click":() => ~$count,}); }}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expectedv2.ts index 16a743e86..20f8752a3 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-$store/expectedv2.ts @@ -1,9 +1,9 @@ /// -;function render() { +;function $$render() { $b=$b.concat(5); async () => { { svelteHTML.createElement("h1", { "on:click":() => $b=$b.concat(5),});$b; }}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expected-svelte5.ts index 78999627b..469af6e6a 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let foo: number = undefined/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/ const bar: string = '' @@ -7,6 +7,6 @@ async () => { { svelteHTML.createElement("svelte:options", {});} }; return { props: {foo: foo , bar: bar}, exports: /** @type {{bar: string}} */ ({}), bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(['foo','bar'], __sveltets_2_with_any_event(render()))); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(['foo','bar'], __sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expectedv2.ts index 1f4d2441f..9b1a45db1 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let foo: number = undefined/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/ const bar: string = '' @@ -8,6 +8,6 @@ async () => { { svelteHTML.createElement("svelte:options", {});} }; return { props: {foo: foo , bar: bar}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['foo','bar'], __sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['foo','bar'], __sveltets_2_with_any_event($$render()))) { get bar() { return __sveltets_2_nonNullable(this.$$prop_def.bar) } } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expected-svelte5.ts index b734e0074..2f03c624d 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let foo: number = undefined/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/ let foo2 = undefined @@ -10,6 +10,6 @@ async () => { { svelteHTML.createElement("svelte:options", {"accessors":true,});} }; return { props: {foo: foo , foo2: foo2 , class: clazz , bar: bar}, exports: /** @type {{foo: number,foo2: typeof foo2,class: string,bar: string}} */ ({}), bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(['foo','foo2','bar'], __sveltets_2_with_any_event(render()))); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(['foo','foo2','bar'], __sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expectedv2.ts index 693ae5c94..316263a18 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let foo: number = undefined/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/ let foo2 = undefined @@ -11,7 +11,7 @@ async () => { { svelteHTML.createElement("svelte:options", {"accessors":true,}) }; return { props: {foo: foo , foo2: foo2 , class: clazz , bar: bar}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['foo','foo2','bar'], __sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['foo','foo2','bar'], __sveltets_2_with_any_event($$render()))) { get bar() { return __sveltets_2_nonNullable(this.$$prop_def.bar) } get foo() { return this.$$prop_def.foo } /**accessor*/ diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expected-svelte5.ts index f92ea54a3..78da26bd9 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let foo: number = undefined/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/ const bar: string = '' @@ -7,6 +7,6 @@ async () => { { svelteHTML.createElement("svelte:options", { "accessors":false,});} }; return { props: {foo: foo , bar: bar}, exports: /** @type {{bar: string}} */ ({}), bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(['foo','bar'], __sveltets_2_with_any_event(render()))); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(['foo','bar'], __sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expectedv2.ts index b4d628dc6..af65dd1fb 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let foo: number = undefined/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/ const bar: string = '' @@ -8,6 +8,6 @@ async () => { { svelteHTML.createElement("svelte:options", { "accessors":false, }; return { props: {foo: foo , bar: bar}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['foo','bar'], __sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['foo','bar'], __sveltets_2_with_any_event($$render()))) { get bar() { return __sveltets_2_nonNullable(this.$$prop_def.bar) } } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expected-svelte5.ts index cd809ea42..79aaa4ecb 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let foo: number = undefined/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/ let foo2 = undefined @@ -10,6 +10,6 @@ async () => { { svelteHTML.createElement("svelte:options", { "accessors":true,});} }; return { props: {foo: foo , foo2: foo2 , class: clazz , bar: bar}, exports: /** @type {{foo: number,foo2: typeof foo2,class: string,bar: string}} */ ({}), bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(['foo','foo2','bar'], __sveltets_2_with_any_event(render()))); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(['foo','foo2','bar'], __sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expectedv2.ts index 7d704d487..dbd53a732 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let foo: number = undefined/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/ let foo2 = undefined @@ -11,7 +11,7 @@ async () => { { svelteHTML.createElement("svelte:options", { "accessors":true,} }; return { props: {foo: foo , foo2: foo2 , class: clazz , bar: bar}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['foo','foo2','bar'], __sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['foo','foo2','bar'], __sveltets_2_with_any_event($$render()))) { get bar() { return __sveltets_2_nonNullable(this.$$prop_def.bar) } get foo() { return this.$$prop_def.foo } /**accessor*/ diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expected-svelte5.ts index b8b37e7e1..bf7de449c 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expected-svelte5.ts @@ -1,11 +1,11 @@ /// -;function render() { +;function $$render() { let foo: number = undefined/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/ const bar: string = '' ; async () => {}; return { props: {foo: foo , bar: bar}, exports: /** @type {{bar: string}} */ ({}), bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(['foo','bar'], __sveltets_2_with_any_event(render()))); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(['foo','bar'], __sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expectedv2.ts index da446ad83..35a67cb64 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { let foo: number = undefined/*Ωignore_startΩ*/;foo = __sveltets_2_any(foo);/*Ωignore_endΩ*/ const bar: string = '' @@ -7,6 +7,6 @@ async () => {}; return { props: {foo: foo , bar: bar}, slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['foo','bar'], __sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(['foo','bar'], __sveltets_2_with_any_event($$render()))) { get bar() { return __sveltets_2_nonNullable(this.$$prop_def.bar) } } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected-svelte5.ts index 0fcbf31e1..891050852 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { /*Ωignore_startΩ*/;const __sveltets_createSlot = __sveltets_2_createCreateSlot();/*Ωignore_endΩ*/ async () => {if(true){ { const $$_svelteself0 = __sveltets_2_createComponentAny({ });{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,prop,} = $$_svelteself0.$$slot_def.default;$$_$$; @@ -10,6 +10,6 @@ async () => {if(true){ { __sveltets_createSlot("default", { prop,});} }}}; return { props: /** @type {Record} */ ({}), exports: {}, bindings: "", slots: {'default': {prop:__sveltets_2_instanceOf(__sveltets_1_componentType()).$$slot_def['default'].prop}}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component_slots(__sveltets_2_partial(__sveltets_2_with_any_event(render()))); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component_slots(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expectedv2.ts index 8ea7079fb..3d62bcdc9 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components-let-forward/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { /*Ωignore_startΩ*/;const __sveltets_createSlot = __sveltets_2_createCreateSlot();/*Ωignore_endΩ*/ async () => {if(true){ { const $$_svelteself0 = __sveltets_2_createComponentAny({ });{const {/*Ωignore_startΩ*/$$_$$/*Ωignore_endΩ*/,prop,} = $$_svelteself0.$$slot_def.default;$$_$$; @@ -11,5 +11,5 @@ async () => {if(true){ }}}; return { props: /** @type {Record} */ ({}), slots: {'default': {prop:__sveltets_2_instanceOf(__sveltets_1_componentType()).$$slot_def['default'].prop}}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected-svelte5.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected-svelte5.ts index 5082b4fed..dfc07df09 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected-svelte5.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expected-svelte5.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { async () => {if(true){ { __sveltets_2_createComponentAny({ "prop1":1,});} } @@ -15,6 +15,6 @@ async () => {if(true){ { svelteHTML.createElement("svelte:fragment", {});} { svelteHTML.createElement("svelte:document", { "foo":`bar`,"on:click":e => {},});}}; return { props: /** @type {Record} */ ({}), exports: {}, bindings: "", slots: {}, events: {} }} -const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event(render()))); +const Input__SvelteComponent_ = __sveltets_2_isomorphic_component(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))); /*Ωignore_startΩ*/type Input__SvelteComponent_ = InstanceType; /*Ωignore_endΩ*/export default Input__SvelteComponent_; \ No newline at end of file diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expectedv2.ts index 75221d3e2..537262a51 100644 --- a/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expectedv2.ts +++ b/packages/svelte2tsx/test/svelte2tsx/samples/uses-svelte-components/expectedv2.ts @@ -1,5 +1,5 @@ /// -;function render() { +;function $$render() { async () => {if(true){ { __sveltets_2_createComponentAny({ "prop1":1,});} } @@ -16,5 +16,5 @@ async () => {if(true){ { svelteHTML.createElement("svelte:document", { "foo":`bar`,"on:click":e => {},});}}; return { props: /** @type {Record} */ ({}), slots: {}, events: {} }} -export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event(render()))) { +export default class Input__SvelteComponent_ extends __sveltets_2_createSvelte2TsxComponent(__sveltets_2_partial(__sveltets_2_with_any_event($$render()))) { } \ No newline at end of file diff --git a/packages/typescript-plugin/package.json b/packages/typescript-plugin/package.json index 0cb00eb55..25e2016db 100644 --- a/packages/typescript-plugin/package.json +++ b/packages/typescript-plugin/package.json @@ -24,8 +24,8 @@ "license": "MIT", "devDependencies": { "@types/node": "^18.0.0", - "typescript": "^5.7.2", - "svelte": "^4.2.19" + "svelte": "^4.2.19", + "typescript": "^5.8.2" }, "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", diff --git a/packages/typescript-plugin/src/language-service/navigate-to-items.ts b/packages/typescript-plugin/src/language-service/navigate-to-items.ts index 815c6e8b1..3d47bf44d 100644 --- a/packages/typescript-plugin/src/language-service/navigate-to-items.ts +++ b/packages/typescript-plugin/src/language-service/navigate-to-items.ts @@ -7,18 +7,8 @@ export function decorateNavigateToItems( snapshotManager: SvelteSnapshotManager ): void { const getNavigateToItems = ls.getNavigateToItems; - ls.getNavigateToItems = ( - searchValue: string, - maxResultCount?: number, - fileName?: string, - excludeDtsFiles?: boolean - ) => { - const navigationToItems = getNavigateToItems( - searchValue, - maxResultCount, - fileName, - excludeDtsFiles - ); + ls.getNavigateToItems = (...args) => { + const navigationToItems = getNavigateToItems(...args); return navigationToItems .map((item) => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6745c3f39..905264a94 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: typescript: - specifier: ^5.7.2 - version: 5.7.2 + specifier: ^5.8.2 + version: 5.8.2 devDependencies: cross-env: specifier: ^7.0.2 @@ -20,7 +20,7 @@ importers: version: 3.3.3 ts-node: specifier: ^10.0.0 - version: 10.9.1(@types/node@18.19.46)(typescript@5.7.2) + version: 10.9.1(@types/node@18.19.46)(typescript@5.8.2) packages/language-server: dependencies: @@ -58,17 +58,17 @@ importers: specifier: workspace:~ version: link:../svelte2tsx typescript: - specifier: ^5.7.2 - version: 5.7.2 + specifier: ^5.8.2 + version: 5.8.2 typescript-auto-import-cache: specifier: ^0.3.5 version: 0.3.5 vscode-css-languageservice: - specifier: ~6.3.0 - version: 6.3.0 + specifier: ~6.3.2 + version: 6.3.2 vscode-html-languageservice: - specifier: ~5.3.0 - version: 5.3.0 + specifier: ~5.3.2 + version: 5.3.2 vscode-languageserver: specifier: 9.0.1 version: 9.0.1 @@ -111,7 +111,7 @@ importers: version: 11.1.2 ts-node: specifier: ^10.0.0 - version: 10.9.1(@types/node@18.19.46)(typescript@5.7.2) + version: 10.9.1(@types/node@18.19.46)(typescript@5.8.2) packages/svelte-check: dependencies: @@ -145,7 +145,7 @@ importers: version: 5.0.2(rollup@3.7.5) '@rollup/plugin-typescript': specifier: ^10.0.0 - version: 10.0.1(rollup@3.7.5)(tslib@2.5.2)(typescript@5.7.2) + version: 10.0.1(rollup@3.7.5)(tslib@2.5.2)(typescript@5.8.2) '@types/sade': specifier: ^1.7.2 version: 1.7.4 @@ -168,8 +168,8 @@ importers: specifier: workspace:* version: link:../language-server typescript: - specifier: ^5.7.2 - version: 5.7.2 + specifier: ^5.8.2 + version: 5.8.2 vscode-languageserver: specifier: 8.0.2 version: 8.0.2 @@ -217,8 +217,8 @@ importers: specifier: ^2.4.0 version: 2.5.2 typescript: - specifier: ^5.7.2 - version: 5.7.2 + specifier: ^5.8.2 + version: 5.8.2 vscode-tmgrammar-test: specifier: ^0.0.11 version: 0.0.11 @@ -249,7 +249,7 @@ importers: version: 15.0.2(rollup@3.7.5) '@rollup/plugin-typescript': specifier: ^10.0.0 - version: 10.0.1(rollup@3.7.5)(tslib@2.5.2)(typescript@5.7.2) + version: 10.0.1(rollup@3.7.5)(tslib@2.5.2)(typescript@5.8.2) '@types/estree': specifier: ^0.0.42 version: 0.0.42 @@ -299,8 +299,8 @@ importers: specifier: ^2.4.0 version: 2.5.2 typescript: - specifier: ^5.7.2 - version: 5.7.2 + specifier: ^5.8.2 + version: 5.8.2 packages/typescript-plugin: dependencies: @@ -318,8 +318,8 @@ importers: specifier: ^4.2.19 version: 4.2.19 typescript: - specifier: ^5.7.2 - version: 5.7.2 + specifier: ^5.8.2 + version: 5.8.2 packages: @@ -1281,8 +1281,8 @@ packages: typescript-auto-import-cache@0.3.5: resolution: {integrity: sha512-fAIveQKsoYj55CozUiBoj4b/7WpN0i4o74wiGY5JVUEoD0XiqDk1tJqTEjgzL2/AizKQrXxyRosSebyDzBZKjw==} - typescript@5.7.2: - resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==} + typescript@5.8.2: + resolution: {integrity: sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==} engines: {node: '>=14.17'} hasBin: true @@ -1302,11 +1302,11 @@ packages: vfile-message@3.1.4: resolution: {integrity: sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw==} - vscode-css-languageservice@6.3.0: - resolution: {integrity: sha512-nU92imtkgzpCL0xikrIb8WvedV553F2BENzgz23wFuok/HLN5BeQmroMy26pUwFxV2eV8oNRmYCUv8iO7kSMhw==} + vscode-css-languageservice@6.3.2: + resolution: {integrity: sha512-GEpPxrUTAeXWdZWHev1OJU9lz2Q2/PPBxQ2TIRmLGvQiH3WZbqaNoute0n0ewxlgtjzTW3AKZT+NHySk5Rf4Eg==} - vscode-html-languageservice@5.3.0: - resolution: {integrity: sha512-C4Z3KsP5Ih+fjHpiBc5jxmvCl+4iEwvXegIrzu2F5pktbWvQaBT3YkVPk8N+QlSSMk8oCG6PKtZ/Sq2YHb5e8g==} + vscode-html-languageservice@5.3.2: + resolution: {integrity: sha512-3MgFQqVG+iQVNG7QI/slaoL7lJpne0nssX082kjUF1yn/YJa8BWCLeCJjM0YpTlp8A7JT1+J22mk4qSPx3NjSQ==} vscode-jsonrpc@8.0.2: resolution: {integrity: sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==} @@ -1326,8 +1326,8 @@ packages: vscode-languageserver-protocol@3.17.5: resolution: {integrity: sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==} - vscode-languageserver-textdocument@1.0.11: - resolution: {integrity: sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==} + vscode-languageserver-textdocument@1.0.12: + resolution: {integrity: sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==} vscode-languageserver-types@3.17.2: resolution: {integrity: sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==} @@ -1496,11 +1496,11 @@ snapshots: optionalDependencies: rollup: 3.7.5 - '@rollup/plugin-typescript@10.0.1(rollup@3.7.5)(tslib@2.5.2)(typescript@5.7.2)': + '@rollup/plugin-typescript@10.0.1(rollup@3.7.5)(tslib@2.5.2)(typescript@5.8.2)': dependencies: '@rollup/pluginutils': 5.0.2(rollup@3.7.5) resolve: 1.22.2 - typescript: 5.7.2 + typescript: 5.8.2 optionalDependencies: rollup: 3.7.5 tslib: 2.5.2 @@ -1604,7 +1604,7 @@ snapshots: dependencies: emmet: 2.4.4 jsonc-parser: 2.3.1 - vscode-languageserver-textdocument: 1.0.11 + vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.17.5 vscode-nls: 5.2.0 vscode-uri: 2.1.2 @@ -2329,7 +2329,7 @@ snapshots: dependencies: is-number: 7.0.0 - ts-node@10.9.1(@types/node@18.19.46)(typescript@5.7.2): + ts-node@10.9.1(@types/node@18.19.46)(typescript@5.8.2): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.9 @@ -2343,7 +2343,7 @@ snapshots: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.7.2 + typescript: 5.8.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 @@ -2355,7 +2355,7 @@ snapshots: dependencies: semver: 7.5.1 - typescript@5.7.2: {} + typescript@5.8.2: {} undici-types@5.26.5: {} @@ -2372,17 +2372,17 @@ snapshots: '@types/unist': 2.0.6 unist-util-stringify-position: 3.0.3 - vscode-css-languageservice@6.3.0: + vscode-css-languageservice@6.3.2: dependencies: '@vscode/l10n': 0.0.18 - vscode-languageserver-textdocument: 1.0.11 + vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.17.5 vscode-uri: 3.0.8 - vscode-html-languageservice@5.3.0: + vscode-html-languageservice@5.3.2: dependencies: '@vscode/l10n': 0.0.18 - vscode-languageserver-textdocument: 1.0.11 + vscode-languageserver-textdocument: 1.0.12 vscode-languageserver-types: 3.17.5 vscode-uri: 3.0.8 @@ -2406,7 +2406,7 @@ snapshots: vscode-jsonrpc: 8.2.0 vscode-languageserver-types: 3.17.5 - vscode-languageserver-textdocument@1.0.11: {} + vscode-languageserver-textdocument@1.0.12: {} vscode-languageserver-types@3.17.2: {} pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy