Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: allow JS snapshots within TS plugin #2565

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: allow JS snapshots within TS plugin #2565

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions packages/typescript-plugin/src/svelte-snapshots.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,18 @@ export class SvelteSnapshot {
private svelteCode: string,
private mapper: SourceMapper,
private logger: Logger,
public readonly isTsFile: boolean
public isTsFile: boolean
) {}

update(svelteCode: string, mapper: SourceMapper) {
update(svelteCode: string, mapper: SourceMapper, isTsFile: boolean) {
this.svelteCode = svelteCode;
this.mapper = mapper;
this.lineOffsets = undefined;
this.isTsFile = isTsFile;
// @ts-expect-error
this.scriptInfo!.scriptKind = this.isTsFile
? this.typescript.ScriptKind.TS
: this.typescript.ScriptKind.JS;
this.log('Updated Snapshot');
}

Expand Down Expand Up @@ -107,7 +112,9 @@ export class SvelteSnapshot {

setAndPatchScriptInfo(scriptInfo: ts.server.ScriptInfo) {
// @ts-expect-error
scriptInfo.scriptKind = this.typescript.ScriptKind.TS;
scriptInfo.scriptKind = this.isTsFile
? this.typescript.ScriptKind.TS
: this.typescript.ScriptKind.JS;

const positionToLineOffset = scriptInfo.positionToLineOffset.bind(scriptInfo);
scriptInfo.positionToLineOffset = (position) => {
Expand Down Expand Up @@ -366,7 +373,17 @@ export class SvelteSnapshotManager {
} else if (isSvelteFilePath(path)) {
this.logger.debug('Read Svelte file:', path);
const svelteCode = readFile(path) || '';
const isTsFile = true; // TODO check file contents? TS might be okay with importing ts into js.
const version = this.svelteCompiler?.VERSION ?? '4.2.0'; // built-in one is 4.x
const isTsFile =
// At some point we supported a default language of TS, but that was removed.
// Assume that people using Svelte 5 are always using the attribute
Number(version.split('.')[0]) >= 5
? svelteCode.includes('lang="ts"') ||
svelteCode.includes('lang=ts') ||
// Additional measures to prevent each file to start out with JS and then switch to TS
!svelteCode.includes('<script') ||
!svelteCode.includes('@type')
: true;
let code: string;
let mapper: SourceMapper;

Expand All @@ -378,7 +395,7 @@ export class SvelteSnapshotManager {
typingsNamespace: this.svelteOptions.namespace,
// Don't search for compiler from current path - could be a different one from which we have loaded the svelte2tsx globals
parse: this.svelteCompiler?.parse,
version: this.svelteCompiler?.VERSION
version
});
code = result.code;
mapper = new SourceMapper(result.map.mappings);
Expand Down Expand Up @@ -410,7 +427,7 @@ export class SvelteSnapshotManager {
const canonicalFilePath = this.projectService.toCanonicalFileName(path);
const existingSnapshot = this.snapshots.get(canonicalFilePath);
if (existingSnapshot) {
existingSnapshot.update(svelteCode, mapper);
existingSnapshot.update(svelteCode, mapper, isTsFile);
} else {
this.snapshots.set(
canonicalFilePath,
Expand Down