@loopress/cli 0.21.0 → 0.22.0

package/dist/commands/api/list.js

@@ -1,4 +1,5 @@
 import { LoopressCommand } from '../../lib/base.js';
+import { pluralize } from '../../utils/pluralize.js';
 export default class List extends LoopressCommand {
     static description = 'List custom API route files from WordPress';
     static enableJsonFlag = true;
@@ -9,7 +10,7 @@ export default class List extends LoopressCommand {
             this.log('No API route files found');
             return files;
         }
-        this.log(`Found ${files.length} route file${files.length === 1 ? '' : 's'}:`);
+        this.log(`Found ${pluralize(files.length, 'route file')}:`);
         this.log('');
         for (const file of files) {
             this.log(`  ${file.filename}`);

package/dist/commands/api/publish.js

@@ -1,10 +1,9 @@
 import { Args, Command } from '@oclif/core';
 import { basename, join } from 'node:path';
-import { authManager } from '../../config/auth.manager.js';
-import { configManager } from '../../config/project-config.manager.js';
 import { ApiClient } from '../../lib/api-client.js';
 import { loadFiles } from '../../lib/load-files.js';
-import { readLocalConfig } from '../../utils/loopress-config.js';
+import { resolveLinkedProject } from '../../lib/resolve-linked-project.js';
+import { pluralize } from '../../utils/pluralize.js';
 // Publishes to the Loopress api (not a WordPress site), so this does not extend
 // `LoopressCommand`/`PushCommand`: those force an environment to be resolved, but publishing
 // for cross-project sharing doesn't need one, same reasoning as `snippet publish`. An API route
@@ -20,22 +19,7 @@ export default class Publish extends Command {
     static examples = ['$ lps api publish', '$ lps api publish --path ./api'];
     async run() {
         const { args } = await this.parse(Publish);
-        const token = process.env.LOOPRESS_TOKEN ?? authManager.getAuth()?.token;
-        if (!token) {
-            this.error('Not logged in. Run `lps login` first.');
-        }
-        const localConfig = await readLocalConfig();
-        const projectId = localConfig.projectId ?? configManager.getCurrentProject()?.id;
-        if (!projectId) {
-            this.error('No project configured. Run `lps project config` first.');
-        }
-        const project = configManager.getProject(projectId);
-        if (!project) {
-            this.error(`Project "${projectId}" (from loopress.json) not found. Run \`lps project config\` to configure it.`);
-        }
-        if (!project.apiProjectId) {
-            this.error(`Project "${project.name}" is not linked to your Loopress account yet. Run \`lps project push\` first.`);
-        }
+        const { apiProjectId, localConfig, token } = await resolveLinkedProject((message) => this.error(message));
         const path = args.path ?? join(localConfig.rootDir ?? '.', localConfig.apiDir ?? 'api');
         this.log(`Publishing API routes from ${path}`);
         const files = await loadFiles(path, {
@@ -45,16 +29,16 @@ export default class Publish extends Command {
         });
         const api = new ApiClient(token);
         try {
-            await api.post(`projects/${project.apiProjectId}/api-routes/publish/upsert`, {
+            await api.post(`projects/${apiProjectId}/api-routes/publish/upsert`, {
                 routes: files,
             });
-            await api.post(`projects/${project.apiProjectId}/api-routes/publish/prune`, {
+            await api.post(`projects/${apiProjectId}/api-routes/publish/prune`, {
                 filenames: files.map((file) => file.filename),
             });
         }
         catch (error) {
             this.error(error.message);
         }
-        this.log(`Published ${files.length} route${files.length === 1 ? '' : 's'} to your Loopress account.`);
+        this.log(`Published ${pluralize(files.length, 'route')} to your Loopress account.`);
     }
 }

package/dist/commands/api/pull.js

@@ -1,9 +1,9 @@
 import { Args } from '@oclif/core';
-import { Listr } from 'listr2';
 import { mkdir, writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { LoopressCommand } from '../../lib/base.js';
 import { basenameKey, findOrphanedFiles } from '../../lib/find-orphaned-files.js';
+import { pluralize } from '../../utils/pluralize.js';
 export default class Pull extends LoopressCommand {
     static args = {
         path: Args.string({ description: 'Path to api directory (overrides project config)' }),
@@ -31,28 +31,23 @@ export default class Pull extends LoopressCommand {
             recursive: true,
         });
         const pulled = files.map((file) => file.filename);
-        if (this.dryRun) {
-            this.log(`[dry-run] Would pull ${files.length} route file${files.length === 1 ? '' : 's'} to ${path}`);
-            if (orphans.length > 0) {
-                this.log(`[dry-run] Would remove ${orphans.length} local file${orphans.length === 1 ? '' : 's'} whose route no longer exists on WordPress: ${orphans.join(', ')}`);
-            }
-            return { orphans, pulled, status: 'dry-run' };
-        }
-        await mkdir(path, { recursive: true });
-        await new Listr(files.map((file) => ({
-            async task(_ctx, task) {
-                const filePath = join(path, `${file.filename}.php`);
+        await this.pullDirectory(path, files, orphans, {
+            alwaysCreateDir: true,
+            dryRunMessage: `Would pull ${pluralize(files.length, 'route file')} to ${path}`,
+            orphanReason: 'whose route no longer exists on WordPress',
+            pulledMessage: `Pulled ${pluralize(files.length, 'route file')} to ${path}`,
+            title: (file) => file.filename,
+            async write(file, writeDir) {
+                const filePath = join(writeDir, `${file.filename}.php`);
                 // filename can contain '/' (a path-param route, e.g. invoice-pdf/[order_id]):
                 // writeFile() doesn't create parent directories on its own the way mkdir()'s
                 // recursive option does above for the top-level path.
                 await mkdir(dirname(filePath), { recursive: true });
                 await writeFile(filePath, file.content);
-                task.output = `Pulled: ${file.filename}`;
             },
-            title: `Pull ${file.filename}`,
-        })), { renderer: this.jsonEnabled() ? 'silent' : 'default' }).run();
-        await this.removeOrphanedFiles(path, orphans, 'whose route no longer exists on WordPress');
-        this.log(`Pulled ${files.length} route file${files.length === 1 ? '' : 's'} to ${path}`);
+        });
+        if (this.dryRun)
+            return { orphans, pulled, status: 'dry-run' };
         return { orphans, pulled, status: 'success' };
     }
 }

package/dist/commands/api/push.js

@@ -1,10 +1,10 @@
 import { Args } from '@oclif/core';
-import { Listr } from 'listr2';
 import { relative, sep } from 'node:path';
 import { authManager } from '../../config/auth.manager.js';
 import { ApiClient } from '../../lib/api-client.js';
 import { loadFiles as loadDirectoryFiles } from '../../lib/load-files.js';
 import { PushCommand } from '../../lib/push-command.js';
+import { pluralize } from '../../utils/pluralize.js';
 // Mirrors the server's own allowlist (wordpress-plugin ApiFilesController::isValidFilename()):
 // filename is sent as a body param (not a URL path segment: a nested path can contain '/' and
 // '[]', and depending on a server to handle a percent-encoded slash in a URL path correctly is
@@ -36,17 +36,14 @@ export default class Push extends PushCommand {
         this.log(`Pushing API routes to ${url}`);
         this.log(`API path: ${path}`);
         const files = await this.loadFiles(path);
-        this.log(`Found ${files.length} route file${files.length === 1 ? '' : 's'} to push`);
+        this.log(`Found ${pluralize(files.length, 'route file')} to push`);
         const pushed = [];
-        await new Listr(files.map((file) => ({
-            task: async (_ctx, task) => {
-                await this.pushFile(file, task);
-                pushed.push(file.filename);
-            },
-            title: `Push ${file.filename}`,
-        })), { concurrent: false, exitOnError: false, renderer: this.jsonEnabled() ? 'silent' : 'default' }).run();
+        await this.runPushTasks(files, (file) => file.filename, async (file, task) => {
+            await this.pushFile(file, task);
+            pushed.push(file.filename);
+        });
         if (this.failedCount > 0) {
-            this.error(`${this.failedCount} route file${this.failedCount === 1 ? '' : 's'} failed to push.`);
+            this.error(`${pluralize(this.failedCount, 'route file')} failed to push.`);
         }
         if (this.dryRun)
             return { pushed, status: 'dry-run' };

package/dist/commands/dev.js

@@ -6,7 +6,7 @@ import { buildWatchTargets, createDebouncedBatcher, resolveResourceTypes, RESOUR
 import { readLocalConfig } from '../utils/loopress-config.js';
 const DEBOUNCE_MS = 400;
 // Noise no one wants pushed: VCS internals, deps, and editor/OS droppings.
-const IGNORED = /(^|[/\\])(\.git|node_modules|\.DS_Store)(?:[/\\]|$)|\.swp$/;
+const IGNORED = /(?:(^|[/\\])(\.git|node_modules|\.DS_Store)(?:[/\\]|$))|(?:\.swp$)/;
 export default class Dev extends Command {
     static description = 'Watch project files and push changes to the local WordPress instance as they happen. Always targets the "local" environment, run `lps snippet push` etc. directly for any other environment.';
     static examples = ['$ lps dev', '$ lps dev --only=snippets,pages', '$ lps dev --skip=plugins'];

package/dist/commands/doctor.js

@@ -2,6 +2,7 @@ import { configManager } from '../config/project-config.manager.js';
 import { LoopressCommand } from '../lib/base.js';
 import { isNotFoundError } from '../lib/wp-client.js';
 import { diagnoseWpSite } from '../lib/wp-site-diagnostic.js';
+import { pluralize } from '../utils/pluralize.js';
 export default class Doctor extends LoopressCommand {
     static description = 'Diagnose connectivity, plugin and credential problems for the targeted environment';
     static examples = ['$ lps doctor', '$ lps doctor --env production'];
@@ -45,7 +46,7 @@ export default class Doctor extends LoopressCommand {
         await this.reportPluginVersion();
         this.log('');
         if (failed > 0) {
-            this.error(`${failed} check${failed === 1 ? '' : 's'} failed.`, { exit: 1 });
+            this.error(`${pluralize(failed, 'check')} failed.`, { exit: 1 });
         }
         this.log('All checks passed.');
     }

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

@@ -1,9 +1,7 @@
 import { LoopressCommand } from '../../lib/base.js';
 export default class List extends LoopressCommand {
     static description: string;
+    static enableJsonFlag: boolean;
     static examples: string[];
-    static flags: {
-        json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
-    };
-    run(): Promise<void>;
+    run(): Promise<Array<Record<string, unknown>>>;
 }

package/dist/commands/form/list.js

@@ -1,26 +1,19 @@
-import { Flags } from '@oclif/core';
 import { LoopressCommand } from '../../lib/base.js';
 import { FORM_ENDPOINT, getFormId, getFormTitle } from '../../utils/form-format.js';
 export default class List extends LoopressCommand {
     static description = 'List forms from WordPress';
+    static enableJsonFlag = true;
     static examples = ['$ lps form list'];
-    static flags = {
-        json: Flags.boolean({ char: 'j', description: 'Output in JSON format' }),
-    };
     async run() {
-        const { flags } = await this.parse(List);
         const forms = await this.wp.get(FORM_ENDPOINT);
-        if (flags.json) {
-            this.log(JSON.stringify(forms, null, 2));
-            return;
-        }
         this.log(`Forms (${forms.length}):`);
         if (forms.length === 0) {
             this.log('  (none)');
-            return;
+            return forms;
         }
         for (const form of forms) {
             this.log(`  ${getFormId(form) ?? '(no id)'}. ${getFormTitle(form)}`);
         }
+        return forms;
     }
 }

package/dist/commands/form/pull.js

@@ -1,10 +1,10 @@
 import { Args } from '@oclif/core';
-import { Listr } from 'listr2';
-import { mkdir, writeFile } from 'node:fs/promises';
+import { writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { LoopressCommand } from '../../lib/base.js';
 import { findOrphanedFiles, numericPrefixKey } from '../../lib/find-orphaned-files.js';
 import { FORM_ENDPOINT, getFormId, getFormTitle } from '../../utils/form-format.js';
+import { pluralize } from '../../utils/pluralize.js';
 import { toSlug } from '../../utils/to-slug.js';
 export default class Pull extends LoopressCommand {
     static args = {
@@ -31,30 +31,21 @@ export default class Pull extends LoopressCommand {
             extensions: ['.json'],
             key: numericPrefixKey,
         });
-        if (this.dryRun) {
-            this.log(`[dry-run] Would pull ${withId.length} form${withId.length === 1 ? '' : 's'} to ${path}`);
-            if (orphans.length > 0) {
-                this.log(`[dry-run] Would remove ${orphans.length} local file${orphans.length === 1 ? '' : 's'} in ${path} no longer present on WordPress: ${orphans.join(', ')}`);
-            }
+        await this.pullDirectory(path, withId, orphans, {
+            dryRunMessage: `Would pull ${pluralize(withId.length, 'form')} to ${path}`,
+            orphanReason: `in ${path} no longer present on WordPress`,
+            pulledMessage: `Pulled ${pluralize(withId.length, 'form')} to ${path}`,
+            title: (form) => getFormTitle(form),
+            async write(form, writeDir) {
+                const id = getFormId(form);
+                const title = getFormTitle(form);
+                await writeFile(join(writeDir, `${id}-${toSlug(title, 'untitled')}.json`), JSON.stringify(form, null, 2) + '\n');
+            },
+        });
+        if (this.dryRun)
             return;
-        }
-        if (withId.length > 0)
-            await mkdir(path, { recursive: true });
-        await new Listr(withId.map((form) => {
-            const id = getFormId(form);
-            const title = getFormTitle(form);
-            return {
-                async task(_ctx, task) {
-                    await writeFile(join(path, `${id}-${toSlug(title, 'untitled')}.json`), JSON.stringify(form, null, 2) + '\n');
-                    task.output = `Pulled: ${title}`;
-                },
-                title: `Pull ${title}`,
-            };
-        })).run();
-        await this.removeOrphanedFiles(path, orphans, `in ${path} no longer present on WordPress`);
-        this.log(`Pulled ${withId.length} form${withId.length === 1 ? '' : 's'} to ${path}`);
         if (skipped > 0) {
-            this.warn(`${skipped} form${skipped === 1 ? '' : 's'} skipped because they have no id`);
+            this.warn(`${pluralize(skipped, 'form')} skipped because they have no id`);
         }
     }
 }

package/dist/commands/form/push.js

@@ -1,10 +1,11 @@
 import { Args } from '@oclif/core';
-import { Listr } from 'listr2';
-import { readdir, readFile, rename } from 'node:fs/promises';
+import { readFile, rename } from 'node:fs/promises';
 import { dirname, extname, join } from 'node:path';
 import { PushCommand } from '../../lib/push-command.js';
-import { isNotFoundError } from '../../lib/wp-client.js';
+import { putOrCreate } from '../../lib/put-or-create.js';
+import { readdirTolerant } from '../../lib/readdir-tolerant.js';
 import { FORM_ENDPOINT, getFormId, getFormTitle } from '../../utils/form-format.js';
+import { pluralize } from '../../utils/pluralize.js';
 import { toSlug } from '../../utils/to-slug.js';
 export default class Push extends PushCommand {
     static args = {
@@ -23,13 +24,10 @@ export default class Push extends PushCommand {
         this.log(`Pushing forms to ${url}`);
         this.log(`Forms path: ${path}`);
         const files = await this.loadFiles(path);
-        this.log(`Found ${files.length} form${files.length === 1 ? '' : 's'} to push`);
-        await new Listr(files.map(({ data, filePath }) => ({
-            task: async (_ctx, task) => this.pushForm(filePath, data, task),
-            title: `Push ${getFormTitle(data)}`,
-        })), { concurrent: false, exitOnError: false }).run();
+        this.log(`Found ${pluralize(files.length, 'form')} to push`);
+        await this.runPushTasks(files, ({ data }) => getFormTitle(data), async ({ data, filePath }, task) => this.pushForm(filePath, data, task));
         if (this.failedCount > 0) {
-            this.error(`${this.failedCount} form${this.failedCount === 1 ? '' : 's'} failed to push.`);
+            this.error(`${pluralize(this.failedCount, 'form')} failed to push.`);
         }
         if (this.dryRun)
             return;
@@ -49,15 +47,7 @@ export default class Push extends PushCommand {
     // form, not abort loading the rest of the directory, same principle as loadObjects() in
     // commands/acf/push.ts.
     async loadFiles(dir) {
-        let files;
-        try {
-            files = await readdir(dir);
-        }
-        catch (error) {
-            if (error.code === 'ENOENT')
-                return [];
-            throw error;
-        }
+        const files = await readdirTolerant(dir);
         const forms = [];
         for (const file of files) {
             if (extname(file) !== '.json')
@@ -79,8 +69,6 @@ export default class Push extends PushCommand {
         }
         return forms;
     }
-    // PUT-then-404-fallback-POST is the same dance as commands/snippet/push.ts, forms are
-    // id-based like snippets, not key-based like ACF.
     async pushForm(filePath, data, task) {
         const title = getFormTitle(data);
         if (this.dryRun) {
@@ -90,28 +78,15 @@ export default class Push extends PushCommand {
         }
         try {
             const id = getFormId(data);
-            if (id === null) {
-                const created = await this.wp.post(FORM_ENDPOINT, data);
-                const newId = getFormId(created);
-                if (newId !== null)
-                    await this.ensureCanonicalFilename(filePath, newId, title);
-            }
-            else {
-                try {
-                    await this.wp.put(`${FORM_ENDPOINT}/${id}`, data);
-                    await this.ensureCanonicalFilename(filePath, id, title);
-                }
-                catch (error) {
-                    // The id recorded locally doesn't exist on this site (e.g. a fresh install): create
-                    // it instead of failing, and adopt whatever id the site assigns.
-                    if (!isNotFoundError(error))
-                        throw error;
-                    const created = await this.wp.post(FORM_ENDPOINT, data);
-                    const newId = getFormId(created);
-                    if (newId !== null)
-                        await this.ensureCanonicalFilename(filePath, newId, title);
-                }
-            }
+            const { body, created } = await putOrCreate(this.wp, {
+                id,
+                payload: data,
+                postEndpoint: FORM_ENDPOINT,
+                putEndpoint: (formId) => `${FORM_ENDPOINT}/${formId}`,
+            });
+            const canonicalId = created ? getFormId(body) : id;
+            if (canonicalId !== null)
+                await this.ensureCanonicalFilename(filePath, canonicalId, title);
             if (task)
                 task.output = `Pushed: ${title}`;
         }

package/dist/commands/login.js

@@ -8,11 +8,15 @@ export default class Login extends Command {
     async run() {
         const { email, token } = await this.waitForCallback();
         authManager.setAuth({ email, savedAt: new Date().toISOString(), token });
-        this.log(`\nLogged in${email ? ` as ${email}` : ''}. You're all set!`);
+        const emailSuffix = email ? ` as ${email}` : '';
+        this.log(`\nLogged in${emailSuffix}. You're all set!`);
     }
     async waitForCallback() {
         return waitForLocalCallback({
-            buildUrl: (callbackBaseUrl) => `${CONSOLE_URL}/cli-auth?callbackUrl=${encodeURIComponent(`${callbackBaseUrl}/callback`)}`,
+            buildUrl(callbackBaseUrl) {
+                const callbackUrl = encodeURIComponent(`${callbackBaseUrl}/callback`);
+                return `${CONSOLE_URL}/cli-auth?callbackUrl=${callbackUrl}`;
+            },
             handleRequest(url, { resolveWithPage, respondBadRequest }) {
                 const token = url.searchParams.get('token');
                 if (!token) {

package/dist/commands/logout.js

@@ -10,6 +10,7 @@ export default class Logout extends Command {
             return;
         }
         authManager.clearAuth();
-        this.log(`Logged out${auth.email ? ` (${auth.email})` : ''}.`);
+        const emailSuffix = auth.email ? ` (${auth.email})` : '';
+        this.log(`Logged out${emailSuffix}.`);
     }
 }

package/dist/commands/page/pull.js

@@ -1,10 +1,10 @@
 import { Args } from '@oclif/core';
-import { Listr } from 'listr2';
-import { mkdir, writeFile } from 'node:fs/promises';
+import { writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { LoopressCommand } from '../../lib/base.js';
 import { findOrphanedFiles, numericPrefixKey } from '../../lib/find-orphaned-files.js';
 import { getPageContent, getPageId, getPageTitle, PAGE_ENDPOINT, PAGE_LIST_QUERY, pageFileBase, pickPageMeta } from '../../utils/page-format.js';
+import { pluralize } from '../../utils/pluralize.js';
 export default class Pull extends LoopressCommand {
     static args = {
         path: Args.string({ description: 'Path to pages directory (overrides project config)' }),
@@ -34,34 +34,23 @@ export default class Pull extends LoopressCommand {
             key: numericPrefixKey,
         });
         const pulled = withId.map((page) => ({ id: getPageId(page), title: getPageTitle(page) }));
-        if (this.dryRun) {
-            this.log(`[dry-run] Would pull ${withId.length} page${withId.length === 1 ? '' : 's'} to ${path}`);
-            if (orphans.length > 0) {
-                this.log(`[dry-run] Would remove ${orphans.length} local file${orphans.length === 1 ? '' : 's'} in ${path} no longer present on WordPress: ${orphans.join(', ')}`);
-            }
+        await this.pullDirectory(path, withId, orphans, {
+            dryRunMessage: `Would pull ${pluralize(withId.length, 'page')} to ${path}`,
+            orphanReason: `in ${path} no longer present on WordPress`,
+            pulledMessage: `Pulled ${pluralize(withId.length, 'page')} to ${path}`,
+            title: (page) => getPageTitle(page),
+            async write(page, writeDir) {
+                const base = pageFileBase(getPageId(page), getPageTitle(page));
+                // `content` lives entirely in the `.html` file; the `.json` sidecar keeps only the
+                // fields WordPress actually accepts back on write, see pickPageMeta.
+                await writeFile(join(writeDir, `${base}.html`), getPageContent(page));
+                await writeFile(join(writeDir, `${base}.json`), JSON.stringify(pickPageMeta(page), null, 2) + '\n');
+            },
+        });
+        if (this.dryRun)
             return { orphans, pulled, skipped, status: 'dry-run' };
-        }
-        if (withId.length > 0)
-            await mkdir(path, { recursive: true });
-        await new Listr(withId.map((page) => {
-            const id = getPageId(page);
-            const title = getPageTitle(page);
-            return {
-                async task(_ctx, task) {
-                    const base = pageFileBase(id, title);
-                    // `content` lives entirely in the `.html` file; the `.json` sidecar keeps only the
-                    // fields WordPress actually accepts back on write, see pickPageMeta.
-                    await writeFile(join(path, `${base}.html`), getPageContent(page));
-                    await writeFile(join(path, `${base}.json`), JSON.stringify(pickPageMeta(page), null, 2) + '\n');
-                    task.output = `Pulled: ${title}`;
-                },
-                title: `Pull ${title}`,
-            };
-        }), { renderer: this.jsonEnabled() ? 'silent' : 'default' }).run();
-        await this.removeOrphanedFiles(path, orphans, `in ${path} no longer present on WordPress`);
-        this.log(`Pulled ${withId.length} page${withId.length === 1 ? '' : 's'} to ${path}`);
         if (skipped > 0) {
-            this.warn(`${skipped} page${skipped === 1 ? '' : 's'} skipped because they have no id`);
+            this.warn(`${pluralize(skipped, 'page')} skipped because they have no id`);
         }
         return { orphans, pulled, skipped, status: 'success' };
     }

package/dist/commands/page/push.js

@@ -1,10 +1,11 @@
 import { Args } from '@oclif/core';
-import { Listr } from 'listr2';
-import { readdir, readFile, rename, writeFile } from 'node:fs/promises';
+import { readFile, rename, writeFile } from 'node:fs/promises';
 import { basename, dirname, extname, join } from 'node:path';
 import { PushCommand } from '../../lib/push-command.js';
-import { isNotFoundError } from '../../lib/wp-client.js';
+import { putOrCreate } from '../../lib/put-or-create.js';
+import { readdirTolerant } from '../../lib/readdir-tolerant.js';
 import { getPageId, getPageTitle, PAGE_ENDPOINT, pageFileBase } from '../../utils/page-format.js';
+import { pluralize } from '../../utils/pluralize.js';
 export default class Push extends PushCommand {
     static args = {
         path: Args.string({ description: 'Path to pages directory (overrides project config)' }),
@@ -23,17 +24,14 @@ export default class Push extends PushCommand {
         this.log(`Pushing pages to ${url}`);
         this.log(`Pages path: ${path}`);
         const pages = await this.loadFiles(path);
-        this.log(`Found ${pages.length} page${pages.length === 1 ? '' : 's'} to push`);
+        this.log(`Found ${pluralize(pages.length, 'page')} to push`);
         const pushed = [];
-        await new Listr(pages.map((page) => ({
-            task: async (_ctx, task) => {
-                const id = await this.pushPage(page, task);
-                pushed.push({ id, title: getPageTitle(page.meta) });
-            },
-            title: `Push ${getPageTitle(page.meta)}`,
-        })), { concurrent: false, exitOnError: false, renderer: this.jsonEnabled() ? 'silent' : 'default' }).run();
+        await this.runPushTasks(pages, (page) => getPageTitle(page.meta), async (page, task) => {
+            const id = await this.pushPage(page, task);
+            pushed.push({ id, title: getPageTitle(page.meta) });
+        });
         if (this.failedCount > 0) {
-            this.error(`${this.failedCount} page${this.failedCount === 1 ? '' : 's'} failed to push.`);
+            this.error(`${pluralize(this.failedCount, 'page')} failed to push.`);
         }
         if (this.dryRun)
             return { pushed, status: 'dry-run' };
@@ -61,15 +59,7 @@ export default class Push extends PushCommand {
     // corrupted or hand-broken sidecar must only skip that page, not abort loading the rest of
     // the directory, same principle as commands/form/push.ts.
     async loadFiles(dir) {
-        let files;
-        try {
-            files = await readdir(dir);
-        }
-        catch (error) {
-            if (error.code === 'ENOENT')
-                return [];
-            throw error;
-        }
+        const files = await readdirTolerant(dir);
         const pages = [];
         for (const file of files) {
             if (extname(file) !== '.html')
@@ -103,8 +93,6 @@ export default class Push extends PushCommand {
         }
         return pages;
     }
-    // PUT-then-404-fallback-POST, same dance as commands/form/push.ts: pages are id-based.
-    //
     // ponytail: `parent` round-trips as the source site's numeric page id untouched, so pushing
     // to a site where that id belongs to a different page (or nothing) silently mis-parents or
     // orphans the page. No id-remapping across sites here; fine for same-hierarchy environments,
@@ -117,38 +105,25 @@ export default class Push extends PushCommand {
             return getPageId(page.meta);
         }
         try {
-            let id = getPageId(page.meta);
+            const id = getPageId(page.meta);
             const payload = { ...page.meta, content: page.content };
-            if (id === null) {
-                const created = await this.wp.post(PAGE_ENDPOINT, payload);
-                id = getPageId(created);
-                if (id !== null)
-                    await this.ensureCanonicalFilename(page, id, title);
-            }
-            else {
-                try {
-                    await this.wp.put(`${PAGE_ENDPOINT}/${id}`, payload);
-                    await this.ensureCanonicalFilename(page, id, title);
-                }
-                catch (error) {
-                    // The id recorded locally doesn't exist on this site (e.g. a fresh install): create
-                    // it instead of failing, and adopt whatever id the site assigns. WordPress core
-                    // rejects any POST that still carries a (now stale) `id` field with a 400 "Cannot
-                    // create existing post", regardless of whether that id actually exists, so it must
-                    // be stripped before falling back to create.
-                    if (!isNotFoundError(error))
-                        throw error;
-                    const newPayload = { ...payload };
-                    delete newPayload.id;
-                    const created = await this.wp.post(PAGE_ENDPOINT, newPayload);
-                    id = getPageId(created);
-                    if (id !== null)
-                        await this.ensureCanonicalFilename(page, id, title);
-                }
-            }
+            // WordPress core rejects any POST that still carries a (now stale) `id` field with a
+            // 400 "Cannot create existing post", regardless of whether that id actually exists.
+            const postPayload = { ...payload };
+            delete postPayload.id;
+            const { body, created } = await putOrCreate(this.wp, {
+                id,
+                payload,
+                postEndpoint: PAGE_ENDPOINT,
+                postPayload,
+                putEndpoint: (pageId) => `${PAGE_ENDPOINT}/${pageId}`,
+            });
+            const resultId = created ? getPageId(body) : id;
+            if (resultId !== null)
+                await this.ensureCanonicalFilename(page, resultId, title);
             if (task)
                 task.output = `Pushed: ${title}`;
-            return id;
+            return resultId;
         }
         catch (error) {
             this.reportTaskFailure(`Failed to push ${title}: ${error.message}`, error, task);

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

@@ -11,5 +11,6 @@ export default class Pull extends LoopressCommand {
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<PullResult>;
+    private logSkippedComposerManaged;
 }
 export {};