@content-collections/core 0.14.0 → 0.14.1

package/dist/index.js

@@ -23,10 +23,8 @@ import chokidar from "chokidar";
 function createKey(config$1, input, key) {
 	return createHash("sha256").update(config$1).update(JSON.stringify(input)).update(key).digest("hex");
 }
-async function createCacheDirectory(directory) {
-	const cacheDirectory = path.join(directory, ".content-collections", "cache");
+async function createCacheDirectory(cacheDirectory) {
 	if (!existsSync(cacheDirectory)) await mkdir(cacheDirectory, { recursive: true });
-	return cacheDirectory;
 }
 function fileName(input) {
 	return input.replace(/[^a-z0-9]/gi, "_").toLowerCase();
@@ -39,8 +37,8 @@ async function readMapping(mappingPath) {
 	}
 	return {};
 }
-async function createCacheManager(baseDirectory, configChecksum) {
-	const cacheDirectory = await createCacheDirectory(baseDirectory);
+async function createCacheManager(cacheDirectory, configChecksum) {
+	await createCacheDirectory(cacheDirectory);
 	const mappingPath = join(cacheDirectory, "mapping.json");
 	const mapping = await readMapping(mappingPath);
 	async function flush() {
@@ -363,14 +361,14 @@ var ConfigurationError = class extends Error {
 	}
 };
 const defaultConfigName = "content-collection-config.mjs";
-function resolveCacheDir(config$1, options) {
+function resolveCacheDir$1(config$1, options) {
 	if (options.cacheDir) return options.cacheDir;
 	return path.join(path.dirname(config$1), ".content-collections", "cache");
 }
 function createConfigurationReader() {
 	return async (configurationPath, options = { configName: defaultConfigName }) => {
 		if (!existsSync(configurationPath)) throw new ConfigurationError("Read", `configuration file ${configurationPath} does not exist`);
-		const cacheDir = resolveCacheDir(configurationPath, options);
+		const cacheDir = resolveCacheDir$1(configurationPath, options);
 		await fs.mkdir(cacheDir, { recursive: true });
 		const outfile = path.join(cacheDir, options.configName);
 		try {
@@ -1933,19 +1931,21 @@ function createImport(imp, variableName) {
 function serialize(value) {
 	let serializedValue = "";
 	let counter = 0;
-	function handleImports(item) {
+	function handleImports(item, parent, key) {
 		if (!item || typeof item !== "object") return;
+		if (isImport(item)) {
+			counter++;
+			const variableName = `__v_${counter}`;
+			serializedValue += createImport(item, variableName);
+			if (parent !== void 0 && key !== void 0) parent[key] = variableName;
+			return;
+		}
 		if (Array.isArray(item)) {
-			item.forEach(handleImports);
+			item.forEach((entry, index) => handleImports(entry, item, index));
 			return;
 		}
-		Object.entries(item).forEach(([key, value$1]) => {
-			if (isImport(value$1)) {
-				counter++;
-				const variableName = `__v_${counter}`;
-				serializedValue += createImport(value$1, variableName);
-				item[key] = variableName;
-			} else handleImports(value$1);
+		Object.entries(item).forEach(([entryKey, entryValue]) => {
+			handleImports(entryValue, item, entryKey);
 		});
 	}
 	handleImports(value);
@@ -2187,12 +2187,12 @@ async function createWriter(directory) {
 
 //#endregion
 //#region src/build.ts
-async function createBuildContext({ emitter, outputDirectory, baseDirectory, configuration }) {
+async function createBuildContext({ emitter, outputDirectory, cacheDirectory, baseDirectory, configuration }) {
 	const collector = createCollector(emitter, baseDirectory);
 	const [writer, resolved, cacheManager] = await Promise.all([
 		createWriter(outputDirectory),
 		collector.collect(configuration.collections),
-		createCacheManager(baseDirectory, configuration.checksum)
+		createCacheManager(cacheDirectory, configuration.checksum)
 	]);
 	return {
 		resolved,
@@ -2307,6 +2307,10 @@ function resolveOutputDir(baseDirectory, options) {
 	if (options.outputDir) return options.outputDir;
 	return path.join(baseDirectory, ".content-collections", "generated");
 }
+function resolveCacheDir(baseDirectory, options) {
+	if (options.cacheDir) return options.cacheDir;
+	return path.join(baseDirectory, ".content-collections", "cache");
+}
 var ConfigurationReloadError = class extends Error {
 	constructor(message) {
 		super(message);
@@ -2321,6 +2325,7 @@ async function createInternalBuilder(initialConfiguration, baseDirectory, option
 	const readConfiguration = createConfigurationReader();
 	const configurationPath = initialConfiguration.path;
 	const outputDirectory = resolveOutputDir(baseDirectory, options);
+	const cacheDirectory = resolveCacheDir(baseDirectory, options);
 	emitter.emit("builder:created", {
 		createdAt: Date.now(),
 		configurationPath,
@@ -2332,6 +2337,7 @@ async function createInternalBuilder(initialConfiguration, baseDirectory, option
 		emitter,
 		baseDirectory,
 		outputDirectory,
+		cacheDirectory,
 		configuration
 	});
 	async function sync(modification, filePath) {
@@ -2369,6 +2375,7 @@ async function createInternalBuilder(initialConfiguration, baseDirectory, option
 			emitter,
 			baseDirectory,
 			outputDirectory,
+			cacheDirectory,
 			configuration
 		});
 		if (watcher) watcher = await createWatcher(emitter, baseDirectory, configuration, sync);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@content-collections/core",
   "type": "module",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "Core of Content Collections",
   "author": "Sebastian Sdorra <s.sdorra@gmail.com>",
   "license": "MIT",