js-beautify 1.6.14 → 1.7.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -179
- package/README.md +12 -10
- package/js/lib/beautify-css.js +768 -293
- package/js/lib/beautify-html.js +1016 -757
- package/js/lib/beautify.js +2385 -2046
- package/js/lib/cli.js +3 -0
- package/js/src/core/acorn.js +63 -0
- package/js/src/core/inputscanner.js +95 -0
- package/js/src/core/options.js +48 -0
- package/js/src/core/output.js +234 -0
- package/js/src/core/token.js +49 -0
- package/js/src/css/beautifier.js +477 -0
- package/js/src/css/index.js +36 -0
- package/js/src/html/beautifier.js +1035 -0
- package/js/src/html/index.js +36 -0
- package/js/src/index.js +27 -0
- package/js/src/javascript/beautifier.js +1449 -0
- package/js/src/javascript/index.js +36 -0
- package/js/src/javascript/tokenizer.js +620 -0
- package/js/test/generated/beautify-javascript-tests.js +33 -0
- package/package.json +5 -4
- package/.codeclimate.yml +0 -13
- package/.jshintignore +0 -9
- package/.jshintrc +0 -10
- package/.npmignore +0 -5
- package/.travis.yml +0 -14
- package/ISSUE_TEMPLATE.md +0 -55
- package/appveyor.yml +0 -35
- package/bower.json +0 -11
- package/build +0 -5
- package/jsbeautifyrc +0 -18
- package/test/data/css/node.mustache +0 -269
- package/test/data/css/python.mustache +0 -270
- package/test/data/css/tests.js +0 -445
- package/test/data/html/node.mustache +0 -378
- package/test/data/html/tests.js +0 -1105
- package/test/data/javascript/inputlib.js +0 -84
- package/test/data/javascript/node.mustache +0 -1114
- package/test/data/javascript/python.mustache +0 -1322
- package/test/data/javascript/tests.js +0 -3083
- package/test/generate-tests.js +0 -216
- package/test/resources/html-with-base64image.html +0 -1
- package/test/resources/underscore-min.js +0 -6
- package/test/resources/underscore.js +0 -1439
- package/tools/build.sh +0 -140
- package/tools/generate-changelog.sh +0 -40
- package/tools/git-status-clear.sh +0 -18
- package/tools/release-all.sh +0 -86
package/tools/build.sh
DELETED
|
@@ -1,140 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env bash
|
|
2
|
-
|
|
3
|
-
REL_SCRIPT_DIR="`dirname \"$0\"`"
|
|
4
|
-
SCRIPT_DIR="`( cd \"$REL_SCRIPT_DIR\" && pwd )`"
|
|
5
|
-
PROJECT_DIR="`( cd \"$SCRIPT_DIR/..\" && pwd )`"
|
|
6
|
-
|
|
7
|
-
build_help()
|
|
8
|
-
{
|
|
9
|
-
echo "build.sh <action>"
|
|
10
|
-
echo " full - build and test of all implementations"
|
|
11
|
-
echo " all - build of both implementations"
|
|
12
|
-
echo " js - build of javascript"
|
|
13
|
-
echo " py - build of python"
|
|
14
|
-
echo " alltest - test both implementations, js and python"
|
|
15
|
-
echo " pytest - test python implementation"
|
|
16
|
-
echo " jstest - test javascript implementation"
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
build_ci()
|
|
20
|
-
{
|
|
21
|
-
build_full
|
|
22
|
-
build_git_status
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
build_full()
|
|
26
|
-
{
|
|
27
|
-
build_all
|
|
28
|
-
build_alltest
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
build_all()
|
|
32
|
-
{
|
|
33
|
-
build_py
|
|
34
|
-
build_js
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
build_py()
|
|
38
|
-
{
|
|
39
|
-
echo Building python module...
|
|
40
|
-
pip install -e ./python || exit 1
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
build_js()
|
|
44
|
-
{
|
|
45
|
-
echo Building javascript...
|
|
46
|
-
npm install || exit 1
|
|
47
|
-
generate_tests
|
|
48
|
-
# jshint
|
|
49
|
-
$PROJECT_DIR/node_modules/.bin/jshint 'js' 'test' || exit 1
|
|
50
|
-
|
|
51
|
-
# beautify test and data
|
|
52
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/test/amd-beautify-tests.js || exit 1
|
|
53
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/test/node-beautify-html-perf-tests.js || exit 1
|
|
54
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/test/node-beautify-perf-tests.js || exit 1
|
|
55
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/test/node-beautify-tests.js || exit 1
|
|
56
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/test/sanitytest.js || exit 1
|
|
57
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/test/data/css/tests.js || exit 1
|
|
58
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/test/data/html/tests.js || exit 1
|
|
59
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/test/data/javascript/inputlib.js || exit 1
|
|
60
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/test/data/javascript/tests.js || exit 1
|
|
61
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/test/generate-tests.js || exit 1
|
|
62
|
-
|
|
63
|
-
# beautify product code
|
|
64
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/lib/unpackers/javascriptobfuscator_unpacker.js || exit 1
|
|
65
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/lib/unpackers/myobfuscate_unpacker.js || exit 1
|
|
66
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/lib/unpackers/p_a_c_k_e_r_unpacker.js || exit 1
|
|
67
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/lib/unpackers/urlencode_unpacker.js || exit 1
|
|
68
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/lib/beautify-css.js || exit 1
|
|
69
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/lib/beautify-html.js || exit 1
|
|
70
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/lib/beautify.js || exit 1
|
|
71
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/lib/cli.js || exit 1
|
|
72
|
-
$PROJECT_DIR/js/bin/js-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r $PROJECT_DIR/js/index.js || exit 1
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
# html not ready yet
|
|
76
|
-
# $PROJECT_DIR/js/bin/html-beautify.js --config $PROJECT_DIR/jsbeautifyrc -r index.html
|
|
77
|
-
|
|
78
|
-
# jshint again to make sure things haven't changed
|
|
79
|
-
$PROJECT_DIR/node_modules/.bin/jshint 'js' 'test' || exit 1
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
generate_tests()
|
|
83
|
-
{
|
|
84
|
-
node test/generate-tests.js || exit 1
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
build_alltest()
|
|
88
|
-
{
|
|
89
|
-
build_jstest
|
|
90
|
-
build_pytest
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
build_pytest()
|
|
94
|
-
{
|
|
95
|
-
echo Testing python implementation...
|
|
96
|
-
generate_tests
|
|
97
|
-
cd python
|
|
98
|
-
python --version
|
|
99
|
-
./jsbeautifier/tests/shell-smoke-test.sh || exit 1
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
build_jstest()
|
|
103
|
-
{
|
|
104
|
-
echo Testing javascript implementation...
|
|
105
|
-
generate_tests
|
|
106
|
-
node --version
|
|
107
|
-
./js/test/shell-smoke-test.sh || exit 1
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
build_git_status()
|
|
111
|
-
{
|
|
112
|
-
$SCRIPT_DIR/git-status-clear.sh || exit 1
|
|
113
|
-
}
|
|
114
|
-
|
|
115
|
-
build_update-codemirror()
|
|
116
|
-
{
|
|
117
|
-
rm -rf node_modules/codemirror
|
|
118
|
-
npm install codemirror
|
|
119
|
-
rm -rf ./web/third-party/codemirror/*
|
|
120
|
-
cp ./node_modules/codemirror/LICENSE ./web/third-party/codemirror/
|
|
121
|
-
cp ./node_modules/codemirror/README.md ./web/third-party/codemirror/
|
|
122
|
-
cp -r ./node_modules/codemirror/lib ./web/third-party/codemirror/
|
|
123
|
-
mkdir -p ./web/third-party/codemirror/mode
|
|
124
|
-
cp -r ./node_modules/codemirror/mode/javascript ./web/third-party/codemirror/mode/
|
|
125
|
-
git add -Av ./web/third-party/codemirror
|
|
126
|
-
}
|
|
127
|
-
|
|
128
|
-
main() {
|
|
129
|
-
cd $PROJECT_DIR
|
|
130
|
-
local ACTION
|
|
131
|
-
ACTION=build_${1:-full}
|
|
132
|
-
if [ -n "$(type -t $ACTION)" ] && [ "$(type -t $ACTION)" = "function" ]; then
|
|
133
|
-
$ACTION
|
|
134
|
-
else
|
|
135
|
-
build_help
|
|
136
|
-
fi
|
|
137
|
-
|
|
138
|
-
}
|
|
139
|
-
|
|
140
|
-
(main $*)
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env bash
|
|
2
|
-
|
|
3
|
-
REL_SCRIPT_DIR="`dirname \"$0\"`"
|
|
4
|
-
SCRIPT_DIR="`( cd \"$REL_SCRIPT_DIR\" && pwd )`"
|
|
5
|
-
|
|
6
|
-
# based on https://gist.github.com/joelittlejohn/5937573
|
|
7
|
-
#
|
|
8
|
-
|
|
9
|
-
main()
|
|
10
|
-
{
|
|
11
|
-
cd $SCRIPT_DIR/..
|
|
12
|
-
|
|
13
|
-
if [ "$#" -ne 1 ]; then
|
|
14
|
-
echo "Usage: ./generate-changelog.sh user/repo"
|
|
15
|
-
exit 1
|
|
16
|
-
fi
|
|
17
|
-
|
|
18
|
-
IFS=$'\n'
|
|
19
|
-
echo "# Changelog" > CHANGELOG.md
|
|
20
|
-
|
|
21
|
-
for m in $(curl -s "https://api.github.com/repos/$1/milestones?state=closed" | jq -c '.[] | [.title, .number, .description]' | gsort -r -V); do
|
|
22
|
-
mid=$(echo $m | sed 's/\[".*",\(.*\),".*"\]/\1/')
|
|
23
|
-
title=$(echo $m | sed 's/\["\(.*\)",.*,".*"\]/\1/')
|
|
24
|
-
|
|
25
|
-
echo "Processing milestone: $title..."
|
|
26
|
-
echo $m | sed 's/\["\(.*\)",.*\]/## \1/' >> CHANGELOG.md
|
|
27
|
-
echo "" >> CHANGELOG.md
|
|
28
|
-
echo '### Description' >> CHANGELOG.md
|
|
29
|
-
echo $m | sed 's/\[".*",.*,"\(.*\)"\]/\1/' | sed -e 's/\\"/"/g' | sed -e 's/\\r\\n/\\n/g' | sed -e 's/\\n/\'$'\n/g' >> CHANGELOG.md
|
|
30
|
-
echo "" >> CHANGELOG.md
|
|
31
|
-
echo '### Closed Issues' >> CHANGELOG.md
|
|
32
|
-
for i in $(curl -s "https://api.github.com/repos/$1/issues?milestone=$mid&state=closed" | jq -c '.[] | [.html_url, .number, .title]'); do
|
|
33
|
-
echo $i | sed 's/\["\(.*\)",\(.*\),\"\(.*\)\"\]/* \3 ([#\2](\1))/' | sed 's/\\"/"/g' >> CHANGELOG.md
|
|
34
|
-
done
|
|
35
|
-
echo "" >> CHANGELOG.md
|
|
36
|
-
echo "" >> CHANGELOG.md
|
|
37
|
-
done
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
(main $*)
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
echo "Post-build git status check..."
|
|
2
|
-
echo "Ensuring no changes visible to git have been made to '$*' ..."
|
|
3
|
-
|
|
4
|
-
git status $* | egrep -q 'nothing to commit.*working (directory|tree) clean' || {
|
|
5
|
-
# we should find nothing to commit. If we don't, build has failed.
|
|
6
|
-
echo "ERROR: Post-build git status check - FAILED."
|
|
7
|
-
echo "Git status reported changes to non-git-ignore'd files."
|
|
8
|
-
echo "TO REPRO: Run 'git status $*'. The use git gui or git diff to see what was changed during the build."
|
|
9
|
-
echo "TO FIX: Amend your commit and rebuild. Repeat until git status reports no changes both before and after the build."
|
|
10
|
-
echo "OUTPUT FOR 'git status $*':"
|
|
11
|
-
git status $*
|
|
12
|
-
echo "."
|
|
13
|
-
echo "OUTPUT FOR 'git diff $*':"
|
|
14
|
-
git diff $* | cat -t -e
|
|
15
|
-
exit 1
|
|
16
|
-
}
|
|
17
|
-
echo "Post-build git status check - Succeeded."
|
|
18
|
-
exit 0
|
package/tools/release-all.sh
DELETED
|
@@ -1,86 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env bash
|
|
2
|
-
|
|
3
|
-
REL_SCRIPT_DIR="`dirname \"$0\"`"
|
|
4
|
-
SCRIPT_DIR="`( cd \"$REL_SCRIPT_DIR\" && pwd )`"
|
|
5
|
-
|
|
6
|
-
case "$OSTYPE" in
|
|
7
|
-
darwin*) PLATFORM="OSX" ;;
|
|
8
|
-
linux*) PLATFORM="LINUX" ;;
|
|
9
|
-
bsd*) PLATFORM="BSD" ;;
|
|
10
|
-
*) PLATFORM="UNKNOWN" ;;
|
|
11
|
-
esac
|
|
12
|
-
|
|
13
|
-
generate_changelog()
|
|
14
|
-
{
|
|
15
|
-
$SCRIPT_DIR/generate-changelog.sh beautify-web/js-beautify || exit 1
|
|
16
|
-
git commit -am "Update Changelog for $NEW_VERSION"
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
release_python()
|
|
20
|
-
{
|
|
21
|
-
git clean -xfd || exit 1
|
|
22
|
-
echo "__version__ = '$NEW_VERSION'" > python/jsbeautifier/__version__.py
|
|
23
|
-
git commit -am "Python $NEW_VERSION"
|
|
24
|
-
cd python
|
|
25
|
-
python setup.py register -r pypi
|
|
26
|
-
python setup.py sdist upload -r pypi
|
|
27
|
-
git push
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
release_node()
|
|
31
|
-
{
|
|
32
|
-
git clean -xfd || exit 1
|
|
33
|
-
npm version $NEW_VERSION
|
|
34
|
-
npm publish .
|
|
35
|
-
git push
|
|
36
|
-
git push --tags
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
release_web()
|
|
40
|
-
{
|
|
41
|
-
local ORIGINAL_BRANCH
|
|
42
|
-
ORIGINAL_BRANCH=$(git branch | grep '[*] .*' | awk '{print $2}')
|
|
43
|
-
git clean -xfd || exit 1
|
|
44
|
-
git fetch || exit 1
|
|
45
|
-
git checkout -B gh-pages origin/gh-pages || exit 1
|
|
46
|
-
git merge origin/master && git push || exit 1
|
|
47
|
-
git checkout $ORIGINAL_BRANCH
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
sedi() {
|
|
51
|
-
if [[ "$PLATFORM" == "OSX" || "$PLATFORM" == "BSD" ]]; then
|
|
52
|
-
sed -i "" $@
|
|
53
|
-
elif [ "$PLATFORM" == "LINUX" ]; then
|
|
54
|
-
sed -i $@
|
|
55
|
-
else
|
|
56
|
-
exit 1
|
|
57
|
-
fi
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
update_readme_versions()
|
|
61
|
-
{
|
|
62
|
-
git clean -xfd || exit 1
|
|
63
|
-
sedi -E 's@(cdn.rawgit.+beautify/v)[^/]+@\1'$NEW_VERSION'@' README.md
|
|
64
|
-
sedi -E 's@(cdnjs.cloudflare.+beautify/)[^/]+@\1'$NEW_VERSION'@' README.md
|
|
65
|
-
sedi -E 's/\((README\.md:.js-beautify@).+\)/(\1'$NEW_VERSION')/' README.md
|
|
66
|
-
git add README.md
|
|
67
|
-
git commit -m "Bump version numbers in README.md"
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
main()
|
|
71
|
-
{
|
|
72
|
-
cd $SCRIPT_DIR/..
|
|
73
|
-
|
|
74
|
-
local NEW_VERSION=$1
|
|
75
|
-
NEW_VERSION=$1
|
|
76
|
-
|
|
77
|
-
git checkout master
|
|
78
|
-
|
|
79
|
-
generate_changelog
|
|
80
|
-
update_readme_versions
|
|
81
|
-
(release_python)
|
|
82
|
-
release_node
|
|
83
|
-
release_web
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
(main $*)
|