@omegup/msync 0.0.99 → 0.1.1

package/index.d.ts

@@ -526,7 +526,7 @@ interface SnapshotStreamHKT extends HKT<O2> {
 interface DeltaHKT extends HKT<O3> {
     readonly out: DeltaStages<I<O3, this>[0], I<O3, this>[1], I<O3, this>[2]>;
 }
-declare const staging: <V extends Model, KK extends StrKey<V>>(view: View<V, Allowed$1<KK>>, streamName: string, skip?: boolean, after?: () => Promise<void>) => DeltaPipe<AllowedPick$1<V, KK>, AllowedPick$1<V, KK>, SnapshotStreamHKT, DeltaHKT>;
+declare const staging: <V extends Model, KK extends StrKey<V>>(view: View<V, Allowed$1<KK>>, streamName: string, skip?: boolean, after?: () => Promise<void>, allowEmtpies?: readonly KK[]) => DeltaPipe<AllowedPick$1<V, KK>, AllowedPick$1<V, KK>, SnapshotStreamHKT, DeltaHKT>;
 
 type Allowed<K> = Exclude<K, 'deletedAt' | '_id'>;
 type AllowedPick<V extends Model, K extends StrKey<V>> = OPickD<V, Allowed<K>>;
@@ -536,7 +536,7 @@ interface StreamRunnerHKT extends HKT<O2> {
 interface StagesHKT extends HKT<O3> {
     readonly out: RORec<'lin', RawStages<I<O3, this>[0], I<O3, this>[1], I<O3, this>[2], unknown, 1>>;
 }
-declare const from: <V extends Model, KK extends StrKey<V>>(view: View<V, Allowed<KK>>, streamName: string) => DeltaPipe<AllowedPick<V, KK>, AllowedPick<V, KK>, StreamRunnerHKT, StagesHKT>;
+declare const from: <V extends Model, KK extends StrKey<V>>(view: View<V, Allowed<KK>>, streamName: string, allowEmtpies?: readonly KK[]) => DeltaPipe<AllowedPick<V, KK>, AllowedPick<V, KK>, StreamRunnerHKT, StagesHKT>;
 
 type SingleResult<out Result> = <Result2>(finalInput: RawStages<unknown, Result, Result2>) => Stages<unknown, Result2, unknown>;
 interface SnapshotStreamHKT2 extends HKT<O2> {

package/index.esm.js

@@ -1367,10 +1367,11 @@ const $replaceWith = (expr) => ({
 const $mergeX = (out, keys, f, map, whenNotMatched = 'fail', ext) => {
     const patch = mapExact(keys, v => sub(v, f));
     const filter = mapExactToObject(ext, v => ({ $eq: v }));
+    const setDeleted = whenNotMatched === 'discard';
     const replacer = map(field(omitPick().backward(spread(patch, {
         _id: ['_id', f.of('_id').expr()],
         touchedAt: ['touchedAt', current],
-        deletedAt: ['deletedAt', current],
+        deletedAt: [setDeleted ? 'deletedAt' : 'touchedAt', current],
     }))));
     return {
         raw: (first) => link()
@@ -1383,8 +1384,16 @@ const $mergeX = (out, keys, f, map, whenNotMatched = 'fail', ext) => {
             whenMatched: asStages([
                 {
                     $replaceWith: {
-                        old: { $mergeObjects: ['$$ROOT', { deletedAt: '$deletedAt' }] },
-                        merged: { $mergeObjects: ['$$ROOT', '$$new', { deletedAt: '$deletedAt' }] },
+                        old: setDeleted
+                            ? { $mergeObjects: ['$$ROOT', { deletedAt: '$deletedAt' }] }
+                            : '$$ROOT',
+                        merged: {
+                            $mergeObjects: [
+                                '$$ROOT',
+                                '$$new',
+                                ...(setDeleted ? [{ deletedAt: '$deletedAt' }] : []),
+                            ],
+                        },
                     },
                 },
                 {
@@ -1621,7 +1630,7 @@ const getFirstStages = (view) => {
 };
 
 const streamNames = {};
-const executes$2 = (view, input, streamName, skip = false, after) => {
+const executes$2 = (view, input, streamName, skip = false, after, allowEmtpies) => {
     const { collection, projection, match } = view;
     const { firstStages, hardMatch } = getFirstStages(view);
     const db = collection.s.db, coll = collection.collectionName;
@@ -1810,9 +1819,9 @@ const executes$2 = (view, input, streamName, skip = false, after) => {
         out: run,
     };
 };
-const staging = (view, streamName, skip = false, after) => pipe(input => executes$2(view, input, streamName, skip, after), emptyDelta(), concatDelta, emptyDelta);
+const staging = (view, streamName, skip = false, after, allowEmtpies) => pipe(input => executes$2(view, input, streamName, skip, after), emptyDelta(), concatDelta, emptyDelta);
 
-const executes$1 = (view, input, streamName) => {
+const executes$1 = (view, input, streamName, allowEmtpies) => {
     const hash = crypto$1
         .createHash('md5')
         .update(new Error().stack + '')
@@ -1822,7 +1831,7 @@ const executes$1 = (view, input, streamName) => {
     else if (streamNames[streamName] != hash)
         throw new Error('streamName already used');
     const { collection, projection, hardMatch: pre, match } = view;
-    const removeNotYetSynchronizedFields = projection && Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($exists(true)) : null));
+    const removeNotYetSynchronizedFields = projection && Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') && !allowEmtpies?.includes(k) ? root().of(k).has($exists(true)) : null));
     const hardMatch = removeNotYetSynchronizedFields ? $and(pre, ...removeNotYetSynchronizedFields) : pre;
     const job = {};
     const db = collection.s.db, coll = collection.collectionName;
@@ -1933,7 +1942,7 @@ const executes$1 = (view, input, streamName) => {
     };
 };
 const emptyLin = () => ({ lin: link().stages });
-const from = (view, streamName) => pipe(input => executes$1(view, input.lin, streamName), { lin: link().stages }, ({ lin: a }, { lin: b }) => ({ lin: concatStages(a, b) }), emptyLin);
+const from = (view, streamName, allowEmtpies) => pipe(input => executes$1(view, input.lin, streamName, allowEmtpies), { lin: link().stages }, ({ lin: a }, { lin: b }) => ({ lin: concatStages(a, b) }), emptyLin);
 
 const executes = (view, input) => {
     const { firstStages } = getFirstStages(view);

package/index.js

@@ -1369,10 +1369,11 @@ const $replaceWith = (expr) => ({
 const $mergeX = (out, keys, f, map, whenNotMatched = 'fail', ext) => {
     const patch = mapExact(keys, v => sub(v, f));
     const filter = mapExactToObject(ext, v => ({ $eq: v }));
+    const setDeleted = whenNotMatched === 'discard';
     const replacer = map(field(omitPick().backward(spread(patch, {
         _id: ['_id', f.of('_id').expr()],
         touchedAt: ['touchedAt', current],
-        deletedAt: ['deletedAt', current],
+        deletedAt: [setDeleted ? 'deletedAt' : 'touchedAt', current],
     }))));
     return {
         raw: (first) => link()
@@ -1385,8 +1386,16 @@ const $mergeX = (out, keys, f, map, whenNotMatched = 'fail', ext) => {
             whenMatched: asStages([
                 {
                     $replaceWith: {
-                        old: { $mergeObjects: ['$$ROOT', { deletedAt: '$deletedAt' }] },
-                        merged: { $mergeObjects: ['$$ROOT', '$$new', { deletedAt: '$deletedAt' }] },
+                        old: setDeleted
+                            ? { $mergeObjects: ['$$ROOT', { deletedAt: '$deletedAt' }] }
+                            : '$$ROOT',
+                        merged: {
+                            $mergeObjects: [
+                                '$$ROOT',
+                                '$$new',
+                                ...(setDeleted ? [{ deletedAt: '$deletedAt' }] : []),
+                            ],
+                        },
                     },
                 },
                 {
@@ -1623,7 +1632,7 @@ const getFirstStages = (view) => {
 };
 
 const streamNames = {};
-const executes$2 = (view, input, streamName, skip = false, after) => {
+const executes$2 = (view, input, streamName, skip = false, after, allowEmtpies) => {
     const { collection, projection, match } = view;
     const { firstStages, hardMatch } = getFirstStages(view);
     const db = collection.s.db, coll = collection.collectionName;
@@ -1812,9 +1821,9 @@ const executes$2 = (view, input, streamName, skip = false, after) => {
         out: run,
     };
 };
-const staging = (view, streamName, skip = false, after) => pipe(input => executes$2(view, input, streamName, skip, after), emptyDelta(), concatDelta, emptyDelta);
+const staging = (view, streamName, skip = false, after, allowEmtpies) => pipe(input => executes$2(view, input, streamName, skip, after), emptyDelta(), concatDelta, emptyDelta);
 
-const executes$1 = (view, input, streamName) => {
+const executes$1 = (view, input, streamName, allowEmtpies) => {
     const hash = crypto$1
         .createHash('md5')
         .update(new Error().stack + '')
@@ -1824,7 +1833,7 @@ const executes$1 = (view, input, streamName) => {
     else if (streamNames[streamName] != hash)
         throw new Error('streamName already used');
     const { collection, projection, hardMatch: pre, match } = view;
-    const removeNotYetSynchronizedFields = projection && Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') ? root().of(k).has($exists(true)) : null));
+    const removeNotYetSynchronizedFields = projection && Object.values(mapExactToObject(projection, (_, k) => k.startsWith('_') && !allowEmtpies?.includes(k) ? root().of(k).has($exists(true)) : null));
     const hardMatch = removeNotYetSynchronizedFields ? $and(pre, ...removeNotYetSynchronizedFields) : pre;
     const job = {};
     const db = collection.s.db, coll = collection.collectionName;
@@ -1935,7 +1944,7 @@ const executes$1 = (view, input, streamName) => {
     };
 };
 const emptyLin = () => ({ lin: link().stages });
-const from = (view, streamName) => pipe(input => executes$1(view, input.lin, streamName), { lin: link().stages }, ({ lin: a }, { lin: b }) => ({ lin: concatStages(a, b) }), emptyLin);
+const from = (view, streamName, allowEmtpies) => pipe(input => executes$1(view, input.lin, streamName, allowEmtpies), { lin: link().stages }, ({ lin: a }, { lin: b }) => ({ lin: concatStages(a, b) }), emptyLin);
 
 const executes = (view, input) => {
     const { firstStages } = getFirstStages(view);

package/package.json

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