@appliance.sh/cli 1.9.0 → 1.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appliance.sh/cli",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "Shell for installing, running, and developing applications on the Appliance platform",
   "repository": "https://github.com/appliance-sh/appliance.sh",
   "license": "MIT",
@@ -17,7 +17,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@appliance.sh/sdk": "1.9.0",
+    "@appliance.sh/sdk": "1.10.0",
     "@inquirer/prompts": "^7.10.1",
     "chalk": "^5.4.1",
     "commander": "^14.0.0",

package/src/appliance-configure.ts

@@ -1,9 +1,15 @@
 import { Command } from 'commander';
-import { extractApplianceFile } from './utils/common.js';
-import { promptForApplianceName } from './wizards/appliance.js';
+import { extractApplianceFile, saveApplianceFile } from './utils/common.js';
+import {
+  promptForApplianceFramework,
+  promptForApplianceName,
+  promptForAppliancePort,
+  promptForApplianceType,
+} from './wizards/appliance.js';
 import * as diff from 'json-diff';
 
 import * as prompt from '@inquirer/prompts';
+import { ApplianceInput, ApplianceType } from '@appliance.sh/sdk';
 
 const program = new Command();
 
@@ -13,37 +19,69 @@ program
 
 const cmd = program.parse(process.argv);
 
-const applianceFile = extractApplianceFile(cmd);
+const applianceFileResult = extractApplianceFile(cmd);
 
 // If a file or directory was specified, but the file was not found, exit with an error.
 if (
   ((cmd.getOptionValue('file') && cmd.getOptionValue('file') !== 'appliance.json') ||
     cmd.getOptionValue('directory')) &&
-  !applianceFile.success
+  !applianceFileResult.success
 ) {
   console.log('The specified file was not found.');
   process.exit(1);
 }
 
+if (!applianceFileResult.success) {
+  console.log(`An error occurred while reading the specified file.`);
+  console.log(applianceFileResult.error);
+}
+
 let updatedApplianceFile = {
-  ...applianceFile.data,
-};
+  manifest: 'v1',
+  ...applianceFileResult.data,
+} as ApplianceInput;
 
 try {
-  const name = await promptForApplianceName(applianceFile.data);
+  const name = await promptForApplianceName(updatedApplianceFile);
 
   updatedApplianceFile = {
-    name,
     ...updatedApplianceFile,
+    name,
   };
 
-  console.log(diff.colorize(diff.diff(applianceFile, updatedApplianceFile)));
+  const type = await promptForApplianceType(updatedApplianceFile);
+
+  if (type === ApplianceType.framework) {
+    const framework = await promptForApplianceFramework(updatedApplianceFile);
+    updatedApplianceFile = {
+      ...updatedApplianceFile,
+      type,
+      framework,
+    };
+  } else if (type === ApplianceType.container) {
+    const port = await promptForAppliancePort(updatedApplianceFile);
+
+    updatedApplianceFile = {
+      ...updatedApplianceFile,
+      type,
+      port,
+    };
+  } else {
+    updatedApplianceFile = {
+      ...updatedApplianceFile,
+      type,
+    };
+  }
+
+  console.log(diff.colorize(diff.diff(applianceFileResult.data, updatedApplianceFile)));
 
   const saveChanges = await prompt.confirm({ message: 'Save changes?', default: true });
   if (!saveChanges) {
     console.log('Changes cancelled.');
     process.exit(0);
   }
+
+  saveApplianceFile(cmd.getOptionValue('file') || 'appliance.json', updatedApplianceFile);
 } catch (error) {
   console.error(error);
 }

package/src/utils/common.ts

@@ -1,7 +1,7 @@
 import { Command } from 'commander';
 import path from 'path';
 import * as fs from 'node:fs';
-import { applianceInput, ApplianceInput, Result } from '@appliance.sh/sdk';
+import { Appliance, applianceInput, ApplianceInput, Result } from '@appliance.sh/sdk';
 
 export function extractApplianceFile(cmd: Command): Result<ApplianceInput> {
   let filePath;
@@ -25,7 +25,7 @@ export function extractApplianceFile(cmd: Command): Result<ApplianceInput> {
 
   try {
     const fileBuf = fs.readFileSync(filePath);
-    const result = applianceInput.safeParse(fileBuf.toString());
+    const result = applianceInput.safeParse(JSON.parse(fileBuf.toString()));
 
     return result;
   } catch (err) {
@@ -35,3 +35,17 @@ export function extractApplianceFile(cmd: Command): Result<ApplianceInput> {
     };
   }
 }
+
+export function saveApplianceFile(filePath: string, appliance: Appliance) {
+  try {
+    fs.writeFileSync(filePath, JSON.stringify(appliance, null, 2));
+    return {
+      success: true,
+    };
+  } catch (err) {
+    return {
+      success: false,
+      error: err as Error,
+    };
+  }
+}

package/src/wizards/appliance.ts

@@ -1,5 +1,5 @@
 import * as prompts from '@inquirer/prompts';
-import { ApplianceInput } from '@appliance.sh/sdk';
+import { ApplianceFramework, ApplianceInput, ApplianceType } from '@appliance.sh/sdk';
 import * as slug from 'random-word-slugs';
 
 export const promptForApplianceName = (config?: Partial<ApplianceInput>) => {
@@ -10,3 +10,35 @@ export const promptForApplianceName = (config?: Partial<ApplianceInput>) => {
 
   return name;
 };
+
+export const promptForApplianceType = (config: Partial<ApplianceInput>) => {
+  const type = prompts.select<ApplianceType>({
+    message: `Choose a type:`,
+    choices: [ApplianceType.framework, ApplianceType.container],
+    default: config?.type ?? ApplianceType.framework,
+  });
+
+  return type;
+};
+
+export const promptForApplianceFramework = (config: Partial<ApplianceInput>) => {
+  const framework = prompts.select<ApplianceFramework>({
+    message: `Choose a framework:`,
+    choices: [ApplianceFramework.Auto, ApplianceFramework.Node, ApplianceFramework.Python],
+    default: (config.type === ApplianceType.framework ? config.framework : undefined) ?? ApplianceFramework.Auto,
+  });
+
+  return framework;
+};
+
+export const promptForAppliancePort = (config: Partial<ApplianceInput>) => {
+  const port = prompts.number<true>({
+    message: 'What port should the app listen on?',
+    min: 1,
+    max: 65535,
+    validate: (value) => !isNaN(parseInt(`${value}`)) || 'Please enter a valid port number',
+    default: (config.type === ApplianceType.container ? config.port : undefined) ?? 8080,
+  });
+
+  return port;
+};