@nocobase/cli 2.2.0-beta.17 → 2.2.0-beta.18

package/dist/commands/api/resource/create.js

@@ -1,10 +1,19 @@
+/**
+ * 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.
+ */
 import { Command } from '@oclif/core';
 import { buildCreateArgs, createFlags, runResourceCommand } from '../../../lib/resource-command.js';
 export default class ResourceCreate extends Command {
-    static summary = 'Create a record in a resource';
-    static description = 'Create a record in a generic resource. Pass record content through --values as a JSON object.';
+    static summary = 'Create one or more records in a resource';
+    static description = 'Create records in a generic resource. Pass record content through --values as a JSON object, or as a JSON array of objects to create multiple records in a single request.';
     static examples = [
         `<%= config.bin %> <%= command.id %> --resource users --values '{"nickname":"Ada"}'`,
+        `<%= config.bin %> <%= command.id %> --resource users --values '[{"nickname":"Ada"},{"nickname":"Grace"}]'`,
         `<%= config.bin %> <%= command.id %> --resource posts.comments --source-id 1 --values '{"content":"Hello"}'`,
     ];
     static flags = createFlags;

package/dist/lib/plugin-import.js

@@ -207,6 +207,29 @@ async function openPluginSource(source, npmRegistry, runFn = run) {
     }
     return await packNpmPluginSource(source, npmRegistry, runFn);
 }
+/**
+ * Locate the directory holding the plugin's `package.json` inside a freshly extracted archive.
+ *
+ * Archives reach us in two shapes: npm-style tarballs (`npm pack`, registry downloads) wrap everything in a single
+ * top-level directory — conventionally `package/` — while NocoBase's own `yarn build <plugin> --tar` writes entries at
+ * the archive root. Extracting with a fixed `strip: 1` would silently discard the root-level files of the latter, so we
+ * extract verbatim and pick the package root here instead. When neither shape matches, return the extract root and let
+ * `readPluginMetadata` report the missing `package.json`.
+ */
+async function resolveArchivePackageRoot(extractRoot) {
+    if (await pathExists(path.join(extractRoot, 'package.json'))) {
+        return extractRoot;
+    }
+    const entries = await fsp.readdir(extractRoot, { withFileTypes: true });
+    const directories = entries.filter((entry) => entry.isDirectory());
+    if (directories.length === 1) {
+        const nestedRoot = path.join(extractRoot, directories[0].name);
+        if (await pathExists(path.join(nestedRoot, 'package.json'))) {
+            return nestedRoot;
+        }
+    }
+    return extractRoot;
+}
 async function readPluginMetadata(extractRoot, sourceLabel) {
     const packageJsonPath = path.join(extractRoot, 'package.json');
     let content;
@@ -241,22 +264,21 @@ export async function importPluginSource(source, options = {}) {
     await fsp.mkdir(storagePluginsPath, { recursive: true });
     const archive = await openPluginSource(normalizedSource, options.npmRegistry, options.runFn);
     const stageDir = await fsp.mkdtemp(path.join(storagePluginsPath, '.nb-plugin-import-'));
-    let stageMoved = false;
     try {
         try {
-            await pipeline(archive.stream, createGunzip(), tar.extract({ cwd: stageDir, strip: 1 }));
+            await pipeline(archive.stream, createGunzip(), tar.extract({ cwd: stageDir }));
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
             throw new Error(`Failed to extract plugin archive from ${archive.source}: ${message}`);
         }
-        const { packageName, packageVersion } = await readPluginMetadata(stageDir, archive.source);
+        const packageRoot = await resolveArchivePackageRoot(stageDir);
+        const { packageName, packageVersion } = await readPluginMetadata(packageRoot, archive.source);
         const outputDir = resolvePluginOutputDir(storagePluginsPath, packageName);
         const action = (await pathExists(outputDir)) ? 'updated' : 'installed';
         await fsp.mkdir(path.dirname(outputDir), { recursive: true });
         await fsp.rm(outputDir, { recursive: true, force: true });
-        await fsp.rename(stageDir, outputDir);
-        stageMoved = true;
+        await fsp.rename(packageRoot, outputDir);
         return {
             action,
             packageName,
@@ -268,9 +290,9 @@ export async function importPluginSource(source, options = {}) {
         };
     }
     finally {
-        if (!stageMoved) {
-            await fsp.rm(stageDir, { recursive: true, force: true });
-        }
+        // Always removes the staging directory: it is either untouched (failure), or an empty wrapper left behind after the
+        // nested package root was renamed out of it.
+        await fsp.rm(stageDir, { recursive: true, force: true });
         await archive.cleanup();
     }
 }

package/dist/lib/resource-command.js

@@ -41,6 +41,22 @@ function parseObjectFlag(value, flagName) {
     }
     return parsed;
 }
+function parseValuesFlag(value, flagName) {
+    if (value === undefined) {
+        return undefined;
+    }
+    const parsed = parseJson(value, flagName);
+    if (!parsed || typeof parsed !== 'object') {
+        throw new Error(`--${flagName} must be a JSON object, or a JSON array of objects to create multiple records`);
+    }
+    if (Array.isArray(parsed)) {
+        const invalidIndex = parsed.findIndex((item) => !item || Array.isArray(item) || typeof item !== 'object');
+        if (invalidIndex !== -1) {
+            throw new Error(`--${flagName} array items must all be JSON objects, but item ${invalidIndex} is not`);
+        }
+    }
+    return parsed;
+}
 function parseJsonArrayFlag(value, flagName) {
     if (value === undefined) {
         return undefined;
@@ -187,7 +203,7 @@ export const createFlags = {
     ...resourceBaseFlags,
     ...resourceAssociationFlags,
     values: Flags.string({
-        description: 'Record values used by create as a JSON object.',
+        description: 'Record values used by create as a JSON object, or a JSON array of objects to create multiple records in one request.',
         required: true,
     }),
     whitelist: Flags.string({
@@ -298,7 +314,7 @@ export function buildGetArgs(flags) {
 export function buildCreateArgs(flags) {
     return {
         ...pickSharedArgs(flags),
-        values: parseObjectFlag(flags.values, 'values'),
+        values: parseValuesFlag(flags.values, 'values'),
         whitelist: parseStringArrayFlags(flags.whitelist, 'whitelist'),
         blacklist: parseStringArrayFlags(flags.blacklist, 'blacklist'),
     };

package/dist/lib/resource-request.js

@@ -1,3 +1,11 @@
+/**
+ * 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.
+ */
 import { executeRawApiRequest } from './api-client.js';
 function buildActionUrl(resource, action, sourceId) {
     if (typeof sourceId === 'undefined' || sourceId === null || !resource.includes('.')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.2.0-beta.17",
+  "version": "2.2.0-beta.18",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -144,5 +144,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "32a74d4bdc538580581df7ac45f6ba9191fa2195"
+  "gitHead": "b74c962f7d35aa12012d908d16bd74fe6ac20a3d"
 }