PR fixes

src/emulator/initEmulators.ts

@@ -8,7 +8,7 @@ import { Emulators } from "./types";
 import { exportConfig } from "../apphosting/config";
 import { detectProjectRoot } from "../detectProjectRoot";
 
-type InitFn = () => Promise<Record<string, string> | null>;
+type InitFn = (currentConfig?: Record<string, any>) => Promise<Record<string, string> | null>;
 type AdditionalInitFnsType = Partial<Record<Emulators, InitFn>>;
 
 export const AdditionalInitFns: AdditionalInitFnsType = {
@@ -46,11 +46,12 @@ export const AdditionalInitFns: AdditionalInitFnsType = {
 
     return mapToObject(additionalConfigs);
   },
-  [Emulators.DATACONNECT]: async () => {
+  [Emulators.DATACONNECT]: async (currentConfig?: Record<string, any>) => {
+    const defaultDataConnectDir = currentConfig?.dataconnect?.source || "dataconnect";
     const dataDir = await promptOnce({
       name: "dataDir",
       type: "input",
-      default: "./postgresData",
+      default: `./${defaultDataConnectDir}/.dataconnect/pgliteData`,
       message:
         "Where do you want to store Postgres data from the Data Connect emulator? " +
         "If set, data will be saved between emulator runs. " +

src/init/features/dataconnect/index.ts

@@ -80,7 +80,10 @@ export async function doSetup(setup: Setup, config: Config): Promise<void> {
   }
   const info = await askQuestions(setup, isBillingEnabled);
   // Most users will want to perist data between emulator runs, so set this to a reasonable default.
-  config.set("emulators.dataconnect.dataDir", "./postgresData");
+
+  const dir: string = config.get("dataconnect.source", "dataconnect");
+  const dataDir = config.get("emulators.dataconnect.dataDir", `${dir}/.dataconnect/pgliteData`);
+  config.set("emulators.dataconnect.dataDir", dataDir);
   await actuate(setup, config, info);
 
   const cwdPlatformGuess = await getPlatformFromFolder(process.cwd());