@malloydata/malloy-tests 0.0.99-dev231102173733 → 0.0.99-dev231102201226

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/api.spec.js +10 -0
  2. package/dist/api.spec.js.map +1 -1
  3. package/dist/render/render.spec.js +47 -0
  4. package/dist/render/render.spec.js.map +1 -1
  5. package/package.json +6 -6
  6. package/src/api.spec.ts +12 -0
  7. package/src/render/__snapshots__/render.spec.ts.snap +157 -0
  8. package/src/render/render.spec.ts +51 -0
package/dist/api.spec.js CHANGED
@@ -65,6 +65,16 @@ describe('extendModel', () => {
65
65
  test('returns helpful error message if named query does not exist', async () => {
66
66
  await expect(runtime.getQueryByName('', 'Dummy Query')).rejects.toThrow('Given query name does not refer to a named query.');
67
67
  });
68
+ test('extending models keep annotations', async () => {
69
+ await runtime
70
+ .loadModel(`
71
+ ##! experimental { compilerTestExperimentParse compilerTestExperimentTranslate }
72
+ ;;[ "x" ]
73
+ `)
74
+ .extendModel(';;[ "x" ]')
75
+ .extendModel(';;[ "x" ]')
76
+ .getModel();
77
+ });
68
78
  });
69
79
  afterAll(async () => await runtime.connection.close());
70
80
  //# sourceMappingURL=api.spec.js.map
package/dist/api.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.spec.js","sourceRoot":"","sources":["../src/api.spec.ts"],"names":[],"mappings":";AAAA,+BAA+B;AAC/B;;;;;;;;;;;;;;;;;;;;;GAqBG;;AAEH,yCAAsC;AACtC,mCAAiC;AAEjC,MAAM,OAAO,GAAG,IAAA,qBAAU,EAAC,QAAQ,CAAC,CAAC;AAErC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,IAAI,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;QACjD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC;;;;;KAK/B,CAAC,CAAC;QACH,MAAM,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC;;;;;KAKlC,CAAC,CAAC;QACH,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC;;;;;KAK/B,CAAC,CAAC;QACH,MAAM,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,kCAAkC,CAAC,CAAC;QACvE,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC7E,MAAM,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACrE,mDAAmD,CACpD,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC"}
1
+ {"version":3,"file":"api.spec.js","sourceRoot":"","sources":["../src/api.spec.ts"],"names":[],"mappings":";AAAA,+BAA+B;AAC/B;;;;;;;;;;;;;;;;;;;;;GAqBG;;AAEH,yCAAsC;AACtC,mCAAiC;AAEjC,MAAM,OAAO,GAAG,IAAA,qBAAU,EAAC,QAAQ,CAAC,CAAC;AAErC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,IAAI,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;QACjD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC;;;;;KAK/B,CAAC,CAAC;QACH,MAAM,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC;;;;;KAKlC,CAAC,CAAC;QACH,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC;;;;;KAK/B,CAAC,CAAC;QACH,MAAM,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExD,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,kCAAkC,CAAC,CAAC;QACvE,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,6DAA6D,EAAE,KAAK,IAAI,EAAE;QAC7E,MAAM,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACrE,mDAAmD,CACpD,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,OAAO;aACV,SAAS,CACR;;;SAGC,CACF;aACA,WAAW,CAAC,WAAW,CAAC;aACxB,WAAW,CAAC,WAAW,CAAC;aACxB,QAAQ,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC"}
package/dist/render/render.spec.js CHANGED
@@ -318,6 +318,53 @@ describe('rendering results', () => {
318
318
  });
319
319
  expect(html).toMatchSnapshot();
320
320
  });
321
+ test('flattened nests render correctly', async () => {
322
+ const src = `
323
+ source: height
324
+ is duckdb.sql("""SELECT 'Pedro' as nm, 'Monday' as dayito, 1 as loc, 2 as lac, 1 as monthy, 20 as height, 3 as wt, 50 apptcost, 1 as vaccine, 'A' as btype
325
+ UNION ALL SELECT 'Pedro', 'Tuesday', 1, 2, 2, 25, 3.4, 100, 1, 'B'
326
+ UNION ALL SELECT 'Pedro', 'Tuesday', 1, 2, 3, 38, 3.6, 200, 0, 'A'
327
+ UNION ALL SELECT 'Pedro', 'Wednesday', 1, 2, 4, 45, 3.7, 300, 1, 'O'
328
+ UNION ALL SELECT 'Sebastian', 'Thursday', 1, 2, 1, 23, 2, 400, 1, 'C'
329
+ UNION ALL SELECT 'Sebastian', 'Thursday', 1, 2, 2, 28, 2.6, 500, 1, 'A'
330
+ UNION ALL SELECT 'Sebastian', 'Monday', 1, 2, 3, 35, 3.6, 650, 0, 'A'
331
+ UNION ALL SELECT 'Sebastian', 'Monday', 1, 2, 4, 47, 4.2, 70, 1, 'B'
332
+ UNION ALL SELECT 'Alex', 'Tuesday', 1, 2, 1, 23, 2.5, 85, 0, 'X'
333
+ UNION ALL SELECT 'Alex', 'Thursday', 1, 2, 2, 28, 3, 42, 1, 'P'
334
+ UNION ALL SELECT 'Alex', 'Thursday', 1, 2, 3, 35, 3.2, 63, 1, 'A'
335
+ UNION ALL SELECT 'Alex', 'Monday', 1, 2, 4, 47, 3.4, 81, 1, 'D'
336
+ UNION ALL SELECT 'Miguel', 'Monday', 1, 2, 1, 23, 4, 34, 0, 'E'
337
+ UNION ALL SELECT 'Miguel', 'Monday', 1, 2, 2, 28, 4.1, 64, 1, 'R'
338
+ UNION ALL SELECT 'Miguel', 'Wednesday', 1, 2, 3, 35, 4.2, 31, 1, 'E'
339
+ UNION ALL SELECT 'Miguel', 'Wednesday', 1, 2, 4, 47, 4.3, 76, 0, 'F' """) extend {
340
+
341
+
342
+ view: flatten is {
343
+ group_by: nm
344
+ aggregate: avg_height is height.avg()
345
+ nest:
346
+ # flatten
347
+ monday is {
348
+ aggregate: avg_height is height.avg()
349
+ where: dayito='Monday'
350
+ },
351
+ # flatten
352
+ thursday is {
353
+ aggregate: avg_height is height.avg()
354
+ where: dayito='Thursday'
355
+ }
356
+ }
357
+ }
358
+
359
+ query: flatten is height -> flatten
360
+ `;
361
+ const result = await (await duckdb.loadModel(src).loadQueryByName('flatten')).run();
362
+ const document = new jsdom_1.JSDOM().window.document;
363
+ const html = await new render_1.HTMLView(document).render(result, {
364
+ dataStyles: {},
365
+ });
366
+ expect(html).toMatchSnapshot();
367
+ });
321
368
  });
322
369
  describe('date renderer', () => {
323
370
  test('date with timezone rendered correctly', async () => {
package/dist/render/render.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"render.spec.js","sourceRoot":"","sources":["../../src/render/render.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;;AAGH,0CAAoD;AACpD,kCAAoD;AACpD,+CAA4C;AAC5C,iCAA4B;AAE5B,KAAK,UAAU,wBAAwB,CACrC,cAAsB,EACtB,QAAqB,EACrB,IAAY,EACZ,QAAgB;IAEhB,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACxD,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;IAC9B,IAAI,OAAO,EAAE;QACX,MAAM,GAAG,GAAG;;UAEN,cAAc,kBAAkB,IAAI;;KAEzC,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QACvE,+CAA+C;QAC/C,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;QAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;YACvD,UAAU,EAAE,EAAE;SACf,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC3C,+BAA+B;KAChC;AACH,CAAC;AAED,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAA,kCAA2B,EAAC;IACxD,UAAU;IACV,UAAU;IACV,QAAQ;CACT,CAAC,CAAC;AACH,MAAM,MAAM,GAAG,IAAA,qBAAU,EAAC,QAAQ,CAAC,CAAC;AACpC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,MAAM,QAAQ,GAAG,IAAI,sBAAW,CAAC,SAAS,CAAC,CAAC;IAE5C,QAAQ,CAAC,KAAK,IAAI,EAAE;QAClB,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QAClC,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;QAC9B,IAAI,OAAO,EAAE;YACX,MAAM,GAAG,GAAG;;;;;OAKX,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YAClD,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC7C,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;gBAC1C,UAAU,EAAE,EAAE;aACf,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,wBAAwB,CAC5B,UAAU,EACV,QAAQ,EACR,yCAAyC,EACzC,sBAAsB,CACvB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,wBAAwB,CAC5B,UAAU,EACV,QAAQ,EACR,mCAAmC,EACnC,wCAAwC,CACzC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,wBAAwB,CAC5B,UAAU,EACV,QAAQ,EACR,iBAAiB,EACjB,aAAa,CACd,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,wBAAwB,CAC5B,UAAU,EACV,QAAQ,EACR,iBAAiB,EACjB,UAAU,CACX,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,wBAAwB,CAC5B,UAAU,EACV,QAAQ,EACR,2BAA2B,EAC3B,SAAS,CACV,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,wBAAwB,CAC5B,UAAU,EACV,QAAQ,EACR,sDAAsD,EACtD,sCAAsC,CACvC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,wBAAwB,CAC5B,UAAU,EACV,QAAQ,EACR,qBAAqB,EACrB,aAAa,CACd,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,wBAAwB,CAC5B,UAAU,EACV,QAAQ,EACR,8BAA8B,EAC9B,mBAAmB,CACpB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,wBAAwB,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,wBAAwB,CAC5B,QAAQ,EACR,QAAQ,EACR,eAAe,EACf,gCAAgC,CACjC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,wBAAwB,CAC5B,QAAQ,EACR,QAAQ,EACR,8CAA8C,EAC9C,sCAAsC,CACvC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,wBAAwB,CAC5B,UAAU,EACV,QAAQ,EACR,yBAAyB,EACzB,mCAAmC,CACpC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;YACvC,IAAI,KAAwB,CAAC;YAE7B,SAAS,CAAC,KAAK,IAAI,EAAE;gBACnB,MAAM,GAAG,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAmDb,CAAC;gBACA,KAAK,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE;gBAC/B,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC;gBAC5D,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;oBACvD,UAAU,EAAE,EAAE;iBACf,CAAC,CAAC;gBAEH,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;YACjC,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;gBAClC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC,GAAG,EAAE,CAAC;gBACvE,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;oBACvD,UAAU,EAAE,EAAE;iBACf,CAAC,CAAC;gBAEH,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;YACjC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;YAC3B,IAAI,iBAAoC,CAAC;YACzC,SAAS,CAAC,GAAG,EAAE;gBACb,MAAM,GAAG,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAgDX,CAAC;gBACF,iBAAiB,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;gBAC1C,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,CAAC;gBACxE,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;oBACvD,UAAU,EAAE,EAAE;iBACf,CAAC,CAAC;gBAEH,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;YACjC,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;gBAC9C,MAAM,MAAM,GAAG,MAAM,iBAAiB;qBACnC,eAAe,CAAC,YAAY,CAAC;qBAC7B,GAAG,EAAE,CAAC;gBACT,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;oBACvD,UAAU,EAAE,EAAE;iBACf,CAAC,CAAC;gBAEH,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;YACjC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC/C,MAAM,GAAG,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgDX,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CACvD,CAAC,GAAG,EAAE,CAAC;YACR,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvD,UAAU,EAAE,EAAE;aACf,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,IAAI,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,GAAG,GAAG;;;;;OAKX,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CACzD,CAAC,GAAG,EAAE,CAAC;YACR,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvD,UAAU,EAAE,EAAE;aACf,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACxE,MAAM,GAAG,GAAG;;;;;;;;;;;OAWX,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,CAC1D,CAAC,GAAG,EAAE,CAAC;YACR,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvD,UAAU,EAAE,EAAE;aACf,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,IAAI,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,GAAG,GAAG;;;;;;OAMX,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CACzD,CAAC,GAAG,EAAE,CAAC;YACR,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvD,UAAU,EAAE,EAAE;aACf,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;QAClC,IAAI,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,GAAG,GAAG;;;;;;;;;UASR,CAAC;YACL,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAChE,CAAC,GAAG,EAAE,CAAC;YACR,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvD,UAAU,EAAE,EAAE;aACf,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,GAAG,GAAG;;;;;;;;;OASX,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,cAAc,CAAC,CAC5D,CAAC,GAAG,EAAE,CAAC;YACR,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvD,UAAU,EAAE,EAAE;aACf,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACpC,IAAI,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;YAClD,MAAM,GAAG,GAAG;;;;;;;;;;;;;;OAcX,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,CAC3D,CAAC,GAAG,EAAE,CAAC;YACR,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvD,UAAU,EAAE,EAAE;aACf,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;YAC/C,MAAM,GAAG,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgDX,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAC9D,CAAC,GAAG,EAAE,CAAC;YACR,MAAM,QAAQ,GAAG,IAAI,aAAK,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,iBAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvD,UAAU,EAAE,EAAE;aACf,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"render.spec.js","sourceRoot":"","sources":["../../src/render/render.spec.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -18,11 +18,11 @@
18
18
  },
19
19
  "dependencies": {
20
20
  "@jest/globals": "^29.4.3",
21
- "@malloydata/db-bigquery": "^0.0.99-dev231102173733",
22
- "@malloydata/db-duckdb": "^0.0.99-dev231102173733",
23
- "@malloydata/db-postgres": "^0.0.99-dev231102173733",
24
- "@malloydata/malloy": "^0.0.99-dev231102173733",
25
- "@malloydata/render": "^0.0.99-dev231102173733",
21
+ "@malloydata/db-bigquery": "^0.0.99-dev231102201226",
22
+ "@malloydata/db-duckdb": "^0.0.99-dev231102201226",
23
+ "@malloydata/db-postgres": "^0.0.99-dev231102201226",
24
+ "@malloydata/malloy": "^0.0.99-dev231102201226",
25
+ "@malloydata/render": "^0.0.99-dev231102201226",
26
26
  "jsdom": "^22.1.0",
27
27
  "luxon": "^2.4.0",
28
28
  "madge": "^6.0.0"
@@ -31,5 +31,5 @@
31
31
  "@types/jsdom": "^21.1.1",
32
32
  "@types/luxon": "^2.4.0"
33
33
  },
34
- "version": "0.0.99-dev231102173733"
34
+ "version": "0.0.99-dev231102201226"
35
35
  }
package/src/api.spec.ts CHANGED
@@ -70,6 +70,18 @@ describe('extendModel', () => {
70
70
  'Given query name does not refer to a named query.'
71
71
  );
72
72
  });
73
+ test('extending models keep annotations', async () => {
74
+ await runtime
75
+ .loadModel(
76
+ `
77
+ ##! experimental { compilerTestExperimentParse compilerTestExperimentTranslate }
78
+ ;;[ "x" ]
79
+ `
80
+ )
81
+ .extendModel(';;[ "x" ]')
82
+ .extendModel(';;[ "x" ]')
83
+ .getModel();
84
+ });
73
85
  });
74
86
 
75
87
  afterAll(async () => await runtime.connection.close());
package/src/render/__snapshots__/render.spec.ts.snap CHANGED
@@ -10620,6 +10620,163 @@ exports[`rendering results html renderer complex query with tags transposed tabl
10620
10620
  </table>
10621
10621
  `;
10622
10622
 
10623
+ exports[`rendering results html renderer flattened nests render correctly 1`] = `
10624
+ <table
10625
+ style="vertical-align: top; border-collapse: collapse; width: 100%;"
10626
+ >
10627
+ <thead>
10628
+ <tr>
10629
+ <th
10630
+ style="padding: 8px; text-align: left;"
10631
+ >
10632
+ nm
10633
+ </th>
10634
+ <th
10635
+ style="padding: 8px; text-align: right;"
10636
+ >
10637
+ avg_​height
10638
+ </th>
10639
+ <th
10640
+ style="padding: 8px; text-align: right;"
10641
+ >
10642
+ monday avg_​height
10643
+ </th>
10644
+ <th
10645
+ style="padding: 8px; text-align: right;"
10646
+ >
10647
+ thursday avg_​height
10648
+ </th>
10649
+ </tr>
10650
+ </thead>
10651
+ <tbody>
10652
+ <tr>
10653
+ <td
10654
+ style="padding: 8px; vertical-align: top;"
10655
+ >
10656
+ <span>
10657
+ Sebastian
10658
+ </span>
10659
+ </td>
10660
+ <td
10661
+ style="padding: 8px; vertical-align: top; text-align: right;"
10662
+ >
10663
+ <span>
10664
+ 33.25
10665
+ </span>
10666
+ </td>
10667
+ <td
10668
+ style="padding: 8px; vertical-align: top; text-align: right;"
10669
+ >
10670
+ <span>
10671
+ 41
10672
+ </span>
10673
+ </td>
10674
+ <td
10675
+ style="padding: 8px; vertical-align: top; text-align: right;"
10676
+ >
10677
+ <span>
10678
+ 25.5
10679
+ </span>
10680
+ </td>
10681
+ </tr>
10682
+ <tr>
10683
+ <td
10684
+ style="padding: 8px; vertical-align: top;"
10685
+ >
10686
+ <span>
10687
+ Miguel
10688
+ </span>
10689
+ </td>
10690
+ <td
10691
+ style="padding: 8px; vertical-align: top; text-align: right;"
10692
+ >
10693
+ <span>
10694
+ 33.25
10695
+ </span>
10696
+ </td>
10697
+ <td
10698
+ style="padding: 8px; vertical-align: top; text-align: right;"
10699
+ >
10700
+ <span>
10701
+ 25.5
10702
+ </span>
10703
+ </td>
10704
+ <td
10705
+ style="padding: 8px; vertical-align: top; text-align: right;"
10706
+ >
10707
+ <span
10708
+ class="value-null"
10709
+ >
10710
+ ∅
10711
+ </span>
10712
+ </td>
10713
+ </tr>
10714
+ <tr>
10715
+ <td
10716
+ style="padding: 8px; vertical-align: top;"
10717
+ >
10718
+ <span>
10719
+ Alex
10720
+ </span>
10721
+ </td>
10722
+ <td
10723
+ style="padding: 8px; vertical-align: top; text-align: right;"
10724
+ >
10725
+ <span>
10726
+ 33.25
10727
+ </span>
10728
+ </td>
10729
+ <td
10730
+ style="padding: 8px; vertical-align: top; text-align: right;"
10731
+ >
10732
+ <span>
10733
+ 47
10734
+ </span>
10735
+ </td>
10736
+ <td
10737
+ style="padding: 8px; vertical-align: top; text-align: right;"
10738
+ >
10739
+ <span>
10740
+ 31.5
10741
+ </span>
10742
+ </td>
10743
+ </tr>
10744
+ <tr>
10745
+ <td
10746
+ style="padding: 8px; vertical-align: top;"
10747
+ >
10748
+ <span>
10749
+ Pedro
10750
+ </span>
10751
+ </td>
10752
+ <td
10753
+ style="padding: 8px; vertical-align: top; text-align: right;"
10754
+ >
10755
+ <span>
10756
+ 32
10757
+ </span>
10758
+ </td>
10759
+ <td
10760
+ style="padding: 8px; vertical-align: top; text-align: right;"
10761
+ >
10762
+ <span>
10763
+ 20
10764
+ </span>
10765
+ </td>
10766
+ <td
10767
+ style="padding: 8px; vertical-align: top; text-align: right;"
10768
+ >
10769
+ <span
10770
+ class="value-null"
10771
+ >
10772
+ ∅
10773
+ </span>
10774
+ </td>
10775
+ </tr>
10776
+ </tbody>
10777
+ </table>
10778
+ `;
10779
+
10623
10780
  exports[`rendering results html renderer hidden tags rendered correctly dashboard 1`] = `
10624
10781
  <div>
10625
10782
  <div
package/src/render/render.spec.ts CHANGED
@@ -410,6 +410,57 @@ describe('rendering results', () => {
410
410
 
411
411
  expect(html).toMatchSnapshot();
412
412
  });
413
+
414
+ test('flattened nests render correctly', async () => {
415
+ const src = `
416
+ source: height
417
+ is duckdb.sql("""SELECT 'Pedro' as nm, 'Monday' as dayito, 1 as loc, 2 as lac, 1 as monthy, 20 as height, 3 as wt, 50 apptcost, 1 as vaccine, 'A' as btype
418
+ UNION ALL SELECT 'Pedro', 'Tuesday', 1, 2, 2, 25, 3.4, 100, 1, 'B'
419
+ UNION ALL SELECT 'Pedro', 'Tuesday', 1, 2, 3, 38, 3.6, 200, 0, 'A'
420
+ UNION ALL SELECT 'Pedro', 'Wednesday', 1, 2, 4, 45, 3.7, 300, 1, 'O'
421
+ UNION ALL SELECT 'Sebastian', 'Thursday', 1, 2, 1, 23, 2, 400, 1, 'C'
422
+ UNION ALL SELECT 'Sebastian', 'Thursday', 1, 2, 2, 28, 2.6, 500, 1, 'A'
423
+ UNION ALL SELECT 'Sebastian', 'Monday', 1, 2, 3, 35, 3.6, 650, 0, 'A'
424
+ UNION ALL SELECT 'Sebastian', 'Monday', 1, 2, 4, 47, 4.2, 70, 1, 'B'
425
+ UNION ALL SELECT 'Alex', 'Tuesday', 1, 2, 1, 23, 2.5, 85, 0, 'X'
426
+ UNION ALL SELECT 'Alex', 'Thursday', 1, 2, 2, 28, 3, 42, 1, 'P'
427
+ UNION ALL SELECT 'Alex', 'Thursday', 1, 2, 3, 35, 3.2, 63, 1, 'A'
428
+ UNION ALL SELECT 'Alex', 'Monday', 1, 2, 4, 47, 3.4, 81, 1, 'D'
429
+ UNION ALL SELECT 'Miguel', 'Monday', 1, 2, 1, 23, 4, 34, 0, 'E'
430
+ UNION ALL SELECT 'Miguel', 'Monday', 1, 2, 2, 28, 4.1, 64, 1, 'R'
431
+ UNION ALL SELECT 'Miguel', 'Wednesday', 1, 2, 3, 35, 4.2, 31, 1, 'E'
432
+ UNION ALL SELECT 'Miguel', 'Wednesday', 1, 2, 4, 47, 4.3, 76, 0, 'F' """) extend {
433
+
434
+
435
+ view: flatten is {
436
+ group_by: nm
437
+ aggregate: avg_height is height.avg()
438
+ nest:
439
+ # flatten
440
+ monday is {
441
+ aggregate: avg_height is height.avg()
442
+ where: dayito='Monday'
443
+ },
444
+ # flatten
445
+ thursday is {
446
+ aggregate: avg_height is height.avg()
447
+ where: dayito='Thursday'
448
+ }
449
+ }
450
+ }
451
+
452
+ query: flatten is height -> flatten
453
+ `;
454
+ const result = await (
455
+ await duckdb.loadModel(src).loadQueryByName('flatten')
456
+ ).run();
457
+ const document = new JSDOM().window.document;
458
+ const html = await new HTMLView(document).render(result, {
459
+ dataStyles: {},
460
+ });
461
+
462
+ expect(html).toMatchSnapshot();
463
+ });
413
464
  });
414
465
 
415
466
  describe('date renderer', () => {