@tachybase/plugin-workflow-test 1.6.21 → 1.6.23

package/dist/externalVersion.js

@@ -1,7 +1,7 @@
 module.exports = {
-  "@tachybase/client": "1.6.21",
+  "@tachybase/client": "1.6.23",
   "dayjs": "1.11.13",
   "lodash": "4.17.21",
-  "@tachybase/test": "1.6.11",
-  "@tego/server": "1.6.11"
+  "@tachybase/test": "1.6.16",
+  "@tego/server": "1.6.16"
 };

package/dist/server/collections/categories.js

@@ -1,26 +1,4 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var categories_exports = {};
-__export(categories_exports, {
-  default: () => categories_default
-});
-module.exports = __toCommonJS(categories_exports);
-var categories_default = {
+module.exports = {
   name: "categories",
   fields: [
     {

package/dist/server/collections/comments.js

@@ -1,26 +1,4 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var comments_exports = {};
-__export(comments_exports, {
-  default: () => comments_default
-});
-module.exports = __toCommonJS(comments_exports);
-var comments_default = {
+module.exports = {
   name: "comments",
   fields: [
     {

package/dist/server/collections/posts.js

@@ -1,26 +1,4 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var posts_exports = {};
-__export(posts_exports, {
-  default: () => posts_default
-});
-module.exports = __toCommonJS(posts_exports);
-var posts_default = {
+module.exports = {
   name: "posts",
   createdBy: true,
   updatedBy: true,
@@ -50,11 +28,6 @@ var posts_default = {
     {
       type: "belongsToMany",
       name: "tags"
-    },
-    {
-      type: "integer",
-      name: "read",
-      defaultValue: 0
     }
   ]
 };

package/dist/server/collections/replies.js

@@ -1,31 +1,13 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var replies_exports = {};
-__export(replies_exports, {
-  default: () => replies_default
-});
-module.exports = __toCommonJS(replies_exports);
-var replies_default = {
+module.exports = {
   name: "replies",
   fields: [
     {
       type: "string",
       name: "content"
+    },
+    {
+      type: "belongsTo",
+      name: "comment"
     }
   ]
 };

package/dist/server/collections/tags.js

@@ -1,26 +1,4 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var tags_exports = {};
-__export(tags_exports, {
-  default: () => tags_default
-});
-module.exports = __toCommonJS(tags_exports);
-var tags_default = {
+module.exports = {
   name: "tags",
   fields: [
     {

package/dist/server/index.d.ts

@@ -1,7 +1,8 @@
-import { MockServer } from '@tachybase/test';
+import { type MockServer } from '@tachybase/test';
 import { ApplicationOptions, Plugin } from '@tego/server';
 export interface MockServerOptions extends ApplicationOptions {
     collectionsPath?: string;
+    withAnotherDataSource?: boolean;
 }
 export declare function sleep(ms: number): Promise<unknown>;
 export declare function getApp(options?: MockServerOptions): Promise<MockServer>;

package/dist/server/index.js

@@ -32,6 +32,7 @@ __export(server_exports, {
   sleep: () => sleep
 });
 module.exports = __toCommonJS(server_exports);
+var import_node_fs = __toESM(require("node:fs"));
 var import_node_path = __toESM(require("node:path"));
 var import_test = require("@tachybase/test");
 var import_server = require("@tego/server");
@@ -44,17 +45,58 @@ function sleep(ms) {
   });
 }
 async function getApp(options = {}) {
-  const { plugins = [], collectionsPath, ...others } = options;
+  const { plugins = [], collectionsPath, withAnotherDataSource = false, ...others } = options;
+  const defaultCollectionsPath = import_node_path.default.resolve(__dirname, "collections");
+  const compiledCollectionsPath = import_node_path.default.resolve(__dirname, "../../dist/server/collections");
+  const resolvedCollectionsPath = collectionsPath || (import_node_fs.default.existsSync(compiledCollectionsPath) ? compiledCollectionsPath : defaultCollectionsPath);
   class TestCollectionPlugin extends import_server.Plugin {
     async load() {
-      if (collectionsPath) {
-        await this.db.import({ directory: collectionsPath });
+      if (resolvedCollectionsPath) {
+        await this.db.import({ directory: resolvedCollectionsPath });
+      }
+    }
+  }
+  class TestAuthStatusPlugin extends import_server.Plugin {
+    async load() {
+      if (!this.app.authManager.userStatusService) {
+        this.app.authManager.setUserStatusService({
+          async checkUserStatus() {
+            return {
+              allowed: true,
+              status: "active",
+              statusInfo: {
+                title: "Active",
+                color: "green",
+                allowLogin: true
+              },
+              errorMessage: "",
+              isExpired: false
+            };
+          },
+          async setUserStatusCache() {
+          },
+          async getUserStatusFromCache() {
+            return null;
+          },
+          getUserStatusCacheKey(userId) {
+            return `test-user-status:${userId}`;
+          },
+          async restoreUserStatus() {
+          },
+          async clearUserStatusCache() {
+          },
+          async recordStatusHistoryIfNotExists() {
+          }
+        });
       }
     }
   }
   const app = await (0, import_test.createMockServer)({
     ...others,
     plugins: [
+      "error-handler",
+      "collection",
+      "user",
       [
         "workflow",
         {
@@ -65,27 +107,30 @@ async function getApp(options = {}) {
       ],
       "workflow-test",
       TestCollectionPlugin,
-      ...plugins
+      ...plugins,
+      TestAuthStatusPlugin
     ]
   });
-  await app.dataSourceManager.add(
-    new import_server.SequelizeDataSource({
-      name: "another",
-      collectionManager: {
-        database: (0, import_test.mockDatabase)({
-          tablePrefix: `t${(0, import_server.uid)(5)}`
-        })
-      },
-      resourceManager: {}
-    })
-  );
-  const another = app.dataSourceManager.dataSources.get("another");
-  const anotherDB = another.collectionManager.db;
-  await anotherDB.import({
-    directory: import_node_path.default.resolve(__dirname, "collections")
-  });
-  await anotherDB.sync();
-  another.acl.allow("*", "*");
+  if (withAnotherDataSource) {
+    await app.dataSourceManager.add(
+      new import_server.SequelizeDataSource({
+        name: "another",
+        collectionManager: {
+          database: (0, import_server.mockDatabase)({
+            tablePrefix: `t${(0, import_server.uid)(5)}`
+          })
+        },
+        resourceManager: {}
+      })
+    );
+    const another = app.dataSourceManager.dataSources.get("another");
+    const anotherDB = another.collectionManager.db;
+    await anotherDB.import({
+      directory: resolvedCollectionsPath
+    });
+    await anotherDB.sync();
+    another.acl.allow("*", "*");
+  }
   return app;
 }
 class WorkflowTestPlugin extends import_server.Plugin {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/plugin-workflow-test",
   "displayName": "Workflow: test kit",
-  "version": "1.6.21",
+  "version": "1.6.23",
   "description": "Workflow Test Toolkit",
   "keywords": [
     "Workflow"
@@ -19,12 +19,12 @@
   "main": "dist/server/index.js",
   "types": "./dist/server/index.d.ts",
   "devDependencies": {
-    "@tachybase/test": "1.6.11",
-    "@tego/client": "1.6.11",
-    "@tego/server": "1.6.11",
+    "@tachybase/test": "1.6.16",
+    "@tego/client": "1.6.16",
+    "@tego/server": "1.6.16",
     "dayjs": "1.11.13",
     "lodash": "4.17.21",
-    "@tachybase/client": "1.6.21"
+    "@tachybase/client": "1.6.23"
   },
   "description.zh-CN": "工作流测试工具包",
   "displayName.zh-CN": "工作流：测试工具包"

package/src/server/collections/{categories.ts → categories.js}

@@ -1,6 +1,4 @@
-import { CollectionOptions } from '@tego/server';
-
-export default {
+module.exports = {
   name: 'categories',
   fields: [
     {
@@ -12,4 +10,4 @@ export default {
       name: 'posts',
     },
   ],
-} as CollectionOptions;
+};

package/src/server/collections/{comments.ts → comments.js}

@@ -1,6 +1,4 @@
-import { CollectionOptions } from '@tego/server';
-
-export default {
+module.exports = {
   name: 'comments',
   fields: [
     {
@@ -21,4 +19,4 @@ export default {
       name: 'replies',
     },
   ],
-} as CollectionOptions;
+};

package/src/server/collections/{posts.ts → posts.js}

@@ -1,6 +1,4 @@
-import { CollectionOptions } from '@tego/server';
-
-export default {
+module.exports = {
   name: 'posts',
   createdBy: true,
   updatedBy: true,
@@ -31,10 +29,5 @@ export default {
       type: 'belongsToMany',
       name: 'tags',
     },
-    {
-      type: 'integer',
-      name: 'read',
-      defaultValue: 0,
-    },
   ],
-} as CollectionOptions;
+};

package/src/server/collections/{replies.ts → replies.js}

@@ -1,9 +1,13 @@
-export default {
+module.exports = {
   name: 'replies',
   fields: [
     {
       type: 'string',
       name: 'content',
     },
+    {
+      type: 'belongsTo',
+      name: 'comment',
+    },
   ],
 };

package/src/server/collections/{tags.ts → tags.js}

@@ -1,6 +1,4 @@
-import { CollectionOptions } from '@tego/server';
-
-export default {
+module.exports = {
   name: 'tags',
   fields: [
     {
@@ -12,4 +10,4 @@ export default {
       name: 'name',
     },
   ],
-} as CollectionOptions;
+};

package/src/server/index.ts

@@ -1,6 +1,7 @@
+import fs from 'node:fs';
 import path from 'node:path';
-import { createMockServer, mockDatabase, MockServer } from '@tachybase/test';
-import { ApplicationOptions, Plugin, Resourcer, SequelizeDataSource, uid } from '@tego/server';
+import { createMockServer, type MockServer } from '@tachybase/test';
+import { ApplicationOptions, mockDatabase, Plugin, Resourcer, SequelizeDataSource, uid } from '@tego/server';
 
 import functions from './functions';
 import instructions from './instructions';
@@ -8,6 +9,7 @@ import triggers from './triggers';
 
 export interface MockServerOptions extends ApplicationOptions {
   collectionsPath?: string;
+  withAnotherDataSource?: boolean;
 }
 
 // async function createMockServer(options: MockServerOptions) {
@@ -24,17 +26,56 @@ export function sleep(ms: number) {
 }
 
 export async function getApp(options: MockServerOptions = {}): Promise<MockServer> {
-  const { plugins = [], collectionsPath, ...others } = options;
+  const { plugins = [], collectionsPath, withAnotherDataSource = false, ...others } = options;
+  const defaultCollectionsPath = path.resolve(__dirname, 'collections');
+  const compiledCollectionsPath = path.resolve(__dirname, '../../dist/server/collections');
+  const resolvedCollectionsPath =
+    collectionsPath || (fs.existsSync(compiledCollectionsPath) ? compiledCollectionsPath : defaultCollectionsPath);
+
   class TestCollectionPlugin extends Plugin {
     async load() {
-      if (collectionsPath) {
-        await this.db.import({ directory: collectionsPath });
+      if (resolvedCollectionsPath) {
+        await this.db.import({ directory: resolvedCollectionsPath });
+      }
+    }
+  }
+  class TestAuthStatusPlugin extends Plugin {
+    async load() {
+      if (!this.app.authManager.userStatusService) {
+        this.app.authManager.setUserStatusService({
+          async checkUserStatus() {
+            return {
+              allowed: true,
+              status: 'active',
+              statusInfo: {
+                title: 'Active',
+                color: 'green',
+                allowLogin: true,
+              },
+              errorMessage: '',
+              isExpired: false,
+            };
+          },
+          async setUserStatusCache() {},
+          async getUserStatusFromCache() {
+            return null;
+          },
+          getUserStatusCacheKey(userId: number) {
+            return `test-user-status:${userId}`;
+          },
+          async restoreUserStatus() {},
+          async clearUserStatusCache() {},
+          async recordStatusHistoryIfNotExists() {},
+        });
       }
     }
   }
   const app = await createMockServer({
     ...others,
     plugins: [
+      'error-handler',
+      'collection',
+      'user',
       [
         'workflow',
         {
@@ -46,30 +87,33 @@ export async function getApp(options: MockServerOptions = {}): Promise<MockServe
       'workflow-test',
       TestCollectionPlugin,
       ...plugins,
+      TestAuthStatusPlugin,
     ],
   });
 
-  await app.dataSourceManager.add(
-    new SequelizeDataSource({
-      name: 'another',
-      collectionManager: {
-        database: mockDatabase({
-          tablePrefix: `t${uid(5)}`,
-        }),
-      },
-      resourceManager: {},
-    }),
-  );
-  const another = app.dataSourceManager.dataSources.get('another');
-  // @ts-ignore
-  const anotherDB = another.collectionManager.db;
+  if (withAnotherDataSource) {
+    await app.dataSourceManager.add(
+      new SequelizeDataSource({
+        name: 'another',
+        collectionManager: {
+          database: mockDatabase({
+            tablePrefix: `t${uid(5)}`,
+          }),
+        },
+        resourceManager: {},
+      }),
+    );
+    const another = app.dataSourceManager.dataSources.get('another');
+    // @ts-ignore
+    const anotherDB = another.collectionManager.db;
 
-  await anotherDB.import({
-    directory: path.resolve(__dirname, 'collections'),
-  });
-  await anotherDB.sync();
+    await anotherDB.import({
+      directory: resolvedCollectionsPath,
+    });
+    await anotherDB.sync();
 
-  another.acl.allow('*', '*');
+    another.acl.allow('*', '*');
+  }
 
   return app;
 }

package/dist/server/collections/categories.d.ts

@@ -1,3 +0,0 @@
-import { CollectionOptions } from '@tego/server';
-declare const _default: CollectionOptions;
-export default _default;

package/dist/server/collections/comments.d.ts

@@ -1,3 +0,0 @@
-import { CollectionOptions } from '@tego/server';
-declare const _default: CollectionOptions;
-export default _default;

package/dist/server/collections/posts.d.ts

@@ -1,3 +0,0 @@
-import { CollectionOptions } from '@tego/server';
-declare const _default: CollectionOptions;
-export default _default;

package/dist/server/collections/replies.d.ts

@@ -1,8 +0,0 @@
-declare const _default: {
-    name: string;
-    fields: {
-        type: string;
-        name: string;
-    }[];
-};
-export default _default;

package/dist/server/collections/tags.d.ts

@@ -1,3 +0,0 @@
-import { CollectionOptions } from '@tego/server';
-declare const _default: CollectionOptions;
-export default _default;