Refactor dataconnect to use the common appUtils models (#9286)

* Refactor dataconnect to use the common appUtils models

* Print all platforms in the init prompt

* Respond to more code review comments

Author: schnecle

src/appUtils.spec.ts

@@ -615,7 +615,27 @@ describe("appUtils", () => {
         {
           platform: Platform.WEB,
           directory: ".",
-          frameworks: ["REACT"],
+          frameworks: ["react"],
+        },
+      ]);
+    });
+
+    it("should detect angular web framework", async () => {
+      mockfs({
+        [testDir]: {
+          "package.json": JSON.stringify({
+            dependencies: {
+              "@angular/core": "1.0.0",
+            },
+          }),
+        },
+      });
+      const apps = cleanUndefinedFields(await detectApps(testDir));
+      expect(apps).to.have.deep.members([
+        {
+          platform: Platform.WEB,
+          directory: ".",
+          frameworks: ["angular"],
         },
       ]);
     });
@@ -635,7 +655,7 @@ describe("appUtils", () => {
         {
           platform: Platform.WEB,
           directory: ".",
-          frameworks: ["REACT"],
+          frameworks: ["react"],
         },
       ]);
     });
@@ -655,7 +675,7 @@ describe("appUtils", () => {
         {
           platform: Platform.WEB,
           directory: ".",
-          frameworks: ["ANGULAR"],
+          frameworks: ["angular"],
         },
       ]);
     });

src/appUtils.ts

@@ -17,8 +17,8 @@ export enum Platform {
  * Supported web frameworks.
  */
 export enum Framework {
-  REACT = "REACT",
-  ANGULAR = "ANGULAR",
+  REACT = "react",
+  ANGULAR = "angular",
 }
 
 interface AppIdentifier {
@@ -176,8 +176,8 @@ async function packageJsonToWebApp(dirPath: string, packageJsonFile: string): Pr
 
 const WEB_FRAMEWORKS: Framework[] = Object.values(Framework);
 const WEB_FRAMEWORKS_SIGNALS: { [key in Framework]: string[] } = {
-  REACT: ["react", "next"],
-  ANGULAR: ["@angular/core"],
+  react: ["react", "next"],
+  angular: ["@angular/core"],
 };
 
 async function detectAppIdsForPlatform(

src/commands/apps-init.ts

@@ -17,7 +17,7 @@ import { requireAuth } from "../requireAuth";
 import { logger } from "../logger";
 import { Options } from "../options";
 import { needProjectId } from "../projectUtils";
-import { Platform } from "../dataconnect/types";
+import { Platform } from "../appUtils";
 import { assertEnabled } from "../experiments";
 
 export interface AppsInitOptions extends Options {

src/dataconnect/appFinder.spec.ts

@@ -153,8 +153,6 @@ export interface SupportedFrameworks {
   angular?: boolean;
 }
 
-export type Framework = keyof SupportedFrameworks;
-
 export interface JavascriptSDK extends SupportedFrameworks {
   outputDir: string;
   package: string;
@@ -174,15 +172,6 @@ export interface DartSDK {
   package: string;
 }
 
-export enum Platform {
-  NONE = "NONE",
-  ANDROID = "ANDROID",
-  WEB = "WEB",
-  IOS = "IOS",
-  FLUTTER = "FLUTTER",
-  MULTIPLE = "MULTIPLE",
-}
-
 // Helper types && converters
 export interface ServiceInfo {
   serviceName: string;