@malloydata/malloy 0.0.226-dev250113222119 → 0.0.226-dev250113232418

package/dist/dialect/duckdb/duckdb.js

@@ -391,7 +391,6 @@ class DuckDBTypeParser extends tiny_parser_1.TinyParser {
         return token.text.toUpperCase();
     }
     typeDef() {
-        const unknownStart = this.parseCursor;
         const wantID = this.next('id');
         const id = this.sqlID(wantID);
         let baseType;
@@ -438,17 +437,18 @@ class DuckDBTypeParser extends tiny_parser_1.TinyParser {
         }
         else {
             if (wantID.type === 'id') {
-                for (;;) {
-                    const next = this.peek();
-                    // Might be WEIRDTYP(a,b)[] ... stop at the []
-                    if (next.type === 'arrayOf' || next.type === 'eof') {
-                        break;
-                    }
+                // unknown field type, strip all type decorations, there was a regex for this
+                // in the pre-parser code, but no tests, so this is also untested
+                let idEnd = wantID.cursor + wantID.text.length;
+                if (this.peek().type === 'precision') {
                     this.next();
                 }
+                if (this.peek().type === 'eof') {
+                    idEnd = this.input.length;
+                }
                 baseType = {
                     type: 'sql native',
-                    rawType: this.input.slice(unknownStart, this.parseCursor - unknownStart + 1),
+                    rawType: this.input.slice(wantID.cursor, idEnd),
                 };
             }
             else {

package/dist/dialect/tiny_parser.d.ts

@@ -1,4 +1,5 @@
 export interface TinyToken {
+    cursor: number;
     type: string;
     text: string;
 }

package/dist/dialect/tiny_parser.js

@@ -129,12 +129,14 @@ class TinyParser {
                 if (foundToken) {
                     notFound = false;
                     let tokenText = foundToken[0];
+                    const cursor = this.parseCursor;
                     this.parseCursor += tokenText.length;
                     if (tokenType !== 'space') {
                         if (tokenType[0] === 'q') {
                             tokenText = tokenText.slice(1, -1); // strip quotes
                         }
                         yield {
+                            cursor,
                             type: tokenType === 'char' ? tokenText : tokenType,
                             text: tokenText,
                         };
@@ -143,7 +145,7 @@ class TinyParser {
                 }
             }
             if (notFound) {
-                yield { type: 'unexpected token', text: src };
+                yield { cursor: this.parseCursor, type: 'unexpected token', text: src };
                 return;
             }
         }

package/dist/lang/ast/field-space/query-spaces.js

@@ -170,7 +170,7 @@ class QueryOperationSpace extends refined_space_1.RefinedSpace {
         const lookup = this.exprSpace.lookup(reference);
         // Should always be found...
         if (lookup.found && lookup.found instanceof struct_space_field_base_1.StructSpaceFieldBase) {
-            return ((_a = lookup.found.fieldDef().onCompositeFieldUsage) !== null && _a !== void 0 ? _a : (0, composite_source_utils_1.emptyCompositeFieldUsage)());
+            return (0, composite_source_utils_1.joinedCompositeFieldUsage)(joinPath.slice(0, -1), (_a = lookup.found.fieldDef().onCompositeFieldUsage) !== null && _a !== void 0 ? _a : (0, composite_source_utils_1.emptyCompositeFieldUsage)());
         }
         throw new Error('Unexpected join lookup was not found or not a struct');
     }

package/dist/lang/test/query.spec.js

@@ -571,6 +571,19 @@ describe('query:', () => {
         extend: { join_one: b with astr }
         group_by: b.ai
       }`).toTranslate();
+        });
+        test('reference field in double nested join inside nest', () => {
+            expect(`
+        source: a_2 is a extend { join_one: b is b extend {
+          join_one: c is b on 1 = c.ai
+        } with astr }
+
+        run: a_2 -> {
+          nest: x is {
+            group_by: ai is b.c.ai
+          }
+        }
+      `).toTranslate();
         });
         test.skip('reference join as field', () => {
             expect(`run: a -> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.226-dev250113222119",
+  "version": "0.0.226-dev250113232418",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",