Merge pull request #191 from DTStack/next_merge_main

JackWang032 · web-flow · commit 9ec899cc1ee7 · 2025-10-24T14:45:24.000+08:00
Next merge main
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,41 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.15.1](https://github.com/DTStack/monaco-sql-languages/compare/v0.15.0...v0.15.1) (2025-06-06)
+
+
+### Bug Fixes
+
+* [#166](https://github.com/DTStack/monaco-sql-languages/issues/166) upgrade dt-sql-parser version ([#183](https://github.com/DTStack/monaco-sql-languages/issues/183)) ([fea3c3c](https://github.com/DTStack/monaco-sql-languages/commit/fea3c3c79682eed760dd7c00a4a5b830a60d9565))
+
+## [0.15.0](https://github.com/DTStack/monaco-sql-languages/compare/v0.14.0...v0.15.0) (2025-05-16)
+
+
+### Features
+
+* **sqlParser:** upgrade dt-sql-parser@4.3.0 ([58a4304](https://github.com/DTStack/monaco-sql-languages/commit/58a430403d2f3a97e91c500e14d9fd3f4be7427c))
+
+## [0.14.0](https://github.com/DTStack/monaco-sql-languages/compare/v0.13.1...v0.14.0) (2025-05-09)
+
+
+### Features
+
+* **dependency:** upgrade dt-sql-parser@4.2.0 ([6d0d6c2](https://github.com/DTStack/monaco-sql-languages/commit/6d0d6c26c80a31325dd8c400b43ab331dab9ac95))
+* support built-in sql snippets ([#154](https://github.com/DTStack/monaco-sql-languages/issues/154)) ([a5d68bb](https://github.com/DTStack/monaco-sql-languages/commit/a5d68bbb32d219715d4caf6abcb9b98cc754b861))
+
+
+### Bug Fixes
+
+* **scripts:** resolve configuration conflicts ([76d728c](https://github.com/DTStack/monaco-sql-languages/commit/76d728ce75c75dea0e0eaf69b2b9bba44c644952))
+
+### [0.13.1](https://github.com/DTStack/monaco-sql-languages/compare/v0.13.0...v0.13.1) (2025-02-17)
+
+
+### Features
+
+* [#167](https://github.com/DTStack/monaco-sql-languages/issues/167) support dt highlight style ([#168](https://github.com/DTStack/monaco-sql-languages/issues/168)) ([7beb537](https://github.com/DTStack/monaco-sql-languages/commit/7beb5373a40317a7ecd18a9cc66f5f133e27345b))
+* update dt-sql-parser's version ([#174](https://github.com/DTStack/monaco-sql-languages/issues/174)) ([159df20](https://github.com/DTStack/monaco-sql-languages/commit/159df20946198d549705afb61cbbdc7ef72e7d88))
+
 ## [0.13.0](https://github.com/DTStack/monaco-sql-languages/compare/v0.12.1...v0.13.0) (2025-02-13)
 
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "monaco-sql-languages",
-	"version": "0.13.0",
+	"version": "0.15.1",
 	"description": "SQL languages for the Monaco Editor, based on monaco-languages.",
 	"scripts": {
 		"prepublishOnly": "npm run build",
@@ -66,9 +66,6 @@
 	"simple-git-hooks": {
 		"pre-commit": "npx pretty-quick --staged"
 	},
-	"dependencies": {
-		"dt-sql-parser": "4.2.0"
-	},
 	"peerDependencies": {
 		"monaco-editor": ">=0.31.0"
 	},
@@ -85,5 +82,8 @@
 		"*": [
 			"prettier --write --ignore-unknown"
 		]
+	},
+	"dependencies": {
+		"dt-sql-parser": "4.3.1"
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/languages/flink/flink.ts b/src/languages/flink/flink.ts
@@ -489,13 +489,14 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@comments' },
 			{ include: '@whitespace' },
 			{ include: '@pseudoColumns' },
+			{ include: '@customParams' },
 			{ include: '@numbers' },
 			{ include: '@strings' },
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
 			{ include: '@complexFunctions' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@#$]+/,
@@ -535,6 +536,10 @@ export const language = <languages.IMonarchLanguage>{
 				}
 			]
 		],
+		customParams: [
+			[/\${[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE],
+			[/\@\@{[A-Za-z0-9._-]*}/, TokenClassConsts.VARIABLE]
+		],
 		numbers: [
 			[/0[xX][0-9a-fA-F]*/, TokenClassConsts.NUMBER_HEX],
 			[/[$][+-]*\d*(\.\d*)?/, TokenClassConsts.NUMBER],
diff --git a/src/languages/hive/hive.ts b/src/languages/hive/hive.ts
@@ -515,7 +515,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@#$]+/,
diff --git a/src/languages/impala/impala.ts b/src/languages/impala/impala.ts
@@ -474,7 +474,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
 			{ include: '@complexOperators' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@#$]+/,
diff --git a/src/languages/mysql/mysql.ts b/src/languages/mysql/mysql.ts
@@ -911,7 +911,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexOperators' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@]+/,
diff --git a/src/languages/pgsql/pgsql.ts b/src/languages/pgsql/pgsql.ts
@@ -980,7 +980,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@#$]+/,
diff --git a/src/languages/spark/spark.ts b/src/languages/spark/spark.ts
@@ -699,7 +699,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@#$]+/,
diff --git a/src/languages/trino/trino.ts b/src/languages/trino/trino.ts
@@ -636,7 +636,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
-			[/[;,.]/, TokenClassConsts.DELIMITER],
+			[/[:;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
 				/[\w@$-]+/, // https://trino.io/docs/current/language/reserved.html#language-identifiers
diff --git a/src/theme/vs-plus/light.ts b/src/theme/vs-plus/light.ts
@@ -8,31 +8,31 @@ export const lightThemeData: editor.IStandaloneThemeData = {
 	base: 'vs',
 	inherit: true,
 	rules: [
-		{ token: postfixTokenClass(TokenClassConsts.BINARY), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.BINARY_ESCAPE), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.COMMENT), foreground: '008000' },
-		{ token: postfixTokenClass(TokenClassConsts.COMMENT_QUOTE), foreground: '008000' },
-		{ token: postfixTokenClass(TokenClassConsts.DELIMITER), foreground: '000000' },
-		{ token: postfixTokenClass(TokenClassConsts.DELIMITER_CURLY), foreground: '319331' },
-		{ token: postfixTokenClass(TokenClassConsts.DELIMITER_PAREN), foreground: '0431fa' },
-		{ token: postfixTokenClass(TokenClassConsts.DELIMITER_SQUARE), foreground: '0431fa' },
-		{ token: postfixTokenClass(TokenClassConsts.IDENTIFIER), foreground: '001080' },
-		{ token: postfixTokenClass(TokenClassConsts.IDENTIFIER_QUOTE), foreground: '001080' },
-		{ token: postfixTokenClass(TokenClassConsts.KEYWORD), foreground: '0000ff' },
-		{ token: postfixTokenClass(TokenClassConsts.KEYWORD_SCOPE), foreground: 'af00db' },
-		{ token: postfixTokenClass(TokenClassConsts.NUMBER), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.NUMBER_FLOAT), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.NUMBER_BINARY), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.NUMBER_OCTAL), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.NUMBER_HEX), foreground: '098658' },
-		{ token: postfixTokenClass(TokenClassConsts.OPERATOR), foreground: '000000' },
-		{ token: postfixTokenClass(TokenClassConsts.OPERATOR_KEYWORD), foreground: '0000ff' },
-		{ token: postfixTokenClass(TokenClassConsts.OPERATOR_SYMBOL), foreground: '000000' },
-		{ token: postfixTokenClass(TokenClassConsts.PREDEFINED), foreground: '795e26' },
-		{ token: postfixTokenClass(TokenClassConsts.STRING), foreground: 'a31515' },
-		{ token: postfixTokenClass(TokenClassConsts.STRING_ESCAPE), foreground: 'a31515' },
-		{ token: postfixTokenClass(TokenClassConsts.TYPE), foreground: '267f99' },
-		{ token: postfixTokenClass(TokenClassConsts.VARIABLE), foreground: '4fc1ff' }
+		{ token: postfixTokenClass(TokenClassConsts.BINARY), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.BINARY_ESCAPE), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.NUMBER), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.NUMBER_FLOAT), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.NUMBER_BINARY), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.NUMBER_OCTAL), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.NUMBER_HEX), foreground: '45AB5A' },
+		{ token: postfixTokenClass(TokenClassConsts.COMMENT), foreground: 'B1B4C5' },
+		{ token: postfixTokenClass(TokenClassConsts.COMMENT_QUOTE), foreground: 'B1B4C5' },
+		{ token: postfixTokenClass(TokenClassConsts.DELIMITER), foreground: '7D98B1' },
+		{ token: postfixTokenClass(TokenClassConsts.OPERATOR), foreground: '7D98B1' },
+		{ token: postfixTokenClass(TokenClassConsts.OPERATOR_SYMBOL), foreground: '7D98B1' },
+		{ token: postfixTokenClass(TokenClassConsts.DELIMITER_CURLY), foreground: 'B1BB86' },
+		{ token: postfixTokenClass(TokenClassConsts.DELIMITER_PAREN), foreground: 'B1BB86' },
+		{ token: postfixTokenClass(TokenClassConsts.DELIMITER_SQUARE), foreground: 'B1BB86' },
+		{ token: postfixTokenClass(TokenClassConsts.IDENTIFIER), foreground: '201A1A' },
+		{ token: postfixTokenClass(TokenClassConsts.IDENTIFIER_QUOTE), foreground: '201A1A' },
+		{ token: postfixTokenClass(TokenClassConsts.KEYWORD), foreground: '3300FF' },
+		{ token: postfixTokenClass(TokenClassConsts.OPERATOR_KEYWORD), foreground: '3300FF' },
+		{ token: postfixTokenClass(TokenClassConsts.KEYWORD_SCOPE), foreground: 'E221DA' },
+		{ token: postfixTokenClass(TokenClassConsts.PREDEFINED), foreground: 'C3771C' },
+		{ token: postfixTokenClass(TokenClassConsts.STRING), foreground: 'BC1313' },
+		{ token: postfixTokenClass(TokenClassConsts.STRING_ESCAPE), foreground: 'BC1313' },
+		{ token: postfixTokenClass(TokenClassConsts.TYPE), foreground: '256FC6' },
+		{ token: postfixTokenClass(TokenClassConsts.VARIABLE), foreground: '00AD84' }
 	],
 	colors: {}
 };

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ export const language = <languages.IMonarchLanguage>{`
`515`	`515`	`{ include: '@complexIdentifiers' },`
`516`	`516`	`{ include: '@scopes' },`
`517`	`517`	`{ include: '@complexDataTypes' },`
`518`		`- [/[;,.]/, TokenClassConsts.DELIMITER],`
	`518`	`+ [/[:;,.]/, TokenClassConsts.DELIMITER],`
`519`	`519`	`[/[\(\)\[\]\{\}]/, '@brackets'],`
`520`	`520`	`[`
`521`	`521`	`/[\w@#$]+/,`
Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ export const language = <languages.IMonarchLanguage>{`
`474`	`474`	`{ include: '@scopes' },`
`475`	`475`	`{ include: '@complexDataTypes' },`
`476`	`476`	`{ include: '@complexOperators' },`
`477`		`- [/[;,.]/, TokenClassConsts.DELIMITER],`
	`477`	`+ [/[:;,.]/, TokenClassConsts.DELIMITER],`
`478`	`478`	`[/[\(\)\[\]\{\}]/, '@brackets'],`
`479`	`479`	`[`
`480`	`480`	`/[\w@#$]+/,`
Original file line number	Diff line number	Diff line change
`@@ -911,7 +911,7 @@ export const language = <languages.IMonarchLanguage>{`
`911`	`911`	`{ include: '@complexIdentifiers' },`
`912`	`912`	`{ include: '@scopes' },`
`913`	`913`	`{ include: '@complexOperators' },`
`914`		`- [/[;,.]/, TokenClassConsts.DELIMITER],`
	`914`	`+ [/[:;,.]/, TokenClassConsts.DELIMITER],`
`915`	`915`	`[/[\(\)\[\]\{\}]/, '@brackets'],`
`916`	`916`	`[`
`917`	`917`	`/[\w@]+/,`
Original file line number	Diff line number	Diff line change
`@@ -980,7 +980,7 @@ export const language = <languages.IMonarchLanguage>{`
`980`	`980`	`{ include: '@complexIdentifiers' },`
`981`	`981`	`{ include: '@scopes' },`
`982`	`982`	`{ include: '@complexDataTypes' },`
`983`		`- [/[;,.]/, TokenClassConsts.DELIMITER],`
	`983`	`+ [/[:;,.]/, TokenClassConsts.DELIMITER],`
`984`	`984`	`[/[\(\)\[\]\{\}]/, '@brackets'],`
`985`	`985`	`[`
`986`	`986`	`/[\w@#$]+/,`
Original file line number	Diff line number	Diff line change
`@@ -699,7 +699,7 @@ export const language = <languages.IMonarchLanguage>{`
`699`	`699`	`{ include: '@complexIdentifiers' },`
`700`	`700`	`{ include: '@scopes' },`
`701`	`701`	`{ include: '@complexDataTypes' },`
`702`		`- [/[;,.]/, TokenClassConsts.DELIMITER],`
	`702`	`+ [/[:;,.]/, TokenClassConsts.DELIMITER],`
`703`	`703`	`[/[\(\)\[\]\{\}]/, '@brackets'],`
`704`	`704`	`[`
`705`	`705`	`/[\w@#$]+/,`
Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ export const language = <languages.IMonarchLanguage>{`
`636`	`636`	`{ include: '@complexIdentifiers' },`
`637`	`637`	`{ include: '@scopes' },`
`638`	`638`	`{ include: '@complexDataTypes' },`
`639`		`- [/[;,.]/, TokenClassConsts.DELIMITER],`
	`639`	`+ [/[:;,.]/, TokenClassConsts.DELIMITER],`
`640`	`640`	`[/[\(\)\[\]\{\}]/, '@brackets'],`
`641`	`641`	`[`
`642`	`642`	`/[\w@$-]+/, // https://trino.io/docs/current/language/reserved.html#language-identifiers`