npm - ajoq - Versions diffs - 0.0.2-0 → 0.0.3 - Mend

ajoq 0.0.2-0 → 0.0.3

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 (10) hide show

package/build/index.cjs CHANGED Viewed

@@ -9,22 +9,25 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    SORT_EXPR: function() {
-        return SORT_EXPR;
-    },
-    SORT_MAP: function() {
-        return SORT_MAP;
-    },
-    createQuery: function() {
-        return createQuery;
+    createFilter: function() {
+        return createFilter;
     },
     createSort: function() {
         return createSort;
     },
-    sortCodeGen: function() {
-        return sortCodeGen;
+    stringify: function() {
+        return stringify;
     }
 });
+const stringify = (value)=>{
+    if (value === undefined) {
+        return 'undefined';
+    }
+    if (value instanceof RegExp) {
+        return `/${value.source}/${value.flags}`;
+    }
+    return JSON.stringify(value);
+};
 const conditions = {
     $eq: (valuePath, value)=>`(${valuePath} === ${value})`,
     $ne: (valuePath, value)=>`(${valuePath} !== ${value})`,
@@ -32,48 +35,84 @@ const conditions = {
     $gte: (valuePath, value)=>`(${valuePath} >= ${value})`,
     $lt: (valuePath, value)=>`(${valuePath} < ${value})`,
     $lte: (valuePath, value)=>`(${valuePath} <= ${value})`,
-    $in: (valuePath, value)=>`(${value}.includes(${valuePath}))`,
-    $nin: (valuePath, value)=>`(!${value}.includes(${valuePath}))`,
+    $in: (valuePath, value, context)=>{
+        const name = context.register(`new Set(${value})`);
+        return `${name}.has(${valuePath})`;
+    },
+    $nin: (valuePath, value, context)=>`!${conditions.$in(valuePath, value, context)}`,
+    $sub: (valuePath, value, context)=>{
+        const name = context.register(`new Set(${value})`);
+        return `${valuePath}.every((value) => ${name}.has(value))`;
+    },
+    $nsub: (valuePath, value, context)=>`!${conditions.$sub(valuePath, value, context)}`,
+    $sup: (valuePath, value, context)=>{
+        const name = context.register(`new Set(${valuePath})`);
+        return `${value}.every((value) => ${name}.has(value))`;
+    },
+    $nsup: (valuePath, value, context)=>`!${conditions.$sup(valuePath, value, context)}`,
+    $con: (valuePath, value)=>`${valuePath}.includes(${value})`,
+    $ncon: (valuePath, value)=>`!${valuePath}.includes(${value})`,
     $exists: (valuePath, value)=>`((${valuePath} !== undefined && ${valuePath} !== null) === ${value})`,
     $match: (valuePath, value)=>`${value}.test('' + ${valuePath})`,
     $nmatch: (valuePath, value)=>`!${value}.test('' + ${valuePath})`,
     $bits: (valuePath, value)=>`((${valuePath} & ${value}) !== 0)`,
-    $nbits: (valuePath, value)=>`((${valuePath} & ${value}) === 0)`
+    $nbits: (valuePath, value)=>`((${valuePath} & ${value}) === 0)`,
+    $typeof: (valuePath, value)=>`(typeof ${valuePath} === ${value})`,
+    $ntypeof: (valuePath, value)=>`(typeof ${valuePath} !== ${value})`
 };
 const operations = {
     $and: (value)=>`(${value.join(' && ')})`,
     $or: (value)=>`(${value.join(' || ')})`,
-    $nor: (value)=>`(!(${value.join(' || ')}))`,
-    $not: (value)=>`(!(${value}))`
+    $nor: (value)=>`!(${value.join(' || ')})`,
+    $not: (value)=>`!(${value})`
 };
-const queryCodeGen = (query, valuePath, path)=>{
+class Context {
+    counter = 0;
+    values = [];
+    cacheMap = new Map();
+    register(code) {
+        if (!this.cacheMap.has(code)) {
+            const name = `v$$${this.counter++}`;
+            this.values.push(`const ${name} = ${code};`);
+            this.cacheMap.set(code, name);
+        }
+        return this.cacheMap.get(code);
+    }
+    toString() {
+        return this.values.join('\n');
+    }
+}
+const filterCodeGen = (query, valuePath, context)=>{
     if (typeof query === 'object' && query !== null) {
         const condition = Object.entries(query).map(([key, value])=>{
             if (key in conditions) {
-                return conditions[key](valuePath, JSON.stringify(value));
+                return conditions[key](valuePath, stringify(value), context);
             }
             if (key in operations) {
                 const values = Array.isArray(value) ? value : [
                     value
                 ];
-                return operations[key](values.map((value)=>queryCodeGen(value, valuePath, path)));
+                return operations[key](values.map((v)=>filterCodeGen(v, valuePath, context)));
             }
-            const valueSubPath = `${valuePath}?.[${JSON.stringify(key)}]`;
+            const valueSubPath = `${valuePath}?.[${stringify(key)}]`;
             if (value instanceof RegExp) {
-                return conditions.$match(valueSubPath, value.toString());
+                return conditions.$match(valueSubPath, value.toString(), context);
             }
             if (typeof value === 'object' && value !== null) {
-                return queryCodeGen(value, valueSubPath, path);
+                return filterCodeGen(value, valueSubPath, context);
             }
-            return conditions.$eq(valueSubPath, JSON.stringify(value));
+            return conditions.$eq(valueSubPath, JSON.stringify(value), context);
         });
-        return `${condition.join(' && ')}`;
+        if (condition.length > 0) {
+            return `${condition.join(' && ')}`;
+        }
     }
     return 'true';
 };
-const createQuery = (query, rootName)=>{
-    const code = queryCodeGen(query, 'data', rootName);
-    const filter = new Function('data', `return ${code || 'true'};`);
+const createFilter = (query)=>{
+    const context = new Context();
+    const code = filterCodeGen(query, 'data', context);
+    const filter = new Function('data', `${context}\nreturn ${code};`);
     return (data)=>filter(data);
 };
 const SORT_EXPR = /^(asc|desc|1|-1)$/i;
@@ -83,7 +122,7 @@ const SORT_MAP = {
     1: 1,
     '-1': -1
 };
-const sortCodeGen = (sort, valuePath, path)=>{
+const sortCodeGen = (sort, valuePath)=>{
     if (typeof sort === 'object' && sort !== null) {
         const condition = Object.entries(sort).map(([key, value])=>{
             const valueSubPathA = `${valuePath[0]}?.[${JSON.stringify(key)}]`;
@@ -91,9 +130,11 @@ const sortCodeGen = (sort, valuePath, path)=>{
             return sortCodeGen(value, [
                 valueSubPathA,
                 valueSubPathB
-            ], path);
+            ]);
         });
-        return condition.join(' || ');
+        if (condition.length > 0) {
+            return condition.join(' || ');
+        }
     }
     if (typeof sort === 'string' && SORT_EXPR.test(sort)) {
         return `(${valuePath[0]}?.localeCompare(${valuePath[1]}) * ${SORT_MAP[sort]})`;
@@ -103,14 +144,13 @@ const sortCodeGen = (sort, valuePath, path)=>{
     }
     return `0`;
 };
-const createSort = (sort, rootName)=>{
+const createSort = (sort)=>{
     const code = sortCodeGen(sort, [
         'a',
         'b'
-    ], rootName);
-    const filter = new Function('a', 'b', `return ${code || 0};`);
-    console.log(filter.toString());
-    return (data)=>filter(data);
+    ]);
+    const sortFn = new Function('a', 'b', `return ${code};`);
+    return (a, b)=>sortFn(a, b);
 };
 //# sourceMappingURL=index.cjs.map

package/build/index.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/index.ts"],"sourcesContent":["export type Query<T> = {\n [P in keyof T]?: QueryCondition<T[P]>;\n} & Operations<T>;\n\ntype QueryCondition<FieldType> =\n \| FieldType\n \| Conditions<FieldType>;\n\ninterface Conditions<ValueType> {\n $eq?: ValueType;\n $ne?: ValueType;\n $gt?: ValueType;\n $gte?: ValueType;\n $lt?: ValueType;\n $lte?: ValueType;\n $in?: ValueType[];\n $nin?: ValueType[];\n $exists?: boolean;\n $match?: RegExp \| string;\n $nmatch?: RegExp \| string;\n $bits?: number;\n $nbits?: number;\n};\n\ntype ConditionKeys = keyof Conditions<unknown>;\n\ninterface Operations<T> {\n $and?: Query<T>[];\n $or?: Query<T>[];\n $nor?: Query<T>[];\n $not?: Query<T>;\n};\n\ntype OperationKeys = keyof Operations<unknown>;\n\nconst conditions: Record<ConditionKeys, any> = {\n $eq: (valuePath: string, value: unknown) => `(${valuePath} === ${value})`,\n $ne: (valuePath: string, value: unknown) => `(${valuePath} !== ${value})`,\n $gt: (valuePath: string, value: unknown) => `(${valuePath} > ${value})`,\n $gte: (valuePath: string, value: unknown) => `(${valuePath} >= ${value})`,\n $lt: (valuePath: string, value: unknown) => `(${valuePath} < ${value})`,\n $lte: (valuePath: string, value: unknown) => `(${valuePath} <= ${value})`,\n $in: (valuePath: string, value: unknown) => `(${value}.includes(${valuePath}))`,\n $nin: (valuePath: string, value: unknown) => `(!${value}.includes(${valuePath}))`,\n $exists: (valuePath: string, value: unknown) => `((${valuePath} !== undefined && ${valuePath} !== null) === ${value})`,\n $match: (valuePath: string, value: unknown) => `${value}.test('' + ${valuePath})`,\n $nmatch: (valuePath: string, value: unknown) => `!${value}.test('' + ${valuePath})`,\n $bits: (valuePath: string, value: unknown) => `((${valuePath} & ${value}) !== 0)`,\n $nbits: (valuePath: string, value: unknown) => `((${valuePath} & ${value}) === 0)`,\n};\n\nconst operations: Record<keyof Operations<unknown>, any> = {\n $and: (value: unknown[]) => `(${value.join(' && ')})`,\n $or: (value: unknown[]) => `(${value.join(' \|\| ')})`,\n $nor: (value: unknown[]) => `(!(${value.join(' \|\| ')}))`,\n $not: (value: unknown) => `(!(${value}))`,\n}\n\n\nconst queryCodeGen = <T extends object>(query: Query<T>, valuePath: string, path: string): string => {\n if (typeof query === 'object' && query !== null) {\n const condition = Object.entries(query).map(([key, value]) => {\n if (key in conditions) {\n return conditions[key as ConditionKeys](valuePath, JSON.stringify(value));\n }\n if (key in operations) {\n const values = Array.isArray(value) ? value : [value];\n return operations[key as OperationKeys](values.map((value) => queryCodeGen(value, valuePath, path)));\n }\n const valueSubPath = `${valuePath}?.[${JSON.stringify(key)}]`;\n if (value instanceof RegExp) {\n return conditions.$match(valueSubPath, value.toString());\n }\n if (typeof value === 'object' && value !== null) {\n return queryCodeGen(value, valueSubPath, path);\n }\n return conditions.$eq(valueSubPath, JSON.stringify(value));\n });\n\n return `${condition.join(' && ')}`;\n }\n return 'true';\n}\n\nexport const createQuery = <T extends object>(query: Query<T>, rootName: string) => {\n const code = queryCodeGen(query, 'data', rootName);\n const filter = new Function('data', `return ${code \|\| 'true'};`);\n return (data: T) => filter(data);\n};\n\nexport type SortType = 'asc' \| 'desc' \| 1 \| -1;\n\nexport type Sort<T> = T extends object\n ? {\n [K in keyof T]?: T[K] extends object ? Sort<T[K]> : SortType;\n }\n : SortType;\n\nexport const SORT_EXPR = /^(asc\|desc\|1\|-1)$/i\n\nexport const SORT_MAP: Record<SortType, 1 \| -1> = {\n asc: 1,\n desc: -1,\n 1: 1,\n '-1': -1,\n};\n\nexport const sortCodeGen = <T>(sort: Sort<T>, valuePath: [string, string], path: string): string => {\n if (typeof sort === 'object' && sort !== null) {\n const condition = Object.entries(sort).map(([key, value]) => {\n const valueSubPathA = `${valuePath[0]}?.[${JSON.stringify(key)}]`;\n const valueSubPathB = `${valuePath[1]}?.[${JSON.stringify(key)}]`;\n return sortCodeGen(value, [valueSubPathA, valueSubPathB], path);\n });\n return condition.join(' \|\| ');\n }\n if (typeof sort === 'string' && SORT_EXPR.test(sort)) {\n return `(${valuePath[0]}?.localeCompare(${valuePath[1]}) * ${SORT_MAP[sort as SortType]})`;\n }\n if (typeof sort === 'number' && SORT_EXPR.test('' + sort)) {\n return `((${valuePath[0]} - ${valuePath[1]}) * ${SORT_MAP[sort as SortType]})`;\n }\n return `0`;\n};\n\nexport const createSort = <T>(sort: Sort<T>, rootName: string) => {\n const code = sortCodeGen(sort, ['a', 'b'], rootName);\n const filter = new Function('a', 'b', `return ${code \|\| 0};`);\n console.log(filter.toString());\n return (data: T) => filter(data);\n};\n"],"names":["SORT_EXPR","SORT_MAP","createQuery","createSort","sortCodeGen","conditions","$eq","valuePath","value","$ne","$gt","$gte","$lt","$lte","$in","$nin","$exists","$match","$nmatch","$bits","$nbits","operations","$and","join","$or","$nor","$not","queryCodeGen","query","path","condition","Object","entries","map","key","JSON","stringify","values","Array","isArray","valueSubPath","RegExp","toString","rootName","code","filter","Function","data","asc","desc","sort","valueSubPathA","valueSubPathB","test","console","log"],"mappings":"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"}
1	+ {"version":3,"sources":["../src/index.ts"],"sourcesContent":["export type Query<T> = {\n [P in keyof T]?: QueryCondition<T[P]>;\n} & Operations<T>;\n\nexport type QueryCondition<FieldType> = FieldType \| Conditions<FieldType> \| Operations<QueryCondition<FieldType>>;\n\nexport interface Conditions<ValueType> {\n $eq?: ValueType;\n $ne?: ValueType;\n $gt?: ValueType;\n $gte?: ValueType;\n $lt?: ValueType;\n $lte?: ValueType;\n $in?: ValueType[];\n $nin?: ValueType[];\n $sub?: ValueType[];\n $nsub?: ValueType[];\n $sup?: ValueType[];\n $nsup?: ValueType[];\n $con?: ValueType;\n $ncon?: ValueType;\n $exists?: boolean;\n $match?: RegExp \| string;\n $nmatch?: RegExp \| string;\n $bits?: number;\n $nbits?: number;\n $typeof: string;\n $ntypeof: string;\n}\n\nexport type ConditionKeys = keyof Conditions<unknown>;\n\nexport interface Operations<T> {\n $and?: Query<T>[];\n $or?: Query<T>[];\n $nor?: Query<T>[];\n $not?: Query<T>;\n}\n\nexport type OperationKeys = keyof Operations<unknown>;\n\nexport const stringify = (value: unknown) => {\n if (value === undefined) {\n return 'undefined';\n }\n if (value instanceof RegExp) {\n return `/${value.source}/${value.flags}`;\n }\n return JSON.stringify(value);\n};\n\nexport interface Condition {\n (valuePath: string, value: any, context: Context): string;\n}\n\nconst conditions: Record<ConditionKeys, Condition> = {\n $eq: (valuePath: string, value: unknown) => `(${valuePath} === ${value})`,\n $ne: (valuePath: string, value: unknown) => `(${valuePath} !== ${value})`,\n $gt: (valuePath: string, value: unknown) => `(${valuePath} > ${value})`,\n $gte: (valuePath: string, value: unknown) => `(${valuePath} >= ${value})`,\n $lt: (valuePath: string, value: unknown) => `(${valuePath} < ${value})`,\n $lte: (valuePath: string, value: unknown) => `(${valuePath} <= ${value})`,\n $in: (valuePath: string, value: unknown, context: Context) => {\n const name = context.register(`new Set(${value})`);\n return `${name}.has(${valuePath})`;\n },\n $nin: (valuePath: string, value: unknown, context: Context) => `!${conditions.$in(valuePath, value, context)}`,\n $sub: (valuePath: string, value: unknown, context: Context) => {\n const name = context.register(`new Set(${value})`);\n return `${valuePath}.every((value) => ${name}.has(value))`;\n },\n $nsub: (valuePath: string, value: unknown, context: Context) => `!${conditions.$sub(valuePath, value, context)}`,\n $sup: (valuePath: string, value: unknown, context: Context) => {\n const name = context.register(`new Set(${valuePath})`);\n return `${value}.every((value) => ${name}.has(value))`;\n },\n $nsup: (valuePath: string, value: unknown, context: Context) => `!${conditions.$sup(valuePath, value, context)}`,\n $con: (valuePath: string, value: unknown) => `${valuePath}.includes(${value})`,\n $ncon: (valuePath: string, value: unknown) => `!${valuePath}.includes(${value})`,\n $exists: (valuePath: string, value: boolean) => `((${valuePath} !== undefined && ${valuePath} !== null) === ${value})`,\n $match: (valuePath: string, value: RegExp) => `${value}.test('' + ${valuePath})`,\n $nmatch: (valuePath: string, value: RegExp) => `!${value}.test('' + ${valuePath})`,\n $bits: (valuePath: string, value: unknown) => `((${valuePath} & ${value}) !== 0)`,\n $nbits: (valuePath: string, value: unknown) => `((${valuePath} & ${value}) === 0)`,\n $typeof: (valuePath: string, value: unknown) => `(typeof ${valuePath} === ${value})`,\n $ntypeof: (valuePath: string, value: unknown) => `(typeof ${valuePath} !== ${value})`,\n};\n\nconst operations: Record<keyof Operations<unknown>, any> = {\n $and: (value: unknown[]) => `(${value.join(' && ')})`,\n $or: (value: unknown[]) => `(${value.join(' \|\| ')})`,\n $nor: (value: unknown[]) => `!(${value.join(' \|\| ')})`,\n $not: (value: unknown[]) => `!(${value})`,\n};\n\nclass Context {\n private counter = 0;\n private values: string[] = [];\n private cacheMap = new Map<string, string>();\n\n register(code: string) {\n if (!this.cacheMap.has(code)) {\n const name = `v$$${this.counter++}`;\n this.values.push(`const ${name} = ${code};`);\n this.cacheMap.set(code, name);\n }\n return this.cacheMap.get(code)!;\n }\n toString() {\n return this.values.join('\\n');\n }\n}\n\nconst filterCodeGen = <T extends object>(query: Query<T> \| undefined, valuePath: string, context: Context): string => {\n if (typeof query === 'object' && query !== null) {\n const condition = Object.entries(query).map(([key, value]) => {\n if (key in conditions) {\n return conditions[key as ConditionKeys](valuePath, stringify(value), context);\n }\n if (key in operations) {\n const values = Array.isArray(value) ? value : [value];\n return operations[key as OperationKeys](values.map((v) => filterCodeGen(v, valuePath, context)));\n }\n const valueSubPath = `${valuePath}?.[${stringify(key)}]`;\n if (value instanceof RegExp) {\n return conditions.$match(valueSubPath, value.toString(), context);\n }\n if (typeof value === 'object' && value !== null) {\n return filterCodeGen(value, valueSubPath, context);\n }\n return conditions.$eq(valueSubPath, JSON.stringify(value), context);\n });\n if (condition.length > 0) {\n return `${condition.join(' && ')}`;\n }\n }\n return 'true';\n};\n\nexport const createFilter = <T extends object>(query?: Query<T>) => {\n const context = new Context();\n const code = filterCodeGen(query, 'data', context);\n const filter = new Function('data', `${context}\\nreturn ${code};`);\n return (data: T) => filter(data);\n};\n\nexport type SortType = 'asc' \| 'desc' \| 1 \| -1;\n\nexport type Sort<T> = T extends object\n ? {\n [K in keyof T]?: T[K] extends object ? Sort<T[K]> : SortType;\n }\n : SortType;\n\nconst SORT_EXPR = /^(asc\|desc\|1\|-1)$/i;\n\nconst SORT_MAP: Record<SortType, 1 \| -1> = {\n asc: 1,\n desc: -1,\n 1: 1,\n '-1': -1,\n};\n\nconst sortCodeGen = <T>(sort: Sort<T>, valuePath: [string, string]): string => {\n if (typeof sort === 'object' && sort !== null) {\n const condition = Object.entries(sort).map(([key, value]) => {\n const valueSubPathA = `${valuePath[0]}?.[${JSON.stringify(key)}]`;\n const valueSubPathB = `${valuePath[1]}?.[${JSON.stringify(key)}]`;\n return sortCodeGen(value, [valueSubPathA, valueSubPathB]);\n });\n if (condition.length > 0) {\n return condition.join(' \|\| ');\n }\n }\n if (typeof sort === 'string' && SORT_EXPR.test(sort)) {\n return `(${valuePath[0]}?.localeCompare(${valuePath[1]}) * ${SORT_MAP[sort as SortType]})`;\n }\n if (typeof sort === 'number' && SORT_EXPR.test('' + sort)) {\n return `((${valuePath[0]} - ${valuePath[1]}) * ${SORT_MAP[sort as SortType]})`;\n }\n return `0`;\n};\n\nexport const createSort = <T>(sort: Sort<T>) => {\n const code = sortCodeGen(sort, ['a', 'b']);\n const sortFn = new Function('a', 'b', `return ${code};`);\n return (a: T, b: T) => sortFn(a, b);\n};\n"],"names":["createFilter","createSort","stringify","value","undefined","RegExp","source","flags","JSON","conditions","$eq","valuePath","$ne","$gt","$gte","$lt","$lte","$in","context","name","register","$nin","$sub","$nsub","$sup","$nsup","$con","$ncon","$exists","$match","$nmatch","$bits","$nbits","$typeof","$ntypeof","operations","$and","join","$or","$nor","$not","Context","counter","values","cacheMap","Map","code","has","push","set","get","toString","filterCodeGen","query","condition","Object","entries","map","key","Array","isArray","v","valueSubPath","length","filter","Function","data","SORT_EXPR","SORT_MAP","asc","desc","sortCodeGen","sort","valueSubPathA","valueSubPathB","test","sortFn","a","b"],"mappings":"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"}

package/build/index.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
 export type Query<T> = {
     [P in keyof T]?: QueryCondition<T[P]>;
 } & Operations<T>;
-type QueryCondition<FieldType> = FieldType | Conditions<FieldType>;
-interface Conditions<ValueType> {
+export type QueryCondition<FieldType> = FieldType | Conditions<FieldType> | Operations<QueryCondition<FieldType>>;
+export interface Conditions<ValueType> {
     $eq?: ValueType;
     $ne?: ValueType;
     $gt?: ValueType;
@@ -11,25 +11,43 @@ interface Conditions<ValueType> {
     $lte?: ValueType;
     $in?: ValueType[];
     $nin?: ValueType[];
+    $sub?: ValueType[];
+    $nsub?: ValueType[];
+    $sup?: ValueType[];
+    $nsup?: ValueType[];
+    $con?: ValueType;
+    $ncon?: ValueType;
     $exists?: boolean;
     $match?: RegExp | string;
     $nmatch?: RegExp | string;
     $bits?: number;
     $nbits?: number;
+    $typeof: string;
+    $ntypeof: string;
 }
-interface Operations<T> {
+export type ConditionKeys = keyof Conditions<unknown>;
+export interface Operations<T> {
     $and?: Query<T>[];
     $or?: Query<T>[];
     $nor?: Query<T>[];
     $not?: Query<T>;
 }
-export declare const createQuery: <T extends object>(query: Query<T>, rootName: string) => (data: T) => any;
+export type OperationKeys = keyof Operations<unknown>;
+export declare const stringify: (value: unknown) => string;
+export interface Condition {
+    (valuePath: string, value: any, context: Context): string;
+}
+declare class Context {
+    private counter;
+    private values;
+    private cacheMap;
+    register(code: string): string;
+    toString(): string;
+}
+export declare const createFilter: <T extends object>(query?: Query<T>) => (data: T) => any;
 export type SortType = 'asc' | 'desc' | 1 | -1;
 export type Sort<T> = T extends object ? {
     [K in keyof T]?: T[K] extends object ? Sort<T[K]> : SortType;
 } : SortType;
-export declare const SORT_EXPR: RegExp;
-export declare const SORT_MAP: Record<SortType, 1 | -1>;
-export declare const sortCodeGen: <T>(sort: Sort<T>, valuePath: [string, string], path: string) => string;
-export declare const createSort: <T>(sort: Sort<T>, rootName: string) => (data: T) => any;
+export declare const createSort: <T>(sort: Sort<T>) => (a: T, b: T) => any;
 export {};

package/build/index.js CHANGED Viewed

@@ -1,3 +1,12 @@
+export const stringify = (value)=>{
+    if (value === undefined) {
+        return 'undefined';
+    }
+    if (value instanceof RegExp) {
+        return `/${value.source}/${value.flags}`;
+    }
+    return JSON.stringify(value);
+};
 const conditions = {
     $eq: (valuePath, value)=>`(${valuePath} === ${value})`,
     $ne: (valuePath, value)=>`(${valuePath} !== ${value})`,
@@ -5,58 +14,94 @@ const conditions = {
     $gte: (valuePath, value)=>`(${valuePath} >= ${value})`,
     $lt: (valuePath, value)=>`(${valuePath} < ${value})`,
     $lte: (valuePath, value)=>`(${valuePath} <= ${value})`,
-    $in: (valuePath, value)=>`(${value}.includes(${valuePath}))`,
-    $nin: (valuePath, value)=>`(!${value}.includes(${valuePath}))`,
+    $in: (valuePath, value, context)=>{
+        const name = context.register(`new Set(${value})`);
+        return `${name}.has(${valuePath})`;
+    },
+    $nin: (valuePath, value, context)=>`!${conditions.$in(valuePath, value, context)}`,
+    $sub: (valuePath, value, context)=>{
+        const name = context.register(`new Set(${value})`);
+        return `${valuePath}.every((value) => ${name}.has(value))`;
+    },
+    $nsub: (valuePath, value, context)=>`!${conditions.$sub(valuePath, value, context)}`,
+    $sup: (valuePath, value, context)=>{
+        const name = context.register(`new Set(${valuePath})`);
+        return `${value}.every((value) => ${name}.has(value))`;
+    },
+    $nsup: (valuePath, value, context)=>`!${conditions.$sup(valuePath, value, context)}`,
+    $con: (valuePath, value)=>`${valuePath}.includes(${value})`,
+    $ncon: (valuePath, value)=>`!${valuePath}.includes(${value})`,
     $exists: (valuePath, value)=>`((${valuePath} !== undefined && ${valuePath} !== null) === ${value})`,
     $match: (valuePath, value)=>`${value}.test('' + ${valuePath})`,
     $nmatch: (valuePath, value)=>`!${value}.test('' + ${valuePath})`,
     $bits: (valuePath, value)=>`((${valuePath} & ${value}) !== 0)`,
-    $nbits: (valuePath, value)=>`((${valuePath} & ${value}) === 0)`
+    $nbits: (valuePath, value)=>`((${valuePath} & ${value}) === 0)`,
+    $typeof: (valuePath, value)=>`(typeof ${valuePath} === ${value})`,
+    $ntypeof: (valuePath, value)=>`(typeof ${valuePath} !== ${value})`
 };
 const operations = {
     $and: (value)=>`(${value.join(' && ')})`,
     $or: (value)=>`(${value.join(' || ')})`,
-    $nor: (value)=>`(!(${value.join(' || ')}))`,
-    $not: (value)=>`(!(${value}))`
+    $nor: (value)=>`!(${value.join(' || ')})`,
+    $not: (value)=>`!(${value})`
 };
-const queryCodeGen = (query, valuePath, path)=>{
+class Context {
+    counter = 0;
+    values = [];
+    cacheMap = new Map();
+    register(code) {
+        if (!this.cacheMap.has(code)) {
+            const name = `v$$${this.counter++}`;
+            this.values.push(`const ${name} = ${code};`);
+            this.cacheMap.set(code, name);
+        }
+        return this.cacheMap.get(code);
+    }
+    toString() {
+        return this.values.join('\n');
+    }
+}
+const filterCodeGen = (query, valuePath, context)=>{
     if (typeof query === 'object' && query !== null) {
         const condition = Object.entries(query).map(([key, value])=>{
             if (key in conditions) {
-                return conditions[key](valuePath, JSON.stringify(value));
+                return conditions[key](valuePath, stringify(value), context);
             }
             if (key in operations) {
                 const values = Array.isArray(value) ? value : [
                     value
                 ];
-                return operations[key](values.map((value)=>queryCodeGen(value, valuePath, path)));
+                return operations[key](values.map((v)=>filterCodeGen(v, valuePath, context)));
             }
-            const valueSubPath = `${valuePath}?.[${JSON.stringify(key)}]`;
+            const valueSubPath = `${valuePath}?.[${stringify(key)}]`;
             if (value instanceof RegExp) {
-                return conditions.$match(valueSubPath, value.toString());
+                return conditions.$match(valueSubPath, value.toString(), context);
             }
             if (typeof value === 'object' && value !== null) {
-                return queryCodeGen(value, valueSubPath, path);
+                return filterCodeGen(value, valueSubPath, context);
             }
-            return conditions.$eq(valueSubPath, JSON.stringify(value));
+            return conditions.$eq(valueSubPath, JSON.stringify(value), context);
         });
-        return `${condition.join(' && ')}`;
+        if (condition.length > 0) {
+            return `${condition.join(' && ')}`;
+        }
     }
     return 'true';
 };
-export const createQuery = (query, rootName)=>{
-    const code = queryCodeGen(query, 'data', rootName);
-    const filter = new Function('data', `return ${code || 'true'};`);
+export const createFilter = (query)=>{
+    const context = new Context();
+    const code = filterCodeGen(query, 'data', context);
+    const filter = new Function('data', `${context}\nreturn ${code};`);
     return (data)=>filter(data);
 };
-export const SORT_EXPR = /^(asc|desc|1|-1)$/i;
-export const SORT_MAP = {
+const SORT_EXPR = /^(asc|desc|1|-1)$/i;
+const SORT_MAP = {
     asc: 1,
     desc: -1,
     1: 1,
     '-1': -1
 };
-export const sortCodeGen = (sort, valuePath, path)=>{
+const sortCodeGen = (sort, valuePath)=>{
     if (typeof sort === 'object' && sort !== null) {
         const condition = Object.entries(sort).map(([key, value])=>{
             const valueSubPathA = `${valuePath[0]}?.[${JSON.stringify(key)}]`;
@@ -64,9 +109,11 @@ export const sortCodeGen = (sort, valuePath, path)=>{
             return sortCodeGen(value, [
                 valueSubPathA,
                 valueSubPathB
-            ], path);
+            ]);
         });
-        return condition.join(' || ');
+        if (condition.length > 0) {
+            return condition.join(' || ');
+        }
     }
     if (typeof sort === 'string' && SORT_EXPR.test(sort)) {
         return `(${valuePath[0]}?.localeCompare(${valuePath[1]}) * ${SORT_MAP[sort]})`;
@@ -76,14 +123,13 @@ export const sortCodeGen = (sort, valuePath, path)=>{
     }
     return `0`;
 };
-export const createSort = (sort, rootName)=>{
+export const createSort = (sort)=>{
     const code = sortCodeGen(sort, [
         'a',
         'b'
-    ], rootName);
-    const filter = new Function('a', 'b', `return ${code || 0};`);
-    console.log(filter.toString());
-    return (data)=>filter(data);
+    ]);
+    const sortFn = new Function('a', 'b', `return ${code};`);
+    return (a, b)=>sortFn(a, b);
 };
 //# sourceMappingURL=index.js.map

package/build/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/index.ts"],"sourcesContent":["export type Query<T> = {\n [P in keyof T]?: QueryCondition<T[P]>;\n} & Operations<T>;\n\ntype QueryCondition<FieldType> =\n \| FieldType\n \| Conditions<FieldType>;\n\ninterface Conditions<ValueType> {\n $eq?: ValueType;\n $ne?: ValueType;\n $gt?: ValueType;\n $gte?: ValueType;\n $lt?: ValueType;\n $lte?: ValueType;\n $in?: ValueType[];\n $nin?: ValueType[];\n $exists?: boolean;\n $match?: RegExp \| string;\n $nmatch?: RegExp \| string;\n $bits?: number;\n $nbits?: number;\n};\n\ntype ConditionKeys = keyof Conditions<unknown>;\n\ninterface Operations<T> {\n $and?: Query<T>[];\n $or?: Query<T>[];\n $nor?: Query<T>[];\n $not?: Query<T>;\n};\n\ntype OperationKeys = keyof Operations<unknown>;\n\nconst conditions: Record<ConditionKeys, any> = {\n $eq: (valuePath: string, value: unknown) => `(${valuePath} === ${value})`,\n $ne: (valuePath: string, value: unknown) => `(${valuePath} !== ${value})`,\n $gt: (valuePath: string, value: unknown) => `(${valuePath} > ${value})`,\n $gte: (valuePath: string, value: unknown) => `(${valuePath} >= ${value})`,\n $lt: (valuePath: string, value: unknown) => `(${valuePath} < ${value})`,\n $lte: (valuePath: string, value: unknown) => `(${valuePath} <= ${value})`,\n $in: (valuePath: string, value: unknown) => `(${value}.includes(${valuePath}))`,\n $nin: (valuePath: string, value: unknown) => `(!${value}.includes(${valuePath}))`,\n $exists: (valuePath: string, value: unknown) => `((${valuePath} !== undefined && ${valuePath} !== null) === ${value})`,\n $match: (valuePath: string, value: unknown) => `${value}.test('' + ${valuePath})`,\n $nmatch: (valuePath: string, value: unknown) => `!${value}.test('' + ${valuePath})`,\n $bits: (valuePath: string, value: unknown) => `((${valuePath} & ${value}) !== 0)`,\n $nbits: (valuePath: string, value: unknown) => `((${valuePath} & ${value}) === 0)`,\n};\n\nconst operations: Record<keyof Operations<unknown>, any> = {\n $and: (value: unknown[]) => `(${value.join(' && ')})`,\n $or: (value: unknown[]) => `(${value.join(' \|\| ')})`,\n $nor: (value: unknown[]) => `(!(${value.join(' \|\| ')}))`,\n $not: (value: unknown) => `(!(${value}))`,\n}\n\n\nconst queryCodeGen = <T extends object>(query: Query<T>, valuePath: string, path: string): string => {\n if (typeof query === 'object' && query !== null) {\n const condition = Object.entries(query).map(([key, value]) => {\n if (key in conditions) {\n return conditions[key as ConditionKeys](valuePath, JSON.stringify(value));\n }\n if (key in operations) {\n const values = Array.isArray(value) ? value : [value];\n return operations[key as OperationKeys](values.map((value) => queryCodeGen(value, valuePath, path)));\n }\n const valueSubPath = `${valuePath}?.[${JSON.stringify(key)}]`;\n if (value instanceof RegExp) {\n return conditions.$match(valueSubPath, value.toString());\n }\n if (typeof value === 'object' && value !== null) {\n return queryCodeGen(value, valueSubPath, path);\n }\n return conditions.$eq(valueSubPath, JSON.stringify(value));\n });\n\n return `${condition.join(' && ')}`;\n }\n return 'true';\n}\n\nexport const createQuery = <T extends object>(query: Query<T>, rootName: string) => {\n const code = queryCodeGen(query, 'data', rootName);\n const filter = new Function('data', `return ${code \|\| 'true'};`);\n return (data: T) => filter(data);\n};\n\nexport type SortType = 'asc' \| 'desc' \| 1 \| -1;\n\nexport type Sort<T> = T extends object\n ? {\n [K in keyof T]?: T[K] extends object ? Sort<T[K]> : SortType;\n }\n : SortType;\n\nexport const SORT_EXPR = /^(asc\|desc\|1\|-1)$/i\n\nexport const SORT_MAP: Record<SortType, 1 \| -1> = {\n asc: 1,\n desc: -1,\n 1: 1,\n '-1': -1,\n};\n\nexport const sortCodeGen = <T>(sort: Sort<T>, valuePath: [string, string], path: string): string => {\n if (typeof sort === 'object' && sort !== null) {\n const condition = Object.entries(sort).map(([key, value]) => {\n const valueSubPathA = `${valuePath[0]}?.[${JSON.stringify(key)}]`;\n const valueSubPathB = `${valuePath[1]}?.[${JSON.stringify(key)}]`;\n return sortCodeGen(value, [valueSubPathA, valueSubPathB], path);\n });\n return condition.join(' \|\| ');\n }\n if (typeof sort === 'string' && SORT_EXPR.test(sort)) {\n return `(${valuePath[0]}?.localeCompare(${valuePath[1]}) * ${SORT_MAP[sort as SortType]})`;\n }\n if (typeof sort === 'number' && SORT_EXPR.test('' + sort)) {\n return `((${valuePath[0]} - ${valuePath[1]}) * ${SORT_MAP[sort as SortType]})`;\n }\n return `0`;\n};\n\nexport const createSort = <T>(sort: Sort<T>, rootName: string) => {\n const code = sortCodeGen(sort, ['a', 'b'], rootName);\n const filter = new Function('a', 'b', `return ${code \|\| 0};`);\n console.log(filter.toString());\n return (data: T) => filter(data);\n};\n"],"names":["conditions","$eq","valuePath","value","$ne","$gt","$gte","$lt","$lte","$in","$nin","$exists","$match","$nmatch","$bits","$nbits","operations","$and","join","$or","$nor","$not","queryCodeGen","query","path","condition","Object","entries","map","key","JSON","stringify","values","Array","isArray","valueSubPath","RegExp","toString","createQuery","rootName","code","filter","Function","data","SORT_EXPR","SORT_MAP","asc","desc","sortCodeGen","sort","valueSubPathA","valueSubPathB","test","createSort","console","log"],"mappings":"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"}
1	+ {"version":3,"sources":["../src/index.ts"],"sourcesContent":["export type Query<T> = {\n [P in keyof T]?: QueryCondition<T[P]>;\n} & Operations<T>;\n\nexport type QueryCondition<FieldType> = FieldType \| Conditions<FieldType> \| Operations<QueryCondition<FieldType>>;\n\nexport interface Conditions<ValueType> {\n $eq?: ValueType;\n $ne?: ValueType;\n $gt?: ValueType;\n $gte?: ValueType;\n $lt?: ValueType;\n $lte?: ValueType;\n $in?: ValueType[];\n $nin?: ValueType[];\n $sub?: ValueType[];\n $nsub?: ValueType[];\n $sup?: ValueType[];\n $nsup?: ValueType[];\n $con?: ValueType;\n $ncon?: ValueType;\n $exists?: boolean;\n $match?: RegExp \| string;\n $nmatch?: RegExp \| string;\n $bits?: number;\n $nbits?: number;\n $typeof: string;\n $ntypeof: string;\n}\n\nexport type ConditionKeys = keyof Conditions<unknown>;\n\nexport interface Operations<T> {\n $and?: Query<T>[];\n $or?: Query<T>[];\n $nor?: Query<T>[];\n $not?: Query<T>;\n}\n\nexport type OperationKeys = keyof Operations<unknown>;\n\nexport const stringify = (value: unknown) => {\n if (value === undefined) {\n return 'undefined';\n }\n if (value instanceof RegExp) {\n return `/${value.source}/${value.flags}`;\n }\n return JSON.stringify(value);\n};\n\nexport interface Condition {\n (valuePath: string, value: any, context: Context): string;\n}\n\nconst conditions: Record<ConditionKeys, Condition> = {\n $eq: (valuePath: string, value: unknown) => `(${valuePath} === ${value})`,\n $ne: (valuePath: string, value: unknown) => `(${valuePath} !== ${value})`,\n $gt: (valuePath: string, value: unknown) => `(${valuePath} > ${value})`,\n $gte: (valuePath: string, value: unknown) => `(${valuePath} >= ${value})`,\n $lt: (valuePath: string, value: unknown) => `(${valuePath} < ${value})`,\n $lte: (valuePath: string, value: unknown) => `(${valuePath} <= ${value})`,\n $in: (valuePath: string, value: unknown, context: Context) => {\n const name = context.register(`new Set(${value})`);\n return `${name}.has(${valuePath})`;\n },\n $nin: (valuePath: string, value: unknown, context: Context) => `!${conditions.$in(valuePath, value, context)}`,\n $sub: (valuePath: string, value: unknown, context: Context) => {\n const name = context.register(`new Set(${value})`);\n return `${valuePath}.every((value) => ${name}.has(value))`;\n },\n $nsub: (valuePath: string, value: unknown, context: Context) => `!${conditions.$sub(valuePath, value, context)}`,\n $sup: (valuePath: string, value: unknown, context: Context) => {\n const name = context.register(`new Set(${valuePath})`);\n return `${value}.every((value) => ${name}.has(value))`;\n },\n $nsup: (valuePath: string, value: unknown, context: Context) => `!${conditions.$sup(valuePath, value, context)}`,\n $con: (valuePath: string, value: unknown) => `${valuePath}.includes(${value})`,\n $ncon: (valuePath: string, value: unknown) => `!${valuePath}.includes(${value})`,\n $exists: (valuePath: string, value: boolean) => `((${valuePath} !== undefined && ${valuePath} !== null) === ${value})`,\n $match: (valuePath: string, value: RegExp) => `${value}.test('' + ${valuePath})`,\n $nmatch: (valuePath: string, value: RegExp) => `!${value}.test('' + ${valuePath})`,\n $bits: (valuePath: string, value: unknown) => `((${valuePath} & ${value}) !== 0)`,\n $nbits: (valuePath: string, value: unknown) => `((${valuePath} & ${value}) === 0)`,\n $typeof: (valuePath: string, value: unknown) => `(typeof ${valuePath} === ${value})`,\n $ntypeof: (valuePath: string, value: unknown) => `(typeof ${valuePath} !== ${value})`,\n};\n\nconst operations: Record<keyof Operations<unknown>, any> = {\n $and: (value: unknown[]) => `(${value.join(' && ')})`,\n $or: (value: unknown[]) => `(${value.join(' \|\| ')})`,\n $nor: (value: unknown[]) => `!(${value.join(' \|\| ')})`,\n $not: (value: unknown[]) => `!(${value})`,\n};\n\nclass Context {\n private counter = 0;\n private values: string[] = [];\n private cacheMap = new Map<string, string>();\n\n register(code: string) {\n if (!this.cacheMap.has(code)) {\n const name = `v$$${this.counter++}`;\n this.values.push(`const ${name} = ${code};`);\n this.cacheMap.set(code, name);\n }\n return this.cacheMap.get(code)!;\n }\n toString() {\n return this.values.join('\\n');\n }\n}\n\nconst filterCodeGen = <T extends object>(query: Query<T> \| undefined, valuePath: string, context: Context): string => {\n if (typeof query === 'object' && query !== null) {\n const condition = Object.entries(query).map(([key, value]) => {\n if (key in conditions) {\n return conditions[key as ConditionKeys](valuePath, stringify(value), context);\n }\n if (key in operations) {\n const values = Array.isArray(value) ? value : [value];\n return operations[key as OperationKeys](values.map((v) => filterCodeGen(v, valuePath, context)));\n }\n const valueSubPath = `${valuePath}?.[${stringify(key)}]`;\n if (value instanceof RegExp) {\n return conditions.$match(valueSubPath, value.toString(), context);\n }\n if (typeof value === 'object' && value !== null) {\n return filterCodeGen(value, valueSubPath, context);\n }\n return conditions.$eq(valueSubPath, JSON.stringify(value), context);\n });\n if (condition.length > 0) {\n return `${condition.join(' && ')}`;\n }\n }\n return 'true';\n};\n\nexport const createFilter = <T extends object>(query?: Query<T>) => {\n const context = new Context();\n const code = filterCodeGen(query, 'data', context);\n const filter = new Function('data', `${context}\\nreturn ${code};`);\n return (data: T) => filter(data);\n};\n\nexport type SortType = 'asc' \| 'desc' \| 1 \| -1;\n\nexport type Sort<T> = T extends object\n ? {\n [K in keyof T]?: T[K] extends object ? Sort<T[K]> : SortType;\n }\n : SortType;\n\nconst SORT_EXPR = /^(asc\|desc\|1\|-1)$/i;\n\nconst SORT_MAP: Record<SortType, 1 \| -1> = {\n asc: 1,\n desc: -1,\n 1: 1,\n '-1': -1,\n};\n\nconst sortCodeGen = <T>(sort: Sort<T>, valuePath: [string, string]): string => {\n if (typeof sort === 'object' && sort !== null) {\n const condition = Object.entries(sort).map(([key, value]) => {\n const valueSubPathA = `${valuePath[0]}?.[${JSON.stringify(key)}]`;\n const valueSubPathB = `${valuePath[1]}?.[${JSON.stringify(key)}]`;\n return sortCodeGen(value, [valueSubPathA, valueSubPathB]);\n });\n if (condition.length > 0) {\n return condition.join(' \|\| ');\n }\n }\n if (typeof sort === 'string' && SORT_EXPR.test(sort)) {\n return `(${valuePath[0]}?.localeCompare(${valuePath[1]}) * ${SORT_MAP[sort as SortType]})`;\n }\n if (typeof sort === 'number' && SORT_EXPR.test('' + sort)) {\n return `((${valuePath[0]} - ${valuePath[1]}) * ${SORT_MAP[sort as SortType]})`;\n }\n return `0`;\n};\n\nexport const createSort = <T>(sort: Sort<T>) => {\n const code = sortCodeGen(sort, ['a', 'b']);\n const sortFn = new Function('a', 'b', `return ${code};`);\n return (a: T, b: T) => sortFn(a, b);\n};\n"],"names":["stringify","value","undefined","RegExp","source","flags","JSON","conditions","$eq","valuePath","$ne","$gt","$gte","$lt","$lte","$in","context","name","register","$nin","$sub","$nsub","$sup","$nsup","$con","$ncon","$exists","$match","$nmatch","$bits","$nbits","$typeof","$ntypeof","operations","$and","join","$or","$nor","$not","Context","counter","values","cacheMap","Map","code","has","push","set","get","toString","filterCodeGen","query","condition","Object","entries","map","key","Array","isArray","v","valueSubPath","length","createFilter","filter","Function","data","SORT_EXPR","SORT_MAP","asc","desc","sortCodeGen","sort","valueSubPathA","valueSubPathB","test","createSort","sortFn","a","b"],"mappings":"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"}

package/eslint.config.mjs ADDED Viewed

@@ -0,0 +1,79 @@
+import prettier from "eslint-plugin-prettier";
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import tsParser from "@typescript-eslint/parser";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+export default [{
+    ignores: [
+        "**/docs",
+        "**/build",
+        "**/coverage",
+        "**/node_modules",
+        "**/scripts",
+        "src/*.tmp.ts",
+        "src/__tests__/*",
+    ],
+}, ...compat.extends("eslint-config-airbnb-base").map(config => ({
+    ...config,
+    files: ["**/*.js"],
+})), {
+    files: ["**/*.js"],
+    plugins: {
+        prettier,
+    },
+    languageOptions: {
+        globals: {},
+    },
+    rules: {
+        "prettier/prettier": "error",
+    },
+}, ...compat.extends(
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended",
+).map(config => ({
+    ...config,
+    files: ["**/*.ts"],
+})), {
+    files: ["**/*.ts"],
+    plugins: {
+        "@typescript-eslint": typescriptEslint,
+        prettier,
+    },
+    languageOptions: {
+        globals: {},
+        parser: tsParser,
+        ecmaVersion: 5,
+        sourceType: "script",
+        parserOptions: {
+            project: "./tsconfig.json",
+        },
+    },
+    rules: {
+        "prettier/prettier": "error",
+        "@typescript-eslint/no-explicit-any": 0,
+        "@typescript-eslint/no-floating-promises": 1,
+        "@typescript-eslint/no-unused-vars": 2,
+        "@typescript-eslint/no-unsafe-declaration-merging": 0,
+        "@typescript-eslint/ban-ts-comment": 1,
+        "@typescript-eslint/ban-types": 0,
+        "@typescript-eslint/no-empty-object-type": 0
+    },
+}];

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "ajoq",
-  "version": "0.0.2-0",
+  "version": "0.0.3",
   "description": "",
   "type": "module",
   "types": "build/index.d.ts",
@@ -14,12 +14,27 @@
   "author": "Ivan Zakharchanka",
   "license": "MIT",
   "devDependencies": {
+    "@swc/jest": "^0.2.37",
+    "@types/jest": "^29.5.14",
     "@types/node": "^22.10.0",
+    "@typescript-eslint/eslint-plugin": "^8.16.0",
+    "@typescript-eslint/parser": "^8.16.0",
+    "@typescript-eslint/typescript-estree": "^8.16.0",
+    "eslint": "^9.15.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "husky": "^9.1.7",
     "inop": "^0.7.4",
+    "jest": "^29.7.0",
+    "prettier": "^3.4.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.7.2"
   },
   "scripts": {
-    "build": "rm -rf build && NODE_ENV=production inop src/ build -i __tests__ && tsc --declaration --emitDeclarationOnly"
+    "build": "rm -rf build && NODE_ENV=production inop src/ build -i __tests__ && tsc --declaration --emitDeclarationOnly",
+    "test": "jest",
+    "lint": "eslint src"
   }
 }

package/src/index.ts CHANGED Viewed

@@ -2,11 +2,9 @@ export type Query<T> = {
   [P in keyof T]?: QueryCondition<T[P]>;
 } & Operations<T>;
-type QueryCondition<FieldType> =
-  | FieldType
-  | Conditions<FieldType>;
+export type QueryCondition<FieldType> = FieldType | Conditions<FieldType> | Operations<QueryCondition<FieldType>>;
-interface Conditions<ValueType> {
+export interface Conditions<ValueType> {
   $eq?: ValueType;
   $ne?: ValueType;
   $gt?: ValueType;
@@ -15,76 +13,134 @@ interface Conditions<ValueType> {
   $lte?: ValueType;
   $in?: ValueType[];
   $nin?: ValueType[];
+  $sub?: ValueType[];
+  $nsub?: ValueType[];
+  $sup?: ValueType[];
+  $nsup?: ValueType[];
+  $con?: ValueType;
+  $ncon?: ValueType;
   $exists?: boolean;
   $match?: RegExp | string;
   $nmatch?: RegExp | string;
   $bits?: number;
   $nbits?: number;
-};
+  $typeof: string;
+  $ntypeof: string;
+}
-type ConditionKeys = keyof Conditions<unknown>;
+export type ConditionKeys = keyof Conditions<unknown>;
-interface Operations<T> {
+export interface Operations<T> {
   $and?: Query<T>[];
   $or?: Query<T>[];
   $nor?: Query<T>[];
   $not?: Query<T>;
+}
+export type OperationKeys = keyof Operations<unknown>;
+export const stringify = (value: unknown) => {
+  if (value === undefined) {
+    return 'undefined';
+  }
+  if (value instanceof RegExp) {
+    return `/${value.source}/${value.flags}`;
+  }
+  return JSON.stringify(value);
 };
-type OperationKeys = keyof Operations<unknown>;
+export interface Condition {
+  (valuePath: string, value: any, context: Context): string;
+}
-const conditions: Record<ConditionKeys, any> = {
+const conditions: Record<ConditionKeys, Condition> = {
   $eq: (valuePath: string, value: unknown) => `(${valuePath} === ${value})`,
   $ne: (valuePath: string, value: unknown) => `(${valuePath} !== ${value})`,
   $gt: (valuePath: string, value: unknown) => `(${valuePath} > ${value})`,
   $gte: (valuePath: string, value: unknown) => `(${valuePath} >= ${value})`,
   $lt: (valuePath: string, value: unknown) => `(${valuePath} < ${value})`,
   $lte: (valuePath: string, value: unknown) => `(${valuePath} <= ${value})`,
-  $in: (valuePath: string, value: unknown) => `(${value}.includes(${valuePath}))`,
-  $nin: (valuePath: string, value: unknown) => `(!${value}.includes(${valuePath}))`,
-  $exists: (valuePath: string, value: unknown) => `((${valuePath} !== undefined && ${valuePath} !== null) === ${value})`,
-  $match: (valuePath: string, value: unknown) => `${value}.test('' + ${valuePath})`,
-  $nmatch: (valuePath: string, value: unknown) => `!${value}.test('' + ${valuePath})`,
+  $in: (valuePath: string, value: unknown, context: Context) => {
+    const name = context.register(`new Set(${value})`);
+    return `${name}.has(${valuePath})`;
+  },
+  $nin: (valuePath: string, value: unknown, context: Context) => `!${conditions.$in(valuePath, value, context)}`,
+  $sub: (valuePath: string, value: unknown, context: Context) => {
+    const name = context.register(`new Set(${value})`);
+    return `${valuePath}.every((value) => ${name}.has(value))`;
+  },
+  $nsub: (valuePath: string, value: unknown, context: Context) => `!${conditions.$sub(valuePath, value, context)}`,
+  $sup: (valuePath: string, value: unknown, context: Context) => {
+    const name = context.register(`new Set(${valuePath})`);
+    return `${value}.every((value) => ${name}.has(value))`;
+  },
+  $nsup: (valuePath: string, value: unknown, context: Context) => `!${conditions.$sup(valuePath, value, context)}`,
+  $con: (valuePath: string, value: unknown) => `${valuePath}.includes(${value})`,
+  $ncon: (valuePath: string, value: unknown) => `!${valuePath}.includes(${value})`,
+  $exists: (valuePath: string, value: boolean) => `((${valuePath} !== undefined && ${valuePath} !== null) === ${value})`,
+  $match: (valuePath: string, value: RegExp) => `${value}.test('' + ${valuePath})`,
+  $nmatch: (valuePath: string, value: RegExp) => `!${value}.test('' + ${valuePath})`,
   $bits: (valuePath: string, value: unknown) => `((${valuePath} & ${value}) !== 0)`,
   $nbits: (valuePath: string, value: unknown) => `((${valuePath} & ${value}) === 0)`,
+  $typeof: (valuePath: string, value: unknown) => `(typeof ${valuePath} === ${value})`,
+  $ntypeof: (valuePath: string, value: unknown) => `(typeof ${valuePath} !== ${value})`,
 };
 const operations: Record<keyof Operations<unknown>, any> = {
   $and: (value: unknown[]) => `(${value.join(' && ')})`,
   $or: (value: unknown[]) => `(${value.join(' || ')})`,
-  $nor: (value: unknown[]) => `(!(${value.join(' || ')}))`,
-  $not: (value: unknown) => `(!(${value}))`,
-}
+  $nor: (value: unknown[]) => `!(${value.join(' || ')})`,
+  $not: (value: unknown[]) => `!(${value})`,
+};
+class Context {
+  private counter = 0;
+  private values: string[] = [];
+  private cacheMap = new Map<string, string>();
+  register(code: string) {
+    if (!this.cacheMap.has(code)) {
+      const name = `v$$${this.counter++}`;
+      this.values.push(`const ${name} = ${code};`);
+      this.cacheMap.set(code, name);
+    }
+    return this.cacheMap.get(code)!;
+  }
+  toString() {
+    return this.values.join('\n');
+  }
+}
-const queryCodeGen = <T extends object>(query: Query<T>, valuePath: string, path: string): string => {
+const filterCodeGen = <T extends object>(query: Query<T> | undefined, valuePath: string, context: Context): string => {
   if (typeof query === 'object' && query !== null) {
     const condition = Object.entries(query).map(([key, value]) => {
       if (key in conditions) {
-        return conditions[key as ConditionKeys](valuePath, JSON.stringify(value));
+        return conditions[key as ConditionKeys](valuePath, stringify(value), context);
       }
       if (key in operations) {
         const values = Array.isArray(value) ? value : [value];
-        return operations[key as OperationKeys](values.map((value) => queryCodeGen(value, valuePath, path)));
+        return operations[key as OperationKeys](values.map((v) => filterCodeGen(v, valuePath, context)));
       }
-      const valueSubPath = `${valuePath}?.[${JSON.stringify(key)}]`;
+      const valueSubPath = `${valuePath}?.[${stringify(key)}]`;
       if (value instanceof RegExp) {
-        return conditions.$match(valueSubPath, value.toString());
+        return conditions.$match(valueSubPath, value.toString(), context);
       }
       if (typeof value === 'object' && value !== null) {
-        return queryCodeGen(value, valueSubPath, path);
+        return filterCodeGen(value, valueSubPath, context);
       }
-      return conditions.$eq(valueSubPath, JSON.stringify(value));
+      return conditions.$eq(valueSubPath, JSON.stringify(value), context);
     });
-    return `${condition.join(' && ')}`;
+    if (condition.length > 0) {
+      return `${condition.join(' && ')}`;
+    }
   }
   return 'true';
-}
+};
-export const createQuery = <T extends object>(query: Query<T>, rootName: string) => {
-  const code = queryCodeGen(query, 'data', rootName);
-  const filter = new Function('data', `return ${code || 'true'};`);
+export const createFilter = <T extends object>(query?: Query<T>) => {
+  const context = new Context();
+  const code = filterCodeGen(query, 'data', context);
+  const filter = new Function('data', `${context}\nreturn ${code};`);
   return (data: T) => filter(data);
 };
@@ -92,27 +148,29 @@ export type SortType = 'asc' | 'desc' | 1 | -1;
 export type Sort<T> = T extends object
   ? {
-    [K in keyof T]?: T[K] extends object ? Sort<T[K]> : SortType;
-  }
+      [K in keyof T]?: T[K] extends object ? Sort<T[K]> : SortType;
+    }
   : SortType;
-export const SORT_EXPR = /^(asc|desc|1|-1)$/i
+const SORT_EXPR = /^(asc|desc|1|-1)$/i;
-export const SORT_MAP: Record<SortType, 1 | -1> = {
+const SORT_MAP: Record<SortType, 1 | -1> = {
   asc: 1,
   desc: -1,
   1: 1,
   '-1': -1,
 };
-export const sortCodeGen = <T>(sort: Sort<T>, valuePath: [string, string], path: string): string => {
+const sortCodeGen = <T>(sort: Sort<T>, valuePath: [string, string]): string => {
   if (typeof sort === 'object' && sort !== null) {
     const condition = Object.entries(sort).map(([key, value]) => {
       const valueSubPathA = `${valuePath[0]}?.[${JSON.stringify(key)}]`;
       const valueSubPathB = `${valuePath[1]}?.[${JSON.stringify(key)}]`;
-      return sortCodeGen(value, [valueSubPathA, valueSubPathB], path);
+      return sortCodeGen(value, [valueSubPathA, valueSubPathB]);
     });
-    return condition.join(' || ');
+    if (condition.length > 0) {
+      return condition.join(' || ');
+    }
   }
   if (typeof sort === 'string' && SORT_EXPR.test(sort)) {
     return `(${valuePath[0]}?.localeCompare(${valuePath[1]}) * ${SORT_MAP[sort as SortType]})`;
@@ -123,9 +181,8 @@ export const sortCodeGen = <T>(sort: Sort<T>, valuePath: [string, string], path:
   return `0`;
 };
-export const createSort = <T>(sort: Sort<T>, rootName: string) => {
-  const code = sortCodeGen(sort, ['a', 'b'], rootName);
-  const filter = new Function('a', 'b', `return ${code || 0};`);
-  console.log(filter.toString());
-  return (data: T) => filter(data);
+export const createSort = <T>(sort: Sort<T>) => {
+  const code = sortCodeGen(sort, ['a', 'b']);
+  const sortFn = new Function('a', 'b', `return ${code};`);
+  return (a: T, b: T) => sortFn(a, b);
 };

package/.prettierrc DELETED Viewed

@@ -1,7 +0,0 @@
-{
-  "tabWidth": 2,
-  "useTabs": false,
-  "semi": true,
-  "singleQuote": true,
-  "printWidth": 160
-}

package/tsconfig.json DELETED Viewed

@@ -1,22 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/tsconfig",
-  "compilerOptions": {
-    "strict": true,
-    "target": "ESNext",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
-    "declaration": true,
-    "esModuleInterop": true,
-    "lib": ["ESNext"],
-    "rootDir": "src",
-    "outDir": "build"
-  },
-  "include": [
-    "src/**/*.ts"
-, "src/__benchmark__/index.js"  ],
-  "exclude": [
-    "**/__tests__",
-    "node_modules",
-    "**/*.tmp.ts"
-  ]
-}