5.0.0

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,12 +1,13 @@
 {
   "name": "@pushrocks/smartenv",
-  "version": "4.0.11",
+  "version": "5.0.0",
   "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)",
+    "build": "(tsbuild --web --allowimplicitany && tsbundle npm)",
     "testbrowser": "(npm test) && (node testbrowser.js)"
   },
   "repository": {
@@ -23,17 +24,16 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartenv",
   "dependencies": {
-    "@pushrocks/smartparam": "^1.1.6",
+    "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@types/node": "^17.0.21"
-    "@types/node": "^14.11.2"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.56",
-    "@gitzone/tsbundle": "^1.0.78",
+    "@gitzone/tsbundle": "^1.0.98",
-    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tsrun": "^1.2.31",
-    "@gitzone/tstest": "^1.0.44",
+    "@gitzone/tstest": "^1.0.68",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/tapbundle": "^5.0.2",
-    "@types/npm": "^2.0.31",
+    "@types/npm": "^7.19.0",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },

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/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 plugins from './smartenv.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
 // interfaces
 export interface IEnvObject {
@@ -11,16 +11,57 @@ export interface IEnvObject {
  * Smartenv class that makes it easy
  */
 export class Smartenv {
-  public getSafeNodeModule<T = any>(moduleNameArg: string): T {
+  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);
+    } 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');
+      return;
+    }
     // tslint:disable-next-line: function-constructor
-    return new Function(
+    return (new Function(`return import('${moduleNameArg}')`))() as Promise<T>;
-      'exports',
+  }
-      'require',
+
-      'module',
+  public loadedScripts: string[] = [];
-      '__filename',
+  public async getSafeWebModule(urlArg: string, getFunctionArg: () => any) {
-      '__dirname',
+    if (!this.isBrowser) {
-      `return require('${moduleNameArg}')`
+      console.error('You tried to load a web module in a wrong context');
-    )(exports, require, module, __filename, __dirname);
+      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() {
@@ -66,7 +107,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 +116,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,30 +125,21 @@ 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
+        'node version is ' + this.nodeVersion
       );
     } else {
       console.log('running on BROWSER');

ts/smartenv.plugins.ts

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