@lingui/extractor-vue 5.9.0 → 6.0.0-next.0

package/dist/index.d.mts

@@ -1,5 +1,13 @@
 import { ExtractorType } from '@lingui/conf';
 
+interface VueExtractorConfig {
+    reactivityTransform?: boolean;
+}
+declare const createVueExtractor: (config?: VueExtractorConfig) => ExtractorType;
+/**
+ * @deprecated use {@link createVueExtractor} instead
+ */
 declare const vueExtractor: ExtractorType;
 
-export { vueExtractor };
+export { createVueExtractor, vueExtractor };
+export type { VueExtractorConfig };

package/dist/index.mjs

@@ -1,7 +1,53 @@
-import { parse, compileTemplate } from '@vue/compiler-sfc';
+import { compileScript, parse, compileTemplate } from '@vue/compiler-sfc';
 import { extractor } from '@lingui/cli/api';
 
-const vueExtractor = {
+function compileScriptSetup(descriptor, filename, reactivityTransform) {
+  const isTsScript = descriptor.script?.lang === "ts";
+  const isTsScriptSetup = descriptor.scriptSetup?.lang === "ts";
+  if (!reactivityTransform || !descriptor.scriptSetup) {
+    return [
+      {
+        source: descriptor.script?.content ?? "",
+        map: descriptor.script?.map,
+        isTs: isTsScript
+      },
+      {
+        source: descriptor.scriptSetup?.content ?? "",
+        map: descriptor.scriptSetup?.map,
+        isTs: isTsScriptSetup
+      }
+    ];
+  }
+  try {
+    const compiled = compileScript(descriptor, {
+      id: filename,
+      sourceMap: true,
+      reactivityTransform
+    });
+    return [
+      {
+        source: compiled.content,
+        map: compiled.map,
+        isTs: isTsScriptSetup
+      }
+    ];
+  } catch (e) {
+    return [
+      {
+        source: descriptor.script?.content ?? "",
+        map: descriptor.script?.map,
+        isTs: isTsScript
+      },
+      {
+        source: descriptor.scriptSetup.content,
+        map: descriptor.scriptSetup.map,
+        isTs: isTsScriptSetup
+      }
+    ];
+  }
+}
+
+const createVueExtractor = (config = {}) => ({
   match(filename) {
     return filename.endsWith(".vue");
   },
@@ -12,6 +58,12 @@ const vueExtractor = {
       ignoreEmpty: true
     });
     const isTsBlock = (block) => block?.lang === "ts";
+    const { reactivityTransform = false } = config;
+    const compiledScripts = compileScriptSetup(
+      descriptor,
+      filename,
+      reactivityTransform
+    );
     const compiledTemplate = descriptor.template && compileTemplate({
       source: descriptor.template.content,
       filename,
@@ -22,25 +74,18 @@ const vueExtractor = {
       }
     });
     const targets = [
-      [
-        descriptor.script?.content,
-        descriptor.script?.map,
-        isTsBlock(descriptor.script)
-      ],
-      [
-        descriptor.scriptSetup?.content,
-        descriptor.scriptSetup?.map,
-        isTsBlock(descriptor.scriptSetup)
-      ],
-      [
-        compiledTemplate?.code,
-        compiledTemplate?.map,
-        isTsBlock(descriptor.script) || isTsBlock(descriptor.scriptSetup)
-      ]
+      ...compiledScripts,
+      {
+        source: compiledTemplate?.code ?? "",
+        map: compiledTemplate?.map,
+        isTs: isTsBlock(descriptor.script) || isTsBlock(descriptor.scriptSetup)
+      }
     ];
     await Promise.all(
-      targets.filter(([source]) => Boolean(source)).map(
-        ([source, map, isTs]) => extractor.extract(
+      targets.filter(
+        (target) => target != null && target.source !== ""
+      ).map(
+        ({ source, map, isTs }) => extractor.extract(
           filename + (isTs ? ".ts" : ""),
           source,
           onMessageExtracted,
@@ -52,6 +97,7 @@ const vueExtractor = {
       )
     );
   }
-};
+});
+const vueExtractor = createVueExtractor();
 
-export { vueExtractor };
+export { createVueExtractor, vueExtractor };

package/package.json

@@ -1,10 +1,8 @@
 {
   "name": "@lingui/extractor-vue",
-  "version": "5.9.0",
+  "version": "6.0.0-next.0",
+  "type": "module",
   "description": "Custom Vue.js extractor to be used with the CLI tool",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
   "keywords": [
     "cli",
     "i18n",
@@ -31,25 +29,33 @@
     "email": "christoffer@jahren.it"
   },
   "scripts": {
-    "build": "rimraf ./dist && unbuild",
-    "stub": "unbuild --stub"
+    "build": "unbuild",
+    "check-types": "tsc --noEmit"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.19.0"
   },
   "files": [
     "LICENSE",
     "README.md",
     "/dist"
   ],
+  "exports": {
+    ".": "./dist/index.mjs"
+  },
   "dependencies": {
-    "@lingui/cli": "5.9.0",
-    "@lingui/conf": "5.9.0",
+    "@lingui/cli": "6.0.0-next.0",
+    "@lingui/conf": "6.0.0-next.0",
     "@vue/compiler-sfc": "^3.2.47"
   },
   "devDependencies": {
-    "@lingui/babel-plugin-extract-messages": "5.9.0",
-    "unbuild": "2.0.0"
+    "@lingui/babel-plugin-extract-messages": "6.0.0-next.0",
+    "@lingui/core": "6.0.0-next.0",
+    "unbuild": "3.6.1",
+    "vitest": "4.0.18"
+  },
+  "unbuild": {
+    "declaration": "node16"
   },
-  "gitHead": "491d4c17651c3f76116fe7f63f6bb8a554bef8da"
+  "gitHead": "a9576050487a4f7dfbc88db20814d5a1bb861c8c"
 }

package/dist/index.cjs

@@ -1,59 +0,0 @@
-'use strict';
-
-const compilerSfc = require('@vue/compiler-sfc');
-const api = require('@lingui/cli/api');
-
-const vueExtractor = {
-  match(filename) {
-    return filename.endsWith(".vue");
-  },
-  async extract(filename, code, onMessageExtracted, ctx) {
-    const { descriptor } = compilerSfc.parse(code, {
-      sourceMap: true,
-      filename,
-      ignoreEmpty: true
-    });
-    const isTsBlock = (block) => block?.lang === "ts";
-    const compiledTemplate = descriptor.template && compilerSfc.compileTemplate({
-      source: descriptor.template.content,
-      filename,
-      inMap: descriptor.template.map,
-      id: filename,
-      compilerOptions: {
-        isTS: isTsBlock(descriptor.script) || isTsBlock(descriptor.scriptSetup)
-      }
-    });
-    const targets = [
-      [
-        descriptor.script?.content,
-        descriptor.script?.map,
-        isTsBlock(descriptor.script)
-      ],
-      [
-        descriptor.scriptSetup?.content,
-        descriptor.scriptSetup?.map,
-        isTsBlock(descriptor.scriptSetup)
-      ],
-      [
-        compiledTemplate?.code,
-        compiledTemplate?.map,
-        isTsBlock(descriptor.script) || isTsBlock(descriptor.scriptSetup)
-      ]
-    ];
-    await Promise.all(
-      targets.filter(([source]) => Boolean(source)).map(
-        ([source, map, isTs]) => api.extractor.extract(
-          filename + (isTs ? ".ts" : ""),
-          source,
-          onMessageExtracted,
-          {
-            sourceMaps: map,
-            ...ctx
-          }
-        )
-      )
-    );
-  }
-};
-
-exports.vueExtractor = vueExtractor;

package/dist/index.d.cts

@@ -1,5 +0,0 @@
-import { ExtractorType } from '@lingui/conf';
-
-declare const vueExtractor: ExtractorType;
-
-export { vueExtractor };

package/dist/index.d.ts

@@ -1,5 +0,0 @@
-import { ExtractorType } from '@lingui/conf';
-
-declare const vueExtractor: ExtractorType;
-
-export { vueExtractor };