Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update node_translators/closure.js $ npm audit fix --force #20

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update node_translators/closure.js $ npm audit fix --force #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f69c973
Update node_translators/closure.js
zaoqi May 10, 2019
3ad1f40
$ npm audit fix --force
zaoqi May 11, 2019
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
179 changes: 131 additions & 48 deletions dist/php-unparser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.phpUnparser = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.phpUnparser = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
/*jslint node: true, indent: 2 */
'use strict';

Expand Down Expand Up @@ -59,10 +59,18 @@ module.exports = function (node, indent) {
'use strict';

module.exports = function (node, indent) {
var codegen = this.process.bind(this);
return codegen(node.left, indent) +
this.ws + node.type + this.ws +
codegen(node.right, indent);
var codegen, str, firstpart, secondpart;
codegen = this.process.bind(this);

firstpart = codegen(node.left, indent);
secondpart = codegen(node.right, indent);
str = firstpart + this.ws + node.type + this.ws + secondpart;

if (str.length > 80) {
str = firstpart + this.ws + node.type + this.nl + indent + this.indent + secondpart;
}

return str;
};

},{}],5:[function(require,module,exports){
Expand Down Expand Up @@ -238,7 +246,7 @@ module.exports = function (node, indent) {
// use statement
if (node.uses && node.uses.length > 0) {
useArgs = node.uses.map(function (arg) {
return '$' + arg.name;
return (arg.byref ? '&$' : '$') + arg.name;
});
str += this.ws + 'use' + this.ws + '(' + useArgs.join(',' + this.ws) + ')';
}
Expand Down Expand Up @@ -273,7 +281,7 @@ module.exports = function (node, indent) {
str = 'const ';
str += node.name;
str += this.ws + '=' + this.ws;
str += codegen(node.value, indent) + ';';
str += codegen(node.value, indent);

return str;
};
Expand Down Expand Up @@ -317,17 +325,17 @@ module.exports = function (node, indent) {
codegen = this.process.bind(this);
for (k in node.what) {
if (node.what.hasOwnProperty(k) && node.what[k]) {
items.push(k + '=' + codegen(node.what[k]));
items.push(k + this.ws + '=' + this.ws + codegen(node.what[k]));
}
}
str = 'declare(' + items.join(',') + ')';
str = 'declare(' + items.join(',' + this.ws) + ')';
if (node.mode !== 'none') {
str += this.ws + '{' + this.nl;
str += doBody.call(this, codegen, indent, node.children);
str += indent + '}' + this.nl;
} else {
str += ';' + this.nl;
str += doBody.call(this, codegen, indent, node.children);
str += doBody.call(this, codegen, indent, node.children, true);
}
return str;
};
Expand All @@ -352,14 +360,30 @@ module.exports = function (node, indent) {
'use strict';

module.exports = function (node, indent) {
var self = this, union, body;

if (node.alreadyParsed) {
return '';
}

if (node.isDoc) {
var body = node.lines.join(this.nl + indent + ' * ');
body = node.lines.join(this.nl + indent + ' * ');
if (body.substring(body.length - 3) === ' * ') {
body = body.substring(0, body.length - 3);
}
return this.nl + indent + '/** ' + body + ' */';
}
return this.nl + indent + '// ' + node.lines.join(this.nl + indent + '// ');

union = self.nl + indent + self.ws + self.ws;
return node.lines.reduce(function (acc, line) {

if (line.indexOf('\n') > -1) {
return acc.concat('/*' + line.split("\n").join(union) + '*/');
}

return acc.concat('// ' + line);
}, []).join(self.nl + indent);

};

},{}],20:[function(require,module,exports){
Expand All @@ -369,7 +393,13 @@ module.exports = function (node, indent) {
var params = require('./helper/parameters');

module.exports = function (node, indent) {
return 'echo ' + params(node.arguments, indent, this);
var str = params(node.arguments, indent, this);

if (node.isInlineEcho) {
return str + this.ws + '?>';
}

return 'echo ' + str;
};

},{"./helper/parameters":33}],21:[function(require,module,exports){
Expand Down Expand Up @@ -518,7 +548,7 @@ module.exports = function (node, indent) {
str += this.ws + '{' + this.nl;
}

str += doBody.call(this, codegen, indent, node.body.children);
str += doBody.call(this, codegen, indent, node.body.children || [node.body]);
if (node.shortForm) {
str += indent + 'endforeach;';
} else {
Expand Down Expand Up @@ -596,6 +626,10 @@ function processElement(indent, ws, codegen) {
return function (arg) {
var str = '';

if (arg.nullable) {
str += '?';
}

if (arg.type) { // type hint
str += codegen(arg.type, indent) + ws;
}
Expand Down Expand Up @@ -645,44 +679,74 @@ var noSemiColons = [
'usegroup', 'traituse', 'inline', 'block'
];

module.exports = function (codegen, currentIndent, body, isProgram) {
module.exports = function (codegen, currentIndent, body, isProgram, dontIncreaseIndent) {

var str, indentation, delimiter, that = this;
var str = '', expr, i, indentation, delimiter, that = this, line, next, after, dontUseNewLine, isInlineEcho;

// Set the rows delimiter
delimiter = that.options.collapseEmptyLines ? '' : '\n';

// Set the indentation
indentation = isProgram ? '' : currentIndent + that.indent;
if (dontIncreaseIndent) {
indentation = currentIndent;
} else {
indentation = isProgram ? '' : currentIndent + that.indent;
}

// Force body as an array
if (!Array.isArray(body)) {
body = [body];
}

// Map body values
str = body.map(function (expr) {
for (i = 0; i < body.length; i += 1) {
expr = body[i];
next = body[i + 1] || {};
after = body[i + 2] || {};

// Return empty string
if (expr === null) {
return '';
}
if (expr !== null) {


/**
* If this expression is an inline, the next is an echo, and the one after
* is another expression inline, treat it as an inline echo
*/
if (expr.kind === 'inline' && next.kind === 'echo' && after.kind === 'inline') {
expr.isInlineEcho = true;
next.isInlineEcho = true;
after.omitClosingTag = true;
dontUseNewLine = true;
}

var line;
if (expr.kind === 'label') {
line = codegen(expr, indentation);
} else {
line = indentation + codegen(expr, indentation);
}

// This expressions don't require semicolons
if (noSemiColons.indexOf(expr.kind) === -1) {
line += ';';
}
// Is this expr the echo of an inline echo?
isInlineEcho = expr.kind === 'echo' && expr.isInlineEcho === true;

if (expr.kind === 'label' || isInlineEcho || expr.omitClosingTag) {
line = codegen(expr, indentation);
} else {
line = indentation + codegen(expr, indentation);
}

return line + that.nl;
// This expressions don't require semicolons
if (noSemiColons.indexOf(expr.kind) === -1 && !isInlineEcho) {
line += ';';
}

}).join(delimiter);
// Check if the next expression is a comment that should be
// on the same line as this expression
if (next.kind === 'doc' && next.loc && expr.loc && next.loc.start.line === expr.loc.start.line) {
line += that.ws + codegen(next, '').trim();
next.alreadyParsed = true; // prevent to parse again the comment
}


str += line;
if (!dontUseNewLine && !isInlineEcho) {
str += that.nl + delimiter;
}
}
}

// Return the generated string
return str;
Expand Down Expand Up @@ -941,7 +1005,16 @@ CodeGen.prototype.yield = require("./yield.js");
'use strict';

module.exports = function (node) {
return '?>' + node.value + '<?php' + this.nl;
var str;

str = node.omitClosingTag ? '' : '?>';
str += node.value;

if (node.isInlineEcho) {
return str + '<?=' + this.ws;
}

return str + (node.isLast ? '' : '<?php' + this.nl);
};

},{}],39:[function(require,module,exports){
Expand Down Expand Up @@ -1101,11 +1174,13 @@ module.exports = function (node, indent) {
var codegen, str;
codegen = this.process.bind(this);
str = codegen(node.what, indent);
str += '(';
if (node.arguments && node.arguments.length > 0) {
str += params(node.arguments, indent, this);
if (node.what.kind !== 'class') {
str += '(';
if (node.arguments && node.arguments.length > 0) {
str += params(node.arguments, indent, this);
}
str += ')';
}
str += ')';
return 'new ' + str;
};

Expand Down Expand Up @@ -1186,8 +1261,12 @@ module.exports = function (node) {

var codegen = this.process.bind(this), str = '<?php' + this.nl;
if (node.children[0].kind === 'inline') {
str = node.children[0].value + str;
node.children.shift();
str = '';
node.children[0].omitClosingTag = true;
}
// Is the last expression and an inline
if (node.children[node.children.length - 1].kind === 'inline') {
node.children[node.children.length - 1].isLast = true;
}
if (
!this.forceNamespaceBrackets &&
Expand Down Expand Up @@ -1516,25 +1595,26 @@ module.exports = function (node, indent) {
* Usage declaration
*/
module.exports = function (node, indent) {
var str = 'use' + this.ws, items = [], glue;
var str = 'use' + this.ws, items, glue;
if (node.type) {
str += node.type + this.ws;
}
node.items.forEach(function (item) {

items = (node.items || []).map(function (item) {
var useItem = item.name;
if (item.alias) {
useItem += ' as ' + item.alias;
}
useItem += ';';
items.push(useItem);
return useItem;
});

if (node.items.length > 1) {
glue = this.nl + indent + this.indent;
str += node.name + this.ws + '{' + glue;
str += items.join(glue) + this.nl;
str += items.join(',' + glue) + this.nl;
str += indent + '};' + this.nl;
} else {
str += items[0] + this.nl;
str += items[0] + ';' + this.nl;
}
return str;
};
Expand Down Expand Up @@ -1570,6 +1650,9 @@ module.exports = function (node, indent) {
var codegen = this.process.bind(this), str;

str = 'while' + this.ws + '(' + codegen(node.test, indent) + ')';
if (!node.body) {
return str;
}
if (node.shortForm) {
str += ':' + this.nl;
} else {
Expand Down Expand Up @@ -1613,4 +1696,4 @@ module.exports = function (node, indent) {
};

},{}]},{},[1])(1)
});
});
2 changes: 1 addition & 1 deletion dist/php-unparser.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion node_translators/closure.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = function (node, indent) {
// use statement
if (node.uses && node.uses.length > 0) {
useArgs = node.uses.map(function (arg) {
return '$' + arg.name;
return (arg.byref ? '&$' : '$') + arg.name;
});
str += this.ws + 'use' + this.ws + '(' + useArgs.join(',' + this.ws) + ')';
}
Expand Down
Loading