@joist/observable 2.0.0-beta.12 → 2.0.0-beta.13

package/README.md

@@ -6,7 +6,7 @@ Decorating a class with `@observable` means that instances of that class will BE
 #### Installation:
 
 ```BASH
-npm i @joist/observablebeta
+npm i @joist/observable@beta
 ```
 
 #### Example:
@@ -72,13 +72,13 @@ state.todos = [...state.todos, 'Build Shit'];
 state.userName = 'Danny Blue'
 ```
 
-#### Attributes
+#### Custom Elements
 
 If you are using @observable with custom elements it is very likely that you will want to read from and write to attributes.
-Joist accounts for this by giving you an `@attr` decorator.
+In order to appropriately handle reading from and writting to attributes. Any class that extends HTMLElement can use the `@attr` decorator to define attribute behavior.
 
 ```TS
-import { observable, observe, attr} from '@joist/observable';
+import { observable, observe, attr } from '@joist/observable';
 
 @observable
 class TestElement extends HTMLElement {
@@ -99,3 +99,34 @@ class TestElement extends HTMLElement {
   count = new Date();
 }
 ```
+
+##### Upgrading Custom Element Properties
+
+One tricky thing about custom elements and properties is how to handle them when the upgrade. For example.
+
+```HTML
+
+<my-element></my-element>
+
+<script>
+  const el = document.querySelector('my-element');
+
+  // A property is changed BEFORE the definition is loaded.
+  // We still want this value to be available on our custom element
+  el.name = "Hello!"
+</script>
+
+<script src="./path/to/my-element-defintion.js" type="module">
+```
+
+Joist provides a mixin that solves this issue.
+You can ensure that any properties that are set prior to upgrade time are forwared to your custom element.
+
+```TS
+import { observable, observe, ForwardProps } from '@joist/observable';
+
+@observable
+class TestElement extends ForwardProps(HTMLElement) {
+  @observe name = ''; // now in our example above this value will be set to "Hello"
+}
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joist/observable",
-  "version": "2.0.0-beta.12",
+  "version": "2.0.0-beta.13",
   "main": "./target/build/lib.js",
   "module": "./target/build/lib.js",
   "exports": {
@@ -35,5 +35,5 @@
     "test": "tsc -p tsconfig.test.json && wtr --config ../../wtr.config.mjs --port 8002",
     "build": "tsc -p tsconfig.build.json"
   },
-  "gitHead": "1962273dca1744f0227fd76c143b07d93566e809"
+  "gitHead": "045b15e31e5f2c9d2b32af3d93400bbbcdabc6ea"
 }

package/target/build/lib/attribute.d.ts

@@ -1,5 +1,5 @@
 import { AttributeParser } from './attribute-parsers';
-export declare function getObservableAttributes(c: typeof HTMLElement): Array<string>;
-export declare function getAttributeParsers<T extends typeof HTMLElement>(c: T): Record<string, AttributeParser<unknown>>;
+export declare function getObservableAttributes(c: typeof HTMLElement | Function): Array<string>;
+export declare function getAttributeParsers<T extends typeof HTMLElement | Function>(c: T): Record<string, AttributeParser<unknown>>;
 export declare function attr<T>(p: Partial<AttributeParser<T>>): <E extends HTMLElement>(t: E, key: string) => void;
 export declare function attr<T extends HTMLElement>(t: T, key: string): void;

package/target/build/lib/element.d.ts

@@ -0,0 +1,8 @@
+import { Changes } from './observable';
+export declare class ObservableElement extends HTMLElement {
+    __upgradedProps: Map<keyof this, unknown>;
+    constructor();
+    connectedCallback(): void;
+    attributeChangedCallback(name: string, _: string, newVal: string): void;
+    onPropertyChanged(changes: Changes): void;
+}

package/target/build/lib/element.js

@@ -0,0 +1,47 @@
+import { getAttributeParsers, getObservableAttributes } from './attribute';
+import { propNameToAttrName } from './attribute-parsers';
+export class ObservableElement extends HTMLElement {
+    constructor() {
+        super();
+        this.__upgradedProps = new Map();
+        for (let prop in this) {
+            if (this.hasOwnProperty(prop) && prop !== 'upgradedProps') {
+                this.__upgradedProps.set(prop, this[prop]);
+            }
+        }
+    }
+    connectedCallback() {
+        const attributes = getObservableAttributes(this.constructor);
+        const parsers = getAttributeParsers(this.constructor);
+        for (let i = 0; i < attributes.length; i++) {
+            const key = attributes[i];
+            const { write, mapTo } = parsers[key];
+            if (this.getAttribute(key) === null) {
+                const propVal = Reflect.get(this, mapTo);
+                if (propVal !== undefined && propVal !== null && propVal !== '') {
+                    this.setAttribute(key, write(propVal));
+                }
+            }
+        }
+    }
+    attributeChangedCallback(name, _, newVal) {
+        const parsers = getAttributeParsers(this.constructor);
+        const { read, mapTo } = parsers[name];
+        Reflect.set(this, mapTo, read(newVal));
+    }
+    onPropertyChanged(changes) {
+        const attributes = getObservableAttributes(this.constructor);
+        const parsers = getAttributeParsers(this.constructor);
+        if (this instanceof ObservableElement) {
+            for (let change in changes) {
+                const attrName = propNameToAttrName(change);
+                if (attributes.includes(attrName)) {
+                    const value = parsers[attrName].write(changes[change].value);
+                    if (value !== this.getAttribute(attrName)) {
+                        this.setAttribute(attrName, value);
+                    }
+                }
+            }
+        }
+    }
+}

package/target/build/lib/observable.d.ts

@@ -9,10 +9,319 @@ export interface OnPropertyChanged {
     onPropertyChanged(changes: Changes): void;
 }
 export declare function getObservableProperties(c: any): Array<string | symbol>;
+export declare function ForwardProps<T extends new (...args: any[]) => HTMLElement>(Base: T): {
+    new (...args: any[]): {
+        __upgradedProps: Map<keyof any, unknown>;
+        accessKey: string;
+        readonly accessKeyLabel: string;
+        autocapitalize: string;
+        dir: string;
+        draggable: boolean;
+        hidden: boolean;
+        innerText: string;
+        lang: string;
+        readonly offsetHeight: number;
+        readonly offsetLeft: number;
+        readonly offsetParent: Element | null;
+        readonly offsetTop: number;
+        readonly offsetWidth: number;
+        outerText: string;
+        spellcheck: boolean;
+        title: string;
+        translate: boolean;
+        attachInternals(): ElementInternals;
+        click(): void;
+        addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions | undefined): void;
+        addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions | undefined): void;
+        removeEventListener<K_1 extends keyof HTMLElementEventMap>(type: K_1, listener: (this: HTMLElement, ev: HTMLElementEventMap[K_1]) => any, options?: boolean | EventListenerOptions | undefined): void;
+        removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions | undefined): void;
+        connectedCallback?(): void;
+        disconnectedCallback?(): void;
+        attributeChangedCallback?(name: string, oldVal: string, newVal: string): void;
+        readonly attributes: NamedNodeMap;
+        readonly classList: DOMTokenList;
+        className: string;
+        readonly clientHeight: number;
+        readonly clientLeft: number;
+        readonly clientTop: number;
+        readonly clientWidth: number;
+        id: string;
+        readonly localName: string;
+        readonly namespaceURI: string | null;
+        onfullscreenchange: ((this: Element, ev: Event) => any) | null;
+        onfullscreenerror: ((this: Element, ev: Event) => any) | null;
+        outerHTML: string;
+        readonly ownerDocument: Document;
+        readonly part: DOMTokenList;
+        readonly prefix: string | null;
+        readonly scrollHeight: number;
+        scrollLeft: number;
+        scrollTop: number;
+        readonly scrollWidth: number;
+        readonly shadowRoot: ShadowRoot | null;
+        slot: string;
+        readonly tagName: string;
+        attachShadow(init: ShadowRootInit): ShadowRoot;
+        closest<K_2 extends keyof HTMLElementTagNameMap>(selector: K_2): HTMLElementTagNameMap[K_2] | null;
+        closest<K_3 extends keyof SVGElementTagNameMap>(selector: K_3): SVGElementTagNameMap[K_3] | null;
+        closest<E extends Element = Element>(selectors: string): E | null;
+        getAttribute(qualifiedName: string): string | null;
+        getAttributeNS(namespace: string | null, localName: string): string | null;
+        getAttributeNames(): string[];
+        getAttributeNode(qualifiedName: string): Attr | null;
+        getAttributeNodeNS(namespace: string | null, localName: string): Attr | null;
+        getBoundingClientRect(): DOMRect;
+        getClientRects(): DOMRectList;
+        getElementsByClassName(classNames: string): HTMLCollectionOf<Element>;
+        getElementsByTagName<K_4 extends keyof HTMLElementTagNameMap>(qualifiedName: K_4): HTMLCollectionOf<HTMLElementTagNameMap[K_4]>;
+        getElementsByTagName<K_5 extends keyof SVGElementTagNameMap>(qualifiedName: K_5): HTMLCollectionOf<SVGElementTagNameMap[K_5]>;
+        getElementsByTagName(qualifiedName: string): HTMLCollectionOf<Element>;
+        getElementsByTagNameNS(namespaceURI: "http://www.w3.org/1999/xhtml", localName: string): HTMLCollectionOf<HTMLElement>;
+        getElementsByTagNameNS(namespaceURI: "http://www.w3.org/2000/svg", localName: string): HTMLCollectionOf<SVGElement>;
+        getElementsByTagNameNS(namespace: string | null, localName: string): HTMLCollectionOf<Element>;
+        hasAttribute(qualifiedName: string): boolean;
+        hasAttributeNS(namespace: string | null, localName: string): boolean;
+        hasAttributes(): boolean;
+        hasPointerCapture(pointerId: number): boolean;
+        insertAdjacentElement(where: InsertPosition, element: Element): Element | null;
+        insertAdjacentHTML(position: InsertPosition, text: string): void;
+        insertAdjacentText(where: InsertPosition, data: string): void;
+        matches(selectors: string): boolean;
+        releasePointerCapture(pointerId: number): void;
+        removeAttribute(qualifiedName: string): void;
+        removeAttributeNS(namespace: string | null, localName: string): void;
+        removeAttributeNode(attr: Attr): Attr;
+        requestFullscreen(options?: FullscreenOptions | undefined): Promise<void>;
+        requestPointerLock(): void;
+        scroll(options?: ScrollToOptions | undefined): void;
+        scroll(x: number, y: number): void;
+        scrollBy(options?: ScrollToOptions | undefined): void;
+        scrollBy(x: number, y: number): void;
+        scrollIntoView(arg?: boolean | ScrollIntoViewOptions | undefined): void;
+        scrollTo(options?: ScrollToOptions | undefined): void;
+        scrollTo(x: number, y: number): void;
+        setAttribute(qualifiedName: string, value: string): void;
+        setAttributeNS(namespace: string | null, qualifiedName: string, value: string): void;
+        setAttributeNode(attr: Attr): Attr | null;
+        setAttributeNodeNS(attr: Attr): Attr | null;
+        setPointerCapture(pointerId: number): void;
+        toggleAttribute(qualifiedName: string, force?: boolean | undefined): boolean;
+        webkitMatchesSelector(selectors: string): boolean;
+        readonly baseURI: string;
+        readonly childNodes: NodeListOf<ChildNode>;
+        readonly firstChild: ChildNode | null;
+        readonly isConnected: boolean;
+        readonly lastChild: ChildNode | null;
+        readonly nextSibling: ChildNode | null;
+        readonly nodeName: string;
+        readonly nodeType: number;
+        nodeValue: string | null;
+        readonly parentElement: HTMLElement | null;
+        readonly parentNode: ParentNode | null;
+        readonly previousSibling: ChildNode | null;
+        textContent: string | null;
+        appendChild<T_1 extends Node>(node: T_1): T_1;
+        cloneNode(deep?: boolean | undefined): Node;
+        compareDocumentPosition(other: Node): number;
+        contains(other: Node | null): boolean;
+        getRootNode(options?: GetRootNodeOptions | undefined): Node;
+        hasChildNodes(): boolean;
+        insertBefore<T_2 extends Node>(node: T_2, child: Node | null): T_2;
+        isDefaultNamespace(namespace: string | null): boolean;
+        isEqualNode(otherNode: Node | null): boolean;
+        isSameNode(otherNode: Node | null): boolean;
+        lookupNamespaceURI(prefix: string | null): string | null;
+        lookupPrefix(namespace: string | null): string | null;
+        normalize(): void;
+        removeChild<T_3 extends Node>(child: T_3): T_3;
+        replaceChild<T_4 extends Node>(node: Node, child: T_4): T_4;
+        readonly ATTRIBUTE_NODE: number;
+        readonly CDATA_SECTION_NODE: number;
+        readonly COMMENT_NODE: number;
+        readonly DOCUMENT_FRAGMENT_NODE: number;
+        readonly DOCUMENT_NODE: number;
+        readonly DOCUMENT_POSITION_CONTAINED_BY: number;
+        readonly DOCUMENT_POSITION_CONTAINS: number;
+        readonly DOCUMENT_POSITION_DISCONNECTED: number;
+        readonly DOCUMENT_POSITION_FOLLOWING: number;
+        readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;
+        readonly DOCUMENT_POSITION_PRECEDING: number;
+        readonly DOCUMENT_TYPE_NODE: number;
+        readonly ELEMENT_NODE: number;
+        readonly ENTITY_NODE: number;
+        readonly ENTITY_REFERENCE_NODE: number;
+        readonly NOTATION_NODE: number;
+        readonly PROCESSING_INSTRUCTION_NODE: number;
+        readonly TEXT_NODE: number;
+        dispatchEvent(event: Event): boolean;
+        ariaAtomic: string | null;
+        ariaAutoComplete: string | null;
+        ariaBusy: string | null;
+        ariaChecked: string | null;
+        ariaColCount: string | null;
+        ariaColIndex: string | null;
+        ariaColSpan: string | null;
+        ariaCurrent: string | null;
+        ariaDisabled: string | null;
+        ariaExpanded: string | null;
+        ariaHasPopup: string | null;
+        ariaHidden: string | null;
+        ariaKeyShortcuts: string | null;
+        ariaLabel: string | null;
+        ariaLevel: string | null;
+        ariaLive: string | null;
+        ariaModal: string | null;
+        ariaMultiLine: string | null;
+        ariaMultiSelectable: string | null;
+        ariaOrientation: string | null;
+        ariaPlaceholder: string | null;
+        ariaPosInSet: string | null;
+        ariaPressed: string | null;
+        ariaReadOnly: string | null;
+        ariaRequired: string | null;
+        ariaRoleDescription: string | null;
+        ariaRowCount: string | null;
+        ariaRowIndex: string | null;
+        ariaRowSpan: string | null;
+        ariaSelected: string | null;
+        ariaSetSize: string | null;
+        ariaSort: string | null;
+        ariaValueMax: string | null;
+        ariaValueMin: string | null;
+        ariaValueNow: string | null;
+        ariaValueText: string | null;
+        animate(keyframes: PropertyIndexedKeyframes | Keyframe[] | null, options?: number | KeyframeAnimationOptions | undefined): Animation;
+        getAnimations(options?: GetAnimationsOptions | undefined): Animation[];
+        after(...nodes: (string | Node)[]): void;
+        before(...nodes: (string | Node)[]): void;
+        remove(): void;
+        replaceWith(...nodes: (string | Node)[]): void;
+        innerHTML: string;
+        readonly nextElementSibling: Element | null;
+        readonly previousElementSibling: Element | null;
+        readonly childElementCount: number;
+        readonly children: HTMLCollection;
+        readonly firstElementChild: Element | null;
+        readonly lastElementChild: Element | null;
+        append(...nodes: (string | Node)[]): void;
+        prepend(...nodes: (string | Node)[]): void;
+        querySelector<K_6 extends keyof HTMLElementTagNameMap>(selectors: K_6): HTMLElementTagNameMap[K_6] | null;
+        querySelector<K_7 extends keyof SVGElementTagNameMap>(selectors: K_7): SVGElementTagNameMap[K_7] | null;
+        querySelector<E_1 extends Element = Element>(selectors: string): E_1 | null;
+        querySelectorAll<K_8 extends keyof HTMLElementTagNameMap>(selectors: K_8): NodeListOf<HTMLElementTagNameMap[K_8]>;
+        querySelectorAll<K_9 extends keyof SVGElementTagNameMap>(selectors: K_9): NodeListOf<SVGElementTagNameMap[K_9]>;
+        querySelectorAll<E_2 extends Element = Element>(selectors: string): NodeListOf<E_2>;
+        replaceChildren(...nodes: (string | Node)[]): void;
+        readonly assignedSlot: HTMLSlotElement | null;
+        oncopy: ((this: DocumentAndElementEventHandlers, ev: ClipboardEvent) => any) | null;
+        oncut: ((this: DocumentAndElementEventHandlers, ev: ClipboardEvent) => any) | null;
+        onpaste: ((this: DocumentAndElementEventHandlers, ev: ClipboardEvent) => any) | null;
+        readonly style: CSSStyleDeclaration;
+        contentEditable: string;
+        enterKeyHint: string;
+        inputMode: string;
+        readonly isContentEditable: boolean;
+        onabort: ((this: GlobalEventHandlers, ev: UIEvent) => any) | null;
+        onanimationcancel: ((this: GlobalEventHandlers, ev: AnimationEvent) => any) | null;
+        onanimationend: ((this: GlobalEventHandlers, ev: AnimationEvent) => any) | null;
+        onanimationiteration: ((this: GlobalEventHandlers, ev: AnimationEvent) => any) | null;
+        onanimationstart: ((this: GlobalEventHandlers, ev: AnimationEvent) => any) | null;
+        onauxclick: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onblur: ((this: GlobalEventHandlers, ev: FocusEvent) => any) | null;
+        oncanplay: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        oncanplaythrough: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onchange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onclick: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onclose: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        oncontextmenu: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        oncuechange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        ondblclick: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        ondrag: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondragend: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondragenter: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondragleave: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondragover: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondragstart: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondrop: ((this: GlobalEventHandlers, ev: DragEvent) => any) | null;
+        ondurationchange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onemptied: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onended: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onerror: OnErrorEventHandler;
+        onfocus: ((this: GlobalEventHandlers, ev: FocusEvent) => any) | null;
+        onformdata: ((this: GlobalEventHandlers, ev: FormDataEvent) => any) | null;
+        ongotpointercapture: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        oninput: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        oninvalid: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onkeydown: ((this: GlobalEventHandlers, ev: KeyboardEvent) => any) | null;
+        onkeypress: ((this: GlobalEventHandlers, ev: KeyboardEvent) => any) | null;
+        onkeyup: ((this: GlobalEventHandlers, ev: KeyboardEvent) => any) | null;
+        onload: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onloadeddata: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onloadedmetadata: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onloadstart: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onlostpointercapture: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onmousedown: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onmouseenter: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onmouseleave: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onmousemove: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onmouseout: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onmouseover: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onmouseup: ((this: GlobalEventHandlers, ev: MouseEvent) => any) | null;
+        onpause: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onplay: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onplaying: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onpointercancel: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointerdown: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointerenter: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointerleave: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointermove: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointerout: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointerover: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onpointerup: ((this: GlobalEventHandlers, ev: PointerEvent) => any) | null;
+        onprogress: ((this: GlobalEventHandlers, ev: ProgressEvent<EventTarget>) => any) | null;
+        onratechange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onreset: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onresize: ((this: GlobalEventHandlers, ev: UIEvent) => any) | null;
+        onscroll: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onsecuritypolicyviolation: ((this: GlobalEventHandlers, ev: SecurityPolicyViolationEvent) => any) | null;
+        onseeked: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onseeking: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onselect: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onselectionchange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onselectstart: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onslotchange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onstalled: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onsubmit: ((this: GlobalEventHandlers, ev: SubmitEvent) => any) | null;
+        onsuspend: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        ontimeupdate: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        ontoggle: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        ontouchcancel?: ((this: GlobalEventHandlers, ev: TouchEvent) => any) | null | undefined;
+        ontouchend?: ((this: GlobalEventHandlers, ev: TouchEvent) => any) | null | undefined;
+        ontouchmove?: ((this: GlobalEventHandlers, ev: TouchEvent) => any) | null | undefined;
+        ontouchstart?: ((this: GlobalEventHandlers, ev: TouchEvent) => any) | null | undefined;
+        ontransitioncancel: ((this: GlobalEventHandlers, ev: TransitionEvent) => any) | null;
+        ontransitionend: ((this: GlobalEventHandlers, ev: TransitionEvent) => any) | null;
+        ontransitionrun: ((this: GlobalEventHandlers, ev: TransitionEvent) => any) | null;
+        ontransitionstart: ((this: GlobalEventHandlers, ev: TransitionEvent) => any) | null;
+        onvolumechange: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onwaiting: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onwebkitanimationend: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onwebkitanimationiteration: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onwebkitanimationstart: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onwebkittransitionend: ((this: GlobalEventHandlers, ev: Event) => any) | null;
+        onwheel: ((this: GlobalEventHandlers, ev: WheelEvent) => any) | null;
+        autofocus: boolean;
+        readonly dataset: DOMStringMap;
+        nonce?: string | undefined;
+        tabIndex: number;
+        blur(): void;
+        focus(options?: FocusOptions | undefined): void;
+    };
+} & T;
 export interface ObservableBase {
-    propChanges: Changes;
-    propChange: Promise<void> | null;
-    initializedChanges: Set<string | symbol>;
+    __propChanges: Map<string | symbol, Change>;
+    __propChange: Promise<void> | null;
+    __initializedChanges: Set<string | symbol>;
     definePropChange(key: string | symbol, propChange: Change): Promise<void>;
     onPropertyChanged?(changes: Changes): void;
 }
@@ -20,14 +329,12 @@ export declare function observe(target: any, key: string): void;
 export declare function observable<T extends new (...args: any[]) => any>(Base: T): {
     new (...args: any[]): {
         [x: string]: any;
-        propChanges: Changes;
-        propChange: Promise<void> | null;
-        initializedChanges: Set<string | symbol>;
-        definePropChange: typeof definePropChange;
-        connectedCallback(this: HTMLElement & any): void;
-        attributeChangedCallback(this: HTMLElement & any, name: string, oldVal: string, newVal: string): void;
+        __propChanges: Map<any, any>;
+        __propChange: Promise<void> | null;
+        __initializedChanges: Set<string | symbol>;
+        connectedCallback(this: HTMLElement): void;
+        attributeChangedCallback(this: HTMLElement, name: string, oldVal: string, newVal: string): void;
         onPropertyChanged(changes: Changes): void;
+        definePropChange(key: string | symbol, propChange: Change): Promise<void>;
     };
 } & T;
-declare function definePropChange(this: ObservableBase, key: string | symbol, propChange: Change): Promise<void>;
-export {};

package/target/build/lib/observable.js

@@ -11,67 +11,130 @@ const PROPERTY_KEY = 'observedProperties';
 export function getObservableProperties(c) {
     return c[PROPERTY_KEY] || [];
 }
+export function ForwardProps(Base) {
+    return class Foo extends Base {
+        constructor(...args) {
+            super(...args);
+            this.__upgradedProps = new Map();
+            for (let prop in this) {
+                if (this.hasOwnProperty(prop) && prop !== 'upgradedProps') {
+                    this.__upgradedProps.set(prop, this[prop]);
+                }
+            }
+        }
+    };
+}
 export function observe(target, key) {
     target.constructor[PROPERTY_KEY] = target.constructor[PROPERTY_KEY] || [];
     target.constructor[PROPERTY_KEY].push(key);
 }
 export function observable(Base) {
     const properties = getObservableProperties(Base);
-    const attributes = getObservableAttributes(Base);
-    const parsers = getAttributeParsers(Base);
     const descriptors = createPropertyDescripors(properties);
+    const parsers = getAttributeParsers(Base);
+    const attributes = getObservableAttributes(Base);
     return class Observable extends Base {
         constructor(...args) {
             super(...args);
-            this.propChanges = {};
-            this.propChange = null;
-            this.initializedChanges = new Set();
-            this.definePropChange = definePropChange;
-            for (let prop in descriptors) {
-                Reflect.set(this, createPrivateKey(prop), Reflect.get(this, prop));
-            }
-            Object.defineProperties(this, descriptors);
+            this.__propChanges = new Map();
+            this.__propChange = null;
+            this.__initializedChanges = new Set();
+            init.call(this, descriptors);
         }
         connectedCallback() {
-            for (let i = 0; i < attributes.length; i++) {
-                const key = attributes[i];
-                const { write, mapTo } = parsers[key];
-                if (this.getAttribute(key) === null) {
-                    const propVal = Reflect.get(this, mapTo);
-                    if (propVal !== undefined && propVal !== null && propVal !== '') {
-                        this.setAttribute(key, write(propVal));
-                    }
-                }
-            }
+            connectedCallback.call(this, attributes, parsers);
             if (super.connectedCallback) {
                 super.connectedCallback();
             }
         }
         attributeChangedCallback(name, oldVal, newVal) {
-            const { read, mapTo } = parsers[name];
-            Reflect.set(this, mapTo, read(newVal));
+            attributeChangedCallback.call(this, name, newVal, parsers);
             if (super.attributeChangedCallback) {
                 super.attributeChangedCallback(name, oldVal, newVal);
             }
         }
         onPropertyChanged(changes) {
-            if (this instanceof HTMLElement) {
-                for (let change in changes) {
-                    const attrName = propNameToAttrName(change);
-                    if (attributes.includes(attrName)) {
-                        const value = parsers[attrName].write(changes[change].value);
-                        if (value !== this.getAttribute(attrName)) {
-                            this.setAttribute(attrName, value);
-                        }
-                    }
-                }
-            }
+            onPropertyChanged.call(this, attributes, parsers, changes);
             if (super.onPropertyChanged) {
                 super.onPropertyChanged(changes);
             }
         }
+        definePropChange(key, propChange) {
+            return definePropChange.call(this, key, propChange);
+        }
     };
 }
+function init(descriptors) {
+    // Set initial props if ForwardPropsed from ObservableElement
+    if ('__upgradedProps' in this && this['__upgradedProps'] instanceof Map) {
+        for (let [key, value] of this.__upgradedProps) {
+            Reflect.set(this, key, value);
+        }
+    }
+    for (let prop in descriptors) {
+        Object.defineProperty(this, createPrivateKey(prop), {
+            value: Reflect.get(this, prop),
+            enumerable: false,
+            writable: true,
+        });
+    }
+    Object.defineProperties(this, descriptors);
+}
+function connectedCallback(attributes, parsers) {
+    for (let i = 0; i < attributes.length; i++) {
+        const key = attributes[i];
+        const { write, mapTo } = parsers[key];
+        if (this.getAttribute(key) === null) {
+            const propVal = Reflect.get(this, mapTo);
+            if (propVal !== undefined && propVal !== null && propVal !== '') {
+                this.setAttribute(key, write(propVal));
+            }
+        }
+    }
+}
+function attributeChangedCallback(name, newVal, parsers) {
+    const { read, mapTo } = parsers[name];
+    Reflect.set(this, mapTo, read(newVal));
+}
+function onPropertyChanged(attributes, parsers, changes) {
+    if (this instanceof HTMLElement) {
+        for (let change in changes) {
+            const attrName = propNameToAttrName(change);
+            if (attributes.includes(attrName)) {
+                const value = parsers[attrName].write(changes[change].value);
+                if (value !== this.getAttribute(attrName)) {
+                    this.setAttribute(attrName, value);
+                }
+            }
+        }
+    }
+}
+function definePropChange(key, propChange) {
+    if (!this.__propChanges.has(key)) {
+        this.__propChanges.set(key, propChange);
+    }
+    this.__propChanges.get(key).value = propChange.value;
+    if (!this.__propChange) {
+        // If there is no previous change defined set it up
+        this.__propChange = Promise.resolve().then(() => {
+            // run onPropChanges here. This makes sure we capture all changes
+            const changes = {};
+            // Copy changes and keep track of whether or not this is the first time a given property has changes
+            for (let [key, value] of this.__propChanges) {
+                changes[key] = value;
+                changes[key].firstChange = !this.__initializedChanges.has(key);
+                this.__initializedChanges.add(key);
+            }
+            // clear out before calling to account for changes made INSIDE of the onPropertyChanged callback
+            this.__propChange = null;
+            this.__propChanges.clear();
+            if (this.onPropertyChanged) {
+                this.onPropertyChanged(changes);
+            }
+        });
+    }
+    return this.__propChange;
+}
 function createPrivateKey(key) {
     return `__${key.toString()}`;
 }
@@ -95,29 +158,3 @@ function createPropertyDescripors(props) {
     }
     return descriptors;
 }
-function definePropChange(key, propChange) {
-    if (!this.propChanges[key]) {
-        this.propChanges[key] = propChange;
-    }
-    this.propChanges[key].value = propChange.value;
-    if (!this.propChange) {
-        // If there is no previous change defined set it up
-        this.propChange = Promise.resolve().then(() => {
-            // run onPropChanges here. This makes sure we capture all changes
-            const changes = {};
-            // Copy changes and keep track of whether or not this is the first time a given property has changes
-            for (let change in this.propChanges) {
-                changes[change] = this.propChanges[change];
-                changes[change].firstChange = !this.initializedChanges.has(change);
-                this.initializedChanges.add(change);
-            }
-            // clear out before calling to account for changes made INSIDE of the onPropertyChanged callback
-            this.propChange = null;
-            this.propChanges = {};
-            if (this.onPropertyChanged) {
-                this.onPropertyChanged(changes);
-            }
-        });
-    }
-    return this.propChange;
-}

package/target/build/lib.d.ts

@@ -1,2 +1,2 @@
-export { observable, Change, OnPropertyChanged, observe, Changes } from './lib/observable';
+export { observable, Change, OnPropertyChanged, observe, Changes, ForwardProps, } from './lib/observable';
 export { attr } from './lib/attribute';

package/target/build/lib.js

@@ -1,2 +1,2 @@
-export { observable, Change, observe } from './lib/observable';
+export { observable, Change, observe, ForwardProps, } from './lib/observable';
 export { attr } from './lib/attribute';