@malloydata/syntax-highlight 0.0.403 → 0.0.405

package/LICENSE

@@ -0,0 +1,77 @@
+Malloy Project License
+SPDX-License-Identifier: MIT
+
+Copyright Contributors to the Malloy project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+========================================================================
+SOURCE FILE HEADER
+========================================================================
+
+Every source file in this project carries the following header (shown here
+in C/Java/JavaScript comment style; equivalent comment styles are used for
+other languages):
+
+/*
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
+ */
+
+========================================================================
+HISTORICAL ATTRIBUTIONS & NOTICES
+========================================================================
+
+Portions of this software were originally contributed by Google LLC and
+Meta Platforms, Inc. and affiliates under the MIT License. For ease of
+maintenance, individual file headers have been updated to the current
+standard header. The full historical attribution and authorship for
+individual files remains completely preserved and accessible via the Git
+repository history.
+
+The original copyright and permission notices for those contributions
+are preserved below:
+
+------------------------------------------------------------------------
+Copyright 2023 Google LLC
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------------------
+Copyright (c) Meta Platforms, Inc. and affiliates.
+
+This source code is licensed under the MIT license found in the
+LICENSE file in the root directory of this source tree.
+------------------------------------------------------------------------

package/grammars/malloy/malloy.monarch.ts

@@ -1,24 +1,6 @@
 /*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 
 import {languages as Monaco} from 'monaco-editor';
@@ -199,6 +181,19 @@ export const monarch: Monaco.IMonarchLanguage = {
       [/\bpublic\b/, 'keyword.control.public'],
       [/\bprivate\b/, 'keyword.control.private'],
       [/\binclude\b/, 'keyword.control.include'],
+      [/\bas\b/, 'keyword.control.as'],
+      [/\bfrom\b/, 'keyword.control.from'],
+      [/\bexport\b/, 'keyword.control.export'],
+      [/\bcase\b/, 'keyword.control.case'],
+      [/\bthen\b/, 'keyword.control.then'],
+      [/\bend\b/, 'keyword.control.end'],
+      [/\bfilter\b/, 'keyword.control.filter'],
+      [/\bin\b/, 'keyword.other.in'],
+      [/\blike\b/, 'keyword.other.like'],
+      [/\binner\b/, 'keyword.other.inner'],
+      [/\bleft\b/, 'keyword.other.left'],
+      [/\bright\b/, 'keyword.other.right'],
+      [/\bfull\b/, 'keyword.other.full'],
     ],
     properties: [
       [/\baccept\b/, 'keyword.control.accept'],
@@ -236,6 +231,8 @@ export const monarch: Monaco.IMonarchLanguage = {
       [/\bview\b/, 'keyword.control.view'],
       [/\bwhere\b/, 'keyword.control.where'],
       [/\bdeclare\b/, 'keyword.control.declare'],
+      [/\btype\b/, 'keyword.control.type'],
+      [/\bgiven\b/, 'keyword.control.given'],
     ],
     functions: [
       [
@@ -243,7 +240,7 @@ export const monarch: Monaco.IMonarchLanguage = {
         ['entity.name.function', '', 'entity.name.function.modifier'],
       ],
       [
-        /\b(AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|UNGROUPED)(\s*\()/,
+        /\b(ALL|AVG|CAST|COMPOSE|COUNT|EXCLUDE|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|UNGROUPED)(\s*\()/,
         ['entity.name.function', ''],
       ],
       [/\b([a-zA-Z_][a-zA-Z_0-9]*)(\s*\()/, ['entity.name.function', '']],
@@ -267,6 +264,7 @@ export const monarch: Monaco.IMonarchLanguage = {
       [/\bstring\b/, 'entity.name.type.string'],
       [/\bnumber\b/, 'entity.name.type.number'],
       [/\bdate\b/, 'entity.name.type.date'],
+      [/\btimestamptz\b/, 'entity.name.type.timestamptz'],
       [/\btimestamp\b/, 'entity.name.type.timestamp'],
       [/\bboolean\b/, 'entity.name.type.boolean'],
     ],

package/grammars/malloy/malloy.tmGrammar.json

@@ -68,7 +68,7 @@
           }
         },
         {
-          "match": "(?i)\\b(AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|UNGROUPED)(\\s*\\()",
+          "match": "(?i)\\b(ALL|AVG|CAST|COMPOSE|COUNT|EXCLUDE|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|UNGROUPED)(\\s*\\()",
           "captures": {
             "1": { "name": "entity.name.function" }
           }
@@ -342,6 +342,10 @@
           "match": "(?i)\\bdate\\b",
           "name": "entity.name.type.date"
         },
+        {
+          "match": "(?i)\\btimestamptz\\b",
+          "name": "entity.name.type.timestamptz"
+        },
         {
           "match": "(?i)\\btimestamp\\b",
           "name": "entity.name.type.timestamp"
@@ -493,6 +497,14 @@
         {
           "match": "(?i)\\bdeclare\\b",
           "name": "keyword.control.declare"
+        },
+        {
+          "match": "(?i)\\btype\\b",
+          "name": "keyword.control.type"
+        },
+        {
+          "match": "(?i)\\bgiven\\b",
+          "name": "keyword.control.given"
         }
       ]
     },
@@ -569,6 +581,58 @@
         {
           "match": "(?i)\\binclude\\b",
           "name": "keyword.control.include"
+        },
+        {
+          "match": "(?i)\\bas\\b",
+          "name": "keyword.control.as"
+        },
+        {
+          "match": "(?i)\\bfrom\\b",
+          "name": "keyword.control.from"
+        },
+        {
+          "match": "(?i)\\bexport\\b",
+          "name": "keyword.control.export"
+        },
+        {
+          "match": "(?i)\\bcase\\b",
+          "name": "keyword.control.case"
+        },
+        {
+          "match": "(?i)\\bthen\\b",
+          "name": "keyword.control.then"
+        },
+        {
+          "match": "(?i)\\bend\\b",
+          "name": "keyword.control.end"
+        },
+        {
+          "match": "(?i)\\bfilter\\b",
+          "name": "keyword.control.filter"
+        },
+        {
+          "match": "(?i)\\bin\\b",
+          "name": "keyword.other.in"
+        },
+        {
+          "match": "(?i)\\blike\\b",
+          "name": "keyword.other.like"
+        },
+        {
+          "match": "(?i)\\binner\\b",
+          "name": "keyword.other.inner"
+        },
+        {
+          "match": "(?i)\\bleft\\b",
+          "name": "keyword.other.left"
+        },
+        {
+          "match": "(?i)\\bright\\b",
+          "name": "keyword.other.right"
+        },
+        {
+          "match": "(?i)\\bfull\\b",
+          "name": "keyword.other.full"
         }
       ]
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/syntax-highlight",
-  "version": "0.0.403",
+  "version": "0.0.405",
   "description": "A package to simplify the process of developing, testing, and syncnig Malloy syntax highlighting grammars",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
     "build": "npm run codegen && tsc",
     "clean": "tsc --build --clean && rm -f tsconfig.tsbuildinfo && rm -rf dist && node ../../scripts/femto-build.js --clean",
     "gen-malloy-monarch": "ts-node scripts/generateMonarchGrammar grammars/malloy/malloy.tmGrammar.json grammars/malloy/malloy.monarch.ts && prettier grammars/malloy/malloy.monarch.ts --write",
-    "gen-malloy-tokens": "ts-node scripts/generateLanguageTokenizationFile grammars/malloy/tokenizations/darkPlus.ts",
+    "gen-malloy-tokens": "ts-node scripts/generateLanguageTokenizationFile grammars/malloy/tokenizations/darkPlus.ts && prettier grammars/malloy/tokenizations/darkPlus.ts --write",
     "test-monarch-grammars": "rimraf ./dist && tsc && karma start",
     "test-textmate-grammars": "jest",
     "gen-monaco-darkplus": "ts-node scripts/generateMonarchTheme themes/textmate/dark_plus.json themes/monaco/darkPlus.ts",