@xano/cli 0.0.25 → 0.0.27

package/dist/commands/workspace/pull/index.js

@@ -3,6 +3,7 @@ import * as yaml from 'js-yaml';
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
+import snakeCase from 'lodash.snakecase';
 import BaseCommand from '../../../base-command.js';
 export default class Pull extends BaseCommand {
     static args = {
@@ -130,19 +131,69 @@ Pulled 58 documents to ./backup
         const filenameCounters = new Map();
         let writtenCount = 0;
         for (const doc of documents) {
-            // Create the type subdirectory
-            const typeDir = path.join(outputDir, doc.type);
-            fs.mkdirSync(typeDir, { recursive: true });
-            // Build the base filename
-            let baseName = this.sanitizeFilename(doc.name);
-            if (doc.verb) {
-                baseName = `${baseName}_${doc.verb}`;
+            let typeDir;
+            let baseName;
+            if (doc.type === 'workspace') {
+                // workspace → workspace/{name}.xs
+                typeDir = path.join(outputDir, 'workspace');
+                baseName = this.sanitizeFilename(doc.name);
+            }
+            else if (doc.type === 'workspace_trigger') {
+                // workspace_trigger → workspace/trigger/{name}.xs
+                typeDir = path.join(outputDir, 'workspace', 'trigger');
+                baseName = this.sanitizeFilename(doc.name);
+            }
+            else if (doc.type === 'agent_trigger') {
+                // agent_trigger → agent/trigger/{name}.xs
+                typeDir = path.join(outputDir, 'agent', 'trigger');
+                baseName = this.sanitizeFilename(doc.name);
+            }
+            else if (doc.type === 'mcp_server_trigger') {
+                // mcp_server_trigger → mcp_server/trigger/{name}.xs
+                typeDir = path.join(outputDir, 'mcp_server', 'trigger');
+                baseName = this.sanitizeFilename(doc.name);
+            }
+            else if (doc.type === 'table_trigger') {
+                // table_trigger → table/trigger/{name}.xs
+                typeDir = path.join(outputDir, 'table', 'trigger');
+                baseName = this.sanitizeFilename(doc.name);
+            }
+            else if (doc.type === 'api_group') {
+                // api_group "test" → api/test/api_group.xs
+                const groupFolder = snakeCase(doc.name);
+                typeDir = path.join(outputDir, 'api', groupFolder);
+                baseName = 'api_group';
             }
-            // Track duplicates per type directory
-            if (!filenameCounters.has(doc.type)) {
-                filenameCounters.set(doc.type, new Map());
+            else if (doc.type === 'query' && doc.apiGroup) {
+                // query in group "test" → api/test/{query_name}.xs
+                const groupFolder = snakeCase(doc.apiGroup);
+                const nameParts = doc.name.split('/');
+                const leafName = nameParts.pop();
+                const folderParts = nameParts.map((part) => snakeCase(part));
+                typeDir = path.join(outputDir, 'api', groupFolder, ...folderParts);
+                baseName = this.sanitizeFilename(leafName);
+                if (doc.verb) {
+                    baseName = `${baseName}_${doc.verb}`;
+                }
             }
-            const typeCounters = filenameCounters.get(doc.type);
+            else {
+                // Default: split folder path from name
+                const nameParts = doc.name.split('/');
+                const leafName = nameParts.pop();
+                const folderParts = nameParts.map((part) => snakeCase(part));
+                typeDir = path.join(outputDir, doc.type, ...folderParts);
+                baseName = this.sanitizeFilename(leafName);
+                if (doc.verb) {
+                    baseName = `${baseName}_${doc.verb}`;
+                }
+            }
+            fs.mkdirSync(typeDir, { recursive: true });
+            // Track duplicates per directory
+            const dirKey = path.relative(outputDir, typeDir);
+            if (!filenameCounters.has(dirKey)) {
+                filenameCounters.set(dirKey, new Map());
+            }
+            const typeCounters = filenameCounters.get(dirKey);
             const count = typeCounters.get(baseName) || 0;
             typeCounters.set(baseName, count + 1);
             // Append numeric suffix for duplicates
@@ -217,7 +268,13 @@ Pulled 58 documents to ./backup
         if (verbMatch) {
             verb = verbMatch[1];
         }
-        return { content, name, type, verb };
+        // Extract api_group if present (e.g., api_group = "test")
+        let apiGroup;
+        const apiGroupMatch = content.match(/api_group\s*=\s*"([^"]*)"/);
+        if (apiGroupMatch) {
+            apiGroup = apiGroupMatch[1];
+        }
+        return { apiGroup, content, name, type, verb };
     }
     /**
      * Sanitize a document name for use as a filename.
@@ -225,9 +282,6 @@ Pulled 58 documents to ./backup
      * characters that are unsafe in filenames.
      */
     sanitizeFilename(name) {
-        return name
-            .replaceAll('"', '')
-            .replaceAll(/\s+/g, '_')
-            .replaceAll(/[<>:"/\\|?*]/g, '_');
+        return snakeCase(name.replaceAll('"', ''));
     }
 }

package/dist/commands/workspace/push/index.js

@@ -107,7 +107,7 @@ Pushed 58 documents from ./backup
             }
             // Log the response if any
             const responseText = await response.text();
-            if (responseText) {
+            if (responseText && responseText !== 'null') {
                 this.log(responseText);
             }
         }