JS: Added support for import assertions (#2953)

RunDevelopment · web-flow · commit ab7c9953eeec · 2021-06-16T11:56:54.000+02:00
diff --git a/components/prism-javascript.js b/components/prism-javascript.js
@@ -12,7 +12,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 			lookbehind: true
 		},
 		{
-			pattern: /(^|[^.]|\.\.\.\s*)\b(?:as|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally(?=\s*(?:\{|$))|for|from(?=\s*(?:['"]|$))|function|(?:get|set)(?=\s*(?:[#\[$\w\xA0-\uFFFF]|$))|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,
+			pattern: /(^|[^.]|\.\.\.\s*)\b(?:as|assert(?=\s*\{)|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally(?=\s*(?:\{|$))|for|from(?=\s*(?:['"]|$))|function|(?:get|set)(?=\s*(?:[#\[$\w\xA0-\uFFFF]|$))|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,
 			lookbehind: true
 		},
 	],
diff --git a/components/prism-javascript.min.js b/components/prism-javascript.min.js
diff --git a/prism.js b/prism.js
@@ -1531,7 +1531,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {
 			lookbehind: true
 		},
 		{
-			pattern: /(^|[^.]|\.\.\.\s*)\b(?:as|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally(?=\s*(?:\{|$))|for|from(?=\s*(?:['"]|$))|function|(?:get|set)(?=\s*(?:[#\[$\w\xA0-\uFFFF]|$))|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,
+			pattern: /(^|[^.]|\.\.\.\s*)\b(?:as|assert(?=\s*\{)|async(?=\s*(?:function\b|\(|[$\w\xA0-\uFFFF]|$))|await|break|case|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally(?=\s*(?:\{|$))|for|from(?=\s*(?:['"]|$))|function|(?:get|set)(?=\s*(?:[#\[$\w\xA0-\uFFFF]|$))|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|static|super|switch|this|throw|try|typeof|undefined|var|void|while|with|yield)\b/,
 			lookbehind: true
 		},
 	],
diff --git a/tests/languages/javascript/keyword_feature.test b/tests/languages/javascript/keyword_feature.test
@@ -54,10 +54,14 @@ import {} from "foo"
 import {} from 'foo'
 class { get foo(){} set baz(){} get [value](){} }
 
+// import assertion
+import json from "./foo.json" assert { type: "json" };
+
 // variables, not keywords
 
 const { async, from, to } = bar;
 promise.catch(foo).finally(bar);
+assert.equal(foo, bar);
 
 ----------------------------------------------------
 
@@ -195,6 +199,20 @@ promise.catch(foo).finally(bar);
 	["punctuation", "}"],
 	["punctuation", "}"],
 
+	["comment", "// import assertion"],
+
+	["keyword", "import"],
+	" json ",
+	["keyword", "from"],
+	["string", "\"./foo.json\""],
+	["keyword", "assert"],
+	["punctuation", "{"],
+	" type",
+	["operator", ":"],
+	["string", "\"json\""],
+	["punctuation", "}"],
+	["punctuation", ";"],
+
 	["comment", "// variables, not keywords"],
 
 	["keyword", "const"],
@@ -220,6 +238,16 @@ promise.catch(foo).finally(bar);
 	["punctuation", "("],
 	"bar",
 	["punctuation", ")"],
+	["punctuation", ";"],
+
+	"\r\nassert",
+	["punctuation", "."],
+	["function", "equal"],
+	["punctuation", "("],
+	"foo",
+	["punctuation", ","],
+	" bar",
+	["punctuation", ")"],
 	["punctuation", ";"]
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {`
`12`	`12`	`lookbehind: true`
`13`	`13`	`},`
`14`	`14`	`{`
`15`		`- pattern: /(^\|[^.]\|\.\.\.\s)\b(?:as\|async(?=\s(?:function\b\|\(\|[$\w\xA0-\uFFFF]\|$))\|await\|break\|case\|class\|const\|continue\|debugger\|default\|delete\|do\|else\|enum\|export\|extends\|finally(?=\s(?:\{\|$))\|for\|from(?=\s(?:['"]\|$))\|function\|(?:get\|set)(?=\s*(?:[#\[$\w\xA0-\uFFFF]\|$))\|if\|implements\|import\|in\|instanceof\|interface\|let\|new\|null\|of\|package\|private\|protected\|public\|return\|static\|super\|switch\|this\|throw\|try\|typeof\|undefined\|var\|void\|while\|with\|yield)\b/,`
	`15`	`+ pattern: /(^\|[^.]\|\.\.\.\s)\b(?:as\|assert(?=\s\{)\|async(?=\s(?:function\b\|\(\|[$\w\xA0-\uFFFF]\|$))\|await\|break\|case\|class\|const\|continue\|debugger\|default\|delete\|do\|else\|enum\|export\|extends\|finally(?=\s(?:\{\|$))\|for\|from(?=\s(?:['"]\|$))\|function\|(?:get\|set)(?=\s(?:[#\[$\w\xA0-\uFFFF]\|$))\|if\|implements\|import\|in\|instanceof\|interface\|let\|new\|null\|of\|package\|private\|protected\|public\|return\|static\|super\|switch\|this\|throw\|try\|typeof\|undefined\|var\|void\|while\|with\|yield)\b/,`
`16`	`16`	`lookbehind: true`
`17`	`17`	`},`
`18`	`18`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1531,7 +1531,7 @@ Prism.languages.javascript = Prism.languages.extend('clike', {`
`1531`	`1531`	`lookbehind: true`
`1532`	`1532`	`},`
`1533`	`1533`	`{`
`1534`		`- pattern: /(^\|[^.]\|\.\.\.\s)\b(?:as\|async(?=\s(?:function\b\|\(\|[$\w\xA0-\uFFFF]\|$))\|await\|break\|case\|class\|const\|continue\|debugger\|default\|delete\|do\|else\|enum\|export\|extends\|finally(?=\s(?:\{\|$))\|for\|from(?=\s(?:['"]\|$))\|function\|(?:get\|set)(?=\s*(?:[#\[$\w\xA0-\uFFFF]\|$))\|if\|implements\|import\|in\|instanceof\|interface\|let\|new\|null\|of\|package\|private\|protected\|public\|return\|static\|super\|switch\|this\|throw\|try\|typeof\|undefined\|var\|void\|while\|with\|yield)\b/,`
	`1534`	`+ pattern: /(^\|[^.]\|\.\.\.\s)\b(?:as\|assert(?=\s\{)\|async(?=\s(?:function\b\|\(\|[$\w\xA0-\uFFFF]\|$))\|await\|break\|case\|class\|const\|continue\|debugger\|default\|delete\|do\|else\|enum\|export\|extends\|finally(?=\s(?:\{\|$))\|for\|from(?=\s(?:['"]\|$))\|function\|(?:get\|set)(?=\s(?:[#\[$\w\xA0-\uFFFF]\|$))\|if\|implements\|import\|in\|instanceof\|interface\|let\|new\|null\|of\|package\|private\|protected\|public\|return\|static\|super\|switch\|this\|throw\|try\|typeof\|undefined\|var\|void\|while\|with\|yield)\b/,`
`1535`	`1535`	`lookbehind: true`
`1536`	`1536`	`},`
`1537`	`1537`	`],`