Merge pull request #480 from blackflux/dev

[Gally]: master <- dev

Author: simlu

README.md

@@ -56,7 +56,7 @@ To ignore file extension and force treat the file as a certain type, you can pas
 
 To simply load yml files without resolving them pass `resolve` as `false`
 
-### smartWrite(filepath. content, options = { treatAs = null, mergeStrategy = (existing, changeset) => changeset, create = true, pretty = false, keepOrder = true })
+### smartWrite(filepath. content, options = { treatAs = null, mergeStrategy = (existing, changeset) => changeset, create = true, pretty = false, keepOrder = true, resolve = false })
 
 Serialize and write content to file based on file extension.
 
@@ -84,6 +84,8 @@ When `pretty` is set to `true`, the output is formatted more compact.
 When `keepOrder` is set to `true` and a file is overwritten, 
 the new content is ordered according to the existing content (e.g. for `json` and `yml`)
 
+To `resolve` the original file before overwrite merging pass the option as `true`.
+
 ## Important
 
 Do not use this library for loading if you don't trust the source of the files you are loading!

src/logic/smart-write.js

@@ -22,13 +22,16 @@ module.exports = (filepath, content, options = {}) => {
     create: true,
     pretty: false,
     keepOrder: true,
+    resolve: false,
     ...options
   };
-  assert(Object.keys(ctx).length === 5, 'Unexpected Option provided!');
+  assert(Object.keys(ctx).length === 6, 'Unexpected Option provided!');
   assert(ctx.treatAs === null || typeof ctx.treatAs === 'string');
   assert(typeof ctx.mergeStrategy === 'function');
   assert(typeof ctx.create === 'boolean');
   assert(typeof ctx.pretty === 'boolean');
+  assert(typeof ctx.keepOrder === 'boolean');
+  assert(typeof ctx.resolve === 'boolean');
 
   const targetExists = fs.existsSync(filepath);
   if (ctx.create !== true && !targetExists) {
@@ -38,7 +41,8 @@ module.exports = (filepath, content, options = {}) => {
   const ext = getExt(filepath);
   const currentContent = targetExists
     ? smartRead(filepath, {
-      treatAs: ctx.treatAs === null && ext === 'js' ? 'txt' : ctx.treatAs
+      treatAs: ctx.treatAs === null && ext === 'js' ? 'txt' : ctx.treatAs,
+      resolve: ctx.resolve
     })
     : null;