update to latest standards

This commit is contained in:
2016-11-21 11:58:37 +01:00
parent 56d4432d31
commit af7b9c46d2
26 changed files with 262 additions and 268 deletions

View File

@ -1,14 +1,12 @@
/// <reference path="typings/main.d.ts" />
import * as plugins from './smartenv.plugins'
import * as classes from './smartenv.classes'
import * as SmartenvEnvironment from './smartenv.environment'
import * as SmartenvObjectstorage from './smartenv.objectstorage'
import * as plugins from "./smartenv.plugins";
import * as classes from "./smartenv.classes";
import * as SmartenvEnvironment from "./smartenv.environment";
import * as SmartenvObjectstorage from "./smartenv.objectstorage";
var smartenv = {
let smartenv = {
getEnv: SmartenvEnvironment.getEnv,
printEnv: SmartenvEnvironment.printEnv,
obs: SmartenvObjectstorage.obs
}; //create smartenv object
} // create smartenv object
export = smartenv;
export = smartenv

View File

@ -1,53 +1,51 @@
/// <reference path="typings/main.d.ts" />
export var getEnvString = function():string {
if (typeof window !== "undefined") {
return "browser";
} else if (typeof process !== "undefined") {
return "node";
export var getEnvString = function(): string {
if (typeof window !== 'undefined') {
return 'browser'
} else if (typeof process !== 'undefined') {
return 'node'
}
};
}
export var getUserAgentString = function():string{
if(isBrowser()){
return navigator.userAgent;
export var getUserAgentString = function(): string{
if (isBrowser()) {
return navigator.userAgent
} else {
return undefined;
return undefined
}
};
}
export var isNode = function():boolean {
return getEnvString() === "node"
};
export var isNode = function(): boolean {
return getEnvString() === 'node'
}
export var getNodeVersion = function():string {
return process.version;
};
export var getNodeVersion = function(): string {
return process.version
}
export var isBrowser = function():boolean {
return !isNode();
};
export var isBrowser = function(): boolean {
return !isNode()
}
export var isCI = function(){
if(process.env.CI){
return true;
if (process.env.CI) {
return true
} else {
return false;
return false
};
};
}
export var isC9 = function(){
if (process.env.C9_HOSTNAME){
return true;
if (process.env.C9_HOSTNAME) {
return true
} else {
return false;
return false
}
};
}
export var isTravis = function(){
if(process.env.TRAVIS){
return true;
if (process.env.TRAVIS) {
return true
} else {
return false;
return false
};
};
}

View File

@ -1,23 +1,22 @@
/// <reference path="typings/main.d.ts" />
import helpers = require('./smartenv.classes.helpers')
import helpers = require("./smartenv.classes.helpers");
export class Environment {
runtimeEnv:string;
isBrowser:boolean;
userAgent:string;
isNode:boolean;
nodeVersion:string;
isCI:boolean;
isTravis:boolean;
isC9:boolean;
runtimeEnv: string
isBrowser: boolean
userAgent: string
isNode: boolean
nodeVersion: string
isCI: boolean
isTravis: boolean
isC9: boolean
constructor() {
this.runtimeEnv = helpers.getEnvString();
this.isBrowser = helpers.isBrowser();
this.userAgent = helpers.getUserAgentString();
this.isNode = helpers.isNode();
this.nodeVersion = helpers.getNodeVersion();
this.isCI = helpers.isCI();
this.isTravis = helpers.isTravis();
this.isC9 = helpers.isC9();
this.runtimeEnv = helpers.getEnvString()
this.isBrowser = helpers.isBrowser()
this.userAgent = helpers.getUserAgentString()
this.isNode = helpers.isNode()
this.nodeVersion = helpers.getNodeVersion()
this.isCI = helpers.isCI()
this.isTravis = helpers.isTravis()
this.isC9 = helpers.isC9()
};
}

View File

@ -1,14 +1,13 @@
/// <reference path="typings/main.d.ts" />
/**
* Deals with the environment the current JS script is running in.
*/
import plugins = require("./smartenv.plugins");
import classes = require("./smartenv.classes");
import objectStorage = require("./smartenv.objectstorage");
import * as plugins from './smartenv.plugins'
import * as classes from './smartenv.classes'
import * as objectStorage from './smartenv.objectstorage'
var environment:classes.Environment;
var envDetermined:boolean = false;
let environment: classes.Environment
let envDetermined: boolean = false
/**
* returns the environment
@ -16,24 +15,24 @@ var envDetermined:boolean = false;
*/
export var getEnv = function(){
if (!envDetermined) {
environment = new classes.Environment();
envDetermined = true; // ensure code above only runs once
environment = new classes.Environment()
envDetermined = true // ensure code above only runs once
};
return environment;
};
return environment
}
/**
* prints the environment to console
*/
export var printEnv = function() {
if (this.getEnv().isNode) {
console.log("running on NODE");
var smartenvVersion = require("../package.json").version;
console.log("node version is " + this.getEnv().nodeVersion + " and smartenv version is " + smartenvVersion);
console.log('running on NODE')
let smartenvVersion = require('../package.json').version
console.log('node version is ' + this.getEnv().nodeVersion + ' and smartenv version is ' + smartenvVersion)
} else {
console.log("running on BROWSER");
console.log("browser is " + this.getEnv().userAgent);
console.log('running on BROWSER')
console.log('browser is ' + this.getEnv().userAgent)
}
console.log("the smartenv registration store currently holds the following properties:");
console.log(Object.getOwnPropertyNames(objectStorage.obs.getAll()));
};
console.log('the smartenv registration store currently holds the following properties:')
console.log(Object.getOwnPropertyNames(objectStorage.obs.getAll()))
}

View File

@ -1,40 +1,39 @@
/// <reference path="typings/main.d.ts" />
import plugins = require("./smartenv.plugins");
export var obs:any = {
add: function(paramNameArg = "undefined",objectArg = "undefined") {
if (paramNameArg == "undefined"){
console.log("paramName is undefined");
return;
import plugins = require('./smartenv.plugins')
export var obs: any = {
add: function(paramNameArg = 'undefined',objectArg = 'undefined') {
if (paramNameArg === 'undefined') {
console.log('paramName is undefined')
return
}
if (objectArg == "undefined"){
console.log("objectArg is undefined");
if (objectArg === 'undefined') {
console.log('objectArg is undefined')
}
if (typeof obsItems[paramNameArg] === "undefined"){
obsItems[paramNameArg] = objectArg;
if (typeof obsItems[paramNameArg] === 'undefined') {
obsItems[paramNameArg] = objectArg
} else {
console.log("object is already present, so add operation has failed.");
console.log('object is already present, so add operation has failed.')
}
return obsItems[paramNameArg];
return obsItems[paramNameArg]
},
replace: function(paramNameArg,objectArg){
obsItems[paramNameArg] = objectArg;
obsItems[paramNameArg] = objectArg
},
merge: function(paramNameArg,objectArg){
if(!(typeof obsItems[paramNameArg] === "undefined")){
obsItems[paramNameArg] = plugins._.assign(obsItems[paramNameArg],objectArg);
if (!(typeof obsItems[paramNameArg] === 'undefined')) {
obsItems[paramNameArg] = plugins._.assign(obsItems[paramNameArg],objectArg)
} else {
console.log("object is not present, so there is nothing to merge");
console.log('object is not present, so there is nothing to merge')
}
},
get: function(keyName) {
return obsItems[keyName];
return obsItems[keyName]
},
getAll: function () {
return obsItems;
return obsItems
},
addComplete: function(itemsArg) {
obsItems = plugins._.assign(obsItems,itemsArg);
return obsItems;
obsItems = plugins._.assign(obsItems,itemsArg)
return obsItems
}
};
export var obsItems:any = {};
}
export var obsItems: any = {}

View File

@ -1,7 +1,8 @@
/// <reference path="typings/main.d.ts" />
var plugins = {
Q: require("q"),
_: require("lodash")
};
import 'typings-global'
import * as Q from 'q'
import * as _ from 'lodash'
export = plugins;
export {
Q,
_
}

View File

@ -1,5 +0,0 @@
{
"ambientDependencies": {
"node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts"
}
}