@webgal/language-server 0.0.2-alpha.3 → 0.0.2-alpha.4

package/build/browser.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-require('./providerState-B7hGbqQj.cjs');
+require('./warnings-De2NDXgx.cjs');
 const require_utils = require('./utils.cjs');
 const require_onInitialize = require('./onInitialize-7r14ko5I.cjs');
 let _volar_language_server_browser = require("@volar/language-server/browser");

package/build/browser.mjs

@@ -1,4 +1,4 @@
-import "./providerState-CLCXHs37.mjs";
+import "./warnings-CWkIAwTu.mjs";
 import { bindCoreFileAccessorToClientVfs, createClientVfsFileSystem, createWebgalVirtualCode, updateWebgalVirtualCode } from "./utils.mjs";
 import { i as registerConnectionHandlers, n as applyServerCapabilities, r as createWebgalService, t as applyClientCapabilities } from "./onInitialize-DLHBz6ds.mjs";
 import { createConnection, createConnection as createConnection$1, createServer, createSimpleProject } from "@volar/language-server/browser";

package/build/index.cjs

@@ -1,4 +1,4 @@
-require('./providerState-B7hGbqQj.cjs');
+require('./warnings-De2NDXgx.cjs');
 const require_utils = require('./utils.cjs');
 const require_onInitialize = require('./onInitialize-7r14ko5I.cjs');
 let _volar_language_server_node = require("@volar/language-server/node");

package/build/index.mjs

@@ -1,4 +1,4 @@
-import "./providerState-CLCXHs37.mjs";
+import "./warnings-CWkIAwTu.mjs";
 import { bindCoreFileAccessorToClientVfs, createClientVfsFileSystem, createWebgalVirtualCode, updateWebgalVirtualCode } from "./utils.mjs";
 import { i as registerConnectionHandlers, n as applyServerCapabilities, r as createWebgalService, t as applyClientCapabilities } from "./onInitialize-DLHBz6ds.mjs";
 import { createConnection, createServer, createSimpleProject } from "@volar/language-server/node";

package/build/utils.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_providerState = require('./providerState-B7hGbqQj.cjs');
+const require_warnings = require('./warnings-De2NDXgx.cjs');
 let _webgal_language_core = require("@webgal/language-core");
 let _volar_language_server = require("@volar/language-server");
 let _volar_language_service = require("@volar/language-service");
@@ -478,8 +478,8 @@ async function validateTextDocument(connection, textDocument, textOverride) {
 	let problems = 0;
 	const diagnostics = [];
 	let _sp = text.split(/\n|\t\n|\r\n/);
-	for (let i in require_providerState.warningConfig) {
-		const _token = require_providerState.warningConfig[i];
+	for (let i in require_warnings.warningConfig) {
+		const _token = require_warnings.warningConfig[i];
 		const _pattern = _token.pattern;
 		if (_token.is_line) continue;
 		if (_token.customCheck && _token.customCheck instanceof Function) {
@@ -505,15 +505,15 @@ async function validateTextDocument(connection, textDocument, textOverride) {
 					uri: textDocument.uri,
 					range: Object.assign({}, diagnostic.range)
 				},
-				message: require_providerState.getDiagnosticInformation(i)
+				message: require_warnings.getDiagnosticInformation(i)
 			}];
 			diagnostics.push(diagnostic);
 		}
 	}
 	for (let _line_index = 0; _line_index < _sp.length; _line_index++) {
 		const _line_text = _sp[_line_index];
-		for (let i in require_providerState.warningConfig) {
-			const _token = require_providerState.warningConfig[i];
+		for (let i in require_warnings.warningConfig) {
+			const _token = require_warnings.warningConfig[i];
 			const _pattern = _token.pattern;
 			if (!_token.is_line) continue;
 			const _newarr = _sp.slice(0, _line_index).join();
@@ -540,7 +540,7 @@ async function validateTextDocument(connection, textDocument, textOverride) {
 						uri: textDocument.uri,
 						range: Object.assign({}, diagnostic.range)
 					},
-					message: require_providerState.getDiagnosticInformation(i)
+					message: require_warnings.getDiagnosticInformation(i)
 				}];
 				diagnostics.push(diagnostic);
 			}
@@ -612,7 +612,6 @@ exports.findTokenRange = findTokenRange;
 exports.getDocumentSettings = getDocumentSettings;
 exports.getPatternAtPosition = getPatternAtPosition;
 exports.getStageCompletionContext = getStageCompletionContext;
-exports.getState = require_providerState.getState;
 exports.getTokenOrPatternAtPosition = getTokenOrPatternAtPosition;
 exports.getWebgalDefinitionMap = getWebgalDefinitionMap;
 exports.getWebgalDocumentLinkCandidates = getWebgalDocumentLinkCandidates;

package/build/utils.d.cts

@@ -13,9 +13,6 @@ interface ServerSettings {
   isShowHint: "关闭" | "最前面" | "变量名前" | "变量名后" | "最后面";
 }
 //#endregion
-//#region src/utils/providerState.d.ts
-declare const getState: (propertiesArray: string[], prev?: any) => any;
-//#endregion
 //#region src/utils/index.d.ts
 type SendRequestConnection = {
   sendRequest: (method: string, ...params: any[]) => Promise<any>;
@@ -108,4 +105,4 @@ declare function createClientVfsFileSystem(connection: SendRequestConnection, op
   uriToPath?: (uri: URI) => string;
 }): FileSystem;
 //#endregion
-export { StateConfig, WebgalDocumentLinkCandidate, WebgalVirtualCode, bindCoreFileAccessorToClientVfs, createClientVfsFileSystem, createVolarFileSystemFromVirtualFileSystem, createWebgalVirtualCode, defaultSettings, documentSettings, findTokenRange, getDocumentSettings, getPatternAtPosition, getStageCompletionContext, getState, getTokenOrPatternAtPosition, getWebgalDefinitionMap, getWebgalDocumentLinkCandidates, getWebgalFoldingRanges, getWebgalLineCommandTypes, getWebgalSourceUriString, getWebgalVirtualCodeLines, getWebgalVirtualCodeText, getWordAtPosition, globalSettings, isPathChar, listPathCandidates, setGlobalSettings, updateWebgalVirtualCode, validateTextDocument };
+export { StateConfig, WebgalDocumentLinkCandidate, WebgalVirtualCode, bindCoreFileAccessorToClientVfs, createClientVfsFileSystem, createVolarFileSystemFromVirtualFileSystem, createWebgalVirtualCode, defaultSettings, documentSettings, findTokenRange, getDocumentSettings, getPatternAtPosition, getStageCompletionContext, getTokenOrPatternAtPosition, getWebgalDefinitionMap, getWebgalDocumentLinkCandidates, getWebgalFoldingRanges, getWebgalLineCommandTypes, getWebgalSourceUriString, getWebgalVirtualCodeLines, getWebgalVirtualCodeText, getWordAtPosition, globalSettings, isPathChar, listPathCandidates, setGlobalSettings, updateWebgalVirtualCode, validateTextDocument };

package/build/utils.d.mts

@@ -13,9 +13,6 @@ interface ServerSettings {
   isShowHint: "关闭" | "最前面" | "变量名前" | "变量名后" | "最后面";
 }
 //#endregion
-//#region src/utils/providerState.d.ts
-declare const getState: (propertiesArray: string[], prev?: any) => any;
-//#endregion
 //#region src/utils/index.d.ts
 type SendRequestConnection = {
   sendRequest: (method: string, ...params: any[]) => Promise<any>;
@@ -108,4 +105,4 @@ declare function createClientVfsFileSystem(connection: SendRequestConnection, op
   uriToPath?: (uri: URI) => string;
 }): FileSystem;
 //#endregion
-export { StateConfig, WebgalDocumentLinkCandidate, WebgalVirtualCode, bindCoreFileAccessorToClientVfs, createClientVfsFileSystem, createVolarFileSystemFromVirtualFileSystem, createWebgalVirtualCode, defaultSettings, documentSettings, findTokenRange, getDocumentSettings, getPatternAtPosition, getStageCompletionContext, getState, getTokenOrPatternAtPosition, getWebgalDefinitionMap, getWebgalDocumentLinkCandidates, getWebgalFoldingRanges, getWebgalLineCommandTypes, getWebgalSourceUriString, getWebgalVirtualCodeLines, getWebgalVirtualCodeText, getWordAtPosition, globalSettings, isPathChar, listPathCandidates, setGlobalSettings, updateWebgalVirtualCode, validateTextDocument };
+export { StateConfig, WebgalDocumentLinkCandidate, WebgalVirtualCode, bindCoreFileAccessorToClientVfs, createClientVfsFileSystem, createVolarFileSystemFromVirtualFileSystem, createWebgalVirtualCode, defaultSettings, documentSettings, findTokenRange, getDocumentSettings, getPatternAtPosition, getStageCompletionContext, getTokenOrPatternAtPosition, getWebgalDefinitionMap, getWebgalDocumentLinkCandidates, getWebgalFoldingRanges, getWebgalLineCommandTypes, getWebgalSourceUriString, getWebgalVirtualCodeLines, getWebgalVirtualCodeText, getWordAtPosition, globalSettings, isPathChar, listPathCandidates, setGlobalSettings, updateWebgalVirtualCode, validateTextDocument };

package/build/utils.mjs

@@ -1,4 +1,4 @@
-import { n as getDiagnosticInformation, r as warningConfig, t as getState } from "./providerState-CLCXHs37.mjs";
+import { n as warningConfig, t as getDiagnosticInformation } from "./warnings-CWkIAwTu.mjs";
 import { fsAccessor, source } from "@webgal/language-core";
 import { DiagnosticSeverity, FoldingRangeKind, Range } from "@volar/language-server";
 import { FileType } from "@volar/language-service";
@@ -600,4 +600,4 @@ function createClientVfsFileSystem(connection, options) {
 }
 
 //#endregion
-export { StateConfig, bindCoreFileAccessorToClientVfs, createClientVfsFileSystem, createVolarFileSystemFromVirtualFileSystem, createWebgalVirtualCode, defaultSettings, documentSettings, findTokenRange, getDocumentSettings, getPatternAtPosition, getStageCompletionContext, getState, getTokenOrPatternAtPosition, getWebgalDefinitionMap, getWebgalDocumentLinkCandidates, getWebgalFoldingRanges, getWebgalLineCommandTypes, getWebgalSourceUriString, getWebgalVirtualCodeLines, getWebgalVirtualCodeText, getWordAtPosition, globalSettings, isPathChar, listPathCandidates, setGlobalSettings, updateWebgalVirtualCode, validateTextDocument };
+export { StateConfig, bindCoreFileAccessorToClientVfs, createClientVfsFileSystem, createVolarFileSystemFromVirtualFileSystem, createWebgalVirtualCode, defaultSettings, documentSettings, findTokenRange, getDocumentSettings, getPatternAtPosition, getStageCompletionContext, getTokenOrPatternAtPosition, getWebgalDefinitionMap, getWebgalDocumentLinkCandidates, getWebgalFoldingRanges, getWebgalLineCommandTypes, getWebgalSourceUriString, getWebgalVirtualCodeLines, getWebgalVirtualCodeText, getWordAtPosition, globalSettings, isPathChar, listPathCandidates, setGlobalSettings, updateWebgalVirtualCode, validateTextDocument };

package/build/warnings-CWkIAwTu.mjs

@@ -0,0 +1,144 @@
+import { source } from "@webgal/language-core";
+import { DiagnosticSeverity } from "@volar/language-server";
+
+//#region src/warnings.ts
+function remove_space(_text) {
+	_text = _text.replace(/^([\n\r\t]+)/, function(input, match) {
+		return input.slice(match.length);
+	});
+	return _text;
+}
+const warningConfig = {
+	"0001": {
+		id: "0001",
+		message: (...args) => {
+			return `${args[0]} 前面包含一个以上的空格或换行`;
+		},
+		DiagnosticInformation: "指令格式不规范（%id%）",
+		pattern: /(\s{2,}-[A-Za-z]+)\b/g,
+		is_line: false
+	},
+	"0002": {
+		id: "0002",
+		message: (...args) => {
+			return `${args[0]} 变量名开头为数字`;
+		},
+		DiagnosticInformation: "变量命名不规范（%id%）",
+		pattern: /^setVar:([0-9]+\S+);/g,
+		is_line: true,
+		customCheck: function(textDocument, _text, _base_offset, _newarr) {
+			const _ori_text = _text;
+			_text = remove_space(_text);
+			let _offset = 0;
+			for (let i = 0; i < _newarr.length; i++) {
+				const _data = _newarr[i];
+				if (/(\r\n)/.test(_data) || _data == "\\r\\n") _offset += 2;
+				else _offset += _data.length;
+			}
+			if (this.pattern.exec(_text)) {
+				const diagnostic = {
+					severity: DiagnosticSeverity.Warning,
+					range: {
+						start: textDocument.positionAt(_offset),
+						end: textDocument.positionAt(_offset + _text.length)
+					},
+					message: message(this.id, _ori_text.trim()),
+					source
+				};
+				diagnostic.relatedInformation = [{
+					location: {
+						uri: textDocument.uri,
+						range: Object.assign({}, diagnostic.range)
+					},
+					message: getDiagnosticInformation(this.id)
+				}];
+				return diagnostic;
+			}
+			return null;
+		}
+	},
+	"0003": {
+		id: "0003",
+		message: (...args) => {
+			return `${args[0]} 冒号后面需要添加一个空格`;
+		},
+		DiagnosticInformation: "指令不规范（%id%）",
+		pattern: /^([^\s]+):[^\s](.+)/g,
+		is_line: true
+	},
+	"0004": {
+		id: "0004",
+		message: (...args) => {
+			return `${args[0]} 插值变量周围存在空格`;
+		},
+		DiagnosticInformation: "变量插值不规范（%id%）",
+		pattern: /{(\S+\s{1,}|\s{1,}\S+|\s{1,}\S+\s{1,})}/g,
+		is_line: false
+	},
+	"0005": {
+		id: "0005",
+		message: (...args) => {
+			return `${args[0]} 语句缺少结束标识`;
+		},
+		DiagnosticInformation: "语句不规范（%id%）",
+		pattern: /none/g,
+		customCheck: function(textDocument, _text, _base_offset, _newarr) {
+			_text = remove_space(_text);
+			let _offset = 0;
+			for (let i = 0; i < _newarr.length; i++) {
+				const _data = _newarr[i];
+				if (/(\r\n)/.test(_data) || _data == "\\r\\n") _offset += 2;
+				else _offset += _data.length;
+			}
+			const _res_match_start = _text.endsWith(";") ? true : false;
+			const _res = _text.startsWith(";") || _res_match_start ? true : false;
+			if (!_text.includes(";") && !_res && _text.length > 0) {
+				const diagnostic = {
+					severity: DiagnosticSeverity.Warning,
+					range: {
+						start: textDocument.positionAt(_offset),
+						end: textDocument.positionAt(_offset + _text.trim().length)
+					},
+					message: message(this.id, _text.trim()),
+					source
+				};
+				diagnostic.relatedInformation = [{
+					location: {
+						uri: textDocument.uri,
+						range: Object.assign({}, diagnostic.range)
+					},
+					message: getDiagnosticInformation(this.id)
+				}];
+				return diagnostic;
+			}
+			return null;
+		},
+		is_line: true
+	}
+};
+/**
+* @description: 获取诊断结果
+* @param {string} id
+* @param {array} args
+* @return {*}
+*/
+function message(id, ...args) {
+	const _data = warningConfig[id];
+	if (!_data) return false;
+	return _data.message(...args);
+}
+/**
+* @description: 获取诊断类型信息
+* @param {string} id
+* @return {*}
+*/
+function getDiagnosticInformation(id) {
+	const _data = warningConfig[id];
+	if (!_data) return "未知错误类型";
+	return _data.DiagnosticInformation.replace(/%(\w+)%/g, function() {
+		return id;
+	});
+}
+
+//#endregion
+export { warningConfig as n, getDiagnosticInformation as t };

package/build/warnings-De2NDXgx.cjs

@@ -0,0 +1,155 @@
+let _webgal_language_core = require("@webgal/language-core");
+let _volar_language_server = require("@volar/language-server");
+
+//#region src/warnings.ts
+function remove_space(_text) {
+	_text = _text.replace(/^([\n\r\t]+)/, function(input, match) {
+		return input.slice(match.length);
+	});
+	return _text;
+}
+const warningConfig = {
+	"0001": {
+		id: "0001",
+		message: (...args) => {
+			return `${args[0]} 前面包含一个以上的空格或换行`;
+		},
+		DiagnosticInformation: "指令格式不规范（%id%）",
+		pattern: /(\s{2,}-[A-Za-z]+)\b/g,
+		is_line: false
+	},
+	"0002": {
+		id: "0002",
+		message: (...args) => {
+			return `${args[0]} 变量名开头为数字`;
+		},
+		DiagnosticInformation: "变量命名不规范（%id%）",
+		pattern: /^setVar:([0-9]+\S+);/g,
+		is_line: true,
+		customCheck: function(textDocument, _text, _base_offset, _newarr) {
+			const _ori_text = _text;
+			_text = remove_space(_text);
+			let _offset = 0;
+			for (let i = 0; i < _newarr.length; i++) {
+				const _data = _newarr[i];
+				if (/(\r\n)/.test(_data) || _data == "\\r\\n") _offset += 2;
+				else _offset += _data.length;
+			}
+			if (this.pattern.exec(_text)) {
+				const diagnostic = {
+					severity: _volar_language_server.DiagnosticSeverity.Warning,
+					range: {
+						start: textDocument.positionAt(_offset),
+						end: textDocument.positionAt(_offset + _text.length)
+					},
+					message: message(this.id, _ori_text.trim()),
+					source: _webgal_language_core.source
+				};
+				diagnostic.relatedInformation = [{
+					location: {
+						uri: textDocument.uri,
+						range: Object.assign({}, diagnostic.range)
+					},
+					message: getDiagnosticInformation(this.id)
+				}];
+				return diagnostic;
+			}
+			return null;
+		}
+	},
+	"0003": {
+		id: "0003",
+		message: (...args) => {
+			return `${args[0]} 冒号后面需要添加一个空格`;
+		},
+		DiagnosticInformation: "指令不规范（%id%）",
+		pattern: /^([^\s]+):[^\s](.+)/g,
+		is_line: true
+	},
+	"0004": {
+		id: "0004",
+		message: (...args) => {
+			return `${args[0]} 插值变量周围存在空格`;
+		},
+		DiagnosticInformation: "变量插值不规范（%id%）",
+		pattern: /{(\S+\s{1,}|\s{1,}\S+|\s{1,}\S+\s{1,})}/g,
+		is_line: false
+	},
+	"0005": {
+		id: "0005",
+		message: (...args) => {
+			return `${args[0]} 语句缺少结束标识`;
+		},
+		DiagnosticInformation: "语句不规范（%id%）",
+		pattern: /none/g,
+		customCheck: function(textDocument, _text, _base_offset, _newarr) {
+			_text = remove_space(_text);
+			let _offset = 0;
+			for (let i = 0; i < _newarr.length; i++) {
+				const _data = _newarr[i];
+				if (/(\r\n)/.test(_data) || _data == "\\r\\n") _offset += 2;
+				else _offset += _data.length;
+			}
+			const _res_match_start = _text.endsWith(";") ? true : false;
+			const _res = _text.startsWith(";") || _res_match_start ? true : false;
+			if (!_text.includes(";") && !_res && _text.length > 0) {
+				const diagnostic = {
+					severity: _volar_language_server.DiagnosticSeverity.Warning,
+					range: {
+						start: textDocument.positionAt(_offset),
+						end: textDocument.positionAt(_offset + _text.trim().length)
+					},
+					message: message(this.id, _text.trim()),
+					source: _webgal_language_core.source
+				};
+				diagnostic.relatedInformation = [{
+					location: {
+						uri: textDocument.uri,
+						range: Object.assign({}, diagnostic.range)
+					},
+					message: getDiagnosticInformation(this.id)
+				}];
+				return diagnostic;
+			}
+			return null;
+		},
+		is_line: true
+	}
+};
+/**
+* @description: 获取诊断结果
+* @param {string} id
+* @param {array} args
+* @return {*}
+*/
+function message(id, ...args) {
+	const _data = warningConfig[id];
+	if (!_data) return false;
+	return _data.message(...args);
+}
+/**
+* @description: 获取诊断类型信息
+* @param {string} id
+* @return {*}
+*/
+function getDiagnosticInformation(id) {
+	const _data = warningConfig[id];
+	if (!_data) return "未知错误类型";
+	return _data.DiagnosticInformation.replace(/%(\w+)%/g, function() {
+		return id;
+	});
+}
+
+//#endregion
+Object.defineProperty(exports, 'getDiagnosticInformation', {
+  enumerable: true,
+  get: function () {
+    return getDiagnosticInformation;
+  }
+});
+Object.defineProperty(exports, 'warningConfig', {
+  enumerable: true,
+  get: function () {
+    return warningConfig;
+  }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webgal/language-server",
-	"version": "0.0.2-alpha.3",
+	"version": "0.0.2-alpha.4",
 	"main": "build/index.cjs",
 	"module": "build/index.mjs",
 	"types": "build/index.d.mts",
@@ -41,7 +41,6 @@
 	},
 	"scripts": {
 		"build": "tsdown",
-		"gen": "tsx scripts/gen.ts",
 		"dev": "pnpm build && node bin/webgal-language-server.js --stdio",
 		"dev:ws": "pnpm build && node bin/webgal-language-server.js --ws",
 		"format": " prettier --write \"src/**/*.ts\"",
@@ -55,7 +54,7 @@
 		"@volar/language-service": "~2.4.0",
 		"@volar/typescript": "~2.4.0",
 		"@webgal/language-core": "0.0.2-alpha.1",
-		"@webgal/language-service": "0.0.2-alpha.4",
+		"@webgal/language-service": "0.0.2-alpha.5",
 		"tsc-alias": "^1.8.16",
 		"vscode-languageserver": "^9.0.1",
 		"vscode-languageserver-textdocument": "^1.0.11",
@@ -68,5 +67,5 @@
 		"tsdown": "^0.20.3",
 		"tsx": "^4.21.0"
 	},
-	"gitHead": "8ae85838b6fd53666ccdedaa6a1afcf5d51451ce"
+	"gitHead": "49b671a9dd0970e01eea1be9a8821f1d3131384b"
 }