Skip to content

Commit

Permalink
Format src
Browse files Browse the repository at this point in the history
  • Loading branch information
mathiasrw committed Dec 10, 2022
1 parent 1ce099f commit 86ee081
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
7 changes: 1 addition & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"build-jison": "gulp --jison && gulp",
"build-watch": "gulp watch",
"install-g": "yarn build && npm uninstall alasql -g && npm install -g .",
"release": "yarn version #f='/tmp/alasql.tmp' && curl https://raw.githubusercontent.com/wiki/agershun/alasql/How-to-release.md > $f && sh $f ; rm $f",
"release": "yarn version",
"jison": "npx jison-gho ./src/alasqlparser.jison -o ./src/alasqlparser.js",
"fmt": "yarn pretty-commit --write",
"format": "yarn pretty-since-dev --write",
Expand All @@ -33,17 +33,12 @@
"pretty-commit": "{ git diff --name-only --diff-filter=d ; git diff --name-only --diff-filter=d --staged ; } | sort | uniq | grep -vE '^dist/|^test/coverage|^lib/|.min.js$' | grep -E '\\.(scss|css|js|ts|vue|json)$' | xargs npx prettier",
"pretty-all": "git ls-tree --full-tree --name-only -r HEAD | grep -vE '^dist/|^test/coverage|^lib/|.min.js$' | grep -E '\\.(scss|css|js|ts|vue|json)$' | xargs npx prettier",
"push": "git push --force-with-lease && git push --no-verify --tags #",
"pull-hard": "git-branch-is '^(release|master|hotfix|develop)' -riq || (git-branch-is --not '^(release|master|hotfix|develop)' && git fetch && git reset --hard $(git merge-base head $(git for-each-ref --format='%(upstream:short)' $(git symbolic-ref -q HEAD))) && git pull)",
"rebase": "git-branch-is '^(release|master|hotfix|develop)' -riq || (git-branch-is --not '^(release|master|hotfix|develop)' && (git fetch || 1) && git rebase origin/develop)",
"repush": "yarn rebase && yarn push",
"amend": "git reset --soft HEAD~1 && sleep 1 && git add --all && git commit --file .git/COMMIT_EDITMSG # This works with husky hooks",
"tagit": "git tag \"$(git rev-parse --abbrev-ref HEAD | awk -F '/' '{print $NF}')\"'-r'\"$(git tag -l \"$(git rev-parse --abbrev-ref HEAD | awk -F '/' '{print $NF}')\"'*' | wc -l | xargs)\" && git push origin --no-verify --tags #",
"commit": "cmdmix 'git add --all && git commit -am \"%1\"'",
"add": "git add --all",
"goto": "git fetch && git checkout",
"todo": "git ls-tree --full-tree --name-only -r head | xargs grep -inEro '\\Wtodo[ :].*' #",
"tofix": "git ls-tree --full-tree --name-only -r HEAD | xargs grep -lrE '<{5,}' #",
"next": "git add --all && git rebase --continue #",
"fresh": "cmdmix 'yarn goto '%1' && yarn pull-hard'",
"pre-pr": "cmdmix 'yarn fresh '%1' && yarn repush'",
"prepare": "husky install",
Expand Down
2 changes: 1 addition & 1 deletion test/test238.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"100":100}]
[{"100": 100}]
4 changes: 2 additions & 2 deletions test/test846.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ describe('Test ' + test + ' - non-numeric values for SUM, MIN and MAX', function
assert.deepEqual(res, [{a: null, b: 10, c: null, c2: 1, d: 5, e: null, f: 13}]);

var data = [[{a: null}]];
res = alasql(`SELECT SUM(a) AS a FROM ?`,data);
res = alasql(`SELECT SUM(a) AS a FROM ?`, data);
assert.deepEqual(res, [{a: null}]);

var data = [[{a: 2}]];
res = alasql(`SELECT SUM(a) AS a FROM ?`,data);
res = alasql(`SELECT SUM(a) AS a FROM ?`, data);
assert.deepEqual(res, [{a: 2}]);
});

Expand Down

0 comments on commit 86ee081

Please sign in to comment.