better config file detection and creation

Author: crowlKats

config.ts

@@ -1,4 +1,4 @@
-import { join } from "@std/path";
+import { dirname, join } from "@std/path";
 import {
   applyEdits as applyJSONCEdits,
   modify as modifyJSONC,
@@ -10,24 +10,44 @@ export interface Config {
   content: string;
 }
 
-export async function readConfig(rootPath: string): Promise<Config | null> {
-  try {
-    const path = join(rootPath, "deno.json");
-    const content = await Deno.readTextFile(path);
-    return { path, content };
-  } catch (e) {
-    if (!(e instanceof Deno.errors.NotFound)) {
-      throw e;
-    }
+export async function readConfig(
+  rootPath: string,
+  maybeConfigPath: string | undefined,
+): Promise<Config | null> {
+  if (maybeConfigPath) {
+    const content = await Deno.readTextFile(maybeConfigPath);
+    return { path: maybeConfigPath, content };
   }
 
-  try {
-    const path = join(rootPath, "deno.jsonc");
-    const content = await Deno.readTextFile(path);
-    return { path, content };
-  } catch (e) {
-    if (!(e instanceof Deno.errors.NotFound)) {
-      throw e;
+  let currentDir = rootPath;
+
+  while (true) {
+    try {
+      const path = join(currentDir, "deno.json");
+      const content = await Deno.readTextFile(path);
+      return { path, content };
+    } catch (e) {
+      if (!(e instanceof Deno.errors.NotFound)) {
+        throw e;
+      }
+    }
+
+    try {
+      const path = join(currentDir, "deno.jsonc");
+      const content = await Deno.readTextFile(path);
+      return { path, content };
+    } catch (e) {
+      if (!(e instanceof Deno.errors.NotFound)) {
+        throw e;
+      }
+    }
+
+    const parentDir = dirname(currentDir);
+
+    if (parentDir == currentDir) {
+      break;
+    } else {
+      currentDir = parentDir;
     }
   }
 
@@ -59,7 +79,6 @@ export function getAppFromConfig(
 
 export async function writeConfig(
   configContent: Config | null,
-  rootPath: string,
   org: string,
   app: string,
 ) {
@@ -75,7 +94,13 @@ export async function writeConfig(
   });
   const out = applyJSONCEdits(content, edits);
   await Deno.writeTextFile(
-    configContent?.path ?? join(rootPath, "deno.jsonc"),
+    configContent?.path ?? join(Deno.cwd(), "deno.jsonc"),
     out,
   );
+
+  if (!configContent) {
+    console.log(
+      `Created configuration file at '${join(Deno.cwd(), "deno.jsonc")}'`,
+    );
+  }
 }

deno.lock

@@ -25,7 +25,7 @@ type EnvCommandContext = GlobalOptions & {
 export const envListCommand = new Command<EnvCommandContext>()
   .description("List all environmental variables in an application")
   .action(async (options) => {
-    const configContent = await readConfig(Deno.cwd());
+    const configContent = await readConfig(Deno.cwd(), options.config);
     let { org, app } = getAppFromConfig(configContent);
     org ??= options.org;
     app ??= options.app;
@@ -112,7 +112,7 @@ export const envAddCommand = new Command<EnvCommandContext>()
   .option("--secret", "If the value should be secret", { default: false })
   .arguments("<variable:string> <value:string>")
   .action(async (options, variable, value) => {
-    const configContent = await readConfig(Deno.cwd());
+    const configContent = await readConfig(Deno.cwd(), options.config);
     let { org, app } = getAppFromConfig(configContent);
     org ??= options.org;
     app ??= options.app;
@@ -159,7 +159,7 @@ export const envUpdateValueCommand = new Command<EnvCommandContext>()
   )
   .arguments("<variable:string> <value:string>")
   .action(async (options, variable, value) => {
-    const configContent = await readConfig(Deno.cwd());
+    const configContent = await readConfig(Deno.cwd(), options.config);
     let { org, app } = getAppFromConfig(configContent);
     org ??= options.org;
     app ??= options.app;
@@ -209,7 +209,7 @@ You can define no contexts, which is the equivalent to "All"`,
   )
   .arguments("<variable:string> [new-contexts...:string]")
   .action(async (options, variable, ...newContexts) => {
-    const configContent = await readConfig(Deno.cwd());
+    const configContent = await readConfig(Deno.cwd(), options.config);
     let { org, app } = getAppFromConfig(configContent);
     org ??= options.org;
     app ??= options.app;
@@ -274,7 +274,7 @@ export const envDeleteCommand = new Command<EnvCommandContext>()
   .description("Delete an environmental variable in the application")
   .arguments("variable:string")
   .action(async (options, variable) => {
-    const configContent = await readConfig(Deno.cwd());
+    const configContent = await readConfig(Deno.cwd(), options.config);
     let { org, app } = getAppFromConfig(configContent);
     org ??= options.org;
     app ??= options.app;
@@ -324,7 +324,7 @@ export const envLoadCommand = new Command<EnvCommandContext>()
   )
   .arguments("<file:string>")
   .action(async (options, file) => {
-    const configContent = await readConfig(Deno.cwd());
+    const configContent = await readConfig(Deno.cwd(), options.config);
     let { org, app } = getAppFromConfig(configContent);
     org ??= options.org;
     app ??= options.app;

env.ts

@@ -34,6 +34,7 @@ export type GlobalOptions = {
   debug: boolean;
   endpoint: string;
   token: string | undefined;
+  config: string | undefined;
 };
 
 const createCommand = new Command<GlobalOptions>()
@@ -45,10 +46,10 @@ const createCommand = new Command<GlobalOptions>()
   .arguments("[root-path:string]")
   .action(
     async (
-      { debug, endpoint, org: initOrg },
+      { debug, endpoint, org: initOrg, config },
       rootPath = Deno.cwd(),
     ) => {
-      const configContent = await readConfig(rootPath);
+      const configContent = await readConfig(rootPath, config);
       const { org, app } = getAppFromConfig(configContent);
       if (org || app) {
         console.log(
@@ -127,7 +128,7 @@ const tunnelLoginCommand = new Command<GlobalOptions>()
   .arguments("[root-path:string]")
   .hidden()
   .action(async (options, rootPath = Deno.cwd()) => {
-    const configContent = await readConfig(rootPath);
+    const configContent = await readConfig(rootPath, options.config);
     const { org, app } = getAppFromConfig(configContent);
     const gottenApp = await withApp(
       options.debug,
@@ -136,7 +137,7 @@ const tunnelLoginCommand = new Command<GlobalOptions>()
       org,
       app,
     );
-    await writeConfig(configContent, rootPath, gottenApp.org, gottenApp.app);
+    await writeConfig(configContent, gottenApp.org, gottenApp.app);
   });
 
 const envCommand = new Command<GlobalOptions>()
@@ -162,7 +163,7 @@ const logsCommand = new Command<GlobalOptions>()
     depends: ["start"],
   })
   .action(async (options, rootPath = Deno.cwd()) => {
-    const configContent = await readConfig(rootPath);
+    const configContent = await readConfig(rootPath, options.config);
     let { org, app } = getAppFromConfig(configContent);
     org ??= options.org;
     app ??= options.app;
@@ -268,6 +269,7 @@ deploy your local directory to the specified application.`)
     default: false,
   })
   .globalOption("--token <token:string>", "Auth token to use")
+  .globalOption("--config <config:string>", "Path for the config file")
   .option("--org <name:string>", "The name of the organization")
   .option("--app <name:string>", "The name of the application")
   .option("--prod", "Deploy directly to production")
@@ -287,7 +289,7 @@ deploy your local directory to the specified application.`)
       options,
       rootPath = Deno.cwd(),
     ) => {
-      const configContent = await readConfig(rootPath);
+      const configContent = await readConfig(rootPath, options.config);
       let { org, app } = getAppFromConfig(configContent);
       org ??= options.org;
       app ??= options.app;

main.ts

@@ -314,5 +314,5 @@ export async function publish(
     );
   }
 
-  await writeConfig(configContent, rootPath, org, app);
+  await writeConfig(configContent, org, app);
 }