feat: should invoke loaded callback

rijs · Jul 24, 2016 · db56594 · db56594
1 parent e0bba34
commit db56594
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -59,17 +59,15 @@ function resdir(ripple) {
     });
   });
 
-  (0, _values2.default)(ripple.resources).map(function (res) {
-    return _is2.default.fn(res.headers.loaded) && res.headers.loaded(ripple, res);
-  });
+  (0, _values2.default)(ripple.resources).map(loaded(ripple));
 
   return ripple;
 }
 
 var watch = function watch(ripple) {
   return function (path) {
     return _chokidar2.default.watch(path).on('change', function () {
-      return register(ripple)(path);
+      return loaded(ripple)(register(ripple)(path));
     });
   };
 };
@@ -84,8 +82,13 @@ var register = function register(ripple) {
         css = isJS && (0, _fs.existsSync)(path.replace('.js', '.css')),
         res = _is2.default.obj(body = body.default || body) ? body : css ? { name: name, body: body, headers: { needs: '[css]' } } : { name: name, body: body };
 
-    return ripple(res);
+    return ripple(res), ripple.resources[name];
   };
 };
 
-var log = require('utilise/log')('[ri/resdir]');
+var log = require('utilise/log')('[ri/resdir]'),
+    loaded = function loaded(ripple) {
+  return function (res) {
+    return _is2.default.fn(res.headers.loaded) && res.headers.loaded(ripple, res);
+  };
+};
diff --git a/src/index.js b/src/index.js
@@ -24,14 +24,14 @@ export default function resdir(ripple, prefix = '.'){
     })
 
   values(ripple.resources)
-    .map(res => is.fn(res.headers.loaded) && res.headers.loaded(ripple, res))
+    .map(loaded(ripple))
 
   return ripple
 }
 
 const watch = ripple => path => 
   chokidar.watch(path)
-    .on('change', () => register(ripple)(path))
+    .on('change', () => loaded(ripple)(register(ripple)(path)))
 
 const register = ripple => path => {
   var last = basename(path)
@@ -44,7 +44,7 @@ const register = ripple => path => {
            : css ? { name, body, headers: { needs: '[css]' } } 
                  : { name, body } 
 
-  return ripple(res)
+  return ripple(res), ripple.resources[name]
 }
 
 import { resolve, basename, extname } from 'path'
@@ -56,4 +56,5 @@ import values from 'utilise/values'
 import file from 'utilise/file'
 import not from 'utilise/not'
 import is from 'utilise/is'
-const log = require('utilise/log')('[ri/resdir]')
+const log = require('utilise/log')('[ri/resdir]')
+    , loaded = ripple => res => is.fn(res.headers.loaded) && res.headers.loaded(ripple, res)