@bamboocss/config 1.45.5 → 1.46.1

package/dist/index.cjs

@@ -34,8 +34,7 @@ let microdiff = require("microdiff");
 microdiff = __toESM(microdiff);
 let fs = require("fs");
 fs = __toESM(fs);
-let typescript = require("typescript");
-typescript = __toESM(typescript);
+let node_module = require("node:module");
 //#region src/is-bamboo-config.ts
 const configName = "bamboo";
 const bambooConfigFiles = new Set([
@@ -293,6 +292,16 @@ function escapeStringRegexp(string) {
 }
 //#endregion
 //#region src/get-mod-deps.ts
+/**
+* The compiler, loaded the first time a bare specifier in a config file needs resolving.
+*
+* This module is re-exported from the package entrypoint, so a static import made every
+* consumer of `@bamboocss/config` load a second full TypeScript — 155ms, on top of the copy
+* ts-morph already bundles — for one `resolveModuleName` call that a config with only relative
+* imports never reaches. `getConfigDependencies` is synchronous, so this is a lazy `require`.
+*/
+let compiler;
+const ts = () => compiler ??= (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href)("typescript");
 const jsExtensions = [
 	".js",
 	".cjs",
@@ -366,7 +375,8 @@ function getDeps(opts, fromAlias) {
 			return;
 		}
 		try {
-			const found = typescript.default.resolveModuleName(mod, absoluteFile, compilerOptions, typescript.default.sys).resolvedModule;
+			const compiler = ts();
+			const found = compiler.resolveModuleName(mod, absoluteFile, compilerOptions, compiler.sys).resolvedModule;
 			if (found && found.extension.endsWith("ts")) {
 				getDeps(Object.assign({}, nextOpts, { filename: found.resolvedFileName }));
 				return;
@@ -715,6 +725,36 @@ function mergeConfigs(configs) {
 	return withoutEmpty;
 }
 //#endregion
+//#region src/resolution-provenance.ts
+/**
+* Private provenance carried from config evaluation to the Node extraction policy.
+*
+* It is deliberately absent from the package entrypoint and from `LoadConfigResult`'s public
+* shape. A non-enumerable registered symbol survives the config package's ESM/CJS boundary
+* without changing serialization, hook arguments, object spreads, or documented API keys.
+*/
+const CONFIG_RESOLUTION_PROVENANCE = Symbol.for("@bamboocss/config-resolution-provenance/v1");
+const presetProvenance = /* @__PURE__ */ new WeakMap();
+const rememberExternalPreset = (config, externalPresets) => {
+	presetProvenance.set(config, externalPresets);
+};
+const takeExternalPresets = (config) => presetProvenance.get(config) ?? [];
+const attachConfigResolutionProvenance = (target, value) => {
+	Object.defineProperty(target, CONFIG_RESOLUTION_PROVENANCE, {
+		configurable: false,
+		enumerable: false,
+		value: Object.freeze({
+			baseline: Object.freeze({ ...value.baseline }),
+			bundleDependencies: Object.freeze([...value.bundleDependencies]),
+			externalPresets: Object.freeze(value.externalPresets.map((entry) => Object.freeze({
+				...entry,
+				dependencies: Object.freeze([...entry.dependencies])
+			})))
+		}),
+		writable: false
+	});
+};
+//#endregion
 //#region src/get-resolved-config.ts
 const hookUtils$1 = {
 	omit: _bamboocss_shared.omit,
@@ -727,6 +767,7 @@ const hookUtils$1 = {
 async function getResolvedConfig(config, cwd, hooks) {
 	const stack = [config];
 	const configs = [];
+	const externalPresets = [];
 	while (stack.length > 0) {
 		const current = stack.pop();
 		const subPresets = current.presets ?? [];
@@ -734,8 +775,14 @@ async function getResolvedConfig(config, cwd, hooks) {
 			let presetConfig;
 			let presetName;
 			if (typeof subPreset === "string") {
-				presetConfig = (await bundle(subPreset, cwd)).config;
+				const presetModule = await bundle(subPreset, cwd);
+				presetConfig = presetModule.config;
 				presetName = subPreset;
+				externalPresets.push({
+					dependencies: [...presetModule.dependencies],
+					index: externalPresets.length,
+					specifier: subPreset
+				});
 			} else {
 				presetConfig = await subPreset;
 				presetName = presetConfig.name || "unknown-preset";
@@ -754,6 +801,7 @@ async function getResolvedConfig(config, cwd, hooks) {
 	}
 	const merged = mergeConfigs(configs);
 	merged.presets = configs.slice(0, -1);
+	rememberExternalPreset(merged, externalPresets);
 	return merged;
 }
 //#endregion
@@ -1225,6 +1273,7 @@ async function resolveConfig(result, cwd) {
 	warnIfBaseDropped(listed, result.config.presets);
 	const hooks = mergeHooks(result.config.plugins ?? []);
 	const mergedConfig = await getResolvedConfig(result.config, cwd, hooks);
+	const externalPresets = takeExternalPresets(mergedConfig);
 	if (mergedConfig.logLevel) _bamboocss_logger.logger.level = mergedConfig.logLevel;
 	if (mergedConfig.logFilter) _bamboocss_logger.logger.filter = mergedConfig.logFilter;
 	validateConfig(mergedConfig);
@@ -1246,12 +1295,21 @@ async function resolveConfig(result, cwd) {
 		presets: []
 	}));
 	const deserialize = () => (0, _bamboocss_shared.parseJson)(serialized);
-	return {
+	const resolved = {
 		...loadConfigResult,
 		serialized,
 		deserialize,
 		hooks
 	};
+	attachConfigResolutionProvenance(resolved, {
+		baseline: {
+			deserialize,
+			serialized
+		},
+		bundleDependencies: result.dependencies,
+		externalPresets
+	});
+	return resolved;
 }
 //#endregion
 //#region src/load-config.ts

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { preset as presetBase } from "@bamboocss/preset-base";
 import { preset as presetBamboo } from "@bamboocss/preset-bamboo";
-import { CompilerOptions, TypeAcquisition } from "typescript";
 import { BambooHooks as BambooHooks$1, BambooPlugin, Config, ConfigTsOptions, DiffConfigResult, LoadConfigResult as LoadConfigResult$1 } from "@bamboocss/types";
+import { CompilerOptions, TypeAcquisition } from "typescript";
 
 //#region src/types.d.ts
 interface ConfigFileOptions {

package/dist/index.mjs

@@ -1,3 +1,4 @@
+import { createRequire } from "node:module";
 import { logger } from "@bamboocss/logger";
 import { BAMBOO_CONFIG_NAME, BambooError, assign, dashCase, isObject, isString, mergeAndConcat, mergeWith, omit, parseJson, pick, stringifyJson, traverse, walkObject } from "@bamboocss/shared";
 import { bundleNRequire } from "bundle-n-require";
@@ -7,7 +8,6 @@ import { preset as presetBase } from "@bamboocss/preset-base";
 import { preset as presetBamboo } from "@bamboocss/preset-bamboo";
 import microdiff from "microdiff";
 import fs from "fs";
-import ts from "typescript";
 //#region src/is-bamboo-config.ts
 const configName = "bamboo";
 const bambooConfigFiles = new Set([
@@ -265,6 +265,16 @@ function escapeStringRegexp(string) {
 }
 //#endregion
 //#region src/get-mod-deps.ts
+/**
+* The compiler, loaded the first time a bare specifier in a config file needs resolving.
+*
+* This module is re-exported from the package entrypoint, so a static import made every
+* consumer of `@bamboocss/config` load a second full TypeScript — 155ms, on top of the copy
+* ts-morph already bundles — for one `resolveModuleName` call that a config with only relative
+* imports never reaches. `getConfigDependencies` is synchronous, so this is a lazy `require`.
+*/
+let compiler;
+const ts = () => compiler ??= createRequire(import.meta.url)("typescript");
 const jsExtensions = [
 	".js",
 	".cjs",
@@ -338,7 +348,8 @@ function getDeps(opts, fromAlias) {
 			return;
 		}
 		try {
-			const found = ts.resolveModuleName(mod, absoluteFile, compilerOptions, ts.sys).resolvedModule;
+			const compiler = ts();
+			const found = compiler.resolveModuleName(mod, absoluteFile, compilerOptions, compiler.sys).resolvedModule;
 			if (found && found.extension.endsWith("ts")) {
 				getDeps(Object.assign({}, nextOpts, { filename: found.resolvedFileName }));
 				return;
@@ -687,6 +698,36 @@ function mergeConfigs(configs) {
 	return withoutEmpty;
 }
 //#endregion
+//#region src/resolution-provenance.ts
+/**
+* Private provenance carried from config evaluation to the Node extraction policy.
+*
+* It is deliberately absent from the package entrypoint and from `LoadConfigResult`'s public
+* shape. A non-enumerable registered symbol survives the config package's ESM/CJS boundary
+* without changing serialization, hook arguments, object spreads, or documented API keys.
+*/
+const CONFIG_RESOLUTION_PROVENANCE = Symbol.for("@bamboocss/config-resolution-provenance/v1");
+const presetProvenance = /* @__PURE__ */ new WeakMap();
+const rememberExternalPreset = (config, externalPresets) => {
+	presetProvenance.set(config, externalPresets);
+};
+const takeExternalPresets = (config) => presetProvenance.get(config) ?? [];
+const attachConfigResolutionProvenance = (target, value) => {
+	Object.defineProperty(target, CONFIG_RESOLUTION_PROVENANCE, {
+		configurable: false,
+		enumerable: false,
+		value: Object.freeze({
+			baseline: Object.freeze({ ...value.baseline }),
+			bundleDependencies: Object.freeze([...value.bundleDependencies]),
+			externalPresets: Object.freeze(value.externalPresets.map((entry) => Object.freeze({
+				...entry,
+				dependencies: Object.freeze([...entry.dependencies])
+			})))
+		}),
+		writable: false
+	});
+};
+//#endregion
 //#region src/get-resolved-config.ts
 const hookUtils$1 = {
 	omit,
@@ -699,6 +740,7 @@ const hookUtils$1 = {
 async function getResolvedConfig(config, cwd, hooks) {
 	const stack = [config];
 	const configs = [];
+	const externalPresets = [];
 	while (stack.length > 0) {
 		const current = stack.pop();
 		const subPresets = current.presets ?? [];
@@ -706,8 +748,14 @@ async function getResolvedConfig(config, cwd, hooks) {
 			let presetConfig;
 			let presetName;
 			if (typeof subPreset === "string") {
-				presetConfig = (await bundle(subPreset, cwd)).config;
+				const presetModule = await bundle(subPreset, cwd);
+				presetConfig = presetModule.config;
 				presetName = subPreset;
+				externalPresets.push({
+					dependencies: [...presetModule.dependencies],
+					index: externalPresets.length,
+					specifier: subPreset
+				});
 			} else {
 				presetConfig = await subPreset;
 				presetName = presetConfig.name || "unknown-preset";
@@ -726,6 +774,7 @@ async function getResolvedConfig(config, cwd, hooks) {
 	}
 	const merged = mergeConfigs(configs);
 	merged.presets = configs.slice(0, -1);
+	rememberExternalPreset(merged, externalPresets);
 	return merged;
 }
 //#endregion
@@ -1197,6 +1246,7 @@ async function resolveConfig(result, cwd) {
 	warnIfBaseDropped(listed, result.config.presets);
 	const hooks = mergeHooks(result.config.plugins ?? []);
 	const mergedConfig = await getResolvedConfig(result.config, cwd, hooks);
+	const externalPresets = takeExternalPresets(mergedConfig);
 	if (mergedConfig.logLevel) logger.level = mergedConfig.logLevel;
 	if (mergedConfig.logFilter) logger.filter = mergedConfig.logFilter;
 	validateConfig(mergedConfig);
@@ -1218,12 +1268,21 @@ async function resolveConfig(result, cwd) {
 		presets: []
 	}));
 	const deserialize = () => parseJson(serialized);
-	return {
+	const resolved = {
 		...loadConfigResult,
 		serialized,
 		deserialize,
 		hooks
 	};
+	attachConfigResolutionProvenance(resolved, {
+		baseline: {
+			deserialize,
+			serialized
+		},
+		bundleDependencies: result.dependencies,
+		externalPresets
+	});
+	return resolved;
 }
 //#endregion
 //#region src/load-config.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bamboocss/config",
-  "version": "1.45.5",
+  "version": "1.46.1",
   "description": "Find and load bamboo config",
   "homepage": "https://bamboocss.com",
   "license": "MIT",
@@ -63,12 +63,12 @@
     "bundle-n-require": "1.1.2",
     "escalade": "3.2.0",
     "microdiff": "1.5.0",
-    "typescript": "6.0.2",
-    "@bamboocss/logger": "1.45.5",
-    "@bamboocss/preset-bamboo": "1.45.5",
-    "@bamboocss/preset-base": "1.45.5",
-    "@bamboocss/shared": "1.45.5",
-    "@bamboocss/types": "1.45.5"
+    "typescript": "npm:@typescript/typescript6@6.0.2",
+    "@bamboocss/logger": "1.46.1",
+    "@bamboocss/preset-bamboo": "1.46.1",
+    "@bamboocss/preset-base": "1.46.1",
+    "@bamboocss/shared": "1.46.1",
+    "@bamboocss/types": "1.46.1"
   },
   "devDependencies": {
     "pkg-types": "2.3.0"