@nocobase/utils 2.1.0-beta.15 → 2.1.0-beta.17

package/lib/index.d.ts

@@ -45,4 +45,5 @@ export * from './wrap-middleware';
 export * from './run-sql';
 export * from './liquidjs';
 export * from './server-request';
+export * from './storage-path';
 export { lodash };

package/lib/index.js

@@ -81,6 +81,7 @@ __reExport(src_exports, require("./wrap-middleware"), module.exports);
 __reExport(src_exports, require("./run-sql"), module.exports);
 __reExport(src_exports, require("./liquidjs"), module.exports);
 __reExport(src_exports, require("./server-request"), module.exports);
+__reExport(src_exports, require("./storage-path"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Schema,
@@ -121,5 +122,6 @@ __reExport(src_exports, require("./server-request"), module.exports);
   ...require("./wrap-middleware"),
   ...require("./run-sql"),
   ...require("./liquidjs"),
-  ...require("./server-request")
+  ...require("./server-request"),
+  ...require("./storage-path")
 });

package/lib/storage-path.d.ts

@@ -0,0 +1,25 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+/**
+ * Absolute path to the application storage root (same rules as CLI `resolveStorageRoot` in `cli-v1/src/util.js`).
+ */
+export declare function resolveStorageRoot(): string;
+/**
+ * Join path segments under the application storage root.
+ * Resolution matches CLI `resolveStorageRoot()` / `initEnv`: use `STORAGE_PATH` when set
+ * (absolute or relative to cwd), otherwise `<cwd>/storage`.
+ *
+ * @example storagePathJoin('tmp')
+ * @example storagePathJoin('cache', 'apps', appName)
+ */
+export declare function storagePathJoin(...segments: string[]): string;
+/**
+ * Resolve plugin storage path: `PLUGIN_STORAGE_PATH` first, else `<STORAGE_PATH>/plugins`.
+ */
+export declare function resolvePluginStoragePath(): string;

package/lib/storage-path.js

@@ -0,0 +1,71 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * 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) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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 storage_path_exports = {};
+__export(storage_path_exports, {
+  resolvePluginStoragePath: () => resolvePluginStoragePath,
+  resolveStorageRoot: () => resolveStorageRoot,
+  storagePathJoin: () => storagePathJoin
+});
+module.exports = __toCommonJS(storage_path_exports);
+var import_path = __toESM(require("path"));
+function resolveStorageRoot() {
+  const raw = process.env.STORAGE_PATH;
+  if (raw) {
+    return import_path.default.isAbsolute(raw) ? raw : import_path.default.resolve(process.cwd(), raw);
+  }
+  return import_path.default.resolve(process.cwd(), "storage");
+}
+__name(resolveStorageRoot, "resolveStorageRoot");
+function storagePathJoin(...segments) {
+  return import_path.default.join(resolveStorageRoot(), ...segments);
+}
+__name(storagePathJoin, "storagePathJoin");
+function resolvePluginStoragePath() {
+  if (process.env.PLUGIN_STORAGE_PATH) {
+    const p = process.env.PLUGIN_STORAGE_PATH;
+    return import_path.default.isAbsolute(p) ? p : import_path.default.resolve(process.cwd(), p);
+  }
+  return storagePathJoin("plugins");
+}
+__name(resolvePluginStoragePath, "resolvePluginStoragePath");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  resolvePluginStoragePath,
+  resolveStorageRoot,
+  storagePathJoin
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "2.1.0-beta.15",
+  "version": "2.1.0-beta.17",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -21,5 +21,5 @@
     "object-path": "^0.11.8",
     "ses": "^1.14.0"
   },
-  "gitHead": "dc1aceea6357e6ab149976c2a236fc4b6bee1370"
+  "gitHead": "227d625e47174ab7b3a90170e7c6c67bbdf36e23"
 }

package/plugin-symlink.js

@@ -1,6 +1,15 @@
-const { resolve } = require('path');
+const path = require('path');
+const { resolve } = path;
 const fs = require('fs-extra');
 
+function resolvePluginStoragePath() {
+  if (process.env.PLUGIN_STORAGE_PATH) {
+    const p = process.env.PLUGIN_STORAGE_PATH;
+    return path.isAbsolute(p) ? p : path.resolve(process.cwd(), p);
+  }
+  return path.join(process.env.STORAGE_PATH || path.resolve(process.cwd(), 'storage'), 'plugins');
+}
+
 /**
  * Recursively get plugin names from a directory
  * @param {string} target - Target directory to scan
@@ -136,7 +145,7 @@ async function createPluginSymLink(pluginName, sourcePath, nodeModulesPath, plug
  * @returns {Promise<void>}
  */
 async function createStoragePluginSymLink(pluginName) {
-  const storagePluginsPath = resolve(process.cwd(), 'storage/plugins');
+  const storagePluginsPath = resolvePluginStoragePath();
   const nodeModulesPath = process.env.NODE_MODULES_PATH;
   await createPluginSymLink(pluginName, storagePluginsPath, nodeModulesPath, 'storage');
 }
@@ -146,7 +155,7 @@ async function createStoragePluginSymLink(pluginName) {
  * @returns {Promise<void>}
  */
 async function createStoragePluginsSymlink() {
-  const storagePluginsPath = resolve(process.cwd(), 'storage/plugins');
+  const storagePluginsPath = resolvePluginStoragePath();
   if (!(await fs.pathExists(storagePluginsPath))) {
     return;
   }
@@ -178,6 +187,7 @@ async function createDevPluginsSymlink() {
   await Promise.all(pluginNames.map((pluginName) => createDevPluginSymLink(pluginName)));
 }
 
+exports.resolvePluginStoragePath = resolvePluginStoragePath;
 exports.createStoragePluginSymLink = createStoragePluginSymLink;
 exports.createStoragePluginsSymlink = createStoragePluginsSymlink;
 exports.createDevPluginSymLink = createDevPluginSymLink;