@arcote.tech/arc 0.0.6 → 0.0.8

package/dist/context/context.d.ts

@@ -26,6 +26,6 @@ declare class ArcContextWithCommands<const C extends ArcContextElement[], Cmds e
     constructor(context: C, commands: Cmds);
 }
 export type ArcContextAny = ArcContext<ArcContextElement[]>;
-export type ArcContextWithCommandsAny = ArcContextWithCommands<ArcContextElement[], any>;
+export type ArcContextWithCommandsAny = ArcContextWithCommands<any, any>;
 export declare function context<const C extends ArcContextElement[]>(...collections: C): ArcContext<C>;
 export {};

package/dist/index.js

@@ -682,10 +682,8 @@ class ArcModel {
     return query;
   }
   async runQuery(query) {
-    if (query instanceof ArcCollectionQuery) {
-      const dbAdapter = await this.dbAdapterPromise;
-      query.run(dbAdapter, this.changes$);
-    }
+    const dbAdapter = await this.dbAdapterPromise;
+    query.run(dbAdapter, this.changes$);
   }
   commands() {
     return new Proxy({}, {
@@ -819,19 +817,25 @@ class RTCClient {
             console.error(`Collection ${collection3} not found`);
             return;
           }
-          const deserializedItems = items.map((item) => c.deserialize(item));
-          this.model.executeCommand(async (ctx) => {
-            for (const item of deserializedItems) {
-              const id3 = item._id;
-              if (!item)
-                await ctx[collection3].remove(id3);
-              else
-                await ctx[collection3].set(id3, item);
+          const deserializedItems = items.map((item) => {
+            if (item.deleted) {
+              return {
+                collection: collection3,
+                type: "delete",
+                id: item._id
+              };
             }
+            return {
+              collection: collection3,
+              type: "set",
+              body: item
+            };
           });
+          this.model.applyChanges(deserializedItems);
         }
         break;
       case "sync-done":
+        window.localStorage.setItem("lastSync", message.date);
         break;
       case "collection-changes":
         const deserializedChanges = deserializeChanges(message.changes, (name) => this.model.getCollection(name));

package/dist/utils.d.ts

@@ -5,13 +5,13 @@ export declare namespace objectUtil {
     export type MergeShapes<U, V> = {
         [k in Exclude<keyof U, keyof V>]: U[k];
     } & V;
-    type optionalKeys<T extends object> = {
+    type optionalKeys<T extends any> = {
         [k in keyof T]: undefined extends T[k] ? k : never;
     }[keyof T];
-    type requiredKeys<T extends object> = {
+    type requiredKeys<T extends any> = {
         [k in keyof T]: undefined extends T[k] ? never : k;
     }[keyof T];
-    export type addQuestionMarks<T extends object> = simplify<{
+    export type addQuestionMarks<T extends any> = simplify<{
         [K in requiredKeys<T>]: T[K];
     } & {
         [K in optionalKeys<T>]?: T[K];
@@ -49,11 +49,11 @@ export type ContextTypes<Ctx extends {
 }> = Ctx["collections"] extends (ArcCollectionAny | ArcIndexedCollectionAny)[] ? {
     [Collection in Ctx["collections"][number] as `${Collection["name"]}.bodyWithoutId`]: util.GetType<Collection["schema"]>;
 } & {
-    [Collection in Ctx["collections"][number] as `${Collection["name"]}.setBody`]: util.FirstArgument<Collection["schema"]["parse"]>;
+    [Collection in Ctx["collections"][number] as `${Collection["name"]}.setBody`]: objectUtil.addQuestionMarks<util.FirstArgument<Collection["schema"]["parse"]>>;
 } & {
     [Collection in Ctx["collections"][number] as `${Collection["name"]}.id`]: util.GetType<Collection["id"]>;
 } & {
     [Collection in Ctx["collections"][number] as `${Collection["name"]}.body`]: util.CollectionItemWithId<Collection>;
 } & {
-    [Collection in Ctx["collections"][number] as `${Collection["name"]}.queryCollectionResult`]: QueryCollectionResult<Collection>;
+    [Collection in Ctx["collections"][number] as `${Collection["name"]}.queryCollectionResult`]: Omit<QueryCollectionResult<Collection>, "result">;
 } : never;

package/package.json

@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "private": false,
   "author": "Przemysław Krasiński [arcote.tech]",
   "description": "Arc is a framework designed to align code closely with business logic, streamlining development and enhancing productivity.",