From 791692955003bb8ded49014111a25f5df9340417 Mon Sep 17 00:00:00 2001 From: PhilKunz Date: Sat, 26 Nov 2016 22:46:36 +0100 Subject: [PATCH] added Smartpath class and path level array --- dist/index.d.ts | 19 +-- dist/index.js | 26 ++--- dist/smartpath.classes.smartpath.d.ts | 8 ++ dist/smartpath.classes.smartpath.js | 12 ++ dist/smartpath.get.d.ts | 7 +- dist/smartpath.get.js | 17 ++- dist/smartpath.plugins.d.ts | 1 - dist/smartpath.plugins.js | 3 +- dist/smartpath.transform.js | 4 +- package.json | 6 +- test/test.d.ts | 3 +- test/test.js | 102 ++++++++-------- test/test.ts | 160 ++++++++++++++------------ ts/index.ts | 24 ++-- ts/smartpath.classes.smartpath.ts | 15 +++ ts/smartpath.get.ts | 38 ++++-- ts/smartpath.plugins.ts | 1 - ts/smartpath.transform.ts | 2 +- 18 files changed, 250 insertions(+), 198 deletions(-) create mode 100644 dist/smartpath.classes.smartpath.d.ts create mode 100644 dist/smartpath.classes.smartpath.js create mode 100644 ts/smartpath.classes.smartpath.ts diff --git a/dist/index.d.ts b/dist/index.d.ts index 38fb428..e555dbb 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -1,14 +1,5 @@ -import 'typings-global'; -import SmartpathCheck = require('./smartpath.check'); -import SmartpathGet = require('./smartpath.get'); -import SmartpathTransform = require('./smartpath.transform'); -/** - * - * @type {{getPath: (function(any): undefined)}} - */ -declare let smartpath: { - check: typeof SmartpathCheck; - get: typeof SmartpathGet; - transform: typeof SmartpathTransform; -}; -export = smartpath; +import check = require('./smartpath.check'); +import get = require('./smartpath.get'); +import transform = require('./smartpath.transform'); +export { check, get, transform }; +export * from './smartpath.classes.smartpath'; diff --git a/dist/index.js b/dist/index.js index e4bc0ee..20fc378 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,17 +1,13 @@ "use strict"; -require("typings-global"); +function __export(m) { + for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; +} // import modules -const SmartpathCheck = require("./smartpath.check"); -const SmartpathGet = require("./smartpath.get"); -const SmartpathTransform = require("./smartpath.transform"); -/** - * - * @type {{getPath: (function(any): undefined)}} - */ -let smartpath = { - check: SmartpathCheck, - get: SmartpathGet, - transform: SmartpathTransform -}; -module.exports = smartpath; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBR3ZCLGlCQUFpQjtBQUNqQixvREFBb0Q7QUFDcEQsZ0RBQWdEO0FBQ2hELDREQUE0RDtBQUU1RDs7O0dBR0c7QUFDSCxJQUFJLFNBQVMsR0FBRztJQUNaLEtBQUssRUFBRSxjQUFjO0lBQ3JCLEdBQUcsRUFBRSxZQUFZO0lBQ2pCLFNBQVMsRUFBRSxrQkFBa0I7Q0FDaEMsQ0FBQTtBQUVELGlCQUFTLFNBQVMsQ0FBQSJ9 \ No newline at end of file +const check = require("./smartpath.check"); +exports.check = check; +const get = require("./smartpath.get"); +exports.get = get; +const transform = require("./smartpath.transform"); +exports.transform = transform; +__export(require("./smartpath.classes.smartpath")); +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsaUJBQWlCO0FBQ2pCLDJDQUEyQztBQU12QyxzQkFBSztBQUxULHVDQUF1QztBQU1uQyxrQkFBRztBQUxQLG1EQUFtRDtBQU0vQyw4QkFBUztBQUdiLG1EQUE2QyJ9 \ No newline at end of file diff --git a/dist/smartpath.classes.smartpath.d.ts b/dist/smartpath.classes.smartpath.d.ts new file mode 100644 index 0000000..a8034b7 --- /dev/null +++ b/dist/smartpath.classes.smartpath.d.ts @@ -0,0 +1,8 @@ +import * as getMod from './smartpath.get'; +export declare class Smartpath { + originalPath: string; + type: getMod.TPathType; + pathLevels: string[]; + pathLevelsBackwards: string[]; + constructor(pathArg: string); +} diff --git a/dist/smartpath.classes.smartpath.js b/dist/smartpath.classes.smartpath.js new file mode 100644 index 0000000..e03c561 --- /dev/null +++ b/dist/smartpath.classes.smartpath.js @@ -0,0 +1,12 @@ +"use strict"; +const getMod = require("./smartpath.get"); +class Smartpath { + constructor(pathArg) { + this.originalPath = pathArg; + this.type = getMod.type(this.originalPath); + this.pathLevels = getMod.pathLevels(this.originalPath); + this.pathLevelsBackwards = getMod.pathLevelsBackwards(this.originalPath); + } +} +exports.Smartpath = Smartpath; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRwYXRoLmNsYXNzZXMuc21hcnRwYXRoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRwYXRoLmNsYXNzZXMuc21hcnRwYXRoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSwwQ0FBeUM7QUFFekM7SUFLSSxZQUFZLE9BQWU7UUFDdkIsSUFBSSxDQUFDLFlBQVksR0FBRyxPQUFPLENBQUE7UUFDM0IsSUFBSSxDQUFDLElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQTtRQUMxQyxJQUFJLENBQUMsVUFBVSxHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFBO1FBQ3RELElBQUksQ0FBQyxtQkFBbUIsR0FBRyxNQUFNLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQzVFLENBQUM7Q0FDSjtBQVhELDhCQVdDIn0= \ No newline at end of file diff --git a/dist/smartpath.get.d.ts b/dist/smartpath.get.d.ts index 0ab2237..dd704dd 100644 --- a/dist/smartpath.get.d.ts +++ b/dist/smartpath.get.d.ts @@ -1,6 +1,9 @@ -import "typings-global"; +export declare type TPathType = 'url' | 'local'; /** * returns the type of the given path. Can be "url" or "local" */ -export declare let type: (pathStringArg: string) => string; +export declare let type: (pathStringArg: string) => TPathType; export declare let home: (pathArgument?: string) => any; +export declare type TSystemArg = 'dynamic' | 'windows' | 'linux' | 'osx'; +export declare let pathLevels: (pathArg: string, systemArg?: TSystemArg) => string[]; +export declare let pathLevelsBackwards: (pathArg: string, systemArg?: TSystemArg) => string[]; diff --git a/dist/smartpath.get.js b/dist/smartpath.get.js index 91cd571..943d8e3 100644 --- a/dist/smartpath.get.js +++ b/dist/smartpath.get.js @@ -1,5 +1,4 @@ "use strict"; -require("typings-global"); const plugins = require("./smartpath.plugins"); /** * returns the type of the given path. Can be "url" or "local" @@ -7,10 +6,10 @@ const plugins = require("./smartpath.plugins"); exports.type = function (pathStringArg) { let urlRegex = /http[s|\s]:\/\/.*/i; if (urlRegex.exec(pathStringArg)) { - return "url"; + return 'url'; } else { - return "local"; + return 'local'; } ; }; @@ -22,4 +21,14 @@ exports.home = function (pathArgument) { return plugins.home(); } }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRwYXRoLmdldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0cGF0aC5nZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF3QjtBQUN4QiwrQ0FBZ0Q7QUFFaEQ7O0dBRUc7QUFDUSxRQUFBLElBQUksR0FBRyxVQUFTLGFBQW9CO0lBQzNDLElBQUksUUFBUSxHQUFHLG9CQUFvQixDQUFBO0lBQ25DLEVBQUUsQ0FBQSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQSxDQUFDO1FBQzdCLE1BQU0sQ0FBQyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ0osTUFBTSxDQUFDLE9BQU8sQ0FBQztJQUNuQixDQUFDO0lBQUEsQ0FBQztBQUNOLENBQUMsQ0FBQztBQUVTLFFBQUEsSUFBSSxHQUFHLFVBQVMsWUFBb0I7SUFDM0MsRUFBRSxDQUFBLENBQUMsWUFBWSxDQUFDLENBQUEsQ0FBQztRQUNiLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDO0lBQzFCLENBQUM7QUFDTCxDQUFDLENBQUMifQ== \ No newline at end of file +exports.pathLevels = (pathArg, systemArg = 'dynamic') => { + let pathLevelArray; + if (systemArg === 'dynamic') { + pathLevelArray = pathArg.split(plugins.path.sep); + } + return pathLevelArray; +}; +exports.pathLevelsBackwards = (pathArg, systemArg) => { + return exports.pathLevels(pathArg, systemArg).reverse(); +}; +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRwYXRoLmdldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0cGF0aC5nZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLCtDQUErQztBQUcvQzs7R0FFRztBQUNRLFFBQUEsSUFBSSxHQUFHLFVBQVUsYUFBcUI7SUFDN0MsSUFBSSxRQUFRLEdBQUcsb0JBQW9CLENBQUE7SUFDbkMsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDL0IsTUFBTSxDQUFDLEtBQUssQ0FBQTtJQUNoQixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixNQUFNLENBQUMsT0FBTyxDQUFBO0lBQ2xCLENBQUM7SUFBQSxDQUFDO0FBQ04sQ0FBQyxDQUFBO0FBRVUsUUFBQSxJQUFJLEdBQUcsVUFBVSxZQUFxQjtJQUM3QyxFQUFFLENBQUMsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO1FBQ2YsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQzdDLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDekIsQ0FBQztBQUNMLENBQUMsQ0FBQTtBQUlVLFFBQUEsVUFBVSxHQUFHLENBQUMsT0FBZSxFQUFFLFlBQXdCLFNBQVM7SUFDdkUsSUFBSSxjQUF3QixDQUFBO0lBQzVCLEVBQUUsQ0FBQyxDQUFDLFNBQVMsS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDO1FBQzFCLGNBQWMsR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDcEQsQ0FBQztJQUNELE1BQU0sQ0FBQyxjQUFjLENBQUE7QUFDekIsQ0FBQyxDQUFBO0FBRVUsUUFBQSxtQkFBbUIsR0FBRyxDQUFDLE9BQWUsRUFBRSxTQUFzQjtJQUNyRSxNQUFNLENBQUMsa0JBQVUsQ0FBQyxPQUFPLEVBQUUsU0FBUyxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUE7QUFDbkQsQ0FBQyxDQUFBIn0= \ No newline at end of file diff --git a/dist/smartpath.plugins.d.ts b/dist/smartpath.plugins.d.ts index 018b4af..e7c70ca 100644 --- a/dist/smartpath.plugins.d.ts +++ b/dist/smartpath.plugins.d.ts @@ -1,4 +1,3 @@ import 'typings-global'; -export import beautylog = require('beautylog'); export declare var home: any; export import path = require('path'); diff --git a/dist/smartpath.plugins.js b/dist/smartpath.plugins.js index f0d8083..3731417 100644 --- a/dist/smartpath.plugins.js +++ b/dist/smartpath.plugins.js @@ -1,6 +1,5 @@ "use strict"; require("typings-global"); -exports.beautylog = require("beautylog"); exports.home = require('home'); exports.path = require("path"); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRwYXRoLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHBhdGgucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLHlDQUErQztBQUNwQyxRQUFBLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUE7QUFDakMsK0JBQW9DIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRwYXRoLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHBhdGgucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ1osUUFBQSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0FBQ2pDLCtCQUFvQyJ9 \ No newline at end of file diff --git a/dist/smartpath.transform.js b/dist/smartpath.transform.js index 24af46d..a79fd53 100644 --- a/dist/smartpath.transform.js +++ b/dist/smartpath.transform.js @@ -35,9 +35,9 @@ exports.toAbsolute = function (relativeArg, baseArg) { return absoluteArray; } else { - plugins.beautylog.error('smartpath.absolute() could not make sense of the input. ' + + console.error('smartpath.absolute() could not make sense of the input. ' + 'Input is neither String nor Array'); return false; } }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRwYXRoLnRyYW5zZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0cGF0aC50cmFuc2Zvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUN2QiwrQ0FBK0M7QUFFL0M7O2dEQUVnRDtBQUVoRCxpQkFBaUI7QUFDakIsSUFBSSxZQUFZLEdBQUcsVUFBUyxZQUFvQixFQUFFLE9BQWdCO0lBQzlELElBQUksWUFBb0IsQ0FBQTtJQUN4QixJQUFJLGVBQWUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUMzRCxFQUFFLENBQUMsQ0FBQyxPQUFPLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO1FBQzlCLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUMsWUFBWSxDQUFDLENBQUE7SUFDMUQsQ0FBQztJQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUM7UUFDekIsWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQ3RELENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLFlBQVksR0FBRyxZQUFZLENBQUE7SUFDL0IsQ0FBQztJQUNELE1BQU0sQ0FBQyxZQUFZLENBQUE7QUFDdkIsQ0FBQyxDQUFBO0FBRUQ7O2dEQUVnRDtBQUNyQyxRQUFBLFVBQVUsR0FBRyxVQUFTLFdBQThCLEVBQUUsT0FBZ0I7SUFDN0UsRUFBRSxDQUFDLENBQUMsT0FBTyxXQUFXLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNsQyxNQUFNLENBQUMsWUFBWSxDQUFDLFdBQVcsRUFBQyxPQUFPLENBQUMsQ0FBQTtJQUM1QyxDQUFDO0lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3BDLElBQUksYUFBYSxHQUFHLFdBQVcsQ0FBQTtRQUMvQixJQUFJLGFBQWEsR0FBYSxFQUFFLENBQUE7UUFDaEMsR0FBRyxDQUFDLENBQUMsSUFBSSxHQUFHLElBQUksYUFBYSxDQUFDLENBQUMsQ0FBQztZQUM1QixhQUFhLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLEVBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQTtRQUNoRSxDQUFDO1FBQ0QsTUFBTSxDQUFDLGFBQWEsQ0FBQTtJQUN4QixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQywwREFBMEQ7WUFDOUUsbUNBQW1DLENBQUMsQ0FBQTtRQUN4QyxNQUFNLENBQUMsS0FBSyxDQUFBO0lBQ2hCLENBQUM7QUFDTCxDQUFDLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRwYXRoLnRyYW5zZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0cGF0aC50cmFuc2Zvcm0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUN2QiwrQ0FBK0M7QUFFL0M7O2dEQUVnRDtBQUVoRCxpQkFBaUI7QUFDakIsSUFBSSxZQUFZLEdBQUcsVUFBUyxZQUFvQixFQUFFLE9BQWdCO0lBQzlELElBQUksWUFBb0IsQ0FBQTtJQUN4QixJQUFJLGVBQWUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUMzRCxFQUFFLENBQUMsQ0FBQyxPQUFPLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO1FBQzlCLFlBQVksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUMsWUFBWSxDQUFDLENBQUE7SUFDMUQsQ0FBQztJQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUM7UUFDekIsWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQ3RELENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNKLFlBQVksR0FBRyxZQUFZLENBQUE7SUFDL0IsQ0FBQztJQUNELE1BQU0sQ0FBQyxZQUFZLENBQUE7QUFDdkIsQ0FBQyxDQUFBO0FBRUQ7O2dEQUVnRDtBQUNyQyxRQUFBLFVBQVUsR0FBRyxVQUFTLFdBQThCLEVBQUUsT0FBZ0I7SUFDN0UsRUFBRSxDQUFDLENBQUMsT0FBTyxXQUFXLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztRQUNsQyxNQUFNLENBQUMsWUFBWSxDQUFDLFdBQVcsRUFBQyxPQUFPLENBQUMsQ0FBQTtJQUM1QyxDQUFDO0lBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3BDLElBQUksYUFBYSxHQUFHLFdBQVcsQ0FBQTtRQUMvQixJQUFJLGFBQWEsR0FBYSxFQUFFLENBQUE7UUFDaEMsR0FBRyxDQUFDLENBQUMsSUFBSSxHQUFHLElBQUksYUFBYSxDQUFDLENBQUMsQ0FBQztZQUM1QixhQUFhLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLEVBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQTtRQUNoRSxDQUFDO1FBQ0QsTUFBTSxDQUFDLGFBQWEsQ0FBQTtJQUN4QixDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDSixPQUFPLENBQUMsS0FBSyxDQUFDLDBEQUEwRDtZQUNwRSxtQ0FBbUMsQ0FBQyxDQUFBO1FBQ3hDLE1BQU0sQ0FBQyxLQUFLLENBQUE7SUFDaEIsQ0FBQztBQUNMLENBQUMsQ0FBQSJ9 \ No newline at end of file diff --git a/package.json b/package.json index f394c9f..0d025cb 100644 --- a/package.json +++ b/package.json @@ -23,13 +23,13 @@ }, "homepage": "https://github.com/pushrocks/smartpath", "dependencies": { - "beautylog": "^5.0.23", "home": "^1.0.1", "typings-global": "^1.0.14" }, "devDependencies": { - "npmts-g": "^5.2.8", - "should": "^11.1.0", + "@types/should": "^8.1.30", + "npmts-g": "^5.2.10", + "should": "^11.1.1", "typings-test": "^1.0.3" } } diff --git a/test/test.d.ts b/test/test.d.ts index b973566..2fd432a 100644 --- a/test/test.d.ts +++ b/test/test.d.ts @@ -1,2 +1 @@ -import "typings-test"; -import "should"; +import 'typings-test'; diff --git a/test/test.js b/test/test.js index 52372f6..7063da8 100644 --- a/test/test.js +++ b/test/test.js @@ -1,77 +1,79 @@ "use strict"; require("typings-test"); -require("should"); -let smartpath = require("../dist/index.js"); -describe("smartpath", function () { - describe(".check", function () { - let filePathString = "./somedir/somefile.json"; - let dirPathString = "./somedir/anotherdir"; - let dirPathString2 = "./somedir/another.dir/"; - describe(".isFile", function () { - it("should be true for a file path", function () { - smartpath.check.isFile(filePathString) - .should.be.true(); +const should = require("should"); +const smartpath = require("../dist/index.js"); +describe('smartpath', function () { + describe('class Smartpath', function () { + let mySmartpath; + it('should create a valid instance', function () { + mySmartpath = new smartpath.Smartpath('/some/path/to/some.file'); + should(mySmartpath).be.instanceof(smartpath.Smartpath); + should(mySmartpath.pathLevelsBackwards).be.of.length(5); + }); + }); + describe('.check', function () { + let filePathString = './somedir/somefile.json'; + let dirPathString = './somedir/anotherdir'; + let dirPathString2 = './somedir/another.dir/'; + describe('.isFile', function () { + it('should be true for a file path', function () { + should(smartpath.check.isFile(filePathString)).be.true(); }); - it("should be false for a directory path", function () { - smartpath.check.isFile(dirPathString) - .should.be.false(); - smartpath.check.isFile(dirPathString2) - .should.be.false(); + it('should be false for a directory path', function () { + should(smartpath.check.isFile(dirPathString)).be.false(); + should(smartpath.check.isFile(dirPathString2)).be.false(); }); }); - describe(".isDir", function () { - it("should be true for a directory path", function () { - smartpath.check.isDir(dirPathString) - .should.be.true(); - smartpath.check.isDir(dirPathString2) - .should.be.true(); + describe('.isDir', function () { + it('should be true for a directory path', function () { + should(smartpath.check.isDir(dirPathString)).be.true(); + should(smartpath.check.isDir(dirPathString2)).be.true(); }); - it("should be false for a file path", function () { - smartpath.check.isDir(filePathString) - .should.be.false(); + it('should be false for a file path', function () { + should(smartpath.check.isDir(filePathString)).be.false(); }); }); }); - describe(".transform", function () { - describe("toAbsolute()", function () { - let baseString = "/basedir"; - let relativeString = "somedir/somefile.txt"; - let relativeString2 = "anotherdir/anotherfile.txt"; + describe('.transform', function () { + describe('toAbsolute()', function () { + let baseString = '/basedir'; + let relativeString = 'somedir/somefile.txt'; + let relativeString2 = 'anotherdir/anotherfile.txt'; let relativeArray = [relativeString, relativeString, relativeString2]; - it("should make a string absolute", function () { - smartpath.transform.toAbsolute(relativeString).should.startWith("/"); - smartpath.transform.toAbsolute(relativeString).should.endWith(relativeString); - smartpath.transform.toAbsolute(relativeString, baseString).should.equal("/basedir/somedir/somefile.txt"); + it('should make a string absolute', function () { + should(smartpath.transform.toAbsolute(relativeString)).startWith('/'); + should(smartpath.transform.toAbsolute(relativeString)).endWith(relativeString); + should(smartpath.transform.toAbsolute(relativeString, baseString)).equal('/basedir/somedir/somefile.txt'); }); - it("should make an array of relative Strings an Array of absolute Strings", function () { + it('should make an array of relative Strings an Array of absolute Strings', function () { let absoluteArray = smartpath.transform.toAbsolute(relativeArray, baseString); - absoluteArray[2].should.startWith("/"); - absoluteArray[2].should.endWith(relativeString2); + should(absoluteArray[2]).startWith('/'); + should(absoluteArray[2]).endWith(relativeString2); }); - it("should return false if neither String nor Array", function () { - smartpath.transform.toAbsolute(3).should.be.false(); + it('should return false if neither String nor Array', function () { + should(smartpath.transform.toAbsolute(3)).be.false(); }); }); }); - describe(".get", function () { - describe(".type()", function () { + describe('.get', function () { + describe('.type()', function () { it("should return 'url' for an URL", function () { - smartpath.get.type("https://push.rocks/some/url").should.equal("url"); - smartpath.get.type("https://push.rocks/some/url").should.not.equal("local"); + should(smartpath.get.type('https://push.rocks/some/url')).equal('url'); + should(smartpath.get.type('https://push.rocks/some/url')).not.equal('local'); }); it("should return 'path' for a Path", function () { - smartpath.get.type("/some/absolute/path/").should.equal("local"); - smartpath.get.type("./some/relative/path/").should.not.equal("url"); + should(smartpath.get.type('/some/absolute/path/')).equal('local'); + should(smartpath.get.type('./some/relative/path/')).not.equal('url'); }); }); - describe(".get()", function () { - it("should a absolute path for an home relative URL", function () { - console.log(smartpath.get.home("~/test")); + describe('.get()', function () { + it('should a absolute path for an home relative URL', function () { + console.log(smartpath.get.home('~/test')); }); - it("should return the home directory path when no argument is specified", function () { + it('should return the home directory path when no argument is specified', function () { console.log(smartpath.get.home()); }); }); }); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFzQjtBQUN0QixrQkFBZ0I7QUFDaEIsSUFBSSxTQUFTLEdBQUcsT0FBTyxDQUFDLGtCQUFrQixDQUFDLENBQUM7QUFFNUMsUUFBUSxDQUFDLFdBQVcsRUFBQztJQUNqQixRQUFRLENBQUMsUUFBUSxFQUFDO1FBQ2QsSUFBSSxjQUFjLEdBQUcseUJBQXlCLENBQUE7UUFDOUMsSUFBSSxhQUFhLEdBQUcsc0JBQXNCLENBQUE7UUFDMUMsSUFBSSxjQUFjLEdBQUcsd0JBQXdCLENBQUE7UUFDN0MsUUFBUSxDQUFDLFNBQVMsRUFBQztZQUNmLEVBQUUsQ0FBQyxnQ0FBZ0MsRUFBQztnQkFDaEMsU0FBUyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDO3FCQUNqQyxNQUFNLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO1lBQzFCLENBQUMsQ0FBQyxDQUFDO1lBQ0gsRUFBRSxDQUFDLHNDQUFzQyxFQUFDO2dCQUN0QyxTQUFTLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUM7cUJBQ2hDLE1BQU0sQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ3ZCLFNBQVMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQztxQkFDakMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUMzQixDQUFDLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQyxDQUFDO1FBQ0gsUUFBUSxDQUFDLFFBQVEsRUFBQztZQUNkLEVBQUUsQ0FBQyxxQ0FBcUMsRUFBQztnQkFDckMsU0FBUyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDO3FCQUMvQixNQUFNLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDO2dCQUN0QixTQUFTLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUM7cUJBQ2hDLE1BQU0sQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDMUIsQ0FBQyxDQUFDLENBQUM7WUFDSCxFQUFFLENBQUMsaUNBQWlDLEVBQUM7Z0JBQ2pDLFNBQVMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQztxQkFDaEMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUMzQixDQUFDLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7SUFDSCxRQUFRLENBQUMsWUFBWSxFQUFDO1FBQ2xCLFFBQVEsQ0FBQyxjQUFjLEVBQUM7WUFDcEIsSUFBSSxVQUFVLEdBQUcsVUFBVSxDQUFDO1lBQzVCLElBQUksY0FBYyxHQUFHLHNCQUFzQixDQUFDO1lBQzVDLElBQUksZUFBZSxHQUFHLDRCQUE0QixDQUFDO1lBQ25ELElBQUksYUFBYSxHQUFHLENBQUMsY0FBYyxFQUFDLGNBQWMsRUFBQyxlQUFlLENBQUMsQ0FBQztZQUNwRSxFQUFFLENBQUMsK0JBQStCLEVBQUM7Z0JBQy9CLFNBQVMsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLGNBQWMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ3JFLFNBQVMsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLGNBQWMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLENBQUM7Z0JBQzlFLFNBQVMsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLGNBQWMsRUFBQyxVQUFVLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLCtCQUErQixDQUFDLENBQUM7WUFDNUcsQ0FBQyxDQUFDLENBQUM7WUFDSCxFQUFFLENBQUMsdUVBQXVFLEVBQUM7Z0JBQ3ZFLElBQUksYUFBYSxHQUFHLFNBQVMsQ0FBQyxTQUFTLENBQUMsVUFBVSxDQUFDLGFBQWEsRUFBQyxVQUFVLENBQUMsQ0FBQztnQkFDN0UsYUFBYSxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ3ZDLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1lBRXJELENBQUMsQ0FBQyxDQUFBO1lBQ0YsRUFBRSxDQUFDLGlEQUFpRCxFQUFDO2dCQUNqRCxTQUFTLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ3hELENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDLENBQUMsQ0FBQztJQUNILFFBQVEsQ0FBQyxNQUFNLEVBQUM7UUFDWixRQUFRLENBQUMsU0FBUyxFQUFDO1lBQ2YsRUFBRSxDQUFDLGdDQUFnQyxFQUFDO2dCQUNoQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUM7Z0JBQ3RFLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLDZCQUE2QixDQUFDLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDaEYsQ0FBQyxDQUFDLENBQUM7WUFDSCxFQUFFLENBQUMsaUNBQWlDLEVBQUM7Z0JBQ2pDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDakUsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsdUJBQXVCLENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUN4RSxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQyxDQUFDO1FBQ0gsUUFBUSxDQUFDLFFBQVEsRUFBQztZQUNkLEVBQUUsQ0FBQyxpREFBaUQsRUFBQztnQkFDakQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1lBQzlDLENBQUMsQ0FBQyxDQUFDO1lBQ0gsRUFBRSxDQUFDLHFFQUFxRSxFQUFDO2dCQUNyRSxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUN0QyxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFDaEMsOENBQTZDO0FBRTdDLFFBQVEsQ0FBQyxXQUFXLEVBQUU7SUFDbEIsUUFBUSxDQUFDLGlCQUFpQixFQUFFO1FBQ3hCLElBQUksV0FBZ0MsQ0FBQTtRQUNwQyxFQUFFLENBQUMsZ0NBQWdDLEVBQUU7WUFDakMsV0FBVyxHQUFHLElBQUksU0FBUyxDQUFDLFNBQVMsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFBO1lBQ2hFLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQTtZQUN0RCxNQUFNLENBQUMsV0FBVyxDQUFDLG1CQUFtQixDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDM0QsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUNGLFFBQVEsQ0FBQyxRQUFRLEVBQUU7UUFDZixJQUFJLGNBQWMsR0FBRyx5QkFBeUIsQ0FBQTtRQUM5QyxJQUFJLGFBQWEsR0FBRyxzQkFBc0IsQ0FBQTtRQUMxQyxJQUFJLGNBQWMsR0FBRyx3QkFBd0IsQ0FBQTtRQUM3QyxRQUFRLENBQUMsU0FBUyxFQUFFO1lBQ2hCLEVBQUUsQ0FBQyxnQ0FBZ0MsRUFBRTtnQkFDakMsTUFBTSxDQUNGLFNBQVMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxDQUN6QyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtZQUNmLENBQUMsQ0FBQyxDQUFBO1lBQ0YsRUFBRSxDQUFDLHNDQUFzQyxFQUFFO2dCQUN2QyxNQUFNLENBQ0YsU0FBUyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQ3hDLENBQUMsRUFBRSxDQUFDLEtBQUssRUFB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 \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index dca0645..d00cfc6 100644 --- a/test/test.ts +++ b/test/test.ts @@ -1,77 +1,89 @@ -import "typings-test"; -import "should"; -let smartpath = require("../dist/index.js"); +import 'typings-test' +import * as should from 'should' +import * as smartpath from '../dist/index.js' -describe("smartpath",function(){ - describe(".check",function(){ - let filePathString = "./somedir/somefile.json" - let dirPathString = "./somedir/anotherdir" - let dirPathString2 = "./somedir/another.dir/" - describe(".isFile",function(){ - it("should be true for a file path",function(){ - smartpath.check.isFile(filePathString) - .should.be.true(); - }); - it("should be false for a directory path",function(){ - smartpath.check.isFile(dirPathString) - .should.be.false(); - smartpath.check.isFile(dirPathString2) - .should.be.false(); - }); - }); - describe(".isDir",function(){ - it("should be true for a directory path",function(){ - smartpath.check.isDir(dirPathString) - .should.be.true(); - smartpath.check.isDir(dirPathString2) - .should.be.true(); - }); - it("should be false for a file path",function(){ - smartpath.check.isDir(filePathString) - .should.be.false(); - }); - }); - }); - describe(".transform",function(){ - describe("toAbsolute()",function(){ - let baseString = "/basedir"; - let relativeString = "somedir/somefile.txt"; - let relativeString2 = "anotherdir/anotherfile.txt"; - let relativeArray = [relativeString,relativeString,relativeString2]; - it("should make a string absolute",function(){ - smartpath.transform.toAbsolute(relativeString).should.startWith("/"); - smartpath.transform.toAbsolute(relativeString).should.endWith(relativeString); - smartpath.transform.toAbsolute(relativeString,baseString).should.equal("/basedir/somedir/somefile.txt"); - }); - it("should make an array of relative Strings an Array of absolute Strings",function(){ - let absoluteArray = smartpath.transform.toAbsolute(relativeArray,baseString); - absoluteArray[2].should.startWith("/"); - absoluteArray[2].should.endWith(relativeString2); +describe('smartpath', function () { + describe('class Smartpath', function() { + let mySmartpath: smartpath.Smartpath + it('should create a valid instance', function() { + mySmartpath = new smartpath.Smartpath('/some/path/to/some.file') + should(mySmartpath).be.instanceof(smartpath.Smartpath) + should(mySmartpath.pathLevelsBackwards).be.of.length(5) + }) + }) + describe('.check', function () { + let filePathString = './somedir/somefile.json' + let dirPathString = './somedir/anotherdir' + let dirPathString2 = './somedir/another.dir/' + describe('.isFile', function () { + it('should be true for a file path', function () { + should( + smartpath.check.isFile(filePathString) + ).be.true() + }) + it('should be false for a directory path', function () { + should( + smartpath.check.isFile(dirPathString) + ).be.false() + should( + smartpath.check.isFile(dirPathString2) + ).be.false() + }) + }) + describe('.isDir', function () { + it('should be true for a directory path', function () { + should(smartpath.check.isDir(dirPathString) + ).be.true() + should(smartpath.check.isDir(dirPathString2) + ).be.true() + }) + it('should be false for a file path', function () { + should( + smartpath.check.isDir(filePathString) + ).be.false() + }) + }) + }) + describe('.transform', function () { + describe('toAbsolute()', function () { + let baseString = '/basedir' + let relativeString = 'somedir/somefile.txt' + let relativeString2 = 'anotherdir/anotherfile.txt' + let relativeArray = [relativeString, relativeString, relativeString2] + it('should make a string absolute', function () { + should(smartpath.transform.toAbsolute(relativeString)).startWith('/') + should(smartpath.transform.toAbsolute(relativeString)).endWith(relativeString) + should(smartpath.transform.toAbsolute(relativeString, baseString)).equal('/basedir/somedir/somefile.txt') + }) + it('should make an array of relative Strings an Array of absolute Strings', function () { + let absoluteArray = smartpath.transform.toAbsolute(relativeArray, baseString) + should(absoluteArray[2]).startWith('/') + should(absoluteArray[2]).endWith(relativeString2) }) - it("should return false if neither String nor Array",function(){ - smartpath.transform.toAbsolute(3).should.be.false(); - }); - }); - }); - describe(".get",function(){ - describe(".type()",function(){ - it("should return 'url' for an URL",function(){ - smartpath.get.type("https://push.rocks/some/url").should.equal("url"); - smartpath.get.type("https://push.rocks/some/url").should.not.equal("local"); - }); - it("should return 'path' for a Path",function(){ - smartpath.get.type("/some/absolute/path/").should.equal("local"); - smartpath.get.type("./some/relative/path/").should.not.equal("url"); - }); - }); - describe(".get()",function(){ - it("should a absolute path for an home relative URL",function(){ - console.log(smartpath.get.home("~/test")); - }); - it("should return the home directory path when no argument is specified",function(){ - console.log(smartpath.get.home()); - }); - }); - }); -}); + it('should return false if neither String nor Array', function () { + should(smartpath.transform.toAbsolute(3)).be.false() + }) + }) + }) + describe('.get', function () { + describe('.type()', function () { + it("should return 'url' for an URL", function () { + should(smartpath.get.type('https://push.rocks/some/url')).equal('url') + should(smartpath.get.type('https://push.rocks/some/url')).not.equal('local') + }) + it("should return 'path' for a Path", function () { + should(smartpath.get.type('/some/absolute/path/')).equal('local') + should(smartpath.get.type('./some/relative/path/')).not.equal('url') + }) + }) + describe('.get()', function () { + it('should a absolute path for an home relative URL', function () { + console.log(smartpath.get.home('~/test')) + }) + it('should return the home directory path when no argument is specified', function () { + console.log(smartpath.get.home()) + }) + }) + }) +}) diff --git a/ts/index.ts b/ts/index.ts index bff3c60..26b2196 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,19 +1,13 @@ -import 'typings-global' -import plugins = require('./smartpath.plugins') - // import modules -import SmartpathCheck = require('./smartpath.check') -import SmartpathGet = require('./smartpath.get') -import SmartpathTransform = require('./smartpath.transform') +import check = require('./smartpath.check') +import get = require('./smartpath.get') +import transform = require('./smartpath.transform') -/** - * - * @type {{getPath: (function(any): undefined)}} - */ -let smartpath = { - check: SmartpathCheck, - get: SmartpathGet, - transform: SmartpathTransform + +export { + check, + get, + transform } -export = smartpath +export * from './smartpath.classes.smartpath' diff --git a/ts/smartpath.classes.smartpath.ts b/ts/smartpath.classes.smartpath.ts new file mode 100644 index 0000000..2700325 --- /dev/null +++ b/ts/smartpath.classes.smartpath.ts @@ -0,0 +1,15 @@ +import * as plugins from './smartpath.plugins' +import * as getMod from './smartpath.get' + +export class Smartpath { + originalPath: string + type: getMod.TPathType + pathLevels: string[] + pathLevelsBackwards: string[] + constructor(pathArg: string) { + this.originalPath = pathArg + this.type = getMod.type(this.originalPath) + this.pathLevels = getMod.pathLevels(this.originalPath) + this.pathLevelsBackwards = getMod.pathLevelsBackwards(this.originalPath) + } +} diff --git a/ts/smartpath.get.ts b/ts/smartpath.get.ts index 8fdf264..7761999 100644 --- a/ts/smartpath.get.ts +++ b/ts/smartpath.get.ts @@ -1,22 +1,36 @@ -import "typings-global"; -import plugins = require("./smartpath.plugins"); +import plugins = require('./smartpath.plugins') +export type TPathType = 'url' | 'local' /** * returns the type of the given path. Can be "url" or "local" */ -export let type = function(pathStringArg:string):string { +export let type = function (pathStringArg: string): TPathType { let urlRegex = /http[s|\s]:\/\/.*/i - if(urlRegex.exec(pathStringArg)){ - return "url"; + if (urlRegex.exec(pathStringArg)) { + return 'url' } else { - return "local"; + return 'local' }; -}; +} -export let home = function(pathArgument?:string){ - if(pathArgument){ - return plugins.home.resolve(pathArgument); +export let home = function (pathArgument?: string) { + if (pathArgument) { + return plugins.home.resolve(pathArgument) } else { - return plugins.home(); + return plugins.home() } -}; \ No newline at end of file +} + +export type TSystemArg = 'dynamic' | 'windows' | 'linux' | 'osx' + +export let pathLevels = (pathArg: string, systemArg: TSystemArg = 'dynamic') => { + let pathLevelArray: string[] + if (systemArg === 'dynamic') { + pathLevelArray = pathArg.split(plugins.path.sep) + } + return pathLevelArray +} + +export let pathLevelsBackwards = (pathArg: string, systemArg?: TSystemArg) => { + return pathLevels(pathArg, systemArg).reverse() +} diff --git a/ts/smartpath.plugins.ts b/ts/smartpath.plugins.ts index 146b34c..4868a85 100644 --- a/ts/smartpath.plugins.ts +++ b/ts/smartpath.plugins.ts @@ -1,4 +1,3 @@ import 'typings-global' -export import beautylog = require ('beautylog') export var home = require('home') export import path = require('path') diff --git a/ts/smartpath.transform.ts b/ts/smartpath.transform.ts index ca6b572..edd3f95 100644 --- a/ts/smartpath.transform.ts +++ b/ts/smartpath.transform.ts @@ -33,7 +33,7 @@ export let toAbsolute = function(relativeArg: string | string[], baseArg?: strin } return absoluteArray } else { - plugins.beautylog.error('smartpath.absolute() could not make sense of the input. ' + + console.error('smartpath.absolute() could not make sense of the input. ' + 'Input is neither String nor Array') return false }