@nocobase/test 0.21.0-alpha.1 → 0.21.0-alpha.3

package/es/e2e/e2eUtils.d.ts

@@ -5,6 +5,7 @@ export { defineConfig };
 export interface CollectionSetting {
     name: string;
     title?: string;
+    titleField?: string;
     /**
      * @default 'general'
      */
@@ -47,6 +48,7 @@ export interface CollectionSetting {
      * @default false
      */
     inherit?: boolean;
+    inherits?: string[];
     category?: any[];
     hidden?: boolean;
     description?: string;

package/es/e2e/index.mjs

@@ -17,7 +17,6 @@ const defineConfig = (config) => {
     fullyParallel: false,
     // Fail the build on CI if you accidentally left test.only in the source code.
     forbidOnly: !!process.env.CI,
-    // Retry on CI only.
     retries: 2,
     // Opt out of parallel tests on CI.
     // workers: process.env.CI ? 1 : undefined,
@@ -353,7 +352,10 @@ const deleteCollections = async (collectionNames) => {
   const headers = getHeaders(state);
   const params = collectionNames.map((name) => `filterByTk[]=${name}`).join("&");
   const result = await api.post(`/api/collections:destroy?${params}`, {
-    headers
+    headers,
+    params: {
+      cascade: true
+    }
   });
   if (!result.ok()) {
     throw new Error(await result.text());

package/es/index.mjs

@@ -85,6 +85,9 @@ class MockServer extends Application {
                     if (filterByTk) {
                       url += `/${filterByTk}`;
                     }
+                    if (restParams.filter) {
+                      restParams.filter = JSON.stringify(restParams.filter);
+                    }
                     const queryString = qs.stringify(restParams, { arrayFormat: "brackets" });
                     let request;
                     switch (method2) {

package/lib/e2e/defineConfig.js

@@ -36,7 +36,6 @@ const defineConfig = /* @__PURE__ */ __name((config) => {
     fullyParallel: false,
     // Fail the build on CI if you accidentally left test.only in the source code.
     forbidOnly: !!process.env.CI,
-    // Retry on CI only.
     retries: 2,
     // Opt out of parallel tests on CI.
     // workers: process.env.CI ? 1 : undefined,

package/lib/e2e/e2eUtils.d.ts

@@ -5,6 +5,7 @@ export { defineConfig };
 export interface CollectionSetting {
     name: string;
     title?: string;
+    titleField?: string;
     /**
      * @default 'general'
      */
@@ -47,6 +48,7 @@ export interface CollectionSetting {
      * @default false
      */
     inherit?: boolean;
+    inherits?: string[];
     category?: any[];
     hidden?: boolean;
     description?: string;

package/lib/e2e/e2eUtils.js

@@ -348,7 +348,10 @@ const deleteCollections = /* @__PURE__ */ __name(async (collectionNames) => {
   const headers = getHeaders(state);
   const params = collectionNames.map((name) => `filterByTk[]=${name}`).join("&");
   const result = await api.post(`/api/collections:destroy?${params}`, {
-    headers
+    headers,
+    params: {
+      cascade: true
+    }
   });
   if (!result.ok()) {
     throw new Error(await result.text());

package/lib/server/mockServer.js

@@ -118,6 +118,9 @@ const _MockServer = class _MockServer extends import_server.Application {
                     if (filterByTk) {
                       url += `/${filterByTk}`;
                     }
+                    if (restParams.filter) {
+                      restParams.filter = JSON.stringify(restParams.filter);
+                    }
                     const queryString = import_qs.default.stringify(restParams, { arrayFormat: "brackets" });
                     let request;
                     switch (method2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/test",
-  "version": "0.21.0-alpha.1",
+  "version": "0.21.0-alpha.3",
   "main": "lib/index.js",
   "module": "./src/index.ts",
   "types": "./lib/index.d.ts",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@faker-js/faker": "8.1.0",
-    "@nocobase/server": "0.21.0-alpha.1",
+    "@nocobase/server": "0.21.0-alpha.3",
     "@playwright/test": "^1.42.1",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.0.0",
@@ -49,6 +49,8 @@
     "@testing-library/user-event": "^14.4.3",
     "@types/supertest": "^2.0.11",
     "@vitejs/plugin-react": "^4.0.0",
+    "@vitest/coverage-istanbul": "^1.4.0",
+    "@vitest/coverage-v8": "^1.4.0",
     "jsdom": "^16.0.0",
     "jsdom-worker": "^0.3.0",
     "mariadb": "^2.5.6",
@@ -60,7 +62,8 @@
     "supertest": "^6.1.6",
     "vite": "^5.0.0",
     "vitest": "^1.4.0",
+    "vitest-dom": "^0.1.1",
     "ws": "^8.13.0"
   },
-  "gitHead": "afd2f3d1341b85ea9daa7b2667dd4ace1fafb7ff"
+  "gitHead": "f7276aff14063a2cf825191a0c83aeacde05a912"
 }

package/vitest.mjs

@@ -1,8 +1,12 @@
+/// <reference types="vitest" />
+
 import react from '@vitejs/plugin-react';
 import fs from 'fs';
 import path, { resolve } from 'path';
 import { URL } from 'url';
-import { defineConfig as vitestConfig } from 'vitest/config';
+import { mergeConfig, defineConfig as vitestConfig } from 'vitest/config';
+
+const CORE_CLIENT_PACKAGES = ['sdk', 'client'];
 
 const __dirname = new URL('.', import.meta.url).pathname;
 
@@ -44,75 +48,171 @@ function tsConfigPathsToAlias() {
   ];
 }
 
-export const defineConfig = (config = {}) => {
-  return vitestConfig(
-    process.env.TEST_ENV === 'server-side'
-      ? {
-          root: process.cwd(),
-          resolve: {
-            mainFields: ['module'],
-          },
-          test: {
-            globals: true,
-            setupFiles: resolve(__dirname, './setup/server.ts'),
-            alias: tsConfigPathsToAlias(),
-            include: ['packages/**/__tests__/**/*.test.ts'],
-            exclude: [
-              '**/node_modules/**',
-              '**/dist/**',
-              '**/lib/**',
-              '**/es/**',
-              '**/e2e/**',
-              '**/__e2e__/**',
-              '**/{vitest,commitlint}.config.*',
-              'packages/**/{dumi-theme-nocobase,sdk,client}/**/__tests__/**/*.{test,spec}.{ts,tsx}',
-            ],
-            testTimeout: 300000,
-            hookTimeout: 300000,
-            // bail: 1,
-            // 在 GitHub Actions 中不输出日志
-            silent: !!process.env.GITHUB_ACTIONS,
-            // poolOptions: {
-            //   threads: {
-            //     singleThread: process.env.SINGLE_THREAD == 'false' ? false : true,
-            //   },
-            // },
-          },
-        }
-      : {
-          plugins: [react()],
-          resolve: {
-            mainFields: ['module'],
-          },
-          define: {
-            'process.env.__TEST__': true,
-            'process.env.__E2E__': false,
-          },
-          test: {
-            globals: true,
-            setupFiles: resolve(__dirname, './setup/client.ts'),
-            environment: 'jsdom',
-            css: false,
-            alias: tsConfigPathsToAlias(),
-            include: ['packages/**/{dumi-theme-nocobase,sdk,client}/**/__tests__/**/*.{test,spec}.{ts,tsx}'],
-            exclude: [
-              '**/node_modules/**',
-              '**/dist/**',
-              '**/lib/**',
-              '**/es/**',
-              '**/e2e/**',
-              '**/__e2e__/**',
-              '**/{vitest,commitlint}.config.*',
-            ],
-            testTimeout: 300000,
-            // 在 GitHub Actions 中不输出日志
-            silent: !!process.env.GITHUB_ACTIONS,
-            server: {
-              deps: {
-                inline: ['@juggle/resize-observer', 'clsx'],
-              },
-            },
-          },
+const defineCommonConfig = () => {
+  return vitestConfig({
+    root: process.cwd(),
+    resolve: {
+      mainFields: ['module'],
+    },
+    test: {
+      globals: true,
+      alias: tsConfigPathsToAlias(),
+      testTimeout: 300000,
+      hookTimeout: 300000,
+      silent: !!process.env.GITHUB_ACTIONS,
+      include: ['packages/**/src/**/__tests__/**/*.test.{ts,tsx}'],
+      exclude: [
+        '**/demos/**',
+        '**/node_modules/**',
+        '**/dist/**',
+        '**/lib/**',
+        '**/es/**',
+        '**/.dumi/**',
+        '**/e2e/**',
+        '**/__e2e__/**',
+        '**/{vitest,commitlint}.config.*',
+      ],
+      watchExclude: [
+        '**/node_modules/**',
+        '**/dist/**',
+        '**/lib/**',
+        '**/es/**',
+        '**/.dumi/**',
+        '**/e2e/**',
+        '**/__e2e__/**',
+        '**/{vitest,commitlint}.config.*',
+      ],
+      coverage: {
+        provider: 'istanbul',
+        include: ['packages/**/src/**/*.{ts,tsx}'],
+        exclude: [
+          '**/demos/**',
+          '**/swagger/**',
+          '**/.dumi/**',
+          '**/.umi/**',
+          '**/.plugins/**',
+          '**/lib/**',
+          '**/__tests__/**',
+          '**/e2e/**',
+          '**/client.js',
+          '**/server.js',
+          '**/*.d.ts',
+        ],
+      },
+    },
+  });
+};
+
+function getExclude(isServer) {
+  return [
+    `packages/core/${isServer ? '' : '!'}(${CORE_CLIENT_PACKAGES.join('|')})/**/*`,
+    `packages/**/src/${isServer ? 'client' : 'server'}/**/*`,
+  ];
+}
+
+const defineServerConfig = () => {
+  return vitestConfig({
+    test: {
+      setupFiles: resolve(__dirname, './setup/server.ts'),
+      exclude: getExclude(true),
+    },
+    coverage: {
+      exclude: getExclude(true),
+    },
+  });
+};
+
+const defineClientConfig = () => {
+  return vitestConfig({
+    plugins: [react()],
+    define: {
+      'process.env.__TEST__': true,
+      'process.env.__E2E__': false,
+      global: 'window',
+    },
+    test: {
+      environment: 'jsdom',
+      css: false,
+      setupFiles: resolve(__dirname, './setup/client.ts'),
+      server: {
+        deps: {
+          inline: ['@juggle/resize-observer', 'clsx'],
         },
+      },
+      exclude: getExclude(false),
+      coverage: {
+        exclude: getExclude(false),
+      },
+    },
+  });
+};
+
+export const getFilterInclude = (isServer, isCoverage) => {
+  let filterFileOrDir = process.argv.slice(2).find((arg) => !arg.startsWith('-'));
+  if (!filterFileOrDir) return;
+  const absPath = path.join(process.cwd(), filterFileOrDir);
+  const isDir = fs.existsSync(absPath) && fs.statSync(absPath).isDirectory();
+  // 如果是文件，则只测试当前文件
+  if (!isDir) {
+    return [filterFileOrDir];
+  }
+
+  const suffix = isCoverage ? `**/*.{ts,tsx}` : `**/__tests__/**/*.{test,spec}.{ts,tsx}`;
+
+  // 判断是否为包目录，如果不是包目录，则只测试当前目录
+  const isPackage = fs.existsSync(path.join(absPath, 'package.json'));
+  if (!isPackage) {
+    return [`${filterFileOrDir}/${suffix}`];
+  }
+
+  // 判断是否为 core 包目录，不分 client 和 server
+  const isCore = absPath.includes('packages/core');
+  if (isCore) {
+    return [`${filterFileOrDir}/src/${suffix}`];
+  }
+
+  // 插件目录，区分 client 和 server
+  return [`${filterFileOrDir}/src/${isServer ? 'server' : 'client'}/${suffix}`];
+};
+
+export const getReportsDirectory = (isServer) => {
+  let filterFileOrDir = process.argv.slice(2).find((arg) => !arg.startsWith('-'));
+  if (!filterFileOrDir) return;
+  const isPackage = fs.existsSync(path.join(process.cwd(), filterFileOrDir, 'package.json'));
+  if (isPackage) {
+    let reportsDirectory = `./storage/coverage/${filterFileOrDir.replace('packages/', '')}`;
+
+    const isCore = filterFileOrDir.includes('packages/core');
+
+    if (!isCore) {
+      reportsDirectory = `${reportsDirectory}/${isServer ? 'server' : 'client'}`;
+    }
+
+    return reportsDirectory;
+  }
+};
+
+export const defineConfig = () => {
+  const isServer = process.env.TEST_ENV === 'server-side';
+  const config = vitestConfig(
+    mergeConfig(defineCommonConfig(), isServer ? defineServerConfig() : defineClientConfig()),
   );
+
+  const isCoverage = process.argv.includes('--coverage');
+  if (!isCoverage) {
+    return config;
+  }
+
+  const filterInclude = getFilterInclude(isServer);
+  if (filterInclude) {
+    config.test.include = getFilterInclude(isServer);
+  }
+
+  config.test.coverage.include = getFilterInclude(isServer, true);
+  const reportsDirectory = getReportsDirectory(isServer);
+  if (reportsDirectory) {
+    config.test.coverage.reportsDirectory = reportsDirectory;
+  }
+
+  return config;
 };