Import patches from tarantool/cartridge

.github/workflows/publish.yml

@@ -0,0 +1,27 @@
+name: Publish
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  publish:
+    if: startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: tarantool/setup-tarantool@v1
+        with:
+          tarantool-version: '2.7'
+
+      - run: echo "TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV
+      - run: tarantoolctl rocks new_version --tag $TAG
+      - run: tarantoolctl rocks pack graphql-$TAG-1.rockspec
+
+      - uses: tarantool/rocks.tarantool.org/github-action@master
+        with:
+          auth: ${{ secrets.ROCKS_USERNAME }}:${{ secrets.ROCKS_PASSWORD }}
+          files: |
+            graphql-${{ env.TAG }}-1.rockspec
+            graphql-${{ env.TAG }}-1.src.rock

.github/workflows/test_on_push.yaml

@@ -0,0 +1,33 @@
+name: Run tests
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  run-tests-ce:
+    if: |
+      github.event_name == 'push' ||
+      github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login != 'tarantool'
+    strategy:
+      matrix:
+        tarantool-version: ["1.10", "2.7"]
+      fail-fast: false
+    runs-on: [ubuntu-20.04]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: tarantool/setup-tarantool@v1
+        with:
+          tarantool-version: ${{ matrix.tarantool-version }}
+
+      - name: Install dependencies
+        run: |
+          tarantoolctl rocks install luatest 0.5.2
+          tarantoolctl rocks install luacheck 0.25.0
+          tarantoolctl rocks make
+
+      - name: Run linter
+        run: .rocks/bin/luacheck .
+
+      - name: Run tests
+        run: .rocks/bin/luatest -v

.gitignore

@@ -0,0 +1,28 @@
+.~*
+*~
+.tarantool.cookie
+.rocks
+.cache
+.doctrees
+__pycache__
+/dev
+/tmp
+doc
+release
+release-doc
+.idea
+Dockerfile.test
+Makefile.test
+CMakeFiles
+CMakeCache.txt
+cmake_install.cmake
+CTestTestfile.cmake
+build.luarocks
+build.rst
+coverage_result.txt
+.DS_Store
+.vscode
+luacov.*.out*
+/node_modules
+/package-lock.json
+*.mo

.luacheckrc

@@ -0,0 +1,18 @@
+redefined = false
+include_files = {
+    '*.lua',
+    'test/**/*.lua',
+    'graphql/**/*.lua',
+    '*.rockspec',
+    '.luacheckrc',
+}
+exclude_files = {
+    '.rocks',
+}
+new_read_globals = {
+    box = { fields = {
+        session = { fields = {
+            storage = {read_only = false, other_fields = true}
+        }}
+    }}
+}

README.md

@@ -1,25 +1,26 @@
 Lua implementation of GraphQL for Tarantool
 ===========================================
 
-Lua implementation of GraphQL for Tarantool. It is based on [graphql-lua](https://github.com/bjornbytes/graphql-lua).
+Lua implementation of GraphQL for Tarantool.
+It is based on [graphql-lua](https://github.com/bjornbytes/graphql-lua).
 
 
 Installation
 ------------
 
 ```bash
-tarantoolctl rocks install https://github.com/raw/tarantool/graphql/master/graphql-scm-1.rockspec
+tarantoolctl rocks install graphql
 ```
 
 Example
 ---
 
 ```lua
-local parse = require 'graphql.parse'
-local schema = require 'graphql.schema'
-local types = require 'graphql.types'
-local validate = require 'graphql.validate'
-local execute = require 'graphql.execute'
+local parse = require('graphql.parse')
+local schema = require('graphql.schema')
+local types = require('graphql.types')
+local validate = require('graphql.validate')
+local execute = require('graphql.execute')
 
 -- Parse a query
 local ast = parse [[
@@ -32,7 +33,7 @@ query getUser($id: ID) {
 ]]
 
 -- Create a type
-local Person = types.object {
+local Person = types.object({
   name = 'Person',
   fields = {
     id = types.id.nonNull,
@@ -41,11 +42,11 @@ local Person = types.object {
     lastName = types.string.nonNull,
     age = types.int.nonNull
   }
-}
+})
 
 -- Create a schema
-local schema = schema.create {
-  query = types.object {
+local schema = schema.create({
+  query = types.object({
     name = 'Query',
     fields = {
       person = {
@@ -65,8 +66,8 @@ local schema = schema.create {
         end
       }
     }
-  }
-}
+  })
+})
 
 -- Validate a parsed query against a schema
 validate(schema, ast)
@@ -91,21 +92,20 @@ execute(schema, ast, rootValue, variables, operationName)
 Status
 ---
 
-- [x] Parsing
-  - [ ] Improve error messages
+- [x] Parsing (based on [luagraphqlparser](https://github.com/tarantool/luagraphqlparser))
 - [x] Type system
 - [x] Introspection
 - [x] Validation
 - [x] Execution
   - [ ] Asynchronous execution (coroutines)
-- [ ] Example server
 
 Running tests
 ---
 
 ```bash
-tarantoolctl rocks make # optionally
-tarantool tests/runner.lua
+tarantoolctl rocks make
+tarantoolctl rocks install luatest 0.5.2
+.rocks/bin/luatest
 ```
 
 License

graphql-scm-1.rockspec

@@ -14,20 +14,21 @@ description = {
 
 dependencies = {
   'lua >= 5.1',
-  'lulpeg',
+  'luagraphqlparser == 0.1.0-1',
 }
 
 build = {
   type = 'builtin',
   modules = {
-    ['graphql'] = 'graphql/init.lua',
-    ['graphql.parse'] = 'graphql/parse.lua',
-    ['graphql.types'] = 'graphql/types.lua',
+    ['graphql.execute'] = 'graphql/execute.lua',
     ['graphql.introspection'] = 'graphql/introspection.lua',
+    ['graphql.parse'] = 'graphql/parse.lua',
+    ['graphql.query_util'] = 'graphql/query_util.lua',
+    ['graphql.rules'] = 'graphql/rules.lua',
     ['graphql.schema'] = 'graphql/schema.lua',
+    ['graphql.types'] = 'graphql/types.lua',
+    ['graphql.util'] = 'graphql/util.lua',
     ['graphql.validate'] = 'graphql/validate.lua',
-    ['graphql.rules'] = 'graphql/rules.lua',
-    ['graphql.execute'] = 'graphql/execute.lua',
-    ['graphql.util'] = 'graphql/util.lua'
+    ['graphql.validate_variables'] = 'graphql/validate_variables.lua',
   }
 }