kirby-deploy 0.2.0 → 0.3.2

package/dist/cli.js

@@ -5,7 +5,7 @@ import { runMain } from "citty";
 
 // src/commands/main.ts
 import { defineCommand as defineCommand4 } from "citty";
-import consola9 from "consola";
+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";
@@ -13,7 +13,7 @@ import { cwd as cwd2 } from "process";
 
 // src/config.ts
 import { loadConfig as load } from "c12";
-import consola from "consola";
+import { consola } from "consola";
 import { flatten, parse } from "valibot";
 
 // src/types.ts
@@ -35,6 +35,7 @@ var FolderStructureSchema = object({
   accounts: string(),
   sessions: string(),
   cache: string(),
+  logs: string(),
   site: string()
 });
 var ConfigSchema = object({
@@ -45,7 +46,12 @@ var ConfigSchema = object({
   token: optional(string()),
   remoteDir: optional(string()),
   folderStructure: optional(
-    union([literal("flat"), literal("public"), FolderStructureSchema])
+    union([
+      literal("flat"),
+      literal("public"),
+      literal("composer"),
+      FolderStructureSchema
+    ])
   ),
   checkComposerLock: optional(boolean()),
   callWebhooks: optional(boolean()),
@@ -62,6 +68,7 @@ var ConfigSchema = object({
 
 // src/config.ts
 var loadConfig = async () => {
+  var _a;
   let { config, configFile } = await load({
     name: "kirby-deploy",
     dotenv: true
@@ -89,15 +96,27 @@ ${info}`);
       accounts: "storage/accounts",
       sessions: "storage/sessions",
       cache: "storage/cache",
+      logs: "storage/logs",
       site: "site"
     };
   } else if (config.folderStructure === "flat") {
     folderStructure = {
       content: "content",
-      media: "site/media",
+      media: "media",
       accounts: "site/accounts",
       sessions: "site/sessions",
       cache: "site/cache",
+      logs: "site/logs",
+      site: "site"
+    };
+  } else if (config.folderStructure === "composer") {
+    folderStructure = {
+      content: "data/storage/content",
+      media: "public/media",
+      accounts: "data/storage/accounts",
+      sessions: "data/runtime/sessions",
+      cache: "data/runtime/cache",
+      logs: "data/runtime/logs",
       site: "site"
     };
   } else {
@@ -115,6 +134,7 @@ ${info}`);
     include: [],
     includeGlob: [],
     ...config,
+    url: (_a = config.url) == null ? void 0 : _a.replace(/\/$/, ""),
     folderStructure,
     lftpSettings: {
       "ftp:ssl-force": true,
@@ -127,7 +147,7 @@ ${info}`);
 
 // src/lftp/cat.ts
 import { spawnSync } from "child_process";
-import consola2 from "consola";
+import { consola as consola2 } from "consola";
 import { platform } from "os";
 var cat = (file, { host, user, password, lftpSettings }) => {
   const commands = [
@@ -143,19 +163,23 @@ var cat = (file, { host, user, password, lftpSettings }) => {
   const child = isWindows ? spawnSync("wsl", ["lftp", "-c", commands.join("; ")], {
     encoding: "utf-8"
   }) : spawnSync("lftp", ["-c", commands.join("; ")], { encoding: "utf-8" });
-  if (child.stderr) consola2.error(child.stderr);
+  if (child.stderr) {
+    if (child.stderr.includes("550")) return void 0;
+    consola2.error(child.stderr);
+    return void 0;
+  }
   return child.stdout;
 };
 
 // src/sync.ts
-import consola5 from "consola";
+import { consola as consola5 } from "consola";
 import { join as join2 } from "path/posix";
 
 // src/lftp/mirror.ts
-import consola3 from "consola";
+import { consola as consola3 } from "consola";
 import { colors } from "consola/utils";
-import { spawn } from "node:child_process";
-import { platform as platform2 } from "node:os";
+import { spawn } from "child_process";
+import { platform as platform2 } from "os";
 var mirror = (source, destination, flags, { lftpSettings, host, user, password, verbose }) => {
   const commands = [
     ...Object.entries(lftpSettings).map(
@@ -212,13 +236,13 @@ ${colors.bgBlue(" LFTP ")} ${commands.join("; ")}
 };
 
 // src/utils.ts
-import consola4 from "consola";
+import { consola as consola4 } from "consola";
 import { colors as colors2 } from "consola/utils";
-import { spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync } from "node:fs";
-import { join } from "node:path";
-import { cwd, stdin as input, stdout as output } from "node:process";
-import * as readline from "node:readline";
+import { spawnSync as spawnSync2 } from "child_process";
+import { existsSync } from "fs";
+import { join } 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 getBranch = () => {
@@ -339,7 +363,7 @@ var sync = async (source, mode, config) => {
 
 // src/commands/accounts.ts
 import { defineCommand } from "citty";
-import consola6 from "consola";
+import { consola as consola6 } from "consola";
 import { colors as colors3 } from "consola/utils";
 import { join as join3 } from "path/posix";
 var syncAccounts = async (mode) => {
@@ -375,7 +399,7 @@ var accountsPull = defineCommand({ run: () => syncAccounts("pull") });
 
 // src/commands/content.ts
 import { defineCommand as defineCommand2 } from "citty";
-import consola7 from "consola";
+import { consola as consola7 } from "consola";
 import { colors as colors4 } from "consola/utils";
 import { join as join4 } from "path/posix";
 var syncContent = async (mode) => {
@@ -410,7 +434,7 @@ var contentPull = defineCommand2({ run: () => syncContent("pull") });
 
 // src/commands/languages.ts
 import { defineCommand as defineCommand3 } from "citty";
-import consola8 from "consola";
+import { consola as consola8 } from "consola";
 import { colors as colors5 } from "consola/utils";
 import { join as join5 } from "path/posix";
 var syncLanguages = async (mode) => {
@@ -461,6 +485,7 @@ var main = defineCommand4({
       `^${relative(cwd2(), folderStructure.accounts)}`,
       `^${relative(cwd2(), folderStructure.sessions)}`,
       `^${relative(cwd2(), folderStructure.cache)}`,
+      `^${relative(cwd2(), folderStructure.logs)}`,
       `^${relative(cwd2(), join6(folderStructure.site, "languages"))}`
     ];
     const excludeGlob = [...config.excludeGlob, ".*", ".*/"];
@@ -478,7 +503,7 @@ var main = defineCommand4({
         encoding: "utf-8"
       });
       const remoteComposerLock = cat("./composer.lock", config);
-      const skipVendor = localComposerLock === remoteComposerLock;
+      const skipVendor = remoteComposerLock !== void 0 && localComposerLock === remoteComposerLock;
       if (skipVendor) {
         exclude.push("^vendor/", "^kirby/");
         consola9.info("Skipping vendor\n");

package/dist/index.d.ts

@@ -5,28 +5,29 @@ declare const ConfigSchema: valibot.ObjectSchema<{
     readonly host: valibot.StringSchema<undefined>;
     readonly user: valibot.StringSchema<undefined>;
     readonly password: valibot.StringSchema<undefined>;
-    readonly url: valibot.OptionalSchema<valibot.StringSchema<undefined>, never>;
-    readonly token: valibot.OptionalSchema<valibot.StringSchema<undefined>, never>;
-    readonly remoteDir: valibot.OptionalSchema<valibot.StringSchema<undefined>, never>;
-    readonly folderStructure: valibot.OptionalSchema<valibot.UnionSchema<[valibot.LiteralSchema<"flat", undefined>, valibot.LiteralSchema<"public", undefined>, valibot.ObjectSchema<{
+    readonly url: valibot.OptionalSchema<valibot.StringSchema<undefined>, undefined>;
+    readonly token: valibot.OptionalSchema<valibot.StringSchema<undefined>, undefined>;
+    readonly remoteDir: valibot.OptionalSchema<valibot.StringSchema<undefined>, undefined>;
+    readonly folderStructure: valibot.OptionalSchema<valibot.UnionSchema<[valibot.LiteralSchema<"flat", undefined>, valibot.LiteralSchema<"public", undefined>, valibot.LiteralSchema<"composer", undefined>, valibot.ObjectSchema<{
         readonly content: valibot.StringSchema<undefined>;
         readonly media: valibot.StringSchema<undefined>;
         readonly accounts: valibot.StringSchema<undefined>;
         readonly sessions: valibot.StringSchema<undefined>;
         readonly cache: valibot.StringSchema<undefined>;
+        readonly logs: valibot.StringSchema<undefined>;
         readonly site: valibot.StringSchema<undefined>;
-    }, undefined>], undefined>, never>;
-    readonly checkComposerLock: valibot.OptionalSchema<valibot.BooleanSchema<undefined>, never>;
-    readonly callWebhooks: valibot.OptionalSchema<valibot.BooleanSchema<undefined>, never>;
-    readonly dryRun: valibot.OptionalSchema<valibot.BooleanSchema<undefined>, never>;
-    readonly verbose: valibot.OptionalSchema<valibot.BooleanSchema<undefined>, never>;
-    readonly parallel: valibot.OptionalSchema<valibot.NumberSchema<undefined>, never>;
-    readonly exclude: valibot.OptionalSchema<valibot.ArraySchema<valibot.StringSchema<undefined>, undefined>, never>;
-    readonly excludeGlob: valibot.OptionalSchema<valibot.ArraySchema<valibot.StringSchema<undefined>, undefined>, never>;
-    readonly include: valibot.OptionalSchema<valibot.ArraySchema<valibot.StringSchema<undefined>, undefined>, never>;
-    readonly includeGlob: valibot.OptionalSchema<valibot.ArraySchema<valibot.StringSchema<undefined>, undefined>, never>;
-    readonly lftpSettings: valibot.OptionalSchema<valibot.RecordSchema<valibot.StringSchema<undefined>, valibot.AnySchema, undefined>, never>;
-    readonly lftpFlags: valibot.OptionalSchema<valibot.ArraySchema<valibot.StringSchema<undefined>, undefined>, never>;
+    }, undefined>], undefined>, undefined>;
+    readonly checkComposerLock: valibot.OptionalSchema<valibot.BooleanSchema<undefined>, undefined>;
+    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 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>;
+    readonly include: valibot.OptionalSchema<valibot.ArraySchema<valibot.StringSchema<undefined>, undefined>, undefined>;
+    readonly includeGlob: valibot.OptionalSchema<valibot.ArraySchema<valibot.StringSchema<undefined>, undefined>, undefined>;
+    readonly lftpSettings: valibot.OptionalSchema<valibot.RecordSchema<valibot.StringSchema<undefined>, valibot.AnySchema, undefined>, undefined>;
+    readonly lftpFlags: valibot.OptionalSchema<valibot.ArraySchema<valibot.StringSchema<undefined>, undefined>, undefined>;
 }, undefined>;
 type Config = InferInput<typeof ConfigSchema>;
 
@@ -37,12 +38,13 @@ declare const defineConfig: (config: Config) => {
     url?: string | undefined;
     token?: string | undefined;
     remoteDir?: string | undefined;
-    folderStructure?: "flat" | "public" | {
+    folderStructure?: "flat" | "public" | "composer" | {
         content: string;
         media: string;
         accounts: string;
         sessions: string;
         cache: string;
+        logs: string;
         site: string;
     } | undefined;
     checkComposerLock?: boolean | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kirby-deploy",
-  "version": "0.2.0",
+  "version": "0.3.2",
   "main": "./dist/index.js",
   "type": "module",
   "bin": {
@@ -9,22 +9,26 @@
   "keywords": [],
   "author": "Arno Schlipf",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/arnoson/kirby-deploy"
+  },
+  "scripts": {
+    "build": "tsup src/index.ts src/cli.ts --format esm --dts",
+    "dev": "tsup src/index.ts src/cli.ts --format esm --watch",
+    "type-check": "tsc --noEmit"
+  },
   "devDependencies": {
-    "@prettier/plugin-php": "^0.22.2",
+    "@prettier/plugin-php": "^0.24.0",
     "@types/node": "^20.16.10",
     "prettier": "^3.3.3",
     "tsup": "^8.3.0",
     "typescript": "^5.6.2"
   },
   "dependencies": {
-    "c12": "^2.0.0",
+    "c12": "^3.0.0",
     "citty": "^0.1.6",
     "consola": "^3.2.3",
-    "valibot": "^0.42.1"
-  },
-  "scripts": {
-    "build": "tsup src/index.ts src/cli.ts --format esm --dts",
-    "dev": "tsup src/index.ts src/cli.ts --format esm --watch",
-    "type-check": "tsc --noEmit"
+    "valibot": "^1.0.0"
   }
-}
+}

package/src/commands/accounts.ts

@@ -1,5 +1,5 @@
 import { defineCommand } from 'citty'
-import consola from 'consola'
+import { consola } from 'consola'
 import { colors } from 'consola/utils'
 import { join } from 'path/posix'
 import { loadConfig } from '../config'

package/src/commands/content.ts

@@ -1,5 +1,5 @@
 import { defineCommand } from 'citty'
-import consola from 'consola'
+import { consola } from 'consola'
 import { colors } from 'consola/utils'
 import { join } from 'path/posix'
 import { loadConfig } from '../config'

package/src/commands/languages.ts

@@ -1,5 +1,5 @@
 import { defineCommand } from 'citty'
-import consola from 'consola'
+import { consola } from 'consola'
 import { colors } from 'consola/utils'
 import { join } from 'path/posix'
 import { loadConfig } from '../config'

package/src/commands/main.ts

@@ -1,5 +1,5 @@
 import { defineCommand } from 'citty'
-import consola from 'consola'
+import { consola } from 'consola'
 import { colors } from 'consola/utils'
 import { readFileSync } from 'fs'
 import { join, relative } from 'path/posix'
@@ -33,6 +33,7 @@ export const main = defineCommand({
       `^${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, '.*', '.*/']
@@ -51,7 +52,9 @@ export const main = defineCommand({
         encoding: 'utf-8',
       })
       const remoteComposerLock = cat('./composer.lock', config)
-      const skipVendor = localComposerLock === remoteComposerLock
+      const skipVendor =
+        remoteComposerLock !== undefined &&
+        localComposerLock === remoteComposerLock
       if (skipVendor) {
         exclude.push('^vendor/', '^kirby/')
         consola.info('Skipping vendor\n')

package/src/config.ts

@@ -1,5 +1,5 @@
 import { loadConfig as load } from 'c12'
-import consola from 'consola'
+import { consola } from 'consola'
 import { flatten, parse } from 'valibot'
 import { Config, ConfigResolved, ConfigSchema, FolderStructure } from './types'
 
@@ -28,7 +28,6 @@ export const loadConfig = async (): Promise<ConfigResolved | null> => {
   }
 
   // Resolve shorthands
-
   let folderStructure: FolderStructure
   config.folderStructure ??= 'flat'
   if (config.folderStructure === 'public') {
@@ -38,16 +37,28 @@ export const loadConfig = async (): Promise<ConfigResolved | null> => {
       accounts: 'storage/accounts',
       sessions: 'storage/sessions',
       cache: 'storage/cache',
+      logs: 'storage/logs',
       site: 'site',
     }
   } else if (config.folderStructure === 'flat') {
     // 'flat' structure is the default.
     folderStructure = {
       content: 'content',
-      media: 'site/media',
+      media: 'media',
       accounts: 'site/accounts',
       sessions: 'site/sessions',
       cache: 'site/cache',
+      logs: 'site/logs',
+      site: 'site',
+    }
+  } else if (config.folderStructure === 'composer') {
+    folderStructure = {
+      content: 'data/storage/content',
+      media: 'public/media',
+      accounts: 'data/storage/accounts',
+      sessions: 'data/runtime/sessions',
+      cache: 'data/runtime/cache',
+      logs: 'data/runtime/logs',
       site: 'site',
     }
   } else {
@@ -66,6 +77,7 @@ export const loadConfig = async (): Promise<ConfigResolved | null> => {
     include: [],
     includeGlob: [],
     ...config,
+    url: config.url?.replace(/\/$/, ''),
     folderStructure,
     lftpSettings: {
       'ftp:ssl-force': true,

package/src/lftp/cat.ts

@@ -1,5 +1,5 @@
 import { spawnSync } from 'child_process'
-import consola from 'consola'
+import { consola } from 'consola'
 import { platform } from 'os'
 import { ConfigResolved } from '../types'
 
@@ -24,6 +24,11 @@ export const cat = (
       })
     : spawnSync('lftp', ['-c', commands.join('; ')], { encoding: 'utf-8' })
 
-  if (child.stderr) consola.error(child.stderr)
+  if (child.stderr) {
+    // 550 means the file doesn't exist, silently return undefined
+    if (child.stderr.includes('550')) return undefined
+    consola.error(child.stderr)
+    return undefined
+  }
   return child.stdout
 }

package/src/lftp/mirror.ts

@@ -1,4 +1,4 @@
-import consola from 'consola'
+import { consola } from 'consola'
 import { colors } from 'consola/utils'
 import { spawn } from 'node:child_process'
 import { platform } from 'node:os'

package/src/sync.ts

@@ -1,4 +1,4 @@
-import consola from 'consola'
+import { consola } from 'consola'
 import { join } from 'path/posix'
 import { logMirror, mirror } from './lftp/mirror'
 import { ConfigResolved } from './types'

package/src/types.ts

@@ -18,6 +18,7 @@ export const FolderStructureSchema = object({
   accounts: string(),
   sessions: string(),
   cache: string(),
+  logs: string(),
   site: string(),
 })
 
@@ -31,7 +32,12 @@ export const ConfigSchema = object({
   token: optional(string()),
   remoteDir: optional(string()),
   folderStructure: optional(
-    union([literal('flat'), literal('public'), FolderStructureSchema]),
+    union([
+      literal('flat'),
+      literal('public'),
+      literal('composer'),
+      FolderStructureSchema,
+    ]),
   ),
   checkComposerLock: optional(boolean()),
   callWebhooks: optional(boolean()),

package/src/utils.ts

@@ -1,4 +1,4 @@
-import consola from 'consola'
+import { consola } from 'consola'
 import { colors } from 'consola/utils'
 import { spawnSync } from 'node:child_process'
 import { existsSync } from 'node:fs'