@atomicsmash/cli 8.2.0-beta.2 → 8.2.0-beta.4

package/dist/commands/blocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../src/commands/blocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAIjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAwBhD,OAAO,OAAO,MAAM,SAAS,CAAC;AAM9B,eAAO,MAAM,OAAO,WAAW,CAAC;AAChC,eAAO,MAAM,QAAQ,8DACuC,CAAC;AAC7D,eAAO,MAAM,OAAO,GAAa,OAAO,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA0ClC,MAAM,EAAE;;;;;;;;;;;;;GAqB1B,CAAC;AAEF,wBAAsB,OAAO,CAC5B,IAAI,EAAE,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,iBA4CrE;AAgJD,wBAAsB,wBAAwB,CAAC,EAC9C,SAAS,EACT,gBAAgB,GAChB,EAAE;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC3B,gCAmCA;AAED,wBAAgB,yBAAyB,CAAC,EACzC,SAAS,EACT,MAAM,GACN,EAAE;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CACb,MAAM,EACN;QACC,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,SAAS,CAAC;KACrB,CACD,CAAC;CACF,uBAkCA;AAED,KAAK,SAAS,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAE7C,wBAAsB,iBAAiB,CACtC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EAAE;iBAUqB,MAAM;eAAa,SAAS;IAuBxE;AAED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,SAAS,6EAW5D;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,SAAS,0EAW3D"}
+{"version":3,"file":"blocks.d.ts","sourceRoot":"","sources":["../../src/commands/blocks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAIjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAwBhD,OAAO,OAAO,MAAM,SAAS,CAAC;AAM9B,eAAO,MAAM,OAAO,WAAW,CAAC;AAChC,eAAO,MAAM,QAAQ,8DACuC,CAAC;AAC7D,eAAO,MAAM,OAAO,GAAa,OAAO,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA0ClC,MAAM,EAAE;;;;;;;;;;;;;GAqB1B,CAAC;AAEF,wBAAsB,OAAO,CAC5B,IAAI,EAAE,kBAAkB,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,iBA4CrE;AAkJD,wBAAsB,wBAAwB,CAAC,EAC9C,SAAS,EACT,gBAAgB,GAChB,EAAE;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC3B,gCAmCA;AAED,wBAAgB,yBAAyB,CAAC,EACzC,SAAS,EACT,MAAM,GACN,EAAE;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CACb,MAAM,EACN;QACC,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,SAAS,CAAC;KACrB,CACD,CAAC;CACF,uBAkCA;AAED,KAAK,SAAS,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAE7C,wBAAsB,iBAAiB,CACtC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EAAE;iBAUqB,MAAM;eAAa,SAAS;IAuBxE;AAED,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,SAAS,6EAW5D;AAED,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,SAAS,0EAW3D"}

package/dist/commands/blocks.js

@@ -16,7 +16,7 @@ import { TsconfigPathsPlugin } from "tsconfig-paths-webpack-plugin";
 import { tsImport } from "tsx/esm/api";
 import webpack from "webpack";
 import defaultConfig from "../external/wordpress.webpack.config.cjs";
-import { getSmashConfig, toCamelCase } from "../utils.js";
+import { getSmashConfig, startRunningMessage, toCamelCase } from "../utils.js";
 const isProduction = process.env.NODE_ENV === "production";
 export const command = "blocks";
 export const describe = "A command to generate WordPress blocks from a src folder.";
@@ -194,7 +194,9 @@ async function runCommand({ srcFolder, distFolder, tsConfigLocation, postcssConf
         });
     }
     else {
-        compiler.run((error, stats) => {
+        const stopRunningMessage = startRunningMessage("Building blocks");
+        compiler.run(async (error, stats) => {
+            await stopRunningMessage();
             if (error) {
                 console.error(error);
                 process.exitCode = 1;

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,kBAkG5B"}
+{"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,kBAqH5B"}

package/dist/commands/pull-database.js

@@ -33,15 +33,17 @@ export async function handler() {
     }
     else {
         const { themeName } = smashConfig;
-        const interval = startRunningMessage("Pulling database from staging");
+        const stopRunningMessage = startRunningMessage("Pulling database from staging");
         performance.mark("Start");
         await (async () => {
             const tmpFile = "/tmp/staging-database.sql";
             const tmpFileProcessed = "/tmp/staging-database.processed.sql";
             await execute(`ssh ${stagingSSHUsername}@${stagingSSHHost} -p ${stagingSSHPort} "cd public/current && wp db export - --add-drop-table" > ${tmpFile}`)
-                .then(() => {
-                console.log("Database downloaded. Updating URLs in database SQL...");
-                return new Promise((resolve, reject) => {
+                .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",
@@ -56,23 +58,38 @@ export async function handler() {
                     writeStream.on("finish", resolve);
                     writeStream.on("error", reject);
                     readStream.on("error", reject);
+                })
+                    .then(async () => {
+                    await stopRunningMessage2();
+                    console.log("URLs updated.");
+                })
+                    .catch(async (error) => {
+                    await stopRunningMessage2();
+                    throw error;
                 });
             })
                 .then(async () => {
-                console.log("Importing database...");
-                await execute(`wp db query < ${tmpFileProcessed}`);
-                await deleteFile(tmpFile);
-                await deleteFile(tmpFileProcessed);
-                if (interval !== null) {
-                    clearInterval(interval);
-                }
+                const stopRunningMessage3 = startRunningMessage("Importing database");
+                await execute(`wp db query < ${tmpFileProcessed}`)
+                    .then(async () => {
+                    await stopRunningMessage3();
+                })
+                    .catch(async (error) => {
+                    await stopRunningMessage3();
+                    throw error;
+                });
+                const stopRunningMessage4 = startRunningMessage("Cleaning up");
+                await Promise.allSettled([
+                    deleteFile(tmpFile),
+                    deleteFile(tmpFileProcessed),
+                ]).then(async () => {
+                    await stopRunningMessage4();
+                });
                 console.log(`Database import complete! ${convertMeasureToPrettyString(performance.measure("everything", "Start"))}`);
                 console.log("If you want to download recent media you can use `npm run pull:media`, you can also change the number of months to download in your `.env` file.");
             })
                 .catch(async (error) => {
-                if (interval !== null) {
-                    clearInterval(interval);
-                }
+                await stopRunningMessage();
                 console.error("Error during database pull:", error);
                 const cleanupResults = await Promise.allSettled([
                     deleteFile(tmpFile),

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

@@ -1 +1 @@
-{"version":3,"file":"pull-media.d.ts","sourceRoot":"","sources":["../../src/commands/pull-media.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,OAAO,eAAe,CAAC;AACpC,eAAO,MAAM,QAAQ,gDAAgD,CAAC;AACtE,wBAAsB,OAAO,kBA8E5B"}
+{"version":3,"file":"pull-media.d.ts","sourceRoot":"","sources":["../../src/commands/pull-media.ts"],"names":[],"mappings":"AAmCA,eAAO,MAAM,OAAO,eAAe,CAAC;AACpC,eAAO,MAAM,QAAQ,gDAAgD,CAAC;AACtE,wBAAsB,OAAO,kBA4E5B"}

package/dist/commands/pull-media.js

@@ -56,7 +56,7 @@ export async function handler() {
             host: stagingSSHHost,
             username: stagingSSHUsername,
         };
-        const interval = startRunningMessage("Pulling database from staging");
+        const stopRunningMessage = startRunningMessage("Pulling media from staging");
         performance.mark("Start");
         await (async () => {
             if (mediaMonths === -1) {
@@ -87,16 +87,12 @@ export async function handler() {
                 console.log("Finished attempting to download all requested months");
             }
         })()
-            .then(() => {
-            if (interval !== null) {
-                clearInterval(interval);
-            }
+            .then(async () => {
+            await stopRunningMessage();
             console.log("Media download complete!");
         })
-            .catch(() => {
-            if (interval !== null) {
-                clearInterval(interval);
-            }
+            .catch(async () => {
+            await stopRunningMessage();
             console.log("There was an error downloading the media, see the message above.");
         });
     }

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

@@ -1,5 +1,5 @@
 import "dotenv/config";
 export declare const command = "setup-database";
 export declare const describe = "Create a new database and initialise the site with no content.";
-export default function setupDatabase(): Promise<void>;
+export declare function handler(): Promise<void>;
 //# sourceMappingURL=setup-database.d.ts.map

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":"AAQA,OAAO,eAAe,CAAC;AAEvB,eAAO,MAAM,OAAO,mBAAmB,CAAC;AACxC,eAAO,MAAM,QAAQ,mEAC4C,CAAC;AAClE,wBAA8B,aAAa,kBA0F1C"}
+{"version":3,"file":"setup-database.d.ts","sourceRoot":"","sources":["../../src/commands/setup-database.ts"],"names":[],"mappings":"AAQA,OAAO,eAAe,CAAC;AAEvB,eAAO,MAAM,OAAO,mBAAmB,CAAC;AACxC,eAAO,MAAM,QAAQ,mEAC4C,CAAC;AAClE,wBAAsB,OAAO,kBAsF5B"}

package/dist/commands/setup-database.js

@@ -5,7 +5,7 @@ import { convertMeasureToPrettyString, getSmashConfig, startRunningMessage, } fr
 import "dotenv/config";
 export const command = "setup-database";
 export const describe = "Create a new database and initialise the site with no content.";
-export default async function setupDatabase() {
+export async function handler() {
     const execute = promisify(exec);
     const smashConfig = await getSmashConfig();
     // These must remain env vars because they differ for each dev.
@@ -17,7 +17,7 @@ export default async function setupDatabase() {
     }
     else {
         const { themeName } = smashConfig;
-        const interval = startRunningMessage("Initialising database");
+        const stopRunningMessage = startRunningMessage("Initialising database");
         performance.mark("Start");
         await execute("wp db create")
             .then(() => {
@@ -42,18 +42,14 @@ export default async function setupDatabase() {
             console.log(`Plugins activated. (${convertMeasureToPrettyString(performance.measure("plugins", addCustomUser ? "add-custom-user" : "wordpress-tables"))})`);
             return execute(`wp theme activate ${themeName}`);
         })
-            .then(() => {
+            .then(async () => {
             performance.mark("theme");
             console.log(`Theme activated. (${convertMeasureToPrettyString(performance.measure("theme", "plugins"))})`);
-            if (interval !== null) {
-                clearInterval(interval);
-            }
+            await stopRunningMessage();
             console.log(`Database set up${addCustomUser ? ` and ${process.env.WORDPRESS_USER} user added` : !process.env.CI ? ". To set up a user, run the `wp user create` command." : ""}. (${convertMeasureToPrettyString(performance.measure("everything", "Start"))})`);
         })
-            .catch((error) => {
-            if (interval !== null) {
-                clearInterval(interval);
-            }
+            .catch(async (error) => {
+            await stopRunningMessage();
             if (error.stderr?.startsWith("ERROR 1007")) {
                 console.error("Database already exists with the name in the wp-config. Please delete that database first with `wp db drop --yes`");
             }

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

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,OAAO,UAAU,CAAC;AAC/B,eAAO,MAAM,QAAQ,kDAAkD,CAAC;AACxE,wBAAsB,OAAO,kBAmM5B"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,OAAO,UAAU,CAAC;AAC/B,eAAO,MAAM,QAAQ,kDAAkD,CAAC;AACxE,wBAAsB,OAAO,kBAiM5B"}

package/dist/commands/setup.js

@@ -23,7 +23,7 @@ export async function handler() {
     }
     else {
         const { themeName, composerInstallPaths, npmInstallPaths } = smashConfig;
-        const interval = startRunningMessage("Running setup");
+        const stopRunningMessage = startRunningMessage("Running setup");
         performance.mark("Start");
         await Promise.allSettled([
             ...(shouldInstallAndBuildOnly
@@ -123,10 +123,8 @@ export async function handler() {
                     throw new Error(`Failed to run additional npm install ${index + 1}.`);
                 });
             }) ?? []),
-        ]).then((results) => {
-            if (interval !== null) {
-                clearInterval(interval);
-            }
+        ]).then(async (results) => {
+            await stopRunningMessage();
             if (results.some((result) => result.status === "rejected")) {
                 process.exitCode = 1;
                 console.error("Setup failed with the following errors:\n");

package/dist/utils.d.ts

@@ -14,7 +14,7 @@ export declare function execute(command: string, options?: {
 }>;
 export declare function toCamelCase(text: string): string;
 export declare function convertMeasureToPrettyString(measure: PerformanceMeasure): string;
-export declare function startRunningMessage(message: string): NodeJS.Timeout | null;
+export declare function startRunningMessage(message: string): () => Promise<void>;
 export declare function getSmashConfig(): Promise<Required<SmashConfig> | {
     npmInstallPaths: string[];
     composerInstallPaths: string[];

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAQ7C,eAAO,MAAM,WAAW,EAAiC,WAAW,CAAC;AAIrE,eAAO,MAAM,WAAW,QAA6D,CAAC;AAItF,eAAO,MAAM,cAAc,QAAsB,CAAC;AAElD,wBAAsB,OAAO,CAC5B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,KAAK,EAAE,OAAO,CAAA;CAAqB;WAGtC,aAAa,GAAG,IAAI;YACnB,MAAM;YACN,MAAM;GAaf;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAQvC;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,kBAAkB,UAevE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,yBAgBlD;AAyBD,wBAAsB,cAAc;;;;;;;UAiEnC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAQ7C,eAAO,MAAM,WAAW,EAAiC,WAAW,CAAC;AAIrE,eAAO,MAAM,WAAW,QAA6D,CAAC;AAItF,eAAO,MAAM,cAAc,QAAsB,CAAC;AAElD,wBAAsB,OAAO,CAC5B,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,KAAK,EAAE,OAAO,CAAA;CAAqB;WAGtC,aAAa,GAAG,IAAI;YACnB,MAAM;YACN,MAAM;GAaf;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAQvC;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,kBAAkB,UAevE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,uBAiClD;AAyBD,wBAAsB,cAAc;;;;;;;UAiEnC"}

package/dist/utils.js

@@ -55,7 +55,7 @@ export function startRunningMessage(message) {
     process.stdout.write(`${message}${".".repeat($i)}\r`);
     $i++;
     if (typeof process.stdout.clearLine !== "undefined") {
-        return setInterval(() => {
+        const interval = setInterval(() => {
             if ($i > 2) {
                 $i = 0;
             }
@@ -64,8 +64,25 @@ export function startRunningMessage(message) {
             process.stdout.cursorTo(0);
             process.stdout.write(`${message}${".".repeat($i)}\r`);
         }, 200);
+        return async () => {
+            if (interval) {
+                clearInterval(interval);
+                await new Promise((resolve) => {
+                    process.stdout.clearLine(0, () => {
+                        resolve();
+                    });
+                });
+                await new Promise((resolve) => {
+                    process.stdout.cursorTo(0, () => {
+                        resolve();
+                    });
+                });
+            }
+        };
     }
-    return null;
+    return async () => {
+        /* do nothing */
+    };
 }
 const getDefaultSCSSAliases = (themePath) => ({
     importers: [

package/package.json

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