vue-i18n-extract-plugin 1.0.58 → 1.0.61

package/lib/index.js

@@ -19,6 +19,7 @@ const {
   registerLangMatch,
   trimEmptyLine,
   padEmptyLine,
+  createFilterFn,
   excludeDirectives,
   EXCLUDED_CALL
 } = require("./utils");
@@ -40,6 +41,9 @@ const {
 } = require("./import-i18n-transform");
 
 function defineConfig(options) {
+  if (typeof options === "function") {
+    return options();
+  }
   return options;
 }
 
@@ -62,6 +66,7 @@ module.exports = {
   registerLangMatch,
   trimEmptyLine,
   padEmptyLine,
+  createFilterFn,
   excludeDirectives,
   EXCLUDED_CALL,
   shouldTransform,

package/lib/utils.js

@@ -2,6 +2,7 @@ const path = require("path");
 const fs = require("fs-extra");
 const crypto = require("crypto");
 const types = require("@babel/types");
+const { createFilter } = require("@rollup/pluginutils");
 
 function hashKey(str) {
   return crypto.createHash("sha512").update(str).digest("base64").slice(0, 6);
@@ -179,6 +180,36 @@ function padEmptyLine(str) {
   return "\n" + str + "\n";
 }
 
+function createFilterFn(option) {
+  const {
+    i18nPkgImportPath: importPath,
+    allowedExtensions: extensions,
+    includePath,
+    excludedPath
+  } = option;
+
+  return createFilter(
+    extensions
+      .map(ext => includePath.map(p => `${fixFolderPath(p)}**/*${ext}`))
+      .flat(),
+    [
+      "node_modules/**",
+      importPath.endsWith("/")
+        ? [
+            resolveFilterPath(importPath + "index.ts"),
+            resolveFilterPath(importPath + "index.js")
+          ]
+        : [
+            resolveFilterPath(importPath + "/index.ts"),
+            resolveFilterPath(importPath + "/index.js"),
+            resolveFilterPath(importPath + ".ts"),
+            resolveFilterPath(importPath + ".js")
+          ],
+      excludedPath.map(resolveFilterPath)
+    ].flat()
+  );
+}
+
 const translateLangKeyEnum = {
   ZH: "zh-cn",
   EN: "en",
@@ -241,6 +272,7 @@ module.exports = {
   registerLangMatch,
   trimEmptyLine,
   padEmptyLine,
+  createFilterFn,
   excludeDirectives,
   EXCLUDED_CALL
 };

package/lib/vite-plugin-i18n.js

@@ -1,44 +1,9 @@
-const { createFilter } = require("@rollup/pluginutils");
 const { transformAsync } = require("@babel/core");
 const { createI18nPlugin } = require("./visitors");
-const {
-  relativeCWDPath,
-  resolveFilterPath,
-  fixFolderPath
-} = require("./utils");
+const { relativeCWDPath, createFilterFn } = require("./utils");
 const { defaultOptions } = require("./options");
 const { globalI18nMap, handleFinalI18nMap } = require("./extract");
 
-function createFilterFn(option) {
-  const {
-    i18nPkgImportPath: importPath,
-    allowedExtensions: extensions,
-    includePath,
-    excludedPath
-  } = option;
-
-  return createFilter(
-    extensions
-      .map(ext => includePath.map(p => `${fixFolderPath(p)}**/*${ext}`))
-      .flat(),
-    [
-      "node_modules/**",
-      importPath.endsWith("/")
-        ? [
-            resolveFilterPath(importPath + "index.ts"),
-            resolveFilterPath(importPath + "index.js")
-          ]
-        : [
-            resolveFilterPath(importPath + "/index.ts"),
-            resolveFilterPath(importPath + "/index.js"),
-            resolveFilterPath(importPath + ".ts"),
-            resolveFilterPath(importPath + ".js")
-          ],
-      excludedPath.map(resolveFilterPath)
-    ].flat()
-  );
-}
-
 function vitePluginI18n(option) {
   option = { ...defaultOptions, ...option };
 
@@ -105,8 +70,6 @@ function vitePluginI18n(option) {
   };
 }
 
-exports.createFilterFn = createFilterFn;
-
 module.exports = vitePluginI18n;
 
 /* import { defineConfig } from 'vite'

package/lib/vite-plugin-import-i18n.js

@@ -1,5 +1,5 @@
 const { i18nImportTransform } = require("./import-i18n-transform");
-const { createFilterFn } = require("./vite-plugin-i18n");
+const { createFilterFn } = require("./utils");
 const { defaultOptions } = require("./options");
 
 function vitePluginImportI18n(option) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-i18n-extract-plugin",
-  "version": "1.0.58",
+  "version": "1.0.61",
   "main": "lib/index.js",
   "types": "types/index.d.ts",
   "bin": {

package/types/index.d.ts

@@ -19,6 +19,7 @@ export {
   registerLangMatch,
   trimEmptyLine,
   padEmptyLine,
+  createFilterFn,
   excludeDirectives,
   EXCLUDED_CALL
 } from "./utils";
@@ -43,4 +44,4 @@ declare const defaultOptions: I18nOptions;
 
 export { defaultOptions }
 
-export function defineConfig(options: Partial<I18nOptions>): I18nOptions;
+export function defineConfig<T = Partial<I18nOptions>>(options: T | (() => T)): T;

package/types/utils.d.ts

@@ -18,5 +18,6 @@ export function shouldExtract(str: string, langKey: LangKey): boolean;
 export function registerLangMatch(langKey: LangKey, regex: RegExp | ((str: string) => boolean)): void;
 export function trimEmptyLine(str: string): string;
 export function padEmptyLine(str: string): string;
+export function createFilterFn(option: Partial<I18nOptions>): (id: string) => boolean;
 export const excludeDirectives: string[];
 export const EXCLUDED_CALL: string[];

package/types/vite-plugin-i18n.d.ts

@@ -1,6 +1,4 @@
 import { Plugin } from 'vite';
 import { I18nOptions } from './options';
 
-export function createFilterFn(option: Partial<I18nOptions>): (id: string) => boolean;
-
 export default function vitePluginI18n(option?: Partial<I18nOptions>): Plugin