@lingo.dev/_compiler 0.2.1 → 0.2.2

package/build/index.cjs

@@ -4,7 +4,7 @@ var _unplugin = require('unplugin');
 // package.json
 var package_default = {
   name: "@lingo.dev/_compiler",
-  version: "0.2.1",
+  version: "0.2.2",
   description: "Lingo.dev Compiler",
   private: false,
   publishConfig: {
@@ -1767,6 +1767,17 @@ function collectCallExpressions(path7, importNames, result, functionName) {
 
 // src/rsc-dictionary-loader.ts
 
+
+// src/_utils.ts
+
+var getDictionaryPath = (params) => {
+  return path.default.relative(
+    params.relativeFilePath,
+    path.default.resolve(params.sourceRoot, params.lingoDir, LCP_DICTIONARY_FILE_NAME)
+  );
+};
+
+// src/rsc-dictionary-loader.ts
 var rscDictionaryLoaderMutation = createCodeMutation((payload) => {
   const mode = getModuleExecutionMode(payload.ast, payload.params.rsc);
   if (mode === "client") {
@@ -1787,6 +1798,11 @@ var rscDictionaryLoaderMutation = createCodeMutation((payload) => {
     if (t12.isIdentifier(invokation.callee)) {
       invokation.callee.name = internalDictionaryLoader.importedName;
     }
+    const dictionaryPath = getDictionaryPath({
+      sourceRoot: payload.params.sourceRoot,
+      lingoDir: payload.params.lingoDir,
+      relativeFilePath: payload.relativeFilePath
+    });
     const localeImportMap = t12.objectExpression(
       allLocales.map(
         (locale) => t12.objectProperty(
@@ -1794,9 +1810,7 @@ var rscDictionaryLoaderMutation = createCodeMutation((payload) => {
           t12.arrowFunctionExpression(
             [],
             t12.callExpression(t12.identifier("import"), [
-              t12.stringLiteral(
-                `@/${payload.params.lingoDir}/${LCP_DICTIONARY_FILE_NAME}?locale=${locale}`
-              )
+              t12.stringLiteral(`${dictionaryPath}?locale=${locale}`)
             ])
           )
         )
@@ -1830,6 +1844,11 @@ var reactRouterDictionaryLoaderMutation = createCodeMutation(
       if (t13.isIdentifier(invokation.callee)) {
         invokation.callee.name = internalDictionaryLoader.importedName;
       }
+      const dictionaryPath = getDictionaryPath({
+        sourceRoot: payload.params.sourceRoot,
+        lingoDir: payload.params.lingoDir,
+        relativeFilePath: payload.relativeFilePath
+      });
       const localeImportMap = t13.objectExpression(
         allLocales.map(
           (locale) => t13.objectProperty(
@@ -1837,9 +1856,7 @@ var reactRouterDictionaryLoaderMutation = createCodeMutation(
             t13.arrowFunctionExpression(
               [],
               t13.callExpression(t13.identifier("import"), [
-                t13.stringLiteral(
-                  `~/${payload.params.lingoDir}/${LCP_DICTIONARY_FILE_NAME}?locale=${locale}`
-                )
+                t13.stringLiteral(`${dictionaryPath}?locale=${locale}`)
               ])
             )
           )
@@ -1951,18 +1968,22 @@ function jsxAttributeScopesExportMutation(payload) {
   for (const [scope, attributes] of attributeScopes) {
     for (const attributeDefinition of attributes) {
       const [attribute, scopeKey] = attributeDefinition.split(":");
-      lcp.resetScope(payload.fileKey, scopeKey);
+      lcp.resetScope(payload.relativeFilePath, scopeKey);
       const attributeValue = getJsxAttributeValue(scope, attribute);
       if (!attributeValue) {
         continue;
       }
-      lcp.setScopeType(payload.fileKey, scopeKey, "attribute");
+      lcp.setScopeType(payload.relativeFilePath, scopeKey, "attribute");
       const hash = getJsxAttributeValueHash(String(attributeValue));
-      lcp.setScopeHash(payload.fileKey, scopeKey, hash);
-      lcp.setScopeContext(payload.fileKey, scopeKey, "");
-      lcp.setScopeSkip(payload.fileKey, scopeKey, false);
-      lcp.setScopeOverrides(payload.fileKey, scopeKey, {});
-      lcp.setScopeContent(payload.fileKey, scopeKey, String(attributeValue));
+      lcp.setScopeHash(payload.relativeFilePath, scopeKey, hash);
+      lcp.setScopeContext(payload.relativeFilePath, scopeKey, "");
+      lcp.setScopeSkip(payload.relativeFilePath, scopeKey, false);
+      lcp.setScopeOverrides(payload.relativeFilePath, scopeKey, {});
+      lcp.setScopeContent(
+        payload.relativeFilePath,
+        scopeKey,
+        String(attributeValue)
+      );
     }
   }
   lcp.save();
@@ -2093,21 +2114,29 @@ function jsxScopesExportMutation(payload) {
   });
   for (const scope of scopes) {
     const scopeKey = getAstKey(scope);
-    lcp.resetScope(payload.fileKey, scopeKey);
-    lcp.setScopeType(payload.fileKey, scopeKey, "element");
+    lcp.resetScope(payload.relativeFilePath, scopeKey);
+    lcp.setScopeType(payload.relativeFilePath, scopeKey, "element");
     const hash = getJsxElementHash(scope);
-    lcp.setScopeHash(payload.fileKey, scopeKey, hash);
+    lcp.setScopeHash(payload.relativeFilePath, scopeKey, hash);
     const context = getJsxAttributeValue(scope, "data-lingo-context");
-    lcp.setScopeContext(payload.fileKey, scopeKey, String(context || ""));
+    lcp.setScopeContext(
+      payload.relativeFilePath,
+      scopeKey,
+      String(context || "")
+    );
     const skip = getJsxAttributeValue(scope, "data-lingo-skip");
-    lcp.setScopeSkip(payload.fileKey, scopeKey, Boolean(skip || false));
+    lcp.setScopeSkip(
+      payload.relativeFilePath,
+      scopeKey,
+      Boolean(skip || false)
+    );
     const attributesMap = getJsxAttributesMap(scope);
     const overrides = _lodash2.default.chain(attributesMap).entries().filter(
       ([attributeKey]) => attributeKey.startsWith("data-lingo-override-")
     ).map(([k, v]) => [k.split("data-lingo-override-")[1], v]).filter(([k]) => !!k).filter(([, v]) => !!v).fromPairs().value();
-    lcp.setScopeOverrides(payload.fileKey, scopeKey, overrides);
+    lcp.setScopeOverrides(payload.relativeFilePath, scopeKey, overrides);
     const content = extractJsxContent(scope);
-    lcp.setScopeContent(payload.fileKey, scopeKey, content);
+    lcp.setScopeContent(payload.relativeFilePath, scopeKey, content);
   }
   lcp.save();
   return payload;
@@ -2144,7 +2173,7 @@ var lingoJsxAttributeScopeInjectMutation = createCodeMutation(
       jsxScope.node.openingElement.attributes.push(
         t17.jsxAttribute(
           t17.jsxIdentifier("$fileKey"),
-          t17.stringLiteral(payload.fileKey)
+          t17.stringLiteral(payload.relativeFilePath)
         )
       );
       jsxScope.node.openingElement.attributes.push(
@@ -2321,7 +2350,7 @@ var lingoJsxScopeInjectMutation = createCodeMutation((payload) => {
     originalAttributes.push(
       t21.jsxAttribute(
         t21.jsxIdentifier("$fileKey"),
-        t21.stringLiteral(payload.fileKey)
+        t21.stringLiteral(payload.relativeFilePath)
       )
     );
     originalAttributes.push(
@@ -2432,17 +2461,7 @@ var jsxRemoveAttributesMutation = createCodeMutation(
 
 // src/client-dictionary-loader.ts
 
-
 var clientDictionaryLoaderMutation = createCodeMutation((payload) => {
-  const lingoDir = path.default.resolve(
-    process.cwd(),
-    payload.params.sourceRoot,
-    payload.params.lingoDir
-  );
-  const currentDir = path.default.dirname(
-    path.default.resolve(process.cwd(), payload.params.sourceRoot, payload.fileKey)
-  );
-  const relativeLingoPath = path.default.relative(currentDir, lingoDir);
   const invokations = findInvokations(payload.ast, {
     moduleName: "lingo.dev/react/client" /* ReactClient */,
     functionName: "loadDictionary"
@@ -2458,6 +2477,11 @@ var clientDictionaryLoaderMutation = createCodeMutation((payload) => {
     if (t23.isIdentifier(invokation.callee)) {
       invokation.callee.name = internalDictionaryLoader.importedName;
     }
+    const dictionaryPath = getDictionaryPath({
+      sourceRoot: payload.params.sourceRoot,
+      lingoDir: payload.params.lingoDir,
+      relativeFilePath: payload.relativeFilePath
+    });
     const localeImportMap = t23.objectExpression(
       allLocales.map(
         (locale) => t23.objectProperty(
@@ -2465,9 +2489,7 @@ var clientDictionaryLoaderMutation = createCodeMutation((payload) => {
           t23.arrowFunctionExpression(
             [],
             t23.callExpression(t23.identifier("import"), [
-              t23.stringLiteral(
-                `./${relativeLingoPath}/${LCP_DICTIONARY_FILE_NAME}?locale=${locale}`
-              )
+              t23.stringLiteral(`${dictionaryPath}?locale=${locale}`)
             ])
           )
         )
@@ -2552,7 +2574,7 @@ var unplugin = _unplugin.createUnplugin.call(void 0,
           const result = _lodash2.default.chain({
             code,
             params,
-            fileKey: path.default.relative(path.default.resolve(process.cwd(), params.sourceRoot), id).split(path.default.sep).join("/")
+            relativeFilePath: path.default.relative(path.default.resolve(process.cwd(), params.sourceRoot), id).split(path.default.sep).join("/")
             // Always normalize for consistent dictionaries
           }).thru(createPayload).thru(
             composeMutations(

package/build/index.mjs

@@ -4,7 +4,7 @@ import { createUnplugin } from "unplugin";
 // package.json
 var package_default = {
   name: "@lingo.dev/_compiler",
-  version: "0.2.1",
+  version: "0.2.2",
   description: "Lingo.dev Compiler",
   private: false,
   publishConfig: {
@@ -1767,6 +1767,17 @@ function collectCallExpressions(path7, importNames, result, functionName) {
 
 // src/rsc-dictionary-loader.ts
 import * as t12 from "@babel/types";
+
+// src/_utils.ts
+import path5 from "path";
+var getDictionaryPath = (params) => {
+  return path5.relative(
+    params.relativeFilePath,
+    path5.resolve(params.sourceRoot, params.lingoDir, LCP_DICTIONARY_FILE_NAME)
+  );
+};
+
+// src/rsc-dictionary-loader.ts
 var rscDictionaryLoaderMutation = createCodeMutation((payload) => {
   const mode = getModuleExecutionMode(payload.ast, payload.params.rsc);
   if (mode === "client") {
@@ -1787,6 +1798,11 @@ var rscDictionaryLoaderMutation = createCodeMutation((payload) => {
     if (t12.isIdentifier(invokation.callee)) {
       invokation.callee.name = internalDictionaryLoader.importedName;
     }
+    const dictionaryPath = getDictionaryPath({
+      sourceRoot: payload.params.sourceRoot,
+      lingoDir: payload.params.lingoDir,
+      relativeFilePath: payload.relativeFilePath
+    });
     const localeImportMap = t12.objectExpression(
       allLocales.map(
         (locale) => t12.objectProperty(
@@ -1794,9 +1810,7 @@ var rscDictionaryLoaderMutation = createCodeMutation((payload) => {
           t12.arrowFunctionExpression(
             [],
             t12.callExpression(t12.identifier("import"), [
-              t12.stringLiteral(
-                `@/${payload.params.lingoDir}/${LCP_DICTIONARY_FILE_NAME}?locale=${locale}`
-              )
+              t12.stringLiteral(`${dictionaryPath}?locale=${locale}`)
             ])
           )
         )
@@ -1830,6 +1844,11 @@ var reactRouterDictionaryLoaderMutation = createCodeMutation(
       if (t13.isIdentifier(invokation.callee)) {
         invokation.callee.name = internalDictionaryLoader.importedName;
       }
+      const dictionaryPath = getDictionaryPath({
+        sourceRoot: payload.params.sourceRoot,
+        lingoDir: payload.params.lingoDir,
+        relativeFilePath: payload.relativeFilePath
+      });
       const localeImportMap = t13.objectExpression(
         allLocales.map(
           (locale) => t13.objectProperty(
@@ -1837,9 +1856,7 @@ var reactRouterDictionaryLoaderMutation = createCodeMutation(
             t13.arrowFunctionExpression(
               [],
               t13.callExpression(t13.identifier("import"), [
-                t13.stringLiteral(
-                  `~/${payload.params.lingoDir}/${LCP_DICTIONARY_FILE_NAME}?locale=${locale}`
-                )
+                t13.stringLiteral(`${dictionaryPath}?locale=${locale}`)
               ])
             )
           )
@@ -1951,18 +1968,22 @@ function jsxAttributeScopesExportMutation(payload) {
   for (const [scope, attributes] of attributeScopes) {
     for (const attributeDefinition of attributes) {
       const [attribute, scopeKey] = attributeDefinition.split(":");
-      lcp.resetScope(payload.fileKey, scopeKey);
+      lcp.resetScope(payload.relativeFilePath, scopeKey);
       const attributeValue = getJsxAttributeValue(scope, attribute);
       if (!attributeValue) {
         continue;
       }
-      lcp.setScopeType(payload.fileKey, scopeKey, "attribute");
+      lcp.setScopeType(payload.relativeFilePath, scopeKey, "attribute");
       const hash = getJsxAttributeValueHash(String(attributeValue));
-      lcp.setScopeHash(payload.fileKey, scopeKey, hash);
-      lcp.setScopeContext(payload.fileKey, scopeKey, "");
-      lcp.setScopeSkip(payload.fileKey, scopeKey, false);
-      lcp.setScopeOverrides(payload.fileKey, scopeKey, {});
-      lcp.setScopeContent(payload.fileKey, scopeKey, String(attributeValue));
+      lcp.setScopeHash(payload.relativeFilePath, scopeKey, hash);
+      lcp.setScopeContext(payload.relativeFilePath, scopeKey, "");
+      lcp.setScopeSkip(payload.relativeFilePath, scopeKey, false);
+      lcp.setScopeOverrides(payload.relativeFilePath, scopeKey, {});
+      lcp.setScopeContent(
+        payload.relativeFilePath,
+        scopeKey,
+        String(attributeValue)
+      );
     }
   }
   lcp.save();
@@ -2093,21 +2114,29 @@ function jsxScopesExportMutation(payload) {
   });
   for (const scope of scopes) {
     const scopeKey = getAstKey(scope);
-    lcp.resetScope(payload.fileKey, scopeKey);
-    lcp.setScopeType(payload.fileKey, scopeKey, "element");
+    lcp.resetScope(payload.relativeFilePath, scopeKey);
+    lcp.setScopeType(payload.relativeFilePath, scopeKey, "element");
     const hash = getJsxElementHash(scope);
-    lcp.setScopeHash(payload.fileKey, scopeKey, hash);
+    lcp.setScopeHash(payload.relativeFilePath, scopeKey, hash);
     const context = getJsxAttributeValue(scope, "data-lingo-context");
-    lcp.setScopeContext(payload.fileKey, scopeKey, String(context || ""));
+    lcp.setScopeContext(
+      payload.relativeFilePath,
+      scopeKey,
+      String(context || "")
+    );
     const skip = getJsxAttributeValue(scope, "data-lingo-skip");
-    lcp.setScopeSkip(payload.fileKey, scopeKey, Boolean(skip || false));
+    lcp.setScopeSkip(
+      payload.relativeFilePath,
+      scopeKey,
+      Boolean(skip || false)
+    );
     const attributesMap = getJsxAttributesMap(scope);
     const overrides = _10.chain(attributesMap).entries().filter(
       ([attributeKey]) => attributeKey.startsWith("data-lingo-override-")
     ).map(([k, v]) => [k.split("data-lingo-override-")[1], v]).filter(([k]) => !!k).filter(([, v]) => !!v).fromPairs().value();
-    lcp.setScopeOverrides(payload.fileKey, scopeKey, overrides);
+    lcp.setScopeOverrides(payload.relativeFilePath, scopeKey, overrides);
     const content = extractJsxContent(scope);
-    lcp.setScopeContent(payload.fileKey, scopeKey, content);
+    lcp.setScopeContent(payload.relativeFilePath, scopeKey, content);
   }
   lcp.save();
   return payload;
@@ -2144,7 +2173,7 @@ var lingoJsxAttributeScopeInjectMutation = createCodeMutation(
       jsxScope.node.openingElement.attributes.push(
         t17.jsxAttribute(
           t17.jsxIdentifier("$fileKey"),
-          t17.stringLiteral(payload.fileKey)
+          t17.stringLiteral(payload.relativeFilePath)
         )
       );
       jsxScope.node.openingElement.attributes.push(
@@ -2321,7 +2350,7 @@ var lingoJsxScopeInjectMutation = createCodeMutation((payload) => {
     originalAttributes.push(
       t21.jsxAttribute(
         t21.jsxIdentifier("$fileKey"),
-        t21.stringLiteral(payload.fileKey)
+        t21.stringLiteral(payload.relativeFilePath)
       )
     );
     originalAttributes.push(
@@ -2431,18 +2460,8 @@ var jsxRemoveAttributesMutation = createCodeMutation(
 );
 
 // src/client-dictionary-loader.ts
-import path5 from "path";
 import * as t23 from "@babel/types";
 var clientDictionaryLoaderMutation = createCodeMutation((payload) => {
-  const lingoDir = path5.resolve(
-    process.cwd(),
-    payload.params.sourceRoot,
-    payload.params.lingoDir
-  );
-  const currentDir = path5.dirname(
-    path5.resolve(process.cwd(), payload.params.sourceRoot, payload.fileKey)
-  );
-  const relativeLingoPath = path5.relative(currentDir, lingoDir);
   const invokations = findInvokations(payload.ast, {
     moduleName: "lingo.dev/react/client" /* ReactClient */,
     functionName: "loadDictionary"
@@ -2458,6 +2477,11 @@ var clientDictionaryLoaderMutation = createCodeMutation((payload) => {
     if (t23.isIdentifier(invokation.callee)) {
       invokation.callee.name = internalDictionaryLoader.importedName;
     }
+    const dictionaryPath = getDictionaryPath({
+      sourceRoot: payload.params.sourceRoot,
+      lingoDir: payload.params.lingoDir,
+      relativeFilePath: payload.relativeFilePath
+    });
     const localeImportMap = t23.objectExpression(
       allLocales.map(
         (locale) => t23.objectProperty(
@@ -2465,9 +2489,7 @@ var clientDictionaryLoaderMutation = createCodeMutation((payload) => {
           t23.arrowFunctionExpression(
             [],
             t23.callExpression(t23.identifier("import"), [
-              t23.stringLiteral(
-                `./${relativeLingoPath}/${LCP_DICTIONARY_FILE_NAME}?locale=${locale}`
-              )
+              t23.stringLiteral(`${dictionaryPath}?locale=${locale}`)
             ])
           )
         )
@@ -2552,7 +2574,7 @@ var unplugin = createUnplugin(
           const result = _11.chain({
             code,
             params,
-            fileKey: path6.relative(path6.resolve(process.cwd(), params.sourceRoot), id).split(path6.sep).join("/")
+            relativeFilePath: path6.relative(path6.resolve(process.cwd(), params.sourceRoot), id).split(path6.sep).join("/")
             // Always normalize for consistent dictionaries
           }).thru(createPayload).thru(
             composeMutations(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingo.dev/_compiler",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Lingo.dev Compiler",
   "private": false,
   "publishConfig": {