@loopress/cli 0.6.0 → 0.7.0

package/dist/config/project-config.manager.js

@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto';
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
@@ -13,6 +14,9 @@ export class ProjectConfigManager {
         }
         return ProjectConfigManager.instance;
     }
+    createProjectId() {
+        return randomUUID();
+    }
     ensureConfigDir() {
         const dir = join(this.homeDir, '.loopress');
         if (!existsSync(dir)) {
@@ -23,41 +27,49 @@ export class ProjectConfigManager {
         return join(this.homeDir, '.loopress', 'config.json');
     }
     getCurrentEnv() {
-        const project = this.getCurrentProject();
-        if (!project || !project.currentEnv)
+        const config = this.readConfig();
+        if (!config.currentProject)
+            return null;
+        const project = config.projects[config.currentProject.id];
+        if (!project)
             return null;
-        return project.environments[project.currentEnv] ?? null;
+        return project.environments[config.currentProject.env] ?? null;
     }
     getCurrentProject() {
         const config = this.readConfig();
-        if (!config.currentProject || !config.projects[config.currentProject])
+        if (!config.currentProject)
+            return null;
+        const project = config.projects[config.currentProject.id];
+        if (!project)
             return null;
-        return config.projects[config.currentProject];
+        return { ...project, id: config.currentProject.id };
     }
-    getEnvironment(projectName, envName) {
-        const project = this.getProject(projectName);
+    getEnvironment(projectId, envName) {
+        const project = this.getProject(projectId);
         if (!project)
             return null;
         return project.environments[envName] ?? null;
     }
-    getProject(name) {
+    getProject(id) {
         const config = this.readConfig();
-        return config.projects[name] ?? null;
+        return config.projects[id] ?? null;
     }
-    listEnvironments(projectName) {
-        const project = this.getProject(projectName);
+    listEnvironments(projectId) {
+        const config = this.readConfig();
+        const project = config.projects[projectId];
         if (!project)
             return [];
         return Object.values(project.environments).map((env) => ({
             ...env,
-            isCurrent: env.name === project.currentEnv,
+            isCurrent: config.currentProject?.id === projectId && config.currentProject.env === env.name,
         }));
     }
     listProjects() {
         const config = this.readConfig();
-        return Object.values(config.projects).map((project) => ({
+        return Object.entries(config.projects).map(([id, project]) => ({
             ...project,
-            isCurrent: project.name === config.currentProject,
+            id,
+            isCurrent: config.currentProject?.id === id,
         }));
     }
     readConfig() {
@@ -65,58 +77,62 @@ export class ProjectConfigManager {
         if (!existsSync(filePath)) {
             return { currentProject: null, projects: {} };
         }
-        return JSON.parse(readFileSync(filePath, 'utf8'));
+        try {
+            const parsed = JSON.parse(readFileSync(filePath, 'utf8'));
+            return this.sanitizeConfig(parsed);
+        }
+        catch {
+            return { currentProject: null, projects: {} };
+        }
     }
-    removeEnvironment(projectName, envName) {
+    removeEnvironment(projectId, envName) {
         const config = this.readConfig();
-        if (!config.projects[projectName])
+        const project = config.projects[projectId];
+        if (!project)
             return;
-        const project = config.projects[projectName];
         delete project.environments[envName];
-        if (project.currentEnv === envName) {
+        if (config.currentProject?.id === projectId && config.currentProject.env === envName) {
             const remaining = Object.keys(project.environments);
-            project.currentEnv = remaining.length > 0 ? remaining[0] : null;
+            config.currentProject = remaining.length > 0 ? { env: remaining[0], id: projectId } : null;
         }
         this.writeConfig(config);
     }
-    removeProject(name) {
+    removeProject(id) {
         const config = this.readConfig();
-        delete config.projects[name];
-        if (config.currentProject === name) {
-            const remaining = Object.keys(config.projects);
-            config.currentProject = remaining.length > 0 ? remaining[0] : null;
+        delete config.projects[id];
+        if (config.currentProject?.id === id) {
+            const [nextId] = Object.keys(config.projects);
+            const nextProject = nextId ? config.projects[nextId] : undefined;
+            const [nextEnv] = nextProject ? Object.keys(nextProject.environments) : [];
+            config.currentProject = nextId && nextEnv ? { env: nextEnv, id: nextId } : null;
         }
         this.writeConfig(config);
     }
-    setCurrentEnv(projectName, envName) {
+    setCurrent(projectId, envName) {
         const config = this.readConfig();
-        if (!config.projects[projectName])
+        if (!config.projects[projectId])
             return;
-        config.projects[projectName].currentEnv = envName;
+        config.currentProject = { env: envName, id: projectId };
         this.writeConfig(config);
     }
-    setCurrentProject(name) {
+    setEnvironment(projectId, envName, env) {
         const config = this.readConfig();
-        config.currentProject = name;
-        this.writeConfig(config);
-    }
-    setEnvironment(projectName, envName, env) {
-        const config = this.readConfig();
-        if (!config.projects[projectName])
+        const project = config.projects[projectId];
+        if (!project)
             return;
-        const project = config.projects[projectName];
-        const isFirst = Object.keys(project.environments).length === 0;
         project.environments[envName] = env;
-        if (isFirst)
-            project.currentEnv = envName;
+        if (!config.currentProject)
+            config.currentProject = { env: envName, id: projectId };
         this.writeConfig(config);
     }
-    setProject(name, project) {
+    setProject(id, project) {
         const config = this.readConfig();
-        const isFirst = Object.keys(config.projects).length === 0;
-        config.projects[name] = project;
-        if (isFirst)
-            config.currentProject = name;
+        config.projects[id] = project;
+        if (!config.currentProject) {
+            const [firstEnv] = Object.keys(project.environments);
+            if (firstEnv)
+                config.currentProject = { env: firstEnv, id };
+        }
         this.writeConfig(config);
     }
     writeConfig(config) {
@@ -126,5 +142,36 @@ export class ProjectConfigManager {
         writeFileSync(tmpPath, JSON.stringify(config, null, 2));
         renameSync(tmpPath, filePath);
     }
+    isProjectConfig(value) {
+        if (typeof value !== 'object' || value === null)
+            return false;
+        const candidate = value;
+        return typeof candidate.name === 'string' && typeof candidate.environments === 'object' && candidate.environments !== null;
+    }
+    sanitizeConfig(value) {
+        if (typeof value !== 'object' || value === null)
+            return { currentProject: null, projects: {} };
+        const candidate = value;
+        return {
+            currentProject: this.sanitizeCurrentProject(candidate.currentProject),
+            projects: this.sanitizeProjects(candidate.projects),
+        };
+    }
+    sanitizeCurrentProject(value) {
+        if (value === null || typeof value !== 'object')
+            return null;
+        const pointer = value;
+        return typeof pointer.id === 'string' && typeof pointer.env === 'string' ? { env: pointer.env, id: pointer.id } : null;
+    }
+    sanitizeProjects(value) {
+        if (typeof value !== 'object' || value === null)
+            return {};
+        const projects = {};
+        for (const [id, project] of Object.entries(value)) {
+            if (this.isProjectConfig(project))
+                projects[id] = project;
+        }
+        return projects;
+    }
 }
 export const configManager = ProjectConfigManager.getInstance();

package/dist/config/types.d.ts

@@ -6,11 +6,14 @@ export interface EnvironmentConfig {
 }
 export interface ProjectConfig {
     addedAt: string;
-    currentEnv: null | string;
     environments: Record<string, EnvironmentConfig>;
     name: string;
 }
+export interface CurrentProjectPointer {
+    env: string;
+    id: string;
+}
 export interface LoopressConfig {
-    currentProject: null | string;
+    currentProject: CurrentProjectPointer | null;
     projects: Record<string, ProjectConfig>;
 }

package/dist/lib/base.js

@@ -33,10 +33,20 @@ export class LoopressCommand extends Command {
             if (!project) {
                 this.error(`Project "${localConfig.projectId}" (from loopress.json) not found. Run \`lps project config\` to configure it.`);
             }
-            if (!project.currentEnv || !project.environments[project.currentEnv]) {
-                this.error(`Project "${localConfig.projectId}" has no active environment. Run \`lps project config\` to configure one.`);
+            const envNames = Object.keys(project.environments);
+            if (envNames.length === 0) {
+                this.error(`Project "${project.name}" has no environments configured. Run \`lps project config\` to add one.`);
             }
-            this.siteConfig = project.environments[project.currentEnv];
+            if (envNames.length === 1) {
+                this.siteConfig = project.environments[envNames[0]];
+                return;
+            }
+            const current = configManager.getCurrentProject();
+            const currentEnv = current?.id === localConfig.projectId ? configManager.getCurrentEnv() : null;
+            if (!currentEnv) {
+                this.error(`Project "${project.name}" has multiple environments. Run \`lps project switch\` to pick one.`);
+            }
+            this.siteConfig = currentEnv;
             return;
         }
         const env = configManager.getCurrentEnv();

package/dist/types/snippet.d.ts

@@ -1,6 +1,8 @@
+import { SnippetType } from '../utils/snippet-plugin.js';
 export interface Snippet {
     code: string;
     id?: number;
     name: string;
     path: string;
+    type: SnippetType;
 }

package/dist/utils/snippet-plugin.d.ts

@@ -9,9 +9,10 @@ export interface NormalizedSnippet {
     tags: string[];
     type: SnippetType;
 }
+export declare function parseType(raw: unknown): null | SnippetType;
 export interface SnippetPlugin {
     endpoint(siteUrl: string): string;
     fromRemote(data: Record<string, unknown>): NormalizedSnippet;
-    toPayload(name: string, code: string, path: string): Record<string, unknown>;
+    toPayload(name: string, code: string, path: string, type: SnippetType): Record<string, unknown>;
 }
 export declare function getSnippetPlugin(name: PluginName): SnippetPlugin;

package/dist/utils/snippet-plugin.js

@@ -1,4 +1,4 @@
-function parseType(raw) {
+export function parseType(raw) {
     const valid = ['css', 'html', 'js', 'php', 'text'];
     const value = String(raw ?? '').toLowerCase();
     return valid.includes(value) ? value : null;
@@ -29,12 +29,13 @@ class CodeSnippetsPlugin {
             type: resolveType(data.type, String(data.code ?? '')),
         };
     }
-    toPayload(name, code, path) {
+    toPayload(name, code, path, type) {
         return {
             code: code.replace(/^<\?php\s*/i, ''),
             desc: `Imported from ${path}`,
             name,
             tags: ['cli-import'],
+            type,
         };
     }
 }
@@ -53,13 +54,13 @@ class WPCodePlugin {
             type: resolveType(data.type, String(data.code ?? '')),
         };
     }
-    toPayload(name, code, path) {
+    toPayload(name, code, path, type) {
         return {
             code,
             note: `Imported from ${path}`,
             tags: ['cli-import'],
             title: name,
-            type: 'php',
+            type,
         };
     }
 }