restructure code and make remote and local file delivery conform

dist/index.js

@@ -2,15 +2,17 @@
 "use strict";
 var SmartfileChecks = require("./smartfile.checks");
 var SmartfileFsaction = require("./smartfile.fsaction");
+var SmartfileGet = require("./smartfile.get");
 var SmartfileLocal = require("./smartfile.local");
 var SmartfileRemote = require("./smartfile.remote");
 var smartfile = {
     fsaction: SmartfileFsaction,
     checks: SmartfileChecks,
+    get: SmartfileGet,
     local: SmartfileLocal,
     remote: SmartfileRemote,
     requireReload: SmartfileLocal.requireReload
 };
 module.exports = smartfile;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0Qzs7QUFHNUMsSUFBTyxlQUFlLFdBQVcsb0JBQW9CLENBQUMsQ0FBQztBQUN2RCxJQUFPLGlCQUFpQixXQUFXLHNCQUFzQixDQUFDLENBQUM7QUFDM0QsSUFBTyxjQUFjLFdBQVcsbUJBQW1CLENBQUMsQ0FBQztBQUNyRCxJQUFPLGVBQWUsV0FBVyxvQkFBb0IsQ0FBQyxDQUFDO0FBR3ZELElBQUksU0FBUyxHQUFPO0lBQ2hCLFFBQVEsRUFBRSxpQkFBaUI7SUFDM0IsTUFBTSxFQUFFLGVBQWU7SUFDdkIsS0FBSyxFQUFFLGNBQWM7SUFDckIsTUFBTSxFQUFFLGVBQWU7SUFDdkIsYUFBYSxFQUFFLGNBQWMsQ0FBQyxhQUFhO0NBQzlDLENBQUM7QUFFRixpQkFBUyxTQUFTLENBQUMiLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XG5cbmltcG9ydCBwbHVnaW5zID0gcmVxdWlyZShcIi4vc21hcnRmaWxlLnBsdWdpbnNcIik7XG5pbXBvcnQgU21hcnRmaWxlQ2hlY2tzID0gcmVxdWlyZShcIi4vc21hcnRmaWxlLmNoZWNrc1wiKTtcbmltcG9ydCBTbWFydGZpbGVGc2FjdGlvbiA9IHJlcXVpcmUoXCIuL3NtYXJ0ZmlsZS5mc2FjdGlvblwiKTtcbmltcG9ydCBTbWFydGZpbGVMb2NhbCA9IHJlcXVpcmUoXCIuL3NtYXJ0ZmlsZS5sb2NhbFwiKTtcbmltcG9ydCBTbWFydGZpbGVSZW1vdGUgPSByZXF1aXJlKFwiLi9zbWFydGZpbGUucmVtb3RlXCIpO1xuXG5cbnZhciBzbWFydGZpbGU6YW55ID0ge1xuICAgIGZzYWN0aW9uOiBTbWFydGZpbGVGc2FjdGlvbixcbiAgICBjaGVja3M6IFNtYXJ0ZmlsZUNoZWNrcyxcbiAgICBsb2NhbDogU21hcnRmaWxlTG9jYWwsXG4gICAgcmVtb3RlOiBTbWFydGZpbGVSZW1vdGUsXG4gICAgcmVxdWlyZVJlbG9hZDogU21hcnRmaWxlTG9jYWwucmVxdWlyZVJlbG9hZFxufTtcblxuZXhwb3J0ID0gc21hcnRmaWxlO1xuIl0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0Qzs7QUFHNUMsSUFBTyxlQUFlLFdBQVcsb0JBQW9CLENBQUMsQ0FBQztBQUN2RCxJQUFPLGlCQUFpQixXQUFXLHNCQUFzQixDQUFDLENBQUM7QUFDM0QsSUFBTyxZQUFZLFdBQVcsaUJBQWlCLENBQUMsQ0FBQztBQUNqRCxJQUFPLGNBQWMsV0FBVyxtQkFBbUIsQ0FBQyxDQUFDO0FBQ3JELElBQU8sZUFBZSxXQUFXLG9CQUFvQixDQUFDLENBQUM7QUFHdkQsSUFBSSxTQUFTLEdBQU87SUFDaEIsUUFBUSxFQUFFLGlCQUFpQjtJQUMzQixNQUFNLEVBQUUsZUFBZTtJQUN2QixHQUFHLEVBQUUsWUFBWTtJQUNqQixLQUFLLEVBQUUsY0FBYztJQUNyQixNQUFNLEVBQUUsZUFBZTtJQUN2QixhQUFhLEVBQUUsY0FBYyxDQUFDLGFBQWE7Q0FDOUMsQ0FBQztBQUVGLGlCQUFTLFNBQVMsQ0FBQyIsImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cblxuaW1wb3J0IHBsdWdpbnMgPSByZXF1aXJlKFwiLi9zbWFydGZpbGUucGx1Z2luc1wiKTtcbmltcG9ydCBTbWFydGZpbGVDaGVja3MgPSByZXF1aXJlKFwiLi9zbWFydGZpbGUuY2hlY2tzXCIpO1xuaW1wb3J0IFNtYXJ0ZmlsZUZzYWN0aW9uID0gcmVxdWlyZShcIi4vc21hcnRmaWxlLmZzYWN0aW9uXCIpO1xuaW1wb3J0IFNtYXJ0ZmlsZUdldCA9IHJlcXVpcmUoXCIuL3NtYXJ0ZmlsZS5nZXRcIik7XG5pbXBvcnQgU21hcnRmaWxlTG9jYWwgPSByZXF1aXJlKFwiLi9zbWFydGZpbGUubG9jYWxcIik7XG5pbXBvcnQgU21hcnRmaWxlUmVtb3RlID0gcmVxdWlyZShcIi4vc21hcnRmaWxlLnJlbW90ZVwiKTtcblxuXG52YXIgc21hcnRmaWxlOmFueSA9IHtcbiAgICBmc2FjdGlvbjogU21hcnRmaWxlRnNhY3Rpb24sXG4gICAgY2hlY2tzOiBTbWFydGZpbGVDaGVja3MsXG4gICAgZ2V0OiBTbWFydGZpbGVHZXQsXG4gICAgbG9jYWw6IFNtYXJ0ZmlsZUxvY2FsLFxuICAgIHJlbW90ZTogU21hcnRmaWxlUmVtb3RlLFxuICAgIHJlcXVpcmVSZWxvYWQ6IFNtYXJ0ZmlsZUxvY2FsLnJlcXVpcmVSZWxvYWRcbn07XG5cbmV4cG9ydCA9IHNtYXJ0ZmlsZTtcbiJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==

dist/smartfile.get.js

@@ -0,0 +1,10 @@
+"use strict";
+/// <reference path="./typings/main.d.ts" />
+var plugins = require("./smartfile.plugins");
+exports.filetype = function (pathArg) {
+    var extName = plugins.path.extname(pathArg);
+    var fileType = extName.replace(/\.([a-z]*)/, "$1"); //remove . form fileType
+    return fileType;
+};
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0ZmlsZS5nZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDRDQUE0QztBQUM1QyxJQUFPLE9BQU8sV0FBVyxxQkFBcUIsQ0FBQyxDQUFDO0FBRXJDLGdCQUFRLEdBQUcsVUFBUyxPQUFjO0lBQ3pDLElBQUksT0FBTyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzVDLElBQUksUUFBUSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsd0JBQXdCO0lBQzNFLE1BQU0sQ0FBQyxRQUFRLENBQUM7QUFDcEIsQ0FBQyxDQUFDIiwiZmlsZSI6InNtYXJ0ZmlsZS5nZXQuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XG5pbXBvcnQgcGx1Z2lucyA9IHJlcXVpcmUoXCIuL3NtYXJ0ZmlsZS5wbHVnaW5zXCIpO1xuXG5leHBvcnQgbGV0IGZpbGV0eXBlID0gZnVuY3Rpb24ocGF0aEFyZzpzdHJpbmcpOnN0cmluZyB7XG4gICAgbGV0IGV4dE5hbWUgPSBwbHVnaW5zLnBhdGguZXh0bmFtZShwYXRoQXJnKTtcbiAgICBsZXQgZmlsZVR5cGUgPSBleHROYW1lLnJlcGxhY2UoL1xcLihbYS16XSopLyxcIiQxXCIpOyAvL3JlbW92ZSAuIGZvcm0gZmlsZVR5cGVcbiAgICByZXR1cm4gZmlsZVR5cGU7XG59OyJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==

dist/smartfile.interpreter.js

@@ -0,0 +1,17 @@
+/// <reference path="./typings/main.d.ts" />
+"use strict";
+var plugins = require("./smartfile.plugins");
+module.exports = function (fileStringArg, fileTypeArg) {
+    switch (fileTypeArg) {
+        case "yml":
+        case "yaml":
+            return plugins.yaml.safeLoad(fileStringArg);
+        case "json":
+            return JSON.parse(fileStringArg);
+        default:
+            plugins.beautylog.error("file type " + fileTypeArg.blue + " not supported");
+            break;
+    }
+};
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0ZmlsZS5pbnRlcnByZXRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSw0Q0FBNEM7O0FBRTVDLElBQU8sT0FBTyxXQUFXLHFCQUFxQixDQUFDLENBQUM7QUFFaEQsaUJBQVMsVUFBUyxhQUFvQixFQUFFLFdBQVc7SUFDL0MsTUFBTSxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztRQUNsQixLQUFLLEtBQUssQ0FBRTtRQUNaLEtBQUssTUFBTTtZQUNQLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNoRCxLQUFLLE1BQU07WUFDUCxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNyQztZQUNJLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLFlBQVksR0FBRyxXQUFXLENBQUMsSUFBSSxHQUFHLGdCQUFnQixDQUFDLENBQUM7WUFDNUUsS0FBSyxDQUFDO0lBQ2QsQ0FBQztBQUNMLENBQUMsQ0FBQSIsImZpbGUiOiJzbWFydGZpbGUuaW50ZXJwcmV0ZXIuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XG5cbmltcG9ydCBwbHVnaW5zID0gcmVxdWlyZShcIi4vc21hcnRmaWxlLnBsdWdpbnNcIik7XG5cbmV4cG9ydCA9IGZ1bmN0aW9uKGZpbGVTdHJpbmdBcmc6c3RyaW5nLCBmaWxlVHlwZUFyZyl7XG4gICAgc3dpdGNoIChmaWxlVHlwZUFyZykge1xuICAgICAgICBjYXNlIFwieW1sXCIgOlxuICAgICAgICBjYXNlIFwieWFtbFwiOlxuICAgICAgICAgICAgcmV0dXJuIHBsdWdpbnMueWFtbC5zYWZlTG9hZChmaWxlU3RyaW5nQXJnKTtcbiAgICAgICAgY2FzZSBcImpzb25cIjpcbiAgICAgICAgICAgIHJldHVybiBKU09OLnBhcnNlKGZpbGVTdHJpbmdBcmcpO1xuICAgICAgICBkZWZhdWx0OlxuICAgICAgICAgICAgcGx1Z2lucy5iZWF1dHlsb2cuZXJyb3IoXCJmaWxlIHR5cGUgXCIgKyBmaWxlVHlwZUFyZy5ibHVlICsgXCIgbm90IHN1cHBvcnRlZFwiKTtcbiAgICAgICAgICAgIGJyZWFrO1xuICAgIH1cbn0iXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=

ts/index.ts

@@ -3,6 +3,7 @@
 import plugins = require("./smartfile.plugins");
 import SmartfileChecks = require("./smartfile.checks");
 import SmartfileFsaction = require("./smartfile.fsaction");
+import SmartfileGet = require("./smartfile.get");
 import SmartfileLocal = require("./smartfile.local");
 import SmartfileRemote = require("./smartfile.remote");
 
@@ -10,6 +11,7 @@ import SmartfileRemote = require("./smartfile.remote");
 var smartfile:any = {
     fsaction: SmartfileFsaction,
     checks: SmartfileChecks,
+    get: SmartfileGet,
     local: SmartfileLocal,
     remote: SmartfileRemote,
     requireReload: SmartfileLocal.requireReload

ts/smartfile.get.ts

@@ -0,0 +1,8 @@
+/// <reference path="./typings/main.d.ts" />
+import plugins = require("./smartfile.plugins");
+
+export let filetype = function(pathArg:string):string {
+    let extName = plugins.path.extname(pathArg);
+    let fileType = extName.replace(/\.([a-z]*)/,"$1"); //remove . form fileType
+    return fileType;
+};

ts/smartfile.interpreter.ts

@@ -0,0 +1,16 @@
+/// <reference path="./typings/main.d.ts" />
+
+import plugins = require("./smartfile.plugins");
+
+export = function(fileStringArg:string, fileTypeArg){
+    switch (fileTypeArg) {
+        case "yml" :
+        case "yaml":
+            return plugins.yaml.safeLoad(fileStringArg);
+        case "json":
+            return JSON.parse(fileStringArg);
+        default:
+            plugins.beautylog.error("file type " + fileTypeArg.blue + " not supported");
+            break;
+    }
+}

ts/smartfile.local.ts

@@ -1,7 +1,8 @@
 /// <reference path="./typings/main.d.ts" />
 
 import plugins = require("./smartfile.plugins");
-
+import SmartfileGet = require("./smartfile.get");
+import SmartfileInterpreter = require("./smartfile.interpreter");
 export let toFS = function(options:{from:string,toPath:string}, cb=undefined){
     
 };
@@ -22,33 +23,15 @@ export let toGulpDestSync = function(folderPathArg:string){
 
 /**
  *
- * @param filePath
+ * @param filePathArg
  * @param fileTypeArg
  * @returns {any}
  */
-export let toObjectSync = function(filePath,fileTypeArg = undefined) {
+export let toObjectSync = function(filePathArg,fileTypeArg?) {
+    let fileString = plugins.fs.readFileSync(filePathArg, 'utf8');
     let fileType;
-    if (typeof fileTypeArg == "undefined") {
+    fileTypeArg ? fileType = fileTypeArg : fileType = SmartfileGet.filetype(filePathArg);
-        fileType = plugins.path.extname(filePath);
+    return SmartfileInterpreter(fileString,fileType);
-    } else {
-        fileType = fileTypeArg;
-    }
-    fileType = fileType.replace(/\.([a-z]*)/,"$1"); //remove . form fileType
-    switch (fileType) {
-        case "yml" :
-        case "yaml":
-            try {
-                return plugins.yaml.safeLoad(plugins.fs.readFileSync(filePath, 'utf8'));
-            } catch (e){
-                plugins.beautylog.error("check that " + filePath.blue + " points to a valid file");
-            }
-            break;
-        case "json":
-            return plugins.fs.readJsonSync(filePath,{});
-        default:
-            plugins.beautylog.error("file type " + fileType.blue + " not supported");
-            break;
-    }
 };
 
 /**

ts/smartfile.remote.ts

@@ -1,5 +1,7 @@
 /// <reference path="./typings/main.d.ts" />
 import plugins = require("./smartfile.plugins");
+import SmartfileInterpreter = require("./smartfile.interpreter");
+import SmartfileGet = require("./smartfile.get");
 
 export let toFs = function(from:string,toPath:string) {
     var done = plugins.q.defer();
@@ -30,14 +32,14 @@ export let toGulpStreamSync = function(filePathArg:string,baseArg:string){
 export let toObject = function(fromArg:string){
     let done = plugins.q.defer();
     plugins.request.get(fromArg, function (error, response, bodyString) {
-        let jsonObject;
+        let returnObject;
         if (!error && response.statusCode == 200) {
-            jsonObject = JSON.parse(bodyString);
+            returnObject = SmartfileInterpreter(bodyString,SmartfileGet.filetype(fromArg));
-            done.resolve(jsonObject);
+            done.resolve(returnObject);
         } else {
             console.log('could not get remote file from ' + fromArg);
-            jsonObject = undefined;
+            returnObject = undefined;
-            done.reject(jsonObject);
+            done.reject(returnObject);
         };
     });
     return done.promise;
@@ -54,7 +56,7 @@ export let toString = (fromArg:string) => {
         if (!error && response.statusCode == 200) {
             done.resolve(bodyString);
         } else {
-            plugins.beautylog.error('could not get get remote file from ' + fromArg);
+            plugins.beautylog.error('could not get remote file from ' + fromArg);
             bodyString = undefined;
             done.reject(bodyString);
         };