From c754462f99a30fa60e1b7853ef6a23e73e95c714 Mon Sep 17 00:00:00 2001 From: Michael Toy Date: Wed, 20 Sep 2023 07:39:39 -0700 Subject: [PATCH 1/2] Move code from #245 --- .vscodeignore | 1 + malloy-language.json | 26 -- malloy-notebook-language.json | 34 --- malloy-notebook.tmGrammar.json | 31 -- malloy-sql-language.json | 33 -- malloy-sql.tmGrammar.json | 64 ---- malloy.tmGrammar.json | 537 --------------------------------- package-lock.json | 64 ++-- package.json | 28 +- tsconfig.json | 2 +- 10 files changed, 52 insertions(+), 768 deletions(-) delete mode 100644 malloy-language.json delete mode 100644 malloy-notebook-language.json delete mode 100644 malloy-notebook.tmGrammar.json delete mode 100644 malloy-sql-language.json delete mode 100644 malloy-sql.tmGrammar.json delete mode 100644 malloy.tmGrammar.json diff --git a/.vscodeignore b/.vscodeignore index 22a05491..cb9d4588 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -3,6 +3,7 @@ cloudbuild integration node_modules !node_modules/@vscode/codicons/dist +!node_modules/@malloydata/syntax-highlight/grammars out/ src/ scripts/ diff --git a/malloy-language.json b/malloy-language.json deleted file mode 100644 index 05efea42..00000000 --- a/malloy-language.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "comments": { - "lineComment": "//", - "blockComment": ["/*", "*/"] - }, - "brackets": [ - ["{", "}"], - ["[", "]"], - ["(", ")"] - ], - "autoClosingPairs": [ - {"open": "{", "close": "}"}, - {"open": "[", "close": "]"}, - {"open": "(", "close": ")"}, - {"open": "\"", "close": "\"", "notIn": ["string"]}, - {"open": "'", "close": "'"}, - {"open": "/*", "close": " */", "notIn": ["string"]} - ], - "surroundingPairs": [ - {"open": "{", "close": "}"}, - {"open": "[", "close": "]"}, - {"open": "(", "close": ")"}, - {"open": "\"", "close": "\""}, - {"open": "'", "close": "'"} - ] -} diff --git a/malloy-notebook-language.json b/malloy-notebook-language.json deleted file mode 100644 index 108cddb5..00000000 --- a/malloy-notebook-language.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "comments": { - "lineComment": ["--", "//"], - "blockComment": ["/*", "*/"] - }, - "brackets": [ - ["{", "}"], - ["[", "]"], - ["(", ")"] - ], - "autoClosingPairs": [ - ["{", "}"], - ["[", "]"], - ["(", ")"], - {"open": "\"", "close": "\"", "notIn": ["string"]}, - {"open": "N'", "close": "'", "notIn": ["string", "comment"]}, - {"open": "'", "close": "'", "notIn": ["string", "comment"]} - ], - "surroundingPairs": [ - [">>>", ">>>"], - ["{", "}"], - ["[", "]"], - ["(", ")"], - ["\"", "\""], - ["'", "'"], - ["`", "`"] - ], - "folding": { - "markers": { - "start": "^\\s*--\\s*#region\\b", - "end": "^\\s*--\\s*#endregion\\b" - } - } -} diff --git a/malloy-notebook.tmGrammar.json b/malloy-notebook.tmGrammar.json deleted file mode 100644 index f2d42cae..00000000 --- a/malloy-notebook.tmGrammar.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "Malloy Notebook", - "scopeName": "source.malloy-notebook", - "patterns": [ - {"include": "#comments"}, - {"include": "#malloysql-malloy"}, - {"include": "#malloysql-sql"} - ], - "repository": { - "malloysql-malloy": { - "begin": ">>>malloy", - "end": "(?=>>>)", - "beginCaptures": { - "0": {"name": "entity.other.attribute.malloy-sql"} - }, - "name": "meta.embedded.block.malloysql.malloy", - "patterns": [{"include": "source.malloy"}] - }, - "malloysql-sql": { - "begin": "(>>>sql)(\\s*connection:.*?(?>>)", - "beginCaptures": { - "0": {"name": "entity.other.attribute.malloy-sql"}, - "1": {"name": "entity.other.attribute.malloy-sql"}, - "3": {"name": "comment.line.double-slash"} - }, - "name": "meta.embedded.block.malloysql.sql", - "patterns": [{"include": "source.malloy-sql"}] - } - } -} diff --git a/malloy-sql-language.json b/malloy-sql-language.json deleted file mode 100644 index f2a1d51c..00000000 --- a/malloy-sql-language.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "comments": { - "lineComment": ["--", "//"], - "blockComment": ["/*", "*/"] - }, - "brackets": [ - ["{", "}"], - ["[", "]"], - ["(", ")"] - ], - "autoClosingPairs": [ - ["{", "}"], - ["[", "]"], - ["(", ")"], - {"open": "\"", "close": "\"", "notIn": ["string"]}, - {"open": "N'", "close": "'", "notIn": ["string", "comment"]}, - {"open": "'", "close": "'", "notIn": ["string", "comment"]} - ], - "surroundingPairs": [ - ["{", "}"], - ["[", "]"], - ["(", ")"], - ["\"", "\""], - ["'", "'"], - ["`", "`"] - ], - "folding": { - "markers": { - "start": "^\\s*--\\s*#region\\b", - "end": "^\\s*--\\s*#endregion\\b" - } - } -} diff --git a/malloy-sql.tmGrammar.json b/malloy-sql.tmGrammar.json deleted file mode 100644 index bce9e9e2..00000000 --- a/malloy-sql.tmGrammar.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "name": "Malloy SQL", - "scopeName": "source.malloy-sql", - "patterns": [{"include": "#malloysql-sql"}], - "repository": { - "malloysql-sql": { - "beginCaptures": { - "0": {"name": "entity.other.attribute.malloy-sql"}, - "1": {"name": "entity.other.attribute.malloy-sql"}, - "3": {"name": "comment.line.double-slash"} - }, - "name": "meta.embedded.block.malloysql.sql", - "patterns": [ - {"include": "#comments"}, - { - "begin": "%{", - "end": "}%", - "beginCaptures": { - "0": {"name": "punctuation.definition.malloy-sql"} - }, - "endCaptures": { - "0": {"name": "punctuation.definition.malloy-sql"} - }, - "name": "meta.embedded.block.malloy", - "patterns": [{"include": "source.malloy"}] - }, - { - "include": "source.sql" - } - ] - }, - "comments": { - "patterns": [ - { - "begin": "/\\*", - "end": "\\*/", - "beginCaptures": { - "0": {"name": "punctuation.definition.comment.begin"} - }, - "endCaptures": { - "0": {"name": "punctuation.definition.comment.end"} - }, - "name": "comment.block" - }, - { - "begin": "//", - "end": "\\n", - "beginCaptures": { - "0": {"name": "punctuation.definition.comment"} - }, - "name": "comment.line.double-slash" - }, - { - "begin": "--", - "end": "\\n", - "beginCaptures": { - "0": {"name": "punctuation.definition.comment"} - }, - "name": "comment.line.double-hyphen" - } - ] - } - } -} diff --git a/malloy.tmGrammar.json b/malloy.tmGrammar.json deleted file mode 100644 index 10c5c1be..00000000 --- a/malloy.tmGrammar.json +++ /dev/null @@ -1,537 +0,0 @@ -{ - "scopeName": "source.malloy", - "patterns": [ - {"include": "#malloy-language"} - ], - "repository": { - "malloy-language": { - "patterns": [ - {"include": "#sql-string"}, - {"include": "#comments"}, - {"include": "#tags"}, - {"include": "#strings"}, - {"include": "#numbers"}, - {"include": "#keywords"}, - {"include": "#properties"}, - {"include": "#functions"}, - {"include": "#datetimes"}, - {"include": "#identifiers-quoted"}, - {"include": "#types"}, - {"include": "#constants"}, - {"include": "#timeframes"}, - {"include": "#identifiers-unquoted"} - ] - }, - "malloy-matched": { - "begin": "{", - "end": "}", - "patterns": [ - {"include": "#malloy-matched"}, - {"include": "#malloy-language"} - ] - }, - "malloy-in-sql": { - "begin": "%{", - "name": "source.malloy-in-sql", - "end": "}%?", - "patterns": [ - {"include": "#malloy-matched"}, - {"include": "#malloy-language"} - ] - }, - "sql-string": { - "patterns": - [ - { - "begin": "\\b(select)(\\s*:\\s*)(\"\"\")", - "end": "\"\"\"", - "beginCaptures": { - "1": {"name": "keyword.control.select"}, - "3": {"name": "punctuation.sql-block.open"} - }, - "endCaptures": { - "0": {"name": "punctuation.sql-block.close"} - }, - "name": "source.sql", - "patterns": [{"include": "#malloy-in-sql"}, {"include": "source.sql"}] - }, - { - "begin": "(\\b[A-Za-z_][A-Za-z_0-9]*)(\\s*\\.\\s*)(sql)(\\s*\\(\\s*)(\"\"\")", - "end": "\"\"\"", - "beginCaptures": { - "1": {"name": "variable.other"}, - "3": {"name": "keyword.control.sql"}, - "5": {"name": "punctuation.sql-block.open"} - }, - "endCaptures": { - "0": {"name": "punctuation.sql-block.close"} - }, - "name": "source.sql", - "patterns": [{"include": "#malloy-in-sql"}, {"include": "source.sql"}] - } - ] - }, - "functions": { - "patterns": [ - { - "match": "(?i)\\b(count)(\\s*\\()(distinct)", - "captures": { - "1": {"name": "entity.name.function"}, - "3": {"name": "entity.name.function.modifier"} - } - }, - { - "match": "(?i)\\b(AVG|COUNT|FIRST|FORMAT|LAST|LCASE|LEN|MAX|MID|MIN|MOD|NOW|ROUND|SUM|UCASE|TABLE|FROM|FROM_SQL|UNGROUPED)(\\s*\\()", - "captures": { - "1": {"name": "entity.name.function"} - } - }, - { - "match": "(?i)\\b([a-zA-Z_][a-zA-Z_0-9]*)(\\s*\\()", - "captures": { - "1": {"name": "entity.name.function"} - } - }, - { - "match": "(?i)\\b([a-zA-Z_][a-zA-Z_0-9]*)\\!(timestamp|number|string|boolean|date)?(\\s*\\()", - "captures": { - "1": { "name": "entity.name.function" }, - "2": { "name": "entity.name.type" } - } - } - ] - }, - "datetimes": { - "patterns": [ - { - "match": "(?i)@[0-9]{4}-[0-9]{2}-[0-9]{2}[ T][0-9]{2}:[0-9]{2}((:[0-9]{2})(([\\.,][0-9]+)(\\[[A-Za-z_/]+\\])?)?)?", - "name": "constant.numeric.timestamp" - }, - { - "match": "(?i)@[0-9]{4}(-Q[1-4]|-[0-9]{2}(-[0-9]{2}(-WK)?)?)?", - "name": "constant.numeric.date" - } - ] - }, - "identifiers-quoted": { - "patterns": [ - { - "match": "`[^`]*`", - "name": "variable.other.quoted" - } - ] - }, - "identifiers-unquoted": { - "patterns": [ - { - "match": "(?i)\\b[A-Za-z_][A-Za-z_0-9]*\\b", - "name": "variable.other" - } - ] - }, - "timeframes": { - "patterns": [ - { - "match": "(?i)\\b((year|quarter|month|week|day|hour|minute|second)s?)\\b", - "name": "keyword.other.timeframe" - }, - { - "match": "(?i)\\b(day_of_year|day_of_month)\\b", - "name": "keyword.other.timeframe" - } - ] - }, - "comments": { - "patterns": [ - { - "begin": "/\\*", - "end": "\\*/", - "beginCaptures": { - "0": {"name": "punctuation.definition.comment.begin"} - }, - "endCaptures": { - "0": {"name": "punctuation.definition.comment.end"} - }, - "name": "comment.block" - }, - { - "begin": "//", - "end": "\\n", - "beginCaptures": { - "0": {"name": "punctuation.definition.comment"} - }, - "name": "comment.line.double-slash" - }, - { - "begin": "--", - "end": "\\n", - "beginCaptures": { - "0": {"name": "punctuation.definition.comment"} - }, - "name": "comment.line.double-hyphen" - } - ] - }, - "tags": { - "patterns": [ - { - "match": "##\\n", - "name": "string.quoted", - "captures": { - "0": {"name": "string.quoted"} - } - }, - { - "begin": "#\"", - "end": "\\n", - "beginCaptures": { - "0": {"name": "punctuation.definition.comment"} - }, - "name": "comment.line.double-slash" - }, - { - "match": "#\\n", - "name": "string.quoted", - "captures": { - "0": {"name": "string.quoted"} - } - }, - { - "begin": "#\\s", - "end": "\\n", - "beginCaptures": { - "0": {"name": "support.type.property-name.json"} - }, - "name": "comment.line.double-slash", - "patterns": [{"include": "#tag-values"}] - }, - { - "begin": "##\\s", - "end": "\\n", - "beginCaptures": { - "0": {"name": "support.type.property-name.json"} - }, - "name": "comment.line.double-slash", - "patterns": [{"include": "#tag-values"}] - }, - { - "begin": "#", - "end": "\\n", - "beginCaptures": { - "0": {"name": "string.quoted"} - }, - "name": "string.quoted" - } - ], - "repository": { - "tag-values": { - "name": "support.type.property-name.json", - "match": "(-)?((?:[^\\s=#]+)|(?:\"[^#]+\"))(?:\\s*(=)\\s*((?:[^\\s=#]+)|(?:\"[^#]+\")))?", - "captures": { - "1": {"name": "keyword.control.negate"}, - "2": {"name": "support.type.property-name.json"}, - "3": {"name": "keyword.operator.comparison.ts"}, - "4": {"name": "string.quoted"} - } - } - } - }, - "strings": { - "patterns": [ - { - "begin": "'", - "end": "'", - "beginCaptures": { - "0": {"name": "punctuation.definition.string.begin"} - }, - "endCaptures": { - "0": {"name": "punctuation.definition.string.end"} - }, - "name": "string.quoted.single", - "patterns": [{"include": "#escapes"}] - }, - { - "begin": "\"", - "end": "\"", - "beginCaptures": { - "0": {"name": "punctuation.definition.string.begin"} - }, - "endCaptures": { - "0": {"name": "punctuation.definition.string.end"} - }, - "name": "string.quoted.double", - "patterns": [{"include": "#escapes"}] - }, - { - "begin": "\"\"\"", - "end": "\"\"\"", - "beginCaptures": { - "0": {"name": "punctuation.definition.string.begin"} - }, - "endCaptures": { - "0": {"name": "punctuation.definition.string.end"} - }, - "name": "string.quoted.triple" - }, - { - "begin": "(?i)[r|/]'", - "end": "'", - "name": "string.regexp", - "patterns": [{"include": "#regex-escapes"}] - } - ], - "repository": { - "escapes": { - "name": "constant.character.escape", - "match": "\\\\(u[A-Fa-f0-9]{4}|.)", - "captures": { - "0": {"name": "constant.character.escape"} - } - }, - "regex-escapes": { - "name": "constant.character.escape", - "match": "\\\\.", - "captures": { - "0": {"name": "constant.character.escape"} - } - } - } - }, - "numbers": { - "match": "(?i)(\\b(0|[1-9][0-9]*(E[+-]?[0-9]+|\\.[0-9]*)?)|\\.[0-9]+)", - "name": "constant.numeric" - }, - "constants": { - "patterns": [ - { - "match": "(?i)\\bnull\\b", - "name": "constant.language.null" - }, - { - "match": "(?i)\\btrue\\b", - "name": "constant.language.true" - }, - { - "match": "(?i)\\bfalse\\b", - "name": "constant.language.false" - } - ] - }, - "types": { - "patterns": [ - { - "match": "(?i)\\bstring\\b", - "name": "entity.name.type.string" - }, - { - "match": "(?i)\\bnumber\\b", - "name": "entity.name.type.number" - }, - { - "match": "(?i)\\bdate\\b", - "name": "entity.name.type.date" - }, - { - "match": "(?i)\\btimestamp\\b", - "name": "entity.name.type.timestamp" - }, - { - "match": "(?i)\\bboolean\\b", - "name": "entity.name.type.boolean" - } - ] - }, - "properties": { - "patterns": [ - { - "match": "(?i)\\baccept\\b", - "name": "keyword.control.accept" - }, - { - "match": "(?i)\\bsql\\b", - "name": "keyword.control.sql" - }, - { - "match": "(?i)\\bselect\\b", - "name": "keyword.control.select" - }, - { - "match": "(?i)\\bconnection\\b", - "name": "keyword.control.connection" - }, - { - "match": "(?i)\\brun\\b", - "name": "keyword.control.run" - }, - { - "match": "(?i)\\bextend\\b", - "name": "keyword.control.extend" - }, - { - "match": "(?i)\\brefine\\b", - "name": "keyword.control.refine" - }, - { - "match": "(?i)\\baggregate\\b", - "name": "keyword.control.aggregate" - }, - { - "match": "(?i)\\bsample\\b", - "name": "keyword.control.sample" - }, - { - "match": "(?i)\\bcalculate\\b", - "name": "keyword.control.calculate" - }, - { - "match": "(?i)\\btimezone\\b", - "name": "keyword.control.timezone" - }, - { - "match": "(?i)\\bdimension\\b", - "name": "keyword.control.dimension" - }, - { - "match": "(?i)\\bexcept\\b", - "name": "keyword.control.except" - }, - { - "match": "(?i)\\bsource\\b", - "name": "keyword.control.source" - }, - { - "match": "(?i)\\bgroup_by\\b", - "name": "keyword.control.group_by" - }, - { - "match": "(?i)\\bhaving\\b", - "name": "keyword.control.having" - }, - { - "match": "(?i)\\bindex\\b", - "name": "keyword.control.index" - }, - { - "match": "(?i)\\bjoin_one\\b", - "name": "keyword.control.join_one" - }, - { - "match": "(?i)\\bwith\\b", - "name": "keyword.control.with" - }, - { - "match": "(?i)\\bjoin_many\\b", - "name": "keyword.control.join_many" - }, - { - "match": "(?i)\\bjoin_cross\\b", - "name": "keyword.control.join_cross" - }, - { - "match": "(?i)\\blimit\\b", - "name": "keyword.control.limit" - }, - { - "match": "(?i)\\bmeasure\\b", - "name": "keyword.control.measure" - }, - { - "match": "(?i)\\bnest\\b", - "name": "keyword.control.nest" - }, - { - "match": "(?i)\\border_by\\b", - "name": "keyword.control.order_by" - }, - { - "match": "(?i)\\bprimary_key\\b", - "name": "keyword.control.primary_key" - }, - { - "match": "(?i)\\bproject\\b", - "name": "keyword.control.project" - }, - { - "match": "(?i)\\bquery\\b", - "name": "keyword.control.query" - }, - { - "match": "(?i)\\brename\\b", - "name": "keyword.control.rename" - }, - { - "match": "(?i)\\btop\\b", - "name": "keyword.control.top" - }, - { - "match": "(?i)\\bwhere\\b", - "name": "keyword.control.where" - }, - { - "match": "(?i)\\bdeclare\\b", - "name": "keyword.control.declare" - } - ] - }, - "keywords": { - "patterns": [ - { - "match": "(?i)\\bis\\b", - "name": "keyword.control.is" - }, - { - "match": "(?i)\\bon\\b", - "name": "keyword.control.on" - }, - { - "match": "(?i)\\bnot\\b", - "name": "keyword.other.not" - }, - { - "match": "(?i)\\bor\\b", - "name": "keyword.other.or" - }, - { - "match": "(?i)\\bdesc\\b", - "name": "keyword.control.desc" - }, - { - "match": "(?i)\\bby\\b", - "name": "keyword.control.by" - }, - { - "match": "(?i)\\band\\b", - "name": "keyword.other.and" - }, - { - "match": "(?i)\\basc\\b", - "name": "keyword.control.asc" - }, - { - "match": "(?i)\\bfor\\b", - "name": "keyword.other.for" - }, - { - "match": "(?i)\\belse\\b", - "name": "keyword.other.else" - }, - { - "match": "(?i)\\bto\\b", - "name": "keyword.other.to" - }, - { - "match": "(?i)\\bwhen\\b", - "name": "keyword.other.when" - }, - { - "match": "(?i)\\bpick\\b", - "name": "keyword.other.pick" - }, - { - "match": "(?i)\\bimport\\b", - "name": "keyword.control.import" - } - ] - } - } -} diff --git a/package-lock.json b/package-lock.json index ab008f0c..f772be08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,12 +9,13 @@ "version": "0.2.0", "license": "MIT", "dependencies": { - "@malloydata/db-bigquery": "0.0.81", - "@malloydata/db-duckdb": "0.0.81", - "@malloydata/db-postgres": "0.0.81", - "@malloydata/malloy": "0.0.81", - "@malloydata/malloy-sql": "0.0.81", - "@malloydata/render": "0.0.81", + "@malloydata/db-bigquery": "0.0.82", + "@malloydata/db-duckdb": "0.0.82", + "@malloydata/db-postgres": "0.0.82", + "@malloydata/malloy": "0.0.82", + "@malloydata/malloy-sql": "0.0.82", + "@malloydata/render": "0.0.82", + "@malloydata/syntax-highlight": "^0.0.82", "@popperjs/core": "^2.11.6", "@vscode/codicons": "^0.0.33", "@vscode/webview-ui-toolkit": "^1.2.1", @@ -2435,14 +2436,14 @@ } }, "node_modules/@malloydata/db-bigquery": { - "version": "0.0.81", - "resolved": "https://registry.npmjs.org/@malloydata/db-bigquery/-/db-bigquery-0.0.81.tgz", - "integrity": "sha512-lUhYnxOoc852KQu8iYDnqPKdYgbQ1w+ShBkLtSxtp18qZB9QBpwv81X6Egdn0GAx00ExAL10KQMnBLyzrGY1EA==", + "version": "0.0.82", + "resolved": "https://registry.npmjs.org/@malloydata/db-bigquery/-/db-bigquery-0.0.82.tgz", + "integrity": "sha512-cJ+BjAOQDdbvvivWCN9k0zXuAJx0yl9BYP4snTlkJeeK7ZHFByiprI24ZtoTfcPmSpEbaPiqUD6XGyPqeC0Dzg==", "dependencies": { "@google-cloud/bigquery": "^5.5.0", "@google-cloud/common": "^3.6.0", "@google-cloud/paginator": "^4.0.1", - "@malloydata/malloy": "^0.0.81", + "@malloydata/malloy": "^0.0.82", "gaxios": "^4.2.0" }, "engines": { @@ -2450,12 +2451,12 @@ } }, "node_modules/@malloydata/db-duckdb": { - "version": "0.0.81", - "resolved": "https://registry.npmjs.org/@malloydata/db-duckdb/-/db-duckdb-0.0.81.tgz", - "integrity": "sha512-9XF4mb4oi9zrfKbA+j/57A30ni98d+FHu/6N/xrMl8IkmrW/3F1GDYnl9URZ16qYOyQzYx7YTmRjDzu9Y6RBpA==", + "version": "0.0.82", + "resolved": "https://registry.npmjs.org/@malloydata/db-duckdb/-/db-duckdb-0.0.82.tgz", + "integrity": "sha512-t3KI3NskKa3ye203G4oGnr6UCz8016mNvjUZ9e7fCq7zIb5px7eWOl2jDvr6Vstl8pmnhfp1wSdnBRg6iQsl+A==", "dependencies": { "@malloydata/duckdb-wasm": "0.0.2", - "@malloydata/malloy": "^0.0.81", + "@malloydata/malloy": "^0.0.82", "apache-arrow": "^11.0.0", "duckdb": "0.8.1", "web-worker": "^1.2.0" @@ -2465,11 +2466,11 @@ } }, "node_modules/@malloydata/db-postgres": { - "version": "0.0.81", - "resolved": "https://registry.npmjs.org/@malloydata/db-postgres/-/db-postgres-0.0.81.tgz", - "integrity": "sha512-sVrWy3+KI6v7FmEfA7CJP+n0gPDp3WeSgrvd6Sb+EZAa3xzd7vI/vaGluFgwoqbPK1Y36RhxP0QNxM/8660LhA==", + "version": "0.0.82", + "resolved": "https://registry.npmjs.org/@malloydata/db-postgres/-/db-postgres-0.0.82.tgz", + "integrity": "sha512-8yK5/moowL2YH9Ez6uN4VhQ8AEHCH/c3fskpuxwQqk8fxcUAs1p6guONbzCBIKp2MOztJY470HUzsk82MbCBPA==", "dependencies": { - "@malloydata/malloy": "^0.0.81", + "@malloydata/malloy": "^0.0.82", "@types/pg": "^8.6.1", "pg": "^8.7.1", "pg-query-stream": "4.2.3" @@ -2483,9 +2484,9 @@ } }, "node_modules/@malloydata/malloy": { - "version": "0.0.81", - "resolved": "https://registry.npmjs.org/@malloydata/malloy/-/malloy-0.0.81.tgz", - "integrity": "sha512-FD8jnbZwMq/k7RmYYRyt4R074p05Ru3WkPD1FO85adBl4GTC3q5mPEfFONVayjYWSz4RwHKEiXaMd3CBkOQ2Ww==", + "version": "0.0.82", + "resolved": "https://registry.npmjs.org/@malloydata/malloy/-/malloy-0.0.82.tgz", + "integrity": "sha512-lBGs4JT+ENRyE/Tf8crzr9WXAa2c1lvZU6KJTF5e/hHYVzc34tKrNFccghRTm2FccSnNgavSvm40bfzAuVOtZQ==", "dependencies": { "antlr4ts": "^0.5.0-alpha.4", "assert": "^2.0.0", @@ -2499,19 +2500,19 @@ } }, "node_modules/@malloydata/malloy-sql": { - "version": "0.0.81", - "resolved": "https://registry.npmjs.org/@malloydata/malloy-sql/-/malloy-sql-0.0.81.tgz", - "integrity": "sha512-8cWlfk5q/BfHuKMmBoqBiUb4y5Za44zzRxXKQ37U7r9ZVlsR9Nw0oOD4D+k9fKJfWXnffwKaBu6nViytfRgWoA==", + "version": "0.0.82", + "resolved": "https://registry.npmjs.org/@malloydata/malloy-sql/-/malloy-sql-0.0.82.tgz", + "integrity": "sha512-CA+Rkejo3o3liLh9j7/PcX+tzb5g6xoRwftmcCpQUpeqqeQY7Ys6WRJ+mNaa4EHsyoAJNBGAL1zkkfGPGmgLNQ==", "dependencies": { - "@malloydata/malloy": "^0.0.81" + "@malloydata/malloy": "^0.0.82" } }, "node_modules/@malloydata/render": { - "version": "0.0.81", - "resolved": "https://registry.npmjs.org/@malloydata/render/-/render-0.0.81.tgz", - "integrity": "sha512-DLTNsyhFeA61a5KWWLdsjGFHD4+1eKi9TtqLt9vuEAq2IHd8OYbNBgT3Vj8HcmvQPt93kEvPKIqYnYR3ig0rIQ==", + "version": "0.0.82", + "resolved": "https://registry.npmjs.org/@malloydata/render/-/render-0.0.82.tgz", + "integrity": "sha512-VxY7LMV/D9N2RnjfW8q3u653Bs4FgRxlUjQrKbWeN1loc94FdsYRXyEIzk5PeZyFwBs8Y2Lt6AnjIdFxDg6L/w==", "dependencies": { - "@malloydata/malloy": "^0.0.81", + "@malloydata/malloy": "^0.0.82", "@types/luxon": "^2.4.0", "lodash": "^4.17.20", "luxon": "^2.4.0", @@ -2528,6 +2529,11 @@ "node": ">=12" } }, + "node_modules/@malloydata/syntax-highlight": { + "version": "0.0.82", + "resolved": "https://registry.npmjs.org/@malloydata/syntax-highlight/-/syntax-highlight-0.0.82.tgz", + "integrity": "sha512-tX8XwjEBuRLWuYtYKFiOvMRBRKv98motX/jXEU56ZVuSMfhKZdqtVRcBcROCnxJCa16oKTPz8sRAn+yS6qI2sQ==" + }, "node_modules/@mapbox/node-pre-gyp": { "version": "1.0.10", "license": "BSD-3-Clause", diff --git a/package.json b/package.json index 85d9d890..8a24fe3f 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "@malloydata/db-duckdb", "@malloydata/db-postgres", "@malloydata/render", - "@malloydata/malloy-sql" + "@malloydata/malloy-sql", + "@malloydata/syntax-highlight" ] }, "engines": { @@ -261,7 +262,7 @@ "malloy" ], "filenames": [], - "configuration": "malloy-language.json", + "configuration": "./node_modules/@malloydata/syntax-highlight/grammars/malloy/malloy-language.json", "icon": { "dark": "./img/icon.svg", "light": "./img/icon.svg" @@ -274,7 +275,7 @@ "malloy SQL" ], "filenames": [], - "configuration": "malloy-sql-language.json", + "configuration": "./node_modules/@malloydata/syntax-highlight/grammars/malloy-sql/malloy-sql-language.json", "icon": { "dark": "./img/icon.svg", "light": "./img/icon.svg" @@ -291,7 +292,7 @@ "malloy notebook" ], "filenames": [], - "configuration": "malloy-notebook-language.json", + "configuration": "./node_modules/@malloydata/syntax-highlight/grammars/malloy-notebook/malloy-notebook-language.json", "icon": { "dark": "./img/icon.svg", "light": "./img/icon.svg" @@ -302,17 +303,17 @@ { "language": "malloy", "scopeName": "source.malloy", - "path": "./malloy.tmGrammar.json" + "path": "./node_modules/@malloydata/syntax-highlight/grammars/malloy/malloy.tmGrammar.json" }, { "language": "malloy-sql", "scopeName": "source.malloy-sql", - "path": "./malloy-sql.tmGrammar.json" + "path": "./node_modules/@malloydata/syntax-highlight/grammars/malloy-sql/malloy-sql.tmGrammar.json" }, { "language": "malloy-notebook", "scopeName": "source.malloy-notebook", - "path": "./malloy-notebook.tmGrammar.json" + "path": "./node_modules/@malloydata/syntax-highlight/grammars/malloy-notebook/malloy-notebook.tmGrammar.json" } ], "views": { @@ -558,12 +559,13 @@ ] }, "dependencies": { - "@malloydata/db-bigquery": "0.0.81", - "@malloydata/db-duckdb": "0.0.81", - "@malloydata/db-postgres": "0.0.81", - "@malloydata/malloy": "0.0.81", - "@malloydata/malloy-sql": "0.0.81", - "@malloydata/render": "0.0.81", + "@malloydata/db-bigquery": "0.0.82", + "@malloydata/db-duckdb": "0.0.82", + "@malloydata/db-postgres": "0.0.82", + "@malloydata/malloy": "0.0.82", + "@malloydata/malloy-sql": "0.0.82", + "@malloydata/render": "0.0.82", + "@malloydata/syntax-highlight": "^0.0.82", "@popperjs/core": "^2.11.6", "@vscode/codicons": "^0.0.33", "@vscode/webview-ui-toolkit": "^1.2.1", diff --git a/tsconfig.json b/tsconfig.json index fbe9892c..1aa8141f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,6 +13,6 @@ "noImplicitAny": true, "strict": true }, - "include": ["./src"], + "include": ["./src", "./node_modules/@malloydata/syntax-highlight/grammars"], "exclude": ["node_modules", ".vscode-test", ".vscode-test-web", "dist"] } From 99bf55e67da597b5f61a041b3e61ede3381ed353 Mon Sep 17 00:00:00 2001 From: Michael Toy Date: Wed, 20 Sep 2023 07:48:05 -0700 Subject: [PATCH 2/2] delete include as per will's review --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 1aa8141f..fbe9892c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -13,6 +13,6 @@ "noImplicitAny": true, "strict": true }, - "include": ["./src", "./node_modules/@malloydata/syntax-highlight/grammars"], + "include": ["./src"], "exclude": ["node_modules", ".vscode-test", ".vscode-test-web", "dist"] }