From af7b9c46d241ed30813478272ea23551cf38dd11 Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Mon, 21 Nov 2016 11:58:37 +0100 Subject: [PATCH] update to latest standards --- .gitlab-ci.yml | 59 ++++++++++++++++++++++++++++ .travis.yml | 15 -------- dist/index.d.ts | 4 +- dist/index.js | 12 +++--- dist/smartenv.classes.helpers.js | 14 +++---- dist/smartenv.classes.js | 13 +++---- dist/smartenv.environment.d.ts | 2 +- dist/smartenv.environment.js | 23 ++++++----- dist/smartenv.objectstorage.js | 26 ++++++------- dist/smartenv.plugins.d.ts | 9 ++--- dist/smartenv.plugins.js | 14 +++---- package.json | 11 ++++-- test/browser/index.html | 6 --- test/browser/index.js | 2 - test/test.d.ts | 6 +-- test/test.js | 37 +++++++++--------- test/test.ts | 38 +++++++++--------- test/testbrowser.ts | 21 ---------- ts/index.ts | 16 ++++---- ts/smartenv.classes.helpers.ts | 66 ++++++++++++++++---------------- ts/smartenv.classes.ts | 35 ++++++++--------- ts/smartenv.environment.ts | 35 ++++++++--------- ts/smartenv.objectstorage.ts | 45 +++++++++++----------- ts/smartenv.plugins.ts | 13 ++++--- ts/typings.json | 5 --- tslint.json | 3 ++ 26 files changed, 262 insertions(+), 268 deletions(-) create mode 100644 .gitlab-ci.yml delete mode 100644 .travis.yml delete mode 100644 test/browser/index.html delete mode 100644 test/browser/index.js delete mode 100644 test/testbrowser.ts delete mode 100644 ts/typings.json create mode 100644 tslint.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..f2d2ff7 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,59 @@ +image: hosttoday/ht-docker-node:npmts + +stages: +- test +- release +- trigger +- pages + +testLEGACY: + stage: test + script: + - npmci test legacy + tags: + - docker + allow_failure: true + +testLTS: + stage: test + script: + - npmci test lts + tags: + - docker + +testSTABLE: + stage: test + script: + - npmci test stable + tags: + - docker + +release: + stage: release + script: + - npmci publish + only: + - tags + tags: + - docker + +trigger: + stage: trigger + script: + - npmci trigger + only: + - tags + tags: + - docker + +pages: + image: hosttoday/ht-docker-node:npmpage + stage: pages + script: + - npmci command npmpage --host gitlab + only: + - tags + artifacts: + expire_in: 1 week + paths: + - public diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 47dae33..0000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: node_js -node_js: -- 4 -- stable -deploy: - provider: npm - email: npm@lossless.digital - api_key: - secure: W6bKXwA7fNE+SNc4cNMkG4T6avf3JTpygukjuL++NKSc69W8aBrGgB2YFGbeIMiiORGLVqdQ6RCBg3Qk1o9Fi4i94dqS+8HjqBB7bYyz8FprtTnrcxJSIZPmEkRD5UNCAdYkDLrofeihnrojsNRLOTvM4x8hSIJpp+2W/WgdYGOzoUJK7qRMWM9TcAMBtVVrww2kVUDoDeHLWIj5w6jvlpl+rUJqmA/x3Gnom+wIVwClyy+mTnwjn9y6ICzoSmHKeL70Vun9AmgjshhVJOW51R4DYt8lkIYvT8DhwIqNOgvf2+uK2rg52pI0v86FL5XbdSCt6AwKtHZFR4J07h/bIr9J/teMrSlX0aI/J7tZnUgFAkUPKtqpvFZm/GD8/549YaG9koUQjwL5pcCUmuPl4djBy22q0NXw/bQIu59fW4KS7cS0KXBrofLCskXAc/CI+EzOX6LXnzryXLh4kDJiWNMLXOeSpdPkvAPzFj9MNYNnF6vjmhUJvoaN1TGO1oOEjIN68BfQY/4EvJDvwgVnqxihomvn95uUYB8f4EnTp2RVnbGKTlsY7J1zzwnMQrWbSRIT/XLsK2rP1oDGbSF1iLX06/sFLXbBDVYsw55jovOvF/dxlZjTJEUWvBV56s81bmKebskr9EdFCTUkP7oegexx4v6rins5WOr1Gele634= - on: - tags: true - repo: pushrocks/smartenv -notifications: - slack: - secure: f5Uss0z9RPl/QcA/DroB8loyE93aOYI6bqCkrsiUscmZtlv/TVQtT4dxqGA6uvcG6iTQDBi3Ul88dQxWkRm4IqbhY35/iMaV2dHW4FVYMAh8GQMbsfL2sALCcufxD9blw47awv3iFcwhV1EeyesscjgL0JIjduk96v/7G/6QIO2838M1lzlgtj+kRUkim8qkaEs1je3gRrhMUIjLuAdscMXyUKYFMjWo9ACSjVUl30R/ZNemb18itIja6i92GotreBgcfEMczvy58ovDC7xdJUsY8LjMI01DwY+WPRnI0tAhsuI8moBwwcdM4e3bAjKjucQRjO33O5bMWRZ6QCiYd0DnCEFyCPQLJ4GSy/tkD00n8ijLHAOSV3AH1zNbdK1EAdSPQXDvlI36KJn/2hyQLoitGHVUPr76ujJWP82ypO2tgIp3XQU0dJVCxDuHnwJO2+hjdI+gCPqxNTpjeujHx3UdkTGNRjuuf9dlZ/D08fApjYxy2fxItTqo3QjP/nrqvBXUOPP8yPHpjIT4H2t5Pr4SJjBGI6X4qhKyFj6s9rA/Xu1rL+45zu1C3uC3z+u3T9UwrbzJ/cZM6r6UQvQmUvIfBNaMlg4I/diQCDIPL+Rhop2nylY3IcHmJnk2itn7kOqj1tohCpFEml5pRuSZy4udWywkdtyBAsHWFLF7oiQ= diff --git a/dist/index.d.ts b/dist/index.d.ts index 9b241ed..2aa9f22 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -1,5 +1,5 @@ -import * as classes from "./smartenv.classes"; -declare var smartenv: { +import * as classes from './smartenv.classes'; +declare let smartenv: { getEnv: () => classes.Environment; printEnv: () => void; obs: any; diff --git a/dist/index.js b/dist/index.js index d70cd84..b65ba78 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,12 +1,10 @@ -/// "use strict"; -var SmartenvEnvironment = require("./smartenv.environment"); -var SmartenvObjectstorage = require("./smartenv.objectstorage"); -var smartenv = { +const SmartenvEnvironment = require("./smartenv.environment"); +const SmartenvObjectstorage = require("./smartenv.objectstorage"); +let smartenv = { getEnv: SmartenvEnvironment.getEnv, printEnv: SmartenvEnvironment.printEnv, obs: SmartenvObjectstorage.obs -}; //create smartenv object +}; // create smartenv object module.exports = smartenv; - -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDBDQUEwQzs7QUFJMUMsSUFBWSxtQkFBbUIsV0FBTSx3QkFBd0IsQ0FBQyxDQUFBO0FBQzlELElBQVkscUJBQXFCLFdBQU0sMEJBQTBCLENBQUMsQ0FBQTtBQUVsRSxJQUFJLFFBQVEsR0FBRztJQUNYLE1BQU0sRUFBRSxtQkFBbUIsQ0FBQyxNQUFNO0lBQ2xDLFFBQVEsRUFBRSxtQkFBbUIsQ0FBQyxRQUFRO0lBQ3RDLEdBQUcsRUFBRSxxQkFBcUIsQ0FBQyxHQUFHO0NBQ2pDLENBQUMsQ0FBQyx3QkFBd0I7QUFFM0IsaUJBQVMsUUFBUSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cInR5cGluZ3MvbWFpbi5kLnRzXCIgLz5cblxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9zbWFydGVudi5wbHVnaW5zXCI7XG5pbXBvcnQgKiBhcyBjbGFzc2VzIGZyb20gXCIuL3NtYXJ0ZW52LmNsYXNzZXNcIjtcbmltcG9ydCAqIGFzIFNtYXJ0ZW52RW52aXJvbm1lbnQgZnJvbSBcIi4vc21hcnRlbnYuZW52aXJvbm1lbnRcIjtcbmltcG9ydCAqIGFzIFNtYXJ0ZW52T2JqZWN0c3RvcmFnZSBmcm9tIFwiLi9zbWFydGVudi5vYmplY3RzdG9yYWdlXCI7XG5cbnZhciBzbWFydGVudiA9IHtcbiAgICBnZXRFbnY6IFNtYXJ0ZW52RW52aXJvbm1lbnQuZ2V0RW52LFxuICAgIHByaW50RW52OiBTbWFydGVudkVudmlyb25tZW50LnByaW50RW52LFxuICAgIG9iczogU21hcnRlbnZPYmplY3RzdG9yYWdlLm9ic1xufTsgLy9jcmVhdGUgc21hcnRlbnYgb2JqZWN0XG5cbmV4cG9ydCA9IHNtYXJ0ZW52O1xuIl19 +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBRUEsOERBQTZEO0FBQzdELGtFQUFpRTtBQUVqRSxJQUFJLFFBQVEsR0FBRztJQUNYLE1BQU0sRUFBRSxtQkFBbUIsQ0FBQyxNQUFNO0lBQ2xDLFFBQVEsRUFBRSxtQkFBbUIsQ0FBQyxRQUFRO0lBQ3RDLEdBQUcsRUFBRSxxQkFBcUIsQ0FBQyxHQUFHO0NBQ2pDLENBQUEsQ0FBQyx5QkFBeUI7QUFFM0IsaUJBQVMsUUFBUSxDQUFBIn0= \ No newline at end of file diff --git a/dist/smartenv.classes.helpers.js b/dist/smartenv.classes.helpers.js index 7a221ae..4d2aed4 100644 --- a/dist/smartenv.classes.helpers.js +++ b/dist/smartenv.classes.helpers.js @@ -1,11 +1,10 @@ -/// "use strict"; exports.getEnvString = function () { - if (typeof window !== "undefined") { - return "browser"; + if (typeof window !== 'undefined') { + return 'browser'; } - else if (typeof process !== "undefined") { - return "node"; + else if (typeof process !== 'undefined') { + return 'node'; } }; exports.getUserAgentString = function () { @@ -17,7 +16,7 @@ exports.getUserAgentString = function () { } }; exports.isNode = function () { - return exports.getEnvString() === "node"; + return exports.getEnvString() === 'node'; }; exports.getNodeVersion = function () { return process.version; @@ -51,5 +50,4 @@ exports.isTravis = function () { } ; }; - -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0ZW52LmNsYXNzZXMuaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwwQ0FBMEM7O0FBRS9CLG9CQUFZLEdBQUc7SUFDdEIsRUFBRSxDQUFDLENBQUMsT0FBTyxNQUFNLEtBQUssV0FBVyxDQUFDLENBQUMsQ0FBQztRQUNoQyxNQUFNLENBQUMsU0FBUyxDQUFDO0lBQ3JCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsT0FBTyxPQUFPLEtBQUssV0FBVyxDQUFDLENBQUMsQ0FBQztRQUN4QyxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQ2xCLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFUywwQkFBa0IsR0FBRztJQUM1QixFQUFFLENBQUEsQ0FBQyxpQkFBUyxFQUFFLENBQUMsQ0FBQSxDQUFDO1FBQ1osTUFBTSxDQUFFLFNBQVMsQ0FBQyxTQUFTLENBQUM7SUFDaEMsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osTUFBTSxDQUFDLFNBQVMsQ0FBQztJQUNyQixDQUFDO0FBQ0wsQ0FBQyxDQUFDO0FBRVMsY0FBTSxHQUFHO0lBQ2hCLE1BQU0sQ0FBQyxvQkFBWSxFQUFFLEtBQUssTUFBTSxDQUFBO0FBQ3BDLENBQUMsQ0FBQztBQUVTLHNCQUFjLEdBQUc7SUFDeEIsTUFBTSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7QUFDM0IsQ0FBQyxDQUFDO0FBRVMsaUJBQVMsR0FBRztJQUNuQixNQUFNLENBQUMsQ0FBQyxjQUFNLEVBQUUsQ0FBQztBQUNyQixDQUFDLENBQUM7QUFFUyxZQUFJLEdBQUc7SUFDZCxFQUFFLENBQUEsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUM7UUFDZixNQUFNLENBQUMsSUFBSSxDQUFDO0lBQ2hCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE1BQU0sQ0FBQyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUFBLENBQUM7QUFDTixDQUFDLENBQUM7QUFFUyxZQUFJLEdBQUc7SUFDZCxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFBLENBQUM7UUFDekIsTUFBTSxDQUFDLElBQUksQ0FBQztJQUNoQixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixNQUFNLENBQUMsS0FBSyxDQUFDO0lBQ2pCLENBQUM7QUFDTCxDQUFDLENBQUM7QUFFUyxnQkFBUSxHQUFHO0lBQ2xCLEVBQUUsQ0FBQSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUEsQ0FBQztRQUNuQixNQUFNLENBQUMsSUFBSSxDQUFDO0lBQ2hCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE1BQU0sQ0FBQyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUFBLENBQUM7QUFDTixDQUFDLENBQUMiLCJmaWxlIjoic21hcnRlbnYuY2xhc3Nlcy5oZWxwZXJzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cInR5cGluZ3MvbWFpbi5kLnRzXCIgLz5cblxuZXhwb3J0IHZhciBnZXRFbnZTdHJpbmcgPSBmdW5jdGlvbigpOnN0cmluZyB7XG4gICAgaWYgKHR5cGVvZiB3aW5kb3cgIT09IFwidW5kZWZpbmVkXCIpIHtcbiAgICAgICAgcmV0dXJuIFwiYnJvd3NlclwiO1xuICAgIH0gZWxzZSBpZiAodHlwZW9mIHByb2Nlc3MgIT09IFwidW5kZWZpbmVkXCIpIHtcbiAgICAgICAgcmV0dXJuIFwibm9kZVwiO1xuICAgIH1cbn07XG5cbmV4cG9ydCB2YXIgZ2V0VXNlckFnZW50U3RyaW5nID0gZnVuY3Rpb24oKTpzdHJpbmd7XG4gICAgaWYoaXNCcm93c2VyKCkpe1xuICAgICAgICByZXR1cm4gIG5hdmlnYXRvci51c2VyQWdlbnQ7XG4gICAgfSBlbHNlIHtcbiAgICAgICAgcmV0dXJuIHVuZGVmaW5lZDtcbiAgICB9XG59O1xuXG5leHBvcnQgdmFyIGlzTm9kZSA9IGZ1bmN0aW9uKCk6Ym9vbGVhbiB7XG4gICAgcmV0dXJuIGdldEVudlN0cmluZygpID09PSBcIm5vZGVcIlxufTtcblxuZXhwb3J0IHZhciBnZXROb2RlVmVyc2lvbiA9IGZ1bmN0aW9uKCk6c3RyaW5nIHtcbiAgICByZXR1cm4gcHJvY2Vzcy52ZXJzaW9uO1xufTtcblxuZXhwb3J0IHZhciBpc0Jyb3dzZXIgPSBmdW5jdGlvbigpOmJvb2xlYW4ge1xuICAgIHJldHVybiAhaXNOb2RlKCk7XG59O1xuXG5leHBvcnQgdmFyIGlzQ0kgPSBmdW5jdGlvbigpe1xuICAgIGlmKHByb2Nlc3MuZW52LkNJKXtcbiAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgfSBlbHNlIHtcbiAgICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH07XG59O1xuXG5leHBvcnQgdmFyIGlzQzkgPSBmdW5jdGlvbigpe1xuICAgIGlmIChwcm9jZXNzLmVudi5DOV9IT1NUTkFNRSl7XG4gICAgICAgIHJldHVybiB0cnVlO1xuICAgIH0gZWxzZSB7XG4gICAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG59O1xuXG5leHBvcnQgdmFyIGlzVHJhdmlzID0gZnVuY3Rpb24oKXtcbiAgICBpZihwcm9jZXNzLmVudi5UUkFWSVMpe1xuICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICB9IGVsc2Uge1xuICAgICAgICByZXR1cm4gZmFsc2U7XG4gICAgfTtcbn07Il19 +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRlbnYuY2xhc3Nlcy5oZWxwZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRlbnYuY2xhc3Nlcy5oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBVyxRQUFBLFlBQVksR0FBRztJQUN0QixFQUFFLENBQUMsQ0FBQyxPQUFPLE1BQU0sS0FBSyxXQUFXLENBQUMsQ0FBQyxDQUFDO1FBQ2hDLE1BQU0sQ0FBQyxTQUFTLENBQUE7SUFDcEIsQ0FBQztJQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxPQUFPLE9BQU8sS0FBSyxXQUFXLENBQUMsQ0FBQyxDQUFDO1FBQ3hDLE1BQU0sQ0FBQyxNQUFNLENBQUE7SUFDakIsQ0FBQztBQUNMLENBQUMsQ0FBQTtBQUVVLFFBQUEsa0JBQWtCLEdBQUc7SUFDNUIsRUFBRSxDQUFDLENBQUMsaUJBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUNkLE1BQU0sQ0FBRSxTQUFTLENBQUMsU0FBUyxDQUFBO0lBQy9CLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE1BQU0sQ0FBQyxTQUFTLENBQUE7SUFDcEIsQ0FBQztBQUNMLENBQUMsQ0FBQTtBQUVVLFFBQUEsTUFBTSxHQUFHO0lBQ2hCLE1BQU0sQ0FBQyxvQkFBWSxFQUFFLEtBQUssTUFBTSxDQUFBO0FBQ3BDLENBQUMsQ0FBQTtBQUVVLFFBQUEsY0FBYyxHQUFHO0lBQ3hCLE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFBO0FBQzFCLENBQUMsQ0FBQTtBQUVVLFFBQUEsU0FBUyxHQUFHO0lBQ25CLE1BQU0sQ0FBQyxDQUFDLGNBQU0sRUFBRSxDQUFBO0FBQ3BCLENBQUMsQ0FBQTtBQUVVLFFBQUEsSUFBSSxHQUFHO0lBQ2QsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2pCLE1BQU0sQ0FBQyxJQUFJLENBQUE7SUFDZixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixNQUFNLENBQUMsS0FBSyxDQUFBO0lBQ2hCLENBQUM7SUFBQSxDQUFDO0FBQ04sQ0FBQyxDQUFBO0FBRVUsUUFBQSxJQUFJLEdBQUc7SUFDZCxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUM7UUFDMUIsTUFBTSxDQUFDLElBQUksQ0FBQTtJQUNmLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE1BQU0sQ0FBQyxLQUFLLENBQUE7SUFDaEIsQ0FBQztBQUNMLENBQUMsQ0FBQTtBQUVVLFFBQUEsUUFBUSxHQUFHO0lBQ2xCLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUNyQixNQUFNLENBQUMsSUFBSSxDQUFBO0lBQ2YsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osTUFBTSxDQUFDLEtBQUssQ0FBQTtJQUNoQixDQUFDO0lBQUEsQ0FBQztBQUNOLENBQUMsQ0FBQSJ9 \ No newline at end of file diff --git a/dist/smartenv.classes.js b/dist/smartenv.classes.js index 47e5444..3378d58 100644 --- a/dist/smartenv.classes.js +++ b/dist/smartenv.classes.js @@ -1,8 +1,7 @@ -/// "use strict"; -var helpers = require("./smartenv.classes.helpers"); -var Environment = (function () { - function Environment() { +const helpers = require("./smartenv.classes.helpers"); +class Environment { + constructor() { this.runtimeEnv = helpers.getEnvString(); this.isBrowser = helpers.isBrowser(); this.userAgent = helpers.getUserAgentString(); @@ -13,8 +12,6 @@ var Environment = (function () { this.isC9 = helpers.isC9(); } ; - return Environment; -}()); +} exports.Environment = Environment; - -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0ZW52LmNsYXNzZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsMENBQTBDOztBQUUxQyxJQUFPLE9BQU8sV0FBVyw0QkFBNEIsQ0FBQyxDQUFDO0FBQ3ZEO0lBU0k7UUFDSSxJQUFJLENBQUMsVUFBVSxHQUFHLE9BQU8sQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUN6QyxJQUFJLENBQUMsU0FBUyxHQUFHLE9BQU8sQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUNyQyxJQUFJLENBQUMsU0FBUyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxDQUFDO1FBQzlDLElBQUksQ0FBQyxNQUFNLEdBQUcsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQy9CLElBQUksQ0FBQyxXQUFXLEdBQUcsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDO1FBQzVDLElBQUksQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQzNCLElBQUksQ0FBQyxRQUFRLEdBQUcsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ25DLElBQUksQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDO0lBQy9CLENBQUM7O0lBQ0wsa0JBQUM7QUFBRCxDQW5CQSxBQW1CQyxJQUFBO0FBbkJZLG1CQUFXLGNBbUJ2QixDQUFBIiwiZmlsZSI6InNtYXJ0ZW52LmNsYXNzZXMuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwidHlwaW5ncy9tYWluLmQudHNcIiAvPlxuXG5pbXBvcnQgaGVscGVycyA9IHJlcXVpcmUoXCIuL3NtYXJ0ZW52LmNsYXNzZXMuaGVscGVyc1wiKTtcbmV4cG9ydCBjbGFzcyBFbnZpcm9ubWVudCB7XG4gICAgcnVudGltZUVudjpzdHJpbmc7XG4gICAgaXNCcm93c2VyOmJvb2xlYW47XG4gICAgdXNlckFnZW50OnN0cmluZztcbiAgICBpc05vZGU6Ym9vbGVhbjtcbiAgICBub2RlVmVyc2lvbjpzdHJpbmc7XG4gICAgaXNDSTpib29sZWFuO1xuICAgIGlzVHJhdmlzOmJvb2xlYW47XG4gICAgaXNDOTpib29sZWFuO1xuICAgIGNvbnN0cnVjdG9yKCkge1xuICAgICAgICB0aGlzLnJ1bnRpbWVFbnYgPSBoZWxwZXJzLmdldEVudlN0cmluZygpO1xuICAgICAgICB0aGlzLmlzQnJvd3NlciA9IGhlbHBlcnMuaXNCcm93c2VyKCk7XG4gICAgICAgIHRoaXMudXNlckFnZW50ID0gaGVscGVycy5nZXRVc2VyQWdlbnRTdHJpbmcoKTtcbiAgICAgICAgdGhpcy5pc05vZGUgPSBoZWxwZXJzLmlzTm9kZSgpO1xuICAgICAgICB0aGlzLm5vZGVWZXJzaW9uID0gaGVscGVycy5nZXROb2RlVmVyc2lvbigpO1xuICAgICAgICB0aGlzLmlzQ0kgPSBoZWxwZXJzLmlzQ0koKTtcbiAgICAgICAgdGhpcy5pc1RyYXZpcyA9IGhlbHBlcnMuaXNUcmF2aXMoKTtcbiAgICAgICAgdGhpcy5pc0M5ID0gaGVscGVycy5pc0M5KCk7XG4gICAgfTtcbn1cbiJdfQ== +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRlbnYuY2xhc3Nlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZW52LmNsYXNzZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHNEQUFzRDtBQUV0RDtJQVNJO1FBQ0ksSUFBSSxDQUFDLFVBQVUsR0FBRyxPQUFPLENBQUMsWUFBWSxFQUFFLENBQUE7UUFDeEMsSUFBSSxDQUFDLFNBQVMsR0FBRyxPQUFPLENBQUMsU0FBUyxFQUFFLENBQUE7UUFDcEMsSUFBSSxDQUFDLFNBQVMsR0FBRyxPQUFPLENBQUMsa0JBQWtCLEVBQUUsQ0FBQTtRQUM3QyxJQUFJLENBQUMsTUFBTSxHQUFHLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQTtRQUM5QixJQUFJLENBQUMsV0FBVyxHQUFHLE9BQU8sQ0FBQyxjQUFjLEVBQUUsQ0FBQTtRQUMzQyxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUMxQixJQUFJLENBQUMsUUFBUSxHQUFHLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQTtRQUNsQyxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUM5QixDQUFDO0lBQUEsQ0FBQztDQUNMO0FBbkJELGtDQW1CQyJ9 \ No newline at end of file diff --git a/dist/smartenv.environment.d.ts b/dist/smartenv.environment.d.ts index e663ef8..03dbd71 100644 --- a/dist/smartenv.environment.d.ts +++ b/dist/smartenv.environment.d.ts @@ -1,4 +1,4 @@ -import classes = require("./smartenv.classes"); +import * as classes from './smartenv.classes'; /** * returns the environment * @returns {Environment} diff --git a/dist/smartenv.environment.js b/dist/smartenv.environment.js index ed2dde4..692c7eb 100644 --- a/dist/smartenv.environment.js +++ b/dist/smartenv.environment.js @@ -1,8 +1,8 @@ "use strict"; -var classes = require("./smartenv.classes"); -var objectStorage = require("./smartenv.objectstorage"); -var environment; -var envDetermined = false; +const classes = require("./smartenv.classes"); +const objectStorage = require("./smartenv.objectstorage"); +let environment; +let envDetermined = false; /** * returns the environment * @returns {Environment} @@ -20,16 +20,15 @@ exports.getEnv = function () { */ exports.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('the smartenv registration store currently holds the following properties:'); console.log(Object.getOwnPropertyNames(objectStorage.obs.getAll())); }; - -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0ZW52LmVudmlyb25tZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFLQSxJQUFPLE9BQU8sV0FBVyxvQkFBb0IsQ0FBQyxDQUFDO0FBQy9DLElBQU8sYUFBYSxXQUFXLDBCQUEwQixDQUFDLENBQUM7QUFHM0QsSUFBSSxXQUErQixDQUFDO0FBQ3BDLElBQUksYUFBYSxHQUFXLEtBQUssQ0FBQztBQUVsQzs7O0dBR0c7QUFDUSxjQUFNLEdBQUc7SUFDaEIsRUFBRSxDQUFDLENBQUMsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQ2pCLFdBQVcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUN4QyxhQUFhLEdBQUcsSUFBSSxDQUFDLENBQUMsbUNBQW1DO0lBQzdELENBQUM7SUFBQSxDQUFDO0lBQ0YsTUFBTSxDQUFDLFdBQVcsQ0FBQztBQUN2QixDQUFDLENBQUM7QUFFRjs7R0FFRztBQUNTLGdCQUFRLEdBQUc7SUFDbkIsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7UUFDdkIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQy9CLElBQUksZUFBZSxHQUFHLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDLE9BQU8sQ0FBQztRQUN6RCxPQUFPLENBQUMsR0FBRyxDQUFDLGtCQUFrQixHQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxXQUFXLEdBQUcsMkJBQTJCLEdBQUcsZUFBZSxDQUFDLENBQUM7SUFDaEgsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBQ2xDLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUN6RCxDQUFDO0lBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQywyRUFBMkUsQ0FBQyxDQUFDO0lBQ3pGLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLG1CQUFtQixDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQ3hFLENBQUMsQ0FBQyIsImZpbGUiOiJzbWFydGVudi5lbnZpcm9ubWVudC5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCJ0eXBpbmdzL21haW4uZC50c1wiIC8+XG4vKipcbiAqIERlYWxzIHdpdGggdGhlIGVudmlyb25tZW50IHRoZSBjdXJyZW50IEpTIHNjcmlwdCBpcyBydW5uaW5nIGluLlxuICovXG5pbXBvcnQgcGx1Z2lucyA9IHJlcXVpcmUoXCIuL3NtYXJ0ZW52LnBsdWdpbnNcIik7XG5pbXBvcnQgY2xhc3NlcyA9IHJlcXVpcmUoXCIuL3NtYXJ0ZW52LmNsYXNzZXNcIik7XG5pbXBvcnQgb2JqZWN0U3RvcmFnZSA9IHJlcXVpcmUoXCIuL3NtYXJ0ZW52Lm9iamVjdHN0b3JhZ2VcIik7XG5cblxudmFyIGVudmlyb25tZW50OmNsYXNzZXMuRW52aXJvbm1lbnQ7XG52YXIgZW52RGV0ZXJtaW5lZDpib29sZWFuID0gZmFsc2U7XG5cbi8qKlxuICogcmV0dXJucyB0aGUgZW52aXJvbm1lbnRcbiAqIEByZXR1cm5zIHtFbnZpcm9ubWVudH1cbiAqL1xuZXhwb3J0IHZhciBnZXRFbnYgPSBmdW5jdGlvbigpe1xuICAgIGlmICghZW52RGV0ZXJtaW5lZCkge1xuICAgICAgICBlbnZpcm9ubWVudCA9IG5ldyBjbGFzc2VzLkVudmlyb25tZW50KCk7XG4gICAgICAgIGVudkRldGVybWluZWQgPSB0cnVlOyAvLyBlbnN1cmUgY29kZSBhYm92ZSBvbmx5IHJ1bnMgb25jZVxuICAgIH07XG4gICAgcmV0dXJuIGVudmlyb25tZW50O1xufTtcblxuLyoqXG4gKiBwcmludHMgdGhlIGVudmlyb25tZW50IHRvIGNvbnNvbGVcbiAqL1xuZXhwb3J0IHZhciAgcHJpbnRFbnYgPSBmdW5jdGlvbigpIHtcbiAgICBpZiAodGhpcy5nZXRFbnYoKS5pc05vZGUpIHtcbiAgICAgICAgY29uc29sZS5sb2coXCJydW5uaW5nIG9uIE5PREVcIik7XG4gICAgICAgIHZhciBzbWFydGVudlZlcnNpb24gPSByZXF1aXJlKFwiLi4vcGFja2FnZS5qc29uXCIpLnZlcnNpb247XG4gICAgICAgIGNvbnNvbGUubG9nKFwibm9kZSB2ZXJzaW9uIGlzIFwiICsgdGhpcy5nZXRFbnYoKS5ub2RlVmVyc2lvbiArIFwiIGFuZCBzbWFydGVudiB2ZXJzaW9uIGlzIFwiICsgc21hcnRlbnZWZXJzaW9uKTtcbiAgICB9IGVsc2Uge1xuICAgICAgICBjb25zb2xlLmxvZyhcInJ1bm5pbmcgb24gQlJPV1NFUlwiKTtcbiAgICAgICAgY29uc29sZS5sb2coXCJicm93c2VyIGlzIFwiICsgdGhpcy5nZXRFbnYoKS51c2VyQWdlbnQpO1xuICAgIH1cbiAgICBjb25zb2xlLmxvZyhcInRoZSBzbWFydGVudiByZWdpc3RyYXRpb24gc3RvcmUgY3VycmVudGx5IGhvbGRzIHRoZSBmb2xsb3dpbmcgcHJvcGVydGllczpcIik7XG4gICAgY29uc29sZS5sb2coT2JqZWN0LmdldE93blByb3BlcnR5TmFtZXMob2JqZWN0U3RvcmFnZS5vYnMuZ2V0QWxsKCkpKTtcbn07Il19 +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRlbnYuZW52aXJvbm1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGVudi5lbnZpcm9ubWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBSUEsOENBQTZDO0FBQzdDLDBEQUF5RDtBQUd6RCxJQUFJLFdBQWdDLENBQUE7QUFDcEMsSUFBSSxhQUFhLEdBQVksS0FBSyxDQUFBO0FBRWxDOzs7R0FHRztBQUNRLFFBQUEsTUFBTSxHQUFHO0lBQ2hCLEVBQUUsQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQztRQUNqQixXQUFXLEdBQUcsSUFBSSxPQUFPLENBQUMsV0FBVyxFQUFFLENBQUE7UUFDdkMsYUFBYSxHQUFHLElBQUksQ0FBQSxDQUFDLG1DQUFtQztJQUM1RCxDQUFDO0lBQUEsQ0FBQztJQUNGLE1BQU0sQ0FBQyxXQUFXLENBQUE7QUFDdEIsQ0FBQyxDQUFBO0FBRUQ7O0dBRUc7QUFDUyxRQUFBLFFBQVEsR0FBRztJQUNuQixFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUN2QixPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixDQUFDLENBQUE7UUFDOUIsSUFBSSxlQUFlLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBQUMsT0FBTyxDQUFBO1FBQ3hELE9BQU8sQ0FBQyxHQUFHLENBQUMsa0JBQWtCLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLFdBQVcsR0FBRywyQkFBMkIsR0FBRyxlQUFlLENBQUMsQ0FBQTtJQUMvRyxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsR0FBRyxDQUFDLG9CQUFvQixDQUFDLENBQUE7UUFDakMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLFNBQVMsQ0FBQyxDQUFBO0lBQ3hELENBQUM7SUFDRCxPQUFPLENBQUMsR0FBRyxDQUFDLDJFQUEyRSxDQUFDLENBQUE7SUFDeEYsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsbUJBQW1CLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLENBQUE7QUFDdkUsQ0FBQyxDQUFBIn0= \ No newline at end of file diff --git a/dist/smartenv.objectstorage.js b/dist/smartenv.objectstorage.js index 7b08d2c..d8b9870 100644 --- a/dist/smartenv.objectstorage.js +++ b/dist/smartenv.objectstorage.js @@ -1,22 +1,19 @@ "use strict"; -/// -var plugins = require("./smartenv.plugins"); +const plugins = require("./smartenv.plugins"); exports.obs = { - add: function (paramNameArg, objectArg) { - if (paramNameArg === void 0) { paramNameArg = "undefined"; } - if (objectArg === void 0) { objectArg = "undefined"; } - if (paramNameArg == "undefined") { - console.log("paramName is undefined"); + 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 exports.obsItems[paramNameArg] === "undefined") { + if (typeof exports.obsItems[paramNameArg] === 'undefined') { exports.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 exports.obsItems[paramNameArg]; }, @@ -24,11 +21,11 @@ exports.obs = { exports.obsItems[paramNameArg] = objectArg; }, merge: function (paramNameArg, objectArg) { - if (!(typeof exports.obsItems[paramNameArg] === "undefined")) { + if (!(typeof exports.obsItems[paramNameArg] === 'undefined')) { exports.obsItems[paramNameArg] = plugins._.assign(exports.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) { @@ -43,5 +40,4 @@ exports.obs = { } }; exports.obsItems = {}; - -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0ZW52Lm9iamVjdHN0b3JhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBDQUEwQztBQUMxQyxJQUFPLE9BQU8sV0FBVyxvQkFBb0IsQ0FBQyxDQUFDO0FBQ3BDLFdBQUcsR0FBTztJQUNqQixHQUFHLEVBQUUsVUFBUyxZQUEwQixFQUFDLFNBQXVCO1FBQWxELDRCQUEwQixHQUExQiwwQkFBMEI7UUFBQyx5QkFBdUIsR0FBdkIsdUJBQXVCO1FBQzVELEVBQUUsQ0FBQyxDQUFDLFlBQVksSUFBSSxXQUFXLENBQUMsQ0FBQSxDQUFDO1lBQzdCLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQztZQUN0QyxNQUFNLENBQUM7UUFDWCxDQUFDO1FBQ0QsRUFBRSxDQUFDLENBQUMsU0FBUyxJQUFJLFdBQVcsQ0FBQyxDQUFBLENBQUM7WUFDMUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO1FBQzFDLENBQUM7UUFDRCxFQUFFLENBQUMsQ0FBQyxPQUFPLGdCQUFRLENBQUMsWUFBWSxDQUFDLEtBQUssV0FBVyxDQUFDLENBQUEsQ0FBQztZQUMvQyxnQkFBUSxDQUFDLFlBQVksQ0FBQyxHQUFHLFNBQVMsQ0FBQztRQUN2QyxDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixPQUFPLENBQUMsR0FBRyxDQUFDLHlEQUF5RCxDQUFDLENBQUM7UUFDM0UsQ0FBQztRQUNELE1BQU0sQ0FBQyxnQkFBUSxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ2xDLENBQUM7SUFDRCxPQUFPLEVBQUUsVUFBUyxZQUFZLEVBQUMsU0FBUztRQUNwQyxnQkFBUSxDQUFDLFlBQVksQ0FBQyxHQUFHLFNBQVMsQ0FBQztJQUN2QyxDQUFDO0lBQ0QsS0FBSyxFQUFFLFVBQVMsWUFBWSxFQUFDLFNBQVM7UUFDbEMsRUFBRSxDQUFBLENBQUMsQ0FBQyxDQUFDLE9BQU8sZ0JBQVEsQ0FBQyxZQUFZLENBQUMsS0FBSyxXQUFXLENBQUMsQ0FBQyxDQUFBLENBQUM7WUFDakQsZ0JBQVEsQ0FBQyxZQUFZLENBQUMsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxnQkFBUSxDQUFDLFlBQVksQ0FBQyxFQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ2hGLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLE9BQU8sQ0FBQyxHQUFHLENBQUMscURBQXFELENBQUMsQ0FBQztRQUN2RSxDQUFDO0lBQ0wsQ0FBQztJQUNELEdBQUcsRUFBRSxVQUFTLE9BQU87UUFDakIsTUFBTSxDQUFDLGdCQUFRLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUNELE1BQU0sRUFBRTtRQUNKLE1BQU0sQ0FBQyxnQkFBUSxDQUFDO0lBQ3BCLENBQUM7SUFDRCxXQUFXLEVBQUUsVUFBUyxRQUFRO1FBQzFCLGdCQUFRLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsZ0JBQVEsRUFBQyxRQUFRLENBQUMsQ0FBQztRQUMvQyxNQUFNLENBQUMsZ0JBQVEsQ0FBQztJQUNwQixDQUFDO0NBQ0osQ0FBQztBQUNTLGdCQUFRLEdBQU8sRUFBRSxDQUFDIiwiZmlsZSI6InNtYXJ0ZW52Lm9iamVjdHN0b3JhZ2UuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwidHlwaW5ncy9tYWluLmQudHNcIiAvPlxuaW1wb3J0IHBsdWdpbnMgPSByZXF1aXJlKFwiLi9zbWFydGVudi5wbHVnaW5zXCIpO1xuZXhwb3J0IHZhciBvYnM6YW55ID0ge1xuICAgIGFkZDogZnVuY3Rpb24ocGFyYW1OYW1lQXJnID0gXCJ1bmRlZmluZWRcIixvYmplY3RBcmcgPSBcInVuZGVmaW5lZFwiKSB7XG4gICAgICAgIGlmIChwYXJhbU5hbWVBcmcgPT0gXCJ1bmRlZmluZWRcIil7XG4gICAgICAgICAgICBjb25zb2xlLmxvZyhcInBhcmFtTmFtZSBpcyB1bmRlZmluZWRcIik7XG4gICAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cbiAgICAgICAgaWYgKG9iamVjdEFyZyA9PSBcInVuZGVmaW5lZFwiKXtcbiAgICAgICAgICAgIGNvbnNvbGUubG9nKFwib2JqZWN0QXJnIGlzIHVuZGVmaW5lZFwiKTtcbiAgICAgICAgfVxuICAgICAgICBpZiAodHlwZW9mIG9ic0l0ZW1zW3BhcmFtTmFtZUFyZ10gPT09IFwidW5kZWZpbmVkXCIpe1xuICAgICAgICAgICAgb2JzSXRlbXNbcGFyYW1OYW1lQXJnXSA9IG9iamVjdEFyZztcbiAgICAgICAgfSBlbHNlIHtcbiAgICAgICAgICAgIGNvbnNvbGUubG9nKFwib2JqZWN0IGlzIGFscmVhZHkgcHJlc2VudCwgc28gYWRkIG9wZXJhdGlvbiBoYXMgZmFpbGVkLlwiKTtcbiAgICAgICAgfVxuICAgICAgICByZXR1cm4gb2JzSXRlbXNbcGFyYW1OYW1lQXJnXTtcbiAgICB9LFxuICAgIHJlcGxhY2U6IGZ1bmN0aW9uKHBhcmFtTmFtZUFyZyxvYmplY3RBcmcpe1xuICAgICAgICBvYnNJdGVtc1twYXJhbU5hbWVBcmddID0gb2JqZWN0QXJnO1xuICAgIH0sXG4gICAgbWVyZ2U6IGZ1bmN0aW9uKHBhcmFtTmFtZUFyZyxvYmplY3RBcmcpe1xuICAgICAgICBpZighKHR5cGVvZiBvYnNJdGVtc1twYXJhbU5hbWVBcmddID09PSBcInVuZGVmaW5lZFwiKSl7XG4gICAgICAgICAgICBvYnNJdGVtc1twYXJhbU5hbWVBcmddID0gcGx1Z2lucy5fLmFzc2lnbihvYnNJdGVtc1twYXJhbU5hbWVBcmddLG9iamVjdEFyZyk7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICBjb25zb2xlLmxvZyhcIm9iamVjdCBpcyBub3QgcHJlc2VudCwgc28gdGhlcmUgaXMgbm90aGluZyB0byBtZXJnZVwiKTtcbiAgICAgICAgfVxuICAgIH0sXG4gICAgZ2V0OiBmdW5jdGlvbihrZXlOYW1lKSB7XG4gICAgICAgIHJldHVybiBvYnNJdGVtc1trZXlOYW1lXTtcbiAgICB9LFxuICAgIGdldEFsbDogZnVuY3Rpb24gKCkge1xuICAgICAgICByZXR1cm4gb2JzSXRlbXM7XG4gICAgfSxcbiAgICBhZGRDb21wbGV0ZTogZnVuY3Rpb24oaXRlbXNBcmcpIHtcbiAgICAgICAgb2JzSXRlbXMgPSBwbHVnaW5zLl8uYXNzaWduKG9ic0l0ZW1zLGl0ZW1zQXJnKTtcbiAgICAgICAgcmV0dXJuIG9ic0l0ZW1zO1xuICAgIH1cbn07XG5leHBvcnQgdmFyIG9ic0l0ZW1zOmFueSA9IHt9OyJdfQ== +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRlbnYub2JqZWN0c3RvcmFnZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZW52Lm9iamVjdHN0b3JhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDhDQUE4QztBQUNuQyxRQUFBLEdBQUcsR0FBUTtJQUNsQixHQUFHLEVBQUUsVUFBUyxZQUFZLEdBQUcsV0FBVyxFQUFDLFNBQVMsR0FBRyxXQUFXO1FBQzVELEVBQUUsQ0FBQyxDQUFDLFlBQVksS0FBSyxXQUFXLENBQUMsQ0FBQyxDQUFDO1lBQy9CLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQTtZQUNyQyxNQUFNLENBQUE7UUFDVixDQUFDO1FBQ0QsRUFBRSxDQUFDLENBQUMsU0FBUyxLQUFLLFdBQVcsQ0FBQyxDQUFDLENBQUM7WUFDNUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFBO1FBQ3pDLENBQUM7UUFDRCxFQUFFLENBQUMsQ0FBQyxPQUFPLGdCQUFRLENBQUMsWUFBWSxDQUFDLEtBQUssV0FBVyxDQUFDLENBQUMsQ0FBQztZQUNoRCxnQkFBUSxDQUFDLFlBQVksQ0FBQyxHQUFHLFNBQVMsQ0FBQTtRQUN0QyxDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixPQUFPLENBQUMsR0FBRyxDQUFDLHlEQUF5RCxDQUFDLENBQUE7UUFDMUUsQ0FBQztRQUNELE1BQU0sQ0FBQyxnQkFBUSxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQ2pDLENBQUM7SUFDRCxPQUFPLEVBQUUsVUFBUyxZQUFZLEVBQUMsU0FBUztRQUNwQyxnQkFBUSxDQUFDLFlBQVksQ0FBQyxHQUFHLFNBQVMsQ0FBQTtJQUN0QyxDQUFDO0lBQ0QsS0FBSyxFQUFFLFVBQVMsWUFBWSxFQUFDLFNBQVM7UUFDbEMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sZ0JBQVEsQ0FBQyxZQUFZLENBQUMsS0FBSyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDbkQsZ0JBQVEsQ0FBQyxZQUFZLENBQUMsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxnQkFBUSxDQUFDLFlBQVksQ0FBQyxFQUFDLFNBQVMsQ0FBQyxDQUFBO1FBQy9FLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLE9BQU8sQ0FBQyxHQUFHLENBQUMscURBQXFELENBQUMsQ0FBQTtRQUN0RSxDQUFDO0lBQ0wsQ0FBQztJQUNELEdBQUcsRUFBRSxVQUFTLE9BQU87UUFDakIsTUFBTSxDQUFDLGdCQUFRLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDNUIsQ0FBQztJQUNELE1BQU0sRUFBRTtRQUNKLE1BQU0sQ0FBQyxnQkFBUSxDQUFBO0lBQ25CLENBQUM7SUFDRCxXQUFXLEVBQUUsVUFBUyxRQUFRO1FBQzFCLGdCQUFRLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsZ0JBQVEsRUFBQyxRQUFRLENBQUMsQ0FBQTtRQUM5QyxNQUFNLENBQUMsZ0JBQVEsQ0FBQTtJQUNuQixDQUFDO0NBQ0osQ0FBQTtBQUNVLFFBQUEsUUFBUSxHQUFRLEVBQUUsQ0FBQSJ9 \ No newline at end of file diff --git a/dist/smartenv.plugins.d.ts b/dist/smartenv.plugins.d.ts index e0ae5e6..1ad666e 100644 --- a/dist/smartenv.plugins.d.ts +++ b/dist/smartenv.plugins.d.ts @@ -1,5 +1,4 @@ -declare var plugins: { - Q: any; - _: any; -}; -export = plugins; +import 'typings-global'; +import * as Q from 'q'; +import * as _ from 'lodash'; +export { Q, _ }; diff --git a/dist/smartenv.plugins.js b/dist/smartenv.plugins.js index 3b869c4..524aaea 100644 --- a/dist/smartenv.plugins.js +++ b/dist/smartenv.plugins.js @@ -1,9 +1,7 @@ "use strict"; -/// -var plugins = { - Q: require("q"), - _: require("lodash") -}; -module.exports = plugins; - -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0ZW52LnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBDQUEwQztBQUMxQyxJQUFJLE9BQU8sR0FBRztJQUNWLENBQUMsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDO0lBQ2YsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUM7Q0FDdkIsQ0FBQztBQUVGLGlCQUFTLE9BQU8sQ0FBQyIsImZpbGUiOiJzbWFydGVudi5wbHVnaW5zLmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cInR5cGluZ3MvbWFpbi5kLnRzXCIgLz5cbnZhciBwbHVnaW5zID0ge1xuICAgIFE6IHJlcXVpcmUoXCJxXCIpLFxuICAgIF86IHJlcXVpcmUoXCJsb2Rhc2hcIilcbn07XG5cbmV4cG9ydCA9IHBsdWdpbnM7Il19 +require("typings-global"); +const Q = require("q"); +exports.Q = Q; +const _ = require("lodash"); +exports._ = _; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRlbnYucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZW52LnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUN2Qix1QkFBc0I7QUFJbEIsY0FBQztBQUhMLDRCQUEyQjtBQUl2QixjQUFDIn0= \ No newline at end of file diff --git a/package.json b/package.json index 087e680..d2f9a8a 100644 --- a/package.json +++ b/package.json @@ -22,11 +22,14 @@ }, "homepage": "https://github.com/pushrocks/smartenv", "dependencies": { - "beautylog": "^4.1.2", - "lodash": "^4.11.1", - "q": "^1.4.1" + "@types/q": "x.x.x", + "lodash": "^4.17.2", + "q": "^1.4.1", + "typings-global": "^1.0.14" }, "devDependencies": { - "npmts": "^5.1.5" + "@types/should": "^8.1.30", + "beautylog": "^6.0.0", + "should": "^11.1.1" } } diff --git a/test/browser/index.html b/test/browser/index.html deleted file mode 100644 index a3f2ff7..0000000 --- a/test/browser/index.html +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/test/browser/index.js b/test/browser/index.js deleted file mode 100644 index 1adc069..0000000 --- a/test/browser/index.js +++ /dev/null @@ -1,2 +0,0 @@ -var smartenv = require("./index.js"); -smartenv.printEnv(); \ No newline at end of file diff --git a/test/test.d.ts b/test/test.d.ts index 5fe3b81..3bb32d4 100644 --- a/test/test.d.ts +++ b/test/test.d.ts @@ -1,3 +1,3 @@ -declare var smartenv: any; -declare var beautylog: any; -declare var key2: string; +declare let smartenv: any; +declare let beautylog: any; +declare let key2: string; diff --git a/test/test.js b/test/test.js index 6919e4a..6e6ae7b 100644 --- a/test/test.js +++ b/test/test.js @@ -1,21 +1,20 @@ -/// -var smartenv = require("../dist/index.js"); -var beautylog = require("beautylog"); +let smartenv = require('../dist/index.js'); +let beautylog = require('beautylog'); smartenv.printEnv(); -//test smartenv.obs.add -smartenv.obs.add("myTestObject", { key1: "Peter" }); -smartenv.obs.add("myTestObject", { key1: "Klaus" }); //now trying to add a second +// test smartenv.obs.add +smartenv.obs.add('myTestObject', { key1: 'Peter' }); +smartenv.obs.add('myTestObject', { key1: 'Klaus' }); //now trying to add a second smartenv.printEnv(); -beautylog.log(smartenv.obs.get("myTestObject").key1); // this should be Peter -//test smartenv.obs.replace -smartenv.obs.replace("myTestObject", { key1: "Klaus" }); -beautylog.log(smartenv.obs.get("myTestObject").key1); // this should be Klaus -//test smartenv.obs.merge -smartenv.obs.merge("myTestObject", { key2: "Peter" }); -beautylog.log(smartenv.obs.get("myTestObject").key1 + smartenv.obs.get("myTestObject").key2); // this should be KlausPeter -var key2 = "hello"; -smartenv.obs.get("myTestObject").key2 = key2; -beautylog.log(smartenv.obs.get("myTestObject").key2); -beautylog.success("Success!"); - -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZ0RBQWdEO0FBQ2hELElBQUksUUFBUSxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0FBQzNDLElBQUksU0FBUyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNyQyxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUM7QUFFcEIsdUJBQXVCO0FBQ3ZCLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBQyxFQUFDLElBQUksRUFBQyxPQUFPLEVBQUMsQ0FBQyxDQUFDO0FBQ2hELFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBQyxFQUFDLElBQUksRUFBQyxPQUFPLEVBQUMsQ0FBQyxDQUFDLENBQUMsNEJBQTRCO0FBQzdFLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQztBQUNwQixTQUFTLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsdUJBQXVCO0FBRTdFLDJCQUEyQjtBQUMzQixRQUFRLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxjQUFjLEVBQUMsRUFBQyxJQUFJLEVBQUMsT0FBTyxFQUFDLENBQUMsQ0FBQztBQUNwRCxTQUFTLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsdUJBQXVCO0FBRTdFLHlCQUF5QjtBQUN6QixRQUFRLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxjQUFjLEVBQUMsRUFBQyxJQUFJLEVBQUMsT0FBTyxFQUFDLENBQUMsQ0FBQztBQUNsRCxTQUFTLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLElBQUksR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLDRCQUE0QjtBQUUxSCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUM7QUFDbkIsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztBQUM3QyxTQUFTLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDO0FBRXJELFNBQVMsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUMiLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuLi90cy90eXBpbmdzL21haW4uZC50c1wiIC8+XG52YXIgc21hcnRlbnYgPSByZXF1aXJlKFwiLi4vZGlzdC9pbmRleC5qc1wiKTtcbnZhciBiZWF1dHlsb2cgPSByZXF1aXJlKFwiYmVhdXR5bG9nXCIpO1xuc21hcnRlbnYucHJpbnRFbnYoKTtcblxuLy90ZXN0IHNtYXJ0ZW52Lm9icy5hZGRcbnNtYXJ0ZW52Lm9icy5hZGQoXCJteVRlc3RPYmplY3RcIix7a2V5MTpcIlBldGVyXCJ9KTtcbnNtYXJ0ZW52Lm9icy5hZGQoXCJteVRlc3RPYmplY3RcIix7a2V5MTpcIktsYXVzXCJ9KTsgLy9ub3cgdHJ5aW5nIHRvIGFkZCBhIHNlY29uZFxuc21hcnRlbnYucHJpbnRFbnYoKTtcbmJlYXV0eWxvZy5sb2coc21hcnRlbnYub2JzLmdldChcIm15VGVzdE9iamVjdFwiKS5rZXkxKTsgLy8gdGhpcyBzaG91bGQgYmUgUGV0ZXJcblxuLy90ZXN0IHNtYXJ0ZW52Lm9icy5yZXBsYWNlXG5zbWFydGVudi5vYnMucmVwbGFjZShcIm15VGVzdE9iamVjdFwiLHtrZXkxOlwiS2xhdXNcIn0pO1xuYmVhdXR5bG9nLmxvZyhzbWFydGVudi5vYnMuZ2V0KFwibXlUZXN0T2JqZWN0XCIpLmtleTEpOyAvLyB0aGlzIHNob3VsZCBiZSBLbGF1c1xuXG4vL3Rlc3Qgc21hcnRlbnYub2JzLm1lcmdlXG5zbWFydGVudi5vYnMubWVyZ2UoXCJteVRlc3RPYmplY3RcIix7a2V5MjpcIlBldGVyXCJ9KTtcbmJlYXV0eWxvZy5sb2coc21hcnRlbnYub2JzLmdldChcIm15VGVzdE9iamVjdFwiKS5rZXkxICsgc21hcnRlbnYub2JzLmdldChcIm15VGVzdE9iamVjdFwiKS5rZXkyKTsgLy8gdGhpcyBzaG91bGQgYmUgS2xhdXNQZXRlclxuXG52YXIga2V5MiA9IFwiaGVsbG9cIjtcbnNtYXJ0ZW52Lm9icy5nZXQoXCJteVRlc3RPYmplY3RcIikua2V5MiA9IGtleTI7XG5iZWF1dHlsb2cubG9nKHNtYXJ0ZW52Lm9icy5nZXQoXCJteVRlc3RPYmplY3RcIikua2V5Mik7XG5cbmJlYXV0eWxvZy5zdWNjZXNzKFwiU3VjY2VzcyFcIik7Il19 +beautylog.log(smartenv.obs.get('myTestObject').key1); // this should be Peter +// test smartenv.obs.replace +smartenv.obs.replace('myTestObject', { key1: 'Klaus' }); +beautylog.log(smartenv.obs.get('myTestObject').key1); // this should be Klaus +// test smartenv.obs.merge +smartenv.obs.merge('myTestObject', { key2: 'Peter' }); +beautylog.log(smartenv.obs.get('myTestObject').key1 + smartenv.obs.get('myTestObject').key2); +// this should be KlausPeter +let key2 = 'hello'; +smartenv.obs.get('myTestObject').key2 = key2; +beautylog.log(smartenv.obs.get('myTestObject').key2); +beautylog.success('Success!'); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBSSxRQUFRLEdBQUcsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUE7QUFDMUMsSUFBSSxTQUFTLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQ3BDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtBQUVuQix3QkFBd0I7QUFDeEIsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFDLEVBQUMsSUFBSSxFQUFDLE9BQU8sRUFBQyxDQUFDLENBQUE7QUFDL0MsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFDLEVBQUMsSUFBSSxFQUFDLE9BQU8sRUFBQyxDQUFDLENBQUEsQ0FBQyw0QkFBNEI7QUFDNUUsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUFBO0FBQ25CLFNBQVMsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUEsQ0FBQyx1QkFBdUI7QUFFNUUsNEJBQTRCO0FBQzVCLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLGNBQWMsRUFBQyxFQUFDLElBQUksRUFBQyxPQUFPLEVBQUMsQ0FBQyxDQUFBO0FBQ25ELFNBQVMsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUEsQ0FBQyx1QkFBdUI7QUFFNUUsMEJBQTBCO0FBQzFCLFFBQVEsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLGNBQWMsRUFBQyxFQUFDLElBQUksRUFBQyxPQUFPLEVBQUMsQ0FBQyxDQUFBO0FBQ2pELFNBQVMsQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUMsSUFBSSxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO0FBQzVGLDRCQUE0QjtBQUU1QixJQUFJLElBQUksR0FBRyxPQUFPLENBQUE7QUFDbEIsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQTtBQUM1QyxTQUFTLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO0FBRXBELFNBQVMsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUEifQ== \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 7fde278..aeaa51f 100644 --- a/test/test.ts +++ b/test/test.ts @@ -1,24 +1,24 @@ -/// -var smartenv = require("../dist/index.js"); -var beautylog = require("beautylog"); -smartenv.printEnv(); +import * as smartenv from '../dist/index.js' +import * as beautylog from 'beautylog' +smartenv.printEnv() -//test smartenv.obs.add -smartenv.obs.add("myTestObject",{key1:"Peter"}); -smartenv.obs.add("myTestObject",{key1:"Klaus"}); //now trying to add a second -smartenv.printEnv(); -beautylog.log(smartenv.obs.get("myTestObject").key1); // this should be Peter +// test smartenv.obs.add +smartenv.obs.add('myTestObject',{key1:'Peter'}) +smartenv.obs.add('myTestObject',{key1:'Klaus'}) //now trying to add a second +smartenv.printEnv() +beautylog.log(smartenv.obs.get('myTestObject').key1) // this should be Peter -//test smartenv.obs.replace -smartenv.obs.replace("myTestObject",{key1:"Klaus"}); -beautylog.log(smartenv.obs.get("myTestObject").key1); // this should be Klaus +// test smartenv.obs.replace +smartenv.obs.replace('myTestObject',{key1:'Klaus'}) +beautylog.log(smartenv.obs.get('myTestObject').key1) // this should be Klaus -//test smartenv.obs.merge -smartenv.obs.merge("myTestObject",{key2:"Peter"}); -beautylog.log(smartenv.obs.get("myTestObject").key1 + smartenv.obs.get("myTestObject").key2); // this should be KlausPeter +// test smartenv.obs.merge +smartenv.obs.merge('myTestObject',{key2:'Peter'}) +beautylog.log(smartenv.obs.get('myTestObject').key1 + smartenv.obs.get('myTestObject').key2) +// this should be KlausPeter -var key2 = "hello"; -smartenv.obs.get("myTestObject").key2 = key2; -beautylog.log(smartenv.obs.get("myTestObject").key2); +let key2 = 'hello' +smartenv.obs.get('myTestObject').key2 = key2 +beautylog.log(smartenv.obs.get('myTestObject').key2) -beautylog.success("Success!"); \ No newline at end of file +beautylog.success('Success!') diff --git a/test/testbrowser.ts b/test/testbrowser.ts deleted file mode 100644 index 43445f9..0000000 --- a/test/testbrowser.ts +++ /dev/null @@ -1,21 +0,0 @@ -/// -var plugins = { - beautylog: require("beautylog")("os"), - gulp: require("gulp"), - gulpBrowser: require("gulp-browser"), - easyserve: require("easyserve") -}; - -plugins.gulp.task('compileBrowserJS', function() { - var stream = plugins.gulp.src('test/browser/index.js') - .pipe(plugins.gulpBrowser.browserify()) - .pipe(plugins.gulp.dest("test/browser/browserified/")); - return stream; -}); - -plugins.gulp.task('default',['compileBrowserJS'], function() { - plugins.beautylog.success('browserJS has been browserified'); - plugins.easyserve("test/browser/"); -}); - -plugins.gulp.start.apply(plugins.gulp, ['default']); \ No newline at end of file diff --git a/ts/index.ts b/ts/index.ts index 749415a..d09ccbf 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,14 +1,12 @@ -/// +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 diff --git a/ts/smartenv.classes.helpers.ts b/ts/smartenv.classes.helpers.ts index cdedb28..fca2fe1 100644 --- a/ts/smartenv.classes.helpers.ts +++ b/ts/smartenv.classes.helpers.ts @@ -1,53 +1,51 @@ -/// - -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 }; -}; \ No newline at end of file +} diff --git a/ts/smartenv.classes.ts b/ts/smartenv.classes.ts index c4042ea..dccb99d 100644 --- a/ts/smartenv.classes.ts +++ b/ts/smartenv.classes.ts @@ -1,23 +1,22 @@ -/// +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() }; } diff --git a/ts/smartenv.environment.ts b/ts/smartenv.environment.ts index e617b50..85f3a3e 100644 --- a/ts/smartenv.environment.ts +++ b/ts/smartenv.environment.ts @@ -1,14 +1,13 @@ -/// /** * 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())); -}; \ No newline at end of file + console.log('the smartenv registration store currently holds the following properties:') + console.log(Object.getOwnPropertyNames(objectStorage.obs.getAll())) +} diff --git a/ts/smartenv.objectstorage.ts b/ts/smartenv.objectstorage.ts index c2e9d9c..c4b5a57 100644 --- a/ts/smartenv.objectstorage.ts +++ b/ts/smartenv.objectstorage.ts @@ -1,40 +1,39 @@ -/// -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 = {}; \ No newline at end of file +} +export var obsItems: any = {} diff --git a/ts/smartenv.plugins.ts b/ts/smartenv.plugins.ts index 487e40a..629777d 100644 --- a/ts/smartenv.plugins.ts +++ b/ts/smartenv.plugins.ts @@ -1,7 +1,8 @@ -/// -var plugins = { - Q: require("q"), - _: require("lodash") -}; +import 'typings-global' +import * as Q from 'q' +import * as _ from 'lodash' -export = plugins; \ No newline at end of file +export { + Q, + _ +} diff --git a/ts/typings.json b/ts/typings.json deleted file mode 100644 index 036cdfa..0000000 --- a/ts/typings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ambientDependencies": { - "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts" - } -} diff --git a/tslint.json b/tslint.json new file mode 100644 index 0000000..45052ad --- /dev/null +++ b/tslint.json @@ -0,0 +1,3 @@ +{ + "extends": "tslint-config-standard" +}