@opendaw/studio-adapters 0.0.88 → 0.0.89

package/dist/transfer/TransferAudioUnits.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TransferAudioUnits.d.ts","sourceRoot":"","sources":["../../src/transfer/TransferAudioUnits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,GAAG,EAAC,MAAM,kBAAkB,CAAA;AAElD,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAA;AAG1D,yBAAiB,kBAAkB,CAAC;IAChC;;;;OAIG;IACI,MAAM,QAAQ,GAAI,gBAAgB,aAAa,CAAC,YAAY,CAAC,EAC3C,+EAA2E,eAAe,EAC1F,UAAS;QAEL,WAAW,CAAC,EAAE,GAAG,CAAC;QAClB,YAAY,CAAC,EAAE,OAAO,CAAC;QAEvB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;KACxB,KAAG,aAAa,CAAC,YAAY,CAgB3D,CAAA;CACJ"}
+{"version":3,"file":"TransferAudioUnits.d.ts","sourceRoot":"","sources":["../../src/transfer/TransferAudioUnits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,GAAG,EAAC,MAAM,kBAAkB,CAAA;AAElD,OAAO,EAAC,YAAY,EAAU,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAA;AAG1D,yBAAiB,kBAAkB,CAAC;IAChC;;;;OAIG;IACI,MAAM,QAAQ,GAAI,gBAAgB,aAAa,CAAC,YAAY,CAAC,EAC3C,+EAA2E,eAAe,EAC1F,UAAS;QACL,WAAW,CAAC,EAAE,GAAG,CAAC;QAClB,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;KACxB,KAAG,aAAa,CAAC,YAAY,CAwB3D,CAAA;CACJ"}

package/dist/transfer/TransferAudioUnits.js

@@ -1,5 +1,6 @@
 import { asInstanceOf } from "@opendaw/lib-std";
-import { AudioUnitBox } from "@opendaw/studio-boxes";
+import { IndexedBox } from "@opendaw/lib-box";
+import { AudioUnitBox, RootBox } from "@opendaw/studio-boxes";
 import { TransferUtils } from "./TransferUtils";
 export var TransferAudioUnits;
 (function (TransferAudioUnits) {
@@ -18,9 +19,16 @@ export var TransferAudioUnits;
         }).boxes);
         const uuidMap = TransferUtils.generateMap(audioUnitBoxes, dependencies, rootBox.audioUnits.address.uuid, primaryAudioBusBox.address.uuid);
         TransferUtils.copyBoxes(uuidMap, targetBoxGraph, audioUnitBoxes, dependencies);
-        TransferUtils.reorderAudioUnits(uuidMap, audioUnitBoxes, rootBox);
-        return audioUnitBoxes.map(source => asInstanceOf(rootBox.graph
+        TransferUtils.reorderAudioUnits(uuidMap, audioUnitBoxes, rootBox, options.insertIndex);
+        const result = audioUnitBoxes.map(source => asInstanceOf(rootBox.graph
             .findBox(uuidMap.get(source.address.uuid).target)
             .unwrap("Target AudioUnit has not been copied"), AudioUnitBox));
+        if (options.deleteSource === true) {
+            const sourceRootBox = asInstanceOf(audioUnitBoxes[0].collection.targetVertex.unwrap().box, RootBox);
+            audioUnitBoxes.forEach(box => box.delete());
+            IndexedBox.collectIndexedBoxes(sourceRootBox.audioUnits, AudioUnitBox)
+                .forEach((box, index) => box.index.setValue(index));
+        }
+        return result;
     };
 })(TransferAudioUnits || (TransferAudioUnits = {}));

package/dist/transfer/TransferUtils.d.ts

@@ -1,5 +1,5 @@
 import { ppqn } from "@opendaw/lib-dsp";
-import { SortedSet, UUID } from "@opendaw/lib-std";
+import { int, SortedSet, UUID } from "@opendaw/lib-std";
 import { AudioUnitBox, RootBox } from "@opendaw/studio-boxes";
 import { Box, BoxGraph } from "@opendaw/lib-box";
 import { ProjectSkeleton } from "../project/ProjectSkeleton";
@@ -13,7 +13,7 @@ export declare namespace TransferUtils {
     const shouldExclude: (box: Box) => boolean;
     const generateMap: (audioUnitBoxes: ReadonlyArray<AudioUnitBox>, dependencies: ReadonlyArray<Box>, rootBoxUUID: UUID.Bytes, masterBusBoxUUID: UUID.Bytes) => SortedSet<UUID.Bytes, UUIDMapper>;
     const copyBoxes: (uuidMap: SortedSet<UUID.Bytes, UUIDMapper>, targetBoxGraph: BoxGraph, audioUnitBoxes: ReadonlyArray<AudioUnitBox>, dependencies: ReadonlyArray<Box>) => void;
-    const reorderAudioUnits: (uuidMap: SortedSet<UUID.Bytes, UUIDMapper>, audioUnitBoxes: ReadonlyArray<AudioUnitBox>, rootBox: RootBox) => void;
+    const reorderAudioUnits: (uuidMap: SortedSet<UUID.Bytes, UUIDMapper>, audioUnitBoxes: ReadonlyArray<AudioUnitBox>, rootBox: RootBox, insertIndex?: int) => void;
     const extractRegions: (regionBoxes: ReadonlyArray<AnyRegionBox>, { boxGraph, mandatoryBoxes: { primaryAudioBusBox, rootBox } }: ProjectSkeleton, insertPosition?: ppqn) => void;
 }
 //# sourceMappingURL=TransferUtils.d.ts.map

package/dist/transfer/TransferUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TransferUtils.d.ts","sourceRoot":"","sources":["../../src/transfer/TransferUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,kBAAkB,CAAA;AACrC,OAAO,EASH,SAAS,EACT,IAAI,EACP,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAC,YAAY,EAAiC,OAAO,EAAW,MAAM,uBAAuB,CAAA;AACpG,OAAO,EAAU,GAAG,EAAE,QAAQ,EAA2B,MAAM,kBAAkB,CAAA;AACjF,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAC,YAAY,EAAgB,MAAM,WAAW,CAAA;AAGrD,yBAAiB,aAAa,CAAC;IAC3B,KAAY,UAAU,GAAG;QAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC;QAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAA;KAAE,CAAA;IAI5D,MAAM,wBAAwB,GAAI,KAAK,GAAG,KAAG,OACqB,CAAA;IAClE,MAAM,aAAa,GAAI,KAAK,GAAG,KAAG,OAA6D,CAAA;IAE/F,MAAM,WAAW,GAAI,gBAAgB,aAAa,CAAC,YAAY,CAAC,EAC3C,cAAc,aAAa,CAAC,GAAG,CAAC,EAChC,aAAa,IAAI,CAAC,KAAK,EACvB,kBAAkB,IAAI,CAAC,KAAK,KAAG,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CA0B1F,CAAA;IAEM,MAAM,SAAS,GAAI,SAAS,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,EAC1C,gBAAgB,QAAQ,EACxB,gBAAgB,aAAa,CAAC,YAAY,CAAC,EAC3C,cAAc,aAAa,CAAC,GAAG,CAAC,KAAG,IAmC5D,CAAA;IAEM,MAAM,iBAAiB,GAAI,SAAS,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,EAC1C,gBAAgB,aAAa,CAAC,YAAY,CAAC,EAC3C,SAAS,OAAO,KAAG,IAWS,CAAA;IAEvD,MAAM,cAAc,GAAI,aAAa,aAAa,CAAC,YAAY,CAAC,EACxC,+DAA2D,eAAe,EAC1E,iBAAgB,IAAU,KAAG,IA8C3D,CAAA;CACJ"}
+{"version":3,"file":"TransferUtils.d.ts","sourceRoot":"","sources":["../../src/transfer/TransferUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,kBAAkB,CAAA;AACrC,OAAO,EAMH,GAAG,EAMH,SAAS,EACT,IAAI,EACP,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAC,YAAY,EAAiC,OAAO,EAAW,MAAM,uBAAuB,CAAA;AACpG,OAAO,EAAU,GAAG,EAAE,QAAQ,EAA2B,MAAM,kBAAkB,CAAA;AACjF,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAC,YAAY,EAAgB,MAAM,WAAW,CAAA;AAErD,yBAAiB,aAAa,CAAC;IAC3B,KAAY,UAAU,GAAG;QAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC;QAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAA;KAAE,CAAA;IAI5D,MAAM,wBAAwB,GAAI,KAAK,GAAG,KAAG,OACqB,CAAA;IAClE,MAAM,aAAa,GAAI,KAAK,GAAG,KAAG,OAA6D,CAAA;IAE/F,MAAM,WAAW,GAAI,gBAAgB,aAAa,CAAC,YAAY,CAAC,EAC3C,cAAc,aAAa,CAAC,GAAG,CAAC,EAChC,aAAa,IAAI,CAAC,KAAK,EACvB,kBAAkB,IAAI,CAAC,KAAK,KAAG,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CA0B1F,CAAA;IAEM,MAAM,SAAS,GAAI,SAAS,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,EAC1C,gBAAgB,QAAQ,EACxB,gBAAgB,aAAa,CAAC,YAAY,CAAC,EAC3C,cAAc,aAAa,CAAC,GAAG,CAAC,KAAG,IAmC5D,CAAA;IAEM,MAAM,iBAAiB,GAAI,SAAS,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,EAC1C,gBAAgB,aAAa,CAAC,YAAY,CAAC,EAC3C,SAAS,OAAO,EAChB,cAAc,GAAG,KAAG,IAYrD,CAAA;IAEM,MAAM,cAAc,GAAI,aAAa,aAAa,CAAC,YAAY,CAAC,EACxC,+DAA2D,eAAe,EAC1E,iBAAgB,IAAU,KAAG,IA8C3D,CAAA;CACJ"}

package/dist/transfer/TransferUtils.js

@@ -1,8 +1,7 @@
-import { Arrays, asInstanceOf, assert, ByteArrayInput, isInstanceOf, SetMultimap, UUID } from "@opendaw/lib-std";
+import { Arrays, asInstanceOf, assert, ByteArrayInput, clamp, isDefined, isInstanceOf, SetMultimap, UUID } from "@opendaw/lib-std";
 import { AudioUnitBox, AuxSendBox, TrackBox } from "@opendaw/studio-boxes";
 import { IndexedBox, PointerField } from "@opendaw/lib-box";
 import { UnionBoxTypes } from "../unions";
-import { AudioUnitOrdering } from "../factories/AudioUnitOrdering";
 export var TransferUtils;
 (function (TransferUtils) {
     const isSameGraph = ({ graph: a }, { graph: b }) => a === b;
@@ -77,17 +76,19 @@ export var TransferUtils;
             });
         });
     };
-    TransferUtils.reorderAudioUnits = (uuidMap, audioUnitBoxes, rootBox) => audioUnitBoxes
-        .toSorted(compareIndex)
-        .map(source => asInstanceOf(rootBox.graph
-        .findBox(uuidMap.get(source.address.uuid).target)
-        .unwrap("Target AudioUnit has not been copied"), AudioUnitBox))
-        .forEach((target) => IndexedBox.collectIndexedBoxes(rootBox.audioUnits, AudioUnitBox).toSorted((a, b) => {
-        const orderA = AudioUnitOrdering[a.type.getValue()];
-        const orderB = AudioUnitOrdering[b.type.getValue()];
-        const orderDifference = orderA - orderB;
-        return orderDifference === 0 ? b === target ? -1 : 1 : orderDifference;
-    }).forEach((box, index) => box.index.setValue(index)));
+    TransferUtils.reorderAudioUnits = (uuidMap, audioUnitBoxes, rootBox, insertIndex) => {
+        const targets = audioUnitBoxes
+            .toSorted(compareIndex)
+            .map(source => asInstanceOf(rootBox.graph
+            .findBox(uuidMap.get(source.address.uuid).target)
+            .unwrap("Target AudioUnit has not been copied"), AudioUnitBox));
+        const targetSet = new Set(targets);
+        const allAudioUnits = IndexedBox.collectIndexedBoxes(rootBox.audioUnits, AudioUnitBox);
+        const existing = allAudioUnits.filter(box => !targetSet.has(box));
+        const position = isDefined(insertIndex) ? clamp(insertIndex, 0, existing.length) : existing.length;
+        const ordered = [...existing.slice(0, position), ...targets, ...existing.slice(position)];
+        ordered.forEach((box, index) => box.index.setValue(index));
+    };
     TransferUtils.extractRegions = (regionBoxes, { boxGraph, mandatoryBoxes: { primaryAudioBusBox, rootBox } }, insertPosition = 0.0) => {
         assert(Arrays.satisfy(regionBoxes, isSameGraph), "Region smust be from the same BoxGraph");
         const regionBoxSet = new Set(regionBoxes);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendaw/studio-adapters",
-  "version": "0.0.88",
+  "version": "0.0.89",
   "license": "LGPL-3.0-or-later",
   "publishConfig": {
     "access": "public"
@@ -36,5 +36,5 @@
     "@opendaw/eslint-config": "^0.0.27",
     "@opendaw/typescript-config": "^0.0.29"
   },
-  "gitHead": "d57cb3527c3cc9f4b17867cd214454a7349496a7"
+  "gitHead": "c569396a4055626274467ca2d51c8951504f1fb1"
 }