@malloydata/malloy-tests 0.0.88-dev231002231014 → 0.0.88-dev231002235732

package/dist/tags.spec.js

@@ -260,11 +260,11 @@ describe('## top level', () => {
 describe('tags in results', () => {
     test('nameless query', async () => {
         const loaded = runtime.loadQuery(`
-          ## modelDef=ok
-          sql: one is {connection: "duckdb" select: """SELECT 1 as one"""}
-          # b4query
-          query: # afterQuery import=$(modelDef)
-            from_sql(one) -> { project: * }`);
+        ## modelDef=ok
+        source: one is duckdb.sql("SELECT 1 as one")
+        # b4query
+        run: # afterQuery import=$(modelDef)
+          one -> { select: * }`);
         const qTag = { b4query: {}, afterQuery: {}, import: { eq: 'ok' } };
         const query = await loaded.getPreparedQuery();
         expect(query).toBeDefined();
@@ -275,17 +275,18 @@ describe('tags in results', () => {
     const wantTag = { BQ: {}, AQ: {}, Bis: {}, Ais: {}, import: { eq: 'ok' } };
     test('named query', async () => {
         const loaded = runtime.loadQuery(`
-          sql: one is {connection: "duckdb" select: """SELECT 1 as one"""}
-          ## modelDef=ok
-          # BQ
-          query: # AQ
-            # import=$(modelDef)
-            theName
-            # Bis
-            is
-            # Ais
-            from_sql(one) -> { project: * }
-          query: -> theName`);
+        ## modelDef=ok
+        source: one is duckdb.sql("SELECT 1 as one")
+        # BQ
+        query: # AQ
+          # import=$(modelDef)
+          theName
+          # Bis
+          is
+          # Ais
+          one -> { select: * }
+        run: theName
+      `);
         const query = await loaded.getPreparedQuery();
         expect(query).toBeDefined();
         expect(query.tagParse().tag).tagsAre(wantTag);
@@ -294,18 +295,18 @@ describe('tags in results', () => {
     });
     test('turtle query', async () => {
         const loaded = runtime.loadQuery(`
-          ## modelDef=ok
-          sql: one is {connection: "duckdb" select: """SELECT 1 as one"""}
-          query: from_sql(one) + {
-            # BQ import=$(modelDef)
-            query: # AQ
-              in_one
-              # Bis
-              is
-              # Ais
-              { project: one }
-            }
-          -> in_one`);
+        ## modelDef=ok
+        source: one is duckdb.sql("SELECT 1 as one") extend {
+          # BQ import=$(modelDef)
+          view: # AQ
+            in_one
+            # Bis
+            is
+            # Ais
+            { select: one }
+        }
+        run: one -> in_one
+      `);
         const query = await loaded.getPreparedQuery();
         expect(query).toBeDefined();
         expect(query.tagParse().tag).tagsAre(wantTag);
@@ -315,9 +316,9 @@ describe('tags in results', () => {
     test('atomic field has tag', async () => {
         const loaded = runtime.loadQuery(`
           ## modelDef=ok
-          sql: one is {connection: "duckdb" select: """SELECT 1 as one"""}
-          query: from_sql(one) -> {
-            project:
+          source: one is duckdb.sql("SELECT 1 as one")
+          run: one -> {
+            select:
               # note1 import=$(modelDef)
               one
           }`);
@@ -332,12 +333,12 @@ describe('tags in results', () => {
     test('nested query has tag', async () => {
         const loaded = runtime.loadQuery(`
           ## modelDef=ok
-          sql: one is {connection: "duckdb" select: """SELECT 1 as one"""}
-          source: malloy_one is from_sql(one) + {
-            query: in_one is {
-              project: one
+          source: one is duckdb.sql("SELECT 1 as one")
+          source: malloy_one is one extend {
+            view: in_one is {
+              select: one
             }
-            query: one_and_one is {
+            view: one_and_one is {
               group_by: one
               # note1
               nest:
@@ -345,7 +346,7 @@ describe('tags in results', () => {
                 in_one
             }
           }
-          query: malloy_one -> one_and_one`);
+          run: malloy_one -> one_and_one`);
         const result = await loaded.run();
         const shape = result.resultExplore;
         const one = shape.getFieldByName('in_one');
@@ -361,20 +362,20 @@ describe('tags in results', () => {
         source: ages is duckdb.sql('SELECT 1 as one') extend {
           # name
           dimension: name is 'John'
-          query: height
+          view: height
           # barchart
           is {
-            project: heightd is 10
+            select: heightd is 10
           }
 
-          query: age
+          view: age
           # barchart
           is {
-            project: aged is 20
+            select: aged is 20
           }
 
         }
-        query: ages -> {
+        run: ages -> {
           group_by: name
           nest: height
           nest: age
@@ -389,12 +390,11 @@ describe('tags in results', () => {
         expect(age.tagParse().tag).tagsAre({ barchart: {} });
         expect(name.tagParse().tag).tagsAre({ name: {} });
     });
-    test('User defines scopes nest properly', async () => {
+    test('User defined scopes nest properly', async () => {
         const loaded = runtime.loadQuery(`
           ## scope=model
-          sql: one is {connection: "duckdb" select: """SELECT 1 as one"""}
-          query: from_sql(one) -> {
-            project:
+          run: duckdb.sql("SELECT 1 as one") -> {
+            select:
               # valueFrom=$(scope)
               one
           }`);

package/dist/tags.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"tags.spec.js","sourceRoot":"","sources":["../src/tags.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tags.spec.js","sourceRoot":"","sources":["../src/tags.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;AAEH,+CAAgD;AAChD,yCAAsC;AAWtC,MAAM,CAAC,MAAM,CAAC;IACZ,OAAO,CAAC,GAAiB,EAAE,MAAW;QACpC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,MAAM,EAAC,GAAG,EAAE,GAAG,EAAC,GAAG,YAAG,CAAC,WAAW,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YACnD,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACrC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClB,OAAO;oBACL,IAAI,EAAE,KAAK;oBACX,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,GAAG,2BAA2B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;iBAClE,CAAC;aACH;YACD,GAAG,GAAG,GAAG,CAAC;SACX;QACD,MAAM,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC;QAC3B,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE;YAC5B,OAAO;gBACL,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,GAAG,EAAE,CAAC,gCAAgC;aAChD,CAAC;SACH;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAC/C,OAAO;YACL,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,QAAQ,eAAe,QAAQ,EAAE;SAC9D,CAAC;IACJ,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,OAAO,GAAG,IAAA,qBAAU,EAAC,QAAQ,CAAC,CAAC;AAGrC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,MAAM,QAAQ,GAAmB;QAC/B,CAAC,WAAW,EAAE,EAAC,SAAS,EAAE,EAAE,EAAC,CAAC;QAC9B,CAAC,kBAAkB,EAAE,EAAC,IAAI,EAAE,EAAC,EAAE,EAAE,aAAa,EAAC,EAAC,CAAC;QACjD,CAAC,sBAAsB,EAAE,EAAC,IAAI,EAAE,EAAC,EAAE,EAAE,eAAe,EAAC,EAAC,CAAC;QACvD,CAAC,cAAc,EAAE,EAAC,IAAI,EAAE,EAAC,UAAU,EAAE,EAAC,KAAK,EAAE,EAAE,EAAC,EAAC,EAAC,CAAC;QACnD;YACE,0BAA0B;YAC1B;gBACE,IAAI,EAAE;oBACJ,UAAU,EAAE;wBACV,KAAK,EAAE,EAAE;wBACT,KAAK,EAAE,EAAC,EAAE,EAAE,OAAO,EAAC;qBACrB;iBACF;aACF;SACF;QACD,CAAC,WAAW,EAAE,EAAC,IAAI,EAAE,EAAC,UAAU,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC,EAAC,EAAC,CAAC;QAC/C,CAAC,iBAAiB,EAAE,EAAC,IAAI,EAAE,EAAC,UAAU,EAAE,EAAC,IAAI,EAAE,EAAC,EAAE,EAAE,OAAO,EAAC,EAAC,EAAC,EAAC,CAAC;QAChE;YACE,qBAAqB;YACrB,EAAC,IAAI,EAAE,EAAC,UAAU,EAAE,EAAC,IAAI,EAAE,EAAC,UAAU,EAAE,EAAC,GAAG,EAAE,EAAC,EAAE,EAAE,OAAO,EAAC,EAAC,EAAC,EAAC,EAAC,EAAC;SACjE;QACD;YACE,wBAAwB;YACxB,EAAC,IAAI,EAAE,EAAC,UAAU,EAAE,EAAC,MAAM,EAAE,EAAC,EAAE,EAAE,CAAC,EAAC,EAAE,EAAE,GAAG,EAAC,EAAE,EAAC,EAAE,EAAE,GAAG,EAAC,EAAE,EAAC,EAAE,EAAE,GAAG,EAAC,CAAC,EAAC,EAAC,EAAC,EAAC;SACxE;QACD,CAAC,mBAAmB,EAAE,EAAC,IAAI,EAAE,EAAC,UAAU,EAAE,EAAC,MAAM,EAAE,EAAC,EAAE,EAAE,CAAC,EAAC,EAAE,EAAE,GAAG,EAAC,CAAC,EAAC,EAAC,EAAC,EAAC,CAAC;QACxE;YACE,qBAAqB;YACrB,EAAC,IAAI,EAAE,EAAC,UAAU,EAAE,EAAC,KAAK,EAAE,EAAC,EAAE,EAAE,CAAC,EAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAC,CAAC,EAAE,EAAE,EAAC,EAAC,CAAC,EAAC,EAAC,EAAC,EAAC;SACtE;QACD;YACE,mBAAmB;YACnB,EAAC,IAAI,EAAE,EAAC,UAAU,EAAE,EAAC,KAAK,EAAE,EAAC,EAAE,EAAE,CAAC,EAAC,UAAU,EAAE,EAAC,CAAC,EAAE,EAAE,EAAC,EAAC,CAAC,EAAC,EAAC,EAAC,EAAC;SAC7D;QACD,CAAC,mBAAmB,EAAE,EAAC,IAAI,EAAE,EAAC,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAC,IAAI,EAAE,EAAE,EAAC,EAAC,EAAC,CAAC;QACpE;YACE,mBAAmB;YACnB,EAAC,IAAI,EAAE,EAAC,UAAU,EAAE,EAAC,IAAI,EAAE,EAAC,UAAU,EAAE,EAAC,KAAK,EAAE,EAAE,EAAC,EAAC,EAAC,EAAC,EAAC;SACxD;QACD,CAAC,YAAY,EAAE,EAAC,GAAG,EAAE,EAAE,EAAC,CAAC;QACzB,CAAC,cAAc,EAAE,EAAC,CAAC,EAAE,EAAC,UAAU,EAAE,EAAC,CAAC,EAAE,EAAE,EAAC,EAAC,EAAC,CAAC;QAC5C,CAAC,gBAAgB,EAAE,EAAC,CAAC,EAAE,EAAC,UAAU,EAAE,EAAC,CAAC,EAAE,EAAE,EAAC,EAAC,EAAC,CAAC;QAC9C,CAAC,eAAe,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAC,EAAE,EAAE,EAAC,EAAE,EAAE,IAAI,EAAC,EAAC,EAAC,EAAC,CAAC;QAC/D,CAAC,kBAAkB,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,IAAI,EAAC,EAAC,EAAC,EAAC,CAAC;QACjE,CAAC,aAAa,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,GAAG,EAAC,EAAC,CAAC;QAC/B,CAAC,cAAc,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAC,CAAC,EAAE,EAAE,EAAC,EAAC,EAAC,CAAC;QACrD;YACE,kDAAkD;YAClD;gBACE,CAAC,EAAE,EAAC,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,EAAC,KAAK,EAAE,EAAC,EAAE,EAAE,MAAM,EAAC,EAAC,EAAC;gBACjD,KAAK,EAAE,EAAC,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,EAAC,KAAK,EAAE,EAAC,EAAE,EAAE,MAAM,EAAC,EAAC,EAAC;gBACrD,KAAK,EAAE,EAAC,EAAE,EAAE,MAAM,EAAC;aACpB;SACF;QACD,CAAC,OAAO,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,KAAK,EAAC,EAAC,CAAC;QAC3B,CAAC,MAAM,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,IAAI,EAAC,EAAC,CAAC;QACzB,CAAC,KAAK,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,GAAG,EAAC,EAAC,CAAC;QACvB,CAAC,OAAO,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,KAAK,EAAC,EAAC,CAAC;QAC3B,CAAC,MAAM,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,IAAI,EAAC,EAAC,CAAC;QACzB,CAAC,QAAQ,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,MAAM,EAAC,EAAC,CAAC;QAC7B,CAAC,OAAO,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,KAAK,EAAC,EAAC,CAAC;QAC3B,CAAC,sBAAsB,EAAE,EAAC,aAAa,EAAE,EAAC,EAAE,EAAE,QAAQ,EAAC,EAAC,CAAC;KAC1D,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,UAAkB,EAAE,QAAiB,EAAE,EAAE;QACtE,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,gDAAgD,EAAE,GAAG,EAAE;QAC1D,MAAM,CAAC,GAAiB,CAAC,YAAY,EAAE,EAAC,CAAC,EAAE,EAAC,EAAE,EAAE,GAAG,EAAC,EAAE,CAAC,EAAE,EAAC,EAAE,EAAE,GAAG,EAAC,EAAC,CAAC,CAAC;QACrE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;QACrB,MAAM,UAAU,GAAG,KAAK,CAAC;QACzB,MAAM,OAAO,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,UAAU,EAAE,GAAG,EAAE;QACpB,MAAM,UAAU,GAAG,aAAa,CAAC;QACjC,MAAM,QAAQ,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACxD,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACxD,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5B,MAAM,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE;QACtB,MAAM,UAAU,GAAG,OAAO,CAAC;QAC3B,MAAM,OAAO,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,IAAI,GAAG,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,EAAE,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QAC3B,IAAI,IAAI,EAAE;YACR,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;QACzB,MAAM,UAAU,GAAG,OAAO,CAAC;QAC3B,MAAM,OAAO,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,IAAI,EAAE,CAAC,CAAC,aAAa,EAAE,CAAC;IACpC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;QACzB,MAAM,UAAU,GAAG,KAAK,CAAC;QACzB,MAAM,OAAO,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,EAAE,CAAC,CAAC,aAAa,EAAE,CAAC;IACrC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE;QACxB,MAAM,UAAU,GAAG,KAAK,CAAC;QACzB,MAAM,OAAO,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,CAAC,GAAG,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,EAAE,CAAC;QACvB,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC3B,MAAM,UAAU,GAAG,SAAS,CAAC;QAC7B,MAAM,OAAO,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,CAAC,GAAG,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,EAAE,CAAC;QACvB,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC5B,MAAM,UAAU,GAAG,WAAW,CAAC;QAC/B,MAAM,OAAO,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,CAAC,GAAG,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,EAAE,CAAC;QACvB,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC3B,MAAM,UAAU,GAAG,SAAS,CAAC;QAC7B,MAAM,OAAO,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC/B,MAAM,UAAU,GAAG,aAAa,CAAC;QACjC,MAAM,OAAO,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAC9B,MAAM,UAAU,GAAG,SAAS,CAAC;QAC7B,MAAM,OAAO,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,YAAY,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAClC,MAAM,UAAU,GAAG,eAAe,CAAC;QACnC,MAAM,OAAO,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,YAAY,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE;QACf,MAAM,UAAU,GAAG,OAAO,CAAC;QAC3B,MAAM,OAAO,GAAG,YAAG,CAAC,WAAW,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;QAC1C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,KAAK,GAAG,MAAM,OAAO;aACxB,SAAS,CACR;;;OAGD,CACA;aACA,QAAQ,EAAE,CAAC;QACd,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC;QAC1C,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;QACrD,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;QAChC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAC9B;;;;;+BAKyB,CAC1B,CAAC;QACF,MAAM,IAAI,GAAG,EAAC,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,EAAE,EAAC,EAAE,EAAE,IAAI,EAAC,EAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC9C,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,EAAC,EAAE,EAAE,IAAI,EAAC,EAAC,CAAC;IACvE,IAAI,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;QAC7B,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAC9B;;;;;;;;;;;;OAYC,CACF,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC9C,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAC9B;;;;;;;;;;;;OAYC,CACF,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC;QAC9C,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACtC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAC9B;;;;;;;YAOM,CACP,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC;QACnC,MAAM,GAAG,GAAG,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC1B,MAAM,EAAE,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC1B,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC3B,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAC,EAAE,EAAE,IAAI,EAAC,EAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACtC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAC9B;;;;;;;;;;;;;;;yCAemC,CACpC,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC;QACnC,MAAM,GAAG,GAAG,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;YACjC,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAC,EAAE,EAAE,IAAI,EAAC;SACnB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAC9B;;;;;;;;;;;;;;;;;;;;;;SAsBG,CACJ,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC;QACnC,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC9C,MAAM,GAAG,GAAG,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAC,QAAQ,EAAE,EAAE,EAAC,CAAC,CAAC;QACtD,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAC,QAAQ,EAAE,EAAE,EAAC,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAC9B;;;;;;YAMM,CACP,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,aAAa,CAAC;QACnC,MAAM,KAAK,GAAG,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;QAC5B,IAAI,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC;QAC9B,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAC,SAAS,EAAE,EAAC,EAAE,EAAE,OAAO,EAAC,EAAC,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,YAAG,CAAC,WAAW,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC,GAAG,CAAC;QACvE,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAC,MAAM,EAAE,CAAC,YAAY,CAAC,EAAC,CAAC,CAAC,GAAG,CAAC;QAClD,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAC,SAAS,EAAE,EAAC,EAAE,EAAE,SAAS,EAAC,EAAC,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,YAAG,CAAC,WAAW,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC,GAAG,CAAC;QACrE,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAC,MAAM,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,EAAC,CAAC,CAAC,GAAG,CAAC;QAC/D,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAC,SAAS,EAAE,EAAC,EAAE,EAAE,QAAQ,EAAC,EAAC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/util/index.js

@@ -100,7 +100,7 @@ function mkSqlEqWith(runtime, initV) {
           query: basicTypes
           -> {
             declare: ${varName} is ${expr}
-            project: calc is pick ${whenPick} else ${elsePick}
+            select: calc is pick ${whenPick} else ${elsePick}
           }`;
         }
         else if (typeof result === 'number') {
@@ -109,7 +109,7 @@ function mkSqlEqWith(runtime, initV) {
           -> {
             declare: expect is ${result}
             declare: got is ${expr}
-            project: calc is
+            select: calc is
               pick '=' when expect = got
               else concat('sqlEq failed', CHR(10), '    Expected: ${qExpr} == ${result}', CHR(10), '    Received: ', got::string)
           }`;
@@ -121,10 +121,10 @@ function mkSqlEqWith(runtime, initV) {
             query = `${sourceDef}
           query: basicTypes
           -> {
-            project: expect is ${qResult}
-            project: got is ${expr}
+            select: expect is ${qResult}
+            select: got is ${expr}
           } -> {
-            project: calc is
+            select: calc is
               pick '=' when expect = got
               else concat('sqlEq failed', CHR(10), '    Expected: ${sqlSafe(expr)} == ${sqlSafe(result)}', CHR(10), '    Received: ', got::string)
           }`;
@@ -134,10 +134,10 @@ function mkSqlEqWith(runtime, initV) {
             query = `${sourceDef}
           query: basicTypes
           -> {
-            project: expect is ${result}
-            project: got is ${expr}
+            select: expect is ${result}
+            select: got is ${expr}
           } -> {
-            project: calc is
+            select: calc is
               pick '=' when expect = got
               else concat('sqlEq failed', CHR(10), '    Expected: ${qExpr} == ${qResult}', CHR(10), '    Received: ', got::string)
           }`;

package/dist/util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;;AAUH,SAAgB,SAAS,CAAC,KAAa,EAAE,KAAa;IACpD,OAAO;QACL,UAAU,EAAE,CAAC,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAC,EAAE,KAAK,KAAK,GAAG,CAAC;QACzD,IAAI,EAAE,GAAG,KAAK,KAAK,KAAK,GAAG;QAC3B,cAAc,EAAE,QAAQ;KACzB,CAAC;AACJ,CAAC;AAND,8BAMC;AAED,SAAgB,WAAW,CAAC,KAAa,EAAE,KAAa;IACtD,OAAO;QACL,UAAU,EAAE,CAAC,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAC,EAAE,UAAU,KAAK,GAAG,CAAC;QAC9D,IAAI,EAAE,GAAG,KAAK,KAAK,KAAK,GAAG;QAC3B,cAAc,EAAE,QAAQ;KACzB,CAAC;AACJ,CAAC;AAND,kCAMC;AAED,SAAgB,OAAO,CAAC,KAAa,EAAE,IAAY;IACjD,MAAM,MAAM,GAAG,IAAI,IAAI,kBAAkB,CAAC;IAC1C,MAAM,IAAI,GAAG,IAAI,IAAI,GAAG,CAAC,kBAAkB,CAAC;IAC5C,MAAM,EAAE,GAAa,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAC,CAAC;IAClD,OAAO;QACL,UAAU,EAAE,CAAC,EAAE,EAAE,KAAK,MAAM,OAAO,EAAE,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC;QACpD,IAAI,EAAE,GAAG,KAAK,KAAK,IAAI,EAAE;QACzB,cAAc,EAAE,QAAQ;KACzB,CAAC;AACJ,CAAC;AATD,0BASC;AAED,oGAAoG;AACpG,0GAA0G;AAC1G,SAAgB,0BAA0B,CACxC,gBAA0B;IAE1B,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;QACpC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;QAC5C,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;YAChC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YAClC,CAAC,CAAC,gBAAgB,CAAC;AACvB,CAAC;AARD,gEAQC;AAED,+GAA+G;AAC/G,qFAAqF;AACrF,6FAA6F;AAC7F,SAAgB,2BAA2B,CACzC,mBAA6B;IAE7B,MAAM,gBAAgB,GAAG,0BAA0B,CAAC,mBAAmB,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9E,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC7E,CAAC;AAPD,kEAOC;AAQD,SAAS,OAAO,CAAC,GAAW;IAC1B,OAAO,GAAG;SACP,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC;SAC/B,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC;SAC7B,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;AACrC,CAAC;AACD,SAAgB,WAAW,CAAC,OAAgB,EAAE,KAAkB;IAC9D,6EAA6E;IAC7E,OAAO,KAAK,WACV,IAAY,EACZ,MAAiC;QAEjC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACtC,MAAM,IAAI,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,KAAI,iBAAiB,CAAC;QAC7C,MAAM,OAAO,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,KAAI,EAAE,CAAC;QACpC,MAAM,MAAM,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU;YAC9B,CAAC,CAAC,iBAAiB,KAAK,CAAC,UAAU,UAAU;YAC7C,CAAC,CAAC,QAAQ,CAAC;QACb,MAAM,SAAS,GAAG;yBACG,MAAM,QAAQ,IAAI;gDACK,OAAO;KAClD,CAAC;QACF,IAAI,KAAa,CAAC;QAClB,IAAI,OAAO,MAAM,KAAK,SAAS,EAAE;YAC/B,MAAM,KAAK,GAAG,kDAAkD,KAAK,UAAU,MAAM,IAAI,CAAC;YAC1F,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC;YACtD,MAAM,QAAQ,GAAG,MAAM;gBACrB,CAAC,CAAC,YAAY,OAAO,EAAE;gBACvB,CAAC,CAAC,GAAG,KAAK,SAAS,OAAO,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;YACxC,KAAK,GAAG,GAAG,SAAS;;;uBAGH,OAAO,OAAO,IAAI;mCACN,QAAQ,SAAS,QAAQ;YAChD,CAAC;SACR;aAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YACrC,KAAK,GAAG,GAAG,SAAS;;;iCAGO,MAAM;8BACT,IAAI;;;oEAGkC,KAAK,OAAO,MAAM;YAC1E,CAAC;SACR;aAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YAC1B,iBAAiB;YACjB,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACpD,MAAM,OAAO,GAAG,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC;YAC1D,KAAK,GAAG,GAAG,SAAS;;;gCAGM,OAAO;6BACV,IAAI;;;;oEAImC,OAAO,CAC3D,IAAI,CACL,OAAO,OAAO,CAAC,MAAM,CAAC;YACzB,CAAC;SACR;aAAM;YACL,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAC1C,KAAK,GAAG,GAAG,SAAS;;;gCAGM,MAAM;6BACT,IAAI;;;;oEAImC,KAAK,OAAO,OAAO;YAC3E,CAAC;SACR;QAED,OAAO,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;IACxC,CAAC,CAAC;AACJ,CAAC;AAxED,kCAwEC;AAEM,KAAK,UAAU,QAAQ,CAAC,OAAgB,EAAE,QAAgB;IAC/D,IAAI,KAAwB,CAAC;IAC7B,IAAI;QACF,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;KACrC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KACnD;IAED,IAAI,MAAc,CAAC;IACnB,IAAI;QACF,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC;KAC5B;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,qBAAqB,CAAC,CAAC,OAAO,IAAI,GAAG,QAAQ,MAAM,KAAK,CAAC,MAAM,EAAE,EAAE,CACpE,CAAC;KACH;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAlBD,4BAkBC;AAEM,MAAM,MAAM,GAAG,CAAC,SAAkB,EAAE,EAAE;IAC3C,OAAO,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;AACtC,CAAC,CAAC;AAFW,QAAA,MAAM,UAEjB"}

package/package.json

@@ -18,11 +18,11 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "^0.0.88-dev231002231014",
-    "@malloydata/db-duckdb": "^0.0.88-dev231002231014",
-    "@malloydata/db-postgres": "^0.0.88-dev231002231014",
-    "@malloydata/malloy": "^0.0.88-dev231002231014",
-    "@malloydata/render": "^0.0.88-dev231002231014",
+    "@malloydata/db-bigquery": "^0.0.88-dev231002235732",
+    "@malloydata/db-duckdb": "^0.0.88-dev231002235732",
+    "@malloydata/db-postgres": "^0.0.88-dev231002235732",
+    "@malloydata/malloy": "^0.0.88-dev231002235732",
+    "@malloydata/render": "^0.0.88-dev231002235732",
     "jsdom": "^22.1.0",
     "luxon": "^1.26.4",
     "madge": "^6.0.0"
@@ -31,5 +31,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^1.26.4"
   },
-  "version": "0.0.88-dev231002231014"
+  "version": "0.0.88-dev231002235732"
 }

package/src/api.spec.ts

@@ -59,7 +59,7 @@ describe('extendModel', () => {
     const oneState = await q1.run();
     expect(oneState.data.path(0, 'state').value).toBe('CA');
 
-    const extended = model.extendModel('query: q2 is ->q1 -> { project: * }');
+    const extended = model.extendModel('query: q2 is ->q1 -> { select: * }');
     const q2 = extended.loadQueryByName('q2');
     const twoState = await q2.run();
     expect(twoState.data.path(0, 'state').value).toBe('CA');
@@ -70,7 +70,7 @@ describe('extendModel', () => {
     `);
 
     const extended = model.extendModel(
-      'query: q2 is from_sql(q1)->{project: *}'
+      'query: q2 is from_sql(q1)->{select: *}'
     );
     const q2 = extended.loadQueryByName('q2');
     const twoState = await q2.run();

package/src/databases/all/db_index.spec.ts

@@ -95,7 +95,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
         }
 
         query: t-> {index:one, state }
-          -> {project: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
+          -> {select: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
     `
       )
       .run();
@@ -116,7 +116,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
         }
 
         query: t-> {index:one, state; sample: 10 }
-          -> {project: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
+          -> {select: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
     `
         )
         .run();
@@ -134,7 +134,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
         }
 
         query: t-> {index:one, tailnum; sample: 50% }
-          -> {project: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
+          -> {select: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
     `
       )
       .run();

package/src/databases/all/expr.spec.ts

@@ -248,8 +248,8 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
         `
         query: aircraft_models->{
           aggregate:
-            distinct_seats is count(distinct seats),
-            boeing_distinct_seats is count(distinct seats) {?manufacturer ? 'BOEING'},
+            distinct_seats is count(seats),
+            boeing_distinct_seats is count(seats) {?manufacturer ? 'BOEING'},
             min_seats is min(seats),
             cessna_min_seats is min(seats) {? manufacturer ? 'CESSNA'},
             max_seats is max(seats),
@@ -377,7 +377,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
         `
         source: b is aircraft{ where: aircraft_models.manufacturer ? ~'B%' }
 
-        query: b->{aggregate: m_count is count(distinct aircraft_models.manufacturer) }
+        query: b->{aggregate: m_count is count(aircraft_models.manufacturer) }
         `
       )
       .run();
@@ -461,7 +461,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
             }
           }
         } -> {
-          project:
+          select:
             aircraft.aircraft.first_three
             aircraft_count
             order_by: 2 desc, 1
@@ -530,7 +530,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
     source: bo_models is
       from(
           table('malloytest.aircraft_models') {? manufacturer ? ~ 'BO%' }
-          -> { project: aircraft_model_code, manufacturer, seats }
+          -> { select: aircraft_model_code, manufacturer, seats }
         ) {
           primary_key: aircraft_model_code
           measure: bo_count is count()
@@ -539,7 +539,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
     source: b_models is
         from(
           table('malloytest.aircraft_models') {? manufacturer ? ~ 'B%' }
-          -> { project: aircraft_model_code, manufacturer, seats }
+          -> { select: aircraft_model_code, manufacturer, seats }
         ) {
           where: bo_models.seats > 200
           primary_key: aircraft_model_code
@@ -687,7 +687,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
       await expect(runtime).queryMatches(
         `sql: x is {connection:"${databaseName}" select:"""SELECT 1 as x"""}
         query: from_sql(x) -> {
-          project: double_quote is "${back}${dq}"
+          select: double_quote is "${back}${dq}"
         }
       `,
         {double_quote: '"'}
@@ -706,7 +706,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
       """ }
       query: from_sql(nullTest) -> {
         where: null_value = null
-        project:
+        select:
           found_null is  null_value ?? 'correct',
           else_pass is string_value ?? 'incorrect'
           literal_null is null ?? 'correct'
@@ -722,7 +722,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
       query: from_sql(tbl) + {
         dimension: fot is (false) or (true)
       } -> {
-        project:
+        select:
           no_paren is false and fot
           paren is    false and (fot)
       }

package/src/databases/all/functions.spec.ts

@@ -998,7 +998,7 @@ expressionModels.forEach((expressionModel, databaseName) => {
     it(`works with default value - ${databaseName}`, async () => {
       const result = await expressionModel
         .loadQuery(
-          `query: state_facts -> { project: *; limit: 10 } -> {
+          `query: state_facts -> { select: *; limit: 10 } -> {
           group_by: state
           calculate: next_state is lead(state, 1, 'NONE')
         }`
@@ -1057,7 +1057,7 @@ expressionModels.forEach((expressionModel, databaseName) => {
       const result = await expressionModel
         .loadQuery(
           `
-          query: state_facts -> { project: *; limit: 3 } -> {
+          query: state_facts -> { select: *; limit: 3 } -> {
             group_by: state, births
             order_by: births desc
             calculate: rolling_avg is avg_moving(births, 0, 2)
@@ -1081,7 +1081,7 @@ expressionModels.forEach((expressionModel, databaseName) => {
       const result = await expressionModel
         .loadQuery(
           `
-          query: state_facts -> { project: *; limit: 5 } -> {
+          query: state_facts -> { select: *; limit: 5 } -> {
             group_by: state, births
             order_by: births asc
             calculate: min_c is min_cumulative(births)