@loopress/cli 0.7.0 → 0.9.0

package/dist/commands/plugin/push.js

@@ -1,24 +1,18 @@
 import { confirm } from '@inquirer/prompts';
-import { Flags } from '@oclif/core';
-import got from 'got';
+import { Listr } from 'listr2';
 import { PushCommand } from '../../lib/push-command.js';
 import { getComposerManagedSlugs, readComposerJson } from '../../utils/composer.js';
-import { readLocalConfig } from '../../utils/loopress-config.js';
 import { diffPlugins } from '../../utils/plugins.js';
 export default class Push extends PushCommand {
     static description = 'Push plugins to WordPress to match loopress.json';
     static examples = ['$ lps plugin push', '$ lps plugin push --dry-run'];
     static flags = {
-        ...PushCommand.baseFlags,
-        'dry-run': Flags.boolean({ char: 'd', description: 'Show what would change without making changes' }),
+        ...PushCommand.dryRunFlag,
     };
+    failedCount = 0;
     async run() {
-        const { flags } = await this.parse(Push);
-        const dryRun = flags['dry-run'];
-        this.dryRun = dryRun;
         const { url } = this.siteConfig;
-        const localConfig = await readLocalConfig();
-        const manifest = localConfig.plugins;
+        const manifest = this.localConfig.plugins;
         if (!manifest || Object.keys(manifest).length === 0) {
             this.error('No plugins found in loopress.json. Run `lps plugin pull` first.');
         }
@@ -31,8 +25,7 @@ export default class Push extends PushCommand {
             this.log('Run `lps composer push` to deploy them.');
         }
         this.log(`Pushing plugins to ${url}`);
-        const headers = await this.buildAuthHeaders();
-        const installed = await got.get(`${url}/wp-json/loopress/v1/plugins`, { headers }).json();
+        const installed = await this.wp.get('loopress/v1/plugins');
         const { drifted, toActivate, toInstall } = diffPlugins(filteredManifest, installed);
         if (toInstall.length === 0 && toActivate.length === 0 && drifted.length === 0) {
             this.log('Everything is already in sync.');
@@ -54,69 +47,82 @@ export default class Push extends PushCommand {
                 this.log(`  ~ ${a.slug}: site has ${a.currentVersion}, manifest wants ${a.targetVersion}`);
             }
         }
-        if (dryRun)
+        if (this.dryRun)
             return;
         // Install missing plugins and activate them.
-        for (const action of toInstall) {
-            this.log(`\nInstalling ${action.slug} @ ${action.targetVersion}...`);
-            try {
-                const result = await got
-                    .post(`${url}/wp-json/loopress/v1/plugins/install`, {
-                    headers,
-                    json: { slug: action.slug, version: action.targetVersion },
-                })
-                    .json();
-                this.log(`  ✓ ${result.message}`);
-            }
-            catch (error) {
-                this.warn(`  Failed to install ${action.slug}: ${error.message}`);
-                continue;
-            }
-            await this.activatePlugin(url, headers, action.slug);
+        if (toInstall.length > 0) {
+            await new Listr(toInstall.map((action) => ({
+                task: async (_ctx, task) => this.installAndActivate(action.slug, action.targetVersion, task),
+                title: `Install ${action.slug} @ ${action.targetVersion}`,
+            })), { concurrent: false, exitOnError: false }).run();
         }
         // Activate installed-but-inactive plugins without prompting.
-        for (const action of toActivate) {
-            this.log(`\nActivating ${action.slug}...`);
-            await this.activatePlugin(url, headers, action.slug);
+        if (toActivate.length > 0) {
+            await new Listr(toActivate.map((action) => ({
+                task: async (_ctx, task) => this.activatePlugin(action.slug, task),
+                title: `Activate ${action.slug}`,
+            })), { concurrent: false, exitOnError: false }).run();
+        }
+        await this.syncDrifted(drifted);
+        if (this.failedCount > 0) {
+            this.error(`${this.failedCount} plugin${this.failedCount === 1 ? '' : 's'} failed to install or activate.`);
+        }
+        await this.recordSuccess();
+    }
+    // `task` is only passed when called from within a running Listr task list (see `run()`); it lets
+    // status lines go through `task.output` instead of `this.log`/`this.warn`, which would otherwise
+    // race with the renderer repainting the terminal. Called without `task` (e.g. directly in tests),
+    // it falls back to plain logging. Rethrowing on failure (rather than swallowing) is what lets Listr
+    // mark the task as failed (red cross) instead of completed, even though `exitOnError: false` stops
+    // that failure from aborting sibling tasks in the same list.
+    async activatePlugin(slug, task) {
+        await this.performPluginAction('activate', { body: { slug }, endpoint: 'loopress/v1/plugins/activate', slug }, task);
+    }
+    async installAndActivate(slug, version, task) {
+        await this.performPluginAction('install', { body: { slug, version }, endpoint: 'loopress/v1/plugins/install', slug }, task);
+        await this.activatePlugin(slug, task);
+    }
+    async performPluginAction(verb, request, task) {
+        const { body, endpoint, slug } = request;
+        try {
+            const result = await this.wp.post(endpoint, body);
+            const message = `✓ ${result.message}`;
+            if (task)
+                task.output = message;
+            else
+                this.log(`  ${message}`);
+        }
+        catch (error) {
+            const message = `Failed to ${verb} ${slug}: ${error.message}`;
+            if (task)
+                task.output = message;
+            else
+                this.warn(`  ${message}`);
+            this.failedCount++;
+            throw error;
         }
-        // Prompt per drifted plugin before syncing.
+    }
+    // Prompt per drifted plugin before syncing. Prompts run sequentially on plain stdout,
+    // before the Listr renderer takes over the terminal for the confirmed subset.
+    async syncDrifted(drifted) {
+        const confirmedDrift = [];
         for (const action of drifted) {
-            this.log('');
             const proceed = await confirm({
                 default: false,
                 message: `${action.slug} is at ${action.currentVersion} on the site but manifest wants ${action.targetVersion}. Sync to ${action.targetVersion}?`,
             });
-            if (!proceed) {
-                this.log(`  Skipped ${action.slug}`);
-                continue;
+            if (proceed) {
+                confirmedDrift.push(action);
             }
-            this.log(`  Syncing ${action.slug} to ${action.targetVersion}...`);
-            try {
-                const result = await got
-                    .post(`${url}/wp-json/loopress/v1/plugins/install`, {
-                    headers,
-                    json: { slug: action.slug, version: action.targetVersion },
-                })
-                    .json();
-                this.log(`  ✓ ${result.message}`);
-            }
-            catch (error) {
-                this.warn(`  Failed to sync ${action.slug}: ${error.message}`);
-                continue;
+            else {
+                this.log(`  Skipped ${action.slug}`);
             }
-            await this.activatePlugin(url, headers, action.slug);
-        }
-        await this.recordSuccess();
-    }
-    async activatePlugin(url, headers, slug) {
-        try {
-            const result = await got
-                .post(`${url}/wp-json/loopress/v1/plugins/activate`, { headers, json: { slug } })
-                .json();
-            this.log(`  ✓ ${result.message}`);
-        }
-        catch (error) {
-            this.warn(`  Failed to activate ${slug}: ${error.message}`);
         }
+        if (confirmedDrift.length === 0)
+            return;
+        await new Listr(confirmedDrift.map((action) => ({
+            task: async (_ctx, task) => this.installAndActivate(action.slug, action.targetVersion, task),
+            title: `Sync ${action.slug} to ${action.targetVersion}`,
+        })), { concurrent: false, exitOnError: false }).run();
     }
 }

package/dist/commands/sentry-test.d.ts

@@ -0,0 +1,6 @@
+import { Command } from '@oclif/core';
+export default class SentryTest extends Command {
+    static description: string;
+    static hidden: boolean;
+    run(): Promise<void>;
+}

package/dist/commands/sentry-test.js

@@ -0,0 +1,8 @@
+import { Command } from '@oclif/core';
+export default class SentryTest extends Command {
+    static description = 'Throw a test error to verify Sentry error reporting is wired up correctly';
+    static hidden = true;
+    async run() {
+        throw new Error('Sentry test error from `lps sentry-test`');
+    }
+}

package/dist/commands/snippet/list.d.ts

@@ -3,11 +3,8 @@ export default class List extends LoopressCommand {
     static description: string;
     static examples: string[];
     static flags: {
-        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         plugin: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        password: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        url: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        user: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/snippet/list.js

@@ -1,59 +1,39 @@
 import { Flags } from '@oclif/core';
-import got from 'got';
 import { LoopressCommand } from '../../lib/base.js';
+import { snippetPluginFlag } from '../../utils/snippet-plugin-flag.js';
 import { getSnippetPlugin } from '../../utils/snippet-plugin.js';
 export default class List extends LoopressCommand {
     static description = 'List snippets from WordPress';
-    static examples = [
-        '$ lps snippet list',
-        '$ lps snippet list --url http://example.com',
-        '$ lps snippet list --plugin wpcode',
-    ];
+    static examples = ['$ lps snippet list', '$ lps snippet list --plugin wpcode'];
     static flags = {
-        ...LoopressCommand.baseFlags,
         json: Flags.boolean({ char: 'j', description: 'Output in JSON format' }),
-        plugin: Flags.string({
-            char: 'p',
-            description: 'WordPress snippet plugin to target (overrides loopress.json)',
-            options: ['code-snippets', 'wpcode'],
-        }),
+        ...snippetPluginFlag,
     };
     async run() {
         const { flags } = await this.parse(List);
-        const { json, plugin } = flags;
-        const { url } = this.siteConfig;
-        const resolvedPlugin = await this.resolveSnippetPlugin(plugin);
-        try {
-            const adapter = getSnippetPlugin(resolvedPlugin);
-            const endpoint = adapter.endpoint(url);
-            const headers = await this.buildAuthHeaders();
-            const remoteList = await got.get(endpoint, { headers }).json();
-            const snippets = remoteList.map((r) => adapter.fromRemote(r));
-            if (json) {
-                this.log(JSON.stringify(snippets, null, 2));
+        const adapter = getSnippetPlugin(this.resolveSnippetPlugin(flags.plugin));
+        const remoteList = await this.wp.get(adapter.endpointPath());
+        const snippets = remoteList.map((r) => adapter.fromRemote(r));
+        if (flags.json) {
+            this.log(JSON.stringify(snippets, null, 2));
+            return;
+        }
+        if (snippets.length === 0) {
+            this.log('No snippets found');
+            return;
+        }
+        this.log(`Found ${snippets.length} snippet${snippets.length === 1 ? '' : 's'}:`);
+        this.log('');
+        for (const snippet of snippets) {
+            this.log(`  ${snippet.id}. ${snippet.name}`);
+            this.log(`     Active: ${snippet.active ? 'yes' : 'no'}`);
+            if (snippet.tags.length > 0) {
+                this.log(`     Tags: ${snippet.tags.join(', ')}`);
             }
-            else {
-                if (snippets.length === 0) {
-                    this.log('No snippets found');
-                    return;
-                }
-                this.log(`Found ${snippets.length} snippet${snippets.length === 1 ? '' : 's'}:`);
-                console.log('');
-                for (const snippet of snippets) {
-                    this.log(`  ${snippet.id}. ${snippet.name}`);
-                    this.log(`     Active: ${snippet.active ? '✓' : '✗'}`);
-                    if (snippet.tags && snippet.tags.length > 0) {
-                        this.log(`     Tags: ${snippet.tags.join(', ')}`);
-                    }
-                    if (snippet.description) {
-                        this.log(`     Description: ${snippet.description}`);
-                    }
-                    console.log('');
-                }
+            if (snippet.description) {
+                this.log(`     Description: ${snippet.description}`);
             }
-        }
-        catch (error) {
-            this.error(`❌ Error listing snippets: ${error.message}`);
+            this.log('');
         }
     }
 }

package/dist/commands/snippet/pull.d.ts

@@ -9,11 +9,8 @@ export default class Pull extends LoopressCommand {
     static description: string;
     static examples: string[];
     static flags: {
-        'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         plugin: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        password: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        url: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        user: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/dist/commands/snippet/pull.js

@@ -1,7 +1,10 @@
-import { Args, Flags } from '@oclif/core';
-import got from 'got';
+import { Args } from '@oclif/core';
+import { Listr } from 'listr2';
+import { mkdir, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
 import slugify from 'slugify';
 import { LoopressCommand } from '../../lib/base.js';
+import { snippetPluginFlag } from '../../utils/snippet-plugin-flag.js';
 import { getSnippetPlugin } from '../../utils/snippet-plugin.js';
 const EXTENSIONS = {
     css: 'css',
@@ -22,11 +25,18 @@ export function buildMetaFile(snippet) {
         name: snippet.name,
         type: snippet.type,
         active: snippet.active,
+        location: snippet.location,
     };
     if (snippet.description)
         meta.description = snippet.description;
     if (snippet.tags.length > 0)
         meta.tags = snippet.tags;
+    if (snippet.insertMethod === 'shortcode')
+        meta.insertMethod = snippet.insertMethod;
+    if (snippet.priority !== 10)
+        meta.priority = snippet.priority;
+    if (snippet.shortcodeAttributes.length > 0)
+        meta.shortcodeAttributes = snippet.shortcodeAttributes;
     return JSON.stringify(meta, null, 2) + '\n';
 }
 export default class Pull extends LoopressCommand {
@@ -34,68 +44,42 @@ export default class Pull extends LoopressCommand {
         path: Args.string({ description: 'Path to snippets directory (overrides project config)' }),
     };
     static description = 'Pull snippets from WordPress';
-    static examples = [
-        '$ lps snippet pull',
-        '$ lps snippet pull --url http://example.com',
-        '$ lps snippet pull --path ./snippets',
-        '$ lps snippet pull --plugin wpcode',
-    ];
+    static examples = ['$ lps snippet pull', '$ lps snippet pull --path ./snippets', '$ lps snippet pull --plugin wpcode'];
     static flags = {
-        ...LoopressCommand.baseFlags,
-        'dry-run': Flags.boolean({ char: 'd', description: 'Show what would be written without making changes' }),
-        plugin: Flags.string({
-            char: 'p',
-            description: 'WordPress snippet plugin to target (overrides loopress.json)',
-            options: ['code-snippets', 'wpcode'],
-        }),
+        ...LoopressCommand.dryRunFlag,
+        ...snippetPluginFlag,
     };
     async run() {
         const { args, flags } = await this.parse(Pull);
-        const dryRun = flags['dry-run'];
-        const { plugin } = flags;
         const { url } = this.siteConfig;
-        const path = await this.resolveSnippetsPath(args.path);
-        const resolvedPlugin = await this.resolveSnippetPlugin(plugin);
-        this.log(`📥 Pulling snippets from ${url} via ${resolvedPlugin}`);
-        this.log(`📂 From snippet path: ${path}`);
-        this.log(`🔄 Dry run: ${dryRun ? 'yes' : 'no'}`);
-        try {
-            const adapter = getSnippetPlugin(resolvedPlugin);
-            const endpoint = adapter.endpoint(url);
-            const headers = await this.buildAuthHeaders();
-            const remoteList = await got.get(endpoint, { headers }).json();
-            const snippets = remoteList.map((r) => adapter.fromRemote(r));
-            const fs = await import('node:fs/promises');
-            await fs.mkdir(path, { recursive: true });
-            if (dryRun) {
-                this.log(`📝 [DRY RUN] Would pull ${snippets.length} snippets`);
-                this.log(`🔍 Raw API sample:\n${JSON.stringify(remoteList[0], null, 2)}`);
-                return;
-            }
-            let count = 0;
-            let skipped = 0;
-            for (const snippet of snippets) {
-                if (!snippet.name.trim()) {
-                    skipped++;
-                    continue;
-                }
+        const path = this.resolveSnippetsPath(args.path);
+        const resolvedPlugin = this.resolveSnippetPlugin(flags.plugin);
+        this.log(`Pulling snippets from ${url} via ${resolvedPlugin}`);
+        this.log(`Snippets path: ${path}`);
+        const adapter = getSnippetPlugin(resolvedPlugin);
+        const remoteList = await this.wp.get(adapter.endpointPath());
+        const snippets = remoteList.map((r) => adapter.fromRemote(r));
+        if (this.dryRun) {
+            this.log(`[dry-run] Would pull ${snippets.length} snippet${snippets.length === 1 ? '' : 's'} to ${path}`);
+            return;
+        }
+        await mkdir(path, { recursive: true });
+        const pullable = snippets.filter((snippet) => snippet.name.trim());
+        const skipped = snippets.length - pullable.length;
+        await new Listr(pullable.map((snippet) => ({
+            async task(_ctx, task) {
                 const ext = EXTENSIONS[snippet.type];
                 const slug = slugify(snippet.name, { lower: true, strict: true });
                 const base = `${snippet.id}-${slug}`;
-                const filePath = `${path}/${base}.${ext}`;
-                const metaPath = `${path}/${base}.json`;
-                await fs.writeFile(filePath, buildSnippetFile(snippet));
-                await fs.writeFile(metaPath, buildMetaFile(snippet));
-                count++;
-                this.log(`✅ Pulled: ${snippet.name}`);
-            }
-            this.log(`🎉 Successfully pulled ${count} snippet${count === 1 ? '' : 's'} to ${path}`);
-            if (skipped > 0) {
-                this.warn(`${skipped} snippet${skipped === 1 ? '' : 's'} skipped because they have no name`);
-            }
-        }
-        catch (error) {
-            this.error(`❌ Error pulling snippets: ${error.message}`);
+                await writeFile(join(path, `${base}.${ext}`), buildSnippetFile(snippet));
+                await writeFile(join(path, `${base}.json`), buildMetaFile(snippet));
+                task.output = `Pulled: ${snippet.name}`;
+            },
+            title: `Pull ${snippet.name}`,
+        }))).run();
+        this.log(`Pulled ${pullable.length} snippet${pullable.length === 1 ? '' : 's'} to ${path}`);
+        if (skipped > 0) {
+            this.warn(`${skipped} snippet${skipped === 1 ? '' : 's'} skipped because they have no name`);
         }
     }
 }

package/dist/commands/snippet/push.d.ts

@@ -6,12 +6,10 @@ export default class Push extends PushCommand {
     static description: string;
     static examples: string[];
     static flags: {
-        'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         plugin: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        password: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        url: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        user: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
+    private failedCount;
     run(): Promise<void>;
     private ensureCanonicalFilename;
     private loadSnippets;