Improve event-types <> workflow

2021-03-12 13:12:07 +01:00
parent 69dd1fc425
commit 1fa6c6cb9b
20 changed files with 2498 additions and 26 deletions
@@ -208,8 +208,19 @@ func Proc() {
 				return
 			}

+			if exprTypeDefs, err = procExprTypes(exprTypeSrc...); err == nil {
+				if genCode {
+					err = genExprTypes(tpls, exprTypeDefs...)
+				}
+			}
+
+			if outputErr(err, "failed to process expr types:\n") {
+				return
+			}
+
 			if eventDefs, err = procEvents(eventSrc...); err == nil {
 				if genCode {
+					expandEventTypes(eventDefs, exprTypeDefs)
 					err = genEvents(tpls, eventDefs...)
 				}
 				if genDocs && err == nil {
@@ -231,16 +242,6 @@ func Proc() {
 				return
 			}

-			if exprTypeDefs, err = procExprTypes(exprTypeSrc...); err == nil {
-				if genCode {
-					err = genExprTypes(tpls, exprTypeDefs...)
-				}
-			}
-
-			if outputErr(err, "failed to process expr types:\n") {
-				return
-			}
-
 			if restDefs, err = procRest(restSrc...); err == nil {
 				if genCode {
 					err = genRest(tpls, restDefs...)