@nocobase/cli 2.1.0-beta.29 → 2.1.0-beta.30

package/dist/lib/plugin-storage.js

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import path from 'node:path';
-import { access, lstat, mkdir, readdir, readlink, realpath, rm, stat, symlink } from 'node:fs/promises';
+import { access, lstat, readlink, rm } from 'node:fs/promises';
 async function pathExists(target) {
     try {
         await access(target);
@@ -28,69 +28,6 @@ export function resolvePluginStoragePath(storagePath) {
     }
     return path.resolve(process.cwd(), 'storage', 'plugins');
 }
-async function getStoragePluginNames(target) {
-    const plugins = [];
-    const items = await readdir(target);
-    for (const item of items) {
-        const itemPath = path.resolve(target, item);
-        if (item.startsWith('@')) {
-            const statResult = await stat(itemPath);
-            if (!statResult.isDirectory()) {
-                continue;
-            }
-            const children = await getStoragePluginNames(itemPath);
-            plugins.push(...children.map((child) => `${item}/${child}`));
-            continue;
-        }
-        if (await pathExists(path.resolve(itemPath, 'package.json'))) {
-            plugins.push(item);
-        }
-    }
-    return plugins;
-}
-async function ensureOrgDirectory(nodeModulesPath, pluginName) {
-    if (!pluginName.startsWith('@')) {
-        return;
-    }
-    const [orgName] = pluginName.split('/');
-    await mkdir(path.resolve(nodeModulesPath, orgName), { recursive: true });
-}
-async function isSymlinkValid(linkPath, targetPath) {
-    try {
-        if (await pathExists(linkPath)) {
-            const realPath = await realpath(linkPath);
-            return realPath === targetPath;
-        }
-    }
-    catch {
-        return false;
-    }
-    return false;
-}
-async function createStoragePluginSymlink(storagePluginsPath, nodeModulesPath, pluginName) {
-    const targetPath = path.resolve(storagePluginsPath, pluginName);
-    if (!(await pathExists(targetPath))) {
-        return;
-    }
-    await ensureOrgDirectory(nodeModulesPath, pluginName);
-    const linkPath = path.resolve(nodeModulesPath, pluginName);
-    if (await isSymlinkValid(linkPath, targetPath)) {
-        return;
-    }
-    await rm(linkPath, { recursive: true, force: true });
-    await symlink(targetPath, linkPath, 'dir');
-}
-export async function createStoragePluginsSymlink(storagePath, nodeModulesPath = String(process.env.NODE_MODULES_PATH ?? '').trim()) {
-    if (!nodeModulesPath) {
-        return;
-    }
-    const storagePluginsPath = resolvePluginStoragePath(storagePath);
-    if (!(await pathExists(storagePluginsPath))) {
-        return;
-    }
-    const pluginNames = await getStoragePluginNames(storagePluginsPath);
-    await Promise.all(pluginNames.map(async (pluginName) => await createStoragePluginSymlink(storagePluginsPath, nodeModulesPath, pluginName)));
-}
 export async function removeStoragePluginSymlink(pluginName, storagePath, nodeModulesPath = String(process.env.NODE_MODULES_PATH ?? '').trim()) {
     if (!nodeModulesPath) {
         return false;

package/dist/lib/resource-command.js

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Flags } from '@oclif/core';
+import { ensureCrossEnvConfirmed } from './env-guard.js';
 import { executeResourceRequest } from './resource-request.js';
 import { setVerboseMode } from './ui.js';
 function parseJson(value, flagName) {
@@ -95,6 +96,11 @@ export const resourceBaseFlags = {
         description: 'Show detailed progress output',
         default: false,
     }),
+    yes: Flags.boolean({
+        char: 'y',
+        description: 'Confirm using --env when it targets a different env than the current env',
+        default: false,
+    }),
     env: Flags.string({
         char: 'e',
         description: 'Environment name',
@@ -331,6 +337,15 @@ export function buildQueryArgs(flags) {
 }
 export async function runResourceCommand(command, action, flags, args) {
     setVerboseMode(Boolean(flags.verbose));
+    const confirmed = await ensureCrossEnvConfirmed({
+        command,
+        requestedEnv: flags.env,
+        yes: flags.yes,
+    });
+    if (!confirmed) {
+        command.log('Canceled.');
+        return;
+    }
     const response = await executeResourceRequest({
         envName: flags.env,
         baseUrl: flags['api-base-url'],

package/dist/lib/runtime-generator.js

@@ -18,7 +18,7 @@ import { createHash } from 'node:crypto';
 import { loadBuildConfig } from './build-config.js';
 import { toKebabCase, toLogicalActionName, toLogicalResourceName, toResourceSegments } from './naming.js';
 import { collectOperations } from './openapi.js';
-const RESERVED_FLAG_NAMES = new Set(['api-base-url', 'base-url', 'env', 'token', 'json-output', 'body', 'body-file']);
+const RESERVED_FLAG_NAMES = new Set(['api-base-url', 'base-url', 'env', 'token', 'json-output', 'body', 'body-file', 'yes']);
 function matchesPattern(value, pattern) {
     if (!value) {
         return false;

package/dist/lib/session-id.js

@@ -0,0 +1,17 @@
+/**
+ * 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.
+ */
+export function resolveSessionIdentity() {
+    const sessionId = String(process.env.NB_SESSION_ID ?? '').trim();
+    if (sessionId) {
+        return {
+            id: sessionId,
+        };
+    }
+    return undefined;
+}