proca 1.8.2 → 2.0.1

package/src/hooks/help.mjs

@@ -1,14 +1,14 @@
 import { Config, Help } from "@oclif/core";
 
 export default class CustomHelp extends Help {
-	showCommandHelp(command) {
-		//		console.log("This will be displayed in single-command CLIs");
-		super.showCommandHelp(command);
-	}
+  showCommandHelp(command) {
+    //		console.log("This will be displayed in single-command CLIs");
+    super.showCommandHelp(command);
+  }
 
-	async showHelp(argv) {
-		//    console.log('This will be displayed in multi-command CLIs')
-		// Always include --all flag to show all commands
-		await super.showHelp([...argv, "--all"]);
-	}
+  async showHelp(argv) {
+    //    console.log('This will be displayed in multi-command CLIs')
+    // Always include --all flag to show all commands
+    await super.showHelp([...argv, "--all"]);
+  }
 }

package/src/hooks/init.mjs

@@ -4,38 +4,38 @@ import { getFilename, load } from "#src/config.mjs";
 import CustomHelp from "./help.mjs";
 
 const getEnv = () => {
-	const rawArgs = process.argv.slice(2);
-	let envValue = undefined;
-	// Manually check for --environment or -e
-	rawArgs.findIndex((arg, envIndex) => {
-		if (arg === "--env") {
-			// || arg === '-e') {
-			envValue = rawArgs[envIndex + 1]; // Next arg is the value
-			return true;
-		}
-		if (arg.startsWith("--env=")) {
-			envValue = arg.split("=")[1];
-			return true;
-		}
-	});
+  const rawArgs = process.argv.slice(2);
+  let envValue = undefined;
+  // Manually check for --environment or -e
+  rawArgs.findIndex((arg, envIndex) => {
+    if (arg === "--env") {
+      // || arg === '-e') {
+      envValue = rawArgs[envIndex + 1]; // Next arg is the value
+      return true;
+    }
+    if (arg.startsWith("--env=")) {
+      envValue = arg.split("=")[1];
+      return true;
+    }
+  });
 
-	//      console.log(`Environment set to: ${envValue}`);
+  //      console.log(`Environment set to: ${envValue}`);
 
-	return envValue;
+  return envValue;
 };
 
 const hook = async (opts) => {
-	const config = load(opts.config.configDir, getEnv());
-	if (config) {
-		opts.config.procaConfig = config;
-	} else {
-		const file = getFilename(opts.config.configDir);
-		this.warn("missing config", file);
-	}
+  const config = load(opts.config.configDir, getEnv());
+  if (config) {
+    opts.config.procaConfig = config;
+  } else {
+    const file = getFilename(opts.config.configDir);
+    this.warn("missing config", file);
+  }
 
-	//console.log(opts);
-	//console.log(opts.config.helpClass, CustomHelp);
-	//	opts.config.helpClass = CustomHelp;
+  //console.log(opts);
+  //console.log(opts.config.helpClass, CustomHelp);
+  //	opts.config.helpClass = CustomHelp;
 };
 
 export default hook;

package/src/procaCommand.mjs

@@ -17,15 +17,10 @@ class ProcaCommand extends Command {
       default: "default",
       description: "allow to switch between configurations (server or users)",
     }),
-    human: Flags.boolean({
-      helpGroup: "OUTPUT", // Optional, groups it under a specific help section if desired
-      description: "Format output to be read on screen by a human [default]",
-      default: true,
-    }),
     json: Flags.boolean({
       helpGroup: "OUTPUT", // Optional, groups it under a specific help section if desired
       description: "Format output as json",
-      exclusive: ["human", "csv", "markdown"],
+      exclusive: ["csv", "markdown"],
     }),
     csv: Flags.boolean({
       description: "Format output as csv",
@@ -57,6 +52,14 @@ class ProcaCommand extends Command {
 
   static flagify(params = {}) {
     const flags = Object.assign({}, ProcaCommand.baseFlags);
+    if (params.name) {
+      flags.name = Flags.string({
+        char: "n",
+        charAliases: ["o"],
+        description: typeof params.name === "string" ? params.name : "name",
+        helpValue: "<the_short_name>",
+      });
+    }
     if (params.multiid) {
       flags.id = Flags.string({
         char: "i",
@@ -69,7 +72,6 @@ class ProcaCommand extends Command {
       });
       flags.name = Flags.string({
         char: "n",
-        charAliases: ["o"],
         description: "name",
         helpValue: "<the_short_name>",
       });
@@ -79,6 +81,9 @@ class ProcaCommand extends Command {
 
   async parse() {
     const parsed = await super.parse();
+    if (this.ctor.args.id_name_dxid === undefined) {
+      return parsed;
+    }
     const maybe = parsed.args.id_name_dxid;
     if (maybe) {
       const d = dxid(maybe, false);
@@ -88,6 +93,17 @@ class ProcaCommand extends Command {
     if (parsed.flags.dxid) {
       parsed.flags.id = dxid(parsed.flags.dxid);
     }
+    const identified = [
+      parsed.flags.name,
+      parsed.flags.id,
+      parsed.flags.dxid,
+    ].filter(Boolean).length;
+
+    if (identified === 0) {
+      this.error("One of --name, --id, or --dxid is required");
+    }
+
+    await super.parse(); // check that either the first arg or the name/id/dxid are set
     return parsed;
   }
 
@@ -274,11 +290,15 @@ class ProcaCommand extends Command {
     this.log(Table.print(data, transformRow, print));
   }
 
-  async output(data) {
+  single = (r) => {
+    this.table(r, null, null);
+  };
+
+  async output(data, { single = false } = {}) {
     if (this.format === "json") {
       if (this.flags.simplify)
         return data?.map(this.simplify) || this.simplify(data);
-      const isDirectCall = process.argv.join(":").includes(this.id);
+      //      const isDirectCall = process.argv.join(":").includes(this.id);
       return data;
     }
     if (this.format === "markdown") {
@@ -287,6 +307,9 @@ class ProcaCommand extends Command {
     if (this.format === "csv") {
       return this.csv(data);
     }
+    if (single === true) {
+      return this.single(data);
+    }
     return this.table(data);
   }
 }

package/src/urql.mjs

@@ -1,60 +1,60 @@
 import { authExchange } from "@urql/exchange-auth";
 import {
-	createClient as _createClient,
-	cacheExchange,
-	fetchExchange,
-	gql,
+  createClient as _createClient,
+  cacheExchange,
+  fetchExchange,
+  gql,
 } from "urql";
 
 import { GraphQLError, formatError } from "graphql";
 
 export let client = {
-	query: () => {
-		throw new Error("urql graphql not initialised, call init first");
-	},
+  query: () => {
+    throw new Error("urql graphql not initialised, call init first");
+  },
 };
 
 // Create a URQL client with your GraphQL API endpoint
 export const createClient = (config) => {
-	if (!config) {
-		console.error("config missing on createClient");
-	}
-	client = _createClient({
-		url: config?.url || "https://api.proca.app/api",
-		exchanges: [
-			//		cacheExchange, // Handles caching
-			authExchange(async (utils) => {
-				const token = config.token;
+  if (!config) {
+    console.error("config missing on createClient");
+  }
+  client = _createClient({
+    url: config?.url || "https://api.proca.app/api",
+    exchanges: [
+      //		cacheExchange, // Handles caching
+      authExchange(async (utils) => {
+        const token = config.token;
 
-				return {
-					addAuthToOperation(operation) {
-						if (!token) return operation;
-						return utils.appendHeaders(operation, {
-							Authorization: `Bearer ${token}`,
-						});
-					},
-				};
-			}),
-			fetchExchange, // Handles fetching
-		],
-	});
+        return {
+          addAuthToOperation(operation) {
+            if (!token) return operation;
+            return utils.appendHeaders(operation, {
+              Authorization: `Bearer ${token}`,
+            });
+          },
+        };
+      }),
+      fetchExchange, // Handles fetching
+    ],
+  });
 };
 
 export const query = async (query, payload) => {
-	const result = await client.query(query, payload).toPromise();
-	if (result.error) {
-		//console.log(result.error);
-		throw result.error;
-	}
-	return result.data;
+  const result = await client.query(query, payload).toPromise();
+  if (result.error) {
+    //console.log(result.error);
+    throw result.error;
+  }
+  return result.data;
 };
 
 export const mutation = async (mutation, payload) => {
-	const result = await client.mutation(mutation, payload).toPromise();
-	if (result.error) {
-		throw result.error;
-	}
-	return result.data;
+  const result = await client.mutation(mutation, payload).toPromise();
+  if (result.error) {
+    throw result.error;
+  }
+  return result.data;
 };
 
 export { gql };

package/src/util/twitter.mjs

@@ -1,23 +1,23 @@
 export const getTwitter = async (org) => {
-	const orgName = org.config.twitter?.screen_name || org.name;
-	try {
-		const res = await fetch(
-			`https://twitter.proca.app/?screen_name=${orgName}`,
-		);
+  const orgName = org.config.twitter?.screen_name || org.name;
+  try {
+    const res = await fetch(
+      `https://twitter.proca.app/?screen_name=${orgName}`,
+    );
 
-		if (res.status >= 400) {
-			throw new Error("Bad response from twitter.proca.app");
-		}
+    if (res.status >= 400) {
+      throw new Error("Bad response from twitter.proca.app");
+    }
 
-		const twitter = await res.json();
-		twitter.picture = twitter.profile_image_url_https;
-		twitter.profile_image_url_https = undefined;
-		if (twitter) org.config.twitter = twitter;
-		if (!org.config.description) org.config.description = twitter.description;
-		if (!org.config.location) org.config.location = twitter.location;
-		if (!org.config.url) org.config.url = twitter.url;
-		if (!org.title) org.title = twitter.name;
-	} catch (err) {
-		console.error(err);
-	}
+    const twitter = await res.json();
+    twitter.picture = twitter.profile_image_url_https;
+    twitter.profile_image_url_https = undefined;
+    if (twitter) org.config.twitter = twitter;
+    if (!org.config.description) org.config.description = twitter.description;
+    if (!org.config.location) org.config.location = twitter.location;
+    if (!org.config.url) org.config.url = twitter.url;
+    if (!org.title) org.title = twitter.name;
+  } catch (err) {
+    console.error(err);
+  }
 };

package/theme.json

@@ -1,29 +1,29 @@
 {
-	"info": "cyan",
-	"warn": "#FFAB40",
-	"error": "red",
-	"bin": "block",
-	"command": "cyan",
-	"commandSummary": "black",
-	"dollarSign": "white",
-	"flag": "blackBright",
-	"flagDefaultValue": "blue",
-	"flagOptions": "white",
-	"flagRequired": "red",
-	"flagSeparator": "white",
-	"json": {
-		"brace": "magenta",
-		"bracket": "magenta",
-		"colon": "dim",
-		"comma": "dim",
-		"key": "yellow",
-		"string": "green",
-		"number": "green",
-		"boolean": "green",
-		"null": "red"
-	},
-	"sectionDescription": "blackBright",
-	"sectionHeader": "underline",
-	"topic": "cyan",
-	"version": "white"
+  "info": "cyan",
+  "warn": "#FFAB40",
+  "error": "red",
+  "bin": "block",
+  "command": "cyan",
+  "commandSummary": "black",
+  "dollarSign": "white",
+  "flag": "blackBright",
+  "flagDefaultValue": "blue",
+  "flagOptions": "white",
+  "flagRequired": "red",
+  "flagSeparator": "white",
+  "json": {
+    "brace": "magenta",
+    "bracket": "magenta",
+    "colon": "dim",
+    "comma": "dim",
+    "key": "yellow",
+    "string": "green",
+    "number": "green",
+    "boolean": "green",
+    "null": "red"
+  },
+  "sectionDescription": "blackBright",
+  "sectionHeader": "underline",
+  "topic": "cyan",
+  "version": "white"
 }