@omegup/msync 0.0.10 → 0.0.12

package/index.d.ts

@@ -102,7 +102,6 @@ type D = O<{
     readonly deletedAt?: Timestamp | null | undefined;
 } & ID>;
 type Model = D & TS;
-type OutInput<T, A = T | null> = ID & Rec<'after', A>;
 type BA = 'before' | 'after';
 type PreDelta<T, K extends BA = BA, E = unknown> = Rec<K, T> & E;
 type Delta<T, K extends BA = BA, E = ID> = PreDelta<T | null, K, E>;
@@ -476,7 +475,7 @@ type ND = {
     readonly deletedAt?: null;
 };
 type Merge<T extends ID> = (T & ND & TS) | Del;
-declare const $upsert: <T extends doc>(out: RWCollection<Merge<T>>) => RawStages<unknown, OutInput<T>, "out">;
+declare const $upsert: <T extends doc>(out: RWCollection<Merge<T>>) => RawStages<unknown, Delta<T>, "out">;
 
 type DeltaPipe<Q extends O, T extends Q, F extends HKT<O2>, G extends HKT<O3>> = {
     with: <Q2 extends O, V extends Q2>(map: (a: Stream<Q, T, F, G>) => Stream<Q | Q2, V, F, G>) => DeltaPipe<Q | Q2, V, F, G>;
@@ -557,6 +556,7 @@ declare const dayAndMonthPart: <D, C>(date: Expr<Date, D, C>) => Expr<string, D,
 declare const now: <D, C>() => Expr<Date, D, C>;
 declare const monthPart: <D, C>(date: Expr<Date, D, C>) => Expr<string, D, C>;
 declare const weekPart: <D, C>(date: Expr<Date, D, C>) => Expr<string, D, C>;
+declare const year: <D, C>(date: Expr<Date, D, C>) => Expr<number, D, C>;
 declare const dateAdd: <D, C>(date: Expr<Date, D, C>, amount: Expr<number, D, C>, unit: Expr<"year" | "week" | "month" | "day" | "hour" | "minute" | "second", D, C>) => Expr<Date, D, C>;
 declare const maxDate: <D, C>(expr: Expr<Arr<Date>, D, C>) => Expr<Date, D, C>;
 declare const minDate: <D, C>(expr: Expr<Arr<Date>, D, C>) => Expr<Date, D, C>;
@@ -642,4 +642,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, $keys, $let, $lookup, $lt, $lte, $map, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $pushDict, $rand, $replaceWith, $set, $simpleMerge, $sum, $unwind, $unwindDelta, $upsert, 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 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 };
+export { $accumulator, $and, $countDict, $entries, $eq, $expr, $getField, $group, $groupId, $groupMerge, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $keys, $let, $lookup, $lt, $lte, $map, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $pushDict, $rand, $replaceWith, $set, $simpleMerge, $sum, $unwind, $unwindDelta, $upsert, 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 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

@@ -1030,18 +1030,18 @@ const $mergeId = () => (out, keys, id) => {
     })).stages;
 };
 const $simpleMerge = () => (out, keys) => $mergeId()(out, keys, root().of('_id').expr());
-const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull(root()
+const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull$1(root()
     .of('before')
     .of('_id')
     .expr()));
-const assertNotNull = (expr) => expr;
+const assertNotNull$1 = (expr) => expr;
 
 const $upsert = (out) => {
-    const replacer = ite(eqTyped(root().of('after').expr(), nil), field({
+    const replacer = ite(eq(root().of('after').expr())(nil), field({
         deletedAt: ['deletedAt', current],
-        _id: ['_id', root().of('_id').expr()],
+        _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
         touchedAt: ['touchedAt', current],
-    }), mergeObjects(root().of('after').expr(), field({ deletedAt: ['deletedAt', nil], touchedAt: ['touchedAt', current] })));
+    }), mergeObjects(assertNotNull(root().of('after').expr()), field({ deletedAt: ['deletedAt', nil], touchedAt: ['touchedAt', current] })));
     return link()
         .with($replaceWith_(replacer))
         .with($merge_({
@@ -1051,6 +1051,7 @@ const $upsert = (out) => {
         whenNotMatched: 'insert',
     })).stages;
 };
+const assertNotNull = (expr) => expr;
 
 const T = (s) => `Timestamp(${parseInt(`${BigInt(s) / 2n ** 32n}`)}, ${parseInt(`${BigInt(s) % 2n ** 32n}`)})`;
 const replace = (s) => s.replace(/\{"\$timestamp":"(\d+)"\}/g, (_, d) => T(d));
@@ -1358,6 +1359,9 @@ const monthPart = (date) => asExpr({
 const weekPart = (date) => asExpr({
     raw: f => asExprRaw({ $dateToString: { date: date.raw(f).get(), format: '%Y-%U' } }),
 });
+const year = (date) => asExpr({
+    raw: f => asExprRaw({ $year: date.raw(f).get() }),
+});
 const dateAdd = (date, amount, unit) => asExpr({
     raw: f => asExprRaw({
         $dateAdd: {
@@ -1621,4 +1625,4 @@ const makeCol = async (docs, database, name) => {
     }
 };
 
-export { $accumulator, $and, $countDict, $entries, $eq, $expr, $getField, $group, $groupId, $groupMerge, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $keys, $let, $lookup, $lt, $lte, $map, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $pushDict, $rand, $replaceWith, $set, $simpleMerge, $sum, $unwind, $unwindDelta, $upsert, 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 };
+export { $accumulator, $and, $countDict, $entries, $eq, $expr, $getField, $group, $groupId, $groupMerge, $gt, $gtTs, $gte, $gteTs, $ifNull, $in, $keys, $let, $lookup, $lt, $lte, $map, $map1, $match, $matchDelta, $merge, $merge_, $ne, $nin, $nor, $or, $pushDict, $rand, $replaceWith, $set, $simpleMerge, $sum, $unwind, $unwindDelta, $upsert, 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

@@ -1032,18 +1032,18 @@ const $mergeId = () => (out, keys, id) => {
     })).stages;
 };
 const $simpleMerge = () => (out, keys) => $mergeId()(out, keys, root().of('_id').expr());
-const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull(root()
+const $merge = () => (out, keys) => $mergeId()(out, keys, assertNotNull$1(root()
     .of('before')
     .of('_id')
     .expr()));
-const assertNotNull = (expr) => expr;
+const assertNotNull$1 = (expr) => expr;
 
 const $upsert = (out) => {
-    const replacer = ite(eqTyped(root().of('after').expr(), nil), field({
+    const replacer = ite(eq(root().of('after').expr())(nil), field({
         deletedAt: ['deletedAt', current],
-        _id: ['_id', root().of('_id').expr()],
+        _id: ['_id', assertNotNull(root().of('before').of('_id').expr())],
         touchedAt: ['touchedAt', current],
-    }), mergeObjects(root().of('after').expr(), field({ deletedAt: ['deletedAt', nil], touchedAt: ['touchedAt', current] })));
+    }), mergeObjects(assertNotNull(root().of('after').expr()), field({ deletedAt: ['deletedAt', nil], touchedAt: ['touchedAt', current] })));
     return link()
         .with($replaceWith_(replacer))
         .with($merge_({
@@ -1053,6 +1053,7 @@ const $upsert = (out) => {
         whenNotMatched: 'insert',
     })).stages;
 };
+const assertNotNull = (expr) => expr;
 
 const T = (s) => `Timestamp(${parseInt(`${BigInt(s) / 2n ** 32n}`)}, ${parseInt(`${BigInt(s) % 2n ** 32n}`)})`;
 const replace = (s) => s.replace(/\{"\$timestamp":"(\d+)"\}/g, (_, d) => T(d));
@@ -1360,6 +1361,9 @@ const monthPart = (date) => asExpr({
 const weekPart = (date) => asExpr({
     raw: f => asExprRaw({ $dateToString: { date: date.raw(f).get(), format: '%Y-%U' } }),
 });
+const year = (date) => asExpr({
+    raw: f => asExprRaw({ $year: date.raw(f).get() }),
+});
 const dateAdd = (date, amount, unit) => asExpr({
     raw: f => asExprRaw({
         $dateAdd: {
@@ -1743,3 +1747,4 @@ exports.toInt = toInt;
 exports.val = val;
 exports.weekPart = weekPart;
 exports.wrap = wrap;
+exports.year = year;

package/package.json

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