@omegup/msync 0.0.47 → 0.0.48

package/index.d.ts

@@ -27,7 +27,6 @@ declare const Predicate: unique symbol;
 interface Predicate<in V> {
     [Type]?(x: typeof Predicate, _: V): void;
     raw: PredicateRaw;
-    expr: <D extends O, C>(field: Field<D, V, C>) => Expr<boolean, D, C>;
 }
 
 declare class Field<in R, out V, in C = unknown> {
@@ -629,14 +628,23 @@ declare const wrap: <Result>(root: Machine<Result>) => Machine<Result>;
 declare const $eq: <T extends unknown>(operand: rawItem & T) => Predicate<T>;
 declare const $ne: <T extends unknown>(operand: rawItem & T) => Predicate<T>;
 type Numeric = number | Timestamp | Date;
-declare const comp: <D2 extends Numeric = number>(op: "$lte" | "$gte" | "$lt" | "$gt") => <T extends D2>(operand: rawItem & D2) => Predicate<D2>;
-declare const $gt: <T extends number>(operand: rawItem & number) => Predicate<number>;
-declare const $gtTs: <T extends Timestamp>(operand: rawItem & Timestamp) => Predicate<Timestamp>;
-declare const $gteTs: <T extends Timestamp>(operand: rawItem & Timestamp) => Predicate<Timestamp>;
-declare const $lt: <T extends number>(operand: rawItem & number) => Predicate<number>;
-declare const dateLt: <T extends Date>(operand: rawItem & Date) => Predicate<Date>;
-declare const $gte: <T extends number>(operand: rawItem & number) => Predicate<number>;
-declare const $lte: <T extends number>(operand: rawItem & number) => Predicate<number>;
+declare const comp: <D2 extends Numeric = Numeric>(op: "$lte" | "$gte" | "$lt" | "$gt") => <T extends Numeric>(operand: rawItem & D2) => Predicate<D2>;
+declare const $gt: <T extends Numeric>(operand: rawItem & Numeric) => Predicate<Numeric>;
+declare const $gtTs: <T extends Numeric>(operand: rawItem & Timestamp) => Predicate<Timestamp>;
+declare const $gteTs: <T extends Numeric>(operand: rawItem & Timestamp) => Predicate<Timestamp>;
+declare const $lt: <T extends Numeric>(operand: rawItem & number) => Predicate<number>;
+declare const dateLt: <T extends Numeric>(operand: rawItem & Date) => Predicate<Date>;
+declare const $gte: <T extends Numeric>(operand: rawItem & number) => Predicate<number>;
+declare const $lte: <T extends Numeric>(operand: rawItem & number) => Predicate<number>;
+type MongoTypes = {
+    number: number;
+    array: readonly rawItem[];
+    string: string;
+    object: RawObj;
+    [i: number]: unknown;
+};
+type MongoTypeNames = keyof MongoTypes;
+declare const $type: <T extends keyof MongoTypes>(operand: rawItem & readonly T[]) => Predicate<N | MongoTypes[T]>;
 
 declare const $expr: <D extends O, C>(expr: Expr<boolean, D, C>) => Query<D, C>;
 
@@ -667,4 +675,4 @@ declare const enablePreAndPostImages: <T extends doc>(coll: Collection<T>) => Pr
 declare const prepare: (testName?: string) => Promise<MongoClient$1>;
 declare const makeCol: <T extends ID>(docs: readonly OptionalUnlessRequiredId<T>[], database: Db, name?: string) => Promise<Collection<T>>;
 
-export { $accumulator, $and, $countDict, $entries, $eq, $expr, $getField, $group, $groupId, $groupMerge, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $replaceWith, $set, $simpleInsert, $simpleMerge, $sum, $unwind, $unwindDelta, type Accumulators, type Arr, type AsLiteral, type Delta, type DeltaAccumulator, type DeltaAccumulators, Expr, type ExprHKT, type Exprs, type ExprsExact, type ExprsExactHKT, type ExprsPart, Field, type ID, type Loose, Machine, type Merge, type MergeArgs, type MergeInto, type MergeMapOArgs, type Model, type N, type NoRaw, type NullToOBJ, type O, type OPick, type OPickD, type RONoRaw, type RORec, type RawStages, type Rec, type Replace, type SnapshotStreamExecutionResult, type StrKey, type Strict, type TS, Type, type WriteonlyCollection, add, and, array, ceil, comp, concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, type doc, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first, firstSure, floor, from, func, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, type notArr, notNull, now, or, pair, prepare, rand, range, root, set, setField, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };
+export { $accumulator, $and, $countDict, $entries, $eq, $expr, $getField, $group, $groupId, $groupMerge, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $replaceWith, $set, $simpleInsert, $simpleMerge, $sum, $type, $unwind, $unwindDelta, type Accumulators, type Arr, type AsLiteral, type Delta, type DeltaAccumulator, type DeltaAccumulators, Expr, type ExprHKT, type Exprs, type ExprsExact, type ExprsExactHKT, type ExprsPart, Field, type ID, type Loose, Machine, type Merge, type MergeArgs, type MergeInto, type MergeMapOArgs, type Model, type MongoTypeNames, type N, type NoRaw, type NullToOBJ, type O, type OPick, type OPickD, type RONoRaw, type RORec, type RawStages, type Rec, type Replace, type SnapshotStreamExecutionResult, type StrKey, type Strict, type TS, Type, type WriteonlyCollection, add, and, array, ceil, comp, concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, type doc, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first, firstSure, floor, from, func, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, type notArr, notNull, now, or, pair, prepare, rand, range, root, set, setField, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };

package/index.esm.js

@@ -885,9 +885,6 @@ const $map = (ex, map) => $map1(ex, i => map(i.expr()));
 const operator = () => (op) => (operand) => {
     return {
         raw: { [op]: operand },
-        expr: (field) => asExpr({
-            raw: f => asExprRaw({ [op]: [$ifNull(field.expr(), nil).raw(f).get(), operand] }),
-        }),
     };
 };
 
@@ -902,6 +899,7 @@ const $lt = comp('$lt');
 const dateLt = comp('$lt');
 const $gte = comp('$gte');
 const $lte = comp('$lte');
+const $type = operator()('$type');
 
 const $expr = (expr) => ({
     raw: f => ({ $expr: expr.raw(f).get() }),
@@ -1484,8 +1482,14 @@ const executes$1 = (view, input, streamName) => {
         streamNames[streamName] = hash;
     else if (streamNames[streamName] != hash)
         throw new Error(`streamName ${streamName} already used`);
-    const { collection, projection, hardMatch, match } = view;
-    const removeNotYetSynchronizedFields = Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($ne(null)) : null));
+    const { collection, projection, hardMatch: pre, match } = view;
+    const types = Array.from({ length: 19 }).map((_, i) => i + 1);
+    const removeNotYetSynchronizedFields = Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_')
+        ? root()
+            .of(k)
+            .has($type(types.filter(x => x != 10)))
+        : null));
+    const hardMatch = $and(pre, ...removeNotYetSynchronizedFields);
     const job = {};
     const db = collection.s.db, coll = collection.collectionName;
     db.command({
@@ -1569,7 +1573,7 @@ const executes$1 = (view, input, streamName) => {
         const step3 = (lastTS) => async () => {
             const hardQuery = $and(lastTS
                 ? root().of('touchedAt').has($gteTs(lastTS.ts))
-                : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), hardMatch, ...removeNotYetSynchronizedFields);
+                : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), hardMatch);
             const notDeleted = eq($ifNull(root().of('deletedAt').expr(), nil))(nil);
             const query = match ? and(notDeleted, match) : notDeleted;
             const replaceRaw = $replaceWith_(field({
@@ -1806,4 +1810,4 @@ const makeCol = async (docs, database, name) => {
     }
 };
 
-export { $accumulator, $and, $countDict, $entries, $eq, $expr, $getField, $group, $groupId, $groupMerge, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $replaceWith, $set, $simpleInsert, $simpleMerge, $sum, $unwind, $unwindDelta, Field, Machine, add, and, array, ceil, comp, concat$1 as concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first$1 as first, firstSure, floor, from, func, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, notNull, now, or, pair, prepare, rand, range, root, set, setField, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };
+export { $accumulator, $and, $countDict, $entries, $eq, $expr, $getField, $group, $groupId, $groupMerge, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $insert, $insertX, $keys, $let, $lookup, $lt, $lte, $map, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $outerLookup, $pushDict, $rand, $replaceWith, $set, $simpleInsert, $simpleMerge, $sum, $type, $unwind, $unwindDelta, Field, Machine, add, and, array, ceil, comp, concat$1 as concat, concatArray, createIndex, ctx, current, dateAdd, dateDiff, dateLt, datePart, dayAndMonthPart, divide, enablePreAndPostImages, eq, eqTyped, except, exprMapVal, field, fieldF, fieldM, filter, filterDefined, first$1 as first, firstSure, floor, from, func, gt, gte, inArray, isArray, ite, last, log, lt, lte, makeCol, map1, mapVal, max, maxDate, mergeExact, mergeExact0, mergeExpr, mergeObjects, minDate, monthPart, multiply, ne, nil, noop, notNull, now, or, pair, prepare, rand, range, root, set, setField, size, slice, sortArray, staging, startOf, str, sub, subtract, to, toInt, val, weekPart, wrap, year };

package/index.js

@@ -887,9 +887,6 @@ const $map = (ex, map) => $map1(ex, i => map(i.expr()));
 const operator = () => (op) => (operand) => {
     return {
         raw: { [op]: operand },
-        expr: (field) => asExpr({
-            raw: f => asExprRaw({ [op]: [$ifNull(field.expr(), nil).raw(f).get(), operand] }),
-        }),
     };
 };
 
@@ -904,6 +901,7 @@ const $lt = comp('$lt');
 const dateLt = comp('$lt');
 const $gte = comp('$gte');
 const $lte = comp('$lte');
+const $type = operator()('$type');
 
 const $expr = (expr) => ({
     raw: f => ({ $expr: expr.raw(f).get() }),
@@ -1486,8 +1484,14 @@ const executes$1 = (view, input, streamName) => {
         streamNames[streamName] = hash;
     else if (streamNames[streamName] != hash)
         throw new Error(`streamName ${streamName} already used`);
-    const { collection, projection, hardMatch, match } = view;
-    const removeNotYetSynchronizedFields = Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($ne(null)) : null));
+    const { collection, projection, hardMatch: pre, match } = view;
+    const types = Array.from({ length: 19 }).map((_, i) => i + 1);
+    const removeNotYetSynchronizedFields = Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_')
+        ? root()
+            .of(k)
+            .has($type(types.filter(x => x != 10)))
+        : null));
+    const hardMatch = $and(pre, ...removeNotYetSynchronizedFields);
     const job = {};
     const db = collection.s.db, coll = collection.collectionName;
     db.command({
@@ -1571,7 +1575,7 @@ const executes$1 = (view, input, streamName) => {
         const step3 = (lastTS) => async () => {
             const hardQuery = $and(lastTS
                 ? root().of('touchedAt').has($gteTs(lastTS.ts))
-                : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), hardMatch, ...removeNotYetSynchronizedFields);
+                : root().of('deletedAt').has($eq(null)), lastTS ? null : match && $expr(match), hardMatch);
             const notDeleted = eq($ifNull(root().of('deletedAt').expr(), nil))(nil);
             const query = match ? and(notDeleted, match) : notDeleted;
             const replaceRaw = $replaceWith_(field({
@@ -1849,6 +1853,7 @@ exports.$set = $set;
 exports.$simpleInsert = $simpleInsert;
 exports.$simpleMerge = $simpleMerge;
 exports.$sum = $sum;
+exports.$type = $type;
 exports.$unwind = $unwind;
 exports.$unwindDelta = $unwindDelta;
 exports.Field = Field;

package/package.json

@@ -3,7 +3,7 @@
     "module": "index.esm.js",
     "typings": "index.d.ts",
     "name": "@omegup/msync",
-    "version": "0.0.47",
+    "version": "0.0.48",
     "dependencies": {
         "dayjs": "^1.11.9",
         "dotenv": "^16.3.1",