i18next-cli 1.82.4 → 1.82.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -2145,8 +2145,6 @@ A translation management system built around the i18next ecosystem - [Locize](ht
2145
2145
 
2146
2146
  **Now with a [Free plan](https://www.locize.com/pricing?utm_source=i18next_cli_readme&utm_medium=github&utm_campaign=readme) for small projects!** Perfect for hobbyists or getting started.
2147
2147
 
2148
- ![Locize](https://www.locize.com/img/ads/github_locize.png)
2149
-
2150
2148
  With using [Locize](https://www.locize.com/?utm_source=i18next_cli_readme&utm_medium=github&utm_campaign=readme) you directly support the future of i18next.
2151
2149
 
2152
2150
  ---
package/dist/cjs/cli.js CHANGED
@@ -39,7 +39,7 @@ const program = new commander.Command();
39
39
  program
40
40
  .name('i18next-cli')
41
41
  .description('A unified, high-performance i18next CLI.')
42
- .version('1.82.4') // This string is replaced with the actual version at build time by rollup
42
+ .version('1.82.5') // This string is replaced with the actual version at build time by rollup
43
43
  .addHelpText('after', '\nUsing an AI coding agent? Install the i18next-localization skill: npx skills add i18next/i18next-cli\n');
44
44
  // new: global config override option
45
45
  program.option('-c, --config <path>', 'Path to i18next-cli config file (overrides detection)');
@@ -1245,7 +1245,7 @@ async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaul
1245
1245
  const existingNsGlobPattern = existingNsPattern.replace(/\\/g, '/');
1246
1246
  const existingNsFiles = await glob.glob(existingNsGlobPattern, { ignore: userIgnore });
1247
1247
  for (const file of existingNsFiles) {
1248
- const ns = node_path.basename(file, node_path.extname(file));
1248
+ const ns = fileUtils.getNamespaceFromOutputPath(config.extract.output, locale, file);
1249
1249
  if (ns) {
1250
1250
  namespacesToProcess.add(ns);
1251
1251
  }
@@ -207,27 +207,20 @@ async function checkOldKeyExists(oldParts, config) {
207
207
  async function buildNamespaceKeyMap(config) {
208
208
  // Map namespace -> set of flattened keys present in that namespace (union across locales)
209
209
  const map = new Map();
210
- // config.extract.output may be either a string template or a function(language, namespace) => string.
211
- // Produce a string we can turn into a glob pattern. For functions, call with wildcard values.
212
- const rawOutput = config.extract.output;
213
- const outputTemplate = typeof rawOutput === 'function'
214
- ? rawOutput('*', '*') // produce a path with wildcards we can glob
215
- : String(rawOutput);
216
- // make a glob pattern by replacing placeholders with *
217
- const pat = outputTemplate
218
- .replace(/\{\{language\}\}/g, '*')
219
- .replace(/\{\{namespace\}\}/g, '*');
220
- // glob expects unix-style
221
- const files = await glob.glob([pat.replace(/\\/g, '/')], { nodir: true });
210
+ // glob each locale's files, so the namespace can be read from where the output template has it
211
+ const files = [];
212
+ for (const locale of config.locales) {
213
+ // glob expects unix-style
214
+ for (const f of await glob.glob(fileUtils.getOutputPath(config.extract.output, locale, '*').replace(/\\/g, '/'), { nodir: true })) {
215
+ files.push([f, fileUtils.getNamespaceFromOutputPath(config.extract.output, locale, f)]);
216
+ }
217
+ }
222
218
  const keySeparator = config.extract.keySeparator ?? '.';
223
- for (const f of files) {
219
+ for (const [f, ns] of files) {
224
220
  try {
225
221
  const translations = await fileUtils.loadTranslationFile(node_path.resolve(process.cwd(), f));
226
222
  if (!translations)
227
223
  continue;
228
- // derive namespace name from filename: basename without extension (platform-safe)
229
- const base = node_path.basename(f);
230
- const ns = base.replace(/\.[^.]+$/, ''); // remove extension
231
224
  const set = map.get(ns) ?? new Set();
232
225
  // flatten keys recursively
233
226
  const collect = (obj, prefix = '') => {
@@ -78,7 +78,7 @@ async function runSyncer(config, options = {}) {
78
78
  const ignoreNamespaces = new Set(config.extract.ignoreNamespaces ?? []);
79
79
  // 2. Loop through each primary namespace file
80
80
  for (const primaryPath of primaryNsFiles) {
81
- const ns = node_path.basename(primaryPath).split('.')[0];
81
+ const ns = fileUtils.getNamespaceFromOutputPath(output, primaryLanguage, primaryPath);
82
82
  // Skip ignored namespaces
83
83
  if (ignoreNamespaces.has(ns))
84
84
  continue;
@@ -67,6 +67,21 @@ function getOutputPath(outputTemplate, language, namespace) {
67
67
  out = out.replace(/\/\/+/g, '/');
68
68
  return node_path.normalize(out);
69
69
  }
70
+ /**
71
+ * The namespace of a file found with `getOutputPath(outputTemplate, language, '*')`: the part of its path
72
+ * where the template has the namespace, so `locales/{{namespace}}/{{language}}.json` works like
73
+ * `locales/{{language}}/{{namespace}}.json`. Falls back to the file name without its extension.
74
+ */
75
+ function getNamespaceFromOutputPath(outputTemplate, language, filePath) {
76
+ const marker = '\u0000';
77
+ const escape = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
78
+ // compare absolute paths: glob returns relative or absolute paths depending on the pattern
79
+ const [first, ...rest] = node_path.resolve(getOutputPath(outputTemplate, language, marker)).replace(/\\/g, '/').split(marker);
80
+ // a namespace that appears more than once in the template must be the same each time;
81
+ // case-insensitive like glob on macOS and Windows
82
+ const match = rest.length > 0 && new RegExp(`^${escape(first)}([^/]+)${rest.map(escape).join('\\1')}$`, 'i').exec(node_path.resolve(filePath).replace(/\\/g, '/'));
83
+ return match ? match[1] : node_path.basename(filePath, node_path.extname(filePath));
84
+ }
70
85
  /**
71
86
  * Dynamically loads a translation file, supporting .json, .js, and .ts formats.
72
87
  * @param filePath - The path to the translation file.
@@ -204,6 +219,7 @@ function inferFormatFromPath(filePath, defaultFormat = 'json') {
204
219
  }
205
220
 
206
221
  exports.ParseTranslationFileError = ParseTranslationFileError;
222
+ exports.getNamespaceFromOutputPath = getNamespaceFromOutputPath;
207
223
  exports.getOutputPath = getOutputPath;
208
224
  exports.inferFormatFromPath = inferFormatFromPath;
209
225
  exports.loadRawJson5Content = loadRawJson5Content;
@@ -249,7 +249,7 @@ async function primaryNamespaces(config, primary) {
249
249
  if (typeof output === 'string' && !output.includes('{{namespace}}'))
250
250
  return [undefined];
251
251
  return (await glob.glob(fileUtils.getOutputPath(output, primary, '*').replace(/\\/g, '/')))
252
- .map(file => node_path.basename(file).split('.')[0])
252
+ .map(file => fileUtils.getNamespaceFromOutputPath(output, primary, file))
253
253
  .filter(ns => !ignoreNamespaces.includes(ns));
254
254
  }
255
255
  /**
package/dist/esm/cli.js CHANGED
@@ -33,7 +33,7 @@ const program = new Command();
33
33
  program
34
34
  .name('i18next-cli')
35
35
  .description('A unified, high-performance i18next CLI.')
36
- .version('1.82.4') // This string is replaced with the actual version at build time by rollup
36
+ .version('1.82.5') // This string is replaced with the actual version at build time by rollup
37
37
  .addHelpText('after', '\nUsing an AI coding agent? Install the i18next-localization skill: npx skills add i18next/i18next-cli\n');
38
38
  // new: global config override option
39
39
  program.option('-c, --config <path>', 'Path to i18next-cli config file (overrides detection)');
@@ -1,7 +1,7 @@
1
- import { resolve, basename, extname } from 'node:path';
1
+ import { resolve } from 'node:path';
2
2
  import { glob } from 'glob';
3
3
  import { naturalLanguageRegexFor, getNestedKeys, getNestedValue, setNestedValue, storedKeySeparator } from '../../utils/nested-object.js';
4
- import { getOutputPath, loadTranslationFile } from '../../utils/file-utils.js';
4
+ import { getOutputPath, loadTranslationFile, getNamespaceFromOutputPath } from '../../utils/file-utils.js';
5
5
  import { resolveDefaultValue } from '../../utils/default-value.js';
6
6
  import { ConsoleLogger } from '../../utils/logger.js';
7
7
  import { safePluralRules } from '../../utils/plural-rules.js';
@@ -1243,7 +1243,7 @@ async function getTranslations(keys, objectKeys, config, { syncPrimaryWithDefaul
1243
1243
  const existingNsGlobPattern = existingNsPattern.replace(/\\/g, '/');
1244
1244
  const existingNsFiles = await glob(existingNsGlobPattern, { ignore: userIgnore });
1245
1245
  for (const file of existingNsFiles) {
1246
- const ns = basename(file, extname(file));
1246
+ const ns = getNamespaceFromOutputPath(config.extract.output, locale, file);
1247
1247
  if (ns) {
1248
1248
  namespacesToProcess.add(ns);
1249
1249
  }
@@ -1,8 +1,8 @@
1
1
  import { glob } from 'glob';
2
2
  import { readFile, writeFile } from 'node:fs/promises';
3
- import { resolve, basename } from 'node:path';
3
+ import { resolve } from 'node:path';
4
4
  import { ConsoleLogger } from './utils/logger.js';
5
- import { getOutputPath, loadTranslationFile, serializeTranslationFile } from './utils/file-utils.js';
5
+ import { getOutputPath, loadTranslationFile, getNamespaceFromOutputPath, serializeTranslationFile } from './utils/file-utils.js';
6
6
  import { getNestedValue, naturalLanguageRegexFor, storedKeySeparator, setNestedValue } from './utils/nested-object.js';
7
7
  import { shouldShowFunnel, recordFunnelShown } from './utils/funnel-msg-tracker.js';
8
8
  import { styleText } from 'node:util';
@@ -205,27 +205,20 @@ async function checkOldKeyExists(oldParts, config) {
205
205
  async function buildNamespaceKeyMap(config) {
206
206
  // Map namespace -> set of flattened keys present in that namespace (union across locales)
207
207
  const map = new Map();
208
- // config.extract.output may be either a string template or a function(language, namespace) => string.
209
- // Produce a string we can turn into a glob pattern. For functions, call with wildcard values.
210
- const rawOutput = config.extract.output;
211
- const outputTemplate = typeof rawOutput === 'function'
212
- ? rawOutput('*', '*') // produce a path with wildcards we can glob
213
- : String(rawOutput);
214
- // make a glob pattern by replacing placeholders with *
215
- const pat = outputTemplate
216
- .replace(/\{\{language\}\}/g, '*')
217
- .replace(/\{\{namespace\}\}/g, '*');
218
- // glob expects unix-style
219
- const files = await glob([pat.replace(/\\/g, '/')], { nodir: true });
208
+ // glob each locale's files, so the namespace can be read from where the output template has it
209
+ const files = [];
210
+ for (const locale of config.locales) {
211
+ // glob expects unix-style
212
+ for (const f of await glob(getOutputPath(config.extract.output, locale, '*').replace(/\\/g, '/'), { nodir: true })) {
213
+ files.push([f, getNamespaceFromOutputPath(config.extract.output, locale, f)]);
214
+ }
215
+ }
220
216
  const keySeparator = config.extract.keySeparator ?? '.';
221
- for (const f of files) {
217
+ for (const [f, ns] of files) {
222
218
  try {
223
219
  const translations = await loadTranslationFile(resolve(process.cwd(), f));
224
220
  if (!translations)
225
221
  continue;
226
- // derive namespace name from filename: basename without extension (platform-safe)
227
- const base = basename(f);
228
- const ns = base.replace(/\.[^.]+$/, ''); // remove extension
229
222
  const set = map.get(ns) ?? new Set();
230
223
  // flatten keys recursively
231
224
  const collect = (obj, prefix = '') => {
@@ -1,11 +1,11 @@
1
1
  import { styleText } from 'node:util';
2
2
  import { glob } from 'glob';
3
3
  import { mkdir, writeFile } from 'node:fs/promises';
4
- import { basename, resolve, dirname } from 'node:path';
4
+ import { resolve, dirname } from 'node:path';
5
5
  import { createSpinnerLike } from './utils/wrap-ora.js';
6
6
  import { ConsoleLogger } from './utils/logger.js';
7
7
  import { resolveDefaultValue } from './utils/default-value.js';
8
- import { getOutputPath, loadTranslationFile, inferFormatFromPath, loadRawJson5Content, serializeTranslationFile } from './utils/file-utils.js';
8
+ import { getOutputPath, getNamespaceFromOutputPath, loadTranslationFile, inferFormatFromPath, loadRawJson5Content, serializeTranslationFile } from './utils/file-utils.js';
9
9
  import { printUntranslatedFunnel } from './utils/locize-funnel.js';
10
10
  import { getNestedKeys, getNestedValue, setNestedValue } from './utils/nested-object.js';
11
11
  import { safePluralRules } from './utils/plural-rules.js';
@@ -76,7 +76,7 @@ async function runSyncer(config, options = {}) {
76
76
  const ignoreNamespaces = new Set(config.extract.ignoreNamespaces ?? []);
77
77
  // 2. Loop through each primary namespace file
78
78
  for (const primaryPath of primaryNsFiles) {
79
- const ns = basename(primaryPath).split('.')[0];
79
+ const ns = getNamespaceFromOutputPath(output, primaryLanguage, primaryPath);
80
80
  // Skip ignored namespaces
81
81
  if (ignoreNamespaces.has(ns))
82
82
  continue;
@@ -1,5 +1,5 @@
1
1
  import { access, readFile } from 'node:fs/promises';
2
- import { resolve, normalize, extname } from 'node:path';
2
+ import { resolve, normalize, basename, extname } from 'node:path';
3
3
  import { createJiti } from 'jiti';
4
4
  import { getTsConfigAliases } from '../config.js';
5
5
  import { JsonParser, JsonObjectNode } from '@croct/json5-parser';
@@ -61,6 +61,21 @@ function getOutputPath(outputTemplate, language, namespace) {
61
61
  out = out.replace(/\/\/+/g, '/');
62
62
  return normalize(out);
63
63
  }
64
+ /**
65
+ * The namespace of a file found with `getOutputPath(outputTemplate, language, '*')`: the part of its path
66
+ * where the template has the namespace, so `locales/{{namespace}}/{{language}}.json` works like
67
+ * `locales/{{language}}/{{namespace}}.json`. Falls back to the file name without its extension.
68
+ */
69
+ function getNamespaceFromOutputPath(outputTemplate, language, filePath) {
70
+ const marker = '\u0000';
71
+ const escape = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
72
+ // compare absolute paths: glob returns relative or absolute paths depending on the pattern
73
+ const [first, ...rest] = resolve(getOutputPath(outputTemplate, language, marker)).replace(/\\/g, '/').split(marker);
74
+ // a namespace that appears more than once in the template must be the same each time;
75
+ // case-insensitive like glob on macOS and Windows
76
+ const match = rest.length > 0 && new RegExp(`^${escape(first)}([^/]+)${rest.map(escape).join('\\1')}$`, 'i').exec(resolve(filePath).replace(/\\/g, '/'));
77
+ return match ? match[1] : basename(filePath, extname(filePath));
78
+ }
64
79
  /**
65
80
  * Dynamically loads a translation file, supporting .json, .js, and .ts formats.
66
81
  * @param filePath - The path to the translation file.
@@ -197,4 +212,4 @@ function inferFormatFromPath(filePath, defaultFormat = 'json') {
197
212
  return defaultFormat || 'json';
198
213
  }
199
214
 
200
- export { ParseTranslationFileError, getOutputPath, inferFormatFromPath, loadRawJson5Content, loadTranslationFile, serializeTranslationFile };
215
+ export { ParseTranslationFileError, getNamespaceFromOutputPath, getOutputPath, inferFormatFromPath, loadRawJson5Content, loadTranslationFile, serializeTranslationFile };
@@ -1,8 +1,8 @@
1
1
  import { readFile } from 'node:fs/promises';
2
- import { basename, resolve } from 'node:path';
2
+ import { resolve } from 'node:path';
3
3
  import { glob } from 'glob';
4
4
  import { parseTree, findNodeAtLocation } from 'jsonc-parser';
5
- import { getOutputPath, loadTranslationFile } from './file-utils.js';
5
+ import { getOutputPath, loadTranslationFile, getNamespaceFromOutputPath } from './file-utils.js';
6
6
  import { parseNestedReferences } from './nesting.js';
7
7
 
8
8
  const escapeRegExp = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
@@ -247,7 +247,7 @@ async function primaryNamespaces(config, primary) {
247
247
  if (typeof output === 'string' && !output.includes('{{namespace}}'))
248
248
  return [undefined];
249
249
  return (await glob(getOutputPath(output, primary, '*').replace(/\\/g, '/')))
250
- .map(file => basename(file).split('.')[0])
250
+ .map(file => getNamespaceFromOutputPath(output, primary, file))
251
251
  .filter(ns => !ignoreNamespaces.includes(ns));
252
252
  }
253
253
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "i18next-cli",
3
- "version": "1.82.4",
3
+ "version": "1.82.5",
4
4
  "description": "A unified, high-performance i18next CLI.",
5
5
  "type": "module",
6
6
  "bin": {
@@ -60,6 +60,12 @@ export declare function writeFileAsync(filePath: string, data: string): Promise<
60
60
  * - Normalizes duplicate slashes and returns a platform-correct path.
61
61
  */
62
62
  export declare function getOutputPath(outputTemplate: string | ((language: string, namespace?: string) => string) | undefined, language: string, namespace?: string): string;
63
+ /**
64
+ * The namespace of a file found with `getOutputPath(outputTemplate, language, '*')`: the part of its path
65
+ * where the template has the namespace, so `locales/{{namespace}}/{{language}}.json` works like
66
+ * `locales/{{language}}/{{namespace}}.json`. Falls back to the file name without its extension.
67
+ */
68
+ export declare function getNamespaceFromOutputPath(outputTemplate: Parameters<typeof getOutputPath>[0], language: string, filePath: string): string;
63
69
  /**
64
70
  * Dynamically loads a translation file, supporting .json, .js, and .ts formats.
65
71
  * @param filePath - The path to the translation file.
@@ -1 +1 @@
1
- {"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../src/utils/file-utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAKvD;;;;;;GAMG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;aACrB,QAAQ,EAAE,MAAM;aAAkB,KAAK,CAAC,EAAE,OAAO;gBAAjD,QAAQ,EAAE,MAAM,EAAkB,KAAK,CAAC,EAAE,OAAO,YAAA;CAK/E;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,qBAAqB,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5E;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEtE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,cAAc,CAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnF;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,cAAc,EAAE,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,EACvF,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,CA8BR;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,CA8DhG;AAGD,wBAAsB,mBAAmB,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQnF;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,MAAM,GAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC,cAAc,CAAU,EAChE,WAAW,GAAE,MAAM,GAAG,MAAU,EAChC,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CA6BR;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,GAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC,cAAc,CAAU,GACtE,WAAW,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,cAAc,CAAC,CAAC,CAO9D"}
1
+ {"version":3,"file":"file-utils.d.ts","sourceRoot":"","sources":["../../src/utils/file-utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAKvD;;;;;;GAMG;AACH,qBAAa,yBAA0B,SAAQ,KAAK;aACrB,QAAQ,EAAE,MAAM;aAAkB,KAAK,CAAC,EAAE,OAAO;gBAAjD,QAAQ,EAAE,MAAM,EAAkB,KAAK,CAAC,EAAE,OAAO,YAAA;CAK/E;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,qBAAqB,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5E;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEtE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,cAAc,CAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnF;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,cAAc,EAAE,MAAM,GAAG,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,EACvF,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB,MAAM,CA8BR;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,EACnD,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,MAAM,CASR;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,CA8DhG;AAGD,wBAAsB,mBAAmB,CAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQnF;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACzB,MAAM,GAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC,cAAc,CAAU,EAChE,WAAW,GAAE,MAAM,GAAG,MAAU,EAChC,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CA6BR;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,GAAE,oBAAoB,CAAC,SAAS,CAAC,CAAC,cAAc,CAAU,GACtE,WAAW,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,cAAc,CAAC,CAAC,CAO9D"}