jade-loader - npm Package Compare versions

Comparing version 0.5.2 to 0.6.0

index.js

@@ -6,23 +6,172 @@ /*
 var path = require("path");
+var dirname = path.dirname;
 var loaderUtils = require("loader-utils");
+
 module.exports = function(source) {
 	this.cacheable && this.cacheable();
 	var jade = require("jade");
-	var runtime = "var jade = require("+JSON.stringify(require.resolve("jade/lib/runtime"))+");\n\n";
+
+	var utils = require("jade/lib/utils");
+	var nodes = require("jade/lib/nodes");
+	var filters = require("jade/lib/filters");
+
 	var req = loaderUtils.getRemainingRequest(this).replace(/^!/, "");
+
 	var query = loaderUtils.parseQuery(this.query);
-	var tmplFunc = jade.compile(source, {
-		filename: req,
-		client: true,
-		self: query.self,
-		pretty: query.pretty,
-		locals: query.locals,
-		compileDebug: this.debug || false
-	});
-	var debugSource = "";
-	if(this.debug) {
-		debugSource = "require(" + JSON.stringify(path.join(__dirname, "web_modules", "fs")) + ").setFile(" + JSON.stringify(req) + ", " + JSON.stringify(source) + ");";
+
+	var loadModule = this.loadModule;
+	var resolve = this.resolve;
+	var loaderContext = this;
+	var callback;
+
+	var fileContents = {};
+	var filePaths = {};
+	function MyParser(str, filename, options) {
+		this._mustBeInlined = false;
+		jade.Parser.call(this, str, filename, options);
 	}
-	return runtime + debugSource + "module.exports = " + tmplFunc.toString();
+	MyParser.prototype = Object.create(jade.Parser.prototype);
+	MyParser.prototype.constructor = MyParser;
+
+	var missingFileMode = false;
+	function getFileContent(context, request) {
+		request = /^~/.test(request) ? request.substr(1) : "./" + request;
+		var baseRequest = request;
+		var filePath = filePaths[context + " " + request];
+		if(filePath) return filePath;
+		var isSync = true;
+		resolve(context, request + ".jade", function(err, _request) {
+			if(err) {
+				resolve(context, request, function(err2, _request) {
+					if(err2) return callback(err2);
+
+					request = _request;
+					next();
+				});
+			}
+
+			request = _request;
+			next();
+			function next() {
+				loadModule("-!" + path.join(__dirname, "stringify.loader.js") + "!" + request, function(err, source) {
+					if(err) return callback(err);
+
+					filePaths[context + " " + baseRequest] = request;
+					fileContents[request] = JSON.parse(source);
+
+					if(!isSync) {
+						run();
+					} else {
+						isSync = false;
+					}
+				});
+			}
+		});
+		if(isSync) {
+			isSync = false;
+			missingFileMode = true;
+			throw "continue";
+		} else {
+			return filePaths[context + " " + baseRequest];
+		}
+	}
+
+	MyParser.prototype.parseMixin = function() {
+		this._mustBeInlined = true;
+		return jade.Parser.prototype.parseMixin.call(this);
+	};
+
+	MyParser.prototype.parseBlock = function() {
+		this._mustBeInlined = true;
+		return jade.Parser.prototype.parseBlock.call(this);
+	};
+
+	MyParser.prototype.parseExtends = function() {
+		if(!callback) callback = loaderContext.async();
+		if(!callback) return jade.Parser.prototype.parseExtends.call(this);
+
+		var request = this.expect('extends').val.trim();
+		var context = dirname(this.filename.split("!").pop());
+
+		var path = getFileContent(context, request);
+		var str = fileContents[path];
+		var parser = new this.constructor(str, path, this.options);
+
+		parser.blocks = this.blocks;
+		parser.contexts = this.contexts;
+		this.extending = parser;
+
+		return new nodes.Literal('');
+	};
+
+	MyParser.prototype.parseInclude = function() {
+		if(!callback) callback = loaderContext.async();
+		if(!callback) return jade.Parser.prototype.parseInclude.call(this);
+
+		var tok = this.expect('include');
+
+		var request = tok.val.trim();
+		var context = dirname(this.filename.split("!").pop());
+		var path = getFileContent(context, request);
+		var str = fileContents[path];
+
+		// has-filter
+		if (tok.filter) {
+			var str = str.replace(/\r/g, '');
+			str = filters(tok.filter, str, { filename: path });
+			return new nodes.Literal(str);
+		}
+
+		// non-jade
+		if ('.jade' != path.substr(-5)) {
+			var str = str.replace(/\r/g, '');
+			return new nodes.Literal(str);
+		}
+
+		var parser = new this.constructor(str, path, this.options);
+		parser.blocks = utils.merge({}, this.blocks);
+
+		parser.mixins = this.mixins;
+
+		this.context(parser);
+		var ast = parser.parse();
+		this.context();
+		ast.filename = path;
+
+		if ('indent' == this.peek().type) {
+			ast.includeBlock().push(this.block());
+		} else if(!parser._mustBeInlined) {
+			ast = new nodes.Code("require(" + JSON.stringify(path) + ").call(this, locals)", true, false);
+			ast.line = this.line();
+		}
+
+		if(parser._mustBeInlined) this._mustBeInlined = true;
+
+		return ast;
+	}
+
+	run();
+	function run() {
+		try {
+			var tmplFunc = jade.compileClient(source, {
+				parser: loadModule ? MyParser : undefined,
+				filename: req,
+				self: query.self,
+				globals: ["require"].concat(query.globals || []),
+				pretty: query.pretty,
+				locals: query.locals,
+				compileDebug: loaderContext.debug || false
+			});
+		} catch(e) {
+			if(missingFileMode) {
+				// Ignore, it'll continue after async action
+				missingFileMode = false;
+				return;
+			}
+			throw e;
+		}
+		var runtime = "var jade = require("+JSON.stringify(require.resolve("jade/lib/runtime"))+");\n\n";
+		loaderContext.callback(null, runtime + "module.exports = " + tmplFunc.toString());
+	}
 }
 module.exports.seperable = true;

package.json

 {
 	"name": "jade-loader",
-	"version": "0.5.2",
+	"version": "0.6.0",
 	"author": "Tobias Koppers @sokra",
 	"description": "jade loader module for webpack",
 	"dependencies": {
-		"loader-utils": "0.2.x",
-		"jade": "0.28.x"
+		"loader-utils": "0.2.x"
 	},
+	"peerDependencies": {
+		"jade": "1.3.x"
+	},
+	"devDependencies": {
+		"mocha": "*",
+		"should": "*"
+	},
+	"scripts": {
+		"test": "mocha -R spec"
+	},
 	"licenses": [
@@ -11,0 +20,0 @@ {

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

7711

326.26%

Number of package files

11

120%

Lines of code

202

621.43%

Worsened metrics

Dev dependency count

2

Infinity%

Number of low supply chain risk alerts

3

200%

Number of medium supply chain risk alerts

1

Infinity%

Dependency changes

• + Added

  @isaacs/balanced-match@4.0.1
  (transitive)

• + Added

  @isaacs/brace-expansion@5.0.0
  (transitive)

• + Added

  amdefine@1.0.1
  (transitive)

• + Added

  async@0.2.10
  (transitive)

• + Added

  camelcase@1.2.1
  (transitive)

• + Added

  character-parser@1.2.0
  (transitive)

• + Added

  commander@2.1.0
  (transitive)

• + Added

  constantinople@2.0.1
  (transitive)

• + Added

  css@1.0.8
  (transitive)

• + Added

  css-parse@1.0.4
  (transitive)

• + Added

  css-stringify@1.0.5
  (transitive)

• + Added

  decamelize@1.2.0
  (transitive)

• + Added

  is-promise@1.0.1
  (transitive)

• + Added

  jade@1.3.1
  (transitive)

• + Added

  minimatch@10.0.3
  (transitive)

• + Added

  monocle@1.1.51
  (transitive)

• + Added

  optimist@0.3.7
  (transitive)

• + Added

  promise@2.0.0
  (transitive)

• + Added

  readdirp@0.2.5
  (transitive)

• + Added

  source-map@0.1.340.1.43
  (transitive)

• + Added

  transformers@2.1.0
  (transitive)

• + Added

  uglify-js@2.2.52.4.24
  (transitive)

• + Added

  uglify-to-browserify@1.0.2
  (transitive)

• + Added

  window-size@0.1.0
  (transitive)

• + Added

  with@3.0.1
  (transitive)

• + Added

  wordwrap@0.0.20.0.3
  (transitive)

• + Added

  yargs@3.5.4
  (transitive)

• - Removed

  jade@0.28.x

• - Removed

  commander@0.6.1
  (transitive)

• - Removed

  jade@0.28.2
  (transitive)