@arcanejs/toolkit 0.5.1 → 1.0.0

package/dist/backend/components/switch.d.mts

@@ -1,6 +1,7 @@
-import * as proto from '@arcanejs/protocol';
+import * as proto from '@arcanejs/protocol/core';
 import { I as IDMap } from '../../id-map-DxQ3_gyA.mjs';
 import { Base, Listenable } from './base.mjs';
+import { AnyClientComponentMessage } from '@arcanejs/protocol';
 import '@arcanejs/protocol/logging';
 
 type Events = {
@@ -9,9 +10,10 @@ type Events = {
 type InternalProps = {
     value?: 'on' | 'off';
     defaultValue?: 'on' | 'off';
+    onChange?: Events['change'];
 };
 type Props = Partial<InternalProps>;
-declare class Switch extends Base<InternalProps> implements Listenable<Events> {
+declare class Switch extends Base<proto.CoreNamespace, proto.CoreComponent, InternalProps> implements Listenable<Events> {
     /** @hidden */
     private readonly events;
     /**
@@ -23,9 +25,9 @@ declare class Switch extends Base<InternalProps> implements Listenable<Events> {
     addListener: <T extends "change">(type: T, listener: Events[T]) => void;
     removeListener: <T extends "change">(type: T, listener: Events[T]) => void;
     /** @hidden */
-    getProtoInfo(idMap: IDMap): proto.Component;
+    getProtoInfo(idMap: IDMap): proto.CoreComponent;
     /** @hidden */
-    handleMessage(message: proto.ClientComponentMessage): void;
+    handleMessage(message: AnyClientComponentMessage): void;
     setValue(state: 'on' | 'off'): void;
     private onPropsUpdated;
 }

package/dist/backend/components/switch.d.ts

@@ -1,6 +1,7 @@
-import * as proto from '@arcanejs/protocol';
+import * as proto from '@arcanejs/protocol/core';
 import { I as IDMap } from '../../id-map-DxQ3_gyA.js';
 import { Base, Listenable } from './base.js';
+import { AnyClientComponentMessage } from '@arcanejs/protocol';
 import '@arcanejs/protocol/logging';
 
 type Events = {
@@ -9,9 +10,10 @@ type Events = {
 type InternalProps = {
     value?: 'on' | 'off';
     defaultValue?: 'on' | 'off';
+    onChange?: Events['change'];
 };
 type Props = Partial<InternalProps>;
-declare class Switch extends Base<InternalProps> implements Listenable<Events> {
+declare class Switch extends Base<proto.CoreNamespace, proto.CoreComponent, InternalProps> implements Listenable<Events> {
     /** @hidden */
     private readonly events;
     /**
@@ -23,9 +25,9 @@ declare class Switch extends Base<InternalProps> implements Listenable<Events> {
     addListener: <T extends "change">(type: T, listener: Events[T]) => void;
     removeListener: <T extends "change">(type: T, listener: Events[T]) => void;
     /** @hidden */
-    getProtoInfo(idMap: IDMap): proto.Component;
+    getProtoInfo(idMap: IDMap): proto.CoreComponent;
     /** @hidden */
-    handleMessage(message: proto.ClientComponentMessage): void;
+    handleMessage(message: AnyClientComponentMessage): void;
     setValue(state: 'on' | 'off'): void;
     private onPropsUpdated;
 }

package/dist/backend/components/switch.js

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkQ5TEM6MMjs = require('../../chunk-Q5TEM6MM.js');
-require('../../chunk-CFO5PSSK.js');
+var _chunk25LALCANjs = require('../../chunk-25LALCAN.js');
+require('../../chunk-ADH7RZG5.js');
 require('../../chunk-3RG5ZIWI.js');
 
 
-exports.Switch = _chunkQ5TEM6MMjs.Switch;
+exports.Switch = _chunk25LALCANjs.Switch;

package/dist/backend/components/switch.mjs

@@ -1,7 +1,7 @@
 import {
   Switch
-} from "../../chunk-Q3NG5UUN.mjs";
-import "../../chunk-PW7QVLLF.mjs";
+} from "../../chunk-SBHNIFAS.mjs";
+import "../../chunk-7SZA6JUN.mjs";
 import "../../chunk-Y6FXYEAI.mjs";
 export {
   Switch

package/dist/backend/components/tabs.d.mts

@@ -1,28 +1,29 @@
-import * as proto from '@arcanejs/protocol';
+import * as proto from '@arcanejs/protocol/core';
 import { I as IDMap } from '../../id-map-DxQ3_gyA.mjs';
-import { BaseParent, Component } from './base.mjs';
+import { BaseParent, AnyComponent } from './base.mjs';
+import '@arcanejs/protocol';
 import '@arcanejs/protocol/logging';
 
 type TabDefinition = {
     name: string;
-    component: Component;
+    component: AnyComponent;
 };
 type InternalTabProps = {
     name: string;
 };
 type TabProps = InternalTabProps;
-declare class Tab extends BaseParent<InternalTabProps> {
-    validateChildren: (children: Component[]) => void;
+declare class Tab extends BaseParent<proto.CoreNamespace, proto.CoreComponent, InternalTabProps> {
+    validateChildren: (children: AnyComponent[]) => void;
     /** @hidden */
     getProtoInfo: (idMap: IDMap) => proto.TabComponent;
 }
 type InternalTabsProps = Record<never, never>;
 type TabsProps = InternalTabsProps;
-declare class Tabs extends BaseParent<InternalTabsProps> {
-    validateChildren: (children: Component[]) => void;
+declare class Tabs extends BaseParent<proto.CoreNamespace, proto.CoreComponent, InternalTabsProps> {
+    validateChildren: (children: AnyComponent[]) => void;
     constructor(props?: TabsProps);
     addTabs(...tabs: TabDefinition[]): void;
-    addTab<C extends Component>(name: string, component: C): C;
+    addTab<C extends AnyComponent>(name: string, component: C): C;
     /** @hidden */
     getProtoInfo(idMap: IDMap): proto.TabsComponent;
 }

package/dist/backend/components/tabs.d.ts

@@ -1,28 +1,29 @@
-import * as proto from '@arcanejs/protocol';
+import * as proto from '@arcanejs/protocol/core';
 import { I as IDMap } from '../../id-map-DxQ3_gyA.js';
-import { BaseParent, Component } from './base.js';
+import { BaseParent, AnyComponent } from './base.js';
+import '@arcanejs/protocol';
 import '@arcanejs/protocol/logging';
 
 type TabDefinition = {
     name: string;
-    component: Component;
+    component: AnyComponent;
 };
 type InternalTabProps = {
     name: string;
 };
 type TabProps = InternalTabProps;
-declare class Tab extends BaseParent<InternalTabProps> {
-    validateChildren: (children: Component[]) => void;
+declare class Tab extends BaseParent<proto.CoreNamespace, proto.CoreComponent, InternalTabProps> {
+    validateChildren: (children: AnyComponent[]) => void;
     /** @hidden */
     getProtoInfo: (idMap: IDMap) => proto.TabComponent;
 }
 type InternalTabsProps = Record<never, never>;
 type TabsProps = InternalTabsProps;
-declare class Tabs extends BaseParent<InternalTabsProps> {
-    validateChildren: (children: Component[]) => void;
+declare class Tabs extends BaseParent<proto.CoreNamespace, proto.CoreComponent, InternalTabsProps> {
+    validateChildren: (children: AnyComponent[]) => void;
     constructor(props?: TabsProps);
     addTabs(...tabs: TabDefinition[]): void;
-    addTab<C extends Component>(name: string, component: C): C;
+    addTab<C extends AnyComponent>(name: string, component: C): C;
     /** @hidden */
     getProtoInfo(idMap: IDMap): proto.TabsComponent;
 }

package/dist/backend/components/tabs.js

@@ -1,10 +1,10 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
-var _chunkC2TVGO43js = require('../../chunk-C2TVGO43.js');
-require('../../chunk-CFO5PSSK.js');
+var _chunkARRRZPUKjs = require('../../chunk-ARRRZPUK.js');
+require('../../chunk-ADH7RZG5.js');
 require('../../chunk-3RG5ZIWI.js');
 
 
 
-exports.Tab = _chunkC2TVGO43js.Tab; exports.Tabs = _chunkC2TVGO43js.Tabs;
+exports.Tab = _chunkARRRZPUKjs.Tab; exports.Tabs = _chunkARRRZPUKjs.Tabs;

package/dist/backend/components/tabs.mjs

@@ -1,8 +1,8 @@
 import {
   Tab,
   Tabs
-} from "../../chunk-H734NV65.mjs";
-import "../../chunk-PW7QVLLF.mjs";
+} from "../../chunk-PXYXUWXE.mjs";
+import "../../chunk-7SZA6JUN.mjs";
 import "../../chunk-Y6FXYEAI.mjs";
 export {
   Tab,

package/dist/backend/components/text-input.d.mts

@@ -1,6 +1,7 @@
-import * as proto from '@arcanejs/protocol';
+import * as proto from '@arcanejs/protocol/core';
 import { I as IDMap } from '../../id-map-DxQ3_gyA.mjs';
 import { Base, Listenable } from './base.mjs';
+import { AnyClientComponentMessage } from '@arcanejs/protocol';
 import '@arcanejs/protocol/logging';
 
 type Events = {
@@ -8,18 +9,19 @@ type Events = {
 };
 type InternalProps = {
     value: string | null;
+    onChange?: Events['change'];
 };
 type Props = Partial<InternalProps>;
-declare class TextInput extends Base<InternalProps> implements Listenable<Events> {
+declare class TextInput extends Base<proto.CoreNamespace, proto.CoreComponent, InternalProps> implements Listenable<Events> {
     /** @hidden */
     private readonly events;
     constructor(props?: Props);
     addListener: <T extends "change">(type: T, listener: Events[T]) => void;
     removeListener: <T extends "change">(type: T, listener: Events[T]) => void;
     /** @hidden */
-    getProtoInfo: (idMap: IDMap) => proto.Component;
+    getProtoInfo: (idMap: IDMap) => proto.CoreComponent;
     /** @hidden */
-    handleMessage: (message: proto.ClientComponentMessage) => void;
+    handleMessage: (message: AnyClientComponentMessage) => void;
     getValue: () => string | null;
     getValidatedValue: <T>(validator: (text: string) => T) => null | T;
     setValue: (value: string) => void;

package/dist/backend/components/text-input.d.ts

@@ -1,6 +1,7 @@
-import * as proto from '@arcanejs/protocol';
+import * as proto from '@arcanejs/protocol/core';
 import { I as IDMap } from '../../id-map-DxQ3_gyA.js';
 import { Base, Listenable } from './base.js';
+import { AnyClientComponentMessage } from '@arcanejs/protocol';
 import '@arcanejs/protocol/logging';
 
 type Events = {
@@ -8,18 +9,19 @@ type Events = {
 };
 type InternalProps = {
     value: string | null;
+    onChange?: Events['change'];
 };
 type Props = Partial<InternalProps>;
-declare class TextInput extends Base<InternalProps> implements Listenable<Events> {
+declare class TextInput extends Base<proto.CoreNamespace, proto.CoreComponent, InternalProps> implements Listenable<Events> {
     /** @hidden */
     private readonly events;
     constructor(props?: Props);
     addListener: <T extends "change">(type: T, listener: Events[T]) => void;
     removeListener: <T extends "change">(type: T, listener: Events[T]) => void;
     /** @hidden */
-    getProtoInfo: (idMap: IDMap) => proto.Component;
+    getProtoInfo: (idMap: IDMap) => proto.CoreComponent;
     /** @hidden */
-    handleMessage: (message: proto.ClientComponentMessage) => void;
+    handleMessage: (message: AnyClientComponentMessage) => void;
     getValue: () => string | null;
     getValidatedValue: <T>(validator: (text: string) => T) => null | T;
     setValue: (value: string) => void;

package/dist/backend/components/text-input.js

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkDONU33U4js = require('../../chunk-DONU33U4.js');
-require('../../chunk-CFO5PSSK.js');
+var _chunkHNFNG5MDjs = require('../../chunk-HNFNG5MD.js');
+require('../../chunk-ADH7RZG5.js');
 require('../../chunk-3RG5ZIWI.js');
 
 
-exports.TextInput = _chunkDONU33U4js.TextInput;
+exports.TextInput = _chunkHNFNG5MDjs.TextInput;

package/dist/backend/components/text-input.mjs

@@ -1,7 +1,7 @@
 import {
   TextInput
-} from "../../chunk-KR6LSBBX.mjs";
-import "../../chunk-PW7QVLLF.mjs";
+} from "../../chunk-ISHGZXPO.mjs";
+import "../../chunk-7SZA6JUN.mjs";
 import "../../chunk-Y6FXYEAI.mjs";
 export {
   TextInput

package/dist/backend/components/timeline.d.mts

@@ -1,6 +1,7 @@
-import * as proto from '@arcanejs/protocol';
+import * as proto from '@arcanejs/protocol/core';
 import { I as IDMap } from '../../id-map-DxQ3_gyA.mjs';
 import { Base } from './base.mjs';
+import '@arcanejs/protocol';
 import '@arcanejs/protocol/logging';
 
 type InternalProps = {
@@ -10,10 +11,10 @@ type InternalProps = {
     source: proto.TimelineComponent['source'] | null;
 };
 type Props = Partial<InternalProps>;
-declare class Timeline extends Base<InternalProps> {
+declare class Timeline extends Base<proto.CoreNamespace, proto.CoreComponent, InternalProps> {
     constructor(props?: Props);
     /** @hidden */
-    getProtoInfo: (idMap: IDMap) => proto.Component;
+    getProtoInfo: (idMap: IDMap) => proto.CoreComponent;
 }
 
 export { type Props, Timeline };

package/dist/backend/components/timeline.d.ts

@@ -1,6 +1,7 @@
-import * as proto from '@arcanejs/protocol';
+import * as proto from '@arcanejs/protocol/core';
 import { I as IDMap } from '../../id-map-DxQ3_gyA.js';
 import { Base } from './base.js';
+import '@arcanejs/protocol';
 import '@arcanejs/protocol/logging';
 
 type InternalProps = {
@@ -10,10 +11,10 @@ type InternalProps = {
     source: proto.TimelineComponent['source'] | null;
 };
 type Props = Partial<InternalProps>;
-declare class Timeline extends Base<InternalProps> {
+declare class Timeline extends Base<proto.CoreNamespace, proto.CoreComponent, InternalProps> {
     constructor(props?: Props);
     /** @hidden */
-    getProtoInfo: (idMap: IDMap) => proto.Component;
+    getProtoInfo: (idMap: IDMap) => proto.CoreComponent;
 }
 
 export { type Props, Timeline };

package/dist/backend/components/timeline.js

@@ -1,8 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkFUINWM5Hjs = require('../../chunk-FUINWM5H.js');
-require('../../chunk-CFO5PSSK.js');
+var _chunkT4TMVBFMjs = require('../../chunk-T4TMVBFM.js');
+require('../../chunk-ADH7RZG5.js');
 require('../../chunk-3RG5ZIWI.js');
 
 
-exports.Timeline = _chunkFUINWM5Hjs.Timeline;
+exports.Timeline = _chunkT4TMVBFMjs.Timeline;

package/dist/backend/components/timeline.mjs

@@ -1,7 +1,7 @@
 import {
   Timeline
-} from "../../chunk-DBSYI5Z4.mjs";
-import "../../chunk-PW7QVLLF.mjs";
+} from "../../chunk-LX5IL6WX.mjs";
+import "../../chunk-7SZA6JUN.mjs";
 import "../../chunk-Y6FXYEAI.mjs";
 export {
   Timeline

package/dist/backend/util/index.d.mts

@@ -1,5 +1,5 @@
 export { I as IDMap } from '../../id-map-DxQ3_gyA.mjs';
-import { Gradient } from '@arcanejs/protocol';
+import { Gradient } from '@arcanejs/protocol/core';
 
 /**
  * Rainbow gradient used for hue slider values.

package/dist/backend/util/index.d.ts

@@ -1,5 +1,5 @@
 export { I as IDMap } from '../../id-map-DxQ3_gyA.js';
-import { Gradient } from '@arcanejs/protocol';
+import { Gradient } from '@arcanejs/protocol/core';
 
 /**
  * Rainbow gradient used for hue slider values.

package/dist/{chunk-Q5TEM6MM.js → chunk-25LALCAN.js}

@@ -1,13 +1,14 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } var _class;
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } var _class;
 
 
-var _chunkCFO5PSSKjs = require('./chunk-CFO5PSSK.js');
+var _chunkADH7RZG5js = require('./chunk-ADH7RZG5.js');
 
 // src/backend/components/switch.ts
+var _core = require('@arcanejs/protocol/core'); var proto = _interopRequireWildcard(_core);
 var DEFAULT_PROPS = {};
-var Switch = (_class = class extends _chunkCFO5PSSKjs.Base {
+var Switch = (_class = class extends _chunkADH7RZG5js.Base {
   /** @hidden */
-  __init() {this.events = new (0, _chunkCFO5PSSKjs.EventEmitter)()}
+  __init() {this.events = new (0, _chunkADH7RZG5js.EventEmitter)()}
   /**
    * Manually manage the state of the switch,
    * to support both controlled and uncontrolled inputs.
@@ -15,15 +16,24 @@ var Switch = (_class = class extends _chunkCFO5PSSKjs.Base {
   __init2() {this._value = null}
   constructor(props) {
     super(DEFAULT_PROPS, props, {
-      onPropsUpdated: () => this.onPropsUpdated()
+      onPropsUpdated: (oldProps) => {
+        this.events.processPropChanges(
+          {
+            onChange: "change"
+          },
+          oldProps,
+          this.props
+        ), this.onPropsUpdated();
+      }
     });_class.prototype.__init.call(this);_class.prototype.__init2.call(this);_class.prototype.__init3.call(this);_class.prototype.__init4.call(this);_class.prototype.__init5.call(this);;
-    this.onPropsUpdated();
+    this.triggerInitialPropsUpdate();
   }
   __init3() {this.addListener = this.events.addListener}
   __init4() {this.removeListener = this.events.removeListener}
   /** @hidden */
   getProtoInfo(idMap) {
     return {
+      namespace: "core",
       component: "switch",
       key: idMap.getId(this),
       state: _nullishCoalesce(this._value, () => ( "off"))
@@ -31,7 +41,7 @@ var Switch = (_class = class extends _chunkCFO5PSSKjs.Base {
   }
   /** @hidden */
   handleMessage(message) {
-    if (message.component === "switch") {
+    if (proto.isCoreComponentMessage(message, "switch")) {
       const state = this._value === "on" ? "off" : "on";
       if (this.props.value === void 0) {
         this._value = state;

package/dist/{chunk-IQ4SDDYP.js → chunk-5JPYL5IU.js}

@@ -1,18 +1,19 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkCFO5PSSKjs = require('./chunk-CFO5PSSK.js');
+var _chunkADH7RZG5js = require('./chunk-ADH7RZG5.js');
 
 // src/backend/components/rect.ts
 var DEFAULT_PROPS = {
   color: "rgba(0, 0, 0, 0)"
 };
-var Rect = class extends _chunkCFO5PSSKjs.Base {
+var Rect = class extends _chunkADH7RZG5js.Base {
   constructor(props) {
     super(DEFAULT_PROPS, props);
   }
   /** @hidden */
   getProtoInfo(idMap) {
     return {
+      namespace: "core",
       component: "rect",
       key: idMap.getId(this),
       ...this.props

package/dist/{chunk-KBPQZJKE.mjs → chunk-5TGGF5UJ.mjs}

@@ -1,9 +1,10 @@
 import {
   BaseParent,
   EventEmitter
-} from "./chunk-PW7QVLLF.mjs";
+} from "./chunk-7SZA6JUN.mjs";
 
 // src/backend/components/group.ts
+import * as proto from "@arcanejs/protocol/core";
 var GROUP_DEFAULT_STYLE = {
   direction: "horizontal"
 };
@@ -17,6 +18,7 @@ var GroupHeader = class extends BaseParent {
   };
   /** @hidden */
   getProtoInfo = (idMap) => ({
+    namespace: "core",
     component: "group-header",
     key: idMap.getId(this),
     children: this.getChildren().map((c) => c.getProtoInfo(idMap))
@@ -26,7 +28,16 @@ var Group = class extends BaseParent {
   /** @hidden */
   events = new EventEmitter();
   constructor(props) {
-    super(DEFAULT_PROPS, props);
+    super(DEFAULT_PROPS, props, {
+      onPropsUpdated: (oldProps) => this.events.processPropChanges(
+        {
+          onTitleChanged: "title-changed"
+        },
+        oldProps,
+        this.props
+      )
+    });
+    this.triggerInitialPropsUpdate();
   }
   addListener = this.events.addListener;
   removeListener = this.events.removeListener;
@@ -70,17 +81,18 @@ var Group = class extends BaseParent {
     const headers = [];
     for (const c of this.getChildren()) {
       const childProto = c.getProtoInfo(idMap);
-      if (childProto.component === "group-header") {
+      if (proto.isCoreComponent(childProto) && childProto.component === "group-header") {
         headers.push(childProto);
       } else {
         children.push(childProto);
       }
     }
     return {
+      namespace: "core",
       component: "group",
       key: idMap.getId(this),
       title: this.props.title ?? void 0,
-      direction: this.props.direction,
+      direction: this.props.direction ?? DEFAULT_PROPS.direction,
       border: this.props.border,
       wrap: this.props.wrap,
       children,
@@ -92,7 +104,7 @@ var Group = class extends BaseParent {
   };
   /** @hidden */
   handleMessage = (message) => {
-    if (message.component === "group") {
+    if (proto.isCoreComponentMessage(message, "group")) {
       this.events.emit("title-changed", message.title);
     }
   };

package/dist/{chunk-PW7QVLLF.mjs → chunk-7SZA6JUN.mjs}

@@ -14,8 +14,23 @@ var Base = class {
       ...defaultProps,
       ...props
     });
-    this._onPropsUpdated = options?.onPropsUpdated ?? null;
+    if (options?.onPropsUpdated) {
+      const initialProps = this._props;
+      this._onPropsUpdated = {
+        listener: options.onPropsUpdated,
+        canSendInitialPropsUpdate: () => this._props === initialProps
+      };
+    }
   }
+  /**
+   * Call if
+   */
+  triggerInitialPropsUpdate = () => {
+    if (!this._onPropsUpdated?.canSendInitialPropsUpdate()) {
+      throw new Error("Cannot call triggerInitialPropsUpdate()");
+    }
+    this._onPropsUpdated.listener(this.defaultProps);
+  };
   log = () => {
     return this.parent?.log() || null;
   };
@@ -26,19 +41,21 @@ var Base = class {
     this.setProps(props);
   }
   setProps = (props) => {
+    const oldProps = this._props;
     this._props = Object.freeze({
       ...this.defaultProps,
       ...props
     });
-    this._onPropsUpdated?.();
+    this._onPropsUpdated?.listener?.(oldProps);
     this.updateTree();
   };
   updateProps = (updates) => {
+    const oldProps = this._props;
     this._props = Object.freeze({
       ...this._props,
       ...updates
     });
-    this._onPropsUpdated?.();
+    this._onPropsUpdated?.listener?.(oldProps);
     this.updateTree();
   };
   /** @hidden */
@@ -160,6 +177,20 @@ var EventEmitter = class {
       )
     );
   };
+  /**
+   * Process prop changes to update listeners
+   */
+  processPropChanges = (mapping, oldProps, newProps) => {
+    for (const key of Object.keys(mapping)) {
+      const prev = oldProps[key];
+      const next = newProps[key];
+      if (prev !== next) {
+        const eventName = mapping[key];
+        prev && this.removeListener(eventName, prev);
+        next && this.addListener(eventName, next);
+      }
+    }
+  };
 };
 
 export {