@lingui/conf 5.4.1 → 5.5.1

package/dist/index.cjs

@@ -5,6 +5,7 @@ const jestValidate = require('jest-validate');
 const path = require('path');
 const fs = require('fs');
 const cosmiconfig = require('cosmiconfig');
+const jiti = require('jiti');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -13,6 +14,9 @@ const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 function replaceRootDir(config, rootDir) {
+  if (!rootDir) {
+    return config;
+  }
   return function replaceDeep(value, rootDir2) {
     const replace = (s) => s.replace("<rootDir>", rootDir2);
     if (value == null) {
@@ -40,7 +44,7 @@ function setCldrParentLocales(config) {
       fallbackLocales: {}
     };
   }
-  if (!config.fallbackLocales.default) {
+  if (!config.fallbackLocales?.default) {
     config.locales.forEach((locale) => {
       const fl = getCldrParentLocale(locale.toLowerCase());
       if (fl && !config.fallbackLocales[locale]) {
@@ -283,10 +287,14 @@ function makeConfig(userConfig, opts = {}) {
   }
   config = setCldrParentLocales(config);
   config = normalizeRuntimeConfigModule(config);
-  return replaceRootDir(
+  const out = replaceRootDir(
     config,
     config.rootDir
   );
+  return {
+    ...out,
+    resolvedConfigPath: opts.resolvedConfigPath
+  };
 }
 const defaultConfig = {
   catalogs: [
@@ -375,15 +383,13 @@ function defineConfig(config) {
 }
 
 function configExists(path2) {
-  return path2 && fs__default.existsSync(path2);
+  return !!path2 && fs__default.existsSync(path2);
 }
 function JitiLoader() {
-  return (filepath, content) => {
-    const opts = {
-      interopDefault: true
-    };
-    const jiti = require("jiti")(__filename, opts);
-    return jiti(filepath);
+  return (filepath) => {
+    const jiti$1 = jiti.createJiti(__filename);
+    const mod = jiti$1(filepath);
+    return mod?.default ?? mod;
   };
 }
 const moduleName = "lingui";
@@ -432,7 +438,7 @@ function getConfig({
       rootDir: result ? path__default.dirname(result.filepath) : defaultRootDir,
       ...userConfig
     },
-    { skipValidation }
+    { skipValidation, resolvedConfigPath: result.filepath }
   );
 }
 

package/dist/index.d.cts

@@ -88,10 +88,9 @@ type CatalogConfig = {
     include: string[];
     exclude?: string[];
 };
-type LocaleObject = {
-    [locale: string]: string[] | string;
-    default?: string;
-};
+type LocaleObject = Record<string, string[] | string> | (Record<string, string[] | string> & {
+    default: string;
+});
 type FallbackLocales = LocaleObject;
 type ModuleSource = readonly [module: string, specifier?: string];
 type CatalogService = {
@@ -229,7 +228,7 @@ type LinguiConfig = {
      *
      * Note that using <rootDir> as a string token in any other path-based config settings will refer back to this value.
      *
-     * @defaul: The root of the directory containing your Lingui configuration file or the package.json.
+     * @default: The root of the directory containing your Lingui configuration file or the package.json.
      */
     rootDir?: string;
     /**
@@ -310,6 +309,7 @@ type LinguiConfig = {
 };
 type ModuleSourceNormalized = readonly [module: string, specifier: string];
 type LinguiConfigNormalized = Omit<LinguiConfig, "runtimeConfigModule"> & {
+    resolvedConfigPath?: string;
     fallbackLocales?: FallbackLocales;
     runtimeConfigModule: {
         i18n: ModuleSourceNormalized;
@@ -320,6 +320,7 @@ type LinguiConfigNormalized = Omit<LinguiConfig, "runtimeConfigModule"> & {
 
 declare function makeConfig(userConfig: Partial<LinguiConfig>, opts?: {
     skipValidation?: boolean;
+    resolvedConfigPath?: string;
 }): LinguiConfigNormalized;
 
 /**

package/dist/index.d.mts

@@ -88,10 +88,9 @@ type CatalogConfig = {
     include: string[];
     exclude?: string[];
 };
-type LocaleObject = {
-    [locale: string]: string[] | string;
-    default?: string;
-};
+type LocaleObject = Record<string, string[] | string> | (Record<string, string[] | string> & {
+    default: string;
+});
 type FallbackLocales = LocaleObject;
 type ModuleSource = readonly [module: string, specifier?: string];
 type CatalogService = {
@@ -229,7 +228,7 @@ type LinguiConfig = {
      *
      * Note that using <rootDir> as a string token in any other path-based config settings will refer back to this value.
      *
-     * @defaul: The root of the directory containing your Lingui configuration file or the package.json.
+     * @default: The root of the directory containing your Lingui configuration file or the package.json.
      */
     rootDir?: string;
     /**
@@ -310,6 +309,7 @@ type LinguiConfig = {
 };
 type ModuleSourceNormalized = readonly [module: string, specifier: string];
 type LinguiConfigNormalized = Omit<LinguiConfig, "runtimeConfigModule"> & {
+    resolvedConfigPath?: string;
     fallbackLocales?: FallbackLocales;
     runtimeConfigModule: {
         i18n: ModuleSourceNormalized;
@@ -320,6 +320,7 @@ type LinguiConfigNormalized = Omit<LinguiConfig, "runtimeConfigModule"> & {
 
 declare function makeConfig(userConfig: Partial<LinguiConfig>, opts?: {
     skipValidation?: boolean;
+    resolvedConfigPath?: string;
 }): LinguiConfigNormalized;
 
 /**

package/dist/index.d.ts

@@ -88,10 +88,9 @@ type CatalogConfig = {
     include: string[];
     exclude?: string[];
 };
-type LocaleObject = {
-    [locale: string]: string[] | string;
-    default?: string;
-};
+type LocaleObject = Record<string, string[] | string> | (Record<string, string[] | string> & {
+    default: string;
+});
 type FallbackLocales = LocaleObject;
 type ModuleSource = readonly [module: string, specifier?: string];
 type CatalogService = {
@@ -229,7 +228,7 @@ type LinguiConfig = {
      *
      * Note that using <rootDir> as a string token in any other path-based config settings will refer back to this value.
      *
-     * @defaul: The root of the directory containing your Lingui configuration file or the package.json.
+     * @default: The root of the directory containing your Lingui configuration file or the package.json.
      */
     rootDir?: string;
     /**
@@ -310,6 +309,7 @@ type LinguiConfig = {
 };
 type ModuleSourceNormalized = readonly [module: string, specifier: string];
 type LinguiConfigNormalized = Omit<LinguiConfig, "runtimeConfigModule"> & {
+    resolvedConfigPath?: string;
     fallbackLocales?: FallbackLocales;
     runtimeConfigModule: {
         i18n: ModuleSourceNormalized;
@@ -320,6 +320,7 @@ type LinguiConfigNormalized = Omit<LinguiConfig, "runtimeConfigModule"> & {
 
 declare function makeConfig(userConfig: Partial<LinguiConfig>, opts?: {
     skipValidation?: boolean;
+    resolvedConfigPath?: string;
 }): LinguiConfigNormalized;
 
 /**

package/dist/index.mjs

@@ -3,8 +3,12 @@ import { validate, multipleValidOptions } from 'jest-validate';
 import path from 'path';
 import fs from 'fs';
 import { cosmiconfigSync } from 'cosmiconfig';
+import { createJiti } from 'jiti';
 
 function replaceRootDir(config, rootDir) {
+  if (!rootDir) {
+    return config;
+  }
   return function replaceDeep(value, rootDir2) {
     const replace = (s) => s.replace("<rootDir>", rootDir2);
     if (value == null) {
@@ -32,7 +36,7 @@ function setCldrParentLocales(config) {
       fallbackLocales: {}
     };
   }
-  if (!config.fallbackLocales.default) {
+  if (!config.fallbackLocales?.default) {
     config.locales.forEach((locale) => {
       const fl = getCldrParentLocale(locale.toLowerCase());
       if (fl && !config.fallbackLocales[locale]) {
@@ -275,10 +279,14 @@ function makeConfig(userConfig, opts = {}) {
   }
   config = setCldrParentLocales(config);
   config = normalizeRuntimeConfigModule(config);
-  return replaceRootDir(
+  const out = replaceRootDir(
     config,
     config.rootDir
   );
+  return {
+    ...out,
+    resolvedConfigPath: opts.resolvedConfigPath
+  };
 }
 const defaultConfig = {
   catalogs: [
@@ -367,15 +375,13 @@ function defineConfig(config) {
 }
 
 function configExists(path2) {
-  return path2 && fs.existsSync(path2);
+  return !!path2 && fs.existsSync(path2);
 }
 function JitiLoader() {
-  return (filepath, content) => {
-    const opts = {
-      interopDefault: true
-    };
-    const jiti = require("jiti")(__filename, opts);
-    return jiti(filepath);
+  return (filepath) => {
+    const jiti = createJiti(__filename);
+    const mod = jiti(filepath);
+    return mod?.default ?? mod;
   };
 }
 const moduleName = "lingui";
@@ -424,7 +430,7 @@ function getConfig({
       rootDir: result ? path.dirname(result.filepath) : defaultRootDir,
       ...userConfig
     },
-    { skipValidation }
+    { skipValidation, resolvedConfigPath: result.filepath }
   );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingui/conf",
-  "version": "5.4.1",
+  "version": "5.5.1",
   "sideEffects": false,
   "description": "Get lingui configuration from package.json",
   "keywords": [
@@ -33,7 +33,7 @@
     "@babel/runtime": "^7.20.13",
     "cosmiconfig": "^8.0.0",
     "jest-validate": "^29.4.3",
-    "jiti": "^1.17.1",
+    "jiti": "^2.5.1",
     "picocolors": "^1.1.1"
   },
   "files": [
@@ -45,5 +45,5 @@
     "@lingui/jest-mocks": "*",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "296f115904bae526cd4b4807bbdc373b2e50822b"
+  "gitHead": "3bd1384568848e15e60fb40324e9e0476ca152e6"
 }