@inlang/paraglide-js 1.0.0-prerelease.21 → 1.0.0-prerelease.23

package/dist/index.js

@@ -162,14 +162,14 @@ var require_main = __commonJS({
       const keys = _dotenvKey(options).split(",");
       const length = keys.length;
       let decrypted;
-      for (let i = 0; i < length; i++) {
+      for (let i2 = 0; i2 < length; i2++) {
         try {
-          const key = keys[i].trim();
+          const key = keys[i2].trim();
           const attrs = _instructions(result, key);
           decrypted = DotenvModule.decrypt(attrs.ciphertext, attrs.key);
           break;
         } catch (error) {
-          if (i + 1 >= length) {
+          if (i2 + 1 >= length) {
             throw error;
           }
         }
@@ -367,9 +367,8 @@ import "@inlang/sdk";
 
 // src/compiler/compilePattern.ts
 init_define_ENV_DEFINED_IN_BUILD_STEP();
-import { isValidJSIdentifier } from "@inlang/valid-js-identifier";
 
-// src/services/escape/index.ts
+// src/services/codegen/escape.ts
 init_define_ENV_DEFINED_IN_BUILD_STEP();
 function escapeForTemplateLiteral(text) {
   return text.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\${/g, "\\${");
@@ -377,6 +376,81 @@ function escapeForTemplateLiteral(text) {
 function escapeForSingleQuoteString(text) {
   return text.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
 }
+function escapeForDoubleQuoteString(text) {
+  return text.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+}
+
+// src/services/valid-js-identifier/index.ts
+init_define_ENV_DEFINED_IN_BUILD_STEP();
+
+// src/services/valid-js-identifier/reservedWords.ts
+init_define_ENV_DEFINED_IN_BUILD_STEP();
+var KEYWORDS = [
+  "break",
+  "case",
+  "catch",
+  "class",
+  "const",
+  "continue",
+  "debugger",
+  "default",
+  "delete",
+  "do",
+  "else",
+  "export",
+  "extends",
+  "false",
+  "finally",
+  "for",
+  "function",
+  "if",
+  "import",
+  "in",
+  "instanceof",
+  "new",
+  "null",
+  "return",
+  "super",
+  "switch",
+  "this",
+  "throw",
+  "true",
+  "try",
+  "typeof",
+  "var",
+  "void",
+  "while",
+  "with",
+  //Strict mode reserved keywords
+  "let",
+  "static",
+  "yield",
+  "await",
+  //Reserved keywords for future use
+  "enum",
+  "implements",
+  "interface",
+  "package",
+  "private",
+  "protected",
+  "public"
+];
+
+// src/services/valid-js-identifier/index.ts
+function isValidJSIdentifier(str) {
+  return !KEYWORDS.includes(str) && canBeUsedAsVariableName(str);
+}
+function canBeUsedAsVariableName(str) {
+  if (str.trim() !== str) {
+    return false;
+  }
+  try {
+    new Function(str, "var " + str);
+  } catch (_) {
+    return false;
+  }
+  return true;
+}
 
 // src/compiler/compilePattern.ts
 var compilePattern = (pattern) => {
@@ -407,16 +481,13 @@ var compilePattern = (pattern) => {
 
 // src/compiler/paramsType.ts
 init_define_ENV_DEFINED_IN_BUILD_STEP();
-import { isValidJSIdentifier as isValidJSIdentifier2 } from "@inlang/valid-js-identifier";
 var paramsType = (params, isMessagesIndex) => {
   if (Object.keys(params).length === 0) {
-    if (isMessagesIndex)
-      return "@param {{}} params";
-    return "";
+    return isMessagesIndex ? "@param {{}} params" : "";
   }
   const fieldTypes = [];
   for (const [name, type] of Object.entries(params)) {
-    if (isValidJSIdentifier2(name)) {
+    if (isValidJSIdentifier(name)) {
       fieldTypes.push(`${name}: ${type}`);
     } else {
       fieldTypes.push(`'${escapeForSingleQuoteString(name)}': ${type}`);
@@ -427,15 +498,32 @@ var paramsType = (params, isMessagesIndex) => {
 
 // src/compiler/optionsType.ts
 init_define_ENV_DEFINED_IN_BUILD_STEP();
+
+// src/services/codegen/string-union.ts
+init_define_ENV_DEFINED_IN_BUILD_STEP();
+function toStringUnion(iterable) {
+  return [...iterable].map((item) => `"${escapeForDoubleQuoteString(item)}"`).join(" | ");
+}
+
+// src/compiler/optionsType.ts
 var optionsType = (args) => {
-  return `@param {{ languageTag?: ${[...args.languageTags].map(quote).join(" | ") ?? "undefined"} }} options`;
+  return `@param {{ languageTag?: ${toStringUnion(args.languageTags) ?? "undefined"} }} options`;
 };
-var quote = (str) => `"${str}"`;
+
+// src/services/codegen/identifier.ts
+init_define_ENV_DEFINED_IN_BUILD_STEP();
+function i(str) {
+  var _a;
+  str = str.replaceAll(/[^a-zA-Z0-9_]/g, "_");
+  if ((_a = str[0]) == null ? void 0 : _a.match(/[0-9]/)) {
+    str = "_" + str;
+  }
+  return str;
+}
 
 // src/compiler/compileMessage.ts
-import { isValidJSIdentifier as isValidJSIdentifier3 } from "@inlang/valid-js-identifier";
 var compileMessage = (message) => {
-  if (!isValidJSIdentifier3(message.id)) {
+  if (!isValidJSIdentifier(message.id)) {
     throw new Error(
       `Cannot compile message with ID "${message.id}".
 
@@ -470,8 +558,8 @@ To detect this issue during linting, use the valid-js-identifier lint rule: http
   };
 };
 var messageIndexFunction = (args) => {
-  return `
-/**
+  const hasParams = Object.keys(args.params).length > 0;
+  return `/**
  * This message has been compiled by [inlang paraglide](https://inlang.com/m/gerre34r/library-inlang-paraglideJs).
  *
  * - Don't edit the message's code. Use the [inlang ide extension](https://inlang.com/m/r7kp499g/app-inlang-ideExtension),
@@ -484,18 +572,17 @@ var messageIndexFunction = (args) => {
  * @returns {string}
  */
 /* @__NO_SIDE_EFFECTS__ */
-export const ${args.message.id} = (params ${Object.keys(args.params).length > 0 ? "" : "= {}"}, options = {}) => {
+export const ${args.message.id} = (params ${hasParams ? "" : "= {}"}, options = {}) => {
+	const messageFunction = {
+${[...args.languageTags].sort((a, b) => a.localeCompare(b)).map((tag) => `		${isValidJSIdentifier(tag) ? tag : `"${tag}"`}: ${i(tag)}.${args.message.id}`).join(",\n")}
+	}[/** @type {${toStringUnion(args.languageTags)}} */ (options.languageTag ?? languageTag())]
 
-	const tag = options.languageTag ?? languageTag();
-${[...args.languageTags].sort((a, b) => a.localeCompare(b)).map(
-    (tag) => `	if (tag === "${tag}") return ${tag.replaceAll("-", "_")}.${args.message.id}(${Object.keys(args.params).length > 0 ? "params" : ""})`
-  ).join("\n")}
 	// if the language tag does not exist, return undefined
 	// 
 	// the missing translation lint rule catches errors like this in CI/CD
 	// see https://inlang.com/m/4cxm3eqi/messageLintRule-inlang-missingTranslation
 	// @ts-expect-error - for better DX treat a message function is always returning a string
-	return undefined
+	return messageFunction ? messageFunction(${hasParams ? "params" : ""}) : undefined;
 }`;
 };
 var messageFunction = (args) => {
@@ -761,10 +848,10 @@ var ZodError = class extends Error {
           fieldErrors._errors.push(mapper(issue));
         } else {
           let curr = fieldErrors;
-          let i = 0;
-          while (i < issue.path.length) {
-            const el = issue.path[i];
-            const terminal = i === issue.path.length - 1;
+          let i2 = 0;
+          while (i2 < issue.path.length) {
+            const el = issue.path[i2];
+            const terminal = i2 === issue.path.length - 1;
             if (!terminal) {
               curr[el] = curr[el] || { _errors: [] };
             } else {
@@ -772,7 +859,7 @@ var ZodError = class extends Error {
               curr[el]._errors.push(mapper(issue));
             }
             curr = curr[el];
-            i++;
+            i2++;
           }
         }
       }
@@ -2489,14 +2576,14 @@ var ZodArray = class _ZodArray extends ZodType {
       }
     }
     if (ctx.common.async) {
-      return Promise.all([...ctx.data].map((item, i) => {
-        return def.type._parseAsync(new ParseInputLazyPath(ctx, item, ctx.path, i));
+      return Promise.all([...ctx.data].map((item, i2) => {
+        return def.type._parseAsync(new ParseInputLazyPath(ctx, item, ctx.path, i2));
       })).then((result2) => {
         return ParseStatus.mergeArray(status, result2);
       });
     }
-    const result = [...ctx.data].map((item, i) => {
-      return def.type._parseSync(new ParseInputLazyPath(ctx, item, ctx.path, i));
+    const result = [...ctx.data].map((item, i2) => {
+      return def.type._parseSync(new ParseInputLazyPath(ctx, item, ctx.path, i2));
     });
     return ParseStatus.mergeArray(status, result);
   }
@@ -3413,7 +3500,7 @@ var ZodSet = class _ZodSet extends ZodType {
       }
       return { status: status.value, value: parsedSet };
     }
-    const elements = [...ctx.data.values()].map((item, i) => valueType._parse(new ParseInputLazyPath(ctx, item, ctx.path, i)));
+    const elements = [...ctx.data.values()].map((item, i2) => valueType._parse(new ParseInputLazyPath(ctx, item, ctx.path, i2)));
     if (ctx.common.async) {
       return Promise.all(elements).then((elements2) => finalizeSet(elements2));
     } else {
@@ -4415,9 +4502,7 @@ var compile = (args) => {
     "messages.js": `
 /* eslint-disable */
 import { languageTag } from "./runtime.js"
-${Object.keys(resources).map(
-      (languageTag) => `import * as ${languageTag.replaceAll("-", "_")} from "./messages/${languageTag}.js"`
-    ).join("\n")}
+${Object.keys(resources).map((languageTag) => `import * as ${i(languageTag)} from "./messages/${languageTag}.js"`).join("\n")}
 
 ${compiledMessages.map((message) => message.index).join("\n\n")}
 `,

package/dist/services/{escape/index.d.ts → codegen/escape.d.ts}

@@ -6,3 +6,4 @@ export declare function escapeForTemplateLiteral(text: string): string;
  * Escapes some Text so that it can safely be used inside a single quote string.s
  */
 export declare function escapeForSingleQuoteString(text: string): string;
+export declare function escapeForDoubleQuoteString(text: string): string;

package/dist/services/codegen/identifier.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Takes in a string and tries to convert it to a valid JS identifier.
+ * The output is deterministic.
+ *
+ * "i" is short for "identifier".
+ */
+export declare function i(str: string): string;

package/dist/services/codegen/indentifier.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/services/codegen/string-union.d.ts

@@ -0,0 +1 @@
+export declare function toStringUnion(iterable: Iterable<string>): string;

package/dist/services/valid-js-identifier/index.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Checks if a string is a valid JS identifier.
+ * This is more reliable than just using regexes or `new Function()`.s
+ */
+export declare function isValidJSIdentifier(str: string): boolean;

package/dist/services/valid-js-identifier/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/services/valid-js-identifier/reservedWords.d.ts

@@ -0,0 +1 @@
+export declare const KEYWORDS: string[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@inlang/paraglide-js",
   "type": "module",
-  "version": "1.0.0-prerelease.21",
+  "version": "1.0.0-prerelease.23",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -38,9 +38,8 @@
     "json5": "2.2.3",
     "posthog-node": "3.1.3",
     "@inlang/detect-json-formatting": "1.0.0",
-    "@inlang/valid-js-identifier": "0.0.1",
-    "@inlang/sdk": "0.19.0",
-    "@lix-js/fs": "0.4.0"
+    "@lix-js/fs": "0.4.0",
+    "@inlang/sdk": "0.20.0"
   },
   "devDependencies": {
     "@rollup/plugin-terser": "0.4.3",
@@ -55,7 +54,7 @@
     "typescript": "5.2.2",
     "vitest": "0.34.3",
     "@inlang/env-variables": "0.1.0",
-    "@inlang/telemetry": "0.3.0"
+    "@inlang/telemetry": "0.3.1"
   },
   "exports": {
     "./internal": {