Skip to content

N
node-sass
Commit 4f5e8777 by Dean Mao
Options

the 'fixed' refactor

parent 3ba1440c
Showing with 122 additions and 246 deletions
binding.cpp
#include <nan.h> #include <v8.h>
#include <node.h>
#include <string> #include <string>
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
...@@ -11,279 +12,179 @@ using namespace std; ...@@ -11,279 +12,179 @@ using namespace std;
void WorkOnContext(uv_work_t* req) { void WorkOnContext(uv_work_t* req) {
sass_context_wrapper* ctx_w = static_cast<sass_context_wrapper*>(req->data); sass_context_wrapper* ctx_w = static_cast<sass_context_wrapper*>(req->data);
if (ctx_w->ctx) {
sass_context* ctx = static_cast<sass_context*>(ctx_w->ctx); sass_context* ctx = static_cast<sass_context*>(ctx_w->ctx);
sass_compile(ctx); sass_compile(ctx);
} } else if (ctx_w->fctx) {
sass_file_context* ctx = static_cast<sass_file_context*>(ctx_w->fctx);
void MakeOldCallback(uv_work_t* req) { sass_compile_file(ctx);
NanScope();
TryCatch try_catch;
sass_context_wrapper* ctx_w = static_cast<sass_context_wrapper*>(req->data);
sass_context* ctx = static_cast<sass_context*>(ctx_w->ctx);
if (ctx->error_status == 0) {
// if no error, do callback(null, result)
const unsigned argc = 2;
Local<Value> argv[argc] = {
NanNewLocal(Null()),
NanNewLocal(String::New(ctx->output_string))
};
ctx_w->callback->Call(argc, argv);
} else {
// if error, do callback(error)
const unsigned argc = 1;
Local<Value> argv[argc] = {
NanNewLocal(String::New(ctx->error_message))
};
ctx_w->callback->Call(argc, argv);
}
if (try_catch.HasCaught()) {
node::FatalException(try_catch);
} }
delete ctx->source_string;
sass_free_context_wrapper(ctx_w);
} }
NAN_METHOD(OldRender) { void extractOptions(const Arguments& args, void* cptr, sass_context_wrapper* ctx_w, bool isFile) {
NanScope();
sass_context* ctx = sass_new_context();
sass_context_wrapper* ctx_w = sass_new_context_wrapper();
char *source; char *source;
char* pathOrData;
int output_style;
int source_comments;
String::AsciiValue astr(args[0]); String::AsciiValue astr(args[0]);
if (ctx_w) {
// async (callback) style
Local<Function> callback = Local<Function>::Cast(args[1]); Local<Function> callback = Local<Function>::Cast(args[1]);
String::AsciiValue bstr(args[2]); Local<Function> errorCallback = Local<Function>::Cast(args[2]);
if (isFile) {
ctx_w->fctx = (sass_file_context*) cptr;
ctx_w->callback = Persistent<Function>::New(callback);
ctx_w->errorCallback = Persistent<Function>::New(errorCallback);
ctx_w->request.data = ctx_w;
} else {
ctx_w->ctx = (sass_context*) cptr;
ctx_w->callback = Persistent<Function>::New(callback);
ctx_w->errorCallback = Persistent<Function>::New(errorCallback);
ctx_w->request.data = ctx_w;
}
output_style = args[4]->Int32Value();
source_comments = args[5]->Int32Value();
String::AsciiValue bstr(args[3]);
pathOrData = new char[strlen(*bstr)+1];
strcpy(pathOrData, *bstr);
} else {
// synchronous style
output_style = args[2]->Int32Value();
source_comments = args[3]->Int32Value();
String::AsciiValue bstr(args[1]);
pathOrData = new char[strlen(*bstr)+1];
strcpy(pathOrData, *bstr);
}
if (isFile) {
sass_file_context *ctx = (sass_file_context*)cptr;
char *filename = new char[strlen(*astr)+1];
strcpy(filename, *astr);
ctx->input_path = filename;
ctx->options.image_path = new char[0];
ctx->options.output_style = output_style;
ctx->options.source_comments = source_comments;
ctx->options.include_paths = pathOrData;
} else {
sass_context *ctx = (sass_context*)cptr;
source = new char[strlen(*astr)+1]; source = new char[strlen(*astr)+1];
strcpy(source, *astr); strcpy(source, *astr);
ctx->source_string = source; ctx->source_string = source;
ctx->options.include_paths = new char[strlen(*bstr)+1];
ctx->options.image_path = new char[0]; ctx->options.image_path = new char[0];
ctx->options.include_paths = *bstr; ctx->options.output_style = output_style;
// ctx->options.output_style = SASS_STYLE_NESTED; ctx->options.source_comments = source_comments;
ctx->options.output_style = args[3]->Int32Value(); ctx->options.include_paths = pathOrData;
ctx->options.source_comments = args[4]->Int32Value(); }
ctx_w->ctx = ctx;
ctx_w->callback = new NanCallback(callback);
ctx_w->request.data = ctx_w;
int status = uv_queue_work(uv_default_loop(), &ctx_w->request, WorkOnContext, (uv_after_work_cb)MakeOldCallback);
assert(status == 0);
NanReturnUndefined();
} }
void MakeCallback(uv_work_t* req) { void MakeCallback(uv_work_t* req) {
NanScope(); HandleScope scope;
TryCatch try_catch; TryCatch try_catch;
sass_context_wrapper* ctx_w = static_cast<sass_context_wrapper*>(req->data); sass_context_wrapper* ctx_w = static_cast<sass_context_wrapper*>(req->data);
sass_context* ctx = static_cast<sass_context*>(ctx_w->ctx); Local<Value> val, err;
if (ctx->error_status == 0) {
// if no error, do callback(null, result)
const unsigned argc = 1; const unsigned argc = 1;
Local<Value> argv[argc] = { int error_status = ctx_w->ctx ? ctx_w->ctx->error_status : ctx_w->fctx->error_status;
NanNewLocal(String::New(ctx->output_string))
};
ctx_w->callback->Call(argc, argv); if (error_status == 0) {
// if no error, do callback(null, result)
val = ctx_w->ctx ? Local<Value>::New(String::New(ctx_w->ctx->output_string)) : Local<Value>::New(String::New(ctx_w->fctx->output_string));
Local<Value> argv[argc] = {val};
ctx_w->callback->Call(Context::GetCurrent()->Global(), argc, argv);
} else { } else {
// if error, do callback(error) // if error, do callback(error)
const unsigned argc = 1; err = ctx_w->ctx ? Local<Value>::New(String::New(ctx_w->ctx->error_message)) : Local<Value>::New(String::New(ctx_w->fctx->error_message));
Local<Value> argv[argc] = { Local<Value> argv[argc] = {err};
NanNewLocal(String::New(ctx->error_message)) ctx_w->errorCallback->Call(Context::GetCurrent()->Global(), argc, argv);
};
ctx_w->errorCallback->Call(argc, argv);
} }
if (try_catch.HasCaught()) { if (try_catch.HasCaught()) {
node::FatalException(try_catch); node::FatalException(try_catch);
} }
delete ctx->source_string; if (ctx_w->ctx) {
delete ctx_w->ctx->source_string;
} else {
delete ctx_w->fctx->input_path;
}
sass_free_context_wrapper(ctx_w); sass_free_context_wrapper(ctx_w);
} }
NAN_METHOD(Render) { Handle<Value> Render(const Arguments& args) {
NanScope(); HandleScope scope;
sass_context* ctx = sass_new_context(); sass_context* ctx = sass_new_context();
sass_context_wrapper* ctx_w = sass_new_context_wrapper(); sass_context_wrapper* ctx_w = sass_new_context_wrapper();
char *source;
String::AsciiValue astr(args[0]);
Local<Function> callback = Local<Function>::Cast(args[1]);
Local<Function> errorCallback = Local<Function>::Cast(args[2]);
String::AsciiValue bstr(args[3]);
source = new char[strlen(*astr)+1];
strcpy(source, *astr);
ctx->source_string = source;
ctx->options.include_paths = new char[strlen(*bstr)+1];
ctx->options.include_paths = *bstr;
// ctx->options.output_style = SASS_STYLE_NESTED;
ctx->options.image_path = new char[0];
ctx->options.output_style = args[4]->Int32Value();
ctx->options.source_comments = args[5]->Int32Value();
ctx_w->ctx = ctx; ctx_w->ctx = ctx;
ctx_w->callback = new NanCallback(callback); extractOptions(args, ctx, ctx_w, false);
ctx_w->errorCallback = new NanCallback(errorCallback);
ctx_w->request.data = ctx_w;
int status = uv_queue_work(uv_default_loop(), &ctx_w->request, WorkOnContext, (uv_after_work_cb)MakeCallback); int status = uv_queue_work(uv_default_loop(), &ctx_w->request, WorkOnContext, (uv_after_work_cb)MakeCallback);
assert(status == 0); assert(status == 0);
NanReturnUndefined(); return scope.Close(Undefined());
} }
NAN_METHOD(RenderSync) { Handle<Value> RenderSync(const Arguments& args) {
NanScope(); HandleScope scope;
sass_context* ctx = sass_new_context(); sass_context* ctx = sass_new_context();
char *source; extractOptions(args, ctx, NULL, false);
String::AsciiValue astr(args[0]);
String::AsciiValue bstr(args[1]);
source = new char[strlen(*astr)+1];
strcpy(source, *astr);
ctx->source_string = source;
ctx->options.include_paths = new char[strlen(*bstr)+1];
ctx->options.include_paths = *bstr;
ctx->options.output_style = args[2]->Int32Value();
ctx->options.image_path = new char[0];
ctx->options.source_comments = args[3]->Int32Value();
sass_compile(ctx); sass_compile(ctx);
source = NULL;
delete ctx->source_string; delete ctx->source_string;
ctx->source_string = NULL; ctx->source_string = NULL;
delete ctx->options.include_paths; delete ctx->options.include_paths;
ctx->options.include_paths = NULL; ctx->options.include_paths = NULL;
delete ctx->options.image_path;
ctx->options.image_path = NULL;
if (ctx->error_status == 0) { if (ctx->error_status == 0) {
Local<Value> output = NanNewLocal(String::New(ctx->output_string)); Local<Value> output = Local<Value>::New(String::New(ctx->output_string));
sass_free_context(ctx); sass_free_context(ctx);
NanReturnValue(output); return scope.Close(output);
} }
Local<String> error = String::New(ctx->error_message); Local<String> error = String::New(ctx->error_message);
sass_free_context(ctx); sass_free_context(ctx);
NanThrowError(error); ThrowException(Exception::Error(error));
NanReturnUndefined(); return scope.Close(Undefined());
} }
/** Handle<Value> RenderFile(const Arguments& args) {
Rendering Files HandleScope scope;
**/ sass_file_context* fctx = sass_new_file_context();
sass_context_wrapper* ctx_w = sass_new_context_wrapper();
void WorkOnFileContext(uv_work_t* req) { ctx_w->fctx = fctx;
sass_file_context_wrapper* ctx_w = static_cast<sass_file_context_wrapper*>(req->data); extractOptions(args, fctx, ctx_w, true);
sass_file_context* ctx = static_cast<sass_file_context*>(ctx_w->ctx);
sass_compile_file(ctx);
}
void MakeFileCallback(uv_work_t* req) {
NanScope();
TryCatch try_catch;
sass_file_context_wrapper* ctx_w = static_cast<sass_file_context_wrapper*>(req->data);
sass_file_context* ctx = static_cast<sass_file_context*>(ctx_w->ctx);
if (ctx->error_status == 0) {
// if no error, do callback(null, result)
const unsigned argc = 1;
Local<Value> argv[argc] = {
NanNewLocal(String::New(ctx->output_string))
};
ctx_w->callback->Call(argc, argv);
} else {
// if error, do callback(error)
const unsigned argc = 1;
Local<Value> argv[argc] = {
NanNewLocal(String::New(ctx->error_message))
};
ctx_w->errorCallback->Call(argc, argv);
}
if (try_catch.HasCaught()) {
node::FatalException(try_catch);
}
delete ctx->input_path;
sass_free_file_context_wrapper(ctx_w);
}
NAN_METHOD(RenderFile) {
NanScope();
sass_file_context* ctx = sass_new_file_context();
sass_file_context_wrapper* ctx_w = sass_new_file_context_wrapper();
char *filename;
String::AsciiValue astr(args[0]);
Local<Function> callback = Local<Function>::Cast(args[1]);
Local<Function> errorCallback = Local<Function>::Cast(args[2]);
String::AsciiValue bstr(args[3]);
filename = new char[strlen(*astr)+1];
strcpy(filename, *astr);
ctx->input_path = filename;
ctx->options.include_paths = new char[strlen(*bstr)+1];
ctx->options.include_paths = *bstr;
// ctx->options.output_style = SASS_STYLE_NESTED;
ctx->options.output_style = args[4]->Int32Value();
ctx->options.image_path = new char[0];
ctx->options.source_comments = args[5]->Int32Value();
ctx_w->ctx = ctx;
ctx_w->callback = new NanCallback(callback);
ctx_w->errorCallback = new NanCallback(errorCallback);
ctx_w->request.data = ctx_w;
int status = uv_queue_work(uv_default_loop(), &ctx_w->request, WorkOnFileContext, (uv_after_work_cb)MakeFileCallback); int status = uv_queue_work(uv_default_loop(), &ctx_w->request, WorkOnContext, (uv_after_work_cb)MakeCallback);
assert(status == 0); assert(status == 0);
NanReturnUndefined(); return scope.Close(Undefined());
} }
NAN_METHOD(RenderFileSync) { Handle<Value> RenderFileSync(const Arguments& args) {
NanScope(); HandleScope scope;
sass_file_context* ctx = sass_new_file_context(); sass_file_context* ctx = sass_new_file_context();
char *filename; extractOptions(args, ctx, NULL, true);
String::AsciiValue astr(args[0]);
String::AsciiValue bstr(args[1]);
filename = new char[strlen(*astr)+1];
strcpy(filename, *astr);
ctx->input_path = filename;
ctx->options.include_paths = new char[strlen(*bstr)+1];
ctx->options.include_paths = *bstr;
ctx->options.image_path = new char[0];
ctx->options.output_style = args[2]->Int32Value();
ctx->options.source_comments = args[3]->Int32Value();
sass_compile_file(ctx); sass_compile_file(ctx);
filename = NULL;
delete ctx->input_path; delete ctx->input_path;
ctx->input_path = NULL; ctx->input_path = NULL;
delete ctx->options.include_paths; delete ctx->options.include_paths;
ctx->options.include_paths = NULL; ctx->options.include_paths = NULL;
delete ctx->options.image_path;
ctx->options.image_path = NULL;
if (ctx->error_status == 0) { if (ctx->error_status == 0) {
Local<Value> output = NanNewLocal(String::New(ctx->output_string)); Local<Value> output = Local<Value>::New(String::New(ctx->output_string));
sass_free_file_context(ctx); sass_free_file_context(ctx);
NanReturnValue(output); return scope.Close(output);
} }
Local<String> error = String::New(ctx->error_message); Local<String> error = String::New(ctx->error_message);
sass_free_file_context(ctx); sass_free_file_context(ctx);
NanThrowError(error); ThrowException(Exception::Error(error));
NanReturnUndefined(); return scope.Close(Undefined());
} }
void RegisterModule(v8::Handle<v8::Object> target) { void RegisterModule(v8::Handle<v8::Object> target) {
NODE_SET_METHOD(target, "oldRender", OldRender);
NODE_SET_METHOD(target, "render", Render); NODE_SET_METHOD(target, "render", Render);
NODE_SET_METHOD(target, "renderSync", RenderSync); NODE_SET_METHOD(target, "renderSync", RenderSync);
NODE_SET_METHOD(target, "renderFile", RenderFile); NODE_SET_METHOD(target, "renderFile", RenderFile);
......
sass.js
var binding; var binding;
var fs = require('fs'); var fs = require('fs');
var path = require('path');
var v8 = 'v8-' + /[0-9]+\.[0-9]+/.exec(process.versions.v8)[0];
var modPath = path.join(__dirname, 'bin', process.platform + '-' + process.arch + '-' + v8, 'binding');
try { try {
if (fs.realpathSync(__dirname + '/build')) { if (fs.realpathSync(__dirname + '/build')) {
// use the build version if it exists // use the build version if it exists
binding = require(__dirname + '/build/Release/binding'); binding = require(__dirname + '/build/Release/binding');
} }
} catch (e) { } catch (e) {
try { // default to a precompiled binary if no build exists
fs.realpathSync(modPath + '.node'); var platform_full = process.platform+'-'+process.arch;
binding = require(modPath); binding = require(__dirname + '/precompiled/'+platform_full+'/binding');
} catch (ex) { }
// No binary! if (binding === null) {
throw new Error('`'+ modPath + '.node` is missing. Try reinstalling `node-sass`?'); throw new Error('Cannot find appropriate binary library for node-sass');
}
} }
var SASS_OUTPUT_STYLE = { var SASS_OUTPUT_STYLE = {
...@@ -34,11 +29,11 @@ var SASS_SOURCE_COMMENTS = { ...@@ -34,11 +29,11 @@ var SASS_SOURCE_COMMENTS = {
}; };
var prepareOptions = function(options) { var prepareOptions = function(options) {
var paths, style; var paths, style, comments;
var options = typeof options !== 'object' ? {} : options; options = typeof options !== 'object' ? {} : options;
var paths = options.include_paths || options.includePaths || []; paths = options.include_paths || options.includePaths || [];
var style = SASS_OUTPUT_STYLE[options.output_style || options.outputStyle] || 0; style = SASS_OUTPUT_STYLE[options.output_style || options.outputStyle] || 0;
var comments = SASS_SOURCE_COMMENTS[options.source_comments || options.sourceComments] || 0; comments = SASS_SOURCE_COMMENTS[options.source_comments || options.sourceComments] || 0;
return { return {
paths: paths, paths: paths,
...@@ -49,7 +44,13 @@ var prepareOptions = function(options) { ...@@ -49,7 +44,13 @@ var prepareOptions = function(options) {
var deprecatedRender = function(css, callback, options) { var deprecatedRender = function(css, callback, options) {
options = prepareOptions(options); options = prepareOptions(options);
return binding.oldRender(css, callback, options.paths.join(':'), options.style, options.comments); var errCallback = function(err) {
callback(err);
};
var oldCallback = function(css, err) {
callback(null, css);
};
return binding.render(css, oldCallback, errCallback, options.paths.join(':'), options.style, options.comments);
}; };
var deprecatedRenderSync = function(css, options) { var deprecatedRenderSync = function(css, options) {
...@@ -68,11 +69,11 @@ exports.render = function(options) { ...@@ -68,11 +69,11 @@ exports.render = function(options) {
options.error = options.error || function(){}; options.error = options.error || function(){};
if (options.file !== undefined && options.file !== null) { if (options.file !== undefined && options.file !== null) {
return binding.renderFile(options.file, options.success, options.error, newOptions.paths.join(path.delimiter), newOptions.style, newOptions.comments); return binding.renderFile(options.file, options.success, options.error, newOptions.paths.join(':'), newOptions.style, newOptions.comments);
} }
//Assume data is present if file is not. binding/libsass will tell the user otherwise! //Assume data is present if file is not. binding/libsass will tell the user otherwise!
return binding.render(options.data, options.success, options.error, newOptions.paths.join(path.delimiter), newOptions.style); return binding.render(options.data, options.success, options.error, newOptions.paths.join(":"), newOptions.style);
}; };
exports.renderSync = function(options) { exports.renderSync = function(options) {
...@@ -85,11 +86,11 @@ exports.renderSync = function(options) { ...@@ -85,11 +86,11 @@ exports.renderSync = function(options) {
newOptions = prepareOptions(options); newOptions = prepareOptions(options);
if (options.file !== undefined && options.file !== null) { if (options.file !== undefined && options.file !== null) {
return binding.renderFileSync(options.file, newOptions.paths.join(path.delimiter), newOptions.style, newOptions.comments); return binding.renderFileSync(options.file, newOptions.paths.join(':'), newOptions.style, newOptions.comments);
} }
//Assume data is present if file is not. binding/libsass will tell the user otherwise! //Assume data is present if file is not. binding/libsass will tell the user otherwise!
return binding.renderSync(options.data, newOptions.paths.join(path.delimiter), newOptions.style); return binding.renderSync(options.data, newOptions.paths.join(":"), newOptions.style);
}; };
exports.middleware = require('./lib/middleware'); exports.middleware = require('./lib/middleware');
sass_context_wrapper.cpp
...@@ -12,24 +12,7 @@ extern "C" { ...@@ -12,24 +12,7 @@ extern "C" {
void sass_free_context_wrapper(sass_context_wrapper* ctx_w) void sass_free_context_wrapper(sass_context_wrapper* ctx_w)
{ {
if (ctx_w->ctx) sass_free_context(ctx_w->ctx); if (ctx_w->ctx) sass_free_context(ctx_w->ctx);
if (ctx_w->fctx) sass_free_file_context(ctx_w->fctx);
delete ctx_w->callback;
delete ctx_w->errorCallback;
free(ctx_w);
}
sass_file_context_wrapper* sass_new_file_context_wrapper()
{
return (sass_file_context_wrapper*) calloc(1, sizeof(sass_file_context_wrapper));
}
void sass_free_file_context_wrapper(sass_file_context_wrapper* ctx_w)
{
if (ctx_w->ctx) sass_free_file_context(ctx_w->ctx);
delete ctx_w->callback;
delete ctx_w->errorCallback;
free(ctx_w); free(ctx_w);
} }
......
sass_context_wrapper.h
#include "libsass/sass_interface.h" #include "libsass/sass_interface.h"
#include <nan.h> #include <node.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -7,24 +7,15 @@ extern "C" { ...@@ -7,24 +7,15 @@ extern "C" {
struct sass_context_wrapper { struct sass_context_wrapper {
sass_context* ctx; sass_context* ctx;
sass_file_context* fctx;
uv_work_t request; uv_work_t request;
NanCallback* callback; v8::Persistent<v8::Function> callback;
NanCallback* errorCallback; v8::Persistent<v8::Function> errorCallback;
}; };
struct sass_context_wrapper* sass_new_context_wrapper(void); struct sass_context_wrapper* sass_new_context_wrapper(void);
void sass_free_context_wrapper(struct sass_context_wrapper* ctx); void sass_free_context_wrapper(struct sass_context_wrapper* ctx);
struct sass_file_context_wrapper {
sass_file_context* ctx;
uv_work_t request;
NanCallback* callback;
NanCallback* errorCallback;
};
struct sass_file_context_wrapper* sass_new_file_context_wrapper(void);
void sass_free_file_context_wrapper(struct sass_file_context_wrapper* ctx);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment