@sleekcms/cli 1.2.0 → 1.4.0

package/index.js

@@ -4,6 +4,7 @@ const fs = require("fs-extra");
 const axios = require("axios");
 const chokidar = require("chokidar");
 const { program } = require("commander");
+const path = require("path");
 
 const API_BASE_URLS = {
     localhost: "http://localhost:9000/api/template",
@@ -34,7 +35,7 @@ if (!AUTH_TOKEN) {
 
 const API_BASE_URL = API_BASE_URLS[ENV] || API_BASE_URLS.production;
 
-const VIEWS_DIR = AUTH_TOKEN.split('-')[0] + "-views/";
+const VIEWS_DIR = path.resolve(AUTH_TOKEN.split('-')[0] + "-views");
 
 // Axios instance with authorization
 const apiClient = axios.create({
@@ -44,6 +45,18 @@ const apiClient = axios.create({
     maxBodyLength: Infinity,
 });
 
+async function refreshFile(filePath) {
+    try {
+        const relativePath = path.relative(VIEWS_DIR, filePath).replace(/\\/g, "/");
+        const resp = await apiClient.get(`/${fileMap[relativePath].id}`);
+        const template = resp.data;
+        fileMap[relativePath] = template;
+        await fs.outputFile(filePath, template.code);
+        console.log(`✅ Refreshed template for: ${relativePath}`);
+    } catch (error) {
+        console.error("❌ Error refreshing template:", error.response?.data || error.message);
+    }
+}
 
 // Function to fetch and save files
 async function fetchFiles() {
@@ -51,14 +64,14 @@ async function fetchFiles() {
         console.log("📥 Fetching files from API...");
         const response = await apiClient.get("/");
 
-        await fs.ensureDir(`./${VIEWS_DIR}`);
+        await fs.ensureDir(VIEWS_DIR);
 
         for (const file of response.data) {
             if (file.file_path) {
-                const filePath = `./${VIEWS_DIR}${file.file_path}`;
+                const filePath = path.join(VIEWS_DIR, file.file_path);
                 await fs.outputFile(filePath, file.code);
-                fileMap[file.file_path] = file.id;
-                console.log(`✅ Created: ${filePath}`);    
+                fileMap[file.file_path.replace(/\\/g,"/")] = file;
+                console.log(`✅ Created: ${filePath}`);
             }
         }
 
@@ -72,7 +85,7 @@ async function fetchFiles() {
 async function cleanupFiles() {
     console.log("🧹 Cleaning up files...");
     try {
-        await fs.remove(`./${VIEWS_DIR}`);
+        await fs.remove(VIEWS_DIR);
         console.log("✅ Cleanup complete. Exiting...");
     } catch (error) {
         console.error("❌ Error during cleanup:", error.message);
@@ -84,24 +97,32 @@ async function cleanupFiles() {
 function scheduleUpdate(filePath) {
     if (isShuttingDown) return;
 
-    const relativePath = filePath.replace(VIEWS_DIR, ""); // Extract relative file path
-    const fileId = fileMap[relativePath];
+    const relativePath = path.relative(VIEWS_DIR, filePath).replace(/\\/g, "/"); // Extract relative file path
+    const file = fileMap[relativePath];
+
+    if (!file?.id) {
+        console.warn(`⚠️ Skipping update: No matching file found in API for ${relativePath}`);
+        return;
+    }
 
     // Clear previous timeout if it exists
-    if (pendingUpdates[fileId]) {
-        clearTimeout(pendingUpdates[fileId]);
+    if (pendingUpdates[file.id]) {
+        clearTimeout(pendingUpdates[file.id]);
     }
 
     // Schedule a new update after the debounce delay
-    pendingUpdates[fileId] = setTimeout(async () => {
+    pendingUpdates[file.id] = setTimeout(async () => {
         try {
             const code = await fs.readFile(filePath, "utf-8");
-            let template = await apiClient.patch(`/${fileId}`, { code: code || "foo bar" });
-            console.log("✅ Updated template for: ", relativePath, `In: ${code.length}, Out: ${template.data.code.length}`);
+            let template = await apiClient.patch(`/${file.id}`, { code: code || "foo bar", updated_at: file.updated_at });
+            fileMap[relativePath] = template.data;
+            console.log(`✅ Updated template for: ${relativePath} | Length In: ${code.length}, Out: ${template.data.code.length}`);
 
-            delete pendingUpdates[fileId]; // Cleanup
+            delete pendingUpdates[file.id]; // Cleanup
         } catch (error) {
             console.error("❌ Error updating API:", error.response?.data || error.message);
+            // refresh file
+            await refreshFile(filePath);
         }
     }, DEBOUNCE_DELAY);
 }
@@ -109,7 +130,7 @@ function scheduleUpdate(filePath) {
 async function createSchema(filePath) {
     if (isShuttingDown) return;
     try {
-        const relativePath = filePath.replace(VIEWS_DIR, ""); // Extract relative file path
+        const relativePath = path.relative(VIEWS_DIR, filePath).replace(/\\/g, "/");
         const resp = await apiClient.post("/cli", { file_path: relativePath});
         const schema = resp.data;
         const templateResp = await apiClient.get(`/${schema.tmpl_main_id}`);
@@ -117,13 +138,13 @@ async function createSchema(filePath) {
         if (relativePath !== template.file_path) {
             // rename the file
             const oldPath = filePath;
-            const newPath = `./${VIEWS_DIR}${template.file_path}`;
+            const newPath = path.join(VIEWS_DIR, template.file_path);
             watcher.unwatch(newPath);
             await fs.move(oldPath, newPath);
             watcher.add(newPath);
             console.log(`✅ Renamed file from ${relativePath} to ${template.file_path}`);
         }
-        fileMap[template.file_path] = schema.tmpl_main_id;
+        fileMap[template.file_path.replace(/\\/g, "/")] = template;
         console.log("✅ Created model for:", template.file_path);
     } catch (error) {
         console.error("❌ Error creating model:", error.response?.data || error.message);
@@ -136,7 +157,7 @@ async function createSchema(filePath) {
 function monitorFiles() {
     console.log("👀 Watching for file changes...");
 
-    watcher = chokidar.watch(`./${VIEWS_DIR}`, { 
+    watcher = chokidar.watch(VIEWS_DIR, { 
         persistent: true, 
         ignoreInitial: true,
         ignored: /\.vscode\//

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sleekcms/cli",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "SleekCMS CLI for locally editing SleekCMS site template code",
   "main": "index.js",
   "bin": {