memfs 3.1.0 → 3.2.0

package/CHANGELOG.md

@@ -1,3 +1,36 @@
+# [3.2.0](https://github.com/streamich/memfs/compare/v3.1.3...v3.2.0) (2020-05-19)
+
+
+### Bug Fixes
+
+* 'fromJSON()' did not consider cwd when creating directories ([3d6ee3b](https://github.com/streamich/memfs/commit/3d6ee3b2c0eef0345ba2bd400e9836f2d685321f))
+
+
+### Features
+
+* support nested objects in 'fromJSON()' ([f8c329c](https://github.com/streamich/memfs/commit/f8c329c8e57c85cc4a394a74802af1f37dcedefd))
+
+## [3.1.3](https://github.com/streamich/memfs/compare/v3.1.2...v3.1.3) (2020-05-14)
+
+
+### Bug Fixes
+
+* **deps:** update dependency fs-monkey to v1.0.1 ([10fc705](https://github.com/streamich/memfs/commit/10fc705c46d57a4354afb9372a98dcdfed9d551d))
+
+## [3.1.2](https://github.com/streamich/memfs/compare/v3.1.1...v3.1.2) (2020-03-12)
+
+
+### Bug Fixes
+
+* should throw `EEXIST` instead of `EISDIR` on `mkdirSync('/')` ([f89eede](https://github.com/streamich/memfs/commit/f89eede9530c3f5bd8d8a523be1927d396cda662))
+
+## [3.1.1](https://github.com/streamich/memfs/compare/v3.1.0...v3.1.1) (2020-02-17)
+
+
+### Bug Fixes
+
+* **deps:** update dependency fs-monkey to v1 ([ccd1be0](https://github.com/streamich/memfs/commit/ccd1be08c5b13dd620ed814def1a84b81614cab2))
+
 # [3.1.0](https://github.com/streamich/memfs/compare/v3.0.6...v3.1.0) (2020-02-17)
 
 

package/README.md

@@ -1,6 +1,6 @@
 # memfs
 
-[![][npm-badge]][npm-url] [![][travis-badge]][travis-url]
+[![][chat-badge]][chat] [![][npm-badge]][npm-url] [![][travis-badge]][travis-url]
 
 In-memory file-system with [Node's `fs` API](https://nodejs.org/api/fs.html).
 
@@ -107,6 +107,8 @@ require('/index'); // hi world
 - [`fs-monkey`][fs-monkey] - monkey-patches Node's `fs` module and `require` function
 - [`libfs`](https://github.com/streamich/full-js/blob/master/src/lib/fs.ts) - real filesystem (that executes UNIX system calls) implemented in JavaScript
 
+[chat]: https://onp4.com/@vadim/~memfs
+[chat-badge]: https://img.shields.io/badge/Chat-%F0%9F%92%AC-green?style=flat&logo=chat&link=https://onp4.com/@vadim/~memfs
 [npm-url]: https://www.npmjs.com/package/memfs
 [npm-badge]: https://img.shields.io/npm/v/memfs.svg
 [travis-url]: https://travis-ci.org/streamich/memfs

package/lib/Dirent.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Dirent = void 0;
 var constants_1 = require("./constants");
 var encoding_1 = require("./encoding");
 var S_IFMT = constants_1.constants.S_IFMT, S_IFDIR = constants_1.constants.S_IFDIR, S_IFREG = constants_1.constants.S_IFREG, S_IFBLK = constants_1.constants.S_IFBLK, S_IFCHR = constants_1.constants.S_IFCHR, S_IFLNK = constants_1.constants.S_IFLNK, S_IFIFO = constants_1.constants.S_IFIFO, S_IFSOCK = constants_1.constants.S_IFSOCK;

package/lib/Stats.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Stats = void 0;
 var constants_1 = require("./constants");
 var getBigInt_1 = require("./getBigInt");
 var S_IFMT = constants_1.constants.S_IFMT, S_IFDIR = constants_1.constants.S_IFDIR, S_IFREG = constants_1.constants.S_IFREG, S_IFBLK = constants_1.constants.S_IFBLK, S_IFCHR = constants_1.constants.S_IFCHR, S_IFLNK = constants_1.constants.S_IFLNK, S_IFIFO = constants_1.constants.S_IFIFO, S_IFSOCK = constants_1.constants.S_IFSOCK;

package/lib/constants.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.constants = void 0;
 exports.constants = {
     O_RDONLY: 0,
     O_WRONLY: 1,

package/lib/encoding.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.strToEncoding = exports.assertEncoding = exports.ENCODING_UTF8 = void 0;
 var buffer_1 = require("./internal/buffer");
 var errors = require("./internal/errors");
 exports.ENCODING_UTF8 = 'utf8';

package/lib/index.js

@@ -11,6 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.fs = exports.createFsFromVolume = exports.vol = exports.Volume = void 0;
 var Stats_1 = require("./Stats");
 var Dirent_1 = require("./Dirent");
 var volume_1 = require("./volume");

package/lib/internal/buffer.js

@@ -7,8 +7,9 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
     return r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.bufferFrom = exports.bufferAllocUnsafe = exports.Buffer = void 0;
 var buffer_1 = require("buffer");
-exports.Buffer = buffer_1.Buffer;
+Object.defineProperty(exports, "Buffer", { enumerable: true, get: function () { return buffer_1.Buffer; } });
 function bufferV0P12Ponyfill(arg0) {
     var args = [];
     for (var _i = 1; _i < arguments.length; _i++) {

package/lib/internal/errors.js

@@ -18,6 +18,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.E = exports.AssertionError = exports.message = exports.RangeError = exports.TypeError = exports.Error = void 0;
 var assert = require("assert");
 var util = require("util");
 var kCode = typeof Symbol === 'undefined' ? '_kCode' : Symbol('code');

package/lib/node.js

@@ -13,6 +13,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.File = exports.Link = exports.Node = exports.SEP = void 0;
 var process_1 = require("./process");
 var buffer_1 = require("./internal/buffer");
 var constants_1 = require("./constants");

package/lib/process.js

@@ -1,6 +1,7 @@
 "use strict";
 // Here we mock the global `process` variable in case we are not in Node's environment.
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createProcess = void 0;
 /**
  * Looks to return a `process` object, if one is available.
  *

package/lib/promises.js

@@ -7,6 +7,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
     return r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileHandle = void 0;
 function promisify(vol, fn, getResult) {
     if (getResult === void 0) { getResult = function (input) { return input; }; }
     return function () {

package/lib/volume-localstorage.js

@@ -13,6 +13,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createVolume = exports.ObjectStore = void 0;
 var volume_1 = require("./volume");
 var node_1 = require("./node");
 var ObjectStore = /** @class */ (function () {
@@ -49,7 +50,7 @@ function createVolume(namespace, LS) {
                     this._key = key('ino', this.ino);
                 return this._key;
             },
-            enumerable: true,
+            enumerable: false,
             configurable: true
         });
         NodeLocalStorage.prototype.sync = function () {
@@ -76,7 +77,7 @@ function createVolume(namespace, LS) {
                     this._key = key('link', this.getPath());
                 return this._key;
             },
-            enumerable: true,
+            enumerable: false,
             configurable: true
         });
         LinkLocalStorage.prototype.sync = function () {

package/lib/volume.d.ts

@@ -101,12 +101,19 @@ export declare function dataToStr(data: TData, encoding?: string): string;
 export declare function dataToBuffer(data: TData, encoding?: string): Buffer;
 export declare function bufferToEncoding(buffer: Buffer, encoding?: TEncodingExtended): TDataOut;
 export declare function toUnixTimestamp(time: any): any;
-export declare type DirectoryJSON = Record<string, string | null>;
+declare type DirectoryContent = string | null;
+export interface DirectoryJSON {
+    [key: string]: DirectoryContent;
+}
+export interface NestedDirectoryJSON {
+    [key: string]: DirectoryContent | NestedDirectoryJSON;
+}
 /**
  * `Volume` represents a file system.
  */
 export declare class Volume {
     static fromJSON(json: DirectoryJSON, cwd?: string): Volume;
+    static fromNestedJSON(json: NestedDirectoryJSON, cwd?: string): Volume;
     /**
      * Global file descriptor counter. UNIX file descriptors start from 0 and go sequentially
      * up, so here, in order not to conflict with them, we choose some big number and descrease
@@ -163,6 +170,7 @@ export declare class Volume {
     private _toJSON;
     toJSON(paths?: PathLike | PathLike[], json?: {}, isRelative?: boolean): DirectoryJSON;
     fromJSON(json: DirectoryJSON, cwd?: string): void;
+    fromNestedJSON(json: NestedDirectoryJSON, cwd?: string): void;
     reset(): void;
     mountSync(mountpoint: string, json: DirectoryJSON): void;
     private openLink;
@@ -378,3 +386,4 @@ export declare class FSWatcher extends EventEmitter {
     start(path: PathLike, persistent?: boolean, recursive?: boolean, encoding?: BufferEncoding): void;
     close(): void;
 }
+export {};

package/lib/volume.js

@@ -20,6 +20,7 @@ var __spreadArrays = (this && this.__spreadArrays) || function () {
     return r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FSWatcher = exports.StatWatcher = exports.Volume = exports.toUnixTimestamp = exports.bufferToEncoding = exports.dataToBuffer = exports.dataToStr = exports.pathToSteps = exports.filenameToSteps = exports.pathToFilename = exports.flagsToNumber = exports.FLAGS = void 0;
 var pathModule = require("path");
 var node_1 = require("./node");
 var Stats_1 = require("./Stats");
@@ -37,17 +38,7 @@ var util = require("util");
 var promises_1 = require("./promises");
 var resolveCrossPlatform = pathModule.resolve;
 var O_RDONLY = constants_1.constants.O_RDONLY, O_WRONLY = constants_1.constants.O_WRONLY, O_RDWR = constants_1.constants.O_RDWR, O_CREAT = constants_1.constants.O_CREAT, O_EXCL = constants_1.constants.O_EXCL, O_TRUNC = constants_1.constants.O_TRUNC, O_APPEND = constants_1.constants.O_APPEND, O_SYNC = constants_1.constants.O_SYNC, O_DIRECTORY = constants_1.constants.O_DIRECTORY, F_OK = constants_1.constants.F_OK, COPYFILE_EXCL = constants_1.constants.COPYFILE_EXCL, COPYFILE_FICLONE_FORCE = constants_1.constants.COPYFILE_FICLONE_FORCE;
-var sep;
-var relative;
-if (pathModule.posix) {
-    var posix = pathModule.posix;
-    sep = posix.sep;
-    relative = posix.relative;
-}
-else {
-    sep = pathModule.sep;
-    relative = pathModule.relative;
-}
+var _a = pathModule.posix ? pathModule.posix : pathModule, sep = _a.sep, relative = _a.relative, join = _a.join, dirname = _a.dirname;
 var isWin = process_1.default.platform === 'win32';
 var kMinPoolSpace = 128;
 // const kMaxLength = require('buffer').kMaxLength;
@@ -409,6 +400,29 @@ function validateGid(gid) {
     if (typeof gid !== 'number')
         throw TypeError(ERRSTR.GID);
 }
+function flattenJSON(nestedJSON) {
+    var flatJSON = {};
+    function flatten(pathPrefix, node) {
+        for (var path in node) {
+            var contentOrNode = node[path];
+            var joinedPath = join(pathPrefix, path);
+            if (typeof contentOrNode === 'string') {
+                flatJSON[joinedPath] = contentOrNode;
+            }
+            else if (typeof contentOrNode === 'object' && contentOrNode !== null && Object.keys(contentOrNode).length > 0) {
+                // empty directories need an explicit entry and therefore get handled in `else`, non-empty ones are implicitly considered
+                flatten(joinedPath, contentOrNode);
+            }
+            else {
+                // without this branch null, empty-object or non-object entries would not be handled in the same way
+                // by both fromJSON() and fromNestedJSON()
+                flatJSON[joinedPath] = null;
+            }
+        }
+    }
+    flatten('', nestedJSON);
+    return flatJSON;
+}
 /**
  * `Volume` represents a file system.
  */
@@ -485,13 +499,18 @@ var Volume = /** @class */ (function () {
         vol.fromJSON(json, cwd);
         return vol;
     };
+    Volume.fromNestedJSON = function (json, cwd) {
+        var vol = new Volume();
+        vol.fromNestedJSON(json, cwd);
+        return vol;
+    };
     Object.defineProperty(Volume.prototype, "promises", {
         get: function () {
             if (this.promisesApi === null)
                 throw new Error('Promise is not supported in this environment.');
             return this.promisesApi;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Volume.prototype.createLink = function (parent, name, isDirectory, perm) {
@@ -728,18 +747,14 @@ var Volume = /** @class */ (function () {
         }
         return json;
     };
-    // fromJSON(json: {[filename: string]: string}, cwd: string = '/') {
     Volume.prototype.fromJSON = function (json, cwd) {
         if (cwd === void 0) { cwd = process_1.default.cwd(); }
         for (var filename in json) {
             var data = json[filename];
+            filename = resolve(filename, cwd);
             if (typeof data === 'string') {
-                filename = resolve(filename, cwd);
-                var steps = filenameToSteps(filename);
-                if (steps.length > 1) {
-                    var dirname = sep + steps.slice(0, steps.length - 1).join(sep);
-                    this.mkdirpBase(dirname, 511 /* DIR */);
-                }
+                var dir = dirname(filename);
+                this.mkdirpBase(dir, 511 /* DIR */);
                 this.writeFileSync(filename, data);
             }
             else {
@@ -747,6 +762,9 @@ var Volume = /** @class */ (function () {
             }
         }
     };
+    Volume.prototype.fromNestedJSON = function (json, cwd) {
+        this.fromJSON(flattenJSON(json), cwd);
+    };
     Volume.prototype.reset = function () {
         this.ino = 0;
         this.inodes = {};
@@ -1500,7 +1518,7 @@ var Volume = /** @class */ (function () {
         var steps = filenameToSteps(filename);
         // This will throw if user tries to create root dir `fs.mkdirSync('/')`.
         if (!steps.length) {
-            throw createError(EISDIR, 'mkdir', filename);
+            throw createError(EEXIST, 'mkdir', filename);
         }
         var dir = this.getLinkParentAsDirOrThrow(filename, 'mkdir');
         // Check path already exists.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "memfs",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "In-memory file-system with Node's fs API.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -23,11 +23,11 @@
     "url": "https://github.com/streamich/memfs.git"
   },
   "dependencies": {
-    "fs-monkey": "0.3.3"
+    "fs-monkey": "1.0.1"
   },
   "devDependencies": {
     "@types/jest": "23.3.14",
-    "@types/node": "10.17.15",
+    "@types/node": "10.17.21",
     "cpy-cli": "3.1.0",
     "husky": "3.1.0",
     "jest": "24.9.0",
@@ -35,10 +35,10 @@
     "pretty-quick": "2.0.1",
     "rimraf": "3.0.2",
     "ts-jest": "24.3.0",
-    "ts-node": "8.6.2",
+    "ts-node": "8.10.1",
     "tslint": "5.20.1",
     "tslint-config-common": "1.6.0",
-    "typescript": "3.7.5",
+    "typescript": "3.9.2",
     "semantic-release": "15.14.0",
     "@semantic-release/changelog": "3.0.6",
     "@semantic-release/git": "7.0.18",