@gadgetinc/ggt 0.4.9 → 1.0.0

package/lib/commands/dev.js

@@ -0,0 +1,445 @@
+import dayjs from "dayjs";
+import ms from "ms";
+import path from "node:path";
+import Watcher from "watcher";
+import which from "which";
+import { Changes } from "../services/filesync/changes.js";
+import { YarnNotFoundError } from "../services/filesync/error.js";
+import { FileSync } from "../services/filesync/filesync.js";
+import { FileSyncStrategy, MergeConflictPreferenceArg } from "../services/filesync/strategy.js";
+import { SyncJson, SyncJsonArgs, loadSyncJsonDirectory } from "../services/filesync/sync-json.js";
+import { footer } from "../services/output/footer.js";
+import { notify } from "../services/output/notify.js";
+import { println } from "../services/output/print.js";
+import { reportErrorAndExit } from "../services/output/report.js";
+import { select } from "../services/output/select.js";
+import { spin } from "../services/output/spinner.js";
+import { sprint } from "../services/output/sprint.js";
+import { symbol } from "../services/output/symbols.js";
+import { unreachable } from "../services/util/assert.js";
+import { debounceAsync } from "../services/util/function.js";
+import { isAbortError } from "../services/util/is.js";
+import { delay } from "../services/util/promise.js";
+export const args = {
+    ...SyncJsonArgs,
+    "--prefer": MergeConflictPreferenceArg,
+    "--file-push-delay": {
+        type: Number,
+        default: ms("100ms")
+    },
+    "--file-watch-debounce": {
+        type: Number,
+        default: ms("300ms")
+    },
+    "--file-watch-poll-interval": {
+        type: Number,
+        default: ms("3s")
+    },
+    "--file-watch-poll-timeout": {
+        type: Number,
+        default: ms("20s")
+    },
+    "--file-watch-rename-timeout": {
+        type: Number,
+        default: ms("1.25s")
+    }
+};
+export const usage = (ctx)=>{
+    if (ctx.args["-h"]) {
+        return sprint`
+      Develop your app by synchronizing your local files with your
+      environment's files, in real-time. Changes are tracked from
+      the last "ggt dev", "ggt push", or "ggt pull" run locally.
+
+      {bold USAGE}
+        ggt dev [DIRECTORY]
+
+      {bold EXAMPLES}
+        $ ggt dev
+        $ ggt dev ~/gadget/example
+        $ ggt dev ~/gadget/example
+        $ ggt dev ~/gadget/example --app=example
+        $ ggt dev ~/gadget/example --app=example --env=development --prefer=local
+
+      {bold ARGUMENTS}
+        DIRECTORY    The directory to synchronize files to (default: ".")
+
+      {bold FLAGS}
+        -a, --app=<name>           The application to synchronize files with
+        -e, --env=<name>           The environment to synchronize files with
+            --prefer=<filesystem>  Prefer "local" or "environment" conflicting changes
+
+        Run "ggt dev --help" for more information.
+    `;
+    }
+    return sprint`
+    Develop your app by synchronizing your local files with your
+    environment's files, in real-time. Changes are tracked from
+    the last "ggt dev", "ggt push", or "ggt pull" run locally.
+
+    While "ggt dev" is running, changes on your local filesystem are
+    immediately pushed to your environment, while file changes on
+    your environment are immediately pulled to your local filesystem.
+
+    If conflicting changes are detected, and "--prefer" is not passed,
+    you will be prompted to choose which changes to keep before
+    "ggt dev" resumes.
+
+    "ggt dev" looks for an ".ignore" file to exclude files and
+    directories from being pushed or pulled. The format is identical
+    to Git's.
+
+    The following files and directories are always ignored:
+      • .DS_Store
+      • .gadget
+      • .git
+      • node_modules
+
+    Note:
+      • "ggt dev" only works with development environments
+      • "ggt dev" only supports "yarn" v1 for installing dependencies
+      • Avoid deleting or moving all of your files while "ggt dev" is running
+
+    {bold USAGE}
+
+      ggt dev [DIRECTORY] [--app=<name>] [--env=<name>] [--prefer=<filesystem>]
+                          [--allow-unknown-directory] [--allow-different-app]
+
+    {bold EXAMPLES}
+
+      $ ggt dev
+      $ ggt dev ~/gadget/example
+      $ ggt dev ~/gadget/example
+      $ ggt dev ~/gadget/example --app=example
+      $ ggt dev ~/gadget/example --app=example --env=development --prefer=local
+
+    {bold ARGUMENTS}
+
+      DIRECTORY
+        The path to the directory to synchronize files to.
+        The directory will be created if it does not exist.
+
+        Defaults to the current working directory. (default: ".")
+
+    {bold FLAGS}
+
+      -a, --app, --application=<name>
+        The application to synchronize files with.
+
+        Defaults to the application within the ".gadget/sync.json"
+        file in the chosen directory or any parent directories.
+
+      -e, --env, --environment=<name>
+        The development environment to synchronize files with.
+
+        Defaults to the environment within the ".gadget/sync.json"
+        file in the chosen directory or any parent directories.
+
+      --prefer=<filesystem>
+        Which filesystem's changes to automatically keep when
+        conflicting changes are detected.
+
+        Must be one of "local" or "environment".
+
+        If not provided, "ggt dev" will pause when conflicting changes
+        are detected and you will be prompted to choose which changes to
+        keep before "ggt dev" resumes.
+
+      --allow-unknown-directory
+        Allows "ggt dev" to continue when the chosen directory, nor
+        any parent directories, contain a ".gadget/sync.json" file
+        within it.
+
+        Defaults to false.
+
+      --allow-different-app
+        Allows "ggt dev" to continue with a different "--app" than the
+        one found within the ".gadget/sync.json" file.
+
+        Defaults to false.
+
+    Run "ggt dev -h" for less information.
+  `;
+};
+export const command = async (ctx)=>{
+    if (!await which("yarn", {
+        nothrow: true
+    })) {
+        throw new YarnNotFoundError();
+    }
+    const directory = await loadSyncJsonDirectory(ctx.args._[0] || process.cwd());
+    const syncJson = await SyncJson.loadOrInit(ctx, {
+        directory
+    });
+    footer({
+        ensureEmptyLineAbove: true
+    })(syncJson.sprint());
+    const filesync = new FileSync(syncJson);
+    const hashes = await filesync.hashes(ctx);
+    if (!hashes.inSync) {
+        // our local files don't match our environment's files
+        if (!syncJson.previousEnvironment || hashes.localChangesToPush.size === 0 && hashes.onlyDotGadgetFilesChanged) {
+            // one of the following is true:
+            //   - we're developing on this environment for the first time
+            //   - we're developing on the same environment as last time
+            //   - we're developing on a different environment, but only .gadget/ files have changed
+            //  merge the changes (if any) and continue
+            await filesync.merge(ctx, {
+                hashes,
+                printLocalChangesOptions: {
+                    limit: 5
+                },
+                printEnvironmentChangesOptions: {
+                    limit: 5
+                }
+            });
+        } else {
+            // we're switching environment's and files outside of .gadget/
+            // have changed, so ask the user what to do
+            await filesync.print(ctx, {
+                hashes
+            });
+            const choices = Object.values(FileSyncStrategy);
+            const strategy = await select({
+                ensureEmptyLineAbove: true,
+                choices: hashes.bothChanged ? choices : choices.filter((choice)=>choice !== FileSyncStrategy.MERGE),
+                formatChoice: (choice)=>{
+                    switch(choice){
+                        case FileSyncStrategy.CANCEL:
+                            return sprint`Cancel (Ctrl+C)`;
+                        case FileSyncStrategy.MERGE:
+                            return sprint`Merge local and environment's changes`;
+                        case FileSyncStrategy.PUSH:
+                            switch(true){
+                                case hashes.bothChanged:
+                                    return sprint`Push local changes and {underline discard environment's} changes`;
+                                case hashes.localChanges.size > 0:
+                                    return sprint`Push local changes`;
+                                case hashes.environmentChanges.size > 0:
+                                    return sprint`Discard environment's changes`;
+                                default:
+                                    return unreachable("no changes to push or discard");
+                            }
+                        case FileSyncStrategy.PULL:
+                            switch(true){
+                                case hashes.bothChanged:
+                                    return sprint`Pull environment's changes and {underline discard local} changes`;
+                                case hashes.localChanges.size > 0:
+                                    return sprint`Discard local changes`;
+                                case hashes.environmentChanges.size > 0:
+                                    return sprint`Pull environment's changes`;
+                                default:
+                                    return unreachable("no changes to pull or discard");
+                            }
+                    }
+                }
+            })`
+        {bold What do you want to do?}
+      `;
+            switch(strategy){
+                case FileSyncStrategy.CANCEL:
+                    process.exit(0);
+                    break;
+                case FileSyncStrategy.MERGE:
+                    await filesync.merge(ctx, {
+                        hashes
+                    });
+                    break;
+                case FileSyncStrategy.PUSH:
+                    await filesync.push(ctx, {
+                        hashes,
+                        force: true
+                    });
+                    break;
+                case FileSyncStrategy.PULL:
+                    await filesync.pull(ctx, {
+                        hashes,
+                        force: true
+                    });
+                    break;
+            }
+        }
+    }
+    /**
+   * A list of filepaths that have changed because we (this ggt process)
+   * modified them. This is used to avoid reacting to filesystem events
+   * that we caused, which would cause an infinite loop.
+   */ const recentWritesToLocalFilesystem = new Map();
+    const clearRecentWritesInterval = setInterval(()=>{
+        for (const [path, timestamp] of recentWritesToLocalFilesystem){
+            if (dayjs().isAfter(timestamp + ms("5s"))) {
+                // this change should have been seen by now
+                recentWritesToLocalFilesystem.delete(path);
+            }
+        }
+    }, ms("1s")).unref();
+    /**
+   * Subscribe to file changes on Gadget and apply them to the local
+   * filesystem.
+   */ const filesyncSubscription = filesync.subscribeToEnvironmentChanges(ctx, {
+        onError: (error)=>ctx.abort(error),
+        beforeChanges: ({ changed, deleted })=>{
+            // add all the files and directories we're about to touch to
+            // recentWritesToLocalFilesystem so that we don't send them back
+            // to Gadget
+            for (const filepath of [
+                ...changed,
+                ...deleted
+            ]){
+                recentWritesToLocalFilesystem.set(filepath, Date.now());
+                let dir = path.dirname(filepath);
+                while(dir !== "."){
+                    recentWritesToLocalFilesystem.set(dir + "/", Date.now());
+                    dir = path.dirname(dir);
+                }
+            }
+        }
+    });
+    /**
+   * A buffer of local file changes to send to Gadget.
+   */ const localChangesBuffer = new Changes();
+    /**
+   * A debounced function that sends the local file changes to Gadget.
+   */ const mergeChangesWithEnvironment = debounceAsync(ctx.args["--file-push-delay"], async ()=>{
+        try {
+            const lastGitBranch = syncJson.gitBranch;
+            await syncJson.loadGitBranch();
+            if (lastGitBranch !== syncJson.gitBranch) {
+                println({
+                    ensureEmptyLineAbove: true
+                })`
+          Your git branch changed.
+
+          ${lastGitBranch} → ${syncJson.gitBranch}
+        `;
+                // we need all the changes to be sent in a single batch, so wait
+                // a bit in case there are changes the watcher hasn't seen yet
+                const spinner = spin({
+                    ensureEmptyLineAbove: true
+                })("Waiting for file changes to settle.");
+                await delay("3s"); // this time was chosen arbitrarily
+                spinner.succeed();
+            }
+            const changes = new Changes(localChangesBuffer.entries());
+            localChangesBuffer.clear();
+            await filesync.mergeChangesWithEnvironment(ctx, {
+                changes
+            });
+        } catch (error) {
+            ctx.log.error("error sending changes to gadget", {
+                error
+            });
+            ctx.abort(error);
+        }
+    });
+    ctx.log.debug("watching", {
+        path: syncJson.directory.path
+    });
+    /**
+   * Watches the local filesystem for changes.
+   */ const fileWatcher = new Watcher(syncJson.directory.path, {
+        // don't emit an event for every watched file when we start watching
+        ignoreInitial: true,
+        // watch everything
+        recursive: true,
+        // don't emit changes to .gadget/ files because they're readonly (Gadget manages them)
+        ignore: (path)=>syncJson.directory.relative(path).startsWith(".gadget") || syncJson.directory.ignores(path),
+        // emit rename/renameDir events
+        renameDetection: true,
+        // how long to wait for an add event to be followed by an unlink
+        // event, and vice versa (i.e. a rename event)
+        renameTimeout: ctx.args["--file-watch-rename-timeout"],
+        // how long to wait before emitting a change event (helps avoid duplicate events)
+        debounce: ctx.args["--file-watch-debounce"]
+    }, (event, absolutePath, renamedPath)=>{
+        const filepath = event === "rename" || event === "renameDir" ? renamedPath : absolutePath;
+        const isDirectory = event === "renameDir" || event === "addDir" || event === "unlinkDir";
+        const normalizedPath = syncJson.directory.normalize(filepath, isDirectory);
+        ctx.log.trace("file event", {
+            event,
+            isDirectory,
+            path: normalizedPath
+        });
+        if (filepath === syncJson.directory.absolute(".ignore")) {
+            syncJson.directory.loadIgnoreFile().catch((error)=>ctx.abort(error));
+        } else if (syncJson.directory.ignores(filepath)) {
+            return;
+        }
+        if (recentWritesToLocalFilesystem.delete(normalizedPath)) {
+            ctx.log.trace("ignoring event because we caused it", {
+                event,
+                path: normalizedPath
+            });
+            return;
+        }
+        switch(event){
+            case "add":
+            case "addDir":
+                localChangesBuffer.set(normalizedPath, {
+                    type: "create"
+                });
+                break;
+            case "rename":
+            case "renameDir":
+                {
+                    const oldNormalizedPath = syncJson.directory.normalize(absolutePath, isDirectory);
+                    localChangesBuffer.set(normalizedPath, {
+                        type: "create",
+                        oldPath: oldNormalizedPath
+                    });
+                    break;
+                }
+            case "change":
+                {
+                    localChangesBuffer.set(normalizedPath, {
+                        type: "update"
+                    });
+                    break;
+                }
+            case "unlink":
+            case "unlinkDir":
+                {
+                    localChangesBuffer.set(normalizedPath, {
+                        type: "delete"
+                    });
+                    break;
+                }
+        }
+        mergeChangesWithEnvironment();
+    }).once("error", (error)=>ctx.abort(error));
+    ctx.onAbort(async (reason)=>{
+        ctx.log.info("stopping", {
+            reason
+        });
+        filesyncSubscription.unsubscribe();
+        fileWatcher.close();
+        clearInterval(clearRecentWritesInterval);
+        await mergeChangesWithEnvironment.flush();
+        try {
+            await filesync.idle();
+        } catch (error) {
+            ctx.log.error("error while waiting for idle", {
+                error
+            });
+        }
+        if (isAbortError(reason)) {
+            return;
+        }
+        notify(ctx, {
+            subtitle: "Uh oh!",
+            message: "An error occurred while syncing files"
+        });
+        await reportErrorAndExit(ctx, reason);
+    });
+    footer({
+        ensureEmptyLineAbove: true
+    })`
+${syncJson.sprint({
+        indent: 4
+    })}
+
+    Waiting for file changes${symbol.ellipsis} {gray Press Ctrl+C to stop}
+  `;
+};
+
+//# sourceMappingURL=dev.js.map

package/lib/commands/dev.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/commands/dev.ts"],"sourcesContent":["import dayjs from \"dayjs\";\nimport ms from \"ms\";\nimport path from \"node:path\";\nimport Watcher from \"watcher\";\nimport which from \"which\";\nimport type { ArgsDefinition } from \"../services/command/arg.js\";\nimport type { Command, Usage } from \"../services/command/command.js\";\nimport type { Context } from \"../services/command/context.js\";\nimport { Changes } from \"../services/filesync/changes.js\";\nimport { YarnNotFoundError } from \"../services/filesync/error.js\";\nimport { FileSync } from \"../services/filesync/filesync.js\";\nimport { FileSyncStrategy, MergeConflictPreferenceArg } from \"../services/filesync/strategy.js\";\nimport { SyncJson, SyncJsonArgs, loadSyncJsonDirectory } from \"../services/filesync/sync-json.js\";\nimport { footer } from \"../services/output/footer.js\";\nimport { notify } from \"../services/output/notify.js\";\nimport { println } from \"../services/output/print.js\";\nimport { reportErrorAndExit } from \"../services/output/report.js\";\nimport { select } from \"../services/output/select.js\";\nimport { spin } from \"../services/output/spinner.js\";\nimport { sprint } from \"../services/output/sprint.js\";\nimport { symbol } from \"../services/output/symbols.js\";\nimport { unreachable } from \"../services/util/assert.js\";\nimport { debounceAsync } from \"../services/util/function.js\";\nimport { isAbortError } from \"../services/util/is.js\";\nimport { delay } from \"../services/util/promise.js\";\nimport type { PullArgs } from \"./pull.js\";\nimport type { PushArgs } from \"./push.js\";\n\nexport type DevArgs = typeof args;\n\nexport const args = {\n  ...SyncJsonArgs,\n  \"--prefer\": MergeConflictPreferenceArg,\n  \"--file-push-delay\": { type: Number, default: ms(\"100ms\") },\n  \"--file-watch-debounce\": { type: Number, default: ms(\"300ms\") },\n  \"--file-watch-poll-interval\": { type: Number, default: ms(\"3s\") },\n  \"--file-watch-poll-timeout\": { type: Number, default: ms(\"20s\") },\n  \"--file-watch-rename-timeout\": { type: Number, default: ms(\"1.25s\") },\n} satisfies ArgsDefinition;\n\nexport const usage: Usage = (ctx) => {\n  if (ctx.args[\"-h\"]) {\n    return sprint`\n      Develop your app by synchronizing your local files with your\n      environment's files, in real-time. Changes are tracked from\n      the last \"ggt dev\", \"ggt push\", or \"ggt pull\" run locally.\n\n      {bold USAGE}\n        ggt dev [DIRECTORY]\n\n      {bold EXAMPLES}\n        $ ggt dev\n        $ ggt dev ~/gadget/example\n        $ ggt dev ~/gadget/example\n        $ ggt dev ~/gadget/example --app=example\n        $ ggt dev ~/gadget/example --app=example --env=development --prefer=local\n\n      {bold ARGUMENTS}\n        DIRECTORY    The directory to synchronize files to (default: \".\")\n\n      {bold FLAGS}\n        -a, --app=<name>           The application to synchronize files with\n        -e, --env=<name>           The environment to synchronize files with\n            --prefer=<filesystem>  Prefer \"local\" or \"environment\" conflicting changes\n\n        Run \"ggt dev --help\" for more information.\n    `;\n  }\n\n  return sprint`\n    Develop your app by synchronizing your local files with your\n    environment's files, in real-time. Changes are tracked from\n    the last \"ggt dev\", \"ggt push\", or \"ggt pull\" run locally.\n\n    While \"ggt dev\" is running, changes on your local filesystem are\n    immediately pushed to your environment, while file changes on\n    your environment are immediately pulled to your local filesystem.\n\n    If conflicting changes are detected, and \"--prefer\" is not passed,\n    you will be prompted to choose which changes to keep before\n    \"ggt dev\" resumes.\n\n    \"ggt dev\" looks for an \".ignore\" file to exclude files and\n    directories from being pushed or pulled. The format is identical\n    to Git's.\n\n    The following files and directories are always ignored:\n      • .DS_Store\n      • .gadget\n      • .git\n      • node_modules\n\n    Note:\n      • \"ggt dev\" only works with development environments\n      • \"ggt dev\" only supports \"yarn\" v1 for installing dependencies\n      • Avoid deleting or moving all of your files while \"ggt dev\" is running\n\n    {bold USAGE}\n\n      ggt dev [DIRECTORY] [--app=<name>] [--env=<name>] [--prefer=<filesystem>]\n                          [--allow-unknown-directory] [--allow-different-app]\n\n    {bold EXAMPLES}\n\n      $ ggt dev\n      $ ggt dev ~/gadget/example\n      $ ggt dev ~/gadget/example\n      $ ggt dev ~/gadget/example --app=example\n      $ ggt dev ~/gadget/example --app=example --env=development --prefer=local\n\n    {bold ARGUMENTS}\n\n      DIRECTORY\n        The path to the directory to synchronize files to.\n        The directory will be created if it does not exist.\n\n        Defaults to the current working directory. (default: \".\")\n\n    {bold FLAGS}\n\n      -a, --app, --application=<name>\n        The application to synchronize files with.\n\n        Defaults to the application within the \".gadget/sync.json\"\n        file in the chosen directory or any parent directories.\n\n      -e, --env, --environment=<name>\n        The development environment to synchronize files with.\n\n        Defaults to the environment within the \".gadget/sync.json\"\n        file in the chosen directory or any parent directories.\n\n      --prefer=<filesystem>\n        Which filesystem's changes to automatically keep when\n        conflicting changes are detected.\n\n        Must be one of \"local\" or \"environment\".\n\n        If not provided, \"ggt dev\" will pause when conflicting changes\n        are detected and you will be prompted to choose which changes to\n        keep before \"ggt dev\" resumes.\n\n      --allow-unknown-directory\n        Allows \"ggt dev\" to continue when the chosen directory, nor\n        any parent directories, contain a \".gadget/sync.json\" file\n        within it.\n\n        Defaults to false.\n\n      --allow-different-app\n        Allows \"ggt dev\" to continue with a different \"--app\" than the\n        one found within the \".gadget/sync.json\" file.\n\n        Defaults to false.\n\n    Run \"ggt dev -h\" for less information.\n  `;\n};\n\nexport const command: Command<DevArgs> = async (ctx) => {\n  if (!(await which(\"yarn\", { nothrow: true }))) {\n    throw new YarnNotFoundError();\n  }\n\n  const directory = await loadSyncJsonDirectory(ctx.args._[0] || process.cwd());\n  const syncJson = await SyncJson.loadOrInit(ctx, { directory });\n  footer({ ensureEmptyLineAbove: true })(syncJson.sprint());\n\n  const filesync = new FileSync(syncJson);\n  const hashes = await filesync.hashes(ctx);\n\n  if (!hashes.inSync) {\n    // our local files don't match our environment's files\n    if (!syncJson.previousEnvironment || (hashes.localChangesToPush.size === 0 && hashes.onlyDotGadgetFilesChanged)) {\n      // one of the following is true:\n      //   - we're developing on this environment for the first time\n      //   - we're developing on the same environment as last time\n      //   - we're developing on a different environment, but only .gadget/ files have changed\n      //  merge the changes (if any) and continue\n      await filesync.merge(ctx, {\n        hashes,\n        printLocalChangesOptions: {\n          limit: 5,\n        },\n        printEnvironmentChangesOptions: {\n          limit: 5,\n        },\n      });\n    } else {\n      // we're switching environment's and files outside of .gadget/\n      // have changed, so ask the user what to do\n      await filesync.print(ctx, { hashes });\n      const choices = Object.values(FileSyncStrategy);\n\n      const strategy = await select({\n        ensureEmptyLineAbove: true,\n        choices: hashes.bothChanged ? choices : choices.filter((choice) => choice !== FileSyncStrategy.MERGE),\n        formatChoice: (choice) => {\n          switch (choice) {\n            case FileSyncStrategy.CANCEL:\n              return sprint`Cancel (Ctrl+C)`;\n            case FileSyncStrategy.MERGE:\n              return sprint`Merge local and environment's changes`;\n            case FileSyncStrategy.PUSH:\n              switch (true) {\n                case hashes.bothChanged:\n                  return sprint`Push local changes and {underline discard environment's} changes`;\n                case hashes.localChanges.size > 0:\n                  return sprint`Push local changes`;\n                case hashes.environmentChanges.size > 0:\n                  return sprint`Discard environment's changes`;\n                default:\n                  return unreachable(\"no changes to push or discard\");\n              }\n            case FileSyncStrategy.PULL:\n              switch (true) {\n                case hashes.bothChanged:\n                  return sprint`Pull environment's changes and {underline discard local} changes`;\n                case hashes.localChanges.size > 0:\n                  return sprint`Discard local changes`;\n                case hashes.environmentChanges.size > 0:\n                  return sprint`Pull environment's changes`;\n                default:\n                  return unreachable(\"no changes to pull or discard\");\n              }\n          }\n        },\n      })`\n        {bold What do you want to do?}\n      `;\n\n      switch (strategy) {\n        case FileSyncStrategy.CANCEL:\n          process.exit(0);\n          break;\n        case FileSyncStrategy.MERGE:\n          await filesync.merge(ctx, { hashes });\n          break;\n        case FileSyncStrategy.PUSH:\n          await filesync.push(ctx as unknown as Context<PushArgs>, { hashes, force: true });\n          break;\n        case FileSyncStrategy.PULL:\n          await filesync.pull(ctx as unknown as Context<PullArgs>, { hashes, force: true });\n          break;\n      }\n    }\n  }\n\n  /**\n   * A list of filepaths that have changed because we (this ggt process)\n   * modified them. This is used to avoid reacting to filesystem events\n   * that we caused, which would cause an infinite loop.\n   */\n  const recentWritesToLocalFilesystem = new Map<string, number>();\n\n  const clearRecentWritesInterval = setInterval(() => {\n    for (const [path, timestamp] of recentWritesToLocalFilesystem) {\n      if (dayjs().isAfter(timestamp + ms(\"5s\"))) {\n        // this change should have been seen by now\n        recentWritesToLocalFilesystem.delete(path);\n      }\n    }\n  }, ms(\"1s\")).unref();\n\n  /**\n   * Subscribe to file changes on Gadget and apply them to the local\n   * filesystem.\n   */\n  const filesyncSubscription = filesync.subscribeToEnvironmentChanges(ctx, {\n    onError: (error) => ctx.abort(error),\n    beforeChanges: ({ changed, deleted }) => {\n      // add all the files and directories we're about to touch to\n      // recentWritesToLocalFilesystem so that we don't send them back\n      // to Gadget\n      for (const filepath of [...changed, ...deleted]) {\n        recentWritesToLocalFilesystem.set(filepath, Date.now());\n\n        let dir = path.dirname(filepath);\n        while (dir !== \".\") {\n          recentWritesToLocalFilesystem.set(dir + \"/\", Date.now());\n          dir = path.dirname(dir);\n        }\n      }\n    },\n  });\n\n  /**\n   * A buffer of local file changes to send to Gadget.\n   */\n  const localChangesBuffer = new Changes();\n\n  /**\n   * A debounced function that sends the local file changes to Gadget.\n   */\n  const mergeChangesWithEnvironment = debounceAsync(ctx.args[\"--file-push-delay\"], async (): Promise<void> => {\n    try {\n      const lastGitBranch = syncJson.gitBranch;\n      await syncJson.loadGitBranch();\n\n      if (lastGitBranch !== syncJson.gitBranch) {\n        println({ ensureEmptyLineAbove: true })`\n          Your git branch changed.\n\n          ${lastGitBranch} → ${syncJson.gitBranch}\n        `;\n\n        // we need all the changes to be sent in a single batch, so wait\n        // a bit in case there are changes the watcher hasn't seen yet\n        const spinner = spin({ ensureEmptyLineAbove: true })(\"Waiting for file changes to settle.\");\n        await delay(\"3s\"); // this time was chosen arbitrarily\n        spinner.succeed();\n      }\n\n      const changes = new Changes(localChangesBuffer.entries());\n      localChangesBuffer.clear();\n\n      await filesync.mergeChangesWithEnvironment(ctx, { changes });\n    } catch (error) {\n      ctx.log.error(\"error sending changes to gadget\", { error });\n      ctx.abort(error);\n    }\n  });\n\n  ctx.log.debug(\"watching\", { path: syncJson.directory.path });\n\n  /**\n   * Watches the local filesystem for changes.\n   */\n  const fileWatcher = new Watcher(\n    syncJson.directory.path,\n    {\n      // don't emit an event for every watched file when we start watching\n      ignoreInitial: true,\n      // watch everything\n      recursive: true,\n      // don't emit changes to .gadget/ files because they're readonly (Gadget manages them)\n      ignore: (path: string) => syncJson.directory.relative(path).startsWith(\".gadget\") || syncJson.directory.ignores(path),\n      // emit rename/renameDir events\n      renameDetection: true,\n      // how long to wait for an add event to be followed by an unlink\n      // event, and vice versa (i.e. a rename event)\n      renameTimeout: ctx.args[\"--file-watch-rename-timeout\"],\n      // how long to wait before emitting a change event (helps avoid duplicate events)\n      debounce: ctx.args[\"--file-watch-debounce\"],\n    },\n    (event: string, absolutePath: string, renamedPath: string) => {\n      const filepath = event === \"rename\" || event === \"renameDir\" ? renamedPath : absolutePath;\n      const isDirectory = event === \"renameDir\" || event === \"addDir\" || event === \"unlinkDir\";\n      const normalizedPath = syncJson.directory.normalize(filepath, isDirectory);\n\n      ctx.log.trace(\"file event\", { event, isDirectory, path: normalizedPath });\n\n      if (filepath === syncJson.directory.absolute(\".ignore\")) {\n        syncJson.directory.loadIgnoreFile().catch((error) => ctx.abort(error));\n      } else if (syncJson.directory.ignores(filepath)) {\n        return;\n      }\n\n      if (recentWritesToLocalFilesystem.delete(normalizedPath)) {\n        ctx.log.trace(\"ignoring event because we caused it\", { event, path: normalizedPath });\n        return;\n      }\n\n      switch (event) {\n        case \"add\":\n        case \"addDir\":\n          localChangesBuffer.set(normalizedPath, { type: \"create\" });\n          break;\n        case \"rename\":\n        case \"renameDir\": {\n          const oldNormalizedPath = syncJson.directory.normalize(absolutePath, isDirectory);\n          localChangesBuffer.set(normalizedPath, { type: \"create\", oldPath: oldNormalizedPath });\n          break;\n        }\n        case \"change\": {\n          localChangesBuffer.set(normalizedPath, { type: \"update\" });\n          break;\n        }\n        case \"unlink\":\n        case \"unlinkDir\": {\n          localChangesBuffer.set(normalizedPath, { type: \"delete\" });\n          break;\n        }\n      }\n\n      mergeChangesWithEnvironment();\n    },\n  ).once(\"error\", (error) => ctx.abort(error));\n\n  ctx.onAbort(async (reason) => {\n    ctx.log.info(\"stopping\", { reason });\n\n    filesyncSubscription.unsubscribe();\n    fileWatcher.close();\n    clearInterval(clearRecentWritesInterval);\n    await mergeChangesWithEnvironment.flush();\n\n    try {\n      await filesync.idle();\n    } catch (error) {\n      ctx.log.error(\"error while waiting for idle\", { error });\n    }\n\n    if (isAbortError(reason)) {\n      return;\n    }\n\n    notify(ctx, { subtitle: \"Uh oh!\", message: \"An error occurred while syncing files\" });\n    await reportErrorAndExit(ctx, reason);\n  });\n\n  footer({ ensureEmptyLineAbove: true })`\n${syncJson.sprint({ indent: 4 })}\n\n    Waiting for file changes${symbol.ellipsis} {gray Press Ctrl+C to stop}\n  `;\n};\n"],"names":["dayjs","ms","path","Watcher","which","Changes","YarnNotFoundError","FileSync","FileSyncStrategy","MergeConflictPreferenceArg","SyncJson","SyncJsonArgs","loadSyncJsonDirectory","footer","notify","println","reportErrorAndExit","select","spin","sprint","symbol","unreachable","debounceAsync","isAbortError","delay","args","type","Number","default","usage","ctx","command","nothrow","directory","_","process","cwd","syncJson","loadOrInit","ensureEmptyLineAbove","filesync","hashes","inSync","previousEnvironment","localChangesToPush","size","onlyDotGadgetFilesChanged","merge","printLocalChangesOptions","limit","printEnvironmentChangesOptions","print","choices","Object","values","strategy","bothChanged","filter","choice","MERGE","formatChoice","CANCEL","PUSH","localChanges","environmentChanges","PULL","exit","push","force","pull","recentWritesToLocalFilesystem","Map","clearRecentWritesInterval","setInterval","timestamp","isAfter","delete","unref","filesyncSubscription","subscribeToEnvironmentChanges","onError","error","abort","beforeChanges","changed","deleted","filepath","set","Date","now","dir","dirname","localChangesBuffer","mergeChangesWithEnvironment","lastGitBranch","gitBranch","loadGitBranch","spinner","succeed","changes","entries","clear","log","debug","fileWatcher","ignoreInitial","recursive","ignore","relative","startsWith","ignores","renameDetection","renameTimeout","debounce","event","absolutePath","renamedPath","isDirectory","normalizedPath","normalize","trace","absolute","loadIgnoreFile","catch","oldNormalizedPath","oldPath","once","onAbort","reason","info","unsubscribe","close","clearInterval","flush","idle","subtitle","message","indent","ellipsis"],"mappings":"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"}

package/lib/commands/list.js

@@ -1,41 +1,49 @@
 import { getApps } from "../services/app/app.js";
-import { sprint } from "../services/output/sprint.js";
+import { output } from "../services/output/output.js";
+import { println } from "../services/output/print.js";
+import { sprint, sprintln } from "../services/output/sprint.js";
+import { printTable } from "../services/output/table.js";
 import { getUserOrLogin } from "../services/user/user.js";
 export const usage = ()=>sprint`
-    List the apps available to the currently logged in user.
+    List your available applications.
 
     {bold USAGE}
       ggt list
 
-    {bold EXAMPLE}
+    {bold EXAMPLES}
       $ ggt list
-        Slug    Domain
-        ─────── ──────────────────
-        my-app  my-app.gadget.app
-        example example.gadget.app
-        test    test.gadget.app
 `;
 export const command = async (ctx)=>{
     await getUserOrLogin(ctx);
     const apps = await getApps(ctx);
     if (apps.length === 0) {
-        ctx.log.println`
+        println`
         It doesn't look like you have any applications.
 
         Visit https://gadget.new to create one!
     `;
         return;
     }
-    let longestSlug = 0;
-    let longestDomain = 0;
-    for (const app of apps){
-        longestSlug = Math.max(longestSlug, app.slug.length);
-        longestDomain = Math.max(longestDomain, app.primaryDomain.length);
-    }
-    ctx.log.println`{bold Slug}${" ".repeat(longestSlug - 4)} {bold Domain}`;
-    ctx.log.println`${"─".repeat(Math.max(longestSlug, 4))} ${"─".repeat(Math.max(longestDomain, 6))}`;
-    for (const app of apps.sort((a, b)=>a.slug.localeCompare(b.slug))){
-        ctx.log.println`${app.slug}${" ".repeat(longestSlug - app.slug.length)} ${app.primaryDomain}`;
+    if (output.isInteractive) {
+        printTable({
+            json: apps,
+            headers: [
+                "Name",
+                "Domain"
+            ],
+            rows: apps.map((app)=>[
+                    app.slug,
+                    app.primaryDomain
+                ])
+        });
+    } else {
+        let simpleOutput = "";
+        for (const app of apps){
+            simpleOutput += sprintln`${app.slug}\t${app.primaryDomain}`;
+        }
+        println({
+            json: apps
+        })(simpleOutput);
     }
 };
 

package/lib/commands/list.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/commands/list.ts"],"sourcesContent":["import { getApps } from \"../services/app/app.js\";\nimport type { Command, Usage } from \"../services/command/command.js\";\nimport { sprint } from \"../services/output/sprint.js\";\nimport { getUserOrLogin } from \"../services/user/user.js\";\n\nexport const usage: Usage = () => sprint`\n    List the apps available to the currently logged in user.\n\n    {bold USAGE}\n      ggt list\n\n    {bold EXAMPLE}\n      $ ggt list\n        Slug    Domain\n        ─────── ──────────────────\n        my-app  my-app.gadget.app\n        example example.gadget.app\n        test    test.gadget.app\n`;\n\nexport const command: Command = async (ctx) => {\n  await getUserOrLogin(ctx);\n\n  const apps = await getApps(ctx);\n  if (apps.length === 0) {\n    ctx.log.println`\n        It doesn't look like you have any applications.\n\n        Visit https://gadget.new to create one!\n    `;\n    return;\n  }\n\n  let longestSlug = 0;\n  let longestDomain = 0;\n\n  for (const app of apps) {\n    longestSlug = Math.max(longestSlug, app.slug.length);\n    longestDomain = Math.max(longestDomain, app.primaryDomain.length);\n  }\n\n  ctx.log.println`{bold Slug}${\" \".repeat(longestSlug - 4)} {bold Domain}`;\n  ctx.log.println`${\"─\".repeat(Math.max(longestSlug, 4))} ${\"─\".repeat(Math.max(longestDomain, 6))}`;\n  for (const app of apps.sort((a, b) => a.slug.localeCompare(b.slug))) {\n    ctx.log.println`${app.slug}${\" \".repeat(longestSlug - app.slug.length)} ${app.primaryDomain}`;\n  }\n};\n"],"names":["getApps","sprint","getUserOrLogin","usage","command","ctx","apps","length","log","println","longestSlug","longestDomain","app","Math","max","slug","primaryDomain","repeat","sort","a","b","localeCompare"],"mappings":"AAAA,SAASA,OAAO,QAAQ,yBAAyB;AAEjD,SAASC,MAAM,QAAQ,+BAA+B;AACtD,SAASC,cAAc,QAAQ,2BAA2B;AAE1D,OAAO,MAAMC,QAAe,IAAMF,MAAM,CAAC;;;;;;;;;;;;;AAazC,CAAC,CAAC;AAEF,OAAO,MAAMG,UAAmB,OAAOC;IACrC,MAAMH,eAAeG;IAErB,MAAMC,OAAO,MAAMN,QAAQK;IAC3B,IAAIC,KAAKC,MAAM,KAAK,GAAG;QACrBF,IAAIG,GAAG,CAACC,OAAO,CAAC;;;;IAIhB,CAAC;QACD;IACF;IAEA,IAAIC,cAAc;IAClB,IAAIC,gBAAgB;IAEpB,KAAK,MAAMC,OAAON,KAAM;QACtBI,cAAcG,KAAKC,GAAG,CAACJ,aAAaE,IAAIG,IAAI,CAACR,MAAM;QACnDI,gBAAgBE,KAAKC,GAAG,CAACH,eAAeC,IAAII,aAAa,CAACT,MAAM;IAClE;IAEAF,IAAIG,GAAG,CAACC,OAAO,CAAC,WAAW,EAAE,IAAIQ,MAAM,CAACP,cAAc,GAAG,cAAc,CAAC;IACxEL,IAAIG,GAAG,CAACC,OAAO,CAAC,EAAE,IAAIQ,MAAM,CAACJ,KAAKC,GAAG,CAACJ,aAAa,IAAI,CAAC,EAAE,IAAIO,MAAM,CAACJ,KAAKC,GAAG,CAACH,eAAe,IAAI,CAAC;IAClG,KAAK,MAAMC,OAAON,KAAKY,IAAI,CAAC,CAACC,GAAGC,IAAMD,EAAEJ,IAAI,CAACM,aAAa,CAACD,EAAEL,IAAI,GAAI;QACnEV,IAAIG,GAAG,CAACC,OAAO,CAAC,EAAEG,IAAIG,IAAI,CAAC,EAAE,IAAIE,MAAM,CAACP,cAAcE,IAAIG,IAAI,CAACR,MAAM,EAAE,CAAC,EAAEK,IAAII,aAAa,CAAC,CAAC;IAC/F;AACF,EAAE"}
+{"version":3,"sources":["../../src/commands/list.ts"],"sourcesContent":["import { getApps } from \"../services/app/app.js\";\nimport type { Command, Usage } from \"../services/command/command.js\";\nimport { output } from \"../services/output/output.js\";\nimport { println } from \"../services/output/print.js\";\nimport { sprint, sprintln } from \"../services/output/sprint.js\";\nimport { printTable } from \"../services/output/table.js\";\nimport { getUserOrLogin } from \"../services/user/user.js\";\n\nexport const usage: Usage = () => sprint`\n    List your available applications.\n\n    {bold USAGE}\n      ggt list\n\n    {bold EXAMPLES}\n      $ ggt list\n`;\n\nexport const command: Command = async (ctx) => {\n  await getUserOrLogin(ctx);\n\n  const apps = await getApps(ctx);\n  if (apps.length === 0) {\n    println`\n        It doesn't look like you have any applications.\n\n        Visit https://gadget.new to create one!\n    `;\n    return;\n  }\n\n  if (output.isInteractive) {\n    printTable({\n      json: apps,\n      headers: [\"Name\", \"Domain\"],\n      rows: apps.map((app) => [app.slug, app.primaryDomain]),\n    });\n  } else {\n    let simpleOutput = \"\";\n    for (const app of apps) {\n      simpleOutput += sprintln`${app.slug}\\t${app.primaryDomain}`;\n    }\n\n    println({ json: apps })(simpleOutput);\n  }\n};\n"],"names":["getApps","output","println","sprint","sprintln","printTable","getUserOrLogin","usage","command","ctx","apps","length","isInteractive","json","headers","rows","map","app","slug","primaryDomain","simpleOutput"],"mappings":"AAAA,SAASA,OAAO,QAAQ,yBAAyB;AAEjD,SAASC,MAAM,QAAQ,+BAA+B;AACtD,SAASC,OAAO,QAAQ,8BAA8B;AACtD,SAASC,MAAM,EAAEC,QAAQ,QAAQ,+BAA+B;AAChE,SAASC,UAAU,QAAQ,8BAA8B;AACzD,SAASC,cAAc,QAAQ,2BAA2B;AAE1D,OAAO,MAAMC,QAAe,IAAMJ,MAAM,CAAC;;;;;;;;AAQzC,CAAC,CAAC;AAEF,OAAO,MAAMK,UAAmB,OAAOC;IACrC,MAAMH,eAAeG;IAErB,MAAMC,OAAO,MAAMV,QAAQS;IAC3B,IAAIC,KAAKC,MAAM,KAAK,GAAG;QACrBT,OAAO,CAAC;;;;IAIR,CAAC;QACD;IACF;IAEA,IAAID,OAAOW,aAAa,EAAE;QACxBP,WAAW;YACTQ,MAAMH;YACNI,SAAS;gBAAC;gBAAQ;aAAS;YAC3BC,MAAML,KAAKM,GAAG,CAAC,CAACC,MAAQ;oBAACA,IAAIC,IAAI;oBAAED,IAAIE,aAAa;iBAAC;QACvD;IACF,OAAO;QACL,IAAIC,eAAe;QACnB,KAAK,MAAMH,OAAOP,KAAM;YACtBU,gBAAgBhB,QAAQ,CAAC,EAAEa,IAAIC,IAAI,CAAC,EAAE,EAAED,IAAIE,aAAa,CAAC,CAAC;QAC7D;QAEAjB,QAAQ;YAAEW,MAAMH;QAAK,GAAGU;IAC1B;AACF,EAAE"}

package/lib/commands/login.js

@@ -3,6 +3,7 @@ import assert from "node:assert";
 import http from "node:http";
 import open from "open";
 import { config } from "../services/config/config.js";
+import { println } from "../services/output/print.js";
 import { sprint } from "../services/output/sprint.js";
 import { writeSession } from "../services/user/session.js";
 import { getUser } from "../services/user/user.js";
@@ -12,13 +13,8 @@ export const usage = ()=>sprint`
     {bold USAGE}
       ggt login
 
-    {bold EXAMPLE}
+    {bold EXAMPLES}
       $ ggt login
-        We've opened Gadget's login page using your default browser.
-
-        Please log in and then return to this terminal.
-
-        Hello, Jane Doe (jane@example.com)
 `;
 export const login = async (ctx)=>{
     let server;
@@ -36,9 +32,13 @@ export const login = async (ctx)=>{
                     const user = await getUser(ctx);
                     assert(user, "missing user after successful login");
                     if (user.name) {
-                        ctx.log.printlns`Hello, ${user.name} {gray (${user.email})}`;
+                        println({
+                            ensureEmptyLineAbove: true
+                        })`Hello, ${user.name} {gray (${user.email})}`;
                     } else {
-                        ctx.log.printlns`Hello, ${user.email}`;
+                        println({
+                            ensureEmptyLineAbove: true
+                        })`Hello, ${user.email}`;
                     }
                     landingPage.searchParams.set("success", "true");
                     resolve();
@@ -65,16 +65,20 @@ export const login = async (ctx)=>{
         url.searchParams.set("returnTo", `https://${config.domains.services}/auth/cli/callback?port=${port}`);
         try {
             await open(url.toString());
-            ctx.log.printlns`
+            println({
+                ensureEmptyLineAbove: true
+            })`
         We've opened Gadget's login page using your default browser.
 
         Please log in and then return to this terminal.
-    `;
+      `;
         } catch (error) {
             ctx.log.error("failed to open browser", {
                 error
             });
-            ctx.log.printlns`
+            println({
+                ensureEmptyLineAbove: true
+            })`
         Please open the following URL in your browser and log in:
 
           {gray ${url.toString()}}