Comparing version 2.0.0-rc.9 to 2.0.0-rc.10
@@ -7,9 +7,11 @@ # Changelog | ||
* Running SassDoc now fails if destination folder is not empty ([#242](https://github.com/SassDoc/sassdoc/issues/242)) | ||
* `--interactive` (`-i`) option has been added to prompt when folder is not empty rather than failing ([#242](https://github.com/SassDoc/sassdoc/issues/242)) | ||
* `--no-prompt` option no longer exists and has been replaced by `--force` (`-f`) ([#242](https://github.com/SassDoc/sassdoc/issues/242)) | ||
* `--sass-convert` option does not exist anymore, it is now implied ([#231](https://github.com/SassDoc/sassdoc/issues/231#issuecomment-63610647)) | ||
* SassDoc now always outputs its own directory in the current folder ([#302](https://github.com/SassDoc/sassdoc/issues/302)) | ||
* `--dest` option has been added to define SassDoc's folder path for output, default is `sassdoc` ([#302](https://github.com/SassDoc/sassdoc/issues/302)) | ||
* `--no-prompt` option no longer exists since SassDoc outputs its own folder ([#302](https://github.com/SassDoc/sassdoc/issues/302)) | ||
* `--sass-convert` option no longer exists and is now implied ([#231](https://github.com/SassDoc/sassdoc/issues/231#issuecomment-63610647)) | ||
* Default name for configuration file is now `.sassdocrc` ([#189](https://github.com/SassDoc/sassdoc/issues/189)) | ||
* `@alias` can no longer be used on placeholders ([#263](https://github.com/SassDoc/sassdoc/issues/263)) | ||
* Annotations `@access`, `@content`, `@deprecated`, `@group`, `@output`, `@return` and `@type` are now restricted to one use per item ([#257](https://github.com/SassDoc/sassdoc/issues/257)) | ||
* Annotations `@param` and `@prop` now use square brackets (`[]`) for default values rather than parentheses (`()`) to avoid edge issues ([#303](https://github.com/SassDoc/sassdoc/issues/303)) | ||
To convert all your SassDoc comments to this change, you can run this script on your codebase: `find . -type f -name '*.s[ac]ss' -exec sed -ri '/@param|@prop|@require/y/()/[]/' {} +` | ||
@@ -29,3 +31,3 @@ ### API breaks for theme builders | ||
* `prop` key from item now becomes `property` ([#225](https://github.com/SassDoc/sassdoc/issues/225)) | ||
* When using the display filter from sassdoc-extras, items are now removed rather than not displayed from the templates ([sassdoc-extras#11](https://github.com/SassDoc/sassdoc-extras/issues/11)) | ||
* When using the display filter from sassdoc-extras, items are now fully removed rather than given a `display` key ([sassdoc-extras#11](https://github.com/SassDoc/sassdoc-extras/issues/11)) | ||
@@ -37,2 +39,4 @@ ### New features | ||
* It is now possible to use file/folder exclusion patterns ([#228](https://github.com/SassDoc/sassdoc/issues/231)) | ||
* It is now possible to pipe SassDoc into `stdin` ([#315](https://github.com/SassDoc/sassdoc/pull/315)) | ||
* `--debug` option has been added to output information about current setup ([#311](https://github.com/SassDoc/sassdoc/issues/311)) | ||
* Default theme now has a `googleAnalytics` configuration accepting a Google Analytics tracking key ([sassdoc-theme-default#10](https://github.com/SassDoc/sassdoc-theme-default/pull/10)) | ||
@@ -39,0 +43,0 @@ * Default theme now has a `trackingCode` configuration accepting an arbitrary HTML snippet to be included before `</body>` ([sassdoc-theme-default#10](https://github.com/SassDoc/sassdoc-theme-default/pull/10)) |
@@ -8,3 +8,3 @@ "use strict"; | ||
}); | ||
function alias(config) { | ||
function alias(env) { | ||
return { | ||
@@ -26,3 +26,3 @@ name: 'alias', | ||
if (aliasedItem === undefined) { | ||
config.logger.log(("Item \"" + name + "\" is an alias of \"" + alias + "\" but this item doesn't exist.")); | ||
env.logger.log(("Item \"" + name + "\" is an alias of \"" + alias + "\" but this item doesn't exist.")); | ||
return; | ||
@@ -29,0 +29,0 @@ } |
@@ -8,3 +8,3 @@ "use strict"; | ||
}); | ||
var typeRegEx = /^\s*(?:\{(.*)\})?\s*(?:\$?([^\s]+))?\s*(?:\((.*)\))?\s*(?:-?\s*([\s\S]*))?/; | ||
var typeRegEx = /^\s*(?:\{(.*)\})?\s*(?:\$?([^\s]+))?\s*(?:\[([^\]]*)\])?\s*(?:-?\s*([\s\S]*))?/; | ||
function parameter() { | ||
@@ -11,0 +11,0 @@ return { |
@@ -8,3 +8,3 @@ "use strict"; | ||
}); | ||
var reqRegEx = /\s*(?:\{(.*)\})?\s*(?:(\$?[^\s]+))?\s*(?:\(([^\)]*)\))?\s*(?:-?\s*([\s\S]*))\s*$/; | ||
var reqRegEx = /\s*(?:\{(.*)\})?\s*(?:(\$?[^\s]+))?\s*(?:\[([^\]]*)\])?\s*(?:-?\s*([\s\S]*))\s*$/; | ||
function property() { | ||
@@ -11,0 +11,0 @@ return { |
@@ -10,4 +10,4 @@ "use strict"; | ||
var uniq = require('lodash').uniq; | ||
var reqRegEx = /^\s*(?:\{(.*)\})?\s*(?:(\$?[^\s]+))?\s*(?:\((.*)\))?\s*(?:-?\s*([^<$]*))?\s*(?:<?\s*(.*)\s*>)?$/; | ||
var $__default = function(config) { | ||
var reqRegEx = /^\s*(?:\{(.*)\})?\s*(?:(\$?[^\s]+))?\s*(?:\[([^\]]*)\])?\s*(?:-?\s*([^<$]*))?\s*(?:<?\s*(.*)\s*>)?$/; | ||
var $__default = function(env) { | ||
return { | ||
@@ -45,3 +45,3 @@ name: 'require', | ||
item.require.forEach((function(reqObj) { | ||
handWritten[reqObj.type + '-' + reqObj.name] = true; | ||
handWritten[$traceurRuntime.toProperty(reqObj.type + '-' + reqObj.name)] = true; | ||
})); | ||
@@ -100,3 +100,3 @@ } | ||
if (!req.autofill) { | ||
config.logger.log(("Item \"" + item.context.name + "\" requires \"" + req.name + "\" from type \"" + req.type + "\" but this item doesn't exist.")); | ||
env.logger.log(("Item \"" + item.context.name + "\" requires \"" + req.name + "\" from type \"" + req.type + "\" but this item doesn't exist.")); | ||
} | ||
@@ -147,3 +147,3 @@ return; | ||
if (type && name && handWritten) { | ||
return handWritten[type + '-' + name]; | ||
return handWritten[$traceurRuntime.toProperty(type + '-' + name)]; | ||
} | ||
@@ -176,3 +176,3 @@ return false; | ||
b = 0; i < index; i++) { | ||
if (code[i] !== str[b]) { | ||
if (code[$traceurRuntime.toProperty(i)] !== str[$traceurRuntime.toProperty(b)]) { | ||
return false; | ||
@@ -179,0 +179,0 @@ } |
@@ -9,3 +9,3 @@ "use strict"; | ||
var seeRegEx = /\s*(?:\{([\w-_]+)\}\s*)?(.*)/; | ||
function see(config) { | ||
function see(env) { | ||
return { | ||
@@ -41,3 +41,3 @@ name: 'see', | ||
} | ||
config.logger.log(("Item \"" + item.context.name + "\" refers to \"" + see.name + "\" from type \"" + see.type + "\" but this item doesn't exist.")); | ||
env.logger.log(("Item \"" + item.context.name + "\" refers to \"" + see.name + "\" from type \"" + see.type + "\" but this item doesn't exist.")); | ||
})).filter((function(x) { | ||
@@ -44,0 +44,0 @@ return x !== undefined; |
@@ -8,5 +8,5 @@ "use strict"; | ||
}); | ||
var annotations = require('./annotations.js'); | ||
var AnnotationsApi = function AnnotationsApi(config) { | ||
this.config = config; | ||
var annotations = require('./annotations'); | ||
var AnnotationsApi = function AnnotationsApi(env) { | ||
this.env = env; | ||
this.list = {_: {alias: {}}}; | ||
@@ -18,10 +18,10 @@ this.addAnnotations(annotations); | ||
var $__0 = this; | ||
annotation = annotation(this.config); | ||
this.list._.alias[name] = name; | ||
annotation = annotation(this.env); | ||
this.list._.alias[$traceurRuntime.toProperty(name)] = name; | ||
if (Array.isArray(annotation.alias)) { | ||
annotation.alias.forEach((function(aliasName) { | ||
$__0.list._.alias[aliasName] = name; | ||
$__0.list._.alias[$traceurRuntime.toProperty(aliasName)] = name; | ||
})); | ||
} | ||
this.list[name] = annotation; | ||
this.list[$traceurRuntime.toProperty(name)] = annotation; | ||
}, | ||
@@ -28,0 +28,0 @@ addAnnotations: function(annotations) { |
@@ -8,4 +8,5 @@ "use strict"; | ||
}); | ||
var doc = "\nUsage: sassdoc <src> <dest> [options]\n\nArguments:\n <src> Path to your Sass folder.\n <dest> Path to the destination folder.\n\nOptions:\n -h, --help Bring help.\n --version Show version.\n -v, --verbose Enable verbose mode.\n -i, --interactive Prompt to remove an existing destination directory.\n -f, --force Always remove an existing destination directory\n without asking.\n -c, --config=<path> Path to JSON/YAML configuration file.\n -t, --theme=<name> Theme to use.\n --no-update-notifier Disable update notifier check.\n --strict Turn warnings into errors.\n"; | ||
var doc = "\nUsage:\n sassdoc <src> [options]\n sassdoc [options]\n\nArguments:\n <src> Path to your Sass folder.\n\nOptions:\n -h, --help Bring help.\n --version Show version.\n -v, --verbose Enable verbose mode.\n -d, --dest=<dir> Documentation folder [default: sassdoc].\n -c, --config=<path> Path to JSON/YAML configuration file.\n -t, --theme=<name> Theme to use.\n --no-update-notifier Disable update notifier check.\n --strict Turn warnings into errors.\n"; | ||
var docopt = require('docopt').docopt; | ||
var source = require('vinyl-source-stream'); | ||
var pkg = require('../package.json'); | ||
@@ -17,3 +18,3 @@ var Environment = require('./environment').default; | ||
function cli() { | ||
var argv = arguments[0] !== (void 0) ? arguments[0] : process.argv; | ||
var argv = arguments[0] !== (void 0) ? arguments[0] : process.argv.slice(2); | ||
var options = docopt(doc, { | ||
@@ -23,4 +24,4 @@ version: pkg.version, | ||
}); | ||
var logger = new Logger(options['--verbose']); | ||
var env = new Environment(logger, options['--strict']); | ||
var logger = new Logger(options[$traceurRuntime.toProperty('--verbose')]); | ||
var env = new Environment(logger, options[$traceurRuntime.toProperty('--strict')]); | ||
env.on('error', (function(error) { | ||
@@ -32,7 +33,6 @@ if (error instanceof errors.Warning) { | ||
})); | ||
env.load(options['--config']); | ||
env.load(options[$traceurRuntime.toProperty('--config')]); | ||
ensure(env, options, { | ||
dest: '--dest', | ||
theme: '--theme', | ||
interactive: '--interactive', | ||
force: '--force', | ||
noUpdateNotifier: '--no-update-notifier' | ||
@@ -44,13 +44,16 @@ }); | ||
} | ||
sassdoc(options['<src>'], options['<dest>'], env); | ||
if (!options[$traceurRuntime.toProperty('<src>')]) { | ||
return process.stdin.pipe(source()).pipe(sassdoc(env)); | ||
} | ||
sassdoc(options[$traceurRuntime.toProperty('<src>')], env); | ||
} | ||
var $__default = cli; | ||
function ensure(env, options, names) { | ||
for (var $__0 = Object.keys(names)[$traceurRuntime.toProperty(Symbol.iterator)](), | ||
for (var $__0 = Object.keys(names)[$traceurRuntime.toProperty($traceurRuntime.toProperty(Symbol.iterator))](), | ||
$__1; !($__1 = $__0.next()).done; ) { | ||
var k = $__1.value; | ||
{ | ||
var v = names[k]; | ||
if (options[v]) { | ||
env[k] = options[v]; | ||
var v = names[$traceurRuntime.toProperty(k)]; | ||
if (options[$traceurRuntime.toProperty(v)]) { | ||
env[$traceurRuntime.toProperty(k)] = options[$traceurRuntime.toProperty(v)]; | ||
} | ||
@@ -57,0 +60,0 @@ } |
@@ -13,2 +13,3 @@ "use strict"; | ||
var errors = require('./errors'); | ||
var utils = require('./utils'); | ||
var converter = require('sass-convert'); | ||
@@ -28,3 +29,7 @@ var Environment = function Environment(logger) { | ||
} else { | ||
logger.error('stack' in error ? error.stack : error); | ||
if (utils.is.object(error) && 'stack' in error) { | ||
logger.error(error.stack); | ||
} else { | ||
logger.error(error); | ||
} | ||
} | ||
@@ -51,3 +56,3 @@ })); | ||
} | ||
if (typeof config === 'object') { | ||
if ((typeof config === 'undefined' ? 'undefined' : $traceurRuntime.typeof(config)) === 'object') { | ||
return this.loadObject(config); | ||
@@ -62,10 +67,10 @@ } | ||
} | ||
for (var $__2 = Object.keys(config)[$traceurRuntime.toProperty(Symbol.iterator)](), | ||
for (var $__2 = Object.keys(config)[$traceurRuntime.toProperty($traceurRuntime.toProperty(Symbol.iterator))](), | ||
$__3; !($__3 = $__2.next()).done; ) { | ||
var k = $__3.value; | ||
{ | ||
if (k in this) { | ||
if ($traceurRuntime.toProperty(k) in this) { | ||
return this.emit('error', new Error(("Reserved configuration key \"" + k + "\"."))); | ||
} | ||
this[k] = config[k]; | ||
this[$traceurRuntime.toProperty(k)] = config[$traceurRuntime.toProperty(k)]; | ||
} | ||
@@ -93,3 +98,3 @@ } | ||
} | ||
if (typeof this.package !== 'object') { | ||
if ($traceurRuntime.typeof(this.package) !== 'object') { | ||
this.loadPackage(); | ||
@@ -96,0 +101,0 @@ } |
@@ -39,3 +39,3 @@ "use strict"; | ||
$__1 = 0; $__1 < arguments.length; $__1++) | ||
args[$__1] = arguments[$__1]; | ||
args[$traceurRuntime.toProperty($__1)] = arguments[$traceurRuntime.toProperty($__1)]; | ||
if (this.verbose) { | ||
@@ -48,3 +48,3 @@ console.log(log(args)); | ||
$__2 = 0; $__2 < arguments.length; $__2++) | ||
args[$__2] = arguments[$__2]; | ||
args[$traceurRuntime.toProperty($__2)] = arguments[$traceurRuntime.toProperty($__2)]; | ||
console.warn(chalk.yellow(flog('WARNING', args))); | ||
@@ -55,3 +55,3 @@ }, | ||
$__3 = 0; $__3 < arguments.length; $__3++) | ||
args[$__3] = arguments[$__3]; | ||
args[$traceurRuntime.toProperty($__3)] = arguments[$traceurRuntime.toProperty($__3)]; | ||
console.error(chalk.red(flog('ERROR', args))); | ||
@@ -58,0 +58,0 @@ } |
@@ -11,2 +11,3 @@ "use strict"; | ||
var through = require('through2'); | ||
var concat = require('concat-stream'); | ||
var path = require('path'); | ||
@@ -30,3 +31,3 @@ var utils = require('./utils'); | ||
Object.keys(this.annotations.list).forEach((function(key) { | ||
var annotation = $__0.annotations.list[key]; | ||
var annotation = $__0.annotations.list[$traceurRuntime.toProperty(key)]; | ||
if (annotation.resolve) { | ||
@@ -40,18 +41,33 @@ annotation.resolve(data); | ||
var $__0 = this; | ||
var deferred = utils.defer(); | ||
var data = []; | ||
var deferred = utils.defer(); | ||
var transform = (function(file, enc, cb) { | ||
cb(null, file); | ||
if (!file.isBuffer()) { | ||
return; | ||
var parseFile = (function($__2) { | ||
var $__3 = $__2, | ||
buf = $__3.buf, | ||
name = $__3.name, | ||
path = $__3.path; | ||
var fileData = $__0.parse(buf.toString(enc), name); | ||
fileData.forEach((function(item) { | ||
item.file = { | ||
path: path, | ||
name: name | ||
}; | ||
data.push(item); | ||
})); | ||
}); | ||
if (file.isBuffer()) { | ||
var args = { | ||
buf: file.contents, | ||
name: path.basename(file.relative), | ||
path: file.relative | ||
}; | ||
parseFile(args); | ||
} | ||
var name = path.basename(file.relative); | ||
var fileData = $__0.parse(file.contents.toString(enc), name); | ||
fileData.forEach((function(item) { | ||
item.file = { | ||
path: file.relative, | ||
name: name | ||
}; | ||
data.push(item); | ||
})); | ||
if (file.isStream()) { | ||
file.pipe(concat((function(buf) { | ||
parseFile({buf: buf}); | ||
}))); | ||
} | ||
}); | ||
@@ -58,0 +74,0 @@ var flush = (function(cb) { |
"use strict"; | ||
Object.defineProperties(exports, { | ||
default: {get: function() { | ||
return $__default; | ||
parseFilter: {get: function() { | ||
return parseFilter; | ||
}}, | ||
parse: {get: function() { | ||
return parse; | ||
}}, | ||
refresh: {get: function() { | ||
return refresh; | ||
}}, | ||
ensureEnvironment: {get: function() { | ||
return ensureEnvironment; | ||
}}, | ||
documentize: {get: function() { | ||
return documentize; | ||
}}, | ||
Environment: {get: function() { | ||
@@ -27,14 +18,11 @@ return Environment; | ||
}}, | ||
sort: {get: function() { | ||
return sort; | ||
sorter: {get: function() { | ||
return sorter; | ||
}}, | ||
recurse: {get: function() { | ||
return recurse; | ||
}}, | ||
exclude: {get: function() { | ||
return exclude; | ||
}}, | ||
errors: {get: function() { | ||
return errors; | ||
}}, | ||
default: {get: function() { | ||
return $__default; | ||
}}, | ||
__esModule: {value: true} | ||
@@ -44,5 +32,3 @@ }); | ||
var errors = require('./errors'); | ||
var mkdir = utils.denodeify(require('mkdirp')); | ||
var safeWipe = require('safe-wipe'); | ||
var vfs = require('vinyl-fs'); | ||
var is = utils.is; | ||
var Environment = require('./environment').default; | ||
@@ -53,65 +39,22 @@ var Logger = require('./logger').default; | ||
var recurse = require('./recurse').default; | ||
var sort = require('./sorter').default; | ||
var sorter = require('./sorter').default; | ||
var mkdir = utils.denodeify(require('mkdirp')); | ||
var safeWipe = require('safe-wipe'); | ||
var vfs = require('vinyl-fs'); | ||
var converter = require('sass-convert'); | ||
var pipe = require('multipipe'); | ||
function sassdoc(src, dest) { | ||
var env = arguments[2] !== (void 0) ? arguments[2] : {}; | ||
var deferred = utils.defer(); | ||
env = ensureEnvironment(env, deferred.reject); | ||
var logger = env.logger; | ||
refresh(dest, { | ||
interactive: env.interactive || false, | ||
force: env.force || false, | ||
parent: utils.g2b(src), | ||
silent: true | ||
}).then((function() { | ||
logger.log(("Folder \"" + dest + "\" successfully refreshed.")); | ||
return parse(src, env); | ||
}), (function(error) { | ||
throw new errors.Error(error.message); | ||
})).then((function(data) { | ||
logger.log(("Folder \"" + src + "\" successfully parsed.")); | ||
env.data = data; | ||
var promise = env.theme(dest, env); | ||
if (promise && typeof promise.then === 'function') { | ||
return promise; | ||
} | ||
var type = Object.prototype.toString.call(promise); | ||
throw new errors.Error(("Theme didn't return a promise, got " + type + ".")); | ||
})).then((function() { | ||
if (env.themeName) { | ||
logger.log(("Theme \"" + env.themeName + "\" successfully rendered.")); | ||
} else { | ||
logger.log('Anonymous theme successfully rendered.'); | ||
} | ||
logger.log('Process over. Everything okay!'); | ||
})).then(deferred.resolve, (function(error) { | ||
return env.emit('error', error); | ||
})); | ||
return deferred.promise; | ||
} | ||
var $__default = sassdoc; | ||
function parse(src) { | ||
function parseFilter(src) { | ||
var env = arguments[1] !== (void 0) ? arguments[1] : {}; | ||
var deferred = utils.defer(); | ||
env = ensureEnvironment(env, deferred.reject); | ||
env = ensureEnvironment(env); | ||
var parser = new Parser(env, env.theme && env.theme.annotations); | ||
var parseFilter = parser.stream(); | ||
var pipeline = pipe(recurse(), exclude(env.exclude || []), converter({ | ||
from: 'sass', | ||
to: 'scss' | ||
}), parseFilter); | ||
pipeline.resume(); | ||
vfs.src(src).pipe(pipeline).on('error', deferred.reject); | ||
parseFilter.promise.then((function(data) { | ||
return sort(data); | ||
})).then(deferred.resolve, deferred.reject); | ||
return deferred.promise; | ||
} | ||
function refresh(dest, env) { | ||
return safeWipe(dest, env).then((function() { | ||
return mkdir(dest); | ||
var filter = parser.stream(); | ||
filter.promise.then((function(data) { | ||
return sorter(data); | ||
})); | ||
return filter; | ||
} | ||
function ensureEnvironment(config, onError) { | ||
function ensureEnvironment(config) { | ||
var onError = arguments[1] !== (void 0) ? arguments[1] : (function(e) { | ||
throw e; | ||
}); | ||
if (config instanceof Environment) { | ||
@@ -121,3 +64,3 @@ config.on('error', onError); | ||
} | ||
var logger = new Logger(config.verbose); | ||
var logger = config.logger || new Logger(config.verbose); | ||
var env = new Environment(logger, config.strict); | ||
@@ -129,3 +72,145 @@ env.on('error', onError); | ||
} | ||
var documentize = sassdoc; | ||
; | ||
function sassdoc() { | ||
for (var args = [], | ||
$__0 = 0; $__0 < arguments.length; $__0++) | ||
args[$traceurRuntime.toProperty($__0)] = arguments[$traceurRuntime.toProperty($__0)]; | ||
var src = args.find(is.string); | ||
var env = args.find(is.object); | ||
var hasSrc = src; | ||
env = ensureEnvironment(env || {}); | ||
src = src || process.cwd(); | ||
env.dest = env.dest || 'sassdoc'; | ||
return hasSrc ? documentize() : stream(); | ||
function refresh() { | ||
return safeWipe(env.dest, { | ||
force: true, | ||
parent: utils.g2b(src), | ||
silent: true | ||
}).then((function() { | ||
return mkdir(env.dest); | ||
})).then((function() { | ||
env.logger.log(("Folder \"" + env.dest + "\" successfully refreshed.")); | ||
})).catch((function(err) { | ||
throw new errors.Error(err.message); | ||
})); | ||
} | ||
function theme() { | ||
var promise = env.theme(env.dest, env); | ||
if (!is.promise(promise)) { | ||
var type = Object.prototype.toString.call(promise); | ||
throw new errors.Error(("Theme didn't return a promise, got " + type + ".")); | ||
} | ||
return promise.then((function() { | ||
var themeName = env.themeName || 'anonymous'; | ||
env.logger.log(("Theme \"" + themeName + "\" successfully rendered.")); | ||
env.logger.log('Process over. Everything okay!'); | ||
})); | ||
} | ||
function documentize() { | ||
var filter, | ||
streams, | ||
pipeline, | ||
err; | ||
return $traceurRuntime.asyncWrap(function($ctx) { | ||
while (true) | ||
switch ($ctx.state) { | ||
case 0: | ||
filter = parseFilter(src, env); | ||
filter.promise.then((function(data) { | ||
env.logger.log(("Folder \"" + src + "\" successfully parsed.")); | ||
env.data = data; | ||
})); | ||
streams = [vfs.src(src), recurse(), exclude(env.exclude || []), converter({ | ||
from: 'sass', | ||
to: 'scss' | ||
}), filter]; | ||
pipeline = (function() { | ||
return new Promise((function(resolve, reject) { | ||
pipe.apply(null, $traceurRuntime.spread(streams, [(function(err) { | ||
err ? reject(err) : resolve(); | ||
})])).resume(); | ||
})); | ||
}); | ||
$ctx.state = 17; | ||
break; | ||
case 17: | ||
$ctx.pushTry(7, null); | ||
$ctx.state = 10; | ||
break; | ||
case 10: | ||
Promise.resolve(refresh()).then($ctx.createCallback(2), $ctx.errback); | ||
return; | ||
case 2: | ||
Promise.resolve(pipeline()).then($ctx.createCallback(4), $ctx.errback); | ||
return; | ||
case 4: | ||
Promise.resolve(theme()).then($ctx.createCallback(6), $ctx.errback); | ||
return; | ||
case 6: | ||
$ctx.popTry(); | ||
$ctx.state = -2; | ||
break; | ||
case 7: | ||
$ctx.popTry(); | ||
err = $ctx.storedException; | ||
$ctx.state = 13; | ||
break; | ||
case 13: | ||
env.emit('error', err); | ||
$ctx.state = -2; | ||
break; | ||
default: | ||
return $ctx.end(); | ||
} | ||
}, this); | ||
} | ||
function stream() { | ||
var filter = parseFilter(src, env); | ||
var documentize = (function() { | ||
var err; | ||
return $traceurRuntime.asyncWrap(function($ctx) { | ||
while (true) | ||
switch ($ctx.state) { | ||
case 0: | ||
$ctx.pushTry(7, null); | ||
$ctx.state = 10; | ||
break; | ||
case 10: | ||
Promise.resolve(refresh()).then($ctx.createCallback(2), $ctx.errback); | ||
return; | ||
case 2: | ||
Promise.resolve(filter.promise).then($ctx.createCallback(4), $ctx.errback); | ||
return; | ||
case 4: | ||
Promise.resolve(theme()).then($ctx.createCallback(6), $ctx.errback); | ||
return; | ||
case 6: | ||
$ctx.popTry(); | ||
$ctx.state = -2; | ||
break; | ||
case 7: | ||
$ctx.popTry(); | ||
err = $ctx.storedException; | ||
$ctx.state = 13; | ||
break; | ||
case 13: | ||
env.emit('error', err); | ||
$ctx.state = -2; | ||
break; | ||
default: | ||
return $ctx.end(); | ||
} | ||
}, this); | ||
}); | ||
filter.on('pipe', documentize).on('error', (function(err) { | ||
return env.emit('error', err); | ||
})).resume(); | ||
filter.promise.then((function(data) { | ||
env.logger.log('SCSS files successfully parsed.'); | ||
env.data = data; | ||
})); | ||
return filter; | ||
} | ||
} | ||
var $__default = sassdoc; |
@@ -27,2 +27,5 @@ "use strict"; | ||
}}, | ||
is: {get: function() { | ||
return is; | ||
}}, | ||
__esModule: {value: true} | ||
@@ -72,3 +75,3 @@ }); | ||
$__0 = 0; $__0 < arguments.length; $__0++) | ||
args[$__0] = arguments[$__0]; | ||
args[$traceurRuntime.toProperty($__0)] = arguments[$traceurRuntime.toProperty($__0)]; | ||
return new Promise((function(resolve, reject) { | ||
@@ -78,3 +81,3 @@ fn.apply(null, $traceurRuntime.spread(args, [(function(err) { | ||
$__1 = 1; $__1 < arguments.length; $__1++) | ||
args[$__1 - 1] = arguments[$__1]; | ||
args[$traceurRuntime.toProperty($__1 - 1)] = arguments[$traceurRuntime.toProperty($__1)]; | ||
if (err) { | ||
@@ -105,1 +108,21 @@ reject(err); | ||
} | ||
var is = { | ||
undef: (function(arg) { | ||
return arg === void 0; | ||
}), | ||
string: (function(arg) { | ||
return typeof arg === 'string'; | ||
}), | ||
function: (function(arg) { | ||
return typeof arg === 'function'; | ||
}), | ||
object: (function(arg) { | ||
return (typeof arg === 'undefined' ? 'undefined' : $traceurRuntime.typeof(arg)) === 'object' && arg !== null; | ||
}), | ||
promise: (function(arg) { | ||
return arg && is.function(arg.then); | ||
}), | ||
stream: (function(arg) { | ||
return arg && is.function(arg.pipe); | ||
}) | ||
}; |
10
index.js
'use strict'; | ||
require('./bin/traceur-runtime'); | ||
module.exports = require('./dist/sassdoc'); | ||
var api = require('./dist/sassdoc'); | ||
module.exports = api.default; | ||
module.exports.ensureEnvironment = api.ensureEnvironment; | ||
module.exports.Environment = api.Environment; | ||
module.exports.Logger = api.Logger; | ||
module.exports.Parser = api.Parser; | ||
module.exports.errors = api.errors; |
@@ -24,3 +24,3 @@ { | ||
], | ||
"version": "2.0.0-rc.9", | ||
"version": "2.0.0-rc.10", | ||
"license": { | ||
@@ -50,20 +50,23 @@ "type": "MIT", | ||
"browser": { | ||
"./dist/notifier.js" : false, | ||
"./dist/exclude.js" : false, | ||
"./dist/cli.js" : false, | ||
"./dist/recurse.js" : false, | ||
"vinyl-fs" : false, | ||
"glob2base" : false, | ||
"docopt" : false, | ||
"glob" : false, | ||
"js-yaml" : false, | ||
"minimatch" : false, | ||
"mkdirp" : false, | ||
"multipipe" : false, | ||
"rimraf" : false, | ||
"safe-wipe" : false, | ||
"sass-convert" : false, | ||
"sassdoc-theme-default" : false, | ||
"update-notifier" : false, | ||
"through2" : false | ||
"./dist/notifier.js": false, | ||
"./dist/exclude.js": false, | ||
"./dist/cli.js": false, | ||
"./dist/recurse.js": false, | ||
"vinyl-fs": false, | ||
"glob2base": false, | ||
"docopt": false, | ||
"glob": false, | ||
"js-yaml": false, | ||
"minimatch": false, | ||
"mkdirp": false, | ||
"multipipe": false, | ||
"rimraf": false, | ||
"safe-wipe": false, | ||
"sass-convert": false, | ||
"sassdoc-theme-default": false, | ||
"update-notifier": false, | ||
"through2": false, | ||
"concat-stream": false, | ||
"vinyl-source-stream": false | ||
}, | ||
@@ -80,2 +83,3 @@ "files": [ | ||
"chalk": "^0.5.0", | ||
"concat-stream": "^1.4.7", | ||
"docopt": "^0.4.1", | ||
@@ -93,6 +97,7 @@ "glob": "^4.3.1", | ||
"sassdoc-theme-default": "2.0.0-rc.10", | ||
"scss-comment-parser": "0.5.1-rc.4", | ||
"scss-comment-parser": "0.5.1-rc.5", | ||
"through2": "^0.6.3", | ||
"update-notifier": "^0.2.0", | ||
"vinyl-fs": "^0.3.11" | ||
"vinyl-fs": "^0.3.11", | ||
"vinyl-source-stream": "^1.0.0" | ||
}, | ||
@@ -103,3 +108,4 @@ "devDependencies": { | ||
"mocha": "^2.0.1", | ||
"traceur": ">= 0.0.79 < 1" | ||
"traceur": ">= 0.0.79 < 1", | ||
"traceur-runner": "pascalduez/traceur-runner#pr__compile_options" | ||
}, | ||
@@ -106,0 +112,0 @@ "engines": { |
Minified code
QualityThis package contains minified code. This may be harmless in some cases where minified code is included in packaged libraries, however packages on npm should not minify code.
Found 1 instance in 1 package
Minified code
QualityThis package contains minified code. This may be harmless in some cases where minified code is included in packaged libraries, however packages on npm should not minify code.
Found 1 instance in 1 package
146340
4086
19
5
+ Addedconcat-stream@^1.4.7
+ Addedvinyl-source-stream@^1.0.0
+ Addedscss-comment-parser@0.5.1-rc.5(transitive)
+ Addedthrough2@2.0.5(transitive)
+ Addedvinyl-source-stream@1.1.2(transitive)
- Removedscss-comment-parser@0.5.1-rc.4(transitive)