@loopress/cli 0.6.0 → 0.7.0

package/dist/commands/project/list.js

@@ -12,17 +12,16 @@ export default class List extends Command {
             return;
         }
         for (const project of projects) {
-            const envs = Object.values(project.environments);
+            const envs = configManager.listEnvironments(project.id);
             const marker = project.isCurrent ? c('green', '●') : c('dim', '○');
             const name = project.isCurrent ? c('green', project.name) : project.name;
             const currentTag = project.isCurrent ? ` ${c('green', '[current]')}` : '';
             this.log(`${marker} ${name}${currentTag}`);
             for (const env of envs) {
-                const isActiveEnv = env.name === project.currentEnv;
-                const envMarker = isActiveEnv ? c('cyan', '·') : c('dim', '·');
-                const envName = isActiveEnv ? c('cyan', env.name.padEnd(15)) : c('dim', env.name.padEnd(15));
+                const envMarker = env.isCurrent ? c('cyan', '·') : c('dim', '·');
+                const envName = env.isCurrent ? c('cyan', env.name.padEnd(15)) : c('dim', env.name.padEnd(15));
                 const envUrl = c('dim', env.url);
-                const activeTag = isActiveEnv ? ` ${c('cyan', '←')}` : '';
+                const activeTag = env.isCurrent ? ` ${c('cyan', '←')}` : '';
                 this.log(`  ${envMarker} ${envName} ${envUrl}${activeTag}`);
             }
             this.log('');

package/dist/commands/project/remove.js

@@ -2,7 +2,7 @@ import { checkbox } from '@inquirer/prompts';
 import { Command } from '@oclif/core';
 import { configManager } from '../../config/project-config.manager.js';
 export default class Remove extends Command {
-    static description = 'Remove one or more WordPress project configurations';
+    static description = 'Remove one or more WordPress projects or environments';
     static examples = ['$ lps project remove'];
     async run() {
         await this.parse(Remove);
@@ -10,25 +10,44 @@ export default class Remove extends Command {
         if (projects.length === 0) {
             this.error('No projects configured.');
         }
-        const chosen = await checkbox({
-            choices: projects.map((project) => {
-                const envCount = Object.keys(project.environments).length;
-                const envLabel = `${envCount} env${envCount > 1 ? 's' : ''}`;
-                const currentMarker = project.isCurrent ? ' [current]' : '';
+        const targets = [];
+        const choices = projects.flatMap((project) => {
+            const envCount = Object.keys(project.environments).length;
+            const envLabel = `${envCount} env${envCount > 1 ? 's' : ''}`;
+            const currentMarker = project.isCurrent ? ' [current]' : '';
+            targets.push({ kind: 'project', projectId: project.id, projectName: project.name });
+            const projectChoice = {
+                name: `${project.isCurrent ? '●' : '○'} ${project.name.padEnd(20)} (${envLabel})${currentMarker}`,
+                value: String(targets.length - 1),
+            };
+            const envChoices = configManager.listEnvironments(project.id).map((env) => {
+                targets.push({ env: env.name, kind: 'env', projectId: project.id, projectName: project.name });
                 return {
-                    name: `${project.isCurrent ? '●' : '○'} ${project.name.padEnd(20)} (${envLabel})${currentMarker}`,
-                    value: project.name,
+                    name: `    ${env.isCurrent ? '●' : '○'} ${env.name.padEnd(20)} ${env.url}${env.isCurrent ? ' [current]' : ''}`,
+                    value: String(targets.length - 1),
                 };
-            }),
-            message: 'Select projects to remove',
+            });
+            return [projectChoice, ...envChoices];
+        });
+        const chosen = await checkbox({
+            choices,
+            message: 'Select projects or environments to remove',
         });
         if (chosen.length === 0) {
             this.log('Nothing removed.');
             return;
         }
-        for (const name of chosen) {
-            configManager.removeProject(name);
-        }
-        this.log(`✓ Removed: ${chosen.join(', ')}`);
+        const selected = chosen.map((index) => targets[Number(index)]);
+        const projectsToRemove = new Map(selected.filter((target) => target.kind === 'project').map((target) => [target.projectId, target.projectName]));
+        const envsToRemove = selected.filter((target) => target.kind === 'env' && !projectsToRemove.has(target.projectId));
+        for (const projectId of projectsToRemove.keys())
+            configManager.removeProject(projectId);
+        for (const { env, projectId } of envsToRemove)
+            configManager.removeEnvironment(projectId, env);
+        const removedLabels = [
+            ...projectsToRemove.values(),
+            ...envsToRemove.map(({ env, projectName }) => `${projectName}/${env}`),
+        ];
+        this.log(`✓ Removed: ${removedLabels.join(', ')}`);
     }
 }

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

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

package/dist/commands/project/switch.js

@@ -2,7 +2,7 @@ import { select } from '@inquirer/prompts';
 import { Command } from '@oclif/core';
 import { configManager } from '../../config/project-config.manager.js';
 export default class Switch extends Command {
-    static description = 'Switch the active project';
+    static description = 'Switch the active project and environment';
     static examples = ['$ lps project switch'];
     async run() {
         await this.parse(Switch);
@@ -10,11 +10,30 @@ export default class Switch extends Command {
         if (projects.length === 0) {
             this.error('No projects configured. Run `lps project config` first.');
         }
-        if (projects.length === 1) {
-            configManager.setCurrentProject(projects[0].name);
-            this.log(`✓ Switched to "${projects[0].name}"`);
-            return;
+        const { id: projectId, name: projectName } = await this.resolveProject(projects);
+        const envName = await this.resolveEnvironment(projectId, projectName);
+        configManager.setCurrent(projectId, envName);
+        this.log(`✓ Switched to "${projectName}/${envName}"`);
+    }
+    async resolveEnvironment(projectId, projectName) {
+        const envs = configManager.listEnvironments(projectId);
+        if (envs.length === 0) {
+            this.error(`No environments configured for "${projectName}". Run \`lps project config\` first.`);
         }
+        if (envs.length === 1)
+            return envs[0].name;
+        return select({
+            choices: envs.map((env) => ({
+                name: `${env.isCurrent ? '●' : '○'} ${env.name.padEnd(20)} ${env.url}${env.isCurrent ? ' [current]' : ''}`,
+                value: env.name,
+            })),
+            default: envs.find((env) => env.isCurrent)?.name,
+            message: `Select environment for "${projectName}"`,
+        });
+    }
+    async resolveProject(projects) {
+        if (projects.length === 1)
+            return { id: projects[0].id, name: projects[0].name };
         const chosen = await select({
             choices: projects.map((project) => {
                 const envCount = Object.keys(project.environments).length;
@@ -22,13 +41,13 @@ export default class Switch extends Command {
                 const currentMarker = project.isCurrent ? ' [current]' : '';
                 return {
                     name: `${project.isCurrent ? '●' : '○'} ${project.name.padEnd(20)} (${envLabel})${currentMarker}`,
-                    value: project.name,
+                    value: project.id,
                 };
             }),
-            default: projects.find((p) => p.isCurrent)?.name,
+            default: projects.find((project) => project.isCurrent)?.id,
             message: 'Select active project',
         });
-        configManager.setCurrentProject(chosen);
-        this.log(`✓ Switched to "${chosen}"`);
+        const project = projects.find((p) => p.id === chosen);
+        return { id: project.id, name: project.name };
     }
 }

package/dist/commands/snippet/list.js

@@ -5,9 +5,9 @@ import { getSnippetPlugin } from '../../utils/snippet-plugin.js';
 export default class List extends LoopressCommand {
     static description = 'List snippets from WordPress';
     static examples = [
-        '$ lps snippets list',
-        '$ lps snippets list --url http://example.com',
-        '$ lps snippets list --plugin wpcode',
+        '$ lps snippet list',
+        '$ lps snippet list --url http://example.com',
+        '$ lps snippet list --plugin wpcode',
     ];
     static flags = {
         ...LoopressCommand.baseFlags,

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

@@ -9,7 +9,7 @@ export default class Pull extends LoopressCommand {
     static description: string;
     static examples: string[];
     static flags: {
-        dryRun: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        '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>;

package/dist/commands/snippet/pull.js

@@ -35,14 +35,14 @@ export default class Pull extends LoopressCommand {
     };
     static description = 'Pull snippets from WordPress';
     static examples = [
-        '$ lps snippets pull',
-        '$ lps snippets pull --url http://example.com',
-        '$ lps snippets pull --path ./snippets',
-        '$ lps snippets pull --plugin wpcode',
+        '$ lps snippet pull',
+        '$ lps snippet pull --url http://example.com',
+        '$ lps snippet pull --path ./snippets',
+        '$ lps snippet pull --plugin wpcode',
     ];
     static flags = {
         ...LoopressCommand.baseFlags,
-        dryRun: Flags.boolean({ char: 'd', description: 'Dry run - show what would happen without making changes' }),
+        '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)',
@@ -51,7 +51,8 @@ export default class Pull extends LoopressCommand {
     };
     async run() {
         const { args, flags } = await this.parse(Pull);
-        const { dryRun, plugin } = flags;
+        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);

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

@@ -6,14 +6,14 @@ export default class Push extends PushCommand {
     static description: string;
     static examples: string[];
     static flags: {
-        dryRun: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        '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>;
     };
     run(): Promise<void>;
-    private injectIdIntoMeta;
+    private ensureCanonicalFilename;
     private loadSnippets;
     private pushSnippet;
 }

package/dist/commands/snippet/push.js

@@ -1,21 +1,30 @@
 import { Args, Flags } from '@oclif/core';
 import got from 'got';
+import { basename, dirname, extname, join } from 'node:path';
+import slugify from 'slugify';
 import { PushCommand } from '../../lib/push-command.js';
-import { getSnippetPlugin } from '../../utils/snippet-plugin.js';
+import { getSnippetPlugin, parseType } from '../../utils/snippet-plugin.js';
+const TYPE_BY_EXTENSION = {
+    '.css': 'css',
+    '.html': 'html',
+    '.js': 'js',
+    '.php': 'php',
+    '.txt': 'text',
+};
 export default class Push extends PushCommand {
     static args = {
         path: Args.string({ description: 'Path to snippets directory (overrides project config)' }),
     };
-    static description = 'Push snippets to WordPress';
+    static description = 'Push snippets to WordPress. Local snippet files created or updated remotely are renamed on disk to the `<id>-<slug>` convention.';
     static examples = [
-        '$ lps snippets push',
-        '$ lps snippets push --url http://example.com',
-        '$ lps snippets push --path ./snippets',
-        '$ lps snippets push --plugin wpcode',
+        '$ lps snippet push',
+        '$ lps snippet push --url http://example.com',
+        '$ lps snippet push --path ./snippets',
+        '$ lps snippet push --plugin wpcode',
     ];
     static flags = {
         ...PushCommand.baseFlags,
-        dryRun: Flags.boolean({ char: 'd', description: 'Dry run - show what would happen without making changes' }),
+        'dry-run': Flags.boolean({ char: 'd', description: 'Show what would change without making changes' }),
         plugin: Flags.string({
             char: 'p',
             description: 'WordPress snippet plugin to target (overrides loopress.json)',
@@ -24,7 +33,8 @@ export default class Push extends PushCommand {
     };
     async run() {
         const { args, flags } = await this.parse(Push);
-        const { dryRun, plugin } = flags;
+        const dryRun = flags['dry-run'];
+        const { plugin } = flags;
         this.dryRun = dryRun;
         const { url } = this.siteConfig;
         const path = await this.resolveSnippetsPath(args.path);
@@ -48,12 +58,19 @@ export default class Push extends PushCommand {
             this.error(error.message);
         }
     }
-    async injectIdIntoMeta(filePath, id) {
+    // Renames the local file pair to the `<id>-<slug>` convention used by `snippet pull` whenever
+    // it doesn't already match (e.g. a hand-created `demo.php` with no id, or a stale slug after a rename).
+    // This is a side effect of `push`: local files on disk are renamed, not just the remote snippet.
+    async ensureCanonicalFilename(snippet, id, name) {
         const fs = await import('node:fs/promises');
-        const metaPath = filePath.replace(/\.[^.]+$/, '.json');
+        const dir = dirname(snippet.path);
+        const ext = extname(snippet.path);
+        const currentBase = basename(snippet.path, ext);
+        const canonicalBase = `${id}-${slugify(name, { lower: true, strict: true })}`;
+        const oldMetaPath = join(dir, `${currentBase}.json`);
         let meta = {};
         try {
-            const existing = await fs.readFile(metaPath, 'utf8');
+            const existing = await fs.readFile(oldMetaPath, 'utf8');
             meta = JSON.parse(existing);
         }
         catch (error) {
@@ -61,12 +78,23 @@ export default class Push extends PushCommand {
                 throw error;
         }
         meta.id = id;
-        await fs.writeFile(metaPath, JSON.stringify(meta, null, 2) + '\n');
+        meta.name = name;
+        if (currentBase === canonicalBase) {
+            await fs.writeFile(oldMetaPath, JSON.stringify(meta, null, 2) + '\n');
+            return;
+        }
+        const newPath = join(dir, `${canonicalBase}${ext}`);
+        const newMetaPath = join(dir, `${canonicalBase}.json`);
+        await fs.rename(snippet.path, newPath);
+        await fs.writeFile(newMetaPath, JSON.stringify(meta, null, 2) + '\n');
+        if (oldMetaPath !== newMetaPath)
+            await fs.rm(oldMetaPath, { force: true });
+        this.log(`📁 Renamed: ${snippet.path} → ${newPath}`);
     }
     async loadSnippets(path) {
         const fs = await import('node:fs/promises');
         const snippets = [];
-        const SNIPPET_EXTENSIONS = new Set(['.css', '.html', '.js', '.php', '.txt']);
+        const SNIPPET_EXTENSIONS = new Set(Object.keys(TYPE_BY_EXTENSION));
         try {
             const files = await fs.readdir(path);
             for (const file of files) {
@@ -78,11 +106,13 @@ export default class Push extends PushCommand {
                 const content = await fs.readFile(filePath, 'utf8');
                 let id;
                 let name;
+                let type;
                 try {
                     const metaContent = await fs.readFile(metaPath, 'utf8');
                     const meta = JSON.parse(metaContent);
                     id = meta.id ? Number(meta.id) : undefined;
                     name = meta.name ? String(meta.name) : undefined;
+                    type = parseType(meta.type) ?? undefined;
                 }
                 catch (error) {
                     if (error.code !== 'ENOENT')
@@ -93,6 +123,7 @@ export default class Push extends PushCommand {
                     id,
                     name: name ?? file.slice(0, file.lastIndexOf('.')),
                     path: filePath,
+                    type: type ?? TYPE_BY_EXTENSION[ext] ?? 'php',
                 });
             }
         }
@@ -110,18 +141,19 @@ export default class Push extends PushCommand {
         }
         try {
             const endpoint = adapter.endpoint(url);
-            const payload = adapter.toPayload(snippet.name, snippet.code, snippet.path);
+            const payload = adapter.toPayload(snippet.name, snippet.code, snippet.path, snippet.type);
             if (snippet.id) {
                 this.log(`🔄 Updating snippet by id (${snippet.id}): ${snippet.name}`);
                 await got.put(`${endpoint}/${snippet.id}`, { headers, json: payload });
                 this.log(`✅ Updated: ${snippet.name}`);
+                await this.ensureCanonicalFilename(snippet, snippet.id, snippet.name);
                 return;
             }
             this.log(`➕ Creating new snippet: ${snippet.name}`);
             const response = await got.post(endpoint, { headers, json: payload }).json();
             const created = adapter.fromRemote(response);
-            await this.injectIdIntoMeta(snippet.path, created.id);
             this.log(`✅ Created: ${snippet.name} (id: ${created.id})`);
+            await this.ensureCanonicalFilename(snippet, created.id, created.name);
         }
         catch (error) {
             this.error(`❌ Error pushing snippet ${snippet.name}: ${error.message}`);

package/dist/commands/{project/remove-env.d.ts → status.d.ts}

@@ -1,6 +1,8 @@
 import { Command } from '@oclif/core';
-export default class RemoveEnv extends Command {
+export default class Status extends Command {
     static description: string;
     static examples: string[];
     run(): Promise<void>;
+    private reportActiveProject;
+    private reportPinnedProject;
 }

package/dist/commands/status.js

@@ -0,0 +1,66 @@
+import { Command, ux } from '@oclif/core';
+import { configManager } from '../config/project-config.manager.js';
+import { readLocalConfig } from '../utils/loopress-config.js';
+const c = ux.colorize;
+export default class Status extends Command {
+    static description = 'Show which WordPress project and environment commands will target';
+    static examples = ['$ lps status'];
+    async run() {
+        await this.parse(Status);
+        const localConfig = await readLocalConfig();
+        if (localConfig.projectId) {
+            this.reportPinnedProject(localConfig.projectId);
+            return;
+        }
+        this.reportActiveProject();
+    }
+    reportActiveProject() {
+        const env = configManager.getCurrentEnv();
+        if (!env) {
+            this.log('No project configured. Run `lps project config` first.');
+            return;
+        }
+        const project = configManager.getCurrentProject();
+        if (!project) {
+            this.log('No project configured. Run `lps project config` first.');
+            return;
+        }
+        this.log(`Project:  ${project.name} (${env.name})`);
+        this.log(`URL:      ${env.url}`);
+    }
+    reportPinnedProject(projectId) {
+        const project = configManager.getProject(projectId);
+        if (!project) {
+            this.log(`loopress.json pins project "${projectId}", but it no longer exists.`);
+            this.log('Run `lps project config` to configure it.');
+            return;
+        }
+        const envNames = Object.keys(project.environments);
+        if (envNames.length === 0) {
+            this.log(`Project:  ${project.name}`);
+            this.log('No environments configured for this project. Run `lps project config` to add one.');
+            return;
+        }
+        if (envNames.length === 1) {
+            const env = project.environments[envNames[0]];
+            this.log(`Project:  ${project.name} (${env.name})`);
+            this.log(`URL:      ${env.url}`);
+            return;
+        }
+        const current = configManager.getCurrentProject();
+        const currentEnv = current?.id === projectId ? configManager.getCurrentEnv() : null;
+        if (!currentEnv) {
+            this.log(`Project:  ${project.name} ${c('yellow', '(ambiguous)')}`);
+            this.log(`Environments: ${envNames.join(', ')}`);
+            this.log('');
+            this.warn(`"${project.name}" has multiple environments and isn't the globally active project.`);
+            this.log('Run `lps project switch` to pick one before running commands here.');
+            if (current) {
+                this.log(`(Globally active project right now: "${current.name}")`);
+            }
+            return;
+        }
+        this.log(`Project:  ${project.name} (${currentEnv.name})`);
+        this.log(`URL:      ${currentEnv.url}`);
+    }
+}

package/dist/config/project-config.manager.d.ts

@@ -4,25 +4,32 @@ export declare class ProjectConfigManager {
     private static instance;
     constructor(homeDir?: string);
     static getInstance(): ProjectConfigManager;
+    createProjectId(): string;
     ensureConfigDir(): void;
     getConfigFilePath(): string;
     getCurrentEnv(): EnvironmentConfig | null;
-    getCurrentProject(): null | ProjectConfig;
-    getEnvironment(projectName: string, envName: string): EnvironmentConfig | null;
-    getProject(name: string): null | ProjectConfig;
-    listEnvironments(projectName: string): Array<EnvironmentConfig & {
+    getCurrentProject(): null | (ProjectConfig & {
+        id: string;
+    });
+    getEnvironment(projectId: string, envName: string): EnvironmentConfig | null;
+    getProject(id: string): null | ProjectConfig;
+    listEnvironments(projectId: string): Array<EnvironmentConfig & {
         isCurrent: boolean;
     }>;
     listProjects(): Array<ProjectConfig & {
+        id: string;
         isCurrent: boolean;
     }>;
     readConfig(): LoopressConfig;
-    removeEnvironment(projectName: string, envName: string): void;
-    removeProject(name: string): void;
-    setCurrentEnv(projectName: string, envName: string): void;
-    setCurrentProject(name: string): void;
-    setEnvironment(projectName: string, envName: string, env: EnvironmentConfig): void;
-    setProject(name: string, project: ProjectConfig): void;
+    removeEnvironment(projectId: string, envName: string): void;
+    removeProject(id: string): void;
+    setCurrent(projectId: string, envName: string): void;
+    setEnvironment(projectId: string, envName: string, env: EnvironmentConfig): void;
+    setProject(id: string, project: ProjectConfig): void;
     writeConfig(config: LoopressConfig): void;
+    private isProjectConfig;
+    private sanitizeConfig;
+    private sanitizeCurrentProject;
+    private sanitizeProjects;
 }
 export declare const configManager: ProjectConfigManager;