@memberjunction/query-processor 5.13.0 → 5.14.0

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.
package/dist/index.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  export { QueryParameterProcessor } from './queryParameterProcessor.js';
2
- export type { ParameterValidationResult, QueryProcessingResult } from './queryParameterProcessor.js';
2
+ export type { ParameterValidationResult, QueryProcessingResult, QueryTemplateInput } from './queryParameterProcessor.js';
3
3
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,YAAY,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,YAAY,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC"}
@@ -1,4 +1,17 @@
1
- import { QueryInfo, QueryParameterInfo } from '@memberjunction/core';
1
+ import { QueryParameterInfo } from '@memberjunction/core';
2
+ /**
3
+ * Minimal interface for the query metadata needed by processQueryTemplate.
4
+ * Both `QueryInfo` (saved queries) and plain objects (transient specs) satisfy this shape.
5
+ * This decouples template processing from requiring a full database-backed QueryInfo.
6
+ */
7
+ export interface QueryTemplateInput {
8
+ /** The SQL query text (used as fallback if no sqlOverride is provided) */
9
+ SQL: string;
10
+ /** Whether this query uses Nunjucks template syntax */
11
+ UsesTemplate: boolean;
12
+ /** Parameter definitions for validation and type conversion */
13
+ Parameters: QueryParameterInfo[];
14
+ }
2
15
  /**
3
16
  * Result of parameter validation
4
17
  */
@@ -61,13 +74,18 @@ export declare class QueryParameterProcessor {
61
74
  * - SQL Server: converts to 1/0 (BIT fields)
62
75
  * - PostgreSQL: keeps as true/false (native boolean)
63
76
  */
64
- static validateParameters(parameters: Record<string, unknown> | undefined, parameterDefinitions: QueryParameterInfo[]): ParameterValidationResult;
77
+ static validateParameters(parameters: Record<string, unknown> | undefined, parameterDefinitions: QueryParameterInfo[], skipUnknownParameterCheck?: boolean): ParameterValidationResult;
65
78
  /**
66
79
  * Processes a query template with the provided parameters.
67
- * @param query The query info containing template SQL and parameter definitions
80
+ * Accepts either a full `QueryInfo` (saved queries) or a minimal `QueryTemplateInput`
81
+ * (transient specs) — only `SQL`, `UsesTemplate`, and `Parameters` are used.
82
+ * @param query The query info or template input containing SQL and parameter definitions
68
83
  * @param parameters User-provided parameter values
69
84
  * @param sqlOverride Optional SQL to use instead of query.SQL (e.g., platform-resolved SQL)
85
+ * @param forceTemplateProcessing When true, processes Nunjucks templates even if the query's
86
+ * own UsesTemplate is false. Used for transitive template resolution when a composed
87
+ * dependency uses templates but the outer query does not.
70
88
  */
71
- static processQueryTemplate(query: QueryInfo, parameters: Record<string, unknown> | undefined, sqlOverride?: string): QueryProcessingResult;
89
+ static processQueryTemplate(query: QueryTemplateInput, parameters: Record<string, unknown> | undefined, sqlOverride?: string, forceTemplateProcessing?: boolean): QueryProcessingResult;
72
90
  }
73
91
  //# sourceMappingURL=queryParameterProcessor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"queryParameterProcessor.d.ts","sourceRoot":"","sources":["../src/queryParameterProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAA8C,MAAM,sBAAsB,CAAC;AAGjH;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChD;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC9C;AAED;;;;;;;;GAQG;AACH,qBAAa,uBAAuB;IAChC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAqC;IAChE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAiC;IAE5D;;;;OAIG;IACH,OAAO,CAAC,MAAM,KAAK,WAAW,GAsB7B;IAED;;;;;OAKG;WACW,kBAAkB,CAC5B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC/C,oBAAoB,EAAE,kBAAkB,EAAE,GAC3C,yBAAyB;IAqI5B;;;;;OAKG;WACW,oBAAoB,CAC9B,KAAK,EAAE,SAAS,EAChB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC/C,WAAW,CAAC,EAAE,MAAM,GACrB,qBAAqB;CAuD3B"}
1
+ {"version":3,"file":"queryParameterProcessor.d.ts","sourceRoot":"","sources":["../src/queryParameterProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAA8C,MAAM,sBAAsB,CAAC;AAGtG;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IAC/B,0EAA0E;IAC1E,GAAG,EAAE,MAAM,CAAC;IACZ,uDAAuD;IACvD,YAAY,EAAE,OAAO,CAAC;IACtB,+DAA+D;IAC/D,UAAU,EAAE,kBAAkB,EAAE,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACtC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChD;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC9C;AAED;;;;;;;;GAQG;AACH,qBAAa,uBAAuB;IAChC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAqC;IAChE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAiC;IAE5D;;;;OAIG;IACH,OAAO,CAAC,MAAM,KAAK,WAAW,GAsB7B;IAED;;;;;OAKG;WACW,kBAAkB,CAC5B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC/C,oBAAoB,EAAE,kBAAkB,EAAE,EAC1C,yBAAyB,CAAC,EAAE,OAAO,GACpC,yBAAyB;IAsI5B;;;;;;;;;;OAUG;WACW,oBAAoB,CAC9B,KAAK,EAAE,kBAAkB,EACzB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAC/C,WAAW,CAAC,EAAE,MAAM,EACpB,uBAAuB,CAAC,EAAE,OAAO,GAClC,qBAAqB;CAoE3B"}
@@ -44,7 +44,7 @@ export class QueryParameterProcessor {
44
44
  * - SQL Server: converts to 1/0 (BIT fields)
45
45
  * - PostgreSQL: keeps as true/false (native boolean)
46
46
  */
47
- static validateParameters(parameters, parameterDefinitions) {
47
+ static validateParameters(parameters, parameterDefinitions, skipUnknownParameterCheck) {
48
48
  const errors = [];
49
49
  const validatedParams = {};
50
50
  const platform = RunQuerySQLFilterManager.Instance.Platform;
@@ -159,8 +159,9 @@ export class QueryParameterProcessor {
159
159
  }
160
160
  }
161
161
  }
162
- // Check for unknown parameters
163
- if (parameters) {
162
+ // Check for unknown parameters (skipped for transitive template processing
163
+ // where the outer query doesn't define the dependency's parameters)
164
+ if (parameters && !skipUnknownParameterCheck) {
164
165
  const definedParamNames = new Set(parameterDefinitions.map(p => p.Name));
165
166
  for (const key of Object.keys(parameters)) {
166
167
  if (!definedParamNames.has(key)) {
@@ -176,23 +177,30 @@ export class QueryParameterProcessor {
176
177
  }
177
178
  /**
178
179
  * Processes a query template with the provided parameters.
179
- * @param query The query info containing template SQL and parameter definitions
180
+ * Accepts either a full `QueryInfo` (saved queries) or a minimal `QueryTemplateInput`
181
+ * (transient specs) — only `SQL`, `UsesTemplate`, and `Parameters` are used.
182
+ * @param query The query info or template input containing SQL and parameter definitions
180
183
  * @param parameters User-provided parameter values
181
184
  * @param sqlOverride Optional SQL to use instead of query.SQL (e.g., platform-resolved SQL)
185
+ * @param forceTemplateProcessing When true, processes Nunjucks templates even if the query's
186
+ * own UsesTemplate is false. Used for transitive template resolution when a composed
187
+ * dependency uses templates but the outer query does not.
182
188
  */
183
- static processQueryTemplate(query, parameters, sqlOverride) {
189
+ static processQueryTemplate(query, parameters, sqlOverride, forceTemplateProcessing) {
184
190
  try {
185
191
  const sql = sqlOverride ?? query.SQL;
186
- // If query doesn't use templates, return the SQL as-is
187
- if (!query.UsesTemplate) {
192
+ // If query doesn't use templates (and no dependency does either), return the SQL as-is
193
+ if (!query.UsesTemplate && !forceTemplateProcessing) {
188
194
  return {
189
195
  success: true,
190
196
  processedSQL: sql,
191
197
  appliedParameters: {}
192
198
  };
193
199
  }
194
- // Validate parameters
195
- const validation = this.validateParameters(parameters, query.Parameters);
200
+ // Validate parameters against known definitions.
201
+ // When force-processing for transitive templates, the outer query may not define
202
+ // all parameters used by dependencies, so we skip the "unknown parameter" check.
203
+ const validation = this.validateParameters(parameters, query.Parameters, forceTemplateProcessing);
196
204
  if (!validation.success) {
197
205
  return {
198
206
  success: false,
@@ -201,13 +209,23 @@ export class QueryParameterProcessor {
201
209
  appliedParameters: {}
202
210
  };
203
211
  }
212
+ // When force-processing, merge any provided parameters that weren't in query.Parameters
213
+ // so Nunjucks can resolve dependency template tokens
214
+ const renderParams = { ...validation.validatedParameters };
215
+ if (forceTemplateProcessing && parameters) {
216
+ for (const [key, value] of Object.entries(parameters)) {
217
+ if (!(key in renderParams)) {
218
+ renderParams[key] = value;
219
+ }
220
+ }
221
+ }
204
222
  // Process the template
205
223
  try {
206
- const processedSQL = this.nunjucksEnv.renderString(sql, validation.validatedParameters);
224
+ const processedSQL = this.nunjucksEnv.renderString(sql, renderParams);
207
225
  return {
208
226
  success: true,
209
227
  processedSQL,
210
- appliedParameters: validation.validatedParameters
228
+ appliedParameters: renderParams
211
229
  };
212
230
  }
213
231
  catch (e) {
@@ -216,7 +234,7 @@ export class QueryParameterProcessor {
216
234
  success: false,
217
235
  processedSQL: '',
218
236
  error: `Template processing failed: ${msg}`,
219
- appliedParameters: validation.validatedParameters
237
+ appliedParameters: renderParams
220
238
  };
221
239
  }
222
240
  }
@@ -1 +1 @@
1
- {"version":3,"file":"queryParameterProcessor.js","sourceRoot":"","sources":["../src/queryParameterProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,wBAAwB,EAAoB,MAAM,sBAAsB,CAAC;AACjH,OAAO,QAAQ,MAAM,UAAU,CAAC;AA0ChC;;;;;;;;GAQG;AACH,MAAM,OAAO,uBAAuB;aACjB,iBAAY,GAAgC,IAAI,CAAC;aACjD,iBAAY,GAA4B,IAAI,CAAC;IAE5D;;;;OAIG;IACK,MAAM,KAAK,WAAW;QAC1B,MAAM,eAAe,GAAG,wBAAwB,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACnE,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,KAAK,eAAe,EAAE,CAAC;YAC9D,IAAI,CAAC,YAAY,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE;gBAC/C,UAAU,EAAE,KAAK;gBACjB,gBAAgB,EAAE,IAAI;gBACtB,UAAU,EAAE,IAAI;gBAChB,YAAY,EAAE,IAAI;aACrB,CAAC,CAAC;YAEH,gEAAgE;YAChE,MAAM,aAAa,GAAG,wBAAwB,CAAC,QAAQ,CAAC;YACxD,MAAM,OAAO,GAAG,aAAa,CAAC,aAAa,EAAE,CAAC;YAE9C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC3B,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;oBACxB,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;gBACpE,CAAC;YACL,CAAC;YACD,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC;QACxC,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,kBAAkB,CAC5B,UAA+C,EAC/C,oBAA0C;QAE1C,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,eAAe,GAA4B,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,wBAAwB,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAE5D,iCAAiC;QACjC,KAAK,MAAM,QAAQ,IAAI,oBAAoB,EAAE,CAAC;YAC1C,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAE1C,4BAA4B;YAC5B,IAAI,QAAQ,CAAC,UAAU,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC,EAAE,CAAC;gBACjF,MAAM,CAAC,IAAI,CAAC,uBAAuB,QAAQ,CAAC,IAAI,cAAc,CAAC,CAAC;gBAChE,SAAS;YACb,CAAC;YAED,oCAAoC;YACpC,IAAI,UAAU,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,IAAI,CAAC,IAAI,QAAQ,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;gBACtF,IAAI,CAAC;oBACD,oCAAoC;oBACpC,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;wBACpB,KAAK,QAAQ;4BACT,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;4BAC3C,MAAM;wBACV,KAAK,SAAS;4BACV,UAAU,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;4BAC5D,MAAM;wBACV,KAAK,MAAM;4BACP,UAAU,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;4BAC7C,MAAM;wBACV,KAAK,OAAO;4BACR,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;4BAC/C,MAAM;wBACV;4BACI,UAAU,GAAG,QAAQ,CAAC,YAAY,CAAC;oBAC3C,CAAC;gBACL,CAAC;gBAAC,OAAO,CAAU,EAAE,CAAC;oBAClB,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBACvD,MAAM,CAAC,IAAI,CAAC,gDAAgD,QAAQ,CAAC,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC;oBACtF,SAAS;gBACb,CAAC;YACL,CAAC;YAED,iCAAiC;YACjC,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBAClD,IAAI,CAAC;oBACD,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;wBACpB,KAAK,QAAQ;4BACT,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;4BACpD,MAAM;wBACV,KAAK,QAAQ,CAAC,CAAC,CAAC;4BACZ,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;4BAC/B,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gCACb,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,IAAI,oBAAoB,CAAC,CAAC;gCAC7D,SAAS;4BACb,CAAC;4BACD,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;4BACrC,MAAM;wBACV,CAAC;wBACD,KAAK,MAAM,CAAC,CAAC,CAAC;4BACV,MAAM,IAAI,GAAG,UAAU,YAAY,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,UAA6B,CAAC,CAAC;4BAC/F,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;gCACxB,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,IAAI,wBAAwB,CAAC,CAAC;gCACjE,SAAS;4BACb,CAAC;4BACD,4CAA4C;4BAC5C,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;4BACpD,MAAM;wBACV,CAAC;wBACD,KAAK,SAAS,CAAC,CAAC,CAAC;4BACb,MAAM,SAAS,GAAG,OAAO,UAAU,KAAK,SAAS;gCAC7C,CAAC,CAAC,UAAU;gCACZ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;4BAElD,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;gCAC5B,kDAAkD;gCAClD,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;4BAC/C,CAAC;iCAAM,CAAC;gCACJ,4BAA4B;gCAC5B,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;4BACvD,CAAC;4BACD,MAAM;wBACV,CAAC;wBACD,KAAK,OAAO;4BACR,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gCAC5B,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;4BAChD,CAAC;iCAAM,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;gCACxC,IAAI,CAAC;oCACD,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gCAC5D,CAAC;gCAAC,MAAM,CAAC;oCACL,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,IAAI,8BAA8B,CAAC,CAAC;oCACvE,SAAS;gCACb,CAAC;4BACL,CAAC;iCAAM,CAAC;gCACJ,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,IAAI,oBAAoB,CAAC,CAAC;gCAC7D,SAAS;4BACb,CAAC;4BACD,MAAM;wBACV;4BACI,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;oBACpD,CAAC;oBAED,kCAAkC;oBAClC,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAC;wBAC7B,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC;wBACvC,KAAK,MAAM,OAAO,IAAI,OAAO,EAAE,CAAC;4BAC5B,4CAA4C;wBAChD,CAAC;oBACL,CAAC;gBACL,CAAC;gBAAC,OAAO,CAAU,EAAE,CAAC;oBAClB,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBACvD,MAAM,CAAC,IAAI,CAAC,+BAA+B,QAAQ,CAAC,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC;gBACzE,CAAC;YACL,CAAC;QACL,CAAC;QAED,+BAA+B;QAC/B,IAAI,UAAU,EAAE,CAAC;YACb,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YACzE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACxC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC9B,MAAM,CAAC,IAAI,CAAC,uBAAuB,GAAG,GAAG,CAAC,CAAC;gBAC/C,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO;YACH,OAAO,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC;YAC5B,MAAM;YACN,mBAAmB,EAAE,eAAe;SACvC,CAAC;IACN,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,oBAAoB,CAC9B,KAAgB,EAChB,UAA+C,EAC/C,WAAoB;QAEpB,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,WAAW,IAAI,KAAK,CAAC,GAAG,CAAC;YAErC,uDAAuD;YACvD,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;gBACtB,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,YAAY,EAAE,GAAG;oBACjB,iBAAiB,EAAE,EAAE;iBACxB,CAAC;YACN,CAAC;YAED,sBAAsB;YACtB,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;YACzE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBACtB,OAAO;oBACH,OAAO,EAAE,KAAK;oBACd,YAAY,EAAE,EAAE;oBAChB,KAAK,EAAE,gCAAgC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACrE,iBAAiB,EAAE,EAAE;iBACxB,CAAC;YACN,CAAC;YAED,uBAAuB;YACvB,IAAI,CAAC;gBACD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAC9C,GAAG,EACH,UAAU,CAAC,mBAAmB,CACjC,CAAC;gBAEF,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,YAAY;oBACZ,iBAAiB,EAAE,UAAU,CAAC,mBAAmB;iBACpD,CAAC;YACN,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBAClB,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACvD,OAAO;oBACH,OAAO,EAAE,KAAK;oBACd,YAAY,EAAE,EAAE;oBAChB,KAAK,EAAE,+BAA+B,GAAG,EAAE;oBAC3C,iBAAiB,EAAE,UAAU,CAAC,mBAAmB;iBACpD,CAAC;YACN,CAAC;QACL,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YAClB,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACvD,OAAO;gBACH,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,EAAE;gBAChB,KAAK,EAAE,6CAA6C,GAAG,EAAE;gBACzD,iBAAiB,EAAE,EAAE;aACxB,CAAC;QACN,CAAC;IACL,CAAC"}
1
+ {"version":3,"file":"queryParameterProcessor.js","sourceRoot":"","sources":["../src/queryParameterProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,wBAAwB,EAAoB,MAAM,sBAAsB,CAAC;AACtG,OAAO,QAAQ,MAAM,UAAU,CAAC;AAwDhC;;;;;;;;GAQG;AACH,MAAM,OAAO,uBAAuB;aACjB,iBAAY,GAAgC,IAAI,CAAC;aACjD,iBAAY,GAA4B,IAAI,CAAC;IAE5D;;;;OAIG;IACK,MAAM,KAAK,WAAW;QAC1B,MAAM,eAAe,GAAG,wBAAwB,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACnE,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,KAAK,eAAe,EAAE,CAAC;YAC9D,IAAI,CAAC,YAAY,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE;gBAC/C,UAAU,EAAE,KAAK;gBACjB,gBAAgB,EAAE,IAAI;gBACtB,UAAU,EAAE,IAAI;gBAChB,YAAY,EAAE,IAAI;aACrB,CAAC,CAAC;YAEH,gEAAgE;YAChE,MAAM,aAAa,GAAG,wBAAwB,CAAC,QAAQ,CAAC;YACxD,MAAM,OAAO,GAAG,aAAa,CAAC,aAAa,EAAE,CAAC;YAE9C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC3B,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;oBACxB,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;gBACpE,CAAC;YACL,CAAC;YACD,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC;QACxC,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,kBAAkB,CAC5B,UAA+C,EAC/C,oBAA0C,EAC1C,yBAAmC;QAEnC,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,eAAe,GAA4B,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,wBAAwB,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAE5D,iCAAiC;QACjC,KAAK,MAAM,QAAQ,IAAI,oBAAoB,EAAE,CAAC;YAC1C,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAE1C,4BAA4B;YAC5B,IAAI,QAAQ,CAAC,UAAU,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC,EAAE,CAAC;gBACjF,MAAM,CAAC,IAAI,CAAC,uBAAuB,QAAQ,CAAC,IAAI,cAAc,CAAC,CAAC;gBAChE,SAAS;YACb,CAAC;YAED,oCAAoC;YACpC,IAAI,UAAU,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,IAAI,CAAC,IAAI,QAAQ,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;gBACtF,IAAI,CAAC;oBACD,oCAAoC;oBACpC,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;wBACpB,KAAK,QAAQ;4BACT,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;4BAC3C,MAAM;wBACV,KAAK,SAAS;4BACV,UAAU,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;4BAC5D,MAAM;wBACV,KAAK,MAAM;4BACP,UAAU,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;4BAC7C,MAAM;wBACV,KAAK,OAAO;4BACR,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;4BAC/C,MAAM;wBACV;4BACI,UAAU,GAAG,QAAQ,CAAC,YAAY,CAAC;oBAC3C,CAAC;gBACL,CAAC;gBAAC,OAAO,CAAU,EAAE,CAAC;oBAClB,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBACvD,MAAM,CAAC,IAAI,CAAC,gDAAgD,QAAQ,CAAC,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC;oBACtF,SAAS;gBACb,CAAC;YACL,CAAC;YAED,iCAAiC;YACjC,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBAClD,IAAI,CAAC;oBACD,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;wBACpB,KAAK,QAAQ;4BACT,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;4BACpD,MAAM;wBACV,KAAK,QAAQ,CAAC,CAAC,CAAC;4BACZ,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;4BAC/B,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gCACb,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,IAAI,oBAAoB,CAAC,CAAC;gCAC7D,SAAS;4BACb,CAAC;4BACD,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;4BACrC,MAAM;wBACV,CAAC;wBACD,KAAK,MAAM,CAAC,CAAC,CAAC;4BACV,MAAM,IAAI,GAAG,UAAU,YAAY,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,UAA6B,CAAC,CAAC;4BAC/F,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;gCACxB,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,IAAI,wBAAwB,CAAC,CAAC;gCACjE,SAAS;4BACb,CAAC;4BACD,4CAA4C;4BAC5C,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;4BACpD,MAAM;wBACV,CAAC;wBACD,KAAK,SAAS,CAAC,CAAC,CAAC;4BACb,MAAM,SAAS,GAAG,OAAO,UAAU,KAAK,SAAS;gCAC7C,CAAC,CAAC,UAAU;gCACZ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;4BAElD,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;gCAC5B,kDAAkD;gCAClD,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;4BAC/C,CAAC;iCAAM,CAAC;gCACJ,4BAA4B;gCAC5B,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;4BACvD,CAAC;4BACD,MAAM;wBACV,CAAC;wBACD,KAAK,OAAO;4BACR,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gCAC5B,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;4BAChD,CAAC;iCAAM,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;gCACxC,IAAI,CAAC;oCACD,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gCAC5D,CAAC;gCAAC,MAAM,CAAC;oCACL,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,IAAI,8BAA8B,CAAC,CAAC;oCACvE,SAAS;gCACb,CAAC;4BACL,CAAC;iCAAM,CAAC;gCACJ,MAAM,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,IAAI,oBAAoB,CAAC,CAAC;gCAC7D,SAAS;4BACb,CAAC;4BACD,MAAM;wBACV;4BACI,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;oBACpD,CAAC;oBAED,kCAAkC;oBAClC,IAAI,QAAQ,CAAC,iBAAiB,EAAE,CAAC;wBAC7B,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC;wBACvC,KAAK,MAAM,OAAO,IAAI,OAAO,EAAE,CAAC;4BAC5B,4CAA4C;wBAChD,CAAC;oBACL,CAAC;gBACL,CAAC;gBAAC,OAAO,CAAU,EAAE,CAAC;oBAClB,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBACvD,MAAM,CAAC,IAAI,CAAC,+BAA+B,QAAQ,CAAC,IAAI,MAAM,GAAG,EAAE,CAAC,CAAC;gBACzE,CAAC;YACL,CAAC;QACL,CAAC;QAED,2EAA2E;QAC3E,oEAAoE;QACpE,IAAI,UAAU,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC3C,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YACzE,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACxC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC9B,MAAM,CAAC,IAAI,CAAC,uBAAuB,GAAG,GAAG,CAAC,CAAC;gBAC/C,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO;YACH,OAAO,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC;YAC5B,MAAM;YACN,mBAAmB,EAAE,eAAe;SACvC,CAAC;IACN,CAAC;IAED;;;;;;;;;;OAUG;IACI,MAAM,CAAC,oBAAoB,CAC9B,KAAyB,EACzB,UAA+C,EAC/C,WAAoB,EACpB,uBAAiC;QAEjC,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,WAAW,IAAI,KAAK,CAAC,GAAG,CAAC;YAErC,uFAAuF;YACvF,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAClD,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,YAAY,EAAE,GAAG;oBACjB,iBAAiB,EAAE,EAAE;iBACxB,CAAC;YACN,CAAC;YAED,iDAAiD;YACjD,iFAAiF;YACjF,iFAAiF;YACjF,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,uBAAuB,CAAC,CAAC;YAClG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBACtB,OAAO;oBACH,OAAO,EAAE,KAAK;oBACd,YAAY,EAAE,EAAE;oBAChB,KAAK,EAAE,gCAAgC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACrE,iBAAiB,EAAE,EAAE;iBACxB,CAAC;YACN,CAAC;YAED,wFAAwF;YACxF,qDAAqD;YACrD,MAAM,YAAY,GAAG,EAAE,GAAG,UAAU,CAAC,mBAAmB,EAAE,CAAC;YAC3D,IAAI,uBAAuB,IAAI,UAAU,EAAE,CAAC;gBACxC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;oBACpD,IAAI,CAAC,CAAC,GAAG,IAAI,YAAY,CAAC,EAAE,CAAC;wBACzB,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;oBAC9B,CAAC;gBACL,CAAC;YACL,CAAC;YAED,uBAAuB;YACvB,IAAI,CAAC;gBACD,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAC9C,GAAG,EACH,YAAY,CACf,CAAC;gBAEF,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,YAAY;oBACZ,iBAAiB,EAAE,YAAY;iBAClC,CAAC;YACN,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBAClB,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACvD,OAAO;oBACH,OAAO,EAAE,KAAK;oBACd,YAAY,EAAE,EAAE;oBAChB,KAAK,EAAE,+BAA+B,GAAG,EAAE;oBAC3C,iBAAiB,EAAE,YAAY;iBAClC,CAAC;YACN,CAAC;QACL,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YAClB,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACvD,OAAO;gBACH,OAAO,EAAE,KAAK;gBACd,YAAY,EAAE,EAAE;gBAChB,KAAK,EAAE,6CAA6C,GAAG,EAAE;gBACzD,iBAAiB,EAAE,EAAE;aACxB,CAAC;QACN,CAAC;IACL,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@memberjunction/query-processor",
3
3
  "type": "module",
4
- "version": "5.13.0",
4
+ "version": "5.14.0",
5
5
  "description": "Shared query parameter validation and Nunjucks template processing for MemberJunction data providers",
6
6
  "main": "dist/index.js",
7
7
  "types": "dist/index.d.ts",
@@ -22,8 +22,8 @@
22
22
  "vitest": "^3.1.1"
23
23
  },
24
24
  "dependencies": {
25
- "@memberjunction/core": "5.13.0",
26
- "@memberjunction/global": "5.13.0",
25
+ "@memberjunction/core": "5.14.0",
26
+ "@memberjunction/global": "5.14.0",
27
27
  "nunjucks": "^3.2.4"
28
28
  },
29
29
  "repository": {