From b175945d78a01fb298ece4871143546e28bb034b Mon Sep 17 00:00:00 2001
From: Johan Girod <johangirod@gmail.com>
Date: Tue, 26 May 2020 16:12:16 +0200
Subject: [PATCH] :sparkles: ajoute un prototype d'interface pour les warnings
 du moteur

---
 mon-entreprise/package.json                   |  3 +-
 .../source/sites/publi.codes/Studio.tsx       | 30 ++++++++-----------
 publicodes/package.json                       |  2 +-
 publicodes/source/index.ts                    | 14 +++++++++
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/mon-entreprise/package.json b/mon-entreprise/package.json
index d9ec01e57..2c1d00a01 100644
--- a/mon-entreprise/package.json
+++ b/mon-entreprise/package.json
@@ -35,7 +35,8 @@
 		"js-yaml": "^3.13.1",
 		"moo": "^0.5.0",
 		"nearley": "^2.19.0",
-		"publicodes": "^1.0.0-beta.3",
+		"publicodes": "^1.0.0-beta.4",
+		"focus-trap-react": "^3.1.2",
 		"ramda": "^0.27.0",
 		"react": "^16.13.1",
 		"react-color": "^2.14.0",
diff --git a/mon-entreprise/source/sites/publi.codes/Studio.tsx b/mon-entreprise/source/sites/publi.codes/Studio.tsx
index dae8b26f9..a236600b0 100644
--- a/mon-entreprise/source/sites/publi.codes/Studio.tsx
+++ b/mon-entreprise/source/sites/publi.codes/Studio.tsx
@@ -132,14 +132,21 @@ export const Results = ({ onClickShare, rules }: ResultsProps) => {
 			setCurrentTarget(last(targets))
 		}
 	})
-	// EN ATTENDANT d'AVOIR une meilleure gestion d'erreur, on va mocker
-	// console.warn
-	const warnings: string[] = []
-	const originalWarn = console.warn
-	console.warn = (warning: string) => warnings.push(warning)
 
 	return (
 		<>
+			{engine.getWarnings().map(warning => (
+				<div
+					css={`
+						background: lightyellow;
+						padding: 20px;
+						border-radius: 5px;
+					`}
+					key={warning}
+				>
+					{nl2br(warning)}
+				</div>
+			))}
 			<div
 				css={`
 					display: flex;
@@ -176,18 +183,7 @@ export const Results = ({ onClickShare, rules }: ResultsProps) => {
 					</button>
 				</div>
 			</div>
-			{warnings.map(warning => (
-				<div
-					css={`
-						background: lightyellow;
-						padding: 20px;
-						border-radius: 5px;
-					`}
-					key={warning}
-				>
-					{nl2br(warning)}
-				</div>
-			))}
+
 			<ErrorBoundary>
 				<Documentation
 					engine={engine}
diff --git a/publicodes/package.json b/publicodes/package.json
index 495d93541..7b62dc0a7 100644
--- a/publicodes/package.json
+++ b/publicodes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "publicodes",
-	"version": "1.0.0-beta.3",
+	"version": "1.0.0-beta.4",
 	"description": "A declarative language for encoding public algorithm",
 	"main": "dist/index.js",
 	"types": "dist/types/index.d.ts",
diff --git a/publicodes/source/index.ts b/publicodes/source/index.ts
index 2c5d7fb2c..68e6b534d 100644
--- a/publicodes/source/index.ts
+++ b/publicodes/source/index.ts
@@ -45,6 +45,7 @@ export default class Engine<Names extends string> {
 	defaultValues: Situation<Names>
 	situation: Situation<Names> = {}
 	cache: Cache
+	warnings: Array<string> = []
 	cacheWithoutDefault: Cache
 
 	constructor(rules: string | Rules<Names> | ParsedRules<Names>) {
@@ -81,6 +82,14 @@ export default class Engine<Names extends string> {
 		context: string,
 		useDefaultValues = true
 	): EvaluatedNode<Names> {
+		// EN ATTENDANT d'AVOIR une meilleure gestion d'erreur, on va mocker
+		// console.warn
+		const warnings: string[] = []
+		const originalWarn = console.warn
+		console.warn = (warning: string) => {
+			this.warnings.push(warning)
+			originalWarn(warning)
+		}
 		const result = simplifyNodeUnit(
 			evaluateNode(
 				useDefaultValues ? this.cache : this.cacheWithoutDefault,
@@ -93,6 +102,7 @@ export default class Engine<Names extends string> {
 				)(expression)
 			)
 		)
+		console.warn = originalWarn
 
 		if (Object.keys(result.defaultValue?.missingVariable ?? {}).length) {
 			throw evaluationError(
@@ -161,6 +171,10 @@ export default class Engine<Names extends string> {
 		)
 	}
 
+	getWarnings() {
+		return this.warnings
+	}
+
 	inversionFail(): boolean {
 		return !!this.cache._meta.inversionFail
 	}