@byted-apaas/server-sdk-node 1.0.5-beta.6 → 1.0.5-beta.9

package/application/application.d.ts

@@ -19,7 +19,7 @@ export interface IApplication {
     localDebugMode(): IApplication;
     setLaneName(laneName: string): IApplication;
 }
-export declare type AppMode = 'openSDK' | 'faasSDK';
+export type AppMode = 'openSDK' | 'faasSDK';
 export interface AppCtx {
     mode: AppMode;
     env?: PlatformEnvType;

package/context/db/db.d.ts

@@ -8,7 +8,7 @@ import { IOql } from './impl/oql/ioql';
  * - 目前 IDBGetter 支持的是 currentObject 方法的动态声明，使用泛型实现，期望传入的 T 是 Context 结构。
  * - 如果 Context 有 objectApiName 属性，则拥有 .db.currentObject 和 .db.transaction.currentObject
  */
-export declare type IDBGetter<T, mt> = T extends {
+export type IDBGetter<T, mt> = T extends {
     'objectApiName': string;
 } ? IDB<T, mt> & IDBWithCurrentObject<{}, mt> : IDB<{}, mt>;
 /**

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

@@ -1,6 +1,6 @@
 export declare const ASC = "asc";
 export declare const DESC = "desc";
-export declare type OrderType = 'asc' | 'desc';
+export type OrderType = 'asc' | 'desc';
 export declare class Order {
     field: string;
     type: string;

package/context/db/impl/transaction/index.d.ts

@@ -1,10 +1,10 @@
 import { ITransaction, ITransactionWithCurrentObject, TransactionObject } from "../transaction";
 import { TransactionOperation } from './operation';
 import { currentObjApiName } from '../../../../data';
-declare type uuidOrRecordIDResult = {
+type uuidOrRecordIDResult = {
     _id: uuidOrRecordID;
 };
-declare type uuidOrRecordID = number | string;
+type uuidOrRecordID = number | string;
 export declare class Transaction<T, mt> implements ITransaction<mt>, ITransactionWithCurrentObject<mt> {
     objectApiName: string;
     placeholders: Record<string, number>;

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

@@ -1,6 +1,6 @@
 import { _Cond } from '../../../types/types';
 import { currentObjApiName } from "../../../data/index";
-export declare type ITransactionGetter<T, mt> = T extends {
+export type ITransactionGetter<T, mt> = T extends {
     'objectApiName': string;
 } ? ITransaction<mt> : ITransaction<mt> & ITransactionWithCurrentObject<mt>;
 export interface ITransaction<mt> {

package/context/metadata/objects/fields.util.js

@@ -112,7 +112,7 @@ function getOptionList(field) {
             apiName: option.api_name,
             description: option.description,
             color: commonUtils.getColorNameById(option.color_id),
-            active: !!option.active,
+            active: Number(option.active) === 1,
         });
     }
     return options;

package/context/metadata/types/common.d.ts

@@ -1,6 +1,6 @@
-export declare type I18n = {
+export type I18n = {
     language_code: number;
     text: string;
 };
-export declare type I18ns = I18n[];
+export type I18ns = I18n[];
 export declare function isNullOrUndefined(param: any): boolean;

package/context/metadata/types/components.d.ts

@@ -1,11 +1,11 @@
 import { I18ns } from "./common";
-export declare type SelectFieldType = {
+export type SelectFieldType = {
     fieldPath: {
         objectApiName: string;
         fieldApiName: string;
     }[];
 };
-export declare type FieldApiType = {
+export type FieldApiType = {
     type?: string;
     fieldApiName: string;
     alias?: I18ns;
@@ -15,18 +15,18 @@ export declare type FieldApiType = {
     };
     color?: string;
 };
-export declare type UIMetaFilterType = {
+export type UIMetaFilterType = {
     conditions: Object[];
     logic: string;
 };
-export declare type UIMetaSortConditionsType = {
+export type UIMetaSortConditionsType = {
     fieldApiName: string;
     sort: string;
 };
-export declare type DeskListTitleField = {
+export type DeskListTitleField = {
     fieldApiName: string;
 };
-export declare type DeskListSubtitleField = {
+export type DeskListSubtitleField = {
     type?: ("field" | "concatText");
     fieldApiName: string;
     alias: I18ns;
@@ -35,11 +35,11 @@ export declare type DeskListSubtitleField = {
         en_US: ConcatTextType[];
     };
 };
-export declare type DeskListDetailField = {
+export type DeskListDetailField = {
     fieldApiName: string;
     alias: I18ns;
 };
-export declare type UIMetaDesktopType = {
+export type UIMetaDesktopType = {
     isCompositeType: boolean;
     titleAreaText: I18ns;
     objectApiName: string;
@@ -49,17 +49,17 @@ export declare type UIMetaDesktopType = {
     filter: UIMetaFilterType;
     sortConditions: UIMetaSortConditionsType[];
 };
-export declare type UIMetaLangType = {
+export type UIMetaLangType = {
     dataType: string;
     fieldApiName: string;
     text: string;
 };
-export declare type ConcatTextType = {
+export type ConcatTextType = {
     dataType: "fieldApiName" | "text";
     fieldApiName: string;
     text: string;
 };
-export declare type UIMetaMobileType = {
+export type UIMetaMobileType = {
     pageType?: ("app" | "record_page");
     pageApiName: string;
     componentName: string;
@@ -69,11 +69,11 @@ export declare type UIMetaMobileType = {
     filter: UIMetaFilterType;
     sortConditions: UIMetaSortConditionsType[];
 };
-export declare type MobileListField = {
+export type MobileListField = {
     fieldApiName: string;
     hiddenWhenEmpty?: boolean;
 };
-export declare type MobileListItem = {
+export type MobileListItem = {
     avatar: {
         active: boolean;
         fieldApiName: string;

package/context/metadata/types/objects.d.ts

@@ -36,7 +36,7 @@ export interface KDateType extends BaseFieldType {
 export interface DateTimeType extends BaseFieldType {
     required: boolean;
 }
-export declare type SubOptionType = {
+export type SubOptionType = {
     label: I18ns;
     apiName: string;
     description: I18ns;
@@ -70,7 +70,7 @@ export interface SortConditionType {
     fieldApiName: string;
     sort: ("asc" | "desc");
 }
-declare type ConditionType = {
+type ConditionType = {
     left: {
         objectApiName: string;
         fieldApiName: string;
@@ -79,11 +79,11 @@ declare type ConditionType = {
     valueType: ("reference" | "specified");
     right: (object | string);
 };
-declare type CriterionType = {
+type CriterionType = {
     conditions: ConditionType[];
     logic: string;
 };
-export declare type FilterType = {
+export type FilterType = {
     label: string;
     needTriggerCriterion: boolean;
     triggerCriterion: CriterionType;
@@ -135,7 +135,7 @@ export interface ExtractSingleRecordType extends BaseFieldType {
     sortConditions: SortConditionType[];
     recordPosition: number;
 }
-export declare type FieldType = {
+export type FieldType = {
     "allow_search": boolean;
     "api_name": string;
     "calculated": boolean;

package/context/msg/msg.d.ts

@@ -1,6 +1,6 @@
 import * as common from "@byted-apaas/server-common-node";
 import Multilingual = common.fieldType.Multilingual;
-export declare type _IconType = "success" | "error" | "progress" | "info";
+export type _IconType = "success" | "error" | "progress" | "info";
 export declare class _NotifyCenter {
     /**
      * 消息中心推送消息

package/context/resources/IResources.d.ts

@@ -41,13 +41,13 @@ export interface _IKunlunFile {
      */
     download(fileInfo: _FileInfo, filePath: string): Promise<void>;
 }
-export declare type FileUploadResult = {
+export type FileUploadResult = {
     fileId: string;
     type: string;
     name: string;
     size: number;
 };
-export declare type UploadAvatarResult = {
+export type UploadAvatarResult = {
     ImageId: string;
     PreviewImageId: string;
 };

package/data/index.d.ts

@@ -1,11 +1,11 @@
 export interface workflowVariables {
 }
-export declare type globalFuncNames = "a" | "b";
+export type globalFuncNames = "a" | "b";
 export interface globalVariablesMap {
     a: string;
     b: string;
 }
-export declare type globalVariables = keyof globalVariablesMap;
+export type globalVariables = keyof globalVariablesMap;
 export interface metadataMap {
     /**
      * @description 用户
@@ -13,7 +13,7 @@ export interface metadataMap {
     _user: User;
     _department: Department;
 }
-export declare type currentObjApiName = "_user";
+export type currentObjApiName = "_user";
 interface User {
     _name: string;
     _id: number;

package/hooks/api.d.ts

@@ -1,11 +1,10 @@
 import * as common from "@byted-apaas/server-common-node";
-import { IFuCtx } from "@byted-apaas/server-common-node/context/IContext";
 import { Tasks } from "../context/tasks/tasks";
 import { DB } from "../context/db/impl/db";
 import { _Resources } from "../context/resources/impl/resources";
 import { Message } from "../context/msg/msg";
 import { IMetaData } from "../context/metadata/metadata";
-declare type invokeGlobalFuncT = (funcNames: string) => {
+type invokeGlobalFuncT = (funcNames: string) => {
     invoke: (params?: any) => Promise<any>;
 };
 export declare function getFunctionSync(context?: any, logger?: common.Logger): invokeGlobalFuncT;
@@ -33,7 +32,7 @@ export declare function invokeMicroservice(): (apiName: string) => {
      */
     invokeAsync: (path: string, method?: string, params?: any) => Promise<any>;
 };
-export declare const db: DB<IFuCtx, import("../data").metadataMap>;
+export declare const db: DB<import("@byted-apaas/server-common-node/context/IContext").IContext, import("../data").metadataMap>;
 export declare const resources: _Resources;
 export declare const msg: Message;
 export declare const tasks: Tasks<unknown>;

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

@@ -1,4 +1,4 @@
-export declare type UserDataType = null | string | boolean | number | Date | object;
+export type UserDataType = null | string | boolean | number | Date | object;
 export declare class Expression {
     index: number;
     left: ExpressionField;
@@ -6,11 +6,11 @@ export declare class Expression {
     right: ExpressionField;
     constructor(left: ExpressionField, operator: string, right: ExpressionField, index: number);
 }
-declare type SettingType = {
+type SettingType = {
     data?: UserDataType;
     fieldPath?: PathType[];
 };
-export declare type PathType = {
+export type PathType = {
     objectApiName: string;
     fieldApiName: string;
     extendLogicTags: string[];

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

@@ -13,7 +13,7 @@ export declare class Condition {
     toExpression(objectApiName: string, fieldApiName: string, index: number): Expression;
     constructor(left: string, right: Condition | UserDataType, op?: string);
 }
-export declare type Criterion = {
+export type Criterion = {
     conditions: Expression[];
     logic: string;
 };

package/kunlun/operator/impl/logic.js

@@ -12,13 +12,6 @@ var fieldType = common.fieldType;
 const dayjs = require("dayjs");
 // 条件操作
 class Condition {
-    constructor(left, right, op = operator_1.operates.EQ) {
-        this.left = left;
-        this.right = right;
-        if (op) {
-            this.op = op;
-        }
-    }
     /**
      *
      * @param objectApiName 对象的ApiName
@@ -44,6 +37,13 @@ class Condition {
         }
         return new expression_1.Expression(left, op, right, index);
     }
+    constructor(left, right, op = operator_1.operates.EQ) {
+        this.left = left;
+        this.right = right;
+        if (op) {
+            this.op = op;
+        }
+    }
 }
 exports.Condition = Condition;
 // param type should be spercific

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

@@ -1,21 +1,21 @@
 import { OrderV2 } from "../../../request/interface";
 import { UserDataType } from "./expression";
-export declare type FieldPath = {
+export type FieldPath = {
     objectApiName: string;
     fieldApiName: string;
     extendLogicTags: string[];
 };
-export declare type SettingType = {
+export type SettingType = {
     data?: any;
     fieldPath?: FieldPath[];
 };
-export declare type Expression = {
+export type Expression = {
     type: string;
     settings: SettingType;
 };
 export declare function NewMetadataExpressionField(objectApiName: string, fieldApiName: string): Expression;
 export declare function NewConstantExpressionField(data: UserDataType): Expression;
-export declare type ExpressionV2 = {
+export type ExpressionV2 = {
     leftValue: string;
     operator: string;
     rightValue: any;
@@ -49,10 +49,10 @@ export declare class QueryV2 {
     select(fieldApiNames: string[]): QueryV2;
     constructor(objectApiName: string);
 }
-export declare type logicalRet = {
+export type logicalRet = {
     logicalExps: LogicalExpression[];
     arithmeticExps: ArithmeticExpression[];
 };
 export declare function logical(exps: (LogicalExpression | Record<string, ArithmeticExpression>)[]): logicalRet;
-export declare type CriterionV2 = (Record<string, CriterionV2> | ExpressionV2)[];
+export type CriterionV2 = (Record<string, CriterionV2> | ExpressionV2)[];
 export declare function buildCriterionV2(filter: LogicalExpression): CriterionV2;

package/kunlun/operator/impl/logicV2.js

@@ -73,18 +73,6 @@ class LogicalExpression {
 }
 exports.LogicalExpression = LogicalExpression;
 class QueryV2 {
-    constructor(objectApiName) {
-        this.objectApiName = objectApiName;
-        this._limit = 200;
-        this._offset = 0;
-        this.fields = [];
-        this._order = [];
-        this.filter = {
-            type: "and",
-            arithmeticExpressions: [],
-            logicalExpressions: [],
-        };
-    }
     buildCriterion(filter) {
         if (!filter || filter.arithmeticExpressions.length == 0 && filter.logicalExpressions.length == 0) {
             return null;
@@ -154,6 +142,18 @@ class QueryV2 {
         });
         return this;
     }
+    constructor(objectApiName) {
+        this.objectApiName = objectApiName;
+        this._limit = 200;
+        this._offset = 0;
+        this.fields = [];
+        this._order = [];
+        this.filter = {
+            type: "and",
+            arithmeticExpressions: [],
+            logicalExpressions: [],
+        };
+    }
 }
 exports.QueryV2 = QueryV2;
 function logical(exps) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byted-apaas/server-sdk-node",
-  "version": "1.0.5-beta.6",
+  "version": "1.0.5-beta.9",
   "description": "aPaaS Server SDK",
   "author": "zhouwexin <zhouwexin@bytedance.com>",
   "homepage": "",
@@ -12,7 +12,7 @@
     "pre-build": "rm -rf build && tsc"
   },
   "dependencies": {
-    "@byted-apaas/server-common-node": "^1.0.7-beta.6",
+    "@byted-apaas/server-common-node": "^1.0.7-beta.17",
     "@jorgeferrero/stream-to-buffer": "^2.0.6",
     "dayjs": "^1.9.6",
     "form-data": "^3.0.0",
@@ -37,5 +37,6 @@
       "ts-node/register"
     ],
     "timeout": 20000
-  }
+  },
+  "gitHead": "034c3de194201277e2db2d962a3480fbd893f5fb"
 }

package/request/interface.d.ts

@@ -7,19 +7,19 @@ import { AppCtx } from "../application/application";
 import { Order } from "../context/db/impl/order";
 export declare function GetInstance(): IInnerAPIRequest;
 export declare function GetFaaSInfraInstance(): IFaaSInfraRequest;
-export declare type UploadFileResp = {
+export type UploadFileResp = {
     id: string;
     token: string;
     size: bigint;
     mimeType: string;
     name: string;
 };
-export declare type OrderV2 = {
+export type OrderV2 = {
     field: string;
     direction: string;
     type: string;
 };
-export declare type OpenSDKGetRecordsReq = {
+export type OpenSDKGetRecordsReq = {
     limit: number;
     offset: number;
     fields: string[];

package/types/types.d.ts

@@ -1,28 +1,28 @@
-export declare type _BooleanCond<T> = {};
-export declare type _LogicalCond<T> = {};
-declare type _LookupCond = number | {
+export type _BooleanCond<T> = {};
+export type _LogicalCond<T> = {};
+type _LookupCond = number | {
     _id: number;
 };
-declare type _MultiLookupCond = _LookupCond[];
-declare type PartialCompositeType<T> = Partial<{
+type _MultiLookupCond = _LookupCond[];
+type PartialCompositeType<T> = Partial<{
     [K in keyof T]: T[K] extends _LookupField[] ? _MultiLookupCond : T[K] extends _LookupField ? _LookupCond : Partial<T[K]>;
 }>;
-declare type _FieldCond<T> = T extends _LookupField[] ? _MultiLookupCond : T extends _LookupField ? _LookupCond : PartialCompositeType<T>;
-declare type _FirstLevelFieldCond<T> = Partial<{
+type _FieldCond<T> = T extends _LookupField[] ? _MultiLookupCond : T extends _LookupField ? _LookupCond : PartialCompositeType<T>;
+type _FirstLevelFieldCond<T> = Partial<{
     [K in keyof T]: T[K] extends _LookupField ? _FieldCond<T[K]> : T[K];
 }>;
-declare type _KCond<T> = Partial<{
+type _KCond<T> = Partial<{
     [K in keyof T]: _FieldCond<T[K]> | _BooleanCond<T[K]> | _LogicalCond<T[K]>;
 }>;
-declare type _WhereKCond<T> = Partial<{
+type _WhereKCond<T> = Partial<{
     [K in keyof T]: _FirstLevelFieldCond<T[K]> | _BooleanCond<T[K]> | _LogicalCond<T[K]>;
 }>;
-export declare type _Cond<T> = _KCond<T> | _LogicalCond<Partial<T>>;
-export declare type _WhereCond<T> = _WhereKCond<T> | _LogicalCond<Partial<T>>;
-export declare type _Record<T> = {
+export type _Cond<T> = _KCond<T> | _LogicalCond<Partial<T>>;
+export type _WhereCond<T> = _WhereKCond<T> | _LogicalCond<Partial<T>>;
+export type _Record<T> = {
     [K in keyof T]: T[K] extends _LookupField ? _LookupFieldRet : T[K];
 };
-export declare type _CondRequireID<T> = _Cond<T> & {
+export type _CondRequireID<T> = _Cond<T> & {
     _id: number;
 };
 interface _LookupFieldRet {