@cyclonium/2d 0.0.102 → 0.0.104

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export { MAX_ORDER_IN_LAYER, MIN_ORDER_IN_LAYER, SortableRenderer, computeLocalSortingKey, } from './sortable.js';
+export { MAX_ORDER_IN_LAYER, MIN_ORDER_IN_LAYER, SortableRenderer, SortingTreeGroup, computeLocalSortingKey, } from './sortable.js';
 export { SortSettings } from './sort-settings.js';
 export { SortingGroup } from './sorting-group.component.js';
 export { SortingLayer } from './sorting-layer.js';

package/lib/index.js

@@ -1,4 +1,4 @@
-export { MAX_ORDER_IN_LAYER, MIN_ORDER_IN_LAYER, SortableRenderer, computeLocalSortingKey, } from './sortable.js';
+export { MAX_ORDER_IN_LAYER, MIN_ORDER_IN_LAYER, SortableRenderer, SortingTreeGroup, computeLocalSortingKey, } from './sortable.js';
 export { SortSettings } from './sort-settings.js';
 export { SortingGroup } from './sorting-group.component.js';
 export { SortingLayer } from './sorting-layer.js';

package/lib/sort-settings.d.ts

@@ -1,5 +1,4 @@
-import { SortableRenderer } from './sortable.js';
-import type { SortingGroup } from './sorting-group.component.js';
+import { type SortableRenderer, type SortingTreeGroup } from './sortable.js';
 export declare class SortSettings {
     get sortingLayer(): number;
     set sortingLayer(value: number);
@@ -7,7 +6,7 @@ export declare class SortSettings {
     set orderInLayer(value: number);
     get connected(): boolean;
     get sortingKey(): number;
-    connect(sortableRenderer: SortableRenderer | SortingGroup): void;
+    connect(sortableRenderer: SortableRenderer | SortingTreeGroup): void;
     disconnect(): void;
     private _sortingLayer;
     private _orderInLayer;

package/lib/sort-settings.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { cycloClass, editable, idem, designType, serializable } from '@cyclonium/core/legacy-decorator';
 import { CCInteger } from 'cc';
-import { MIN_ORDER_IN_LAYER, MAX_ORDER_IN_LAYER, SortableRenderer } from './sortable.js';
+import { MIN_ORDER_IN_LAYER, MAX_ORDER_IN_LAYER } from './sortable.js';
 import { SortingLayer } from './sorting-layer.js';
 import { SortingTreeNode } from './sorting-tree.js';
 let SortSettings = class SortSettings {

package/lib/sortable.d.ts

@@ -10,6 +10,15 @@ export declare namespace SortableRenderer {
     }
     function is(component: Component): component is SortableRenderer;
 }
+export interface SortingTreeGroup extends Component {
+    readonly [SortingTreeGroup.Tags.sortSettings]: SortSettings;
+}
+export declare namespace SortingTreeGroup {
+    namespace Tags {
+        const sortSettings: unique symbol;
+    }
+    function is(component: Component): component is SortingTreeGroup;
+}
 export declare const MIN_ORDER_IN_LAYER: number;
 export declare const MAX_ORDER_IN_LAYER: number;
 export declare function computeLocalSortingKey(sortSettings: SortSettings): number;

package/lib/sortable.js

@@ -11,6 +11,19 @@ export var SortableRenderer;
     }
     SortableRenderer.is = is;
 })(SortableRenderer || (SortableRenderer = {}));
+// eslint-disable-next-line @typescript-eslint/no-namespace
+export var SortingTreeGroup;
+(function (SortingTreeGroup) {
+    // eslint-disable-next-line @typescript-eslint/no-namespace
+    let Tags;
+    (function (Tags) {
+        Tags.sortSettings = Symbol('isSortingTreeGroup');
+    })(Tags = SortingTreeGroup.Tags || (SortingTreeGroup.Tags = {}));
+    function is(component) {
+        return Tags.sortSettings in component;
+    }
+    SortingTreeGroup.is = is;
+})(SortingTreeGroup || (SortingTreeGroup = {}));
 const MAX_ORDER_IN_LAYER_POW = 16;
 export const MIN_ORDER_IN_LAYER = -(2 ** (MAX_ORDER_IN_LAYER_POW - 1));
 export const MAX_ORDER_IN_LAYER = 2 ** (MAX_ORDER_IN_LAYER_POW - 1);

package/lib/sorting-group.component.d.ts

@@ -1,7 +1,9 @@
 import { CycloComponent } from '@cyclonium/core/framework';
+import { SortingTreeGroup } from './sortable.js';
 import { SortSettings } from './sort-settings.js';
-export declare class SortingGroup extends CycloComponent {
+export declare class SortingGroup extends CycloComponent implements SortingTreeGroup {
     get sortSettings(): SortSettings;
+    get [SortingTreeGroup.Tags.sortSettings](): SortSettings;
     protected onDestroy(): void;
     protected onEnabled(): void;
     protected onDisabled(): void;

package/lib/sorting-group.component.js

@@ -7,11 +7,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { CycloComponent } from '@cyclonium/core/framework';
 import { editable, executeInEditMode, cycloClass, serializable } from '@cyclonium/core/legacy-decorator';
+import { SortingTreeGroup } from './sortable.js';
 import { SortSettings } from './sort-settings.js';
 let SortingGroup = class SortingGroup extends CycloComponent {
     get sortSettings() {
         return this._sortSettings;
     }
+    get [SortingTreeGroup.Tags.sortSettings]() {
+        return this._sortSettings;
+    }
     onDestroy() {
         this._sortSettings.disconnect();
     }

package/lib/sorting-tree.d.ts

@@ -1,9 +1,9 @@
-import { SortingGroup } from './sorting-group.component.js';
-import { SortableRenderer } from './sortable.js';
+import { SortableRenderer, SortingTreeGroup } from './sortable.js';
+type SortingTreeComponent = SortingTreeGroup | SortableRenderer;
 export declare class SortingTreeNode {
     private readonly _component;
     private readonly _treeNodeMap;
-    static create(component: SortingGroup | SortableRenderer): SortingTreeNode;
+    static create(component: SortingTreeComponent): SortingTreeNode;
     get sortingKeyStart(): number;
     destroy(): void;
     update(): void;
@@ -13,6 +13,7 @@ export declare class SortingTreeNode {
     private static _computeLCA;
     private static _computeLocalSortingKey;
     private static _compareLocalSortingKey;
+    private static _getSortingGroup;
     private static _ensureSceneSortingRecord;
     private static _getOrCreateParent;
     private static _getOrCreateNode;
@@ -35,4 +36,5 @@ export declare class SortingTreeNode {
     private _updateChildRangeSlightly;
     private _updateChildFrom;
 }
+export {};
 //# sourceMappingURL=sorting-tree.d.ts.map

package/lib/sorting-tree.js

@@ -1,9 +1,7 @@
-import { Node, Scene } from 'cc';
-import { SortingGroup } from './sorting-group.component.js';
 import { assert } from '@cyclonium/core/utils';
 import { logger } from '@cyclonium/core/log';
 import { EDITOR_NOT_IN_PREVIEW } from 'cc/env';
-import { computeLocalSortingKey, SortableRenderer } from './sortable.js';
+import { computeLocalSortingKey, SortableRenderer, SortingTreeGroup } from './sortable.js';
 const ENABLE_SORTING_TREE_DEBUG = false && !EDITOR_NOT_IN_PREVIEW;
 const debugLog = ENABLE_SORTING_TREE_DEBUG
     ? (() => {
@@ -143,6 +141,9 @@ export class SortingTreeNode {
     static _compareLocalSortingKey(a, b) {
         return this._computeLocalSortingKey(a) - this._computeLocalSortingKey(b);
     }
+    static _getSortingGroup(node) {
+        return node.components.find(SortingTreeGroup.is);
+    }
     static _ensureSceneSortingRecord(component) {
         const scene = component.node.scene;
         let sceneSortingRecord = this._sceneSortingRecordMap.get(scene);
@@ -182,9 +183,9 @@ export class SortingTreeNode {
         return sceneSortingRecord;
     }
     static _getOrCreateParent(sceneSortingRecord, component) {
-        const startSceneNode = component instanceof SortingGroup ? component.node.parent : component.node;
+        const startSceneNode = SortingTreeGroup.is(component) ? component.node.parent : component.node;
         for (let currentNode = startSceneNode; currentNode; currentNode = currentNode.parent) {
-            const sortingGroup = currentNode.getComponent(SortingGroup);
+            const sortingGroup = this._getSortingGroup(currentNode);
             if (sortingGroup && sortingGroup.enabledInHierarchy) {
                 const sortingTreeNode = this._getOrCreateNode(sceneSortingRecord, sortingGroup);
                 return sortingTreeNode;
@@ -214,7 +215,7 @@ export class SortingTreeNode {
         const newSortingTreeNode = this._createComponentSortingTreeNode(sceneSortingRecord, component);
         parentTreeNode._addChildSlightly(newSortingTreeNode);
         SortingTreeNode._queueUpdate(sceneSortingRecord, parentTreeNode);
-        if (component instanceof SortingGroup) {
+        if (SortingTreeGroup.is(component)) {
             debugLog?.log(`[NOTICE] Creating subtrees from ${component.name} top-to-bottom`);
             this._constructSubTree(sceneSortingRecord, newSortingTreeNode, component.node);
         }
@@ -251,7 +252,7 @@ export class SortingTreeNode {
         for (const childSceneNode of sceneNode.children) {
             // If child scene node is a sorting group, then itself is our child,
             // but its child scene nodes are not our children.
-            const childSortingGroup = childSceneNode.getComponent(SortingGroup);
+            const childSortingGroup = this._getSortingGroup(childSceneNode);
             if (childSortingGroup && childSortingGroup.enabledInHierarchy) {
                 let childTreeNode = sceneSortingRecord.treeNodeMap.get(childSortingGroup);
                 if (childTreeNode) {
@@ -291,11 +292,11 @@ export class SortingTreeNode {
     constructor(_component, _treeNodeMap) {
         this._component = _component;
         this._treeNodeMap = _treeNodeMap;
-        this._sortSettings = _component instanceof SortingGroup
-            ? _component.sortSettings
-            : _component
-                ? _component[SortableRenderer.Tags.sortSettings]
-                : undefined;
+        this._sortSettings = _component
+            ? SortingTreeGroup.is(_component)
+                ? _component[SortingTreeGroup.Tags.sortSettings]
+                : _component[SortableRenderer.Tags.sortSettings]
+            : undefined;
     }
     _parent = undefined;
     _children = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyclonium/2d",
-  "version": "0.0.102",
+  "version": "0.0.104",
   "repository": {
     "type": "git",
     "url": "https://github.com/shrinktofit/cyclonium",
@@ -21,8 +21,8 @@
     }
   },
   "peerDependencies": {
-    "@cyclonium/core": "0.0.102",
-    "@cyclonium/editor": "0.0.102"
+    "@cyclonium/core": "0.0.104",
+    "@cyclonium/editor": "0.0.104"
   },
   "peerDependenciesMeta": {
     "@cyclonium/editor": {
@@ -36,7 +36,7 @@
     "typescript": "^6.0.2",
     "vitest": "^4.1.5",
     "@cyclonium/cc-test": "0.0.102",
-    "@cyclonium/editor": "0.0.102",
+    "@cyclonium/editor": "0.0.104",
     "@cyclonium/workflow": "0.0.100",
     "@cyclonium/types-cc": "0.0.100"
   },