@swell/cli 2.3.3 → 2.3.4

package/dist/commands/inspect/models.d.ts

@@ -16,7 +16,7 @@ export default class Models extends SwellCommand {
     private showStandardModels;
     private showAppModels;
     private showModels;
-    private showCollectionPath;
+    private getModelPath;
     private getCurrentAppSlugId;
     private getAppSlugId;
     private showModelDetail;

package/dist/commands/inspect/models.js

@@ -31,6 +31,7 @@ With a collection path, it retrieves the model for that specific collection in J
     static examples = [
         'swell inspect models',
         'swell inspect models /products',
+        'swell inspect models /content/blogs',
         'swell inspect models /apps/myapp/orders',
         'swell inspect models /orders --live',
     ];
@@ -69,7 +70,6 @@ With a collection path, it retrieves the model for that specific collection in J
             adminPath: '/data/:models',
         }, {
             query: {
-                content_id: { $exists: false },
                 deprecated: { $ne: true },
                 development: { $ne: true },
                 abstract: { $ne: true },
@@ -102,6 +102,7 @@ With a collection path, it retrieves the model for that specific collection in J
         this.log();
         this.log('Examples:');
         this.log('  swell inspect models /products');
+        this.log('  swell inspect models /content/blogs');
         this.log('  swell inspect models /apps/myapp/orders');
     }
     showStandardModels(models) {
@@ -123,20 +124,34 @@ With a collection path, it retrieves the model for that specific collection in J
     showModels(models, label, options) {
         this.log(label);
         this.log();
-        const sortedModels = [...models].sort((a, b) => a.name.localeCompare(b.name));
+        const sortedModels = [...models].sort((a, b) => {
+            const pathA = this.getModelPath(a, options?.pathPrefix);
+            const pathB = this.getModelPath(b, options?.pathPrefix);
+            return pathA.localeCompare(pathB);
+        });
         for (const model of sortedModels) {
-            this.showCollectionPath(model.name, 2, options);
+            const modelPath = this.getModelPath(model, options?.pathPrefix);
+            this.log(`  ${modelPath}`);
             const sortedSubModels = Object.values(model.fields)
                 .filter((field) => field.type === 'collection')
                 .map((field) => field.name)
                 .sort((a, b) => a.localeCompare(b));
             for (const sub of sortedSubModels) {
-                this.showCollectionPath(sub, 4, options);
+                const subPath = options?.pathPrefix
+                    ? `${options.pathPrefix}/${sub}`
+                    : `/${sub}`;
+                this.log(`    ${subPath}`);
             }
         }
     }
-    showCollectionPath(collection, indent = 0, options) {
-        this.log(`${' '.repeat(indent)}${options?.pathPrefix || ''}/${collection}`);
+    getModelPath(model, pathPrefix) {
+        if (pathPrefix) {
+            return `${pathPrefix}/${model.name}`;
+        }
+        if (model.namespace) {
+            return `/${model.namespace}/${model.name}`;
+        }
+        return `/${model.name}`;
     }
     async getCurrentAppSlugId() {
         const hasAppContext = fs.existsSync('swell.json');
@@ -155,15 +170,32 @@ With a collection path, it retrieves the model for that specific collection in J
         return app.public_id || app.private_id.replace(/^_/, '');
     }
     async showModelDetail(path) {
-        const [modelPath, subModelKey] = await this.resolveModelPath(path);
-        const model = await this.api.get({
-            adminPath: `/data/:models${modelPath}`,
-        }, { query: { $app: true } });
+        const [modelPath, subModelKey, namespace] = await this.resolveModelPath(path);
+        let model = null;
+        if (namespace) {
+            // For namespaced models, fetch by name and namespace filter
+            // since the API may return a different model with the same name
+            const modelName = modelPath.slice(1); // Remove leading /
+            const { results } = await this.api.get({ adminPath: '/data/:models' }, {
+                query: {
+                    name: modelName,
+                    namespace,
+                    $app: true,
+                },
+            });
+            model = results?.[0] ?? null;
+        }
+        else {
+            model = await this.api.get({
+                adminPath: `/data/:models${modelPath}`,
+            }, { query: { $app: true } });
+        }
         if (!model) {
             this.throwModelNotFound(path);
         }
         if (!subModelKey) {
-            return this.showModel(model);
+            this.showModel(model);
+            return;
         }
         const subModel = model.fields[subModelKey];
         if (!subModel) {
@@ -176,6 +208,13 @@ With a collection path, it retrieves the model for that specific collection in J
             return this.resolveAppModelPath(path);
         }
         const [modelPath, subModelKey] = path.split(':');
+        // Check if this is a namespaced path (e.g., /content/blogs)
+        const pathParts = modelPath.slice(1).split('/');
+        if (pathParts.length === 2) {
+            const [namespace, modelName] = pathParts;
+            // Return model name and namespace for filtering
+            return [`/${modelName}`, subModelKey, namespace];
+        }
         return [modelPath, subModelKey];
     }
     async resolveAppModelPath(path) {

package/dist/lib/api.js

@@ -177,6 +177,7 @@ export default class Api {
             await this.setEnv(envId);
         }
         this.storeId = storeId;
+        this.envId = envId;
     }
     isAdmin() {
         return !this.secretKey;

package/oclif.manifest.json

@@ -2326,6 +2326,7 @@
       "examples": [
         "swell inspect models",
         "swell inspect models /products",
+        "swell inspect models /content/blogs",
         "swell inspect models /apps/myapp/orders",
         "swell inspect models /orders --live"
       ],
@@ -2875,5 +2876,5 @@
       ]
     }
   },
-  "version": "2.3.3"
+  "version": "2.3.4"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swell/cli",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "type": "module",
   "description": "Swell's command line interface/utility",
   "keywords": [