fixed schema generation for Haxe 4.1 and nightly (#499)

AlexHaxe · web-flow · commit bbf482a978b2 · 2020-05-30T21:38:17.000+02:00
* fixed schema generation for Haxe 4.1 and nightly
* upgraded to lix 15.9.0
* use latest mcover
* added Haxe 4.1.1 to build matrix
diff --git a/.github/workflows/checkstyle-linux.yml b/.github/workflows/checkstyle-linux.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        haxe-version: ['3.4.7', '4.0.5', 'nightly']
+        haxe-version: ['3.4.7', '4.0.5', '4.1.1', 'nightly']
     env:
       CC_TEST_REPORTER_ID: 1dff6f89d7179dff5db635c6b4fe64acdd5694c9ed44d7da5f12f0f7d3d163b7
       CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
@@ -26,7 +26,7 @@ jobs:
       with:
         node-version: 10
     - name: Installing codeclimate client
-      if: matrix.haxe-version == '4.0.5'
+      if: matrix.haxe-version == '4.1.1'
       run: |
         curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
         chmod +x ./cc-test-reporter
@@ -57,7 +57,7 @@ jobs:
       run: npx haxe buildJS.hxml
     - name: Build C++ version
       if: matrix.haxe-version != 'nightly'
-      run: npx haxe buildCpp.hxml
+      run: echo "y" | npx haxe buildCpp.hxml
     - name: Build JSON schema
       run: npx haxe buildSchema.hxml
     - name: Run neko tests
@@ -72,13 +72,13 @@ jobs:
       if: matrix.haxe-version != '3.4.7'
       run: npx haxe testJvm.hxml
     - name: Format and upload codeclimate coverage
-      if: success() && matrix.haxe-version == '4.0.5'
+      if: success() && matrix.haxe-version == '4.1.1'
       run: |
         ( \
           cd src; \
           ../cc-test-reporter format-coverage -t lcov ../lcov.info; \
           ../cc-test-reporter upload-coverage; \
         )
     - name: Upload results to codecov
-      if: success() && matrix.haxe-version == '4.0.5'
+      if: success() && (matrix.haxe-version == '3.4.7' || matrix.haxe-version == '4.1.1')
       run: bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
diff --git a/.haxerc b/.haxerc
@@ -1,4 +1,4 @@
 {
-  "version": "4.0.5",
+  "version": "4.1.1",
   "resolveLibs": "scoped"
 }
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ env:
   matrix:
     - HAXE_VERSION=haxe347
     - HAXE_VERSION=haxe4
+    - HAXE_VERSION=haxe41
     - HAXE_VERSION=nightly
 
 install:
@@ -18,6 +19,7 @@ install:
   - if [[ "$HAXE_VERSION" == "haxe347" ]]; then mv haxe_libraries haxe4_libraries; mv haxe3_libraries haxe_libraries; fi
   - if [[ "$HAXE_VERSION" == "haxe347" ]]; then npx lix download haxe 3.4.7; npx lix use haxe 3.4.7; fi
   - if [[ "$HAXE_VERSION" == "haxe4" ]]; then npx lix download haxe 4.0.5; npx lix use haxe 4.0.5; fi
+  - if [[ "$HAXE_VERSION" == "haxe41" ]]; then npx lix download haxe 4.1.1; npx lix use haxe 4.1.1; fi
   - if [[ "$HAXE_VERSION" == "nightly" ]]; then npx lix download haxe nightly; npx lix use haxe nightly; fi
   - npx lix download
   - npx haxe -version
@@ -39,7 +41,7 @@ script:
   - (cd src; ../cc-test-reporter format-coverage -t lcov ../lcov.info)
 
 after_script:
-  - if [[ "$HAXE_VERSION" == "haxe4" ]]; then (cd src; ../cc-test-reporter upload-coverage); fi
+  - if [[ "$HAXE_VERSION" == "haxe41" ]]; then (cd src; ../cc-test-reporter upload-coverage); fi
 
 after_success:
   - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
diff --git a/haxe3_libraries/hxcpp.hxml b/haxe3_libraries/hxcpp.hxml
@@ -1,4 +1,4 @@
--D hxcpp=4.0.52
-# @install: lix --silent download "haxelib:/hxcpp#4.0.52" into hxcpp/4.0.52/haxelib
-# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.0.52/haxelib
--cp ${HAXE_LIBCACHE}/hxcpp/4.0.52/haxelib/
+# @install: lix --silent download "haxelib:/hxcpp#4.1.1" into hxcpp/4.1.1/haxelib
+# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.1.1/haxelib
+-cp ${HAXE_LIBCACHE}/hxcpp/4.1.1/haxelib/
+-D hxcpp=4.1.1
diff --git a/haxe3_libraries/hxnodejs.hxml b/haxe3_libraries/hxnodejs.hxml
@@ -1,6 +1,7 @@
--D hxnodejs=10.0.0
-# @install: lix --silent download "gh://github.com/HaxeFoundation/hxnodejs#462c800e16aa0b91df5a7c5d54782b313c3f8730" into hxnodejs/10.0.0/github/462c800e16aa0b91df5a7c5d54782b313c3f8730
--cp ${HAXE_LIBCACHE}/hxnodejs/10.0.0/github/462c800e16aa0b91df5a7c5d54782b313c3f8730/src
---macro allowPackage('sys')
-# should behave like other target defines and not be defined in macro context
---macro define('nodejs')
+# @install: lix --silent download "haxelib:/hxnodejs#12.1.0" into hxnodejs/12.1.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxnodejs/12.1.0/haxelib/src
+-D hxnodejs=12.1.0
+--macro allowPackage('sys')
+# should behave like other target defines and not be defined in macro context
+--macro define('nodejs')
+--macro _internal.SuppressDeprecated.run()
diff --git a/haxe3_libraries/mconsole.hxml b/haxe3_libraries/mconsole.hxml
@@ -1,3 +1,3 @@
--D mconsole=1.6.0
 # @install: lix --silent download "haxelib:/mconsole#1.6.0" into mconsole/1.6.0/haxelib
 -cp ${HAXE_LIBCACHE}/mconsole/1.6.0/haxelib/
+-D mconsole=1.6.0
diff --git a/haxe3_libraries/mcover.hxml b/haxe3_libraries/mcover.hxml
@@ -1,5 +1,5 @@
--D mcover=2.2.1
-# @install: lix --silent download "haxelib:/mcover#2.2.1" into mcover/2.2.1/haxelib
+# @install: lix --silent download "haxelib:/mcover#2.2.2" into mcover/2.2.2/haxelib
 -lib mconsole
 -lib munit
--cp ${HAXE_LIBCACHE}/mcover/2.2.1/haxelib/
+-cp ${HAXE_LIBCACHE}/mcover/2.2.2/haxelib/
+-D mcover=2.2.2
diff --git a/haxe3_libraries/mlib.hxml b/haxe3_libraries/mlib.hxml
@@ -1,4 +1,4 @@
--D mlib=2.0.3
 # @install: lix --silent download "haxelib:/mlib#2.0.3" into mlib/2.0.3/haxelib
 # @run: haxelib run-dir mlib ${HAXE_LIBCACHE}/mlib/2.0.3/haxelib
 -cp ${HAXE_LIBCACHE}/mlib/2.0.3/haxelib/
+-D mlib=2.0.3
diff --git a/haxe3_libraries/munit.hxml b/haxe3_libraries/munit.hxml
@@ -1,6 +1,6 @@
--D munit=2.3.4
 # @install: lix --silent download "haxelib:/munit#2.3.4" into munit/2.3.4/haxelib
 # @run: haxelib run-dir munit ${HAXE_LIBCACHE}/munit/2.3.4/haxelib
 -lib mcover
 -lib mlib
 -cp ${HAXE_LIBCACHE}/munit/2.3.4/haxelib/
+-D munit=2.3.4
diff --git a/haxe3_libraries/tokentree.hxml b/haxe3_libraries/tokentree.hxml
@@ -1,3 +1,3 @@
+# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#119c4cefa927018472cd57f5de1063d43f00da95" into tokentree/1.0.24/github/119c4cefa927018472cd57f5de1063d43f00da95
+-cp ${HAXE_LIBCACHE}/tokentree/1.0.24/github/119c4cefa927018472cd57f5de1063d43f00da95/src
 -D tokentree=1.0.24
-# @install: lix --silent download "haxelib:/tokentree#1.0.24" into tokentree/1.0.24/haxelib
--cp ${HAXE_LIBCACHE}/tokentree/1.0.24/haxelib/src
diff --git a/haxe_libraries/hxcpp.hxml b/haxe_libraries/hxcpp.hxml
@@ -1,4 +1,4 @@
--D hxcpp=4.0.64
-# @install: lix --silent download "haxelib:/hxcpp#4.0.64" into hxcpp/4.0.64/haxelib
-# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.0.64/haxelib
--cp ${HAXE_LIBCACHE}/hxcpp/4.0.64/haxelib/
+# @install: lix --silent download "haxelib:/hxcpp#4.1.1" into hxcpp/4.1.1/haxelib
+# @run: haxelib run-dir hxcpp ${HAXE_LIBCACHE}/hxcpp/4.1.1/haxelib
+-cp ${HAXE_LIBCACHE}/hxcpp/4.1.1/haxelib/
+-D hxcpp=4.1.1
diff --git a/haxe_libraries/hxnodejs.hxml b/haxe_libraries/hxnodejs.hxml
@@ -1,6 +1,7 @@
--D hxnodejs=10.0.0
-# @install: lix --silent download "gh://github.com/HaxeFoundation/hxnodejs#462c800e16aa0b91df5a7c5d54782b313c3f8730" into hxnodejs/10.0.0/github/462c800e16aa0b91df5a7c5d54782b313c3f8730
--cp ${HAXE_LIBCACHE}/hxnodejs/10.0.0/github/462c800e16aa0b91df5a7c5d54782b313c3f8730/src
---macro allowPackage('sys')
-# should behave like other target defines and not be defined in macro context
---macro define('nodejs')
+# @install: lix --silent download "haxelib:/hxnodejs#12.1.0" into hxnodejs/12.1.0/haxelib
+-cp ${HAXE_LIBCACHE}/hxnodejs/12.1.0/haxelib/src
+-D hxnodejs=12.1.0
+--macro allowPackage('sys')
+# should behave like other target defines and not be defined in macro context
+--macro define('nodejs')
+--macro _internal.SuppressDeprecated.run()
diff --git a/haxe_libraries/mconsole.hxml b/haxe_libraries/mconsole.hxml
@@ -1,3 +1,3 @@
--D mconsole=1.6.0
 # @install: lix --silent download "haxelib:/mconsole#1.6.0" into mconsole/1.6.0/haxelib
 -cp ${HAXE_LIBCACHE}/mconsole/1.6.0/haxelib/
+-D mconsole=1.6.0
diff --git a/haxe_libraries/mcover.hxml b/haxe_libraries/mcover.hxml
@@ -1,5 +1,5 @@
--D mcover=2.2.1
-# @install: lix --silent download "haxelib:/mcover#2.2.1" into mcover/2.2.1/haxelib
+# @install: lix --silent download "haxelib:/mcover#2.2.2" into mcover/2.2.2/haxelib
 -lib mconsole
 -lib munit
--cp ${HAXE_LIBCACHE}/mcover/2.2.1/haxelib/
+-cp ${HAXE_LIBCACHE}/mcover/2.2.2/haxelib/
+-D mcover=2.2.2
diff --git a/haxe_libraries/mlib.hxml b/haxe_libraries/mlib.hxml
@@ -1,4 +1,4 @@
--D mlib=2.0.3
 # @install: lix --silent download "haxelib:/mlib#2.0.3" into mlib/2.0.3/haxelib
 # @run: haxelib run-dir mlib ${HAXE_LIBCACHE}/mlib/2.0.3/haxelib
 -cp ${HAXE_LIBCACHE}/mlib/2.0.3/haxelib/
+-D mlib=2.0.3
diff --git a/haxe_libraries/munit.hxml b/haxe_libraries/munit.hxml
@@ -1,6 +1,6 @@
--D munit=2.3.4
 # @install: lix --silent download "haxelib:/munit#2.3.4" into munit/2.3.4/haxelib
 # @run: haxelib run-dir munit ${HAXE_LIBCACHE}/munit/2.3.4/haxelib
 -lib mcover
 -lib mlib
 -cp ${HAXE_LIBCACHE}/munit/2.3.4/haxelib/
+-D munit=2.3.4
diff --git a/haxe_libraries/tokentree.hxml b/haxe_libraries/tokentree.hxml
@@ -1,3 +1,3 @@
+# @install: lix --silent download "gh://github.com/HaxeCheckstyle/tokentree#119c4cefa927018472cd57f5de1063d43f00da95" into tokentree/1.0.24/github/119c4cefa927018472cd57f5de1063d43f00da95
+-cp ${HAXE_LIBCACHE}/tokentree/1.0.24/github/119c4cefa927018472cd57f5de1063d43f00da95/src
 -D tokentree=1.0.24
-# @install: lix --silent download "haxelib:/tokentree#1.0.24" into tokentree/1.0.24/haxelib
--cp ${HAXE_LIBCACHE}/tokentree/1.0.24/haxelib/src
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
         }
     ],
     "devDependencies": {
-        "lix": "^15.8.9"
+        "lix": "^15.9.0"
     },
     "bugs": "https://github.com/HaxeCheckstyle/haxe-checkstyle/issues",
     "license": "MIT"
diff --git a/schema/CheckstyleSchemaGenerator.hx b/schema/CheckstyleSchemaGenerator.hx
@@ -1,11 +1,11 @@
 #if macro
 import haxe.DynamicAccess;
+import haxe.ds.ArraySort;
+import haxe.io.Path;
 import haxe.macro.Context;
 import haxe.macro.Expr;
 import haxe.macro.Type;
 import sys.FileSystem;
-import haxe.io.Path;
-import haxe.ds.ArraySort;
 
 using StringTools;
 
@@ -131,14 +131,15 @@ class CheckstyleSchemaGenerator {
 
 							var doc:StructInfo = {name: name, doc: getDescMeta(cl.meta)};
 							var props = SchemaUtils.makeObject(SchemaUtils.makeObjectDecl(classFields, null, -1, pos), doc, [], -1, pos);
-							var checkName:Array<Expr> = [macro '$typeName'];
+							var checkName:Array<Expr> = [macro $v{typeName}];
 							var typeExpr:Expr = macro $a{checkName};
 							var type = SchemaUtils.makeEnum(typeExpr, doc, -1, pos);
 							var checkFields:Array<ObjectDeclField> = [{field: "type", expr: type}, {field: "props", expr: props}];
 							var classExpr:Expr = SchemaUtils.makeObject(SchemaUtils.makeObjectDecl(checkFields, null, -1, pos), doc, [], -1, pos);
 							refs[name] = classExpr;
 						}
-						return SchemaUtils.makeObjectDecl([{field: DollarName.DollarRef, expr: macro '#/definitions/${name}'}], null, order, pos);
+						var defName:String = '#/definitions/${name}';
+						return SchemaUtils.makeObjectDecl([{field: DollarName.DollarRef, expr: macro $v{defName}}], null, order, pos);
 					default:
 				}
 			default:
diff --git a/schema/JsonSchemaGenerator.hx b/schema/JsonSchemaGenerator.hx
@@ -4,8 +4,8 @@ import haxe.macro.Context;
 import haxe.macro.Expr;
 import haxe.macro.Type;
 
-using haxe.macro.Tools;
 using StringTools;
+using haxe.macro.Tools;
 
 typedef ExtendedFieldsCB = Array<ObjectDeclField> -> String -> Position -> DynamicAccess<Expr> -> Void;
 #end
@@ -33,7 +33,7 @@ class JsonSchemaGenerator {
 				fields.push({field: "definitions", expr: definitions});
 				fields.push({field: DollarName.DollarSchema, expr: macro "http://json-schema.org/schema#"});
 				if (id != null) {
-					fields.push({field: "id", expr: macro '$id'});
+					fields.push({field: "id", expr: macro $v{id}});
 				}
 			default:
 		}
@@ -84,7 +84,8 @@ class JsonSchemaGenerator {
 							var schema = genSchema(dt.type.applyTypeParameters(dt.params, params), dt.name, dt.pos, doc, refs, -1, extendCB);
 							refs[dt.name] = schema;
 						}
-						return SchemaUtils.makeObjectDecl([{field: DollarName.DollarRef, expr: macro '#/definitions/${dt.name}'}], structInfo, order, pos);
+						var name:String = '#/definitions/${dt.name}';
+						return SchemaUtils.makeObjectDecl([{field: DollarName.DollarRef, expr: macro $v{name}}], structInfo, order, pos);
 				}
 
 			case TInst(_.get() => cl, params):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "version": "4.0.5",`
	`2`	`+ "version": "4.1.1",`
`3`	`3`	`"resolveLibs": "scoped"`
`4`	`4`	`}`