2.0.0

.gitlab-ci.yml

@@ -36,6 +36,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

package.json

@@ -1,38 +1,40 @@
 {
   "name": "@designestate/dees-domtools",
-  "version": "1.0.57",
+  "version": "2.0.0",
   "private": false,
   "description": "tools to simplify complex css structures",
   "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 && tsbundle npm)",
+    "build": "(tsbuild --web --allowimplicitany --skiplibcheck && tsbundle npm)",
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsbundle": "^1.0.78",
-    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^14.14.6",
+    "@gitzone/tsbuild": "^2.1.56",
+    "@gitzone/tsbundle": "^1.0.98",
+    "@gitzone/tstest": "^1.0.68",
+    "@pushrocks/tapbundle": "^5.0.2",
+    "@types/node": "^17.0.21",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@apiglobal/typedrequest": "^1.0.54",
-    "@designestate/dees-comms": "^1.0.7",
-    "@pushrocks/lik": "^4.0.17",
-    "@pushrocks/smartdelay": "^2.0.10",
-    "@pushrocks/smartpromise": "^3.1.3",
-    "@pushrocks/smartrouter": "^1.0.4",
-    "@pushrocks/smartstate": "^1.0.17",
-    "@pushrocks/webrequest": "^2.0.13",
-    "@pushrocks/websetup": "^3.0.5",
-    "@pushrocks/webstore": "^1.0.16",
-    "lit-element": "^2.4.0",
+    "@apiglobal/typedrequest": "^1.0.65",
+    "@designestate/dees-comms": "^1.0.16",
+    "@pushrocks/lik": "^5.0.4",
+    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartrouter": "^1.0.12",
+    "@pushrocks/smartrx": "^2.0.25",
+    "@pushrocks/smartstate": "^1.0.23",
+    "@pushrocks/webrequest": "^2.0.15",
+    "@pushrocks/websetup": "^3.0.16",
+    "@pushrocks/webstore": "^1.0.18",
+    "lit": "^2.2.1",
     "sweet-scroll": "^4.0.0"
   },
   "files": [

test/test.browser.ts

@@ -3,7 +3,7 @@ import * as domtools from '../ts/index';
 
 tap.test('first test', async () => {
   const domtoolsInstance = await domtools.DomTools.setupDomTools();
-  expect(domtoolsInstance).to.be.instanceof(domtools.DomTools);
+  expect(domtoolsInstance).toBeInstanceOf(domtools.DomTools);
 });
 
 tap.start();

ts/domtools.breakpoints.ts

@@ -1,71 +0,0 @@
-import { DomTools } from './domtools.classes.domtools';
-
-export const desktop = 1240;
-export const tablet = 1024;
-export const phablet = 600;
-export const phone = 400;
-
-export type TViewport = 'native' | 'desktop' | 'tablet' | 'phablet' | 'phone';
-
-export const getEnvironment = (): TViewport => {
-  if (
-    globalThis.deesDomTools &&
-    globalThis.deesDomTools.domToolsStatePart.getState().virtualViewport
-  ) {
-    return globalThis.deesDomTools.domToolsStatePart.getState().virtualViewport;
-  } else {
-    return 'native';
-  }
-};
-
-export const cssForTablet = (contentArg) => {
-  if (getEnvironment() === 'native' || getEnvironment() === 'desktop') {
-    return `
-      @media (max-width: ${tablet}px) {
-        ${contentArg}
-      }
-    `;
-  } else if (
-    getEnvironment() === 'tablet' ||
-    getEnvironment() === 'phablet' ||
-    getEnvironment() === 'phone'
-  ) {
-    return `
-      @media (min-width: 0px) {
-        ${contentArg}
-      }
-    `;
-  }
-};
-
-export const cssForPhablet = (contentArg) => {
-  if (getEnvironment() === 'native' || getEnvironment() === 'desktop') {
-    return `
-      @media (max-width: ${phablet}px) {
-        ${contentArg}
-      }
-    `;
-  } else if (getEnvironment() === 'phablet' || getEnvironment() === 'phone') {
-    return `
-      @media (min-width: 0px) {
-        ${contentArg}
-      }
-    `;
-  }
-};
-
-export const cssForPhone = (contentArg) => {
-  if (getEnvironment() === 'native' || getEnvironment() === 'desktop') {
-    return `
-      @media (max-width: ${phone}px) {
-        ${contentArg}
-      }
-    `;
-  } else if (getEnvironment() === 'phone') {
-    return `
-      @media (min-width: 0px) {
-        ${contentArg}
-      }
-    `;
-  }
-};

ts/domtools.classes.domtools.ts

@@ -1,14 +1,15 @@
-import * as plugins from './domtools.plugins';
-import { Stringmap } from '@pushrocks/lik/dist_ts/lik.stringmap';
-import { FastMap } from '@pushrocks/lik/dist_ts/lik.fastmap';
-import { TViewport } from './domtools.breakpoints';
+import * as plugins from './domtools.plugins.js';
+import { Stringmap } from '@pushrocks/lik/dist_ts/lik.stringmap.js';
+import { FastMap } from '@pushrocks/lik/dist_ts/lik.fastmap.js';
+import { TViewport } from './domtools.css.breakpoints.js';
 
-import { Scroller } from './domtools.classes.scroller';
-import { delayForRandom } from '@pushrocks/smartdelay';
+import { Scroller } from './domtools.classes.scroller.js';
 import { WebSetup } from '@pushrocks/websetup';
+import { ThemeManager } from './domtools.classes.thememanager.js';
 
 export interface IDomToolsState {
   virtualViewport: TViewport;
+  jwt: string;
 }
 
 export class DomTools {
@@ -64,11 +65,16 @@ export class DomTools {
     bodyElement: null,
   };
 
-  public websetup: WebSetup;
+  public websetup: WebSetup = new WebSetup({
+    metaObject: {
+      title: 'loading...',
+    },
+  });
 
   public smartstate = new plugins.smartstate.Smartstate();
   public domToolsStatePart = this.smartstate.getStatePart<IDomToolsState>('domtools', {
     virtualViewport: 'native',
+    jwt: null
   });
 
   public router = new plugins.smartrouter.SmartRouter({
@@ -76,14 +82,17 @@ export class DomTools {
   });
 
   public convenience = {
+    typedrequest: plugins.typedrequest,
     smartdelay: plugins.smartdelay,
   };
 
-  public scroller: plugins.SweetScroll;
-
   public deesComms = new plugins.deesComms.DeesComms();
+  public scroller = new plugins.SweetScroll({
+    /* some options */
+  }); // TODO: switch to scroller class
+  public themeManager = new ThemeManager(this);
 
-  private actionSetVirtualViewport = this.domToolsStatePart.createAction<TViewport>(
+  /* private actionSetVirtualViewport = this.domToolsStatePart.createAction<TViewport>(
     async (statePart, payload) => {
       const currentState = statePart.getState();
       currentState.virtualViewport = payload;
@@ -91,21 +100,19 @@ export class DomTools {
     }
   );
 
+  public setVirtualViewport(environmentArg: TViewport) {
+    this.domToolsStatePart.dispatchAction(this.actionSetVirtualViewport, environmentArg);
+  } */
+
   public domToolsReady = plugins.smartpromise.defer();
   public domReady = plugins.smartpromise.defer();
   public globalStylesReady = plugins.smartpromise.defer();
 
-  constructor() {
-    // lets care about third party stuff
-    this.domToolsReady.promise.then(() => {
-      this.scroller = new plugins.SweetScroll({
-        /* some options */
-      });
-    });
-  }
+  constructor() {}
 
   private runOnceTrackerStringMap = new Stringmap();
   private runOnceResultMap = new FastMap();
+
   /**
    * run a function once and always get the Promise of the first execution
    * @param identifierArg the indentifier arg identifies functions. functions with the same identifier are considered equal
@@ -131,7 +138,10 @@ export class DomTools {
   }
 
   // setStuff
-
+  /**
+   * allows to set global styles
+   * @param stylesText the css text you want to set
+   */
   public async setGlobalStyles(stylesText: string) {
     await this.domReady.promise;
     const styleElement = document.createElement('style');
@@ -140,12 +150,24 @@ export class DomTools {
     this.elements.headElement.appendChild(styleElement);
   }
 
-  public setVirtualViewport(environmentArg: TViewport) {
-    this.domToolsStatePart.dispatchAction(this.actionSetVirtualViewport, environmentArg);
+  /**
+   * allows setting external css files
+   * @param cssLinkArg a url to an external stylesheet
+   */
+  public async setExternalCss(cssLinkArg: string) {
+    const cssTag = document.createElement('link');
+    cssTag.rel = 'stylesheet';
+    cssTag.crossOrigin = 'anonymous';
+    cssTag.href = cssLinkArg;
+    document.head.append(cssTag);
   }
 
+  /**
+   * allows setting of website infos
+   * @param optionsArg the website info
+   */
   public async setWebsiteInfo(optionsArg: plugins.websetup.IWebSetupConstructorOptions) {
-    this.websetup = new plugins.websetup.WebSetup(optionsArg);
+    await this.websetup.setup(optionsArg);
     await this.websetup.readyPromise;
   }
 }

ts/domtools.classes.scroller.ts

@@ -1,4 +1,4 @@
-import * as plugins from './domtools.plugins';
+import * as plugins from './domtools.plugins.js';
 
 export class Scroller {
   // TODO: move sweet scroll over to here;

ts/domtools.classes.thememanager.ts

@@ -0,0 +1,54 @@
+import { DomTools } from './domtools.classes.domtools.js';
+import * as plugins from './domtools.plugins.js';
+
+export class ThemeManager {
+  public domtoolsRef: DomTools;
+
+  public goBrightBoolean = false;
+  public preferredColorSchemeMediaMatch = window.matchMedia('(prefers-color-scheme: light)');
+
+  public themeObservable = new plugins.smartrx.rxjs.ReplaySubject<boolean>(1);
+
+  constructor(domtoolsRefArg: DomTools) {
+    this.domtoolsRef = domtoolsRefArg;
+
+    // lets care
+    this.goBrightBoolean = this.preferredColorSchemeMediaMatch.matches;
+    this.preferredColorSchemeMediaMatch.addEventListener('change', (eventArg) => {
+      this.goBrightBoolean = eventArg.matches;
+      this.updateAllConnectedElements();
+    });
+    this.updateAllConnectedElements();
+  }
+
+  private async updateAllConnectedElements() {
+    if (document.body && document.body.style) {
+      document.body.style.background = this.goBrightBoolean ? '#fff' : '#000';
+    }
+    this.themeObservable.next(this.goBrightBoolean);
+  }
+
+  /**
+   * set the theme of the website to bright
+   */
+  public goBright() {
+    this.goBrightBoolean = true;
+    this.updateAllConnectedElements();
+  }
+
+  /**
+   * set the theme of the website to dark
+   */
+  public goDark() {
+    this.goBrightBoolean = false;
+    this.updateAllConnectedElements();
+  }
+
+  /**
+   * simply toggle between bright and dark
+   */
+  public toggleDarkBright() {
+    this.goBrightBoolean = !this.goBrightBoolean;
+    this.updateAllConnectedElements();
+  }
+}

ts/domtools.css.basestyles.ts

@@ -0,0 +1,59 @@
+import { DomTools } from './domtools.classes.domtools.js';
+
+import { css, unsafeCSS } from 'lit';
+
+/**
+ * changes scrollbar styles to be consistent across OS borders
+ */
+export const scrollBarStyles: string = (() => {
+  const returnStyles =
+    navigator.userAgent.indexOf('Mac OS X') === -1
+      ? css`
+          /* width */
+          ::-webkit-scrollbar {
+            width: 6px;
+          }
+
+          /* Track */
+          ::-webkit-scrollbar-track {
+            background: #111;
+          }
+
+          /* Handle */
+          ::-webkit-scrollbar-thumb {
+            background: #666;
+          }
+
+          /* Handle on hover */
+          ::-webkit-scrollbar-thumb:hover {
+            background: #777;
+          }
+        `.cssText
+      : ``;
+  return returnStyles;
+})();
+
+export const globalBaseStyles: string = css`
+  /* global material font */
+  @font-face {
+    font-family: 'Material Icons';
+    font-style: normal;
+    font-weight: 400;
+    src: url(https://fonts.gstatic.com/s/materialicons/v42/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.woff2)
+      format('woff2');
+  }
+
+  /* Roboto Font */
+  @import url('https://fonts.googleapis.com/css2?family=Roboto:wght@100;300;400');
+  @import url('https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@100;300;400');
+
+  /* global body styles */
+  body {
+    margin: 0px;
+    font-family: 'Roboto', sans-serif;
+    box-sizing: border-box;
+  }
+
+  /* scroll bar styles */
+  ${unsafeCSS(scrollBarStyles)}
+`.cssText;

ts/domtools.css.breakpoints.ts

@@ -0,0 +1,43 @@
+import { DomTools } from './domtools.classes.domtools.js';
+
+import { CSSResult, unsafeCSS } from 'lit';
+
+export const desktop = 1240;
+export const tablet = 1024;
+export const phablet = 600;
+export const phone = 400;
+
+export type TViewport = 'native' | 'desktop' | 'tablet' | 'phablet' | 'phone';
+
+export const cssForTablet = (cssArg: CSSResult) => {
+  return unsafeCSS(`
+    @container wccToolsViewport size(max-width: ${tablet}px) {
+      ${cssArg.cssText}
+    }
+    @media (max-width: ${tablet}px) {
+      ${cssArg.cssText}
+    }
+  `);
+};
+
+export const cssForPhablet = (cssArg: CSSResult) => {
+  return unsafeCSS(`
+    @container wccToolsViewport size(max-width: ${phablet}px) {
+      ${cssArg.cssText}
+    }
+    @media (max-width: ${phablet}px) {
+      ${cssArg.cssText}
+    }
+  `);
+};
+
+export const cssForPhone = (cssArg: CSSResult) => {
+  return unsafeCSS(`
+    @container wccToolsViewport size(max-width: ${phone}px) {
+      ${cssArg.cssText}
+    }
+    @media (max-width: ${phone}px) {
+      ${cssArg.cssText}
+    }
+  `);
+};

ts/domtools.css.theme.ts

@@ -1,28 +0,0 @@
-import { DomTools } from './domtools.classes.domtools';
-
-/**
- * changes scrollbar styles to be consistent across OS borders
- */
-export const scrollBarStyles = (() => {
-  const returnStyles = navigator.userAgent.indexOf("Windows") !== -1 ? `
-  /* width */
-  ::-webkit-scrollbar {
-    width: 8px;
-  }
-
-  /* Track */
-  ::-webkit-scrollbar-track {
-    background: #111; 
-  }
-
-  /* Handle */
-  ::-webkit-scrollbar-thumb {
-    background: #666; 
-  }
-
-  /* Handle on hover */
-  ::-webkit-scrollbar-thumb:hover {
-    background: #777; 
-  }
-` : ``;
-})();

ts/domtools.elementbasic.ts

@@ -1,8 +1,22 @@
-import * as plugins from './domtools.plugins';
-import { DomTools } from './domtools.classes.domtools';
-import { scrollBarStyles } from './domtools.css.theme';
+import * as plugins from './domtools.plugins.js';
+import { DomTools } from './domtools.classes.domtools.js';
+import { scrollBarStyles, globalBaseStyles } from './domtools.css.basestyles.js';
 
-import { html } from 'lit-element';
+import { html, LitElement, css, unsafeCSS } from 'lit';
+
+export const staticStyles = css`
+  * {
+    transition: background 0.1s, color 0.1s;
+    box-sizing: border-box;
+  }
+
+  :host {
+    box-sizing: border-box;
+    font-family: 'Roboto', sans-serif;
+  }
+
+  ${unsafeCSS(scrollBarStyles)}
+`;
 
 /**
  * styles to be included in every webcomponent
@@ -10,10 +24,14 @@ import { html } from 'lit-element';
 export const styles = html`
   <style>
     * {
-      font-family: 'Roboto', sans-serif;
+      transition: background 0.1s, color 0.1s;
       box-sizing: border-box;
     }
 
+    :host {
+      font-family: 'Roboto', sans-serif;
+    }
+
     ${scrollBarStyles}
   </style>
 `;
@@ -22,37 +40,17 @@ export const styles = html`
  * a basic setup for elements
  * makes sure everything is in check
  */
-export const setup = async () => {
+export const setup = async (elementArg?: LitElement): Promise<DomTools> => {
   const domTools = await DomTools.setupDomTools();
+
+  if (elementArg) {
+    // lets do something with the element
+    // not used right now
+  }
+
   domTools.runOnce('elementBasicSetup', async () => {
     // bodyStyles
-    domTools.setGlobalStyles(`
-      body {
-        margin: 0px;
-        font-family: 'Roboto', sans-serif;
-        box-sizing: border-box;
-      }
-    `);
-
-    // material font
-    domTools.setGlobalStyles(`
-      @font-face {
-        font-family: 'Material Icons';
-        font-style: normal;
-        font-weight: 400;
-        src: url(https://fonts.gstatic.com/s/materialicons/v42/flUhRq6tzZclQEJ-Vdg-IuiaDsNcIhQ8tQ.woff2) format('woff2');
-      }
-    `);
-
-    // Roboto Font
-    domTools.setGlobalStyles(`
-      @import url('https://fonts.googleapis.com/css2?family=Roboto:wght@100;300;400');
-      @import url('https://fonts.googleapis.com/css2?family=Roboto+Mono:wght@100;300;400');
-    `);
-
-    // scrollbars
-    domTools.setGlobalStyles(`
-      ${scrollBarStyles}
-    `);
+    domTools.setGlobalStyles(globalBaseStyles);
   });
+  return domTools;
 };

ts/domtools.plugins.ts

@@ -1,9 +1,7 @@
 // designestate scope
 import * as deesComms from '@designestate/dees-comms';
 
-export {
-  deesComms
-};
+export { deesComms };
 
 // apiglobal scope
 import * as typedrequest from '@apiglobal/typedrequest';
@@ -14,12 +12,29 @@ export { typedrequest };
 import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartrouter from '@pushrocks/smartrouter';
+import * as smartrx from '@pushrocks/smartrx';
 import * as smartstate from '@pushrocks/smartstate';
 import * as webrequest from '@pushrocks/webrequest';
 import * as websetup from '@pushrocks/websetup';
 import * as webstore from '@pushrocks/webstore';
 
-export { smartdelay, smartpromise, smartrouter, smartstate, webrequest, websetup, webstore };
+// subscope lik
+import { ObjectMap } from '@pushrocks/lik/dist_ts/lik.objectmap.js';
+const lik = {
+  ObjectMap,
+};
+
+export {
+  lik,
+  smartdelay,
+  smartpromise,
+  smartrouter,
+  smartrx,
+  smartstate,
+  webrequest,
+  websetup,
+  webstore,
+};
 
 // third party scope
 import SweetScroll from 'sweet-scroll';

ts/index.ts

@@ -1,15 +1,20 @@
-export * from './domtools.colors';
+export * from './domtools.colors.js';
 
-import * as elementBasic from './domtools.elementbasic';
-import * as breakpoints from './domtools.breakpoints';
-import * as css from './domtools.css';
+import * as elementBasic from './domtools.elementbasic.js';
+import * as breakpoints from './domtools.css.breakpoints.js';
+import * as css from './domtools.css.js';
 
 export { css, breakpoints, elementBasic };
-export { DomTools } from './domtools.classes.domtools';
+export { DomTools } from './domtools.classes.domtools.js';
 export { TypedRequest } from '@apiglobal/typedrequest';
+export { IWebSetupConstructorOptions } from '@pushrocks/websetup';
+export { rxjs } from '@pushrocks/smartrx';
 
-import * as allPlugins from './domtools.plugins';
+import * as allPlugins from './domtools.plugins.js';
 
 export const plugins = {
+  smartdelay: allPlugins.smartdelay,
   smartpromise: allPlugins.smartpromise,
+  SweetScroll: allPlugins.SweetScroll,
+  smartstate: allPlugins.smartstate
 };

tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "Node12"
+  }
+}