From 6acea380923c5a698ae151aee93d7f87bea91915 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Mon, 10 Feb 2020 16:10:55 -0800 Subject: [PATCH] Upgrade OMP AST to 4.08 (#76) * Upgrade OMP AST to 4.08 * chore: bump ppx_tools_versioned for 402 and 406 * ci: change pipeline triggers Co-authored-by: Tomasz Cichocinski --- .github/workflows/pipeline.yml | 6 +- 402.esy.lock/.gitattributes | 2 +- 402.esy.lock/index.json | 180 +++++++++--------- 402.esy.lock/opam/cppo.1.6.5/opam | 2 +- .../opam/{dune.1.11.3 => dune.1.11.4}/opam | 6 +- 402.esy.lock/opam/jbuilder.transition/opam | 5 +- .../opam | 13 +- .../opam | 8 +- .../opam/seq.0.2.2}/opam | 22 ++- .../package.json | 14 -- 402.json | 12 +- 406.esy.lock/.gitattributes | 2 +- 406.esy.lock/index.json | 115 +++++------ .../opam | 13 +- .../opam | 8 +- .../opam/seq.0.2.2}/opam | 22 ++- 406.json | 12 +- src/base/dune | 2 +- src/bucklescript/dune | 2 +- src/bucklescript/graphql_ppx.re | 10 +- .../output_bucklescript_decoder.re | 137 +++++++++---- .../output_bucklescript_encoder.re | 2 +- .../output_bucklescript_module.re | 28 +-- .../output_bucklescript_unifier.re | 2 +- src/native/dune | 2 +- src/native/graphql_ppx.re | 10 +- src/native/output_native_decoder.re | 100 ++++++---- src/native/output_native_encoder.re | 2 +- src/native/output_native_module.re | 24 ++- src/native/output_native_unifier.re | 4 +- 30 files changed, 430 insertions(+), 337 deletions(-) rename 402.esy.lock/opam/{dune.1.11.3 => dune.1.11.4}/opam (84%) rename 402.esy.lock/opam/{ocaml-migrate-parsetree.1.2.0 => ocaml-migrate-parsetree.1.4.0}/opam (70%) rename 402.esy.lock/opam/{ppx_tools_versioned.5.2.2 => ppx_tools_versioned.5.2.3}/opam (75%) rename {406.esy.lock/opam/seq.0.2 => 402.esy.lock/opam/seq.0.2.2}/opam (51%) delete mode 100644 402.esy.lock/overrides/opam__s__dune_opam__c__1.11.3_opam_override/package.json rename 406.esy.lock/opam/{ocaml-migrate-parsetree.1.2.0 => ocaml-migrate-parsetree.1.4.0}/opam (70%) rename 406.esy.lock/opam/{ppx_tools_versioned.5.2.2 => ppx_tools_versioned.5.2.3}/opam (75%) rename {402.esy.lock/opam/seq.0.2 => 406.esy.lock/opam/seq.0.2.2}/opam (51%) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index d5cc0dfc..39595369 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -1,6 +1,10 @@ name: graphql_ppx pipeline -on: [push, pull_request] +on: + pull_request: + push: + branches: + - master jobs: test_and_build_linux: diff --git a/402.esy.lock/.gitattributes b/402.esy.lock/.gitattributes index 25366aee..e0b4e26c 100644 --- a/402.esy.lock/.gitattributes +++ b/402.esy.lock/.gitattributes @@ -1,3 +1,3 @@ # Set eol to LF so files aren't converted to CRLF-eol on Windows. -* text eol=lf +* text eol=lf linguist-generated diff --git a/402.esy.lock/index.json b/402.esy.lock/index.json index 11745b21..ca3c69b4 100644 --- a/402.esy.lock/index.json +++ b/402.esy.lock/index.json @@ -1,6 +1,6 @@ { - "checksum": "c9233449232de3641647f3b438341cf8", - "root": "402@link-dev:./402.json", + "checksum": "7594e47baa79b3b458f3c110fb540b8f", + "root": "graphql_ppx@link-dev:./402.json", "node": { "refmterr@3.1.10@d41d8cd9": { "id": "refmterr@3.1.10@d41d8cd9", @@ -15,7 +15,7 @@ "overrides": [], "dependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/reason@3.5.2@d41d8cd9" + "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/reason@3.5.2@d41d8cd9" ], "devDependencies": [] }, @@ -33,6 +33,24 @@ "dependencies": [ "flexdll-prebuilt@0.37.4@d41d8cd9" ], "devDependencies": [] }, + "graphql_ppx@link-dev:./402.json": { + "id": "graphql_ppx@link-dev:./402.json", + "name": "graphql_ppx", + "version": "link-dev:./402.json", + "source": { "type": "link-dev", "path": ".", "manifest": "402.json" }, + "overrides": [], + "dependencies": [ + "refmterr@3.1.10@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.4@dc720aef", + "@opam/ppx_tools_versioned@opam:5.2.3@4994ec80", + "@opam/ocaml-migrate-parsetree@opam:1.4.0@12deb6f3", + "@opam/menhir@opam:20171013@e2d3ef03", + "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/reason@3.5.2@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.2.3007@d41d8cd9", "@opam/alcotest@opam:0.8.5@68e6c66c" + ] + }, "flexdll-prebuilt@0.37.4@d41d8cd9": { "id": "flexdll-prebuilt@0.37.4@d41d8cd9", "name": "flexdll-prebuilt", @@ -66,13 +84,13 @@ "overrides": [], "dependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.3@9894df55", "@opam/cppo@opam:1.6.5@bec3dbd9", + "@opam/dune@opam:1.11.4@a7ccb7ae", "@opam/cppo@opam:1.6.5@f8ff4f1a", "@opam/biniou@opam:1.2.1@d7570399", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.3@9894df55", "@opam/biniou@opam:1.2.1@d7570399" + "@opam/dune@opam:1.11.4@a7ccb7ae", "@opam/biniou@opam:1.2.1@d7570399" ] }, "@opam/uuidm@opam:0.9.6@bcd0dcef": { @@ -155,29 +173,29 @@ "@opam/ocamlbuild@opam:0@0bebfc9d" ] }, - "@opam/seq@opam:0.2@35c16df8": { - "id": "@opam/seq@opam:0.2@35c16df8", + "@opam/seq@opam:0.2.2@e9144e45": { + "id": "@opam/seq@opam:0.2.2@e9144e45", "name": "@opam/seq", - "version": "opam:0.2", + "version": "opam:0.2.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/1d/1d5a9d0aba27b22433f518cdc495d0fd#md5:1d5a9d0aba27b22433f518cdc495d0fd", - "archive:https://github.com/c-cube/seq/archive/0.2.tar.gz#md5:1d5a9d0aba27b22433f518cdc495d0fd" + "archive:https://opam.ocaml.org/cache/md5/90/9033e02283aa3bde9f97f24e632902e3#md5:9033e02283aa3bde9f97f24e632902e3", + "archive:https://github.com/c-cube/seq/archive/0.2.2.tar.gz#md5:9033e02283aa3bde9f97f24e632902e3" ], "opam": { "name": "seq", - "version": "0.2", - "path": "402.esy.lock/opam/seq.0.2" + "version": "0.2.2", + "path": "402.esy.lock/opam/seq.0.2.2" } }, "overrides": [], "dependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, "@opam/result@opam:1.4@dc720aef": { @@ -198,11 +216,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, "@opam/re@opam:1.9.0@d4d5e13d": { @@ -223,40 +241,40 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/seq@opam:0.2@35c16df8", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.2.3007@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", + "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/seq@opam:0.2@35c16df8", - "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.2.3007@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", + "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, - "@opam/ppx_tools_versioned@opam:5.2.2@8d1998c4": { - "id": "@opam/ppx_tools_versioned@opam:5.2.2@8d1998c4", + "@opam/ppx_tools_versioned@opam:5.2.3@4994ec80": { + "id": "@opam/ppx_tools_versioned@opam:5.2.3@4994ec80", "name": "@opam/ppx_tools_versioned", - "version": "opam:5.2.2", + "version": "opam:5.2.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/f7/f78a3c2b4cc3b92702e1f7096a6125fa#md5:f78a3c2b4cc3b92702e1f7096a6125fa", - "archive:https://github.com/ocaml-ppx/ppx_tools_versioned/archive/5.2.2.tar.gz#md5:f78a3c2b4cc3b92702e1f7096a6125fa" + "archive:https://opam.ocaml.org/cache/md5/b1/b1455e5a4a1bcd9ddbfcf712ccbd4262#md5:b1455e5a4a1bcd9ddbfcf712ccbd4262", + "archive:https://github.com/ocaml-ppx/ppx_tools_versioned/archive/5.2.3.tar.gz#md5:b1455e5a4a1bcd9ddbfcf712ccbd4262" ], "opam": { "name": "ppx_tools_versioned", - "version": "5.2.2", - "path": "402.esy.lock/opam/ppx_tools_versioned.5.2.2" + "version": "5.2.3", + "path": "402.esy.lock/opam/ppx_tools_versioned.5.2.3" } }, "overrides": [], "dependencies": [ "ocaml@4.2.3007@d41d8cd9", - "@opam/ocaml-migrate-parsetree@opam:1.2.0@f717a85e", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/ocaml-migrate-parsetree@opam:1.4.0@12deb6f3", + "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.2.3007@d41d8cd9", - "@opam/ocaml-migrate-parsetree@opam:1.2.0@f717a85e", - "@opam/dune@opam:1.11.3@9894df55" + "@opam/ocaml-migrate-parsetree@opam:1.4.0@12deb6f3", + "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, "@opam/ppx_derivers@opam:1.2.1@ecf0aa45": { @@ -277,11 +295,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, "@opam/ocamlfind@opam:1.8.1@ff07b0f9": { @@ -336,32 +354,32 @@ "ocaml@4.2.3007@d41d8cd9", "@opam/base-ocamlbuild@opam:base@78c02864" ] }, - "@opam/ocaml-migrate-parsetree@opam:1.2.0@f717a85e": { - "id": "@opam/ocaml-migrate-parsetree@opam:1.2.0@f717a85e", + "@opam/ocaml-migrate-parsetree@opam:1.4.0@12deb6f3": { + "id": "@opam/ocaml-migrate-parsetree@opam:1.4.0@12deb6f3", "name": "@opam/ocaml-migrate-parsetree", - "version": "opam:1.2.0", + "version": "opam:1.4.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/cc/cc6fb09ad6f99156c7dba47711c62c6f#md5:cc6fb09ad6f99156c7dba47711c62c6f", - "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.2.0/ocaml-migrate-parsetree-v1.2.0.tbz#md5:cc6fb09ad6f99156c7dba47711c62c6f" + "archive:https://opam.ocaml.org/cache/sha256/23/231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8#sha256:231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8", + "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.4.0/ocaml-migrate-parsetree-v1.4.0.tbz#sha256:231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8" ], "opam": { "name": "ocaml-migrate-parsetree", - "version": "1.2.0", - "path": "402.esy.lock/opam/ocaml-migrate-parsetree.1.2.0" + "version": "1.4.0", + "path": "402.esy.lock/opam/ocaml-migrate-parsetree.1.4.0" } }, "overrides": [], "dependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/result@opam:1.4@dc720aef", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/result@opam:1.4@dc720aef", "@opam/ppx_derivers@opam:1.2.1@ecf0aa45", - "@opam/dune@opam:1.11.3@9894df55" + "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, "@opam/merlin-extend@opam:0.5@a5dd7d4b": { @@ -382,11 +400,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", - "@opam/cppo@opam:1.6.5@bec3dbd9", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", + "@opam/cppo@opam:1.6.5@f8ff4f1a", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, "@opam/menhir@opam:20171013@e2d3ef03": { @@ -420,8 +438,8 @@ "ocaml@4.2.3007@d41d8cd9", "@opam/ocamlfind@opam:1.8.1@ff07b0f9" ] }, - "@opam/jbuilder@opam:transition@58bdfe0a": { - "id": "@opam/jbuilder@opam:transition@58bdfe0a", + "@opam/jbuilder@opam:transition@20522f05": { + "id": "@opam/jbuilder@opam:transition@20522f05", "name": "@opam/jbuilder", "version": "opam:transition", "source": { @@ -435,11 +453,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, "@opam/fmt@opam:0.8.5@01e38a4e": { @@ -491,35 +509,30 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55", + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.3@9894df55" + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, - "@opam/dune@opam:1.11.3@9894df55": { - "id": "@opam/dune@opam:1.11.3@9894df55", + "@opam/dune@opam:1.11.4@a7ccb7ae": { + "id": "@opam/dune@opam:1.11.4@a7ccb7ae", "name": "@opam/dune", - "version": "opam:1.11.3", + "version": "opam:1.11.4", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/sha256/c8/c83a63e7e8245611b0e11d6adea07c6484dc1b4efffacb176315cd6674d4bbd2#sha256:c83a63e7e8245611b0e11d6adea07c6484dc1b4efffacb176315cd6674d4bbd2", - "archive:https://github.com/ocaml/dune/releases/download/1.11.3/dune-build-info-1.11.3.tbz#sha256:c83a63e7e8245611b0e11d6adea07c6484dc1b4efffacb176315cd6674d4bbd2" + "archive:https://opam.ocaml.org/cache/sha256/77/77cb5f483221b266ded2b85fc84173ae0089a25134a086be922e82c131456ce6#sha256:77cb5f483221b266ded2b85fc84173ae0089a25134a086be922e82c131456ce6", + "archive:https://github.com/ocaml/dune/releases/download/1.11.4/dune-build-info-1.11.4.tbz#sha256:77cb5f483221b266ded2b85fc84173ae0089a25134a086be922e82c131456ce6" ], "opam": { "name": "dune", - "version": "1.11.3", - "path": "402.esy.lock/opam/dune.1.11.3" + "version": "1.11.4", + "path": "402.esy.lock/opam/dune.1.11.4" } }, - "overrides": [ - { - "opamoverride": - "402.esy.lock/overrides/opam__s__dune_opam__c__1.11.3_opam_override" - } - ], + "overrides": [], "dependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb", "@opam/base-threads@opam:base@36803084", @@ -530,8 +543,8 @@ "@opam/base-threads@opam:base@36803084" ] }, - "@opam/cppo@opam:1.6.5@bec3dbd9": { - "id": "@opam/cppo@opam:1.6.5@bec3dbd9", + "@opam/cppo@opam:1.6.5@f8ff4f1a": { + "id": "@opam/cppo@opam:1.6.5@f8ff4f1a", "name": "@opam/cppo", "version": "opam:1.6.5", "source": { @@ -548,12 +561,13 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/jbuilder@opam:transition@58bdfe0a", + "ocaml@4.2.3007@d41d8cd9", "@opam/jbuilder@opam:transition@20522f05", "@opam/base-unix@opam:base@87d0b2eb", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/base-unix@opam:base@87d0b2eb" + "ocaml@4.2.3007@d41d8cd9", "@opam/jbuilder@opam:transition@20522f05", + "@opam/base-unix@opam:base@87d0b2eb" ] }, "@opam/conf-m4@opam:1@3b2b148a": { @@ -620,11 +634,11 @@ "overrides": [], "dependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/easy-format@opam:1.3.2@0484b3c4", - "@opam/dune@opam:1.11.3@9894df55" + "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, "@opam/base-unix@opam:base@87d0b2eb": { @@ -750,7 +764,7 @@ "dependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/uuidm@opam:0.9.6@bcd0dcef", "@opam/result@opam:1.4@dc720aef", "@opam/fmt@opam:0.8.5@01e38a4e", - "@opam/dune@opam:1.11.3@9894df55", + "@opam/dune@opam:1.11.4@a7ccb7ae", "@opam/cmdliner@opam:1.0.2@8ab0598a", "@opam/astring@opam:0.8.3@4e5e17d5", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -758,7 +772,7 @@ "devDependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/uuidm@opam:0.9.6@bcd0dcef", "@opam/result@opam:1.4@dc720aef", "@opam/fmt@opam:0.8.5@01e38a4e", - "@opam/dune@opam:1.11.3@9894df55", + "@opam/dune@opam:1.11.4@a7ccb7ae", "@opam/cmdliner@opam:1.0.2@8ab0598a", "@opam/astring@opam:0.8.3@4e5e17d5" ] @@ -791,30 +805,12 @@ "dependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/result@opam:1.4@dc720aef", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-migrate-parsetree@opam:1.2.0@f717a85e", + "@opam/ocaml-migrate-parsetree@opam:1.4.0@12deb6f3", "@opam/merlin-extend@opam:0.5@a5dd7d4b", "@opam/menhir@opam:20171013@e2d3ef03", - "@opam/dune@opam:1.11.3@9894df55" + "@opam/dune@opam:1.11.4@a7ccb7ae" ], "devDependencies": [] - }, - "402@link-dev:./402.json": { - "id": "402@link-dev:./402.json", - "name": "402", - "version": "link-dev:./402.json", - "source": { "type": "link-dev", "path": ".", "manifest": "402.json" }, - "overrides": [], - "dependencies": [ - "refmterr@3.1.10@d41d8cd9", "ocaml@4.2.3007@d41d8cd9", - "@opam/yojson@opam:1.7.0@7056d985", "@opam/result@opam:1.4@dc720aef", - "@opam/ppx_tools_versioned@opam:5.2.2@8d1998c4", - "@opam/ocaml-migrate-parsetree@opam:1.2.0@f717a85e", - "@opam/menhir@opam:20171013@e2d3ef03", - "@opam/dune@opam:1.11.3@9894df55", "@esy-ocaml/reason@3.5.2@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/alcotest@opam:0.8.5@68e6c66c" - ] } } } \ No newline at end of file diff --git a/402.esy.lock/opam/cppo.1.6.5/opam b/402.esy.lock/opam/cppo.1.6.5/opam index 74f8e925..6130ff34 100644 --- a/402.esy.lock/opam/cppo.1.6.5/opam +++ b/402.esy.lock/opam/cppo.1.6.5/opam @@ -13,7 +13,7 @@ build: [ ] depends: [ "ocaml" - "jbuilder" {build & >= "1.0+beta17"} + "jbuilder" {>= "1.0+beta17"} "base-unix" ] synopsis: "Equivalent of the C preprocessor for OCaml programs" diff --git a/402.esy.lock/opam/dune.1.11.3/opam b/402.esy.lock/opam/dune.1.11.4/opam similarity index 84% rename from 402.esy.lock/opam/dune.1.11.3/opam rename to 402.esy.lock/opam/dune.1.11.4/opam index af3286b5..19e25117 100644 --- a/402.esy.lock/opam/dune.1.11.3/opam +++ b/402.esy.lock/opam/dune.1.11.4/opam @@ -45,9 +45,9 @@ build: [ ] url { src: - "https://github.com/ocaml/dune/releases/download/1.11.3/dune-build-info-1.11.3.tbz" + "https://github.com/ocaml/dune/releases/download/1.11.4/dune-build-info-1.11.4.tbz" checksum: [ - "sha256=c83a63e7e8245611b0e11d6adea07c6484dc1b4efffacb176315cd6674d4bbd2" - "sha512=2c1532b91d223e6ea0628c5f5174792c1bb4113a464f6d8b878b3c58be1136beb84ba2d9883a330fa20e550367588aa923ba06ffb9b615a098a21374a9377e81" + "sha256=77cb5f483221b266ded2b85fc84173ae0089a25134a086be922e82c131456ce6" + "sha512=02f00fd872aa49b832fc8c1e928409f23c79ddf84a53009a58875f222cca36fbb92c905e12c539caec9cbad723f195a8aa24218382dca35a903b3f52b11f06f2" ] } diff --git a/402.esy.lock/opam/jbuilder.transition/opam b/402.esy.lock/opam/jbuilder.transition/opam index 3e3174a5..9280c3ff 100644 --- a/402.esy.lock/opam/jbuilder.transition/opam +++ b/402.esy.lock/opam/jbuilder.transition/opam @@ -5,7 +5,10 @@ homepage: "https://github.com/ocaml/dune" bug-reports: "https://github.com/ocaml/dune/issues" dev-repo: "git+https://github.com/ocaml/dune.git" license: "MIT" -depends: ["ocaml" "dune"] +depends: [ + "ocaml" + "dune" {< "2.0"} +] post-messages: [ "Jbuilder has been renamed and the jbuilder package is now a transition \ package. Use the dune package instead." diff --git a/402.esy.lock/opam/ocaml-migrate-parsetree.1.2.0/opam b/402.esy.lock/opam/ocaml-migrate-parsetree.1.4.0/opam similarity index 70% rename from 402.esy.lock/opam/ocaml-migrate-parsetree.1.2.0/opam rename to 402.esy.lock/opam/ocaml-migrate-parsetree.1.4.0/opam index 5feacef7..1929884c 100644 --- a/402.esy.lock/opam/ocaml-migrate-parsetree.1.2.0/opam +++ b/402.esy.lock/opam/ocaml-migrate-parsetree.1.4.0/opam @@ -4,7 +4,7 @@ authors: [ "Frédéric Bour " "Jérémie Dimino " ] -license: "LGPL-2.1" +license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" homepage: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree" bug-reports: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/issues" dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git" @@ -16,8 +16,8 @@ build: [ depends: [ "result" "ppx_derivers" - "dune" {>= "1.6.0"} - "ocaml" {>= "4.02.3" & < "4.08.0"} + "dune" {>= "1.9.0"} + "ocaml" {>= "4.02.3" & < "4.10"} ] synopsis: "Convert OCaml parsetrees between different versions" description: """ @@ -29,6 +29,9 @@ rewriters independent of a compiler version. """ url { src: - "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.2.0/ocaml-migrate-parsetree-v1.2.0.tbz" - checksum: "md5=cc6fb09ad6f99156c7dba47711c62c6f" + "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.4.0/ocaml-migrate-parsetree-v1.4.0.tbz" + checksum: [ + "sha256=231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8" + "sha512=61ee91d2d146cc2d2ff2d5dc4ef5dea4dc4d3c8dbd8b4c9586d64b6ad7302327ab35547aa0a5b0103c3f07b66b13d416a1bee6d4d117293cd3cabe44113ec6d4" + ] } diff --git a/402.esy.lock/opam/ppx_tools_versioned.5.2.2/opam b/402.esy.lock/opam/ppx_tools_versioned.5.2.3/opam similarity index 75% rename from 402.esy.lock/opam/ppx_tools_versioned.5.2.2/opam rename to 402.esy.lock/opam/ppx_tools_versioned.5.2.3/opam index 10aae9f3..dbf79a1b 100644 --- a/402.esy.lock/opam/ppx_tools_versioned.5.2.2/opam +++ b/402.esy.lock/opam/ppx_tools_versioned.5.2.3/opam @@ -17,14 +17,14 @@ build: [ depends: [ "ocaml" {>= "4.02.0"} "dune" {>= "1.0"} - "ocaml-migrate-parsetree" {>= "1.0.10"} + "ocaml-migrate-parsetree" {>= "1.4.0"} ] synopsis: "A variant of ppx_tools based on ocaml-migrate-parsetree" url { src: - "https://github.com/ocaml-ppx/ppx_tools_versioned/archive/5.2.2.tar.gz" + "https://github.com/ocaml-ppx/ppx_tools_versioned/archive/5.2.3.tar.gz" checksum: [ - "md5=f78a3c2b4cc3b92702e1f7096a6125fa" - "sha512=68c168ebc01af46fe8766ad7e36cc778caabb97d8eb303db284d106450cb79974c2a640ce459e197630b9e84b02caa24b59c97c9a8d39ddadc7efc7284e42a70" + "md5=b1455e5a4a1bcd9ddbfcf712ccbd4262" + "sha512=af20aa0031b9c638537bcdb52c75de95f316ae8fd455a38672a60da5c7c6895cca9dbecd5d56a88c3c40979c6a673a047d986b5b41e1e84b528b7df5d905b9b1" ] } diff --git a/406.esy.lock/opam/seq.0.2/opam b/402.esy.lock/opam/seq.0.2.2/opam similarity index 51% rename from 406.esy.lock/opam/seq.0.2/opam rename to 402.esy.lock/opam/seq.0.2.2/opam index 55c46960..5ed51654 100644 --- a/406.esy.lock/opam/seq.0.2/opam +++ b/402.esy.lock/opam/seq.0.2.2/opam @@ -2,21 +2,23 @@ opam-version: "2.0" synopsis: "Compatibility package for OCaml's standard iterator type starting from 4.07" maintainer: "simon.cruanes.2007@m4x.org" -authors: "Simon Cruanes" license: "LGPL2.1" -tags: ["iterator" "seq" "pure" "list" "compatibility" "cascade"] -homepage: "https://github.com/c-cube/seq/" -bug-reports: "https://github.com/c-cube/seq/issues" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] depends: [ "dune" {>= "1.1.0"} - "ocaml" {< "4.07.0"} + "ocaml" ] -build: ["dune" "build" "-p" name "-j" jobs] +tags: [ "iterator" "seq" "pure" "list" "compatibility" "cascade" ] +homepage: "https://github.com/c-cube/seq/" +bug-reports: "https://github.com/c-cube/seq/issues" dev-repo: "git+https://github.com/c-cube/seq.git" +authors: "Simon Cruanes" url { - src: "https://github.com/c-cube/seq/archive/0.2.tar.gz" + src: "https://github.com/c-cube/seq/archive/0.2.2.tar.gz" checksum: [ - "md5=1d5a9d0aba27b22433f518cdc495d0fd" - "sha512=b2571225a18e624b79dad5e1aab91b22e2fda17702f2e23c438b75d2a71e24c55ee8672005f5cc4b17ae79e3b277b1918b71b5d0d674b8b12ea19b3fb2d747cb" + "md5=9033e02283aa3bde9f97f24e632902e3" + "sha512=cab0eb4cb6d9788b7cbd7acbefefc15689d706c97ff7f75dd97faf3c21e466af4d0ff110541a24729db587e7172b1a30a3c2967e17ec2e49cbd923360052c07c" ] -} \ No newline at end of file +} diff --git a/402.esy.lock/overrides/opam__s__dune_opam__c__1.11.3_opam_override/package.json b/402.esy.lock/overrides/opam__s__dune_opam__c__1.11.3_opam_override/package.json deleted file mode 100644 index 064c7e39..00000000 --- a/402.esy.lock/overrides/opam__s__dune_opam__c__1.11.3_opam_override/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "build": [ - [ - "ocaml", - "bootstrap.ml" - ], - [ - "./boot.exe", - "--release", - "-j", - "4" - ] - ] -} diff --git a/402.json b/402.json index d5d2df60..03d401cd 100644 --- a/402.json +++ b/402.json @@ -2,14 +2,14 @@ "name": "graphql_ppx", "description": "Used to build for BuckleScript 5 using OCaml 4.02", "dependencies": { - "@opam/dune": "*", + "@esy-ocaml/reason": "*", + "@opam/dune": "~1.11.0", + "@opam/menhir": "20171013", + "@opam/ocaml-migrate-parsetree": "1.4.0", + "@opam/ppx_tools_versioned": "5.2.3", "@opam/result": "*", "@opam/yojson": "*", - "@opam/ocaml-migrate-parsetree": "1.2.0", - "@opam/ppx_tools_versioned": "*", - "@esy-ocaml/reason": "*", - "refmterr": "*", - "@opam/menhir": "20171013" + "refmterr": "~3.1.1" }, "devDependencies": { "@opam/alcotest": "*", diff --git a/406.esy.lock/.gitattributes b/406.esy.lock/.gitattributes index 25366aee..e0b4e26c 100644 --- a/406.esy.lock/.gitattributes +++ b/406.esy.lock/.gitattributes @@ -1,3 +1,3 @@ # Set eol to LF so files aren't converted to CRLF-eol on Windows. -* text eol=lf +* text eol=lf linguist-generated diff --git a/406.esy.lock/index.json b/406.esy.lock/index.json index fcf33b5e..8388515d 100644 --- a/406.esy.lock/index.json +++ b/406.esy.lock/index.json @@ -1,20 +1,20 @@ { - "checksum": "773794fe659917906b251e5b59843c24", - "root": "406@link-dev:./406.json", + "checksum": "efb28fc6e38bf8077a0c9533352b4d4f", + "root": "graphql_ppx@link-dev:./406.json", "node": { - "refmterr@3.2.2@d41d8cd9": { - "id": "refmterr@3.2.2@d41d8cd9", + "refmterr@3.3.0@d41d8cd9": { + "id": "refmterr@3.3.0@d41d8cd9", "name": "refmterr", - "version": "3.2.2", + "version": "3.3.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/refmterr/-/refmterr-3.2.2.tgz#sha1:b7d6c5df6a37633ec82d339dc609b1867e54e55e" + "archive:https://registry.npmjs.org/refmterr/-/refmterr-3.3.0.tgz#sha1:45adde80205093c201b491b3c37dd7740c9b036b" ] }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@reason-native/pastel@0.2.2@d41d8cd9", + "ocaml@4.6.1000@d41d8cd9", "@reason-native/pastel@0.3.0@d41d8cd9", "@reason-native/console@0.1.0@d41d8cd9", "@opam/re@opam:1.9.0@d4d5e13d", "@opam/dune@opam:1.11.4@a7ccb7ae", "@opam/atdgen@opam:2.0.0@46af0360", @@ -36,14 +36,32 @@ "dependencies": [], "devDependencies": [] }, - "@reason-native/pastel@0.2.2@d41d8cd9": { - "id": "@reason-native/pastel@0.2.2@d41d8cd9", + "graphql_ppx@link-dev:./406.json": { + "id": "graphql_ppx@link-dev:./406.json", + "name": "graphql_ppx", + "version": "link-dev:./406.json", + "source": { "type": "link-dev", "path": ".", "manifest": "406.json" }, + "overrides": [], + "dependencies": [ + "refmterr@3.3.0@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", + "@opam/result@opam:1.4@dc720aef", + "@opam/ppx_tools_versioned@opam:5.2.3@4994ec80", + "@opam/ocaml-migrate-parsetree@opam:1.4.0@12deb6f3", + "@opam/menhir@opam:20171013@e2d3ef03", + "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/reason@3.5.2@d41d8cd9" + ], + "devDependencies": [ + "ocaml@4.6.1000@d41d8cd9", "@opam/alcotest@opam:0.8.5@68e6c66c" + ] + }, + "@reason-native/pastel@0.3.0@d41d8cd9": { + "id": "@reason-native/pastel@0.3.0@d41d8cd9", "name": "@reason-native/pastel", - "version": "0.2.2", + "version": "0.3.0", "source": { "type": "install", "source": [ - "archive:https://registry.npmjs.org/@reason-native/pastel/-/pastel-0.2.2.tgz#sha1:a1f7fe266223aaf7915a71f5c8b9ee58e065c62a" + "archive:https://registry.npmjs.org/@reason-native/pastel/-/pastel-0.3.0.tgz#sha1:07da3c5a0933e61bc3b353bc85aa71ac7c0f311c" ] }, "overrides": [], @@ -175,20 +193,20 @@ "ocaml@4.6.1000@d41d8cd9", "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, - "@opam/seq@opam:0.2@35c16df8": { - "id": "@opam/seq@opam:0.2@35c16df8", + "@opam/seq@opam:0.2.2@e9144e45": { + "id": "@opam/seq@opam:0.2.2@e9144e45", "name": "@opam/seq", - "version": "opam:0.2", + "version": "opam:0.2.2", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/1d/1d5a9d0aba27b22433f518cdc495d0fd#md5:1d5a9d0aba27b22433f518cdc495d0fd", - "archive:https://github.com/c-cube/seq/archive/0.2.tar.gz#md5:1d5a9d0aba27b22433f518cdc495d0fd" + "archive:https://opam.ocaml.org/cache/md5/90/9033e02283aa3bde9f97f24e632902e3#md5:9033e02283aa3bde9f97f24e632902e3", + "archive:https://github.com/c-cube/seq/archive/0.2.2.tar.gz#md5:9033e02283aa3bde9f97f24e632902e3" ], "opam": { "name": "seq", - "version": "0.2", - "path": "406.esy.lock/opam/seq.0.2" + "version": "0.2.2", + "path": "406.esy.lock/opam/seq.0.2.2" } }, "overrides": [], @@ -243,39 +261,39 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/seq@opam:0.2@35c16df8", + "ocaml@4.6.1000@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/seq@opam:0.2@35c16df8", + "ocaml@4.6.1000@d41d8cd9", "@opam/seq@opam:0.2.2@e9144e45", "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, - "@opam/ppx_tools_versioned@opam:5.2.2@8d1998c4": { - "id": "@opam/ppx_tools_versioned@opam:5.2.2@8d1998c4", + "@opam/ppx_tools_versioned@opam:5.2.3@4994ec80": { + "id": "@opam/ppx_tools_versioned@opam:5.2.3@4994ec80", "name": "@opam/ppx_tools_versioned", - "version": "opam:5.2.2", + "version": "opam:5.2.3", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/f7/f78a3c2b4cc3b92702e1f7096a6125fa#md5:f78a3c2b4cc3b92702e1f7096a6125fa", - "archive:https://github.com/ocaml-ppx/ppx_tools_versioned/archive/5.2.2.tar.gz#md5:f78a3c2b4cc3b92702e1f7096a6125fa" + "archive:https://opam.ocaml.org/cache/md5/b1/b1455e5a4a1bcd9ddbfcf712ccbd4262#md5:b1455e5a4a1bcd9ddbfcf712ccbd4262", + "archive:https://github.com/ocaml-ppx/ppx_tools_versioned/archive/5.2.3.tar.gz#md5:b1455e5a4a1bcd9ddbfcf712ccbd4262" ], "opam": { "name": "ppx_tools_versioned", - "version": "5.2.2", - "path": "406.esy.lock/opam/ppx_tools_versioned.5.2.2" + "version": "5.2.3", + "path": "406.esy.lock/opam/ppx_tools_versioned.5.2.3" } }, "overrides": [], "dependencies": [ "ocaml@4.6.1000@d41d8cd9", - "@opam/ocaml-migrate-parsetree@opam:1.2.0@f717a85e", + "@opam/ocaml-migrate-parsetree@opam:1.4.0@12deb6f3", "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.6.1000@d41d8cd9", - "@opam/ocaml-migrate-parsetree@opam:1.2.0@f717a85e", + "@opam/ocaml-migrate-parsetree@opam:1.4.0@12deb6f3", "@opam/dune@opam:1.11.4@a7ccb7ae" ] }, @@ -360,20 +378,20 @@ ], "devDependencies": [ "ocaml@4.6.1000@d41d8cd9" ] }, - "@opam/ocaml-migrate-parsetree@opam:1.2.0@f717a85e": { - "id": "@opam/ocaml-migrate-parsetree@opam:1.2.0@f717a85e", + "@opam/ocaml-migrate-parsetree@opam:1.4.0@12deb6f3": { + "id": "@opam/ocaml-migrate-parsetree@opam:1.4.0@12deb6f3", "name": "@opam/ocaml-migrate-parsetree", - "version": "opam:1.2.0", + "version": "opam:1.4.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/cc/cc6fb09ad6f99156c7dba47711c62c6f#md5:cc6fb09ad6f99156c7dba47711c62c6f", - "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.2.0/ocaml-migrate-parsetree-v1.2.0.tbz#md5:cc6fb09ad6f99156c7dba47711c62c6f" + "archive:https://opam.ocaml.org/cache/sha256/23/231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8#sha256:231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8", + "archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.4.0/ocaml-migrate-parsetree-v1.4.0.tbz#sha256:231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8" ], "opam": { "name": "ocaml-migrate-parsetree", - "version": "1.2.0", - "path": "406.esy.lock/opam/ocaml-migrate-parsetree.1.2.0" + "version": "1.4.0", + "path": "406.esy.lock/opam/ocaml-migrate-parsetree.1.4.0" } }, "overrides": [], @@ -486,7 +504,8 @@ "dependencies": [ "ocaml@4.6.1000@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e", "@opam/stdlib-shims@opam:0.1.0@d957c903", - "@opam/seq@opam:0.2@35c16df8", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", + "@opam/seq@opam:0.2.2@e9144e45", + "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocamlbuild@opam:0.14.0@6ac75d03", "@opam/cmdliner@opam:1.0.4@93208aac", "@opam/base-unix@opam:base@87d0b2eb", @@ -494,7 +513,7 @@ ], "devDependencies": [ "ocaml@4.6.1000@d41d8cd9", "@opam/stdlib-shims@opam:0.1.0@d957c903", - "@opam/seq@opam:0.2@35c16df8" + "@opam/seq@opam:0.2.2@e9144e45" ] }, "@opam/easy-format@opam:1.3.2@0484b3c4": { @@ -875,30 +894,12 @@ "dependencies": [ "ocaml@4.6.1000@d41d8cd9", "@opam/result@opam:1.4@dc720aef", "@opam/ocamlfind@opam:1.8.1@ff07b0f9", - "@opam/ocaml-migrate-parsetree@opam:1.2.0@f717a85e", + "@opam/ocaml-migrate-parsetree@opam:1.4.0@12deb6f3", "@opam/merlin-extend@opam:0.5@a5dd7d4b", "@opam/menhir@opam:20171013@e2d3ef03", "@opam/dune@opam:1.11.4@a7ccb7ae" ], "devDependencies": [] - }, - "406@link-dev:./406.json": { - "id": "406@link-dev:./406.json", - "name": "406", - "version": "link-dev:./406.json", - "source": { "type": "link-dev", "path": ".", "manifest": "406.json" }, - "overrides": [], - "dependencies": [ - "refmterr@3.2.2@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985", - "@opam/result@opam:1.4@dc720aef", - "@opam/ppx_tools_versioned@opam:5.2.2@8d1998c4", - "@opam/ocaml-migrate-parsetree@opam:1.2.0@f717a85e", - "@opam/menhir@opam:20171013@e2d3ef03", - "@opam/dune@opam:1.11.4@a7ccb7ae", "@esy-ocaml/reason@3.5.2@d41d8cd9" - ], - "devDependencies": [ - "ocaml@4.6.1000@d41d8cd9", "@opam/alcotest@opam:0.8.5@68e6c66c" - ] } } } \ No newline at end of file diff --git a/406.esy.lock/opam/ocaml-migrate-parsetree.1.2.0/opam b/406.esy.lock/opam/ocaml-migrate-parsetree.1.4.0/opam similarity index 70% rename from 406.esy.lock/opam/ocaml-migrate-parsetree.1.2.0/opam rename to 406.esy.lock/opam/ocaml-migrate-parsetree.1.4.0/opam index 5feacef7..1929884c 100644 --- a/406.esy.lock/opam/ocaml-migrate-parsetree.1.2.0/opam +++ b/406.esy.lock/opam/ocaml-migrate-parsetree.1.4.0/opam @@ -4,7 +4,7 @@ authors: [ "Frédéric Bour " "Jérémie Dimino " ] -license: "LGPL-2.1" +license: "LGPL-2.1-only with OCaml-LGPL-linking-exception" homepage: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree" bug-reports: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/issues" dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git" @@ -16,8 +16,8 @@ build: [ depends: [ "result" "ppx_derivers" - "dune" {>= "1.6.0"} - "ocaml" {>= "4.02.3" & < "4.08.0"} + "dune" {>= "1.9.0"} + "ocaml" {>= "4.02.3" & < "4.10"} ] synopsis: "Convert OCaml parsetrees between different versions" description: """ @@ -29,6 +29,9 @@ rewriters independent of a compiler version. """ url { src: - "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.2.0/ocaml-migrate-parsetree-v1.2.0.tbz" - checksum: "md5=cc6fb09ad6f99156c7dba47711c62c6f" + "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.4.0/ocaml-migrate-parsetree-v1.4.0.tbz" + checksum: [ + "sha256=231fbdc205187b3ee266b535d9cfe44b599067b2f6e97883c782ea7bb577d3b8" + "sha512=61ee91d2d146cc2d2ff2d5dc4ef5dea4dc4d3c8dbd8b4c9586d64b6ad7302327ab35547aa0a5b0103c3f07b66b13d416a1bee6d4d117293cd3cabe44113ec6d4" + ] } diff --git a/406.esy.lock/opam/ppx_tools_versioned.5.2.2/opam b/406.esy.lock/opam/ppx_tools_versioned.5.2.3/opam similarity index 75% rename from 406.esy.lock/opam/ppx_tools_versioned.5.2.2/opam rename to 406.esy.lock/opam/ppx_tools_versioned.5.2.3/opam index 10aae9f3..dbf79a1b 100644 --- a/406.esy.lock/opam/ppx_tools_versioned.5.2.2/opam +++ b/406.esy.lock/opam/ppx_tools_versioned.5.2.3/opam @@ -17,14 +17,14 @@ build: [ depends: [ "ocaml" {>= "4.02.0"} "dune" {>= "1.0"} - "ocaml-migrate-parsetree" {>= "1.0.10"} + "ocaml-migrate-parsetree" {>= "1.4.0"} ] synopsis: "A variant of ppx_tools based on ocaml-migrate-parsetree" url { src: - "https://github.com/ocaml-ppx/ppx_tools_versioned/archive/5.2.2.tar.gz" + "https://github.com/ocaml-ppx/ppx_tools_versioned/archive/5.2.3.tar.gz" checksum: [ - "md5=f78a3c2b4cc3b92702e1f7096a6125fa" - "sha512=68c168ebc01af46fe8766ad7e36cc778caabb97d8eb303db284d106450cb79974c2a640ce459e197630b9e84b02caa24b59c97c9a8d39ddadc7efc7284e42a70" + "md5=b1455e5a4a1bcd9ddbfcf712ccbd4262" + "sha512=af20aa0031b9c638537bcdb52c75de95f316ae8fd455a38672a60da5c7c6895cca9dbecd5d56a88c3c40979c6a673a047d986b5b41e1e84b528b7df5d905b9b1" ] } diff --git a/402.esy.lock/opam/seq.0.2/opam b/406.esy.lock/opam/seq.0.2.2/opam similarity index 51% rename from 402.esy.lock/opam/seq.0.2/opam rename to 406.esy.lock/opam/seq.0.2.2/opam index 55c46960..5ed51654 100644 --- a/402.esy.lock/opam/seq.0.2/opam +++ b/406.esy.lock/opam/seq.0.2.2/opam @@ -2,21 +2,23 @@ opam-version: "2.0" synopsis: "Compatibility package for OCaml's standard iterator type starting from 4.07" maintainer: "simon.cruanes.2007@m4x.org" -authors: "Simon Cruanes" license: "LGPL2.1" -tags: ["iterator" "seq" "pure" "list" "compatibility" "cascade"] -homepage: "https://github.com/c-cube/seq/" -bug-reports: "https://github.com/c-cube/seq/issues" +build: [ + ["dune" "build" "-p" name "-j" jobs] +] depends: [ "dune" {>= "1.1.0"} - "ocaml" {< "4.07.0"} + "ocaml" ] -build: ["dune" "build" "-p" name "-j" jobs] +tags: [ "iterator" "seq" "pure" "list" "compatibility" "cascade" ] +homepage: "https://github.com/c-cube/seq/" +bug-reports: "https://github.com/c-cube/seq/issues" dev-repo: "git+https://github.com/c-cube/seq.git" +authors: "Simon Cruanes" url { - src: "https://github.com/c-cube/seq/archive/0.2.tar.gz" + src: "https://github.com/c-cube/seq/archive/0.2.2.tar.gz" checksum: [ - "md5=1d5a9d0aba27b22433f518cdc495d0fd" - "sha512=b2571225a18e624b79dad5e1aab91b22e2fda17702f2e23c438b75d2a71e24c55ee8672005f5cc4b17ae79e3b277b1918b71b5d0d674b8b12ea19b3fb2d747cb" + "md5=9033e02283aa3bde9f97f24e632902e3" + "sha512=cab0eb4cb6d9788b7cbd7acbefefc15689d706c97ff7f75dd97faf3c21e466af4d0ff110541a24729db587e7172b1a30a3c2967e17ec2e49cbd923360052c07c" ] -} \ No newline at end of file +} diff --git a/406.json b/406.json index 42a7ce5d..d642a93e 100644 --- a/406.json +++ b/406.json @@ -2,14 +2,14 @@ "name": "graphql_ppx", "description": "Used to build for BuckleScript 6+ using OCaml 4.06", "dependencies": { - "@opam/dune": "*", + "@esy-ocaml/reason": "*", + "@opam/dune": "~1.11.0", + "@opam/menhir": "20171013", + "@opam/ocaml-migrate-parsetree": "1.4.0", + "@opam/ppx_tools_versioned": "5.2.3", "@opam/result": "*", "@opam/yojson": "*", - "@opam/ocaml-migrate-parsetree": "1.2.0", - "@opam/ppx_tools_versioned": "*", - "@esy-ocaml/reason": "*", - "refmterr": "*", - "@opam/menhir": "20171013" + "refmterr": "*" }, "devDependencies": { "@opam/alcotest": "*", diff --git a/src/base/dune b/src/base/dune index 635af5f0..9d10fc1d 100644 --- a/src/base/dune +++ b/src/base/dune @@ -2,7 +2,7 @@ (name graphql_ppx_base) (public_name graphql_ppx.base) (libraries unix result yojson) - (preprocess (pps ppx_tools_versioned.metaquot_406))) + (preprocess (pps ppx_tools_versioned.metaquot_408))) (rule (targets build_config.ml) diff --git a/src/bucklescript/dune b/src/bucklescript/dune index 69429bf6..e9c5357f 100644 --- a/src/bucklescript/dune +++ b/src/bucklescript/dune @@ -3,4 +3,4 @@ (libraries reason ocaml-migrate-parsetree graphql_ppx.base) - (preprocess (pps ppx_tools_versioned.metaquot_406))) + (preprocess (pps ppx_tools_versioned.metaquot_408))) diff --git a/src/bucklescript/graphql_ppx.re b/src/bucklescript/graphql_ppx.re index 9bdec130..0799efd4 100644 --- a/src/bucklescript/graphql_ppx.re +++ b/src/bucklescript/graphql_ppx.re @@ -51,14 +51,14 @@ let fmt_parse_err = err => ); let make_error_expr = (loc, message) => { - Ast_406.( + Ast_408.( Ast_mapper.extension_of_error(Location.error(~loc, message)) |> Ast_helper.Exp.extension(~loc) ); }; let rewrite_query = (~schema=?, ~loc, ~delim, ~query, ()) => { - open Ast_406; + open Ast_408; open Ast_helper; open Parsetree; let lexer = Graphql_lexer.make(query); @@ -118,7 +118,7 @@ let rewrite_query = (~schema=?, ~loc, ~delim, ~query, ()) => { }; let extract_schema_from_config = config_fields => { - open Ast_406; + open Ast_408; open Asttypes; open Parsetree; @@ -173,7 +173,7 @@ let () = ); let mapper = (_config, _cookies) => { - Ast_406.( + Ast_408.( Ast_mapper.( Parsetree.( Asttypes.{ @@ -313,5 +313,5 @@ let args = [ let () = Migrate_parsetree.( - Driver.register(~name="graphql", ~args, Versions.ocaml_406, mapper) + Driver.register(~name="graphql", ~args, Versions.ocaml_408, mapper) ); diff --git a/src/bucklescript/output_bucklescript_decoder.re b/src/bucklescript/output_bucklescript_decoder.re index a6f2ac97..8a6c9984 100644 --- a/src/bucklescript/output_bucklescript_decoder.re +++ b/src/bucklescript/output_bucklescript_decoder.re @@ -3,7 +3,7 @@ open Graphql_ppx_base; open Result_structure; open Schema; -open Ast_406; +open Ast_408; open Asttypes; open Parsetree; @@ -123,7 +123,11 @@ let generate_poly_enum_decoder = (loc, enum_meta) => { Typ.variant( enum_meta.em_values |> List.map(({evm_name, _}) => - Rtag({txt: evm_name, loc}, [], true, []) + { + prf_desc: Rtag({txt: evm_name, loc}, true, []), + prf_loc: loc, + prf_attributes: [], + } ), Closed, None, @@ -168,7 +172,11 @@ let generate_poly_enum_decoder_lean = (loc, enum_meta) => { Typ.variant( enum_meta.em_values |> List.map(({evm_name, _}) => - Rtag({txt: evm_name, loc}, [], true, []) + { + prf_desc: Rtag({txt: evm_name, loc}, true, []), + prf_loc: loc, + prf_attributes: [], + } ), Closed, None, @@ -424,11 +432,15 @@ and generate_object_decoder = (config, loc, name, fields) => { fields |> List.mapi( (i, Fr_named_field(key, _, _) | Fr_fragment_spread(key, _, _)) => - Otag( - {txt: key, loc}, - [], - Ast_helper.Typ.var("a" ++ string_of_int(i)), - ) + { + pof_desc: + Otag( + {txt: key, loc}, + Ast_helper.Typ.var("a" ++ string_of_int(i)), + ), + pof_loc: loc, + pof_attributes: [], + } ); let rec do_obj_constructor = () => { @@ -443,7 +455,14 @@ and generate_object_decoder = (config, loc, name, fields) => { pval_type: make_obj_constructor_fn(0, fields), pval_prim: [""], pval_attributes: [ - ({txt: "bs.obj", loc: Location.none}, PStr([])), + { + attr_name: { + txt: "bs.obj", + loc: Location.none, + }, + attr_payload: PStr([]), + attr_loc: loc, + }, ], pval_loc: Location.none, }), @@ -517,7 +536,14 @@ and generate_object_decoder = (config, loc, name, fields) => { pval_type: make_obj_constructor_fn(0, fields), pval_prim: [""], pval_attributes: [ - ({txt: "bs.obj", loc: Location.none}, PStr([])), + { + attr_name: { + txt: "bs.obj", + loc: Location.none, + }, + attr_payload: PStr([]), + attr_loc: loc, + }, ], pval_loc: Location.none, }), @@ -652,18 +678,24 @@ and generate_poly_variant_selection_set = (config, loc, name, fields) => { Typ.variant( fields |> List.map(((name, _)) => - Rtag( - {txt: Compat.capitalize_ascii(name), loc}, - [], - false, - [ - { - ptyp_desc: Ptyp_any, - ptyp_attributes: [], - ptyp_loc: Location.none, - }, - ], - ) + { + prf_desc: + Rtag( + {txt: Compat.capitalize_ascii(name), loc}, + false, + [ + { + ptyp_desc: Ptyp_any, + ptyp_attributes: [], + ptyp_loc_stack: [], + ptyp_loc: Location.none, + }, + ], + ), + + prf_loc: loc, + prf_attributes: [], + } ), Closed, None, @@ -699,13 +731,23 @@ and generate_poly_variant_interface = (config, loc, name, base, fragments) => { Exp.variant(type_name, Some(generate_decoder(config, inner))) |> Exp.case(name_pattern); }; - let map_case_ty = ((name, _)) => - Rtag( - {txt: name, loc}, - [], - false, - [{ptyp_desc: Ptyp_any, ptyp_attributes: [], ptyp_loc: Location.none}], - ); + let map_case_ty = ((name, _)) => { + prf_desc: + Rtag( + {txt: name, loc}, + false, + [ + { + ptyp_desc: Ptyp_any, + ptyp_attributes: [], + ptyp_loc_stack: [], + ptyp_loc: Location.none, + }, + ], + ), + prf_loc: loc, + prf_attributes: [], + }; let fragment_cases = List.map(map_case, fragments); let fallback_case = map_fallback_case(base); @@ -796,25 +838,36 @@ and generate_poly_variant_union = ) | Nonexhaustive => ( Exp.case(Pat.any(), [%expr `Nonexhaustive]), - [Rtag({txt: "Nonexhaustive", loc}, [], true, [])], + [ + { + prf_desc: Rtag({txt: "Nonexhaustive", loc}, true, []), + prf_loc: loc, + prf_attributes: [], + }, + ], ) } ); let fragment_case_tys = fragments |> List.map(((name, _)) => - Rtag( - {txt: name, loc}, - [], - false, - [ - { - ptyp_desc: Ptyp_any, - ptyp_attributes: [], - ptyp_loc: Location.none, - }, - ], - ) + { + prf_desc: + Rtag( + {txt: name, loc}, + false, + [ + { + ptyp_desc: Ptyp_any, + ptyp_attributes: [], + ptyp_loc: Location.none, + ptyp_loc_stack: [], + }, + ], + ), + prf_loc: loc, + prf_attributes: [], + } ); let union_ty = diff --git a/src/bucklescript/output_bucklescript_encoder.re b/src/bucklescript/output_bucklescript_encoder.re index 31cc95ee..1990b163 100644 --- a/src/bucklescript/output_bucklescript_encoder.re +++ b/src/bucklescript/output_bucklescript_encoder.re @@ -4,7 +4,7 @@ open Graphql_ast; open Source_pos; open Schema; -open Ast_406; +open Ast_408; open Asttypes; open Type_utils; diff --git a/src/bucklescript/output_bucklescript_module.re b/src/bucklescript/output_bucklescript_module.re index 5fe6c732..22d4c1ee 100644 --- a/src/bucklescript/output_bucklescript_module.re +++ b/src/bucklescript/output_bucklescript_module.re @@ -3,7 +3,7 @@ open Graphql_ppx_base; open Result_structure; open Generator_utils; -open Ast_406; +open Ast_408; open Asttypes; open Parsetree; open Ast_helper; @@ -45,7 +45,7 @@ let ret_type_magic = [ ]; let emit_printed_query = parts => { - open Ast_406; + open Ast_408; open Graphql_printer; let generate_expr = acc => fun @@ -104,13 +104,13 @@ let emit_printed_query = parts => { Array.fold_left( generate_expr, - Ast_406.(Ast_helper.Exp.constant(Parsetree.Pconst_string("", None))), + Ast_408.(Ast_helper.Exp.constant(Parsetree.Pconst_string("", None))), parts, ); }; let rec emit_json = - Ast_406.( + Ast_408.( fun | `Assoc(vs) => { let pairs = @@ -227,14 +227,18 @@ let generate_fragment_module = let variable_fields = variable_names |> List.map(name => - Otag( - {txt: name, loc: Location.none}, - [], - Ast_helper.Typ.constr( - {txt: Longident.Lident("unit"), loc: Location.none}, - [], - ), - ) + { + pof_desc: + Otag( + {txt: name, loc: Location.none}, + Ast_helper.Typ.constr( + {txt: Longident.Lident("unit"), loc: Location.none}, + [], + ), + ), + pof_loc: Location.none, + pof_attributes: [], + } ); let variable_obj_type = Ast_helper.Typ.constr( diff --git a/src/bucklescript/output_bucklescript_unifier.re b/src/bucklescript/output_bucklescript_unifier.re index 85904d12..1831b4eb 100644 --- a/src/bucklescript/output_bucklescript_unifier.re +++ b/src/bucklescript/output_bucklescript_unifier.re @@ -4,7 +4,7 @@ open Graphql_ast; open Source_pos; open Generator_utils; -open Ast_406; +open Ast_408; open Parsetree; open Asttypes; diff --git a/src/native/dune b/src/native/dune index 7b807a3d..a110c1a8 100644 --- a/src/native/dune +++ b/src/native/dune @@ -5,6 +5,6 @@ (libraries reason ocaml-migrate-parsetree graphql_ppx_base) - (preprocess (pps ppx_tools_versioned.metaquot_406))) + (preprocess (pps ppx_tools_versioned.metaquot_408))) diff --git a/src/native/graphql_ppx.re b/src/native/graphql_ppx.re index 4ea7f7ed..2bda8c50 100644 --- a/src/native/graphql_ppx.re +++ b/src/native/graphql_ppx.re @@ -62,7 +62,7 @@ let is_prefixed = (prefix, str) => { }; let make_error_expr = (loc, message) => { - open Ast_406; + open Ast_408; let ext = Ast_mapper.extension_of_error(Location.error(~loc, message)); Ast_helper.Exp.extension(~loc, ext); }; @@ -74,7 +74,7 @@ let drop_prefix = (prefix, str) => { }; let rewrite_query = (~schema=?, ~loc, ~delim, ~query, ()) => { - open Ast_406; + open Ast_408; let lexer = Graphql_lexer.make(query); let delimLength = @@ -135,7 +135,7 @@ let rewrite_query = (~schema=?, ~loc, ~delim, ~query, ()) => { }; let extract_schema_from_config = config_fields => { - open Ast_406; + open Ast_408; open Asttypes; open Parsetree; @@ -190,7 +190,7 @@ let () = ); let mapper = (_config, _cookies) => { - Ast_406.( + Ast_408.( Ast_mapper.( Parsetree.( Asttypes.{ @@ -323,5 +323,5 @@ let args = [ let () = Migrate_parsetree.( - Driver.register(~name="graphql", ~args, Versions.ocaml_406, mapper) + Driver.register(~name="graphql", ~args, Versions.ocaml_408, mapper) ); diff --git a/src/native/output_native_decoder.re b/src/native/output_native_decoder.re index 06bc416e..454b0146 100644 --- a/src/native/output_native_decoder.re +++ b/src/native/output_native_decoder.re @@ -3,7 +3,7 @@ open Graphql_ppx_base; open Result_structure; open Schema; -open Ast_406; +open Ast_408; open Asttypes; open Parsetree; @@ -114,7 +114,12 @@ let generate_poly_enum_decoder = (loc, enum_meta) => { Ast_helper.( Typ.variant( List.map( - ({evm_name, _}) => Rtag({txt: evm_name, loc}, [], true, []), + ({evm_name, _}) => + { + prf_desc: Rtag({txt: evm_name, loc}, true, []), + prf_loc: loc, + prf_attributes: [], + }, enum_meta.em_values, ), Closed, @@ -455,18 +460,24 @@ and generate_poly_variant_selection_set = (config, loc, name, fields) => { Typ.variant( List.map( ((name, _)) => - Rtag( - {txt: Compat.capitalize_ascii(name), loc}, - [], - false, - [ - { - ptyp_desc: Ptyp_any, - ptyp_attributes: [], - ptyp_loc: Location.none, - }, - ], - ), + { + prf_desc: + Rtag( + {txt: Compat.capitalize_ascii(name), loc}, + false, + [ + { + ptyp_desc: Ptyp_any, + ptyp_attributes: [], + ptyp_loc: Location.none, + ptyp_loc_stack: [], + }, + ], + ), + + prf_loc: loc, + prf_attributes: [], + }, fields, ), Closed, @@ -503,13 +514,23 @@ and generate_poly_variant_interface = (config, loc, name, base, fragments) => { Exp.variant(type_name, Some(generate_decoder(config, inner))); Exp.case(name_pattern, variant); }; - let map_case_ty = ((name, _)) => - Rtag( - name, - [], - false, - [{ptyp_desc: Ptyp_any, ptyp_attributes: [], ptyp_loc: Location.none}], - ); + let map_case_ty = ((name, _)) => { + prf_desc: + Rtag( + name, + false, + [ + { + ptyp_desc: Ptyp_any, + ptyp_attributes: [], + ptyp_loc: Location.none, + ptyp_loc_stack: [], + }, + ], + ), + prf_loc: loc, + prf_attributes: [], + }; let fragment_cases = List.map(map_case, fragments); let fallback_case = map_fallback_case(base); @@ -606,25 +627,36 @@ and generate_poly_variant_union = ) | Nonexhaustive => ( Exp.case(Pat.any(), [%expr `Nonexhaustive]), - [Rtag({txt: "Nonexhaustive", loc}, [], true, [])], + [ + { + prf_desc: Rtag({txt: "Nonexhaustive", loc}, true, []), + prf_loc: loc, + prf_attributes: [], + }, + ], ) } ); let fragment_case_tys = List.map( ((name, _)) => - Rtag( - {txt: name, loc}, - [], - false, - [ - { - ptyp_desc: Ptyp_any, - ptyp_attributes: [], - ptyp_loc: Location.none, - }, - ], - ), + { + prf_desc: + Rtag( + {txt: name, loc}, + false, + [ + { + ptyp_desc: Ptyp_any, + ptyp_attributes: [], + ptyp_loc: Location.none, + ptyp_loc_stack: [], + }, + ], + ), + prf_loc: loc, + prf_attributes: [], + }, fragments, ); let union_ty = diff --git a/src/native/output_native_encoder.re b/src/native/output_native_encoder.re index 900d8913..a2babec4 100644 --- a/src/native/output_native_encoder.re +++ b/src/native/output_native_encoder.re @@ -4,7 +4,7 @@ open Graphql_ast; open Source_pos; open Schema; -open Ast_406; +open Ast_408; open Asttypes; open Type_utils; diff --git a/src/native/output_native_module.re b/src/native/output_native_module.re index 787c4601..4efc0869 100644 --- a/src/native/output_native_module.re +++ b/src/native/output_native_module.re @@ -3,7 +3,7 @@ open Graphql_ppx_base; open Result_structure; open Generator_utils; -open Ast_406; +open Ast_408; open Asttypes; open Parsetree; open Ast_helper; @@ -109,7 +109,7 @@ let emit_printed_query = parts => { }; let rec emit_json = - Ast_406.( + Ast_408.( fun | `Assoc(vs) => { let pairs = @@ -224,14 +224,18 @@ let generate_fragment_module = let variable_fields = variable_names |> List.map(name => - Otag( - {txt: name, loc}, - [], - Ast_helper.Typ.constr( - {txt: Longident.Lident("unit"), loc: Location.none}, - [], - ), - ) + { + pof_desc: + Otag( + {txt: name, loc}, + Ast_helper.Typ.constr( + {txt: Longident.Lident("unit"), loc: Location.none}, + [], + ), + ), + pof_loc: Location.none, + pof_attributes: [], + } ); let variable_obj_type = Ast_helper.Typ.constr( diff --git a/src/native/output_native_unifier.re b/src/native/output_native_unifier.re index e4019a45..20ad8252 100644 --- a/src/native/output_native_unifier.re +++ b/src/native/output_native_unifier.re @@ -4,7 +4,7 @@ open Graphql_ast; open Source_pos; open Generator_utils; -open Ast_406; +open Ast_408; open Parsetree; open Asttypes; @@ -151,4 +151,4 @@ let make_make_fun = (config, variable_defs) => { [%expr [%e make_tuple(Location.none, [%expr `Null], [%expr 0])]], ) }; -}; \ No newline at end of file +};