proca 0.6.0 → 0.6.3

package/README.md

@@ -18,7 +18,7 @@ $ npm install -g proca
 $ proca COMMAND
 running command...
 $ proca (--version)
-proca/0.6.0 linux-x64 node-v20.12.2
+proca/0.6.3 linux-x64 node-v20.12.2
 $ proca --help [COMMAND]
 USAGE
   $ proca COMMAND

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "proca",
 	"description": "Access the proca api",
-	"version": "0.6.0",
+	"version": "0.6.3",
 	"author": "Xavier",
 	"bin": {
 		"proca": "./proca-cli"
@@ -16,6 +16,7 @@
 		"dxid": "^2.2.1",
 		"easy-table": "^1.2.0",
 		"fast-csv": "^5.0.1",
+		"graphql": "^16.10.0",
 		"typescript": "^5.7.3",
 		"urql": "^4.1.0"
 	},

package/src/commands/widget/add.mjs

@@ -1,5 +1,6 @@
 import { Args, Flags } from "@oclif/core";
 import { error, stdout, ux } from "@oclif/core/ux";
+import CampaignGet from "#src/commands/campaign/get.mjs";
 import Command from "#src/procaCommand.mjs";
 import { gql, mutation } from "#src/urql.mjs";
 
@@ -34,20 +35,31 @@ export default class WidgetAdd extends Command {
 	};
 
 	create = async (flag) => {
+		const orgName = flag.org;
 		let campaign = { org: { name: orgName } }; // no need to fetch the campaign if the orgName is specified
 
-		const addWidgetDocument = gql`mutation addPage($campaign:String!,$org: String!, $name: String!, $locale: String!) {
-  addActionPage(campaignName:$campaign, orgName: $org, input: {
-    name: $name, locale:$locale
-  }) {
-    id
-  }
-}
-`;
+		const addWidgetDocument = gql`
+      mutation addPage(
+        $campaign: String!
+        $org: String!
+        $name: String!
+        $lang: String!
+      ) {
+        addActionPage(
+          campaignName: $campaign
+          orgName: $org
+          input: { name: $name, locale: $lang }
+        ) {
+          id
+        }
+      }
+    `;
 
 		if (!orgName) {
 			try {
-				campaign = await pullCampaign(campaignName);
+				const campapi = new CampaignGet();
+				campaign = await campapi.fetch({ name: flag.campaign });
+				flag.org = campaign.org.name;
 			} catch (e) {
 				console.log("error", e);
 				throw e;
@@ -55,52 +67,27 @@ export default class WidgetAdd extends Command {
 		}
 
 		if (!campaign) {
-			throw new Error(`campaign not found: ${campaignName}`);
+			throw new Error(`campaign not found: ${flag.campaign}`);
 		}
 
-		const r = await mutation(AddWidgetDocument, flag);
-
-		console.log(r);
-		if (r.errors) {
-			try {
-				console.log(r.errors);
-				if (r.errors[0].path[1] === "name") {
-					console.error("invalid name", name);
-					throw new Error(r.errors[0].message);
-				}
-				if (r.errors[0].extensions?.code === "permission_denied") {
-					console.error(
-						"permission denied to create",
-						name,
-						campaign?.org.name,
-					);
-					throw new Error(r.errors[0].message);
-				}
-				const page = await fetchByName(name);
-				console.warn("duplicate of widget", page.id);
+		try {
+			const r = await mutation(addWidgetDocument, flag);
+			return r;
+		} catch (e) {
+			const errors = e.graphQLErrors;
+			if (errors[0].path[1] === "name") {
+				this.error(`invalid name (already taken?): ${flag.name}`);
+				throw new Error(errors[0].message);
+			}
+			if (r.errors[0].extensions?.code === "permission_denied") {
+				console.error("permission denied to create", name, campaign?.org.name);
 				throw new Error(r.errors[0].message);
-			} catch (e) {
-				console.log(e);
-				throw e;
 			}
+			const page = await fetchByName(name);
+			console.warn("duplicate of widget", page.id);
+			throw new Error(r.errors[0].message);
 		}
 	};
-	_noCreate = async (_org) => {
-		const AddWidgetDocument = gql`
-mutation ($org: String!,$name: String!,$title: String!) {
-  addCampaign(orgName: $org, input: {$org}) {
-    config
-    name
-    title
-  }
-}
-    `;
-		const result = await mutation(AddWidgetDocument, {
-			org,
-		});
-		console.log(result);
-		return result.org;
-	};
 
 	async run() {
 		const { args, flags } = await this.parse();

package/src/util/flags.mjs

@@ -1,33 +0,0 @@
-/*
- * inspired by https://github.com/salesforcecli/cli/blob/main/src/flags.ts
- * Copyright (c) 2020, salesforce.com, inc.
- * All rights reserved.
- * Licensed under the BSD 3-Clause license.
- * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
- */
-
-// -------------------------------------------------------------------------------
-// No requires or imports since this is loaded early in the cli lifecycle and we
-// want to minimize the number of packages that load before enabling require
-// instrumentation.
-// -------------------------------------------------------------------------------
-
-export function _preprocessCliFlags(process) {
-	process.argv.map((arg) => {
-		if (arg === "--dev-debug") {
-			let debug = "*";
-			const filterIndex = process.argv.indexOf("--debug-filter");
-			if (filterIndex > 0) {
-				debug = process.argv[filterIndex + 1];
-
-				process.argv.splice(filterIndex, 2);
-			}
-			// convert --dev-debug into a set of environment variables
-			process.env.DEBUG = debug;
-			process.env.PROCA_ENV = "development";
-
-			// need to calculate indexOf --dev-debug here because it might've changed based on --debug-filter
-			process.argv.splice(process.argv.indexOf("--dev-debug"), 1);
-		}
-	});
-}