Skip to content
This repository was archived by the owner on Feb 21, 2025. It is now read-only.

Support for valid json syntax and gulp-file-include. #52

Closed
jonaslewin wants to merge 1 commit into from
Closed

Support for valid json syntax and gulp-file-include. #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,22 @@ var concat = require('concat-stream'),
fs = require('fs');

module.exports = function(options) {
var prefix, basepath, filters, context;
var prefix, suffix, basepath, filters, context;

if (typeof options === 'object') {
basepath = options.basepath || '@file';
prefix = options.prefix || '@@';
suffix = options.suffix || '';
context = options.context || {};
filters = options.filters;
} else {
prefix = options || '@@';
suffix = '';
basepath = '@file';
context = {};
}

var includeRegExp = new RegExp(prefix + 'include\\s*\\([^)"\']*["\']([^"\']*)["\'](,\\s*({[\\s\\S]*?})){0,1}\\s*\\)+');
var includeRegExp = new RegExp(prefix + 'include\\s*\\([^)"\']*["\']([^"\']*)["\'](,\\s*({[\\s\\S]*?})){0,1}\\s*\\)+' + suffix);

function fileInclude(file, enc, cb) {
if (file.isNull()) {
Expand Down Expand Up @@ -52,13 +54,13 @@ module.exports = function(options) {
*/
function stripCommentedIncludes(content) {
// remove single line html comments that use the format: <!-- @@include() -->
var regex = new RegExp('<\!--(.*)' + prefix + 'include([\\s\\S]*?)-->', 'g');
var regex = new RegExp('<\!--(.*)' + prefix + 'include([\\s\\S]*?)' + suffix + '-->', 'g');
return content.replace(regex, '');
}

function parseConditionalIncludes(content, variables) {
// parse @@if (something) { include('...') }
var regexp = new RegExp(prefix + 'if.*\\{[^{}]*\\}\\s*'),
var regexp = new RegExp(prefix + 'if.*\\{[^{}]*\\}\\s*' + suffix),
matches = regexp.exec(content),
included = false;

Expand Down