@atomicsmash/cli 9.0.1-beta.1 → 9.0.1-beta.3

package/dist/commands/pull-database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull-database.d.ts","sourceRoot":"","sources":["../../src/commands/pull-database.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,OAAO,kBAAkB,CAAC;AACvC,eAAO,MAAM,QAAQ,oEAC6C,CAAC;AACnE,wBAAsB,OAAO,kBA+J5B"}
+{"version":3,"file":"pull-database.d.ts","sourceRoot":"","sources":["../../src/commands/pull-database.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,OAAO,kBAAkB,CAAC;AACvC,eAAO,MAAM,QAAQ,oEAC6C,CAAC;AACnE,wBAAsB,OAAO,kBA4I5B"}

package/dist/commands/pull-database.js

@@ -1,8 +1,6 @@
 import { exec } from "node:child_process";
-import { createReadStream, createWriteStream } from "node:fs";
 import { unlink as deleteFile } from "node:fs/promises";
 import { performance } from "node:perf_hooks";
-import readline from "node:readline";
 import { promisify } from "node:util";
 import { convertMeasureToPrettyString, getSmashConfig, startRunningMessage, } from "../utils.js";
 export const command = "pull-database";
@@ -40,7 +38,6 @@ export async function handler() {
         await (async () => {
             const tmpFile = "/tmp/staging-database.sql";
             const dbPrefixFile = "/tmp/db-prefix.txt";
-            const tmpFileProcessed = "/tmp/staging-database.processed.sql";
             const tablesToExclude = [
                 // WordFence
                 "wfauditevents",
@@ -81,26 +78,11 @@ export async function handler() {
                 .then(async () => {
                 await stopRunningMessage();
                 console.log("Database downloaded.");
-                const stopRunningMessage2 = startRunningMessage("Updating URLs in database SQL");
-                await new Promise((resolve, reject) => {
-                    const readStream = createReadStream(tmpFile, { encoding: "utf8" });
-                    const writeStream = createWriteStream(tmpFileProcessed, {
-                        encoding: "utf8",
-                    });
-                    const rl = readline.createInterface({ input: readStream });
-                    rl.on("line", (line) => {
-                        writeStream.write(line.replaceAll(stagingUrl, `//${projectName}.test`) + "\n");
-                    });
-                    rl.on("close", () => {
-                        writeStream.end();
-                    });
-                    writeStream.on("finish", resolve);
-                    writeStream.on("error", reject);
-                    readStream.on("error", reject);
-                })
+                const stopRunningMessage2 = startRunningMessage("Importing database");
+                await execute(`wp db query < ${tmpFile}`)
                     .then(async () => {
                     await stopRunningMessage2();
-                    console.log("URLs updated.");
+                    console.log("Database imported.");
                 })
                     .catch(async (error) => {
                     await stopRunningMessage2();
@@ -108,20 +90,22 @@ export async function handler() {
                 });
             })
                 .then(async () => {
-                const stopRunningMessage3 = startRunningMessage("Importing database");
-                await execute(`wp db query < ${tmpFileProcessed}`)
+                const stopRunningMessage3 = startRunningMessage("Running search and replace");
+                await execute(`wp search-replace --url=${projectName}.test ${stagingUrl} '//${projectName}.test' --skip-columns=guid`)
                     .then(async () => {
                     await stopRunningMessage3();
+                    console.log("Search and replace completed.");
                 })
                     .catch(async (error) => {
                     await stopRunningMessage3();
                     throw error;
                 });
+            })
+                .then(async () => {
                 const stopRunningMessage4 = startRunningMessage("Cleaning up");
                 await Promise.allSettled([
                     deleteFile(tmpFile),
                     deleteFile(dbPrefixFile),
-                    deleteFile(tmpFileProcessed),
                 ]).then(async () => {
                     await stopRunningMessage4();
                 });
@@ -134,7 +118,6 @@ export async function handler() {
                 const cleanupResults = await Promise.allSettled([
                     deleteFile(tmpFile),
                     deleteFile(dbPrefixFile),
-                    deleteFile(tmpFileProcessed),
                 ]);
                 const failedCleanups = cleanupResults.filter((result) => result.status === "rejected");
                 if (failedCleanups.length > 0) {

package/dist/commands/setup-database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-database.d.ts","sourceRoot":"","sources":["../../src/commands/setup-database.ts"],"names":[],"mappings":"AAUA,OAAO,eAAe,CAAC;AA4HvB,eAAO,MAAM,OAAO,mBAAmB,CAAC;AACxC,eAAO,MAAM,QAAQ,mEAC4C,CAAC;AAClE,wBAAsB,OAAO,kBAsH5B"}
+{"version":3,"file":"setup-database.d.ts","sourceRoot":"","sources":["../../src/commands/setup-database.ts"],"names":[],"mappings":"AAQA,OAAO,eAAe,CAAC;AAiEvB,eAAO,MAAM,OAAO,mBAAmB,CAAC;AACxC,eAAO,MAAM,QAAQ,mEAC4C,CAAC;AAClE,wBAAsB,OAAO,kBAkG5B"}

package/dist/commands/setup-database.js

@@ -1,112 +1,61 @@
 import { exec } from "node:child_process";
-import { readFileSync, readdirSync } from "node:fs";
-import { join } from "node:path";
 import { performance } from "node:perf_hooks";
 import { promisify } from "node:util";
 import { convertMeasureToPrettyString, getSmashConfig, startRunningMessage, } from "../utils.js";
 import "dotenv/config";
-function parsePluginHeaders(pluginPath) {
-    try {
-        // Find the main plugin file by looking for the standard WordPress plugin header
-        const files = readdirSync(pluginPath).filter(file => file.endsWith('.php'));
-        let mainFile = null;
-        // Look for the file containing the standard plugin header
-        for (const file of files) {
-            const content = readFileSync(join(pluginPath, file), 'utf8');
-            // Check for the standard plugin header (Plugin Name: field)
-            if (/^\s*\/\*\*[\s\S]*?Plugin Name:/m.test(content)) {
-                mainFile = file;
-                break;
-            }
-        }
-        if (!mainFile)
-            return null;
-        const content = readFileSync(join(pluginPath, mainFile), 'utf8');
-        // Match the plugin header block
-        const headerPattern = /\/\*\*\s*([\s\S]*?)\s*\*\//;
-        const match = headerPattern.exec(content);
-        if (!match)
-            return null;
-        const headers = {};
-        const headerContent = match[1];
-        // Parse each header line
-        headerContent?.split('\n').forEach(line => {
-            const colonIndex = line.indexOf(':');
-            if (colonIndex > 0) {
-                const key = line.substring(0, colonIndex).trim().replace(/\*/g, '');
-                const value = line.substring(colonIndex + 1).trim();
-                if (key && value) {
-                    headers[key] = value;
-                }
-            }
-        });
-        return headers;
-    }
-    catch (_error) {
-        return null;
+function extractDependenciesFromError(errorMessage) {
+    // Extract plugin names from error messages like:
+    // "Warning: Failed to activate plugin. Discount Rules for WooCommerce requires 1 plugin to be installed and activated: WooCommerce."
+    const regex = /requires \d+ plugin[s]? to be installed and activated: (.+)\./;
+    const match = regex.exec(errorMessage);
+    if (match?.[1]) {
+        return match[1].split(',').map(dep => dep.trim());
     }
+    return [];
 }
-async function buildDependencyGraph(execute) {
-    const graph = new Map();
-    const pluginPaths = new Map();
-    // Get the plugins directory path
-    const { stdout: pluginsDir } = await execute('wp plugin path');
-    const pluginsDirectory = pluginsDir.trim();
-    // Get all plugins
-    const { stdout: pluginList } = await execute('wp plugin list --format=json');
-    const plugins = JSON.parse(pluginList);
-    // Map plugin names to their paths
-    for (const plugin of plugins) {
-        const pluginPath = `${pluginsDirectory}/${plugin.name}`;
-        pluginPaths.set(plugin.name, pluginPath);
-    }
-    // Parse headers and build dependency graph
-    for (const [pluginName, pluginPath] of pluginPaths) {
-        const headers = parsePluginHeaders(pluginPath);
-        if (headers?.['Requires Plugins']) {
-            // Parse the Requires Plugins field (comma-separated list)
-            const dependencies = headers['Requires Plugins']
-                .split(',')
-                .map(dep => dep.trim())
-                .filter(dep => dep.length > 0);
-            graph.set(pluginName, dependencies);
-        }
-        else {
-            graph.set(pluginName, []);
-        }
-    }
-    return graph;
-}
-function topologicalSort(graph) {
-    const visited = new Set();
-    const temp = new Set();
-    const result = [];
-    function visit(node) {
-        if (temp.has(node)) {
-            throw new Error(`Circular dependency detected involving ${node}`);
-        }
-        if (visited.has(node)) {
-            return;
-        }
-        temp.add(node);
-        // Visit all dependencies first
-        const dependencies = graph.get(node) ?? [];
-        for (const dep of dependencies) {
-            if (graph.has(dep)) {
-                visit(dep);
+async function activatePluginsWithRetry(execute, pluginsToActivate, excludedPlugins) {
+    const maxRetries = 10; // Prevent infinite loops
+    let retryCount = 0;
+    const remainingPlugins = [...pluginsToActivate];
+    while (remainingPlugins.length > 0 && retryCount < maxRetries) {
+        const pluginsToTry = [...remainingPlugins];
+        remainingPlugins.length = 0; // Clear the array
+        for (const pluginName of pluginsToTry) {
+            if (excludedPlugins.includes(pluginName)) {
+                continue;
+            }
+            try {
+                await execute(`wp plugin activate ${pluginName}`);
+                console.log(`✓ Activated ${pluginName}`);
+            }
+            catch (error) {
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                // Check if this is a dependency error
+                const dependencies = extractDependenciesFromError(errorMessage);
+                if (dependencies.length > 0) {
+                    console.log(`⚠ ${pluginName} requires dependencies: ${dependencies.join(', ')}`);
+                    // Add dependencies to the remaining plugins list if they're not already there
+                    for (const dep of dependencies) {
+                        if (!pluginsToActivate.includes(dep) && !excludedPlugins.includes(dep)) {
+                            pluginsToActivate.push(dep);
+                        }
+                        if (!remainingPlugins.includes(dep)) {
+                            remainingPlugins.push(dep);
+                        }
+                    }
+                    // Add the current plugin back to try again later
+                    remainingPlugins.push(pluginName);
+                }
+                else {
+                    console.warn(`⚠ Warning: Could not activate ${pluginName}: ${errorMessage}`);
+                }
             }
         }
-        temp.delete(node);
-        visited.add(node);
-        result.push(node);
+        retryCount++;
     }
-    // Visit all nodes
-    for (const node of graph.keys()) {
-        if (!visited.has(node)) {
-            visit(node);
-        }
+    if (remainingPlugins.length > 0) {
+        console.warn(`⚠ Warning: Could not activate all plugins after ${maxRetries} attempts. Remaining: ${remainingPlugins.join(', ')}`);
     }
-    return result;
 }
 export const command = "setup-database";
 export const describe = "Create a new database and initialise the site with no content.";
@@ -140,31 +89,15 @@ export async function handler() {
                 performance.mark("add-custom-user");
                 console.log(`Custom user ${process.env.WORDPRESS_USER} added. (${convertMeasureToPrettyString(performance.measure("add-custom-user", "wordpress-tables"))})`);
             }
-            const dependencyGraph = await buildDependencyGraph(execute);
             const excludedPlugins = ['stream', 'shortpixel-image-optimiser', 'wordfence'];
             const { stdout: pluginList } = await execute('wp plugin list --format=json');
             const allPlugins = JSON.parse(pluginList);
             // Filter out excluded plugins and already active plugins
-            const pluginsToActivate = allPlugins.filter(plugin => !excludedPlugins.includes(plugin.name) &&
-                plugin.status !== 'active');
-            const filteredGraph = new Map();
-            for (const plugin of pluginsToActivate) {
-                const dependencies = dependencyGraph.get(plugin.name) ?? [];
-                // Only include dependencies that are also in our activation list
-                const filteredDependencies = dependencies.filter(dep => pluginsToActivate.some(p => p.name === dep));
-                filteredGraph.set(plugin.name, filteredDependencies);
-            }
-            const activationOrder = topologicalSort(filteredGraph);
-            for (const pluginName of activationOrder) {
-                try {
-                    await execute(`wp plugin activate ${pluginName}`);
-                    console.log(`✓ Activated ${pluginName}`);
-                }
-                catch (error) {
-                    const errorMessage = error instanceof Error ? error.message : String(error);
-                    console.warn(`⚠ Warning: Could not activate ${pluginName}: ${errorMessage}`);
-                }
-            }
+            const pluginsToActivate = allPlugins
+                .filter(plugin => !excludedPlugins.includes(plugin.name) &&
+                plugin.status !== 'active')
+                .map(plugin => plugin.name);
+            await activatePluginsWithRetry(execute, pluginsToActivate, excludedPlugins);
         })
             .then(() => {
             performance.mark("plugins");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atomicsmash/cli",
-	"version": "9.0.1-beta.1",
+	"version": "9.0.1-beta.3",
 	"description": "A collection of CLI tools by Atomic Smash.",
 	"keywords": [],
 	"homepage": "https://www.atomicsmash.co.uk/",