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",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${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"
     }
   ]
 }

.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,28 +1,31 @@
 {
   "name": "@designestate/dees-element",
-  "version": "1.0.8",
+  "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/tsbuild": "^2.1.61",
-    "@gitzone/tsbundle": "^1.0.78",
+    "@gitzone/tsbundle": "^1.0.102",
-    "@gitzone/tstest": "^1.0.44",
+    "@gitzone/tstest": "^1.0.70",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/tapbundle": "^5.0.3",
-    "@types/node": "^14.11.2",
+    "@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.70",
+    "@designestate/dees-domtools": "^2.0.6",
-    "lit-element": "^2.4.0"
+    "@pushrocks/isounique": "^1.0.5",
+    "@pushrocks/smartrx": "^2.0.25",
+    "lit": "^2.2.2"
   },
   "browserslist": [
     "last 1 chrome versions"

test/test.browser.ts

@@ -0,0 +1,24 @@
+import { expect, tap } from '@pushrocks/tapbundle';
+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.bdTheme('blue', 'black')};
+      }
+    `,
+    ];
+
+    // INSTANCE
+    render() {
+      return deesElement.html`<div class="buttonClass">My Button</div>`;
+    }
+  }
+});
+
+tap.start();

test/test.ts

@@ -1,6 +0,0 @@
-import { expect, tap } from '@pushrocks/tapbundle';
-import * as deesElement from '../ts/index';
-
-tap.test('first test', async () => {});
-
-tap.start();

ts/dees-element.classes.cssmanager.ts

@@ -0,0 +1,83 @@
+import { CSSResult, unsafeCSS } from 'lit';
+import * as plugins from './dees-element.plugins.js';
+import * as domtools from '@designestate/dees-domtools';
+
+export interface IBdVarTriplet {
+  cssVarName: string;
+  darkValue: string;
+  brightValue: string;
+}
+
+export class CssManager {
+  public domtoolsPromise = domtools.DomTools.setupDomTools();
+  public goBright: boolean = false;
+  public bdVarTripletStore: IBdVarTriplet[] = [];
+
+  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.bdVarTripletStore.find(
+      (tripletArg) =>
+        tripletArg.darkValue === darkValueArg && tripletArg.brightValue === brightValueArg
+    );
+    if (existingTriplet) {
+      returnCssVar = existingTriplet.cssVarName;
+    } else {
+      const newTriplet: IBdVarTriplet = {
+        cssVarName: `--${plugins.isounique.uni()}`,
+        brightValue: brightValueArg,
+        darkValue: darkValueArg,
+      };
+      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.lit.unsafeCSS(`var(${returnCssVar}, ${darkValueArg})`);
+  }
+
+  public cssGridColumns = (amountOfColumnsArg: number, gapSizeArg: number): CSSResult => {
+    let returnString = ``;
+    for (let i = 0; i < amountOfColumnsArg; i++) {
+      returnString += ` calc((100%/${amountOfColumnsArg}) - (${
+        gapSizeArg * (amountOfColumnsArg - 1)
+      }px/${amountOfColumnsArg}))`;
+    }
+    return plugins.lit.unsafeCSS(returnString);
+  };
+}

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

@@ -0,0 +1,46 @@
+import * as plugins from './dees-element.plugins.js';
+
+export class DeesElement extends plugins.lit.LitElement {
+  // INSTANCE
+  @plugins.lit.property({ type: Boolean })
+  public goBright: boolean = false;
+
+  // domtools
+  public domtoolsPromise = plugins.domtools.elementBasic.setup(this);
+
+  @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) => {
+      this.domtools = domtoolsArg;
+    });
+  }
+
+  public async connectedCallback() {
+    super.connectedCallback();
+    const domtools = await this.domtoolsPromise;
+    this.themeSubscription = domtools.themeManager.themeObservable.subscribe((goBrightArg) => {
+      this.goBright = goBrightArg;
+    });
+    this.dispatchEvent(new CustomEvent('deesElementConnected'));
+  }
+
+  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

@@ -1,12 +1,19 @@
-import { LitElement, property } from 'lit-element';
+// pushrocks scope
-const litElement = {
+import * as isounique from '@pushrocks/isounique';
+import * as smartrx from '@pushrocks/smartrx';
+
+export { isounique, smartrx };
+
+// third party scope
+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 {
+export { lit, domtools };
-  litElement,
-  domtools
-};

ts/index.ts

@@ -1,27 +1,20 @@
-import * as plugins from './dees-element.plugins';
+import { CssManager } from './dees-element.classes.cssmanager.js';
 
-export {
+// lit exports
-  property,
+export { html, TemplateResult, css, unsafeCSS, render } from 'lit';
-  html,
-  customElement,
-  TemplateResult,
-  internalProperty,
-  css,
-  unsafeCSS
-} from 'lit-element';
 
-export class DeesElement extends plugins.litElement.LitElement {
+export { customElement } from 'lit/decorators/custom-element.js';
-  @plugins.litElement.property({type: Boolean})
-  public goBright: boolean = false;
-  public domtoolsPromise = plugins.domtools.elementBasic.setup(this);
 
-  public connectedCallback() {
+export { property, state, query, queryAll, queryAsync } from 'lit/decorators.js';
-    super.connectedCallback();
-    this.dispatchEvent(new CustomEvent('domtools-connected'));
-  }
 
-  public disconnectedCallback() {
+// domtools exports
-    super.disconnectedCallback();
+import * as domtools from '@designestate/dees-domtools';
-    this.dispatchEvent(new CustomEvent('domtools-disconnected'));
+export { domtools };
-  }
+
-}
+// DeesElements exports
+export { DeesElement } from './dees-element.classes.dees-element.js';
+
+/**
+ * a singleton instance of CssManager
+ */
+export const cssManager = new CssManager();

ts/tsconfig.json

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

tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "compilerOptions": {
+    "target": "es2020",
+    "module": "es2020",
+    "moduleResolution": "node12",
+    "experimentalDecorators": true
+  }
+}