@elek-io/core 0.15.3 → 0.16.0

package/dist/cli/{index.cli.js → index.cli.mjs}

@@ -1,10 +1,10 @@
 #! /usr/bin/env node
 import { Command } from "@commander-js/extra-typings";
-import Path from "path";
+import Path from "node:path";
 import Fs from "fs-extra";
 import { build } from "tsdown";
 import CodeBlockWriter from "code-block-writer";
-import assert from "assert";
+import assert from "node:assert";
 import chokidar from "chokidar";
 import { serve } from "@hono/node-server";
 import { OpenAPIHono, createRoute, z } from "@hono/zod-openapi";
@@ -14,25 +14,30 @@ import { cors } from "hono/cors";
 import { trimTrailingSlash } from "hono/trailing-slash";
 import { z as z$1 } from "zod";
 import { Scalar } from "@scalar/hono-api-reference";
-import Os from "os";
-import { execFile } from "child_process";
+import Os from "node:os";
+import { execFile } from "node:child_process";
 import mime from "mime";
 import slugify from "@sindresorhus/slugify";
 import { v4 } from "uuid";
-import { GitProcess } from "dugite";
+import { exec } from "dugite";
 import PQueue from "p-queue";
 import { createLogger, format, transports } from "winston";
 import DailyRotateFile from "winston-daily-rotate-file";
 import Semver from "semver";
 
-//#region rolldown:runtime
+//#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
-var __export = (all) => {
+var __exportAll = (all, no_symbols) => {
 	let target = {};
-	for (var name$1 in all) __defProp(target, name$1, {
-		get: all[name$1],
-		enumerable: true
-	});
+	for (var name in all) {
+		__defProp(target, name, {
+			get: all[name],
+			enumerable: true
+		});
+	}
+	if (!no_symbols) {
+		__defProp(target, Symbol.toStringTag, { value: "Module" });
+	}
 	return target;
 };
 
@@ -40,24 +45,34 @@ var __export = (all) => {
 //#region package.json
 var package_default = {
 	name: "@elek-io/core",
-	version: "0.15.3",
+	version: "0.16.0",
 	description: "Handles core functionality of elek.io Projects like file IO and version control.",
 	homepage: "https://elek.io",
 	repository: "https://github.com/elek-io/core",
 	bugs: { "url": "https://github.com/elek-io/core/issues" },
 	type: "module",
-	bin: { "elek": "./dist/cli/index.cli.js" },
-	files: ["dist/node", "dist/browser"],
-	exports: { ".": {
-		"node": { "import": {
-			"types": "./dist/node/index.node.d.ts",
-			"default": "./dist/node/index.node.js"
-		} },
-		"import": {
-			"types": "./dist/browser/index.browser.d.ts",
-			"default": "./dist/browser/index.browser.js"
-		}
-	} },
+	bin: { "elek": "./dist/cli/index.cli.mjs" },
+	files: [
+		"dist/node",
+		"dist/browser",
+		"dist/astro"
+	],
+	exports: {
+		".": {
+			"node": { "import": {
+				"types": "./dist/node/index.node.d.mts",
+				"default": "./dist/node/index.node.mjs"
+			} },
+			"import": {
+				"types": "./dist/browser/index.browser.d.ts",
+				"default": "./dist/browser/index.browser.js"
+			}
+		},
+		"./astro": { "import": {
+			"types": "./dist/astro/index.astro.d.mts",
+			"default": "./dist/astro/index.astro.mjs"
+		} }
+	},
 	pnpm: { "overrides": {} },
 	scripts: {
 		"lint": "eslint",
@@ -72,105 +87,222 @@ var package_default = {
 	},
 	dependencies: {
 		"@commander-js/extra-typings": "14.0.0",
-		"@hono/node-server": "1.19.5",
-		"@hono/zod-openapi": "1.1.4",
-		"@scalar/hono-api-reference": "0.9.22",
+		"@hono/node-server": "1.19.11",
+		"@hono/zod-openapi": "1.2.2",
+		"@scalar/hono-api-reference": "0.10.0",
 		"@sindresorhus/slugify": "3.0.0",
-		"chokidar": "4.0.3",
+		"chokidar": "5.0.0",
 		"code-block-writer": "13.0.3",
-		"commander": "14.0.2",
-		"fs-extra": "11.3.2",
-		"hono": "4.10.4",
+		"commander": "14.0.3",
+		"fs-extra": "11.3.4",
+		"hono": "4.12.5",
 		"mime": "4.1.0",
-		"p-queue": "9.0.0",
-		"semver": "7.7.3",
-		"tsdown": "0.15.12",
+		"p-queue": "9.1.0",
+		"semver": "7.7.4",
+		"tsdown": "0.21.0",
 		"uuid": "13.0.0",
-		"winston": "3.18.3",
+		"winston": "3.19.0",
 		"winston-daily-rotate-file": "5.0.0",
-		"zod": "4.1.12"
+		"zod": "4.3.6"
 	},
 	devDependencies: {
-		"@changesets/cli": "2.29.7",
-		"@eslint/js": "9.38.0",
-		"@faker-js/faker": "10.1.0",
-		"@tsconfig/node22": "22.0.2",
-		"@tsconfig/strictest": "2.0.7",
+		"@changesets/cli": "2.30.0",
+		"@eslint/js": "10.0.1",
+		"@faker-js/faker": "10.3.0",
+		"@tsconfig/node24": "24.0.4",
+		"@tsconfig/strictest": "2.0.8",
 		"@types/fs-extra": "11.0.4",
-		"@types/node": "22.18.13",
+		"@types/node": "24.12.0",
 		"@types/semver": "7.7.1",
-		"@vitest/coverage-v8": "4.0.5",
-		"eslint": "9.38.0",
+		"@vitest/coverage-v8": "4.0.18",
+		"astro": "5.18.0",
+		"eslint": "10.0.3",
 		"eslint-config-prettier": "10.1.8",
-		"globals": "16.4.0",
+		"globals": "17.4.0",
 		"jiti": "2.6.1",
-		"prettier": "3.6.2",
+		"prettier": "3.8.1",
 		"typescript": "5.9.3",
-		"typescript-eslint": "8.46.2",
-		"vitest": "4.0.5"
+		"typescript-eslint": "8.56.1",
+		"vitest": "4.0.18"
 	},
-	peerDependencies: { "dugite": "2.7.1" }
+	peerDependencies: {
+		"astro": ">=5.0.0",
+		"dugite": "3.2.0"
+	},
+	peerDependenciesMeta: { "astro": { "optional": true } }
 };
 
 //#endregion
 //#region src/cli/exportAction.ts
-async function exportProjects({ outDir, projects, options }) {
-	const projectsToExport = [];
-	const resolvedOutDir = Path.resolve(outDir);
-	await Fs.ensureDir(resolvedOutDir);
-	let content = {};
-	if (projects === "all") projectsToExport.push(...(await core.projects.list({ limit: 0 })).list);
-	else for (const projectId of projects) projectsToExport.push(await core.projects.read({ id: projectId }));
+async function exportFile({ resolvedOutDir, name, content }) {
+	await Fs.writeFile(Path.join(resolvedOutDir, `${name}.json`), JSON.stringify(content, null, 2));
+}
+async function exportProjectNested({ projectToExport }) {
+	const assets = (await core.assets.list({
+		projectId: projectToExport.id,
+		limit: 0
+	})).list;
+	let assetContent = {};
+	for (const asset of assets) assetContent = {
+		...assetContent,
+		[asset.id]: { ...asset }
+	};
+	let collectionContent = {};
+	const collections = (await core.collections.list({
+		projectId: projectToExport.id,
+		limit: 0
+	})).list;
+	for (const collection of collections) {
+		let entryContent = {};
+		const entries = (await core.entries.list({
+			projectId: projectToExport.id,
+			collectionId: collection.id,
+			limit: 0
+		})).list;
+		for (const entry of entries) entryContent = {
+			...entryContent,
+			[entry.id]: { ...entry }
+		};
+		collectionContent = {
+			...collectionContent,
+			[collection.id]: {
+				...collection,
+				entries: entryContent
+			}
+		};
+	}
+	return {
+		...projectToExport,
+		assets: assetContent,
+		collections: collectionContent
+	};
+}
+async function exportProjectsNested({ resolvedOutDir, projectsToExport, options }) {
+	if (projectsToExport.length === 1) {
+		const projectToExport = projectsToExport[0];
+		const project = await exportProjectNested({
+			resolvedOutDir,
+			projectToExport,
+			options
+		});
+		await exportFile({
+			resolvedOutDir,
+			options,
+			name: `project-${projectToExport.id}`,
+			content: project
+		});
+	} else {
+		let projects = {};
+		for (const project of projectsToExport) projects = {
+			...projects,
+			[project.id]: await exportProjectNested({
+				resolvedOutDir,
+				projectToExport: project,
+				options
+			})
+		};
+		await exportFile({
+			resolvedOutDir,
+			options,
+			name: "projects",
+			content: projects
+		});
+	}
+}
+async function exportProjectsSeparate({ resolvedOutDir, projectsToExport, options }) {
 	for (const project of projectsToExport) {
-		const assets = (await core.assets.list({
+		const projectOutDir = Path.join(resolvedOutDir, `project-${project.id}`);
+		await Fs.ensureDir(projectOutDir);
+		await exportFile({
+			resolvedOutDir: projectOutDir,
+			options,
+			name: `project`,
+			content: project
+		});
+		const tmpAssets = (await core.assets.list({
 			projectId: project.id,
 			limit: 0
 		})).list;
-		let assetContent = {};
-		for (const asset of assets) assetContent = {
-			...assetContent,
-			[asset.id]: { ...asset }
-		};
-		let collectionContent = {};
+		const assets = [];
+		const assetOutDir = Path.join(projectOutDir, "assets");
+		await Fs.ensureDir(assetOutDir);
+		for (const asset of tmpAssets) {
+			const assetDestination = Path.join(assetOutDir, `${asset.id}.${asset.extension}`);
+			await Fs.copyFile(asset.absolutePath, assetDestination);
+			assets.push({
+				...asset,
+				absolutePath: assetDestination
+			});
+		}
+		await exportFile({
+			resolvedOutDir: assetOutDir,
+			options,
+			name: `assets`,
+			content: assets
+		});
 		const collections = (await core.collections.list({
 			projectId: project.id,
 			limit: 0
 		})).list;
+		const collectionsOutDir = Path.join(projectOutDir, "collections");
+		await Fs.ensureDir(collectionsOutDir);
 		for (const collection of collections) {
-			let entryContent = {};
+			const collectionOutDir = Path.join(collectionsOutDir, collection.slug.plural);
+			await Fs.ensureDir(collectionOutDir);
+			await exportFile({
+				resolvedOutDir: collectionOutDir,
+				options,
+				name: `collection`,
+				content: collection
+			});
 			const entries = (await core.entries.list({
 				projectId: project.id,
 				collectionId: collection.id,
 				limit: 0
 			})).list;
-			for (const entry of entries) entryContent = {
-				...entryContent,
-				[entry.id]: { ...entry }
-			};
-			collectionContent = {
-				...collectionContent,
-				[collection.id]: {
-					...collection,
-					entries: entryContent
-				}
-			};
+			await exportFile({
+				resolvedOutDir: collectionOutDir,
+				options,
+				name: `entries`,
+				content: entries
+			});
 		}
-		content = {
-			...content,
-			[project.id]: {
-				...project,
-				assets: assetContent,
-				collections: collectionContent
-			}
-		};
+		await exportFile({
+			resolvedOutDir: collectionsOutDir,
+			options,
+			name: `collections`,
+			content: collections
+		});
+	}
+}
+async function exportProjects({ outDir, projects, template, options }) {
+	const projectsToExport = [];
+	const resolvedOutDir = Path.resolve(outDir);
+	await Fs.ensureDir(resolvedOutDir);
+	if (projects === "all") projectsToExport.push(...(await core.projects.list({ limit: 0 })).list);
+	else for (const projectId of projects) projectsToExport.push(await core.projects.read({ id: projectId }));
+	switch (template) {
+		case "nested":
+			await exportProjectsNested({
+				resolvedOutDir,
+				projectsToExport,
+				options
+			});
+			break;
+		case "separate":
+			await exportProjectsSeparate({
+				resolvedOutDir,
+				projectsToExport,
+				options
+			});
+			break;
 	}
-	if (options.separate === true) for (const project of projectsToExport) await Fs.writeFile(Path.join(resolvedOutDir, `project-${project.id}.json`), JSON.stringify(content[project.id], null, 2));
-	else await Fs.writeFile(Path.join(resolvedOutDir, "projects.json"), JSON.stringify(content, null, 2));
 }
-const exportAction = async ({ outDir, projects, options }) => {
+const exportAction = async ({ outDir, projects, template, options }) => {
 	await exportProjects({
 		outDir,
 		projects,
+		template,
 		options
 	});
 	if (options.watch === true) {
@@ -186,6 +318,7 @@ const exportAction = async ({ outDir, projects, options }) => {
 			exportProjects({
 				outDir,
 				projects,
+				template,
 				options
 			});
 		});
@@ -326,7 +459,7 @@ function writeFetch(writer, to, method = "GET") {
 	}).write(`);`).newLine();
 	writer.writeLine(`const entries = await response.json();`);
 }
-async function generateApiClientAs({ outDir, language, format: format$1, target }) {
+async function generateApiClientAs({ outDir, language, format, target }) {
 	const resolvedOutDir = Path.resolve(outDir);
 	await Fs.ensureDir(resolvedOutDir);
 	const outFileTs = Path.join(resolvedOutDir, "client.ts");
@@ -337,8 +470,9 @@ async function generateApiClientAs({ outDir, language, format: format$1, target
 			external: ["@elek-io/core", "zod"],
 			entry: outFileTs.split(Path.sep).join(Path.posix.sep),
 			outDir: resolvedOutDir,
-			format: format$1,
+			format,
 			target,
+			platform: "neutral",
 			sourcemap: true,
 			clean: false,
 			dts: true,
@@ -347,11 +481,11 @@ async function generateApiClientAs({ outDir, language, format: format$1, target
 		await Fs.remove(outFileTs);
 	}
 }
-const generateApiClientAction = async ({ outDir, language, format: format$1, target, options }) => {
+const generateApiClientAction = async ({ outDir, language, format, target, options }) => {
 	await generateApiClientAs({
 		outDir,
 		language,
-		format: format$1,
+		format,
 		target,
 		options
 	});
@@ -368,7 +502,7 @@ const generateApiClientAction = async ({ outDir, language, format: format$1, tar
 			generateApiClientAs({
 				outDir,
 				language,
-				format: format$1,
+				format,
 				target,
 				options
 			});
@@ -383,10 +517,10 @@ const generateApiClientAction = async ({ outDir, language, format: format$1, tar
 */
 const requestResponseLogger = createMiddleware(async (c, next) => {
 	const { method, url } = c.req;
-	const requestId$1 = c.get("requestId");
+	const requestId = c.get("requestId");
 	c.var.logService.info({
 		source: "core",
-		message: `Recieved API request "${method} ${url}" with requestId ${requestId$1}`
+		message: `Recieved API request "${method} ${url}" with requestId ${requestId}`
 	});
 	const start = Date.now();
 	await next();
@@ -394,7 +528,7 @@ const requestResponseLogger = createMiddleware(async (c, next) => {
 	const statusCode = c.res.status.toString();
 	const resultLog = {
 		source: "core",
-		message: `Response for API request "${method} ${url}" with requestId ${requestId$1} and status code ${statusCode} in ${durationMs}ms`
+		message: `Response for API request "${method} ${url}" with requestId ${requestId} and status code ${statusCode} in ${durationMs}ms`
 	};
 	if (statusCode.startsWith("2")) c.var.logService.info(resultLog);
 	else if (statusCode.startsWith("3")) c.var.logService.warn(resultLog);
@@ -504,19 +638,19 @@ const logLevelSchema = z.enum([
 	"debug"
 ]);
 const versionSchema = z.string();
-const uuidSchema = z.uuid("shared.invalidUuid");
+const uuidSchema = z.uuid();
 /**
 * A record that can be used to translate a string value into all supported languages
 */
-const translatableStringSchema = z.partialRecord(supportedLanguageSchema, z.string().trim().min(1, "shared.translatableStringRequired"));
+const translatableStringSchema = z.partialRecord(supportedLanguageSchema, z.string().trim().min(1));
 /**
 * A record that can be used to translate a number value into all supported languages
 */
-const translatableNumberSchema = z.partialRecord(supportedLanguageSchema, z.number({ error: (error) => error.input === void 0 ? "shared.translatableNumberRequired" : "shared.translatableNumberNotANumber" }));
+const translatableNumberSchema = z.partialRecord(supportedLanguageSchema, z.number());
 /**
 * A record that can be used to translate a boolean value into all supported languages
 */
-const translatableBooleanSchema = z.partialRecord(supportedLanguageSchema, z.boolean({ error: (error) => error.input === void 0 ? "shared.translatableBooleanRequired" : "shared.translatableBooleanNotABoolean" }));
+const translatableBooleanSchema = z.partialRecord(supportedLanguageSchema, z.boolean());
 function translatableArrayOf(schema) {
 	return z.partialRecord(supportedLanguageSchema, z.array(schema));
 }
@@ -951,8 +1085,8 @@ const projectBranchSchema = z.enum(["production", "work"]);
 const projectFileSchema = baseFileSchema.extend({
 	objectType: z.literal(objectTypeSchema.enum.project).readonly(),
 	coreVersion: versionSchema,
-	name: z.string().trim().min(1, "shared.projectNameRequired"),
-	description: z.string().trim().min(1, "shared.projectDescriptionRequired"),
+	name: z.string().trim().min(1),
+	description: z.string().trim().min(1),
 	version: versionSchema,
 	status: projectStatusSchema,
 	settings: projectSettingsSchema
@@ -1022,6 +1156,12 @@ const searchProjectSchema = z.object({
 //#endregion
 //#region src/schema/schemaFromFieldDefinition.ts
 /**
+* Dynamic zod schema generation
+*
+* Altough everything is already strictly typed, a type of string might not be an email or text of a certain length.
+* To validate this, we need to generate zod schemas based on Field definitions the user created.
+*/
+/**
 * Boolean Values are always either true or false, so we don't need the Field definition here
 */
 function getBooleanValueContentSchemaFromFieldDefinition() {
@@ -1073,7 +1213,7 @@ function getStringValueContentSchemaFromFieldDefinition(fieldDefinition) {
 	if ("min" in fieldDefinition && fieldDefinition.min) schema = schema.min(fieldDefinition.min);
 	if ("max" in fieldDefinition && fieldDefinition.max) schema = schema.max(fieldDefinition.max);
 	if (fieldDefinition.isRequired === false) return schema.nullable();
-	return schema.min(1, "shared.stringValueRequired");
+	return schema.min(1);
 }
 /**
 * Reference Values can reference either Assets or Entries (or Shared Values in the future)
@@ -1089,7 +1229,7 @@ function getReferenceValueContentSchemaFromFieldDefinition(fieldDefinition) {
 			schema = z.array(valueContentReferenceToEntrySchema);
 			break;
 	}
-	if (fieldDefinition.isRequired) schema = schema.min(1, "shared.referenceRequired");
+	if (fieldDefinition.isRequired) schema = schema.min(1);
 	if (fieldDefinition.min) schema = schema.min(fieldDefinition.min);
 	if (fieldDefinition.max) schema = schema.max(fieldDefinition.max);
 	return schema;
@@ -1222,7 +1362,7 @@ const projectsSchema = z$1.string().default("all").transform((value) => {
 	return value.split(",").map((v) => uuidSchema.parse(v.trim()));
 });
 const generateApiClientOptionsSchema = z$1.object({ watch: z$1.boolean().default(false) });
-const exportProjectsOptionsSchema = generateApiClientOptionsSchema.extend({ separate: z$1.boolean().default(false) });
+const exportProjectsOptionsSchema = generateApiClientOptionsSchema.extend({ watch: z$1.boolean().default(false) });
 const generateApiClientSchema = z$1.object({
 	outDir: outDirSchema,
 	language: languageSchema,
@@ -1246,6 +1386,7 @@ const apiStartSchema = z$1.object({ port: portSchema });
 const exportSchema = z$1.object({
 	outDir: outDirSchema,
 	projects: projectsSchema,
+	template: z$1.enum(["nested", "separate"]).default("nested"),
 	options: exportProjectsOptionsSchema
 });
 
@@ -1324,7 +1465,6 @@ const router$6 = createRouter().openapi(createRoute({
 	const project = await c.var.projectService.read({ id: projectId });
 	return c.json(project, 200);
 });
-var projects_default = router$6;
 
 //#endregion
 //#region src/api/routes/content/v1/collections.ts
@@ -1410,7 +1550,6 @@ const router$5 = createRouter().openapi(createRoute({
 	});
 	return c.json(collection, 200);
 });
-var collections_default = router$5;
 
 //#endregion
 //#region src/api/routes/content/v1/entries.ts
@@ -1517,7 +1656,6 @@ const router$4 = createRouter().openapi(createRoute({
 	});
 	return c.json(entry, 200);
 });
-var entries_default = router$4;
 
 //#endregion
 //#region src/api/routes/content/v1/assets.ts
@@ -1603,22 +1741,18 @@ const router$3 = createRouter().openapi(createRoute({
 	});
 	return c.json(asset, 200);
 });
-var assets_default = router$3;
 
 //#endregion
 //#region src/api/routes/content/v1/index.ts
-const router$2 = createRouter().route("/projects", projects_default).route("/projects", collections_default).route("/projects", entries_default).route("/projects", assets_default);
-var v1_default = router$2;
+const router$2 = createRouter().route("/projects", router$6).route("/projects", router$5).route("/projects", router$4).route("/projects", router$3);
 
 //#endregion
 //#region src/api/routes/content/index.ts
-const router$1 = createRouter().route("/v1", v1_default);
-var content_default = router$1;
+const router$1 = createRouter().route("/v1", router$2);
 
 //#endregion
 //#region src/api/routes/index.ts
-const router = createRouter().route("/content", content_default);
-var routes_default = router;
+const router = createRouter().route("/content", router$1);
 
 //#endregion
 //#region src/api/index.ts
@@ -1636,7 +1770,7 @@ var LocalApi = class {
 		this.collectionService = collectionService;
 		this.entryService = entryService;
 		this.assetService = assetService;
-		this.api = createApi(this.logService, this.projectService, this.collectionService, this.entryService, this.assetService).route("/", routes_default).doc("/openapi.json", {
+		this.api = createApi(this.logService, this.projectService, this.collectionService, this.entryService, this.assetService).route("/", router).doc("/openapi.json", {
 			openapi: "3.0.0",
 			externalDocs: { url: "https://elek.io/docs" },
 			info: {
@@ -1740,7 +1874,7 @@ var RequiredParameterMissingError = class extends Error {
 
 //#endregion
 //#region src/util/node.ts
-var node_exports = /* @__PURE__ */ __export({
+var node_exports = /* @__PURE__ */ __exportAll({
 	execCommand: () => execCommand,
 	files: () => files,
 	folders: () => folders,
@@ -1907,8 +2041,8 @@ var AbstractCrudService = class {
 	/**
 	* Do not instantiate directly as this is an abstract class
 	*/
-	constructor(type$1, options, logService) {
-		this.type = type$1;
+	constructor(type, options, logService) {
+		this.type = type;
 		this.options = options;
 		this.logService = logService;
 	}
@@ -1944,8 +2078,8 @@ var AbstractCrudService = class {
 	* @param projectId Project to get all asset references from
 	* @param collectionId Only needed when requesting files of type "Entry"
 	*/
-	async listReferences(type$1, projectId, collectionId) {
-		switch (type$1) {
+	async listReferences(type, projectId, collectionId) {
+		switch (type) {
 			case objectTypeSchema.enum.asset:
 				if (!projectId) throw new RequiredParameterMissingError("projectId");
 				return this.getFileReferences(pathTo.lfs(projectId));
@@ -1960,7 +2094,7 @@ var AbstractCrudService = class {
 			case objectTypeSchema.enum.sharedValue:
 				if (!projectId) throw new RequiredParameterMissingError("projectId");
 				return this.getFileReferences(pathTo.sharedValues(projectId));
-			default: throw new Error(`Trying to list files of unsupported type "${type$1}"`);
+			default: throw new Error(`Trying to list files of unsupported type "${type}"`);
 		}
 	}
 	async getFolderReferences(path) {
@@ -2180,9 +2314,9 @@ var AssetService = class extends AbstractCrudService {
 	async list(props) {
 		listAssetsSchema.parse(props);
 		const offset = props.offset || 0;
-		const limit = props.limit || 15;
+		const limit = props.limit ?? 15;
 		const assetReferences = await this.listReferences(objectTypeSchema.enum.asset, props.projectId);
-		const partialAssetReferences = assetReferences.slice(offset, limit);
+		const partialAssetReferences = limit === 0 ? assetReferences.slice(offset) : assetReferences.slice(offset, offset + limit);
 		const assets = await this.returnResolved(partialAssetReferences.map((assetReference) => {
 			return this.read({
 				projectId: props.projectId,
@@ -2365,9 +2499,9 @@ var CollectionService = class extends AbstractCrudService {
 	async list(props) {
 		listCollectionsSchema.parse(props);
 		const offset = props.offset || 0;
-		const limit = props.limit || 15;
+		const limit = props.limit ?? 15;
 		const collectionReferences = await this.listReferences(objectTypeSchema.enum.collection, props.projectId);
-		const partialCollectionReferences = collectionReferences.slice(offset, limit);
+		const partialCollectionReferences = limit === 0 ? collectionReferences.slice(offset) : collectionReferences.slice(offset, offset + limit);
 		const collections = await this.returnResolved(partialCollectionReferences.map((reference) => {
 			return this.read({
 				projectId: props.projectId,
@@ -2530,9 +2664,9 @@ var EntryService = class extends AbstractCrudService {
 	async list(props) {
 		listEntriesSchema.parse(props);
 		const offset = props.offset || 0;
-		const limit = props.limit || 15;
+		const limit = props.limit ?? 15;
 		const entryReferences = await this.listReferences(objectTypeSchema.enum.entry, props.projectId, props.collectionId);
-		const partialEntryReferences = entryReferences.slice(offset, limit);
+		const partialEntryReferences = limit === 0 ? entryReferences.slice(offset) : entryReferences.slice(offset, offset + limit);
 		const entries = await this.returnResolved(partialEntryReferences.map((reference) => {
 			return this.read({
 				projectId: props.projectId,
@@ -2618,8 +2752,8 @@ var GitTagService = class extends AbstractCrudService {
 	*/
 	async read(props) {
 		readGitTagSchema.parse(props);
-		const tag = (await this.list({ path: props.path })).list.find((tag$1) => {
-			return tag$1.id === props.id;
+		const tag = (await this.list({ path: props.path })).list.find((tag) => {
+			return tag.id === props.id;
 		});
 		if (!tag) throw new GitError(`Provided tag with UUID "${props.id}" did not match any known tags`);
 		return tag;
@@ -2810,11 +2944,11 @@ var GitService = class {
 	* @param path  Path to the repository
 	* @param files Files to add
 	*/
-	async add(path, files$2) {
+	async add(path, files) {
 		const args = [
 			"add",
 			"--",
-			...files$2.map((filePath) => {
+			...files.map((filePath) => {
 				return filePath.replace(`${path}${Path.sep}`, "");
 			})
 		];
@@ -3088,11 +3222,11 @@ var GitService = class {
 	* @param path Path to the repository
 	* @param name Name to check
 	*/
-	async checkBranchOrTagName(path, name$1) {
+	async checkBranchOrTagName(path, name) {
 		await this.git(path, [
 			"check-ref-format",
 			"--allow-onelevel",
-			name$1
+			name
 		]);
 	}
 	/**
@@ -3151,7 +3285,7 @@ var GitService = class {
 		const result = await this.queue.add(async () => {
 			const start = Date.now();
 			return {
-				gitResult: await GitProcess.exec(args, path, options),
+				gitResult: await exec(args, path, options),
 				durationMs: Date.now() - start
 			};
 		});
@@ -3163,8 +3297,12 @@ var GitService = class {
 		};
 		if (result.durationMs >= 100) this.logService.warn(gitLog);
 		else this.logService.debug(gitLog);
-		if (result.gitResult.exitCode !== 0) throw new GitError(`Git ${this.version} (${this.gitPath}) command "git ${args.join(" ")}" executed for "${path}" failed with exit code "${result.gitResult.exitCode}" and message "${result.gitResult.stderr.trim() || result.gitResult.stdout.trim()}"`);
-		return result.gitResult;
+		if (result.gitResult.exitCode !== 0) throw new GitError(`Git ${this.version} (${this.gitPath}) command "git ${args.join(" ")}" executed for "${path}" failed with exit code "${result.gitResult.exitCode}" and message "${result.gitResult.stderr.toString().trim() || result.gitResult.stdout.toString().trim()}"`);
+		return {
+			...result.gitResult,
+			stdout: result.gitResult.stdout.toString(),
+			stderr: result.gitResult.stderr.toString()
+		};
 	}
 };
 
@@ -3213,8 +3351,8 @@ var JsonFileService = class extends AbstractCrudService {
 				source: "core",
 				message: `Cache hit reading file "${path}"`
 			});
-			const json$1 = this.cache.get(path);
-			return schema.parse(json$1);
+			const json = this.cache.get(path);
+			return schema.parse(json);
 		}
 		this.logService.debug({
 			source: "core",
@@ -3319,13 +3457,18 @@ var LogService = class {
 			handleExceptions: true,
 			handleRejections: true,
 			format: format.combine(format.colorize(), format.timestamp({ format: "HH:mm:ss" }), format.printf((props) => {
-				const { timestamp, level, source, message } = logConsoleTransportSchema.parse({
-					...props[Symbol.for("splat")][0],
+				const splatArgs = props[Symbol.for("splat")];
+				const result = logConsoleTransportSchema.safeParse({
+					...splatArgs?.[0] ?? {},
 					timestamp: props["timestamp"],
 					level: props.level,
 					message: props.message
 				});
-				return `${timestamp} [${source}] ${level}: ${message}`;
+				if (result.success) {
+					const { timestamp, level, source, message } = result.data;
+					return `${timestamp} [${source}] ${level}: ${message}`;
+				}
+				return `${String(props["timestamp"])} ${props.level}: ${String(props.message)}`;
 			}))
 		});
 		this.logger = createLogger({
@@ -3656,9 +3799,9 @@ var ProjectService = class extends AbstractCrudService {
 	async list(props) {
 		if (props) listProjectsSchema.parse(props);
 		const offset = props?.offset || 0;
-		const limit = props?.limit || 15;
+		const limit = props?.limit ?? 15;
 		const projectReferences = await this.listReferences(objectTypeSchema.enum.project);
-		const partialProjectReferences = projectReferences.slice(offset, limit);
+		const partialProjectReferences = limit === 0 ? projectReferences.slice(offset) : projectReferences.slice(offset, offset + limit);
 		const projects = await this.returnResolved(partialProjectReferences.map((reference) => {
 			return this.read({ id: reference.id });
 		}));
@@ -3707,8 +3850,8 @@ var ProjectService = class extends AbstractCrudService {
 	* committed
 	*/
 	async createFolderStructure(path) {
-		const folders$1 = Object.values(projectFolderSchema.enum);
-		await Promise.all(folders$1.map(async (folder) => {
+		const folders = Object.values(projectFolderSchema.enum);
+		await Promise.all(folders.map(async (folder) => {
 			await Fs.mkdirp(Path.join(path, folder));
 			await Fs.writeFile(Path.join(path, folder, ".gitkeep"), "");
 		}));
@@ -3954,11 +4097,11 @@ function watchProjects() {
 //#region src/index.cli.ts
 const program = new Command();
 program.name("elek").description("CLI for elek.io").version(package_default.version);
-program.command("generate:client").description("Generates a JS/TS API Client").argument("[outDir]", "The directory to generate the API Client in", "./.elek.io").argument("[language]", "The programming language of the generated API Client. Choose \"ts\" if you bundle it yourself in your TypeScript project, or \"js\" if you want a ready-to-use JavaScript API Client.", "ts").argument("[format]", "The output format of the generated API Client. Choose \"esm\" for ES Modules, or \"cjs\" for CommonJS. This option is only relevant if you choose \"js\" as the language.", "esm").argument("[target]", "The target environment of the generated API Client. Choose this depending on the JavaScript runtime you want to support. This option is only relevant if you choose \"js\" as the language.", "es2020").option("-w, --watch", "Watches for changes in your Projects and regenerates the API Client automatically.").action(async (outDir, language, format$1, target, options) => {
+program.command("generate:client").description("Generates a JS/TS API Client").argument("[outDir]", "The directory to generate the API Client in", "./.elek.io").argument("[language]", "The programming language of the generated API Client. Choose \"ts\" if you bundle it yourself in your TypeScript project, or \"js\" if you want a ready-to-use JavaScript API Client.", "ts").argument("[format]", "The output format of the generated API Client. Choose \"esm\" for ES Modules, or \"cjs\" for CommonJS. This option is only relevant if you choose \"js\" as the language.", "esm").argument("[target]", "The target environment of the generated API Client. Choose this depending on the JavaScript runtime you want to support. This option is only relevant if you choose \"js\" as the language.", "es2020").option("-w, --watch", "Watches for changes in your Projects and regenerates the API Client automatically.").action(async (outDir, language, format, target, options) => {
 	await generateApiClientAction(generateApiClientSchema.parse({
 		outDir,
 		language,
-		format: format$1,
+		format,
 		target,
 		options
 	}));
@@ -3966,10 +4109,11 @@ program.command("generate:client").description("Generates a JS/TS API Client").a
 program.command("api:start").description("Starts the local API").argument("[port]", "The port to run the local API on", "31310").action((port) => {
 	startApiAction(apiStartSchema.parse({ port }));
 });
-program.command("export").description("Exports all locally available Projects into a JSON file").argument("[outDir]", "The directory to write the JSON file to", "./.elek.io").argument("[projects]", "One or more Project IDs, separated by commas to export. If not provided, all Projects will be exported.", "all").option("-s, --separate", "Separates the exported Projects into individual files.").option("-w, --watch", "Watches for changes in your Projects and updates the JSON file automatically.").action(async (outDir, projects, options) => {
+program.command("export").description("Exports locally available Projects to JSON").argument("[outDir]", "The directory to write the JSON to", "./.elek.io").argument("[projects]", "One or more Project IDs, separated by commas to export. If not provided, all Projects will be exported.", "all").argument("[template]", "The template to use for exporting Projects. Choose \"nested\" to export all Projects in a single, nested file or \"separate\" to export each Project in a separate folder with individual files.", "nested").option("-w, --watch", "Watches for changes in your Projects and updates the JSON file automatically.").action(async (outDir, projects, template, options) => {
 	await exportAction(exportSchema.parse({
 		outDir,
 		projects,
+		template,
 		options
 	}));
 });
@@ -3977,4 +4121,4 @@ await program.parseAsync();
 
 //#endregion
 export {  };
-//# sourceMappingURL=index.cli.js.map
+//# sourceMappingURL=index.cli.mjs.map