intor 2.4.12 → 2.4.14

package/dist/types/src/core/types/generated.d.ts

@@ -1,31 +1,29 @@
 import type { LOCALE_PLACEHOLDER } from "../constants";
 import type { Locale, LocaleMessages, Replacement, Rich } from "intor-translator";
-/**
- * =================================================
- * Generated-aware type system for Intor
- * =================================================
- */
 /**
  * Sentinel key injected by CLI when generated types exist.
- * Used purely for type-level generation detection.
  */
 export type INTOR_GENERATED_KEY = "__intor_generated__";
 /**
- * Detect whether generated types are present.
+ * Detect generation mode.
+ *
+ * This works in both source and declaration emit environments.
  */
-type HasGenerated = IntorGeneratedTypes extends {
-    [K in INTOR_GENERATED_KEY]: true;
-} ? true : false;
+type HasGen = INTOR_GENERATED_KEY extends keyof IntorGeneratedTypes ? true : false;
 /**
- * Extract valid configuration keys from generated types.
- * (Excludes sentinel key.)
+ * Extract concrete generated config keys safely.
+ *
+ * - Works even if IntorGeneratedTypes is empty.
+ * - Prevents keyof widening issues.
  */
-type GeneratedConfigKeys = Exclude<keyof IntorGeneratedTypes, INTOR_GENERATED_KEY>;
+type GeneratedConfigKeys = HasGen extends true ? Exclude<keyof IntorGeneratedTypes & string, INTOR_GENERATED_KEY> : never;
 /**
- * Public configuration key union.
- * Falls back to `string` in non-generated mode.
+ * Public config key union.
+ *
+ * - Never resolves to `never`.
+ * - Falls back to `string` safely.
  */
-export type GenConfigKeys = HasGenerated extends true ? GeneratedConfigKeys : string;
+export type GenConfigKeys = HasGen extends true ? [GeneratedConfigKeys] extends [never] ? string : GeneratedConfigKeys : string;
 /**
  * Fallback configuration shape (non-generated mode).
  */
@@ -36,11 +34,14 @@ type FallbackConfig = {
     Rich: Rich;
 };
 /**
- * Extract generated configuration shape safely.
+ * Safely extract generated config structure.
+ *
+ * - Never leaks `never` to public API.
+ * - Handles malformed generated types defensively.
  */
-type ExtractGeneratedConfig<T> = T extends {
+type SafeExtract<T> = T extends {
     Locales: infer L extends string;
-    Messages: Record<typeof LOCALE_PLACEHOLDER, infer M>;
+    Messages: Record<typeof LOCALE_PLACEHOLDER, infer M extends LocaleMessages[string]>;
     Replacements: infer RE;
     Rich: infer RI;
 } ? {
@@ -48,17 +49,15 @@ type ExtractGeneratedConfig<T> = T extends {
     Messages: Record<L, M>;
     Replacements: RE;
     Rich: RI;
-} : never;
+} : FallbackConfig;
 /**
- * Configuration shape resolver.
+ * Main configuration resolver.
  *
- * - Uses generated types when available.
- * - Falls back to default shape otherwise.
- */
-export type GenConfig<CK extends GenConfigKeys> = HasGenerated extends true ? CK extends GeneratedConfigKeys ? ExtractGeneratedConfig<IntorGeneratedTypes[CK]> : never : FallbackConfig;
-/**
- * Derived helpers
+ * - Never returns `never`.
+ * - Fully declaration-safe.
+ * - Stable under generic distribution.
  */
+export type GenConfig<CK extends GenConfigKeys> = HasGen extends true ? CK extends GeneratedConfigKeys ? SafeExtract<IntorGeneratedTypes[CK]> : FallbackConfig : FallbackConfig;
 export type GenMessages<CK extends GenConfigKeys> = GenConfig<CK>["Messages"];
 export type GenLocale<CK extends GenConfigKeys> = GenConfig<CK>["Locales"];
 export type GenReplacements<CK extends GenConfigKeys> = GenConfig<CK>["Replacements"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intor",
-  "version": "2.4.12",
+  "version": "2.4.14",
   "description": "The i18n library for modern JavaScript",
   "author": "Yiming Liao",
   "homepage": "https://intor.dev",
@@ -32,6 +32,7 @@
   "exports": {
     ".": {
       "import": "./dist/core/export/index.js",
+      "require": "./dist/core/export/index.js",
       "types": "./dist/types/export/index.d.ts"
     },
     "./internal": {
@@ -92,7 +93,7 @@
   ],
   "sideEffects": false,
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=20"
   },
   "scripts": {
     "type": "tsc --noEmit",
@@ -103,11 +104,10 @@
     "test:check": "tsx scripts/check-test-structure.ts",
     "knip": "knip --config .config/knip.config.ts",
     "build": "tsx scripts/build.ts",
-    "prepublishOnly": "yarn build",
-    "examples:html": "vite --config examples/html/vite.config.ts"
+    "prepublishOnly": "yarn build"
   },
   "dependencies": {
-    "intor-translator": "1.4.13",
+    "intor-translator": "^1.4.14",
     "logry": "2.1.6",
     "p-limit": "7.2.0"
   },
@@ -152,6 +152,7 @@
     "svelte": "5.46.1",
     "tsc-alias": "1.8.16",
     "tsd": "0.33.0",
+    "tsx": "^4.21.0",
     "typescript": "5.8.3",
     "typescript-eslint": "8.32.1",
     "vite": "7.3.0",