Commit af459424 authored by Hasang Cho's avatar Hasang Cho
Browse files

fix(mod.ts, lookup.ts): Ensure colors are disabled with -o option in lookup

parent 6af58cf0
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ import * as colors from "@std/fmt/colors";
import { dirname, isAbsolute, resolve } from "@std/path";
import ora from "ora";
import { getContextLoader, getDocumentLoader } from "./docloader.ts";
import { colorEnabled, formatObjectForOutput } from "./mod.ts";
import { spawnTemporaryServer, type TemporaryServer } from "./tempserver.ts";

const logger = getLogger(["fedify", "cli", "lookup"]);
@@ -107,9 +108,8 @@ export async function writeObjectToStream(
      content = object;
    }

    content = Deno.inspect(content, {
      colors: !(options.output),
    });
    const enableColors = colorEnabled && options.output === undefined;
    content = formatObjectForOutput(content, enableColors);

    const encoder = new TextEncoder();
    const bytes = encoder.encode(content + "\n");
+4 −2
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ export const colorEnabled: boolean = Deno.stdout.isTerminal() &&
  !Deno.env.has("NO_COLOR");
setColorEnabled(colorEnabled);

export function formatObjectForOutput(obj: unknown): string {
  if (colorEnabled) {
export function formatObjectForOutput(obj: unknown, colors?: boolean): string {
  const enableColors = colors ?? colorEnabled;

  if (enableColors) {
    return Deno.inspect(obj, { colors: true });
  } else {
    return Deno.inspect(obj, { colors: false });