Implements source map embedding

- embed sources content inside source map
- embed source map inside sourceMappingURL

Author: mgreter

context.cpp

@@ -58,6 +58,8 @@ namespace Sass {
     source_comments         (initializers.source_comments()),
     output_style            (initializers.output_style()),
     source_map_file         (make_canonical_path(initializers.source_map_file())),
+    source_map_embed        (initializers.source_map_embed()),
+    source_map_contents     (initializers.source_map_contents()),
     omit_source_map_url     (initializers.omit_source_map_url()),
     is_indented_syntax_src  (initializers.is_indented_syntax_src()),
     names_to_colors         (map<string, Color*>()),
@@ -153,7 +155,8 @@ namespace Sass {
     sources.push_back(contents);
     included_files.push_back(abs_path);
     queue.push_back(make_pair(load_path, contents));
-    source_map.files.push_back(resolve_relative_path(abs_path, source_map_file, cwd));
+    source_map.source_index.push_back(sources.size() - 1);
+    include_links.push_back(resolve_relative_path(abs_path, source_map_file, cwd));
   }
 
   string Context::add_file(string path)
@@ -268,14 +271,23 @@ namespace Sass {
 
   string Context::format_source_mapping_url(const string& file) const
   {
-    return "/*# sourceMappingURL=" + resolve_relative_path(file, output_path, cwd) + " */";
+    string url = resolve_relative_path(file, output_path, cwd);
+    if (source_map_embed) {
+      base64::encoder E;
+      istringstream is( sources[0] );
+      ostringstream buffer;
+      E.encode(is, buffer);
+      url = "data:text/css;base64," + buffer.str();
+      url.erase(url.size() - 1);
+    }
+    return "/*# sourceMappingURL=" + url + " */";
   }
 
   char* Context::generate_source_map()
   {
     if (source_map_file == "") return 0;
     char* result = 0;
-    string map = source_map.generate_source_map();
+    string map = source_map.generate_source_map(*this);
     result = copy_c_str(map.c_str());
     return result;
   }

context.hpp

@@ -21,6 +21,9 @@
 #include "subset_map.hpp"
 #endif
 
+#define BUFFERSIZE 255
+#include "b64/encode.h"
+
 struct Sass_C_Function_Descriptor;
 
 namespace Sass {
@@ -41,8 +44,17 @@ namespace Sass {
     Memory_Manager<AST_Node> mem;
 
     const char* source_c_str;
-    vector<const char*> sources; // c-strs containing Sass file contents
-    vector<string> include_paths;
+
+    // c-strs containing Sass file contents
+    // we will overtake ownership of memory
+    vector<const char*> sources;
+    // absolute paths to includes
+    vector<string> included_files;
+    // relative links to includes
+    vector<string> include_links;
+    // vectors above have same size
+
+    vector<string> include_paths; // lookup paths for includes
     vector<pair<string, const char*> > queue; // queue of files to be parsed
     map<string, Block*> style_sheets; // map of paths to ASTs
     SourceMap source_map;
@@ -53,6 +65,8 @@ namespace Sass {
     bool         source_comments; // for inline debug comments in css output
     Output_Style output_style; // output style for the generated css code
     string       source_map_file; // path to source map file (enables feature)
+    bool         source_map_embed; // embed in sourceMappingUrl (as data-url)
+    bool         source_map_contents; // insert included contents into source map
     bool         omit_source_map_url; // disable source map comment in css output
     bool         is_indented_syntax_src; // treat source string as sass
 
@@ -77,6 +91,8 @@ namespace Sass {
       KWD_ARG(Data, bool,            is_indented_syntax_src);
       KWD_ARG(Data, size_t,          precision);
       KWD_ARG(Data, bool,            _skip_source_map_update);
+      KWD_ARG(Data, bool,            source_map_embed);
+      KWD_ARG(Data, bool,            source_map_contents);
     };
 
     Context(Data);
@@ -93,14 +109,13 @@ namespace Sass {
     char* compile_file();
     char* generate_source_map();
 
-    std::vector<string> get_included_files();
+    vector<string> get_included_files();
 
   private:
     void add_source(const string &load_path, const string &abs_path, const char* contents);
     string format_source_mapping_url(const string& file) const;
     string get_cwd();
 
-    vector<string> included_files;
     string cwd;
 
     // void register_built_in_functions(Env* env);

sass.cpp

@@ -46,6 +46,8 @@ extern "C" {
 
                          .source_comments     (c_ctx->source_comments)
                          .source_map_file     (c_ctx->source_map_file)
+                         .source_map_embed    (c_ctx->source_map_embed)
+                         .source_map_contents (c_ctx->source_map_contents)
                          .omit_source_map_url (c_ctx->omit_source_map_url)
 
                          .image_path          (c_ctx->image_path ?

sass.h

@@ -23,8 +23,10 @@ struct Sass_Context {
 
   int          output_style;
   bool         source_comments;
-  const char*  source_map_file;
+  bool         source_map_embed;
+  bool         source_map_contents;
   bool         omit_source_map_url;
+  const char*  source_map_file;
   const char*  image_path;
   const char*  output_path;
   const char*  include_paths_string;

sass_interface.cpp

@@ -199,6 +199,8 @@ extern "C" {
                        .output_style((Output_Style) c_ctx->options.output_style)
                        .source_comments(c_ctx->options.source_comments)
                        .source_map_file(safe_str(c_ctx->options.source_map_file))
+                       .source_map_embed(c_ctx->options.source_map_embed)
+                       .source_map_contents(c_ctx->options.source_map_contents)
                        .omit_source_map_url(c_ctx->options.omit_source_map_url)
                        .image_path(safe_str(c_ctx->options.image_path))
                        .include_paths_c_str(c_ctx->options.include_paths)

sass_interface.h

@@ -27,6 +27,10 @@ struct sass_options {
   const char* source_map_file;
   // Disable sourceMappingUrl in css output
   bool omit_source_map_url;
+  // embed sourceMappingUrl as data uri
+  bool source_map_embed;
+  // embed include contents in maps
+  bool source_map_contents;
   // Treat source_string as sass (as opposed to scss)
   bool is_indented_syntax_src;
   // Colon-separated list of paths

source_map.cpp

@@ -1,4 +1,5 @@
 #include "source_map.hpp"
+#include "json.hpp"
 
 #ifndef SASS_CONTEXT
 #include "context.hpp"
@@ -13,45 +14,54 @@ namespace Sass {
   using std::ptrdiff_t;
   SourceMap::SourceMap(const string& file) : current_position(Position(1, 1)), file(file) { }
 
-  // taken from http://stackoverflow.com/a/7725289/1550314
-  std::string encodeJsonString(const std::string& input) {
-    std::ostringstream ss;
-    for (std::string::const_iterator iter = input.begin(); iter != input.end(); iter++) {
-        switch (*iter) {
-            case '\\': ss << "\\\\"; break;
-            case '"': ss << "\\\""; break;
-            case '\b': ss << "\\b"; break;
-            case '\f': ss << "\\f"; break;
-            case '\n': ss << "\\n"; break;
-            case '\r': ss << "\\r"; break;
-            case '\t': ss << "\\t"; break;
-            // is a legal escape in JSON
-            case '/': ss << "\\/"; break;
-            default: ss << *iter; break;
-        }
-    }
+  string SourceMap::generate_source_map(Context &ctx) {
 
-    return ss.str();
-  }
+    const bool include_sources = ctx.source_map_contents;
+    const vector<string> includes = ctx.include_links;
+    const vector<const char*> sources = ctx.sources;
+
+    JsonNode *json_srcmap = json_mkobject();
+
+    json_append_member(json_srcmap, "version", json_mknumber(3));
+
+    const char *include = file.c_str();
+    JsonNode *json_include = json_mkstring(include);
+    json_append_member(json_srcmap, "file", json_include);
 
-  string SourceMap::generate_source_map() {
-    string result = "{\n";
-    result += "  \"version\": 3,\n";
-    result += "  \"file\": \"" + encodeJsonString(file) + "\",\n";
-    result += "  \"sources\": [";
-    for (size_t i = 0; i < files.size(); ++i) {
-      result+="\"" + encodeJsonString(files[i]) + "\",";
+    JsonNode *json_includes = json_mkarray();
+    for (size_t i = 0; i < source_index.size(); ++i) {
+      const char *include = includes[source_index[i]].c_str();
+      JsonNode *json_include = json_mkstring(include);
+      json_append_element(json_includes, json_include);
     }
-    if (!files.empty()) result.erase(result.length() - 1);
-    result += "],\n";
-    result += "  \"names\": [],\n";
-    result += "  \"mappings\": \"" + serialize_mappings() + "\"\n";
-    result += "}";
+    json_append_member(json_srcmap, "sources", json_includes);
+
+    JsonNode *json_contents = json_mkarray();
+    if (include_sources) {
+      for (size_t i = 1; i < source_index.size(); ++i) {
+        const char *content = sources[source_index[i]];
+        JsonNode *json_content = json_mkstring(content);
+        json_append_element(json_contents, json_content);
+      }
+    }
+    json_append_member(json_srcmap, "sourcesContent", json_contents);
+
+    string mappings = serialize_mappings();
+    JsonNode *json_mappings = json_mkstring(mappings.c_str());
+    json_append_member(json_srcmap, "mappings", json_mappings);
 
+    JsonNode *json_names = json_mkarray();
+    // so far we have no implementation for names
+    // no problem as we do not alter any identifiers
+    json_append_member(json_srcmap, "names", json_names);
+
+    char *str = json_stringify(json_srcmap, "\t");
+    string result = string(str);
+    free(str);
+    json_delete(json_srcmap);
     return result;
   }
 
-
   string SourceMap::serialize_mappings() {
     string result = "";
 

source_map.hpp

@@ -24,15 +24,14 @@ namespace Sass {
   class SourceMap {
 
   public:
-    vector<string> files;
-
+    vector<size_t> source_index;
     SourceMap(const string& file);
 
     void remove_line();
     void update_column(const string& str);
     void add_mapping(AST_Node* node);
 
-    string generate_source_map();
+    string generate_source_map(Context &ctx);
 
   private: