@malloydata/malloy-tests 0.0.119-dev240123183113 → 0.0.119-dev240124170348

package/src/tags.spec.ts

@@ -377,7 +377,25 @@ describe('tags in results', () => {
     const result = await loaded.run();
     expect(result.tagParse().tag).tagsAre(wantTag);
   });
-  test('atomic field has tag', async () => {
+  test('field ref has tag', async () => {
+    const loaded = runtime.loadQuery(
+      `run: duckdb.sql("select 1 as num") extend {
+        dimension: # sourceNote
+          one is num
+        } -> {
+          select: # queryNote
+          one
+      }`
+    );
+    const result = await loaded.run();
+    const shape = result.resultExplore;
+    const one = shape.getFieldByName('one');
+    expect(one).toBeDefined();
+    const tp = one.tagParse();
+    expect(tp.log).toEqual([]);
+    expect(tp.tag).tagsAre({sourceNote: {}, queryNote: {}});
+  });
+  test('atomic field model scope tag', async () => {
     const loaded = runtime.loadQuery(
       `
           ## modelDef=ok

package/src/util/index.ts

@@ -24,14 +24,30 @@
 import {
   FilterExpression,
   Fragment,
+  QueryFieldDef,
+  IndexFieldDef,
   QueryMaterializer,
   Result,
   Runtime,
 } from '@malloydata/malloy';
 
+// these two helper functions are here just to make older hand built models
+// easier to use in the new world were refs are not strings
+export function fToQF(fs: (QueryFieldDef | string)[]): QueryFieldDef[] {
+  return fs.map(f =>
+    typeof f === 'string' ? {type: 'fieldref', path: f.split('.')} : f
+  );
+}
+
+export function fToIF(fs: string[]): IndexFieldDef[] {
+  return fs.map(f =>
+    typeof f === 'string' ? {type: 'fieldref', path: f.split('.')} : f
+  );
+}
+
 export function fStringEq(field: string, value: string): FilterExpression {
   return {
-    expression: [{type: 'field', path: field}, `='${value}'`],
+    expression: [{type: 'field', path: field.split('.')}, `='${value}'`],
     code: `${field}='${value}'`,
     expressionType: 'scalar',
   };
@@ -39,7 +55,7 @@ export function fStringEq(field: string, value: string): FilterExpression {
 
 export function fStringLike(field: string, value: string): FilterExpression {
   return {
-    expression: [{type: 'field', path: field}, ` LIKE '${value}'`],
+    expression: [{type: 'field', path: field.split('.')}, ` LIKE '${value}'`],
     code: `${field}~'${value}'`,
     expressionType: 'scalar',
   };
@@ -48,7 +64,7 @@ export function fStringLike(field: string, value: string): FilterExpression {
 export function fYearEq(field: string, year: number): FilterExpression {
   const yBegin = `'${year}-01-01 00:00:00'`;
   const yEnd = `'${year + 1}-01-01 00:00:00'`;
-  const fx: Fragment = {type: 'field', path: field};
+  const fx: Fragment = {type: 'field', path: field.split('.')};
   return {
     expression: [fx, `>=${yBegin} and `, fx, `<${yEnd}`],
     code: `${field}:@${year}`,