@nocobase/cli 2.1.0-beta.35 → 2.1.0-beta.36

package/dist/lib/run-npm.js

@@ -31,6 +31,14 @@ function pathExists(candidate) {
         return false;
     }
 }
+function isDirectory(candidate) {
+    try {
+        return Boolean(candidate) && fs.statSync(candidate).isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
 function hasLocalNocoBaseBinary(candidate) {
     return (pathExists(path.join(candidate, 'node_modules', '.bin', 'nocobase-v1'))
         || pathExists(path.join(candidate, 'node_modules', '.bin', 'nocobase-v1.cmd')));
@@ -45,19 +53,23 @@ export function resolveCwd(cwd) {
 export function resolveProjectCwd(cwd) {
     const normalizedCwd = typeof cwd === 'string' && cwd.trim() === '' ? undefined : cwd;
     const fallback = resolveCwd(normalizedCwd);
-    const isAbsoluteInput = typeof normalizedCwd === 'string' && path.isAbsolute(normalizedCwd);
-    let current = isAbsoluteInput ? fallback : process.cwd();
+    const hasExplicitInput = normalizedCwd !== undefined;
+    if (hasExplicitInput && !pathExists(fallback)) {
+        throw new Error(`The specified --cwd does not exist: ${fallback}`);
+    }
+    if (hasExplicitInput && !isDirectory(fallback)) {
+        throw new Error(`The specified --cwd is not a directory: ${fallback}`);
+    }
+    let current = hasExplicitInput ? fallback : process.cwd();
     while (true) {
-        const candidate = isAbsoluteInput
-            ? current
-            : normalizedCwd
-                ? path.resolve(current, normalizedCwd)
-                : current;
-        if (hasLocalNocoBaseBinary(candidate)) {
-            return candidate;
+        if (hasLocalNocoBaseBinary(current)) {
+            return current;
         }
         const parent = path.dirname(current);
         if (parent === current) {
+            if (hasExplicitInput) {
+                throw new Error(`Couldn't find a NocoBase source project from --cwd: ${fallback}`);
+            }
             return fallback;
         }
         current = parent;
@@ -77,6 +89,20 @@ export function run(name, args, options) {
             },
             windowsHide: process.platform === 'win32',
         });
+        if (options?.stdio === 'pipe') {
+            child.stdout?.setEncoding('utf8');
+            child.stderr?.setEncoding('utf8');
+            if (options.onStdout) {
+                child.stdout?.on('data', (chunk) => {
+                    options.onStdout?.(String(chunk));
+                });
+            }
+            if (options.onStderr) {
+                child.stderr?.on('data', (chunk) => {
+                    options.onStderr?.(String(chunk));
+                });
+            }
+        }
         const cleanupSignalForwarding = forwardSignalsToChild(child);
         child.once('error', (error) => {
             cleanupSignalForwarding();

package/dist/lib/source-publish.js

@@ -7,7 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import path from 'node:path';
-import { commandOutput, resolveProjectCwd, run } from './run-npm.js';
+import { commandOutput, resolveProjectCwd, run, runNocoBaseCommand } from './run-npm.js';
 import { DEFAULT_SOURCE_REGISTRY_PORT, parseSourceRegistryUrl, resolveSourceRegistryInfo } from './source-registry.js';
 function trimValue(value) {
     return String(value ?? '').trim();
@@ -98,6 +98,16 @@ async function commitSourceSnapshotVersion(params) {
         errorName: 'git commit',
     });
 }
+async function buildSourceSnapshot(params) {
+    const args = ['build'];
+    if (!params.buildDts) {
+        args.push('--no-dts');
+    }
+    await runNocoBaseCommand(args, {
+        cwd: params.cwd,
+        stdio: params.stdio,
+    });
+}
 async function createSourcePublishStash(params) {
     if (!(await hasLocalGitChanges(params.cwd))) {
         return undefined;
@@ -158,6 +168,8 @@ export async function publishSourceSnapshot(params) {
     const version = buildSnapshotVersion(baseVersion, gitSha, params.now);
     const temporaryBranch = buildSourcePublishBranchName(gitSha, params.now);
     const stdio = params.verbose ? 'inherit' : 'ignore';
+    const shouldBuild = params.build !== false;
+    const shouldBuildDts = params.buildDts !== false;
     let stash;
     let onTemporaryBranch = false;
     let branchCreated = false;
@@ -186,6 +198,13 @@ export async function publishSourceSnapshot(params) {
                 errorName: 'git stash apply',
             });
         }
+        if (shouldBuild) {
+            await buildSourceSnapshot({
+                cwd: projectRoot,
+                buildDts: shouldBuildDts,
+                stdio,
+            });
+        }
         await run('yarn', ['lerna', 'version', version, '--force-publish=*', '--no-git-tag-version', '-y'], {
             cwd: projectRoot,
             errorName: 'lerna version',

package/dist/lib/source-registry.js

@@ -9,7 +9,7 @@
 import fsp from 'node:fs/promises';
 import path from 'node:path';
 import { commandOutput, commandSucceeds, resolveCwd, resolveProjectCwd, run } from './run-npm.js';
-import { resolveCliHomeRoot } from './cli-home.js';
+import { resolveCliHomeDir } from './cli-home.js';
 export const DEFAULT_SOURCE_REGISTRY_HOST = '127.0.0.1';
 export const DEFAULT_SOURCE_REGISTRY_PORT = 4873;
 export const DEFAULT_SOURCE_REGISTRY_CONTAINER_NAME = 'nb-source-registry';
@@ -31,7 +31,7 @@ function asPosixPathForDockerMount(value) {
     return resolveCwd(value).replace(/\\/g, '/');
 }
 export function resolveSourceRegistryRootDir() {
-    return path.join(resolveCliHomeRoot(), 'verdaccio');
+    return path.join(resolveCliHomeDir(), 'verdaccio');
 }
 export function resolveSourceRegistryConfigPath() {
     return path.join(resolveSourceRegistryRootDir(), 'config.yaml');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.0-beta.35",
+  "version": "2.1.0-beta.36",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -67,6 +67,9 @@
       "self": {
         "description": "Inspect or update the NocoBase CLI itself."
       },
+      "backup": {
+        "description": "Create and restore NocoBase backups."
+      },
       "skills": {
         "description": "Inspect or synchronize NocoBase AI coding skills for the current workspace."
       },
@@ -93,7 +96,7 @@
     "ora": "^8.2.0",
     "pg": "^8.14.1",
     "picocolors": "^1.1.1",
-    "tar": "^7.4.3"
+    "tar": "^7.5.15"
   },
   "devDependencies": {
     "@types/node": "^18.19.130",
@@ -105,5 +108,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "74310d8b9e9581fcde14b5a93d12b41ddb5bb325"
+  "gitHead": "397d45c744f6eb48b3a0cd785c87cbf1257c3513"
 }