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

package/src/models/faa_model.ts

@@ -23,7 +23,7 @@
 
 import {ModelDef, StructDef, StructRelationship} from '@malloydata/malloy';
 
-import {fStringEq, fYearEq} from '../util';
+import {fStringEq, fToIF, fToQF, fYearEq} from '../util';
 
 import {medicareModel, medicareStateFacts} from './medicare_model';
 
@@ -32,9 +32,9 @@ function withJoin(leftKey: string, rightKey: string): StructRelationship {
     type: 'one',
     matrixOperation: 'left',
     onExpression: [
-      {type: 'field', path: `${leftKey}`},
+      {type: 'field', path: leftKey.split('.')},
       '=',
-      {type: 'field', path: `${rightKey}`},
+      {type: 'field', path: rightKey.split('.')},
     ],
   };
 }
@@ -82,7 +82,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
         {
           type: 'aggregate',
           function: 'sum',
-          e: [{type: 'field', path: 'distance'}],
+          e: [{type: 'field', path: ['distance']}],
         },
       ],
     },
@@ -101,9 +101,9 @@ export const FLIGHTS_EXPLORE: StructDef = {
         type: 'one',
         matrixOperation: 'left',
         onExpression: [
-          {type: 'field', path: 'carrier'},
+          {type: 'field', path: ['carrier']},
           '=',
-          {type: 'field', path: 'carriers.code'},
+          {type: 'field', path: ['carriers', 'code']},
         ],
       },
       primaryKey: 'code',
@@ -174,7 +174,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
             {
               type: 'aggregate',
               function: 'sum',
-              e: [{type: 'field', path: 'aircraft_models.engines'}],
+              e: [{type: 'field', path: ['aircraft_models', 'engines']}],
             },
           ],
         },
@@ -226,7 +226,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
                 {
                   type: 'aggregate',
                   function: 'sum',
-                  e: [{type: 'field', path: 'seats'}],
+                  e: [{type: 'field', path: ['seats']}],
                 },
               ],
             },
@@ -347,7 +347,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
           pipeline: [
             {
               type: 'reduce',
-              fields: [
+              queryFields: fToQF([
                 'tail_num',
                 {
                   type: 'number',
@@ -357,11 +357,11 @@ export const FLIGHTS_EXPLORE: StructDef = {
                     {
                       type: 'aggregate',
                       function: 'sum',
-                      e: [{type: 'field', path: 'distance'}],
+                      e: [{type: 'field', path: ['distance']}],
                     },
                   ],
                 },
-              ],
+              ]),
             },
           ],
         },
@@ -374,33 +374,13 @@ export const FLIGHTS_EXPLORE: StructDef = {
       ],
     },
 
-    // // Inline derived table
-    // {
-    //   type: 'struct',
-    //   name: "aircraft_facts2",
-    //   structSource: {
-    //     type: 'query',
-    //     query: {
-    //       type: 'reduce',
-    //         fields: [
-    //           'tail_num',
-    //           {name: 'total_distance', as: 'lifetime_distance'}
-    //         ]
-    //       }
-    //   },
-    //   structRelationship: {type: 'foreignKey', keyExpression: [{ type: "field", path:  'tail_num'},
-    //   fields: [
-    //   ]
-    // },
-    // query definition
-    // EXPLORE flights | REDUCE carriers.name, flight_count ORDER BY 1
     {
       type: 'turtle',
       name: 'flights_by_carrier',
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             'carriers.name',
             'flight_count',
             // { name: "origin.count", as: "origin_count" },
@@ -413,7 +393,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
                   type: 'aggregate',
                   function: 'count',
                   e: [],
-                  structPath: 'origin',
+                  structPath: ['origin'],
                 },
               ],
             },
@@ -425,11 +405,11 @@ export const FLIGHTS_EXPLORE: StructDef = {
                 {
                   type: 'aggregate',
                   function: 'sum',
-                  e: [{type: 'field', path: 'distance'}],
+                  e: [{type: 'field', path: ['distance']}],
                 },
               ],
             },
-          ],
+          ]),
           orderBy: [{field: 'name', dir: 'asc'}],
         },
       ],
@@ -441,7 +421,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
         {
           type: 'reduce',
 
-          fields: [
+          queryFields: fToQF([
             'carriers.name',
             {
               name: 'flights_2001',
@@ -479,7 +459,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
                 },
               ],
             },
-          ],
+          ]),
           orderBy: [{field: 'name', dir: 'asc'}],
         },
       ],
@@ -491,7 +471,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: ['destination.city', 'flight_count'],
+          queryFields: fToQF(['destination.city', 'flight_count']),
           orderBy: [{field: 2, dir: 'desc'}],
           limit: 5,
         },
@@ -505,12 +485,12 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             'aircraft.aircraft_models.manufacturer',
             'aircraft.aircraft_models.model',
             'aircraft.aircraft_count',
             'flight_count',
-          ],
+          ]),
           orderBy: [{field: 'flight_count', dir: 'desc'}],
           filterList: [fStringEq('origin.state', 'CA')],
           limit: 5,
@@ -525,7 +505,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
         {
           type: 'reduce',
 
-          fields: [
+          queryFields: fToQF([
             'tail_num',
             {
               type: 'number',
@@ -535,11 +515,11 @@ export const FLIGHTS_EXPLORE: StructDef = {
                 {
                   type: 'aggregate',
                   function: 'sum',
-                  e: [{type: 'field', path: 'distance'}],
+                  e: [{type: 'field', path: ['distance']}],
                 },
               ],
             },
-          ],
+          ]),
         },
       ],
     },
@@ -550,7 +530,11 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: ['carriers.name', 'aircraft.total_engines', 'flight_count'],
+          queryFields: fToQF([
+            'carriers.name',
+            'aircraft.total_engines',
+            'flight_count',
+          ]),
         },
       ],
     },
@@ -561,7 +545,10 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: ['aircraft_facts.lifetime_distance', 'flight_count'],
+          queryFields: fToQF([
+            'aircraft_facts.lifetime_distance',
+            'flight_count',
+          ]),
         },
       ],
     },
@@ -572,7 +559,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: ['flight_count', 'origin.city', 'origin.state'],
+          queryFields: fToQF(['flight_count', 'origin.city', 'origin.state']),
         },
       ],
     },
@@ -592,7 +579,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             'carrier',
             'flight_count',
             {
@@ -601,13 +588,17 @@ export const FLIGHTS_EXPLORE: StructDef = {
               pipeline: [
                 {
                   type: 'reduce',
-                  fields: ['origin_code', 'destination_code', 'flight_count'],
+                  queryFields: fToQF([
+                    'origin_code',
+                    'destination_code',
+                    'flight_count',
+                  ]),
                   limit: 5,
                   orderBy: [{field: 'flight_count', dir: 'desc'}],
                 },
               ],
             },
-          ],
+          ]),
         },
       ],
     },
@@ -622,7 +613,11 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: ['origin_code', 'destination_code', 'flight_count'],
+          queryFields: fToQF([
+            'origin_code',
+            'destination_code',
+            'flight_count',
+          ]),
           limit: 5,
           orderBy: [{field: 'flight_count', dir: 'desc'}],
         },
@@ -635,7 +630,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: ['carrier', 'flight_count', 'top_5_routes'],
+          queryFields: fToQF(['carrier', 'flight_count', 'top_5_routes']),
         },
       ],
     },
@@ -646,7 +641,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: ['destination.code', 'flight_count'],
+          queryFields: fToQF(['destination.code', 'flight_count']),
           filterList: [fStringEq('destination.state', 'NY')],
           orderBy: [{field: 'flight_count', dir: 'desc'}],
         },
@@ -659,11 +654,11 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             'aircraft.aircraft_models.manufacturer',
             'aircraft.aircraft_count',
             'flight_count',
-          ],
+          ]),
           orderBy: [{field: 'flight_count', dir: 'desc'}],
           limit: 5,
         },
@@ -676,12 +671,12 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             'carrier',
             'flight_count',
             'top_5_routes',
             'flights_by_manufacturer',
-          ],
+          ]),
           filterList: [fStringEq('origin.state', 'CA')],
         },
       ],
@@ -692,12 +687,12 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: [
+          queryFields: fToQF([
             'origin_code',
             'destination_code',
             'flight_count',
             'flights_by_carrier',
-          ],
+          ]),
           limit: 5,
           orderBy: [{field: 'flight_count', dir: 'desc'}],
         },
@@ -710,14 +705,14 @@ export const FLIGHTS_EXPLORE: StructDef = {
         {
           type: 'reduce',
           filterList: [fStringEq('origin.state', 'CA')],
-          fields: [
+          queryFields: fToQF([
             {
               type: 'turtle',
               name: 'main',
               pipeline: [
                 {
                   type: 'reduce',
-                  fields: [
+                  queryFields: fToQF([
                     'carriers.name',
                     'flight_count',
                     //{ name: "origin.count", as: "origin_count" },
@@ -730,11 +725,11 @@ export const FLIGHTS_EXPLORE: StructDef = {
                           type: 'aggregate',
                           function: 'count',
                           e: [],
-                          structPath: 'origin',
+                          structPath: ['origin'],
                         },
                       ],
                     },
-                  ],
+                  ]),
                   orderBy: [{field: 'flight_count', dir: 'desc'}],
                 },
               ],
@@ -745,11 +740,11 @@ export const FLIGHTS_EXPLORE: StructDef = {
               pipeline: [
                 {
                   type: 'reduce',
-                  fields: ['flight_count'],
+                  queryFields: fToQF(['flight_count']),
                 },
               ],
             },
-          ],
+          ]),
         },
       ],
     },
@@ -760,7 +755,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
         {
           type: 'reduce',
           orderBy: [{field: 'dep_time', dir: 'asc'}],
-          fields: [
+          queryFields: fToQF([
             'id2',
             'dep_time',
             'tail_num',
@@ -769,7 +764,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
             'destination_code',
             'distance',
             'dep_delay',
-          ],
+          ]),
           limit: 500,
         },
       ],
@@ -780,7 +775,11 @@ export const FLIGHTS_EXPLORE: StructDef = {
       pipeline: [
         {
           type: 'reduce',
-          fields: ['flight_count', 'total_distance', 'aircraft.aircraft_count'],
+          queryFields: fToQF([
+            'flight_count',
+            'total_distance',
+            'aircraft.aircraft_count',
+          ]),
         },
       ],
     },
@@ -795,7 +794,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
             fStringEq('carrier', 'UA'),
           ],
           limit: 20,
-          fields: [
+          queryFields: fToQF([
             {
               type: 'timestamp',
               name: 'dep_time',
@@ -809,7 +808,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
               pipeline: [
                 {
                   type: 'reduce',
-                  fields: [
+                  queryFields: fToQF([
                     'origin_code',
                     'destination_code',
                     'flight_count',
@@ -821,22 +820,22 @@ export const FLIGHTS_EXPLORE: StructDef = {
                           type: 'reduce',
                           orderBy: [{field: 'dep_time', dir: 'asc'}],
                           limit: 5,
-                          fields: [
+                          queryFields: fToQF([
                             'id2',
                             'dep_time',
                             'tail_num',
                             'flight_num',
                             'dep_delay',
-                          ],
+                          ]),
                         },
                       ],
                     },
-                  ],
+                  ]),
                   orderBy: [{field: 'flight_count', dir: 'desc'}],
                 },
               ],
             },
-          ],
+          ]),
         },
       ],
     },
@@ -863,7 +862,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
           type: 'reduce',
           filterList: [fStringEq('carrier', 'UA')],
           limit: 2,
-          fields: [
+          queryFields: fToQF([
             {
               type: 'timestamp',
               name: 'dep_time',
@@ -879,7 +878,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
                 {
                   type: 'reduce',
                   limit: 10,
-                  fields: [
+                  queryFields: fToQF([
                     'tail_num',
                     'flight_count',
                     {
@@ -889,23 +888,23 @@ export const FLIGHTS_EXPLORE: StructDef = {
                         {
                           type: 'reduce',
                           orderBy: [{field: 'dep_time', dir: 'asc'}],
-                          fields: [
+                          queryFields: fToQF([
                             'id2',
                             'dep_time',
                             'origin_code',
                             'destination_code',
                             'flight_num',
                             'dep_delay',
-                          ],
+                          ]),
                         },
                       ],
                     },
-                  ],
+                  ]),
                   orderBy: [{field: 'flight_count', dir: 'desc'}],
                 },
               ],
             },
-          ],
+          ]),
         },
       ],
     },
@@ -916,7 +915,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
         {
           type: 'index',
           weightMeasure: 'flight_count',
-          fields: [
+          indexFields: fToIF([
             'carrier',
             'origin_code',
             'destination_code',
@@ -934,7 +933,7 @@ export const FLIGHTS_EXPLORE: StructDef = {
             'aircraft.aircraft_model_code',
             'aircraft.aircraft_models.manufacturer',
             'aircraft.aircraft_models.model',
-          ],
+          ]),
         },
       ],
     },

package/src/models/medicare_model.ts

@@ -22,6 +22,7 @@
  */
 
 import {StructDef} from '@malloydata/malloy';
+import {fToQF} from '../util';
 
 // will it build?
 
@@ -71,7 +72,7 @@ export const medicareModel: StructDef = {
       type: 'number',
       name: 'provider_count',
       expressionType: 'aggregate',
-      e: ['COUNT(DISTINCT ', {type: 'field', path: 'provider_id'}, ')'],
+      e: ['COUNT(DISTINCT ', {type: 'field', path: ['provider_id']}, ')'],
     },
     {
       type: 'number',
@@ -81,7 +82,7 @@ export const medicareModel: StructDef = {
         {
           type: 'aggregate',
           function: 'sum',
-          e: [{type: 'field', path: 'discharges'}],
+          e: [{type: 'field', path: ['discharges']}],
         },
       ],
     },
@@ -91,7 +92,7 @@ export const medicareModel: StructDef = {
       name: 'discharges_by_state',
       pipeline: [
         {
-          fields: ['provider_state', 'total_discharges'],
+          queryFields: fToQF(['provider_state', 'total_discharges']),
           orderBy: [{dir: 'desc', field: 2}],
           type: 'reduce',
         },
@@ -102,7 +103,7 @@ export const medicareModel: StructDef = {
       name: 'discharges_by_city',
       pipeline: [
         {
-          fields: ['provider_city', 'total_discharges'],
+          queryFields: fToQF(['provider_city', 'total_discharges']),
           orderBy: [{dir: 'desc', field: 2}],
           type: 'reduce',
         },
@@ -113,12 +114,12 @@ export const medicareModel: StructDef = {
       name: 'bigturtle_state',
       pipeline: [
         {
-          fields: [
+          queryFields: fToQF([
             'provider_state',
             'total_discharges',
             'discharges_by_city',
             'discharges_by_zip',
-          ],
+          ]),
           orderBy: [{dir: 'desc', field: 1}],
           type: 'reduce',
         },
@@ -129,7 +130,7 @@ export const medicareModel: StructDef = {
       name: 'discharges_by_zip',
       pipeline: [
         {
-          fields: ['provider_zipcode', 'total_discharges'],
+          queryFields: fToQF(['provider_zipcode', 'total_discharges']),
           orderBy: [{dir: 'desc', field: 2}],
           type: 'reduce',
         },
@@ -140,7 +141,11 @@ export const medicareModel: StructDef = {
       name: 'turtle_city_zip',
       pipeline: [
         {
-          fields: ['provider_city', 'total_discharges', 'discharges_by_zip'],
+          queryFields: fToQF([
+            'provider_city',
+            'total_discharges',
+            'discharges_by_zip',
+          ]),
           orderBy: [{dir: 'desc', field: 1}],
           type: 'reduce',
         },
@@ -151,7 +156,11 @@ export const medicareModel: StructDef = {
       name: 'triple_turtle',
       pipeline: [
         {
-          fields: ['provider_state', 'total_discharges', 'turtle_city_zip'],
+          queryFields: fToQF([
+            'provider_state',
+            'total_discharges',
+            'turtle_city_zip',
+          ]),
           orderBy: [{dir: 'desc', field: 1}],
           type: 'reduce',
         },
@@ -162,7 +171,7 @@ export const medicareModel: StructDef = {
       name: 'rollup_by_location',
       pipeline: [
         {
-          fields: [
+          queryFields: fToQF([
             'provider_state',
             'total_discharges',
             {
@@ -170,7 +179,7 @@ export const medicareModel: StructDef = {
               name: 'turtle_city_zip',
               pipeline: [
                 {
-                  fields: [
+                  queryFields: fToQF([
                     'provider_city',
                     'total_discharges',
                     {
@@ -178,19 +187,22 @@ export const medicareModel: StructDef = {
                       name: 'discharges_by_zip',
                       pipeline: [
                         {
-                          fields: ['provider_zipcode', 'total_discharges'],
+                          queryFields: fToQF([
+                            'provider_zipcode',
+                            'total_discharges',
+                          ]),
                           orderBy: [{dir: 'desc', field: 2}],
                           type: 'reduce',
                         },
                       ],
                     },
-                  ],
+                  ]),
                   orderBy: [{dir: 'desc', field: 1}],
                   type: 'reduce',
                 },
               ],
             },
-          ],
+          ]),
           orderBy: [{dir: 'desc', field: 1}],
           type: 'reduce',
         },
@@ -217,15 +229,19 @@ export const medicareStateFacts: StructDef = {
       structRef: 'medicare_test',
       pipeline: [
         {
-          fields: [
+          queryFields: fToQF([
             'provider_state',
             {
               type: 'number',
               name: 'num_providers',
               expressionType: 'aggregate',
-              e: ['COUNT(DISTINCT ', {type: 'field', path: 'provider_id'}, ')'],
+              e: [
+                'COUNT(DISTINCT ',
+                {type: 'field', path: ['provider_id']},
+                ')',
+              ],
             },
-          ],
+          ]),
           type: 'reduce',
         },
       ],