@joist/observable 2.0.0-alpha.18 → 2.0.0-alpha.20

package/README.md

@@ -92,10 +92,10 @@ class TestElement extends HTMLElement {
 
   // reads as a Date object and writes back a string
   @observe
-  @attr({
-    read: (val: string) => new Date(val),
-    write: (val: Date) => val.toString()
+  @attr<Date>({
+    read: (val) => new Date(val),
+    write: (val) => val.toString()
   })
-  count: Date = 0;
+  count = new Date();
 }
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joist/observable",
-  "version": "2.0.0-alpha.18",
+  "version": "2.0.0-alpha.20",
   "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": "d8d6e607f491335d14b5db3db044d6709d0ffba5"
+  "gitHead": "9b62852b4fdfea6eebbf128d55537adbd368faf2"
 }

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 attr<T extends HTMLElement>(p: Partial<AttributeParser<unknown>>): (t: T, key: string) => void;
+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/attribute.js

@@ -1,14 +1,13 @@
 import { defaultParser, propNameToAttrName, } from './attribute-parsers';
 export function getObservableAttributes(c) {
-    const attrs = Reflect.get(c, 'observedAttributes') || [];
-    return attrs.map(propNameToAttrName);
+    return Reflect.get(c, 'observedAttributes') || [];
 }
 export function getAttributeParsers(c) {
     const parsers = Reflect.get(c, 'attributeParsers') || {};
     return parsers;
 }
 export function attr(targetOrParser, key) {
-    if (targetOrParser instanceof HTMLElement) {
+    if (targetOrParser instanceof HTMLElement && typeof key === 'string') {
         const attrName = propNameToAttrName(key);
         return defineAttribute(targetOrParser, attrName, key);
     }

package/target/build/lib/observable.js

@@ -57,9 +57,9 @@ export function observable(Base) {
         onPropertyChanged(changes) {
             if (this instanceof HTMLElement) {
                 for (let change in changes) {
-                    if (attributes.includes(change)) {
-                        const value = parsers[change].write(changes[change].value);
-                        const attrName = propNameToAttrName(change);
+                    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);
                         }