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

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.
@@ -23,6 +23,7 @@
23
23
  */
24
24
  Object.defineProperty(exports, "__esModule", { value: true });
25
25
  exports.medicareStateFacts = exports.medicareModel = void 0;
26
+ const util_1 = require("../util");
26
27
  // will it build?
27
28
  /** Medicare Model */
28
29
  exports.medicareModel = {
@@ -70,7 +71,7 @@ exports.medicareModel = {
70
71
  type: 'number',
71
72
  name: 'provider_count',
72
73
  expressionType: 'aggregate',
73
- e: ['COUNT(DISTINCT ', { type: 'field', path: 'provider_id' }, ')'],
74
+ e: ['COUNT(DISTINCT ', { type: 'field', path: ['provider_id'] }, ')'],
74
75
  },
75
76
  {
76
77
  type: 'number',
@@ -80,7 +81,7 @@ exports.medicareModel = {
80
81
  {
81
82
  type: 'aggregate',
82
83
  function: 'sum',
83
- e: [{ type: 'field', path: 'discharges' }],
84
+ e: [{ type: 'field', path: ['discharges'] }],
84
85
  },
85
86
  ],
86
87
  },
@@ -89,7 +90,7 @@ exports.medicareModel = {
89
90
  name: 'discharges_by_state',
90
91
  pipeline: [
91
92
  {
92
- fields: ['provider_state', 'total_discharges'],
93
+ queryFields: (0, util_1.fToQF)(['provider_state', 'total_discharges']),
93
94
  orderBy: [{ dir: 'desc', field: 2 }],
94
95
  type: 'reduce',
95
96
  },
@@ -100,7 +101,7 @@ exports.medicareModel = {
100
101
  name: 'discharges_by_city',
101
102
  pipeline: [
102
103
  {
103
- fields: ['provider_city', 'total_discharges'],
104
+ queryFields: (0, util_1.fToQF)(['provider_city', 'total_discharges']),
104
105
  orderBy: [{ dir: 'desc', field: 2 }],
105
106
  type: 'reduce',
106
107
  },
@@ -111,12 +112,12 @@ exports.medicareModel = {
111
112
  name: 'bigturtle_state',
112
113
  pipeline: [
113
114
  {
114
- fields: [
115
+ queryFields: (0, util_1.fToQF)([
115
116
  'provider_state',
116
117
  'total_discharges',
117
118
  'discharges_by_city',
118
119
  'discharges_by_zip',
119
- ],
120
+ ]),
120
121
  orderBy: [{ dir: 'desc', field: 1 }],
121
122
  type: 'reduce',
122
123
  },
@@ -127,7 +128,7 @@ exports.medicareModel = {
127
128
  name: 'discharges_by_zip',
128
129
  pipeline: [
129
130
  {
130
- fields: ['provider_zipcode', 'total_discharges'],
131
+ queryFields: (0, util_1.fToQF)(['provider_zipcode', 'total_discharges']),
131
132
  orderBy: [{ dir: 'desc', field: 2 }],
132
133
  type: 'reduce',
133
134
  },
@@ -138,7 +139,11 @@ exports.medicareModel = {
138
139
  name: 'turtle_city_zip',
139
140
  pipeline: [
140
141
  {
141
- fields: ['provider_city', 'total_discharges', 'discharges_by_zip'],
142
+ queryFields: (0, util_1.fToQF)([
143
+ 'provider_city',
144
+ 'total_discharges',
145
+ 'discharges_by_zip',
146
+ ]),
142
147
  orderBy: [{ dir: 'desc', field: 1 }],
143
148
  type: 'reduce',
144
149
  },
@@ -149,7 +154,11 @@ exports.medicareModel = {
149
154
  name: 'triple_turtle',
150
155
  pipeline: [
151
156
  {
152
- fields: ['provider_state', 'total_discharges', 'turtle_city_zip'],
157
+ queryFields: (0, util_1.fToQF)([
158
+ 'provider_state',
159
+ 'total_discharges',
160
+ 'turtle_city_zip',
161
+ ]),
153
162
  orderBy: [{ dir: 'desc', field: 1 }],
154
163
  type: 'reduce',
155
164
  },
@@ -160,7 +169,7 @@ exports.medicareModel = {
160
169
  name: 'rollup_by_location',
161
170
  pipeline: [
162
171
  {
163
- fields: [
172
+ queryFields: (0, util_1.fToQF)([
164
173
  'provider_state',
165
174
  'total_discharges',
166
175
  {
@@ -168,7 +177,7 @@ exports.medicareModel = {
168
177
  name: 'turtle_city_zip',
169
178
  pipeline: [
170
179
  {
171
- fields: [
180
+ queryFields: (0, util_1.fToQF)([
172
181
  'provider_city',
173
182
  'total_discharges',
174
183
  {
@@ -176,19 +185,22 @@ exports.medicareModel = {
176
185
  name: 'discharges_by_zip',
177
186
  pipeline: [
178
187
  {
179
- fields: ['provider_zipcode', 'total_discharges'],
188
+ queryFields: (0, util_1.fToQF)([
189
+ 'provider_zipcode',
190
+ 'total_discharges',
191
+ ]),
180
192
  orderBy: [{ dir: 'desc', field: 2 }],
181
193
  type: 'reduce',
182
194
  },
183
195
  ],
184
196
  },
185
- ],
197
+ ]),
186
198
  orderBy: [{ dir: 'desc', field: 1 }],
187
199
  type: 'reduce',
188
200
  },
189
201
  ],
190
202
  },
191
- ],
203
+ ]),
192
204
  orderBy: [{ dir: 'desc', field: 1 }],
193
205
  type: 'reduce',
194
206
  },
@@ -214,15 +226,19 @@ exports.medicareStateFacts = {
214
226
  structRef: 'medicare_test',
215
227
  pipeline: [
216
228
  {
217
- fields: [
229
+ queryFields: (0, util_1.fToQF)([
218
230
  'provider_state',
219
231
  {
220
232
  type: 'number',
221
233
  name: 'num_providers',
222
234
  expressionType: 'aggregate',
223
- e: ['COUNT(DISTINCT ', { type: 'field', path: 'provider_id' }, ')'],
235
+ e: [
236
+ 'COUNT(DISTINCT ',
237
+ { type: 'field', path: ['provider_id'] },
238
+ ')',
239
+ ],
224
240
  },
225
- ],
241
+ ]),
226
242
  type: 'reduce',
227
243
  },
228
244
  ],
@@ -1 +1 @@
1
- {"version":3,"file":"medicare_model.js","sourceRoot":"","sources":["../../src/models/medicare_model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"medicare_model.js","sourceRoot":"","sources":["../../src/models/medicare_model.ts"],"names":[],"mappings":"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"}
package/dist/tags.spec.js CHANGED
@@ -353,7 +353,23 @@ describe('tags in results', () => {
353
353
  const result = await loaded.run();
354
354
  expect(result.tagParse().tag).tagsAre(wantTag);
355
355
  });
356
- test('atomic field has tag', async () => {
356
+ test('field ref has tag', async () => {
357
+ const loaded = runtime.loadQuery(`run: duckdb.sql("select 1 as num") extend {
358
+ dimension: # sourceNote
359
+ one is num
360
+ } -> {
361
+ select: # queryNote
362
+ one
363
+ }`);
364
+ const result = await loaded.run();
365
+ const shape = result.resultExplore;
366
+ const one = shape.getFieldByName('one');
367
+ expect(one).toBeDefined();
368
+ const tp = one.tagParse();
369
+ expect(tp.log).toEqual([]);
370
+ expect(tp.tag).tagsAre({ sourceNote: {}, queryNote: {} });
371
+ });
372
+ test('atomic field model scope tag', async () => {
357
373
  const loaded = runtime.loadQuery(`
358
374
  ## modelDef=ok
359
375
  source: one is duckdb.sql("SELECT 1 as one")
@@ -1 +1 @@
1
- {"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;QAEzB,uFAAuF;QACvF,oCAAoC;QACpC,CAAC,QAAQ,EAAE,EAAC,CAAC,EAAE,EAAC,UAAU,EAAE,EAAE,EAAC,EAAC,CAAC;QACjC,CAAC,YAAY,EAAE,EAAC,CAAC,EAAE,EAAC,UAAU,EAAE,EAAE,EAAC,EAAC,CAAC;QAErC,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;QACzD;YACE,0CAA0C;YAC1C;gBACE,KAAK,EAAE;oBACL,UAAU,EAAE;wBACV,GAAG,EAAE,EAAC,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAC,KAAK,EAAE,EAAC,EAAE,EAAE,YAAY,EAAC,EAAC,EAAC;qBAC5D;iBACF;aACF;SACF;QACD;YACE,kDAAkD;YAClD;gBACE,KAAK,EAAE;oBACL,UAAU,EAAE;wBACV,GAAG,EAAE,EAAC,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAC,KAAK,EAAE,EAAC,EAAE,EAAE,YAAY,EAAC,EAAC,EAAC;qBAC5D;iBACF;aACF;SACF;KACF,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,IAAI,CAAC,6CAA6C,EAAE,GAAG,EAAE;QAC5D,MAAM,CAAC,GAAiB,CAAC,OAAO,EAAE,EAAC,CAAC,EAAE,EAAC,UAAU,EAAE,EAAC,CAAC,EAAE,EAAE,EAAC,EAAC,EAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACvC,MAAM,IAAI,GAAG;YACX,GAAG,EAAE,cAAc;YACnB,KAAK,EAAE,EAAC,KAAK,EAAE,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAC,EAAE,GAAG,EAAE,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAC,EAAC;SACtE,CAAC;QACF,MAAM,IAAI,GAAG;YACX,GAAG,EAAE,cAAc;YACnB,KAAK,EAAE,EAAC,KAAK,EAAE,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAC,EAAE,GAAG,EAAE,EAAC,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAC,EAAC;SACtE,CAAC;QACF,MAAM,UAAU,GAAG,YAAG,CAAC,eAAe,CAAC;YACrC,QAAQ,EAAE,EAAC,KAAK,EAAE,CAAC,EAAC,IAAI,EAAE,oBAAoB,EAAE,EAAE,EAAE,IAAI,EAAC,CAAC,EAAC;YAC3D,KAAK,EAAE,CAAC,EAAC,IAAI,EAAE,iBAAiB,EAAE,EAAE,EAAE,IAAI,EAAC,CAAC;SAC7C,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,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;IACH,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAC7B,sDAAsD,CACvD,CAAC;QACF,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;QAClC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,sEAAsE,EAAE,GAAG,EAAE;QAChF,MAAM,SAAS,GAAG,YAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,YAAG,CAAC,WAAW,CAAC,YAAY,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC;QAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,OAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,CAAC,GAAG,IAAK,CAAC,OAAO,EAAE,CAAC;QAC1B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACnD,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"tags.spec.js","sourceRoot":"","sources":["../src/tags.spec.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,7 @@
1
1
  /// <reference types="jest" />
2
- import { FilterExpression, Result, Runtime } from '@malloydata/malloy';
2
+ import { FilterExpression, QueryFieldDef, IndexFieldDef, Result, Runtime } from '@malloydata/malloy';
3
+ export declare function fToQF(fs: (QueryFieldDef | string)[]): QueryFieldDef[];
4
+ export declare function fToIF(fs: string[]): IndexFieldDef[];
3
5
  export declare function fStringEq(field: string, value: string): FilterExpression;
4
6
  export declare function fStringLike(field: string, value: string): FilterExpression;
5
7
  export declare function fYearEq(field: string, year: number): FilterExpression;
@@ -22,10 +22,20 @@
22
22
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23
23
  */
24
24
  Object.defineProperty(exports, "__esModule", { value: true });
25
- exports.testIf = exports.runQuery = exports.mkSqlEqWith = exports.describeIfDatabaseAvailable = exports.databasesFromEnvironmentOr = exports.fYearEq = exports.fStringLike = exports.fStringEq = void 0;
25
+ exports.testIf = exports.runQuery = exports.mkSqlEqWith = exports.describeIfDatabaseAvailable = exports.databasesFromEnvironmentOr = exports.fYearEq = exports.fStringLike = exports.fStringEq = exports.fToIF = exports.fToQF = void 0;
26
+ // these two helper functions are here just to make older hand built models
27
+ // easier to use in the new world were refs are not strings
28
+ function fToQF(fs) {
29
+ return fs.map(f => typeof f === 'string' ? { type: 'fieldref', path: f.split('.') } : f);
30
+ }
31
+ exports.fToQF = fToQF;
32
+ function fToIF(fs) {
33
+ return fs.map(f => typeof f === 'string' ? { type: 'fieldref', path: f.split('.') } : f);
34
+ }
35
+ exports.fToIF = fToIF;
26
36
  function fStringEq(field, value) {
27
37
  return {
28
- expression: [{ type: 'field', path: field }, `='${value}'`],
38
+ expression: [{ type: 'field', path: field.split('.') }, `='${value}'`],
29
39
  code: `${field}='${value}'`,
30
40
  expressionType: 'scalar',
31
41
  };
@@ -33,7 +43,7 @@ function fStringEq(field, value) {
33
43
  exports.fStringEq = fStringEq;
34
44
  function fStringLike(field, value) {
35
45
  return {
36
- expression: [{ type: 'field', path: field }, ` LIKE '${value}'`],
46
+ expression: [{ type: 'field', path: field.split('.') }, ` LIKE '${value}'`],
37
47
  code: `${field}~'${value}'`,
38
48
  expressionType: 'scalar',
39
49
  };
@@ -42,7 +52,7 @@ exports.fStringLike = fStringLike;
42
52
  function fYearEq(field, year) {
43
53
  const yBegin = `'${year}-01-01 00:00:00'`;
44
54
  const yEnd = `'${year + 1}-01-01 00:00:00'`;
45
- const fx = { type: 'field', path: field };
55
+ const fx = { type: 'field', path: field.split('.') };
46
56
  return {
47
57
  expression: [fx, `>=${yBegin} and `, fx, `<${yEnd}`],
48
58
  code: `${field}:@${year}`,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.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.119-dev240123183113",
22
- "@malloydata/db-duckdb": "^0.0.119-dev240123183113",
23
- "@malloydata/db-postgres": "^0.0.119-dev240123183113",
24
- "@malloydata/malloy": "^0.0.119-dev240123183113",
25
- "@malloydata/render": "^0.0.119-dev240123183113",
21
+ "@malloydata/db-bigquery": "^0.0.119-dev240124170348",
22
+ "@malloydata/db-duckdb": "^0.0.119-dev240124170348",
23
+ "@malloydata/db-postgres": "^0.0.119-dev240124170348",
24
+ "@malloydata/malloy": "^0.0.119-dev240124170348",
25
+ "@malloydata/render": "^0.0.119-dev240124170348",
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.119-dev240123183113"
34
+ "version": "0.0.119-dev240124170348"
35
35
  }
@@ -112,7 +112,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
112
112
  await expect(`
113
113
  run: ${databaseName}.table('malloytest.flights') extend {
114
114
  dimension: one is 'one'
115
- } -> {index:one, tailnum; sample: 50% }
115
+ } -> {index:one, tail_num; sample: 50% }
116
116
  -> {select: fieldName, weight, fieldValue; order_by: 2 desc; where: fieldName = 'one'}
117
117
  `).malloyResultMatches(runtime, {fieldName: 'one'});
118
118
  // Hard to get consistent results here so just check that we get a value back.
@@ -594,54 +594,6 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
594
594
  }
595
595
  `).malloyResultMatches(runtime, {model_count: 60461, b_count: 355});
596
596
  });
597
-
598
- it('group by join - simple group by', async () => {
599
- await expect(`
600
- run: aircraft->{
601
- group_by: aircraft_models
602
- aggregate: aircraft_count
603
- }
604
- `).malloyResultMatches(expressionModel, {
605
- aircraft_models_id: '7102802',
606
- aircraft_count: 58,
607
- });
608
- });
609
-
610
- it('group by explore - pipeline', async () => {
611
- await expect(`
612
- run: aircraft->{
613
- group_by: aircraft_models
614
- aggregate: aircraft_count
615
- } -> {
616
- group_by: aircraft_models.manufacturer
617
- aggregate: aircraft_count is aircraft_count.sum()
618
- }
619
- `).malloyResultMatches(expressionModel, {
620
- aircraft_count: 1048,
621
- manufacturer: 'CESSNA',
622
- });
623
- });
624
-
625
- it('group by explore - pipeline 2 levels', async () => {
626
- await expect(`
627
- run: ${databaseName}.table('malloytest.flights') extend {
628
- join_one: a is ${databaseName}.table('malloytest.aircraft') extend {
629
- join_one: state_facts
630
- is ${databaseName}.table('malloytest.state_facts') extend {primary_key: state}
631
- with state
632
- } on tail_num = a.tail_num
633
- } -> {
634
- group_by: a.state_facts
635
- aggregate: flight_count is count()
636
- } -> {
637
- group_by: state_facts.popular_name
638
- aggregate: flight_count is flight_count.sum()
639
- }
640
- `).malloyResultMatches(runtime, {
641
- flight_count: 199726,
642
- popular_name: 'Isabella',
643
- });
644
- });
645
597
  });
646
598
 
647
599
  describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {