fix(mf2): Drop forward-reference error, extend duplicate-declaration instead

eemeli · eemeli · commit 654693f677f7 · 2024-01-16T12:33:40.000+02:00
diff --git a/packages/mf2-messageformat/src/data-model/validate.ts b/packages/mf2-messageformat/src/data-model/validate.ts
@@ -1,11 +1,5 @@
 import { MessageDataModelError } from '../errors.js';
-import type {
-  Expression,
-  Message,
-  MessageNode,
-  VariableRef,
-  Variant
-} from './types.js';
+import type { Expression, Message, MessageNode, Variant } from './types.js';
 import { visit } from './visit.js';
 
 /**
@@ -55,19 +49,16 @@ export function validate(
   /** Tracks declared variables for `duplicate-declaration` */
   const declared = new Set<string>();
 
-  const declRefs = new Map<string, VariableRef[]>();
   const functions = new Set<string>();
   const localVars = new Set<string>();
   const variables = new Set<string>();
 
+  let setArgAsDeclared = true;
   visit(msg, {
     declaration(decl) {
       // Skip all ReservedStatement
       if (!decl.name) return undefined;
 
-      if (declared.has(decl.name)) onError('duplicate-declaration', decl);
-      else declared.add(decl.name);
-
       if (
         decl.value.annotation ||
         (decl.type === 'local' &&
@@ -79,12 +70,10 @@ export function validate(
 
       if (decl.type === 'local') localVars.add(decl.name);
 
+      setArgAsDeclared = decl.type === 'local';
       return () => {
-        for (const ref of declRefs.get(decl.name) ?? []) {
-          if (decl.type !== 'input' || ref !== decl.value.arg) {
-            onError('forward-reference', ref);
-          }
-        }
+        if (declared.has(decl.name)) onError('duplicate-declaration', decl);
+        else declared.add(decl.name);
       };
     },
 
@@ -112,13 +101,14 @@ export function validate(
       }
     },
 
-    value(value, context) {
+    value(value, context, position) {
       if (value.type === 'variable') {
         variables.add(value.name);
-        if (context === 'declaration') {
-          const prev = declRefs.get(value.name);
-          if (prev) prev.push(value);
-          else declRefs.set(value.name, [value]);
+        if (
+          context === 'declaration' &&
+          (position !== 'arg' || setArgAsDeclared)
+        ) {
+          declared.add(value.name);
         }
       }
     },
diff --git a/packages/mf2-messageformat/src/errors.ts b/packages/mf2-messageformat/src/errors.ts
@@ -34,7 +34,6 @@ export class MessageSyntaxError extends MessageError {
     | 'duplicate-declaration'
     | 'duplicate-option'
     | 'extra-content'
-    | 'forward-reference'
     | 'key-mismatch'
     | 'parse-error'
     | 'missing-fallback'
@@ -65,7 +64,6 @@ export class MessageSyntaxError extends MessageError {
         break;
       case 'duplicate-declaration':
       case 'duplicate-option':
-      case 'forward-reference':
       case 'key-mismatch':
       case 'missing-fallback':
       case 'missing-selector-annotation':
@@ -97,7 +95,6 @@ export class MessageDataModelError extends MessageSyntaxError {
   declare type:
     | 'duplicate-declaration'
     | 'duplicate-option'
-    | 'forward-reference'
     | 'key-mismatch'
     | 'missing-fallback'
     | 'missing-selector-annotation';
