Fix getLocalizationTable

robincodex · Mar 29, 2024 · 803bd1f · 803bd1f
1 parent 15f7ca8
commit 803bd1f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/__tests__/__snapshots__/localize_macro_test.ts.snap b/__tests__/__snapshots__/localize_macro_test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`localize_macro getLocalizationList 1`] = `
+exports[`localize_macro getLocalizationTable 1`] = `
 ""use strict";
 
 const token_a = "#test_token_a";

diff --git a/__tests__/localize_macro_test.ts b/__tests__/localize_macro_test.ts
@@ -1,9 +1,9 @@
 import { parseMacros } from './utils';
 import { describe, expect, test } from '@jest/globals';
-import { getLocalizationList } from '../packages/panorama-all-in-jsx/src/localize.macro';
+import { getLocalizationTable } from '../packages/panorama-all-in-jsx/src/localize.macro';
 
 describe('localize_macro', function () {
-    test('getLocalizationList', function () {
+    test('getLocalizationTable', function () {
         const result = parseMacros(
             `
             import localize from '../packages/panorama-all-in-jsx/src/localize.macro';
@@ -21,7 +21,7 @@ describe('localize_macro', function () {
         );
         expect(result).toMatchSnapshot();
 
-        expect(getLocalizationList()).toStrictEqual({
+        expect(getLocalizationTable()).toStrictEqual({
             test_token_a: {
                 english: 'this is a',
                 schinese: '这是a',

diff --git a/packages/panorama-all-in-jsx/package.json b/packages/panorama-all-in-jsx/package.json
@@ -1,6 +1,6 @@
 {
     "name": "solid-panorama-all-in-jsx",
-    "version": "0.3.7",
+    "version": "0.3.8",
     "description": "",
     "engines": {
         "node": ">=16.0.0"

diff --git a/packages/panorama-all-in-jsx/src/localize.macro.ts b/packages/panorama-all-in-jsx/src/localize.macro.ts
@@ -1,11 +1,17 @@
 import { createMacro } from 'babel-plugin-macros';
 import { createHash } from 'crypto';
 
-let localizationList: Record<string, Record<string, string>> = {};
+type LocalizationTable = Record<string, Record<string, string>>;
+
+let fileLocalization: Record<string, LocalizationTable> = {};
 
 export default createMacro(
     function ({ references, state, babel, config }) {
-        localizationList = {};
+        if (!state.filename) {
+            throw new Error('state.filename is not defined');
+        }
+        const localizationTable: LocalizationTable = {};
+        fileLocalization[state.filename] = localizationTable;
         const argv = config ? config['localize_language_argv'] : ['english'];
 
         for (const path of references.default) {
@@ -64,7 +70,7 @@ export default createMacro(
                     hash.update(token);
                     token = `token_${hash.digest('hex').slice(0, 16)}`;
                 }
-                localizationList[token] = localizationData;
+                localizationTable[token] = localizationData;
 
                 // replace localize call with token
                 path.parentPath.replaceWith(
@@ -76,6 +82,10 @@ export default createMacro(
     { configName: 'panorama-all-in-jsx' }
 );
 
-export function getLocalizationList() {
-    return localizationList;
+export function getLocalizationTable() {
+    const localizationTable: LocalizationTable = {};
+    for (const [_, table] of Object.entries(fileLocalization)) {
+        Object.assign(localizationTable, table);
+    }
+    return localizationTable;
 }
diff --git a/packages/panorama-all-in-jsx/types/localize.macro.d.ts b/packages/panorama-all-in-jsx/types/localize.macro.d.ts
@@ -31,7 +31,7 @@ export interface LocalizationData {
     ukrainian?: string;
     vietnamese?: string;
 }
-export function getLocalizationList<T extends LocalizationData>(): Record<
+export function getLocalizationTable<T extends LocalizationData>(): Record<
     string,
     T
 >;