@opendaw/studio-core 0.0.45 → 0.0.46

package/dist/ysync/YService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"YService.d.ts","sourceRoot":"","sources":["../../src/ysync/YService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAmC,MAAM,kBAAkB,CAAA;AAQjF,OAAO,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,YAAY,CAAA;AAI9C,yBAAiB,QAAQ,CAAC;IAMf,MAAM,eAAe,GAAU,YAAY,MAAM,CAAC,OAAO,CAAC,EAC3B,KAAK,UAAU,EACf,UAAU,MAAM,KAAG,OAAO,CAAC,OAAO,CAiDvE,CAAA;CACJ"}
+{"version":3,"file":"YService.d.ts","sourceRoot":"","sources":["../../src/ysync/YService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAyC,MAAM,kBAAkB,CAAA;AAQvF,OAAO,EAAC,OAAO,EAAE,UAAU,EAAC,MAAM,YAAY,CAAA;AAI9C,yBAAiB,QAAQ,CAAC;IAMf,MAAM,eAAe,GAAU,YAAY,MAAM,CAAC,OAAO,CAAC,EAC3B,KAAK,UAAU,EACf,UAAU,MAAM,KAAG,OAAO,CAAC,OAAO,CA6DvE,CAAA;CACJ"}

package/dist/ysync/YService.js

@@ -1,7 +1,7 @@
-import { Errors, Option, panic, RuntimeNotifier, TimeSpan } from "@opendaw/lib-std";
+import { Errors, Option, panic, RuntimeNotifier, TimeSpan, UUID } from "@opendaw/lib-std";
 import { BoxGraph } from "@opendaw/lib-box";
 import { Promises } from "@opendaw/lib-runtime";
-import { BoxIO } from "@opendaw/studio-boxes";
+import { BoxIO, UserInterfaceBox } from "@opendaw/studio-boxes";
 import { ProjectDecoder } from "@opendaw/studio-adapters";
 import { YSync } from "./YSync";
 import * as Y from "yjs";
@@ -33,13 +33,18 @@ export var YService;
             provider.on("sync", onSync);
             await Promises.timeout(promise, TimeSpan.seconds(10), "Timeout 'synced'");
         }
-        const boxesMap = doc.getMap("boxes");
-        if (boxesMap.size === 0) {
+        const boxes = doc.getMap("boxes");
+        const isRoomEmpty = boxes.size === 0;
+        if (isRoomEmpty) {
             const project = optProject.match({
                 none: () => Project.new(env),
                 some: project => project.copy()
             });
-            const sync = await YSync.populate({ boxGraph: project.boxGraph, doc, conflict: () => project.invalid() });
+            const sync = await YSync.populateRoom({
+                boxGraph: project.boxGraph,
+                boxes,
+                conflict: () => project.invalid()
+            });
             project.own(sync);
             project.editing.disable();
             return project;
@@ -57,11 +62,17 @@ export var YService;
                 }
             }
             const boxGraph = new BoxGraph(Option.wrap(BoxIO.create));
-            const sync = await YSync.join({ boxGraph, doc, conflict: () => project.invalid() });
+            const sync = await YSync.joinRoom({ boxGraph, boxes, conflict: () => project.invalid() });
+            const mandatoryBoxes = ProjectDecoder.findMandatoryBoxes(boxGraph);
             const project = Project.skeleton(env, {
                 boxGraph,
-                mandatoryBoxes: ProjectDecoder.findMandatoryBoxes(boxGraph)
-            });
+                mandatoryBoxes
+            }, false);
+            boxGraph.beginTransaction();
+            // TODO How takes care to remove the user interface boxes?
+            const userInterfaceBox = UserInterfaceBox.create(boxGraph, UUID.generate(), box => box.root.refer(mandatoryBoxes.rootBox.users));
+            boxGraph.endTransaction();
+            project.follow(userInterfaceBox);
             project.own(sync);
             project.editing.disable();
             return project;

package/dist/ysync/YSync.d.ts

@@ -3,15 +3,15 @@ import { BoxGraph } from "@opendaw/lib-box";
 import * as Y from "yjs";
 export type Construct<T> = {
     boxGraph: BoxGraph<T>;
-    doc: Y.Doc;
+    boxes: Y.Map<unknown>;
     conflict?: Provider<boolean>;
 };
 export declare class YSync<T> implements Terminable {
     #private;
     static isEmpty(doc: Y.Doc): boolean;
-    static populate<T>({ boxGraph, doc }: Construct<T>): Promise<YSync<T>>;
-    static join<T>({ boxGraph, doc }: Construct<T>): Promise<YSync<T>>;
-    constructor({ boxGraph, doc, conflict }: Construct<T>);
+    static populateRoom<T>({ boxGraph, boxes }: Construct<T>): Promise<YSync<T>>;
+    static joinRoom<T>({ boxGraph, boxes }: Construct<T>): Promise<YSync<T>>;
+    constructor({ boxGraph, boxes, conflict }: Construct<T>);
     terminate(): void;
 }
 //# sourceMappingURL=YSync.d.ts.map

package/dist/ysync/YSync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"YSync.d.ts","sourceRoot":"","sources":["../../src/ysync/YSync.ts"],"names":[],"mappings":"AAAA,OAAO,EASH,QAAQ,EAER,UAAU,EAGb,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAa,QAAQ,EAA2D,MAAM,kBAAkB,CAAA;AAE/G,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAIxB,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACvB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACtB,GAAG,EAAE,CAAC,CAAC,GAAG,CAAA;IACV,QAAQ,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;CAC/B,CAAA;AAED,qBAAa,KAAK,CAAC,CAAC,CAAE,YAAW,UAAU;;IACvC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,OAAO;WAItB,QAAQ,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,GAAG,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;WAa7D,IAAI,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,GAAG,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBA4B1D,EAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IASnD,SAAS,IAAI,IAAI;CA0KpB"}
+{"version":3,"file":"YSync.d.ts","sourceRoot":"","sources":["../../src/ysync/YSync.ts"],"names":[],"mappings":"AAAA,OAAO,EASH,QAAQ,EAER,UAAU,EAGb,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAa,QAAQ,EAA2D,MAAM,kBAAkB,CAAA;AAE/G,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAIxB,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACvB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACtB,KAAK,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;CAC/B,CAAA;AAED,qBAAa,KAAK,CAAC,CAAC,CAAE,YAAW,UAAU;;IACvC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,OAAO;WAItB,YAAY,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;WAcnE,QAAQ,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,KAAK,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBA0BhE,EAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC;IAQrD,SAAS,IAAI,IAAI;CAgLpB"}

package/dist/ysync/YSync.js

@@ -5,25 +5,25 @@ export class YSync {
     static isEmpty(doc) {
         return doc.getMap("boxes").size === 0;
     }
-    static async populate({ boxGraph, doc }) {
+    static async populateRoom({ boxGraph, boxes }) {
         console.debug("populate");
-        const boxesMap = doc.getMap("boxes");
-        assert(boxesMap.size === 0, "BoxesMap must be empty");
-        const sync = new YSync({ boxGraph, doc });
-        doc.transact(() => boxGraph.boxes().forEach(box => {
+        assert(boxes.size === 0, "boxes must be empty");
+        const sync = new YSync({ boxGraph, boxes });
+        asDefined(boxes.doc, "Y.Map is not connect to Y.Doc")
+            .transact(() => boxGraph.boxes()
+            .forEach(box => {
             const key = UUID.toString(box.address.uuid);
             const map = YMapper.createBoxMap(box);
-            boxesMap.set(key, map);
+            boxes.set(key, map);
         }), "[openDAW] populate");
         return sync;
     }
-    static async join({ boxGraph, doc }) {
+    static async joinRoom({ boxGraph, boxes }) {
         console.debug("join");
         assert(boxGraph.boxes().length === 0, "BoxGraph must be empty");
-        const sync = new YSync({ boxGraph, doc });
+        const sync = new YSync({ boxGraph, boxes });
         boxGraph.beginTransaction();
-        const boxesMap = doc.getMap("boxes");
-        boxesMap.forEach((value, key) => {
+        boxes.forEach((value, key) => {
             const boxMap = value;
             const uuid = UUID.parse(key);
             const name = boxMap.get("name");
@@ -36,16 +36,14 @@ export class YSync {
     }
     #terminator = new Terminator();
     #boxGraph;
-    #doc;
     #conflict;
-    #boxesMap;
+    #boxes;
     #updates;
     #ignoreUpdates = false;
-    constructor({ boxGraph, doc, conflict }) {
+    constructor({ boxGraph, boxes, conflict }) {
         this.#boxGraph = boxGraph;
-        this.#doc = doc;
         this.#conflict = Option.wrap(conflict);
-        this.#boxesMap = doc.getMap("boxes");
+        this.#boxes = boxes;
         this.#updates = [];
         this.#terminator.ownAll(this.#setupYjs(), this.#setupOpenDAW());
     }
@@ -83,7 +81,8 @@ export class YSync {
                 this.#ignoreUpdates = true;
                 this.#boxGraph.endTransaction();
                 this.#ignoreUpdates = false;
-                this.#boxGraph.verifyPointers();
+                // TODO Only in DEV-MODE
+                //  this.#boxGraph.verifyPointers()
             }
             catch (reason) {
                 this.terminate();
@@ -94,11 +93,11 @@ export class YSync {
                 this.#rollbackTransaction(events);
             }
         };
-        this.#boxesMap.observeDeep(eventHandler);
-        return { terminate: () => { this.#boxesMap.unobserveDeep(eventHandler); } };
+        this.#boxes.observeDeep(eventHandler);
+        return { terminate: () => { this.#boxes.unobserveDeep(eventHandler); } };
     }
     #createBox(key) {
-        const map = this.#boxesMap.get(key);
+        const map = this.#boxes.get(key);
         const name = map.get("name");
         const fields = map.get("fields");
         const uuid = UUID.parse(key);
@@ -119,7 +118,7 @@ export class YSync {
         }
         const vertex = vertexOption.unwrap("Could not find field");
         const [uuidAsString, fieldsKey, ...fieldKeys] = path;
-        const targetMap = YMapper.findMap(this.#boxesMap
+        const targetMap = YMapper.findMap(this.#boxes
             .get(String(uuidAsString))
             .get(String(fieldsKey)), fieldKeys);
         assert(vertex.isField(), "Vertex must be either Primitive or Pointer");
@@ -146,7 +145,8 @@ export class YSync {
     }
     #rollbackTransaction(events) {
         console.debug(`rollback ${events.length} events...`);
-        this.#doc.transact(() => {
+        this.#getDoc()
+            .transact(() => {
             for (let i = events.length - 1; i >= 0; i--) {
                 const event = events[i];
                 const target = asInstanceOf(event.target, Y.Map);
@@ -180,7 +180,7 @@ export class YSync {
                     this.#updates.length = 0;
                     return;
                 }
-                this.#doc.transact(() => this.#updates.forEach(update => {
+                this.#getDoc().transact(() => this.#updates.forEach(update => {
                     /**
                      * TRANSFER CHANGES FROM OPENDAW TO YJS
                      */
@@ -188,11 +188,11 @@ export class YSync {
                         const uuid = update.uuid;
                         const key = UUID.toString(uuid);
                         const box = this.#boxGraph.findBox(uuid).unwrap();
-                        this.#boxesMap.set(key, YMapper.createBoxMap(box));
+                        this.#boxes.set(key, YMapper.createBoxMap(box));
                     }
                     else if (update.type === "primitive") {
                         const key = UUID.toString(update.address.uuid);
-                        const boxObject = asDefined(this.#boxesMap.get(key), "Could not find box");
+                        const boxObject = asDefined(this.#boxes.get(key), "Could not find box");
                         const { address: { fieldKeys }, newValue } = update;
                         let field = boxObject.get("fields");
                         for (let i = 0; i < fieldKeys.length - 1; i++) {
@@ -202,7 +202,7 @@ export class YSync {
                     }
                     else if (update.type === "pointer") {
                         const key = UUID.toString(update.address.uuid);
-                        const boxObject = asDefined(this.#boxesMap.get(key), "Could not find box");
+                        const boxObject = asDefined(this.#boxes.get(key), "Could not find box");
                         const { address: { fieldKeys }, newAddress } = update;
                         let field = boxObject.get("fields");
                         for (let i = 0; i < fieldKeys.length - 1; i++) {
@@ -211,7 +211,7 @@ export class YSync {
                         field.set(String(fieldKeys[fieldKeys.length - 1]), newAddress.mapOr(address => address.toString(), null));
                     }
                     else if (update.type === "delete") {
-                        this.#boxesMap.delete(UUID.toString(update.uuid));
+                        this.#boxes.delete(UUID.toString(update.uuid));
                     }
                 }), "[openDAW] updates");
                 this.#updates.length = 0;
@@ -220,4 +220,7 @@ export class YSync {
             onUpdate: (update) => this.#updates.push(update)
         }));
     }
+    #getDoc() {
+        return asDefined(this.#boxes.doc, "Y.Map is not connect to Y.Doc");
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@opendaw/studio-core",
-    "version": "0.0.45",
+    "version": "0.0.46",
     "license": "LGPL-3.0-or-later",
     "publishConfig": {
         "access": "public"
@@ -26,16 +26,16 @@
         "test": "vitest run --config vitest.config.ts"
     },
     "dependencies": {
-        "@opendaw/lib-box": "^0.0.36",
-        "@opendaw/lib-dawproject": "^0.0.22",
-        "@opendaw/lib-dom": "^0.0.36",
-        "@opendaw/lib-dsp": "^0.0.36",
-        "@opendaw/lib-fusion": "^0.0.36",
-        "@opendaw/lib-runtime": "^0.0.36",
-        "@opendaw/lib-std": "^0.0.36",
-        "@opendaw/studio-adapters": "^0.0.37",
-        "@opendaw/studio-boxes": "^0.0.36",
-        "@opendaw/studio-enums": "^0.0.27",
+        "@opendaw/lib-box": "^0.0.37",
+        "@opendaw/lib-dawproject": "^0.0.23",
+        "@opendaw/lib-dom": "^0.0.37",
+        "@opendaw/lib-dsp": "^0.0.37",
+        "@opendaw/lib-fusion": "^0.0.37",
+        "@opendaw/lib-runtime": "^0.0.37",
+        "@opendaw/lib-std": "^0.0.37",
+        "@opendaw/studio-adapters": "^0.0.38",
+        "@opendaw/studio-boxes": "^0.0.37",
+        "@opendaw/studio-enums": "^0.0.28",
         "dropbox": "^10.34.0",
         "y-websocket": "^1.4.5",
         "yjs": "^13.6.27",
@@ -43,10 +43,10 @@
     },
     "devDependencies": {
         "@opendaw/eslint-config": "^0.0.20",
-        "@opendaw/studio-core-processors": "^0.0.37",
-        "@opendaw/studio-core-workers": "^0.0.32",
-        "@opendaw/studio-forge-boxes": "^0.0.36",
+        "@opendaw/studio-core-processors": "^0.0.38",
+        "@opendaw/studio-core-workers": "^0.0.33",
+        "@opendaw/studio-forge-boxes": "^0.0.37",
         "@opendaw/typescript-config": "^0.0.20"
     },
-    "gitHead": "a3c95d33522ce3b35c1a67af0fd6064488d35c97"
+    "gitHead": "cbe2d3409a066196db3434a48f61320f29c80d99"
 }