2.0.8

.gitlab-ci.yml

@@ -12,6 +12,9 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
@@ -36,6 +39,7 @@ auditProductionDependencies:
     - npmci command npm audit --audit-level=high --only=prod --production
   tags:
     - docker
+  allow_failure: true
 
 auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
-      "type": "node",
+      "command": "npm test",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
+      "type": "node-terminal"
     }
   ]
 }

.vscode/settings.json

@@ -22,5 +22,6 @@
         }
       }
     }
-  ]
+  ],
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

npmextra.json

@@ -5,7 +5,7 @@
       "githost": "gitlab.com",
       "gitscope": "designestate",
       "gitrepo": "dees-element",
-      "shortDescription": "a custom element class extending lit element class",
+      "description": "a custom element class extending lit element class",
       "npmPackagename": "@designestate/dees-element",
       "license": "MIT",
       "projectDomain": "design.estate"

package.json

@@ -1,30 +1,31 @@
 {
   "name": "@designestate/dees-element",
-  "version": "1.0.14",
+  "version": "2.0.8",
   "private": false,
   "description": "a custom element class extending lit element class",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/ --web)",
-    "build": "(tsbuild --web)"
+    "build": "(tsbuild --web --allowimplicitany --skiplibcheck && tsbundle npm)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsbundle": "^1.0.80",
-    "@gitzone/tstest": "^1.0.44",
-    "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^14.14.37",
+    "@gitzone/tsbuild": "^2.1.61",
+    "@gitzone/tsbundle": "^1.0.102",
+    "@gitzone/tstest": "^1.0.70",
+    "@pushrocks/tapbundle": "^5.0.3",
+    "@types/node": "^17.0.25",
     "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.15.0"
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@designestate/dees-domtools": "^1.0.86",
-    "@pushrocks/isounique": "^1.0.4",
-    "@pushrocks/smartrx": "^2.0.19",
-    "lit-element": "^2.4.0"
+    "@designestate/dees-domtools": "^2.0.6",
+    "@pushrocks/isounique": "^1.0.5",
+    "@pushrocks/smartrx": "^2.0.25",
+    "lit": "^2.2.2"
   },
   "browserslist": [
     "last 1 chrome versions"

test/test.browser.ts

@@ -1,21 +1,22 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as deesElement from '../ts/index';
+import * as deesElement from '../ts/index.js';
 
 tap.test('should create a static element', async () => {
   @deesElement.customElement('my-button')
   class MyButton extends deesElement.DeesElement {
     // STATIC
     public static styles = [
+      deesElement.cssManager.defaultStyles,
       deesElement.css`
       .buttonClass {
-        background: ${deesElement.cssManager.dbTheme('blue', 'black')};
+        background: ${deesElement.cssManager.bdTheme('blue', 'black')};
       }
-    `
+    `,
     ];
 
     // INSTANCE
     render() {
-      return deesElement.html`<div class="buttonClass">My Button</div>`
+      return deesElement.html`<div class="buttonClass">My Button</div>`;
     }
   }
 });

ts/dees-element.classes.cssmanager.ts

@@ -1,35 +1,74 @@
-import { CSSResult } from 'lit-element';
-import * as plugins from './dees-element.plugins';
+import { CSSResult, unsafeCSS } from 'lit';
+import * as plugins from './dees-element.plugins.js';
 import * as domtools from '@designestate/dees-domtools';
 
-export interface IDbVarTriplet {
+export interface IBdVarTriplet {
   cssVarName: string;
   darkValue: string;
   brightValue: string;
 }
 
 export class CssManager {
-  public dbVarTripletStore: IDbVarTriplet[] = [];
+  public domtoolsPromise = domtools.DomTools.setupDomTools();
+  public goBright: boolean = false;
+  public bdVarTripletStore: IBdVarTriplet[] = [];
 
-  public dbTheme(darkValueArg: string, brightValueArg: string): CSSResult {
+  constructor() {
+    this.domtoolsPromise.then(async (domtoolsArg) => {
+      domtoolsArg.themeManager.themeObservable.subscribe(async (goBrightArg) => {
+        this.goBright = goBrightArg;
+        await domtoolsArg.domReady.promise;
+        for (const bdTripletArg of this.bdVarTripletStore) {
+          document.body.style.setProperty(
+            bdTripletArg.cssVarName,
+            this.goBright ? bdTripletArg.brightValue : bdTripletArg.darkValue
+          );
+        }
+      });
+    });
+  }
+
+  public get defaultStyles() {
+    return domtools.elementBasic.staticStyles;
+  }
+
+  public cssForTablet(contentArg: CSSResult) {
+    return unsafeCSS(domtools.breakpoints.cssForTablet(contentArg));
+  }
+
+  public cssForPhablet(contentArg: CSSResult) {
+    return unsafeCSS(domtools.breakpoints.cssForPhablet(contentArg));
+  }
+
+  public cssForPhone(contentArg: CSSResult) {
+    return unsafeCSS(domtools.breakpoints.cssForPhone(contentArg));
+  }
+
+  public bdTheme(brightValueArg: string, darkValueArg: string): CSSResult {
     let returnCssVar: string;
-    const existingTriplet = this.dbVarTripletStore.find(tripletArg => tripletArg.darkValue === darkValueArg && tripletArg.brightValue === brightValueArg);
+    const existingTriplet = this.bdVarTripletStore.find(
+      (tripletArg) =>
+        tripletArg.darkValue === darkValueArg && tripletArg.brightValue === brightValueArg
+    );
     if (existingTriplet) {
       returnCssVar = existingTriplet.cssVarName;
     } else {
-      const newTriplet: IDbVarTriplet = {
+      const newTriplet: IBdVarTriplet = {
         cssVarName: `--${plugins.isounique.uni()}`,
         brightValue: brightValueArg,
-        darkValue: darkValueArg
+        darkValue: darkValueArg,
       };
-      this.dbVarTripletStore.push(newTriplet);
-      domtools.DomTools.setupDomTools().then(async (domtools) => {
-        await domtools.domReady.promise;
-        document.body.style.setProperty(newTriplet.cssVarName, newTriplet.darkValue);
+      this.bdVarTripletStore.push(newTriplet);
+      this.domtoolsPromise.then(async (domtoolsArg) => {
+        await domtoolsArg.domReady.promise;
+        document.body.style.setProperty(
+          newTriplet.cssVarName,
+          domtoolsArg.themeManager.goBrightBoolean ? newTriplet.brightValue : newTriplet.darkValue
+        );
       });
       returnCssVar = newTriplet.cssVarName;
     }
-    return plugins.litElement.unsafeCSS(`var(${returnCssVar})`);
+    return plugins.lit.unsafeCSS(`var(${returnCssVar}, ${darkValueArg})`);
   }
 
   public cssGridColumns = (amountOfColumnsArg: number, gapSizeArg: number): CSSResult => {
@@ -39,6 +78,6 @@ export class CssManager {
         gapSizeArg * (amountOfColumnsArg - 1)
       }px/${amountOfColumnsArg}))`;
     }
-    return plugins.litElement.unsafeCSS(returnString);
+    return plugins.lit.unsafeCSS(returnString);
   };
 }

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

@@ -1,18 +1,21 @@
-import * as plugins from './dees-element.plugins';
+import * as plugins from './dees-element.plugins.js';
 
-export class DeesElement extends plugins.litElement.LitElement {
+export class DeesElement extends plugins.lit.LitElement {
   // INSTANCE
-  @plugins.litElement.property({ type: Boolean })
+  @plugins.lit.property({ type: Boolean })
   public goBright: boolean = false;
 
   // domtools
   public domtoolsPromise = plugins.domtools.elementBasic.setup(this);
 
-  @plugins.litElement.property()
+  @plugins.lit.property()
   domtools?: plugins.domtools.DomTools;
 
   private themeSubscription: plugins.smartrx.rxjs.Subscription;
 
+  private elementDomReadyDeferred = plugins.domtools.plugins.smartpromise.defer();
+  public elementDomReady = this.elementDomReadyDeferred.promise;
+
   constructor() {
     super();
     this.domtoolsPromise.then((domtoolsArg) => {
@@ -20,17 +23,22 @@ export class DeesElement extends plugins.litElement.LitElement {
     });
   }
 
-  public connectedCallback() {
+  public async connectedCallback() {
     super.connectedCallback();
-    this.domtoolsPromise.then(async (domtools) => {
+    const domtools = await this.domtoolsPromise;
     this.themeSubscription = domtools.themeManager.themeObservable.subscribe((goBrightArg) => {
       this.goBright = goBrightArg;
     });
-    });
     this.dispatchEvent(new CustomEvent('deesElementConnected'));
   }
 
-  public disconnectedCallback() {
+  public firstUpdated(_changedProperties: Map<string | number | symbol, unknown>): void {
+    super.firstUpdated(_changedProperties);
+    this.elementDomReadyDeferred.resolve();
+  }
+
+  public async disconnectedCallback() {
+    await this.domtoolsPromise;
     super.disconnectedCallback();
     this.themeSubscription.unsubscribe();
     this.dispatchEvent(new CustomEvent('deesElementDisconnected'));

ts/dees-element.plugins.ts

@@ -2,23 +2,18 @@
 import * as isounique from '@pushrocks/isounique';
 import * as smartrx from '@pushrocks/smartrx';
 
-export {
-  isounique,
-  smartrx
-};
+export { isounique, smartrx };
 
 // third party scope
-import { css, unsafeCSS, LitElement, property } from 'lit-element';
-const litElement = {
+import { css, unsafeCSS, LitElement } from 'lit';
+import { property } from 'lit/decorators/property.js';
+const lit = {
   css,
   unsafeCSS,
   LitElement,
-  property
+  property,
 };
 
 import * as domtools from '@designestate/dees-domtools';
 
-export {
-  litElement,
-  domtools
-};
+export { lit, domtools };

ts/index.ts

@@ -1,16 +1,20 @@
-import { CssManager } from './dees-element.classes.cssmanager';
-import * as plugins from './dees-element.plugins';
+import { CssManager } from './dees-element.classes.cssmanager.js';
 
-export {
-  customElement,
-  property,
-  internalProperty,
-  html,
-  TemplateResult,
-  css,
-  unsafeCSS
-} from 'lit-element';
+// lit exports
+export { html, TemplateResult, css, unsafeCSS, render } from 'lit';
 
-export { DeesElement } from './dees-element.classes.dees-element';
+export { customElement } from 'lit/decorators/custom-element.js';
 
+export { property, state, query, queryAll, queryAsync } from 'lit/decorators.js';
+
+// domtools exports
+import * as domtools from '@designestate/dees-domtools';
+export { domtools };
+
+// DeesElements exports
+export { DeesElement } from './dees-element.classes.dees-element.js';
+
+/**
+ * a singleton instance of CssManager
+ */
 export const cssManager = new CssManager();

tsconfig.json

@@ -1,16 +1,8 @@
 {
   "compilerOptions": {
-    "target": "es2017",
-    "module": "es2015",
-    "moduleResolution": "node",
-    "lib": ["es2017", "dom"],
-    "declaration": true,
-    "inlineSources": true,
-    "inlineSourceMap": true,
-    "noUnusedLocals": true,
-    "noFallthroughCasesInSwitch": true,
-    "outDir": "dist/",
-    "skipLibCheck": true,
+    "target": "es2020",
+    "module": "es2020",
+    "moduleResolution": "node12",
     "experimentalDecorators": true
   }
 }