@intlayer/chokidar 8.9.4 → 8.9.5

package/dist/cjs/createType/createModuleAugmentation.cjs

@@ -7,7 +7,6 @@ let node_path = require("node:path");
 let fast_glob = require("fast-glob");
 fast_glob = require_runtime.__toESM(fast_glob);
 let _intlayer_config_utils = require("@intlayer/config/utils");
-let zod_to_ts = require("zod-to-ts");
 
 //#region src/createType/createModuleAugmentation.ts
 const getTypeName = (key) => `${(0, _intlayer_config_utils.kebabCaseToCamelCase)(key)}Content`;
@@ -54,7 +53,7 @@ const zodToTsString = (schema) => {
 	}
 };
 /** Generate the content of the module augmentation file */
-const generateTypeIndexContent = (typeFiles, configuration) => {
+const generateTypeIndexContent = (typeFiles, configuration, zodToTsFns) => {
 	const { internationalization, system, editor } = configuration;
 	const { moduleAugmentationDir } = system;
 	const { enabled } = editor;
@@ -76,9 +75,11 @@ const generateTypeIndexContent = (typeFiles, configuration) => {
 	const formattedSchemas = Object.entries(schemas).map(([key, schema]) => {
 		let typeStr = "any";
 		if (schema) try {
-			const { node } = (0, zod_to_ts.zodToTs)(schema, { auxiliaryTypeStore: (0, zod_to_ts.createAuxiliaryTypeStore)() });
-			if (node.kind !== 133) typeStr = (0, zod_to_ts.printNode)(node);
-			else typeStr = zodToTsString(schema);
+			if (zodToTsFns) {
+				const { node } = zodToTsFns.zodToTs(schema, { auxiliaryTypeStore: zodToTsFns.createAuxiliaryTypeStore() });
+				if (node.kind !== 133) typeStr = zodToTsFns.printNode(node);
+				else typeStr = zodToTsString(schema);
+			} else typeStr = zodToTsString(schema);
 		} catch (_e) {
 			typeStr = zodToTsString(schema);
 		}
@@ -103,7 +104,17 @@ const generateTypeIndexContent = (typeFiles, configuration) => {
 const createModuleAugmentation = async (configuration) => {
 	const { moduleAugmentationDir, typesDir } = configuration.system;
 	await (0, node_fs_promises.mkdir)(moduleAugmentationDir, { recursive: true });
-	const tsContent = generateTypeIndexContent(await (0, fast_glob.default)((0, _intlayer_config_utils.normalizePath)(`${typesDir}/*.ts`), { ignore: ["**/*.d.ts"] }), configuration);
+	const dictionariesTypesDefinitions = await (0, fast_glob.default)((0, _intlayer_config_utils.normalizePath)(`${typesDir}/*.ts`), { ignore: ["**/*.d.ts"] });
+	let zodToTsFns = null;
+	try {
+		const mod = await import("zod-to-ts");
+		zodToTsFns = {
+			zodToTs: mod.zodToTs,
+			printNode: mod.printNode,
+			createAuxiliaryTypeStore: mod.createAuxiliaryTypeStore
+		};
+	} catch {}
+	const tsContent = generateTypeIndexContent(dictionariesTypesDefinitions, configuration, zodToTsFns);
 	await require_writeFileIfChanged.writeFileIfChanged((0, node_path.join)(moduleAugmentationDir, "intlayer.d.ts"), tsContent);
 };
 

package/dist/cjs/createType/createModuleAugmentation.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"createModuleAugmentation.cjs","names":["getPathHash","writeFileIfChanged"],"sources":["../../../src/createType/createModuleAugmentation.ts"],"sourcesContent":["import { mkdir } from 'node:fs/promises';\nimport { basename, extname, join, relative } from 'node:path';\nimport { kebabCaseToCamelCase, normalizePath } from '@intlayer/config/utils';\nimport type { Locale } from '@intlayer/types/allLocales';\nimport type { IntlayerConfig } from '@intlayer/types/config';\nimport fg from 'fast-glob';\nimport { createAuxiliaryTypeStore, printNode, zodToTs } from 'zod-to-ts';\nimport { getPathHash } from '../utils';\nimport { writeFileIfChanged } from '../writeFileIfChanged';\n\nexport const getTypeName = (key: string): string =>\n  `${kebabCaseToCamelCase(key)}Content`;\n\n/** Returns lines like: [Locales.FRENCH]: 1; */\nconst formatLocales = (locales: Locale[]) =>\n  locales.map((locale) => `    \"${locale}\": 1;`).join('\\n');\n\nconst zodToTsString = (schema: any): string => {\n  if (!schema) return 'any';\n\n  // Support both real Zod objects (_def) and serialized versions (def or nested)\n  const def = schema._def ?? schema.def ?? schema;\n\n  // Handle serialized type names (sometimes 'type' instead of 'typeName')\n  const typeName = def.typeName ?? def.type;\n\n  switch (typeName) {\n    case 'ZodString':\n    case 'string':\n      return 'string';\n    case 'ZodNumber':\n    case 'number':\n      return 'number';\n    case 'ZodBoolean':\n    case 'boolean':\n      return 'boolean';\n    case 'ZodNull':\n    case 'null':\n      return 'null';\n    case 'ZodUndefined':\n    case 'undefined':\n      return 'undefined';\n    case 'ZodArray':\n    case 'array':\n      return `${zodToTsString(def.type ?? def.element)}[]`;\n    case 'ZodObject':\n    case 'object': {\n      const shape = typeof def.shape === 'function' ? def.shape() : def.shape;\n      if (!shape) return 'Record<string, any>';\n\n      const entries = Object.entries(shape)\n        .map(([k, v]) => `      \"${k}\": ${zodToTsString(v)};`)\n        .join('\\n');\n      return `{\\n${entries}\\n    }`;\n    }\n    case 'ZodOptional':\n    case 'optional':\n      return `${zodToTsString(def.innerType ?? def.wrapped)} | undefined`;\n    case 'ZodNullable':\n    case 'nullable':\n      return `${zodToTsString(def.innerType ?? def.wrapped)} | null`;\n    case 'ZodUnion':\n    case 'union': {\n      const options = def.options ?? [];\n      return options.map(zodToTsString).join(' | ');\n    }\n    case 'ZodIntersection':\n    case 'intersection':\n      return `${zodToTsString(def.left)} & ${zodToTsString(def.right)}`;\n    case 'ZodEnum':\n    case 'enum': {\n      const values = def.values ?? [];\n      return values.map((v: string) => `\"${v}\"`).join(' | ');\n    }\n    case 'ZodLiteral':\n    case 'literal': {\n      const value = def.value;\n      return typeof value === 'string' ? `\"${value}\"` : String(value);\n    }\n    default:\n      return 'any';\n  }\n};\n\n/** Generate the content of the module augmentation file */\nconst generateTypeIndexContent = (\n  typeFiles: string[],\n  configuration: IntlayerConfig\n): string => {\n  const { internationalization, system, editor } = configuration;\n  const { moduleAugmentationDir } = system;\n  const { enabled } = editor;\n  const { locales, requiredLocales, strictMode } = internationalization;\n\n  let fileContent = 'import \"intlayer\";\\n';\n\n  // Build dictionary refs\n  const dictionariesRef = typeFiles.map((dictionaryPath) => ({\n    relativePath: `./${relative(moduleAugmentationDir, dictionaryPath)}`,\n    id: basename(dictionaryPath, extname(dictionaryPath)),\n    hash: `_${getPathHash(dictionaryPath)}`,\n  }));\n\n  // Import all dictionaries\n  for (const dictionary of dictionariesRef) {\n    fileContent += `import ${dictionary.hash} from '${dictionary.relativePath}';\\n`;\n  }\n  fileContent += '\\n';\n\n  // Dictionary map entries (id: typeof <hash>)\n  const formattedDictionaryMap: string = dictionariesRef\n    .map((dictionary) => `    \"${dictionary.id}\": typeof ${dictionary.hash};`)\n    .join('\\n');\n\n  // Ensure required ⊆ declared; if empty, default required = declared\n  const declared = locales;\n  const requiredSanitized = requiredLocales?.length\n    ? requiredLocales.filter((requiredLocales) =>\n        declared.includes(requiredLocales)\n      )\n    : declared;\n\n  const formattedDeclaredLocales = formatLocales(declared);\n  const formattedRequiredLocales = formatLocales(requiredSanitized);\n\n  // Build schema registry\n  const schemas = configuration.schemas ?? {};\n  const formattedSchemas = Object.entries(schemas)\n    .map(([key, schema]) => {\n      let typeStr = 'any';\n\n      if (schema) {\n        try {\n          const { node } = zodToTs(schema, {\n            auxiliaryTypeStore: createAuxiliaryTypeStore(),\n          });\n          // 133 is the kind for AnyKeyword in TypeScript\n          if ((node as any).kind !== 133) {\n            typeStr = printNode(node);\n          } else {\n            // Fallback to custom string generator if zodToTs returns any\n            typeStr = zodToTsString(schema);\n          }\n        } catch (_e) {\n          // Fallback to custom string generator\n          typeStr = zodToTsString(schema);\n        }\n      }\n      return `    \"${key}\": ${typeStr};`;\n    })\n    .join('\\n');\n\n  // Choose strict mode registry key\n  const strictKey =\n    strictMode === 'strict'\n      ? 'strict'\n      : strictMode === 'inclusive'\n        ? 'inclusive'\n        : 'loose';\n\n  /**\n   * Module augmentation that ONLY adds keys to registries.\n   * No types/aliases redefined here—avoids merge conflicts.\n   */\n  fileContent += `declare module 'intlayer' {\\n`;\n  // Dictionaries registry\n  fileContent += `  interface __DictionaryRegistry {\\n${formattedDictionaryMap}\\n  }\\n\\n`;\n  // Locales registries\n  fileContent += `  interface __DeclaredLocalesRegistry {\\n${formattedDeclaredLocales}\\n  }\\n\\n`;\n  fileContent += `  interface __RequiredLocalesRegistry {\\n${formattedRequiredLocales}\\n  }\\n\\n`;\n  // Schema registry\n  fileContent += `  interface __SchemaRegistry {\\n${formattedSchemas}\\n  }\\n\\n`;\n  // Resolved strict mode (narrow the literal at build time)\n  fileContent += `  interface __StrictModeRegistry { mode: '${strictKey}' }\\n\\n`;\n  // Editor registry\n  fileContent += `  interface __EditorRegistry { enabled : ${enabled} } \\n`;\n  fileContent += `}\\n`;\n\n  return fileContent;\n};\n\n/** Generate the index file merging all the types */\nexport const createModuleAugmentation = async (\n  configuration: IntlayerConfig\n) => {\n  const { moduleAugmentationDir, typesDir } = configuration.system;\n\n  await mkdir(moduleAugmentationDir, { recursive: true });\n\n  const dictionariesTypesDefinitions: string[] = await fg(\n    normalizePath(`${typesDir}/*.ts`),\n    { ignore: ['**/*.d.ts'] }\n  );\n\n  const tsContent = generateTypeIndexContent(\n    dictionariesTypesDefinitions,\n    configuration\n  );\n\n  const tsFilePath = join(moduleAugmentationDir, 'intlayer.d.ts');\n  await writeFileIfChanged(tsFilePath, tsContent);\n};\n"],"mappings":";;;;;;;;;;;;AAUA,MAAa,eAAe,QAC1B,oDAAwB,IAAI,CAAC;;AAG/B,MAAM,iBAAiB,YACrB,QAAQ,KAAK,WAAW,QAAQ,OAAO,OAAO,CAAC,KAAK,KAAK;AAE3D,MAAM,iBAAiB,WAAwB;CAC7C,IAAI,CAAC,QAAQ,OAAO;CAGpB,MAAM,MAAM,OAAO,QAAQ,OAAO,OAAO;CAKzC,QAFiB,IAAI,YAAY,IAAI,MAErC;EACE,KAAK;EACL,KAAK,UACH,OAAO;EACT,KAAK;EACL,KAAK,UACH,OAAO;EACT,KAAK;EACL,KAAK,WACH,OAAO;EACT,KAAK;EACL,KAAK,QACH,OAAO;EACT,KAAK;EACL,KAAK,aACH,OAAO;EACT,KAAK;EACL,KAAK,SACH,OAAO,GAAG,cAAc,IAAI,QAAQ,IAAI,QAAQ,CAAC;EACnD,KAAK;EACL,KAAK,UAAU;GACb,MAAM,QAAQ,OAAO,IAAI,UAAU,aAAa,IAAI,OAAO,GAAG,IAAI;GAClE,IAAI,CAAC,OAAO,OAAO;GAKnB,OAAO,MAHS,OAAO,QAAQ,MAAM,CAClC,KAAK,CAAC,GAAG,OAAO,UAAU,EAAE,KAAK,cAAc,EAAE,CAAC,GAAG,CACrD,KAAK,KACY,CAAC;;EAEvB,KAAK;EACL,KAAK,YACH,OAAO,GAAG,cAAc,IAAI,aAAa,IAAI,QAAQ,CAAC;EACxD,KAAK;EACL,KAAK,YACH,OAAO,GAAG,cAAc,IAAI,aAAa,IAAI,QAAQ,CAAC;EACxD,KAAK;EACL,KAAK,SAEH,QADgB,IAAI,WAAW,EAAE,EAClB,IAAI,cAAc,CAAC,KAAK,MAAM;EAE/C,KAAK;EACL,KAAK,gBACH,OAAO,GAAG,cAAc,IAAI,KAAK,CAAC,KAAK,cAAc,IAAI,MAAM;EACjE,KAAK;EACL,KAAK,QAEH,QADe,IAAI,UAAU,EAAE,EACjB,KAAK,MAAc,IAAI,EAAE,GAAG,CAAC,KAAK,MAAM;EAExD,KAAK;EACL,KAAK,WAAW;GACd,MAAM,QAAQ,IAAI;GAClB,OAAO,OAAO,UAAU,WAAW,IAAI,MAAM,KAAK,OAAO,MAAM;;EAEjE,SACE,OAAO;;;;AAKb,MAAM,4BACJ,WACA,kBACW;CACX,MAAM,EAAE,sBAAsB,QAAQ,WAAW;CACjD,MAAM,EAAE,0BAA0B;CAClC,MAAM,EAAE,YAAY;CACpB,MAAM,EAAE,SAAS,iBAAiB,eAAe;CAEjD,IAAI,cAAc;CAGlB,MAAM,kBAAkB,UAAU,KAAK,oBAAoB;EACzD,cAAc,6BAAc,uBAAuB,eAAe;EAClE,4BAAa,uCAAwB,eAAe,CAAC;EACrD,MAAM,IAAIA,sCAAY,eAAe;EACtC,EAAE;CAGH,KAAK,MAAM,cAAc,iBACvB,eAAe,UAAU,WAAW,KAAK,SAAS,WAAW,aAAa;CAE5E,eAAe;CAGf,MAAM,yBAAiC,gBACpC,KAAK,eAAe,QAAQ,WAAW,GAAG,YAAY,WAAW,KAAK,GAAG,CACzE,KAAK,KAAK;CAGb,MAAM,WAAW;CACjB,MAAM,oBAAoB,iBAAiB,SACvC,gBAAgB,QAAQ,oBACtB,SAAS,SAAS,gBAAgB,CACnC,GACD;CAEJ,MAAM,2BAA2B,cAAc,SAAS;CACxD,MAAM,2BAA2B,cAAc,kBAAkB;CAGjE,MAAM,UAAU,cAAc,WAAW,EAAE;CAC3C,MAAM,mBAAmB,OAAO,QAAQ,QAAQ,CAC7C,KAAK,CAAC,KAAK,YAAY;EACtB,IAAI,UAAU;EAEd,IAAI,QACF,IAAI;GACF,MAAM,EAAE,gCAAiB,QAAQ,EAC/B,6DAA8C,EAC/C,CAAC;GAEF,IAAK,KAAa,SAAS,KACzB,mCAAoB,KAAK;QAGzB,UAAU,cAAc,OAAO;WAE1B,IAAI;GAEX,UAAU,cAAc,OAAO;;EAGnC,OAAO,QAAQ,IAAI,KAAK,QAAQ;GAChC,CACD,KAAK,KAAK;CAGb,MAAM,YACJ,eAAe,WACX,WACA,eAAe,cACb,cACA;;;;;CAMR,eAAe;CAEf,eAAe,uCAAuC,uBAAuB;CAE7E,eAAe,4CAA4C,yBAAyB;CACpF,eAAe,4CAA4C,yBAAyB;CAEpF,eAAe,mCAAmC,iBAAiB;CAEnE,eAAe,6CAA6C,UAAU;CAEtE,eAAe,4CAA4C,QAAQ;CACnE,eAAe;CAEf,OAAO;;;AAIT,MAAa,2BAA2B,OACtC,kBACG;CACH,MAAM,EAAE,uBAAuB,aAAa,cAAc;CAE1D,kCAAY,uBAAuB,EAAE,WAAW,MAAM,CAAC;CAOvD,MAAM,YAAY,yBAChB,uEALc,GAAG,SAAS,OAAO,EACjC,EAAE,QAAQ,CAAC,YAAY,EAAE,CAC1B,EAIC,cACD;CAGD,MAAMC,kEADkB,uBAAuB,gBACZ,EAAE,UAAU"}
+{"version":3,"file":"createModuleAugmentation.cjs","names":["getPathHash","writeFileIfChanged"],"sources":["../../../src/createType/createModuleAugmentation.ts"],"sourcesContent":["import { mkdir } from 'node:fs/promises';\nimport { basename, extname, join, relative } from 'node:path';\nimport { kebabCaseToCamelCase, normalizePath } from '@intlayer/config/utils';\nimport type { Locale } from '@intlayer/types/allLocales';\nimport type { IntlayerConfig } from '@intlayer/types/config';\nimport fg from 'fast-glob';\nimport { getPathHash } from '../utils';\nimport { writeFileIfChanged } from '../writeFileIfChanged';\n\nexport const getTypeName = (key: string): string =>\n  `${kebabCaseToCamelCase(key)}Content`;\n\n/** Returns lines like: [Locales.FRENCH]: 1; */\nconst formatLocales = (locales: Locale[]) =>\n  locales.map((locale) => `    \"${locale}\": 1;`).join('\\n');\n\nconst zodToTsString = (schema: any): string => {\n  if (!schema) return 'any';\n\n  // Support both real Zod objects (_def) and serialized versions (def or nested)\n  const def = schema._def ?? schema.def ?? schema;\n\n  // Handle serialized type names (sometimes 'type' instead of 'typeName')\n  const typeName = def.typeName ?? def.type;\n\n  switch (typeName) {\n    case 'ZodString':\n    case 'string':\n      return 'string';\n    case 'ZodNumber':\n    case 'number':\n      return 'number';\n    case 'ZodBoolean':\n    case 'boolean':\n      return 'boolean';\n    case 'ZodNull':\n    case 'null':\n      return 'null';\n    case 'ZodUndefined':\n    case 'undefined':\n      return 'undefined';\n    case 'ZodArray':\n    case 'array':\n      return `${zodToTsString(def.type ?? def.element)}[]`;\n    case 'ZodObject':\n    case 'object': {\n      const shape = typeof def.shape === 'function' ? def.shape() : def.shape;\n      if (!shape) return 'Record<string, any>';\n\n      const entries = Object.entries(shape)\n        .map(([k, v]) => `      \"${k}\": ${zodToTsString(v)};`)\n        .join('\\n');\n      return `{\\n${entries}\\n    }`;\n    }\n    case 'ZodOptional':\n    case 'optional':\n      return `${zodToTsString(def.innerType ?? def.wrapped)} | undefined`;\n    case 'ZodNullable':\n    case 'nullable':\n      return `${zodToTsString(def.innerType ?? def.wrapped)} | null`;\n    case 'ZodUnion':\n    case 'union': {\n      const options = def.options ?? [];\n      return options.map(zodToTsString).join(' | ');\n    }\n    case 'ZodIntersection':\n    case 'intersection':\n      return `${zodToTsString(def.left)} & ${zodToTsString(def.right)}`;\n    case 'ZodEnum':\n    case 'enum': {\n      const values = def.values ?? [];\n      return values.map((v: string) => `\"${v}\"`).join(' | ');\n    }\n    case 'ZodLiteral':\n    case 'literal': {\n      const value = def.value;\n      return typeof value === 'string' ? `\"${value}\"` : String(value);\n    }\n    default:\n      return 'any';\n  }\n};\n\ntype ZodToTsFns = {\n  zodToTs: (schema: any, opts?: any) => { node: any };\n  printNode: (node: any) => string;\n  createAuxiliaryTypeStore: () => any;\n};\n\n/** Generate the content of the module augmentation file */\nconst generateTypeIndexContent = (\n  typeFiles: string[],\n  configuration: IntlayerConfig,\n  zodToTsFns: ZodToTsFns | null\n): string => {\n  const { internationalization, system, editor } = configuration;\n  const { moduleAugmentationDir } = system;\n  const { enabled } = editor;\n  const { locales, requiredLocales, strictMode } = internationalization;\n\n  let fileContent = 'import \"intlayer\";\\n';\n\n  // Build dictionary refs\n  const dictionariesRef = typeFiles.map((dictionaryPath) => ({\n    relativePath: `./${relative(moduleAugmentationDir, dictionaryPath)}`,\n    id: basename(dictionaryPath, extname(dictionaryPath)),\n    hash: `_${getPathHash(dictionaryPath)}`,\n  }));\n\n  // Import all dictionaries\n  for (const dictionary of dictionariesRef) {\n    fileContent += `import ${dictionary.hash} from '${dictionary.relativePath}';\\n`;\n  }\n  fileContent += '\\n';\n\n  // Dictionary map entries (id: typeof <hash>)\n  const formattedDictionaryMap: string = dictionariesRef\n    .map((dictionary) => `    \"${dictionary.id}\": typeof ${dictionary.hash};`)\n    .join('\\n');\n\n  // Ensure required ⊆ declared; if empty, default required = declared\n  const declared = locales;\n  const requiredSanitized = requiredLocales?.length\n    ? requiredLocales.filter((requiredLocales) =>\n        declared.includes(requiredLocales)\n      )\n    : declared;\n\n  const formattedDeclaredLocales = formatLocales(declared);\n  const formattedRequiredLocales = formatLocales(requiredSanitized);\n\n  // Build schema registry\n  const schemas = configuration.schemas ?? {};\n  const formattedSchemas = Object.entries(schemas)\n    .map(([key, schema]) => {\n      let typeStr = 'any';\n\n      if (schema) {\n        try {\n          if (zodToTsFns) {\n            const { node } = zodToTsFns.zodToTs(schema, {\n              auxiliaryTypeStore: zodToTsFns.createAuxiliaryTypeStore(),\n            });\n            // 133 is the kind for AnyKeyword in TypeScript\n            if ((node as any).kind !== 133) {\n              typeStr = zodToTsFns.printNode(node);\n            } else {\n              typeStr = zodToTsString(schema);\n            }\n          } else {\n            typeStr = zodToTsString(schema);\n          }\n        } catch (_e) {\n          // Fallback to custom string generator\n          typeStr = zodToTsString(schema);\n        }\n      }\n      return `    \"${key}\": ${typeStr};`;\n    })\n    .join('\\n');\n\n  // Choose strict mode registry key\n  const strictKey =\n    strictMode === 'strict'\n      ? 'strict'\n      : strictMode === 'inclusive'\n        ? 'inclusive'\n        : 'loose';\n\n  /**\n   * Module augmentation that ONLY adds keys to registries.\n   * No types/aliases redefined here—avoids merge conflicts.\n   */\n  fileContent += `declare module 'intlayer' {\\n`;\n  // Dictionaries registry\n  fileContent += `  interface __DictionaryRegistry {\\n${formattedDictionaryMap}\\n  }\\n\\n`;\n  // Locales registries\n  fileContent += `  interface __DeclaredLocalesRegistry {\\n${formattedDeclaredLocales}\\n  }\\n\\n`;\n  fileContent += `  interface __RequiredLocalesRegistry {\\n${formattedRequiredLocales}\\n  }\\n\\n`;\n  // Schema registry\n  fileContent += `  interface __SchemaRegistry {\\n${formattedSchemas}\\n  }\\n\\n`;\n  // Resolved strict mode (narrow the literal at build time)\n  fileContent += `  interface __StrictModeRegistry { mode: '${strictKey}' }\\n\\n`;\n  // Editor registry\n  fileContent += `  interface __EditorRegistry { enabled : ${enabled} } \\n`;\n  fileContent += `}\\n`;\n\n  return fileContent;\n};\n\n/** Generate the index file merging all the types */\nexport const createModuleAugmentation = async (\n  configuration: IntlayerConfig\n) => {\n  const { moduleAugmentationDir, typesDir } = configuration.system;\n\n  await mkdir(moduleAugmentationDir, { recursive: true });\n\n  const dictionariesTypesDefinitions: string[] = await fg(\n    normalizePath(`${typesDir}/*.ts`),\n    { ignore: ['**/*.d.ts'] }\n  );\n\n  let zodToTsFns: ZodToTsFns | null = null;\n  try {\n    const mod = await import('zod-to-ts');\n    zodToTsFns = {\n      zodToTs: mod.zodToTs,\n      printNode: mod.printNode,\n      createAuxiliaryTypeStore: mod.createAuxiliaryTypeStore,\n    };\n  } catch {\n    // typescript peer dep not installed (plain JS project), use fallback\n  }\n\n  const tsContent = generateTypeIndexContent(\n    dictionariesTypesDefinitions,\n    configuration,\n    zodToTsFns\n  );\n\n  const tsFilePath = join(moduleAugmentationDir, 'intlayer.d.ts');\n  await writeFileIfChanged(tsFilePath, tsContent);\n};\n"],"mappings":"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"}

package/dist/cjs/watcher.cjs

@@ -1,5 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('./_virtual/_rolldown/runtime.cjs');
+const require_utils_formatter = require('./utils/formatter.cjs');
 const require_handleContentDeclarationFileChange = require('./handleContentDeclarationFileChange.cjs');
 const require_handleContentDeclarationFileMoved = require('./handleContentDeclarationFileMoved.cjs');
 const require_handleAdditionalContentDeclarationFile = require('./handleAdditionalContentDeclarationFile.cjs');
@@ -14,6 +15,7 @@ let node_fs = require("node:fs");
 let _intlayer_config_utils = require("@intlayer/config/utils");
 let _intlayer_config_colors = require("@intlayer/config/colors");
 _intlayer_config_colors = require_runtime.__toESM(_intlayer_config_colors);
+let node_url = require("node:url");
 
 //#region src/watcher.ts
 const pendingUnlinks = /* @__PURE__ */ new Map();
@@ -57,6 +59,58 @@ const watch = async (options) => {
 	], { level: "warn" });
 	const excludedSegments = excludedPath.map((segment) => segment.replace(/^\*\*\//, "").replace(/\/\*\*$/, ""));
 	const normalizedConfigPath = configurationFilePath ? (0, _intlayer_config_utils.normalizePath)(configurationFilePath) : null;
+	const { mainDir, baseDir } = configuration.system;
+	const normalizedIntlayerDir = (0, _intlayer_config_utils.normalizePath)((0, node_path.dirname)(mainDir));
+	if ((0, node_fs.existsSync)(mainDir)) chokidarWatch(mainDir, {
+		persistent: isWatchMode,
+		ignoreInitial: true,
+		depth: 0
+	}).on("change", async (filePath) => {
+		if (isProcessing) return;
+		processEvent(async () => {
+			(0, _intlayer_config_utils.clearModuleCache)(filePath);
+			try {
+				await import(`${(0, node_url.pathToFileURL)(filePath).href}?update=${Date.now()}`);
+			} catch {
+				appLogger(`Entry point ${(0, node_path.basename)(filePath)} failed to load, running clean rebuild...`, { level: "warn" });
+				await require_prepareIntlayer.prepareIntlayer(configuration, {
+					clean: true,
+					forceRun: true
+				});
+			}
+		});
+	}).on("unlink", async (filePath) => {
+		if (isProcessing) return;
+		processEvent(async () => {
+			appLogger([
+				"Entry point",
+				require_utils_formatter.formatPath((0, node_path.basename)(filePath)),
+				"was removed, running clean rebuild..."
+			], { level: "warn" });
+			await require_prepareIntlayer.prepareIntlayer(configuration, {
+				clean: true,
+				forceRun: true
+			});
+		});
+	});
+	chokidarWatch(baseDir, {
+		persistent: isWatchMode,
+		ignoreInitial: true,
+		depth: 0,
+		ignored: (filePath) => {
+			const path = (0, _intlayer_config_utils.normalizePath)(filePath);
+			return path !== (0, _intlayer_config_utils.normalizePath)(baseDir) && path !== normalizedIntlayerDir;
+		}
+	}).on("unlinkDir", async (dirPath) => {
+		if (isProcessing) return;
+		if ((0, _intlayer_config_utils.normalizePath)(dirPath) === normalizedIntlayerDir) {
+			appLogger([require_utils_formatter.formatPath(".intlayer"), "directory removed, running clean rebuild..."]);
+			processEvent(() => require_prepareIntlayer.prepareIntlayer(configuration, {
+				clean: true,
+				forceRun: true
+			}));
+		}
+	});
 	return chokidarWatch(pathsToWatch, {
 		persistent: isWatchMode,
 		ignoreInitial: true,

package/dist/cjs/watcher.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.cjs","names":["existsSync","ANSIColor","handleContentDeclarationFileMoved","writeContentDeclaration","handleAdditionalContentDeclarationFile","prepareIntlayer","handleContentDeclarationFileChange","handleUnlinkedContentDeclarationFile"],"sources":["../../src/watcher.ts"],"sourcesContent":["import { existsSync } from 'node:fs';\nimport { readFile } from 'node:fs/promises';\nimport { basename } from 'node:path';\nimport * as ANSIColor from '@intlayer/config/colors';\nimport { colorize, getAppLogger } from '@intlayer/config/logger';\nimport {\n  type GetConfigurationOptions,\n  getConfiguration,\n  getConfigurationAndFilePath,\n} from '@intlayer/config/node';\nimport {\n  clearAllCache,\n  clearDiskCacheMemory,\n  clearModuleCache,\n  normalizePath,\n} from '@intlayer/config/utils';\nimport type { IntlayerConfig } from '@intlayer/types/config';\nimport type { ChokidarOptions } from 'chokidar';\nimport { handleAdditionalContentDeclarationFile } from './handleAdditionalContentDeclarationFile';\nimport { handleContentDeclarationFileChange } from './handleContentDeclarationFileChange';\nimport { handleContentDeclarationFileMoved } from './handleContentDeclarationFileMoved';\nimport { handleUnlinkedContentDeclarationFile } from './handleUnlinkedContentDeclarationFile';\nimport { prepareIntlayer } from './prepareIntlayer';\nimport { writeContentDeclaration } from './writeContentDeclaration';\n\n// Map to track files that were recently unlinked: oldPath -> { timer, timestamp }\nconst pendingUnlinks = new Map<\n  string,\n  { timer: NodeJS.Timeout; oldPath: string }\n>();\n\n// Array-based sequential task queue — no Promise chain accumulation, no race conditions\nconst taskQueue: (() => Promise<void>)[] = [];\nlet isProcessing = false;\n\nconst processQueue = async () => {\n  if (isProcessing) return;\n  isProcessing = true;\n  while (taskQueue.length > 0) {\n    const task = taskQueue.shift()!;\n    try {\n      await task();\n    } catch (error) {\n      console.error(error);\n    }\n  }\n  isProcessing = false;\n};\n\nconst processEvent = (task: () => Promise<void>) => {\n  taskQueue.push(task);\n  processQueue();\n};\n\ntype WatchOptions = ChokidarOptions & {\n  configuration?: IntlayerConfig;\n  configOptions?: GetConfigurationOptions;\n  skipPrepare?: boolean;\n};\n\n// Initialize chokidar watcher (non-persistent)\nexport const watch = async (options?: WatchOptions) => {\n  const { watch: chokidarWatch } = await import('chokidar');\n  const configResult = getConfigurationAndFilePath(options?.configOptions);\n  const configurationFilePath = configResult.configurationFilePath;\n  let configuration: IntlayerConfig =\n    options?.configuration ?? configResult.configuration;\n  const appLogger = getAppLogger(configuration);\n\n  const {\n    watch: isWatchMode,\n    fileExtensions,\n    contentDir,\n    excludedPath,\n  } = configuration.content;\n\n  // chokidar v5 dropped glob support — use fs to resolve dirs, filter extensions via ignored\n  const pathsToWatch = [\n    ...contentDir.map((dir) => normalizePath(dir)).filter(existsSync),\n    ...(configurationFilePath ? [configurationFilePath] : []),\n  ];\n\n  if (!configuration.content.watch) return;\n\n  appLogger('Watching Intlayer content declarations');\n\n  if (configuration.build.optimize === true) {\n    appLogger(\n      [\n        `Build optimization is forced to ${colorize('true', ANSIColor.GREY)}, but watching is enabled too.`,\n        'It may lead to dev mode performance degradation as well as import errors.',\n        'Its recommended to keep the',\n        colorize('`build.optimized`', ANSIColor.BLUE),\n        'option',\n        colorize('undefined', ANSIColor.GREY),\n        'to get the best dev mode experience',\n      ],\n      {\n        level: 'warn',\n      }\n    );\n  }\n\n  // Strip glob markers from excludedPath entries to get plain segments (e.g. 'node_modules')\n  const excludedSegments = excludedPath.map((segment) =>\n    segment.replace(/^\\*\\*\\//, '').replace(/\\/\\*\\*$/, '')\n  );\n\n  const normalizedConfigPath = configurationFilePath\n    ? normalizePath(configurationFilePath)\n    : null;\n\n  return chokidarWatch(pathsToWatch, {\n    persistent: isWatchMode, // Make the watcher persistent\n    ignoreInitial: true, // Process existing files\n    awaitWriteFinish: {\n      stabilityThreshold: 1000,\n      pollInterval: 100,\n    },\n    ignored: (filePath: string, stats?: import('node:fs').Stats) => {\n      const path = normalizePath(filePath);\n\n      if (normalizedConfigPath && path === normalizedConfigPath) return false;\n\n      if (excludedSegments.some((segment) => path.includes(`/${segment}`)))\n        return true;\n\n      if (stats?.isFile()) {\n        return !fileExtensions.some((extension) => path.endsWith(extension));\n      }\n\n      return false;\n    },\n    ...options,\n  })\n    .on('add', async (filePath) => {\n      const fileName = basename(filePath);\n      let isMove = false;\n\n      // Check if this Add corresponds to a pending Unlink (Move/Rename detection)\n      // Heuristic:\n      // - Priority A: Exact basename match (Moved to different folder)\n      // - Priority B: Single entry in pendingUnlinks (Renamed file)\n      let matchedOldPath: string | undefined;\n\n      // Search for basename match\n      for (const [oldPath] of pendingUnlinks) {\n        if (basename(oldPath) === fileName) {\n          matchedOldPath = oldPath;\n          break;\n        }\n      }\n\n      // If no basename match, but exactly one file was recently unlinked, assume it's a rename\n      if (!matchedOldPath && pendingUnlinks.size === 1) {\n        matchedOldPath = pendingUnlinks.keys().next().value;\n      }\n\n      if (matchedOldPath) {\n        // It is a move! Cancel the unlink handler\n        const pending = pendingUnlinks.get(matchedOldPath);\n        if (pending) {\n          clearTimeout(pending.timer);\n          pendingUnlinks.delete(matchedOldPath);\n        }\n\n        isMove = true;\n        appLogger(`File moved from ${matchedOldPath} to ${filePath}`);\n      }\n\n      processEvent(async () => {\n        if (isMove && matchedOldPath) {\n          await handleContentDeclarationFileMoved(\n            matchedOldPath,\n            filePath,\n            configuration\n          );\n        } else {\n          const fileContent = await readFile(filePath, 'utf-8');\n          const isEmpty = fileContent === '';\n\n          // Fill template content declaration file if it is empty\n          if (isEmpty) {\n            const extensionPattern = fileExtensions\n              .map((ext) => ext.replace(/\\./g, '\\\\.'))\n              .join('|');\n            const name = fileName.replace(\n              new RegExp(`(${extensionPattern})$`),\n              ''\n            );\n\n            await writeContentDeclaration(\n              {\n                key: name,\n                content: {},\n                filePath,\n              },\n              configuration\n            );\n          }\n\n          await handleAdditionalContentDeclarationFile(filePath, configuration);\n        }\n      });\n    })\n    .on('change', async (filePath) =>\n      processEvent(async () => {\n        if (configurationFilePath && filePath === configurationFilePath) {\n          appLogger('Configuration file changed, repreparing Intlayer');\n\n          clearModuleCache(configurationFilePath);\n          clearAllCache();\n\n          const { configuration: newConfiguration } =\n            getConfigurationAndFilePath(options?.configOptions);\n\n          configuration = options?.configuration ?? newConfiguration;\n\n          await prepareIntlayer(configuration, { clean: false });\n        } else {\n          // Clear module cache for the changed file to avoid stale require() results\n          clearModuleCache(filePath);\n          // Evict in-memory caches so loadContentDeclaration picks up fresh content\n          clearAllCache();\n          clearDiskCacheMemory();\n          await handleContentDeclarationFileChange(filePath, configuration);\n        }\n      })\n    )\n    .on('unlink', async (filePath) => {\n      // Delay unlink processing to see if an 'add' event occurs (indicating a move)\n      const timer = setTimeout(async () => {\n        // If timer fires, the file was genuinely removed\n        pendingUnlinks.delete(filePath);\n        processEvent(async () =>\n          handleUnlinkedContentDeclarationFile(filePath, configuration)\n        );\n      }, 200); // 200ms window to catch the 'add' event\n\n      pendingUnlinks.set(filePath, { timer, oldPath: filePath });\n    })\n    .on('error', async (error) => {\n      appLogger(`Watcher error: ${error}`, {\n        level: 'error',\n      });\n\n      appLogger('Restarting watcher');\n\n      await prepareIntlayer(configuration);\n    });\n};\n\nexport const buildAndWatchIntlayer = async (options?: WatchOptions) => {\n  const { skipPrepare, ...rest } = options ?? {};\n  const configuration =\n    options?.configuration ?? getConfiguration(options?.configOptions);\n\n  if (!skipPrepare) {\n    await prepareIntlayer(configuration, { forceRun: true });\n  }\n\n  if (configuration.content.watch || options?.persistent) {\n    await watch({ ...rest, configuration });\n  }\n};\n"],"mappings":"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"}
+{"version":3,"file":"watcher.cjs","names":["existsSync","ANSIColor","prepareIntlayer","formatPath","handleContentDeclarationFileMoved","writeContentDeclaration","handleAdditionalContentDeclarationFile","handleContentDeclarationFileChange","handleUnlinkedContentDeclarationFile"],"sources":["../../src/watcher.ts"],"sourcesContent":["import { existsSync } from 'node:fs';\nimport { readFile } from 'node:fs/promises';\nimport { basename, dirname } from 'node:path';\nimport { pathToFileURL } from 'node:url';\nimport * as ANSIColor from '@intlayer/config/colors';\nimport { colorize, getAppLogger } from '@intlayer/config/logger';\nimport {\n  type GetConfigurationOptions,\n  getConfiguration,\n  getConfigurationAndFilePath,\n} from '@intlayer/config/node';\nimport {\n  clearAllCache,\n  clearDiskCacheMemory,\n  clearModuleCache,\n  normalizePath,\n} from '@intlayer/config/utils';\nimport type { IntlayerConfig } from '@intlayer/types/config';\nimport type { ChokidarOptions } from 'chokidar';\nimport { handleAdditionalContentDeclarationFile } from './handleAdditionalContentDeclarationFile';\nimport { handleContentDeclarationFileChange } from './handleContentDeclarationFileChange';\nimport { handleContentDeclarationFileMoved } from './handleContentDeclarationFileMoved';\nimport { handleUnlinkedContentDeclarationFile } from './handleUnlinkedContentDeclarationFile';\nimport { prepareIntlayer } from './prepareIntlayer';\nimport { formatPath } from './utils';\nimport { writeContentDeclaration } from './writeContentDeclaration';\n\n// Map to track files that were recently unlinked: oldPath -> { timer, timestamp }\nconst pendingUnlinks = new Map<\n  string,\n  { timer: NodeJS.Timeout; oldPath: string }\n>();\n\n// Array-based sequential task queue — no Promise chain accumulation, no race conditions\nconst taskQueue: (() => Promise<void>)[] = [];\nlet isProcessing = false;\n\nconst processQueue = async () => {\n  if (isProcessing) return;\n  isProcessing = true;\n  while (taskQueue.length > 0) {\n    const task = taskQueue.shift()!;\n    try {\n      await task();\n    } catch (error) {\n      console.error(error);\n    }\n  }\n  isProcessing = false;\n};\n\nconst processEvent = (task: () => Promise<void>) => {\n  taskQueue.push(task);\n  processQueue();\n};\n\ntype WatchOptions = ChokidarOptions & {\n  configuration?: IntlayerConfig;\n  configOptions?: GetConfigurationOptions;\n  skipPrepare?: boolean;\n};\n\n// Initialize chokidar watcher (non-persistent)\nexport const watch = async (options?: WatchOptions) => {\n  const { watch: chokidarWatch } = await import('chokidar');\n  const configResult = getConfigurationAndFilePath(options?.configOptions);\n  const configurationFilePath = configResult.configurationFilePath;\n  let configuration: IntlayerConfig =\n    options?.configuration ?? configResult.configuration;\n  const appLogger = getAppLogger(configuration);\n\n  const {\n    watch: isWatchMode,\n    fileExtensions,\n    contentDir,\n    excludedPath,\n  } = configuration.content;\n\n  // chokidar v5 dropped glob support — use fs to resolve dirs, filter extensions via ignored\n  const pathsToWatch = [\n    ...contentDir.map((dir) => normalizePath(dir)).filter(existsSync),\n    ...(configurationFilePath ? [configurationFilePath] : []),\n  ];\n\n  if (!configuration.content.watch) return;\n\n  appLogger('Watching Intlayer content declarations');\n\n  if (configuration.build.optimize === true) {\n    appLogger(\n      [\n        `Build optimization is forced to ${colorize('true', ANSIColor.GREY)}, but watching is enabled too.`,\n        'It may lead to dev mode performance degradation as well as import errors.',\n        'Its recommended to keep the',\n        colorize('`build.optimized`', ANSIColor.BLUE),\n        'option',\n        colorize('undefined', ANSIColor.GREY),\n        'to get the best dev mode experience',\n      ],\n      {\n        level: 'warn',\n      }\n    );\n  }\n\n  // Strip glob markers from excludedPath entries to get plain segments (e.g. 'node_modules')\n  const excludedSegments = excludedPath.map((segment) =>\n    segment.replace(/^\\*\\*\\//, '').replace(/\\/\\*\\*$/, '')\n  );\n\n  const normalizedConfigPath = configurationFilePath\n    ? normalizePath(configurationFilePath)\n    : null;\n\n  const { mainDir, baseDir } = configuration.system;\n  const normalizedIntlayerDir = normalizePath(dirname(mainDir));\n\n  // Watch mainDir to detect broken or missing entry point files\n  if (existsSync(mainDir)) {\n    chokidarWatch(mainDir, {\n      persistent: isWatchMode,\n      ignoreInitial: true,\n      depth: 0,\n    })\n      .on('change', async (filePath) => {\n        if (isProcessing) return;\n\n        processEvent(async () => {\n          clearModuleCache(filePath);\n          try {\n            // Convert absolute path to a valid file:// URL\n            const fileUrl = pathToFileURL(filePath).href;\n\n            // Append a timestamp to bypass the ESM cache\n            await import(`${fileUrl}?update=${Date.now()}`);\n          } catch {\n            appLogger(\n              `Entry point ${basename(filePath)} failed to load, running clean rebuild...`,\n              { level: 'warn' }\n            );\n            await prepareIntlayer(configuration, {\n              clean: true,\n              forceRun: true,\n            });\n          }\n        });\n      })\n      .on('unlink', async (filePath) => {\n        if (isProcessing) return;\n\n        processEvent(async () => {\n          appLogger(\n            [\n              'Entry point',\n              formatPath(basename(filePath)),\n              'was removed, running clean rebuild...',\n            ],\n            { level: 'warn' }\n          );\n          await prepareIntlayer(configuration, { clean: true, forceRun: true });\n        });\n      });\n  }\n\n  // Watch baseDir at depth 0 to detect the entire .intlayer folder being removed\n  chokidarWatch(baseDir, {\n    persistent: isWatchMode,\n    ignoreInitial: true,\n    depth: 0,\n    ignored: (filePath: string) => {\n      const path = normalizePath(filePath);\n      return path !== normalizePath(baseDir) && path !== normalizedIntlayerDir;\n    },\n  }).on('unlinkDir', async (dirPath) => {\n    if (isProcessing) return;\n\n    if (normalizePath(dirPath) === normalizedIntlayerDir) {\n      appLogger([\n        formatPath('.intlayer'),\n        'directory removed, running clean rebuild...',\n      ]);\n\n      processEvent(() =>\n        prepareIntlayer(configuration, { clean: true, forceRun: true })\n      );\n    }\n  });\n\n  return chokidarWatch(pathsToWatch, {\n    persistent: isWatchMode, // Make the watcher persistent\n    ignoreInitial: true, // Process existing files\n    awaitWriteFinish: {\n      stabilityThreshold: 1000,\n      pollInterval: 100,\n    },\n    ignored: (filePath: string, stats?: import('node:fs').Stats) => {\n      const path = normalizePath(filePath);\n\n      if (normalizedConfigPath && path === normalizedConfigPath) return false;\n\n      if (excludedSegments.some((segment) => path.includes(`/${segment}`)))\n        return true;\n\n      if (stats?.isFile()) {\n        return !fileExtensions.some((extension) => path.endsWith(extension));\n      }\n\n      return false;\n    },\n    ...options,\n  })\n    .on('add', async (filePath) => {\n      const fileName = basename(filePath);\n      let isMove = false;\n\n      // Check if this Add corresponds to a pending Unlink (Move/Rename detection)\n      // Heuristic:\n      // - Priority A: Exact basename match (Moved to different folder)\n      // - Priority B: Single entry in pendingUnlinks (Renamed file)\n      let matchedOldPath: string | undefined;\n\n      // Search for basename match\n      for (const [oldPath] of pendingUnlinks) {\n        if (basename(oldPath) === fileName) {\n          matchedOldPath = oldPath;\n          break;\n        }\n      }\n\n      // If no basename match, but exactly one file was recently unlinked, assume it's a rename\n      if (!matchedOldPath && pendingUnlinks.size === 1) {\n        matchedOldPath = pendingUnlinks.keys().next().value;\n      }\n\n      if (matchedOldPath) {\n        // It is a move! Cancel the unlink handler\n        const pending = pendingUnlinks.get(matchedOldPath);\n        if (pending) {\n          clearTimeout(pending.timer);\n          pendingUnlinks.delete(matchedOldPath);\n        }\n\n        isMove = true;\n        appLogger(`File moved from ${matchedOldPath} to ${filePath}`);\n      }\n\n      processEvent(async () => {\n        if (isMove && matchedOldPath) {\n          await handleContentDeclarationFileMoved(\n            matchedOldPath,\n            filePath,\n            configuration\n          );\n        } else {\n          const fileContent = await readFile(filePath, 'utf-8');\n          const isEmpty = fileContent === '';\n\n          // Fill template content declaration file if it is empty\n          if (isEmpty) {\n            const extensionPattern = fileExtensions\n              .map((ext) => ext.replace(/\\./g, '\\\\.'))\n              .join('|');\n            const name = fileName.replace(\n              new RegExp(`(${extensionPattern})$`),\n              ''\n            );\n\n            await writeContentDeclaration(\n              {\n                key: name,\n                content: {},\n                filePath,\n              },\n              configuration\n            );\n          }\n\n          await handleAdditionalContentDeclarationFile(filePath, configuration);\n        }\n      });\n    })\n    .on('change', async (filePath) =>\n      processEvent(async () => {\n        if (configurationFilePath && filePath === configurationFilePath) {\n          appLogger('Configuration file changed, repreparing Intlayer');\n\n          clearModuleCache(configurationFilePath);\n          clearAllCache();\n\n          const { configuration: newConfiguration } =\n            getConfigurationAndFilePath(options?.configOptions);\n\n          configuration = options?.configuration ?? newConfiguration;\n\n          await prepareIntlayer(configuration, { clean: false });\n        } else {\n          // Clear module cache for the changed file to avoid stale require() results\n          clearModuleCache(filePath);\n          // Evict in-memory caches so loadContentDeclaration picks up fresh content\n          clearAllCache();\n          clearDiskCacheMemory();\n          await handleContentDeclarationFileChange(filePath, configuration);\n        }\n      })\n    )\n    .on('unlink', async (filePath) => {\n      // Delay unlink processing to see if an 'add' event occurs (indicating a move)\n      const timer = setTimeout(async () => {\n        // If timer fires, the file was genuinely removed\n        pendingUnlinks.delete(filePath);\n        processEvent(async () =>\n          handleUnlinkedContentDeclarationFile(filePath, configuration)\n        );\n      }, 200); // 200ms window to catch the 'add' event\n\n      pendingUnlinks.set(filePath, { timer, oldPath: filePath });\n    })\n    .on('error', async (error) => {\n      appLogger(`Watcher error: ${error}`, {\n        level: 'error',\n      });\n\n      appLogger('Restarting watcher');\n\n      await prepareIntlayer(configuration);\n    });\n};\n\nexport const buildAndWatchIntlayer = async (options?: WatchOptions) => {\n  const { skipPrepare, ...rest } = options ?? {};\n  const configuration =\n    options?.configuration ?? getConfiguration(options?.configOptions);\n\n  if (!skipPrepare) {\n    await prepareIntlayer(configuration, { forceRun: true });\n  }\n\n  if (configuration.content.watch || options?.persistent) {\n    await watch({ ...rest, configuration });\n  }\n};\n"],"mappings":"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"}

package/dist/esm/createType/createModuleAugmentation.mjs

@@ -4,7 +4,6 @@ import { mkdir } from "node:fs/promises";
 import { basename, extname, join, relative } from "node:path";
 import fg from "fast-glob";
 import { kebabCaseToCamelCase, normalizePath } from "@intlayer/config/utils";
-import { createAuxiliaryTypeStore, printNode, zodToTs } from "zod-to-ts";
 
 //#region src/createType/createModuleAugmentation.ts
 const getTypeName = (key) => `${kebabCaseToCamelCase(key)}Content`;
@@ -51,7 +50,7 @@ const zodToTsString = (schema) => {
 	}
 };
 /** Generate the content of the module augmentation file */
-const generateTypeIndexContent = (typeFiles, configuration) => {
+const generateTypeIndexContent = (typeFiles, configuration, zodToTsFns) => {
 	const { internationalization, system, editor } = configuration;
 	const { moduleAugmentationDir } = system;
 	const { enabled } = editor;
@@ -73,9 +72,11 @@ const generateTypeIndexContent = (typeFiles, configuration) => {
 	const formattedSchemas = Object.entries(schemas).map(([key, schema]) => {
 		let typeStr = "any";
 		if (schema) try {
-			const { node } = zodToTs(schema, { auxiliaryTypeStore: createAuxiliaryTypeStore() });
-			if (node.kind !== 133) typeStr = printNode(node);
-			else typeStr = zodToTsString(schema);
+			if (zodToTsFns) {
+				const { node } = zodToTsFns.zodToTs(schema, { auxiliaryTypeStore: zodToTsFns.createAuxiliaryTypeStore() });
+				if (node.kind !== 133) typeStr = zodToTsFns.printNode(node);
+				else typeStr = zodToTsString(schema);
+			} else typeStr = zodToTsString(schema);
 		} catch (_e) {
 			typeStr = zodToTsString(schema);
 		}
@@ -100,7 +101,17 @@ const generateTypeIndexContent = (typeFiles, configuration) => {
 const createModuleAugmentation = async (configuration) => {
 	const { moduleAugmentationDir, typesDir } = configuration.system;
 	await mkdir(moduleAugmentationDir, { recursive: true });
-	const tsContent = generateTypeIndexContent(await fg(normalizePath(`${typesDir}/*.ts`), { ignore: ["**/*.d.ts"] }), configuration);
+	const dictionariesTypesDefinitions = await fg(normalizePath(`${typesDir}/*.ts`), { ignore: ["**/*.d.ts"] });
+	let zodToTsFns = null;
+	try {
+		const mod = await import("zod-to-ts");
+		zodToTsFns = {
+			zodToTs: mod.zodToTs,
+			printNode: mod.printNode,
+			createAuxiliaryTypeStore: mod.createAuxiliaryTypeStore
+		};
+	} catch {}
+	const tsContent = generateTypeIndexContent(dictionariesTypesDefinitions, configuration, zodToTsFns);
 	await writeFileIfChanged(join(moduleAugmentationDir, "intlayer.d.ts"), tsContent);
 };
 

package/dist/esm/createType/createModuleAugmentation.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"createModuleAugmentation.mjs","names":[],"sources":["../../../src/createType/createModuleAugmentation.ts"],"sourcesContent":["import { mkdir } from 'node:fs/promises';\nimport { basename, extname, join, relative } from 'node:path';\nimport { kebabCaseToCamelCase, normalizePath } from '@intlayer/config/utils';\nimport type { Locale } from '@intlayer/types/allLocales';\nimport type { IntlayerConfig } from '@intlayer/types/config';\nimport fg from 'fast-glob';\nimport { createAuxiliaryTypeStore, printNode, zodToTs } from 'zod-to-ts';\nimport { getPathHash } from '../utils';\nimport { writeFileIfChanged } from '../writeFileIfChanged';\n\nexport const getTypeName = (key: string): string =>\n  `${kebabCaseToCamelCase(key)}Content`;\n\n/** Returns lines like: [Locales.FRENCH]: 1; */\nconst formatLocales = (locales: Locale[]) =>\n  locales.map((locale) => `    \"${locale}\": 1;`).join('\\n');\n\nconst zodToTsString = (schema: any): string => {\n  if (!schema) return 'any';\n\n  // Support both real Zod objects (_def) and serialized versions (def or nested)\n  const def = schema._def ?? schema.def ?? schema;\n\n  // Handle serialized type names (sometimes 'type' instead of 'typeName')\n  const typeName = def.typeName ?? def.type;\n\n  switch (typeName) {\n    case 'ZodString':\n    case 'string':\n      return 'string';\n    case 'ZodNumber':\n    case 'number':\n      return 'number';\n    case 'ZodBoolean':\n    case 'boolean':\n      return 'boolean';\n    case 'ZodNull':\n    case 'null':\n      return 'null';\n    case 'ZodUndefined':\n    case 'undefined':\n      return 'undefined';\n    case 'ZodArray':\n    case 'array':\n      return `${zodToTsString(def.type ?? def.element)}[]`;\n    case 'ZodObject':\n    case 'object': {\n      const shape = typeof def.shape === 'function' ? def.shape() : def.shape;\n      if (!shape) return 'Record<string, any>';\n\n      const entries = Object.entries(shape)\n        .map(([k, v]) => `      \"${k}\": ${zodToTsString(v)};`)\n        .join('\\n');\n      return `{\\n${entries}\\n    }`;\n    }\n    case 'ZodOptional':\n    case 'optional':\n      return `${zodToTsString(def.innerType ?? def.wrapped)} | undefined`;\n    case 'ZodNullable':\n    case 'nullable':\n      return `${zodToTsString(def.innerType ?? def.wrapped)} | null`;\n    case 'ZodUnion':\n    case 'union': {\n      const options = def.options ?? [];\n      return options.map(zodToTsString).join(' | ');\n    }\n    case 'ZodIntersection':\n    case 'intersection':\n      return `${zodToTsString(def.left)} & ${zodToTsString(def.right)}`;\n    case 'ZodEnum':\n    case 'enum': {\n      const values = def.values ?? [];\n      return values.map((v: string) => `\"${v}\"`).join(' | ');\n    }\n    case 'ZodLiteral':\n    case 'literal': {\n      const value = def.value;\n      return typeof value === 'string' ? `\"${value}\"` : String(value);\n    }\n    default:\n      return 'any';\n  }\n};\n\n/** Generate the content of the module augmentation file */\nconst generateTypeIndexContent = (\n  typeFiles: string[],\n  configuration: IntlayerConfig\n): string => {\n  const { internationalization, system, editor } = configuration;\n  const { moduleAugmentationDir } = system;\n  const { enabled } = editor;\n  const { locales, requiredLocales, strictMode } = internationalization;\n\n  let fileContent = 'import \"intlayer\";\\n';\n\n  // Build dictionary refs\n  const dictionariesRef = typeFiles.map((dictionaryPath) => ({\n    relativePath: `./${relative(moduleAugmentationDir, dictionaryPath)}`,\n    id: basename(dictionaryPath, extname(dictionaryPath)),\n    hash: `_${getPathHash(dictionaryPath)}`,\n  }));\n\n  // Import all dictionaries\n  for (const dictionary of dictionariesRef) {\n    fileContent += `import ${dictionary.hash} from '${dictionary.relativePath}';\\n`;\n  }\n  fileContent += '\\n';\n\n  // Dictionary map entries (id: typeof <hash>)\n  const formattedDictionaryMap: string = dictionariesRef\n    .map((dictionary) => `    \"${dictionary.id}\": typeof ${dictionary.hash};`)\n    .join('\\n');\n\n  // Ensure required ⊆ declared; if empty, default required = declared\n  const declared = locales;\n  const requiredSanitized = requiredLocales?.length\n    ? requiredLocales.filter((requiredLocales) =>\n        declared.includes(requiredLocales)\n      )\n    : declared;\n\n  const formattedDeclaredLocales = formatLocales(declared);\n  const formattedRequiredLocales = formatLocales(requiredSanitized);\n\n  // Build schema registry\n  const schemas = configuration.schemas ?? {};\n  const formattedSchemas = Object.entries(schemas)\n    .map(([key, schema]) => {\n      let typeStr = 'any';\n\n      if (schema) {\n        try {\n          const { node } = zodToTs(schema, {\n            auxiliaryTypeStore: createAuxiliaryTypeStore(),\n          });\n          // 133 is the kind for AnyKeyword in TypeScript\n          if ((node as any).kind !== 133) {\n            typeStr = printNode(node);\n          } else {\n            // Fallback to custom string generator if zodToTs returns any\n            typeStr = zodToTsString(schema);\n          }\n        } catch (_e) {\n          // Fallback to custom string generator\n          typeStr = zodToTsString(schema);\n        }\n      }\n      return `    \"${key}\": ${typeStr};`;\n    })\n    .join('\\n');\n\n  // Choose strict mode registry key\n  const strictKey =\n    strictMode === 'strict'\n      ? 'strict'\n      : strictMode === 'inclusive'\n        ? 'inclusive'\n        : 'loose';\n\n  /**\n   * Module augmentation that ONLY adds keys to registries.\n   * No types/aliases redefined here—avoids merge conflicts.\n   */\n  fileContent += `declare module 'intlayer' {\\n`;\n  // Dictionaries registry\n  fileContent += `  interface __DictionaryRegistry {\\n${formattedDictionaryMap}\\n  }\\n\\n`;\n  // Locales registries\n  fileContent += `  interface __DeclaredLocalesRegistry {\\n${formattedDeclaredLocales}\\n  }\\n\\n`;\n  fileContent += `  interface __RequiredLocalesRegistry {\\n${formattedRequiredLocales}\\n  }\\n\\n`;\n  // Schema registry\n  fileContent += `  interface __SchemaRegistry {\\n${formattedSchemas}\\n  }\\n\\n`;\n  // Resolved strict mode (narrow the literal at build time)\n  fileContent += `  interface __StrictModeRegistry { mode: '${strictKey}' }\\n\\n`;\n  // Editor registry\n  fileContent += `  interface __EditorRegistry { enabled : ${enabled} } \\n`;\n  fileContent += `}\\n`;\n\n  return fileContent;\n};\n\n/** Generate the index file merging all the types */\nexport const createModuleAugmentation = async (\n  configuration: IntlayerConfig\n) => {\n  const { moduleAugmentationDir, typesDir } = configuration.system;\n\n  await mkdir(moduleAugmentationDir, { recursive: true });\n\n  const dictionariesTypesDefinitions: string[] = await fg(\n    normalizePath(`${typesDir}/*.ts`),\n    { ignore: ['**/*.d.ts'] }\n  );\n\n  const tsContent = generateTypeIndexContent(\n    dictionariesTypesDefinitions,\n    configuration\n  );\n\n  const tsFilePath = join(moduleAugmentationDir, 'intlayer.d.ts');\n  await writeFileIfChanged(tsFilePath, tsContent);\n};\n"],"mappings":"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"}
+{"version":3,"file":"createModuleAugmentation.mjs","names":[],"sources":["../../../src/createType/createModuleAugmentation.ts"],"sourcesContent":["import { mkdir } from 'node:fs/promises';\nimport { basename, extname, join, relative } from 'node:path';\nimport { kebabCaseToCamelCase, normalizePath } from '@intlayer/config/utils';\nimport type { Locale } from '@intlayer/types/allLocales';\nimport type { IntlayerConfig } from '@intlayer/types/config';\nimport fg from 'fast-glob';\nimport { getPathHash } from '../utils';\nimport { writeFileIfChanged } from '../writeFileIfChanged';\n\nexport const getTypeName = (key: string): string =>\n  `${kebabCaseToCamelCase(key)}Content`;\n\n/** Returns lines like: [Locales.FRENCH]: 1; */\nconst formatLocales = (locales: Locale[]) =>\n  locales.map((locale) => `    \"${locale}\": 1;`).join('\\n');\n\nconst zodToTsString = (schema: any): string => {\n  if (!schema) return 'any';\n\n  // Support both real Zod objects (_def) and serialized versions (def or nested)\n  const def = schema._def ?? schema.def ?? schema;\n\n  // Handle serialized type names (sometimes 'type' instead of 'typeName')\n  const typeName = def.typeName ?? def.type;\n\n  switch (typeName) {\n    case 'ZodString':\n    case 'string':\n      return 'string';\n    case 'ZodNumber':\n    case 'number':\n      return 'number';\n    case 'ZodBoolean':\n    case 'boolean':\n      return 'boolean';\n    case 'ZodNull':\n    case 'null':\n      return 'null';\n    case 'ZodUndefined':\n    case 'undefined':\n      return 'undefined';\n    case 'ZodArray':\n    case 'array':\n      return `${zodToTsString(def.type ?? def.element)}[]`;\n    case 'ZodObject':\n    case 'object': {\n      const shape = typeof def.shape === 'function' ? def.shape() : def.shape;\n      if (!shape) return 'Record<string, any>';\n\n      const entries = Object.entries(shape)\n        .map(([k, v]) => `      \"${k}\": ${zodToTsString(v)};`)\n        .join('\\n');\n      return `{\\n${entries}\\n    }`;\n    }\n    case 'ZodOptional':\n    case 'optional':\n      return `${zodToTsString(def.innerType ?? def.wrapped)} | undefined`;\n    case 'ZodNullable':\n    case 'nullable':\n      return `${zodToTsString(def.innerType ?? def.wrapped)} | null`;\n    case 'ZodUnion':\n    case 'union': {\n      const options = def.options ?? [];\n      return options.map(zodToTsString).join(' | ');\n    }\n    case 'ZodIntersection':\n    case 'intersection':\n      return `${zodToTsString(def.left)} & ${zodToTsString(def.right)}`;\n    case 'ZodEnum':\n    case 'enum': {\n      const values = def.values ?? [];\n      return values.map((v: string) => `\"${v}\"`).join(' | ');\n    }\n    case 'ZodLiteral':\n    case 'literal': {\n      const value = def.value;\n      return typeof value === 'string' ? `\"${value}\"` : String(value);\n    }\n    default:\n      return 'any';\n  }\n};\n\ntype ZodToTsFns = {\n  zodToTs: (schema: any, opts?: any) => { node: any };\n  printNode: (node: any) => string;\n  createAuxiliaryTypeStore: () => any;\n};\n\n/** Generate the content of the module augmentation file */\nconst generateTypeIndexContent = (\n  typeFiles: string[],\n  configuration: IntlayerConfig,\n  zodToTsFns: ZodToTsFns | null\n): string => {\n  const { internationalization, system, editor } = configuration;\n  const { moduleAugmentationDir } = system;\n  const { enabled } = editor;\n  const { locales, requiredLocales, strictMode } = internationalization;\n\n  let fileContent = 'import \"intlayer\";\\n';\n\n  // Build dictionary refs\n  const dictionariesRef = typeFiles.map((dictionaryPath) => ({\n    relativePath: `./${relative(moduleAugmentationDir, dictionaryPath)}`,\n    id: basename(dictionaryPath, extname(dictionaryPath)),\n    hash: `_${getPathHash(dictionaryPath)}`,\n  }));\n\n  // Import all dictionaries\n  for (const dictionary of dictionariesRef) {\n    fileContent += `import ${dictionary.hash} from '${dictionary.relativePath}';\\n`;\n  }\n  fileContent += '\\n';\n\n  // Dictionary map entries (id: typeof <hash>)\n  const formattedDictionaryMap: string = dictionariesRef\n    .map((dictionary) => `    \"${dictionary.id}\": typeof ${dictionary.hash};`)\n    .join('\\n');\n\n  // Ensure required ⊆ declared; if empty, default required = declared\n  const declared = locales;\n  const requiredSanitized = requiredLocales?.length\n    ? requiredLocales.filter((requiredLocales) =>\n        declared.includes(requiredLocales)\n      )\n    : declared;\n\n  const formattedDeclaredLocales = formatLocales(declared);\n  const formattedRequiredLocales = formatLocales(requiredSanitized);\n\n  // Build schema registry\n  const schemas = configuration.schemas ?? {};\n  const formattedSchemas = Object.entries(schemas)\n    .map(([key, schema]) => {\n      let typeStr = 'any';\n\n      if (schema) {\n        try {\n          if (zodToTsFns) {\n            const { node } = zodToTsFns.zodToTs(schema, {\n              auxiliaryTypeStore: zodToTsFns.createAuxiliaryTypeStore(),\n            });\n            // 133 is the kind for AnyKeyword in TypeScript\n            if ((node as any).kind !== 133) {\n              typeStr = zodToTsFns.printNode(node);\n            } else {\n              typeStr = zodToTsString(schema);\n            }\n          } else {\n            typeStr = zodToTsString(schema);\n          }\n        } catch (_e) {\n          // Fallback to custom string generator\n          typeStr = zodToTsString(schema);\n        }\n      }\n      return `    \"${key}\": ${typeStr};`;\n    })\n    .join('\\n');\n\n  // Choose strict mode registry key\n  const strictKey =\n    strictMode === 'strict'\n      ? 'strict'\n      : strictMode === 'inclusive'\n        ? 'inclusive'\n        : 'loose';\n\n  /**\n   * Module augmentation that ONLY adds keys to registries.\n   * No types/aliases redefined here—avoids merge conflicts.\n   */\n  fileContent += `declare module 'intlayer' {\\n`;\n  // Dictionaries registry\n  fileContent += `  interface __DictionaryRegistry {\\n${formattedDictionaryMap}\\n  }\\n\\n`;\n  // Locales registries\n  fileContent += `  interface __DeclaredLocalesRegistry {\\n${formattedDeclaredLocales}\\n  }\\n\\n`;\n  fileContent += `  interface __RequiredLocalesRegistry {\\n${formattedRequiredLocales}\\n  }\\n\\n`;\n  // Schema registry\n  fileContent += `  interface __SchemaRegistry {\\n${formattedSchemas}\\n  }\\n\\n`;\n  // Resolved strict mode (narrow the literal at build time)\n  fileContent += `  interface __StrictModeRegistry { mode: '${strictKey}' }\\n\\n`;\n  // Editor registry\n  fileContent += `  interface __EditorRegistry { enabled : ${enabled} } \\n`;\n  fileContent += `}\\n`;\n\n  return fileContent;\n};\n\n/** Generate the index file merging all the types */\nexport const createModuleAugmentation = async (\n  configuration: IntlayerConfig\n) => {\n  const { moduleAugmentationDir, typesDir } = configuration.system;\n\n  await mkdir(moduleAugmentationDir, { recursive: true });\n\n  const dictionariesTypesDefinitions: string[] = await fg(\n    normalizePath(`${typesDir}/*.ts`),\n    { ignore: ['**/*.d.ts'] }\n  );\n\n  let zodToTsFns: ZodToTsFns | null = null;\n  try {\n    const mod = await import('zod-to-ts');\n    zodToTsFns = {\n      zodToTs: mod.zodToTs,\n      printNode: mod.printNode,\n      createAuxiliaryTypeStore: mod.createAuxiliaryTypeStore,\n    };\n  } catch {\n    // typescript peer dep not installed (plain JS project), use fallback\n  }\n\n  const tsContent = generateTypeIndexContent(\n    dictionariesTypesDefinitions,\n    configuration,\n    zodToTsFns\n  );\n\n  const tsFilePath = join(moduleAugmentationDir, 'intlayer.d.ts');\n  await writeFileIfChanged(tsFilePath, tsContent);\n};\n"],"mappings":"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"}

package/dist/esm/watcher.mjs

@@ -1,3 +1,4 @@
+import { formatPath } from "./utils/formatter.mjs";
 import { handleContentDeclarationFileChange } from "./handleContentDeclarationFileChange.mjs";
 import { handleContentDeclarationFileMoved } from "./handleContentDeclarationFileMoved.mjs";
 import { handleAdditionalContentDeclarationFile } from "./handleAdditionalContentDeclarationFile.mjs";
@@ -5,12 +6,13 @@ import { handleUnlinkedContentDeclarationFile } from "./handleUnlinkedContentDec
 import { prepareIntlayer } from "./prepareIntlayer.mjs";
 import { writeContentDeclaration } from "./writeContentDeclaration/writeContentDeclaration.mjs";
 import { readFile } from "node:fs/promises";
-import { basename } from "node:path";
+import { basename, dirname } from "node:path";
 import { colorize, getAppLogger } from "@intlayer/config/logger";
 import { getConfiguration, getConfigurationAndFilePath } from "@intlayer/config/node";
 import { existsSync } from "node:fs";
 import { clearAllCache, clearDiskCacheMemory, clearModuleCache, normalizePath } from "@intlayer/config/utils";
 import * as ANSIColor from "@intlayer/config/colors";
+import { pathToFileURL } from "node:url";
 
 //#region src/watcher.ts
 const pendingUnlinks = /* @__PURE__ */ new Map();
@@ -54,6 +56,58 @@ const watch = async (options) => {
 	], { level: "warn" });
 	const excludedSegments = excludedPath.map((segment) => segment.replace(/^\*\*\//, "").replace(/\/\*\*$/, ""));
 	const normalizedConfigPath = configurationFilePath ? normalizePath(configurationFilePath) : null;
+	const { mainDir, baseDir } = configuration.system;
+	const normalizedIntlayerDir = normalizePath(dirname(mainDir));
+	if (existsSync(mainDir)) chokidarWatch(mainDir, {
+		persistent: isWatchMode,
+		ignoreInitial: true,
+		depth: 0
+	}).on("change", async (filePath) => {
+		if (isProcessing) return;
+		processEvent(async () => {
+			clearModuleCache(filePath);
+			try {
+				await import(`${pathToFileURL(filePath).href}?update=${Date.now()}`);
+			} catch {
+				appLogger(`Entry point ${basename(filePath)} failed to load, running clean rebuild...`, { level: "warn" });
+				await prepareIntlayer(configuration, {
+					clean: true,
+					forceRun: true
+				});
+			}
+		});
+	}).on("unlink", async (filePath) => {
+		if (isProcessing) return;
+		processEvent(async () => {
+			appLogger([
+				"Entry point",
+				formatPath(basename(filePath)),
+				"was removed, running clean rebuild..."
+			], { level: "warn" });
+			await prepareIntlayer(configuration, {
+				clean: true,
+				forceRun: true
+			});
+		});
+	});
+	chokidarWatch(baseDir, {
+		persistent: isWatchMode,
+		ignoreInitial: true,
+		depth: 0,
+		ignored: (filePath) => {
+			const path = normalizePath(filePath);
+			return path !== normalizePath(baseDir) && path !== normalizedIntlayerDir;
+		}
+	}).on("unlinkDir", async (dirPath) => {
+		if (isProcessing) return;
+		if (normalizePath(dirPath) === normalizedIntlayerDir) {
+			appLogger([formatPath(".intlayer"), "directory removed, running clean rebuild..."]);
+			processEvent(() => prepareIntlayer(configuration, {
+				clean: true,
+				forceRun: true
+			}));
+		}
+	});
 	return chokidarWatch(pathsToWatch, {
 		persistent: isWatchMode,
 		ignoreInitial: true,

package/dist/esm/watcher.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.mjs","names":[],"sources":["../../src/watcher.ts"],"sourcesContent":["import { existsSync } from 'node:fs';\nimport { readFile } from 'node:fs/promises';\nimport { basename } from 'node:path';\nimport * as ANSIColor from '@intlayer/config/colors';\nimport { colorize, getAppLogger } from '@intlayer/config/logger';\nimport {\n  type GetConfigurationOptions,\n  getConfiguration,\n  getConfigurationAndFilePath,\n} from '@intlayer/config/node';\nimport {\n  clearAllCache,\n  clearDiskCacheMemory,\n  clearModuleCache,\n  normalizePath,\n} from '@intlayer/config/utils';\nimport type { IntlayerConfig } from '@intlayer/types/config';\nimport type { ChokidarOptions } from 'chokidar';\nimport { handleAdditionalContentDeclarationFile } from './handleAdditionalContentDeclarationFile';\nimport { handleContentDeclarationFileChange } from './handleContentDeclarationFileChange';\nimport { handleContentDeclarationFileMoved } from './handleContentDeclarationFileMoved';\nimport { handleUnlinkedContentDeclarationFile } from './handleUnlinkedContentDeclarationFile';\nimport { prepareIntlayer } from './prepareIntlayer';\nimport { writeContentDeclaration } from './writeContentDeclaration';\n\n// Map to track files that were recently unlinked: oldPath -> { timer, timestamp }\nconst pendingUnlinks = new Map<\n  string,\n  { timer: NodeJS.Timeout; oldPath: string }\n>();\n\n// Array-based sequential task queue — no Promise chain accumulation, no race conditions\nconst taskQueue: (() => Promise<void>)[] = [];\nlet isProcessing = false;\n\nconst processQueue = async () => {\n  if (isProcessing) return;\n  isProcessing = true;\n  while (taskQueue.length > 0) {\n    const task = taskQueue.shift()!;\n    try {\n      await task();\n    } catch (error) {\n      console.error(error);\n    }\n  }\n  isProcessing = false;\n};\n\nconst processEvent = (task: () => Promise<void>) => {\n  taskQueue.push(task);\n  processQueue();\n};\n\ntype WatchOptions = ChokidarOptions & {\n  configuration?: IntlayerConfig;\n  configOptions?: GetConfigurationOptions;\n  skipPrepare?: boolean;\n};\n\n// Initialize chokidar watcher (non-persistent)\nexport const watch = async (options?: WatchOptions) => {\n  const { watch: chokidarWatch } = await import('chokidar');\n  const configResult = getConfigurationAndFilePath(options?.configOptions);\n  const configurationFilePath = configResult.configurationFilePath;\n  let configuration: IntlayerConfig =\n    options?.configuration ?? configResult.configuration;\n  const appLogger = getAppLogger(configuration);\n\n  const {\n    watch: isWatchMode,\n    fileExtensions,\n    contentDir,\n    excludedPath,\n  } = configuration.content;\n\n  // chokidar v5 dropped glob support — use fs to resolve dirs, filter extensions via ignored\n  const pathsToWatch = [\n    ...contentDir.map((dir) => normalizePath(dir)).filter(existsSync),\n    ...(configurationFilePath ? [configurationFilePath] : []),\n  ];\n\n  if (!configuration.content.watch) return;\n\n  appLogger('Watching Intlayer content declarations');\n\n  if (configuration.build.optimize === true) {\n    appLogger(\n      [\n        `Build optimization is forced to ${colorize('true', ANSIColor.GREY)}, but watching is enabled too.`,\n        'It may lead to dev mode performance degradation as well as import errors.',\n        'Its recommended to keep the',\n        colorize('`build.optimized`', ANSIColor.BLUE),\n        'option',\n        colorize('undefined', ANSIColor.GREY),\n        'to get the best dev mode experience',\n      ],\n      {\n        level: 'warn',\n      }\n    );\n  }\n\n  // Strip glob markers from excludedPath entries to get plain segments (e.g. 'node_modules')\n  const excludedSegments = excludedPath.map((segment) =>\n    segment.replace(/^\\*\\*\\//, '').replace(/\\/\\*\\*$/, '')\n  );\n\n  const normalizedConfigPath = configurationFilePath\n    ? normalizePath(configurationFilePath)\n    : null;\n\n  return chokidarWatch(pathsToWatch, {\n    persistent: isWatchMode, // Make the watcher persistent\n    ignoreInitial: true, // Process existing files\n    awaitWriteFinish: {\n      stabilityThreshold: 1000,\n      pollInterval: 100,\n    },\n    ignored: (filePath: string, stats?: import('node:fs').Stats) => {\n      const path = normalizePath(filePath);\n\n      if (normalizedConfigPath && path === normalizedConfigPath) return false;\n\n      if (excludedSegments.some((segment) => path.includes(`/${segment}`)))\n        return true;\n\n      if (stats?.isFile()) {\n        return !fileExtensions.some((extension) => path.endsWith(extension));\n      }\n\n      return false;\n    },\n    ...options,\n  })\n    .on('add', async (filePath) => {\n      const fileName = basename(filePath);\n      let isMove = false;\n\n      // Check if this Add corresponds to a pending Unlink (Move/Rename detection)\n      // Heuristic:\n      // - Priority A: Exact basename match (Moved to different folder)\n      // - Priority B: Single entry in pendingUnlinks (Renamed file)\n      let matchedOldPath: string | undefined;\n\n      // Search for basename match\n      for (const [oldPath] of pendingUnlinks) {\n        if (basename(oldPath) === fileName) {\n          matchedOldPath = oldPath;\n          break;\n        }\n      }\n\n      // If no basename match, but exactly one file was recently unlinked, assume it's a rename\n      if (!matchedOldPath && pendingUnlinks.size === 1) {\n        matchedOldPath = pendingUnlinks.keys().next().value;\n      }\n\n      if (matchedOldPath) {\n        // It is a move! Cancel the unlink handler\n        const pending = pendingUnlinks.get(matchedOldPath);\n        if (pending) {\n          clearTimeout(pending.timer);\n          pendingUnlinks.delete(matchedOldPath);\n        }\n\n        isMove = true;\n        appLogger(`File moved from ${matchedOldPath} to ${filePath}`);\n      }\n\n      processEvent(async () => {\n        if (isMove && matchedOldPath) {\n          await handleContentDeclarationFileMoved(\n            matchedOldPath,\n            filePath,\n            configuration\n          );\n        } else {\n          const fileContent = await readFile(filePath, 'utf-8');\n          const isEmpty = fileContent === '';\n\n          // Fill template content declaration file if it is empty\n          if (isEmpty) {\n            const extensionPattern = fileExtensions\n              .map((ext) => ext.replace(/\\./g, '\\\\.'))\n              .join('|');\n            const name = fileName.replace(\n              new RegExp(`(${extensionPattern})$`),\n              ''\n            );\n\n            await writeContentDeclaration(\n              {\n                key: name,\n                content: {},\n                filePath,\n              },\n              configuration\n            );\n          }\n\n          await handleAdditionalContentDeclarationFile(filePath, configuration);\n        }\n      });\n    })\n    .on('change', async (filePath) =>\n      processEvent(async () => {\n        if (configurationFilePath && filePath === configurationFilePath) {\n          appLogger('Configuration file changed, repreparing Intlayer');\n\n          clearModuleCache(configurationFilePath);\n          clearAllCache();\n\n          const { configuration: newConfiguration } =\n            getConfigurationAndFilePath(options?.configOptions);\n\n          configuration = options?.configuration ?? newConfiguration;\n\n          await prepareIntlayer(configuration, { clean: false });\n        } else {\n          // Clear module cache for the changed file to avoid stale require() results\n          clearModuleCache(filePath);\n          // Evict in-memory caches so loadContentDeclaration picks up fresh content\n          clearAllCache();\n          clearDiskCacheMemory();\n          await handleContentDeclarationFileChange(filePath, configuration);\n        }\n      })\n    )\n    .on('unlink', async (filePath) => {\n      // Delay unlink processing to see if an 'add' event occurs (indicating a move)\n      const timer = setTimeout(async () => {\n        // If timer fires, the file was genuinely removed\n        pendingUnlinks.delete(filePath);\n        processEvent(async () =>\n          handleUnlinkedContentDeclarationFile(filePath, configuration)\n        );\n      }, 200); // 200ms window to catch the 'add' event\n\n      pendingUnlinks.set(filePath, { timer, oldPath: filePath });\n    })\n    .on('error', async (error) => {\n      appLogger(`Watcher error: ${error}`, {\n        level: 'error',\n      });\n\n      appLogger('Restarting watcher');\n\n      await prepareIntlayer(configuration);\n    });\n};\n\nexport const buildAndWatchIntlayer = async (options?: WatchOptions) => {\n  const { skipPrepare, ...rest } = options ?? {};\n  const configuration =\n    options?.configuration ?? getConfiguration(options?.configOptions);\n\n  if (!skipPrepare) {\n    await prepareIntlayer(configuration, { forceRun: true });\n  }\n\n  if (configuration.content.watch || options?.persistent) {\n    await watch({ ...rest, configuration });\n  }\n};\n"],"mappings":"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"}
+{"version":3,"file":"watcher.mjs","names":[],"sources":["../../src/watcher.ts"],"sourcesContent":["import { existsSync } from 'node:fs';\nimport { readFile } from 'node:fs/promises';\nimport { basename, dirname } from 'node:path';\nimport { pathToFileURL } from 'node:url';\nimport * as ANSIColor from '@intlayer/config/colors';\nimport { colorize, getAppLogger } from '@intlayer/config/logger';\nimport {\n  type GetConfigurationOptions,\n  getConfiguration,\n  getConfigurationAndFilePath,\n} from '@intlayer/config/node';\nimport {\n  clearAllCache,\n  clearDiskCacheMemory,\n  clearModuleCache,\n  normalizePath,\n} from '@intlayer/config/utils';\nimport type { IntlayerConfig } from '@intlayer/types/config';\nimport type { ChokidarOptions } from 'chokidar';\nimport { handleAdditionalContentDeclarationFile } from './handleAdditionalContentDeclarationFile';\nimport { handleContentDeclarationFileChange } from './handleContentDeclarationFileChange';\nimport { handleContentDeclarationFileMoved } from './handleContentDeclarationFileMoved';\nimport { handleUnlinkedContentDeclarationFile } from './handleUnlinkedContentDeclarationFile';\nimport { prepareIntlayer } from './prepareIntlayer';\nimport { formatPath } from './utils';\nimport { writeContentDeclaration } from './writeContentDeclaration';\n\n// Map to track files that were recently unlinked: oldPath -> { timer, timestamp }\nconst pendingUnlinks = new Map<\n  string,\n  { timer: NodeJS.Timeout; oldPath: string }\n>();\n\n// Array-based sequential task queue — no Promise chain accumulation, no race conditions\nconst taskQueue: (() => Promise<void>)[] = [];\nlet isProcessing = false;\n\nconst processQueue = async () => {\n  if (isProcessing) return;\n  isProcessing = true;\n  while (taskQueue.length > 0) {\n    const task = taskQueue.shift()!;\n    try {\n      await task();\n    } catch (error) {\n      console.error(error);\n    }\n  }\n  isProcessing = false;\n};\n\nconst processEvent = (task: () => Promise<void>) => {\n  taskQueue.push(task);\n  processQueue();\n};\n\ntype WatchOptions = ChokidarOptions & {\n  configuration?: IntlayerConfig;\n  configOptions?: GetConfigurationOptions;\n  skipPrepare?: boolean;\n};\n\n// Initialize chokidar watcher (non-persistent)\nexport const watch = async (options?: WatchOptions) => {\n  const { watch: chokidarWatch } = await import('chokidar');\n  const configResult = getConfigurationAndFilePath(options?.configOptions);\n  const configurationFilePath = configResult.configurationFilePath;\n  let configuration: IntlayerConfig =\n    options?.configuration ?? configResult.configuration;\n  const appLogger = getAppLogger(configuration);\n\n  const {\n    watch: isWatchMode,\n    fileExtensions,\n    contentDir,\n    excludedPath,\n  } = configuration.content;\n\n  // chokidar v5 dropped glob support — use fs to resolve dirs, filter extensions via ignored\n  const pathsToWatch = [\n    ...contentDir.map((dir) => normalizePath(dir)).filter(existsSync),\n    ...(configurationFilePath ? [configurationFilePath] : []),\n  ];\n\n  if (!configuration.content.watch) return;\n\n  appLogger('Watching Intlayer content declarations');\n\n  if (configuration.build.optimize === true) {\n    appLogger(\n      [\n        `Build optimization is forced to ${colorize('true', ANSIColor.GREY)}, but watching is enabled too.`,\n        'It may lead to dev mode performance degradation as well as import errors.',\n        'Its recommended to keep the',\n        colorize('`build.optimized`', ANSIColor.BLUE),\n        'option',\n        colorize('undefined', ANSIColor.GREY),\n        'to get the best dev mode experience',\n      ],\n      {\n        level: 'warn',\n      }\n    );\n  }\n\n  // Strip glob markers from excludedPath entries to get plain segments (e.g. 'node_modules')\n  const excludedSegments = excludedPath.map((segment) =>\n    segment.replace(/^\\*\\*\\//, '').replace(/\\/\\*\\*$/, '')\n  );\n\n  const normalizedConfigPath = configurationFilePath\n    ? normalizePath(configurationFilePath)\n    : null;\n\n  const { mainDir, baseDir } = configuration.system;\n  const normalizedIntlayerDir = normalizePath(dirname(mainDir));\n\n  // Watch mainDir to detect broken or missing entry point files\n  if (existsSync(mainDir)) {\n    chokidarWatch(mainDir, {\n      persistent: isWatchMode,\n      ignoreInitial: true,\n      depth: 0,\n    })\n      .on('change', async (filePath) => {\n        if (isProcessing) return;\n\n        processEvent(async () => {\n          clearModuleCache(filePath);\n          try {\n            // Convert absolute path to a valid file:// URL\n            const fileUrl = pathToFileURL(filePath).href;\n\n            // Append a timestamp to bypass the ESM cache\n            await import(`${fileUrl}?update=${Date.now()}`);\n          } catch {\n            appLogger(\n              `Entry point ${basename(filePath)} failed to load, running clean rebuild...`,\n              { level: 'warn' }\n            );\n            await prepareIntlayer(configuration, {\n              clean: true,\n              forceRun: true,\n            });\n          }\n        });\n      })\n      .on('unlink', async (filePath) => {\n        if (isProcessing) return;\n\n        processEvent(async () => {\n          appLogger(\n            [\n              'Entry point',\n              formatPath(basename(filePath)),\n              'was removed, running clean rebuild...',\n            ],\n            { level: 'warn' }\n          );\n          await prepareIntlayer(configuration, { clean: true, forceRun: true });\n        });\n      });\n  }\n\n  // Watch baseDir at depth 0 to detect the entire .intlayer folder being removed\n  chokidarWatch(baseDir, {\n    persistent: isWatchMode,\n    ignoreInitial: true,\n    depth: 0,\n    ignored: (filePath: string) => {\n      const path = normalizePath(filePath);\n      return path !== normalizePath(baseDir) && path !== normalizedIntlayerDir;\n    },\n  }).on('unlinkDir', async (dirPath) => {\n    if (isProcessing) return;\n\n    if (normalizePath(dirPath) === normalizedIntlayerDir) {\n      appLogger([\n        formatPath('.intlayer'),\n        'directory removed, running clean rebuild...',\n      ]);\n\n      processEvent(() =>\n        prepareIntlayer(configuration, { clean: true, forceRun: true })\n      );\n    }\n  });\n\n  return chokidarWatch(pathsToWatch, {\n    persistent: isWatchMode, // Make the watcher persistent\n    ignoreInitial: true, // Process existing files\n    awaitWriteFinish: {\n      stabilityThreshold: 1000,\n      pollInterval: 100,\n    },\n    ignored: (filePath: string, stats?: import('node:fs').Stats) => {\n      const path = normalizePath(filePath);\n\n      if (normalizedConfigPath && path === normalizedConfigPath) return false;\n\n      if (excludedSegments.some((segment) => path.includes(`/${segment}`)))\n        return true;\n\n      if (stats?.isFile()) {\n        return !fileExtensions.some((extension) => path.endsWith(extension));\n      }\n\n      return false;\n    },\n    ...options,\n  })\n    .on('add', async (filePath) => {\n      const fileName = basename(filePath);\n      let isMove = false;\n\n      // Check if this Add corresponds to a pending Unlink (Move/Rename detection)\n      // Heuristic:\n      // - Priority A: Exact basename match (Moved to different folder)\n      // - Priority B: Single entry in pendingUnlinks (Renamed file)\n      let matchedOldPath: string | undefined;\n\n      // Search for basename match\n      for (const [oldPath] of pendingUnlinks) {\n        if (basename(oldPath) === fileName) {\n          matchedOldPath = oldPath;\n          break;\n        }\n      }\n\n      // If no basename match, but exactly one file was recently unlinked, assume it's a rename\n      if (!matchedOldPath && pendingUnlinks.size === 1) {\n        matchedOldPath = pendingUnlinks.keys().next().value;\n      }\n\n      if (matchedOldPath) {\n        // It is a move! Cancel the unlink handler\n        const pending = pendingUnlinks.get(matchedOldPath);\n        if (pending) {\n          clearTimeout(pending.timer);\n          pendingUnlinks.delete(matchedOldPath);\n        }\n\n        isMove = true;\n        appLogger(`File moved from ${matchedOldPath} to ${filePath}`);\n      }\n\n      processEvent(async () => {\n        if (isMove && matchedOldPath) {\n          await handleContentDeclarationFileMoved(\n            matchedOldPath,\n            filePath,\n            configuration\n          );\n        } else {\n          const fileContent = await readFile(filePath, 'utf-8');\n          const isEmpty = fileContent === '';\n\n          // Fill template content declaration file if it is empty\n          if (isEmpty) {\n            const extensionPattern = fileExtensions\n              .map((ext) => ext.replace(/\\./g, '\\\\.'))\n              .join('|');\n            const name = fileName.replace(\n              new RegExp(`(${extensionPattern})$`),\n              ''\n            );\n\n            await writeContentDeclaration(\n              {\n                key: name,\n                content: {},\n                filePath,\n              },\n              configuration\n            );\n          }\n\n          await handleAdditionalContentDeclarationFile(filePath, configuration);\n        }\n      });\n    })\n    .on('change', async (filePath) =>\n      processEvent(async () => {\n        if (configurationFilePath && filePath === configurationFilePath) {\n          appLogger('Configuration file changed, repreparing Intlayer');\n\n          clearModuleCache(configurationFilePath);\n          clearAllCache();\n\n          const { configuration: newConfiguration } =\n            getConfigurationAndFilePath(options?.configOptions);\n\n          configuration = options?.configuration ?? newConfiguration;\n\n          await prepareIntlayer(configuration, { clean: false });\n        } else {\n          // Clear module cache for the changed file to avoid stale require() results\n          clearModuleCache(filePath);\n          // Evict in-memory caches so loadContentDeclaration picks up fresh content\n          clearAllCache();\n          clearDiskCacheMemory();\n          await handleContentDeclarationFileChange(filePath, configuration);\n        }\n      })\n    )\n    .on('unlink', async (filePath) => {\n      // Delay unlink processing to see if an 'add' event occurs (indicating a move)\n      const timer = setTimeout(async () => {\n        // If timer fires, the file was genuinely removed\n        pendingUnlinks.delete(filePath);\n        processEvent(async () =>\n          handleUnlinkedContentDeclarationFile(filePath, configuration)\n        );\n      }, 200); // 200ms window to catch the 'add' event\n\n      pendingUnlinks.set(filePath, { timer, oldPath: filePath });\n    })\n    .on('error', async (error) => {\n      appLogger(`Watcher error: ${error}`, {\n        level: 'error',\n      });\n\n      appLogger('Restarting watcher');\n\n      await prepareIntlayer(configuration);\n    });\n};\n\nexport const buildAndWatchIntlayer = async (options?: WatchOptions) => {\n  const { skipPrepare, ...rest } = options ?? {};\n  const configuration =\n    options?.configuration ?? getConfiguration(options?.configOptions);\n\n  if (!skipPrepare) {\n    await prepareIntlayer(configuration, { forceRun: true });\n  }\n\n  if (configuration.content.watch || options?.persistent) {\n    await watch({ ...rest, configuration });\n  }\n};\n"],"mappings":"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"}

package/dist/types/createType/createModuleAugmentation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createModuleAugmentation.d.ts","names":[],"sources":["../../../src/createType/createModuleAugmentation.ts"],"mappings":";;;cAUa,WAAA,GAAe,GAAA;;cA4Kf,wBAAA,GACX,aAAA,EAAe,cAAA,KAAc,OAAA"}
+{"version":3,"file":"createModuleAugmentation.d.ts","names":[],"sources":["../../../src/createType/createModuleAugmentation.ts"],"mappings":";;;cASa,WAAA,GAAe,GAAA;;cAsLf,wBAAA,GACX,aAAA,EAAe,cAAA,KAAc,OAAA"}

package/dist/types/watcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watcher.d.ts","names":[],"sources":["../../src/watcher.ts"],"mappings":";;;;;;KAsDK,YAAA,GAAe,eAAA;EAClB,aAAA,GAAgB,cAAA;EAChB,aAAA,GAAgB,uBAAA;EAChB,WAAA;AAAA;AAAA,cAIW,KAAA,GAAe,OAAA,GAAU,YAAA,KAAY,OAAA,CAAA,UAAA,CAAA,SAAA;AAAA,cA+LrC,qBAAA,GAA+B,OAAA,GAAU,YAAA,KAAY,OAAA"}
+{"version":3,"file":"watcher.d.ts","names":[],"sources":["../../src/watcher.ts"],"mappings":";;;;;;KAwDK,YAAA,GAAe,eAAA;EAClB,aAAA,GAAgB,cAAA;EAChB,aAAA,GAAgB,uBAAA;EAChB,WAAA;AAAA;AAAA,cAIW,KAAA,GAAe,OAAA,GAAU,YAAA,KAAY,OAAA,CAAA,UAAA,CAAA,SAAA;AAAA,cAyQrC,qBAAA,GAA+B,OAAA,GAAU,YAAA,KAAY,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intlayer/chokidar",
-  "version": "8.9.4",
+  "version": "8.9.5",
   "private": false,
   "description": "Uses chokidar to scan and build Intlayer declaration files into dictionaries based on Intlayer configuration.",
   "keywords": [
@@ -109,13 +109,13 @@
     "typecheck": "tsc --noEmit --project tsconfig.types.json"
   },
   "dependencies": {
-    "@intlayer/api": "8.9.4",
-    "@intlayer/config": "8.9.4",
-    "@intlayer/core": "8.9.4",
-    "@intlayer/dictionaries-entry": "8.9.4",
-    "@intlayer/remote-dictionaries-entry": "8.9.4",
-    "@intlayer/types": "8.9.4",
-    "@intlayer/unmerged-dictionaries-entry": "8.9.4",
+    "@intlayer/api": "8.9.5",
+    "@intlayer/config": "8.9.5",
+    "@intlayer/core": "8.9.5",
+    "@intlayer/dictionaries-entry": "8.9.5",
+    "@intlayer/remote-dictionaries-entry": "8.9.5",
+    "@intlayer/types": "8.9.5",
+    "@intlayer/unmerged-dictionaries-entry": "8.9.5",
     "chokidar": "5.0.0",
     "defu": "6.1.7",
     "fast-glob": "3.3.3",
@@ -124,14 +124,14 @@
     "zod-to-ts": "2.0.0"
   },
   "devDependencies": {
-    "@types/node": "25.6.2",
+    "@types/node": "25.7.0",
     "@utils/ts-config": "1.0.4",
     "@utils/ts-config-types": "1.0.4",
     "@utils/tsdown-config": "1.0.4",
     "rimraf": "6.1.3",
     "tsdown": "0.22.00",
     "typescript": "6.0.3",
-    "vitest": "4.1.5",
+    "vitest": "4.1.6",
     "zod": "4.4.3"
   },
   "engines": {