Merge pull request #51 from adangel/sosl-tolabel

Support toLabel in SOSL queries
apex-dev-tools · Sep 2, 2024 · aeb4b19 · aeb4b19
2 parents 8522020 + e52b7ee
commit aeb4b19
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/antlr/ApexParser.g4 b/antlr/ApexParser.g4
@@ -865,6 +865,7 @@ fieldSpec
 
 fieldList
     : soslId (COMMA fieldList)*
+    | TOLABEL LPAREN soslId RPAREN
     ;
 
 updateList

diff --git a/jvm/src/test/java/io/github/apexdevtools/apexparser/SOSLParserTest.java b/jvm/src/test/java/io/github/apexdevtools/apexparser/SOSLParserTest.java
@@ -76,4 +76,12 @@ void testWithSystemModeQuery() {
         assertNotNull(context);
         assertEquals(0, parserAndCounter.getValue().getNumErrors());
     }
+
+    @Test
+    void testToLabel() {
+        Map.Entry<ApexParser, SyntaxErrorCounter> parserAndCounter = createParser("[FIND :searchTerm IN ALL FIELDS RETURNING Account(Id, toLabel(Name)) LIMIT 10]");
+        ApexParser.SoslLiteralContext context = parserAndCounter.getKey().soslLiteral();
+        assertNotNull(context);
+        assertEquals(0, parserAndCounter.getValue().getNumErrors());
+    }
 }
diff --git a/npm/src/__tests__/SOSLParserTest.ts b/npm/src/__tests__/SOSLParserTest.ts
@@ -65,17 +65,26 @@ test('testQuotesFailOnAltFormat', () => {
 test('testWithUserModeQuery', () => {
     const [parser, errorCounter] = createParser("[Find 'something' RETURNING Account WITH USER_MODE WITH METADATA='Labels']")
 
-    const context = parser.soslLiteralAlt()
+    const context = parser.soslLiteral()
 
-    expect(context).toBeInstanceOf(SoslLiteralAltContext)
-    expect(errorCounter.getNumErrors()).toEqual(1)
+    expect(context).toBeInstanceOf(SoslLiteralContext)
+    expect(errorCounter.getNumErrors()).toEqual(0)
 })
 
 test('testWithSystemModeQuery', () => {
     const [parser, errorCounter] = createParser("[Find 'something' RETURNING Account WITH METADATA='Labels' WITH SYSTEM_MODE]")
 
-    const context = parser.soslLiteralAlt()
+    const context = parser.soslLiteral()
 
-    expect(context).toBeInstanceOf(SoslLiteralAltContext)
-    expect(errorCounter.getNumErrors()).toEqual(1)
+    expect(context).toBeInstanceOf(SoslLiteralContext)
+    expect(errorCounter.getNumErrors()).toEqual(0)
+})
+
+test('testToLabel', () => {
+    const [parser, errorCounter] = createParser("[FIND :searchTerm IN ALL FIELDS RETURNING Account(Id, toLabel(Name)) LIMIT 10]")
+
+    const context = parser.soslLiteral()
+
+    expect(context).toBeInstanceOf(SoslLiteralContext)
+    expect(errorCounter.getNumErrors()).toEqual(0)
 })