~interim commit~custom importers~

binding.gyp

@@ -4,7 +4,20 @@
       'target_name': 'binding',
       'sources': [
         'src/binding.cpp',
-        'src/sass_context_wrapper.cpp'
+        'src/create_string.cpp',
+        'src/custom_function_bridge.cpp',
+        'src/custom_importer_bridge.cpp',
+        'src/sass_context_wrapper.cpp',
+        'src/sass_types/boolean.cpp',
+        'src/sass_types/color.cpp',
+        'src/sass_types/error.cpp',
+        'src/sass_types/factory.cpp',
+        'src/sass_types/list.cpp',
+        'src/sass_types/map.cpp',
+        'src/sass_types/null.cpp',
+        'src/sass_types/number.cpp',
+        'src/sass_types/string.cpp',
+        'src/sass_types/value.cpp'
       ],
       'include_dirs': [
         '<!(node -e "require(\'nan\')")',

lib/index.js

@@ -13,6 +13,9 @@ require('./extensions');
 
 var binding = require(process.sass.getBinaryPath(true));
 
+// Expose sass types
+module.exports.types = binding.types;
+
 /**
  * Get input file
  *
@@ -172,13 +175,9 @@ module.exports.render = function(options, cb) {
   var importer = options.importer;
 
   if (importer) {
-    options.importer = function(file, prev, key) {
+    options.importer = function(file, prev, bridge) {
       function done(data) {
-        console.log(data); // ugly hack
-        binding.importedCallback({
-          index: key,
-          objectLiteral: data
-        });
+        bridge.success(data);
       }
 
       var result = importer.call(options.context, file, prev, done);
@@ -189,6 +188,27 @@ module.exports.render = function(options, cb) {
     };
   }
 
+  if (options.functions) {
+    Object.keys(options.functions).forEach(function(signature) {
+      var callback = options.functions[signature];
+
+      options.functions[signature] = function() {
+        var args = Array.prototype.slice.call(arguments),
+            bridge = args.pop();
+
+        function done(data) {
+          bridge.success(data);
+        }
+
+        var result = callback.apply(this, args.concat(done));
+
+        if (result) {
+          done(result);
+        }
+      };
+    });
+  }
+
   options.data ? binding.render(options) : binding.renderFile(options);
 };
 
@@ -206,7 +226,7 @@ module.exports.renderSync = function(options) {
 
   if (importer) {
     options.importer = function(file, prev) {
-      return { objectLiteral: importer.call(options.context, file, prev) };
+      return importer.call(options.context, file, prev);
     };
   }