@loopress/cli 0.17.0 → 0.19.0

package/dist/commands/form/pull.js

@@ -0,0 +1,60 @@
+import { Args } from '@oclif/core';
+import { Listr } from 'listr2';
+import { mkdir, 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 { toSlug } from '../../utils/to-slug.js';
+export default class Pull extends LoopressCommand {
+    static args = {
+        path: Args.string({ description: 'Path to forms directory (overrides project config)' }),
+    };
+    static description = 'Pull forms from WordPress';
+    static examples = ['$ lps form pull'];
+    static flags = {
+        ...LoopressCommand.dryRunFlag,
+        ...LoopressCommand.yesFlag,
+    };
+    async run() {
+        const { args } = await this.parse(Pull);
+        const { url } = this.siteConfig;
+        const path = this.resolveFormPath(args.path);
+        this.log(`Pulling forms from ${url}`);
+        this.log(`Forms path: ${path}`);
+        const remoteList = await this.wp.get(FORM_ENDPOINT);
+        const withId = remoteList.filter((form) => getFormId(form) !== null);
+        const skipped = remoteList.length - withId.length;
+        // Only matches files following the `<id>-<slug>.json` convention pull/push themselves
+        // produce, same principle as `snippet pull`.
+        const orphans = await findOrphanedFiles(path, new Set(withId.map((form) => String(getFormId(form)))), {
+            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(', ')}`);
+            }
+            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`);
+        }
+    }
+}

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

@@ -0,0 +1,16 @@
+import { PushCommand } from '../../lib/push-command.js';
+export default class Push extends PushCommand {
+    static args: {
+        path: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static description: string;
+    static examples: string[];
+    static flags: {
+        yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+    private ensureCanonicalFilename;
+    private loadFiles;
+    private pushForm;
+}

package/dist/commands/form/push.js

@@ -0,0 +1,122 @@
+import { Args } from '@oclif/core';
+import { Listr } from 'listr2';
+import { readdir, 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 { FORM_ENDPOINT, getFormId, getFormTitle } from '../../utils/form-format.js';
+import { toSlug } from '../../utils/to-slug.js';
+export default class Push extends PushCommand {
+    static args = {
+        path: Args.string({ description: 'Path to forms directory (overrides project config)' }),
+    };
+    static description = 'Push forms to WordPress. Local files created or updated remotely are renamed on disk to the `<id>-<slug>.json` convention.';
+    static examples = ['$ lps form push'];
+    static flags = {
+        ...PushCommand.dryRunFlag,
+        ...PushCommand.yesFlag,
+    };
+    async run() {
+        const { args } = await this.parse(Push);
+        const { url } = this.siteConfig;
+        const path = this.resolveFormPath(args.path);
+        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();
+        if (this.failedCount > 0) {
+            this.error(`${this.failedCount} form${this.failedCount === 1 ? '' : 's'} failed to push.`);
+        }
+        if (this.dryRun)
+            return;
+        await this.recordSuccess();
+        this.log('All forms pushed.');
+    }
+    // Renames the local file to the `<id>-<slug>.json` convention used by `form pull`
+    // whenever it doesn't already match (a hand-created file with no id, or a stale slug after
+    // a title change in the WordPress admin), same principle as ensureCanonicalFilename in
+    // commands/snippet/push.ts.
+    async ensureCanonicalFilename(filePath, id, title) {
+        const canonicalPath = join(dirname(filePath), `${id}-${toSlug(title, 'untitled')}.json`);
+        if (filePath !== canonicalPath)
+            await rename(filePath, canonicalPath);
+    }
+    // One file is read in isolation: a corrupted or hand-broken JSON file must only skip that
+    // 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 forms = [];
+        for (const file of files) {
+            if (extname(file) !== '.json')
+                continue;
+            const filePath = join(dir, file);
+            let parsed;
+            try {
+                parsed = JSON.parse(await readFile(filePath, 'utf8'));
+            }
+            catch (error) {
+                this.warn(`Skipping "${filePath}": ${error.message}`);
+                continue;
+            }
+            if (typeof parsed !== 'object' || parsed === null) {
+                this.warn(`Skipping "${filePath}": not a JSON object`);
+                continue;
+            }
+            forms.push({ data: parsed, filePath });
+        }
+        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) {
+            if (task)
+                task.output = `[dry-run] Would push: ${title}`;
+            return;
+        }
+        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);
+                }
+            }
+            if (task)
+                task.output = `Pushed: ${title}`;
+        }
+        catch (error) {
+            this.reportTaskFailure(`Failed to push ${title}: ${error.message}`, error, task);
+        }
+    }
+}

package/dist/commands/init.d.ts

@@ -3,4 +3,6 @@ export default class Init extends Command {
     static description: string;
     static examples: string[];
     run(): Promise<void>;
+    private promptManualProjectId;
+    private resolveProjectChoice;
 }

package/dist/commands/init.js

@@ -1,8 +1,9 @@
-import { confirm, input, select } from '@inquirer/prompts';
+import { checkbox, confirm, input, select } from '@inquirer/prompts';
 import { Command } from '@oclif/core';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { configManager } from '../config/project-config.manager.js';
+import { isInteractive } from '../lib/interactive.js';
 import { writeLocalConfig } from '../utils/loopress-config.js';
 // WordPress.org slugs for the two snippet plugins the Loopress WordPress plugin supports
 // (see SnippetModule.php, which wires up both providers and auto-detects the active one).
@@ -10,11 +11,21 @@ const SNIPPET_PROVIDERS = [
     { name: 'Code Snippets', slug: 'code-snippets' },
     { name: 'WPCode', slug: 'insert-headers-and-footers' },
 ];
+// Default directory per optional feature, matching the resolve*Path defaults in lib/base.ts.
+const FEATURES = [
+    { dir: 'acf', key: 'acfDir', label: 'ACF' },
+    { dir: 'seo', key: 'seoDir', label: 'SEO' },
+    { dir: 'forms', key: 'formDir', label: 'Forms' },
+    { dir: 'api', key: 'apiDir', label: 'Custom API routes' },
+];
 export default class Init extends Command {
     static description = 'Initialize a loopress.json config file in the current directory';
     static examples = ['$ lps init'];
     async run() {
         await this.parse(Init);
+        if (!isInteractive()) {
+            this.error('lps init asks its questions interactively and needs a terminal. In CI or scripts, commit a loopress.json instead (see the Getting Started documentation for the file format).');
+        }
         const configPath = join(process.cwd(), 'loopress.json');
         if (existsSync(configPath)) {
             const overwrite = await confirm({
@@ -26,38 +37,7 @@ export default class Init extends Command {
                 return;
             }
         }
-        const projects = configManager.listProjects();
-        let projectId;
-        let projectLabel;
-        if (projects.length > 0) {
-            const choices = [
-                ...projects.map((p) => ({ name: p.name, value: p.id })),
-                { name: 'Enter a project ID manually', value: '__manual__' },
-            ];
-            const choice = await select({
-                choices,
-                message: 'WordPress project',
-            });
-            if (choice === '__manual__') {
-                projectId = await input({
-                    message: 'Project ID',
-                    validate: (value) => (value.trim().length > 0 ? true : 'Project ID cannot be empty'),
-                });
-                projectLabel = projectId;
-            }
-            else {
-                projectId = choice;
-                projectLabel = projects.find((p) => p.id === choice).name;
-            }
-        }
-        else {
-            this.log('No projects configured yet. Run `lps project config` to add one first.');
-            projectId = await input({
-                message: 'Project ID',
-                validate: (value) => (value.trim().length > 0 ? true : 'Project ID cannot be empty'),
-            });
-            projectLabel = projectId;
-        }
+        const { projectId, projectLabel } = await this.resolveProjectChoice();
         const rootDir = await input({
             default: '.',
             message: 'Root directory',
@@ -66,6 +46,10 @@ export default class Init extends Command {
             default: 'snippets',
             message: 'Snippets directory (relative to root)',
         });
+        const features = await checkbox({
+            choices: FEATURES.map((feature) => ({ name: `${feature.label} (${feature.dir}/)`, value: feature.key })),
+            message: 'Other features to configure directories for (optional)',
+        });
         const providerChoice = await select({
             choices: [...SNIPPET_PROVIDERS.map((p) => ({ name: p.name, value: p.slug })), { name: 'None / already installed', value: '__none__' }],
             message: 'Snippet provider',
@@ -75,6 +59,10 @@ export default class Init extends Command {
             rootDir,
             snippetsDir,
         };
+        for (const feature of FEATURES) {
+            if (features.includes(feature.key))
+                config[feature.key] = feature.dir;
+        }
         await writeLocalConfig(config);
         let providerAdded = false;
         if (providerChoice !== '__none__') {
@@ -89,8 +77,51 @@ export default class Init extends Command {
         this.log(`\n✓ loopress.json created`);
         this.log(`  Project:  ${projectLabel}`);
         this.log(`  Snippets: ${join(rootDir, snippetsDir)}`);
+        for (const feature of FEATURES) {
+            if (features.includes(feature.key)) {
+                this.log(`  ${feature.label}:${' '.repeat(Math.max(1, 9 - feature.label.length))}${join(rootDir, feature.dir)}`);
+            }
+        }
         if (providerAdded) {
             this.log(`  Plugin:   ${providerChoice}`);
         }
+        this.log('\n→ Next: run `lps snippet pull` to fetch what is already on the site, or `lps doctor` to verify the connection.');
+    }
+    // When nothing is configured yet, the useful path is configuring a project right here, not
+    // typing a project ID that points at nothing. Manual entry stays available as an explicit
+    // choice, and as the fallback when the inline `project config` is declined or aborted.
+    async promptManualProjectId() {
+        const projectId = await input({
+            message: 'Project ID',
+            validate: (value) => (value.trim().length > 0 ? true : 'Project ID cannot be empty'),
+        });
+        return { projectId, projectLabel: projectId };
+    }
+    async resolveProjectChoice() {
+        let projects = configManager.listProjects();
+        if (projects.length === 0) {
+            this.log('No projects configured yet.');
+            const runConfig = await confirm({ default: true, message: 'Run `lps project config` now to add one?' });
+            if (!runConfig) {
+                return this.promptManualProjectId();
+            }
+            await this.config.runCommand('project:config');
+            projects = configManager.listProjects();
+            if (projects.length === 0) {
+                this.log('Still no project configured, falling back to manual entry.');
+                return this.promptManualProjectId();
+            }
+            if (projects.length === 1) {
+                return { projectId: projects[0].id, projectLabel: projects[0].name };
+            }
+        }
+        const choice = await select({
+            choices: [...projects.map((p) => ({ name: p.name, value: p.id })), { name: 'Enter a project ID manually', value: '__manual__' }],
+            message: 'WordPress project',
+        });
+        if (choice === '__manual__') {
+            return this.promptManualProjectId();
+        }
+        return { projectId: choice, projectLabel: projects.find((p) => p.id === choice).name };
     }
 }

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

@@ -3,9 +3,9 @@ export default class Push extends PushCommand {
     static description: string;
     static examples: string[];
     static flags: {
+        yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
-    private failedCount;
     run(): Promise<void>;
     private activatePlugin;
     private installPlugin;

package/dist/commands/plugin/push.js

@@ -7,8 +7,8 @@ export default class Push extends PushCommand {
     static examples = ['$ lps plugin push', '$ lps plugin push --dry-run'];
     static flags = {
         ...PushCommand.dryRunFlag,
+        ...PushCommand.yesFlag,
     };
-    failedCount = 0;
     async run() {
         const { url } = this.siteConfig;
         const manifest = this.localConfig.plugins;
@@ -62,12 +62,6 @@ export default class Push extends PushCommand {
         }
         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(file, slug, task) {
         await this.performPluginAction('activate', slug, () => this.wp.put(`wp/v2/plugins/${file}`, { status: 'active' }), task);
     }
@@ -84,13 +78,7 @@ export default class Push extends PushCommand {
                 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;
+            this.reportTaskFailure(`Failed to ${verb} ${slug}: ${error.message}`, error, task);
         }
     }
 }

package/dist/commands/project/config.js

@@ -1,6 +1,7 @@
 import { confirm, input, password as passwordPrompt, select } from '@inquirer/prompts';
 import { Command } from '@oclif/core';
 import { configManager } from '../../config/project-config.manager.js';
+import { isInteractive } from '../../lib/interactive.js';
 import { authorizeWithBrowser } from '../../lib/wp-authorize-flow.js';
 import { diagnoseWpSite } from '../../lib/wp-site-diagnostic.js';
 const NEW_PROJECT = '__new__';
@@ -11,6 +12,9 @@ export default class Config extends Command {
     static examples = ['$ lps project config'];
     async run() {
         await this.parse(Config);
+        if (!isInteractive()) {
+            this.error('lps project config asks its questions interactively and needs a terminal. Configure the project on your machine, then target environments in CI with --env.');
+        }
         const { projectId, projectName } = await this.resolveProject();
         const envChoice = await select({
             choices: [

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

@@ -2,9 +2,14 @@ import { Command } from '@oclif/core';
 export default class Push extends Command {
     static description: string;
     static examples: string[];
+    static flags: {
+        yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+    };
+    private yes;
     run(): Promise<void>;
     private applyEnvironment;
     private applyProject;
+    private confirmLink;
     private fetchApiProjects;
     private planEnvironment;
     private planProject;

package/dist/commands/project/push.js

@@ -1,15 +1,22 @@
 import { confirm } from '@inquirer/prompts';
 import { Command } from '@oclif/core';
 import { Listr } from 'listr2';
-import slugify from 'slugify';
 import { authManager } from '../../config/auth.manager.js';
 import { configManager } from '../../config/project-config.manager.js';
 import { ApiClient } from '../../lib/api-client.js';
+import { LoopressCommand } from '../../lib/base.js';
+import { isInteractive } from '../../lib/interactive.js';
+import { toSlug } from '../../utils/to-slug.js';
 export default class Push extends Command {
     static description = 'Push locally configured projects, environments and credentials to your Loopress account';
     static examples = ['$ lps project push'];
+    static flags = {
+        ...LoopressCommand.yesFlag,
+    };
+    yes = false;
     async run() {
-        await this.parse(Push);
+        const { flags } = await this.parse(Push);
+        this.yes = Boolean(flags.yes);
         const token = authManager.getAuth()?.token;
         if (!token) {
             this.error('Not logged in. Run `lps login` first.');
@@ -126,6 +133,15 @@ export default class Push extends Command {
             throw error;
         }
     }
+    // Linking to the existing match is the safe default: outside a TTY (or with --yes) it is
+    // taken without prompting, and logged, so CI runs never mint duplicate projects.
+    async confirmLink(message) {
+        if (this.yes || !isInteractive()) {
+            this.log(`${message} Assuming yes (link).`);
+            return true;
+        }
+        return confirm({ default: true, message });
+    }
     async fetchApiProjects(api) {
         try {
             return await api.get('projects');
@@ -142,10 +158,7 @@ export default class Push extends Command {
         }
         const match = apiProject?.environments.find((candidate) => candidate.name === env.name && !claimedEnvironmentIds.has(candidate.id));
         if (match) {
-            const link = await confirm({
-                default: true,
-                message: `Environment "${env.name}" already exists on "${apiProject?.name}". Link to it instead of creating a new one?`,
-            });
+            const link = await this.confirmLink(`Environment "${env.name}" already exists on "${apiProject?.name}". Link to it instead of creating a new one?`);
             if (link) {
                 claimedEnvironmentIds.add(match.id);
                 return { action: 'link', apiEnvironmentId: match.id, env, projectId };
@@ -158,13 +171,10 @@ export default class Push extends Command {
             claimedProjectIds.add(project.apiProjectId);
             return { action: 'synced', apiProjectId: project.apiProjectId, project };
         }
-        const slug = slugify(project.name, { lower: true, strict: true });
+        const slug = toSlug(project.name);
         const match = apiProjects.find((candidate) => candidate.slug === slug && !claimedProjectIds.has(candidate.id));
         if (match) {
-            const link = await confirm({
-                default: true,
-                message: `A project named "${project.name}" already exists on your account. Link to it instead of creating a new one?`,
-            });
+            const link = await this.confirmLink(`A project named "${project.name}" already exists on your account. Link to it instead of creating a new one?`);
             if (link) {
                 claimedProjectIds.add(match.id);
                 return { action: 'link', apiProjectId: match.id, project };

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

@@ -1,5 +1,4 @@
 import { LoopressCommand } from '../../lib/base.js';
-import { SeoRedirect } from '../../utils/seo-format.js';
 export default class Pull extends LoopressCommand {
     static args: {
         path: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
@@ -8,12 +7,11 @@ export default class Pull extends LoopressCommand {
     static examples: string[];
     static flags: {
         'post-type': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
-    private findOrphanedFiles;
     private pullPostMeta;
     private pullRedirects;
     private pullSettings;
 }
-export declare function redirectFileBase(redirect: SeoRedirect): string;

package/dist/commands/seo/pull.js

@@ -1,10 +1,10 @@
 import { Args, Flags } from '@oclif/core';
 import { Listr } from 'listr2';
-import { mkdir, readdir, rm, writeFile } from 'node:fs/promises';
-import { extname, join } from 'node:path';
-import slugify from 'slugify';
+import { mkdir, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
 import { LoopressCommand } from '../../lib/base.js';
-import { DEFAULT_POST_TYPES, SEO_REDIRECTS_ENDPOINT, SEO_SETTINGS_ENDPOINT, seoPostMetaEndpoint, } from '../../utils/seo-format.js';
+import { basenameKey, findOrphanedFiles, numericPrefixKey } from '../../lib/find-orphaned-files.js';
+import { DEFAULT_POST_TYPES, redirectFileBase, SEO_REDIRECTS_ENDPOINT, SEO_SETTINGS_ENDPOINT, seoPostMetaEndpoint, } from '../../utils/seo-format.js';
 export default class Pull extends LoopressCommand {
     static args = {
         path: Args.string({ description: 'Path to SEO directory (overrides project config)' }),
@@ -13,6 +13,7 @@ export default class Pull extends LoopressCommand {
     static examples = ['$ lps seo pull', '$ lps seo pull --post-type post --post-type page'];
     static flags = {
         ...LoopressCommand.dryRunFlag,
+        ...LoopressCommand.yesFlag,
         'post-type': Flags.string({ description: 'Limit post meta to specific post types', multiple: true }),
     };
     async run() {
@@ -28,33 +29,13 @@ export default class Pull extends LoopressCommand {
         }
         await this.pullRedirects(path);
     }
-    // Shared by post-meta (`<slug>.json`) and redirects (`<id>-<slug>.json`) directories: a local
-    // file whose identity is no longer in the current remote list belongs to something deleted on
-    // WordPress. Left on disk, it would silently come back to life on the next `seo push`.
-    async findOrphanedFiles(dir, keepKeys, numericIdPrefix) {
-        let files;
-        try {
-            files = await readdir(dir);
-        }
-        catch (error) {
-            if (error.code === 'ENOENT')
-                return [];
-            throw error;
-        }
-        return files.filter((file) => {
-            if (extname(file) !== '.json')
-                return false;
-            if (numericIdPrefix) {
-                const match = /^(\d+)-/.exec(file);
-                return match !== null && !keepKeys.has(match[1]);
-            }
-            return !keepKeys.has(file.slice(0, -'.json'.length));
-        });
-    }
     async pullPostMeta(postType, basePath) {
         const dir = join(basePath, 'post-meta', postType);
         const remote = await this.wp.get(seoPostMetaEndpoint(postType));
-        const orphans = await this.findOrphanedFiles(dir, new Set(remote.map((post) => post.slug)), false);
+        const orphans = await findOrphanedFiles(dir, new Set(remote.map((post) => post.slug)), {
+            extensions: ['.json'],
+            key: basenameKey,
+        });
         if (this.dryRun) {
             this.log(`[dry-run] Would pull ${remote.length} ${postType} post-meta file(s) to ${dir}`);
             if (orphans.length > 0) {
@@ -71,11 +52,7 @@ export default class Pull extends LoopressCommand {
             },
             title: `Pull ${post.slug}`,
         }))).run();
-        for (const file of orphans)
-            await rm(join(dir, file), { force: true });
-        if (orphans.length > 0) {
-            this.warn(`Removed ${orphans.length} local file${orphans.length === 1 ? '' : 's'} in ${dir} no longer present on WordPress: ${orphans.join(', ')}`);
-        }
+        await this.removeOrphanedFiles(dir, orphans, `in ${dir} no longer present on WordPress`);
         this.log(`Pulled ${remote.length} ${postType} post-meta file(s) to ${dir}`);
     }
     // Redirects are only supported by some SeoProvider backends (RankMath, not Yoast). Unlike
@@ -92,7 +69,10 @@ export default class Pull extends LoopressCommand {
             this.warn(`Skipping redirects: ${error.message}`);
             return;
         }
-        const orphans = await this.findOrphanedFiles(dir, new Set(remote.map((redirect) => String(redirect.id))), true);
+        const orphans = await findOrphanedFiles(dir, new Set(remote.map((redirect) => String(redirect.id))), {
+            extensions: ['.json'],
+            key: numericPrefixKey,
+        });
         if (this.dryRun) {
             this.log(`[dry-run] Would pull ${remote.length} redirect(s) to ${dir}`);
             if (orphans.length > 0) {
@@ -109,11 +89,7 @@ export default class Pull extends LoopressCommand {
             },
             title: `Pull redirect #${redirect.id}`,
         }))).run();
-        for (const file of orphans)
-            await rm(join(dir, file), { force: true });
-        if (orphans.length > 0) {
-            this.warn(`Removed ${orphans.length} local file${orphans.length === 1 ? '' : 's'} in ${dir} no longer present on WordPress: ${orphans.join(', ')}`);
-        }
+        await this.removeOrphanedFiles(dir, orphans, `in ${dir} no longer present on WordPress`);
         this.log(`Pulled ${remote.length} redirect(s) to ${dir}`);
     }
     async pullSettings(basePath) {
@@ -128,7 +104,3 @@ export default class Pull extends LoopressCommand {
         this.log(`Pulled settings to ${file}`);
     }
 }
-export function redirectFileBase(redirect) {
-    const slug = slugify(redirect.urlTo || 'redirect', { lower: true, strict: true });
-    return `${redirect.id}-${slug || 'redirect'}`;
-}

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

@@ -6,9 +6,9 @@ export default class Push extends PushCommand {
     static description: string;
     static examples: string[];
     static flags: {
+        yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
-    private failedCount;
     run(): Promise<void>;
     private jsonFilesIn;
     private pushPostMeta;