@content-collections/core 0.14.0 → 0.14.2

package/dist/index.js

@@ -8,6 +8,7 @@ import fs2 from "fs";
 import path2 from "path";
 import { build } from "esbuild";
 import { createRequire } from "module";
+import { fileURLToPath } from "node:url";
 import matter from "gray-matter";
 import { parse, stringify } from "yaml";
 import camelcase from "camelcase";
@@ -23,10 +24,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 +38,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() {
@@ -249,7 +248,7 @@ var loadTsConfigInternal = (dir = process.cwd(), name = "tsconfig.json", isExten
 var loadTsConfig = (dir, name) => loadTsConfigInternal(dir, name);
 
 //#endregion
-//#region ../../node_modules/.pnpm/bundle-require@5.0.0_esbuild@0.25.11/node_modules/bundle-require/dist/index.js
+//#region ../../node_modules/.pnpm/bundle-require@5.0.0_esbuild@0.25.12/node_modules/bundle-require/dist/index.js
 var tsconfigPathsToRegExp = (paths) => {
 	return Object.keys(paths || {}).map((key) => {
 		return /* @__PURE__ */ new RegExp(`^${key.replace(/\*/, ".*")}$`);
@@ -274,14 +273,21 @@ const NON_NODE_MODULE_RE = /^[A-Z]:[/\\]|^\.{0,2}\/|^\.{1,2}$/;
 function isCoreImport(path$1, kind) {
 	return path$1 === "@content-collections/core" && kind === "import-statement";
 }
+function resolveDirname() {
+	return dirname(fileURLToPath(import.meta.url));
+}
+function isInternalTest() {
+	return process.env.CC_TEST_INDICATOR === "__yes";
+}
 function createExternalsPlugin(configPath) {
 	const resolvePatterns = tsconfigPathsToRegExp(tsconfigResolvePaths(configPath));
+	const currentDir = resolveDirname();
 	return {
 		name: "external-packages",
 		setup: (build$2) => {
 			build$2.onResolve({ filter: /.*/ }, ({ path: path$1, kind }) => {
-				if (process.env.NODE_ENV === "test" && isCoreImport(path$1, kind)) return {
-					path: join(__dirname, "index.ts"),
+				if (isInternalTest() && isCoreImport(path$1, kind)) return {
+					path: join(currentDir, "index.ts"),
 					external: true
 				};
 				if (match(path$1, resolvePatterns)) {
@@ -363,14 +369,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 +1939,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 +2195,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 +2315,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 +2333,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 +2345,7 @@ async function createInternalBuilder(initialConfiguration, baseDirectory, option
 		emitter,
 		baseDirectory,
 		outputDirectory,
+		cacheDirectory,
 		configuration
 	});
 	async function sync(modification, filePath) {
@@ -2369,6 +2383,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.2",
   "description": "Core of Content Collections",
   "author": "Sebastian Sdorra <s.sdorra@gmail.com>",
   "license": "MIT",
@@ -49,7 +49,7 @@
     "p-limit": "^6.1.0",
     "picomatch": "^4.0.2",
     "pluralize": "^8.0.0",
-    "serialize-javascript": "^6.0.2",
+    "serialize-javascript": "^7.0.3",
     "tinyglobby": "^0.2.5",
     "yaml": "^2.4.5"
   },