2.0.33

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @git.zone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@designestate/dees-element",
-  "version": "2.0.21",
+  "name": "@design.estate/dees-element",
+  "version": "2.0.33",
   "private": false,
   "description": "a custom element class extending lit element class",
   "main": "dist_ts/index.js",
@@ -14,17 +14,17 @@
     "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.61",
-    "@gitzone/tsbundle": "^2.0.7",
-    "@gitzone/tstest": "^1.0.70",
-    "@pushrocks/tapbundle": "^5.0.3",
-    "@types/node": "^18.15.10"
+    "@git.zone/tsbuild": "^2.1.70",
+    "@git.zone/tsbundle": "^2.0.10",
+    "@git.zone/tstest": "^1.0.81",
+    "@push.rocks/tapbundle": "^5.0.15",
+    "@types/node": "^20.8.7"
   },
   "dependencies": {
-    "@designestate/dees-domtools": "^2.0.28",
-    "@pushrocks/isounique": "^1.0.5",
-    "@pushrocks/smartrx": "^3.0.0",
-    "lit": "^2.7.0"
+    "@design.estate/dees-domtools": "^2.0.54",
+    "@push.rocks/isounique": "^1.0.5",
+    "@push.rocks/smartrx": "^3.0.6",
+    "lit": "^3.0.0"
   },
   "browserslist": [
     "last 1 chrome versions"

test/test.browser.ts

@@ -1,4 +1,4 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 import * as deesElement from '../ts/index.js';
 
 tap.test('should create a static element', async () => {

ts/00_commitinfo_data.ts

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@designestate/dees-element',
-  version: '2.0.21',
+  name: '@design.estate/dees-element',
+  version: '2.0.33',
   description: 'a custom element class extending lit element class'
 }

ts/dees-element.classes.cssmanager.ts

@@ -1,6 +1,6 @@
 import { CSSResult, unsafeCSS } from 'lit';
 import * as plugins from './dees-element.plugins.js';
-import * as domtools from '@designestate/dees-domtools';
+import * as domtools from '@design.estate/dees-domtools';
 
 export interface IBdVarTriplet {
   cssVarName: string;

ts/dees-element.classes.dees-element.ts

@@ -40,12 +40,20 @@ export class DeesElement extends plugins.lit.LitElement {
     this.elementDomReadyDeferred.resolve();
   }
 
+  private garbageFunctions: (() => void)[] = [];
+  public registerGarbageFunction(garbageFunctionArg: () => void) {
+    this.garbageFunctions.push(garbageFunctionArg);
+  }
+
   public async disconnectedCallback() {
     await this.domtoolsPromise;
     super.disconnectedCallback();
     for (const subscription of this.rxSubscriptions) {
       subscription.unsubscribe();
     }
+    for (const garbageFunction of this.garbageFunctions) {
+      garbageFunction();
+    }
     this.dispatchEvent(new CustomEvent('deesElementDisconnected'));
   }
 }

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 '@pushrocks/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 resolve = directive(ResolveDirective);
+export const resolveExec = (funcArg: () => Promise<TemplateResult | unknown>) => {
+  return resolve(funcArg());
+}

ts/dees-element.classes.subscribedirective.ts

@@ -1,6 +1,6 @@
 import { noChange } from 'lit';
 import { AsyncDirective, directive } from 'lit/async-directive.js';
-import { rxjs } from '@pushrocks/smartrx';
+import { rxjs } from '@push.rocks/smartrx';
 
 class SubscribeDirective extends AsyncDirective {
   observable: rxjs.Observable<unknown> | undefined;
@@ -34,4 +34,4 @@ class SubscribeDirective extends AsyncDirective {
   }
 }
 
-export const subscribe = directive(SubscribeDirective);
+export const subscribe = directive(SubscribeDirective);

ts/dees-element.plugins.ts

@@ -1,6 +1,6 @@
 // pushrocks scope
-import * as isounique from '@pushrocks/isounique';
-import * as smartrx from '@pushrocks/smartrx';
+import * as isounique from '@push.rocks/isounique';
+import * as smartrx from '@push.rocks/smartrx';
 
 export { isounique, smartrx };
 
@@ -14,6 +14,6 @@ const lit = {
   property,
 };
 
-import * as domtools from '@designestate/dees-domtools';
+import * as domtools from '@design.estate/dees-domtools';
 
 export { lit, domtools };

ts/index.ts

@@ -1,7 +1,7 @@
 import { CssManager } from './dees-element.classes.cssmanager.js';
 
 // lit exports
-export { html, TemplateResult, css, unsafeCSS, render } from 'lit';
+export { html, type TemplateResult, css, unsafeCSS, render, type CSSResult } from 'lit';
 export { unsafeHTML } from 'lit/directives/unsafe-html.js';
 
 export { customElement } from 'lit/decorators/custom-element.js';
@@ -12,7 +12,7 @@ export { until } from 'lit/directives/until.js';
 export { asyncAppend } from 'lit/directives/async-append.js';
 
 // domtools exports
-import * as domtools from '@designestate/dees-domtools';
+import * as domtools from '@design.estate/dees-domtools';
 export { domtools };
 
 // DeesElements exports
@@ -24,3 +24,19 @@ 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,
+}
+
+// type exports
+import type { rxjs } from '@push.rocks/smartrx';
+
+export type {
+  rxjs,
+}

tsconfig.json

@@ -3,8 +3,12 @@
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
     "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "nodenext",
-    "esModuleInterop": true
-  }
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
 }