@skaldapp/monaco-sfc 1.1.46 → 1.1.47

package/dist/vue.worker.js

@@ -15470,102 +15470,87 @@ var require_collectBindings = /* @__PURE__ */ __commonJSMin(((exports) => {
 var require_interpolation = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	exports.generateInterpolation = generateInterpolation;
+	exports.shouldIdentifierSkipped = shouldIdentifierSkipped;
 	var shared_1 = (init_shared_esm_bundler(), __toCommonJS(shared_esm_bundler_exports));
 	var collectBindings_1 = require_collectBindings();
 	var shared_2 = require_shared$2();
 	var codeFeatures_1 = require_codeFeatures();
 	var names_1 = require_names();
 	var utils_1 = require_utils$5();
+	var boundary_1 = require_boundary();
 	var isLiteralWhitelisted = /* @__PURE__ */ (0, shared_1.makeMap)("true,false,null,this");
 	function* generateInterpolation({ typescript, setupRefs }, ctx, block, data, code, start, prefix = "", suffix = "") {
-		for (const segment of forEachInterpolationSegment(typescript, setupRefs, ctx, block, code, start, prefix, suffix)) {
-			if (typeof segment === "string") {
-				yield segment;
-				continue;
-			}
-			let [section, offset, type] = segment;
-			offset -= prefix.length;
-			let addSuffix = "";
-			const overLength = offset + section.length - code.length;
-			if (overLength > 0) {
-				addSuffix = section.slice(section.length - overLength);
-				section = section.slice(0, -overLength);
-			}
-			if (offset < 0) {
-				yield section.slice(0, -offset);
-				section = section.slice(-offset);
-				offset = 0;
-			}
-			if (!(section.length === 0 && type === "startEnd")) yield [
-				section,
-				block.name,
-				start + offset,
-				type === "errorMappingOnly" ? codeFeatures_1.codeFeatures.verification : type === "shorthand" ? {
-					...data,
-					__shorthandExpression: "js"
-				} : data
-			];
-			yield addSuffix;
-		}
-	}
-	function* forEachInterpolationSegment(ts, setupRefs, ctx, block, originalCode, start, prefix, suffix) {
-		const code = prefix + originalCode + suffix;
+		if (prefix) yield prefix;
 		let prevEnd = 0;
-		for (const [name, offset, isShorthand] of forEachIdentifiers(ts, ctx, block, originalCode, code, prefix)) {
+		for (const [name, offset, isShorthand] of forEachIdentifiers(typescript, ctx, block, code, prefix, suffix)) {
 			if (isShorthand) {
-				yield [code.slice(prevEnd, offset + name.length), prevEnd];
+				yield [
+					code.slice(prevEnd, offset + name.length),
+					block.name,
+					start + prevEnd,
+					data
+				];
 				yield `: `;
-			} else yield [
+			} else if (prevEnd < offset) yield [
 				code.slice(prevEnd, offset),
-				prevEnd,
-				prevEnd > 0 ? void 0 : "startEnd"
+				block.name,
+				start + prevEnd,
+				data
 			];
 			if (setupRefs.has(name)) {
-				yield [name, offset];
-				yield `.value`;
-			} else {
 				yield [
-					"",
-					offset,
-					"errorMappingOnly"
+					name,
+					block.name,
+					start + offset,
+					data
 				];
+				yield `.value`;
+			} else {
+				const token = yield* (0, boundary_1.startBoundary)(block.name, start + offset, codeFeatures_1.codeFeatures.verification);
 				if (ctx.dollarVars.has(name)) yield names_1.names.dollars;
 				else {
-					ctx.recordComponentAccess(block.name, name, start - prefix.length + offset);
+					ctx.recordComponentAccess(block.name, name, start + offset);
 					yield names_1.names.ctx;
 				}
 				yield `.`;
 				yield [
 					name,
-					offset,
-					isShorthand ? "shorthand" : void 0
+					block.name,
+					start + offset,
+					isShorthand ? {
+						...data,
+						__shorthandExpression: "js"
+					} : data
 				];
+				yield (0, boundary_1.endBoundary)(token, start + offset + name.length);
 			}
 			prevEnd = offset + name.length;
 		}
 		if (prevEnd < code.length) yield [
 			code.slice(prevEnd),
-			prevEnd,
-			"startEnd"
+			block.name,
+			start + prevEnd,
+			data
 		];
+		if (suffix) yield suffix;
 	}
-	function* forEachIdentifiers(ts, ctx, block, originalCode, code, prefix) {
-		if (utils_1.identifierRegex.test(originalCode) && !shouldIdentifierSkipped(ctx, originalCode)) {
+	function* forEachIdentifiers(ts, ctx, block, code, prefix, suffix) {
+		if (utils_1.identifierRegex.test(code) && !shouldIdentifierSkipped(ctx, code)) {
 			yield [
-				originalCode,
-				prefix.length,
+				code,
+				0,
 				false
 			];
 			return;
 		}
 		const endScope = ctx.startScope();
-		const ast = (0, utils_1.getTypeScriptAST)(ts, block, code);
+		const ast = (0, utils_1.getTypeScriptAST)(ts, block, prefix + code + suffix);
 		for (const [id, isShorthand] of forEachDeclarations(ts, ast, ast, ctx)) {
 			const text = (0, shared_2.getNodeText)(ts, id, ast);
 			if (shouldIdentifierSkipped(ctx, text)) continue;
 			yield [
 				text,
-				(0, shared_2.getStartEnd)(ts, id, ast).start,
+				(0, shared_2.getStartEnd)(ts, id, ast).start - prefix.length,
 				isShorthand
 			];
 		}
@@ -18216,7 +18201,7 @@ var require_elementProps = /* @__PURE__ */ __commonJSMin(((exports) => {
 					...codeFeatures_1.codeFeatures.withoutHighlightAndCompletion,
 					__shorthandExpression: "html"
 				});
-				if (ctx.scopes.some((scope) => scope.has(propVariableName))) yield* codes;
+				if ((0, interpolation_1.shouldIdentifierSkipped)(ctx, propVariableName)) yield* codes;
 				else if (options.setupRefs.has(propVariableName)) {
 					yield* codes;
 					yield `.value`;
@@ -32561,6 +32546,7 @@ var require_range = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			return this.range;
 		}
 		parseRange(range) {
+			range = range.replace(BUILDSTRIPRE, "");
 			const memoKey = ((this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE)) + ":" + range;
 			const cached = cache.get(memoKey);
 			if (cached) return cached;
@@ -32619,8 +32605,9 @@ var require_range = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var Comparator = require_comparator();
 	var debug = require_debug();
 	var SemVer = require_semver$1();
-	var { safeRe: re, t, comparatorTrimReplace, tildeTrimReplace, caretTrimReplace } = require_re();
+	var { safeRe: re, src, t, comparatorTrimReplace, tildeTrimReplace, caretTrimReplace } = require_re();
 	var { FLAG_INCLUDE_PRERELEASE, FLAG_LOOSE } = require_constants();
+	var BUILDSTRIPRE = new RegExp(src[t.BUILD], "g");
 	var isNullSet = (c) => c.value === "<0.0.0-0";
 	var isAny = (c) => c.value === "";
 	var isSatisfiable = (comparators, options) => {
@@ -33147,7 +33134,7 @@ var require_subset = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				if (c.operator === ">" || c.operator === ">=") {
 					higher = higherGT(gt, c, options);
 					if (higher === c && higher !== gt) return false;
-				} else if (gt.operator === ">=" && !satisfies(gt.semver, String(c), options)) return false;
+				} else if (gt.operator === ">=" && !c.test(gt.semver)) return false;
 			}
 			if (lt) {
 				if (needDomLTPre) {
@@ -33156,7 +33143,7 @@ var require_subset = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				if (c.operator === "<" || c.operator === "<=") {
 					lower = lowerLT(lt, c, options);
 					if (lower === c && lower !== lt) return false;
-				} else if (lt.operator === "<=" && !satisfies(lt.semver, String(c), options)) return false;
+				} else if (lt.operator === "<=" && !c.test(lt.semver)) return false;
 			}
 			if (!c.operator && (lt || gt) && gtltComp !== 0) return false;
 		}
@@ -169594,7 +169581,7 @@ ${lanes.join("\n")}
 						type = getIntendedTypeFromJSDocTypeReference(node);
 						if (!type) {
 							symbol = resolveTypeReferenceName(node, meaning, true);
-							if (symbol === unknownSymbol) symbol = resolveTypeReferenceName(node, meaning | 111551);
+							if (symbol === unknownSymbol) symbol = resolveTypeReferenceName(node, 900095);
 							else resolveTypeReferenceName(node, meaning);
 							type = getTypeReferenceType(node, symbol);
 						}
@@ -244236,7 +244223,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
 				};
 			}
 			return {
-				newText: openComment + closeComment,
+				newText: "/** */",
 				caretOffset: 3
 			};
 		}
@@ -262428,7 +262415,6 @@ var require_moduleSpecifierCache$3 = /* @__PURE__ */ __commonJSMin(((exports) =>
 	exports.createModuleSpecifierCache = exports.nodeModulesPathPart = void 0;
 	exports.nodeModulesPathPart = "/node_modules/";
 	function createModuleSpecifierCache() {
-		let containedNodeModulesWatchers;
 		let cache;
 		let currentKey;
 		const result = {
@@ -262455,9 +262441,7 @@ var require_moduleSpecifierCache$3 = /* @__PURE__ */ __commonJSMin(((exports) =>
 				else cache.set(toFileName, createInfo(void 0, void 0, isBlockedByPackageJsonDependencies));
 			},
 			clear() {
-				containedNodeModulesWatchers === null || containedNodeModulesWatchers === void 0 || containedNodeModulesWatchers.forEach((watcher) => watcher.close());
 				cache === null || cache === void 0 || cache.clear();
-				containedNodeModulesWatchers === null || containedNodeModulesWatchers === void 0 || containedNodeModulesWatchers.clear();
 				currentKey = void 0;
 			},
 			count() {
@@ -262686,7 +262670,6 @@ var require_moduleSpecifierCache$2 = /* @__PURE__ */ __commonJSMin(((exports) =>
 	exports.createModuleSpecifierCache = exports.nodeModulesPathPart = void 0;
 	exports.nodeModulesPathPart = "/node_modules/";
 	function createModuleSpecifierCache() {
-		let containedNodeModulesWatchers;
 		let cache;
 		let currentKey;
 		const result = {
@@ -262713,9 +262696,7 @@ var require_moduleSpecifierCache$2 = /* @__PURE__ */ __commonJSMin(((exports) =>
 				else cache.set(toFileName, createInfo(void 0, void 0, isBlockedByPackageJsonDependencies));
 			},
 			clear() {
-				containedNodeModulesWatchers === null || containedNodeModulesWatchers === void 0 || containedNodeModulesWatchers.forEach((watcher) => watcher.close());
 				cache === null || cache === void 0 || cache.clear();
-				containedNodeModulesWatchers === null || containedNodeModulesWatchers === void 0 || containedNodeModulesWatchers.clear();
 				currentKey = void 0;
 			},
 			count() {
@@ -263164,7 +263145,6 @@ var require_moduleSpecifierCache$1 = /* @__PURE__ */ __commonJSMin(((exports) =>
 	Object.defineProperty(exports, "__esModule", { value: true });
 	exports.createModuleSpecifierCache = void 0;
 	function createModuleSpecifierCache() {
-		let containedNodeModulesWatchers;
 		let cache;
 		let currentKey;
 		const result = {
@@ -263191,9 +263171,7 @@ var require_moduleSpecifierCache$1 = /* @__PURE__ */ __commonJSMin(((exports) =>
 				else cache.set(toFileName, createInfo(void 0, void 0, void 0, isBlockedByPackageJsonDependencies));
 			},
 			clear() {
-				containedNodeModulesWatchers === null || containedNodeModulesWatchers === void 0 || containedNodeModulesWatchers.forEach((watcher) => watcher.close());
 				cache === null || cache === void 0 || cache.clear();
-				containedNodeModulesWatchers === null || containedNodeModulesWatchers === void 0 || containedNodeModulesWatchers.clear();
 				currentKey = void 0;
 			},
 			count() {
@@ -263251,7 +263229,6 @@ var require_moduleSpecifierCache = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	exports.createModuleSpecifierCache = void 0;
 	function createModuleSpecifierCache() {
-		let containedNodeModulesWatchers;
 		let cache;
 		let currentKey;
 		const result = {
@@ -263280,9 +263257,7 @@ var require_moduleSpecifierCache = /* @__PURE__ */ __commonJSMin(((exports) => {
 				} else cache.set(toFileName, createInfo(void 0, void 0, void 0, void 0, isBlockedByPackageJsonDependencies));
 			},
 			clear() {
-				containedNodeModulesWatchers === null || containedNodeModulesWatchers === void 0 || containedNodeModulesWatchers.forEach((watcher) => watcher.close());
 				cache === null || cache === void 0 || cache.clear();
-				containedNodeModulesWatchers === null || containedNodeModulesWatchers === void 0 || containedNodeModulesWatchers.clear();
 				currentKey = void 0;
 			},
 			count() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://www.schemastore.org/package",
   "name": "@skaldapp/monaco-sfc",
-  "version": "1.1.46",
+  "version": "1.1.47",
   "description": "A Monaco Editor language server for Vue Single File Components (SFC) providing syntax highlighting, IntelliSense, error detection, and more",
   "keywords": [
     "vue",
@@ -54,9 +54,9 @@
     "@remote-dom/polyfill": "^1.5.1",
     "@volar/jsdelivr": "^2.4.28",
     "@volar/monaco": "^2.4.28",
-    "@vue/language-core": "^3.3.1",
-    "@vue/language-service": "^3.3.1",
-    "@vue/typescript-plugin": "^3.3.1",
+    "@vue/language-core": "^3.3.2",
+    "@vue/language-service": "^3.3.2",
+    "@vue/typescript-plugin": "^3.3.2",
     "monaco-editor": "0.52.2",
     "typescript": "^6.0.3",
     "volar-service-typescript": "^0.0.71",
@@ -65,12 +65,12 @@
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^29.0.2",
-    "@skaldapp/configs": "^1.2.109",
+    "@skaldapp/configs": "^1.2.110",
     "@types/markdown-it": "^14.1.2",
     "@types/node": "^25.9.1",
     "eslint": "^10.4.0",
     "jsonc-parser": "^3.3.1",
     "path-browserify": "^1.0.1",
-    "vite": "^8.0.13"
+    "vite": "^8.0.14"
   }
 }