kirby-deploy 0.3.3 → 0.4.1

package/dist/cli.js

@@ -8,7 +8,7 @@ import { defineCommand as defineCommand4 } from "citty";
 import { consola as consola9 } from "consola";
 import { colors as colors6 } from "consola/utils";
 import { readFileSync } from "fs";
-import { join as join6, relative } from "path/posix";
+import { join as join7, relative } from "path/posix";
 import { cwd as cwd2 } from "process";
 
 // src/config.ts
@@ -57,6 +57,7 @@ var ConfigSchema = object({
   callWebhooks: optional(boolean()),
   dryRun: optional(boolean()),
   verbose: optional(boolean()),
+  force: optional(boolean()),
   parallel: optional(number()),
   exclude: optional(array(string())),
   excludeGlob: optional(array(string())),
@@ -126,6 +127,7 @@ ${info}`);
     remoteDir: "./",
     dryRun: true,
     verbose: false,
+    force: false,
     parallel: 10,
     checkComposerLock: true,
     callWebhooks: true,
@@ -148,15 +150,15 @@ ${info}`);
 // src/lftp/cat.ts
 import { spawnSync } from "child_process";
 import { consola as consola2 } from "consola";
+import { join } from "path";
 import { platform } from "os";
-var cat = (file, { host, user, password, lftpSettings }) => {
+var cat = (file, { host, user, password, remoteDir, lftpSettings }) => {
   const commands = [
     ...Object.entries(lftpSettings).map(
       ([key, value]) => `set ${key} ${value}`
     ),
-    `open ${host}`,
-    `user ${user} ${password}`,
-    `cat ${file}`,
+    `open -u ${user},${password} ${host}`,
+    `cat ${join(remoteDir, file)}`,
     "bye"
   ];
   const isWindows = platform() === "win32";
@@ -164,7 +166,8 @@ var cat = (file, { host, user, password, lftpSettings }) => {
     encoding: "utf-8"
   }) : spawnSync("lftp", ["-c", commands.join("; ")], { encoding: "utf-8" });
   if (child.stderr) {
-    if (child.stderr.includes("550")) return void 0;
+    if (child.stderr.includes("550") || child.stderr.includes("No such file"))
+      return void 0;
     consola2.error(child.stderr);
     return void 0;
   }
@@ -173,7 +176,7 @@ var cat = (file, { host, user, password, lftpSettings }) => {
 
 // src/sync.ts
 import { consola as consola5 } from "consola";
-import { join as join2 } from "path/posix";
+import { join as join3 } from "path/posix";
 
 // src/lftp/mirror.ts
 import { consola as consola3 } from "consola";
@@ -185,9 +188,7 @@ var mirror = (source, destination, flags, { lftpSettings, host, user, password,
     ...Object.entries(lftpSettings).map(
       ([key, value]) => `set ${key} ${value}`
     ),
-    `open ${host}`,
-    `user ${user} ${password}`,
-    // mask credentials
+    `open -u ${user},${password} ${host}`,
     `mirror ${flags.join(" ")} ${source} ${destination}`,
     "bye"
   ];
@@ -203,6 +204,9 @@ var mirror = (source, destination, flags, { lftpSettings, host, user, password,
       if (match = line.match(/Transferring file `(.*)'/)) {
         hasChanges = true;
         consola3.log(colors.blue(`\u2192 ${match[1]}`));
+      } else if (match = line.match(/Making directory `(.*)'/)) {
+        hasChanges = true;
+        consola3.log(colors.blue(`\u2192 ${match[1]}`));
       } else if (match = line.match(/Removing old (?:file|directory) `(.*)'/)) {
         hasChanges = true;
         consola3.log(colors.red(`\u2A2F ${match[1]}`));
@@ -240,11 +244,11 @@ import { consola as consola4 } from "consola";
 import { colors as colors2 } from "consola/utils";
 import { spawnSync as spawnSync2 } from "child_process";
 import { existsSync } from "fs";
-import { join } from "path";
+import { join as join2 } from "path";
 import { cwd, stdin as input, stdout as output } from "process";
 import * as readline from "readline";
 var upperFirst = (string2) => string2.charAt(0).toUpperCase() + string2.slice(1);
-var isGit = () => existsSync(join(cwd(), ".git"));
+var isGit = () => existsSync(join2(cwd(), ".git"));
 var getBranch = () => {
   if (!isGit()) return;
   const { stderr, stdout } = spawnSync2("git", ["branch", "--show-current"], {
@@ -286,7 +290,7 @@ var sync = async (source, mode, config) => {
   const targetName = mode === "push" ? "remote" : "local";
   const webhookBase = `${config.url}/plugin-kirby-deploy`;
   const shouldCallWebhooks = mode === "push" && config.callWebhooks;
-  const destination = source === "./" ? config.remoteDir : join2(config.remoteDir, source);
+  const destination = source === "./" ? config.remoteDir : join3(config.remoteDir, source);
   if (shouldCallWebhooks && !config.token) {
     consola5.error("token needed to call webhooks");
     return false;
@@ -297,11 +301,11 @@ var sync = async (source, mode, config) => {
   }
   const flags = [
     "--continue",
-    "--only-newer",
     "--overwrite",
-    "--use-cache",
     "--delete",
     "--verbose",
+    !config.force && "--use-cache",
+    config.force && "--transfer-all",
     reverse && "--reverse",
     ...config.exclude.map((path) => `--exclude ${path}`),
     ...config.excludeGlob.map((path) => `--exclude-glob ${path}`),
@@ -365,8 +369,8 @@ var sync = async (source, mode, config) => {
 import { defineCommand } from "citty";
 import { consola as consola6 } from "consola";
 import { colors as colors3 } from "consola/utils";
-import { join as join3 } from "path/posix";
-var syncAccounts = async (mode) => {
+import { join as join4 } from "path/posix";
+var syncAccounts = async (mode, force = false) => {
   const config = await loadConfig();
   if (!config) return;
   const { accounts } = config.folderStructure;
@@ -376,7 +380,7 @@ var syncAccounts = async (mode) => {
     `${source}${branch ? colors3.cyan(` (${branch})`) : ""}`
   );
   const displayDestination = colors3.magenta(
-    join3(config.host, config.remoteDir, source)
+    join4(config.host, config.remoteDir, source)
   );
   const direction = mode === "pull" ? "from" : "to";
   consola6.log(
@@ -391,18 +395,30 @@ var syncAccounts = async (mode) => {
     excludeGlob: [".*", ".*/"],
     include: [".htpasswd"],
     // Make sure account passwords are synced.
-    includeGlob: []
+    includeGlob: [],
+    force
   });
 };
-var accountsPush = defineCommand({ run: () => syncAccounts("push") });
-var accountsPull = defineCommand({ run: () => syncAccounts("pull") });
+var forceArg = {
+  type: "boolean",
+  description: "Transfer all files unconditionally, ignoring timestamps and cache",
+  default: false
+};
+var accountsPush = defineCommand({
+  args: { force: forceArg },
+  run: ({ args }) => syncAccounts("push", args.force)
+});
+var accountsPull = defineCommand({
+  args: { force: forceArg },
+  run: ({ args }) => syncAccounts("pull", args.force)
+});
 
 // src/commands/content.ts
 import { defineCommand as defineCommand2 } from "citty";
 import { consola as consola7 } from "consola";
 import { colors as colors4 } from "consola/utils";
-import { join as join4 } from "path/posix";
-var syncContent = async (mode) => {
+import { join as join5 } from "path/posix";
+var syncContent = async (mode, force = false) => {
   const config = await loadConfig();
   if (!config) return;
   const { content } = config.folderStructure;
@@ -412,7 +428,7 @@ var syncContent = async (mode) => {
     `${source}${branch ? colors4.cyan(` (${branch})`) : ""}`
   );
   const displayDestination = colors4.magenta(
-    join4(config.host, config.remoteDir, source)
+    join5(config.host, config.remoteDir, source)
   );
   const direction = mode === "pull" ? "from" : "to";
   consola7.log(
@@ -426,18 +442,30 @@ var syncContent = async (mode) => {
     exclude: [],
     excludeGlob: [".*", ".*/"],
     include: [],
-    includeGlob: []
+    includeGlob: [],
+    force
   });
 };
-var contentPush = defineCommand2({ run: () => syncContent("push") });
-var contentPull = defineCommand2({ run: () => syncContent("pull") });
+var forceArg2 = {
+  type: "boolean",
+  description: "Transfer all files unconditionally, ignoring timestamps and cache",
+  default: false
+};
+var contentPush = defineCommand2({
+  args: { force: forceArg2 },
+  run: ({ args }) => syncContent("push", args.force)
+});
+var contentPull = defineCommand2({
+  args: { force: forceArg2 },
+  run: ({ args }) => syncContent("pull", args.force)
+});
 
 // src/commands/languages.ts
 import { defineCommand as defineCommand3 } from "citty";
 import { consola as consola8 } from "consola";
 import { colors as colors5 } from "consola/utils";
-import { join as join5 } from "path/posix";
-var syncLanguages = async (mode) => {
+import { join as join6 } from "path/posix";
+var syncLanguages = async (mode, force = false) => {
   const config = await loadConfig();
   if (!config) return;
   const { site } = config.folderStructure;
@@ -447,7 +475,7 @@ var syncLanguages = async (mode) => {
     `${source}${branch ? colors5.cyan(` (${branch})`) : ""}`
   );
   const displayDestination = colors5.magenta(
-    join5(config.host, config.remoteDir, source)
+    join6(config.host, config.remoteDir, source)
   );
   const direction = mode === "pull" ? "from" : "to";
   consola8.log(
@@ -461,15 +489,34 @@ var syncLanguages = async (mode) => {
     exclude: [],
     excludeGlob: [".*", ".*/"],
     include: [],
-    includeGlob: []
+    includeGlob: [],
+    force
   });
 };
-var languagesPush = defineCommand3({ run: () => syncLanguages("push") });
-var languagesPull = defineCommand3({ run: () => syncLanguages("pull") });
+var forceArg3 = {
+  type: "boolean",
+  description: "Transfer all files unconditionally, ignoring timestamps and cache",
+  default: false
+};
+var languagesPush = defineCommand3({
+  args: { force: forceArg3 },
+  run: ({ args }) => syncLanguages("push", args.force)
+});
+var languagesPull = defineCommand3({
+  args: { force: forceArg3 },
+  run: ({ args }) => syncLanguages("pull", args.force)
+});
 
 // src/commands/main.ts
 var main = defineCommand4({
-  run: async ({ rawArgs, cmd }) => {
+  args: {
+    force: {
+      type: "boolean",
+      description: "Transfer all files unconditionally, ignoring timestamps and cache",
+      default: false
+    }
+  },
+  run: async ({ args, rawArgs, cmd }) => {
     const [firstArg] = rawArgs;
     const subCommands = Object.keys(cmd.subCommands ?? {});
     const isSubCommand = subCommands.includes(firstArg);
@@ -480,13 +527,13 @@ var main = defineCommand4({
     const exclude = [
       ...config.exclude,
       "^node_modules/",
-      `^${relative(cwd2(), folderStructure.content)}`,
-      `^${relative(cwd2(), folderStructure.media)}`,
-      `^${relative(cwd2(), folderStructure.accounts)}`,
-      `^${relative(cwd2(), folderStructure.sessions)}`,
-      `^${relative(cwd2(), folderStructure.cache)}`,
-      `^${relative(cwd2(), folderStructure.logs)}`,
-      `^${relative(cwd2(), join6(folderStructure.site, "languages"))}`
+      `^${relative(cwd2(), folderStructure.content)}/.`,
+      `^${relative(cwd2(), folderStructure.media)}/.`,
+      `^${relative(cwd2(), folderStructure.accounts)}/.`,
+      `^${relative(cwd2(), folderStructure.sessions)}/.`,
+      `^${relative(cwd2(), folderStructure.cache)}/.`,
+      `^${relative(cwd2(), folderStructure.logs)}/.`,
+      `^${relative(cwd2(), join7(folderStructure.site, "languages"))}/.`
     ];
     const excludeGlob = [...config.excludeGlob, ".*", ".*/"];
     const include = config.include;
@@ -494,7 +541,7 @@ var main = defineCommand4({
     const branch = getBranch();
     const displaySource = branch ? colors6.cyan(` ${branch} `) : " ";
     const displayDestination = colors6.magenta(
-      join6(config.host, config.remoteDir)
+      join7(config.host, config.remoteDir)
     );
     consola9.log(`\u{1F680} Deploy${displaySource}to ${displayDestination}
 `);
@@ -514,7 +561,8 @@ var main = defineCommand4({
       exclude,
       excludeGlob,
       include,
-      includeGlob
+      includeGlob,
+      force: args.force
     });
   },
   subCommands: {

package/dist/index.d.ts

@@ -21,6 +21,7 @@ declare const ConfigSchema: valibot.ObjectSchema<{
     readonly callWebhooks: valibot.OptionalSchema<valibot.BooleanSchema<undefined>, undefined>;
     readonly dryRun: valibot.OptionalSchema<valibot.BooleanSchema<undefined>, undefined>;
     readonly verbose: valibot.OptionalSchema<valibot.BooleanSchema<undefined>, undefined>;
+    readonly force: valibot.OptionalSchema<valibot.BooleanSchema<undefined>, undefined>;
     readonly parallel: valibot.OptionalSchema<valibot.NumberSchema<undefined>, undefined>;
     readonly exclude: valibot.OptionalSchema<valibot.ArraySchema<valibot.StringSchema<undefined>, undefined>, undefined>;
     readonly excludeGlob: valibot.OptionalSchema<valibot.ArraySchema<valibot.StringSchema<undefined>, undefined>, undefined>;
@@ -51,6 +52,7 @@ declare const defineConfig: (config: Config) => {
     callWebhooks?: boolean | undefined;
     dryRun?: boolean | undefined;
     verbose?: boolean | undefined;
+    force?: boolean | undefined;
     parallel?: number | undefined;
     exclude?: string[] | undefined;
     excludeGlob?: string[] | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kirby-deploy",
-  "version": "0.3.3",
+  "version": "0.4.1",
   "main": "./dist/index.js",
   "type": "module",
   "bin": {

package/src/commands/accounts.ts

@@ -6,7 +6,7 @@ import { loadConfig } from '../config'
 import { sync } from '../sync'
 import { getBranch, upperFirst } from '../utils'
 
-const syncAccounts = async (mode: 'pull' | 'push') => {
+const syncAccounts = async (mode: 'pull' | 'push', force = false) => {
   const config = await loadConfig()
   if (!config) return
 
@@ -33,8 +33,22 @@ const syncAccounts = async (mode: 'pull' | 'push') => {
     excludeGlob: ['.*', '.*/'],
     include: ['.htpasswd'], // Make sure account passwords are synced.
     includeGlob: [],
+    force,
   })
 }
 
-export const accountsPush = defineCommand({ run: () => syncAccounts('push') })
-export const accountsPull = defineCommand({ run: () => syncAccounts('pull') })
+const forceArg = {
+  type: 'boolean',
+  description:
+    'Transfer all files unconditionally, ignoring timestamps and cache',
+  default: false,
+} as const
+
+export const accountsPush = defineCommand({
+  args: { force: forceArg },
+  run: ({ args }) => syncAccounts('push', args.force),
+})
+export const accountsPull = defineCommand({
+  args: { force: forceArg },
+  run: ({ args }) => syncAccounts('pull', args.force),
+})

package/src/commands/content.ts

@@ -6,7 +6,7 @@ import { loadConfig } from '../config'
 import { sync } from '../sync'
 import { getBranch, upperFirst } from '../utils'
 
-const syncContent = async (mode: 'pull' | 'push') => {
+const syncContent = async (mode: 'pull' | 'push', force = false) => {
   const config = await loadConfig()
   if (!config) return
 
@@ -33,8 +33,22 @@ const syncContent = async (mode: 'pull' | 'push') => {
     excludeGlob: ['.*', '.*/'],
     include: [],
     includeGlob: [],
+    force,
   })
 }
 
-export const contentPush = defineCommand({ run: () => syncContent('push') })
-export const contentPull = defineCommand({ run: () => syncContent('pull') })
+const forceArg = {
+  type: 'boolean',
+  description:
+    'Transfer all files unconditionally, ignoring timestamps and cache',
+  default: false,
+} as const
+
+export const contentPush = defineCommand({
+  args: { force: forceArg },
+  run: ({ args }) => syncContent('push', args.force),
+})
+export const contentPull = defineCommand({
+  args: { force: forceArg },
+  run: ({ args }) => syncContent('pull', args.force),
+})

package/src/commands/languages.ts

@@ -6,7 +6,7 @@ import { loadConfig } from '../config'
 import { sync } from '../sync'
 import { getBranch, upperFirst } from '../utils'
 
-const syncLanguages = async (mode: 'pull' | 'push') => {
+const syncLanguages = async (mode: 'pull' | 'push', force = false) => {
   const config = await loadConfig()
   if (!config) return
 
@@ -33,8 +33,22 @@ const syncLanguages = async (mode: 'pull' | 'push') => {
     excludeGlob: ['.*', '.*/'],
     include: [],
     includeGlob: [],
+    force,
   })
 }
 
-export const languagesPush = defineCommand({ run: () => syncLanguages('push') })
-export const languagesPull = defineCommand({ run: () => syncLanguages('pull') })
+const forceArg = {
+  type: 'boolean',
+  description:
+    'Transfer all files unconditionally, ignoring timestamps and cache',
+  default: false,
+} as const
+
+export const languagesPush = defineCommand({
+  args: { force: forceArg },
+  run: ({ args }) => syncLanguages('push', args.force),
+})
+export const languagesPull = defineCommand({
+  args: { force: forceArg },
+  run: ({ args }) => syncLanguages('pull', args.force),
+})

package/src/commands/main.ts

@@ -13,7 +13,15 @@ import { contentPull, contentPush } from './content'
 import { languagesPull, languagesPush } from './languages'
 
 export const main = defineCommand({
-  run: async ({ rawArgs, cmd }) => {
+  args: {
+    force: {
+      type: 'boolean',
+      description:
+        'Transfer all files unconditionally, ignoring timestamps and cache',
+      default: false,
+    },
+  },
+  run: async ({ args, rawArgs, cmd }) => {
     // Todo: find a cleaner way to prevent the main command from running when
     // when a sub command is run.
     const [firstArg] = rawArgs
@@ -28,13 +36,13 @@ export const main = defineCommand({
     const exclude = [
       ...config.exclude,
       '^node_modules/',
-      `^${relative(cwd(), folderStructure.content)}`,
-      `^${relative(cwd(), folderStructure.media)}`,
-      `^${relative(cwd(), folderStructure.accounts)}`,
-      `^${relative(cwd(), folderStructure.sessions)}`,
-      `^${relative(cwd(), folderStructure.cache)}`,
-      `^${relative(cwd(), folderStructure.logs)}`,
-      `^${relative(cwd(), join(folderStructure.site, 'languages'))}`,
+      `^${relative(cwd(), folderStructure.content)}/.`,
+      `^${relative(cwd(), folderStructure.media)}/.`,
+      `^${relative(cwd(), folderStructure.accounts)}/.`,
+      `^${relative(cwd(), folderStructure.sessions)}/.`,
+      `^${relative(cwd(), folderStructure.cache)}/.`,
+      `^${relative(cwd(), folderStructure.logs)}/.`,
+      `^${relative(cwd(), join(folderStructure.site, 'languages'))}/.`,
     ]
     const excludeGlob = [...config.excludeGlob, '.*', '.*/']
     const include = config.include
@@ -67,6 +75,7 @@ export const main = defineCommand({
       excludeGlob,
       include,
       includeGlob,
+      force: args.force,
     })
   },
   subCommands: {

package/src/config.ts

@@ -69,6 +69,7 @@ export const loadConfig = async (): Promise<ConfigResolved | null> => {
     remoteDir: './',
     dryRun: true,
     verbose: false,
+    force: false,
     parallel: 10,
     checkComposerLock: true,
     callWebhooks: true,

package/src/lftp/cat.ts

@@ -1,19 +1,19 @@
 import { spawnSync } from 'child_process'
 import { consola } from 'consola'
+import { join } from 'path'
 import { platform } from 'os'
 import { ConfigResolved } from '../types'
 
 export const cat = (
   file: string,
-  { host, user, password, lftpSettings }: ConfigResolved,
+  { host, user, password, remoteDir, lftpSettings }: ConfigResolved,
 ) => {
   const commands = [
     ...Object.entries(lftpSettings).map(
       ([key, value]) => `set ${key} ${value}`,
     ),
-    `open ${host}`,
-    `user ${user} ${password}`,
-    `cat ${file}`,
+    `open -u ${user},${password} ${host}`,
+    `cat ${join(remoteDir, file)}`,
     'bye',
   ]
 
@@ -25,8 +25,9 @@ export const cat = (
     : spawnSync('lftp', ['-c', commands.join('; ')], { encoding: 'utf-8' })
 
   if (child.stderr) {
-    // 550 means the file doesn't exist, silently return undefined
-    if (child.stderr.includes('550')) return undefined
+    // 550 or "No such file" means the file doesn't exist, silently return undefined
+    if (child.stderr.includes('550') || child.stderr.includes('No such file'))
+      return undefined
     consola.error(child.stderr)
     return undefined
   }

package/src/lftp/mirror.ts

@@ -19,8 +19,7 @@ export const mirror = (
     ...Object.entries(lftpSettings).map(
       ([key, value]) => `set ${key} ${value}`,
     ),
-    `open ${host}`,
-    `user ${user} ${password}`, // mask credentials
+    `open -u ${user},${password} ${host}`,
     `mirror ${flags.join(' ')} ${source} ${destination}`,
     'bye',
   ]
@@ -42,6 +41,9 @@ export const mirror = (
         if ((match = line.match(/Transferring file `(.*)'/))) {
           hasChanges = true
           consola.log(colors.blue(`→ ${match[1]}`))
+        } else if ((match = line.match(/Making directory `(.*)'/))) {
+          hasChanges = true
+          consola.log(colors.blue(`→ ${match[1]}`))
         } else if (
           (match = line.match(/Removing old (?:file|directory) `(.*)'/))
         ) {

package/src/sync.ts

@@ -28,11 +28,11 @@ export const sync = async (
 
   const flags = [
     '--continue',
-    '--only-newer',
     '--overwrite',
-    '--use-cache',
     '--delete',
     '--verbose',
+    !config.force && '--use-cache',
+    config.force && '--transfer-all',
     reverse && '--reverse',
     ...config.exclude.map((path: string) => `--exclude ${path}`),
     ...config.excludeGlob.map((path: string) => `--exclude-glob ${path}`),

package/src/types.ts

@@ -43,6 +43,7 @@ export const ConfigSchema = object({
   callWebhooks: optional(boolean()),
   dryRun: optional(boolean()),
   verbose: optional(boolean()),
+  force: optional(boolean()),
   parallel: optional(number()),
   exclude: optional(array(string())),
   excludeGlob: optional(array(string())),