@inlang/paraglide-js 2.0.7 → 2.0.8

package/dist/compiler/compile-bundle.test.js

@@ -56,7 +56,7 @@ export const blue_moon_bottle = (inputs, options = {}) => {
 	const locale = options.locale ?? getLocale()
 	trackMessageCall("blue_moon_bottle", locale)
 	if (locale === "en") return en.blue_moon_bottle(inputs)
-	if (locale === "en-US") return en_us.blue_moon_bottle(inputs)
+	if (locale === "en-US") return en_us2.blue_moon_bottle(inputs)
 	return "blue_moon_bottle"
 };"`);
 });

package/dist/compiler/compile-project.test.js

@@ -264,6 +264,7 @@ describe.each([
         });
         test("should return the correct message for the current locale", async () => {
             const { m, runtime } = await importCode(code);
+            console.log(m);
             runtime.setLocale("en");
             expect(m.sad_penguin_bundle()).toBe("A simple message.");
             runtime.setLocale("de");
@@ -571,10 +572,6 @@ describe.each([
         });
     });
     test("case sensitivity handling for bundle IDs", async () => {
-        // skip local modules for now because the option might get removed in the future
-        if (compilerOptions.outputStructure === "locale-modules") {
-            return;
-        }
         const project = await loadProjectInMemory({
             blob: await newProject({
                 settings: { locales: ["en"], baseLocale: "en" },

package/dist/compiler/output-structure/locale-modules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locale-modules.d.ts","sourceRoot":"","sources":["../../../src/compiler/output-structure/locale-modules.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAavE,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAY1E;AAED,wBAAgB,cAAc,CAC7B,eAAe,EAAE,0BAA0B,EAAE,EAC7C,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,YAAY,CAAC,EACzD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAC7C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgIxB"}
+{"version":3,"file":"locale-modules.d.ts","sourceRoot":"","sources":["../../../src/compiler/output-structure/locale-modules.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAIvE,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAE1E;AAED,wBAAgB,cAAc,CAC7B,eAAe,EAAE,0BAA0B,EAAE,EAC7C,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,YAAY,CAAC,EACzD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAC7C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAoDxB"}

package/dist/compiler/output-structure/locale-modules.js

@@ -1,66 +1,15 @@
 import { toSafeModuleId } from "../safe-module-id.js";
 import { inputsType } from "../jsdoc-types.js";
-// Helper function to escape special characters in a string for use in a regular expression
-function escapeRegExp(string) {
-    return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-// This map will be used to track which bundle IDs have been renamed to which unique IDs
-// It will be populated during the generateOutput function and used in messageReferenceExpression
-const bundleIdToUniqueIdMap = new Map();
 export function messageReferenceExpression(locale, bundleId) {
-    // First convert to safe module ID
-    const safeModuleId = toSafeModuleId(bundleId);
-    // Check if this bundleId has been mapped to a unique identifier
-    const uniqueId = bundleIdToUniqueIdMap.get(bundleId);
-    if (uniqueId) {
-        return `${toSafeModuleId(locale)}.${uniqueId}`;
-    }
-    // Otherwise, return the default safe module ID
-    return `${toSafeModuleId(locale)}.${safeModuleId}`;
+    return `${toSafeModuleId(locale)}.${toSafeModuleId(bundleId)}`;
 }
 export function generateOutput(compiledBundles, settings, fallbackMap) {
-    // Create a map to track module IDs in the index file to avoid duplicates
-    const indexModuleIdMap = new Map();
-    // Process the bundles to ensure no duplicate bundle IDs
-    // Generate unique moduleIds for duplicate IDs
-    const processedBundleCodes = compiledBundles
-        .map(({ bundle }) => {
-        const bundleId = bundle.node.id;
-        const bundleModuleId = toSafeModuleId(bundleId);
-        // Check if this safe module ID has been used before
-        if (indexModuleIdMap.has(bundleModuleId)) {
-            // Create a unique identifier by adding a counter
-            let counter = 1;
-            let uniqueModuleId = `${bundleModuleId}${counter}`;
-            while (indexModuleIdMap.has(uniqueModuleId)) {
-                counter++;
-                uniqueModuleId = `${bundleModuleId}${counter}`;
-            }
-            // Modify the code to use the unique identifier
-            const modifiedCode = bundle.code
-                .replace(new RegExp(`const ${bundleModuleId} =`, "g"), `const ${uniqueModuleId} =`)
-                .replace(new RegExp(`export const ${bundleModuleId} =`, "g"), `export const ${uniqueModuleId} =`)
-                .replace(new RegExp(`export { ${bundleModuleId}`, "g"), `export { ${uniqueModuleId}`)
-                .replace(
-            // Also update the trackMessageCall to use the new identifier
-            new RegExp(`trackMessageCall\\("${escapeRegExp(bundleId)}"`, "g"), `trackMessageCall("${bundleId}"`);
-            // Store the unique ID mapping
-            indexModuleIdMap.set(uniqueModuleId, bundleId);
-            // Also store in the global map for messageReferenceExpression to use
-            bundleIdToUniqueIdMap.set(bundleId, uniqueModuleId);
-            return modifiedCode;
-        }
-        // Store the mapping
-        indexModuleIdMap.set(bundleModuleId, bundleId);
-        return bundle.code;
-    })
-        .join("\n");
     const indexFile = [
         `import { getLocale, trackMessageCall, experimentalMiddlewareLocaleSplitting, isServer } from "../runtime.js"`,
         settings.locales
             .map((locale) => `import * as ${toSafeModuleId(locale)} from "./${locale}.js"`)
             .join("\n"),
-        processedBundleCodes,
+        compiledBundles.map(({ bundle }) => bundle.code).join("\n"),
     ].join("\n");
     const output = {
         ["messages/_index.js"]: indexFile,
@@ -69,39 +18,24 @@ export function generateOutput(compiledBundles, settings, fallbackMap) {
     for (const locale of settings.locales) {
         const filename = `messages/${locale}.js`;
         let file = "";
-        // Keep track of module IDs to avoid duplicates
-        const moduleIdMap = new Map();
         for (const compiledBundle of compiledBundles) {
             const compiledMessage = compiledBundle.messages[locale];
-            const bundleId = compiledBundle.bundle.node.id;
             const bundleModuleId = toSafeModuleId(compiledBundle.bundle.node.id);
-            // Check if this module ID has already been used
-            let uniqueModuleId = bundleModuleId;
-            if (moduleIdMap.has(bundleModuleId)) {
-                // If it has, create a unique ID by adding an index
-                let counter = 1;
-                uniqueModuleId = `${bundleModuleId}${counter}`;
-                while (moduleIdMap.has(uniqueModuleId)) {
-                    counter++;
-                    uniqueModuleId = `${bundleModuleId}${counter}`;
-                }
-            }
-            // Store this module ID
-            moduleIdMap.set(uniqueModuleId, bundleId);
+            const bundleId = compiledBundle.bundle.node.id;
             const inputs = compiledBundle.bundle.node.declarations?.filter((decl) => decl.type === "input-variable") ?? [];
             if (!compiledMessage) {
                 const fallbackLocale = fallbackMap[locale];
                 if (fallbackLocale) {
                     // use the fall back locale e.g. render the message in English if the German message is missing
-                    file += `\nexport { ${uniqueModuleId} } from "./${fallbackLocale}.js"`;
+                    file += `\nexport { ${bundleModuleId} } from "./${fallbackLocale}.js"`;
                 }
                 else {
                     // no fallback exists, render the bundleId
-                    file += `\n/** @type {(inputs: ${inputsType(inputs)}) => string} */\nexport const ${uniqueModuleId} = () => '${bundleId}'`;
+                    file += `\n/** @type {(inputs: ${inputsType(inputs)}) => string} */ */\nexport const ${bundleModuleId} = () => '${bundleId}'`;
                 }
                 continue;
             }
-            file += `\n\nexport const ${uniqueModuleId} = ${compiledMessage.code}`;
+            file += `\n\nexport const ${bundleModuleId} = ${compiledMessage.code}`;
         }
         // add import if used
         if (file.includes("registry.")) {

package/dist/compiler/output-structure/locale-modules.test.js

@@ -97,6 +97,7 @@ test("should handle case sensitivity in message IDs correctly", () => {
     const fallbackMap = {};
     const output = generateOutput(bundles, settings, fallbackMap);
     // Check that the output exists
+    expect(output).toHaveProperty("messages/_index.js");
     expect(output).toHaveProperty("messages/en.js");
     // The exported constants should not conflict
     const content = output["messages/en.js"];

package/dist/compiler/output-structure/message-modules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-modules.d.ts","sourceRoot":"","sources":["../../../src/compiler/output-structure/message-modules.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAKvE,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAE1E;AAED,wBAAgB,cAAc,CAC7B,eAAe,EAAE,0BAA0B,EAAE,EAC7C,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,YAAY,CAAC,EACzD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAC7C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAyFxB"}
+{"version":3,"file":"message-modules.d.ts","sourceRoot":"","sources":["../../../src/compiler/output-structure/message-modules.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAKvE,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAE1E;AAED,wBAAgB,cAAc,CAC7B,eAAe,EAAE,0BAA0B,EAAE,EAC7C,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,YAAY,CAAC,EACzD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,GAC7C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAkFxB"}

package/dist/compiler/output-structure/message-modules.js

@@ -9,17 +9,11 @@ export function generateOutput(compiledBundles, settings, fallbackMap) {
     const moduleFilenames = new Set();
     for (const compiledBundle of compiledBundles) {
         const bundleId = compiledBundle.bundle.node.id;
-        const safeBundleId = toSafeModuleId(compiledBundle.bundle.node.id);
+        const safeModuleId = toSafeModuleId(compiledBundle.bundle.node.id);
         const inputs = compiledBundle.bundle.node.declarations?.filter((decl) => decl.type === "input-variable") ?? [];
         // bundle file
-        let filename = `messages/${safeBundleId}.js`;
-        let counter = 0;
-        while (output[filename]) {
-            // bundle file already exists, need to append to it
-            counter += 1;
-            filename = `messages/${safeBundleId}${counter}.js`;
-        }
-        moduleFilenames.add(`${safeBundleId}${counter ? counter : ""}.js`);
+        const filename = `messages/${safeModuleId}.js`;
+        moduleFilenames.add(`${safeModuleId}.js`);
         // create fresh bundle file
         output[filename] = compiledBundle.bundle.code;
         const needsFallback = [];
@@ -32,7 +26,7 @@ export function generateOutput(compiledBundles, settings, fallbackMap) {
                 needsFallback.push(locale);
             }
             else {
-                messages.push(`const ${safeLocale}_${safeBundleId} = ${compiledMessage.code}`);
+                messages.push(`const ${safeLocale}_${safeModuleId} = ${compiledMessage.code}`);
             }
         }
         // add the fallbacks (needs to be done after the messages to avoid referencing
@@ -44,11 +38,11 @@ export function generateOutput(compiledBundles, settings, fallbackMap) {
             if (fallbackLocale) {
                 const safeFallbackLocale = toSafeModuleId(fallbackLocale);
                 // take the fallback locale
-                messages.push(`/** @type {(inputs: ${inputsType(inputs)}) => string} */\nconst ${safeLocale}_${safeBundleId} = ${safeFallbackLocale}_${safeBundleId};`);
+                messages.push(`/** @type {(inputs: ${inputsType(inputs)}) => string} */\nconst ${safeLocale}_${safeModuleId} = ${safeFallbackLocale}_${safeModuleId};`);
             }
             else {
                 // fallback to just the bundle id
-                messages.push(`/** @type {(inputs: ${inputsType(inputs)}) => string} */\nconst ${safeLocale}_${safeBundleId} = () => '${escapeForSingleQuoteString(bundleId)}'`);
+                messages.push(`/** @type {(inputs: ${inputsType(inputs)}) => string} */\nconst ${safeLocale}_${safeModuleId} = () => '${escapeForSingleQuoteString(bundleId)}'`);
             }
         }
         output[filename] = messages.join("\n\n") + "\n\n" + output[filename];

package/dist/compiler/output-structure/message-modules.test.js

@@ -72,6 +72,6 @@ test("handles case senstivity by creating directories and files only in lowercas
     const output = generateOutput(resources, settings, {});
     // expecting only lowercase directories and files
     expect(output).toHaveProperty("messages/happyelephant.js");
-    expect(output).toHaveProperty("messages/happyelephant1.js");
+    expect(output).toHaveProperty("messages/happyelephant2.js");
     expect(output).not.toHaveProperty("messages/HappyElephant.js");
 });

package/dist/compiler/safe-module-id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"safe-module-id.d.ts","sourceRoot":"","sources":["../../src/compiler/safe-module-id.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAYjD;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAElD"}
+{"version":3,"file":"safe-module-id.d.ts","sourceRoot":"","sources":["../../src/compiler/safe-module-id.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAmBjD;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAElD"}

package/dist/compiler/safe-module-id.js

@@ -12,7 +12,13 @@ export function toSafeModuleId(id) {
     else if (reservedJsKeywords.includes(result)) {
         return "_" + result;
     }
-    return result;
+    let numUppercase = 0;
+    for (const char of id) {
+        if (char.match(/[A-Z]/)) {
+            numUppercase++;
+        }
+    }
+    return result + (numUppercase > 0 ? `${numUppercase}` : "");
 }
 export function isSafeModuleId(id) {
     return toSafeModuleId(id) === id;

package/dist/compiler/safe-module-id.test.js

@@ -1,14 +1,14 @@
 import { test, expect } from "vitest";
 import { toSafeModuleId } from "./safe-module-id.js";
 test("handles emojis (because why not)", () => {
-    expect(toSafeModuleId("helloWorld🍌")).toBe("helloworld__");
+    expect(toSafeModuleId("helloWorld🍌")).toBe("helloworld__1");
 });
 // https://github.com/opral/inlang-paraglide-js/issues/395
 test("makes everything lowercase", () => {
-    expect(toSafeModuleId("HelloWorld")).toBe("helloworld");
+    expect(toSafeModuleId("HelloWorld")).toBe("helloworld2");
 });
 test('escapes "-" to "_"', () => {
-    expect(toSafeModuleId("de-DE-bavaria")).toBe("de_de_bavaria");
+    expect(toSafeModuleId("de-DE-bavaria")).toBe("de_de_bavaria2");
 });
 test("prefixes with _ if it starts with a number", () => {
     expect(toSafeModuleId("123")).toBe("_123");
@@ -28,3 +28,8 @@ test("transforms js reserved keywords", async () => {
     // https://github.com/opral/inlang-paraglide-js/issues/331
     expect(toSafeModuleId("then")).toBe("_then");
 });
+test("adds an uppercase counter for de-duplication", async () => {
+    expect(toSafeModuleId("helloworld")).toBe("helloworld");
+    expect(toSafeModuleId("helloWorld")).toBe("helloworld1");
+    expect(toSafeModuleId("HelloWorld")).toBe("helloworld2");
+});

package/dist/services/env-variables/index.js

@@ -1,5 +1,5 @@
 export const ENV_VARIABLES = {
     PARJS_APP_ID: "library.inlang.paraglideJs",
     PARJS_POSTHOG_TOKEN: "phc_m5yJZCxjOGxF8CJvP5sQ3H0d76xpnLrsmiZHduT4jDz",
-    PARJS_PACKAGE_VERSION: "2.0.7",
+    PARJS_PACKAGE_VERSION: "2.0.8",
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@inlang/paraglide-js",
   "type": "module",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "license": "MIT",
   "publishConfig": {
     "access": "public",
@@ -50,9 +50,9 @@
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.20.0",
     "vitest": "2.1.8",
-    "@inlang/plugin-message-format": "4.0.0",
+    "@inlang/paraglide-js": "2.0.8",
     "@opral/tsconfig": "1.1.0",
-    "@inlang/paraglide-js": "2.0.7"
+    "@inlang/plugin-message-format": "4.0.0"
   },
   "keywords": [
     "inlang",