@nocobase/test 1.9.0-beta.1 → 1.9.0-beta.10

package/es/server/mock-server.d.ts

@@ -85,11 +85,12 @@ export type MockClusterOptions = MockServerOptions & {
     number?: number;
     clusterName?: string;
     appName?: string;
+    mockInstanceId?: boolean;
 };
 export type MockCluster = {
     nodes: MockServer[];
     destroy: () => Promise<void>;
 };
-export declare function createMockCluster({ number, clusterName, appName, ...options }?: MockClusterOptions): Promise<MockCluster>;
+export declare function createMockCluster({ number, clusterName, appName, mockInstanceId, ...options }?: MockClusterOptions): Promise<MockCluster>;
 export declare function createMockServer(options?: MockServerOptions): Promise<MockServer>;
 export default mockServer;

package/lib/server/mock-server.d.ts

@@ -85,11 +85,12 @@ export type MockClusterOptions = MockServerOptions & {
     number?: number;
     clusterName?: string;
     appName?: string;
+    mockInstanceId?: boolean;
 };
 export type MockCluster = {
     nodes: MockServer[];
     destroy: () => Promise<void>;
 };
-export declare function createMockCluster({ number, clusterName, appName, ...options }?: MockClusterOptions): Promise<MockCluster>;
+export declare function createMockCluster({ number, clusterName, appName, mockInstanceId, ...options }?: MockClusterOptions): Promise<MockCluster>;
 export declare function createMockServer(options?: MockServerOptions): Promise<MockServer>;
 export default mockServer;

package/lib/server/mock-server.js

@@ -98,7 +98,7 @@ const _MockServer = class _MockServer extends import_server.Application {
       get(target, method, receiver) {
         if (["login", "loginUsingId"].includes(method)) {
           return async (userOrId, roleName) => {
-            const userId = typeof userOrId === "number" ? userOrId : userOrId == null ? void 0 : userOrId.id;
+            const userId = (userOrId == null ? void 0 : userOrId.id) ? userOrId.id : userOrId;
             const tokenInfo = await authManager.tokenController.add({ userId });
             const expiresIn = (await authManager.tokenController.getConfig()).tokenExpirationTime;
             return proxy.auth(
@@ -228,6 +228,7 @@ async function createMockCluster({
   number = 2,
   clusterName = `cluster_${(0, import_utils.uid)()}`,
   appName = `app_${(0, import_utils.uid)()}`,
+  mockInstanceId = true,
   ...options
 } = {}) {
   const nodes = [];
@@ -242,7 +243,7 @@ async function createMockCluster({
       ...options,
       skipSupervisor: true,
       name: clusterName + "_" + appName,
-      instanceId: `${clusterName}_${appName}_${i}`,
+      instanceId: mockInstanceId ? i : void 0,
       pubSubManager: {
         channelPrefix: clusterName
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "1.9.0-beta.1",
+  "version": "1.9.0-beta.10",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -51,7 +51,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "1.9.0-beta.1",
+    "@nocobase/server": "1.9.0-beta.10",
     "@playwright/test": "^1.45.3",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.0.0",
@@ -75,5 +75,5 @@
     "vitest-dom": "^0.1.1",
     "ws": "^8.13.0"
   },
-  "gitHead": "e0597219574e23bbf15b57848cb9b0fb4953634f"
+  "gitHead": "a4a5180d8e9b6bebe9df1a931c2c0f8b5c5d26e6"
 }

package/perf/collections/categories.ts

@@ -0,0 +1,209 @@
+/**
+ * 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 { CollectionOptions } from '@nocobase/database';
+
+export default {
+  title: 'Categories',
+  name: 'categories',
+  createdBy: true,
+  updatedBy: true,
+  fields: [
+    {
+      type: 'string',
+      name: 'title',
+      unique: true,
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: 'Title',
+        'x-component': 'Input',
+      },
+    },
+    {
+      type: 'string',
+      name: 'subTitle',
+      unique: true,
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: 'Sub Title',
+        'x-component': 'Input',
+      },
+    },
+    {
+      type: 'text',
+      name: 'description',
+      unique: true,
+      interface: 'textarea',
+      uiSchema: {
+        type: 'string',
+        title: 'Description',
+        'x-component': 'Input.TextArea',
+      },
+    },
+    {
+      type: 'string',
+      name: 'slug',
+      unique: true,
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: 'Slug',
+        'x-component': 'Input',
+      },
+    },
+    { type: 'sort', name: 'sort' },
+    {
+      type: 'string',
+      name: 'coverImageUrl',
+      interface: 'url',
+      uiSchema: {
+        type: 'string',
+        title: 'Cover Image URL',
+        'x-component': 'Input.URL',
+      },
+    },
+    {
+      type: 'string',
+      name: 'url',
+      interface: 'url',
+      uiSchema: {
+        type: 'string',
+        title: 'URL',
+        'x-component': 'Input.URL',
+      },
+    },
+    {
+      type: 'integer',
+      name: 'followerCount',
+      defaultValue: 0,
+      interface: 'integer',
+      uiSchema: {
+        type: 'number',
+        title: 'Follower Count',
+        'x-component': 'InputNumber',
+      },
+    },
+    {
+      type: 'integer',
+      name: 'articleCount',
+      defaultValue: 0,
+      interface: 'integer',
+      uiSchema: {
+        type: 'number',
+        title: 'Article Count',
+        'x-component': 'InputNumber',
+      },
+    },
+    {
+      type: 'date',
+      name: 'lastPostedAt',
+      interface: 'date',
+      uiSchema: {
+        type: 'string',
+        title: 'Last Posted At',
+        'x-component': 'DatePicker',
+      },
+    },
+    {
+      type: 'boolean',
+      name: 'hidden',
+      defaultValue: false,
+      interface: 'checkbox',
+      uiSchema: {
+        type: 'string',
+        title: 'Hidden',
+        'x-component': 'Checkbox',
+      },
+    },
+    {
+      type: 'string',
+      name: 'themeColor',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: 'Theme Color',
+        'x-component': 'Input',
+      },
+    },
+    {
+      type: 'string',
+      name: 'icon',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: 'Icon',
+        'x-component': 'Input',
+      },
+    },
+    {
+      type: 'boolean',
+      name: 'allowComments',
+      defaultValue: true,
+      interface: 'checkbox',
+      uiSchema: {
+        type: 'string',
+        title: 'Allow Comments',
+        'x-component': 'Checkbox',
+      },
+    },
+    {
+      type: 'belongsTo',
+      name: 'parent',
+      target: 'categories',
+      interface: 'm2o',
+      uiSchema: {
+        type: 'object',
+        title: 'Parent',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          fieldNames: {
+            value: 'id',
+            label: 'title',
+          },
+        },
+      },
+    },
+    {
+      type: 'hasMany',
+      name: 'posts',
+      interface: 'o2m',
+      uiSchema: {
+        type: 'array',
+        title: 'Posts',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            value: 'id',
+            label: 'title',
+          },
+        },
+      },
+    },
+    {
+      type: 'belongsTo',
+      name: 'moderator',
+      target: 'users',
+      interface: 'm2o',
+      uiSchema: {
+        type: 'object',
+        title: 'Moderator',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          fieldNames: {
+            value: 'id',
+            label: 'nickname',
+          },
+        },
+      },
+    },
+  ],
+} as CollectionOptions;

package/perf/collections/comments.ts

@@ -0,0 +1,268 @@
+/**
+ * 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 { CollectionOptions } from '@nocobase/database';
+
+export default {
+  title: 'Comments',
+  name: 'comments',
+  createdBy: true,
+  updatedBy: true,
+  fields: [
+    {
+      type: 'text',
+      name: 'content',
+      interface: 'textarea',
+      uiSchema: {
+        type: 'string',
+        title: 'Content',
+        'x-component': 'Input.TextArea',
+      },
+    },
+    {
+      type: 'string',
+      name: 'authorName',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: 'Author Name',
+        'x-component': 'Input',
+      },
+    },
+    {
+      type: 'string',
+      name: 'authorEmail',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: 'Author Email',
+        'x-component': 'Input',
+      },
+    },
+    {
+      type: 'string',
+      name: 'authorUrl',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: 'Author URL',
+        'x-component': 'Input',
+      },
+    },
+    {
+      type: 'string',
+      name: 'ipAddress',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: 'IP Address',
+        'x-component': 'Input',
+      },
+    },
+    {
+      type: 'string',
+      name: 'userAgent',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        title: 'User Agent',
+        'x-component': 'Input',
+      },
+    },
+    {
+      type: 'string',
+      name: 'status',
+      defaultValue: 'pending',
+      uiSchema: {
+        type: 'string',
+        title: 'Status',
+        'x-component': 'Select',
+        enum: [
+          { label: 'Pending', value: 'pending' },
+          { label: 'Approved', value: 'approved' },
+          { label: 'Spam', value: 'spam' },
+        ],
+      },
+    },
+    {
+      type: 'integer',
+      name: 'likeCount',
+      interface: 'integer',
+      defaultValue: 0,
+      uiSchema: {
+        type: 'number',
+        title: 'Like Count',
+        'x-component': 'InputNumber',
+      },
+    },
+    {
+      type: 'integer',
+      name: 'dislikeCount',
+      interface: 'integer',
+      defaultValue: 0,
+      uiSchema: {
+        type: 'number',
+        title: 'Dislike Count',
+        'x-component': 'InputNumber',
+      },
+    },
+    {
+      type: 'integer',
+      name: 'rating',
+      interface: 'number',
+      defaultValue: 0,
+      uiSchema: {
+        type: 'number',
+        title: 'Rating',
+        'x-component': 'InputNumber',
+        'x-component-props': {
+          step: 0.1,
+          min: 0,
+          max: 5,
+        },
+      },
+    }, // 1-5
+    {
+      type: 'boolean',
+      name: 'isApproved',
+      interface: 'checkbox',
+      defaultValue: false,
+      uiSchema: {
+        type: 'string',
+        title: 'Is Approved',
+        'x-component': 'Checkbox',
+      },
+    },
+    {
+      type: 'boolean',
+      name: 'isFeatured',
+      interface: 'checkbox',
+      defaultValue: false,
+      uiSchema: {
+        type: 'string',
+        title: 'Is Featured',
+        'x-component': 'Checkbox',
+      },
+    },
+    {
+      type: 'boolean',
+      name: 'isSticky',
+      interface: 'checkbox',
+      defaultValue: false,
+      uiSchema: {
+        type: 'string',
+        title: 'Is Sticky',
+        'x-component': 'Checkbox',
+      },
+    },
+    {
+      type: 'string',
+      name: 'path',
+      interface: 'input',
+      uiSchema: {
+        type: 'string',
+        uiSchema: {
+          type: 'string',
+          title: 'Path',
+          'x-component': 'Input',
+        },
+      },
+    }, // For threaded comments (materialized path)
+    {
+      type: 'belongsTo',
+      name: 'post',
+      interface: 'm2o',
+      uiSchema: {
+        type: 'object',
+        title: 'Post',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          fieldNames: {
+            value: 'id',
+            label: 'title',
+          },
+        },
+      },
+    },
+    {
+      type: 'belongsTo',
+      name: 'parent',
+      target: 'comments',
+      interface: 'm2o',
+      uiSchema: {
+        type: 'object',
+        title: 'Parent Comment',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          fieldNames: {
+            value: 'id',
+            label: 'id',
+          },
+        },
+      },
+    },
+    {
+      type: 'hasMany',
+      name: 'children',
+      target: 'comments',
+      foreignKey: 'parentId',
+      interface: 'o2m',
+      uiSchema: {
+        type: 'array',
+        title: 'Child Comments',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            value: 'id',
+            label: 'id',
+          },
+        },
+      },
+    },
+    {
+      type: 'belongsToMany',
+      name: 'mentions',
+      target: 'users',
+      interface: 'm2m',
+      uiSchema: {
+        type: 'object',
+        title: 'Mentions',
+        'x-component': 'AssociationField',
+        'x-component-props': {
+          multiple: true,
+          fieldNames: {
+            value: 'id',
+            label: 'nickname',
+          },
+        },
+      },
+    },
+    {
+      type: 'json',
+      name: 'attachments',
+      interface: 'json',
+      uiSchema: {
+        type: 'object',
+        title: 'Attachments',
+        'x-component': 'Input.JSON',
+      },
+    },
+    {
+      type: 'text',
+      name: 'moderationNotes',
+      interface: 'textarea',
+      uiSchema: {
+        type: 'string',
+        title: 'Moderation Notes',
+        'x-component': 'Input.TextArea',
+      },
+    },
+  ],
+} as CollectionOptions;