@yume-chan/scrcpy 0.0.23 → 0.0.24

package/esm/options/1_24.d.ts

@@ -1,10 +1,9 @@
 import type { ScrcpyOptionsInit1_23 } from "./1_23.js";
-import { ScrcpyOptions1_23 } from "./1_23.js";
-import { ScrcpyOptionsBase } from "./types.js";
+import { ScrcpyOptions } from "./types.js";
 export interface ScrcpyOptionsInit1_24 extends ScrcpyOptionsInit1_23 {
     powerOn?: boolean;
 }
-export declare class ScrcpyOptions1_24 extends ScrcpyOptionsBase<ScrcpyOptionsInit1_24, ScrcpyOptions1_23> {
+export declare class ScrcpyOptions1_24 extends ScrcpyOptions<ScrcpyOptionsInit1_24> {
     static readonly DEFAULTS: {
         readonly powerOn: true;
         readonly cleanup: true;

package/esm/options/1_24.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"1_24.d.ts","sourceRoot":"","sources":["../../src/options/1_24.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAChE,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,iBAAkB,SAAQ,iBAAiB,CACpD,qBAAqB,EACrB,iBAAiB,CACpB;IACG,MAAM,CAAC,QAAQ,CAAC,QAAQ;;;;;;;;;;;;;;;;;;;;;;MAG6B;IAErD,IAAa,QAAQ,IAAI,QAAQ,CAAC,qBAAqB,CAAC,CAEvD;gBAEW,IAAI,EAAE,qBAAqB;IAO9B,SAAS,IAAI,MAAM,EAAE;CAGjC"}
+{"version":3,"file":"1_24.d.ts","sourceRoot":"","sources":["../../src/options/1_24.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAChE,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,qBAAa,iBAAkB,SAAQ,aAAa,CAAC,qBAAqB,CAAC;IACvE,MAAM,CAAC,QAAQ,CAAC,QAAQ;;;;;;;;;;;;;;;;;;;;;;MAG6B;IAErD,IAAa,QAAQ,IAAI,QAAQ,CAAC,qBAAqB,CAAC,CAEvD;gBAEW,IAAI,EAAE,qBAAqB;IAI9B,SAAS,IAAI,MAAM,EAAE;CAGjC"}

package/esm/options/1_24.js

@@ -1,7 +1,7 @@
 import { ScrcpyOptions1_21 } from "./1_21.js";
 import { ScrcpyOptions1_23 } from "./1_23.js";
-import { ScrcpyOptionsBase } from "./types.js";
-export class ScrcpyOptions1_24 extends ScrcpyOptionsBase {
+import { ScrcpyOptions } from "./types.js";
+export class ScrcpyOptions1_24 extends ScrcpyOptions {
     static DEFAULTS = {
         ...ScrcpyOptions1_23.DEFAULTS,
         powerOn: true,
@@ -10,10 +10,7 @@ export class ScrcpyOptions1_24 extends ScrcpyOptionsBase {
         return ScrcpyOptions1_24.DEFAULTS;
     }
     constructor(init) {
-        super(new ScrcpyOptions1_23(init), {
-            ...ScrcpyOptions1_24.DEFAULTS,
-            ...init,
-        });
+        super(ScrcpyOptions1_23, init, ScrcpyOptions1_24.DEFAULTS);
     }
     serialize() {
         return ScrcpyOptions1_21.serialize(this.value, this.defaults);

package/esm/options/1_24.js.map

@@ -1 +1 @@
-{"version":3,"file":"1_24.js","sourceRoot":"","sources":["../../src/options/1_24.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAM/C,MAAM,OAAO,iBAAkB,SAAQ,iBAGtC;IACG,MAAM,CAAU,QAAQ,GAAG;QACvB,GAAG,iBAAiB,CAAC,QAAQ;QAC7B,OAAO,EAAE,IAAI;KACmC,CAAC;IAErD,IAAa,QAAQ;QACjB,OAAO,iBAAiB,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED,YAAY,IAA2B;QACnC,KAAK,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE;YAC/B,GAAG,iBAAiB,CAAC,QAAQ;YAC7B,GAAG,IAAI;SACV,CAAC,CAAC;IACP,CAAC;IAEQ,SAAS;QACd,OAAO,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC"}
+{"version":3,"file":"1_24.js","sourceRoot":"","sources":["../../src/options/1_24.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAM3C,MAAM,OAAO,iBAAkB,SAAQ,aAAoC;IACvE,MAAM,CAAU,QAAQ,GAAG;QACvB,GAAG,iBAAiB,CAAC,QAAQ;QAC7B,OAAO,EAAE,IAAI;KACmC,CAAC;IAErD,IAAa,QAAQ;QACjB,OAAO,iBAAiB,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED,YAAY,IAA2B;QACnC,KAAK,CAAC,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAEQ,SAAS;QACd,OAAO,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC"}

package/esm/options/1_25/options.d.ts

@@ -1,8 +1,7 @@
 import type { ScrcpyScrollController } from "../1_16/index.js";
 import type { ScrcpyOptionsInit1_24 } from "../1_24.js";
-import { ScrcpyOptions1_24 } from "../1_24.js";
-import { ScrcpyOptionsBase } from "../types.js";
-export declare class ScrcpyOptions1_25 extends ScrcpyOptionsBase<ScrcpyOptionsInit1_24, ScrcpyOptions1_24> {
+import { ScrcpyOptions } from "../types.js";
+export declare class ScrcpyOptions1_25 extends ScrcpyOptions<ScrcpyOptionsInit1_24> {
     get defaults(): Required<ScrcpyOptionsInit1_24>;
     constructor(init: ScrcpyOptionsInit1_24);
     serialize(): string[];

package/esm/options/1_25/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/options/1_25/options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIhD,qBAAa,iBAAkB,SAAQ,iBAAiB,CACpD,qBAAqB,EACrB,iBAAiB,CACpB;IACG,IAAa,QAAQ,IAAI,QAAQ,CAAC,qBAAqB,CAAC,CAEvD;gBAEW,IAAI,EAAE,qBAAqB;IAO9B,SAAS,IAAI,MAAM,EAAE;IAIrB,sBAAsB,IAAI,sBAAsB;CAG5D"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/options/1_25/options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5C,qBAAa,iBAAkB,SAAQ,aAAa,CAAC,qBAAqB,CAAC;IACvE,IAAa,QAAQ,IAAI,QAAQ,CAAC,qBAAqB,CAAC,CAEvD;gBAEW,IAAI,EAAE,qBAAqB;IAI9B,SAAS,IAAI,MAAM,EAAE;IAIrB,sBAAsB,IAAI,sBAAsB;CAG5D"}

package/esm/options/1_25/options.js

@@ -1,16 +1,13 @@
 import { ScrcpyOptions1_21 } from "../1_21.js";
 import { ScrcpyOptions1_24 } from "../1_24.js";
-import { ScrcpyOptionsBase } from "../types.js";
+import { ScrcpyOptions } from "../types.js";
 import { ScrcpyScrollController1_25 } from "./scroll.js";
-export class ScrcpyOptions1_25 extends ScrcpyOptionsBase {
+export class ScrcpyOptions1_25 extends ScrcpyOptions {
     get defaults() {
         return ScrcpyOptions1_24.DEFAULTS;
     }
     constructor(init) {
-        super(new ScrcpyOptions1_24(init), {
-            ...ScrcpyOptions1_24.DEFAULTS,
-            ...init,
-        });
+        super(ScrcpyOptions1_24, init, ScrcpyOptions1_24.DEFAULTS);
     }
     serialize() {
         return ScrcpyOptions1_21.serialize(this.value, this.defaults);

package/esm/options/1_25/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/options/1_25/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAEzD,MAAM,OAAO,iBAAkB,SAAQ,iBAGtC;IACG,IAAa,QAAQ;QACjB,OAAO,iBAAiB,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED,YAAY,IAA2B;QACnC,KAAK,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE;YAC/B,GAAG,iBAAiB,CAAC,QAAQ;YAC7B,GAAG,IAAI;SACV,CAAC,CAAC;IACP,CAAC;IAEQ,SAAS;QACd,OAAO,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;IAEQ,sBAAsB;QAC3B,OAAO,IAAI,0BAA0B,EAAE,CAAC;IAC5C,CAAC;CACJ"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/options/1_25/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAEzD,MAAM,OAAO,iBAAkB,SAAQ,aAAoC;IACvE,IAAa,QAAQ;QACjB,OAAO,iBAAiB,CAAC,QAAQ,CAAC;IACtC,CAAC;IAED,YAAY,IAA2B;QACnC,KAAK,CAAC,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAEQ,SAAS;QACd,OAAO,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;IAEQ,sBAAsB;QAC3B,OAAO,IAAI,0BAA0B,EAAE,CAAC;IAC5C,CAAC;CACJ"}

package/esm/options/1_25/scroll.d.ts

@@ -1,8 +1,9 @@
-import Struct, { NumberFieldType } from "@yume-chan/struct";
+import type { NumberFieldVariant } from "@yume-chan/struct";
+import Struct from "@yume-chan/struct";
 import type { ScrcpyInjectScrollControlMessage } from "../../control/index.js";
 import { ScrcpyControlMessageType } from "../../control/index.js";
 import type { ScrcpyScrollController } from "../1_16/index.js";
-export declare const ScrcpyFloatToInt16NumberType: NumberFieldType;
+export declare const ScrcpySignedFloatNumberVariant: NumberFieldVariant;
 export declare const ScrcpyInjectScrollControlMessage1_25: Struct<{
     type: ScrcpyControlMessageType.InjectScroll;
     pointerX: number;

package/esm/options/1_25/scroll.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scroll.d.ts","sourceRoot":"","sources":["../../../src/options/1_25/scroll.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAEX,eAAe,EAClB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAG/D,eAAO,MAAM,4BAA4B,EAAE,eAc1C,CAAC;AAMF,eAAO,MAAM,oCAAoC;;;;;;;;;0CAQ5B,CAAC;AAEtB,MAAM,MAAM,oCAAoC,GAC5C,CAAC,OAAO,oCAAoC,CAAC,CAAC,OAAO,CAAC,CAAC;AAE3D,qBAAa,0BAA2B,YAAW,sBAAsB;IACrE,sBAAsB,CAClB,OAAO,EAAE,gCAAgC,GAC1C,UAAU,GAAG,SAAS;CAG5B"}
+{"version":3,"file":"scroll.d.ts","sourceRoot":"","sources":["../../../src/options/1_25/scroll.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,MAAiC,MAAM,mBAAmB,CAAC;AAElE,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAG/D,eAAO,MAAM,8BAA8B,EAAE,kBAc5C,CAAC;AAMF,eAAO,MAAM,oCAAoC;;;;;;;;;0CAQ5B,CAAC;AAEtB,MAAM,MAAM,oCAAoC,GAC5C,CAAC,OAAO,oCAAoC,CAAC,CAAC,OAAO,CAAC,CAAC;AAE3D,qBAAa,0BAA2B,YAAW,sBAAsB;IACrE,sBAAsB,CAClB,OAAO,EAAE,gCAAgC,GAC1C,UAAU,GAAG,SAAS;CAG5B"}

package/esm/options/1_25/scroll.js

@@ -1,11 +1,12 @@
-import Struct, { NumberFieldDefinition, NumberFieldType, } from "@yume-chan/struct";
+import { getInt16 } from "@yume-chan/no-data-view";
+import Struct, { NumberFieldDefinition } from "@yume-chan/struct";
 import { ScrcpyControlMessageType } from "../../control/index.js";
 import { clamp } from "../1_16/index.js";
-export const ScrcpyFloatToInt16NumberType = {
+export const ScrcpySignedFloatNumberVariant = {
     size: 2,
     signed: true,
     deserialize(array, littleEndian) {
-        const value = NumberFieldType.Int16.deserialize(array, littleEndian);
+        const value = getInt16(array, 0, littleEndian);
         // https://github.com/Genymobile/scrcpy/blob/1f138aef41de651668043b32c4effc2d4adbfc44/server/src/main/java/com/genymobile/scrcpy/Binary.java#L34
         return value === 0x7fff ? 1 : value / 0x8000;
     },
@@ -13,18 +14,18 @@ export const ScrcpyFloatToInt16NumberType = {
         // https://github.com/Genymobile/scrcpy/blob/1f138aef41de651668043b32c4effc2d4adbfc44/app/src/util/binary.h#L65
         value = clamp(value, -1, 1);
         value = value === 1 ? 0x7fff : value * 0x8000;
-        NumberFieldType.Int16.serialize(dataView, offset, value, littleEndian);
+        dataView.setInt16(offset, value, littleEndian);
     },
 };
-const ScrcpyFloatToInt16FieldDefinition = new NumberFieldDefinition(ScrcpyFloatToInt16NumberType);
+const ScrcpySignedFloatFieldDefinition = new NumberFieldDefinition(ScrcpySignedFloatNumberVariant);
 export const ScrcpyInjectScrollControlMessage1_25 = new Struct()
     .uint8("type", ScrcpyControlMessageType.InjectScroll)
     .uint32("pointerX")
     .uint32("pointerY")
     .uint16("screenWidth")
     .uint16("screenHeight")
-    .field("scrollX", ScrcpyFloatToInt16FieldDefinition)
-    .field("scrollY", ScrcpyFloatToInt16FieldDefinition)
+    .field("scrollX", ScrcpySignedFloatFieldDefinition)
+    .field("scrollY", ScrcpySignedFloatFieldDefinition)
     .int32("buttons");
 export class ScrcpyScrollController1_25 {
     serializeScrollMessage(message) {

package/esm/options/1_25/scroll.js.map

@@ -1 +1 @@
-{"version":3,"file":"scroll.js","sourceRoot":"","sources":["../../../src/options/1_25/scroll.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EACX,qBAAqB,EACrB,eAAe,GAClB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAElE,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,MAAM,CAAC,MAAM,4BAA4B,GAAoB;IACzD,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,IAAI;IACZ,WAAW,CAAC,KAAK,EAAE,YAAY;QAC3B,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QACrE,gJAAgJ;QAChJ,OAAO,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC;IACjD,CAAC;IACD,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY;QAC3C,+GAA+G;QAC/G,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5B,KAAK,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC;QAC9C,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IAC3E,CAAC;CACJ,CAAC;AAEF,MAAM,iCAAiC,GAAG,IAAI,qBAAqB,CAC/D,4BAA4B,CAC/B,CAAC;AAEF,MAAM,CAAC,MAAM,oCAAoC,GAAG,IAAI,MAAM,EAAE;KAC3D,KAAK,CAAC,MAAM,EAAE,wBAAwB,CAAC,YAAqB,CAAC;KAC7D,MAAM,CAAC,UAAU,CAAC;KAClB,MAAM,CAAC,UAAU,CAAC;KAClB,MAAM,CAAC,aAAa,CAAC;KACrB,MAAM,CAAC,cAAc,CAAC;KACtB,KAAK,CAAC,SAAS,EAAE,iCAAiC,CAAC;KACnD,KAAK,CAAC,SAAS,EAAE,iCAAiC,CAAC;KACnD,KAAK,CAAC,SAAS,CAAC,CAAC;AAKtB,MAAM,OAAO,0BAA0B;IACnC,sBAAsB,CAClB,OAAyC;QAEzC,OAAO,oCAAoC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACnE,CAAC;CACJ"}
+{"version":3,"file":"scroll.js","sourceRoot":"","sources":["../../../src/options/1_25/scroll.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,OAAO,MAAM,EAAE,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAGlE,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAElE,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,MAAM,CAAC,MAAM,8BAA8B,GAAuB;IAC9D,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,IAAI;IACZ,WAAW,CAAC,KAAK,EAAE,YAAY;QAC3B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC;QAC/C,gJAAgJ;QAChJ,OAAO,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC;IACjD,CAAC;IACD,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY;QAC3C,+GAA+G;QAC/G,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5B,KAAK,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC;QAC9C,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IACnD,CAAC;CACJ,CAAC;AAEF,MAAM,gCAAgC,GAAG,IAAI,qBAAqB,CAC9D,8BAA8B,CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,oCAAoC,GAAG,IAAI,MAAM,EAAE;KAC3D,KAAK,CAAC,MAAM,EAAE,wBAAwB,CAAC,YAAqB,CAAC;KAC7D,MAAM,CAAC,UAAU,CAAC;KAClB,MAAM,CAAC,UAAU,CAAC;KAClB,MAAM,CAAC,aAAa,CAAC;KACrB,MAAM,CAAC,cAAc,CAAC;KACtB,KAAK,CAAC,SAAS,EAAE,gCAAgC,CAAC;KAClD,KAAK,CAAC,SAAS,EAAE,gCAAgC,CAAC;KAClD,KAAK,CAAC,SAAS,CAAC,CAAC;AAKtB,MAAM,OAAO,0BAA0B;IACnC,sBAAsB,CAClB,OAAyC;QAEzC,OAAO,oCAAoC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACnE,CAAC;CACJ"}

package/esm/options/2_0.d.ts

@@ -4,10 +4,10 @@ import Struct from "@yume-chan/struct";
 import type { AndroidMotionEventAction, ScrcpyInjectTouchControlMessage } from "../control/index.js";
 import { CodecOptions } from "./1_16/index.js";
 import type { ScrcpyOptionsInit1_24 } from "./1_24.js";
-import { ScrcpyOptions1_25 } from "./1_25/index.js";
 import type { ScrcpyAudioStreamMetadata, ScrcpyVideoStream } from "./codec.js";
+import { ScrcpyAudioCodec } from "./codec.js";
 import type { ScrcpyDisplay, ScrcpyEncoder, ScrcpyOptionValue } from "./types.js";
-import { ScrcpyOptionsBase } from "./types.js";
+import { ScrcpyOptions } from "./types.js";
 export declare const ScrcpyInjectTouchControlMessage2_0: Struct<{
     type: number;
     action: AndroidMotionEventAction;
@@ -33,28 +33,30 @@ export interface ScrcpyOptionsInit2_0 extends Omit<ScrcpyOptionsInit1_24, "bitRa
     videoCodec?: "h264" | "h265" | "av1";
     videoBitRate?: number;
     videoCodecOptions?: CodecOptions;
-    videoEncoder?: string;
+    videoEncoder?: string | undefined;
     audio?: boolean;
-    audioCodec?: "opus" | "aac" | "raw";
+    audioCodec?: "raw" | "opus" | "aac";
     audioBitRate?: number;
     audioCodecOptions?: CodecOptions;
-    audioEncoder?: string;
+    audioEncoder?: string | undefined;
     listEncoders?: boolean;
     listDisplays?: boolean;
     sendCodecMeta?: boolean;
 }
-export declare class ScrcpyOptions2_0 extends ScrcpyOptionsBase<ScrcpyOptionsInit2_0, ScrcpyOptions1_25> {
+export declare function omit<T extends object, K extends keyof T>(obj: T, keys: K[]): Omit<T, K>;
+export declare class ScrcpyOptions2_0 extends ScrcpyOptions<ScrcpyOptionsInit2_0> {
+    static parseAudioMetadata(stream: ReadableStream<Uint8Array>, sendCodecMeta: boolean, mapMetadata: (value: number) => ScrcpyAudioCodec, getOptionCodec: () => ScrcpyAudioCodec): Promise<ScrcpyAudioStreamMetadata>;
     static readonly DEFAULTS: {
         readonly scid: ScrcpyInstanceId;
         readonly videoCodec: "h264";
         readonly videoBitRate: 8000000;
         readonly videoCodecOptions: CodecOptions;
-        readonly videoEncoder: "";
+        readonly videoEncoder: undefined;
         readonly audio: true;
         readonly audioCodec: "opus";
         readonly audioBitRate: 128000;
         readonly audioCodecOptions: CodecOptions;
-        readonly audioEncoder: "";
+        readonly audioEncoder: undefined;
         readonly listEncoders: false;
         readonly listDisplays: false;
         readonly sendCodecMeta: true;

package/esm/options/2_0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"2_0.d.ts","sourceRoot":"","sources":["../../src/options/2_0.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAK9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,MAAwC,MAAM,mBAAmB,CAAC;AAEzE,OAAO,KAAK,EACR,wBAAwB,EACxB,+BAA+B,EAClC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACH,YAAY,EAGf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/E,OAAO,KAAK,EACR,aAAa,EACb,aAAa,EACb,iBAAiB,EACpB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,eAAO,MAAM,kCAAkC;;;;;;;;;;;0CAUzB,CAAC;AAEvB,MAAM,MAAM,kCAAkC,GAC1C,CAAC,OAAO,kCAAkC,CAAC,CAAC,OAAO,CAAC,CAAC;AAEzD,qBAAa,gBAAiB,YAAW,iBAAiB;IACtD,MAAM,CAAC,QAAQ,CAAC,IAAI,mBAA4B;IAEhD,MAAM,CAAC,MAAM,IAAI,gBAAgB;IAKjC,KAAK,EAAE,MAAM,CAAC;gBAEF,KAAK,EAAE,MAAM;IAIzB,aAAa,IAAI,MAAM,GAAG,SAAS;CAMtC;AAED,MAAM,WAAW,oBACb,SAAQ,IAAI,CACR,qBAAqB,EACrB,SAAS,GAAG,cAAc,GAAG,aAAa,CAC7C;IACD,IAAI,CAAC,EAAE,gBAAgB,CAAC;IAExB,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,YAAY,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,CAAC;IACpC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,YAAY,CAAC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;CAC3B;AAeD,qBAAa,gBAAiB,SAAQ,iBAAiB,CACnD,oBAAoB,EACpB,iBAAiB,CACpB;IACG,MAAM,CAAC,QAAQ,CAAC,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAsB4B;IAEpD,IAAa,QAAQ,IAAI,QAAQ,CAAC,oBAAoB,CAAC,CAEtD;gBAEW,IAAI,EAAE,oBAAoB;IAO7B,SAAS,IAAI,MAAM,EAAE;IAIrB,eAAe,IAAI,IAAI;IAIvB,eAAe,IAAI,IAAI;IAIvB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IA0BrD,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAcrD,wBAAwB,CAC7B,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GACnC,cAAc,CAAC,iBAAiB,CAAC;IAwD3B,wBAAwB,CAC7B,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,GACnC,cAAc,CAAC,yBAAyB,CAAC;IAmFnC,kCAAkC,CACvC,OAAO,EAAE,+BAA+B,GACzC,UAAU;CAGhB"}
+{"version":3,"file":"2_0.d.ts","sourceRoot":"","sources":["../../src/options/2_0.ts"],"names":[],"mappings":"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"}

package/esm/options/2_0.js

@@ -1,11 +1,12 @@
+import { getUint32BigEndian } from "@yume-chan/no-data-view";
 import { BufferedReadableStream, PushReadableStream, } from "@yume-chan/stream-extra";
-import Struct, { NumberFieldType, placeholder } from "@yume-chan/struct";
-import { CodecOptions, ScrcpyFloatToUint16FieldDefinition, ScrcpyOptions1_16, } from "./1_16/index.js";
+import Struct, { placeholder } from "@yume-chan/struct";
+import { CodecOptions, ScrcpyOptions1_16, ScrcpyUnsignedFloatFieldDefinition, } from "./1_16/index.js";
 import { ScrcpyOptions1_21 } from "./1_21.js";
 import { ScrcpyOptions1_24 } from "./1_24.js";
 import { ScrcpyOptions1_25 } from "./1_25/index.js";
 import { ScrcpyAudioCodec, ScrcpyVideoCodecId } from "./codec.js";
-import { ScrcpyOptionsBase } from "./types.js";
+import { ScrcpyOptions } from "./types.js";
 export const ScrcpyInjectTouchControlMessage2_0 = new Struct()
     .uint8("type")
     .uint8("action", placeholder())
@@ -14,7 +15,7 @@ export const ScrcpyInjectTouchControlMessage2_0 = new Struct()
     .uint32("pointerY")
     .uint16("screenWidth")
     .uint16("screenHeight")
-    .field("pressure", ScrcpyFloatToUint16FieldDefinition)
+    .field("pressure", ScrcpyUnsignedFloatFieldDefinition)
     .uint32("actionButton")
     .uint32("buttons");
 export class ScrcpyInstanceId {
@@ -34,7 +35,7 @@ export class ScrcpyInstanceId {
         return this.value.toString(16);
     }
 }
-function omit(obj, keys) {
+export function omit(obj, keys) {
     const result = {};
     for (const key in obj) {
         if (!keys.includes(key)) {
@@ -43,7 +44,49 @@ function omit(obj, keys) {
     }
     return result;
 }
-export class ScrcpyOptions2_0 extends ScrcpyOptionsBase {
+export class ScrcpyOptions2_0 extends ScrcpyOptions {
+    static async parseAudioMetadata(stream, sendCodecMeta, mapMetadata, getOptionCodec) {
+        const buffered = new BufferedReadableStream(stream);
+        const buffer = await buffered.readExactly(4);
+        // Treat it as a 32-bit number for simpler comparisons
+        const codecMetadataValue = getUint32BigEndian(buffer, 0);
+        // Server will send `0x00_00_00_00` and `0x00_00_00_01` even if `sendCodecMeta` is false
+        switch (codecMetadataValue) {
+            case 0x00_00_00_00:
+                return {
+                    type: "disabled",
+                };
+            case 0x00_00_00_01:
+                return {
+                    type: "errored",
+                };
+        }
+        if (sendCodecMeta) {
+            return {
+                type: "success",
+                codec: mapMetadata(codecMetadataValue),
+                stream: buffered.release(),
+            };
+        }
+        return {
+            type: "success",
+            // Infer codec from `audioCodec` option
+            codec: getOptionCodec(),
+            stream: new PushReadableStream(async (controller) => {
+                // Put the first 4 bytes back
+                await controller.enqueue(buffer);
+                const stream = buffered.release();
+                const reader = stream.getReader();
+                while (true) {
+                    const { done, value } = await reader.read();
+                    if (done) {
+                        break;
+                    }
+                    await controller.enqueue(value);
+                }
+            }),
+        };
+    }
     static DEFAULTS = {
         ...omit(ScrcpyOptions1_24.DEFAULTS, [
             "bitRate",
@@ -54,12 +97,12 @@ export class ScrcpyOptions2_0 extends ScrcpyOptionsBase {
         videoCodec: "h264",
         videoBitRate: 8000000,
         videoCodecOptions: new CodecOptions(),
-        videoEncoder: "",
+        videoEncoder: undefined,
         audio: true,
         audioCodec: "opus",
         audioBitRate: 128000,
         audioCodecOptions: new CodecOptions(),
-        audioEncoder: "",
+        audioEncoder: undefined,
         listEncoders: false,
         listDisplays: false,
         sendCodecMeta: true,
@@ -68,10 +111,7 @@ export class ScrcpyOptions2_0 extends ScrcpyOptionsBase {
         return ScrcpyOptions2_0.DEFAULTS;
     }
     constructor(init) {
-        super(new ScrcpyOptions1_25(init), {
-            ...ScrcpyOptions2_0.DEFAULTS,
-            ...init,
-        });
+        super(ScrcpyOptions1_25, init, ScrcpyOptions2_0.DEFAULTS);
     }
     serialize() {
         return ScrcpyOptions1_21.serialize(this.value, this.defaults);
@@ -167,73 +207,27 @@ export class ScrcpyOptions2_0 extends ScrcpyOptionsBase {
         })();
     }
     parseAudioStreamMetadata(stream) {
-        return (async () => {
-            const buffered = new BufferedReadableStream(stream);
-            const buffer = await buffered.readExactly(NumberFieldType.Uint32.size);
-            const codecMetadataValue = NumberFieldType.Uint32.deserialize(buffer, false);
-            // Server will send `0x00_00_00_00` and `0x00_00_00_01` even if `sendCodecMeta` is false
-            switch (codecMetadataValue) {
-                case 0x00_00_00_00:
-                    return {
-                        type: "disabled",
-                    };
-                case 0x00_00_00_01:
-                    return {
-                        type: "errored",
-                    };
-            }
-            if (this.value.sendCodecMeta) {
-                let codec;
-                switch (codecMetadataValue) {
-                    case ScrcpyAudioCodec.OPUS.metadataValue:
-                        codec = ScrcpyAudioCodec.OPUS;
-                        break;
-                    case ScrcpyAudioCodec.AAC.metadataValue:
-                        codec = ScrcpyAudioCodec.AAC;
-                        break;
-                    case ScrcpyAudioCodec.RAW.metadataValue:
-                        codec = ScrcpyAudioCodec.RAW;
-                        break;
-                    default:
-                        throw new Error(`Unknown audio codec metadata value: ${codecMetadataValue}`);
-                }
-                return {
-                    type: "success",
-                    codec,
-                    stream: buffered.release(),
-                };
+        return ScrcpyOptions2_0.parseAudioMetadata(stream, this.value.sendCodecMeta, (value) => {
+            switch (value) {
+                case ScrcpyAudioCodec.RAW.metadataValue:
+                    return ScrcpyAudioCodec.RAW;
+                case ScrcpyAudioCodec.OPUS.metadataValue:
+                    return ScrcpyAudioCodec.OPUS;
+                case ScrcpyAudioCodec.AAC.metadataValue:
+                    return ScrcpyAudioCodec.AAC;
+                default:
+                    throw new Error(`Unknown audio codec metadata value: ${value}`);
             }
-            // Infer codec from `audioCodec` option
-            let codec;
+        }, () => {
             switch (this.value.audioCodec) {
+                case "raw":
+                    return ScrcpyAudioCodec.RAW;
                 case "opus":
-                    codec = ScrcpyAudioCodec.OPUS;
-                    break;
+                    return ScrcpyAudioCodec.OPUS;
                 case "aac":
-                    codec = ScrcpyAudioCodec.AAC;
-                    break;
-                case "raw":
-                    codec = ScrcpyAudioCodec.RAW;
-                    break;
+                    return ScrcpyAudioCodec.AAC;
             }
-            return {
-                type: "success",
-                codec,
-                stream: new PushReadableStream(async (controller) => {
-                    // Put the first 4 bytes back
-                    await controller.enqueue(buffer);
-                    const stream = buffered.release();
-                    const reader = stream.getReader();
-                    while (true) {
-                        const { done, value } = await reader.read();
-                        if (done) {
-                            break;
-                        }
-                        await controller.enqueue(value);
-                    }
-                }),
-            };
-        })();
+        });
     }
     serializeInjectTouchControlMessage(message) {
         return ScrcpyInjectTouchControlMessage2_0.serialize(message);

package/esm/options/2_0.js.map

@@ -1 +1 @@
-{"version":3,"file":"2_0.js","sourceRoot":"","sources":["../../src/options/2_0.ts"],"names":[],"mappings":"AACA,OAAO,EACH,sBAAsB,EACtB,kBAAkB,GACrB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,MAAM,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAOzE,OAAO,EACH,YAAY,EACZ,kCAAkC,EAClC,iBAAiB,GACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAMlE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,CAAC,MAAM,kCAAkC,GAAG,IAAI,MAAM,EAAE;KACzD,KAAK,CAAC,MAAM,CAAC;KACb,KAAK,CAAC,QAAQ,EAAE,WAAW,EAA4B,CAAC;KACxD,MAAM,CAAC,WAAW,CAAC;KACnB,MAAM,CAAC,UAAU,CAAC;KAClB,MAAM,CAAC,UAAU,CAAC;KAClB,MAAM,CAAC,aAAa,CAAC;KACrB,MAAM,CAAC,cAAc,CAAC;KACtB,KAAK,CAAC,UAAU,EAAE,kCAAkC,CAAC;KACrD,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,SAAS,CAAC,CAAC;AAKvB,MAAM,OAAO,gBAAgB;IACzB,MAAM,CAAU,IAAI,GAAG,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IAEhD,MAAM,CAAC,MAAM;QACT,mCAAmC;QACnC,OAAO,IAAI,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAS;IAEd,YAAY,KAAa;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAED,aAAa;QACT,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;YACjB,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACnC,CAAC;;AA0BL,SAAS,IAAI,CACT,GAAM,EACN,IAAS;IAET,MAAM,MAAM,GAAiC,EAAE,CAAC;IAChD,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAmB,CAAC,EAAE,CAAC;YACtC,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;IACL,CAAC;IACD,OAAO,MAAoB,CAAC;AAChC,CAAC;AAED,MAAM,OAAO,gBAAiB,SAAQ,iBAGrC;IACG,MAAM,CAAU,QAAQ,GAAG;QACvB,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE;YAChC,SAAS;YACT,cAAc;YACd,aAAa;SAChB,CAAC;QACF,IAAI,EAAE,gBAAgB,CAAC,IAAI;QAE3B,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,OAAO;QACrB,iBAAiB,EAAE,IAAI,YAAY,EAAE;QACrC,YAAY,EAAE,EAAE;QAEhB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,YAAY,EAAE,MAAM;QACpB,iBAAiB,EAAE,IAAI,YAAY,EAAE;QACrC,YAAY,EAAE,EAAE;QAEhB,YAAY,EAAE,KAAK;QACnB,YAAY,EAAE,KAAK;QACnB,aAAa,EAAE,IAAI;KAC4B,CAAC;IAEpD,IAAa,QAAQ;QACjB,OAAO,gBAAgB,CAAC,QAAQ,CAAC;IACrC,CAAC;IAED,YAAY,IAA0B;QAClC,KAAK,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,EAAE;YAC/B,GAAG,gBAAgB,CAAC,QAAQ;YAC5B,GAAG,IAAI;SACV,CAAC,CAAC;IACP,CAAC;IAEQ,SAAS;QACd,OAAO,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC;IAEQ,eAAe;QACpB,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;IACnC,CAAC;IAEQ,eAAe;QACpB,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;IACnC,CAAC;IAEQ,YAAY,CAAC,IAAY;QAC9B,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAClB,sDAAsD,CACzD,CAAC;QACF,IAAI,KAAK,EAAE,CAAC;YACR,OAAO;gBACH,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,KAAK,CAAC,CAAC,CAAE;gBAChB,IAAI,EAAE,KAAK,CAAC,CAAC,CAAE;aAClB,CAAC;QACN,CAAC;QAED,KAAK,GAAG,IAAI,CAAC,KAAK,CACd,sDAAsD,CACzD,CAAC;QACF,IAAI,KAAK,EAAE,CAAC;YACR,OAAO;gBACH,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,KAAK,CAAC,CAAC,CAAE;gBAChB,IAAI,EAAE,KAAK,CAAC,CAAC,CAAE;aAClB,CAAC;QACN,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IAEQ,YAAY,CAAC,IAAY;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC/D,IAAI,KAAK,EAAE,CAAC;YACR,MAAM,OAAO,GAAkB;gBAC3B,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAE,EAAE,EAAE,CAAC;aACrC,CAAC;YACF,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,cAAc,EAAE,CAAC;gBAC9B,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;YACnC,CAAC;YACD,OAAO,OAAO,CAAC;QACnB,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEQ,wBAAwB,CAC7B,MAAkC;QAElC,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACrD,IAAI,CAAC,cAAc,IAAI,CAAC,aAAa,EAAE,CAAC;YACpC,IAAI,KAAyB,CAAC;YAC9B,QAAQ,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;gBAC5B,KAAK,MAAM;oBACP,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC;oBAChC,MAAM;gBACV,KAAK,MAAM;oBACP,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC;oBAChC,MAAM;gBACV,KAAK,KAAK;oBACN,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC;oBAC/B,MAAM;YACd,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC;QAC3C,CAAC;QAED,OAAO,CAAC,KAAK,IAAI,EAAE;YACf,MAAM,QAAQ,GAAG,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAC;YAEpD,kDAAkD;YAClD,kDAAkD;YAClD,IAAI,UAA8B,CAAC;YACnC,IAAI,cAAc,EAAE,CAAC;gBACjB,UAAU,GAAG,MAAM,iBAAiB,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACpE,CAAC;YAED,IAAI,KAAyB,CAAC;YAC9B,IAAI,KAAyB,CAAC;YAC9B,IAAI,MAA0B,CAAC;YAC/B,IAAI,aAAa,EAAE,CAAC;gBAChB,KAAK,GAAG,MAAM,iBAAiB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACxD,KAAK,GAAG,MAAM,iBAAiB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;gBACxD,MAAM,GAAG,MAAM,iBAAiB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC7D,CAAC;iBAAM,CAAC;gBACJ,QAAQ,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;oBAC5B,KAAK,MAAM;wBACP,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC;wBAChC,MAAM;oBACV,KAAK,MAAM;wBACP,KAAK,GAAG,kBAAkB,CAAC,IAAI,CAAC;wBAChC,MAAM;oBACV,KAAK,KAAK;wBACN,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC;wBAC/B,MAAM;gBACd,CAAC;YACL,CAAC;YAED,OAAO;gBACH,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE;gBAC1B,QAAQ,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE;aACjD,CAAC;QACN,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAEQ,wBAAwB,CAC7B,MAAkC;QAElC,OAAO,CAAC,KAAK,IAAwC,EAAE;YACnD,MAAM,QAAQ,GAAG,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAC;YACpD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,CACrC,eAAe,CAAC,MAAM,CAAC,IAAI,CAC9B,CAAC;YAEF,MAAM,kBAAkB,GAAG,eAAe,CAAC,MAAM,CAAC,WAAW,CACzD,MAAM,EACN,KAAK,CACR,CAAC;YACF,wFAAwF;YACxF,QAAQ,kBAAkB,EAAE,CAAC;gBACzB,KAAK,aAAa;oBACd,OAAO;wBACH,IAAI,EAAE,UAAU;qBACnB,CAAC;gBACN,KAAK,aAAa;oBACd,OAAO;wBACH,IAAI,EAAE,SAAS;qBAClB,CAAC;YACV,CAAC;YAED,IAAI,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;gBAC3B,IAAI,KAAuB,CAAC;gBAC5B,QAAQ,kBAAkB,EAAE,CAAC;oBACzB,KAAK,gBAAgB,CAAC,IAAI,CAAC,aAAa;wBACpC,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC;wBAC9B,MAAM;oBACV,KAAK,gBAAgB,CAAC,GAAG,CAAC,aAAa;wBACnC,KAAK,GAAG,gBAAgB,CAAC,GAAG,CAAC;wBAC7B,MAAM;oBACV,KAAK,gBAAgB,CAAC,GAAG,CAAC,aAAa;wBACnC,KAAK,GAAG,gBAAgB,CAAC,GAAG,CAAC;wBAC7B,MAAM;oBACV;wBACI,MAAM,IAAI,KAAK,CACX,uCAAuC,kBAAkB,EAAE,CAC9D,CAAC;gBACV,CAAC;gBACD,OAAO;oBACH,IAAI,EAAE,SAAS;oBACf,KAAK;oBACL,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE;iBAC7B,CAAC;YACN,CAAC;YAED,uCAAuC;YACvC,IAAI,KAAuB,CAAC;YAC5B,QAAQ,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;gBAC5B,KAAK,MAAM;oBACP,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC;oBAC9B,MAAM;gBACV,KAAK,KAAK;oBACN,KAAK,GAAG,gBAAgB,CAAC,GAAG,CAAC;oBAC7B,MAAM;gBACV,KAAK,KAAK;oBACN,KAAK,GAAG,gBAAgB,CAAC,GAAG,CAAC;oBAC7B,MAAM;YACd,CAAC;YACD,OAAO;gBACH,IAAI,EAAE,SAAS;gBACf,KAAK;gBACL,MAAM,EAAE,IAAI,kBAAkB,CAC1B,KAAK,EAAE,UAAU,EAAE,EAAE;oBACjB,6BAA6B;oBAC7B,MAAM,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;oBAEjC,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;oBAClC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;oBAClC,OAAO,IAAI,EAAE,CAAC;wBACV,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;wBAC5C,IAAI,IAAI,EAAE,CAAC;4BACP,MAAM;wBACV,CAAC;wBACD,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;oBACpC,CAAC;gBACL,CAAC,CACJ;aACJ,CAAC;QACN,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAEQ,kCAAkC,CACvC,OAAwC;QAExC,OAAO,kCAAkC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACjE,CAAC"}
+{"version":3,"file":"2_0.js","sourceRoot":"","sources":["../../src/options/2_0.ts"],"names":[],"mappings":"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"}

package/esm/options/2_1.d.ts

@@ -1,11 +1,10 @@
 import type { ScrcpyOptionsInit2_0 } from "./2_0.js";
-import { ScrcpyOptions2_0 } from "./2_0.js";
-import { ScrcpyOptionsBase } from "./types.js";
+import { ScrcpyOptions } from "./types.js";
 export interface ScrcpyOptionsInit2_1 extends ScrcpyOptionsInit2_0 {
     video?: boolean;
     audioSource?: "output" | "mic";
 }
-export declare class ScrcpyOptions2_1 extends ScrcpyOptionsBase<ScrcpyOptionsInit2_1, ScrcpyOptions2_0> {
+export declare class ScrcpyOptions2_1 extends ScrcpyOptions<ScrcpyOptionsInit2_1> {
     static readonly DEFAULTS: {
         readonly video: true;
         readonly audioSource: "output";
@@ -13,12 +12,12 @@ export declare class ScrcpyOptions2_1 extends ScrcpyOptionsBase<ScrcpyOptionsIni
         readonly videoCodec: "h264";
         readonly videoBitRate: 8000000;
         readonly videoCodecOptions: import("./index.js").CodecOptions;
-        readonly videoEncoder: "";
+        readonly videoEncoder: undefined;
         readonly audio: true;
         readonly audioCodec: "opus";
         readonly audioBitRate: 128000;
         readonly audioCodecOptions: import("./index.js").CodecOptions;
-        readonly audioEncoder: "";
+        readonly audioEncoder: undefined;
         readonly listEncoders: false;
         readonly listDisplays: false;
         readonly sendCodecMeta: true;

package/esm/options/2_1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"2_1.d.ts","sourceRoot":"","sources":["../../src/options/2_1.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAC9D,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC;CAClC;AAED,qBAAa,gBAAiB,SAAQ,iBAAiB,CACnD,oBAAoB,EACpB,gBAAgB,CACnB;IACG,MAAM,CAAC,QAAQ,CAAC,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAI4B;IAEpD,IAAa,QAAQ,IAAI,QAAQ,CAAC,oBAAoB,CAAC,CAEtD;gBAEW,IAAI,EAAE,oBAAoB;IAO7B,SAAS,IAAI,MAAM,EAAE;CAGjC"}
+{"version":3,"file":"2_1.d.ts","sourceRoot":"","sources":["../../src/options/2_1.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAC9D,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC;CAClC;AAED,qBAAa,gBAAiB,SAAQ,aAAa,CAAC,oBAAoB,CAAC;IACrE,MAAM,CAAC,QAAQ,CAAC,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAI4B;IAEpD,IAAa,QAAQ,IAAI,QAAQ,CAAC,oBAAoB,CAAC,CAEtD;gBAEW,IAAI,EAAE,oBAAoB;IAI7B,SAAS,IAAI,MAAM,EAAE;CAGjC"}

package/esm/options/2_1.js

@@ -1,7 +1,7 @@
 import { ScrcpyOptions1_21 } from "./1_21.js";
 import { ScrcpyOptions2_0 } from "./2_0.js";
-import { ScrcpyOptionsBase } from "./types.js";
-export class ScrcpyOptions2_1 extends ScrcpyOptionsBase {
+import { ScrcpyOptions } from "./types.js";
+export class ScrcpyOptions2_1 extends ScrcpyOptions {
     static DEFAULTS = {
         ...ScrcpyOptions2_0.DEFAULTS,
         video: true,
@@ -11,10 +11,7 @@ export class ScrcpyOptions2_1 extends ScrcpyOptionsBase {
         return ScrcpyOptions2_1.DEFAULTS;
     }
     constructor(init) {
-        super(new ScrcpyOptions2_0(init), {
-            ...ScrcpyOptions2_1.DEFAULTS,
-            ...init,
-        });
+        super(ScrcpyOptions2_0, init, ScrcpyOptions2_1.DEFAULTS);
     }
     serialize() {
         return ScrcpyOptions1_21.serialize(this.value, this.defaults);

package/esm/options/2_1.js.map

@@ -1 +1 @@
-{"version":3,"file":"2_1.js","sourceRoot":"","sources":["../../src/options/2_1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAO/C,MAAM,OAAO,gBAAiB,SAAQ,iBAGrC;IACG,MAAM,CAAU,QAAQ,GAAG;QACvB,GAAG,gBAAgB,CAAC,QAAQ;QAC5B,KAAK,EAAE,IAAI;QACX,WAAW,EAAE,QAAQ;KAC0B,CAAC;IAEpD,IAAa,QAAQ;QACjB,OAAO,gBAAgB,CAAC,QAAQ,CAAC;IACrC,CAAC;IAED,YAAY,IAA0B;QAClC,KAAK,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE;YAC9B,GAAG,gBAAgB,CAAC,QAAQ;YAC5B,GAAG,IAAI;SACV,CAAC,CAAC;IACP,CAAC;IAEQ,SAAS;QACd,OAAO,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC"}
+{"version":3,"file":"2_1.js","sourceRoot":"","sources":["../../src/options/2_1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAO3C,MAAM,OAAO,gBAAiB,SAAQ,aAAmC;IACrE,MAAM,CAAU,QAAQ,GAAG;QACvB,GAAG,gBAAgB,CAAC,QAAQ;QAC5B,KAAK,EAAE,IAAI;QACX,WAAW,EAAE,QAAQ;KAC0B,CAAC;IAEpD,IAAa,QAAQ;QACjB,OAAO,gBAAgB,CAAC,QAAQ,CAAC;IACrC,CAAC;IAED,YAAY,IAA0B;QAClC,KAAK,CAAC,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAEQ,SAAS;QACd,OAAO,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC"}

package/esm/options/2_2.d.ts

@@ -1,7 +1,6 @@
 import type { ScrcpyOptionsInit2_1 } from "./2_1.js";
-import { ScrcpyOptions2_1 } from "./2_1.js";
 import type { ScrcpyDisplay } from "./types.js";
-import { ScrcpyOptionsBase } from "./types.js";
+import { ScrcpyOptions } from "./types.js";
 export interface ScrcpyOptionsInit2_2 extends Omit<ScrcpyOptionsInit2_1, "display"> {
     videoSource?: "display" | "camera";
     displayId?: number;
@@ -14,7 +13,7 @@ export interface ScrcpyOptionsInit2_2 extends Omit<ScrcpyOptionsInit2_1, "displa
     listCameras?: boolean;
     listCameraSizes?: boolean;
 }
-export declare class ScrcpyOptions2_2 extends ScrcpyOptionsBase<ScrcpyOptionsInit2_2, ScrcpyOptions2_1> {
+export declare class ScrcpyOptions2_2 extends ScrcpyOptions<ScrcpyOptionsInit2_2> {
     static readonly DEFAULTS: {
         readonly videoSource: "display";
         readonly displayId: 0;
@@ -32,12 +31,12 @@ export declare class ScrcpyOptions2_2 extends ScrcpyOptionsBase<ScrcpyOptionsIni
         readonly videoCodec: "h264";
         readonly videoBitRate: 8000000;
         readonly videoCodecOptions: import("./index.js").CodecOptions;
-        readonly videoEncoder: "";
+        readonly videoEncoder: undefined;
         readonly audio: true;
         readonly audioCodec: "opus";
         readonly audioBitRate: 128000;
         readonly audioCodecOptions: import("./index.js").CodecOptions;
-        readonly audioEncoder: "";
+        readonly audioEncoder: undefined;
         readonly listEncoders: false;
         readonly listDisplays: false;
         readonly sendCodecMeta: true;

package/esm/options/2_2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"2_2.d.ts","sourceRoot":"","sources":["../../src/options/2_2.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,WAAW,oBACb,SAAQ,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC;IAC7C,WAAW,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,YAAY,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;IACzD,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,qBAAa,gBAAiB,SAAQ,iBAAiB,CACnD,oBAAoB,EACpB,gBAAgB,CACnB;IACG,MAAM,CAAC,QAAQ,CAAC,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAY4B;IAEpD,IAAa,QAAQ,IAAI,QAAQ,CAAC,oBAAoB,CAAC,CAEtD;gBAEW,IAAI,EAAE,oBAAoB;IAO7B,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAcrD,SAAS,IAAI,MAAM,EAAE;CAGjC"}
+{"version":3,"file":"2_2.d.ts","sourceRoot":"","sources":["../../src/options/2_2.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAErD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,WAAW,oBACb,SAAQ,IAAI,CAAC,oBAAoB,EAAE,SAAS,CAAC;IAC7C,WAAW,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,YAAY,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;IACzD,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,qBAAa,gBAAiB,SAAQ,aAAa,CAAC,oBAAoB,CAAC;IACrE,MAAM,CAAC,QAAQ,CAAC,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAY4B;IAEpD,IAAa,QAAQ,IAAI,QAAQ,CAAC,oBAAoB,CAAC,CAEtD;gBAEW,IAAI,EAAE,oBAAoB;IAI7B,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAcrD,SAAS,IAAI,MAAM,EAAE;CAGjC"}

package/esm/options/2_2.js

@@ -1,7 +1,7 @@
 import { ScrcpyOptions1_21 } from "./1_21.js";
 import { ScrcpyOptions2_1 } from "./2_1.js";
-import { ScrcpyOptionsBase } from "./types.js";
-export class ScrcpyOptions2_2 extends ScrcpyOptionsBase {
+import { ScrcpyOptions } from "./types.js";
+export class ScrcpyOptions2_2 extends ScrcpyOptions {
     static DEFAULTS = {
         ...ScrcpyOptions2_1.DEFAULTS,
         videoSource: "display",
@@ -19,10 +19,7 @@ export class ScrcpyOptions2_2 extends ScrcpyOptionsBase {
         return ScrcpyOptions2_2.DEFAULTS;
     }
     constructor(init) {
-        super(new ScrcpyOptions2_1(init), {
-            ...ScrcpyOptions2_2.DEFAULTS,
-            ...init,
-        });
+        super(ScrcpyOptions2_1, init, ScrcpyOptions2_2.DEFAULTS);
     }
     parseDisplay(line) {
         const match = line.match(/^\s+--display-id=(\d+)\s+\(([^)]+)\)$/);

package/esm/options/2_2.js.map

@@ -1 +1 @@
-{"version":3,"file":"2_2.js","sourceRoot":"","sources":["../../src/options/2_2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAiB/C,MAAM,OAAO,gBAAiB,SAAQ,iBAGrC;IACG,MAAM,CAAU,QAAQ,GAAG;QACvB,GAAG,gBAAgB,CAAC,QAAQ;QAC5B,WAAW,EAAE,SAAS;QACtB,SAAS,EAAE,CAAC;QACZ,QAAQ,EAAE,SAAS;QACnB,UAAU,EAAE,SAAS;QACrB,YAAY,EAAE,SAAS;QACvB,QAAQ,EAAE,SAAS;QACnB,SAAS,EAAE,SAAS;QACpB,eAAe,EAAE,KAAK;QACtB,WAAW,EAAE,KAAK;QAClB,eAAe,EAAE,KAAK;KACyB,CAAC;IAEpD,IAAa,QAAQ;QACjB,OAAO,gBAAgB,CAAC,QAAQ,CAAC;IACrC,CAAC;IAED,YAAY,IAA0B;QAClC,KAAK,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE;YAC9B,GAAG,gBAAgB,CAAC,QAAQ;YAC5B,GAAG,IAAI;SACV,CAAC,CAAC;IACP,CAAC;IAEQ,YAAY,CAAC,IAAY;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAClE,IAAI,KAAK,EAAE,CAAC;YACR,MAAM,OAAO,GAAkB;gBAC3B,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAE,EAAE,EAAE,CAAC;aACrC,CAAC;YACF,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,cAAc,EAAE,CAAC;gBAC9B,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;YACnC,CAAC;YACD,OAAO,OAAO,CAAC;QACnB,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEQ,SAAS;QACd,OAAO,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC"}
+{"version":3,"file":"2_2.js","sourceRoot":"","sources":["../../src/options/2_2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAiB3C,MAAM,OAAO,gBAAiB,SAAQ,aAAmC;IACrE,MAAM,CAAU,QAAQ,GAAG;QACvB,GAAG,gBAAgB,CAAC,QAAQ;QAC5B,WAAW,EAAE,SAAS;QACtB,SAAS,EAAE,CAAC;QACZ,QAAQ,EAAE,SAAS;QACnB,UAAU,EAAE,SAAS;QACrB,YAAY,EAAE,SAAS;QACvB,QAAQ,EAAE,SAAS;QACnB,SAAS,EAAE,SAAS;QACpB,eAAe,EAAE,KAAK;QACtB,WAAW,EAAE,KAAK;QAClB,eAAe,EAAE,KAAK;KACyB,CAAC;IAEpD,IAAa,QAAQ;QACjB,OAAO,gBAAgB,CAAC,QAAQ,CAAC;IACrC,CAAC;IAED,YAAY,IAA0B;QAClC,KAAK,CAAC,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAEQ,YAAY,CAAC,IAAY;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAClE,IAAI,KAAK,EAAE,CAAC;YACR,MAAM,OAAO,GAAkB;gBAC3B,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAE,EAAE,EAAE,CAAC;aACrC,CAAC;YACF,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,cAAc,EAAE,CAAC;gBAC9B,OAAO,CAAC,UAAU,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;YACnC,CAAC;YACD,OAAO,OAAO,CAAC;QACnB,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAEQ,SAAS;QACd,OAAO,iBAAiB,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClE,CAAC"}