diff --git a/.gitattributes b/.gitattributes index 423d27d4b..4fe4f2f67 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ /src/** linguist-vendored /examples/* linguist-vendored -*.js eof=lf +* text=auto eof=lf diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index ccc698357..2c5c9db58 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -9,11 +9,12 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: matrix: - node-version: [10.x, 12.x, 14.x] + os: [ubuntu-latest, windows-latest] + node-version: [12.x, 14.x, 16.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: diff --git a/.prettierrc.json b/.prettierrc.json index 87bc023e0..df5dd02fb 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,4 +1,5 @@ { "arrowParens": "avoid", - "trailingComma": "all" + "trailingComma": "all", + "endOfLine": "auto" } diff --git a/binding.gyp b/binding.gyp index 3896caa5c..2d9a80264 100644 --- a/binding.gyp +++ b/binding.gyp @@ -1,7 +1,7 @@ { "targets": [ { - "target_name": "tree_sitter_SQL_binding", + "target_name": "tree_sitter_sql_binding", "include_dirs": [ " exports, Local module) { Local constructor = Nan::GetFunction(tpl).ToLocalChecked(); Local instance = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked(); - Nan::SetInternalFieldPointer(instance, 0, tree_sitter_SQL()); + Nan::SetInternalFieldPointer(instance, 0, tree_sitter_sql()); - Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("SQL").ToLocalChecked()); + Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("sql").ToLocalChecked()); Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance); } -NODE_MODULE(tree_sitter_SQL_binding, Init) +NODE_MODULE(tree_sitter_sql_binding, Init) } // namespace diff --git a/bindings/node/index.js b/bindings/node/index.js index 621e05433..c50cdbd8f 100644 --- a/bindings/node/index.js +++ b/bindings/node/index.js @@ -1,11 +1,11 @@ try { - module.exports = require("../../build/Release/tree_sitter_SQL_binding"); + module.exports = require("../../build/Release/tree_sitter_sql_binding"); } catch (error1) { if (error1.code !== 'MODULE_NOT_FOUND') { throw error1; } try { - module.exports = require("../../build/Debug/tree_sitter_SQL_binding"); + module.exports = require("../../build/Debug/tree_sitter_sql_binding"); } catch (error2) { if (error2.code !== 'MODULE_NOT_FOUND') { throw error2; diff --git a/package-lock.json b/package-lock.json index 515cbe047..ad822961f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,13 +5,14 @@ "requires": true, "packages": { "": { + "name": "tree-sitter-sql", "version": "0.1.0", "license": "MIT", "dependencies": { "nan": "^2.14.2" }, "devDependencies": { - "prettier": "2.3.0", + "prettier": "^2.4.1", "tree-sitter-cli": "^0.20.0" } }, @@ -21,9 +22,9 @@ "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" }, "node_modules/prettier": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz", - "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", + "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -50,9 +51,9 @@ "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" }, "prettier": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz", - "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", + "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", "dev": true }, "tree-sitter-cli": { diff --git a/package.json b/package.json index 1489e81fd..970b6f6e3 100644 --- a/package.json +++ b/package.json @@ -18,18 +18,14 @@ "lexer", "sql" ], - "repository": { - "type": "git", - "url": "https://github.com/m-novikov/tree-sitter-sql" - }, - "author": "Maksim Novikov ", "repository": "https://github.com/m-novikov/tree-sitter-sql", + "author": "Maksim Novikov ", "license": "MIT", "dependencies": { "nan": "^2.14.2" }, "devDependencies": { - "prettier": "2.3.0", + "prettier": "^2.4.1", "tree-sitter-cli": "^0.20.0" }, "tree-sitter": [