diff --git a/packages/svelte-vscode/package.json b/packages/svelte-vscode/package.json index 574715f96..f97cf561f 100644 --- a/packages/svelte-vscode/package.json +++ b/packages/svelte-vscode/package.json @@ -741,8 +741,10 @@ "devDependencies": { "@types/lodash": "^4.14.116", "@types/node": "^18.0.0", + "@types/semver": "^7.7.0", "@types/vscode": "^1.67", "js-yaml": "^3.14.0", + "semver": "^7.7.2", "tslib": "^2.4.0", "typescript": "^5.8.2", "vitest": "^3.2.4", diff --git a/packages/svelte-vscode/src/sveltekit/utils.ts b/packages/svelte-vscode/src/sveltekit/utils.ts index 6ca33f796..cce8e2de9 100644 --- a/packages/svelte-vscode/src/sveltekit/utils.ts +++ b/packages/svelte-vscode/src/sveltekit/utils.ts @@ -2,6 +2,7 @@ import { TextDecoder } from 'util'; import * as path from 'path'; import { Uri, workspace } from 'vscode'; import type { GenerateConfig } from './generateFiles/types'; +import { atLeast } from '../version'; export async function fileExists(file: string) { try { @@ -31,10 +32,20 @@ export async function checkProjectKind(path: string): Promise= jsconfig.length); let withSatisfies = false; @@ -44,7 +55,12 @@ export async function checkProjectKind(path: string): Promise= (minor ?? 0)) || - Number(majorVersion) > major - ); -} - export async function getVersionFromPackageJson(packageName: string): Promise { const packageJsonList = await workspace.findFiles('**/package.json', '**/node_modules/**'); diff --git a/packages/svelte-vscode/src/version.ts b/packages/svelte-vscode/src/version.ts new file mode 100644 index 000000000..7db8b318d --- /dev/null +++ b/packages/svelte-vscode/src/version.ts @@ -0,0 +1,51 @@ +import { lt, coerce, gte } from 'semver'; + +/** + * @example + * const supported = atLeast({ + * packageName: 'node', + * versionMin: '18.3', + * versionToCheck: process.versions.node + * fallback: true // optional + * }); + */ +export function atLeast(o: { + packageName: string; + versionMin: string; + versionToCheck: string; + fallback: boolean; +}): boolean; +export function atLeast(o: { + packageName: string; + versionMin: string; + versionToCheck: string; + fallback?: undefined; +}): boolean | undefined; + +// Implementation +export function atLeast(o: { + packageName: string; + versionMin: string; + versionToCheck: string; + fallback?: boolean; +}): boolean | undefined { + const { packageName, versionMin, versionToCheck, fallback } = o; + if (versionToCheck === undefined || versionToCheck === '') return fallback; + + if ( + versionToCheck.includes('latest') || + versionToCheck.includes('catalog:') || + versionToCheck.includes('http') + ) { + console.warn(`Version '${versionToCheck}' for '${packageName}' is not supported`); + return fallback; + } + try { + const vMin = coerce(versionMin); + const vToCheck = coerce(versionToCheck); + if (vMin && vToCheck) { + return gte(vToCheck, vMin); + } + } catch (error) {} + return fallback; +} diff --git a/packages/svelte-vscode/test/version.spec.ts b/packages/svelte-vscode/test/version.spec.ts new file mode 100644 index 000000000..f22b9c721 --- /dev/null +++ b/packages/svelte-vscode/test/version.spec.ts @@ -0,0 +1,41 @@ +import { expect, describe, it } from 'vitest'; +import { atLeast } from '../src/version'; + +describe('atLeast', () => { + const combinationsAtLeast = [ + { min: '5', version: '>=5', supported: true }, + { min: '5', version: '>=5.0.0', supported: true }, + { min: '5', version: '5.0.0', supported: true }, + { min: '5', version: '5', supported: true }, + { min: '5', version: '4', supported: false }, + { min: '5', version: '4.9', supported: false }, + { min: '5', version: '', supported: undefined }, + { min: '5', version: 'catalog:', supported: undefined }, + { min: '5', version: 'latest', supported: undefined }, + { min: '5', version: 'latest', fallback: true, supported: true }, + { min: '5', version: 'latest', fallback: false, supported: false } + ]; + it.each(combinationsAtLeast)( + '(min $min, $version, $fallback) => $supported', + ({ min, version, supported, fallback }) => { + if (fallback !== undefined) { + expect( + atLeast({ + packageName: 'myPkg', + versionMin: min, + versionToCheck: version, + fallback + }) + ).toEqual(supported); + } else { + expect( + atLeast({ + packageName: 'myPkg', + versionMin: min, + versionToCheck: version + }) + ).toEqual(supported); + } + } + ); +}); diff --git a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/MustacheTag.ts b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/MustacheTag.ts index 9e888b90c..ab132e67e 100644 --- a/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/MustacheTag.ts +++ b/packages/svelte2tsx/src/htmlxtojsx_v2/nodes/MustacheTag.ts @@ -10,6 +10,13 @@ export function handleMustacheTag(str: MagicString, node: BaseNode, parent: Base // handled inside Attribute.ts / StyleDirective.ts return; } + const text = str.original.slice(node.start + 1, node.end - 1); + if (text.trimStart().startsWith('{')) { + // possibly an object literal, wrapping it in parentheses so it's treated as an expression + str.overwrite(node.start, node.start + 1, ';(', { contentOnly: true }); + str.overwrite(node.end - 1, node.end, ');', { contentOnly: true }); + return; + } str.overwrite(node.start, node.start + 1, '', { contentOnly: true }); str.overwrite(node.end - 1, node.end, ';', { contentOnly: true }); } diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/mustache-tag-object-literal/expectedv2.js b/packages/svelte2tsx/test/htmlx2jsx/samples/mustache-tag-object-literal/expectedv2.js new file mode 100644 index 000000000..ce8c12ef9 --- /dev/null +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/mustache-tag-object-literal/expectedv2.js @@ -0,0 +1,5 @@ +;({ + toString() { return "Hello World" } +}); + +;({ a: '' }['a']); \ No newline at end of file diff --git a/packages/svelte2tsx/test/htmlx2jsx/samples/mustache-tag-object-literal/input.svelte b/packages/svelte2tsx/test/htmlx2jsx/samples/mustache-tag-object-literal/input.svelte new file mode 100644 index 000000000..0d001f271 --- /dev/null +++ b/packages/svelte2tsx/test/htmlx2jsx/samples/mustache-tag-object-literal/input.svelte @@ -0,0 +1,5 @@ +{{ + toString() { return "Hello World" } +}} + +{{ a: '' }['a']} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 29ea244d6..38c0cb205 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -207,12 +207,18 @@ importers: '@types/node': specifier: ^18.0.0 version: 18.19.46 + '@types/semver': + specifier: ^7.7.0 + version: 7.7.0 '@types/vscode': specifier: ^1.67 version: 1.78.0 js-yaml: specifier: ^3.14.0 version: 3.14.1 + semver: + specifier: ^7.7.2 + version: 7.7.2 tslib: specifier: ^2.4.0 version: 2.5.2 @@ -771,6 +777,9 @@ packages: '@types/sade@1.7.4': resolution: {integrity: sha512-6ys13kmtlY0aIOz4KtMdeBD9BHs6vSE3aRcj4vAZqXjypT2el8WZt6799CMjElVgh1cbOH/t3vrpQ4IpwytcPA==} + '@types/semver@7.7.0': + resolution: {integrity: sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA==} + '@types/sinon@7.5.2': resolution: {integrity: sha512-T+m89VdXj/eidZyejvmoP9jivXgBDdkOSBVQjU9kF349NEx10QdPNGxHeZUaj1IlJ32/ewdyXJjnJxyxJroYwg==} @@ -1561,6 +1570,11 @@ packages: engines: {node: '>=10'} hasBin: true + semver@7.7.2: + resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==} + engines: {node: '>=10'} + hasBin: true + serialize-javascript@6.0.0: resolution: {integrity: sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==} @@ -2227,6 +2241,8 @@ snapshots: dependencies: '@types/mri': 1.1.1 + '@types/semver@7.7.0': {} + '@types/sinon@7.5.2': {} '@types/unist@2.0.6': {} @@ -3037,6 +3053,8 @@ snapshots: dependencies: lru-cache: 6.0.0 + semver@7.7.2: {} + serialize-javascript@6.0.0: dependencies: randombytes: 2.1.0 @@ -3290,7 +3308,7 @@ snapshots: vscode-languageclient@9.0.1: dependencies: minimatch: 5.1.6 - semver: 7.5.1 + semver: 7.7.2 vscode-languageserver-protocol: 3.17.5 vscode-languageserver-protocol@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