From 86ee0810c5aed893d513ac32b77f7b07e79577c3 Mon Sep 17 00:00:00 2001 From: "M. Wulff" Date: Sat, 10 Dec 2022 20:50:17 +1100 Subject: [PATCH] Format src --- package.json | 7 +------ test/test238.json | 2 +- test/test846.js | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index a58721dc5b..a321bef525 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", diff --git a/test/test238.json b/test/test238.json index 4dca1cc0b0..5bb1abba08 100644 --- a/test/test238.json +++ b/test/test238.json @@ -1 +1 @@ -[{"100":100}] \ No newline at end of file +[{"100": 100}] diff --git a/test/test846.js b/test/test846.js index eb5acd4c3a..2287411e14 100644 --- a/test/test846.js +++ b/test/test846.js @@ -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}]); });