LumeWeb
/
filer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #572: remove lib/nodash.js, use builtins instead

This commit is contained in:
David Humphrey 2018-11-27 20:49:38 -05:00
parent f57c7330d3
commit 7ab229a64c
3 changed files with 32 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
lib/nodash.js
View File

@ -1,97 +0,0 @@
// Cherry-picked bits of underscore.js, lodash.js
/**
* Lo-Dash 2.4.0 <http://lodash.com/>
* Copyright 2012-2013 The Dojo Foundation <http://dojofoundation.org/>
* Based on Underscore.js 1.5.2 <http://underscorejs.org/LICENSE>
* Copyright 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
* Available under MIT license <http://lodash.com/license>
*/
var ArrayProto = Array.prototype;
var nativeForEach = ArrayProto.forEach;
var nativeIndexOf = ArrayProto.indexOf;
var nativeSome = ArrayProto.some;
var ObjProto = Object.prototype;
var hasOwnProperty = ObjProto.hasOwnProperty;
var nativeKeys = Object.keys;
var breaker = {};
function has(obj, key) {
return hasOwnProperty.call(obj, key);
}
var keys = nativeKeys || function(obj) {
if (obj !== Object(obj)) throw new TypeError('Invalid object');
var keys = [];
for (var key in obj) if (has(obj, key)) keys.push(key);
return keys;
};
function size(obj) {
if (obj == null) return 0;
return (obj.length === +obj.length) ? obj.length : keys(obj).length;
}
function identity(value) {
return value;
}
function each(obj, iterator, context) {
var i, length;
if (obj == null) return;
if (nativeForEach && obj.forEach === nativeForEach) {
obj.forEach(iterator, context);
} else if (obj.length === +obj.length) {
for (i = 0, length = obj.length; i < length; i++) {
if (iterator.call(context, obj[i], i, obj) === breaker) return;
}
} else {
var keys = keys(obj);
for (i = 0, length = keys.length; i < length; i++) {
if (iterator.call(context, obj[keys[i]], keys[i], obj) === breaker) return;
}
}
};
function any(obj, iterator, context) {
iterator || (iterator = identity);
var result = false;
if (obj == null) return result;
if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
each(obj, function(value, index, list) {
if (result || (result = iterator.call(context, value, index, list))) return breaker;
});
return !!result;
};
function contains(obj, target) {
if (obj == null) return false;
if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
return any(obj, function(value) {
return value === target;
});
};
function Wrapped(value) {
this.value = value;
}
Wrapped.prototype.has = function(key) {
return has(this.value, key);
};
Wrapped.prototype.contains = function(target) {
return contains(this.value, target);
};
Wrapped.prototype.size = function() {
return size(this.value);
};
function nodash(value) {
// don't wrap if already wrapped, even if wrapped by a different `lodash` constructor
return (value && typeof value == 'object' && !Array.isArray(value) && hasOwnProperty.call(value, '__wrapped__'))
? value
: new Wrapped(value);
}
module.exports = nodash;

63
src/filesystem/implementation.js
View File

@ -1,5 +1,3 @@
var _ = require('../../lib/nodash.js');
var Path = require('../path.js');
var normalize = Path.normalize;
var dirname = Path.dirname;
@ -48,10 +46,10 @@ const { validateInteger } = require('../shared.js');
function update_node_times(context, path, node, times, callback) {
// Honour mount flags for how we update times
var flags = context.flags;
if(_(flags).contains(FS_NOCTIME)) {
if(flags.includes(FS_NOCTIME)) {
delete times.ctime;
}
if(_(flags).contains(FS_NOMTIME)) {
if(flags.includes(FS_NOMTIME)) {
delete times.mtime;
}
@ -226,7 +224,7 @@ function find_node(context, path, callback) {
if(error) {
callback(error);
} else {
if(!_(parentDirectoryData).has(name)) {
if(!parentDirectoryData.hasOwnProperty(name)) {
callback(new Errors.ENOENT(null, path));
} else {
var nodeId = parentDirectoryData[name].id;
@ -482,7 +480,7 @@ function remove_directory(context, path, callback) {
callback(error);
} else if(ROOT_DIRECTORY_NAME === name) {
callback(new Errors.EBUSY(null, path));
} else if(!_(result).has(name)) {
} else if(!result.hasOwnProperty(name)) {
callback(new Errors.ENOENT(null, path));
} else {
parentDirectoryData = result;
@ -507,7 +505,7 @@ function remove_directory(context, path, callback) {
callback(error);
} else {
directoryData = result;
if(_(directoryData).size() > 0) {
if(Object.keys(directoryData).length > 0) {
callback(new Errors.ENOTEMPTY(null, path));
} else {
remove_directory_entry_from_parent_directory_node();
@ -566,7 +564,7 @@ function open_file(context, path, flags, mode, callback) {
var followedCount = 0;
if(ROOT_DIRECTORY_NAME === name) {
if(_(flags).contains(O_WRITE)) {
if(flags.includes(O_WRITE)) {
callback(new Errors.EISDIR('the named file is a directory and O_WRITE is set', path));
} else {
find_node(context, path, set_file_node);
@ -591,19 +589,19 @@ function open_file(context, path, flags, mode, callback) {
callback(error);
} else {
directoryData = result;
if(_(directoryData).has(name)) {
if(_(flags).contains(O_EXCLUSIVE)) {
if(directoryData.hasOwnProperty(name)) {
if(flags.includes(O_EXCLUSIVE)) {
callback(new Errors.ENOENT('O_CREATE and O_EXCLUSIVE are set, and the named file exists', path));
} else {
directoryEntry = directoryData[name];
if(directoryEntry.type === NODE_TYPE_DIRECTORY && _(flags).contains(O_WRITE)) {
if(directoryEntry.type === NODE_TYPE_DIRECTORY && flags.includes(O_WRITE)) {
callback(new Errors.EISDIR('the named file is a directory and O_WRITE is set', path));
} else {
context.getObject(directoryEntry.id, check_if_symbolic_link);
}
}
} else {
if(!_(flags).contains(O_CREATE)) {
if(!flags.includes(O_CREATE)) {
callback(new Errors.ENOENT('O_CREATE is not set and the named file does not exist', path));
} else {
write_file_node();
@ -635,7 +633,7 @@ function open_file(context, path, flags, mode, callback) {
parentPath = dirname(data);
name = basename(data);
if(ROOT_DIRECTORY_NAME === name) {
if(_(flags).contains(O_WRITE)) {
if(flags.includes(O_WRITE)) {
callback(new Errors.EISDIR('the named file is a directory and O_WRITE is set', path));
} else {
find_node(context, path, set_file_node);
@ -897,7 +895,7 @@ function lstat_file(context, path, callback) {
callback(error);
} else {
directoryData = result;
if(!_(directoryData).has(name)) {
if(!directoryData.hasOwnProperty(name)) {
callback(new Errors.ENOENT('a component of the path does not name an existing file', path));
} else {
context.getObject(directoryData[name].id, callback);
@ -954,7 +952,7 @@ function link_node(context, oldpath, newpath, callback) {
callback(error);
} else {
newDirectoryData = result;
if(_(newDirectoryData).has(newname)) {
if(newDirectoryData.hasOwnProperty(newname)) {
callback(new Errors.EEXIST('newpath resolves to an existing file', newname));
} else {
newDirectoryData[newname] = oldDirectoryData[oldname];
@ -978,7 +976,7 @@ function link_node(context, oldpath, newpath, callback) {
callback(error);
} else {
oldDirectoryData = result;
if(!_(oldDirectoryData).has(oldname)) {
if(!oldDirectoryData.hasOwnProperty(oldname)) {
callback(new Errors.ENOENT('a component of either path prefix does not exist', oldname));
} else if(oldDirectoryData[oldname].type === NODE_TYPE_DIRECTORY) {
callback(new Errors.EPERM('oldpath refers to a directory'));
@ -1068,7 +1066,7 @@ function unlink_node(context, path, callback) {
callback(error);
} else {
directoryData = result;
if(!_(directoryData).has(name)) {
if(!directoryData.hasOwnProperty(name)) {
callback(new Errors.ENOENT('a component of the path does not name an existing file', name));
} else {
context.getObject(directoryData[name].id, check_if_node_is_directory);
@ -1147,7 +1145,7 @@ function make_symbolic_link(context, srcpath, dstpath, callback) {
callback(error);
} else {
directoryData = result;
if(_(directoryData).has(name)) {
if(directoryData.hasOwnProperty(name)) {
callback(new Errors.EEXIST(null, name));
} else {
write_file_node();
@ -1224,7 +1222,7 @@ function read_link(context, path, callback) {
callback(error);
} else {
directoryData = result;
if(!_(directoryData).has(name)) {
if(!directoryData.hasOwnProperty(name)) {
callback(new Errors.ENOENT('a component of the path does not name an existing file', name));
} else {
context.getObject(directoryData[name].id, check_if_symbolic);
@ -1594,10 +1592,7 @@ function fremovexattr_file (context, ofd, name, callback) {
}
function validate_flags(flags) {
if(!_(O_FLAGS).has(flags)) {
return null;
}
return O_FLAGS[flags];
return O_FLAGS.hasOwnProperty(flags) ? O_FLAGS[flags] : null;
}
function validate_file_options(options, enc, fileMode){
@ -1651,7 +1646,7 @@ function open(fs, context, path, flags, mode, callback) {
callback(error);
} else {
var position;
if(_(flags).contains(O_APPEND)) {
if(flags.includes(O_APPEND)) {
position = fileNode.size;
} else {
position = 0;
@ -1671,7 +1666,7 @@ function open(fs, context, path, flags, mode, callback) {
}
function close(fs, context, fd, callback) {
if(!_(fs.openFiles).has(fd)) {
if(!fs.openFiles[fd]) {
callback(new Errors.EBADF());
} else {
fs.releaseDescriptor(fd);
@ -1771,7 +1766,7 @@ function read(fs, context, fd, buffer, offset, length, position, callback) {
var ofd = fs.openFiles[fd];
if(!ofd) {
callback(new Errors.EBADF());
} else if(!_(ofd.flags).contains(O_READ)) {
} else if(!ofd.flags.includes(O_READ)) {
callback(new Errors.EBADF('descriptor does not permit reading'));
} else {
read_data(context, ofd, buffer, offset, length, position, wrapped_cb);
@ -1844,7 +1839,7 @@ function write(fs, context, fd, buffer, offset, length, position, callback) {
var ofd = fs.openFiles[fd];
if(!ofd) {
callback(new Errors.EBADF());
} else if(!_(ofd.flags).contains(O_WRITE)) {
} else if(!ofd.flags.includes(O_WRITE)) {
callback(new Errors.EBADF('descriptor does not permit writing'));
} else if(buffer.length - offset < length) {
callback(new Errors.EIO('intput buffer is too small'));
@ -2084,7 +2079,7 @@ function fsetxattr(fs, context, fd, name, value, flag, callback) {
if (!ofd) {
callback(new Errors.EBADF());
}
else if (!_(ofd.flags).contains(O_WRITE)) {
else if (!ofd.flags.includes(O_WRITE)) {
callback(new Errors.EBADF('descriptor does not permit writing'));
}
else {
@ -2102,7 +2097,7 @@ function fremovexattr(fs, context, fd, name, callback) {
if (!ofd) {
callback(new Errors.EBADF());
}
else if (!_(ofd.flags).contains(O_WRITE)) {
else if (!ofd.flags.includes(O_WRITE)) {
callback(new Errors.EBADF('descriptor does not permit writing'));
}
else {
@ -2173,7 +2168,7 @@ function futimes(fs, context, fd, atime, mtime, callback) {
var ofd = fs.openFiles[fd];
if(!ofd) {
callback(new Errors.EBADF());
} else if(!_(ofd.flags).contains(O_WRITE)) {
} else if(!ofd.flags.includes(O_WRITE)) {
callback(new Errors.EBADF('descriptor does not permit writing'));
} else {
futimes_file(context, ofd, atime, mtime, callback);
@ -2195,7 +2190,7 @@ function fchmod(fs, context, fd, mode, callback) {
var ofd = fs.openFiles[fd];
if(!ofd) {
callback(new Errors.EBADF());
} else if(!_(ofd.flags).contains(O_WRITE)) {
} else if(!ofd.flags.includes(O_WRITE)) {
callback(new Errors.EBADF('descriptor does not permit writing'));
} else {
fchmod_file(context, ofd, mode, callback);
@ -2225,7 +2220,7 @@ function fchown(fs, context, fd, uid, gid, callback) {
var ofd = fs.openFiles[fd];
if(!ofd) {
callback(new Errors.EBADF());
} else if(!_(ofd.flags).contains(O_WRITE)) {
} else if(!ofd.flags.includes(O_WRITE)) {
callback(new Errors.EBADF('descriptor does not permit writing'));
} else {
fchown_file(context, ofd, uid, gid, callback);
@ -2291,7 +2286,7 @@ function rename(fs, context, oldpath, newpath, callback) {
callback(error);
} else {
newParentData = result;
if(_(newParentData).has(newName)) {
if(newParentData.hasOwnProperty(newName)) {
remove_directory(context, newpath, update_new_parent_directory_data);
} else {
update_new_parent_directory_data();
@ -2397,7 +2392,7 @@ function ftruncate(fs, context, fd, length, callback) {
var ofd = fs.openFiles[fd];
if(!ofd) {
callback(new Errors.EBADF());
} else if(!_(ofd.flags).contains(O_WRITE)) {
} else if(!ofd.flags.includes(O_WRITE)) {
callback(new Errors.EBADF('descriptor does not permit writing'));
} else {
ftruncate_file(context, ofd, length, callback);

7
src/filesystem/interface.js
View File

@ -1,4 +1,3 @@
var _ = require('../../lib/nodash.js');
var { promisify } = require('es6-promisify');
var isNullPath = require('../path.js').isNull;
@ -80,12 +79,12 @@ function FileSystem(options, callback) {
options = options || {};
callback = callback || defaultCallback;
var flags = options.flags;
var flags = options.flags || [];
var guid = options.guid ? options.guid : defaultGuidFn;
var provider = options.provider || new providers.Default(options.name || FILE_SYSTEM_NAME);
// If we're given a provider, match its name unless we get an explicit name
var name = options.name || provider.name;
var forceFormatting = _(flags).contains(FS_FORMAT);
var forceFormatting = flags.includes(FS_FORMAT);
var fs = this;
fs.readyState = FS_PENDING;
@ -163,7 +162,7 @@ function FileSystem(options, callback) {
function wrappedGuidFn(context) {
return function(callback) {
// Skip the duplicate ID check if asked to
if(_(flags).contains(FS_NODUPEIDCHECK)) {
if(flags.includes(FS_NODUPEIDCHECK)) {
callback(null, guid());
return;
}