5.0.4

.gitlab-ci.yml

@@ -12,30 +12,38 @@ stages:
   - release
   - metadata
 
+before_script:
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
+
 # ====================
 # security stage
 # ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-audit:
+# ====================
+# security stage
+# ====================
+auditProductionDependencies:
   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 pnpm audit --audit-level=high --prod
   tags:
     - lossless
     - docker
-    - notpriv
+  allow_failure: true
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command pnpm audit --audit-level=high --dev
+  tags:
+    - lossless
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
@@ -44,28 +52,22 @@ audit:
 testStable:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
-    - npmci command npm run build
+    - npmci npm build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,11 +87,12 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
     - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
     - lossless
     - docker
@@ -109,11 +112,9 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
+    - npmci node install stable
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
     - lossless
     - docker

.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

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

npmextra.json

@@ -9,7 +9,7 @@
       "githost": "gitlab.com",
       "gitscope": "pushrocks",
       "gitrepo": "smartenv",
-      "shortDescription": "store things about your environment and let them travel across modules",
+      "description": "store things about your environment and let them travel across modules",
       "npmPackagename": "@pushrocks/smartenv",
       "license": "MIT"
     }

package.json

@@ -1,13 +1,15 @@
 {
   "name": "@pushrocks/smartenv",
-  "version": "4.0.10",
+  "version": "5.0.4",
   "description": "store things about your environment and let them travel across modules",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
     "test": "(tstest test/ --web)",
-    "build": "(tsbuild --web && tsbundle npm)",
-    "testbrowser": "(npm test) && (node testbrowser.js)"
+    "build": "(tsbuild --web --allowimplicitany && tsbundle npm)",
+    "testbrowser": "(npm test) && (node testbrowser.js)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
@@ -23,19 +25,16 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartenv",
   "dependencies": {
-    "@pushrocks/smartparam": "^1.1.6",
-    "@pushrocks/smartpromise": "^3.0.6",
-    "@types/node": "^14.0.14"
+    "@pushrocks/smartpromise": "^3.1.7"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
-    "@gitzone/tsbundle": "^1.0.69",
-    "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.33",
-    "@pushrocks/tapbundle": "^3.2.1",
-    "@types/npm": "^2.0.31",
-    "tslint": "^6.1.2",
-    "tslint-config-prettier": "^1.18.0"
+    "@gitzone/tsbuild": "^2.1.56",
+    "@gitzone/tsbundle": "^2.0.7",
+    "@gitzone/tsrun": "^1.2.31",
+    "@gitzone/tstest": "^1.0.68",
+    "@pushrocks/tapbundle": "^5.0.2",
+    "@types/node": "^18.11.18",
+    "@types/npm": "^7.19.0"
   },
   "private": false,
   "files": [
@@ -49,5 +48,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -21,20 +21,17 @@ Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](htt
 PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartenv)](https://lossless.cloud)
 PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartenv)](https://lossless.cloud)
 BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartenv)](https://lossless.cloud)
-Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
 Use TypeScript for best in class instellisense.
 
-
 ## Contribution
 
 We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
 
 For further information read the linked docs at the top of this readme.
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
 | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -1,5 +1,5 @@
 import { tap, expect } from '@pushrocks/tapbundle';
-import * as smartenv from '../ts/index';
+import * as smartenv from '../ts/index.js';
 
 let testEnv: smartenv.Smartenv;
 
@@ -17,20 +17,20 @@ tap.test('should get os', async () => {
   const resultWindows = await testEnv.isWindowsAsync();
   const osModule = await import('os');
   if (resultMac) {
-    expect(osModule.platform()).to.equal('darwin');
+    expect(osModule.platform()).toEqual('darwin');
     console.log('platform is Mac!');
   } else if (resultLinux) {
-    expect(osModule.platform()).to.equal('linux');
+    expect(osModule.platform()).toEqual('linux');
     console.log('platform is Linux!');
   } else {
-    expect(osModule.platform()).to.equal('win32');
+    expect(osModule.platform()).toEqual('win32');
     console.log('platform is Windows!');
   }
 });
 
 tap.test('should state wether we are in CI', async () => {
   if (process.env.CI) {
-    expect(testEnv.isCI).to.be.true;
+    expect(testEnv.isCI).toBeTrue();
   }
 });
 

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/smartenv',
+  version: '5.0.4',
+  description: 'store things about your environment and let them travel across modules'
+}

ts/index.ts

@@ -1 +1 @@
-export * from './smartenv.classes.smartenv';
+export * from './smartenv.classes.smartenv.js';

ts/smartenv.classes.smartenv.ts

@@ -1,5 +1,5 @@
-import * as plugins from './smartenv.plugins';
-import * as interfaces from './interfaces';
+import * as plugins from './smartenv.plugins.js';
+import * as interfaces from './interfaces/index.js';
 
 // interfaces
 export interface IEnvObject {
@@ -11,23 +11,68 @@ export interface IEnvObject {
  * Smartenv class that makes it easy
  */
 export class Smartenv {
-  public getSafeNodeModule(moduleNameArg: string) {
+  public async getEnvAwareModule(optionsArg: {
+    nodeModuleName: string;
+    webUrlArg: string;
+    getFunction: () => any;
+  }) {
+    if (this.isNode) {
+      const moduleResult = await this.getSafeNodeModule(optionsArg.nodeModuleName);
+      return moduleResult;
+    } else if (this.isBrowser) {
+      const moduleResult = await this.getSafeWebModule(
+        optionsArg.webUrlArg,
+        optionsArg.getFunction
+      );
+      return moduleResult;
+    } else {
+      console.error('platform for loading not supported by smartenv');
+    }
+  }
+
+  public async getSafeNodeModule<T = any>(moduleNameArg: string): Promise<T> {
+    if (!this.isNode) {
+      console.error(`You tried to load a node module in a wrong context: ${moduleNameArg}`);
+      return;
+    }
     // tslint:disable-next-line: function-constructor
-    return new Function(
-      'exports',
-      'require',
-      'module',
-      '__filename',
-      '__dirname',
-      `return require('${moduleNameArg}')`
-      )(exports,require,module,__filename,__dirname);
+    return new Function(`return import('${moduleNameArg}')`)() as Promise<T>;
+  }
+
+  public loadedScripts: string[] = [];
+  public async getSafeWebModule(urlArg: string, getFunctionArg: () => any) {
+    if (!this.isBrowser) {
+      console.error('You tried to load a web module in a wrong context');
+      return;
+    }
+
+    if (this.loadedScripts.includes(urlArg)) {
+      return getFunctionArg();
+    } else {
+      this.loadedScripts.push(urlArg);
+    }
+
+    const done = plugins.smartpromise.defer();
+    if (globalThis.importScripts) {
+      globalThis.importScripts(urlArg);
+      done.resolve();
+    } else {
+      const script = document.createElement('script');
+      script.onload = () => {
+        done.resolve();
+      };
+      script.src = urlArg;
+      document.head.appendChild(script);
+    }
+    await done.promise;
+    return getFunctionArg();
   }
 
   public get runtimeEnv() {
-    if (typeof window !== 'undefined') {
-      return 'browser';
-    } else if (typeof process !== 'undefined') {
+    if (typeof process !== 'undefined') {
       return 'node';
+    } else {
+      return 'browser';
     }
   }
 
@@ -66,7 +111,7 @@ export class Smartenv {
 
   public async isMacAsync(): Promise<boolean> {
     if (this.isNode) {
-      const os = this.getSafeNodeModule('os');
+      const os = await this.getSafeNodeModule('os');
       return os.platform() === 'darwin';
     } else {
       return false;
@@ -75,7 +120,7 @@ export class Smartenv {
 
   public async isWindowsAsync(): Promise<boolean> {
     if (this.isNode) {
-      const os = this.getSafeNodeModule('os');
+      const os = await this.getSafeNodeModule('os');
       return os.platform() === 'win32';
     } else {
       return false;
@@ -84,31 +129,20 @@ export class Smartenv {
 
   public async isLinuxAsync(): Promise<boolean> {
     if (this.isNode) {
-      const os = this.getSafeNodeModule('os');
+      const os = await this.getSafeNodeModule('os');
       return os.platform() === 'linux';
     } else {
       return false;
     }
   }
 
-  /**
-   * get environment variables that fit the description
-   */
-  // get envVars (regexArg: RegExp) {
-  //   let EnvironmentArray = []
-  //   // TODO: plugins.smartparam.forEachMinimatch()
-  // }
-
   /**
    * prints the environment to console
    */
   public async printEnv() {
     if (this.isNode) {
       console.log('running on NODE');
-      const smartenvVersion = require('../package.json').version;
-      console.log(
-        'node version is ' + this.nodeVersion + ' and smartenv version is ' + smartenvVersion
-      );
+      console.log('node version is ' + this.nodeVersion);
     } else {
       console.log('running on BROWSER');
       console.log('browser is ' + this.userAgent);

ts/smartenv.plugins.ts

@@ -1,5 +1,3 @@
-import * as smartparam from '@pushrocks/smartparam';
 import * as smartpromise from '@pushrocks/smartpromise';
 
-export { smartparam, smartpromise };
-
+export { smartpromise };

tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext"
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}