wizard-ql 2.0.0 → 2.0.1

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { type Operation, type ComparisonOperation, type JunctionOperation, type Expression, type Condition, type UncheckedCondition, type Group, type Primitive, type TypeRecord, type Token, type ComparisonTypeToTSType, OPERATION_PURPOSE_DICTIONARY, COMPARISON_TYPE_DICTIONARY, OPERATION_ALIAS_DICTIONARY } from './spec';
+export { type Operation, type ComparisonOperation, type JunctionOperation, type Expression, type UncheckedExpression, type Condition, type UncheckedCondition, type Group, type Primitive, type TypeRecord, type Token, type ComparisonTypeToTSType, OPERATION_PURPOSE_DICTIONARY, COMPARISON_TYPE_DICTIONARY, OPERATION_ALIAS_DICTIONARY } from './spec';
 export { type ExpressionConstraints, QUOTE_EDGE_REGEX, parse, tokenize } from './parse';
 export { executeAsKnex } from './execute';
 export { type AggregationValue, summarize } from './summarize';

package/dist/parse.d.ts

@@ -51,4 +51,5 @@ export interface ExpressionConstraints<T extends TypeRecord, V extends boolean>
  * @returns                                            The object representation
  * @throws  {ParseError | ConstraintError}
  */
-export declare function parse<const T extends TypeRecord, const V extends boolean>(expression: string | string[] | Token[], constraints?: ExpressionConstraints<T, V>): Expression<ConvertTypeRecord<T>, V> | null;
+export declare function parse<const T extends TypeRecord = {}, // eslint-disable-line @typescript-eslint/no-empty-object-type
+const V extends boolean = false>(expression: string | string[] | Token[], constraints?: ExpressionConstraints<T, V>): Expression<ConvertTypeRecord<T>, V> | null;

package/dist/spec.d.ts

@@ -106,14 +106,14 @@ export type FieldTypeToTSType<T extends FieldType> = {
 export type Primitive = FieldTypeToTSType<FieldType>;
 /** Convert input type record to language server type record */
 export type ConvertTypeRecord<T extends TypeRecord> = {
-    [K in keyof T]: (T[K] extends FieldType[] ? FieldTypeToTSType<T[K][number]> : T[K] extends FieldType ? FieldTypeToTSType<T[K]> : Primitive) & Primitive;
+    [K in keyof T]: T[K] extends FieldType[] ? FieldTypeToTSType<T[K][number]> : T[K] extends FieldType ? FieldTypeToTSType<T[K]> : Primitive;
 };
 export declare const TYPE_PRIORITY: ["boolean", "date", "number", "string"];
 /**
  * A group of conditions joined by a junction operator
  * @template R A record mapping field names to values
  */
-export interface Group<R extends Record<string, Primitive> = Record<string, Primitive>, V extends boolean = false> {
+export interface Group<R extends Record<string, unknown> = Record<string, Primitive>, V extends boolean = false> {
     type: 'group';
     /** The junction operator */
     operation: JunctionOperation;
@@ -125,14 +125,14 @@ export interface Group<R extends Record<string, Primitive> = Record<string, Prim
  * @template R A record mapping field names to values
  * @template F The name of the field being queried
  */
-export interface Condition<R extends Record<string, Primitive>, F extends keyof R, O extends ComparisonOperation> {
+export interface Condition<R extends Record<string, unknown>, F extends keyof R, O extends ComparisonOperation> {
     type: 'condition';
     /** The operation */
     operation: O;
     /** The name of the field */
     field: F;
     /** The value being checked */
-    value: typeof COMPARISON_TYPE_DICTIONARY[O] extends 'array' ? Array<R[F]> : R[F] & ComparisonTypeToTSType<O>;
+    value: typeof COMPARISON_TYPE_DICTIONARY[O] extends 'array' ? Array<R[F]> : Extract<ComparisonTypeToTSType<O>, R[F]>;
     /** Was this condition validated by the constraints or is its type unknown? */
     validated: true;
 }
@@ -146,7 +146,7 @@ export interface UncheckedCondition<O extends ComparisonOperation = ComparisonOp
     /** The name of the field */
     field: string;
     /** The value being checked */
-    value: ComparisonTypeToTSType<O>;
+    value: Exclude<ComparisonTypeToTSType<O>, Date>;
     /** Was this condition validated by the constraints or is its type unknown? */
     validated: false;
 }
@@ -160,7 +160,7 @@ type ReverseAggregate<T extends Record<any, any>> = {
 };
 type ReverseAggregatedTypes = ReverseAggregate<typeof COMPARISON_TYPE_DICTIONARY>;
 /** Create a union of conditions; an intersection of the operation type validation and constraint type validation */
-export type CheckedConditionSpread<R extends Record<string, Primitive>> = {
+export type CheckedConditionSpread<R extends Record<string, unknown>> = {
     [K in keyof R]: {
         [O in keyof ReverseAggregatedTypes]: Condition<R, K, ReverseAggregatedTypes[O]>;
     }[keyof ReverseAggregatedTypes];
@@ -169,5 +169,8 @@ export type CheckedConditionSpread<R extends Record<string, Primitive>> = {
 export type UncheckedConditionSpread = {
     [O in keyof ReverseAggregatedTypes]: UncheckedCondition<ReverseAggregatedTypes[O]>;
 }[keyof ReverseAggregatedTypes];
-export type Expression<R extends Record<string, Primitive> = Record<string, Primitive>, V extends boolean = false> = Group<R, V> | (V extends true ? CheckedConditionSpread<R> : CheckedConditionSpread<R> | UncheckedConditionSpread);
+export type Expression<R extends Record<string, unknown> = Record<string, Primitive>, V extends boolean = false> = Group<R, V> | (V extends true ? CheckedConditionSpread<R> : CheckedConditionSpread<R> | UncheckedConditionSpread);
+export type UncheckedExpression = (Omit<Group, 'constituents'> & {
+    constituents: UncheckedExpression[];
+}) | UncheckedConditionSpread;
 export {};

package/package.json

@@ -6,7 +6,7 @@
   },
   "homepage": "https://github.com/guidance-analytics/wizard-ql",
   "description": "WizardQL is a natural-language-like query language for constructing data queries for resources that meet conditions.",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/guidance-analytics/wizard-ql.git"