@byted-apaas/server-sdk-node 1.1.18-beta.2 → 1.1.18-beta.3

package/context/db/db.d.ts

@@ -60,6 +60,58 @@ export interface IDB<T, mt> {
      */
     oql(oql: string, nameArgs: Record<string, any>): IOql;
 }
+/**
+ * IDB3 经由 IDBGetter 返回，是 DBV3 的基础接口结构
+ */
+export interface IDBV3<T, mt> {
+    /**
+     * 操作指定对象的记录数据
+     * @param objectApiName 指定对象的 ApiName
+     * @example
+     * ```
+     * application.data.object('_user').where({
+     *     gender: 'male'
+     * }).find()
+     * ```
+     */
+    object<T extends keyof mt>(objectApiName: T): _IKAllEndpoint<mt[T]> & _IKQuery<mt[T]>;
+    /**
+     * 创建一个新的空事务
+     * @example
+     * ```
+     * let tx = application.data.newTransaction();
+     * let user = tx.object('_user').registerCreate({
+     *     _name: new application.constants.type.Multilingual({ zh: '用户1', en: 'user1' }),
+     * });
+     * let contract = tx.object('contract').registerCreate({
+     *     _name: new application.constants.type.Multilingual({ zh: '用户1的合同', en: 'user1's contract' }),
+     *     user: {id: user._id}
+     * });
+     * await tx.commit();
+     * ```
+     */
+    /**
+     * OQL 操作
+     * @param oql OQL 语句
+     * @example
+     * ```
+     * let users = await application.data.oql('select _email from _user').execute();
+     * ```
+     */
+    oql(oql: string): IOql;
+    /**
+     * OQL 操作
+     * @param oql OQL 语句
+     * @param nameArgs 用于替换 OQL 语句中的占位符
+     * @example
+     * ```
+     * let employees = await application.data.oql('select _email from _user where _type = $user_type',{
+     *     'user_type': '_employee',
+     * }).execute();
+     * ```
+     */
+    oql(oql: string, nameArgs: Record<string, any>): IOql;
+}
 /**
  * IDBWithCurrentObject 经由 IDBGetter 返回，是 DB 的动态增加的接口结构
  */

package/context/db/impl/IObject.d.ts

@@ -17,7 +17,7 @@ export interface _IKSyncEndpoint<T> {
      * ```
      */
     create(recordMap: _Cond<T>): Promise<{
-        _id: number;
+        _id: number | string;
     }>;
     /**
      * 删除记录
@@ -27,7 +27,7 @@ export interface _IKSyncEndpoint<T> {
      * application.data.object('_user').delete(123456789123)
      * ```
      */
-    delete(recordID: number): Promise<void>;
+    delete(recordID: number | string): Promise<void>;
     /**
      * 删除记录
      * @param record 用于删除的一条完整记录
@@ -49,7 +49,7 @@ export interface _IKSyncEndpoint<T> {
      * })
      * ```
      */
-    update(_id: number, recordMap: _Cond<T>): Promise<void>;
+    update(_id: number | string, recordMap: _Cond<T>): Promise<void>;
     /**
      * 指定 _id 后，更新对应记录
      * @param recordMap 用于更新的一条记录，需对 _id 赋值

package/context/db/impl/dbV3.d.ts

@@ -1,9 +1,8 @@
 import { _IKAllEndpoint, _IKQuery } from './IObject';
-import { ITransactionGetter } from './transaction';
-import { IDB } from '../db';
+import { IDBV3 } from '../db';
 import { metadataMap } from '../../../data/index';
 import { IOql } from './oql/ioql';
-export declare class DBV3<T, mt = metadataMap> implements IDB<T, mt> {
+export declare class DBV3<T, mt = metadataMap> implements IDBV3<T, mt> {
     objectApiName: string;
     constructor(objectApiName?: string);
     /**
@@ -32,7 +31,6 @@ export declare class DBV3<T, mt = metadataMap> implements IDB<T, mt> {
      * await tx.commit();
      * ```
      */
-    newTransaction(): ITransactionGetter<T, mt>;
     /**
      * OQL 操作
      * @param oql 指定 OQL 语句
@@ -43,5 +41,4 @@ export declare class DBV3<T, mt = metadataMap> implements IDB<T, mt> {
      */
     oql(oql: string): IOql;
     oql(oql: string, nameArgs: Record<string, any>): IOql;
-    toDataParam(): any;
 }

package/context/db/impl/dbV3.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DBV3 = void 0;
 const object_1 = require("./object");
-const index_1 = require("./transaction/index");
 const oql_1 = require("./oql/oql");
 class DBV3 {
     constructor(objectApiName) {
@@ -25,28 +24,6 @@ class DBV3 {
         return new object_1._KObject(objectApiName, appCtx);
     }
     ;
-    /**
-     * 创建一个新的空事务
-     * @example
-     * ```
-     * let tx = context.db.newTransaction();
-     * let user = tx.object('_user').registerCreate({
-     *     _name: new kunlun.type.Multilingual({ zh: '用户1', en: 'user1' }),
-     * });
-     * let contract = tx.object('contract').registerCreate({
-     *     _name: new kunlun.type.Multilingual({ zh: '用户1的合同', en: 'user1's contract' }),
-     *     user: {id: user._id}
-     * });
-     * await tx.commit();
-     * ```
-     */
-    newTransaction() {
-        const appCtx = {
-            dataVersion: "v3",
-        };
-        return new index_1.Transaction(this.objectApiName, appCtx);
-    }
-    ;
     oql(oql, nameArgs) {
         const appCtx = {
             dataVersion: "v3",
@@ -56,8 +33,5 @@ class DBV3 {
         }
         return new oql_1.Oql(oql, undefined, appCtx);
     }
-    toDataParam() {
-        console.log("================= toDataParam");
-    }
 }
 exports.DBV3 = DBV3;

package/context/db/impl/object.d.ts

@@ -26,12 +26,14 @@ declare class _KObjectSync<T> implements _IKSyncEndpoint<T> {
     appCtx: AppCtx;
     authType: string;
     create(recordMap: _Cond<T>): Promise<{
-        _id: number;
+        _id: number | string;
     }>;
-    delete(recordID: number): Promise<void>;
+    delete(recordID: number | string): Promise<void>;
     delete(record: _Cond<T>): Promise<void>;
-    update(_id: number, recordMap: _Cond<T>): Promise<void>;
+    private deleteV3;
+    update(_id: number | string, recordMap: _Cond<T>): Promise<void>;
     update(recordMap: _Cond<T>): Promise<void>;
+    private updateV3;
     batchCreate(recordMapList: _Cond<T>[]): Promise<number[]>;
     batchDelete(recordIdList: number[]): Promise<BatchResult>;
     batchDelete(recordList: _Cond<T>[]): Promise<BatchResult>;
@@ -108,6 +110,7 @@ declare class _KQuery<T> implements _IKQuery<T> {
     limit(limit: number): this;
     offset(offset: number): this;
     count(): Promise<number>;
+    private findV3;
     private findPreCheck;
     useSystemAuth(): this;
     useUserAuth(): this;

package/context/db/impl/object.js

@@ -57,11 +57,18 @@ class _KObjectSync {
                 return await Request.GetInstance().openSDKCreateRecordBySync(this.apiName, recordMap);
             });
         }
+        else if (this.appCtx && this.appCtx.dataVersion === 'v3') {
+            console.log("dataV3");
+            return await Request.GetInstance().createRecordV3BySync(this.apiName, recordMap, this.authType);
+        }
         return await Request.GetInstance().createRecordBySync(this.apiName, recordMap, this.authType);
     }
     ;
     async delete(recordOrRecordID) {
-        let recordID = 0;
+        if (this.appCtx && this.appCtx.dataVersion === "v3") {
+            return this.deleteV3(recordOrRecordID);
+        }
+        let recordID;
         // 用户直接传入 record id 来进行删除的情况
         if (typeof recordOrRecordID === 'number') {
             recordID = recordOrRecordID;
@@ -74,7 +81,12 @@ class _KObjectSync {
                 if (!record._id) {
                     throw new server_common_node_1.exceptions.InvalidParamError('record._id is empty');
                 }
-                recordID = record._id;
+                if (typeof record._id === 'number') {
+                    recordID = record._id;
+                }
+                else if (typeof record._id === 'string') {
+                    recordID = parseInt(record._id);
+                }
             }
         }
         if (recordID > 0) {
@@ -89,7 +101,38 @@ class _KObjectSync {
         throw new server_common_node_1.exceptions.InvalidParamError('record must be number or object');
     }
     ;
+    async deleteV3(recordOrRecordID) {
+        let recordIDStr;
+        if (typeof recordOrRecordID === 'number') {
+            recordIDStr = recordOrRecordID.toString();
+        }
+        else if (typeof recordOrRecordID === 'string') {
+            recordIDStr = recordOrRecordID;
+        }
+        else {
+            let record = recordOrRecordID;
+            if (server_common_node_1.checkUtils.isObject(record)) {
+                // 如果用户没有传入包含 id 的 record，则报错
+                if (!record._id) {
+                    throw new server_common_node_1.exceptions.InvalidParamError('record._id is empty');
+                }
+                if (typeof record._id === 'number') {
+                    recordIDStr = record._id.toString();
+                }
+                else if (typeof record._id === 'string') {
+                    recordIDStr = record._id;
+                }
+            }
+        }
+        if (recordIDStr.length <= 0) {
+            throw new server_common_node_1.exceptions.InvalidParamError('record._id must greater than 0');
+        }
+        return await Request.GetInstance().deleteRecordV3BySync(this.apiName, recordIDStr, this.authType);
+    }
     async update(_idOrRecordMap, recordMap) {
+        if (this.appCtx && this.appCtx.dataVersion === "v3") {
+            return this.updateV3(_idOrRecordMap, recordMap);
+        }
         // record 必须包含 _id
         let record;
         // 用户显式传入 id 的情况
@@ -124,6 +167,37 @@ class _KObjectSync {
         return await Request.GetInstance().updateRecordBySync(this.apiName, recordID, record, this.authType);
     }
     ;
+    async updateV3(_idOrRecordMap, recordMap) {
+        // record 必须包含 _id
+        let record;
+        // 用户显式传入 id 的情况
+        if (recordMap && (typeof _idOrRecordMap === 'string' || typeof _idOrRecordMap === 'number')) {
+            record = recordMap;
+            if (typeof _idOrRecordMap === 'number')
+                record._id = _idOrRecordMap.toString();
+            else if (typeof _idOrRecordMap === 'string')
+                record._id = _idOrRecordMap;
+        }
+        else {
+            // 用户隐式传入 id 的情况
+            record = _idOrRecordMap;
+            if (!record._id) {
+                throw new server_common_node_1.exceptions.InvalidParamError('record._id is empty');
+            }
+            if (typeof record._id === 'number') {
+                record._id = record._id.toString();
+            }
+        }
+        if (!record) {
+            throw new server_common_node_1.exceptions.InvalidParamError('param is empty');
+        }
+        record = permissionUtils.delUnauthField(record).newRecord;
+        let recordIDStr = record._id;
+        if (recordIDStr.length <= 0) {
+            throw new server_common_node_1.exceptions.InvalidParamError('record._id must greater than 0');
+        }
+        return await Request.GetInstance().updateRecordV3BySync(this.apiName, recordIDStr, record, this.authType);
+    }
     // batch sync
     async batchCreate(recordMapList) {
         // 参数校验
@@ -190,7 +264,13 @@ class _KObjectSync {
         const recordIDs = [];
         let recordMap = {};
         for (let record of recordMapList) {
-            let recordID = record['_id'];
+            let recordID;
+            if (typeof record._id === 'number') {
+                recordID = record._id;
+            }
+            else if (typeof record._id === 'string') {
+                recordID = parseInt(record._id);
+            }
             if ((typeof recordID !== 'number') || recordID <= 0) {
                 throw new server_common_node_1.exceptions.InvalidParamError('record._id is empty');
             }
@@ -286,7 +366,13 @@ class _KObjectAsync {
         recordMapList = permissionUtils.batchDelUnauthField(recordMapList).newRecords;
         let recordMap = {};
         for (let record of recordMapList) {
-            let recordID = record['_id'];
+            let recordID;
+            if (typeof record._id === 'number') {
+                recordID = record._id;
+            }
+            else if (typeof record._id === 'string') {
+                recordID = parseInt(record._id);
+            }
             if (recordID === undefined || recordID === null) {
                 throw new server_common_node_1.exceptions.InvalidParamError('record._id is empty');
             }
@@ -397,6 +483,9 @@ class _KQuery {
     async find() {
         this.findPreCheck();
         const { apiName, appCtx, queryBuilder, queryV2 } = queryPropertiesStore.get(this);
+        if (appCtx && appCtx.dataVersion === "v3") {
+            return await this.findV3(false);
+        }
         if (queryV2) {
             const param = {
                 limit: queryV2._limit,
@@ -514,6 +603,13 @@ class _KQuery {
                     return await Request.GetInstance().openSDKGetRecords(apiName, param);
                 });
             }
+            else if (appCtx && appCtx.dataVersion === "v3") {
+                // 更新 maxId
+                criterion.conditions[criterion.conditions.length - 1].right.settings.data = maxId;
+                // 转换成 V3 的 criterion
+                const criterionV3 = (0, logic_1.convertCriterionToCriterionV3)(criterion);
+                rs = await Request.GetInstance().getRecordsV3OrCounByCriterion(apiName, criterionV3, queryBuilder.fuzzySearch, [new order_1.Order('_id', 'asc')], queryBuilder.getSelect(), 0, newLimit, false, this.authType);
+            }
             else {
                 // 更新 maxId
                 criterion.conditions[criterion.conditions.length - 1].right.settings.data = maxId;
@@ -604,6 +700,13 @@ class _KQuery {
                     return await Request.GetInstance().openSDKGetRecords(apiName, param);
                 });
             }
+            else if (appCtx && appCtx.dataVersion === "v3") {
+                // 更新 maxId
+                criterion.conditions[criterion.conditions.length - 1].right.settings.data = maxId;
+                // 转换成 V3 的 criterion
+                const criterionV3 = (0, logic_1.convertCriterionToCriterionV3)(criterion);
+                rs = await Request.GetInstance().getRecordsV3OrCounByCriterion(apiName, criterionV3, queryBuilder.fuzzySearch, orders, selectFields, curOffset, newLimit, false, this.authType);
+            }
             else {
                 // 更新 maxId
                 criterion.conditions[criterion.conditions.length - 1].right.settings.data = maxId;
@@ -690,9 +793,6 @@ class _KQuery {
     }
     select(fieldApiNames, ...restFieldApiNames) {
         const { appCtx } = queryPropertiesStore.get(this);
-        if (appCtx && appCtx.dataVersion == "v3") {
-            console.log("=======================wby test: ", appCtx.dataVersion);
-        }
         fieldApiNames = !fieldApiNames ? [] : fieldApiNames;
         let fields = server_common_node_1.utils.argsToList(fieldApiNames, restFieldApiNames);
         const { queryBuilder, queryV2 } = queryPropertiesStore.get(this);
@@ -772,6 +872,9 @@ class _KQuery {
     ;
     async count() {
         const { apiName, appCtx, queryBuilder, queryV2 } = queryPropertiesStore.get(this);
+        if (appCtx && appCtx.dataVersion == "v3") {
+            return await this.findV3(true);
+        }
         if (queryV2) {
             const param = {
                 limit: 1,
@@ -795,6 +898,20 @@ class _KQuery {
         }
     }
     ;
+    async findV3(needCount) {
+        const { apiName, appCtx, queryBuilder, queryV2 } = queryPropertiesStore.get(this);
+        let criterion = (0, logic_1.buildCriterion)(queryBuilder.getLogic(), apiName);
+        if (queryBuilder.getLogic().logics.length > 0) {
+            // console.log("test-----------------------", queryBuilder.getLogic().logics)
+            criterion = await (0, logic_1.handleCriterion)(criterion);
+        }
+        const criterionV3 = (0, logic_1.convertCriterionToCriterionV3)(criterion);
+        const res = await Request.GetInstance().getRecordsV3OrCounByCriterion(apiName, criterionV3, queryBuilder.fuzzySearch, queryBuilder.getOrder(), queryBuilder.getSelect(), queryBuilder.getOffset(), queryBuilder.getLimit(), needCount, this.authType);
+        if (needCount) {
+            return res;
+        }
+        return res;
+    }
     findPreCheck() {
         const { queryBuilder, queryV2 } = queryPropertiesStore.get(this);
         let limit = queryBuilder_1.defaultLimit;

package/context/db/impl/transaction/index.js

@@ -74,7 +74,14 @@ class Transaction {
                     throw new server_common_node_1.exceptions.InvalidParamError('record is empty');
                 }
                 recordMap = permissionUtils.delUnauthField(recordMap).newRecord;
-                const recordID = recordMap._id;
+                // const recordID: number = recordMap._id;
+                let recordID;
+                if (typeof recordMap._id === 'number') {
+                    recordID = recordMap._id;
+                }
+                else if (typeof recordMap._id === 'string') {
+                    recordID = parseInt(recordMap._id);
+                }
                 if (!recordID) {
                     throw new server_common_node_1.exceptions.InvalidParamError('record._id is empty');
                 }

package/context/metadata/metadata.d.ts

@@ -37,6 +37,12 @@ declare class MetaData<mt> implements IMetaData<mt> {
     page(apiName: string, objectApiName: string, type: string): Page;
 }
 declare function metadata<mt>(ctx: any): IMetaData<mt>;
+declare class MetaDataV2<mt> implements IMetaData<mt> {
+    constructor(ctx: any);
+    object<T>(objectApiName: keyof mt): IKObject<T>;
+    page(apiName: string, objectApiName: string, type: string): Page;
+}
+declare function metadataV2<mt>(ctx: any): IMetaData<mt>;
 declare class Page implements IPage {
     pageApiName: string;
     objectApiName: string;
@@ -55,4 +61,4 @@ declare class Page implements IPage {
     updateMobileList(componentName: string, params: any): Promise<void>;
 }
 declare function metaType(): any;
-export { IMetaData, IKObject, IPage, MetaData, metadata, metaType, };
+export { IMetaData, IKObject, IPage, MetaData, metadata, metaType, MetaDataV2, metadataV2, };

package/context/metadata/metadata.js

@@ -2,7 +2,7 @@
 // Copyright 2022 ByteDance Ltd. and/or its affiliates
 // SPDX-License-Identifier: MIT
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.metaType = exports.metadata = exports.MetaData = void 0;
+exports.metadataV2 = exports.MetaDataV2 = exports.metaType = exports.metadata = exports.MetaData = void 0;
 const components = require("./components/components");
 const common = require("@byted-apaas/server-common-node");
 const fields = require("./objects/fields");
@@ -36,6 +36,33 @@ function metadata(ctx) {
     return new MetaData(ctx);
 }
 exports.metadata = metadata;
+class MetaDataV2 {
+    constructor(ctx) {
+    }
+    object(objectApiName) {
+        if (!objectApiName) {
+            throw new commonExceptions.InvalidParamError('objectApiName is empty');
+        }
+        return new KObject(objectApiName);
+    }
+    page(apiName, objectApiName, type) {
+        if (!apiName) {
+            throw new commonExceptions.InvalidParamError('apiName is empty');
+        }
+        if (!objectApiName) {
+            throw new commonExceptions.InvalidParamError('objectApiName is empty');
+        }
+        if (!type) {
+            throw new commonExceptions.InvalidParamError('type is empty');
+        }
+        return new Page(apiName, objectApiName, type);
+    }
+}
+exports.MetaDataV2 = MetaDataV2;
+function metadataV2(ctx) {
+    return new MetaData(ctx);
+}
+exports.metadataV2 = metadataV2;
 class KObject {
     constructor(objectApiName) {
         this.objectApiName = objectApiName;

package/global/global.d.ts

@@ -7,6 +7,7 @@ import { _Resources } from '../context/resources/impl/resources';
 import { Message } from '../context/msg/msg';
 import { _IIntegration } from '../context/integration/IIntegration';
 import { DBV3 } from '../context/db/impl/dbV3';
+import { MetaDataV2 } from '../context/metadata/metadata';
 declare global {
     export namespace application {
         /**
@@ -26,9 +27,13 @@ declare global {
          */
         let operator: IOperator;
         /**
-         * 新 data 接口
+         * dataV2 接口
          */
         let dataV2: DBV3<{}>;
+        /**
+         * metadataV2 接口
+         */
+        let metadataV2: MetaDataV2<{}>;
         /**
          * 常量
          */

package/hooks/hooks.js

@@ -86,6 +86,7 @@ function mountApplication(context) {
     global.application.msg = new msg_1.Message();
     global.application.resources = new resources_1._Resources();
     global.application.metadata = metadataApi.metadata(context);
+    global.application.metadataV2 = metadataApi.metadataV2(context);
     // globalVar
     if (!global.application.globalVar) {
         global.application.globalVar = {};

package/kunlun/operator/impl/expression.d.ts

@@ -44,4 +44,32 @@ export declare class ConstantExpressionField extends ExpressionField {
 export declare class MetadataExpressionField extends ExpressionField {
     constructor(objectApiName: string, fieldApiName: string);
 }
+export declare class ExpressionV3 {
+    index: number;
+    left: ExpressionFieldV3;
+    operator: string;
+    right: ExpressionFieldV3;
+    constructor(left: ExpressionFieldV3, operator: string, right: ExpressionFieldV3, index: number);
+}
+declare class ExpressionFieldV3 {
+    type: string;
+    settings: string;
+    constructor(type: string, settings: string);
+}
+/**
+ * 常量表达式字段
+ *
+ * 比如在 condition: user.name equal 'bob' 中，'bob' 将被构建为 ConstantExpressionField
+ */
+export declare class ConstantExpressionFieldV3 extends ExpressionFieldV3 {
+    constructor(data?: UserDataType);
+}
+/**
+ * 元数据表达式字段
+ *
+ * 比如在 condition: user.name equal 'bob' 中，'user.name' 将被构建为 MetadataExpressionField
+ */
+export declare class MetadataExpressionFieldV3 extends ExpressionFieldV3 {
+    constructor(filedPath?: PathType[]);
+}
 export {};

package/kunlun/operator/impl/expression.js

@@ -2,7 +2,7 @@
 // Copyright 2022 ByteDance Ltd. and/or its affiliates
 // SPDX-License-Identifier: MIT
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MetadataExpressionField = exports.ConstantExpressionField = exports.Expression = void 0;
+exports.MetadataExpressionFieldV3 = exports.ConstantExpressionFieldV3 = exports.ExpressionV3 = exports.MetadataExpressionField = exports.ConstantExpressionField = exports.Expression = void 0;
 class Expression {
     constructor(left, operator, right, index) {
         this.index = index;
@@ -54,3 +54,43 @@ class MetadataExpressionField extends ExpressionField {
     }
 }
 exports.MetadataExpressionField = MetadataExpressionField;
+class ExpressionV3 {
+    constructor(left, operator, right, index) {
+        this.index = index;
+        this.left = left;
+        this.operator = operator;
+        this.right = right;
+    }
+}
+exports.ExpressionV3 = ExpressionV3;
+class ExpressionFieldV3 {
+    constructor(type, settings) {
+        this.type = type;
+        this.settings = settings;
+    }
+}
+/**
+ * 常量表达式字段
+ *
+ * 比如在 condition: user.name equal 'bob' 中，'bob' 将被构建为 ConstantExpressionField
+ */
+class ConstantExpressionFieldV3 extends ExpressionFieldV3 {
+    constructor(data) {
+        const d = { 'data': data };
+        super('constant', JSON.stringify(d));
+    }
+}
+exports.ConstantExpressionFieldV3 = ConstantExpressionFieldV3;
+/**
+ * 元数据表达式字段
+ *
+ * 比如在 condition: user.name equal 'bob' 中，'user.name' 将被构建为 MetadataExpressionField
+ */
+class MetadataExpressionFieldV3 extends ExpressionFieldV3 {
+    constructor(filedPath) {
+        const filedPathV3 = filedPath.map(({ extendLogicTags, ...item }) => item);
+        const fp = { 'fieldPath': filedPathV3 };
+        super('metadataVariable', JSON.stringify(fp));
+    }
+}
+exports.MetadataExpressionFieldV3 = MetadataExpressionFieldV3;

package/kunlun/operator/impl/logic.d.ts

@@ -1,4 +1,4 @@
-import { Expression, UserDataType } from './expression';
+import { Expression, UserDataType, ExpressionV3 } from './expression';
 export declare class Condition {
     left: string;
     right: Condition | UserDataType;
@@ -17,6 +17,10 @@ export type Criterion = {
     conditions: Expression[];
     logic: string;
 };
+export type CriterionV3 = {
+    conditions: ExpressionV3[];
+    expression: string;
+};
 /**
  * 构造 criterion
  *
@@ -34,6 +38,12 @@ export declare function buildExpression(objectApiName: string, left: string, rig
  * @param maxId 添加 _id>maxId 条件
  */
 export declare function addIDCriterion(criterion: Criterion, apiName: string, maxId: number): Criterion;
+/**
+ * 构造 convertCriterionToCriterionV3
+ *
+ * @param criterion v1 版本的条件
+ */
+export declare function convertCriterionToCriterionV3(criterion: Criterion): CriterionV3;
 export declare class Logic {
     value: string;
     expressions: {

package/kunlun/operator/impl/logic.js

@@ -2,7 +2,7 @@
 // Copyright 2022 ByteDance Ltd. and/or its affiliates
 // SPDX-License-Identifier: MIT
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleCriterion = exports.buildLogic = exports.Logic = exports.addIDCriterion = exports.buildExpression = exports.buildCriterion = exports.Condition = void 0;
+exports.handleCriterion = exports.buildLogic = exports.Logic = exports.convertCriterionToCriterionV3 = exports.addIDCriterion = exports.buildExpression = exports.buildCriterion = exports.Condition = void 0;
 const expression_1 = require("./expression");
 const operator_1 = require("./operator");
 const server_common_node_1 = require("@byted-apaas/server-common-node");
@@ -186,6 +186,26 @@ function addIDCriterion(criterion, apiName, maxId) {
     return criterion;
 }
 exports.addIDCriterion = addIDCriterion;
+/**
+ * 构造 convertCriterionToCriterionV3
+ *
+ * @param criterion v1 版本的条件
+ */
+function convertCriterionToCriterionV3(criterion) {
+    let criterionV3 = {
+        conditions: [],
+        expression: criterion.logic
+    };
+    // const criterionCopy = {...criterion};  // 创造一个v1Data的拷贝
+    criterionV3.conditions = criterion.conditions.map(condition => {
+        const rightField = new expression_1.ConstantExpressionFieldV3(condition.right.settings.data);
+        const leftField = new expression_1.MetadataExpressionFieldV3(condition.left.settings.fieldPath);
+        let conditionV3 = new expression_1.ExpressionV3(leftField, condition.operator, rightField, condition.index);
+        return conditionV3;
+    });
+    return criterionV3;
+}
+exports.convertCriterionToCriterionV3 = convertCriterionToCriterionV3;
 // 逻辑操作：and 和 or
 class Logic {
     constructor(expressions = null, logicValue = 'and') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byted-apaas/server-sdk-node",
-  "version": "1.1.18-beta.2",
+  "version": "1.1.18-beta.3",
   "description": "aPaaS Server SDK",
   "author": "zhouwexin <zhouwexin@bytedance.com>",
   "homepage": "",
@@ -13,7 +13,7 @@
     "clean": "tsc --build --clean && rm -rf **/*.js.map"
   },
   "dependencies": {
-    "@byted-apaas/server-common-node": "^2.0.9",
+    "@byted-apaas/server-common-node": "2.0.12-beta.3",
     "@jorgeferrero/stream-to-buffer": "^2.0.6",
     "dayjs": "^1.9.6",
     "form-data": "^3.0.0",

package/request/interface.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { Criterion } from '../kunlun/operator/impl/logic';
+import { Criterion, CriterionV3 } from '../kunlun/operator/impl/logic';
 import { Stream } from 'stream';
 import { ExecutionInfo, ExecutionResult, RevokeExecutionOptions } from '@byted-apaas/server-common-node/context/workflow/workflow';
 import { AppCtx } from '../application/application';
@@ -44,8 +44,11 @@ export interface IInnerAPIRequest extends IInnerAPIBaseRequest, IInnerAPIOpenSDK
 }
 export interface IInnerAPIBaseRequest {
     createRecordBySync: (objectApiName: string, record: object, authType: string) => any;
+    createRecordV3BySync: (objectApiName: string, record: object, authType: string) => any;
     updateRecordBySync: (objectApiName: string, recordID: number, record: object, authType: string) => any;
+    updateRecordV3BySync: (objectApiName: string, recordID: string, record: object, authType: string) => any;
     deleteRecordBySync: (objectApiName: string, recordID: number, authType: string) => any;
+    deleteRecordV3BySync: (objectApiName: string, recordID: string, authType: string) => any;
     createRecordsByAsync: (objectApiName: string, records: object[], authType: string) => any;
     updateRecordsByAsync: (objectApiName: string, recordMap: Record<number, object>, authType: string) => any;
     deleteRecordsByAsync: (objectApiName: string, recordIDs: number[], authType: string) => any;
@@ -53,6 +56,7 @@ export interface IInnerAPIBaseRequest {
     updateRecordsBySync: (objectApiName: string, recordMap: Record<number, object>, authType: string) => Promise<Record<number, string>>;
     deleteRecordsBySync: (objectApiName: string, recordIDs: number[], authType: string) => Promise<Record<number, string>>;
     getRecordsOrCountByCriterion: (objectApiName: string, criterion: string | Criterion, fuzzySearch: any, order: Order[], ignoreBackLookupField: boolean, fieldApiNames: string[], offset: number, limit: number, needCount: boolean, authType: string) => any;
+    getRecordsV3OrCounByCriterion: (objectApiName: string, criterion: string | CriterionV3, fuzzySearch: any, order: Order[], fieldApiNames: string[], offset: number, limit: number, needCount: boolean, authType: string) => any;
     updateWorkflowVariables: (ctx: any, instanceId: number, variables: object, variableTypes: object) => Promise<void>;
     uploadFile: (data: Stream, expire: number, fileName?: string) => Promise<UploadFileResp>;
     downloadFileByID: (fileID: string, filePath?: string) => Promise<Buffer | undefined>;

package/request/openapi.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import { Stream } from 'stream';
 import { Order } from '../context/db/impl/order';
-import { Criterion } from '../kunlun/operator/impl/logic';
+import { Criterion, CriterionV3 } from '../kunlun/operator/impl/logic';
 import { IInnerAPIRequest, OpenSDKGetRecordsReq, UploadFileResp } from './interface';
 import { ExecutionInfo, ExecutionResult, RevokeExecutionOptions } from '@byted-apaas/server-common-node/context/workflow/workflow';
 import { AppCtx } from '../application/application';
@@ -12,8 +12,11 @@ export declare class RequestHttp implements IInnerAPIRequest {
     constructor();
     updateWorkflowVariables(ctx: any, instanceId: number, variables: object, variableTypes: object): any;
     createRecordBySync(objectApiName: string, record: object, authType: string): any;
+    createRecordV3BySync(objectApiName: string, record: object, authType: string): any;
     updateRecordBySync(objectApiName: string, recordID: number, record: object, authType: string): any;
+    updateRecordV3BySync(objectApiName: string, recordID: string, record: object, authType: string): any;
     deleteRecordBySync(objectApiName: string, recordID: number, authType: string): any;
+    deleteRecordV3BySync(objectApiName: string, recordID: string, authType: string): any;
     createRecordsByAsync(objectApiName: string, records: object[], authType: string): any;
     updateRecordsByAsync(objectApiName: string, recordMap: Record<number, object>, authType: string): any;
     deleteRecordsByAsync(objectApiName: string, recordIDs: number[], authType: string): any;
@@ -21,6 +24,7 @@ export declare class RequestHttp implements IInnerAPIRequest {
     updateRecordsBySync(objectApiName: string, recordMap: Record<number, object>, authType: string): Promise<Record<number, string>>;
     deleteRecordsBySync(objectApiName: string, recordIDs: number[], authType: string): Promise<Record<number, string>>;
     getRecordsOrCountByCriterion(objectApiName: string, criterion: string | Criterion, order: Order[], fuzzySearch: any, ignoreBackLookupField: boolean, fieldApiNames: string[], offset: number, limit: number, needCount: boolean, authType: string): any;
+    getRecordsV3OrCounByCriterion(objectApiName: string, criterion: string | CriterionV3, order: Order[], fuzzySearch: any, fieldApiNames: string[], offset: number, limit: number, needCount: boolean, authType: string): any;
     uploadFile(data: Stream, expire: number, fileName?: string): Promise<UploadFileResp>;
     downloadFileByID(fileID: string, filePath?: string): Promise<undefined | Buffer>;
     downloadFileByToken(fileToken: string, filePath?: string): Promise<Buffer | undefined>;

package/request/openapi.js

@@ -69,6 +69,39 @@ async function createRecordBySync(objectApiName, record, authType) {
     }
     return data;
 }
+// todo wby
+async function createRecordV3BySync(objectApiName, record, authType) {
+    // 1.check
+    if (!objectApiName) {
+        throw new exceptions.InvalidParamError('objectApiName is empty');
+    }
+    // 2.获取 options
+    let options = commonHttp.getOptions(null, openapiHttpPath.createRecordV3BySync);
+    let urlPath = options._reqPath.replace(replaceKeys.namespace, await (0, common_1.getNamespaceForOpenAndFaaSSDK)());
+    urlPath = urlPath.replace(replaceKeys.objectApiName, objectApiName);
+    // 3.请求
+    options.json = {
+        'data_version': "v3",
+        'record': record,
+    };
+    authType = (0, utils_1.formatAuthType)(authType);
+    options.headers.User = String(utils.getUserIDFromCtx());
+    if (authType) {
+        options.headers[constants_3.AuthTypeHttpHeader] = authType;
+    }
+    let task_id = utils.getTriggerTaskID();
+    if (task_id) {
+        options.json.task_id = task_id;
+    }
+    let data = await openapi.doRequest(null, urlPath, options);
+    if (data && data.record_id) {
+        return { _id: data.record_id };
+    }
+    if (data && data.recordID) {
+        return { _id: data.recordID };
+    }
+    return data;
+}
 async function updateRecordBySync(objectApiName, recordID, record, authType) {
     // 1.check
     if (!objectApiName) {
@@ -95,6 +128,33 @@ async function updateRecordBySync(objectApiName, recordID, record, authType) {
     }
     return openapi.doRequest(null, urlPath, options);
 }
+// todo wby
+async function updateRecordV3BySync(objectApiName, recordID, record, authType) {
+    // 1.check
+    if (!objectApiName) {
+        throw new exceptions.InvalidParamError('objectApiName is empty');
+    }
+    // 2.获取 options
+    let options = commonHttp.getOptions(null, openapiHttpPath.updateRecordV3BySync);
+    let urlPath = options._reqPath.replace(replaceKeys.namespace, await (0, common_1.getNamespaceForOpenAndFaaSSDK)());
+    urlPath = urlPath.replace(replaceKeys.objectApiName, objectApiName);
+    urlPath = urlPath.replace(replaceKeys.recordID, recordID);
+    // 3.请求
+    options.json = {
+        "record": record,
+        "data_version": "v3"
+    };
+    authType = (0, utils_1.formatAuthType)(authType);
+    options.headers.User = String(utils.getUserIDFromCtx());
+    if (authType) {
+        options.headers[constants_3.AuthTypeHttpHeader] = authType;
+    }
+    let task_id = utils.getTriggerTaskID();
+    if (task_id) {
+        options.json.task_id = task_id;
+    }
+    return openapi.doRequest(null, urlPath, options);
+}
 async function deleteRecordBySync(objectApiName, recordID, authType) {
     // 1.check
     if (!objectApiName) {
@@ -120,6 +180,9 @@ async function deleteRecordBySync(objectApiName, recordID, authType) {
     }
     return openapi.doRequest(null, urlPath, options);
 }
+// todo wby
+async function deleteRecordV3BySync(objectApiName, recordID, authType) {
+}
 async function createRecordsByAsync(objectApiName, records, authType) {
     // 1.获取 options
     let options = commonHttp.getOptions(null, openapiHttpPath.createRecordsByAsyncV2);
@@ -274,8 +337,11 @@ function handleResponse(objectAPIName, data, needCount) {
         return 0;
     }
     else {
-        if (checkUtils.isObject(data) && data.data_list) {
-            const records = data.data_list;
+        if (checkUtils.isObject(data) && (data.data_list || data.items)) {
+            let records = data.data_list;
+            if (data.items) {
+                records = data.items;
+            }
             if (data.unauthPermissionInfo && data.unauthPermissionInfo.UnauthFieldSlice) {
                 permissionUtils.appendUnauthFieldRecordList(objectAPIName, records, data.unauthPermissionInfo.UnauthFieldSlice, true);
             }
@@ -324,6 +390,46 @@ async function getRecordsOrCountByCriterion(objectApiName, criterion, fuzzySearc
     let data = await openapi.doRequest(null, urlPath, options);
     return handleResponse(objectApiName, data, needCount);
 }
+async function getRecordsV3OrCountByCriterion(objectApiName, criterion, order, fuzzySearch, fieldApiNames, offset, limit, needCount, authType) {
+    // 1.check
+    if (!objectApiName) {
+        throw new exceptions.InternalError('objectApiName is empty');
+    }
+    // 2.获取 options
+    let options = commonHttp.getOptions(null, openapiHttpPath.mGetRecordsV3OrCounByCriterion);
+    let urlPath = options._reqPath.replace(replaceKeys.namespace, await (0, common_1.getNamespaceForOpenAndFaaSSDK)());
+    urlPath = urlPath.replace(replaceKeys.objectApiName, objectApiName);
+    if (needCount) {
+        fieldApiNames = ['_id'];
+    }
+    if (typeof criterion === 'string') {
+        criterion = JSON.parse(criterion);
+    }
+    console.log('criterion', JSON.stringify(criterion));
+    // 3.请求
+    options.json = {
+        'page_size': limit,
+        'offset': offset,
+        'select': fieldApiNames,
+        'order_by': order,
+        'need_total_count': needCount,
+        'filter': criterion,
+        // fuzzySearch, // todo wby
+        // 只返回 slice 结果，使用 SliceResult
+        // 只返回 map 结果，使用 MapResult
+        // 分不清场景可以用 BothResult，性能较差，建议区分场景
+        // 0 表示不返回 unauth field 任何数据; 1 表示两者都返回；2 表示仅返回 slice；3 表示仅返回 map
+        'process_auth_field_type': 2,
+        'date_version': 'v3',
+    };
+    authType = (0, utils_1.formatAuthType)(authType);
+    options.headers.User = String(utils.getUserIDFromCtx());
+    if (authType) {
+        options.headers[constants_3.AuthTypeHttpHeader] = authType;
+    }
+    let data = await openapi.doRequest(null, urlPath, options);
+    return handleResponse(objectApiName, data, needCount);
+}
 /**
  * 上传文件
  *
@@ -782,8 +888,11 @@ class RequestHttp {
     constructor() {
         this.updateWorkflowVariables = updateWorkflowVariables;
         this.createRecordBySync = createRecordBySync;
+        this.createRecordV3BySync = createRecordV3BySync;
         this.updateRecordBySync = updateRecordBySync;
+        this.updateRecordV3BySync = updateRecordV3BySync;
         this.deleteRecordBySync = deleteRecordBySync;
+        this.deleteRecordV3BySync = deleteRecordV3BySync;
         this.createRecordsByAsync = createRecordsByAsync;
         this.updateRecordsByAsync = updateRecordsByAsync;
         this.deleteRecordsByAsync = deleteRecordsByAsync;
@@ -791,6 +900,7 @@ class RequestHttp {
         this.updateRecordsBySync = updateRecordsBySync;
         this.deleteRecordsBySync = deleteRecordsBySync;
         this.getRecordsOrCountByCriterion = getRecordsOrCountByCriterion;
+        this.getRecordsV3OrCounByCriterion = getRecordsV3OrCountByCriterion;
         this.uploadFile = uploadFile;
         this.downloadFileByID = downloadFileByID;
         this.downloadFileByToken = downloadFileByToken;
@@ -823,10 +933,16 @@ class RequestHttp {
     }
     createRecordBySync(objectApiName, record, authType) {
     }
+    createRecordV3BySync(objectApiName, record, authType) {
+    }
     updateRecordBySync(objectApiName, recordID, record, authType) {
     }
+    updateRecordV3BySync(objectApiName, recordID, record, authType) {
+    }
     deleteRecordBySync(objectApiName, recordID, authType) {
     }
+    deleteRecordV3BySync(objectApiName, recordID, authType) {
+    }
     createRecordsByAsync(objectApiName, records, authType) {
     }
     updateRecordsByAsync(objectApiName, recordMap, authType) {
@@ -843,6 +959,8 @@ class RequestHttp {
     }
     getRecordsOrCountByCriterion(objectApiName, criterion, order, fuzzySearch, ignoreBackLookupField, fieldApiNames, offset, limit, needCount, authType) {
     }
+    getRecordsV3OrCounByCriterion(objectApiName, criterion, order, fuzzySearch, fieldApiNames, offset, limit, needCount, authType) {
+    }
     uploadFile(data, expire, fileName) {
         return null;
     }

package/types/types.d.ts

@@ -23,7 +23,7 @@ export type _Record<T> = {
     [K in keyof T]: T[K] extends _LookupField ? _LookupFieldRet : T[K];
 };
 export type _CondRequireID<T> = _Cond<T> & {
-    _id: number;
+    _id: number | string;
 };
 interface _LookupFieldRet {
     /**