@cubejs-backend/schema-compiler 1.7.16 → 1.7.18

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 (6) hide show
  1. package/dist/src/adapter/BaseQuery.d.ts +1 -1
  2. package/dist/src/adapter/MemberSqlTemplateCompiler.d.ts +1 -1
  3. package/dist/src/adapter/MemberSqlTemplateCompiler.d.ts.map +1 -1
  4. package/dist/src/adapter/MemberSqlTemplateCompiler.js +128 -25
  5. package/dist/src/adapter/MemberSqlTemplateCompiler.js.map +1 -1
  6. package/package.json +7 -7
package/dist/src/adapter/BaseQuery.d.ts CHANGED
@@ -848,11 +848,11 @@ export class BaseQuery {
848
848
  urlEncode: (sql: string) => string;
849
849
  };
850
850
  compileMemberSql(sqlFn: any, securityContext: any, argNames: any): {
851
- template: string | string[];
852
851
  symbolPaths: never[];
853
852
  filterParams: never[];
854
853
  filterGroups: never[];
855
854
  securityContextValues: never[];
855
+ template: string | string[];
856
856
  };
857
857
  contextSymbolsProxy(symbols: any): object;
858
858
  filtersProxy(): {};
package/dist/src/adapter/MemberSqlTemplateCompiler.d.ts CHANGED
@@ -5,11 +5,11 @@
5
5
  * @param {object} sqlUtils the SQL_UTILS object passed through to the template
6
6
  */
7
7
  export function compileMemberSql(sqlFn: Function, argNames: string[], securityContext: object, sqlUtils: object): {
8
- template: string | string[];
9
8
  symbolPaths: never[];
10
9
  filterParams: never[];
11
10
  filterGroups: never[];
12
11
  securityContextValues: never[];
12
+ template: string | string[];
13
13
  };
14
14
  export function uniqueInsertPath(paths: any, path: any): number;
15
15
  export function uniqueInsertString(values: any, value: any): any;
package/dist/src/adapter/MemberSqlTemplateCompiler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MemberSqlTemplateCompiler.d.ts","sourceRoot":"","sources":["../../../src/adapter/MemberSqlTemplateCompiler.js"],"names":[],"mappings":"AAkPA;;;;;GAKG;AACH,4DAJW,MAAM,EAAE,mBACR,MAAM,YACN,MAAM;;;;;;EAoBhB;AAnOD,gEASC;AAED,iEAOC"}
1
+ {"version":3,"file":"MemberSqlTemplateCompiler.d.ts","sourceRoot":"","sources":["../../../src/adapter/MemberSqlTemplateCompiler.js"],"names":[],"mappings":"AAuWA;;;;;GAKG;AACH,4DAJW,MAAM,EAAE,mBACR,MAAM,YACN,MAAM;;;;;;EAUhB;AA5TD,gEASC;AAED,iEAOC"}
package/dist/src/adapter/MemberSqlTemplateCompiler.js CHANGED
@@ -11,15 +11,19 @@
11
11
  * {
12
12
  * template: string | string[],
13
13
  * symbolPaths: string[][], // {arg:N}
14
- * filterParams: [{ cube_name, name, column }], // {fp:N}, column = fn|string
14
+ * filterParams: [{ cube_name, name, column }], // {fp:N}
15
15
  * filterGroups: [{ filterParams: [...] }], // {fg:N}
16
16
  * securityContextValues: string[] // {sv:N}
17
17
  * }
18
18
  *
19
19
  * Member references are returned as recorded paths — the caller resolves them
20
- * to symbols. FILTER_PARAMS column callbacks are deferred (returned as the raw
21
- * JS function for the caller to invoke at render time); SECURITY_CONTEXT is
22
- * resolved eagerly here against the provided context.
20
+ * to symbols. SECURITY_CONTEXT is resolved eagerly here against the provided
21
+ * context.
22
+ *
23
+ * A FILTER_PARAMS `column` is a plain string, or — when the data model gave a
24
+ * callback — a recording of its own in the same shape, with the filter values it
25
+ * takes as `{fpv:N}` placeholders and `valueParamsCount` of them. A callback
26
+ * taking its values through a rest parameter is returned as the bare function.
23
27
  *
24
28
  * The module holds no planner state — `securityContext` and `sqlUtils` are
25
29
  * passed in — so it can be unit-tested in isolation.
@@ -28,9 +32,22 @@ const ARG_PREFIX = 'arg';
28
32
  const FILTER_PARAM_PREFIX = 'fp';
29
33
  const FILTER_GROUP_PREFIX = 'fg';
30
34
  const SECURITY_VALUE_PREFIX = 'sv';
35
+ const FILTER_VALUE_PREFIX = 'fpv';
31
36
  function placeholder(prefix, index) {
32
37
  return `{${prefix}:${index}}`;
33
38
  }
39
+ // The proxies handed to the member's `sql` function are captured by any
40
+ // `FILTER_PARAMS` column callback it declares, so a nested compile cannot hand
41
+ // them a different state. They record into `state.target`, which
42
+ // `compileColumnCallback` swaps for the duration of that compile.
43
+ function emptyRecording() {
44
+ return {
45
+ symbolPaths: [],
46
+ filterParams: [],
47
+ filterGroups: [],
48
+ securityContextValues: [],
49
+ };
50
+ }
34
51
  // Returns the index of an equal path if it already exists, otherwise appends
35
52
  // and returns the new index. Paths are short arrays of strings, compared by
36
53
  // value, so repeated references collapse to a single placeholder.
@@ -62,12 +79,12 @@ function memberReferenceProxy(path, state) {
62
79
  return undefined;
63
80
  }
64
81
  if (prop === 'sql') {
65
- const index = uniqueInsertPath(state.symbolPaths, [...path, '__sql_fn']);
82
+ const index = uniqueInsertPath(state.target.symbolPaths, [...path, '__sql_fn']);
66
83
  const ph = placeholder(ARG_PREFIX, index);
67
84
  return () => ph;
68
85
  }
69
86
  if (prop === 'toString' || prop === 'valueOf') {
70
- const index = uniqueInsertPath(state.symbolPaths, path);
87
+ const index = uniqueInsertPath(state.target.symbolPaths, path);
71
88
  const ph = placeholder(ARG_PREFIX, index);
72
89
  return () => ph;
73
90
  }
@@ -76,13 +93,109 @@ function memberReferenceProxy(path, state) {
76
93
  });
77
94
  }
78
95
  // ---- FILTER_PARAMS / FILTER_GROUP ------------------------------------------
96
+ // Declared parameters of a column callback: how many filter values it can take,
97
+ // and whether it takes them as a rest parameter. `Function.length` stops at the
98
+ // first defaulted parameter, so the parameter list is read from the source.
99
+ function declaredValueParams(fn) {
100
+ const source = fn.toString();
101
+ const open = source.indexOf('(');
102
+ const arrow = source.indexOf('=>');
103
+ if (open === -1 || (arrow !== -1 && arrow < open)) {
104
+ // `v => …`, a single parameter without parentheses.
105
+ return { count: 1, rest: false, inner: '' };
106
+ }
107
+ let depth = 0;
108
+ let close = -1;
109
+ for (let i = open; i < source.length; i++) {
110
+ const ch = source[i];
111
+ if (ch === '(' || ch === '[' || ch === '{')
112
+ depth++;
113
+ else if (ch === ')' || ch === ']' || ch === '}') {
114
+ depth--;
115
+ if (depth === 0 && ch === ')') {
116
+ close = i;
117
+ break;
118
+ }
119
+ }
120
+ }
121
+ if (close === -1) {
122
+ return { count: 0, rest: false, inner: source };
123
+ }
124
+ const inner = source.slice(open + 1, close);
125
+ const params = [];
126
+ let start = 0;
127
+ depth = 0;
128
+ for (let i = 0; i <= inner.length; i++) {
129
+ const ch = inner[i];
130
+ if (ch === '(' || ch === '[' || ch === '{')
131
+ depth++;
132
+ else if (ch === ')' || ch === ']' || ch === '}')
133
+ depth--;
134
+ if (i === inner.length || (ch === ',' && depth === 0)) {
135
+ const param = inner.slice(start, i).trim();
136
+ if (param)
137
+ params.push(param);
138
+ start = i + 1;
139
+ }
140
+ }
141
+ return { count: params.length, rest: params.some(p => p.startsWith('...')), inner };
142
+ }
143
+ // Parsing the parameter list can come up short — a bound or native function
144
+ // exposes no list, and a `)` inside a comment or a string default ends the scan
145
+ // early. Too few placeholders would render the missing values as `undefined`, so
146
+ // a count is trusted only when nothing could have thrown the scan off.
147
+ //
148
+ // `Function.length` counts the parameters before the first defaulted one, so it
149
+ // catches a scan that stopped short of that point and nothing after it. Past
150
+ // there only the text can vouch: a list holding neither a string nor a comment
151
+ // has nothing for the scan to trip over. A list that does holds a callback back
152
+ // to the render-time path, where every unreadable list already goes.
153
+ function valueParamsAreCertain(fn, count, inner) {
154
+ if (fn.toString().includes('[native code]')) {
155
+ return false;
156
+ }
157
+ if (count < fn.length) {
158
+ return false;
159
+ }
160
+ return !/['"`]|\/\*|\/\//.test(inner);
161
+ }
162
+ // Compiles a column callback into a template of its own: its filter values
163
+ // become `{fpv:N}` placeholders and whatever it references is recorded into its
164
+ // own lists, so the placeholders it emits index its own dependencies rather than
165
+ // the enclosing member's. A rest parameter consumes as many values as the query
166
+ // happens to supply, which a fixed set of placeholders cannot express, so such a
167
+ // callback is left for the caller to invoke at render time.
168
+ function compileColumnCallback(column, state) {
169
+ const { count, rest, inner } = declaredValueParams(column);
170
+ if (rest || !valueParamsAreCertain(column, count, inner)) {
171
+ return column;
172
+ }
173
+ const values = [];
174
+ for (let i = 0; i < count; i++) {
175
+ values.push(placeholder(FILTER_VALUE_PREFIX, i));
176
+ }
177
+ const recording = emptyRecording();
178
+ const outer = state.target;
179
+ state.target = recording;
180
+ try {
181
+ const template = parseTemplateResult(column(...values));
182
+ return { template, valueParamsCount: count, ...recording };
183
+ }
184
+ finally {
185
+ state.target = outer;
186
+ }
187
+ }
79
188
  function filterParamsItemProxy(cubeName, name, state) {
80
189
  return {
81
190
  filter(column) {
82
- const item = { cube_name: cubeName, name, column };
191
+ const item = {
192
+ cube_name: cubeName,
193
+ name,
194
+ column: typeof column === 'function' ? compileColumnCallback(column, state) : column,
195
+ };
83
196
  const toString = () => {
84
- const index = state.filterParams.length;
85
- state.filterParams.push(item);
197
+ const index = state.target.filterParams.length;
198
+ state.target.filterParams.push(item);
86
199
  return placeholder(FILTER_PARAM_PREFIX, index);
87
200
  };
88
201
  // `__member` lets FILTER_GROUP recover the item; `toString` records and
@@ -110,8 +223,8 @@ function filterGroupFn(state) {
110
223
  }
111
224
  return arg.__member;
112
225
  });
113
- const index = state.filterGroups.length;
114
- state.filterGroups.push({ filterParams });
226
+ const index = state.target.filterGroups.length;
227
+ state.target.filterGroups.push({ filterParams });
115
228
  return placeholder(FILTER_GROUP_PREFIX, index);
116
229
  };
117
230
  }
@@ -158,7 +271,7 @@ function coerceToStringValue(value) {
158
271
  return null;
159
272
  }
160
273
  function recordSecurityValue(value, state) {
161
- return placeholder(SECURITY_VALUE_PREFIX, uniqueInsertString(state.securityContextValues, value));
274
+ return placeholder(SECURITY_VALUE_PREFIX, uniqueInsertString(state.target.securityContextValues, value));
162
275
  }
163
276
  function securityFilterFn(value, required, state) {
164
277
  const param = coerceFilterValue(value);
@@ -248,21 +361,11 @@ function parseTemplateResult(result) {
248
361
  * @param {object} sqlUtils the SQL_UTILS object passed through to the template
249
362
  */
250
363
  function compileMemberSql(sqlFn, argNames, securityContext, sqlUtils) {
251
- const state = {
252
- symbolPaths: [],
253
- filterParams: [],
254
- filterGroups: [],
255
- securityContextValues: [],
256
- };
364
+ const root = emptyRecording();
365
+ const state = { target: root };
257
366
  const args = argNames.map(name => buildArg(name, state, securityContext, sqlUtils));
258
367
  const template = parseTemplateResult(sqlFn(...args));
259
- return {
260
- template,
261
- symbolPaths: state.symbolPaths,
262
- filterParams: state.filterParams,
263
- filterGroups: state.filterGroups,
264
- securityContextValues: state.securityContextValues,
265
- };
368
+ return { template, ...root };
266
369
  }
267
370
  exports.compileMemberSql = compileMemberSql;
268
371
  exports.uniqueInsertPath = uniqueInsertPath;
package/dist/src/adapter/MemberSqlTemplateCompiler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MemberSqlTemplateCompiler.js","sourceRoot":"","sources":["../../../src/adapter/MemberSqlTemplateCompiler.js"],"names":[],"mappings":";AAAA,yCAAyC;AAEzC;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,MAAM,UAAU,GAAG,KAAK,CAAC;AACzB,MAAM,mBAAmB,GAAG,IAAI,CAAC;AACjC,MAAM,mBAAmB,GAAG,IAAI,CAAC;AACjC,MAAM,qBAAqB,GAAG,IAAI,CAAC;AAEnC,SAAS,WAAW,CAAC,MAAM,EAAE,KAAK;IAChC,OAAO,IAAI,MAAM,IAAI,KAAK,GAAG,CAAC;AAChC,CAAC;AAED,6EAA6E;AAC7E,4EAA4E;AAC5E,kEAAkE;AAClE,SAAS,gBAAgB,CAAC,KAAK,EAAE,IAAI;IACnC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACpC,OAAO,CAAC,CAAC;SACV;KACF;IACD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAM,EAAE,KAAK;IACvC,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;QACZ,OAAO,CAAC,CAAC;KACV;IACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;AAC3B,CAAC;AAED,gFAAgF;AAEhF,SAAS,oBAAoB,CAAC,IAAI,EAAE,KAAK;IACvC,OAAO,IAAI,KAAK,CAAC,EAAE,EAAE;QACnB,GAAG,CAAC,OAAO,EAAE,IAAI;YACf,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBAC5B,mEAAmE;gBACnE,sDAAsD;gBACtD,OAAO,SAAS,CAAC;aAClB;YACD,IAAI,IAAI,KAAK,KAAK,EAAE;gBAClB,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;gBACzE,MAAM,EAAE,GAAG,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;gBAC1C,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC;aACjB;YACD,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,SAAS,EAAE;gBAC7C,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBACxD,MAAM,EAAE,GAAG,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;gBAC1C,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC;aACjB;YACD,OAAO,oBAAoB,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QACtD,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,+EAA+E;AAE/E,SAAS,qBAAqB,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK;IAClD,OAAO;QACL,MAAM,CAAC,MAAM;YACX,MAAM,IAAI,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;YACnD,MAAM,QAAQ,GAAG,GAAG,EAAE;gBACpB,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC;gBACxC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9B,OAAO,WAAW,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YACjD,CAAC,CAAC;YACF,wEAAwE;YACxE,6CAA6C;YAC7C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QACtC,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAK;IAC9B,OAAO,IAAI,KAAK,CAAC,EAAE,EAAE;QACnB,GAAG,CAAC,EAAE,EAAE,QAAQ;YACd,OAAO,IAAI,KAAK,CAAC,EAAE,EAAE;gBACnB,GAAG,CAAC,GAAG,EAAE,UAAU;oBACjB,OAAO,qBAAqB,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;gBAC5D,CAAC;aACF,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,aAAa,CAAC,KAAK;IAC1B,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE;QACjB,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAClC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,WAAW,EAAE;gBAC/C,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;aAC1E;YACD,OAAO,GAAG,CAAC,QAAQ,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC;QACxC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;QAC1C,OAAO,WAAW,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC,CAAC;AACJ,CAAC;AAED,+EAA+E;AAE/E,SAAS,oBAAoB,CAAC,KAAK;IACjC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,GAAG,KAAK,EAAE,CAAC;IACjD,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO,GAAG,KAAK,EAAE,CAAC;IAClD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;AACxD,CAAC;AAED,uEAAuE;AACvE,SAAS,iBAAiB,CAAC,KAAK;IAC9B,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACnE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC;KACjE;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;KACpE;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,KAAK,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC;KACtG;IACD,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE;QAC9B,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;KACrE;IACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;AACxD,CAAC;AAED,iEAAiE;AACjE,SAAS,mBAAmB,CAAC,KAAK;IAChC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACvD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACjE,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;IACnD,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;IACpD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAK,EAAE,KAAK;IACvC,OAAO,WAAW,CAAC,qBAAqB,EAAE,kBAAkB,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC,CAAC;AACpG,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK;IAC9C,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACvC,OAAO,CAAC,MAAM,EAAE,EAAE;QAChB,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;YAC3B,MAAM,EAAE,GAAG,mBAAmB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACnD,IAAI,OAAO,MAAM,KAAK,UAAU;gBAAE,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC;YACpD,IAAI,OAAO,MAAM,KAAK,QAAQ;gBAAE,OAAO,GAAG,MAAM,MAAM,EAAE,EAAE,CAAC;YAC3D,OAAO,EAAE,CAAC;SACX;QACD,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE;YACxB,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,IAAI,OAAO,MAAM,KAAK,UAAU;oBAAE,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC;gBACpD,OAAO,OAAO,CAAC;aAChB;YACD,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;YACjE,IAAI,OAAO,MAAM,KAAK,UAAU;gBAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;YACrD,IAAI,OAAO,MAAM,KAAK,QAAQ;gBAAE,OAAO,GAAG,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YAC1E,OAAO,EAAE,CAAC;SACX;QACD,OAAO;QACP,IAAI,QAAQ,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,cAAc,MAAM,cAAc,CAAC,CAAC;SACrD;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAK,EAAE,KAAK;IACtC,MAAM,MAAM,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC1C,OAAO,GAAG,EAAE;QACV,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClE,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAK,EAAE,KAAK;IACxC,OAAO,IAAI,KAAK,CAAC,EAAE,EAAE;QACnB,GAAG,CAAC,EAAE,EAAE,IAAI;YACV,IAAI,OAAO,IAAI,KAAK,QAAQ;gBAAE,OAAO,SAAS,CAAC;YAC/C,yEAAyE;YACzE,uEAAuE;YACvE,IAAI,IAAI,KAAK,QAAQ;gBAAE,OAAO,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YACpE,IAAI,IAAI,KAAK,gBAAgB;gBAAE,OAAO,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAC3E,IAAI,IAAI,KAAK,aAAa;gBAAE,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;YAC/C,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,SAAS;gBAAE,OAAO,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACvF,MAAM,aAAa,GAAG,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC3F,OAAO,oBAAoB,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QACpD,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,+EAA+E;AAE/E,SAAS,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ;IACzD,IAAI,OAAO,KAAK,eAAe;QAAE,OAAO,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACjE,IAAI,OAAO,KAAK,cAAc;QAAE,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;IAC5D,IAAI,OAAO,KAAK,kBAAkB,IAAI,OAAO,KAAK,kBAAkB,IAAI,OAAO,KAAK,iBAAiB,EAAE;QACrG,OAAO,oBAAoB,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;KACrD;IACD,IAAI,OAAO,KAAK,WAAW;QAAE,OAAO,QAAQ,CAAC;IAC7C,OAAO,oBAAoB,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAM;IACjC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACzB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KAChC;IACD,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS,EAAE;QAC3C,OAAO,EAAE,CAAC;KACX;IACD,OAAO,GAAG,MAAM,EAAE,CAAC;AACrB,CAAC;AAED;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ;IAClE,MAAM,KAAK,GAAG;QACZ,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;QAChB,YAAY,EAAE,EAAE;QAChB,qBAAqB,EAAE,EAAE;KAC1B,CAAC;IAEF,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC;IACpF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAErD,OAAO;QACL,QAAQ;QACR,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,qBAAqB,EAAE,KAAK,CAAC,qBAAqB;KACnD,CAAC;AACJ,CAAC;AAED,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;AAC5C,OAAO,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;AAC5C,OAAO,CAAC,kBAAkB,GAAG,kBAAkB,CAAC"}
1
+ {"version":3,"file":"MemberSqlTemplateCompiler.js","sourceRoot":"","sources":["../../../src/adapter/MemberSqlTemplateCompiler.js"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/schema-compiler",
3
3
  "description": "Cube schema compiler",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "1.7.16",
5
+ "version": "1.7.18",
6
6
  "repository": {
7
7
  "type": "git",
8
8
  "url": "https://github.com/cube-js/cube.git",
@@ -40,8 +40,8 @@
40
40
  "@babel/standalone": "^7.24",
41
41
  "@babel/traverse": "^7.24",
42
42
  "@babel/types": "^7.24",
43
- "@cubejs-backend/native": "1.7.16",
44
- "@cubejs-backend/shared": "1.7.16",
43
+ "@cubejs-backend/native": "1.7.18",
44
+ "@cubejs-backend/shared": "1.7.18",
45
45
  "antlr4": "^4.13.2",
46
46
  "camelcase": "^6.2.0",
47
47
  "cron-parser": "^4.9.0",
@@ -60,9 +60,9 @@
60
60
  },
61
61
  "devDependencies": {
62
62
  "@clickhouse/client": "^1.12.0",
63
- "@cubejs-backend/linter": "1.7.16",
64
- "@cubejs-backend/mssql-driver": "1.7.16",
65
- "@cubejs-backend/query-orchestrator": "1.7.16",
63
+ "@cubejs-backend/linter": "1.7.18",
64
+ "@cubejs-backend/mssql-driver": "1.7.18",
65
+ "@cubejs-backend/query-orchestrator": "1.7.18",
66
66
  "@types/babel__code-frame": "^7.0.6",
67
67
  "@types/babel__generator": "^7.6.8",
68
68
  "@types/babel__traverse": "^7.20.5",
@@ -89,5 +89,5 @@
89
89
  "eslintConfig": {
90
90
  "extends": "../cubejs-linter"
91
91
  },
92
- "gitHead": "a433127f6ed00de590a0a37faada816f4bb77b08"
92
+ "gitHead": "5a491d1c41774f1bb6858385f3917aca058befad"
93
93
  }