@byted-apaas/server-sdk-node 1.1.15-beta.16 → 1.1.15-beta.18

package/context/db/impl/object.js

@@ -571,7 +571,6 @@ class _KQuery {
             }
             else {
                 let criterion = (0, logic_1.buildCriterion)(queryBuilder.getLogic(), apiName, maxId);
-                console.log('walkRecordsByLimitOffset_start', JSON.stringify(criterion), server_common_node_1.utils.getLogID());
                 rs = await Request.GetInstance().getRecordsOrCountByCriterion(apiName, await (0, logic_1.handleCriterion)(criterion), queryBuilder.fuzzySearch, orders, false, selectFields, i, newLimit, false, this.authType);
             }
             queryCount += rs.length;
@@ -581,7 +580,6 @@ class _KQuery {
                 }
             }
             catch (err) {
-                console.log('walkRecordsByLimitOffset_err', err, server_common_node_1.utils.getLogID());
                 throw err;
             }
             if (rs.length < queryBuilder_1.defaultLimit) {

package/global/application/flow/flow.d.ts

@@ -1,5 +1,5 @@
 import { IApprovalInstance, IApprovalInstanceListOptions, IApprovalInstanceList, IGetApprovalInstanceOptions } from '../../../request/structs';
-export declare function NewFlow(): Flow;
+export declare function NewFlow(context: any): Flow;
 export interface Flow {
     /**
      * 获取流程实例人工任务详情列表

package/global/application/flow/flow.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NewFlow = void 0;
 const flow_1 = require("./impl/flow");
-function NewFlow() {
-    return new flow_1.Flow();
+function NewFlow(context) {
+    return new flow_1.Flow(context?.flow);
 }
 exports.NewFlow = NewFlow;

package/global/application/flow/impl/flow.d.ts

@@ -1,6 +1,16 @@
-import { Flow as IFlow, ExecuteOptions, ExecutionResult, ExecutionInfo, FlowTaskInfo, RevokeExecutionOptions } from '../flow';
+import { Flow as IFlow, ExecuteOptions, ExecutionResult, ExecutionInfo, FlowTaskInfo, RevokeExecutionOptions, Execution } from '../flow';
 import { IApprovalInstance, IApprovalInstanceList, IApprovalInstanceListOptions, IGetApprovalInstanceOptions } from "../../../../request/structs";
 export declare class Flow implements IFlow {
+    execution: Execution;
+    /**
+    * 工作流的 API name
+    */
+    apiName: string;
+    /**
+     * 工作流实例的 ID
+     */
+    instanceId: number;
+    constructor(flowParams: any);
     execute(APIName: string, options: ExecuteOptions | undefined): Promise<ExecutionResult>;
     getExecutionInfo(executionId: number): Promise<ExecutionInfo>;
     getExecutionUserTaskInfo(executionId: number): Promise<FlowTaskInfo[]>;

package/global/application/flow/impl/flow.js

@@ -5,6 +5,11 @@ const exceptions_1 = require("@byted-apaas/server-common-node/utils/exceptions")
 const Request = require("../../../../request/interface");
 const server_common_node_1 = require("@byted-apaas/server-common-node");
 class Flow {
+    constructor(flowParams) {
+        this.execution = flowParams?.execution;
+        this.apiName = flowParams?.apiName;
+        this.instanceId = flowParams?.instanceId;
+    }
     async execute(APIName, options) {
         if (!APIName || typeof APIName !== 'string') {
             throw new exceptions_1.InvalidParamError(`param's type (${APIName}) need string, but is ${typeof APIName}`);

package/hooks/hooks.js

@@ -95,7 +95,7 @@ function mountApplication(context) {
     }
     global.application.constants.metaType = metadataApi.metaType();
     // flow
-    global.application.flow = (0, flow_1.NewFlow)();
+    global.application.flow = (0, flow_1.NewFlow)(context);
     // operator
     global.application.operator = new operator_1.Operator();
     global.application.integration = new integration_1._Integration();

package/kunlun/operator/impl/logic.js

@@ -35,9 +35,7 @@ class Condition {
             right = new expression_1.ConstantExpressionField(this.right);
             op = this.op;
         }
-        let newExpression = new expression_1.Expression(left, op, right, index);
-        console.log('Condition_toExpression', objectApiName, fieldApiName, index, JSON.stringify(newExpression), server_common_node_1.utils.getLogID());
-        return newExpression;
+        return new expression_1.Expression(left, op, right, index);
     }
     constructor(left, right, op = operator_1.operates.EQ) {
         this.left = left;
@@ -65,7 +63,6 @@ function buildCriterion(logic, objectApiName, maxId = -1) {
     let index = 0;
     let logics = [];
     let expressions = [];
-    console.log('buildCriterion_log', 0, logic, logic.expressions, server_common_node_1.utils.getLogID());
     // check type of logic
     function f(logic, value = 'and') {
         // 1.如果是逻辑表达式
@@ -87,10 +84,8 @@ function buildCriterion(logic, objectApiName, maxId = -1) {
         // 2.否则是算法表达式
         let exps = logic;
         let logs = [];
-        console.log('buildCriterion_log', 111, exps, server_common_node_1.utils.getLogID());
         for (let left of Object.keys(exps)) {
             let right = logic[left];
-            console.log('buildCriterion_log', 222, JSON.stringify(right), right instanceof Condition, server_common_node_1.utils.getLogID());
             let copy = right;
             if (server_common_node_1.utils.isObject(right) && !(right instanceof Condition) && !isKunlunTypeOrSerializedObject(right)) {
                 for (let leftInner of Object.keys(right)) {
@@ -350,7 +345,6 @@ async function handleCriterion(criterion) {
     if (!criterion || !criterion.conditions || !(criterion.conditions instanceof Array)) {
         return criterion;
     }
-    console.log('handleCriterion_in', JSON.stringify(criterion), server_common_node_1.utils.getLogID());
     let fieldRes = await handleLookupCondition(criterion.conditions);
     for (let condition of criterion.conditions) {
         if (fieldRes && fieldRes.lookupMap) {
@@ -361,7 +355,6 @@ async function handleCriterion(criterion) {
         }
         await handleCondition(condition, fieldRes);
     }
-    console.log('handleCriterion_out', JSON.stringify(criterion), server_common_node_1.utils.getLogID());
     return JSON.stringify(criterion);
 }
 exports.handleCriterion = handleCriterion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byted-apaas/server-sdk-node",
-  "version": "1.1.15-beta.16",
+  "version": "1.1.15-beta.18",
   "description": "aPaaS Server SDK",
   "author": "zhouwexin <zhouwexin@bytedance.com>",
   "homepage": "",
@@ -10,10 +10,11 @@
     "compile": "tsc -d",
     "compile.local": "tsc -d --sourceMap",
     "pre-build": "rm -rf build && tsc",
-    "clean": "tsc --build --clean && rm -rf **/*.js.map"
+    "clean": "tsc --build --clean && rm -rf **/*.js.map",
+    "test": "mocha --require ts-node 'test/**/*.ts'"
   },
   "dependencies": {
-    "@byted-apaas/server-common-node": "^2.0.4",
+    "@byted-apaas/server-common-node": "2.0.4-beta.17",
     "@jorgeferrero/stream-to-buffer": "^2.0.6",
     "dayjs": "^1.9.6",
     "form-data": "^3.0.0",
@@ -29,7 +30,8 @@
     "madge": "^3.12.0",
     "mocha": "^9.1.3",
     "node-cls": "^1.0.7",
-    "sinon": "^17.0.1"
+    "sinon": "^17.0.1",
+    "ts-node": "^10.9.2"
   },
   "mocha": {
     "color": true,