@apso/cli 0.3.0 → 0.3.1

package/dist/commands/server/new.d.ts

@@ -10,13 +10,13 @@ export default class New extends BaseCommand {
     static args: {
         name: import("@oclif/core/lib/interfaces/parser").Arg<string | undefined, Record<string, unknown>>;
     };
-    installModules(path: string): Promise<void>;
-    formatApp(root: string): Promise<void>;
-    startApp(root: string): Promise<void>;
+    installModules(projectPath: string): Promise<void>;
+    formatApp(projectPath: string): Promise<void>;
+    startApp(projectPath: string): Promise<void>;
     cloneTemplate(projectPath: string): Promise<void>;
-    run(): Promise<void>;
     validateFlags(): Promise<{
         projectName: string;
         apiType: string;
     }>;
+    run(): Promise<void>;
 }

package/dist/commands/server/new.js

@@ -12,28 +12,25 @@ class New extends base_command_1.default {
         super(...arguments);
         this.CURR_DIR = process.cwd();
     }
-    async installModules(path) {
-        this.log("installing modules");
-        await this.runNpmCommand(["install", "--force", "--prefix", path]);
+    async installModules(projectPath) {
+        this.log("Installing modules...");
+        await this.runNpmCommand(["install", "--force", "--prefix", projectPath]);
     }
-    async formatApp(root) {
-        this.log("cleaning up");
-        shelljs_1.default.cd(root);
-        await this.runNpmCommand(["run", "format", "--prefix", root]);
+    async formatApp(projectPath) {
+        this.log("Formatting code...");
+        shelljs_1.default.cd(projectPath);
+        await this.runNpmCommand(["run", "format", "--prefix", projectPath]);
     }
-    async startApp(root) {
+    async startApp(projectPath) {
         return new Promise((resolve, reject) => {
-            const command = "npm";
+            const isWindows = process.platform === "win32";
+            const command = isWindows ? "npm.cmd" : "npm";
             const args = ["start"];
-            // Explicitly set cwd() to work around issues like
-            // https://github.com/facebook/create-react-app/issues/3326.
-            // Unfortunately we can only do this for Yarn because npm support for
-            // equivalent --prefix flag doesn't help with this issue.
-            // This is why for npm, we run checkThatNpmCanReadCwd() early instead.
-            // args.push('--cwd')
-            // args.push(root)
-            // args.push('--verbose')
-            const child = (0, child_process_1.spawn)(command, args, { stdio: "inherit", cwd: root });
+            const child = (0, child_process_1.spawn)(command, args, {
+                cwd: projectPath,
+                stdio: "inherit",
+                shell: isWindows,
+            });
             child.on("close", (code) => {
                 if (code !== 0) {
                     reject({
@@ -43,15 +40,18 @@ class New extends base_command_1.default {
                 }
                 resolve();
             });
+            child.on("error", (err) => {
+                this.log(`Error starting app: ${err.message}`);
+                reject(err);
+            });
         });
     }
     async cloneTemplate(projectPath) {
-        this.log("Creating project in current folder.");
+        this.log("Cloning service template...");
         if (!fs.existsSync(projectPath) && this.CURR_DIR !== projectPath) {
             fs.mkdirSync(projectPath);
         }
         shelljs_1.default.cd(projectPath);
-        // Execute git clone and capture the result using HTTPS
         const cloneResult = shelljs_1.default.exec(`git clone --depth=1 --branch=main https://github.com/apsoai/service-template.git ${projectPath}`, { silent: true }); // Use silent: true to suppress default output
         // Check if the command failed
         if (cloneResult.code !== 0) {
@@ -66,34 +66,31 @@ class New extends base_command_1.default {
         shelljs_1.default.exec(`rm -rf ${projectPath}/.git`);
         shelljs_1.default.cd(this.CURR_DIR);
     }
-    async run() {
-        this.log("Initializing New Apso Server...");
-        const { projectName,
-        // apiType,
-         } = await this.validateFlags();
-        const CURR_DIR = process.cwd();
-        const projectPath = path.join(CURR_DIR, projectName);
-        await this.cloneTemplate(projectPath);
-        await this.installModules(projectPath);
-        await this.formatApp(projectPath);
-    }
     async validateFlags() {
         var _a;
         const { flags } = await this.parse(New);
         let projectName = flags.name;
         let apiType = (_a = flags.type) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-        if (typeof projectName === "undefined") {
-            // this.error("`name` must be set (e.g. WoofyApp)");
+        if (!projectName) {
             projectName = '';
         }
-        if (typeof apiType === "undefined") {
+        if (!apiType) {
             apiType = "rest";
         }
-        if (apiType !== "rest" && apiType !== "graphql") {
-            this.error("`apiType` must be set (e.g. rest or graphql)");
+        if (!["rest", "graphql"].includes(apiType)) {
+            this.error("`apiType` must be 'rest' or 'graphql'");
         }
         return { projectName, apiType };
     }
+    async run() {
+        this.log("Initializing New Apso Server...");
+        const { projectName } = await this.validateFlags();
+        const CURR_DIR = process.cwd();
+        const projectPath = path.join(CURR_DIR, projectName);
+        await this.cloneTemplate(projectPath);
+        await this.installModules(projectPath);
+        await this.formatApp(projectPath);
+    }
 }
 New.description = "Initialize your server project";
 New.examples = [`$ apso server new --name TestProject`];

package/dist/lib/base-command.js

@@ -1,23 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const child_process_1 = require("child_process");
+const os_1 = tslib_1.__importDefault(require("os"));
 class BaseCommand extends core_1.Command {
     async runNpmCommand(args, silent = false) {
         return new Promise((resolve, reject) => {
-            const command = "npm";
+            const isWindows = os_1.default.platform() === "win32";
+            const command = isWindows ? "npm.cmd" : "npm";
             const cmdStr = `${command} ${args.join(" ")}`;
-            this.log(cmdStr);
-            const child = (0, child_process_1.spawn)(command, args, { stdio: silent ? "ignore" : "inherit" });
+            this.log(`Running: ${cmdStr}`);
+            const child = (0, child_process_1.spawn)(command, args, {
+                stdio: "inherit",
+                shell: isWindows,
+            });
             child.on("close", (code) => {
                 if (code !== 0) {
-                    reject({
-                        command: cmdStr,
-                    });
+                    reject({ command: cmdStr, exitCode: code });
                     return;
                 }
                 resolve();
             });
+            child.on("error", () => {
+                this.error(`Failed to run: ${cmdStr}`);
+            });
         });
     }
 }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.3.0",
+  "version": "0.3.1",
   "commands": {
     "server:new": {
       "id": "server:new",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apso/cli",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Apso CLI",
   "author": "Apso by Mavric - @mavric",
   "bin": {