@opendaw/studio-adapters 0.3.4 → 0.3.5

package/dist/preset/PresetEncoder.d.ts

@@ -6,6 +6,7 @@ export declare namespace PresetEncoder {
         excludeEffect?: (box: Box) => boolean;
         includeTimeline?: boolean;
     }) => ArrayBufferLike;
+    const encodeLayerInstrument: (instrument: Box) => ArrayBufferLike;
     const encodeEffects: (effects: ReadonlyArray<Box>, kind: PresetHeader.ChainKind) => ArrayBufferLike;
 }
 //# sourceMappingURL=PresetEncoder.d.ts.map

package/dist/preset/PresetEncoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PresetEncoder.d.ts","sourceRoot":"","sources":["../../src/preset/PresetEncoder.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAA2B,MAAM,kBAAkB,CAAA;AAC9D,OAAO,EAAC,YAAY,EAA4D,MAAM,uBAAuB,CAAA;AAI7G,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAE3C,yBAAiB,aAAa,CAAC;IACpB,MAAM,MAAM,GAAI,cAAc,YAAY,EAC1B,UAAS;QACL,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;QACtC,eAAe,CAAC,EAAE,OAAO,CAAA;KACvB,KAAG,eA+B/B,CAAA;IAEM,MAAM,aAAa,GACtB,SAAS,aAAa,CAAC,GAAG,CAAC,EAC3B,MAAM,YAAY,CAAC,SAAS,KAC7B,eAmFF,CAAA;CACJ"}
+{"version":3,"file":"PresetEncoder.d.ts","sourceRoot":"","sources":["../../src/preset/PresetEncoder.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,GAAG,EAA2B,MAAM,kBAAkB,CAAA;AAC9D,OAAO,EAAC,YAAY,EAA4D,MAAM,uBAAuB,CAAA;AAI7G,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAE3C,yBAAiB,aAAa,CAAC;IACpB,MAAM,MAAM,GAAI,cAAc,YAAY,EAC1B,UAAS;QACL,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;QACtC,eAAe,CAAC,EAAE,OAAO,CAAA;KACvB,KAAG,eA+B/B,CAAA;IAGM,MAAM,qBAAqB,GAAI,YAAY,GAAG,KAAG,eAkCvD,CAAA;IAEM,MAAM,aAAa,GACtB,SAAS,aAAa,CAAC,GAAG,CAAC,EAC3B,MAAM,YAAY,CAAC,SAAS,KAC7B,eAmFF,CAAA;CACJ"}

package/dist/preset/PresetEncoder.js

@@ -36,6 +36,42 @@ export var PresetEncoder;
         boxGraph.endTransaction();
         return Arrays.concatArrayBuffers(header.toArrayBuffer(), boxGraph.toArrayBuffer());
     };
+    // saved as an ordinary instrument preset, in a wrapper unit of its own
+    PresetEncoder.encodeLayerInstrument = (instrument) => {
+        const header = ByteArrayOutput.create();
+        header.writeInt(PresetHeader.MAGIC_HEADER_OPEN);
+        header.writeInt(PresetHeader.FORMAT_VERSION);
+        const preset = ProjectSkeleton.empty({ createOutputMaximizer: false, createDefaultUser: false });
+        const { boxGraph, mandatoryBoxes: { rootBox, primaryAudioBusBox } } = preset;
+        boxGraph.beginTransaction();
+        const captureBox = CaptureMidiBox.create(boxGraph, UUID.generate());
+        const wrapperAudioUnit = AudioUnitBox.create(boxGraph, UUID.generate(), box => {
+            box.collection.refer(rootBox.audioUnits);
+            box.output.refer(primaryAudioBusBox.input);
+            box.index.setValue(0);
+            box.type.setValue(AudioUnitType.Instrument);
+            box.capture.refer(captureBox);
+        });
+        const dependencies = TransferUtils.deviceDependencies(instrument);
+        const uuidMap = TransferUtils.mapUuids([instrument, ...dependencies]);
+        PointerField.decodeWith({
+            map: (pointer, address) => {
+                const internal = address.flatMap(addr => uuidMap.opt(addr.uuid).map(({ target }) => addr.moveTo(target)));
+                if (internal.nonEmpty()) {
+                    return internal;
+                }
+                if (pointer.pointerType === Pointers.InstrumentHost) {
+                    return Option.wrap(wrapperAudioUnit.input.address);
+                }
+                if (pointer.pointerType === Pointers.ModulatorCollection) {
+                    return Option.wrap(rootBox.modulators.address);
+                }
+                return address.flatMap(addr => boxGraph.findBox(addr.uuid).nonEmpty() ? Option.wrap(addr) : Option.None);
+            }
+        }, () => TransferUtils.cloneBoxes([instrument, ...dependencies], uuidMap, boxGraph));
+        boxGraph.endTransaction();
+        return Arrays.concatArrayBuffers(header.toArrayBuffer(), boxGraph.toArrayBuffer());
+    };
     PresetEncoder.encodeEffects = (effects, kind) => {
         const header = ByteArrayOutput.create();
         header.writeInt(PresetHeader.MAGIC_HEADER_OPEN);

package/dist/timeline/RegionOverlap.d.ts

@@ -0,0 +1,13 @@
+import { int, Option } from "@opendaw/lib-std";
+import { ppqn } from "@opendaw/lib-dsp";
+import { TrackBox } from "@opendaw/studio-boxes";
+import { AnyRegionBox } from "../unions";
+import { BoxAdapters } from "../BoxAdapters";
+export declare namespace RegionOverlap {
+    const boundaryTolerance: (value: ppqn) => ppqn;
+    const endsAtSuccessor: (box: AnyRegionBox) => boolean;
+    const sortedRegions: (trackBox: TrackBox) => Array<AnyRegionBox>;
+    const find: (sorted: ReadonlyArray<AnyRegionBox>) => Option<int>;
+    const hasSpace: (boxAdapters: BoxAdapters, trackBox: TrackBox, position: ppqn, complete: ppqn) => boolean;
+}
+//# sourceMappingURL=RegionOverlap.d.ts.map

package/dist/timeline/RegionOverlap.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RegionOverlap.d.ts","sourceRoot":"","sources":["../../src/timeline/RegionOverlap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,MAAM,EAAC,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAC,IAAI,EAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAiB,QAAQ,EAAC,MAAM,uBAAuB,CAAA;AAC9D,OAAO,EAAC,YAAY,EAAgB,MAAM,WAAW,CAAA;AACrD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAG1C,yBAAiB,aAAa,CAAC;IAGpB,MAAM,iBAAiB,GAAI,OAAO,IAAI,KAAG,IAAuD,CAAA;IAGhG,MAAM,eAAe,GAAI,KAAK,YAAY,KAAG,OAC6B,CAAA;IAE1E,MAAM,aAAa,GAAI,UAAU,QAAQ,KAAG,KAAK,CAAC,YAAY,CAEW,CAAA;IAEzE,MAAM,IAAI,GAAI,QAAQ,aAAa,CAAC,YAAY,CAAC,KAAG,MAAM,CAAC,GAAG,CAUpE,CAAA;IAEM,MAAM,QAAQ,GAAI,aAAa,WAAW,EAAE,UAAU,QAAQ,EAAE,UAAU,IAAI,EAAE,UAAU,IAAI,KAAG,OAIlG,CAAA;CACT"}

package/dist/timeline/RegionOverlap.js

@@ -0,0 +1,32 @@
+import { Option } from "@opendaw/lib-std";
+import { TimeBase } from "@opendaw/lib-dsp";
+import { AudioRegionBox } from "@opendaw/studio-boxes";
+import { UnionBoxTypes } from "../unions";
+import { RegionAdapters } from "./RegionBoxAdapter";
+export var RegionOverlap;
+(function (RegionOverlap) {
+    const Float32RelativeEpsilon = 2 ** -23; // float32 has 23 mantissa bits
+    RegionOverlap.boundaryTolerance = (value) => Math.abs(value) * Float32RelativeEpsilon + 1e-3;
+    // The end of a seconds region moves with the tempo. It ends where the next region starts, never an error.
+    RegionOverlap.endsAtSuccessor = (box) => box instanceof AudioRegionBox && box.timeBase.getValue() !== TimeBase.Musical;
+    RegionOverlap.sortedRegions = (trackBox) => trackBox.regions.pointerHub.incoming()
+        .map(({ box }) => UnionBoxTypes.asRegionBox(box))
+        .sort((left, right) => left.position.getValue() - right.position.getValue());
+    RegionOverlap.find = (sorted) => {
+        for (let index = 1; index < sorted.length; index++) {
+            const prev = sorted[index - 1];
+            if (RegionOverlap.endsAtSuccessor(prev)) {
+                continue;
+            }
+            const position = sorted[index].position.getValue();
+            if (prev.position.getValue() + prev.duration.getValue() > position + RegionOverlap.boundaryTolerance(position)) {
+                return Option.wrap(index);
+            }
+        }
+        return Option.None;
+    };
+    RegionOverlap.hasSpace = (boxAdapters, trackBox, position, complete) => trackBox.regions.pointerHub.incoming().every(({ box }) => {
+        const region = RegionAdapters.for(boxAdapters, box);
+        return region.resolveComplete(region.position) <= position || region.position >= complete;
+    });
+})(RegionOverlap || (RegionOverlap = {}));

package/dist/transfer/TransferUtils.d.ts

@@ -1,5 +1,5 @@
 import { ppqn } from "@opendaw/lib-dsp";
-import { int, Option, SortedSet, UUID } from "@opendaw/lib-std";
+import { int, Option, Predicate, SortedSet, UUID } from "@opendaw/lib-std";
 import { AudioUnitBox, RootBox } from "@opendaw/studio-boxes";
 import { Address, Box, BoxGraph, PointerField } from "@opendaw/lib-box";
 import { ProjectSkeleton } from "../project/ProjectSkeleton";
@@ -13,6 +13,9 @@ export declare namespace TransferUtils {
     const shouldExclude: (box: Box) => boolean;
     const keepsIdentity: (box: Box) => boolean;
     const withModulators: (boxes: ReadonlyArray<Box>) => ReadonlyArray<Box>;
+    const deviceDependencies: (root: Box, exclude?: Predicate<Box>) => ReadonlyArray<Box>;
+    const mapUuids: (boxes: ReadonlyArray<Box>) => SortedSet<UUID.Bytes, UUIDMapper>;
+    const cloneBoxes: (sources: ReadonlyArray<Box>, uuidMap: SortedSet<UUID.Bytes, UUIDMapper>, targetGraph: BoxGraph) => void;
     const mapModulatorCollection: (pointer: PointerField, targetGraph: BoxGraph) => Option<Address>;
     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;

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,EAMH,GAAG,EAGH,MAAM,EAGN,SAAS,EACT,IAAI,EACP,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAC,YAAY,EAAgD,OAAO,EAAW,MAAM,uBAAuB,CAAA;AAEnH,OAAO,EAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAc,YAAY,EAAC,MAAM,kBAAkB,CAAA;AACjF,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAC,YAAY,EAAgB,MAAM,WAAW,CAAA;AAIrD,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;IAC/F,MAAM,aAAa,GAAI,KAAK,GAAG,KAAG,OAA8D,CAAA;IAGhG,MAAM,cAAc,GAAI,OAAO,aAAa,CAAC,GAAG,CAAC,KAAG,aAAa,CAAC,GAAG,CAa3E,CAAA;IAEM,MAAM,sBAAsB,GAAI,SAAS,YAAY,EAAE,aAAa,QAAQ,KAAG,MAAM,CAAC,OAAO,CAI/E,CAAA;IAEd,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,IAqC5D,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,IA2BrD,CAAA;IAEM,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,EAGH,MAAM,EACN,SAAS,EAET,SAAS,EACT,IAAI,EACP,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAC,YAAY,EAAgD,OAAO,EAAW,MAAM,uBAAuB,CAAA;AAEnH,OAAO,EAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAc,YAAY,EAAC,MAAM,kBAAkB,CAAA;AACjF,OAAO,EAAC,eAAe,EAAC,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAC,YAAY,EAAgB,MAAM,WAAW,CAAA;AAIrD,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;IAC/F,MAAM,aAAa,GAAI,KAAK,GAAG,KAAG,OAA8D,CAAA;IAGhG,MAAM,cAAc,GAAI,OAAO,aAAa,CAAC,GAAG,CAAC,KAAG,aAAa,CAAC,GAAG,CAa3E,CAAA;IAEM,MAAM,kBAAkB,GAAI,MAAM,GAAG,EAAE,UAAS,SAAS,CAAC,GAAG,CAAe,KAAG,aAAa,CAAC,GAAG,CAK7D,CAAA;IAEnC,MAAM,QAAQ,GAAI,OAAO,aAAa,CAAC,GAAG,CAAC,KAAG,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAOpF,CAAA;IAEM,MAAM,UAAU,GAAI,SAAS,aAAa,CAAC,GAAG,CAAC,EAC3B,SAAS,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,EAC1C,aAAa,QAAQ,KAAG,IAK7C,CAAA;IAEC,MAAM,sBAAsB,GAAI,SAAS,YAAY,EAAE,aAAa,QAAQ,KAAG,MAAM,CAAC,OAAO,CAI/E,CAAA;IAEd,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,IAqC5D,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,IA2BrD,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

@@ -31,6 +31,24 @@ export var TransferUtils;
         });
         return [...boxes, ...modulators];
     };
+    TransferUtils.deviceDependencies = (root, exclude = () => false) => TransferUtils.withModulators(Array.from(root.graph.dependenciesOf([root], {
+        alwaysFollowMandatory: true,
+        stopAtResources: true,
+        excludeBox: box => exclude(box) || TransferUtils.shouldExclude(box) || TransferUtils.excludeTimelinePredicate(box) || box instanceof AudioUnitBox
+    }).boxes).filter(box => box !== root));
+    TransferUtils.mapUuids = (boxes) => {
+        const uuidMap = UUID.newSet(({ source }) => source);
+        uuidMap.addMany(boxes.map(box => ({
+            source: box.address.uuid,
+            target: TransferUtils.keepsIdentity(box) ? box.address.uuid : UUID.generate()
+        })));
+        return uuidMap;
+    };
+    TransferUtils.cloneBoxes = (sources, uuidMap, targetGraph) => sources.forEach(source => {
+        const input = new ByteArrayInput(source.toArrayBuffer());
+        const uuid = uuidMap.get(source.address.uuid, "uuid mapping").target;
+        targetGraph.createBox(source.name, uuid, box => box.read(input));
+    });
     TransferUtils.mapModulatorCollection = (pointer, targetGraph) => pointer.pointerType === Pointers.ModulatorCollection
         ? Option.wrap(targetGraph.boxes().find(box => isInstanceOf(box, RootBox)))
             .map(rootBox => rootBox.modulators.address)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendaw/studio-adapters",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "license": "AGPL-3.0-or-later",
   "publishConfig": {
     "access": "public"
@@ -20,24 +20,24 @@
     "generate-exports": "node generate-exports.mjs",
     "build": "npm run generate-exports && tsc",
     "lint": "eslint \"**/*.ts\"",
-    "test": "echo \"No tests to run\"",
+    "test": "vitest run",
     "generate-all-boxes": "npx tsx scripts/generate-all-boxes.ts",
     "pregenerate-all-boxes": "npm run build -w @opendaw/studio-forge-boxes && npm run build -w @opendaw/studio-boxes"
   },
   "dependencies": {
-    "@opendaw/lib-box": "^0.0.94",
-    "@opendaw/lib-dsp": "^0.0.93",
-    "@opendaw/lib-fusion": "^0.0.103",
-    "@opendaw/lib-midi": "^0.0.74",
-    "@opendaw/lib-runtime": "^0.0.86",
-    "@opendaw/lib-std": "^0.0.85",
-    "@opendaw/studio-boxes": "^0.0.110",
-    "@opendaw/studio-enums": "^0.1.3",
+    "@opendaw/lib-box": "^0.0.95",
+    "@opendaw/lib-dsp": "^0.0.94",
+    "@opendaw/lib-fusion": "^0.0.104",
+    "@opendaw/lib-midi": "^0.0.75",
+    "@opendaw/lib-runtime": "^0.0.87",
+    "@opendaw/lib-std": "^0.0.86",
+    "@opendaw/studio-boxes": "^0.0.111",
+    "@opendaw/studio-enums": "^0.1.4",
     "soundfont2": "^0.5.0"
   },
   "devDependencies": {
     "@opendaw/eslint-config": "^0.0.28",
     "@opendaw/typescript-config": "^0.0.32"
   },
-  "gitHead": "b540a9cb4d3934297e8bb2acf8557781eb9580f0"
+  "gitHead": "88113f892cea2fa9495289a9c166b6fe0f93ce69"
 }