@limble/limble-tree 6.1.1 → 7.0.0

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@limble/limble-tree",
-  "version": "6.1.1",
+  "version": "7.0.0",
   "peerDependencies": {
-    "@angular/common": "^19.0.0",
-    "@angular/core": "^19.0.0",
+    "@angular/common": "^20.0.0",
+    "@angular/core": "^20.0.0",
     "rxjs": "^7.8.0"
   },
   "dependencies": {

package/lib/components/branch/branch.component.d.ts

@@ -1,26 +0,0 @@
-import { type AfterViewInit, ApplicationRef, type ComponentRef, EventEmitter, type OnDestroy, type QueryList, type Type, ViewContainerRef } from "@angular/core";
-import type { HostComponent } from "../host-component.interface";
-import type { NodeComponent } from "../node-component.interface";
-import { DropzoneComponent } from "../dropzone";
-import * as i0 from "@angular/core";
-export declare class BranchComponent<T> implements NodeComponent, HostComponent<T>, AfterViewInit, OnDestroy {
-    private readonly appRef;
-    branchesContainer: ViewContainerRef | undefined;
-    contentContainer: ViewContainerRef | undefined;
-    dropzones: QueryList<DropzoneComponent> | undefined;
-    contentToHost?: Type<T>;
-    readonly contentCreated: EventEmitter<T>;
-    readonly showDropzones: EventEmitter<"upper" | "lower">;
-    readonly dropped: EventEmitter<"inner" | "lateral">;
-    showInnerDropzone: boolean;
-    showLateralDropzone: boolean;
-    private hostedContent?;
-    constructor(appRef: ApplicationRef);
-    ngAfterViewInit(): void;
-    getHostedContent(): ComponentRef<T> | undefined;
-    triggerChangeDetection(): void;
-    protected dragoverHandler(event: DragEvent): void;
-    ngOnDestroy(): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<BranchComponent<any>, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<BranchComponent<any>, "branch", never, { "contentToHost": { "alias": "contentToHost"; "required": false; }; }, { "contentCreated": "contentCreated"; "showDropzones": "showDropzones"; "dropped": "dropped"; }, never, never, true, never>;
-}

package/lib/components/branch/index.d.ts

@@ -1 +0,0 @@
-export * from "./branch.component";

package/lib/components/dragover-no-change-detect.d.ts

@@ -1,18 +0,0 @@
-import { ElementRef, EventEmitter, NgZone, type OnDestroy, type OnInit } from "@angular/core";
-import * as i0 from "@angular/core";
-/**
- * Works just like Angular's built-in `(dragover)` event binding, but is much
- * more performant. It throttles the event to a configurable rate (default once
- * every 25ms) and runs outside of Angular's change detection.
- */
-export declare class DragoverNoChangeDetectDirective implements OnInit, OnDestroy {
-    private readonly ngZone;
-    private readonly el;
-    readonly dragoverNoChangeDetect: EventEmitter<DragEvent>;
-    private eventSubscription;
-    constructor(ngZone: NgZone, el: ElementRef<Element>);
-    ngOnInit(): void;
-    ngOnDestroy(): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<DragoverNoChangeDetectDirective, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<DragoverNoChangeDetectDirective, "[dragoverNoChangeDetect]", never, {}, { "dragoverNoChangeDetect": "dragoverNoChangeDetect"; }, never, never, true, never>;
-}

package/lib/components/dropzone/dropzone.component.d.ts

@@ -1,13 +0,0 @@
-import { EventEmitter } from "@angular/core";
-import * as i0 from "@angular/core";
-export declare class DropzoneComponent {
-    placement?: "inner" | "lateral";
-    readonly dropped: EventEmitter<DragEvent>;
-    protected active: boolean;
-    dragenterHandler(): void;
-    dragleaveHandler(): void;
-    dragoverHandler(event: DragEvent): void;
-    dropHandler(event: DragEvent): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<DropzoneComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<DropzoneComponent, "dropzone", never, { "placement": { "alias": "placement"; "required": false; }; }, { "dropped": "dropped"; }, never, never, true, never>;
-}

package/lib/components/dropzone/index.d.ts

@@ -1 +0,0 @@
-export * from "./dropzone.component";

package/lib/components/host-component.interface.d.ts

@@ -1,6 +0,0 @@
-import type { ComponentRef, EventEmitter, Type } from "@angular/core";
-export interface HostComponent<UserlandComponent> {
-    contentCreated: EventEmitter<UserlandComponent>;
-    contentToHost?: Type<UserlandComponent>;
-    getHostedContent: () => ComponentRef<UserlandComponent> | undefined;
-}

package/lib/components/index.d.ts

@@ -1,6 +0,0 @@
-export * from "./branch";
-export * from "./root";
-export * from "./dropzone";
-export type * from "./host-component.interface";
-export type * from "./node-component.interface";
-export * from "./dragover-no-change-detect";

package/lib/components/node-component.interface.d.ts

@@ -1,5 +0,0 @@
-import type { ViewContainerRef } from "@angular/core";
-export interface NodeComponent {
-    branchesContainer: ViewContainerRef | undefined;
-    showInnerDropzone: boolean;
-}

package/lib/components/root/index.d.ts

@@ -1 +0,0 @@
-export * from "./root.component";

package/lib/components/root/root.component.d.ts

@@ -1,14 +0,0 @@
-import { type AfterViewInit, EventEmitter, ViewContainerRef } from "@angular/core";
-import { DropzoneComponent } from "../dropzone";
-import type { NodeComponent } from "../node-component.interface";
-import * as i0 from "@angular/core";
-export declare class RootComponent implements NodeComponent, AfterViewInit {
-    branchesContainer: ViewContainerRef | undefined;
-    dropzone: DropzoneComponent | undefined;
-    readonly afterViewInit: EventEmitter<void>;
-    readonly dropped: EventEmitter<void>;
-    showInnerDropzone: boolean;
-    ngAfterViewInit(): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<RootComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<RootComponent, "root", never, {}, { "afterViewInit": "afterViewInit"; "dropped": "dropped"; }, never, never, true, never>;
-}

package/lib/core/branch-options.interface.d.ts

@@ -1,14 +0,0 @@
-import type { EventEmitter, Type } from "@angular/core";
-export interface BranchOptions<Component> {
-    inputBindings?: {
-        [K in keyof Component]?: Component[K];
-    };
-    outputBindings?: {
-        [K in keyof Component]?: Component[K] extends EventEmitter<infer T> ? (value: T) => void : never;
-    };
-    defaultCollapsed?: boolean;
-    meta?: Record<string, any>;
-}
-export interface FullBranchOptions<Component> extends BranchOptions<Component> {
-    component: Type<Component>;
-}

package/lib/core/branchable.interface.d.ts

@@ -1,8 +0,0 @@
-import type { Type } from "@angular/core";
-import type { TreeBranch } from "./tree-branch";
-import type { BranchOptions } from "./branch-options.interface";
-export interface Branchable<UserlandComponent> {
-    branches: () => Array<TreeBranch<UserlandComponent>>;
-    getBranch: (index: number) => TreeBranch<UserlandComponent> | undefined;
-    grow: (component: Type<UserlandComponent>, options?: BranchOptions<UserlandComponent>) => TreeBranch<UserlandComponent>;
-}

package/lib/core/component-container.interface.d.ts

@@ -1,8 +0,0 @@
-import type { ViewContainerRef, ViewRef } from "@angular/core";
-export interface ComponentContainer<Component> {
-    detectChanges: () => void;
-    getBranchesContainer: () => ViewContainerRef | undefined;
-    getComponentInstance: () => Component;
-    getHostView: () => ViewRef;
-    getNativeElement: () => HTMLElement;
-}

package/lib/core/configuration/configuration.d.ts

@@ -1,11 +0,0 @@
-import type { TreeRoot } from "../tree-root";
-import type { TreeOptions } from "./tree-options.interface";
-declare class Configuration {
-    private readonly configStorage;
-    constructor();
-    setConfig<T>(root: TreeRoot<T>, options: TreeOptions): void;
-    getConfig(root: any): TreeOptions | undefined;
-    delete(root: any): void;
-}
-export declare const config: Configuration;
-export {};

package/lib/core/configuration/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./configuration";
-export type * from "./tree-options.interface";

package/lib/core/configuration/tree-options.interface.d.ts

@@ -1,54 +0,0 @@
-import type { TreeBranch } from "../tree-branch";
-import type { TreeRoot } from "../tree-root";
-/** The configuration options for a tree, as identified by a TreeRoot */
-export interface TreeOptions {
-    dragAndDrop?: {
-        /**
-         * A function that determines whether to allow a node to be dragged.
-         *
-         * @remarks
-         * Runs when a drag begins, but before the branch is pruned from the tree.
-         *
-         * @param treeBranch - The node of the tree that is about to be dragged.
-         *
-         * @defaultValue A function that always returns true.
-         *
-         * @returns `true` if the node can be dragged; `false` if it cannot.
-         */
-        allowDragging?: <T>(treeBranch: TreeBranch<T>) => boolean;
-        /**
-         * A function to determine whether a sourceNode can be dropped at a
-         * particular location.
-         *
-         * @remarks
-         * This function runs just before displaying a family of dropzones.
-         *
-         * @param sourceBranch - The branch that is being dragged.
-         * @param proposedParent - The proposed new parent of the sourceBranch.
-         * @param proposedIndex - The proposed new index of the sourceBranch.
-         *
-         * @defaultValue A function that always returns true.
-         */
-        allowDrop?: <T>(sourceBranch: TreeBranch<T>, proposedParent: TreeBranch<T> | TreeRoot<T>, proposedIndex: number) => boolean;
-        /**
-         * A function to indicate whether to allow "nesting" (placing a branch as
-         * a child) of a particular branch.
-         *
-         * @remarks
-         * This function runs just before displaying a family of dropzones.
-         *
-         * @param treeBranch - The node of the tree whose nesting capability is being
-         * checked.
-         *
-         * @defaultValue A function that always returns true.
-         */
-        allowNesting?: <T>(treeBranch: TreeBranch<T>) => boolean;
-    };
-    /**
-     * The number of pixels each level of the tree will be indented relative to
-     * its parent.
-     *
-     * @defaultValue 16
-     */
-    indentation?: number;
-}

package/lib/core/index.d.ts

@@ -1,10 +0,0 @@
-export * from "./configuration";
-export * from "./tree-branch";
-export * from "./tree-root";
-export * from "./tree-service";
-export type * from "./branch-options.interface";
-export type * from "./branchable.interface";
-export type * from "./component-container.interface";
-export * from "./tree-node-base";
-export type * from "./tree-node.interface";
-export type * from "./tree-plot.interface";

package/lib/core/tree-branch/branch-controller.d.ts

@@ -1,25 +0,0 @@
-import { type ComponentRef, type ViewContainerRef, type ViewRef } from "@angular/core";
-import { BranchComponent } from "../../components";
-import type { ComponentContainer } from "../component-container.interface";
-import type { TreeBranch } from "./tree-branch";
-/**
- * A wrapper around the BranchComponent that helps instantiate it and handles its events.
- */
-export declare class BranchController<UserlandComponent> implements ComponentContainer<BranchComponent<UserlandComponent>> {
-    private readonly treeBranch;
-    private readonly branchComponentRef;
-    private readonly instanceSubscriptions;
-    private readonly outputBindingSubscriptions;
-    constructor(treeBranch: TreeBranch<UserlandComponent>, parentBranchesContainer: ViewContainerRef);
-    destroy(): void;
-    detectChanges(): void;
-    getBranchesContainer(): ViewContainerRef | undefined;
-    getComponentInstance(): BranchComponent<UserlandComponent>;
-    getHostView(): ViewRef;
-    getNativeElement(): HTMLElement;
-    getUserlandComponentRef(): ComponentRef<UserlandComponent> | undefined;
-    private getContentCreatedSub;
-    private getInstanceSubscriptions;
-    private getShowLowerZonesSub;
-    private getShowUpperZonesSub;
-}

package/lib/core/tree-branch/graftable.interface.d.ts

@@ -1,7 +0,0 @@
-import type { TreeNode } from "../tree-node.interface";
-export interface Graftable<UserlandComponent> {
-    graftTo: (newParent: TreeNode<UserlandComponent>, index?: number) => number;
-    index: () => number | undefined;
-    parent: () => TreeNode<UserlandComponent> | undefined;
-    prune: () => void;
-}

package/lib/core/tree-branch/index.d.ts

@@ -1,3 +0,0 @@
-export * from "./branch-controller";
-export * from "./tree-branch";
-export type * from "./graftable.interface";

package/lib/core/tree-branch/tree-branch.d.ts

@@ -1,223 +0,0 @@
-import type { Observable } from "rxjs";
-import type { ComponentRef, Type, ViewContainerRef, ViewRef } from "@angular/core";
-import { BranchComponent } from "../../components";
-import { TreeRoot } from "../tree-root";
-import type { TreeNode } from "../tree-node.interface";
-import type { TreePlot } from "../tree-plot.interface";
-import type { BranchOptions, FullBranchOptions } from "../branch-options.interface";
-import type { Graftable } from "./graftable.interface";
-import { type TreeEvent } from "../../events";
-/** Represents a standard node in a tree. Renders a BranchComponent.
- *
- * @remarks
- * This class renders a branch component, which does the following:
- * 1. Renders a component provided by the user
- * 2. Provides a container in which child branches may be rendered
- * 3. Contains two Dropzones: one for dropping branches below this branch (as a
- * sibling), and one for dropping branches as a first child of this branch.
- */
-export declare class TreeBranch<UserlandComponent> implements TreeNode<UserlandComponent>, Graftable<UserlandComponent> {
-    readonly branchOptions: FullBranchOptions<UserlandComponent>;
-    private readonly branchController;
-    private detachedView;
-    private _parent;
-    private readonly treeNodeBase;
-    constructor(parent: TreeNode<UserlandComponent>, branchOptions: FullBranchOptions<UserlandComponent>);
-    /** @returns All child branches as an array of TreeBranch instances, in order. */
-    branches(): Array<TreeBranch<UserlandComponent>>;
-    /**
-     * Recursively destroys all descendant branches, as well as itself. This
-     * releases all resources held or consumed by this branch and its descendants.
-     *
-     * @remarks
-     * It is important to call this method when a branch is discarded, otherwise
-     * the branch will remain in memory and continue to consume resources.
-     */
-    destroy(): void;
-    /** Run Angular change detection on this branch */
-    detectChanges(): void;
-    /**
-     * Emits the specified TreeEvent.
-     *
-     * @remarks
-     * Caution: It is not recommended to manually emit TreeEvents that are already
-     * provided by the library. For example, it is not recommended to emit a
-     * `GraftEvent`, `DestructionEvent`, etc. These events may be used by the tree,
-     * and emitting them manually may cause unexpected behavior. Instead, we
-     * recommend implementing the TreeEvent interface with your own custom events
-     * and dispatching those.
-     *
-     * @param event - The TreeEvent that will be emitted.
-     */
-    dispatch(event: TreeEvent<UserlandComponent>): void;
-    /**
-     * @returns
-     * An observable that emits TreeEvents whenever an event is dispatched
-     * in this branch or any of its descendant branches.
-     */
-    events(): Observable<TreeEvent<UserlandComponent>>;
-    /**
-     * @param index - The index of the child branch to retrieve.
-     *
-     * @returns
-     * The child branch at the specified index, or undefined if there is
-     * no child branch at the specified index.
-     */
-    getBranch(index: number): TreeBranch<UserlandComponent> | undefined;
-    /** @returns The ViewContainerRef in which child branches are rendered */
-    getBranchesContainer(): ViewContainerRef | undefined;
-    /** @returns The instance of BranchComponent that is rendered by this class. */
-    getComponentInstance(): BranchComponent<UserlandComponent>;
-    /** @returns The Host View in which the BranchComponent is rendered */
-    getHostView(): ViewRef;
-    /** @returns The BranchComponent as a native HTML Element */
-    getNativeElement(): HTMLElement;
-    /**
-     * @returns
-     * A ComponentRef containing the instance of the user-provided
-     * component which is rendered by this branch.
-     */
-    getUserlandComponentRef(): ComponentRef<UserlandComponent> | undefined;
-    /**
-     * Attaches a branch to a new parent node.
-     *
-     * @remarks
-     * If not already pruned, this method prunes (removes) this branch from its
-     * current position in the tree; then grafts (reattaches) it as a child of the
-     * specified parent branch at the specified index. If no index is specified,
-     * the branch is appended as the last child of the parent. This causes this
-     * branch's associated BranchComponent to be re-rendered in the DOM at the
-     * new location.
-     *
-     * @param newParent - The new parent branch unto which this branch will be grafted.
-     * @param index - The index at which this branch will be grafted. If not specified,
-     * this branch will be appended as the last child of the new parent.
-     *
-     * @returns The index at which this branch was grafted.
-     */
-    graftTo(newParent: TreeNode<UserlandComponent>, index?: number): number;
-    /**
-     * Appends a new child branch to this branch. The child branch will render
-     * the specified component according to the (optional) configuration parameter.
-     *
-     * @param component - The component to render in the new child branch.
-     * @param options - Configuration options for the new child branch.
-     *
-     * @returns
-     * The newly-created child branch.
-     */
-    grow(component: Type<UserlandComponent>, options?: BranchOptions<UserlandComponent>): TreeBranch<UserlandComponent>;
-    /**
-     * Determines this branch's index in relation to its sibling branches.
-     *
-     * @remarks
-     * For example, if it is the first child of its parent, this method will return
-     * 0. If it is the second child of its parent, this method will return 1.
-     *
-     * If this branch has no parent, (eg, if this branch has been pruned) this
-     * method will return undefined.
-     *
-     * @returns
-     * The index of this branch in relation to its sibling branches, or undefined.
-     */
-    index(): number | undefined;
-    /** @returns `true` if the branch is destroyed, `false` otherwise */
-    isDestroyed(): boolean;
-    /**
-     * @returns
-     * The data that was passed into the `branchOptions`' `meta` property
-     * at construction.
-     */
-    meta(): Record<string, any>;
-    /**
-     * @returns
-     * This branch's parent node (which may be a TreeBranch or TreeRoot).
-     * If this branch has no parent, (eg, if this branch has been pruned) this
-     * method will return undefined.
-     */
-    parent(): TreeNode<UserlandComponent> | undefined;
-    /**
-     * Provides a model describing this branch's descendants.
-     *
-     * @returns
-     * A multi-dimensional Map which describes the shape of this branch's
-     * descendants.
-     *
-     * @example
-     * A branch with no children will return an empty Map. A branch with
-     * a single child will return a Map with a single entry, where the key is the index
-     * of the branch (zero) and the value is an empty Map. A Tree like this:
-     *
-     * ```
-     *         ---Branch-------Branch
-     *        /
-     * Branch-------Branch
-     *        \
-     *         ---Branch
-     * ```
-     * Will return a Map of matching shape:
-     * ```
-     * Map {
-     *    0: Map { 0: Map {}},
-     *    1: Map {},
-     *    2: Map {}
-     * }
-     * ```
-     */
-    plot(): TreePlot;
-    /**
-     * Calculates the branch's position in the tree relative to the Root.
-     *
-     * @remarks
-     * The position is described as an array of numbers, where each number
-     * represents the index of the branch at that level of the tree.
-     *
-     * For example, if this branch is the first child of the Root, this method
-     * will return [0]. If this branch is the second child of the first child
-     * of the Root, this method will return [0, 1].
-     *
-     * If the branch is not related to a TreeRoot, (such as when it has been
-     * pruned,) this method will throw an error.
-     *
-     * @returns
-     * An array of numbers which describe the branch's position in the tree
-     * relative to the Root.
-     */
-    position(): Array<number>;
-    /**
-     * Removes a branch from its tree without destroying it.
-     *
-     * @remarks
-     * Removes this branch from its parent and detaches its associated
-     * BranchComponent from the DOM. This puts the branch in a "pruned" state,
-     * which may affect the behavior of other methods.
-     *
-     * A pruned branch can be reattached to any other node using the `graftTo` method.
-     *
-     * @returns
-     * Itself, or undefined if it is already in a pruned state.
-     */
-    prune(): this | undefined;
-    /**
-     * Get the root of the tree to which this Branch is attached.
-     *
-     * @returns
-     * The TreeRoot of the tree this branch is in. If this branch is
-     * does not have a root (such as when it has been pruned) this method will
-     * return undefined.
-     */
-    root(): TreeRoot<UserlandComponent> | undefined;
-    /**
-     * Traverses this branch's descendants in depth-first pre-order, executing
-     * the provided callback function on each node. Traversal includes this branch.
-     *
-     * @param callback - A function to execute on each node.
-     */
-    traverse(callback: (node: TreeBranch<UserlandComponent>) => void): void;
-    private checkGraftLocationValidity;
-    private handleUserlandError;
-    private indexIsOutOfRange;
-    private furthestAncestor;
-    private reattachView;
-    private setIndentation;
-}

package/lib/core/tree-node-base.d.ts

@@ -1,26 +0,0 @@
-import { type Observable } from "rxjs";
-import { TreeError } from "../errors";
-import { type TreeEvent } from "../events";
-import { TreeBranch } from "./tree-branch";
-import type { TreePlot } from "./tree-plot.interface";
-import type { TreeNode } from "./tree-node.interface";
-export declare class TreeNodeBase<UserlandComponent> implements Partial<TreeNode<UserlandComponent>> {
-    private readonly _branches;
-    private readonly events$;
-    private destroyed;
-    private readonly subscriptions;
-    constructor();
-    branches(): Array<TreeBranch<UserlandComponent>>;
-    destroy(): void;
-    dispatch(event: TreeEvent<UserlandComponent>): void;
-    events(): Observable<TreeEvent<UserlandComponent>>;
-    getBranch(index: number): TreeBranch<UserlandComponent> | undefined;
-    handleUserlandError(error: unknown): TreeError;
-    isDestroyed(): boolean;
-    plot(): TreePlot;
-    traverse(callback: (node: TreeBranch<UserlandComponent>) => void): void;
-    private deregisterChildRelationship;
-    private graftsToSelf;
-    private prunesToSelf;
-    private registerChildRelationship;
-}

package/lib/core/tree-node.interface.d.ts

@@ -1,16 +0,0 @@
-import type { TreeRoot } from "./tree-root";
-import type { TreePlot } from "./tree-plot.interface";
-import type { Branchable } from "./branchable.interface";
-import type { ComponentContainer } from "./component-container.interface";
-import type { Observable } from "rxjs";
-import type { TreeEvent } from "../events";
-import type { NodeComponent } from "../components";
-export interface TreeNode<UserlandComponent> extends Branchable<UserlandComponent>, ComponentContainer<NodeComponent> {
-    destroy: () => void;
-    dispatch: (event: TreeEvent<UserlandComponent>) => void;
-    events: () => Observable<TreeEvent<UserlandComponent>>;
-    isDestroyed: () => boolean;
-    plot: () => TreePlot;
-    root: () => TreeRoot<any> | undefined;
-    traverse: (callback: (node: TreeNode<UserlandComponent>) => void) => void;
-}

package/lib/core/tree-plot.interface.d.ts

@@ -1 +0,0 @@
-export type TreePlot = Map<number, TreePlot>;

package/lib/core/tree-root/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./tree-root";
-export * from "./root-controller";

package/lib/core/tree-root/root-controller.d.ts

@@ -1,19 +0,0 @@
-import type { ViewContainerRef, ViewRef } from "@angular/core";
-import { RootComponent } from "../../components";
-import type { TreeRoot } from "./tree-root";
-import type { ComponentContainer } from "../component-container.interface";
-/**
- * A wrapper around the BranchComponent that helps instantiate it and handles its events.
- */
-export declare class RootController<T> implements ComponentContainer<RootComponent> {
-    private readonly treeRoot;
-    private readonly rootComponentRef;
-    private readonly instanceSubscriptions;
-    constructor(treeRoot: TreeRoot<T>, viewContainerRef: ViewContainerRef);
-    destroy(): void;
-    detectChanges(): void;
-    getBranchesContainer(): ViewContainerRef | undefined;
-    getComponentInstance(): RootComponent;
-    getHostView(): ViewRef;
-    getNativeElement(): HTMLElement;
-}