@nocobase/utils 1.0.0-alpha.8 → 1.0.1-alpha.1

package/lib/getValuesByPath.js

@@ -56,14 +56,14 @@ const getValuesByPath = /* @__PURE__ */ __name((obj, path, defaultValue) => {
       result.push(currentValue);
     }
   }
-  result = result.filter((item) => item != null);
+  result = result.filter((item) => item !== void 0);
   if (result.length === 0) {
     return defaultValue;
   }
   if (shouldReturnArray) {
-    return result;
+    return result.filter((item) => item !== null);
   }
-  return result.length === 1 ? result[0] : result;
+  return result[0];
 }, "getValuesByPath");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/json-templates.js

@@ -7,11 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -26,14 +24,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var json_templates_exports = {};
 __export(json_templates_exports, {
@@ -41,7 +31,6 @@ __export(json_templates_exports, {
 });
 module.exports = __toCommonJS(json_templates_exports);
 var import_lodash = require("lodash");
-var import_dedupe = __toESM(require("dedupe"));
 function type(value) {
   let valueType = typeof value;
   if (Array.isArray(value)) {
@@ -70,9 +59,7 @@ function Parameter(match) {
 }
 __name(Parameter, "Parameter");
 function Template(fn, parameters) {
-  Object.assign(fn, {
-    parameters: (0, import_dedupe.default)(parameters, (item) => item.key)
-  });
+  fn.parameters = Array.from(new Map(parameters.map((parameter) => [parameter.key, parameter])).values());
   return fn;
 }
 __name(Template, "Template");
@@ -92,7 +79,7 @@ function parse(value) {
 }
 __name(parse, "parse");
 const parseString = (() => {
-  const regex = /{{(\w|:|[\s-+.,@///()?=*_$])+}}/g;
+  const regex = /{{(\w|:|[\s-+.,@/()?=*_$])+}}/g;
   return (str) => {
     let parameters = [];
     let templateFn = /* @__PURE__ */ __name((context) => str, "templateFn");
@@ -110,7 +97,7 @@ const parseString = (() => {
           if (typeof value === "function") {
             value = value();
           }
-          if (str.startsWith("{{") && str.endsWith("}}")) {
+          if (matches.length === 1 && str.startsWith("{{") && str.endsWith("}}")) {
             return value;
           }
           if (value instanceof Date) {

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.8",
+  "version": "1.0.1-alpha.1",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -8,12 +8,11 @@
     "@hapi/topo": "^6.0.0",
     "@rc-component/mini-decimal": "^1.1.0",
     "dayjs": "^1.11.9",
-    "dedupe": "^3.0.2",
     "deepmerge": "^4.2.2",
     "flat-to-nested": "^1.1.1",
     "graphlib": "^2.1.8",
     "multer": "^1.4.5-lts.1",
     "object-path": "^0.11.8"
   },
-  "gitHead": "3c4e978f6fc366c01621c9d625678e91f53f8662"
+  "gitHead": "d24aa16987a4068f857ae073fcce18f3cb490660"
 }

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');