@boltic/cli 1.0.5 → 1.0.6-beta.0

package/api/environment.js

@@ -19,7 +19,7 @@ const setEnvironment = async (environment) => {
 
 const getEnvironment = async (configData) => {
 	try {
-		return configData.environment || "uat";
+		return configData?.environment || "bolt";
 	} catch (error) {
 		handleError(error);
 	}

package/cli.js

@@ -1,5 +1,6 @@
 import chalk from "chalk";
 import fs from "fs";
+import path from "path";
 import EnvironmentCommands from "./commands/env.js";
 import IntegrationCommands from "./commands/integration.js";
 import AuthCommands from "./commands/login.js";
@@ -73,8 +74,12 @@ const createCLI = (consoleUrl, apiUrl, serviceName, env) => {
 				return;
 			}
 
-			// Check if user is authenticated for all commands except login and help
-			if (command !== "login" && command !== "help") {
+			// Check if user is authenticated for all commands except login, help, and version
+			if (
+				command !== "login" &&
+				command !== "help" &&
+				command !== "version"
+			) {
 				const secrets = await getAllSecrets();
 				const userData = secrets?.reduce(
 					(acc, { account, password }) => {
@@ -101,9 +106,16 @@ const createCLI = (consoleUrl, apiUrl, serviceName, env) => {
 };
 
 async function showHelp(commands) {
-	const packageJson = JSON.parse(
-		fs.readFileSync(new URL("./package.json", import.meta.url))
-	);
+	let packageJson;
+	try {
+		// Try to read package.json from current directory
+		packageJson = JSON.parse(
+			fs.readFileSync(path.join(process.cwd(), "package.json"))
+		);
+	} catch (error) {
+		// Fallback version if package.json not found
+		packageJson = { version: "1.0.0" };
+	}
 	const version = packageJson.version;
 
 	console.log(chalk.bold.yellow(`\nBoltic CLI Version: ${version}\n`));
@@ -127,9 +139,16 @@ async function handleEnvironment(args) {
 }
 
 async function showVersion() {
-	const packageJson = JSON.parse(
-		fs.readFileSync(new URL("./package.json", import.meta.url))
-	);
+	let packageJson;
+	try {
+		// Try to read package.json from current directory
+		packageJson = JSON.parse(
+			fs.readFileSync(path.join(process.cwd(), "package.json"))
+		);
+	} catch (error) {
+		// Fallback version if package.json not found
+		packageJson = { version: "1.0.0" };
+	}
 	const version = packageJson.version;
 	console.log(`Boltic CLI Version: ${version}`);
 }

package/commands/integration.js

@@ -173,6 +173,21 @@ async function handleSync(args) {
 		console.log(chalk.cyan(`\nSyncing integration: ${specContent.name}`));
 
 		console.log("Validating schemas...");
+
+		// Validate resources
+		const { validateIntegrationSchemas } = await import(
+			"../helper/validation.js"
+		);
+		const validationResult = validateIntegrationSchemas(currentDir);
+		if (!validationResult.success) {
+			if (Array.isArray(validationResult.errors)) {
+				validationResult.errors.forEach((error) => {
+					console.error(chalk.red(`\n❌ ${error}`));
+				});
+			}
+			return;
+		}
+
 		const schemas = await readSchemaFiles(currentDir);
 		schemas.status = "draft";
 
@@ -256,6 +271,22 @@ async function handlePublish(args) {
 		console.log(chalk.cyan(`\nSyncing integration: ${specContent.name}`));
 
 		console.log("Validating schemas...");
+
+		// Validate resources
+		const { validateIntegrationSchemas } = await import(
+			"../helper/validation.js"
+		);
+		const validationResult = validateIntegrationSchemas(currentDir);
+		if (!validationResult.success) {
+			if (Array.isArray(validationResult.errors)) {
+				validationResult.errors.forEach((error) => {
+					console.error(chalk.red(`\n❌ ${error}`));
+				});
+			}
+
+			return;
+		}
+
 		const schemas = await readSchemaFiles(currentDir);
 		schemas.status = "draft";
 
@@ -504,6 +535,12 @@ async function handleCreate() {
 			return;
 		}
 
+		const create_catalogue = await confirm({
+			message:
+				"Would you like to create authentication form for this integration?",
+			default: true,
+		});
+
 		// Create the integration
 		try {
 			const integration = await saveIntegration(
@@ -527,7 +564,7 @@ async function handleCreate() {
 							trigger: trigger_ai_description || "",
 						},
 					},
-					create_catalogue: true,
+					create_catalogue: create_catalogue,
 				}
 			);
 

package/helper/env.js

@@ -6,8 +6,16 @@ import { getAllSecrets } from "./secure-storage.js";
  * @returns {Object} Environment configuration including apiUrl, token, session, and accountId
  */
 export const getCurrentEnv = async () => {
-	const secrets = await getAllSecrets();
+	let secrets;
 	let config;
+
+	try {
+		secrets = await getAllSecrets();
+	} catch (_) {
+		// If getAllSecrets fails, use default bolt environment
+		secrets = null;
+	}
+
 	if (secrets && secrets.length > 0) {
 		config = secrets.reduce((acc, { account, password }) => {
 			acc[account] = password;

package/helper/folder.js

@@ -1,5 +1,6 @@
 import chalk from "chalk";
 import fs from "fs";
+import isEmpty from "lodash.isempty";
 import path from "path";
 import {
 	authentication,
@@ -48,30 +49,12 @@ export const createIntegrationFolderStructure = async (integration) => {
 		"schemas/resources/resource1.json": JSON.stringify(resource1, null, 4),
 		"schemas/authentication.json": JSON.stringify(authentication, null, 4),
 		"schemas/base.json": JSON.stringify(base(name), null, 4),
-		"schemas/webhook.json": JSON.stringify(webhook(name), null, 4),
+		...(!isEmpty(trigger_type) && {
+			"schemas/webhook.json": JSON.stringify(webhook(name), null, 4),
+		}),
 		"spec.json": JSON.stringify(spec, null, 4),
-		"Authentication.mdx": `# ${name} Authentication
-
-Describe the authentication process for ${name} integration here.`,
-		"Documentation.mdx": `# ${name} Documentation
-
-${description}
-
-## Overview
-
-Add integration overview here.
-
-## Features
-
-- Feature 1
-- Feature 2
-- Feature 3
-
-## Setup Guide
-
-1. Step 1
-2. Step 2
-3. Step 3`,
+		"Authentication.mdx": `# ${name} Authentication`,
+		"Documentation.mdx": `# ${name} Documentation`,
 	};
 
 	// Create all files

package/helper/validation.js

@@ -0,0 +1,195 @@
+import fs from "fs";
+import isEmpty from "lodash.isempty";
+import path from "path";
+
+const readAndParseJson = (filePath, fileLabel, errors) => {
+	try {
+		const content = fs.readFileSync(filePath, "utf8");
+		if (!content.trim()) {
+			errors.add(`"${fileLabel}" is empty.`);
+			return null;
+		}
+		return JSON.parse(content);
+	} catch (e) {
+		errors.add(`Failed to read or parse "${fileLabel}": ${e.message}`);
+		return null;
+	}
+};
+
+const findResourceFieldsWithOptions = (schema) => {
+	const resourceFields = [];
+	if (Array.isArray(schema?.parameters)) {
+		schema.parameters.forEach((param) => {
+			if (
+				param.name === "resource" &&
+				Array.isArray(param.meta?.options)
+			) {
+				resourceFields.push(
+					...param.meta.options.map((opt) => opt.value)
+				);
+			}
+		});
+	}
+	return resourceFields;
+};
+
+const findOperationFieldsWithOptions = (schema) => {
+	const operationFields = [];
+	if (Array.isArray(schema?.parameters)) {
+		schema.parameters.forEach((param) => {
+			if (
+				param.name === "operation" &&
+				Array.isArray(param.meta?.options)
+			) {
+				operationFields.push(
+					...param.meta.options.map((opt) => opt.value)
+				);
+			}
+		});
+	}
+	return operationFields;
+};
+
+// ─────────────────────────────────────────────────────────────────────────────
+// INDIVIDUAL VALIDATORS
+// ─────────────────────────────────────────────────────────────────────────────
+
+const validateDocumentation = (docPath, errors) => {
+	if (!fs.existsSync(docPath)) {
+		errors.add(`"Documentation.mdx" not found in the root directory.`);
+	}
+};
+
+const validateSpec = (specPath, errors) => {
+	if (!fs.existsSync(specPath)) {
+		errors.add(`"spec.json" not found in the root directory.`);
+		return null;
+	}
+	const spec = readAndParseJson(specPath, "spec.json", errors);
+	return spec;
+};
+
+const validateWebhook = (webhookPath, spec, errors) => {
+	const hasTrigger = spec && !isEmpty(spec.trigger_type);
+	const hasWebhook = fs.existsSync(webhookPath);
+
+	if (hasTrigger && !hasWebhook) {
+		errors.add(
+			`"webhook.json" not found, but trigger_type is defined in spec.json.`
+		);
+	}
+	if (!hasTrigger && hasWebhook) {
+		errors.add(
+			`"webhook.json" exists but trigger_type is not defined in spec.json.`
+		);
+	}
+};
+
+const validateBaseSchema = (baseSchemaPath, errors) => {
+	if (!fs.existsSync(baseSchemaPath)) {
+		errors.add(`"base.json" not found in the "schemas" directory.`);
+		return null;
+	}
+	return readAndParseJson(baseSchemaPath, "base.json", errors);
+};
+
+const validateResources = (resourcesDir, resourceFields, errors) => {
+	if (!fs.existsSync(resourcesDir)) {
+		errors.add(`"resources" directory not found in "schemas".`);
+		return;
+	}
+
+	const resourceFiles = fs
+		.readdirSync(resourcesDir)
+		.filter((f) => f.endsWith(".json"))
+		.map((f) => path.basename(f, ".json"));
+
+	// Check for missing resource files
+	resourceFields.forEach((field) => {
+		if (!resourceFiles.includes(field)) {
+			errors.add(`Resource file: "${field}.json" is missing.`);
+		}
+	});
+
+	// Validate each resource file
+	resourceFiles.forEach((resourceFile) => {
+		const filePath = path.join(resourcesDir, `${resourceFile}.json`);
+		const schema = readAndParseJson(
+			filePath,
+			`${resourceFile}.json`,
+			errors
+		);
+		if (!schema) return;
+
+		const operationFields = findOperationFieldsWithOptions(schema);
+
+		operationFields.forEach((operation) => {
+			const operationMethod = operation.split(".")[1];
+
+			if (!operationMethod) {
+				errors.add(
+					`Invalid format for operation "${operation}" in "${resourceFile}.json". Use "resource.operation".`
+				);
+				return;
+			}
+
+			const methodDef = schema[operationMethod];
+			if (!methodDef) {
+				errors.add(
+					`Operation "${operationMethod}" missing in "${resourceFile}.json".`
+				);
+				return;
+			}
+			if (!methodDef.parameters) {
+				errors.add(
+					`Operation "${operationMethod}" in "${resourceFile}.json" is missing parameters.`
+				);
+			}
+			if (!methodDef.definition) {
+				errors.add(
+					`Operation "${operationMethod}" in "${resourceFile}.json" is missing definition.`
+				);
+			}
+		});
+	});
+};
+
+// ─────────────────────────────────────────────────────────────────────────────
+// MAIN FUNCTION
+// ─────────────────────────────────────────────────────────────────────────────
+
+export const validateIntegrationSchemas = (currentDir) => {
+	const errors = new Set();
+
+	// Define file paths
+	const paths = {
+		base: path.join(currentDir, "schemas", "base.json"),
+		resources: path.join(currentDir, "schemas", "resources"),
+		spec: path.join(currentDir, "spec.json"),
+		webhook: path.join(currentDir, "schemas", "webhook.json"),
+		documentation: path.join(currentDir, "Documentation.mdx"),
+	};
+
+	// Step-by-step validation
+	validateDocumentation(paths.documentation, errors);
+
+	const spec = validateSpec(paths.spec, errors);
+	validateWebhook(paths.webhook, spec, errors);
+
+	const baseSchema = validateBaseSchema(paths.base, errors);
+	const resourceFields = baseSchema
+		? findResourceFieldsWithOptions(baseSchema)
+		: [];
+
+	validateResources(paths.resources, resourceFields, errors);
+
+	// Return results
+	if (errors.size > 0) {
+		return {
+			success: false,
+			errors: Array.from(errors),
+		};
+	}
+
+	return { success: true };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@boltic/cli",
-	"version": "1.0.5",
+	"version": "1.0.6-beta.0",
 	"description": "A powerful CLI tool for managing Boltic Workflow integrations",
 	"main": "index.js",
 	"bin": {
@@ -51,6 +51,7 @@
 		"husky": "^9.1.7",
 		"jest": "^29.7.0",
 		"lint-staged": "^15.4.3",
+		"lodash.isempty": "^4.4.0",
 		"nodemon": "^3.1.9",
 		"prettier": "^3.5.3"
 	}