diff --git a/o2web/source/o2_lib/JSBeautifier/beautify-css.js b/o2web/source/o2_lib/JSBeautifier/beautify-css.js index 833a55240890afa6066dc5b32ceef585287e8108..79f65643de2d1c7395baeadd57603621862682e4 100644 --- a/o2web/source/o2_lib/JSBeautifier/beautify-css.js +++ b/o2web/source/o2_lib/JSBeautifier/beautify-css.js @@ -1,4 +1,3 @@ - /* AUTO-GENERATED. DO NOT MODIFY. */ /* @@ -40,8 +39,8 @@ css_beautify(source_text, options); The options are (default in brackets): - indent_size (4) 鈥� indentation size, - indent_char (space) 鈥� character to indent with, + indent_size (4) — indentation size, + indent_char (space) — character to indent with, selector_separator_newline (true) - separate selectors with newline or not (e.g. "a,\nbr" or "a, br") end_with_newline (false) - end with a newline @@ -66,100 +65,15 @@ (function() { /* GENERATED_BUILD_OUTPUT */ -var legacy_beautify_css = -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) { -/******/ return installedModules[moduleId].exports; -/******/ } -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); -/******/ } -/******/ }; -/******/ -/******/ // define __esModule on exports -/******/ __webpack_require__.r = function(exports) { -/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { -/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); -/******/ } -/******/ Object.defineProperty(exports, '__esModule', { value: true }); -/******/ }; -/******/ -/******/ // create a fake namespace object -/******/ // mode & 1: value is a module id, require it -/******/ // mode & 2: merge all properties of value into the ns -/******/ // mode & 4: return value when already ns object -/******/ // mode & 8|1: behave like require -/******/ __webpack_require__.t = function(value, mode) { -/******/ if(mode & 1) value = __webpack_require__(value); -/******/ if(mode & 8) return value; -/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; -/******/ var ns = Object.create(null); -/******/ __webpack_require__.r(ns); -/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); -/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); -/******/ return ns; -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 12); -/******/ }) -/************************************************************************/ -/******/ ([ +var legacy_beautify_css; +/******/ (function() { // webpackBootstrap +/******/ "use strict"; +/******/ var __webpack_modules__ = ([ /* 0 */, /* 1 */, /* 2 */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module) { -"use strict"; /*jshint node:true */ /* The MIT License (MIT) @@ -195,10 +109,20 @@ function OutputLine(parent) { // use indent_count as a marker for this.__lines that have preserved indentation this.__indent_count = -1; this.__alignment_count = 0; + this.__wrap_point_index = 0; + this.__wrap_point_character_count = 0; + this.__wrap_point_indent_count = -1; + this.__wrap_point_alignment_count = 0; this.__items = []; } +OutputLine.prototype.clone_empty = function() { + var line = new OutputLine(this.__parent); + line.set_indent(this.__indent_count, this.__alignment_count); + return line; +}; + OutputLine.prototype.item = function(index) { if (index < 0) { return this.__items[this.__items.length + index]; @@ -217,13 +141,46 @@ OutputLine.prototype.has_match = function(pattern) { }; OutputLine.prototype.set_indent = function(indent, alignment) { - this.__indent_count = indent || 0; - this.__alignment_count = alignment || 0; - this.__character_count = this.__parent.get_indent_size(this.__indent_count, this.__alignment_count); + if (this.is_empty()) { + this.__indent_count = indent || 0; + this.__alignment_count = alignment || 0; + this.__character_count = this.__parent.get_indent_size(this.__indent_count, this.__alignment_count); + } +}; + +OutputLine.prototype._set_wrap_point = function() { + if (this.__parent.wrap_line_length) { + this.__wrap_point_index = this.__items.length; + this.__wrap_point_character_count = this.__character_count; + this.__wrap_point_indent_count = this.__parent.next_line.__indent_count; + this.__wrap_point_alignment_count = this.__parent.next_line.__alignment_count; + } }; -OutputLine.prototype.get_character_count = function() { - return this.__character_count; +OutputLine.prototype._should_wrap = function() { + return this.__wrap_point_index && + this.__character_count > this.__parent.wrap_line_length && + this.__wrap_point_character_count > this.__parent.next_line.__character_count; +}; + +OutputLine.prototype._allow_wrap = function() { + if (this._should_wrap()) { + this.__parent.add_new_line(); + var next = this.__parent.current_line; + next.set_indent(this.__wrap_point_indent_count, this.__wrap_point_alignment_count); + next.__items = this.__items.slice(this.__wrap_point_index); + this.__items = this.__items.slice(0, this.__wrap_point_index); + + next.__character_count += this.__character_count - this.__wrap_point_character_count; + this.__character_count = this.__wrap_point_character_count; + + if (next.__items[0] === " ") { + next.__items.splice(0, 1); + next.__character_count -= 1; + } + return true; + } + return false; }; OutputLine.prototype.is_empty = function() { @@ -240,14 +197,11 @@ OutputLine.prototype.last = function() { OutputLine.prototype.push = function(item) { this.__items.push(item); - this.__character_count += item.length; -}; - -OutputLine.prototype.push_raw = function(item) { - this.push(item); var last_newline_index = item.lastIndexOf('\n'); if (last_newline_index !== -1) { this.__character_count = item.length - last_newline_index; + } else { + this.__character_count += item.length; } }; @@ -260,13 +214,19 @@ OutputLine.prototype.pop = function() { return item; }; -OutputLine.prototype.remove_indent = function() { + +OutputLine.prototype._remove_indent = function() { if (this.__indent_count > 0) { this.__indent_count -= 1; this.__character_count -= this.__parent.indent_size; } }; +OutputLine.prototype._remove_wrap_indent = function() { + if (this.__wrap_point_indent_count > 0) { + this.__wrap_point_indent_count -= 1; + } +}; OutputLine.prototype.trim = function() { while (this.last() === ' ') { this.__items.pop(); @@ -276,7 +236,11 @@ OutputLine.prototype.trim = function() { OutputLine.prototype.toString = function() { var result = ''; - if (!this.is_empty()) { + if (this.is_empty()) { + if (this.__parent.indent_empty_lines) { + result = this.__parent.get_indent_string(this.__indent_count); + } + } else { result = this.__parent.get_indent_string(this.__indent_count, this.__alignment_count); result += this.__items.join(''); } @@ -352,17 +316,22 @@ function Output(options, baseIndentString) { this.raw = false; this._end_with_newline = options.end_with_newline; this.indent_size = options.indent_size; + this.wrap_line_length = options.wrap_line_length; + this.indent_empty_lines = options.indent_empty_lines; this.__lines = []; this.previous_line = null; this.current_line = null; + this.next_line = new OutputLine(this); this.space_before_token = false; + this.non_breaking_space = false; + this.previous_token_wrapped = false; // initialize this.__add_outputline(); } Output.prototype.__add_outputline = function() { this.previous_line = this.current_line; - this.current_line = new OutputLine(this); + this.current_line = this.next_line.clone_empty(); this.__lines.push(this.current_line); }; @@ -399,27 +368,47 @@ Output.prototype.add_new_line = function(force_newline) { }; Output.prototype.get_code = function(eol) { - var sweet_code = this.__lines.join('\n').replace(/[\r\n\t ]+$/, ''); + this.trim(true); + + // handle some edge cases where the last tokens + // has text that ends with newline(s) + var last_item = this.current_line.pop(); + if (last_item) { + if (last_item[last_item.length - 1] === '\n') { + last_item = last_item.replace(/\n+$/g, ''); + } + this.current_line.push(last_item); + } if (this._end_with_newline) { - sweet_code += '\n'; + this.__add_outputline(); } + var sweet_code = this.__lines.join('\n'); + if (eol !== '\n') { sweet_code = sweet_code.replace(/[\n]/g, eol); } return sweet_code; }; +Output.prototype.set_wrap_point = function() { + this.current_line._set_wrap_point(); +}; + Output.prototype.set_indent = function(indent, alignment) { indent = indent || 0; alignment = alignment || 0; + // Next line stores alignment values + this.next_line.set_indent(indent, alignment); + // Never indent your first output indent at the start of the file if (this.__lines.length > 1) { this.current_line.set_indent(indent, alignment); return true; } + this.current_line.set_indent(); return false; }; @@ -428,35 +417,44 @@ Output.prototype.add_raw_token = function(token) { for (var x = 0; x < token.newlines; x++) { this.__add_outputline(); } + this.current_line.set_indent(-1); this.current_line.push(token.whitespace_before); - this.current_line.push_raw(token.text); + this.current_line.push(token.text); this.space_before_token = false; + this.non_breaking_space = false; + this.previous_token_wrapped = false; }; Output.prototype.add_token = function(printable_token) { - this.add_space_before_token(); + this.__add_space_before_token(); this.current_line.push(printable_token); + this.space_before_token = false; + this.non_breaking_space = false; + this.previous_token_wrapped = this.current_line._allow_wrap(); }; -Output.prototype.add_space_before_token = function() { +Output.prototype.__add_space_before_token = function() { if (this.space_before_token && !this.just_added_newline()) { + if (!this.non_breaking_space) { + this.set_wrap_point(); + } this.current_line.push(' '); } - this.space_before_token = false; }; Output.prototype.remove_indent = function(index) { var output_length = this.__lines.length; while (index < output_length) { - this.__lines[index].remove_indent(); + this.__lines[index]._remove_indent(); index++; } + this.current_line._remove_wrap_indent(); }; Output.prototype.trim = function(eat_newlines) { eat_newlines = (eat_newlines === undefined) ? false : eat_newlines; - this.current_line.trim(this.indent_string, this.baseIndentString); + this.current_line.trim(); while (eat_newlines && this.__lines.length > 1 && this.current_line.is_empty()) { @@ -502,9 +500,8 @@ module.exports.Output = Output; /* 4 */, /* 5 */, /* 6 */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module) { -"use strict"; /*jshint node:true */ /* @@ -572,6 +569,12 @@ function Options(options, merge_child_field) { // Backwards compat with 1.3.x this.wrap_line_length = this._get_number('wrap_line_length', this._get_number('max_char')); + this.indent_empty_lines = this._get_boolean('indent_empty_lines'); + + // valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty'] + // For now, 'auto' = all off for javascript, all on for html (and inline javascript). + // other values ignored + this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php', 'smarty'], ['auto']); } Options.prototype._get_array = function(name, default_value) { @@ -697,9 +700,8 @@ module.exports.mergeOpts = _mergeOpts; /***/ }), /* 7 */, /* 8 */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module) { -"use strict"; /*jshint node:true */ /* @@ -730,6 +732,8 @@ module.exports.mergeOpts = _mergeOpts; +var regexp_has_sticky = RegExp.prototype.hasOwnProperty('sticky'); + function InputScanner(input_string) { this.__input = input_string || ''; this.__input_length = this.__input.length; @@ -769,14 +773,32 @@ InputScanner.prototype.peek = function(index) { return val; }; +// This is a JavaScript only helper function (not in python) +// Javascript doesn't have a match method +// and not all implementation support "sticky" flag. +// If they do not support sticky then both this.match() and this.test() method +// must get the match and check the index of the match. +// If sticky is supported and set, this method will use it. +// Otherwise it will check that global is set, and fall back to the slower method. +InputScanner.prototype.__match = function(pattern, index) { + pattern.lastIndex = index; + var pattern_match = pattern.exec(this.__input); + + if (pattern_match && !(regexp_has_sticky && pattern.sticky)) { + if (pattern_match.index !== index) { + pattern_match = null; + } + } + + return pattern_match; +}; + InputScanner.prototype.test = function(pattern, index) { index = index || 0; index += this.__position; - pattern.lastIndex = index; if (index >= 0 && index < this.__input_length) { - var pattern_match = pattern.exec(this.__input); - return pattern_match && pattern_match.index === index; + return !!this.__match(pattern, index); } else { return false; } @@ -785,13 +807,13 @@ InputScanner.prototype.test = function(pattern, index) { InputScanner.prototype.testChar = function(pattern, index) { // test one character regex match var val = this.peek(index); + pattern.lastIndex = 0; return val !== null && pattern.test(val); }; InputScanner.prototype.match = function(pattern) { - pattern.lastIndex = this.__position; - var pattern_match = pattern.exec(this.__input); - if (pattern_match && pattern_match.index === this.__position) { + var pattern_match = this.__match(pattern, this.__position); + if (pattern_match) { this.__position += pattern_match[0].length; } else { pattern_match = null; @@ -799,25 +821,30 @@ InputScanner.prototype.match = function(pattern) { return pattern_match; }; -InputScanner.prototype.read = function(pattern) { +InputScanner.prototype.read = function(starting_pattern, until_pattern, until_after) { var val = ''; - var match = this.match(pattern); - if (match) { - val = match[0]; + var match; + if (starting_pattern) { + match = this.match(starting_pattern); + if (match) { + val += match[0]; + } + } + if (until_pattern && (match || !starting_pattern)) { + val += this.readUntil(until_pattern, until_after); } return val; }; -InputScanner.prototype.readUntil = function(pattern, include_match) { +InputScanner.prototype.readUntil = function(pattern, until_after) { var val = ''; var match_index = this.__position; pattern.lastIndex = this.__position; var pattern_match = pattern.exec(this.__input); if (pattern_match) { - if (include_match) { - match_index = pattern_match.index + pattern_match[0].length; - } else { - match_index = pattern_match.index; + match_index = pattern_match.index; + if (until_after) { + match_index += pattern_match[0].length; } } else { match_index = this.__input_length; @@ -832,6 +859,26 @@ InputScanner.prototype.readUntilAfter = function(pattern) { return this.readUntil(pattern, true); }; +InputScanner.prototype.get_regexp = function(pattern, match_from) { + var result = null; + var flags = 'g'; + if (match_from && regexp_has_sticky) { + flags = 'y'; + } + // strings are converted to regexp + if (typeof pattern === "string" && pattern !== '') { + // result = new RegExp(pattern.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'), flags); + result = new RegExp(pattern, flags); + } else if (pattern) { + result = new RegExp(pattern.source, flags); + } + return result; +}; + +InputScanner.prototype.get_literal_regexp = function(literal_string) { + return RegExp(literal_string.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')); +}; + /* css beautifier legacy helpers */ InputScanner.prototype.peekUntilAfter = function(pattern) { var start = this.__position; @@ -846,7 +893,6 @@ InputScanner.prototype.lookBack = function(testVal) { .toLowerCase() === testVal; }; - module.exports.InputScanner = InputScanner; @@ -854,10 +900,10 @@ module.exports.InputScanner = InputScanner; /* 9 */, /* 10 */, /* 11 */, -/* 12 */ -/***/ (function(module, exports, __webpack_require__) { +/* 12 */, +/* 13 */ +/***/ (function(module) { -"use strict"; /*jshint node:true */ /* @@ -888,8 +934,77 @@ module.exports.InputScanner = InputScanner; -var Beautifier = __webpack_require__(13).Beautifier, - Options = __webpack_require__(14).Options; +function Directives(start_block_pattern, end_block_pattern) { + start_block_pattern = typeof start_block_pattern === 'string' ? start_block_pattern : start_block_pattern.source; + end_block_pattern = typeof end_block_pattern === 'string' ? end_block_pattern : end_block_pattern.source; + this.__directives_block_pattern = new RegExp(start_block_pattern + / beautify( \w+[:]\w+)+ /.source + end_block_pattern, 'g'); + this.__directive_pattern = / (\w+)[:](\w+)/g; + + this.__directives_end_ignore_pattern = new RegExp(start_block_pattern + /\sbeautify\signore:end\s/.source + end_block_pattern, 'g'); +} + +Directives.prototype.get_directives = function(text) { + if (!text.match(this.__directives_block_pattern)) { + return null; + } + + var directives = {}; + this.__directive_pattern.lastIndex = 0; + var directive_match = this.__directive_pattern.exec(text); + + while (directive_match) { + directives[directive_match[1]] = directive_match[2]; + directive_match = this.__directive_pattern.exec(text); + } + + return directives; +}; + +Directives.prototype.readIgnored = function(input) { + return input.readUntilAfter(this.__directives_end_ignore_pattern); +}; + + +module.exports.Directives = Directives; + + +/***/ }), +/* 14 */, +/* 15 */ +/***/ (function(module, __unused_webpack_exports, __webpack_require__) { + +/*jshint node:true */ +/* + + The MIT License (MIT) + + Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + + + +var Beautifier = __webpack_require__(16).Beautifier, + Options = __webpack_require__(17).Options; function css_beautify(source_text, options) { var beautifier = new Beautifier(source_text, options); @@ -903,10 +1018,9 @@ module.exports.defaultOptions = function() { /***/ }), -/* 13 */ -/***/ (function(module, exports, __webpack_require__) { +/* 16 */ +/***/ (function(module, __unused_webpack_exports, __webpack_require__) { -"use strict"; /*jshint node:true */ /* @@ -937,9 +1051,12 @@ module.exports.defaultOptions = function() { -var Options = __webpack_require__(14).Options; +var Options = __webpack_require__(17).Options; var Output = __webpack_require__(2).Output; var InputScanner = __webpack_require__(8).InputScanner; +var Directives = __webpack_require__(13).Directives; + +var directives_core = new Directives(/\/\*/, /\*\//); var lineBreak = /\r\n|[\r\n]/; var allLineBreaks = /\r\n|[\r\n]/g; @@ -997,13 +1114,12 @@ Beautifier.prototype.eatString = function(endChars) { // the first newline will be output Beautifier.prototype.eatWhitespace = function(allowAtLeastOneNewLine) { var result = whitespaceChar.test(this._input.peek()); - var isFirstNewLine = true; - + var newline_count = 0; while (whitespaceChar.test(this._input.peek())) { this._ch = this._input.next(); if (allowAtLeastOneNewLine && this._ch === '\n') { - if (this._options.preserve_newlines || isFirstNewLine) { - isFirstNewLine = false; + if (newline_count === 0 || newline_count < this._options.max_preserve_newlines) { + newline_count++; this._output.add_new_line(true); } } @@ -1039,9 +1155,8 @@ Beautifier.prototype.foundNestedPseudoClass = function() { }; Beautifier.prototype.print_string = function(output_string) { - if (this._output.just_added_newline()) { - this._output.set_indent(this._indentLevel); - } + this._output.set_indent(this._indentLevel); + this._output.non_breaking_space = true; this._output.add_token(output_string); }; @@ -1100,12 +1215,18 @@ Beautifier.prototype.beautify = function() { var insideAtExtend = false; var insideAtImport = false; var topCharacter = this._ch; + var whitespace; + var isAfterSpace; + var previous_ch; while (true) { - var whitespace = this._input.read(whitespacePattern); - var isAfterSpace = whitespace !== ''; - var previous_ch = topCharacter; + whitespace = this._input.read(whitespacePattern); + isAfterSpace = whitespace !== ''; + previous_ch = topCharacter; this._ch = this._input.next(); + if (this._ch === '\\' && this._input.hasNext()) { + this._ch += this._input.next(); + } topCharacter = this._ch; if (!this._ch) { @@ -1118,7 +1239,16 @@ Beautifier.prototype.beautify = function() { // minified code is being beautified. this._output.add_new_line(); this._input.back(); - this.print_string(this._input.read(block_comment_pattern)); + + var comment = this._input.read(block_comment_pattern); + + // Handle ignore directive + var directives = directives_core.get_directives(comment); + if (directives && directives.ignore === 'start') { + comment += directives_core.readIgnored(this._input); + } + + this.print_string(comment); // Ensures any new lines following the comment are preserved this.eatWhitespace(true); @@ -1183,23 +1313,34 @@ Beautifier.prototype.beautify = function() { insidePropertyValue = false; this.outdent(); } - this.indent(); - this._output.space_before_token = true; - this.print_string(this._ch); // when entering conditional groups, only rulesets are allowed if (enteringConditionalGroup) { enteringConditionalGroup = false; - insideRule = (this._indentLevel > this._nestedLevel); + insideRule = (this._indentLevel >= this._nestedLevel); } else { // otherwise, declarations are also allowed - insideRule = (this._indentLevel >= this._nestedLevel); + insideRule = (this._indentLevel >= this._nestedLevel - 1); } if (this._options.newline_between_rules && insideRule) { if (this._output.previous_line && this._output.previous_line.item(-1) !== '{') { this._output.ensure_empty_line_above('/', ','); } } + + this._output.space_before_token = true; + + // The difference in print_string and indent order is necessary to indent the '{' correctly + if (this._options.brace_style === 'expand') { + this._output.add_new_line(); + this.print_string(this._ch); + this.indent(); + this._output.set_indent(this._indentLevel); + } else { + this.indent(); + this.print_string(this._ch); + } + this.eatWhitespace(true); this._output.add_new_line(); } else if (this._ch === '}') { @@ -1229,7 +1370,7 @@ Beautifier.prototype.beautify = function() { } } } else if (this._ch === ":") { - if ((insideRule || enteringConditionalGroup) && !(this._input.lookBack("&") || this.foundNestedPseudoClass()) && !this._input.lookBack("(") && !insideAtExtend) { + if ((insideRule || enteringConditionalGroup) && !(this._input.lookBack("&") || this.foundNestedPseudoClass()) && !this._input.lookBack("(") && !insideAtExtend && parenLevel === 0) { // 'property: value' delimiter // which could be in a conditional group query this.print_string(':'); @@ -1261,51 +1402,66 @@ Beautifier.prototype.beautify = function() { this.print_string(this._ch + this.eatString(this._ch)); this.eatWhitespace(true); } else if (this._ch === ';') { - if (insidePropertyValue) { - this.outdent(); - insidePropertyValue = false; - } - insideAtExtend = false; - insideAtImport = false; - this.print_string(this._ch); - this.eatWhitespace(true); - - // This maintains single line comments on the same - // line. Block comments are also affected, but - // a new line is always output before one inside - // that section - if (this._input.peek() !== '/') { - this._output.add_new_line(); + if (parenLevel === 0) { + if (insidePropertyValue) { + this.outdent(); + insidePropertyValue = false; + } + insideAtExtend = false; + insideAtImport = false; + this.print_string(this._ch); + this.eatWhitespace(true); + + // This maintains single line comments on the same + // line. Block comments are also affected, but + // a new line is always output before one inside + // that section + if (this._input.peek() !== '/') { + this._output.add_new_line(); + } + } else { + this.print_string(this._ch); + this.eatWhitespace(true); + this._output.space_before_token = true; } } else if (this._ch === '(') { // may be a url if (this._input.lookBack("url")) { this.print_string(this._ch); this.eatWhitespace(); + parenLevel++; + this.indent(); this._ch = this._input.next(); if (this._ch === ')' || this._ch === '"' || this._ch === '\'') { this._input.back(); - parenLevel++; } else if (this._ch) { this.print_string(this._ch + this.eatString(')')); + if (parenLevel) { + parenLevel--; + this.outdent(); + } } } else { - parenLevel++; this.preserveSingleSpace(isAfterSpace); this.print_string(this._ch); this.eatWhitespace(); + parenLevel++; + this.indent(); } } else if (this._ch === ')') { + if (parenLevel) { + parenLevel--; + this.outdent(); + } this.print_string(this._ch); - parenLevel--; } else if (this._ch === ',') { this.print_string(this._ch); this.eatWhitespace(true); - if (this._options.selector_separator_newline && !insidePropertyValue && parenLevel < 1 && !insideAtImport) { + if (this._options.selector_separator_newline && !insidePropertyValue && parenLevel === 0 && !insideAtImport && !insideAtExtend) { this._output.add_new_line(); } else { this._output.space_before_token = true; } - } else if ((this._ch === '>' || this._ch === '+' || this._ch === '~') && !insidePropertyValue && parenLevel < 1) { + } else if ((this._ch === '>' || this._ch === '+' || this._ch === '~') && !insidePropertyValue && parenLevel === 0) { //handle combinator spacing if (this._options.space_around_combinator) { this._output.space_before_token = true; @@ -1330,7 +1486,7 @@ Beautifier.prototype.beautify = function() { if (whitespaceChar.test(this._ch)) { this._ch = ''; } - } else if (this._ch === '!') { // !important + } else if (this._ch === '!' && !this._input.lookBack("\\")) { // !important this.print_string(' '); this.print_string(this._ch); } else { @@ -1348,10 +1504,9 @@ module.exports.Beautifier = Beautifier; /***/ }), -/* 14 */ -/***/ (function(module, exports, __webpack_require__) { +/* 17 */ +/***/ (function(module, __unused_webpack_exports, __webpack_require__) { -"use strict"; /*jshint node:true */ /* @@ -1392,6 +1547,16 @@ function Options(options) { var space_around_selector_separator = this._get_boolean('space_around_selector_separator'); this.space_around_combinator = this._get_boolean('space_around_combinator') || space_around_selector_separator; + var brace_style_split = this._get_selection_list('brace_style', ['collapse', 'expand', 'end-expand', 'none', 'preserve-inline']); + this.brace_style = 'collapse'; + for (var bs = 0; bs < brace_style_split.length; bs++) { + if (brace_style_split[bs] !== 'expand') { + // default to collapse, as only collapse|expand is implemented for now + this.brace_style = 'collapse'; + } else { + this.brace_style = brace_style_split[bs]; + } + } } Options.prototype = new BaseOptions(); @@ -1401,7 +1566,42 @@ module.exports.Options = Options; /***/ }) -/******/ ]); +/******/ ]); +/************************************************************************/ +/******/ // The module cache +/******/ var __webpack_module_cache__ = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ // Check if module is in cache +/******/ var cachedModule = __webpack_module_cache__[moduleId]; +/******/ if (cachedModule !== undefined) { +/******/ return cachedModule.exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = __webpack_module_cache__[moduleId] = { +/******/ // no module.id needed +/******/ // no module.loaded needed +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__); +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/************************************************************************/ +/******/ +/******/ // startup +/******/ // Load entry module and return exports +/******/ // This entry module is referenced by other modules so it can't be inlined +/******/ var __webpack_exports__ = __webpack_require__(15); +/******/ legacy_beautify_css = __webpack_exports__; +/******/ +/******/ })() +; var css_beautify = legacy_beautify_css; /* Footer */ if (typeof define === "function" && define.amd) { diff --git a/o2web/source/o2_lib/JSBeautifier/beautify-html.js b/o2web/source/o2_lib/JSBeautifier/beautify-html.js index 2f7b0968ecb4a2d6e89304f1bb4ace98c067f130..f69c07e643530deae652cabafbb432aba1351c5b 100644 --- a/o2web/source/o2_lib/JSBeautifier/beautify-html.js +++ b/o2web/source/o2_lib/JSBeautifier/beautify-html.js @@ -1,4 +1,3 @@ - /* AUTO-GENERATED. DO NOT MODIFY. */ /* @@ -41,9 +40,9 @@ style_html(html_source, options); The options are: - indent_inner_html (default false) 鈥� indent and sections, - indent_size (default 4) 鈥� indentation size, - indent_char (default space) 鈥� character to indent with, + indent_inner_html (default false) — indent and sections, + indent_size (default 4) — indentation size, + indent_char (default space) — character to indent with, wrap_line_length (default 250) - maximum amount of characters per line (0 = disable) brace_style (default "collapse") - "collapse" | "expand" | "end-expand" | "none" put braces on the same line as control statements (default), or put braces on own line (Allman / ANSI style), or just put end braces on own line, or attempt to keep them where they are. @@ -76,100 +75,15 @@ (function() { /* GENERATED_BUILD_OUTPUT */ -var legacy_beautify_html = -/******/ (function(modules) { // webpackBootstrap -/******/ // The module cache -/******/ var installedModules = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ -/******/ // Check if module is in cache -/******/ if(installedModules[moduleId]) { -/******/ return installedModules[moduleId].exports; -/******/ } -/******/ // Create a new module (and put it into the cache) -/******/ var module = installedModules[moduleId] = { -/******/ i: moduleId, -/******/ l: false, -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); -/******/ -/******/ // Flag the module as loaded -/******/ module.l = true; -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/******/ -/******/ // expose the modules object (__webpack_modules__) -/******/ __webpack_require__.m = modules; -/******/ -/******/ // expose the module cache -/******/ __webpack_require__.c = installedModules; -/******/ -/******/ // define getter function for harmony exports -/******/ __webpack_require__.d = function(exports, name, getter) { -/******/ if(!__webpack_require__.o(exports, name)) { -/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); -/******/ } -/******/ }; -/******/ -/******/ // define __esModule on exports -/******/ __webpack_require__.r = function(exports) { -/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { -/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); -/******/ } -/******/ Object.defineProperty(exports, '__esModule', { value: true }); -/******/ }; -/******/ -/******/ // create a fake namespace object -/******/ // mode & 1: value is a module id, require it -/******/ // mode & 2: merge all properties of value into the ns -/******/ // mode & 4: return value when already ns object -/******/ // mode & 8|1: behave like require -/******/ __webpack_require__.t = function(value, mode) { -/******/ if(mode & 1) value = __webpack_require__(value); -/******/ if(mode & 8) return value; -/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; -/******/ var ns = Object.create(null); -/******/ __webpack_require__.r(ns); -/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); -/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); -/******/ return ns; -/******/ }; -/******/ -/******/ // getDefaultExport function for compatibility with non-harmony modules -/******/ __webpack_require__.n = function(module) { -/******/ var getter = module && module.__esModule ? -/******/ function getDefault() { return module['default']; } : -/******/ function getModuleExports() { return module; }; -/******/ __webpack_require__.d(getter, 'a', getter); -/******/ return getter; -/******/ }; -/******/ -/******/ // Object.prototype.hasOwnProperty.call -/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; -/******/ -/******/ // __webpack_public_path__ -/******/ __webpack_require__.p = ""; -/******/ -/******/ -/******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 15); -/******/ }) -/************************************************************************/ -/******/ ([ +var legacy_beautify_html; +/******/ (function() { // webpackBootstrap +/******/ "use strict"; +/******/ var __webpack_modules__ = ([ /* 0 */, /* 1 */, /* 2 */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module) { -"use strict"; /*jshint node:true */ /* The MIT License (MIT) @@ -205,10 +119,20 @@ function OutputLine(parent) { // use indent_count as a marker for this.__lines that have preserved indentation this.__indent_count = -1; this.__alignment_count = 0; + this.__wrap_point_index = 0; + this.__wrap_point_character_count = 0; + this.__wrap_point_indent_count = -1; + this.__wrap_point_alignment_count = 0; this.__items = []; } +OutputLine.prototype.clone_empty = function() { + var line = new OutputLine(this.__parent); + line.set_indent(this.__indent_count, this.__alignment_count); + return line; +}; + OutputLine.prototype.item = function(index) { if (index < 0) { return this.__items[this.__items.length + index]; @@ -227,13 +151,46 @@ OutputLine.prototype.has_match = function(pattern) { }; OutputLine.prototype.set_indent = function(indent, alignment) { - this.__indent_count = indent || 0; - this.__alignment_count = alignment || 0; - this.__character_count = this.__parent.get_indent_size(this.__indent_count, this.__alignment_count); + if (this.is_empty()) { + this.__indent_count = indent || 0; + this.__alignment_count = alignment || 0; + this.__character_count = this.__parent.get_indent_size(this.__indent_count, this.__alignment_count); + } }; -OutputLine.prototype.get_character_count = function() { - return this.__character_count; +OutputLine.prototype._set_wrap_point = function() { + if (this.__parent.wrap_line_length) { + this.__wrap_point_index = this.__items.length; + this.__wrap_point_character_count = this.__character_count; + this.__wrap_point_indent_count = this.__parent.next_line.__indent_count; + this.__wrap_point_alignment_count = this.__parent.next_line.__alignment_count; + } +}; + +OutputLine.prototype._should_wrap = function() { + return this.__wrap_point_index && + this.__character_count > this.__parent.wrap_line_length && + this.__wrap_point_character_count > this.__parent.next_line.__character_count; +}; + +OutputLine.prototype._allow_wrap = function() { + if (this._should_wrap()) { + this.__parent.add_new_line(); + var next = this.__parent.current_line; + next.set_indent(this.__wrap_point_indent_count, this.__wrap_point_alignment_count); + next.__items = this.__items.slice(this.__wrap_point_index); + this.__items = this.__items.slice(0, this.__wrap_point_index); + + next.__character_count += this.__character_count - this.__wrap_point_character_count; + this.__character_count = this.__wrap_point_character_count; + + if (next.__items[0] === " ") { + next.__items.splice(0, 1); + next.__character_count -= 1; + } + return true; + } + return false; }; OutputLine.prototype.is_empty = function() { @@ -250,14 +207,11 @@ OutputLine.prototype.last = function() { OutputLine.prototype.push = function(item) { this.__items.push(item); - this.__character_count += item.length; -}; - -OutputLine.prototype.push_raw = function(item) { - this.push(item); var last_newline_index = item.lastIndexOf('\n'); if (last_newline_index !== -1) { this.__character_count = item.length - last_newline_index; + } else { + this.__character_count += item.length; } }; @@ -270,13 +224,19 @@ OutputLine.prototype.pop = function() { return item; }; -OutputLine.prototype.remove_indent = function() { + +OutputLine.prototype._remove_indent = function() { if (this.__indent_count > 0) { this.__indent_count -= 1; this.__character_count -= this.__parent.indent_size; } }; +OutputLine.prototype._remove_wrap_indent = function() { + if (this.__wrap_point_indent_count > 0) { + this.__wrap_point_indent_count -= 1; + } +}; OutputLine.prototype.trim = function() { while (this.last() === ' ') { this.__items.pop(); @@ -286,7 +246,11 @@ OutputLine.prototype.trim = function() { OutputLine.prototype.toString = function() { var result = ''; - if (!this.is_empty()) { + if (this.is_empty()) { + if (this.__parent.indent_empty_lines) { + result = this.__parent.get_indent_string(this.__indent_count); + } + } else { result = this.__parent.get_indent_string(this.__indent_count, this.__alignment_count); result += this.__items.join(''); } @@ -362,17 +326,22 @@ function Output(options, baseIndentString) { this.raw = false; this._end_with_newline = options.end_with_newline; this.indent_size = options.indent_size; + this.wrap_line_length = options.wrap_line_length; + this.indent_empty_lines = options.indent_empty_lines; this.__lines = []; this.previous_line = null; this.current_line = null; + this.next_line = new OutputLine(this); this.space_before_token = false; + this.non_breaking_space = false; + this.previous_token_wrapped = false; // initialize this.__add_outputline(); } Output.prototype.__add_outputline = function() { this.previous_line = this.current_line; - this.current_line = new OutputLine(this); + this.current_line = this.next_line.clone_empty(); this.__lines.push(this.current_line); }; @@ -409,27 +378,47 @@ Output.prototype.add_new_line = function(force_newline) { }; Output.prototype.get_code = function(eol) { - var sweet_code = this.__lines.join('\n').replace(/[\r\n\t ]+$/, ''); + this.trim(true); + + // handle some edge cases where the last tokens + // has text that ends with newline(s) + var last_item = this.current_line.pop(); + if (last_item) { + if (last_item[last_item.length - 1] === '\n') { + last_item = last_item.replace(/\n+$/g, ''); + } + this.current_line.push(last_item); + } if (this._end_with_newline) { - sweet_code += '\n'; + this.__add_outputline(); } + var sweet_code = this.__lines.join('\n'); + if (eol !== '\n') { sweet_code = sweet_code.replace(/[\n]/g, eol); } return sweet_code; }; +Output.prototype.set_wrap_point = function() { + this.current_line._set_wrap_point(); +}; + Output.prototype.set_indent = function(indent, alignment) { indent = indent || 0; alignment = alignment || 0; + // Next line stores alignment values + this.next_line.set_indent(indent, alignment); + // Never indent your first output indent at the start of the file if (this.__lines.length > 1) { this.current_line.set_indent(indent, alignment); return true; } + this.current_line.set_indent(); return false; }; @@ -438,35 +427,44 @@ Output.prototype.add_raw_token = function(token) { for (var x = 0; x < token.newlines; x++) { this.__add_outputline(); } + this.current_line.set_indent(-1); this.current_line.push(token.whitespace_before); - this.current_line.push_raw(token.text); + this.current_line.push(token.text); this.space_before_token = false; + this.non_breaking_space = false; + this.previous_token_wrapped = false; }; Output.prototype.add_token = function(printable_token) { - this.add_space_before_token(); + this.__add_space_before_token(); this.current_line.push(printable_token); + this.space_before_token = false; + this.non_breaking_space = false; + this.previous_token_wrapped = this.current_line._allow_wrap(); }; -Output.prototype.add_space_before_token = function() { +Output.prototype.__add_space_before_token = function() { if (this.space_before_token && !this.just_added_newline()) { + if (!this.non_breaking_space) { + this.set_wrap_point(); + } this.current_line.push(' '); } - this.space_before_token = false; }; Output.prototype.remove_indent = function(index) { var output_length = this.__lines.length; while (index < output_length) { - this.__lines[index].remove_indent(); + this.__lines[index]._remove_indent(); index++; } + this.current_line._remove_wrap_indent(); }; Output.prototype.trim = function(eat_newlines) { eat_newlines = (eat_newlines === undefined) ? false : eat_newlines; - this.current_line.trim(this.indent_string, this.baseIndentString); + this.current_line.trim(); while (eat_newlines && this.__lines.length > 1 && this.current_line.is_empty()) { @@ -509,9 +507,8 @@ module.exports.Output = Output; /***/ }), /* 3 */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module) { -"use strict"; /*jshint node:true */ /* @@ -572,9 +569,8 @@ module.exports.Token = Token; /* 4 */, /* 5 */, /* 6 */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module) { -"use strict"; /*jshint node:true */ /* @@ -642,6 +638,12 @@ function Options(options, merge_child_field) { // Backwards compat with 1.3.x this.wrap_line_length = this._get_number('wrap_line_length', this._get_number('max_char')); + this.indent_empty_lines = this._get_boolean('indent_empty_lines'); + + // valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty'] + // For now, 'auto' = all off for javascript, all on for html (and inline javascript). + // other values ignored + this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php', 'smarty'], ['auto']); } Options.prototype._get_array = function(name, default_value) { @@ -767,9 +769,8 @@ module.exports.mergeOpts = _mergeOpts; /***/ }), /* 7 */, /* 8 */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module) { -"use strict"; /*jshint node:true */ /* @@ -800,6 +801,8 @@ module.exports.mergeOpts = _mergeOpts; +var regexp_has_sticky = RegExp.prototype.hasOwnProperty('sticky'); + function InputScanner(input_string) { this.__input = input_string || ''; this.__input_length = this.__input.length; @@ -839,14 +842,32 @@ InputScanner.prototype.peek = function(index) { return val; }; +// This is a JavaScript only helper function (not in python) +// Javascript doesn't have a match method +// and not all implementation support "sticky" flag. +// If they do not support sticky then both this.match() and this.test() method +// must get the match and check the index of the match. +// If sticky is supported and set, this method will use it. +// Otherwise it will check that global is set, and fall back to the slower method. +InputScanner.prototype.__match = function(pattern, index) { + pattern.lastIndex = index; + var pattern_match = pattern.exec(this.__input); + + if (pattern_match && !(regexp_has_sticky && pattern.sticky)) { + if (pattern_match.index !== index) { + pattern_match = null; + } + } + + return pattern_match; +}; + InputScanner.prototype.test = function(pattern, index) { index = index || 0; index += this.__position; - pattern.lastIndex = index; if (index >= 0 && index < this.__input_length) { - var pattern_match = pattern.exec(this.__input); - return pattern_match && pattern_match.index === index; + return !!this.__match(pattern, index); } else { return false; } @@ -855,13 +876,13 @@ InputScanner.prototype.test = function(pattern, index) { InputScanner.prototype.testChar = function(pattern, index) { // test one character regex match var val = this.peek(index); + pattern.lastIndex = 0; return val !== null && pattern.test(val); }; InputScanner.prototype.match = function(pattern) { - pattern.lastIndex = this.__position; - var pattern_match = pattern.exec(this.__input); - if (pattern_match && pattern_match.index === this.__position) { + var pattern_match = this.__match(pattern, this.__position); + if (pattern_match) { this.__position += pattern_match[0].length; } else { pattern_match = null; @@ -869,25 +890,30 @@ InputScanner.prototype.match = function(pattern) { return pattern_match; }; -InputScanner.prototype.read = function(pattern) { +InputScanner.prototype.read = function(starting_pattern, until_pattern, until_after) { var val = ''; - var match = this.match(pattern); - if (match) { - val = match[0]; + var match; + if (starting_pattern) { + match = this.match(starting_pattern); + if (match) { + val += match[0]; + } + } + if (until_pattern && (match || !starting_pattern)) { + val += this.readUntil(until_pattern, until_after); } return val; }; -InputScanner.prototype.readUntil = function(pattern, include_match) { +InputScanner.prototype.readUntil = function(pattern, until_after) { var val = ''; var match_index = this.__position; pattern.lastIndex = this.__position; var pattern_match = pattern.exec(this.__input); if (pattern_match) { - if (include_match) { - match_index = pattern_match.index + pattern_match[0].length; - } else { - match_index = pattern_match.index; + match_index = pattern_match.index; + if (until_after) { + match_index += pattern_match[0].length; } } else { match_index = this.__input_length; @@ -902,6 +928,26 @@ InputScanner.prototype.readUntilAfter = function(pattern) { return this.readUntil(pattern, true); }; +InputScanner.prototype.get_regexp = function(pattern, match_from) { + var result = null; + var flags = 'g'; + if (match_from && regexp_has_sticky) { + flags = 'y'; + } + // strings are converted to regexp + if (typeof pattern === "string" && pattern !== '') { + // result = new RegExp(pattern.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'), flags); + result = new RegExp(pattern, flags); + } else if (pattern) { + result = new RegExp(pattern.source, flags); + } + return result; +}; + +InputScanner.prototype.get_literal_regexp = function(literal_string) { + return RegExp(literal_string.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')); +}; + /* css beautifier legacy helpers */ InputScanner.prototype.peekUntilAfter = function(pattern) { var start = this.__position; @@ -916,15 +962,13 @@ InputScanner.prototype.lookBack = function(testVal) { .toLowerCase() === testVal; }; - module.exports.InputScanner = InputScanner; /***/ }), /* 9 */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module, __unused_webpack_exports, __webpack_require__) { -"use strict"; /*jshint node:true */ /* @@ -958,6 +1002,7 @@ module.exports.InputScanner = InputScanner; var InputScanner = __webpack_require__(8).InputScanner; var Token = __webpack_require__(3).Token; var TokenStream = __webpack_require__(10).TokenStream; +var WhitespacePattern = __webpack_require__(11).WhitespacePattern; var TOKEN = { START: 'TK_START', @@ -969,11 +1014,9 @@ var Tokenizer = function(input_string, options) { this._input = new InputScanner(input_string); this._options = options || {}; this.__tokens = null; - this.__newline_count = 0; - this.__whitespace_before_token = ''; - this._whitespace_pattern = /[\n\r\t ]+/g; - this._newline_pattern = /([^\n\r]*)(\r\n|[\n\r])?/g; + this._patterns = {}; + this._patterns.whitespace = new WhitespacePattern(this._input); }; Tokenizer.prototype.tokenize = function() { @@ -1052,25 +1095,14 @@ Tokenizer.prototype._is_closing = function(current_token, open_token) { // jshin }; Tokenizer.prototype._create_token = function(type, text) { - var token = new Token(type, text, this.__newline_count, this.__whitespace_before_token); - this.__newline_count = 0; - this.__whitespace_before_token = ''; + var token = new Token(type, text, + this._patterns.whitespace.newline_count, + this._patterns.whitespace.whitespace_before_token); return token; }; Tokenizer.prototype._readWhitespace = function() { - var resulting_string = this._input.read(this._whitespace_pattern); - if (resulting_string === ' ') { - this.__whitespace_before_token = resulting_string; - } else if (resulting_string !== '') { - this._newline_pattern.lastIndex = 0; - var nextMatch = this._newline_pattern.exec(resulting_string); - while (nextMatch[2]) { - this.__newline_count += 1; - nextMatch = this._newline_pattern.exec(resulting_string); - } - this.__whitespace_before_token = nextMatch[1]; - } + return this._patterns.whitespace.read(); }; @@ -1081,9 +1113,8 @@ module.exports.TOKEN = TOKEN; /***/ }), /* 10 */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module) { -"use strict"; /*jshint node:true */ /* @@ -1166,9 +1197,219 @@ module.exports.TokenStream = TokenStream; /***/ }), /* 11 */ -/***/ (function(module, exports, __webpack_require__) { +/***/ (function(module, __unused_webpack_exports, __webpack_require__) { + +/*jshint node:true */ +/* + + The MIT License (MIT) + + Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + + + +var Pattern = __webpack_require__(12).Pattern; + +function WhitespacePattern(input_scanner, parent) { + Pattern.call(this, input_scanner, parent); + if (parent) { + this._line_regexp = this._input.get_regexp(parent._line_regexp); + } else { + this.__set_whitespace_patterns('', ''); + } + + this.newline_count = 0; + this.whitespace_before_token = ''; +} +WhitespacePattern.prototype = new Pattern(); + +WhitespacePattern.prototype.__set_whitespace_patterns = function(whitespace_chars, newline_chars) { + whitespace_chars += '\\t '; + newline_chars += '\\n\\r'; + + this._match_pattern = this._input.get_regexp( + '[' + whitespace_chars + newline_chars + ']+', true); + this._newline_regexp = this._input.get_regexp( + '\\r\\n|[' + newline_chars + ']'); +}; + +WhitespacePattern.prototype.read = function() { + this.newline_count = 0; + this.whitespace_before_token = ''; + + var resulting_string = this._input.read(this._match_pattern); + if (resulting_string === ' ') { + this.whitespace_before_token = ' '; + } else if (resulting_string) { + var matches = this.__split(this._newline_regexp, resulting_string); + this.newline_count = matches.length - 1; + this.whitespace_before_token = matches[this.newline_count]; + } + + return resulting_string; +}; + +WhitespacePattern.prototype.matching = function(whitespace_chars, newline_chars) { + var result = this._create(); + result.__set_whitespace_patterns(whitespace_chars, newline_chars); + result._update(); + return result; +}; + +WhitespacePattern.prototype._create = function() { + return new WhitespacePattern(this._input, this); +}; + +WhitespacePattern.prototype.__split = function(regexp, input_string) { + regexp.lastIndex = 0; + var start_index = 0; + var result = []; + var next_match = regexp.exec(input_string); + while (next_match) { + result.push(input_string.substring(start_index, next_match.index)); + start_index = next_match.index + next_match[0].length; + next_match = regexp.exec(input_string); + } + + if (start_index < input_string.length) { + result.push(input_string.substring(start_index, input_string.length)); + } else { + result.push(''); + } + + return result; +}; + + + +module.exports.WhitespacePattern = WhitespacePattern; + + +/***/ }), +/* 12 */ +/***/ (function(module) { + +/*jshint node:true */ +/* + + The MIT License (MIT) + + Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + + + +function Pattern(input_scanner, parent) { + this._input = input_scanner; + this._starting_pattern = null; + this._match_pattern = null; + this._until_pattern = null; + this._until_after = false; + + if (parent) { + this._starting_pattern = this._input.get_regexp(parent._starting_pattern, true); + this._match_pattern = this._input.get_regexp(parent._match_pattern, true); + this._until_pattern = this._input.get_regexp(parent._until_pattern); + this._until_after = parent._until_after; + } +} + +Pattern.prototype.read = function() { + var result = this._input.read(this._starting_pattern); + if (!this._starting_pattern || result) { + result += this._input.read(this._match_pattern, this._until_pattern, this._until_after); + } + return result; +}; + +Pattern.prototype.read_match = function() { + return this._input.match(this._match_pattern); +}; + +Pattern.prototype.until_after = function(pattern) { + var result = this._create(); + result._until_after = true; + result._until_pattern = this._input.get_regexp(pattern); + result._update(); + return result; +}; + +Pattern.prototype.until = function(pattern) { + var result = this._create(); + result._until_after = false; + result._until_pattern = this._input.get_regexp(pattern); + result._update(); + return result; +}; + +Pattern.prototype.starting_with = function(pattern) { + var result = this._create(); + result._starting_pattern = this._input.get_regexp(pattern, true); + result._update(); + return result; +}; + +Pattern.prototype.matching = function(pattern) { + var result = this._create(); + result._match_pattern = this._input.get_regexp(pattern, true); + result._update(); + return result; +}; + +Pattern.prototype._create = function() { + return new Pattern(this._input, this); +}; + +Pattern.prototype._update = function() {}; + +module.exports.Pattern = Pattern; + + +/***/ }), +/* 13 */ +/***/ (function(module) { -"use strict"; /*jshint node:true */ /* @@ -1205,7 +1446,7 @@ function Directives(start_block_pattern, end_block_pattern) { this.__directives_block_pattern = new RegExp(start_block_pattern + / beautify( \w+[:]\w+)+ /.source + end_block_pattern, 'g'); this.__directive_pattern = / (\w+)[:](\w+)/g; - this.__directives_end_ignore_pattern = new RegExp('(?:[\\s\\S]*?)((?:' + start_block_pattern + /\sbeautify\signore:end\s/.source + end_block_pattern + ')|$)', 'g'); + this.__directives_end_ignore_pattern = new RegExp(start_block_pattern + /\sbeautify\signore:end\s/.source + end_block_pattern, 'g'); } Directives.prototype.get_directives = function(text) { @@ -1226,7 +1467,7 @@ Directives.prototype.get_directives = function(text) { }; Directives.prototype.readIgnored = function(input) { - return input.read(this.__directives_end_ignore_pattern); + return input.readUntilAfter(this.__directives_end_ignore_pattern); }; @@ -1234,13 +1475,9 @@ module.exports.Directives = Directives; /***/ }), -/* 12 */, -/* 13 */, -/* 14 */, -/* 15 */ -/***/ (function(module, exports, __webpack_require__) { +/* 14 */ +/***/ (function(module, __unused_webpack_exports, __webpack_require__) { -"use strict"; /*jshint node:true */ /* @@ -1271,8 +1508,228 @@ module.exports.Directives = Directives; -var Beautifier = __webpack_require__(16).Beautifier, - Options = __webpack_require__(17).Options; +var Pattern = __webpack_require__(12).Pattern; + + +var template_names = { + django: false, + erb: false, + handlebars: false, + php: false, + smarty: false +}; + +// This lets templates appear anywhere we would do a readUntil +// The cost is higher but it is pay to play. +function TemplatablePattern(input_scanner, parent) { + Pattern.call(this, input_scanner, parent); + this.__template_pattern = null; + this._disabled = Object.assign({}, template_names); + this._excluded = Object.assign({}, template_names); + + if (parent) { + this.__template_pattern = this._input.get_regexp(parent.__template_pattern); + this._excluded = Object.assign(this._excluded, parent._excluded); + this._disabled = Object.assign(this._disabled, parent._disabled); + } + var pattern = new Pattern(input_scanner); + this.__patterns = { + handlebars_comment: pattern.starting_with(/{{!--/).until_after(/--}}/), + handlebars_unescaped: pattern.starting_with(/{{{/).until_after(/}}}/), + handlebars: pattern.starting_with(/{{/).until_after(/}}/), + php: pattern.starting_with(/<\?(?:[= ]|php)/).until_after(/\?>/), + erb: pattern.starting_with(/<%[^%]/).until_after(/[^%]%>/), + // django coflicts with handlebars a bit. + django: pattern.starting_with(/{%/).until_after(/%}/), + django_value: pattern.starting_with(/{{/).until_after(/}}/), + django_comment: pattern.starting_with(/{#/).until_after(/#}/), + smarty: pattern.starting_with(/{(?=[^}{\s\n])/).until_after(/[^\s\n]}/), + smarty_comment: pattern.starting_with(/{\*/).until_after(/\*}/), + smarty_literal: pattern.starting_with(/{literal}/).until_after(/{\/literal}/) + }; +} +TemplatablePattern.prototype = new Pattern(); + +TemplatablePattern.prototype._create = function() { + return new TemplatablePattern(this._input, this); +}; + +TemplatablePattern.prototype._update = function() { + this.__set_templated_pattern(); +}; + +TemplatablePattern.prototype.disable = function(language) { + var result = this._create(); + result._disabled[language] = true; + result._update(); + return result; +}; + +TemplatablePattern.prototype.read_options = function(options) { + var result = this._create(); + for (var language in template_names) { + result._disabled[language] = options.templating.indexOf(language) === -1; + } + result._update(); + return result; +}; + +TemplatablePattern.prototype.exclude = function(language) { + var result = this._create(); + result._excluded[language] = true; + result._update(); + return result; +}; + +TemplatablePattern.prototype.read = function() { + var result = ''; + if (this._match_pattern) { + result = this._input.read(this._starting_pattern); + } else { + result = this._input.read(this._starting_pattern, this.__template_pattern); + } + var next = this._read_template(); + while (next) { + if (this._match_pattern) { + next += this._input.read(this._match_pattern); + } else { + next += this._input.readUntil(this.__template_pattern); + } + result += next; + next = this._read_template(); + } + + if (this._until_after) { + result += this._input.readUntilAfter(this._until_pattern); + } + return result; +}; + +TemplatablePattern.prototype.__set_templated_pattern = function() { + var items = []; + + if (!this._disabled.php) { + items.push(this.__patterns.php._starting_pattern.source); + } + if (!this._disabled.handlebars) { + items.push(this.__patterns.handlebars._starting_pattern.source); + } + if (!this._disabled.erb) { + items.push(this.__patterns.erb._starting_pattern.source); + } + if (!this._disabled.django) { + items.push(this.__patterns.django._starting_pattern.source); + // The starting pattern for django is more complex because it has different + // patterns for value, comment, and other sections + items.push(this.__patterns.django_value._starting_pattern.source); + items.push(this.__patterns.django_comment._starting_pattern.source); + } + if (!this._disabled.smarty) { + items.push(this.__patterns.smarty._starting_pattern.source); + } + + if (this._until_pattern) { + items.push(this._until_pattern.source); + } + this.__template_pattern = this._input.get_regexp('(?:' + items.join('|') + ')'); +}; + +TemplatablePattern.prototype._read_template = function() { + var resulting_string = ''; + var c = this._input.peek(); + if (c === '<') { + var peek1 = this._input.peek(1); + //if we're in a comment, do something special + // We treat all comments as literals, even more than preformatted tags + // we just look for the appropriate close tag + if (!this._disabled.php && !this._excluded.php && peek1 === '?') { + resulting_string = resulting_string || + this.__patterns.php.read(); + } + if (!this._disabled.erb && !this._excluded.erb && peek1 === '%') { + resulting_string = resulting_string || + this.__patterns.erb.read(); + } + } else if (c === '{') { + if (!this._disabled.handlebars && !this._excluded.handlebars) { + resulting_string = resulting_string || + this.__patterns.handlebars_comment.read(); + resulting_string = resulting_string || + this.__patterns.handlebars_unescaped.read(); + resulting_string = resulting_string || + this.__patterns.handlebars.read(); + } + if (!this._disabled.django) { + // django coflicts with handlebars a bit. + if (!this._excluded.django && !this._excluded.handlebars) { + resulting_string = resulting_string || + this.__patterns.django_value.read(); + } + if (!this._excluded.django) { + resulting_string = resulting_string || + this.__patterns.django_comment.read(); + resulting_string = resulting_string || + this.__patterns.django.read(); + } + } + if (!this._disabled.smarty) { + // smarty cannot be enabled with django or handlebars enabled + if (this._disabled.django && this._disabled.handlebars) { + resulting_string = resulting_string || + this.__patterns.smarty_comment.read(); + resulting_string = resulting_string || + this.__patterns.smarty_literal.read(); + resulting_string = resulting_string || + this.__patterns.smarty.read(); + } + } + } + return resulting_string; +}; + + +module.exports.TemplatablePattern = TemplatablePattern; + + +/***/ }), +/* 15 */, +/* 16 */, +/* 17 */, +/* 18 */ +/***/ (function(module, __unused_webpack_exports, __webpack_require__) { + +/*jshint node:true */ +/* + + The MIT License (MIT) + + Copyright (c) 2007-2018 Einar Lielmanis, Liam Newman, and contributors. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + + + +var Beautifier = __webpack_require__(19).Beautifier, + Options = __webpack_require__(20).Options; function style_html(html_source, options, js_beautify, css_beautify) { var beautifier = new Beautifier(html_source, options, js_beautify, css_beautify); @@ -1286,10 +1743,9 @@ module.exports.defaultOptions = function() { /***/ }), -/* 16 */ -/***/ (function(module, exports, __webpack_require__) { +/* 19 */ +/***/ (function(module, __unused_webpack_exports, __webpack_require__) { -"use strict"; /*jshint node:true */ /* @@ -1320,10 +1776,10 @@ module.exports.defaultOptions = function() { -var Options = __webpack_require__(17).Options; +var Options = __webpack_require__(20).Options; var Output = __webpack_require__(2).Output; -var Tokenizer = __webpack_require__(18).Tokenizer; -var TOKEN = __webpack_require__(18).TOKEN; +var Tokenizer = __webpack_require__(21).Tokenizer; +var TOKEN = __webpack_require__(21).TOKEN; var lineBreak = /\r\n|[\r\n]/; var allLineBreaks = /\r\n|[\r\n]/g; @@ -1332,7 +1788,6 @@ var Printer = function(options, base_indent_string) { //handles input/output and this.indent_level = 0; this.alignment_size = 0; - this.wrap_line_length = options.wrap_line_length; this.max_preserve_newlines = options.max_preserve_newlines; this.preserve_newlines = options.preserve_newlines; @@ -1344,10 +1799,17 @@ Printer.prototype.current_line_has_match = function(pattern) { return this._output.current_line.has_match(pattern); }; -Printer.prototype.set_space_before_token = function(value) { +Printer.prototype.set_space_before_token = function(value, non_breaking) { this._output.space_before_token = value; + this._output.non_breaking_space = non_breaking; +}; + +Printer.prototype.set_wrap_point = function() { + this._output.set_indent(this.indent_level, this.alignment_size); + this._output.set_wrap_point(); }; + Printer.prototype.add_raw_token = function(token) { this._output.add_raw_token(token); }; @@ -1372,53 +1834,31 @@ Printer.prototype.traverse_whitespace = function(raw_token) { if (raw_token.whitespace_before || raw_token.newlines) { if (!this.print_preserved_newlines(raw_token)) { this._output.space_before_token = true; - this.print_space_or_wrap(raw_token.text); } return true; } return false; }; -// Append a space to the given content (string array) or, if we are -// at the wrap_line_length, append a newline/indentation. -// return true if a newline was added, false if a space was added -Printer.prototype.print_space_or_wrap = function(text) { - if (this.wrap_line_length) { - if (this._output.current_line.get_character_count() + text.length + 1 >= this.wrap_line_length) { //insert a line when the wrap_line_length is reached - return this._output.add_new_line(); - } - } - return false; +Printer.prototype.previous_token_wrapped = function() { + return this._output.previous_token_wrapped; }; Printer.prototype.print_newline = function(force) { this._output.add_new_line(force); }; -Printer.prototype.print_token = function(text) { - if (text) { - if (this._output.current_line.is_empty()) { - this._output.set_indent(this.indent_level, this.alignment_size); - } - - this._output.add_token(text); +Printer.prototype.print_token = function(token) { + if (token.text) { + this._output.set_indent(this.indent_level, this.alignment_size); + this._output.add_token(token.text); } }; -Printer.prototype.print_raw_text = function(text) { - this._output.current_line.push_raw(text); -}; - Printer.prototype.indent = function() { this.indent_level++; }; -Printer.prototype.unindent = function() { - if (this.indent_level > 0) { - this.indent_level--; - } -}; - Printer.prototype.get_full_indent = function(level) { level = this.indent_level + (level || 0); if (level < 1) { @@ -1428,28 +1868,55 @@ Printer.prototype.get_full_indent = function(level) { return this._output.get_indent_string(level); }; - -var uses_beautifier = function(tag_check, start_token) { +var get_type_attribute = function(start_token) { + var result = null; var raw_token = start_token.next; - if (!start_token.closed) { - return false; - } - while (raw_token.type !== TOKEN.EOF && raw_token.closed !== start_token) { + // Search attributes for a type attribute + while (raw_token.type !== TOKEN.EOF && start_token.closed !== raw_token) { if (raw_token.type === TOKEN.ATTRIBUTE && raw_token.text === 'type') { - // For script and style tags that have a type attribute, only enable custom beautifiers for matching values - var peekEquals = raw_token.next ? raw_token.next : raw_token; - var peekValue = peekEquals.next ? peekEquals.next : peekEquals; - if (peekEquals.type === TOKEN.EQUALS && peekValue.type === TOKEN.VALUE) { - return (tag_check === 'style' && peekValue.text.search('text/css') > -1) || - (tag_check === 'script' && peekValue.text.search(/(text|application|dojo)\/(x-)?(javascript|ecmascript|jscript|livescript|(ld\+)?json|method|aspect)/) > -1); + if (raw_token.next && raw_token.next.type === TOKEN.EQUALS && + raw_token.next.next && raw_token.next.next.type === TOKEN.VALUE) { + result = raw_token.next.next.text; } - return false; + break; } raw_token = raw_token.next; } - return true; + return result; +}; + +var get_custom_beautifier_name = function(tag_check, raw_token) { + var typeAttribute = null; + var result = null; + + if (!raw_token.closed) { + return null; + } + + if (tag_check === 'script') { + typeAttribute = 'text/javascript'; + } else if (tag_check === 'style') { + typeAttribute = 'text/css'; + } + + typeAttribute = get_type_attribute(raw_token) || typeAttribute; + + // For script and style tags that have a type attribute, only enable custom beautifiers for matching values + // For those without a type attribute use default; + if (typeAttribute.search('text/css') > -1) { + result = 'css'; + } else if (typeAttribute.search(/module|((text|application|dojo)\/(x-)?(javascript|ecmascript|jscript|livescript|(ld\+)?json|method|aspect))/) > -1) { + result = 'javascript'; + } else if (typeAttribute.search(/(text|application|dojo)\/(x-)?(html)/) > -1) { + result = 'html'; + } else if (typeAttribute.search(/test\/null/) > -1) { + // Test only mime-type for testing the beautifier when null is passed as beautifing function + result = 'null'; + } + + return result; }; function in_array(what, arr) { @@ -1557,10 +2024,8 @@ Beautifier.prototype.beautify = function() { // HACK: newline parsing inconsistent. This brute force normalizes the input. source_text = source_text.replace(allLineBreaks, '\n'); - var baseIndentString = ''; - // Including commented out text would change existing html beautifier behavior to autodetect base indent. - // baseIndentString = source_text.match(/^[\t ]*/)[0]; + var baseIndentString = source_text.match(/^[\t ]*/)[0]; var last_token = { text: '', @@ -1610,17 +2075,18 @@ Beautifier.prototype._handle_tag_close = function(printer, raw_token, last_tag_t printer.alignment_size = 0; last_tag_token.tag_complete = true; - printer.set_space_before_token(raw_token.newlines || raw_token.whitespace_before !== ''); + printer.set_space_before_token(raw_token.newlines || raw_token.whitespace_before !== '', true); if (last_tag_token.is_unformatted) { printer.add_raw_token(raw_token); } else { if (last_tag_token.tag_start_char === '<') { - printer.set_space_before_token(raw_token.text[0] === '/'); // space before />, no space before > + printer.set_space_before_token(raw_token.text[0] === '/', true); // space before />, no space before > if (this._is_wrap_attributes_force_expand_multiline && last_tag_token.has_wrapped_attrs) { printer.print_newline(false); } } - printer.print_token(raw_token.text); + printer.print_token(raw_token); + } if (last_tag_token.indent_content && @@ -1630,23 +2096,32 @@ Beautifier.prototype._handle_tag_close = function(printer, raw_token, last_tag_t // only indent once per opened tag last_tag_token.indent_content = false; } + + if (!last_tag_token.is_inline_element && + !(last_tag_token.is_unformatted || last_tag_token.is_content_unformatted)) { + printer.set_wrap_point(); + } + return parser_token; }; Beautifier.prototype._handle_inside_tag = function(printer, raw_token, last_tag_token, tokens) { + var wrapped = last_tag_token.has_wrapped_attrs; var parser_token = { text: raw_token.text, type: raw_token.type }; - printer.set_space_before_token(raw_token.newlines || raw_token.whitespace_before !== ''); + + printer.set_space_before_token(raw_token.newlines || raw_token.whitespace_before !== '', true); if (last_tag_token.is_unformatted) { printer.add_raw_token(raw_token); } else if (last_tag_token.tag_start_char === '{' && raw_token.type === TOKEN.TEXT) { // For the insides of handlebars allow newlines or a single space between open and contents if (printer.print_preserved_newlines(raw_token)) { - printer.print_raw_text(raw_token.whitespace_before + raw_token.text); + raw_token.newlines = 0; + printer.add_raw_token(raw_token); } else { - printer.print_token(raw_token.text); + printer.print_token(raw_token); } } else { if (raw_token.type === TOKEN.ATTRIBUTE) { @@ -1658,44 +2133,40 @@ Beautifier.prototype._handle_inside_tag = function(printer, raw_token, last_tag_ printer.set_space_before_token(false); } - if (printer._output.space_before_token && last_tag_token.tag_start_char === '<') { - // Allow the current attribute to wrap - // Set wrapped to true if the line is wrapped - var wrapped = printer.print_space_or_wrap(raw_token.text); - if (raw_token.type === TOKEN.ATTRIBUTE) { - if (this._is_wrap_attributes_preserve || this._is_wrap_attributes_preserve_aligned) { - printer.traverse_whitespace(raw_token); - wrapped = wrapped || raw_token.newlines !== 0; + if (raw_token.type === TOKEN.ATTRIBUTE && last_tag_token.tag_start_char === '<') { + if (this._is_wrap_attributes_preserve || this._is_wrap_attributes_preserve_aligned) { + printer.traverse_whitespace(raw_token); + wrapped = wrapped || raw_token.newlines !== 0; + } + + + if (this._is_wrap_attributes_force) { + var force_attr_wrap = last_tag_token.attr_count > 1; + if (this._is_wrap_attributes_force_expand_multiline && last_tag_token.attr_count === 1) { + var is_only_attribute = true; + var peek_index = 0; + var peek_token; + do { + peek_token = tokens.peek(peek_index); + if (peek_token.type === TOKEN.ATTRIBUTE) { + is_only_attribute = false; + break; + } + peek_index += 1; + } while (peek_index < 4 && peek_token.type !== TOKEN.EOF && peek_token.type !== TOKEN.TAG_CLOSE); + + force_attr_wrap = !is_only_attribute; } - // Save whether we have wrapped any attributes - last_tag_token.has_wrapped_attrs = last_tag_token.has_wrapped_attrs || wrapped; - - if (this._is_wrap_attributes_force) { - var force_attr_wrap = last_tag_token.attr_count > 1; - if (this._is_wrap_attributes_force_expand_multiline && last_tag_token.attr_count === 1) { - var is_only_attribute = true; - var peek_index = 0; - var peek_token; - do { - peek_token = tokens.peek(peek_index); - if (peek_token.type === TOKEN.ATTRIBUTE) { - is_only_attribute = false; - break; - } - peek_index += 1; - } while (peek_index < 4 && peek_token.type !== TOKEN.EOF && peek_token.type !== TOKEN.TAG_CLOSE); - - force_attr_wrap = !is_only_attribute; - } - - if (force_attr_wrap) { - printer.print_newline(false); - last_tag_token.has_wrapped_attrs = true; - } + + if (force_attr_wrap) { + printer.print_newline(false); + wrapped = true; } } } - printer.print_token(raw_token.text); + printer.print_token(raw_token); + wrapped = wrapped || printer.previous_token_wrapped(); + last_tag_token.has_wrapped_attrs = wrapped; } return parser_token; }; @@ -1705,27 +2176,35 @@ Beautifier.prototype._handle_text = function(printer, raw_token, last_tag_token) text: raw_token.text, type: 'TK_CONTENT' }; - if (last_tag_token.custom_beautifier) { //check if we need to format javascript + if (last_tag_token.custom_beautifier_name) { //check if we need to format javascript this._print_custom_beatifier_text(printer, raw_token, last_tag_token); } else if (last_tag_token.is_unformatted || last_tag_token.is_content_unformatted) { printer.add_raw_token(raw_token); } else { printer.traverse_whitespace(raw_token); - printer.print_token(raw_token.text); + printer.print_token(raw_token); } return parser_token; }; Beautifier.prototype._print_custom_beatifier_text = function(printer, raw_token, last_tag_token) { + var local = this; if (raw_token.text !== '') { - printer.print_newline(false); + var text = raw_token.text, _beautifier, - script_indent_level = 1; - if (last_tag_token.tag_name === 'script') { - _beautifier = typeof this._js_beautify === 'function' && this._js_beautify; - } else if (last_tag_token.tag_name === 'style') { - _beautifier = typeof this._css_beautify === 'function' && this._css_beautify; + script_indent_level = 1, + pre = '', + post = ''; + if (last_tag_token.custom_beautifier_name === 'javascript' && typeof this._js_beautify === 'function') { + _beautifier = this._js_beautify; + } else if (last_tag_token.custom_beautifier_name === 'css' && typeof this._css_beautify === 'function') { + _beautifier = this._css_beautify; + } else if (last_tag_token.custom_beautifier_name === 'html') { + _beautifier = function(html_source, options) { + var beautifier = new Beautifier(html_source, options, local._js_beautify, local._css_beautify); + return beautifier.beautify(); + }; } if (this._options.indent_scripts === "keep") { @@ -1740,25 +2219,72 @@ Beautifier.prototype._print_custom_beatifier_text = function(printer, raw_token, // we'll be adding one back after the text but before the containing tag. text = text.replace(/\n[ \t]*$/, ''); - if (_beautifier) { + // Handle the case where content is wrapped in a comment or cdata. + if (last_tag_token.custom_beautifier_name !== 'html' && + text[0] === '<' && text.match(/^(|]]>)$/.exec(text); - // call the Beautifier if avaliable - var Child_options = function() { - this.eol = '\n'; - }; - Child_options.prototype = this._options.raw_options; - var child_options = new Child_options(); - text = _beautifier(indentation + text, child_options); - } else { - // simply indent the string otherwise - var white = text.match(/^\s*/)[0]; - var _level = white.match(/[^\n\r]*$/)[0].split(this._options.indent_string).length - 1; - var reindent = this._get_full_indent(script_indent_level - _level); - text = (indentation + text.trim()) - .replace(/\r\n|\r|\n/g, '\n' + reindent); + // if we start to wrap but don't finish, print raw + if (!matched) { + printer.add_raw_token(raw_token); + return; + } + + pre = indentation + matched[1] + '\n'; + text = matched[4]; + if (matched[5]) { + post = indentation + matched[5]; + } + + // if there is at least one empty line at the end of this text, strip it + // we'll be adding one back after the text but before the containing tag. + text = text.replace(/\n[ \t]*$/, ''); + + if (matched[2] || matched[3].indexOf('\n') !== -1) { + // if the first line of the non-comment text has spaces + // use that as the basis for indenting in null case. + matched = matched[3].match(/[ \t]+$/); + if (matched) { + raw_token.whitespace_before = matched[0]; + } + } + } + + if (text) { + if (_beautifier) { + + // call the Beautifier if avaliable + var Child_options = function() { + this.eol = '\n'; + }; + Child_options.prototype = this._options.raw_options; + var child_options = new Child_options(); + text = _beautifier(indentation + text, child_options); + } else { + // simply indent the string otherwise + var white = raw_token.whitespace_before; + if (white) { + text = text.replace(new RegExp('\n(' + white + ')?', 'g'), '\n'); + } + + text = indentation + text.replace(/\n/g, '\n' + indentation); + } } + + if (pre) { + if (!text) { + text = pre + post; + } else { + text = pre + text + '\n' + post; + } + } + + printer.print_newline(false); if (text) { - printer.print_raw_text(text); + raw_token.text = text; + raw_token.whitespace_before = ''; + raw_token.newlines = 0; + printer.add_raw_token(raw_token); printer.print_newline(true); } } @@ -1768,14 +2294,19 @@ Beautifier.prototype._handle_tag_open = function(printer, raw_token, last_tag_to var parser_token = this._get_tag_open_token(raw_token); if ((last_tag_token.is_unformatted || last_tag_token.is_content_unformatted) && + !last_tag_token.is_empty_element && raw_token.type === TOKEN.TAG_OPEN && raw_token.text.indexOf(']*)/); this.tag_check = tag_check_match ? tag_check_match[1] : ''; } else { - tag_check_match = raw_token.text.match(/^{{\#?([^\s}]+)/); + tag_check_match = raw_token.text.match(/^{{(?:[\^]|#\*?)?([^\s}]+)/); this.tag_check = tag_check_match ? tag_check_match[1] : ''; + + // handle "{{#> myPartial}} + if (raw_token.text === '{{#>' && this.tag_check === '>' && raw_token.next !== null) { + this.tag_check = raw_token.next.text; + } } this.tag_check = this.tag_check.toLowerCase(); @@ -1870,13 +2406,17 @@ Beautifier.prototype._set_tag_position = function(printer, raw_token, parser_tok } else { // it's a start-tag // check if this tag is starting an element that has optional end element // and do an ending needed - this._do_optional_end_element(parser_token); + if (this._do_optional_end_element(parser_token)) { + if (!parser_token.is_inline_element) { + printer.print_newline(false); + } + } this._tag_stack.record_tag(parser_token); //push it on the tag stack if ((parser_token.tag_name === 'script' || parser_token.tag_name === 'style') && !(parser_token.is_unformatted || parser_token.is_content_unformatted)) { - parser_token.custom_beautifier = uses_beautifier(parser_token.tag_check, raw_token); + parser_token.custom_beautifier_name = get_custom_beautifier_name(parser_token.tag_check, raw_token); } } } @@ -1906,25 +2446,32 @@ Beautifier.prototype._set_tag_position = function(printer, raw_token, parser_tok if (parser_token.tag_name === '!--' && last_token.type === TOKEN.TAG_CLOSE && last_tag_token.is_end_tag && parser_token.text.indexOf('\n') === -1) { //Do nothing. Leave comments on same line. - } else if (!parser_token.is_inline_element && !parser_token.is_unformatted) { - printer.print_newline(false); - } - } else if (parser_token.is_unformatted || parser_token.is_content_unformatted) { - if (!parser_token.is_inline_element && !parser_token.is_unformatted) { - printer.print_newline(false); + } else { + if (!(parser_token.is_inline_element || parser_token.is_unformatted)) { + printer.print_newline(false); + } + this._calcluate_parent_multiline(printer, parser_token); } } else if (parser_token.is_end_tag) { //this tag is a double tag so check for tag-ending - if ((parser_token.start_tag_token && parser_token.start_tag_token.multiline_content) || - !(parser_token.is_inline_element || - (last_tag_token.is_inline_element) || - (last_token.type === TOKEN.TAG_CLOSE && - parser_token.start_tag_token === last_tag_token) || - (last_token.type === 'TK_CONTENT') - )) { + var do_end_expand = false; + + // deciding whether a block is multiline should not be this hard + do_end_expand = parser_token.start_tag_token && parser_token.start_tag_token.multiline_content; + do_end_expand = do_end_expand || (!parser_token.is_inline_element && + !(last_tag_token.is_inline_element || last_tag_token.is_unformatted) && + !(last_token.type === TOKEN.TAG_CLOSE && parser_token.start_tag_token === last_tag_token) && + last_token.type !== 'TK_CONTENT' + ); + + if (parser_token.is_content_unformatted || parser_token.is_unformatted) { + do_end_expand = false; + } + + if (do_end_expand) { printer.print_newline(false); } } else { // it's a start-tag - parser_token.indent_content = !parser_token.custom_beautifier; + parser_token.indent_content = !parser_token.custom_beautifier_name; if (parser_token.tag_start_char === '<') { if (parser_token.tag_name === 'html') { @@ -1936,19 +2483,28 @@ Beautifier.prototype._set_tag_position = function(printer, raw_token, parser_tok } } - if (!parser_token.is_inline_element && last_token.type !== 'TK_CONTENT') { - if (parser_token.parent) { - parser_token.parent.multiline_content = true; - } + if (!(parser_token.is_inline_element || parser_token.is_unformatted) && + (last_token.type !== 'TK_CONTENT' || parser_token.is_content_unformatted)) { printer.print_newline(false); } + + this._calcluate_parent_multiline(printer, parser_token); + } +}; + +Beautifier.prototype._calcluate_parent_multiline = function(printer, parser_token) { + if (parser_token.parent && printer._output.just_added_newline() && + !((parser_token.is_inline_element || parser_token.is_unformatted) && parser_token.parent.is_inline_element)) { + parser_token.parent.multiline_content = true; } }; //To be used for

tag special case: -//var p_closers = ['address', 'article', 'aside', 'blockquote', 'details', 'div', 'dl', 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'hr', 'main', 'nav', 'ol', 'p', 'pre', 'section', 'table', 'ul']; +var p_closers = ['address', 'article', 'aside', 'blockquote', 'details', 'div', 'dl', 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'header', 'hr', 'main', 'nav', 'ol', 'p', 'pre', 'section', 'table', 'ul']; +var p_parent_excludes = ['a', 'audio', 'del', 'ins', 'map', 'noscript', 'video']; Beautifier.prototype._do_optional_end_element = function(parser_token) { + var result = null; // NOTE: cases of "if there is no more content in the parent element" // are handled automatically by the beautifier. // It assumes parent or ancestor close tag closes all children. @@ -1956,104 +2512,111 @@ Beautifier.prototype._do_optional_end_element = function(parser_token) { if (parser_token.is_empty_element || !parser_token.is_start_tag || !parser_token.parent) { return; - } else if (parser_token.tag_name === 'body') { - // A head element鈥檚 end tag may be omitted if the head element is not immediately followed by a space character or a comment. - this._tag_stack.try_pop('head'); + } + + if (parser_token.tag_name === 'body') { + // A head element’s end tag may be omitted if the head element is not immediately followed by a space character or a comment. + result = result || this._tag_stack.try_pop('head'); //} else if (parser_token.tag_name === 'body') { - // DONE: A body element鈥檚 end tag may be omitted if the body element is not immediately followed by a comment. + // DONE: A body element’s end tag may be omitted if the body element is not immediately followed by a comment. } else if (parser_token.tag_name === 'li') { - // An li element鈥檚 end tag may be omitted if the li element is immediately followed by another li element or if there is no more content in the parent element. - this._tag_stack.try_pop('li', ['ol', 'ul']); + // An li element’s end tag may be omitted if the li element is immediately followed by another li element or if there is no more content in the parent element. + result = result || this._tag_stack.try_pop('li', ['ol', 'ul']); } else if (parser_token.tag_name === 'dd' || parser_token.tag_name === 'dt') { - // A dd element鈥檚 end tag may be omitted if the dd element is immediately followed by another dd element or a dt element, or if there is no more content in the parent element. - // A dt element鈥檚 end tag may be omitted if the dt element is immediately followed by another dt element or a dd element. - this._tag_stack.try_pop('dt', ['dl']); - this._tag_stack.try_pop('dd', ['dl']); - - //} else if (p_closers.indexOf(parser_token.tag_name) !== -1) { - //TODO: THIS IS A BUG FARM. We are not putting this into 1.8.0 as it is likely to blow up. - //A p element鈥檚 end tag may be omitted if the p element is immediately followed by an address, article, aside, blockquote, details, div, dl, fieldset, figcaption, figure, footer, form, h1, h2, h3, h4, h5, h6, header, hr, main, nav, ol, p, pre, section, table, or ul element, or if there is no more content in the parent element and the parent element is an HTML element that is not an a, audio, del, ins, map, noscript, or video element, or an autonomous custom element. - //this._tag_stack.try_pop('p', ['body']); - + // A dd element’s end tag may be omitted if the dd element is immediately followed by another dd element or a dt element, or if there is no more content in the parent element. + // A dt element’s end tag may be omitted if the dt element is immediately followed by another dt element or a dd element. + result = result || this._tag_stack.try_pop('dt', ['dl']); + result = result || this._tag_stack.try_pop('dd', ['dl']); + + + } else if (parser_token.parent.tag_name === 'p' && p_closers.indexOf(parser_token.tag_name) !== -1) { + // IMPORTANT: this else-if works because p_closers has no overlap with any other element we look for in this method + // check for the parent element is an HTML element that is not an ,