1.0.80

.gitlab-ci.yml

@@ -19,23 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@designestate/dees-domtools",
-  "version": "1.0.32",
+  "version": "1.0.80",
   "private": false,
   "description": "tools to simplify complex css structures",
   "main": "dist_ts/index.js",
@@ -13,23 +13,27 @@
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tsbundle": "^1.0.69",
+    "@gitzone/tsbundle": "^1.0.78",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.0.7",
+    "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^14.0.5",
+    "@types/node": "^14.14.10",
-    "tslint": "^6.1.2",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@apiglobal/typedrequest": "^1.0.38",
+    "@apiglobal/typedrequest": "^1.0.54",
-    "@pushrocks/lik": "^4.0.13",
+    "@designestate/dees-comms": "^1.0.7",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/lik": "^4.0.20",
-    "@pushrocks/smartrouter": "^1.0.2",
+    "@pushrocks/smartdelay": "^2.0.10",
-    "@pushrocks/smartstate": "^1.0.16",
+    "@pushrocks/smartpromise": "^3.1.3",
-    "@pushrocks/webrequest": "^2.0.9",
+    "@pushrocks/smartrouter": "^1.0.6",
-    "@pushrocks/websetup": "^2.0.16",
+    "@pushrocks/smartrx": "^2.0.19",
-    "lit-element": "^2.3.1",
+    "@pushrocks/smartstate": "^1.0.21",
+    "@pushrocks/webrequest": "^2.0.13",
+    "@pushrocks/websetup": "^3.0.11",
+    "@pushrocks/webstore": "^1.0.16",
+    "lit-element": "^2.4.0",
     "sweet-scroll": "^4.0.0"
   },
   "files": [
@@ -43,5 +47,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

test/test.browser.ts

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

test/test.ts

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

ts/domtools.classes.domtools.ts

@@ -3,6 +3,11 @@ import { Stringmap } from '@pushrocks/lik/dist_ts/lik.stringmap';
 import { FastMap } from '@pushrocks/lik/dist_ts/lik.fastmap';
 import { TViewport } from './domtools.breakpoints';
 
+import { Scroller } from './domtools.classes.scroller';
+import { delayForRandom } from '@pushrocks/smartdelay';
+import { WebSetup } from '@pushrocks/websetup';
+import { ThemeManager } from './domtools.classes.thememanager';
+
 export interface IDomToolsState {
   virtualViewport: TViewport;
 }
@@ -19,6 +24,7 @@ export class DomTools {
     if (!globalThis.deesDomTools) {
       globalThis.deesDomTools = new DomTools();
       domToolsInstance = globalThis.deesDomTools;
+
       // lets make sure the dom is ready
       const readyStateChangedFunc = () => {
         if (document.readyState === 'interactive' || document.readyState === 'complete') {
@@ -36,6 +42,17 @@ export class DomTools {
     return domToolsInstance;
   }
 
+  /**
+   * if you can, use the static asysnc .setupDomTools() function instead since it is safer to use.
+   */
+  public static getGlobalDomToolsSync(): DomTools {
+    const globalDomTools: DomTools = globalThis.deesDomTools;
+    if (!globalDomTools) {
+      throw new Error('You tried to access domtools synchronously too early');
+    }
+    return globalThis.deesDomTools;
+  }
+
   // ========
   // INSTANCE
   // ========
@@ -48,6 +65,12 @@ export class DomTools {
     bodyElement: null,
   };
 
+  public websetup: WebSetup = new WebSetup({
+    metaObject: {
+      title: 'loading...',
+    },
+  });
+
   public smartstate = new plugins.smartstate.Smartstate();
   public domToolsStatePart = this.smartstate.getStatePart<IDomToolsState>('domtools', {
     virtualViewport: 'native',
@@ -57,7 +80,15 @@ export class DomTools {
     debug: false,
   });
 
-  public scroller: plugins.SweetScroll;
+  public convenience = {
+    smartdelay: plugins.smartdelay,
+  };
+
+  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>(
     async (statePart, payload) => {
@@ -71,14 +102,7 @@ export class DomTools {
   public domReady = plugins.smartpromise.defer();
   public globalStylesReady = plugins.smartpromise.defer();
 
-  constructor() {
+  constructor() {}
-    // lets care about third party stuff
-    this.domToolsReady.promise.then(() => {
-      this.scroller = new plugins.SweetScroll({
-        /* some options */
-      });
-    });
-  }
 
   private runOnceTrackerStringMap = new Stringmap();
   private runOnceResultMap = new FastMap();
@@ -116,12 +140,20 @@ export class DomTools {
     this.elements.headElement.appendChild(styleElement);
   }
 
+  public async setExternalCss(cssLinkArg: string) {
+    const cssTag = document.createElement('link');
+    cssTag.rel = 'stylesheet';
+    cssTag.crossOrigin = 'anonymous';
+    cssTag.href = cssLinkArg;
+    document.head.append(cssTag);
+  }
+
   public setVirtualViewport(environmentArg: TViewport) {
     this.domToolsStatePart.dispatchAction(this.actionSetVirtualViewport, environmentArg);
   }
 
   public async setWebsiteInfo(optionsArg: plugins.websetup.IWebSetupConstructorOptions) {
-    const websetup = new plugins.websetup.WebSetup(optionsArg);
+    await this.websetup.setup(optionsArg);
-    await websetup.setup();
+    await this.websetup.readyPromise;
   }
 }

ts/domtools.classes.scroller.ts

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

ts/domtools.classes.thememanager.ts

@@ -0,0 +1,44 @@
+import { LitElement } from 'lit-element';
+import { DomTools } from './domtools.classes.domtools';
+import * as plugins from './domtools.plugins';
+
+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() {
+    document.body.style.background = this.goBrightBoolean ? '#fff' : '#000';
+    this.themeObservable.next(this.goBrightBoolean);
+  }
+
+  public goBright() {
+    this.goBrightBoolean = true;
+    this.updateAllConnectedElements();
+  }
+
+  public goDark() {
+    this.goBrightBoolean = false;
+    this.updateAllConnectedElements();
+  }
+
+  public toggleDarkBright() {
+    this.goBrightBoolean = !this.goBrightBoolean;
+    this.updateAllConnectedElements();
+  }
+}

ts/domtools.css.theme.ts

@@ -0,0 +1,28 @@
+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,13 +1,21 @@
 import * as plugins from './domtools.plugins';
 import { DomTools } from './domtools.classes.domtools';
+import { scrollBarStyles } from './domtools.css.theme';
 
-import { html } from 'lit-element';
+import { html, LitElement } from 'lit-element';
+
+/**
+ * styles to be included in every webcomponent
+ */
 export const styles = html`
   <style>
     * {
+      transition: background 0.1s, color 0.1s;
       font-family: 'Roboto', sans-serif;
       box-sizing: border-box;
     }
+
+    ${scrollBarStyles}
   </style>
 `;
 
@@ -15,8 +23,14 @@ 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(`
@@ -39,7 +53,14 @@ export const setup = async () => {
 
     // Roboto Font
     domTools.setGlobalStyles(`
-      @import url('https://fonts.googleapis.com/css?family=Roboto');
+      @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}
     `);
   });
+  return domTools;
 };

ts/domtools.move.ts

@@ -1 +0,0 @@
-import * as plugins from './domtools.plugins';

ts/domtools.plugins.ts

@@ -1,11 +1,32 @@
+// designestate scope
+import * as deesComms from '@designestate/dees-comms';
+
+export {
+  deesComms
+};
+
+// apiglobal scope
+import * as typedrequest from '@apiglobal/typedrequest';
+
+export { typedrequest };
+
 // pushrocks scope
+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 { smartpromise, smartrouter, smartstate, webrequest, websetup };
+// subscope lik
+import { ObjectMap } from '@pushrocks/lik/dist_ts/lik.objectmap';  
+const lik = {
+  ObjectMap
+};
+
+export { lik, smartdelay, smartpromise, smartrouter, smartrx, smartstate, webrequest, websetup, webstore };
 
 // third party scope
 import SweetScroll from 'sweet-scroll';

ts/index.ts

@@ -7,3 +7,9 @@ import * as css from './domtools.css';
 export { css, breakpoints, elementBasic };
 export { DomTools } from './domtools.classes.domtools';
 export { TypedRequest } from '@apiglobal/typedrequest';
+
+import * as allPlugins from './domtools.plugins';
+
+export const plugins = {
+  smartpromise: allPlugins.smartpromise,
+};