Skip to content

Commit f367119

Browse files
committed
Updated builds and README
1 parent 9fab84e commit f367119

File tree

4 files changed

+80
-33
lines changed

4 files changed

+80
-33
lines changed

build/two.js

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ var Two = (() => {
741741
canvas: "CanvasRenderer"
742742
},
743743
Version: "v0.8.15",
744-
PublishDate: "2024-11-07T05:56:16.788Z",
744+
PublishDate: "2024-12-27T23:16:37.528Z",
745745
Identifier: "two-",
746746
Resolution: 12,
747747
AutoCalculateImportedMatrices: true,
@@ -1482,42 +1482,48 @@ var Two = (() => {
14821482

14831483
// src/collection.js
14841484
var Collection = class extends Array {
1485-
_events = new Events();
1485+
#events = new Events();
1486+
get _events() {
1487+
return this.#events;
1488+
}
1489+
set _events(e) {
1490+
this.#events = e;
1491+
}
14861492
get _bound() {
1487-
return this._events._bound;
1493+
return this.#events._bound;
14881494
}
14891495
set _bound(v) {
1490-
this._events._bound = v;
1496+
this.#events._bound = v;
14911497
}
14921498
addEventListener() {
1493-
return this._events.addEventListener.apply(this, arguments);
1499+
return this.#events.addEventListener.apply(this, arguments);
14941500
}
14951501
on() {
1496-
return this._events.on.apply(this, arguments);
1502+
return this.#events.on.apply(this, arguments);
14971503
}
14981504
bind() {
1499-
return this._events.bind.apply(this, arguments);
1505+
return this.#events.bind.apply(this, arguments);
15001506
}
15011507
removeEventListener() {
1502-
return this._events.removeEventListener.apply(this, arguments);
1508+
return this.#events.removeEventListener.apply(this, arguments);
15031509
}
15041510
off() {
1505-
return this._events.off.apply(this, arguments);
1511+
return this.#events.off.apply(this, arguments);
15061512
}
15071513
unbind() {
1508-
return this._events.unbind.apply(this, arguments);
1514+
return this.#events.unbind.apply(this, arguments);
15091515
}
15101516
dispatchEvent() {
1511-
return this._events.dispatchEvent.apply(this, arguments);
1517+
return this.#events.dispatchEvent.apply(this, arguments);
15121518
}
15131519
trigger() {
1514-
return this._events.trigger.apply(this, arguments);
1520+
return this.#events.trigger.apply(this, arguments);
15151521
}
15161522
listen() {
1517-
return this._events.listen.apply(this, arguments);
1523+
return this.#events.listen.apply(this, arguments);
15181524
}
15191525
ignore() {
1520-
return this._events.ignore.apply(this, arguments);
1526+
return this.#events.ignore.apply(this, arguments);
15211527
}
15221528
constructor() {
15231529
super();
@@ -1553,7 +1559,10 @@ var Two = (() => {
15531559
const spliced = super.splice.apply(this, arguments);
15541560
this.trigger(Events.Types.remove, spliced);
15551561
if (arguments.length > 2) {
1556-
const inserted = this.slice(arguments[0], arguments[0] + arguments.length - 2);
1562+
const inserted = this.slice(
1563+
arguments[0],
1564+
arguments[0] + arguments.length - 2
1565+
);
15571566
this.trigger(Events.Types.insert, inserted);
15581567
this.trigger(Events.Types.order);
15591568
}
@@ -2734,7 +2743,10 @@ var Two = (() => {
27342743

27352744
// src/children.js
27362745
var Children = class extends Collection {
2737-
ids = {};
2746+
#ids = {};
2747+
get ids() {
2748+
return this.#ids;
2749+
}
27382750
constructor(children) {
27392751
children = Array.isArray(children) ? children : Array.prototype.slice.call(arguments);
27402752
super(children);

build/two.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/two.module.js

Lines changed: 50 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,24 @@ var __publicField = (obj, key, value) => {
4848
__defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
4949
return value;
5050
};
51+
var __accessCheck = (obj, member, msg) => {
52+
if (!member.has(obj))
53+
throw TypeError("Cannot " + msg);
54+
};
55+
var __privateGet = (obj, member, getter) => {
56+
__accessCheck(obj, member, "read from private field");
57+
return getter ? getter.call(obj) : member.get(obj);
58+
};
59+
var __privateAdd = (obj, member, value) => {
60+
if (member.has(obj))
61+
throw TypeError("Cannot add the same private member more than once");
62+
member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
63+
};
64+
var __privateSet = (obj, member, value, setter) => {
65+
__accessCheck(obj, member, "write to private field");
66+
setter ? setter.call(obj, value) : member.set(obj, value);
67+
return value;
68+
};
5169

5270
// src/utils/path-commands.js
5371
var Commands = {
@@ -739,7 +757,7 @@ var Constants = {
739757
canvas: "CanvasRenderer"
740758
},
741759
Version: "v0.8.15",
742-
PublishDate: "2024-11-07T05:56:16.788Z",
760+
PublishDate: "2024-12-27T23:16:37.528Z",
743761
Identifier: "two-",
744762
Resolution: 12,
745763
AutoCalculateImportedMatrices: true,
@@ -1479,10 +1497,11 @@ function FlagScale() {
14791497
}
14801498

14811499
// src/collection.js
1500+
var _events;
14821501
var Collection = class extends Array {
14831502
constructor() {
14841503
super();
1485-
__publicField(this, "_events", new Events());
1504+
__privateAdd(this, _events, new Events());
14861505
if (arguments[0] && Array.isArray(arguments[0])) {
14871506
if (arguments[0].length > 0) {
14881507
this.push.apply(this, arguments[0]);
@@ -1491,41 +1510,47 @@ var Collection = class extends Array {
14911510
this.push.apply(this, arguments);
14921511
}
14931512
}
1513+
get _events() {
1514+
return __privateGet(this, _events);
1515+
}
1516+
set _events(e) {
1517+
__privateSet(this, _events, e);
1518+
}
14941519
get _bound() {
1495-
return this._events._bound;
1520+
return __privateGet(this, _events)._bound;
14961521
}
14971522
set _bound(v) {
1498-
this._events._bound = v;
1523+
__privateGet(this, _events)._bound = v;
14991524
}
15001525
addEventListener() {
1501-
return this._events.addEventListener.apply(this, arguments);
1526+
return __privateGet(this, _events).addEventListener.apply(this, arguments);
15021527
}
15031528
on() {
1504-
return this._events.on.apply(this, arguments);
1529+
return __privateGet(this, _events).on.apply(this, arguments);
15051530
}
15061531
bind() {
1507-
return this._events.bind.apply(this, arguments);
1532+
return __privateGet(this, _events).bind.apply(this, arguments);
15081533
}
15091534
removeEventListener() {
1510-
return this._events.removeEventListener.apply(this, arguments);
1535+
return __privateGet(this, _events).removeEventListener.apply(this, arguments);
15111536
}
15121537
off() {
1513-
return this._events.off.apply(this, arguments);
1538+
return __privateGet(this, _events).off.apply(this, arguments);
15141539
}
15151540
unbind() {
1516-
return this._events.unbind.apply(this, arguments);
1541+
return __privateGet(this, _events).unbind.apply(this, arguments);
15171542
}
15181543
dispatchEvent() {
1519-
return this._events.dispatchEvent.apply(this, arguments);
1544+
return __privateGet(this, _events).dispatchEvent.apply(this, arguments);
15201545
}
15211546
trigger() {
1522-
return this._events.trigger.apply(this, arguments);
1547+
return __privateGet(this, _events).trigger.apply(this, arguments);
15231548
}
15241549
listen() {
1525-
return this._events.listen.apply(this, arguments);
1550+
return __privateGet(this, _events).listen.apply(this, arguments);
15261551
}
15271552
ignore() {
1528-
return this._events.ignore.apply(this, arguments);
1553+
return __privateGet(this, _events).ignore.apply(this, arguments);
15291554
}
15301555
pop() {
15311556
const popped = super.pop.apply(this, arguments);
@@ -1551,7 +1576,10 @@ var Collection = class extends Array {
15511576
const spliced = super.splice.apply(this, arguments);
15521577
this.trigger(Events.Types.remove, spliced);
15531578
if (arguments.length > 2) {
1554-
const inserted = this.slice(arguments[0], arguments[0] + arguments.length - 2);
1579+
const inserted = this.slice(
1580+
arguments[0],
1581+
arguments[0] + arguments.length - 2
1582+
);
15551583
this.trigger(Events.Types.insert, inserted);
15561584
this.trigger(Events.Types.order);
15571585
}
@@ -1585,6 +1613,7 @@ var Collection = class extends Array {
15851613
return results;
15861614
}
15871615
};
1616+
_events = new WeakMap();
15881617

15891618
// src/effects/stop.js
15901619
var _Stop = class extends Element {
@@ -2731,15 +2760,19 @@ function FlagMatrix() {
27312760
}
27322761

27332762
// src/children.js
2763+
var _ids;
27342764
var Children = class extends Collection {
27352765
constructor(children) {
27362766
children = Array.isArray(children) ? children : Array.prototype.slice.call(arguments);
27372767
super(children);
2738-
__publicField(this, "ids", {});
2768+
__privateAdd(this, _ids, {});
27392769
this.attach(children);
27402770
this.on(Events.Types.insert, this.attach);
27412771
this.on(Events.Types.remove, this.detach);
27422772
}
2773+
get ids() {
2774+
return __privateGet(this, _ids);
2775+
}
27432776
attach(children) {
27442777
for (let i = 0; i < children.length; i++) {
27452778
const child = children[i];
@@ -2756,6 +2789,7 @@ var Children = class extends Collection {
27562789
return this;
27572790
}
27582791
};
2792+
_ids = new WeakMap();
27592793

27602794
// src/path.js
27612795
var min = Math.min;

wiki/changelog/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file. The format
1313

1414
## Nightly
1515

16+
+ Made `Two.Collection._events` and `Two.Children.ids` not enumerated for more seamless invocation of `Array` methods like `Array.filter` and `Object` methods like `Object.keys`
1617
+ Added static method `fromObject` to all `Two.Element` and descendant classes
1718
+ Added method `copy` to all `Two.Element` and descendant classes
1819
+ Added tests for `toObject` methods

0 commit comments

Comments
 (0)