@nocobase/utils 1.0.0-alpha.13 → 1.0.0-alpha.14

package/lib/requireModule.d.ts

@@ -6,6 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+export declare function requireResolve(m: any): Promise<string>;
 export declare function requireModule(m: any): any;
 export default requireModule;
 export declare function importModule(m: string): Promise<any>;

package/lib/requireModule.js

@@ -39,11 +39,27 @@ var requireModule_exports = {};
 __export(requireModule_exports, {
   default: () => requireModule_default,
   importModule: () => importModule,
-  requireModule: () => requireModule
+  requireModule: () => requireModule,
+  requireResolve: () => requireResolve
 });
 module.exports = __toCommonJS(requireModule_exports);
+var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_url = require("url");
+async function requireResolve(m) {
+  if (!process.env.VITEST) {
+    return require.resolve(m);
+  }
+  const json = JSON.parse(
+    await import_fs.default.promises.readFile(import_path.default.resolve(process.cwd(), "./tsconfig.paths.json"), { encoding: "utf8" })
+  );
+  const paths = json.compilerOptions.paths;
+  if (paths[m]) {
+    return require.resolve(import_path.default.resolve(process.cwd(), paths[m][0], "index.ts"));
+  }
+  return require.resolve(m);
+}
+__name(requireResolve, "requireResolve");
 function requireModule(m) {
   if (typeof m === "string") {
     m = require(m);
@@ -69,5 +85,6 @@ __name(importModule, "importModule");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   importModule,
-  requireModule
+  requireModule,
+  requireResolve
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.0.0-alpha.13",
+  "version": "1.0.0-alpha.14",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -15,5 +15,5 @@
     "multer": "^1.4.5-lts.1",
     "object-path": "^0.11.8"
   },
-  "gitHead": "bd97adef70762a6691b5b58ca6572672a8cdf838"
+  "gitHead": "829078819e5b9720a4c2501c340a301315c0d029"
 }

package/plugin-symlink.js

@@ -1,5 +1,5 @@
 const { dirname, resolve } = require('path');
-const { readFile, writeFile, readdir, symlink, unlink, mkdir, stat } = require('fs').promises;
+const { realpath, readFile, writeFile, readdir, symlink, unlink, mkdir, stat } = require('fs').promises;
 
 async function getStoragePluginNames(target) {
   const plugins = [];
@@ -76,6 +76,10 @@ async function createDevPluginSymLink(pluginName) {
     }
     const link = resolve(nodeModulesPath, pluginName);
     if (await fsExists(link)) {
+      const real = await realpath(link);
+      if (real === resolve(packagePluginsPath, pluginName)) {
+        return;
+      }
       await unlink(link);
     }
     await symlink(resolve(packagePluginsPath, pluginName), link, 'dir');