@malloydata/db-trino 0.0.375 → 0.0.377

package/dist/trino_connection.js

@@ -24,6 +24,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrinoConnection = exports.PrestoConnection = exports.TrinoPrestoConnection = void 0;
 const malloy_1 = require("@malloydata/malloy");
+const internal_1 = require("@malloydata/malloy/internal");
 const connection_1 = require("@malloydata/malloy/connection");
 const presto_js_client_1 = require("@prestodb/presto-js-client");
 const crypto_1 = require("crypto");
@@ -368,7 +369,7 @@ exports.TrinoConnection = TrinoConnection;
  * ARRAY_TYPE: ARRAY '(' TYPE ')'
  * REC_TYPE: REC '(' "name" TYPE (, "name" TYPE)* ')'
  */
-class TrinoPrestoSchemaParser extends malloy_1.TinyParser {
+class TrinoPrestoSchemaParser extends internal_1.TinyParser {
     constructor(input, dialect) {
         super(input, {
             space: /^\s+/,
@@ -382,39 +383,31 @@ class TrinoPrestoSchemaParser extends malloy_1.TinyParser {
     }
     fieldNameList() {
         this.skipTo(']'); // Skip to end of plan
-        this.next('['); // Expect start of name list
+        this.expect('['); // Expect start of name list
         const fieldNames = [];
         for (;;) {
-            const nmToken = this.next('id');
+            const nmToken = this.expect('id');
             fieldNames.push(nmToken.text);
-            const sep = this.next();
-            if (sep.type === ',') {
-                continue;
-            }
-            if (sep.type !== ']') {
-                throw this.parseError(`Unexpected '${sep.text}' while getting field name list`);
+            if (!this.match(',')) {
+                this.expect(']');
+                break;
             }
-            break;
         }
         return fieldNames;
     }
     parseQueryPlan() {
         const fieldNames = this.fieldNameList();
         const fields = [];
-        this.next('arrow', '[');
+        this.expect('arrow', '[');
         for (let nameIndex = 0;; nameIndex += 1) {
             const name = fieldNames[nameIndex];
-            this.next('id', ':');
+            this.expect('id', ':');
             const nextType = this.typeDef();
             fields.push((0, malloy_1.mkFieldDef)(nextType, name));
-            const sep = this.next();
-            if (sep.text === ',') {
-                continue;
-            }
-            if (sep.text !== ']') {
-                throw this.parseError(`Unexpected '${sep.text}' between field types`);
+            if (!this.match(',')) {
+                this.expect(']');
+                break;
             }
-            break;
         }
         if (fields.length !== fieldNames.length) {
             throw new Error(`Presto schema error mismatched ${fields.length} types and ${fieldNames.length} fields`);
@@ -422,26 +415,25 @@ class TrinoPrestoSchemaParser extends malloy_1.TinyParser {
         return fields;
     }
     typeDef() {
-        const typToken = this.next();
+        var _a;
+        const typToken = this.read();
         if (typToken.type === 'eof') {
             throw this.parseError('Unexpected EOF parsing type, expected a type name');
         }
-        else if (typToken.text === 'row' && this.next('(')) {
+        else if (typToken.text === 'row') {
+            this.expect('(');
             const fields = [];
             for (;;) {
-                const name = this.next();
-                if (name.type !== 'id' && name.type !== 'quoted_name') {
-                    throw this.parseError(`Expected property name, got '${name.type}'`);
+                const name = (_a = this.match('id')) !== null && _a !== void 0 ? _a : this.match('quoted_name');
+                if (!name) {
+                    throw this.parseError('Expected property name');
                 }
                 const getDef = this.typeDef();
                 fields.push((0, malloy_1.mkFieldDef)(getDef, name.text));
-                const sep = this.next();
-                if (sep.text === ')') {
+                if (!this.match(',')) {
+                    this.expect(')');
                     break;
                 }
-                if (sep.text === ',') {
-                    continue;
-                }
             }
             const def = {
                 type: 'record',
@@ -449,9 +441,10 @@ class TrinoPrestoSchemaParser extends malloy_1.TinyParser {
             };
             return def;
         }
-        else if (typToken.text === 'array' && this.next('(')) {
+        else if (typToken.text === 'array') {
+            this.expect('(');
             const elType = this.typeDef();
-            this.next(')');
+            this.expect(')');
             return elType.type === 'record'
                 ? {
                     type: 'array',
@@ -460,41 +453,38 @@ class TrinoPrestoSchemaParser extends malloy_1.TinyParser {
                 }
                 : { type: 'array', elementTypeDef: elType };
         }
-        else if (typToken.text === 'map' && this.next('(')) {
+        else if (typToken.text === 'map') {
+            this.expect('(');
             const _keyType = this.typeDef();
-            this.next(',');
+            this.expect(',');
             const _valType = this.typeDef();
-            this.next(')');
+            this.expect(')');
             return { type: 'sql native' };
         }
         else if (typToken.type === 'id') {
             const sqlType = typToken.text.toLowerCase();
             if (sqlType === 'varchar') {
-                if (this.peek().type === '(') {
-                    this.next('(', 'id', ')');
-                }
+                if (this.match('('))
+                    this.expect('id', ')');
             }
             else if (sqlType === 'timestamp') {
-                if (this.peek().text === '(') {
-                    this.next('(', 'id', ')');
-                }
-                if (this.peek().text === 'with') {
-                    this.nextText('with', 'time', 'zone');
+                if (this.match('('))
+                    this.expect('id', ')');
+                if (this.matchText('with', 'time', 'zone')) {
                     return { type: 'timestamptz' };
                 }
                 return { type: 'timestamp' };
             }
             const typeDef = this.dialect.sqlTypeToMalloyType(sqlType);
             if (typeDef.type === 'number' && sqlType === 'decimal') {
-                this.next('(', 'id');
-                if (this.peek().type === ',') {
-                    this.next(',', 'id');
+                this.expect('(', 'id');
+                if (this.match(',', 'id')) {
                     typeDef.numberType = 'float';
                 }
                 else {
                     typeDef.numberType = 'integer';
                 }
-                this.next(')');
+                this.expect(')');
             }
             if (typeDef === undefined) {
                 throw this.parseError(`Can't parse presto type ${sqlType}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-trino",
-  "version": "0.0.375",
+  "version": "0.0.377",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "0.0.375",
+    "@malloydata/malloy": "0.0.377",
     "@prestodb/presto-js-client": "^1.0.0",
     "gaxios": "^4.2.0",
     "luxon": "^3.5.0",