Update scrubber config and allow nested tags (#13)

Author: alexguo8

cli/index.ts

@@ -302,7 +302,7 @@ async function cli(args: CommandLineArgs): Promise<Options> {
 
   if (!commandLineOptions.testing) {
     const clone = shell.exec(
-      "git clone https://github.com/uwblueprint/starter-code-v2.git",
+      "git clone --single-branch --branch alex/test-scrubber https://github.com/uwblueprint/starter-code-v2.git",
     );
 
     if (clone.code !== 0) {

scrubber/scrubUtils.ts

@@ -11,6 +11,8 @@ const FILE_TYPE_COMMENT: { [key: string]: string } = {
   json: "//",
   ts: "//",
   py: "#",
+  tsx: "//",
+  jsx: "//",
 };
 
 export function getAllTagsAndSetToRemove(
@@ -40,6 +42,7 @@ export function scrubFile(
       const commentType = ext && FILE_TYPE_COMMENT[ext];
       const scrubbedLines: string[] = [];
       let skip = false;
+      let currentTag = "";
 
       const lines: string[] = text.split("\n");
 
@@ -99,10 +102,14 @@ export function scrubFile(
               );
             }
 
-            // NOTE: nested tagging is not currently supported and will lead to unexpected behaviour.
-
             if (tags[tag] === "remove") {
-              skip = brace === TAG_START_CHAR;
+              if (!skip && brace === TAG_START_CHAR) {
+                currentTag = tag;
+                skip = true;
+              } else if (tag === currentTag) {
+                currentTag = "";
+                skip = false;
+              }
             }
 
             // We always scrub tags from the final file.

scrubber/scrubberConfig.json

@@ -26,23 +26,38 @@
       "tagsToKeep": ["auth"]
     },
     "no-auth": {
-      "tagsToKeep": [],
+      "tagsToKeep": ["no-auth"],
       "filesToDelete": [
         "backend/typescript/services/implementations/userService.ts",
         "backend/typescript/services/interfaces/userService.ts",
         "backend/typescript/services/implementations/authService.ts",
         "backend/typescript/services/interfaces/authService.ts",
         "backend/typescript/rest/userRoutes.ts",
         "backend/typescript/rest/authRoutes.ts",
-        "backend/typescript/middlewares/auth.ts",
-        "backend/typescript/middlewares/auth.graphql.ts",
+        "backend/typescript/graphql/resolvers/userResolvers.ts",
+        "backend/typescript/graphql/resolvers/authResolvers.ts",
+        "backend/typescript/graphql/types/userType.ts",
+        "backend/typescript/graphql/types/authType.ts",
+        "backend/typescript/models/user.ts",
+        "backend/typescript/middlewares",
+        "backend/typescript/utilities/firebaseRestClient.ts",
         "backend/python/app/services/implementations/user_service.py",
         "backend/python/app/services/interfaces/user_service.py",
         "backend/python/app/services/implementations/auth_service.py",
         "backend/python/app/services/interfaces/auth_service.py",
         "backend/python/app/rest/user_routes.py",
         "backend/python/app/rest/auth_routes.py",
-        "backend/python/app/middlewares/auth.py"
+        "backend/python/app/middlewares",
+        "backend/python/app/resources/create_user_dto.py",
+        "backend/python/app/resources/token.py",
+        "backend/python/app/resources/update_user_dto.py",
+        "backend/python/app/resources/user_dto.py",
+        "backend/python/app/utilities/firebase_rest_client.py",
+        "frontend/src/APIClients/AuthAPIClient.ts",
+        "frontend/src/components/auth",
+        "frontend/src/components/pages/Default.tsx",
+        "frontend/src/constants/AuthConstants.ts",
+        "frontend/src/contexts/AuthContext.ts"
       ]
     }
   },