🔥 Supprime les variables temporelles

publicodes/core/source/AST/index.ts

@@ -174,8 +174,6 @@ export const traverseASTNode: TraverseFunction<NodeKind> = (fn, node) => {
 			return traverseUnitéNode(fn, node)
 		case 'variations':
 			return traverseVariationNode(fn, node)
-		case 'variable temporelle':
-			return traverseVariableTemporelle(fn, node)
 		case 'replacementRule':
 			return traverseReplacementNode(fn, node)
 		default:
@@ -382,17 +380,3 @@ const traverseVariationNode: TraverseFunction<'variations'> = (fn, node) => ({
 		consequence: fn(consequence),
 	})),
 })
-
-const traverseVariableTemporelle: TraverseFunction<'variable temporelle'> = (
-	fn,
-	node
-) => ({
-	...node,
-	explanation: {
-		period: {
-			end: node.explanation.period.end && fn(node.explanation.period.end),
-			start: node.explanation.period.start && fn(node.explanation.period.start),
-		},
-		value: fn(node.explanation.value),
-	},
-})

publicodes/core/source/AST/types.ts

@@ -23,12 +23,10 @@ import { SommeNode } from '../mecanisms/sum'
 import { SynchronisationNode } from '../mecanisms/synchronisation'
 import { TauxProgressifNode } from '../mecanisms/tauxProgressif'
 import { UnitéNode } from '../mecanisms/unité'
-import { VariableTemporelleNode } from '../mecanisms/variableTemporelle'
 import { VariationNode } from '../mecanisms/variations'
 import { ReferenceNode } from '../reference'
 import { ReplacementRule } from '../replacement'
 import { RuleNode } from '../rule'
-import { Temporal } from '../temporal'
 
 export type ConstantNode = {
 	type: 'boolean' | 'objet' | 'number' | 'string'
@@ -64,7 +62,6 @@ export type ASTNode = (
 	| SynchronisationNode
 	| TauxProgressifNode
 	| UnitéNode
-	| VariableTemporelleNode
 	| VariationNode
 	| ConstantNode
 	| ReplacementRule
@@ -109,12 +106,10 @@ export type Unit = {
 }
 
 // Idée : une évaluation est un n-uple : (value, unit, missingVariable, isApplicable)
-// Une temporalEvaluation est une liste d'evaluation sur chaque période. : [(Evaluation, Period)]
 type EvaluationDecoration<T extends Types> = {
 	nodeValue: Evaluation<T>
 	missingVariables: Record<string, number>
 	unit?: Unit
-	temporalValue?: Temporal<Evaluation>
 }
 export type Types = number | boolean | string | Record<string, unknown>
 export type Evaluation<T extends Types = Types> = T | false | null

publicodes/core/source/grammar.ne

@@ -7,8 +7,7 @@
 
 @{%
 const {
-  string, date, variable, temporalNumericValue, binaryOperation, 
-  unaryOperation, boolean, number, numberWithUnit, JSONObject
+  string, date, variable, binaryOperation, unaryOperation, boolean, number, numberWithUnit, JSONObject
 } = require('./grammarFunctions')
 
 const moo = require("moo");
@@ -61,11 +60,6 @@ main ->
 NumericValue ->
     AdditionSubstraction {% id %}
   | Negation {% id %}
-  | TemporalNumericValue {% id %}
-
-TemporalNumericValue ->
-    NumericValue %space %periodWord %space %date {% ([value,,word,,dateString]) => temporalNumericValue(value, word, date([dateString])) %}
-  | NumericValue %space %periodWord %colon Date {% ([value,,word,,date]) => temporalNumericValue(value, word, date) %}
 
 NumericTerminal ->
 	 	Variable {% id %}

publicodes/core/source/grammarFunctions.js

@@ -1,7 +1,6 @@
 /* Those are postprocessor functions for the Nearley grammar.ne.
 The advantage of putting them here is to get prettier's JS formatting, since Nealrey doesn't support it https://github.com/kach/nearley/issues/310 */
 import { normalizeDateString } from './date'
-import { parsePeriod } from './temporal'
 
 export let binaryOperation = (operationType) => ([A, , operator, , B]) => ({
 	[operator]: {
@@ -17,13 +16,6 @@ export let unaryOperation = (operationType) => ([operator, , A]) => ({
 	},
 })
 
-export let temporalNumericValue = (variable, word, date) => ({
-	temporalValue: {
-		explanation: variable,
-		period: parsePeriod(word.value.slice(2), date),
-	},
-})
-
 export let variable = ([firstFragment, nextFragment], _, reject) => {
 	const fragments = [firstFragment, ...nextFragment].map(({ value }) => value)
 	if (!nextFragment.length && ['oui', 'non'].includes(firstFragment)) {

publicodes/core/source/mecanisms/product.ts

@@ -1,7 +1,7 @@
 import { EvaluationFunction } from '..'
 import { ASTNode } from '../AST/types'
 import { warning } from '../error'
-import { defaultNode, parseObject } from '../evaluation'
+import { defaultNode, mergeAllMissing, parseObject } from '../evaluation'
 import { registerEvaluationFunction } from '../evaluationFunctions'
 import { convertNodeToUnit, simplifyNodeUnit } from '../nodeUnits'
 import { areUnitConvertible, convertUnit, inferUnit } from '../units'
@@ -72,11 +72,17 @@ const evaluateProduit: EvaluationFunction<'produit'> = function (node) {
 		nodeValue = convertUnit(unit, assiette.unit, nodeValue)
 		unit = assiette.unit
 	}
+
 	return simplifyNodeUnit({
+		...node,
+		missingVariables: mergeAllMissing([assiette, taux, facteur, plafond]),
 		nodeValue,
 		unit,
-
 		explanation: {
+			assiette,
+			taux,
+			facteur,
+			plafond,
 			plafondActif: (assiette.nodeValue as any) > (plafond as any).nodeValue,
 		},
 	})

publicodes/core/source/parse.ts

@@ -28,7 +28,6 @@ import { mecanismSum } from './mecanisms/sum'
 import { mecanismSynchronisation } from './mecanisms/synchronisation'
 import tauxProgressif from './mecanisms/tauxProgressif'
 import unité from './mecanisms/unité'
-import variableTemporelle from './mecanisms/variableTemporelle'
 import variations, { devariate } from './mecanisms/variations'
 import { Context } from './parsePublicodes'
 import parseReference from './reference'
@@ -190,7 +189,6 @@ const parseFunctions = {
 	somme: mecanismSum,
 	multiplication: mecanismProduct,
 	produit: mecanismProduct,
-	temporalValue: variableTemporelle,
 	barème,
 	grille,
 	'taux progressif': tauxProgressif,