Update CHANGE_POINT parser

Author: sddonne

src/parser/__tests__/change_point.test.ts

@@ -220,63 +220,11 @@ describe('CHANGE_POINT command', () => {
   });
 
   describe('configuration order', () => {
-    it('parses AS before ON (reversed order)', () => {
+    it('Throws error if AS is before ON (reversed order)', () => {
       const text = `FROM index | CHANGE_POINT value AS type, pvalue ON key`;
       const query = EsqlQuery.fromSrc(text);
 
-      expect(query.errors.length).toBe(0);
-      expect(query.ast.commands[1]).toMatchObject({
-        type: 'command',
-        name: 'change_point',
-        value: {
-          type: 'column',
-          name: 'value',
-        },
-        key: {
-          type: 'column',
-          name: 'key',
-        },
-        target: {
-          type: {
-            type: 'column',
-            name: 'type',
-          },
-          pvalue: {
-            type: 'column',
-            name: 'pvalue',
-          },
-        },
-        args: [
-          {
-            type: 'column',
-            name: 'value',
-          },
-          {
-            type: 'option',
-            name: 'as',
-            args: [
-              {
-                type: 'column',
-                name: 'type',
-              },
-              {
-                type: 'column',
-                name: 'pvalue',
-              },
-            ],
-          },
-          {
-            type: 'option',
-            name: 'on',
-            args: [
-              {
-                type: 'column',
-                name: 'key',
-              },
-            ],
-          },
-        ],
-      });
+      expect(query.errors.length).toBe(1);
     });
   });
 

src/parser/core/cst_to_ast_converter.ts

@@ -1359,40 +1359,40 @@ export class CstToAstConverter {
 
     command.args.push(value);
 
-    for (const configCtx of ctx.changePointConfiguration_list()) {
-      if (configCtx._key && configCtx._key.getText()) {
-        const key = this.toColumn(configCtx._key);
-        const option = Builder.option(
-          {
-            name: 'on',
-            args: [key],
-          },
-          {
-            location: getPosition(configCtx.ON().symbol, configCtx._key.stop),
-          }
-        );
+    if (ctx._key && ctx._key.getText()) {
+      const key = this.toColumn(ctx._key);
+      const option = Builder.option(
+        {
+          name: 'on',
+          args: [key],
+        },
+        {
+          location: getPosition(ctx.ON().symbol, ctx._key.stop),
+        }
+      );
 
-        command.key = key;
-        command.args.push(option);
-      } else if (configCtx._targetType && configCtx._targetPvalue) {
-        const type = this.toColumn(configCtx._targetType);
-        const pvalue = this.toColumn(configCtx._targetPvalue);
-        const option = Builder.option(
-          {
-            name: 'as',
-            args: [type, pvalue],
-          },
-          {
-            location: getPosition(configCtx.AS().symbol, configCtx._targetPvalue.stop),
-          }
-        );
+      command.key = key;
+      command.args.push(option);
+    }
 
-        command.target = {
-          type,
-          pvalue,
-        };
-        command.args.push(option);
-      }
+    if (ctx._targetType && ctx._targetPvalue) {
+      const type = this.toColumn(ctx._targetType);
+      const pvalue = this.toColumn(ctx._targetPvalue);
+      const option = Builder.option(
+        {
+          name: 'as',
+          args: [type, pvalue],
+        },
+        {
+          location: getPosition(ctx.AS().symbol, ctx._targetPvalue.stop),
+        }
+      );
+
+      command.target = {
+        type,
+        pvalue,
+      };
+      command.args.push(option);
     }
 
     return command;