@inlang/paraglide-js 2.0.0-beta.20 → 2.0.0-beta.21

package/dist/bundler-plugins/rollup.d.ts

@@ -1,2 +1,2 @@
-export declare const paraglideRollupPlugin: (options: import("../index.js").CompilerOptions) => import("unplugin").RollupPlugin<any> | import("unplugin").RollupPlugin<any>[];
+export declare const paraglideRollupPlugin: (options: import("../index.js").CompilerOptions) => import("rollup").Plugin<any> | import("rollup").Plugin<any>[];
 //# sourceMappingURL=rollup.d.ts.map

package/dist/bundler-plugins/rollup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/bundler-plugins/rollup.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB,mIAAsC,CAAC"}
+{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/bundler-plugins/rollup.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB,mHAAsC,CAAC"}

package/dist/bundler-plugins/unplugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unplugin.d.ts","sourceRoot":"","sources":["../../src/bundler-plugins/unplugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAMhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAcvE,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,eAAe,CAoF3D,CAAC"}
+{"version":3,"file":"unplugin.d.ts","sourceRoot":"","sources":["../../src/bundler-plugins/unplugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAMhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAQvE,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,eAAe,CAiF3D,CAAC"}

package/dist/bundler-plugins/unplugin.js

@@ -5,23 +5,16 @@ import { nodeNormalizePath } from "../utilities/node-normalize-path.js";
 import { Logger } from "../services/logger/index.js";
 const PLUGIN_NAME = "unplugin-paraglide-js";
 const logger = new Logger();
-let compilationResult;
-// https://github.com/opral/inlang-paraglide-js/issues/371
-//
-// has the second benefit that paraglide js only compiles once
-// per enviornment build (browser, server, etc.)
-let hasInitiallyCompiled = false;
+let previousCompilation;
 export const unpluginFactory = (args) => ({
     name: PLUGIN_NAME,
     enforce: "pre",
     async buildStart() {
-        if (hasInitiallyCompiled === true) {
-            return;
-        }
         logger.info("Compiling inlang project...");
         try {
-            compilationResult = await compile({
+            previousCompilation = await compile({
                 fs: wrappedFs,
+                previousCompilation,
                 ...args,
             });
             logger.success("Compilation complete");
@@ -35,7 +28,6 @@ export const unpluginFactory = (args) => ({
             for (const path of Array.from(readFiles)) {
                 this.addWatchFile(path);
             }
-            hasInitiallyCompiled = true;
         }
     },
     async watchChange(path) {
@@ -48,10 +40,11 @@ export const unpluginFactory = (args) => ({
             logger.info(`Re-compiling inlang project... File "${relative(process.cwd(), path)}" has changed.`);
             // Clear readFiles to track fresh file reads
             readFiles.clear();
-            compilationResult = await compile({
+            previousCompilation = await compile({
                 fs: wrappedFs,
+                previousCompilation,
                 ...args,
-            }, compilationResult?.outputHashes);
+            });
             logger.success("Compilation complete");
             // Add any new files to watch
             for (const filePath of Array.from(readFiles)) {
@@ -61,7 +54,7 @@ export const unpluginFactory = (args) => ({
         catch (e) {
             readFiles = previouslyReadFiles;
             // Reset compilation result on error
-            compilationResult = undefined;
+            previousCompilation = undefined;
             logger.warn("Failed to re-compile project:", e.message);
         }
     },
@@ -74,14 +67,14 @@ export const unpluginFactory = (args) => ({
                 async_hooks: false,
             },
         };
-        //we need the compiler to run before the build so that the message-modules will be present
-        //In the other bundlers `buildStart` already runs before the build. In webpack it's a race condition
         compiler.hooks.beforeRun.tapPromise(PLUGIN_NAME, async () => {
             try {
-                await compile({
+                previousCompilation = await compile({
                     fs: wrappedFs,
+                    previousCompilation,
                     ...args,
                 });
+                logger.success("Compilation complete");
             }
             catch (error) {
                 logger.warn("Failed to compile project:", error.message);

package/dist/compiler/compile-bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile-bundle.d.ts","sourceRoot":"","sources":["../../src/compiler/compile-bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAKjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAI3C,MAAM,MAAM,0BAA0B,GAAG;IACxC,kDAAkD;IAClD,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzB,gDAAgD;IAChD,QAAQ,EAAE;QACT,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;KACpC,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,SAAU;IACnC,MAAM,EAAE,YAAY,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAChD,KAAG,0BAmCH,CAAC"}
+{"version":3,"file":"compile-bundle.d.ts","sourceRoot":"","sources":["../../src/compiler/compile-bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAK3C,MAAM,MAAM,0BAA0B,GAAG;IACxC,kDAAkD;IAClD,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzB,gDAAgD;IAChD,QAAQ,EAAE;QACT,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;KACpC,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,SAAU;IACnC,MAAM,EAAE,YAAY,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAChD,KAAG,0BAyBH,CAAC"}

package/dist/compiler/compile-bundle.js

@@ -1,21 +1,12 @@
 import { compileMessage } from "./compile-message.js";
-import { jsIdentifier } from "../services/codegen/identifier.js";
-import { isValidJSIdentifier } from "../services/valid-js-identifier/index.js";
-import { escapeForDoubleQuoteString } from "../services/codegen/escape.js";
 import { jsDocBundleFunctionTypes } from "./jsdoc-types.js";
-import { KEYWORDS } from "../services/valid-js-identifier/reserved-words.js";
+import { toSafeModuleId } from "./safe-module-id.js";
+import { escapeForDoubleQuoteString } from "../services/codegen/escape.js";
 /**
  * Compiles all the messages in the bundle and returns an index-function + each compiled message
  */
 export const compileBundle = (args) => {
     const compiledMessages = {};
-    if (KEYWORDS.includes(args.bundle.id) || args.bundle.id === "then") {
-        throw new Error([
-            `You are using a reserved JS keyword as id "${args.bundle.id}".`,
-            "Rename the message bundle id to something else.",
-            "See https://github.com/opral/inlang-paraglide-js/issues/331",
-        ].join("\n"));
-    }
     for (const message of args.bundle.messages) {
         if (compiledMessages[message.locale]) {
             throw new Error(`Duplicate locale: ${message.locale}`);
@@ -35,6 +26,8 @@ export const compileBundle = (args) => {
 const compileBundleFunction = (args) => {
     const inputs = args.bundle.declarations.filter((decl) => decl.type === "input-variable");
     const hasInputs = inputs.length > 0;
+    const safeBundleId = toSafeModuleId(args.bundle.id);
+    const isSafeBundleId = safeBundleId === args.bundle.id;
     let code = `/**
 * This function has been compiled by [Paraglide JS](https://inlang.com/m/gerre34r).
 *
@@ -45,20 +38,15 @@ const compileBundleFunction = (args) => {
 * ${jsDocBundleFunctionTypes({ inputs, locales: args.availableLocales })}
 */
 /* @__NO_SIDE_EFFECTS__ */
-const ${jsIdentifier(args.bundle.id)} = (inputs${hasInputs ? "" : "= {}"}, options = {}) => {
+${isSafeBundleId ? "export" : ""} const ${safeBundleId} = (inputs${hasInputs ? "" : "= {}"}, options = {}) => {
 	const locale = options.locale ?? getLocale()
 	${args.availableLocales
-        .map((locale, index) => `${index > 0 ? "	" : ""}if (locale === "${locale}") return ${jsIdentifier(locale)}.${args.bundle.id}(inputs)`)
+        .map((locale, index) => `${index > 0 ? "	" : ""}if (locale === "${locale}") return ${toSafeModuleId(locale)}.${safeBundleId}(inputs)`)
         .join("\n")}
 	return "${args.bundle.id}"
-}
-	`;
-    // export the function
-    if (isValidJSIdentifier(args.bundle.id)) {
-        code += `\nexport { ${args.bundle.id} }`;
-    }
-    else {
-        code += `\nexport { ${jsIdentifier(args.bundle.id)} as "${escapeForDoubleQuoteString(args.bundle.id)}" }`;
+};`;
+    if (isSafeBundleId === false) {
+        code += `\nexport { ${safeBundleId} as "${escapeForDoubleQuoteString(args.bundle.id)}" }`;
     }
     return {
         code,

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

@@ -1,6 +1,33 @@
 import { test, expect } from "vitest";
 import { compileBundle } from "./compile-bundle.js";
+import { toSafeModuleId } from "./safe-module-id.js";
 test("compiles to jsdoc", async () => {
+    const mockBundle = {
+        id: "blue_moon_bottle",
+        declarations: [{ type: "input-variable", name: "age" }],
+        messages: [
+            {
+                id: "message-id",
+                bundleId: "blue_moon_bottle",
+                locale: "en",
+                selectors: [],
+                variants: [
+                    {
+                        id: "1",
+                        messageId: "message-id",
+                        matches: [],
+                        pattern: [
+                            { type: "text", value: "Hello" },
+                            {
+                                type: "expression",
+                                arg: { type: "variable-reference", name: "age" },
+                            },
+                        ],
+                    },
+                ],
+            },
+        ],
+    };
     const result = compileBundle({
         fallbackMap: {
             en: "en",
@@ -21,48 +48,44 @@ test("compiles to jsdoc", async () => {
 * @returns {string}
 */
 /* @__NO_SIDE_EFFECTS__ */
-const blue_moon_bottle = (inputs, options = {}) => {
+export const blue_moon_bottle = (inputs, options = {}) => {
 	const locale = options.locale ?? getLocale()
 	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_us.blue_moon_bottle(inputs)
 	return "blue_moon_bottle"
-}
-	
-export { blue_moon_bottle }"`);
+};"`);
 });
-const mockBundle = {
-    id: "blue_moon_bottle",
-    declarations: [{ type: "input-variable", name: "age" }],
-    messages: [
-        {
-            id: "message-id",
-            bundleId: "blue_moon_bottle",
-            locale: "en",
-            selectors: [],
-            variants: [
-                {
-                    id: "1",
-                    messageId: "message-id",
-                    matches: [],
-                    pattern: [
-                        { type: "text", value: "Hello" },
-                        {
-                            type: "expression",
-                            arg: { type: "variable-reference", name: "age" },
-                        },
-                    ],
-                },
-            ],
-        },
-    ],
-};
-test("throws if a JS keyword is used as an identifier", async () => {
-    expect(() => compileBundle({
+// https://github.com/opral/inlang-paraglide-js/issues/285
+test("compiles bundles with arbitrary module identifiers", async () => {
+    const mockBundle = {
+        id: "$p@44🍌",
+        declarations: [{ type: "input-variable", name: "age" }],
+        messages: [
+            {
+                id: "message-id",
+                bundleId: "$p@44🍌",
+                locale: "en",
+                selectors: [],
+                variants: [
+                    {
+                        id: "1",
+                        messageId: "message-id",
+                        matches: [],
+                        pattern: [
+                            { type: "text", value: "Hello" },
+                            {
+                                type: "expression",
+                                arg: { type: "variable-reference", name: "age" },
+                            },
+                        ],
+                    },
+                ],
+            },
+        ],
+    };
+    const result = compileBundle({
         fallbackMap: {},
-        bundle: {
-            id: "then",
-            declarations: [],
-            messages: [],
-        },
-    })).toThrow();
+        bundle: mockBundle,
+    });
+    expect(result.bundle.code).includes(`export { ${toSafeModuleId("$p@44🍌")} as "$p@44🍌" }`);
 });

package/dist/compiler/compile-message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile-message.d.ts","sourceRoot":"","sources":["../../src/compiler/compile-message.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAK3C;;;GAGG;AACH,eAAO,MAAM,cAAc,iBACZ,WAAW,EAAE,WAClB,OAAO,YACN,OAAO,EAAE,KACjB,QAAQ,CAAC,OAAO,CAUlB,CAAC"}
+{"version":3,"file":"compile-message.d.ts","sourceRoot":"","sources":["../../src/compiler/compile-message.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAM3C;;;GAGG;AACH,eAAO,MAAM,cAAc,iBACZ,WAAW,EAAE,WAClB,OAAO,YACN,OAAO,EAAE,KACjB,QAAQ,CAAC,OAAO,CAUlB,CAAC"}

package/dist/compiler/compile-message.js

@@ -2,6 +2,7 @@ import { compilePattern } from "./compile-pattern.js";
 import { doubleQuote } from "../services/codegen/quotes.js";
 import { inputsType } from "./jsdoc-types.js";
 import { compileLocalVariable } from "./compile-local-variable.js";
+import { toSafeModuleId } from "./safe-module-id.js";
 /**
  * Returns the compiled message as a string
  *
@@ -33,8 +34,9 @@ function compileMessageWithOneVariant(declarations, message, variants) {
             compiledLocalVariables.push(compileLocalVariable({ declaration, locale: message.locale }));
         }
     }
+    const safeModuleId = toSafeModuleId(message.bundleId);
     const code = `/** @type {(inputs: ${inputsType(inputs)}) => string} */
-export const ${message.bundleId} = (${hasInputs ? "i" : ""}) => {
+export const ${safeModuleId} = (${hasInputs ? "i" : ""}) => {
 	${compiledLocalVariables.join("\n\t")}return ${compiledPattern.code}
 };`;
     return { code, node: message };
@@ -81,8 +83,9 @@ function compileMessageWithMultipleVariants(declarations, message, variants) {
             compiledLocalVariables.push(compileLocalVariable({ declaration, locale: message.locale }));
         }
     }
+    const safeModuleId = toSafeModuleId(message.bundleId);
     const code = `/** @type {(inputs: ${inputsType(inputs)}) => string} */
-export const ${message.bundleId} = (${hasInputs ? "i" : ""}) => {
+export const ${safeModuleId} = (${hasInputs ? "i" : ""}) => {
 	${compiledLocalVariables.join("\n\t")}
 	${compiledVariants.join("\n\t")}
 	return \`${message.id}\`;

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

@@ -1,6 +1,7 @@
 import { test, expect } from "vitest";
 import { compileMessage } from "./compile-message.js";
 import { createRegistry } from "./registry.js";
+import { toSafeModuleId } from "./safe-module-id.js";
 test("compiles a message with a single variant", async () => {
     const declarations = [];
     const message = {
@@ -254,3 +255,25 @@ test("compiles messages that use datetime a function with options", async () =>
     expect(enMessage({ date: "2022-03-31" })).toMatch(/Today is March \d{1,2}\./);
     expect(deMessage({ date: "2022-03-31" })).toMatch(/Today is \d{1,2}\. März\./);
 });
+// https://github.com/opral/inlang-paraglide-js/issues/285
+test("compiles messages with arbitrary module identifiers", async () => {
+    const declarations = [];
+    const message = {
+        locale: "en",
+        bundleId: "$p@44🍌",
+        id: "message-id",
+        selectors: [],
+    };
+    const variants = [
+        {
+            id: "1",
+            messageId: "message-id",
+            matches: [],
+            pattern: [{ type: "text", value: "Hello" }],
+        },
+    ];
+    const compiled = compileMessage(declarations, message, variants);
+    const m = await import("data:text/javascript;base64," +
+        Buffer.from(compiled.code).toString("base64"));
+    expect(m[toSafeModuleId("$p@44🍌")]()).toBe("Hello");
+});

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

@@ -328,6 +328,32 @@ describe.each([
             runtime.setLocale("en-US");
             expect(m.missingInGerman()).toBe("A simple message.");
         });
+        test("arbitrary module identifiers work", async () => {
+            const project = await loadProjectInMemory({
+                blob: await newProject({
+                    settings: { locales: ["en", "de"], baseLocale: "en" },
+                }),
+            });
+            await insertBundleNested(project.db, createBundleNested({
+                id: "$502.23-hello_world",
+                messages: [
+                    {
+                        locale: "en",
+                        variants: [
+                            { pattern: [{ type: "text", value: "A simple message." }] },
+                        ],
+                    },
+                ],
+            }));
+            const output = await compileProject({
+                project,
+                compilerOptions,
+            });
+            const code = await bundleCode(output, `export * as m from "./paraglide/messages.js"
+					export * as runtime from "./paraglide/runtime.js"`);
+            const { m } = await importCode(code);
+            expect(m["$502.23-hello_world"]()).toBe("A simple message.");
+        });
         test("falls back to parent locale if message doesn't exist", async () => {
             const project = await loadProjectInMemory({
                 blob: await newProject({

package/dist/compiler/compile.d.ts

@@ -1,4 +1,7 @@
 import { type CompilerOptions } from "./compiler-options.js";
+export type CompilationResult = {
+    outputHashes: Record<string, string> | undefined;
+};
 /**
  * Loads, compiles, and writes the output to disk.
  *
@@ -12,7 +15,7 @@ import { type CompilerOptions } from "./compiler-options.js";
  *     outdir: 'path/to/output',
  *   })
  */
-export declare function compile(options: CompilerOptions, previousOutputHashes?: Record<string, string>): Promise<{
-    outputHashes: Record<string, string> | undefined;
-}>;
+export declare function compile(options: CompilerOptions & {
+    previousCompilation?: CompilationResult;
+}): Promise<CompilationResult>;
 //# sourceMappingURL=compile.d.ts.map

package/dist/compiler/compile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/compiler/compile.ts"],"names":[],"mappings":"AASA,OAAO,EAEN,KAAK,eAAe,EACpB,MAAM,uBAAuB,CAAC;AAQ/B;;;;;;;;;;;;GAYG;AACH,wBAAsB,OAAO,CAC5B,OAAO,EAAE,eAAe,EACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3C,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAA;CAAE,CAAC,CA6D/D"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../src/compiler/compile.ts"],"names":[],"mappings":"AASA,OAAO,EAEN,KAAK,eAAe,EACpB,MAAM,uBAAuB,CAAC;AAQ/B,MAAM,MAAM,iBAAiB,GAAG;IAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;CACjD,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAsB,OAAO,CAC5B,OAAO,EAAE,eAAe,GAAG;IAC1B,mBAAmB,CAAC,EAAE,iBAAiB,CAAC;CACxC,GACC,OAAO,CAAC,iBAAiB,CAAC,CAgE5B"}

package/dist/compiler/compile.js

@@ -21,7 +21,7 @@ let compilationInProgress = null;
  *     outdir: 'path/to/output',
  *   })
  */
-export async function compile(options, previousOutputHashes) {
+export async function compile(options) {
     const withDefaultOptions = {
         ...defaultCompilerOptions,
         ...options,
@@ -48,7 +48,7 @@ export async function compile(options, previousOutputHashes) {
                 directory: absoluteOutdir,
                 output,
                 fs: fs.promises,
-                previousOutputHashes,
+                previousOutputHashes: options.previousCompilation?.outputHashes,
             });
             if (!localAccount) {
                 const activeAccount = await project.lix.db
@@ -60,6 +60,10 @@ export async function compile(options, previousOutputHashes) {
             await project.close();
             return { outputHashes };
         }
+        catch (e) {
+            console.error(e);
+            return { outputHashes: undefined };
+        }
         finally {
             // release the lock
             compilationInProgress = null;

package/dist/compiler/compile.test.js

@@ -216,11 +216,15 @@ test("includes eslint-disable comment", async () => {
     const messagesWithoutComment = await fs.promises.readFile("/output/messages.js", "utf8");
     expect(messagesWithoutComment).not.toContain("// eslint-disable");
 });
-test("default compiler options should include variable and baseLocale to ensure easy try out of paraglide js, working both in server and browser environemnts", () => {
+test("default compiler options should include cookied, variable and baseLocale to ensure easy try out of paraglide js, working both in server and browser environemnts", () => {
     // someone trying out paraglide js should be able to call `getLocale()` and `setLocale()`
     // without getting an error slammed in their face saying "define your strategy".
     //
     // instead, make the apis work out of the box and once the developer is convinced that
     // paraglide js is the right tool for them, they can then define their own strategy.
-    expect(defaultCompilerOptions.strategy).toEqual(expect.arrayContaining(["globalVariable", "baseLocale"]));
+    expect(defaultCompilerOptions.strategy).toEqual([
+        "cookie",
+        "globalVariable",
+        "baseLocale",
+    ]);
 });

package/dist/compiler/compiler-options.d.ts

@@ -4,7 +4,7 @@ export declare const defaultCompilerOptions: {
     readonly emitGitIgnore: true;
     readonly includeEslintDisableComment: true;
     readonly emitPrettierIgnore: true;
-    readonly strategy: ["url", "cookie", "globalVariable", "baseLocale"];
+    readonly strategy: ["cookie", "globalVariable", "baseLocale"];
     readonly cookieName: "PARAGLIDE_LOCALE";
 };
 export type CompilerOptions = {

package/dist/compiler/compiler-options.js

@@ -3,6 +3,6 @@ export const defaultCompilerOptions = {
     emitGitIgnore: true,
     includeEslintDisableComment: true,
     emitPrettierIgnore: true,
-    strategy: ["url", "cookie", "globalVariable", "baseLocale"],
+    strategy: ["cookie", "globalVariable", "baseLocale"],
     cookieName: "PARAGLIDE_LOCALE",
 };

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;AAIvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,wBAAgB,qBAAqB,CACpC,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,EAC/C,eAAe,EAAE;IAChB,QAAQ,EAAE,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACnD,UAAU,EAAE,WAAW,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;CACvD,GACC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAyDxB"}
+{"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;AAGvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,wBAAgB,qBAAqB,CACpC,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,EAC/C,eAAe,EAAE;IAChB,QAAQ,EAAE,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACnD,UAAU,EAAE,WAAW,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;CACvD,GACC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA2DxB"}

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

@@ -1,11 +1,11 @@
-import { jsIdentifier } from "../../services/codegen/identifier.js";
 import { createRuntimeFile } from "../runtime/create-runtime.js";
 import { createRegistry } from "../registry.js";
+import { toSafeModuleId } from "../safe-module-id.js";
 export function generateLocaleModules(compiledBundles, settings, fallbackMap, compilerOptions) {
     const indexFile = [
         `import { getLocale } from "../runtime.js"`,
         settings.locales
-            .map((locale) => `import * as ${jsIdentifier(locale)} from "./${locale}.js"`)
+            .map((locale) => `import * as ${toSafeModuleId(locale)} from "./${locale}.js"`)
             .join("\n"),
         compiledBundles.map(({ bundle }) => bundle.code).join("\n"),
     ].join("\n");
@@ -29,16 +29,17 @@ export function generateLocaleModules(compiledBundles, settings, fallbackMap, co
         let file = "";
         for (const compiledBundle of compiledBundles) {
             const compiledMessage = compiledBundle.messages[locale];
-            const id = jsIdentifier(compiledBundle.bundle.node.id);
+            const bundleModuleId = toSafeModuleId(compiledBundle.bundle.node.id);
+            const bundleId = compiledBundle.bundle.node.id;
             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 { ${id} } from "./${fallbackLocale}.js"`;
+                    file += `\nexport { ${bundleModuleId} } from "./${fallbackLocale}.js"`;
                 }
                 else {
                     // no fallback exists, render the bundleId
-                    file += `\nexport const ${id} = () => '${id}'`;
+                    file += `\n/** @type {(inputs?: Record<string, never>) => string} */\nexport const ${bundleModuleId} = () => '${bundleId}'`;
                 }
                 continue;
             }

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,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,wBAAgB,sBAAsB,CACrC,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,EAC/C,eAAe,EAAE;IAChB,QAAQ,EAAE,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACnD,UAAU,EAAE,WAAW,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;CACvD,GACC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAwExB"}
+{"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;AAIvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,wBAAgB,sBAAsB,CACrC,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,EAC/C,eAAe,EAAE;IAChB,QAAQ,EAAE,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACnD,UAAU,EAAE,WAAW,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC;CACvD,GACC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAoFxB"}

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

@@ -1,7 +1,7 @@
 import { createRuntimeFile } from "../runtime/create-runtime.js";
 import { createRegistry } from "../registry.js";
-import { jsIdentifier } from "../../services/codegen/identifier.js";
 import { escapeForSingleQuoteString } from "../../services/codegen/escape.js";
+import { toSafeModuleId } from "../safe-module-id.js";
 export function generateMessageModules(compiledBundles, settings, fallbackMap, compilerOptions) {
     const output = {
         ["runtime.js"]: createRuntimeFile({
@@ -11,33 +11,40 @@ export function generateMessageModules(compiledBundles, settings, fallbackMap, c
         }),
         ["registry.js"]: createRegistry(),
     };
-    // messages index file
+    // all messages index file
     output["messages/_index.js"] = [
-        ...compiledBundles.map(({ bundle }) => `export * from './${bundle.node.id}/index.js'`),
+        ...compiledBundles.map(({ bundle }) => `export * from './${toSafeModuleId(bundle.node.id)}/index.js'`),
     ].join("\n");
     output["messages.js"] = [
         "export * from './messages/_index.js'",
         "// enabling auto-import by exposing all messages as m",
         "export * as m from './messages/_index.js'",
     ].join("\n");
-    // Creates a per message index file
     for (const compiledBundle of compiledBundles) {
-        const filename = `messages/${compiledBundle.bundle.node.id}/index.js`;
-        const code = [
-            settings.locales
-                .map((locale) => `import * as ${jsIdentifier(locale)} from "./${locale}.js"`)
-                .join("\n"),
-            `import { getLocale } from '../../runtime.js'`,
-            "",
-            compiledBundle.bundle.code,
-        ].join("\n");
-        output[filename] = code;
-    }
-    for (const locale of settings.locales) {
-        for (const compiledBundle of compiledBundles) {
+        const bundleFileId = toSafeModuleId(compiledBundle.bundle.node.id);
+        // bundle file
+        const indexFilename = `messages/${bundleFileId}/index.js`;
+        if (output[indexFilename]) {
+            // bundle file already exists, need to append to it
+            output[indexFilename] += `\n${compiledBundle.bundle.code}`;
+        }
+        else {
+            // create fresh bundle file
+            const code = [
+                settings.locales
+                    .map((locale) => `import * as ${toSafeModuleId(locale)} from "./${locale}.js"`)
+                    .join("\n"),
+                `import { getLocale } from '../../runtime.js'`,
+                "",
+                compiledBundle.bundle.code,
+            ].join("\n");
+            output[indexFilename] = code;
+        }
+        // message files
+        for (const locale of settings.locales) {
             let file = "";
             const compiledMessage = compiledBundle.messages[locale];
-            const id = jsIdentifier(compiledBundle.bundle.node.id);
+            const id = toSafeModuleId(compiledBundle.bundle.node.id);
             if (!compiledMessage) {
                 // add fallback
                 const fallbackLocale = fallbackMap[locale];
@@ -47,18 +54,24 @@ export function generateMessageModules(compiledBundles, settings, fallbackMap, c
                 }
                 else {
                     // fallback to just the bundle id
-                    file += `\nexport const ${id} = () => '${escapeForSingleQuoteString(compiledBundle.bundle.node.id)}'`;
+                    file += `\n/** @type {(inputs?: Record<string, never>) => string} */\nexport const ${id} = () => '${escapeForSingleQuoteString(compiledBundle.bundle.node.id)}'`;
                 }
             }
             else {
                 file += `\n${compiledMessage.code}`;
             }
-            // Add the registry import to the message file
-            // if registry is used
-            if (file.includes("registry.")) {
-                file = `import * as registry from '../../registry.js'\n` + file;
+            if (output[`messages/${bundleFileId}/${locale}.js`]) {
+                // message file already exists, need to append to it
+                output[`messages/${bundleFileId}/${locale}.js`] += file;
+            }
+            else {
+                // Add the registry import to the message file
+                // if registry is used
+                if (file.includes("registry.")) {
+                    file = `import * as registry from '../../registry.js'\n` + file;
+                }
+                output[`messages/${bundleFileId}/${locale}.js`] = file;
             }
-            output[`messages/${compiledBundle.bundle.node.id}/${locale}.js`] = file;
         }
     }
     return output;