Merge branch 'main' into crs-generic-functions

malloydata · Dec 16, 2024 · 5634b4d · 5634b4d
2 parents 051a3fa + cdd3586
commit 5634b4d
Show file tree

Hide file tree

Showing 54 changed files with 1,518 additions and 150 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": false,
-  "version": "0.0.222",
+  "version": "0.0.223",
   "command": {
     "version": {
       "allowBranch": "main"

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/malloy-db-bigquery/package.json b/packages/malloy-db-bigquery/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-bigquery",
-  "version": "0.0.222",
+  "version": "0.0.223",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,7 +25,7 @@
     "@google-cloud/bigquery": "^7.3.0",
     "@google-cloud/common": "^5.0.1",
     "@google-cloud/paginator": "^5.0.0",
-    "@malloydata/malloy": "^0.0.222",
+    "@malloydata/malloy": "^0.0.223",
     "gaxios": "^4.2.0"
   }
 }
diff --git a/packages/malloy-db-duckdb/package.json b/packages/malloy-db-duckdb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.222",
+  "version": "0.0.223",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@duckdb/duckdb-wasm": "1.29.0",
-    "@malloydata/malloy": "^0.0.222",
+    "@malloydata/malloy": "^0.0.223",
     "@motherduck/wasm-client": "^0.6.6",
     "apache-arrow": "^17.0.0",
     "duckdb": "1.1.1",

diff --git a/packages/malloy-db-mysql/package.json b/packages/malloy-db-mysql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-mysql",
-  "version": "0.0.222",
+  "version": "0.0.223",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.222",
+    "@malloydata/malloy": "^0.0.223",
     "@types/node": "^22.7.4",
     "fastestsmallesttextencoderdecoder": "^1.0.22",
     "luxon": "^3.5.0",

diff --git a/packages/malloy-db-postgres/package.json b/packages/malloy-db-postgres/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-postgres",
-  "version": "0.0.222",
+  "version": "0.0.223",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.222",
+    "@malloydata/malloy": "^0.0.223",
     "@types/pg": "^8.6.1",
     "pg": "^8.7.1",
     "pg-query-stream": "4.2.3"

diff --git a/packages/malloy-db-snowflake/package.json b/packages/malloy-db-snowflake/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-snowflake",
-  "version": "0.0.222",
+  "version": "0.0.223",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.222",
+    "@malloydata/malloy": "^0.0.223",
     "generic-pool": "^3.9.0",
     "snowflake-sdk": "1.14.0",
     "toml": "^3.0.0"

diff --git a/packages/malloy-db-trino/package.json b/packages/malloy-db-trino/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-trino",
-  "version": "0.0.222",
+  "version": "0.0.223",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.222",
+    "@malloydata/malloy": "^0.0.223",
     "@prestodb/presto-js-client": "^1.0.0",
     "gaxios": "^4.2.0",
     "trino-client": "^0.2.2"

diff --git a/packages/malloy-interfaces/package.json b/packages/malloy-interfaces/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy-interfaces",
-  "version": "0.0.222",
+  "version": "0.0.223",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/malloy-malloy-sql/package.json b/packages/malloy-malloy-sql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy-sql",
-  "version": "0.0.222",
+  "version": "0.0.223",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -24,7 +24,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.222"
+    "@malloydata/malloy": "^0.0.223"
   },
   "devDependencies": {
     "peggy": "^3.0.2"

diff --git a/packages/malloy-render/package.json b/packages/malloy-render/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/render",
-  "version": "0.0.222",
+  "version": "0.0.223",
   "license": "MIT",
   "main": "dist/module/index.umd.js",
   "types": "dist/index.d.ts",
@@ -30,7 +30,7 @@
     "build-types": "tsc --build --declaration --emitDeclarationOnly"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.222",
+    "@malloydata/malloy": "^0.0.223",
     "@tanstack/solid-virtual": "^3.10.4",
     "component-register": "^0.8.6",
     "lodash": "^4.17.20",

diff --git a/packages/malloy-syntax-highlight/grammars/malloy/malloy.monarch.ts b/packages/malloy-syntax-highlight/grammars/malloy/malloy.monarch.ts
@@ -181,6 +181,10 @@ export const monarch: Monaco.IMonarchLanguage = {
       [/\bwhen\b/, 'keyword.other.when'],
       [/\bpick\b/, 'keyword.other.pick'],
       [/\bimport\b/, 'keyword.control.import'],
+      [/\binternal\b/, 'keyword.control.internal'],
+      [/\bpublic\b/, 'keyword.control.public'],
+      [/\bprivate\b/, 'keyword.control.private'],
+      [/\binclude\b/, 'keyword.control.include'],
     ],
     properties: [
       [/\baccept\b/, 'keyword.control.accept'],

diff --git a/packages/malloy-syntax-highlight/grammars/malloy/malloy.tmGrammar.json b/packages/malloy-syntax-highlight/grammars/malloy/malloy.tmGrammar.json
@@ -521,6 +521,22 @@
         {
           "match": "(?i)\\bimport\\b",
           "name": "keyword.control.import"
+        },
+        {
+          "match": "(?i)\\binternal\\b",
+          "name": "keyword.control.internal"
+        },
+        {
+          "match": "(?i)\\bpublic\\b",
+          "name": "keyword.control.public"
+        },
+        {
+          "match": "(?i)\\bprivate\\b",
+          "name": "keyword.control.private"
+        },
+        {
+          "match": "(?i)\\binclude\\b",
+          "name": "keyword.control.include"
         }
       ]
     }

diff --git a/packages/malloy-syntax-highlight/package.json b/packages/malloy-syntax-highlight/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/syntax-highlight",
-  "version": "0.0.222",
+  "version": "0.0.223",
   "description": "A package to simplify the process of developing, testing, and syncnig Malloy syntax highlighting grammars",
   "files": [
     "grammars/**/*.tmGrammar.json",

diff --git a/packages/malloy-syntax-highlight/test/visual/index.html b/packages/malloy-syntax-highlight/test/visual/index.html
@@ -43,7 +43,7 @@
 }
     </textarea></div>
     <div class="right"><div id="output"></div></div>
-    <script src="https://unpkg.com/shiki"></script>
+    <script src="https://unpkg.com/shiki@0.14.7"></script>
     <script>
       fetch("./malloy.tmGrammar.json").then(response => {
         const malloyGrammar = response.json();
@@ -73,4 +73,4 @@
       });
     </script>
   </body>
-</html>
+</html>
diff --git a/packages/malloy/package.json b/packages/malloy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.222",
+  "version": "0.0.223",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",

diff --git a/packages/malloy/src/lang/ast/expressions/constant-expression.ts b/packages/malloy/src/lang/ast/expressions/constant-expression.ts
@@ -62,6 +62,10 @@ export class ConstantFieldSpace implements FieldSpace {
   isQueryFieldSpace(): this is QueryFieldSpace {
     return false;
   }
+
+  isProtectedAccessSpace(): boolean {
+    return false;
+  }
 }
 
 export class ConstantExpression extends ExpressionDef {