@_unit/unit 1.0.9 → 1.0.10

package/lib/API.d.ts

@@ -10,6 +10,7 @@ import { IDisplayMediaOpt } from './types/global/IDisplayMedia';
 import { IDownloadDataOpt as IDownloadTextOpt } from './types/global/IDownloadData';
 import { IDownloadURLOpt } from './types/global/IDownloadURL';
 import { IGeoPosition } from './types/global/IGeoPosition';
+import { IIntersectionObserverConstructor } from './types/global/IIntersectionObserver';
 import { IMutationObserverConstructor } from './types/global/IMutationObserver';
 import { IPositionObserverCostructor } from './types/global/IPositionObserver';
 import { IResizeObserverConstructor } from './types/global/IResizeObserver';
@@ -126,6 +127,7 @@ export type API = {
         MutationObserver: IMutationObserverConstructor;
         PositionObserver: IPositionObserverCostructor;
         ResizeObserver: IResizeObserverConstructor;
+        IntersectionObserver: IIntersectionObserverConstructor;
     };
     querystring: {
         stringify: (obj: Dict<any>) => string;

package/lib/API.js

@@ -1,3 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+IntersectionObserver;
 //# sourceMappingURL=API.js.map

package/lib/API.js.map

@@ -1 +1 @@
-{"version":3,"file":"API.js","sourceRoot":"src/","sources":["API.ts"],"names":[],"mappings":""}
+{"version":3,"file":"API.js","sourceRoot":"src/","sources":["API.ts"],"names":[],"mappings":";;AA6LA,oBAAoB,CAAA"}

package/lib/Class/Graph/index.d.ts

@@ -86,7 +86,6 @@ export declare class Graph<I = any, O = any> extends Primitive<I, O, GraphEvents
     private _memPlugPinToUnitPin;
     private _memPlugPinToMerge;
     private _simPlugPinToUnitPin;
-    private setExposedSubPin;
     private _setExposedSubPin;
     private _memSetExposedSubPin;
     private _simSetExposedSubPin;
@@ -145,7 +144,7 @@ export declare class Graph<I = any, O = any> extends Primitive<I, O, GraphEvents
     private _specSetPinSetFunctional;
     private _memSetPinSetFunctional;
     private _simSetPinSetFunctional;
-    setPinSetId(type: IO, pinId: string, nextPinId: string): void;
+    setPinSetId(type: IO, pinId: string, nextPinId: string, emit?: boolean): void;
     _setPinSetId(type: IO, pinId: string, nextPinId: string): void;
     exposePin: (type: IO, pinId: string, subPinId: string, subPinSpec: GraphSubPinSpec, emit?: boolean, propagate?: boolean) => void;
     private _exposePin;
@@ -252,7 +251,7 @@ export declare class Graph<I = any, O = any> extends Primitive<I, O, GraphEvents
     getPlugSpecs(): IOOf<Dict<Dict<GraphSubPinSpec>>>;
     getPlug(type: IO, pinId: string, subPinId: string): Pin;
     getMerge(mergeId: string): Merge;
-    refExposedMerges(): Dict<Merge>;
+    refExposedMerges(): IOOf<Dict<IOOf<Merge>>>;
     getUnitCount(): number;
     getMergeCount(): number;
     findMergeExposedSubPin(type: IO, mergeId: string): {

package/lib/Class/Graph/index.js

@@ -47,6 +47,7 @@ const Merge_1 = require("../Merge");
 const WaitAll_1 = require("../WaitAll");
 const moveSubgraph_1 = require("./moveSubgraph");
 const spec_3 = require("../../spec/reducers/spec");
+const weakMerge_1 = require("../../types/weakMerge");
 class Graph extends Primitive_1.Primitive {
     constructor(spec, branch = {}, system, id) {
         var _a;
@@ -80,18 +81,19 @@ class Graph extends Primitive_1.Primitive {
             // console.log('Graph', '_onPinSetRenamed', type, name, newName, opt, newOpt)
             const oppositeType = (0, util_1.opposite)(type);
             const { functional } = opt;
-            const exposedPinId = (0, util_1.getExposedPinId)(name, type);
-            const newExposedPinId = (0, util_1.getExposedPinId)(newName, type);
-            const exposedPin = this._exposedPin[exposedPinId];
-            const exposedMerge = this._exposedMerge[exposedPinId];
+            const exposedPin = (0, f_1.default)(this._exposedPin, [type, name]);
+            const exposedMerge = (0, f_1.default)(this._exposedMerge, [type, name, type]);
+            const exposedMergeOpposite = (0, f_1.default)(this._exposedMerge, [type, name, oppositeType]);
             exposedMerge.renamePin(type, name, newName);
             if (functional) {
                 this._unplugFromWaitAll(type, name);
             }
-            delete this._exposedPin[exposedPinId];
-            delete this._exposedMerge[exposedPinId];
-            this._exposedPin[newExposedPinId] = exposedPin;
-            this._exposedMerge[newExposedPinId] = exposedMerge;
+            (0, object_1.pathDestroy)(this._exposedPin, [type, name]);
+            (0, object_1.pathDestroy)(this._exposedMerge, [type, name, type]);
+            (0, object_1.pathDestroy)(this._exposedMerge, [type, name, oppositeType]);
+            (0, object_1.pathSet)(this._exposedPin, [type, newName], exposedPin);
+            (0, object_1.pathSet)(this._exposedMerge, [type, newName, type], exposedMerge);
+            (0, object_1.pathSet)(this._exposedMerge, [type, newName, oppositeType], exposedMergeOpposite);
             const emptySubPins = (0, f_1.default)(this._exposedEmptySubPin, [type, name]);
             for (const subPinId in Object.assign({}, emptySubPins)) {
                 const emptySubPin = emptySubPins[subPinId];
@@ -183,35 +185,35 @@ class Graph extends Primitive_1.Primitive {
             const mergePinNodeId = (0, util_1.getMergePinNodeId)(mergeId, type);
             this._ensureMergePin(type, mergeId, propagate);
             const subPin = this._pin[mergePinNodeId];
-            this._setExposedSubPin(type, pinId, subPinId, subPin, opt, propagate);
+            this._setExposedSubPin(type, pinId, type, subPinId, subPin, opt, propagate);
         };
         this._simPlugPinToMerge = (type, pinId, subPinId, mergeId, propagate = true) => {
             const mergePinNodeId = (0, util_1.getMergePinNodeId)(mergeId, type);
             this._ensureMergePin(type, mergeId, propagate);
             const subPin = this._pin[mergePinNodeId];
-            this._simSetExposedSubPin(type, pinId, subPinId, subPin, propagate);
+            this._simSetExposedSubPin(type, pinId, type, subPinId, subPin, propagate);
         };
         this._simUnplugPinFromMerge = (type, name, subPinId, mergeId) => {
             this._simRemoveExposedSubPin(type, name, subPinId);
         };
-        this._simUnplugPinFromUnitPin = (type, pinId, subPinId, _unitId, _pinId) => {
+        this._simUnplugPinFromUnitPin = (type, pinId, subPinId, _unitId, _pinId, _type) => {
             this._simRemoveExposedSubPin(type, pinId, subPinId);
         };
-        this._plugPinToUnitPin = (type, name, subPinId, unitId, pinId, opt, propagate = false) => {
-            this._memPlugPinToUnitPin(type, name, subPinId, unitId, pinId);
-            this._simPlugPinToUnitPin(type, name, subPinId, unitId, pinId, propagate);
+        this._plugPinToUnitPin = (type, name, subPinId, unitId, kind, pinId, opt, propagate = false) => {
+            this._memPlugPinToUnitPin(type, name, subPinId, unitId, kind, pinId);
+            this._simPlugPinToUnitPin(type, name, subPinId, unitId, kind, pinId, propagate);
         };
-        this._memPlugPinToUnitPin = (type, name, subPinId, unitId, pinId) => {
-            const subPin = this.getUnitPin(unitId, type, pinId);
-            (0, object_1.pathSet)(this._pinToPlug, [unitId, type, pinId], { pinId: name, subPinId });
-            this._memSetExposedSubPin(type, name, subPinId, subPin);
+        this._memPlugPinToUnitPin = (type, pinId, subPinId, unitId, kind, pinId_) => {
+            const subPin = this.getUnitPin(unitId, kind, pinId_);
+            (0, object_1.pathSet)(this._pinToPlug, [unitId, type, pinId_], { pinId, subPinId, kind });
+            this._memSetExposedSubPin(type, pinId, subPinId, subPin);
         };
         this._memPlugPinToMerge = (type, name, subPinId, mergeId) => {
             //
         };
-        this._simPlugPinToUnitPin = (type, name, subPinId, unitId, pinId, propagate = true) => {
-            const subPin = this.getUnitPin(unitId, type, pinId);
-            this._simSetExposedSubPin(type, name, subPinId, subPin, propagate);
+        this._simPlugPinToUnitPin = (type, name, subPinId, unitId, kind, pinId, propagate = true) => {
+            const subPin = this.getUnitPin(unitId, kind, pinId);
+            this._simSetExposedSubPin(type, name, kind, subPinId, subPin, propagate);
         };
         this._takeErr = () => {
             if (this._errUnitIds.length > 0) {
@@ -310,19 +312,21 @@ class Graph extends Primitive_1.Primitive {
         this._exposePinSet = (type, pinId, pinSpec, data, propagate = true) => {
             // console.log('Graph', '_exposePinSet', type, pinId, pinSpec, data, propagate)
             const exposedPin = new Pin_1.Pin({ data });
-            const exposedMerge = new Merge_1.default(this.__system);
+            const exposeMerge = new Merge_1.default(this.__system);
+            const exposedMergeOpposite = new Merge_1.default(this.__system);
             this._fork();
             this._specExposePinSet(type, pinId, pinSpec);
-            this._memExposePinSet(type, pinId, pinSpec, exposedPin, exposedMerge);
-            this._simExposePinSet(type, pinId, pinSpec, exposedPin, exposedMerge, propagate);
+            this._memExposePinSet(type, pinId, pinSpec, exposedPin, exposeMerge, exposedMergeOpposite);
+            this._simExposePinSet(type, pinId, pinSpec, exposedPin, exposeMerge, exposedMergeOpposite, propagate);
         };
         this._initPinSet = (type, pinId, pinSpec, propagate = true) => {
             // console.log('Graph', '_initPinSet', type, pinId, pinSpec, exposedPin)
             const { ref } = pinSpec;
             const exposedPin = new Pin_1.Pin({ ref });
             const exposedMerge = new Merge_1.default(this.__system);
-            this._memExposePinSet(type, pinId, pinSpec, exposedPin, exposedMerge);
-            this._simExposePinSet(type, pinId, pinSpec, exposedPin, exposedMerge, propagate);
+            const exposedMergeOpposite = new Merge_1.default(this.__system);
+            this._memExposePinSet(type, pinId, pinSpec, exposedPin, exposedMerge, exposedMergeOpposite);
+            this._simExposePinSet(type, pinId, pinSpec, exposedPin, exposedMerge, exposedMergeOpposite, propagate);
         };
         this._specExposePinSet = (type, pinId, pinSpec) => {
             // console.log('Graph', '_specExposePinSet', type, pinId, pinSpec)
@@ -332,12 +336,13 @@ class Graph extends Primitive_1.Primitive {
                 this._specExposePin(type, pinId, subPinId, subPinSpec);
             });
         };
-        this._memExposePinSet = (type, pinId, pinSpec, exposedPin, exposedMerge) => {
+        this._memExposePinSet = (type, pinId, pinSpec, exposedPin, exposedMerge, exposedMergeOpposite) => {
             // console.log('Graph', '_memExposePinSet', type, pinId, pinSpec)
             const { plug } = pinSpec;
-            const exposedNodeId = (0, util_1.getExposedPinId)(pinId, type);
-            this._exposedPin[exposedNodeId] = exposedPin;
-            this._exposedMerge[exposedNodeId] = exposedMerge;
+            const oppositeType = (0, util_1.opposite)(type);
+            (0, object_1.pathSet)(this._exposedPin, [type, pinId], exposedPin);
+            (0, object_1.pathSet)(this._exposedMerge, [type, pinId, type], exposedMerge);
+            (0, object_1.pathSet)(this._exposedMerge, [type, pinId, oppositeType], exposedMergeOpposite);
             (0, f_2.default)(plug, (subPinSpec, subPinId) => {
                 this._memExposePin(type, pinId, subPinId, subPinSpec);
             });
@@ -409,12 +414,12 @@ class Graph extends Primitive_1.Primitive {
             // console.log('Graph', '_memCoverPinSet', type, pinId)
             const pinSpec = this.getExposedPinSpec(type, pinId);
             const { plug } = pinSpec;
-            const exposedNodeId = (0, util_1.getExposedPinId)(pinId, type);
             (0, f_2.default)(plug, (subPinSpec, subPinId) => {
                 this._memCoverPin(type, pinId, subPinId);
             });
-            delete this._exposedPin[exposedNodeId];
-            delete this._exposedMerge[exposedNodeId];
+            (0, object_1.pathDestroy)(this._exposedPin, [type, pinId]);
+            (0, object_1.pathDestroy)(this._exposedMerge, [type, pinId, 'input']);
+            (0, object_1.pathDestroy)(this._exposedMerge, [type, pinId, 'output']);
         };
         this._specCoverPinSet = (type, pinId) => {
             // console.log('Graph', '_specCoverPinSet', type, pinId)
@@ -437,13 +442,13 @@ class Graph extends Primitive_1.Primitive {
             (0, object_1.pathSet)(this._spec, [`${type}s`, pinId, 'ref'], ref);
         };
         this._memPlugPin = (type, pinId, subPinId, subPinSpec) => {
-            const { mergeId, unitId: _unitId, pinId: _pinId } = subPinSpec;
+            const { mergeId, unitId: _unitId, pinId: _pinId, kind = type } = subPinSpec;
             let ref = undefined;
             if (_unitId && _pinId) {
-                if (this.isUnitRefPin(_unitId, type, _pinId) || _pinId === SELF_1.SELF) {
+                if (this.isUnitRefPin(_unitId, kind, _pinId) || _pinId === SELF_1.SELF) {
                     ref = true;
                 }
-                this._memPlugPinToUnitPin(type, pinId, subPinId, _unitId, _pinId);
+                this._memPlugPinToUnitPin(type, pinId, subPinId, _unitId, kind, _pinId);
             }
             else if (mergeId) {
                 const merge = this.getMergeSpec(mergeId);
@@ -465,10 +470,10 @@ class Graph extends Primitive_1.Primitive {
         };
         this._specPlugPin = (type, pinId, subPinId, subPinSpec) => {
             // console.log('Graph', '_specPlugPin', type, pinId, subPinId, subPinSpec)
-            const { mergeId: _mergeId, unitId: _unitId, pinId: _pinId } = subPinSpec;
+            const { mergeId: _mergeId, unitId: _unitId, pinId: _pinId, kind = type, } = subPinSpec;
             let ref = undefined;
             if (_unitId && _pinId) {
-                if (this.isUnitRefPin(_unitId, type, _pinId) || _pinId === SELF_1.SELF) {
+                if (this.isUnitRefPin(_unitId, kind, _pinId) || _pinId === SELF_1.SELF) {
                     ref = true;
                 }
             }
@@ -490,7 +495,7 @@ class Graph extends Primitive_1.Primitive {
             (0, spec_2.plugPin)({ type, pinId, subPinId, subPinSpec }, this._spec);
         };
         this.plugPin = (type, pinId, subPinId, subPinSpec, emit = true, propagate = true) => {
-            // console.log('Graph', 'plugPin', pinId, subPinId, subPinSpec)
+            // console.log('Graph', 'plugPin', type, pinId, subPinId, subPinSpec)
             this._plugPin(type, pinId, subPinId, subPinSpec, propagate);
             emit && this.emit('plug_pin', type, pinId, subPinId, subPinSpec, []);
         };
@@ -508,7 +513,7 @@ class Graph extends Primitive_1.Primitive {
         };
         this._plugPin = (type, pinId, subPinId, subPinSpec, propagate = true) => {
             // console.log('Graph', '_plugPin', type, pinId, subPinId, subPinSpec)
-            const { mergeId, unitId, pinId: _pinId } = subPinSpec;
+            const { mergeId, unitId, pinId: _pinId, kind = type } = subPinSpec;
             if ((0, object_1.pathOrDefault)(this._exposedEmptySubPin, [type, pinId, subPinId], undefined)) {
                 this._simUnplugPinFromEmpty(type, pinId, subPinId);
                 this._memRemoveEmptyPin(type, pinId, subPinId);
@@ -520,7 +525,7 @@ class Graph extends Primitive_1.Primitive {
                 this._plugPinToMerge(type, pinId, subPinId, mergeId, opt, propagate);
             }
             else if (unitId && _pinId) {
-                this._plugPinToUnitPin(type, pinId, subPinId, unitId, _pinId, opt, propagate);
+                this._plugPinToUnitPin(type, pinId, subPinId, unitId, kind, _pinId, opt, propagate);
             }
             else {
                 //
@@ -531,12 +536,12 @@ class Graph extends Primitive_1.Primitive {
         };
         this._simPlugPin = (type, pinId, subPinId, subPinSpec, propagate = true) => {
             // console.log('Graph', '_simPlugPin', pinId, subPinId, subPinSpec)
-            const { mergeId, unitId, pinId: _pinId } = subPinSpec;
+            const { mergeId, unitId, pinId: _pinId, kind = type } = subPinSpec;
             if (mergeId) {
                 this._simPlugPinToMerge(type, pinId, subPinId, mergeId, propagate);
             }
             else {
-                this._simPlugPinToUnitPin(type, pinId, subPinId, unitId, _pinId, propagate);
+                this._simPlugPinToUnitPin(type, pinId, subPinId, unitId, kind, _pinId, propagate);
             }
         };
         this.plugInput = (subPinId, subPin, id) => {
@@ -651,7 +656,7 @@ class Graph extends Primitive_1.Primitive {
         };
         this.__simUnplugPin = (type, pinId, subPinId, propagate = true) => {
             const subPinSpec = this.getSubPinSpec(type, pinId, subPinId);
-            const { mergeId: _mergeId, unitId: _unitId, pinId: _pinId } = subPinSpec;
+            const { mergeId: _mergeId, unitId: _unitId, pinId: _pinId, kind = type, } = subPinSpec;
             const isOutput = type === 'output';
             if (isOutput) {
                 if (_mergeId) {
@@ -666,7 +671,7 @@ class Graph extends Primitive_1.Primitive {
             else if (_unitId && _pinId) {
                 const unit = this.getUnit(_unitId);
                 const isUnitPinRef = unit.isPinRef(type, _pinId);
-                this._simUnplugPinFromUnitPin(type, pinId, subPinId, _unitId, _pinId);
+                this._simUnplugPinFromUnitPin(type, pinId, subPinId, _unitId, _pinId, kind);
                 if (propagate) {
                     if (isUnitPinRef) {
                         if (isOutput) {
@@ -679,15 +684,21 @@ class Graph extends Primitive_1.Primitive {
                 }
             }
             if (isRef) {
-                const exposedPinId = (0, util_1.getExposedPinId)(pinId, type);
-                const exposedMerge = this._exposedMerge[exposedPinId];
+                const oppositeType = (0, util_1.opposite)(type);
+                const exposedMerge = (0, f_1.default)(this._exposedMerge, [type, pinId, type]);
+                const exposedMergeOpposite = (0, f_1.default)(this._exposedMerge, [
+                    type,
+                    pinId,
+                    oppositeType,
+                ]);
                 exposedMerge.reset();
+                exposedMergeOpposite.reset();
             }
         };
         this._simPlugEmptyPin = (type, pinId, subPinId, propagate = true) => {
             // console.log('Graph', '_simPlugEmptyPin', type, pinId, subPinId)
             const emptySubPin = this._ensureEmptySubPin(type, pinId, subPinId);
-            this._simSetExposedSubPin(type, pinId, subPinId, emptySubPin, propagate);
+            this._simSetExposedSubPin(type, pinId, type, subPinId, emptySubPin, propagate);
         };
         this._memUnplugInput = (pinId, subPinId) => {
             return this._memUnplugPin('input', pinId, subPinId);
@@ -702,12 +713,10 @@ class Graph extends Primitive_1.Primitive {
             return this._simUnplugPin('output', pinId, subPinId);
         };
         this.getExposedInputPin = (id) => {
-            const exposedInputId = (0, util_1.getExposedPinId)(id, 'input');
-            return this._exposedPin[exposedInputId];
+            return (0, f_1.default)(this._exposedPin, ['input', id]);
         };
         this.getExposedOutputPin = (id) => {
-            const exposedOutputId = (0, util_1.getExposedPinId)(id, 'output');
-            return this._exposedPin[exposedOutputId];
+            return (0, f_1.default)(this._exposedPin, ['output', id]);
         };
         this.getUnitOuterSpec = (unitId) => {
             const outerSpec = {
@@ -988,6 +997,7 @@ class Graph extends Primitive_1.Primitive {
             const exposedOutputId = this.getExposedOutput({
                 unitId,
                 pinId: SELF_1.SELF,
+                kind: 'output',
             });
             this._simUnplugUnit(unitId, take);
             if (take) {
@@ -1029,10 +1039,18 @@ class Graph extends Primitive_1.Primitive {
                             const otherMergeUnitPinId = (0, object_1.getObjSingleKey)((_a = mergeSpec === null || mergeSpec === void 0 ? void 0 : mergeSpec[otherMergeUnitId]) === null || _a === void 0 ? void 0 : _a[otherMergeUnitType]);
                             this._specRemoveMerge(mergeId);
                             if (mergeInputPlug) {
-                                this._specPlugPin('input', mergeInputPlug.pinId, mergeInputPlug.subPinId, { unitId: otherMergeUnitId, pinId: otherMergeUnitPinId });
+                                this._specPlugPin('input', mergeInputPlug.pinId, mergeInputPlug.subPinId, {
+                                    unitId: otherMergeUnitId,
+                                    pinId: otherMergeUnitPinId,
+                                    kind: 'input',
+                                });
                             }
                             if (mergeOutputPlug) {
-                                this._specPlugPin('output', mergeOutputPlug.pinId, mergeOutputPlug.subPinId, { unitId: otherMergeUnitId, pinId: otherMergeUnitPinId });
+                                this._specPlugPin('output', mergeOutputPlug.pinId, mergeOutputPlug.subPinId, {
+                                    unitId: otherMergeUnitId,
+                                    pinId: otherMergeUnitPinId,
+                                    kind: 'output',
+                                });
                             }
                         }
                         else {
@@ -1069,10 +1087,18 @@ class Graph extends Primitive_1.Primitive {
                     const otherMergeUnitPinId = (0, object_1.getObjSingleKey)((_a = mergeSpec === null || mergeSpec === void 0 ? void 0 : mergeSpec[otherMergeUnitId]) === null || _a === void 0 ? void 0 : _a[otherMergeUnitType]);
                     this._simRemoveMerge(mergeId, take);
                     if (mergeInputPlug) {
-                        this._simPlugPin('input', mergeInputPlug.pinId, mergeInputPlug.subPinId, { unitId: otherMergeUnitId, pinId: otherMergeUnitPinId }, false);
+                        this._simPlugPin('input', mergeInputPlug.pinId, mergeInputPlug.subPinId, {
+                            unitId: otherMergeUnitId,
+                            pinId: otherMergeUnitPinId,
+                            kind: 'input',
+                        }, false);
                     }
                     if (mergeOutputPlug) {
-                        this._simPlugPin('output', mergeOutputPlug.pinId, mergeOutputPlug.subPinId, { unitId: otherMergeUnitId, pinId: otherMergeUnitPinId }, false);
+                        this._simPlugPin('output', mergeOutputPlug.pinId, mergeOutputPlug.subPinId, {
+                            unitId: otherMergeUnitId,
+                            pinId: otherMergeUnitPinId,
+                            kind: 'output',
+                        }, false);
                     }
                 }
                 else {
@@ -1390,8 +1416,9 @@ class Graph extends Primitive_1.Primitive {
         if (!this._spec.id) {
             system.newSpec(this._spec);
         }
-        const specs = Object.assign(Object.assign({}, ((_a = spec.specs) !== null && _a !== void 0 ? _a : {})), { [id]: spec });
-        this._specs = this.__system.specs;
+        // const specs = { ...(spec.specs ?? {}), [id]: spec }
+        const specs = (0, weakMerge_1.weakMerge)(system.specs, (0, weakMerge_1.weakMerge)((_a = spec.specs) !== null && _a !== void 0 ? _a : {}, { [id]: spec }));
+        this._specs = specs;
         const { inputs = {}, outputs = {}, units = {}, merges = {}, component = {}, render = false, } = this._spec;
         this._branch = branch;
         this._initAddUnits(units);
@@ -1508,40 +1535,54 @@ class Graph extends Primitive_1.Primitive {
         this._simRemoveBranch(mergeId, type, pinNodeId);
         this._memRemoveBranch(mergeId, type, pinNodeId);
     }
-    setExposedSubPin(type, name, subPinId, subPin, opt) {
-        this._setExposedSubPin(type, name, subPinId, subPin, opt);
-        this.emit('set_exposed_sub_pin', type, name, subPinId, subPin, opt, []);
-    }
-    _setExposedSubPin(type, name, subPinId, subPin, opt, propagate = true) {
-        const oppositeType = (0, util_1.opposite)(type);
-        const exposedPinId = (0, util_1.getExposedPinId)(name, type);
-        const exposedMerge = this._exposedMerge[exposedPinId];
-        exposedMerge.setPin(oppositeType, subPinId, subPin, opt, propagate);
+    _setExposedSubPin(type, name, kind, subPinId, subPin, opt, propagate = true) {
+        // console.log('Graph', '_setExposedSubPin', type, name, kind, subPinId, subPin, opt)
+        this._simSetExposedSubPin(type, name, kind, subPinId, subPin, propagate);
     }
     _memSetExposedSubPin(type, name, subPinId, subPin) {
         //
     }
-    _simSetExposedSubPin(type, name, subPinId, subPin, propagate = true) {
+    _simSetExposedSubPin(type, name, kind, subPinId, subPin, propagate = true) {
         // console.log(
         //   'Graph',
         //   '_simSetExposedSubPin',
         //   type,
         //   name,
+        //   kind,
         //   subPinId,
         //   subPin,
         //   propagate
         // )
         const oppositeType = (0, util_1.opposite)(type);
-        const exposedPinId = (0, util_1.getExposedPinId)(name, type);
-        const exposedMerge = this._exposedMerge[exposedPinId];
-        exposedMerge.setPin(oppositeType, subPinId, subPin, {}, propagate);
+        const exposedMerge = (0, f_1.default)(this._exposedMerge, [type, name, type]);
+        const exposedMergeOpposite = (0, f_1.default)(this._exposedMerge, [
+            type,
+            name,
+            oppositeType,
+        ]);
+        if (type === kind || (0, object_1.pathOrDefault)(this._exposedEmptySubPin, [type, name, subPinId], undefined)) {
+            exposedMerge.setPin(oppositeType, subPinId, subPin, {}, propagate);
+        }
+        else {
+            exposedMergeOpposite.setPin(type, subPinId, subPin, {}, propagate);
+        }
     }
     _simRemoveExposedSubPin(type, name, subPinId) {
-        // console.log('Graph', '_simRemoveExposedSubPin', type, name, subPinId)
+        const subPinSpec = this.getSubPinSpec(type, name, subPinId);
+        const { kind = type } = subPinSpec;
         const oppositeType = (0, util_1.opposite)(type);
-        const exposedPinId = (0, util_1.getExposedPinId)(name, type);
-        const exposedMerge = this._exposedMerge[exposedPinId];
-        exposedMerge.removePin(oppositeType, subPinId);
+        const exposedMerge = (0, f_1.default)(this._exposedMerge, [type, name, type]);
+        const exposedMergeOpposite = (0, f_1.default)(this._exposedMerge, [
+            type,
+            name,
+            oppositeType,
+        ]);
+        if (type === kind || (0, object_1.pathOrDefault)(this._exposedEmptySubPin, [type, name, subPinId], undefined)) {
+            exposedMerge.removePin(oppositeType, subPinId);
+        }
+        else {
+            exposedMergeOpposite.removePin(type, subPinId);
+        }
     }
     _play() {
         (0, f_2.default)(this._unit, (u) => u.play());
@@ -1634,16 +1675,24 @@ class Graph extends Primitive_1.Primitive {
             const merge_state = merge.snapshot();
             state.merge[mergeId] = merge_state;
         }
-        for (const pinId in this._exposedMerge) {
-            const merge = this._exposedMerge[pinId];
-            const merge_state = merge.snapshot();
-            state.exposedMerge[pinId] = merge_state;
-        }
+        (0, IOOf_1.forIOObjKV)(this._exposedMerge, (type, pinId) => {
+            const oppositeType = (0, util_1.opposite)(type);
+            const merge = (0, f_1.default)(this._exposedMerge, [type, pinId, type]);
+            const mergeOpposite = (0, f_1.default)(this._exposedMerge, [
+                type,
+                pinId,
+                oppositeType,
+            ]);
+            const mergeState = merge.snapshot();
+            const mergeOppositeState = mergeOpposite.snapshot();
+            (0, object_1.pathSet)(state.exposedMerge, [type, pinId, type], mergeState);
+            (0, object_1.pathSet)(state.exposedMerge, [type, pinId, oppositeType], mergeOppositeState);
+        });
         state.waitAll = this._waitAll['input'].snapshot();
         return state;
     }
     restoreSelf(state) {
-        var _a, _b, _c;
+        var _a, _b;
         super.restoreSelf(state);
         for (const unitId in this._unit) {
             const unit = this._unit[unitId];
@@ -1659,16 +1708,25 @@ class Graph extends Primitive_1.Primitive {
                 merge.restore(merge_state);
             }
         }
-        for (const exposedPinId in this._exposedMerge) {
-            const [type, pinId] = exposedPinId.split('/');
+        (0, IOOf_1.forIOObjKV)(this._exposedMerge, (type, pinId) => {
+            const oppositeType = (0, util_1.opposite)(type);
             if (this.hasDataPinNamed(type, pinId)) {
-                const merge = this._exposedMerge[exposedPinId];
-                const merge_state = (_c = state.exposedMerge) === null || _c === void 0 ? void 0 : _c[exposedPinId];
-                if (merge_state) {
-                    merge.restore(merge_state);
+                const merge = (0, f_1.default)(this._exposedMerge, [type, pinId, type]);
+                const mergeOpposite = (0, f_1.default)(this._exposedMerge, [
+                    type,
+                    pinId,
+                    oppositeType,
+                ]);
+                const mergeState = (0, object_1.pathOrDefault)(state, ['exposedMerge', type, pinId, type], undefined);
+                const mergeOppositeState = (0, object_1.pathOrDefault)(state, ['exposedMerge', type, pinId, oppositeType], undefined);
+                if (mergeState) {
+                    merge.restore(mergeState);
+                }
+                if (mergeOppositeState) {
+                    mergeOpposite.restore(mergeOppositeState);
                 }
             }
-        }
+        });
         const wait_all_state = state.waitAll;
         if (wait_all_state) {
             this._waitAll['input'].restore(wait_all_state);
@@ -1710,9 +1768,11 @@ class Graph extends Primitive_1.Primitive {
         this._setComponentSize(width, height);
         // emit && this.emit('set_component_size', unitId, width, height, [])
     }
-    _simExposePinSet(type, pinId, pinSpec, exposedPin, exposedMerge, propagate = true) {
+    _simExposePinSet(type, pinId, pinSpec, exposedPin, exposedMerge, exposedMergeOpposite, propagate = true) {
         const { plug, ref } = pinSpec;
+        const oppositeType = (0, util_1.opposite)(type);
         exposedMerge.setPin(type, pinId, exposedPin);
+        exposedMergeOpposite.setPin(oppositeType, pinId, exposedPin);
         (0, f_2.default)(plug, (subPinSpec, subPinId) => {
             this._simExposePin(type, pinId, subPinId, subPinSpec, propagate);
         });
@@ -1749,10 +1809,10 @@ class Graph extends Primitive_1.Primitive {
             this._unplugFromWaitAll(type, pinId);
         }
     }
-    setPinSetId(type, pinId, nextPinId) {
+    setPinSetId(type, pinId, nextPinId, emit = true) {
         this._setPinSetId(type, pinId, nextPinId);
         this.renamePin(type, pinId, nextPinId);
-        this.emit('set_pin_set_id', type, pinId, nextPinId, []);
+        emit && this.emit('set_pin_set_id', type, pinId, nextPinId, []);
     }
     _setPinSetId(type, pinId, nextPinId) {
         // console.log('Graph', '_setPinSetId', type, pinId, nextPinId)
@@ -1762,7 +1822,7 @@ class Graph extends Primitive_1.Primitive {
         this._spec[`${type}s`][nextPinId] = pinSpec;
     }
     isExposedInput(pin) {
-        const inputs = this._spec.inputs || {};
+        const { inputs = {} } = this._spec;
         const pinNodeId = this._getExposedSubPinNodeId('input', pin);
         return (0, object_1.someObj)(inputs, ({ plug }) => {
             return (0, object_1.someObj)(plug, (i) => {
@@ -1889,6 +1949,7 @@ class Graph extends Primitive_1.Primitive {
             this._plugPin(outerPin.type, outerPin.pinId, outerPin.subPinId, {
                 unitId: nextUnitId,
                 pinId: nextPinId,
+                kind: outerPin.type,
             });
         });
     }
@@ -1926,6 +1987,7 @@ class Graph extends Primitive_1.Primitive {
             this._plugPin(outerPin.type, outerPin.pinId, outerPin.subPinId, {
                 unitId: nextUnitId,
                 pinId,
+                kind: outerPin.type,
             });
         });
         if (snapshot) {
@@ -2048,8 +2110,7 @@ class Graph extends Primitive_1.Primitive {
     }
     getPlug(type, pinId, subPinId) {
         const oppositeType = (0, util_1.opposite)(type);
-        const exposedPinId = (0, util_1.getExposedPinId)(pinId, type);
-        const exposedMerge = this._exposedMerge[exposedPinId];
+        const exposedMerge = (0, f_1.default)(this._exposedMerge, [type, pinId, type]);
         const plug = exposedMerge.getPin(oppositeType, subPinId);
         return plug;
     }
@@ -2180,12 +2241,16 @@ class Graph extends Primitive_1.Primitive {
             const pinNodeId = (0, util_1.getPinNodeId)(unitId, type, pinId);
             const pipedToMerge = this._pipedTo[pinNodeId];
             const pipedFromMerge = this._pipedFrom[pinNodeId];
+            const pinPlug = (0, util_1.findUnitPinPlug)(this._spec, unitId, type, pinId);
             if (pipedToMerge) {
                 this._removePinOrMerge(pipedToMerge, unitId, type, pinId);
             }
             if (pipedFromMerge) {
                 this._removePinOrMerge(pipedFromMerge, unitId, type, pinId);
             }
+            if (pinPlug) {
+                this._unplugPin(type, pinPlug.pinId, pinPlug.subPinId);
+            }
             delete this._pipedTo[pinNodeId];
             delete this._pipedFrom[pinNodeId];
             delete this._pin[pinNodeId];
@@ -2758,7 +2823,7 @@ class Graph extends Primitive_1.Primitive {
     }
     setUnitPinSetId(unitId, type, pinId, newPinId, emit = true) {
         const unit = this.getUnit(unitId);
-        unit.setPinSetId(type, pinId, newPinId);
+        unit.setPinSetId(type, pinId, newPinId, false);
         emit && this.emit('set_unit_pin_set_id', unitId, type, pinId, newPinId, []);
     }
     setUnitPinConstant(unitId, type, pinId, constant, emit = true) {
@@ -2845,6 +2910,7 @@ class Graph extends Primitive_1.Primitive {
             this._plugPin(type, plugSpec.pinId, plugSpec.subPinId, {
                 unitId,
                 pinId,
+                kind: type,
             }, propagate);
         });
     }