@hapico/cli 0.0.21 → 0.0.22

package/bin/index.js

@@ -371,12 +371,12 @@ class RoomState {
         return this.isConnected;
     }
 }
-commander_1.program.version("0.0.21").description("Hapico CLI for project management");
+commander_1.program.version("0.0.22").description("Hapico CLI for project management");
 commander_1.program
     .command("clone <id>")
     .description("Clone a project by ID")
     .action(async (id) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const { accessToken } = getStoredToken();
     if (!accessToken) {
         console.error(chalk_1.default.red("✗ You need to login first. Use 'hapico login' command."));
@@ -390,11 +390,13 @@ commander_1.program
     let files = [];
     const apiSpinner = (0, ora_1.default)(chalk_1.default.blue("Fetching project data...")).start();
     try {
+        // ===== 1. Lấy version public/published (giữ nguyên như cũ) =====
         const response = await axios_1.default.get(`https://base.myworkbeast.com/api/views/${id}`);
         const code = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.code;
         const decompressedCode = pako_1.default.inflate(Uint8Array.from(atob(code), (c) => c.charCodeAt(0)), { to: "string" });
         files = ((_b = (0, exports.tryJSONParse)(decompressedCode)) === null || _b === void 0 ? void 0 : _b.files) || [];
         apiSpinner.succeed(chalk_1.default.green("Project data fetched successfully!"));
+        // ===== 2. Download + extract template =====
         const templateSpinner = (0, ora_1.default)(chalk_1.default.blue("Downloading template...")).start();
         const TEMPLATE_URL = "https://files.hcm04.vstorage.vngcloud.vn/assets/template_zalominiapp_devmode.zip";
         const templateResponse = await axios_1.default.get(TEMPLATE_URL, {
@@ -412,9 +414,10 @@ commander_1.program
         if (fs.existsSync(macosxDir)) {
             fs.rmSync(macosxDir, { recursive: true, force: true });
         }
-        // Save project ID to hapico.config.json
+        // Save project ID
         saveProjectId(outputDir, id);
         console.log(chalk_1.default.green("Project cloned successfully!"));
+        // ===== 3. Save file từ version public =====
         const saveSpinner = (0, ora_1.default)(chalk_1.default.blue("Saving project files...")).start();
         files.forEach((file) => {
             const filePath = path.join(process.cwd(), id, "src", file.path);
@@ -425,6 +428,31 @@ commander_1.program
             fs.writeFileSync(filePath, file.content);
         });
         saveSpinner.succeed(chalk_1.default.green("Project files saved successfully!"));
+        // ===== 4. TỰ ĐỘNG PULL PHIÊN BẢN MỚI NHẤT (draft) – ĐÂY LÀ PHẦN MỚI =====
+        const pullSpinner = (0, ora_1.default)(chalk_1.default.blue("Pulling latest changes from server...")).start();
+        try {
+            const pullResponse = await axios_1.default.get(`https://base.myworkbeast.com/api/views/v3/${id}`, {
+                headers: {
+                    Authorization: `Bearer ${accessToken}`,
+                    "Content-Type": "application/json",
+                },
+            });
+            const pullCode = (_c = pullResponse === null || pullResponse === void 0 ? void 0 : pullResponse.data) === null || _c === void 0 ? void 0 : _c.code;
+            if (!pullCode) {
+                pullSpinner.info(chalk_1.default.cyan("No draft version found – using published version."));
+            }
+            else {
+                const pullDecompressed = pako_1.default.inflate(Uint8Array.from(atob(pullCode), (c) => c.charCodeAt(0)), { to: "string" });
+                const latestFiles = ((_d = (0, exports.tryJSONParse)(pullDecompressed)) === null || _d === void 0 ? void 0 : _d.files) || [];
+                const fileManager = new FileManager(path.join(outputDir, "src"));
+                fileManager.syncFiles(latestFiles);
+                pullSpinner.succeed(chalk_1.default.green("✓ Latest changes pulled successfully!"));
+            }
+        }
+        catch (pullErr) {
+            pullSpinner.warn(chalk_1.default.yellow(`⚠ Could not pull latest changes: ${pullErr.message}\n   Run "hapico pull" manually later.`));
+        }
+        // ===== 5. Hướng dẫn chạy dev =====
         console.log(chalk_1.default.cyan(`💡 Run ${chalk_1.default.bold("cd ${id} && npm install && hapico dev")} to start the project.`));
     }
     catch (error) {

package/dist/index.js

@@ -371,12 +371,12 @@ class RoomState {
         return this.isConnected;
     }
 }
-commander_1.program.version("0.0.21").description("Hapico CLI for project management");
+commander_1.program.version("0.0.22").description("Hapico CLI for project management");
 commander_1.program
     .command("clone <id>")
     .description("Clone a project by ID")
     .action(async (id) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const { accessToken } = getStoredToken();
     if (!accessToken) {
         console.error(chalk_1.default.red("✗ You need to login first. Use 'hapico login' command."));
@@ -390,11 +390,13 @@ commander_1.program
     let files = [];
     const apiSpinner = (0, ora_1.default)(chalk_1.default.blue("Fetching project data...")).start();
     try {
+        // ===== 1. Lấy version public/published (giữ nguyên như cũ) =====
         const response = await axios_1.default.get(`https://base.myworkbeast.com/api/views/${id}`);
         const code = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.code;
         const decompressedCode = pako_1.default.inflate(Uint8Array.from(atob(code), (c) => c.charCodeAt(0)), { to: "string" });
         files = ((_b = (0, exports.tryJSONParse)(decompressedCode)) === null || _b === void 0 ? void 0 : _b.files) || [];
         apiSpinner.succeed(chalk_1.default.green("Project data fetched successfully!"));
+        // ===== 2. Download + extract template =====
         const templateSpinner = (0, ora_1.default)(chalk_1.default.blue("Downloading template...")).start();
         const TEMPLATE_URL = "https://files.hcm04.vstorage.vngcloud.vn/assets/template_zalominiapp_devmode.zip";
         const templateResponse = await axios_1.default.get(TEMPLATE_URL, {
@@ -412,9 +414,10 @@ commander_1.program
         if (fs.existsSync(macosxDir)) {
             fs.rmSync(macosxDir, { recursive: true, force: true });
         }
-        // Save project ID to hapico.config.json
+        // Save project ID
         saveProjectId(outputDir, id);
         console.log(chalk_1.default.green("Project cloned successfully!"));
+        // ===== 3. Save file từ version public =====
         const saveSpinner = (0, ora_1.default)(chalk_1.default.blue("Saving project files...")).start();
         files.forEach((file) => {
             const filePath = path.join(process.cwd(), id, "src", file.path);
@@ -425,6 +428,31 @@ commander_1.program
             fs.writeFileSync(filePath, file.content);
         });
         saveSpinner.succeed(chalk_1.default.green("Project files saved successfully!"));
+        // ===== 4. TỰ ĐỘNG PULL PHIÊN BẢN MỚI NHẤT (draft) – ĐÂY LÀ PHẦN MỚI =====
+        const pullSpinner = (0, ora_1.default)(chalk_1.default.blue("Pulling latest changes from server...")).start();
+        try {
+            const pullResponse = await axios_1.default.get(`https://base.myworkbeast.com/api/views/v3/${id}`, {
+                headers: {
+                    Authorization: `Bearer ${accessToken}`,
+                    "Content-Type": "application/json",
+                },
+            });
+            const pullCode = (_c = pullResponse === null || pullResponse === void 0 ? void 0 : pullResponse.data) === null || _c === void 0 ? void 0 : _c.code;
+            if (!pullCode) {
+                pullSpinner.info(chalk_1.default.cyan("No draft version found – using published version."));
+            }
+            else {
+                const pullDecompressed = pako_1.default.inflate(Uint8Array.from(atob(pullCode), (c) => c.charCodeAt(0)), { to: "string" });
+                const latestFiles = ((_d = (0, exports.tryJSONParse)(pullDecompressed)) === null || _d === void 0 ? void 0 : _d.files) || [];
+                const fileManager = new FileManager(path.join(outputDir, "src"));
+                fileManager.syncFiles(latestFiles);
+                pullSpinner.succeed(chalk_1.default.green("✓ Latest changes pulled successfully!"));
+            }
+        }
+        catch (pullErr) {
+            pullSpinner.warn(chalk_1.default.yellow(`⚠ Could not pull latest changes: ${pullErr.message}\n   Run "hapico pull" manually later.`));
+        }
+        // ===== 5. Hướng dẫn chạy dev =====
         console.log(chalk_1.default.cyan(`💡 Run ${chalk_1.default.bold("cd ${id} && npm install && hapico dev")} to start the project.`));
     }
     catch (error) {

package/index.ts

@@ -447,7 +447,7 @@ class RoomState {
   }
 }
 
-program.version("0.0.21").description("Hapico CLI for project management");
+program.version("0.0.22").description("Hapico CLI for project management");
 
 program
   .command("clone <id>")
@@ -470,17 +470,19 @@ program
     const apiSpinner: Ora = ora(chalk.blue("Fetching project data...")).start();
 
     try {
+      // ===== 1. Lấy version public/published (giữ nguyên như cũ) =====
       const response: ApiResponse = await axios.get(
         `https://base.myworkbeast.com/api/views/${id}`
       );
       const code = response?.data?.code;
       const decompressedCode = pako.inflate(
-        Uint8Array.from(atob(code), (c) => c.charCodeAt(0)),  
+        Uint8Array.from(atob(code), (c) => c.charCodeAt(0)),
         { to: "string" }
       );
       files = tryJSONParse(decompressedCode)?.files || [];
       apiSpinner.succeed(chalk.green("Project data fetched successfully!"));
 
+      // ===== 2. Download + extract template =====
       const templateSpinner: Ora = ora(
         chalk.blue("Downloading template...")
       ).start();
@@ -509,11 +511,11 @@ program
         fs.rmSync(macosxDir, { recursive: true, force: true });
       }
 
-      // Save project ID to hapico.config.json
+      // Save project ID
       saveProjectId(outputDir, id);
-
       console.log(chalk.green("Project cloned successfully!"));
 
+      // ===== 3. Save file từ version public =====
       const saveSpinner: Ora = ora(
         chalk.blue("Saving project files...")
       ).start();
@@ -528,6 +530,47 @@ program
         fs.writeFileSync(filePath, file.content);
       });
       saveSpinner.succeed(chalk.green("Project files saved successfully!"));
+
+      // ===== 4. TỰ ĐỘNG PULL PHIÊN BẢN MỚI NHẤT (draft) – ĐÂY LÀ PHẦN MỚI =====
+      const pullSpinner: Ora = ora(
+        chalk.blue("Pulling latest changes from server...")
+      ).start();
+
+      try {
+        const pullResponse = await axios.get(
+          `https://base.myworkbeast.com/api/views/v3/${id}`,
+          {
+            headers: {
+              Authorization: `Bearer ${accessToken}`,
+              "Content-Type": "application/json",
+            },
+          }
+        );
+
+        const pullCode = pullResponse?.data?.code;
+        if (!pullCode) {
+          pullSpinner.info(chalk.cyan("No draft version found – using published version."));
+        } else {
+          const pullDecompressed = pako.inflate(
+            Uint8Array.from(atob(pullCode), (c) => c.charCodeAt(0)),
+            { to: "string" }
+          );
+          const latestFiles: FileContent[] = tryJSONParse(pullDecompressed)?.files || [];
+
+          const fileManager = new FileManager(path.join(outputDir, "src"));
+          fileManager.syncFiles(latestFiles);
+
+          pullSpinner.succeed(chalk.green("✓ Latest changes pulled successfully!"));
+        }
+      } catch (pullErr: any) {
+        pullSpinner.warn(
+          chalk.yellow(
+            `⚠ Could not pull latest changes: ${pullErr.message}\n   Run "hapico pull" manually later.`
+          )
+        );
+      }
+
+      // ===== 5. Hướng dẫn chạy dev =====
       console.log(
         chalk.cyan(
           `💡 Run ${chalk.bold("cd ${id} && npm install && hapico dev")} to start the project.`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hapico/cli",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "A simple CLI tool for project management",
   "main": "index.js",
   "bin": {