Support WITH SECURITY_ENFORCED (#9)

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.0-alpha.4
+- Support `WITH SECURITY_ENFORCED` in SOQL ([issue](https://github.com/dangmai/prettier-plugin-apex/issues/9)).
+- Fix `npm scripts` pointing to old files.
+
 ## 1.0.0-alpha.3
 
 - Fix DML operation having double indents ([issue](https://github.com/dangmai/prettier-plugin-apex/issues/8)).

src/printer.js

@@ -1266,11 +1266,15 @@ function handleWhereInnerExpression(path, print) {
 }
 
 function handleQuery(path, print) {
+  const withIdentifierDocs = path.map(print, "withIdentifiers");
   const parts = [];
   parts.push(path.call(print, "select"));
   parts.push(path.call(print, "from"));
   _pushIfExist(parts, path.call(print, "where", "value"));
   _pushIfExist(parts, path.call(print, "with", "value"));
+  if (withIdentifierDocs.length > 0) {
+    parts.push(join(" ", withIdentifierDocs));
+  }
   _pushIfExist(parts, path.call(print, "groupBy", "value"));
   _pushIfExist(parts, path.call(print, "orderBy", "value"));
   _pushIfExist(parts, path.call(print, "limit", "value"));
@@ -2202,6 +2206,8 @@ nodeHandler[apexNames.SEARCH_USING_CLAUSE] = (path, print) =>
 nodeHandler[apexNames.USING_TYPE] = handleUsingType;
 nodeHandler[apexNames.BIND_CLAUSE] = handleBindClause;
 nodeHandler[apexNames.BIND_EXPRESSION] = handleBindExpression;
+nodeHandler[apexNames.WITH_IDENTIFIER] = (path, print) =>
+  concat(["WITH", " ", path.call(print, "identifier")]);
 
 function handleTrailingEmptyLines(doc, node) {
   if (node.trailingEmptyLine) {

src/values.js

@@ -204,6 +204,7 @@ const values = {
     WITH_DATA_CATEGORIES: "apex.jorje.data.soql.WithClause$WithDataCategories",
     DATA_CATEGORY: "apex.jorje.data.soql.DataCategory",
     DATA_CATEGORY_OPERATOR: "apex.jorje.data.soql.DataCategoryOperator",
+    WITH_IDENTIFIER: "apex.jorje.data.soql.WithIdentifier",
   },
   BINARY: {
     ADDITION: "+",

tests/soql/SOQLClass.cls

@@ -110,6 +110,12 @@ class SOQLClass {
     Contact[] fullOrder = [SELECT Id FROM Contact ORDER BY Name ASC NULLS FIRST];
   }
 
+  void withIdentifiersSoql() {
+    Account[] withSecurityEnforced = [SELECT Id FROM Account WITH SECURITY_ENFORCED];
+    Account[] withRandomIdentifiers = [SELECT Id FROM Account WITH SECURITY_ENFORCED WITH RANDOM_IDENTIFIER];
+    Account[] withIdentifierOrder = [SELECT Id FROM Account WHERE Name = 'Hello' WITH SECURITY_ENFORCED GROUP BY Id];
+  }
+
   void nicheSoql() {
     Contact[] forView = [SELECT Name, ID FROM Contact  LIMIT 1 FOR VIEW];
     Contact[] forReference = [SELECT Name, ID FROM Contact  LIMIT 1 FOR REFERENCE];

tests/soql/__snapshots__/jsfmt.spec.js.snap

@@ -113,6 +113,12 @@ class SOQLClass {
     Contact[] fullOrder = [SELECT Id FROM Contact ORDER BY Name ASC NULLS FIRST];
   }
 
+  void withIdentifiersSoql() {
+    Account[] withSecurityEnforced = [SELECT Id FROM Account WITH SECURITY_ENFORCED];
+    Account[] withRandomIdentifiers = [SELECT Id FROM Account WITH SECURITY_ENFORCED WITH RANDOM_IDENTIFIER];
+    Account[] withIdentifierOrder = [SELECT Id FROM Account WHERE Name = 'Hello' WITH SECURITY_ENFORCED GROUP BY Id];
+  }
+
   void nicheSoql() {
     Contact[] forView = [SELECT Name, ID FROM Contact  LIMIT 1 FOR VIEW];
     Contact[] forReference = [SELECT Name, ID FROM Contact  LIMIT 1 FOR REFERENCE];
@@ -369,6 +375,26 @@ class SOQLClass {
     ];
   }
 
+  void withIdentifiersSoql() {
+    Account[] withSecurityEnforced = [
+      SELECT Id
+      FROM Account
+      WITH SECURITY_ENFORCED
+    ];
+    Account[] withRandomIdentifiers = [
+      SELECT Id
+      FROM Account
+      WITH SECURITY_ENFORCED WITH RANDOM_IDENTIFIER
+    ];
+    Account[] withIdentifierOrder = [
+      SELECT Id
+      FROM Account
+      WHERE Name = 'Hello'
+      WITH SECURITY_ENFORCED
+      GROUP BY Id
+    ];
+  }
+
   void nicheSoql() {
     Contact[] forView = [SELECT Name, ID FROM Contact LIMIT 1 FOR VIEW];
     Contact[] forReference = [