work in progress

ts/index.ts

@@ -1,10 +1,10 @@
 /// <reference path="typings/main.d.ts" />
 /// <reference path="./smartcli.interfaces.ts" />
-/// <reference path="./smartcli.getters.ts" />
-/// <reference path="./smartcli.interaction.ts" />
 
 import plugins = require("./smartcli.plugins");
 import SmartcliChecks = require("./smartcli.checks");
+import SmartcliGetters = require("./smartcli.getters");
+import SmartcliInteractions = require("./smartcli.interaction");
 
 /* ------------------------------------------------ *
  * ---------- plugins for direct use -------------- *
@@ -14,12 +14,16 @@ export let cliff = plugins.cliff; // formats cli output
 export let argv = plugins.argv; //argv gets initial cli commands and options.
 
 /* ------------------------------------------------ *
- * ---------- checks -------------- *
+ * ---------- checks ------------------------------ *
  * ------------------------------------------------ */
+export let check = SmartcliChecks;
 
+/* ------------------------------------------------ *
+ * ---------- getters ----------------------------- *
+ * ------------------------------------------------ */
+export let get = SmartcliGetters;
 
-
-//init checks. Checks return boolean. That means they can be used as question with an answer of yes or no.
-
-SmartcliGetters.init(); // is defined in smartcli.getters.ts
-SmartcliInteraction.init(); // is defined in smartcli.interaction.ts
+/* ------------------------------------------------ *
+ * ---------- interaction ----------------------------- *
+ * ------------------------------------------------ */
+export let interaction = SmartcliInteractions;

ts/smartcli.checks.ts

@@ -1,4 +1,5 @@
 /// <reference path="typings/main.d.ts" />
+/// <reference path="./smartcli.interfaces.ts" />
 
 import plugins = require("./smartcli.plugins");
 

ts/smartcli.getters.ts

@@ -1,110 +1,110 @@
 /// <reference path="typings/main.d.ts" />
-module SmartcliGetters {
-    export function init() {
-        smartcli.get = {};
-        /**
-         *
-         * @param commandString
-         * @returns {{specified: boolean, name: any, arguments: CliCommandArgument}}
-         */
-        smartcli.get.command = function():CliCommand {
-            var cliCommand = {
-                specified: smartcli.check.commandPresence(),
-                name: plugins.argv._[0],
-                arguments: smartcli.get.commandArgs()
-            }
-            return cliCommand;
-        };
+/// <reference path="./smartcli.interfaces.ts" />
 
-        /**
-         * gets the second or higher value of plugins.argv._ if specified and returns it as commandArgument
-         * @param argumentLevel
-         * @returns {{specified: (boolean|boolean), name}}
-         */
-        smartcli.get.commandArgument = function(argumentLevel):CliCommandArgument {
-            var commandArgument:CliCommandArgument = {
-                specified: false,
-                name: "undefined",
-                level:argumentLevel
-            };
-            if(argumentLevel < 1) {
-                plugins.beautylog.error("smartcli.get.argument cannot be invoked with an argumentLevel smaller than 1");
-                return commandArgument;
-            }
-            if(smartcli.check.commandArgumentPresence(argumentLevel)) {
-                commandArgument.specified = true;
-                commandArgument.name = plugins.argv._[argumentLevel];
-            }
-            return commandArgument;
-        };
+import plugins = require("./smartcli.plugins");
+import SmartcliChecks = require("./smartcli.checks");
 
-        /**
-         * returns array with commandArgs
-         * @returns {CliCommandArgument[]}
-         */
-        smartcli.get.commandArgs = function():CliCommandArgument[] {
-            var commandArgs:CliCommandArgument[] = [];
-            var argsArray = smartcli.get.commandArray().slice(0);
-            argsArray.shift();
-            for (var item in argsArray){
-                var commandArgument:CliCommandArgument = {
-                    specified:true,
-                    name:argsArray[item],
-                    level: item + 1
-                }
-                commandArgs.push(commandArgument);
-            }
-            return commandArgs;
-        };
-
-        /**
-         * returns complete command array
-         * @returns {any}
-         */
-        smartcli.get.commandArray = function ():string[] {
-            var commandArray = plugins.argv._;
-            return commandArray;
-        };
-
-
-        /**
-         * returns a cli option
-         * @param optionName
-         * @returns {CliOption}
-         */
-        smartcli.get.option = function(optionName:string):CliOption {
-            var cliOption:CliOption = {
-                name:optionName,
-                specified: false,
-                value: false
-            };
-            if (plugins.smartparam.exists(plugins.argv,optionName)) {
-                cliOption.name = optionName;
-                cliOption.specified = true;
-                cliOption.value = plugins.argv[optionName] //we already know from the "if" above that the value is available.
-            }
-            return cliOption;
-        };
-
-
-        smartcli.get.options = function() {
-            var options = {};
-            for (var key in plugins.argv) {
-                if (key != "_") {
-                    options['key'] = plugins.argv['key'];
-                }
-            }
-            return options;
-        };
-
-        /**
-         * returns Directory of cwd
-         * @returns {{path: string}}
-         */
-        smartcli.get.cwd = function():Directory {
-            return {
-                path: process.cwd()
-            }
-        };
+/**
+ *
+ * @param commandString
+ * @returns {{specified: boolean, name: any, arguments: CliCommandArgument}}
+ */
+export let command = function():CliCommand {
+    var cliCommand = {
+        specified: SmartcliChecks.commandPresence(),
+        name: plugins.argv._[0],
+        arguments: commandArgs()
     }
-}
+    return cliCommand;
+};
+
+/**
+ * gets the second or higher value of plugins.argv._ if specified and returns it as commandArgument
+ * @param argumentLevel
+ * @returns {{specified: (boolean|boolean), name}}
+ */
+export let commandArgument = function(argumentLevel):CliCommandArgument {
+    var commandArgument:CliCommandArgument = {
+        specified: false,
+        name: "undefined",
+        level:argumentLevel
+    };
+    if(argumentLevel < 1) {
+        plugins.beautylog.error("smartcli.get.argument cannot be invoked with an argumentLevel smaller than 1");
+        return commandArgument;
+    }
+    if(SmartcliChecks.commandArgumentPresence(argumentLevel)) {
+        commandArgument.specified = true;
+        commandArgument.name = plugins.argv._[argumentLevel];
+    }
+    return commandArgument;
+};
+
+/**
+ * returns array with commandArgs
+ * @returns {CliCommandArgument[]}
+ */
+export let commandArgs = function():CliCommandArgument[] {
+    var commandArgs:CliCommandArgument[] = [];
+    var argsArray = commandArray().slice(0);
+    argsArray.shift();
+    for (var item in argsArray){
+        var commandArgument:CliCommandArgument = {
+            specified:true,
+            name:argsArray[item],
+            level: item + 1
+        }
+        commandArgs.push(commandArgument);
+    }
+    return commandArgs;
+};
+
+/**
+ * returns complete command array
+ * @returns {any}
+ */
+export let commandArray = function ():string[] {
+    var commandArray = plugins.argv._;
+    return commandArray;
+};
+
+
+/**
+ * returns a cli option
+ * @param optionName
+ * @returns {CliOption}
+ */
+export let option = function(optionName:string):CliOption {
+    var cliOption:CliOption = {
+        name:optionName,
+        specified: false,
+        value: false
+    };
+    if (plugins.smartparam.exists(plugins.argv,optionName)) {
+        cliOption.name = optionName;
+        cliOption.specified = true;
+        cliOption.value = plugins.argv[optionName] //we already know from the "if" above that the value is available.
+    }
+    return cliOption;
+};
+
+
+export let options = function() {
+    var options = {};
+    for (var key in plugins.argv) {
+        if (key != "_") {
+            options['key'] = plugins.argv['key'];
+        }
+    }
+    return options;
+};
+
+/**
+ * returns Directory of cwd
+ * @returns {{path: string}}
+ */
+export let cwd = function():Directory {
+    return {
+        path: process.cwd()
+    }
+};

ts/smartcli.interaction.ts

@@ -1,61 +1,59 @@
 /// <reference path="typings/main.d.ts" />
-module SmartcliInteraction {
-    export function init(){
+/// <reference path="./smartcli.interfaces.ts" />
 
-        smartcli.interaction = {};
-        /**
-         * executes callback with answer to question as argument
-         * @param questionString the question you want to ask the user
-         * @param cb the function to execute with answer as param
-         * @returns {null}
-         */
-        smartcli.interaction.getAnswer = function(questionString:string, cb) {
-            if (typeof questionString != 'string') {
-                plugins.beautylog.error('no question specified');
-                return null;
-            }
-            //make inquirer compatible question object
-            var question = {
-                type: "input",
-                name: "userFeedback",
-                message: questionString,
-                validate: function( value ) {
-                    return true;
-                }
-            };
+import plugins = require("./smartcli.plugins");
 
-            plugins.inquirer.prompt([question],function(answers){
-                var answer = answers.userFeedback;
-                cb(answer);
-            });
-        };
-
-        /**
-         *
-         * @param questionString
-         * @param choiceOptions
-         * @param cb
-         * @returns {null}
-         */
-        smartcli.interaction.getChoice = function(questionString:string, choiceOptions:string[], cb) {
-            if(!Array.isArray(choiceOptions)) {
-                return null;
-            }
-
-            //make inquirer compatible question object
-            var question = {
-                type: "list",
-                name: "userFeedback",
-                message: questionString,
-                choices: choiceOptions,
-                filter: function( val ) { return val.toLowerCase(); }
-            };
-
-            plugins.inquirer.prompt(question,function(answers){
-                var answer = answers.userFeedback;
-                cb(answer);
-            });
-
-        };
+/**
+ * executes callback with answer to question as argument
+ * @param questionString the question you want to ask the user
+ * @param cb the function to execute with answer as param
+ * @returns {null}
+ */
+export let getAnswer = function(questionString:string, cb) {
+    if (typeof questionString != 'string') {
+        plugins.beautylog.error('no question specified');
+        return null;
     }
-}
+    //make inquirer compatible question object
+    var question = {
+        type: "input",
+        name: "userFeedback",
+        message: questionString,
+        validate: function( value ) {
+            return true;
+        }
+    };
+
+    plugins.inquirer.prompt([question],function(answers){
+        var answer = answers.userFeedback;
+        cb(answer);
+    });
+};
+
+/**
+ *
+ * @param questionString
+ * @param choiceOptions
+ * @param cb
+ * @returns {null}
+ */
+export let getChoice = function(questionString:string, choiceOptions:string[], cb) {
+    if(!Array.isArray(choiceOptions)) {
+        return null;
+    }
+
+    //make inquirer compatible question object
+    var question = {
+        type: "list",
+        name: "userFeedback",
+        message: questionString,
+        choices: choiceOptions,
+        filter: function( val ) { return val.toLowerCase(); }
+    };
+
+    plugins.inquirer.prompt(question,function(answers){
+        var answer = answers.userFeedback;
+        cb(answer);
+    });
+
+};

ts/smartcli.interfaces.ts

@@ -1,5 +1,3 @@
-/// <reference path="typings/main.d.ts" />
-
 interface CliOption {
     name: string;
     specified:boolean;

ts/typings.json

@@ -1,5 +1,6 @@
 {
   "ambientDependencies": {
+    "mocha": "registry:dt/mocha#2.2.5+20151023103246",
     "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts"
   }
 }

ts/typings/browser.d.ts

@@ -1 +1,2 @@
-/// <reference path="browser/ambient/node/node.d.ts" />
+/// <reference path="browser/ambient/mocha/index.d.ts" />
+/// <reference path="browser/ambient/node/index.d.ts" />

ts/typings/main.d.ts

@@ -1 +1,2 @@
-/// <reference path="main/ambient/node/node.d.ts" />
+/// <reference path="main/ambient/mocha/index.d.ts" />
+/// <reference path="main/ambient/node/index.d.ts" />