Next merge main (#173)

* fix: export sql parser EntityContext types (#157)

* feat: #14988 stream dataTypes and builtinFunctions highlight (#153)

---------

Co-authored-by: 琉易 <[email protected]>

Author: mumiao

package.json

@@ -67,7 +67,7 @@
 		"pre-commit": "npx pretty-quick --staged"
 	},
 	"dependencies": {
-		"dt-sql-parser": "4.0.2"
+		"dt-sql-parser": "4.1.0-beta.4"
 	},
 	"peerDependencies": {
 		"monaco-editor": ">=0.31.0"

pnpm-lock.yaml

@@ -292,10 +292,11 @@ export const language = <languages.IMonarchLanguage>{
 		'EXP',
 		'CEIL',
 		'CEILING',
-		'FLOOR',
 		'SIN',
 		'SINH',
+		'SQRT',
 		'COS',
+		'MOD',
 		'TAN',
 		'TANH',
 		'COT',
@@ -335,6 +336,7 @@ export const language = <languages.IMonarchLanguage>{
 		'CONCAT',
 		'CONCAT_WS',
 		'LPAD',
+		'RIGHT',
 		'RPAD',
 		'FROM_BASE64',
 		'TO_BASE64',
@@ -343,6 +345,7 @@ export const language = <languages.IMonarchLanguage>{
 		'DECODE',
 		'ENCODE',
 		'INSTR',
+		'LEFT',
 		'LOCATE',
 		'PARSE_URL',
 		'REGEXP',
@@ -375,23 +378,30 @@ export const language = <languages.IMonarchLanguage>{
 		'TO_TIMESTAMP_LTZ',
 		'TO_TIMESTAMP',
 		'CURRENT_WATERMARK',
+		'OVERLAPS',
 		// Conditional Functions
 		'COALESCE',
+		'GREATEST',
 		'IF',
 		'IFNULL',
 		'IS_ALPHA',
 		'IS_DECIMAL',
 		'IS_DIGIT',
-		'GREATEST',
 		'LEAST',
+		'NULLIF',
 		// Type Conversion Functions
 		'CAST',
 		'TRY_CAST',
 		'TYPEOF',
 		// Collection Functions
 		'CARDINALITY',
 		'ELEMENT',
+		'ARRAY',
+		'MAP',
 		'ARRAY_CONTAINS',
+		// comparison function
+		'EXISTS',
+		'IN',
 		// JSON Functions
 		'JSON_EXISTS',
 		'JSON_STRING',
@@ -404,14 +414,15 @@ export const language = <languages.IMonarchLanguage>{
 		// Grouping Functions
 		'GROUP_ID',
 		'GROUPING',
+		'GROUPING_ID',
 		// Hash Functions
 		'MD5',
 		'SHA1',
+		'SHA2',
 		'SHA224',
 		'SHA256',
 		'SHA384',
 		'SHA512',
-		'SHA2',
 		// Aggregate Functions
 		'COUNT',
 		'AVG',
@@ -459,14 +470,14 @@ export const language = <languages.IMonarchLanguage>{
 		'TIME',
 		'TIMESTAMP',
 		'TIMESTAMP_LTZ',
-		'INTERVAL',
 		'ARRAY',
 		'MULTISET',
 		'MAP',
 		'ROW',
 		'RAW',
 		'DEC',
 		'NUMERIC',
+		'INT',
 		'INTERVAL'
 	],
 	scopeKeywords: ['CASE', 'END', 'WHEN', 'THEN', 'ELSE'],
@@ -483,6 +494,7 @@ export const language = <languages.IMonarchLanguage>{
 			{ include: '@complexIdentifiers' },
 			{ include: '@scopes' },
 			{ include: '@complexDataTypes' },
+			{ include: '@complexFunctions' },
 			[/[;,.]/, TokenClassConsts.DELIMITER],
 			[/[\(\)\[\]\{\}]/, '@brackets'],
 			[
@@ -550,6 +562,10 @@ export const language = <languages.IMonarchLanguage>{
 			[/DOUBLE\s+PRECISION\b/i, { token: TokenClassConsts.TYPE }],
 			[/WITHOUT\s+TIME\s+ZONE\b/i, { token: TokenClassConsts.TYPE }],
 			[/WITH\s+LOCAL\s+TIME\s+ZONE\b/i, { token: TokenClassConsts.TYPE }]
+		],
+		complexFunctions: [
+			[/NOT\s+IN\b/i, { token: TokenClassConsts.PREDEFINED }],
+			[/IS\s+JSON\b/i, { token: TokenClassConsts.PREDEFINED }]
 		]
 	}
 };

src/languages/flink/flink.ts

@@ -13,6 +13,9 @@ export type {
 	Suggestions,
 	TextSlice,
 	ParseError,
+	StmtContext,
 	EntityContext,
-	StmtContext
+	CommonEntityContext,
+	ColumnEntityContext,
+	FuncEntityContext
 } from 'dt-sql-parser';