@tachybase/test 0.23.41 → 0.23.47

package/es/e2e/index.mjs

@@ -1,5 +1,5 @@
+import { uid } from "@tachybase/schema";
 import "@faker-js/faker";
-import { uid } from "@formily/shared";
 import { defineConfig as defineConfig$1, devices, test as test$2, request, expect } from "@playwright/test";
 export * from "@playwright/test";
 import _ from "lodash";
@@ -61,10 +61,6 @@ class NocoPage {
     this.page = page;
     this._waitForInit = this.init();
   }
-  url;
-  uid;
-  collectionsName;
-  _waitForInit;
   async init() {
     var _a, _b, _c, _d, _e, _f, _g;
     if ((_b = (_a = this.options) == null ? void 0 : _a.collections) == null ? void 0 : _b.length) {
@@ -265,7 +261,7 @@ const _test = test$2.extend({
 });
 const test = Object.assign(_test, {
   /** 只运行在 postgres 数据库中 */
-  pgOnly: process.env.DB_DIALECT == "postgres" ? _test : _test.skip
+  pgOnly: process.env.DB_DIALECT === "postgres" ? _test : _test.skip
 });
 const getStorageItem = (key, storageState) => {
   var _a, _b;

package/lib/e2e/e2eUtils.js

@@ -38,8 +38,8 @@ __export(e2eUtils_exports, {
   test: () => test
 });
 module.exports = __toCommonJS(e2eUtils_exports);
+var import_schema = require("@tachybase/schema");
 var import_faker = require("@faker-js/faker");
-var import_shared = require("@formily/shared");
 var import_test = require("@playwright/test");
 var import_lodash = __toESM(require("lodash"));
 var import_defineConfig = require("./defineConfig");
@@ -52,10 +52,6 @@ const _NocoPage = class _NocoPage {
     this.page = page;
     this._waitForInit = this.init();
   }
-  url;
-  uid;
-  collectionsName;
-  _waitForInit;
   async init() {
     var _a, _b, _c, _d, _e, _f, _g;
     if ((_b = (_a = this.options) == null ? void 0 : _a.collections) == null ? void 0 : _b.length) {
@@ -258,7 +254,7 @@ const _test = import_test.test.extend({
 });
 const test = Object.assign(_test, {
   /** 只运行在 postgres 数据库中 */
-  pgOnly: process.env.DB_DIALECT == "postgres" ? _test : _test.skip
+  pgOnly: process.env.DB_DIALECT === "postgres" ? _test : _test.skip
 });
 const getStorageItem = /* @__PURE__ */ __name((key, storageState) => {
   var _a, _b;
@@ -269,7 +265,7 @@ const updateUidOfPageSchema = /* @__PURE__ */ __name((uiSchema) => {
     return;
   }
   if (uiSchema["x-uid"]) {
-    uiSchema["x-uid"] = (0, import_shared.uid)();
+    uiSchema["x-uid"] = (0, import_schema.uid)();
   }
   if (uiSchema.properties) {
     Object.keys(uiSchema.properties).forEach((key) => {
@@ -301,8 +297,8 @@ const createPage = /* @__PURE__ */ __name(async (options) => {
   };
   const state = await api.storageState();
   const headers = getHeaders(state);
-  const pageUid = (0, import_shared.uid)();
-  const gridName = (0, import_shared.uid)();
+  const pageUid = (0, import_schema.uid)();
+  const gridName = (0, import_schema.uid)();
   const result = await api.post(`/api/uiSchemas:insertAdjacent/default-admin-menu?position=beforeEnd`, {
     headers,
     data: {
@@ -331,15 +327,15 @@ const createPage = /* @__PURE__ */ __name(async (options) => {
                 type: "void",
                 "x-component": "Grid",
                 "x-initializer": "page:addBlock",
-                "x-uid": (0, import_shared.uid)(),
+                "x-uid": (0, import_schema.uid)(),
                 name: gridName
               }
             },
-            "x-uid": (0, import_shared.uid)(),
+            "x-uid": (0, import_schema.uid)(),
             name: "page"
           }
         },
-        name: (0, import_shared.uid)(),
+        name: (0, import_schema.uid)(),
         "x-uid": pageUid
       },
       wrap: null
@@ -424,7 +420,7 @@ const createRole = /* @__PURE__ */ __name(async (roleSetting) => {
   });
   const state = await api.storageState();
   const headers = getHeaders(state);
-  const name = roleSetting.name || (0, import_shared.uid)();
+  const name = roleSetting.name || (0, import_schema.uid)();
   const result = await api.post(`/api/users/1/roles:create`, {
     headers,
     data: { ...roleSetting, name, title: name }

package/lib/scripts/test-db-creator.js

@@ -30,8 +30,10 @@ var import_promise = __toESM(require("mysql2/promise"));
 var import_pg = __toESM(require("pg"));
 import_dotenv.default.config({ path: import_path.default.resolve(process.cwd(), ".env.test") });
 const _BaseClient = class _BaseClient {
-  _client = null;
-  createdDBs = /* @__PURE__ */ new Set();
+  constructor() {
+    this._client = null;
+    this.createdDBs = /* @__PURE__ */ new Set();
+  }
   async createDB(name) {
     if (this.createdDBs.has(name)) {
       return;

package/lib/scripts/test-db-distributor.js

@@ -30,7 +30,9 @@ var import_pg = __toESM(require("pg"));
 import_dotenv.default.config({ path: import_path.default.resolve(process.cwd(), ".env.test") });
 const delay = /* @__PURE__ */ __name((ms) => new Promise((resolve) => setTimeout(resolve, ms)), "delay");
 const _DBManager = class _DBManager {
-  acquiredDBs = /* @__PURE__ */ new Map();
+  constructor() {
+    this.acquiredDBs = /* @__PURE__ */ new Map();
+  }
   acquire(name, via) {
     console.log("acquire", name, "via", via);
     if (this.acquiredDBs.has(name)) {
@@ -76,8 +78,8 @@ const getDBNames = /* @__PURE__ */ __name((size, name) => {
 const _BasePool = class _BasePool {
   constructor(size) {
     this.size = size;
+    this.dbManager = new DBManager();
   }
-  dbManager = new DBManager();
   async init() {
     const promises = [];
     for (const name of getDBNames(this.size, this.getConfiguredDatabaseName())) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/test",
-  "version": "0.23.41",
+  "version": "0.23.47",
   "license": "Apache-2.0",
   "exports": {
     ".": {
@@ -41,11 +41,10 @@
   "types": "./lib/index.d.ts",
   "dependencies": {
     "@faker-js/faker": "8.4.1",
-    "@formily/shared": "2.3.2",
     "@playwright/test": "^1.49.1",
-    "@testing-library/dom": "^9.3.4",
+    "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^14.3.1",
+    "@testing-library/react": "^16.2.0",
     "@testing-library/user-event": "^14.5.2",
     "@types/supertest": "^2.0.16",
     "@vitejs/plugin-react": "^4.3.4",
@@ -63,10 +62,11 @@
     "sqlite3": "^5.1.7",
     "supertest": "^6.3.4",
     "vite": "^5.4.11",
-    "vitest": "^1.6.0",
+    "vitest": "^3.0.5",
     "ws": "^8.18.0",
-    "@tachybase/database": "0.23.41",
-    "@tachybase/server": "0.23.41"
+    "@tachybase/database": "0.23.47",
+    "@tachybase/server": "0.23.47",
+    "@tachybase/schema": "0.23.47"
   },
   "scripts": {
     "build": "tachybase-build --no-dts @tachybase/test"

package/vitest.mjs

@@ -66,7 +66,7 @@ export const defineConfig = (config = {}) => {
               '**/e2e/**',
               '**/__e2e__/**',
               '**/{vitest,commitlint}.config.*',
-              'packages/**/{sdk,client}/**/__tests__/**/*.{test,spec}.{ts,tsx}',
+              'packages/**/{sdk,client,schema}/**/__tests__/**/*.{test,spec}.{ts,tsx}',
             ],
             testTimeout: 300000,
             hookTimeout: 300000,
@@ -95,7 +95,7 @@ export const defineConfig = (config = {}) => {
             environment: 'jsdom',
             css: false,
             alias: tsConfigPathsToAlias(),
-            include: ['packages/**/{sdk,client}/**/__tests__/**/*.{test,spec}.{ts,tsx}'],
+            include: ['packages/**/{sdk,client,schema}/**/__tests__/**/*.{test,spec}.{ts,tsx}'],
             exclude: [
               '**/node_modules/**',
               '**/dist/**',