improve absolute path handling
This commit is contained in:
@@ -1,35 +1,40 @@
|
||||
import "typings-global";
|
||||
import plugins = require("./smartpath.plugins");
|
||||
import 'typings-global'
|
||||
import plugins = require('./smartpath.plugins')
|
||||
|
||||
/* ------------------------------------------ *
|
||||
* ------------ helpers --------------------- *
|
||||
* ------------------------------------------ */
|
||||
let makeAbsolute = function(localPathArg:string, baseArg?:string):string {
|
||||
let absolutePath:string;
|
||||
if(baseArg){
|
||||
absolutePath = plugins.path.join(baseArg,localPathArg);
|
||||
|
||||
// checks a file
|
||||
let makeAbsolute = function(localPathArg: string, baseArg?: string): string {
|
||||
let absolutePath: string
|
||||
let alreadyAbsolute = plugins.path.isAbsolute(localPathArg)
|
||||
if (baseArg && !alreadyAbsolute) {
|
||||
absolutePath = plugins.path.join(baseArg,localPathArg)
|
||||
} else if (!alreadyAbsolute) {
|
||||
absolutePath = plugins.path.resolve(localPathArg)
|
||||
} else {
|
||||
absolutePath = plugins.path.resolve(localPathArg);
|
||||
absolutePath = localPathArg
|
||||
}
|
||||
return absolutePath;
|
||||
};
|
||||
return absolutePath
|
||||
}
|
||||
|
||||
/* ------------------------------------------ *
|
||||
* ------- export functions ----------------- *
|
||||
* ------------------------------------------ */
|
||||
export let toAbsolute = function(relativeArg:any, baseArg?:string):any {
|
||||
if(typeof relativeArg === "string"){
|
||||
return makeAbsolute(relativeArg,baseArg);
|
||||
} else if(Array.isArray(relativeArg)){
|
||||
export let toAbsolute = function(relativeArg: string | string[], baseArg?: string): any {
|
||||
if (typeof relativeArg === 'string') {
|
||||
return makeAbsolute(relativeArg,baseArg)
|
||||
} else if (Array.isArray(relativeArg)) {
|
||||
let relativeArray = relativeArg
|
||||
let absoluteArray:string[] = [];
|
||||
for (let key in relativeArray){
|
||||
absoluteArray.push(makeAbsolute(relativeArray[key],baseArg));
|
||||
};
|
||||
return absoluteArray;
|
||||
let absoluteArray: string[] = []
|
||||
for (let key in relativeArray) {
|
||||
absoluteArray.push(makeAbsolute(relativeArray[key],baseArg))
|
||||
}
|
||||
return absoluteArray
|
||||
} else {
|
||||
plugins.beautylog.error("smartpath.absolute() could not make sense of the input. " +
|
||||
"Input is neither String nor Array");
|
||||
return false;
|
||||
plugins.beautylog.error('smartpath.absolute() could not make sense of the input. ' +
|
||||
'Input is neither String nor Array')
|
||||
return false
|
||||
}
|
||||
};
|
||||
}
|
||||
|
Reference in New Issue
Block a user