2.0.29

.gitea/workflows/default_tags.yaml

@@ -119,6 +119,6 @@ jobs:
         run: |
           npmci node install stable
           npmci npm install
-          pnpm install -g @gitzone/tsdoc
+          pnpm install -g @git.zone/tsdoc
           npmci command tsdoc
         continue-on-error: true

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@design.estate/dees-element",
-  "version": "2.0.25",
+  "version": "2.0.29",
   "private": false,
   "description": "a custom element class extending lit element class",
   "main": "dist_ts/index.js",
@@ -14,14 +14,14 @@
     "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tsbundle": "^2.0.8",
-    "@gitzone/tstest": "^1.0.77",
-    "@push.rocks/tapbundle": "^5.0.12",
-    "@types/node": "^20.4.8"
+    "@git.zone/tsbuild": "^2.1.70",
+    "@git.zone/tsbundle": "^2.0.8",
+    "@git.zone/tstest": "^1.0.81",
+    "@push.rocks/tapbundle": "^5.0.15",
+    "@types/node": "^20.6.2"
   },
   "dependencies": {
-    "@design.estate/dees-domtools": "^2.0.37",
+    "@design.estate/dees-domtools": "^2.0.41",
     "@push.rocks/isounique": "^1.0.5",
     "@push.rocks/smartrx": "^3.0.6",
     "lit": "^2.8.0"

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@design.estate/dees-element',
-  version: '2.0.25',
+  version: '2.0.29',
   description: 'a custom element class extending lit element class'
 }

ts/dees-element.classes.resolvedirective.ts

@@ -1,37 +1,50 @@
-import { noChange } from 'lit';
+import { type TemplateResult, noChange } from 'lit';
 import { AsyncDirective, directive } from 'lit/async-directive.js';
-import { rxjs } from '@push.rocks/smartrx';
 
 class ResolveDirective extends AsyncDirective {
-  observable: rxjs.Observable<unknown> | undefined;
-  sub: rxjs.Subscription | null = null;
+  promise: Promise<unknown> | undefined;
+  hasPromiseSettled: boolean = false;
 
-  render(observable: rxjs.Observable<unknown>) {
-    if (this.observable !== observable) {
-      this.sub?.unsubscribe();
-      this.observable = observable;
+  render(promise: Promise<unknown>) {
+    if (this.promise !== promise) {
+      this.promise = promise;
 
       if (this.isConnected) {
-        this.subscribe(observable);
+        this.handlePromise(promise);
       }
     }
 
     return noChange;
   }
 
-  subscribe(observable: rxjs.Observable<unknown>) {
-    this.sub = observable.subscribe((v: unknown) => {
-      this.setValue(v);
+  handlePromise(promise: Promise<unknown>) {
+    this.hasPromiseSettled = false;
+
+    promise.then((value) => {
+      if (this.promise === promise && !this.hasPromiseSettled) {
+        this.setValue(value);
+        this.hasPromiseSettled = true;
+      }
+    }).catch((error) => {
+      if (this.promise === promise && !this.hasPromiseSettled) {
+        this.setValue(error);
+        this.hasPromiseSettled = true;
+      }
     });
   }
 
   disconnected() {
-    this.sub?.unsubscribe();
+    this.hasPromiseSettled = true; // prevent setting value if the promise settles after disconnection
   }
 
   reconnected() {
-    this.subscribe(this.observable!);
+    if (!this.hasPromiseSettled) {
+      this.handlePromise(this.promise!);
+    }
   }
 }
 
 export const resolve = directive(ResolveDirective);
+export const resolveExec = (funcArg: () => Promise<TemplateResult | unknown>) => {
+  return resolve(funcArg());
+}

ts/index.ts

@@ -24,3 +24,12 @@ export * from './dees-element.classes.resolvedirective.js';
  * a singleton instance of CssManager
  */
 export const cssManager = new CssManager();
+
+// better scoped exports
+import { resolve } from './dees-element.classes.resolvedirective.js';
+import { subscribe } from './dees-element.classes.subscribedirective.js';
+
+export const directives = {
+  resolve,
+  subscribe,
+}

tsconfig.json

@@ -5,6 +5,10 @@
     "target": "ES2022",
     "module": "ES2022",
     "moduleResolution": "nodenext",
-    "esModuleInterop": true
-  }
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
 }