tencentcloud-sdk-nodejs-cfw 4.0.1042 → 4.1.7

package/README.md

@@ -44,18 +44,40 @@ npm install tencentcloud-sdk-nodejs-vpc --save
 
 ### 安装全产品 SDK
 
+如果项目依赖的云产品较多，可以引入全产品 SDK。
+
 ```
 npm install tencentcloud-sdk-nodejs --save
 ```
 
-全产品 SDK 包含了所有云产品的调用代码，体积偏大，对体积敏感的场景，推荐安装指定产品 SDK。
+全产品 SDK 包含所有云产品调用代码和 TypeScript 类型文件，体积偏大。对于体积敏感的场景，推荐安装指定产品 SDK。
+
+如果既希望全产品调用，又对包体积比较敏感，可以使用 Slim 版本 SDK。Slim SDK 移除类型文件，并进行了代码压缩，适合体积敏感场景使用：
+
+```
+npm install tencentcloud-sdk-slim-nodejs --save
+```
 
 ## 通过源码包安装
 
-1. 前往 [GitHub 仓库](https://github.com/tencentcloud/tencentcloud-sdk-nodejs) 或者 [Gitee 仓库](https://gitee.com/tencentcloud/tencentcloud-sdk-nodejs) 下载源码压缩包。
-2. 解压源码包到您项目合适的位置，例如 `sdk/tencentcloud-sdk-nodejs`。
-3. 执行 `npm install ./sdk/tencentcloud-sdk-nodejs`。
-4. 使用 `require("tencentcloud-sdk-nodejs")` 的方式引入 SDK，具体可参考示例。
+1. clone 代码到本地：
+```
+git clone https://github.com/tencentcloud/tencentcloud-sdk-nodejs
+# 或者
+git clone https://gitee.com/tencentcloud/tencentcloud-sdk-nodejs
+```
+2. 在项目根目录执行以下命令完成构建：
+```
+npm install && npm run build
+```
+3. 打包 NPM 压缩文件，例如 `tencentcloud-sdk-nodejs-4.0.0.tgz`
+```
+npm pack
+```
+4. 安装包到你的项目里：
+```
+npm install /path/to/tencentcloud-sdk-nodejs/tencentcloud-sdk-nodejs-4.0.0.tgz
+```
 
 # 示例
 

package/es/index.js

@@ -0,0 +1 @@
+export * from "./services";

package/es/services/cfw/index.js

@@ -0,0 +1,4 @@
+import { v20190904 } from "./v20190904";
+export const cfw = {
+    v20190904: v20190904,
+};

package/es/services/cfw/v20190904/cfw_client.js

@@ -0,0 +1,342 @@
+import * as TencentCloudCommon from "tencentcloud-sdk-nodejs-common";
+export class Client extends TencentCloudCommon.AbstractClient {
+    constructor(clientConfig) {
+        super("cfw.tencentcloudapi.com", "2019-09-04", clientConfig);
+    }
+    async RemoveVpcAcRule(req, cb) {
+        return this.request("RemoveVpcAcRule", req, cb);
+    }
+    async DeleteBlockIgnoreRuleNew(req, cb) {
+        return this.request("DeleteBlockIgnoreRuleNew", req, cb);
+    }
+    async DescribeVpcFwGroupSwitch(req, cb) {
+        return this.request("DescribeVpcFwGroupSwitch", req, cb);
+    }
+    async ModifyEWRuleStatus(req, cb) {
+        return this.request("ModifyEWRuleStatus", req, cb);
+    }
+    async StopSecurityGroupRuleDispatch(req, cb) {
+        return this.request("StopSecurityGroupRuleDispatch", req, cb);
+    }
+    async ModifyResourceGroup(req, cb) {
+        return this.request("ModifyResourceGroup", req, cb);
+    }
+    async DescribeResourceGroupNew(req, cb) {
+        return this.request("DescribeResourceGroupNew", req, cb);
+    }
+    async ModifyVpcFwGroup(req, cb) {
+        return this.request("ModifyVpcFwGroup", req, cb);
+    }
+    async ModifyAssetSync(req, cb) {
+        return this.request("ModifyAssetSync", req, cb);
+    }
+    async DeleteVpcFwGroup(req, cb) {
+        return this.request("DeleteVpcFwGroup", req, cb);
+    }
+    async AddVpcAcRule(req, cb) {
+        return this.request("AddVpcAcRule", req, cb);
+    }
+    async AddEnterpriseSecurityGroupRules(req, cb) {
+        return this.request("AddEnterpriseSecurityGroupRules", req, cb);
+    }
+    async DescribeTableStatus(req, cb) {
+        return this.request("DescribeTableStatus", req, cb);
+    }
+    async ModifySecurityGroupSequenceRules(req, cb) {
+        return this.request("ModifySecurityGroupSequenceRules", req, cb);
+    }
+    async RemoveEnterpriseSecurityGroupRule(req, cb) {
+        return this.request("RemoveEnterpriseSecurityGroupRule", req, cb);
+    }
+    async ModifyNatSequenceRules(req, cb) {
+        return this.request("ModifyNatSequenceRules", req, cb);
+    }
+    async DescribeUnHandleEventTabList(req, cb) {
+        return this.request("DescribeUnHandleEventTabList", req, cb);
+    }
+    async CreateNatFwInstance(req, cb) {
+        return this.request("CreateNatFwInstance", req, cb);
+    }
+    async ModifyBlockTop(req, cb) {
+        return this.request("ModifyBlockTop", req, cb);
+    }
+    async DeleteRemoteAccessDomain(req, cb) {
+        return this.request("DeleteRemoteAccessDomain", req, cb);
+    }
+    async RemoveAclRule(req, cb) {
+        return this.request("RemoveAclRule", req, cb);
+    }
+    async DeleteNatFwInstance(req, cb) {
+        return this.request("DeleteNatFwInstance", req, cb);
+    }
+    async CreateBlockIgnoreRuleList(req, cb) {
+        return this.request("CreateBlockIgnoreRuleList", req, cb);
+    }
+    async ModifyBlockIgnoreRuleNew(req, cb) {
+        return this.request("ModifyBlockIgnoreRuleNew", req, cb);
+    }
+    async ModifyEdgeIpSwitch(req, cb) {
+        return this.request("ModifyEdgeIpSwitch", req, cb);
+    }
+    async DescribeBlockByIpTimesList(req, cb) {
+        return this.request("DescribeBlockByIpTimesList", req, cb);
+    }
+    async DescribeNatFwDnatRule(req, cb) {
+        return this.request("DescribeNatFwDnatRule", req, cb);
+    }
+    async DescribeEnterpriseSGRuleProgress(req, cb) {
+        return this.request("DescribeEnterpriseSGRuleProgress", req, cb);
+    }
+    async DescribeNatFwInfoCount(req, cb) {
+        return this.request("DescribeNatFwInfoCount", req, cb);
+    }
+    async DescribeNatFwVpcDnsLst(req, cb) {
+        return this.request("DescribeNatFwVpcDnsLst", req, cb);
+    }
+    async ModifyBlockIgnoreRule(req, cb) {
+        return this.request("ModifyBlockIgnoreRule", req, cb);
+    }
+    async DescribeAclRule(req, cb) {
+        return this.request("DescribeAclRule", req, cb);
+    }
+    async ModifySecurityGroupRule(req, cb) {
+        return this.request("ModifySecurityGroupRule", req, cb);
+    }
+    async DeleteAllAccessControlRule(req, cb) {
+        return this.request("DeleteAllAccessControlRule", req, cb);
+    }
+    async DescribeSecurityGroupList(req, cb) {
+        return this.request("DescribeSecurityGroupList", req, cb);
+    }
+    async ModifyVpcAcRule(req, cb) {
+        return this.request("ModifyVpcAcRule", req, cb);
+    }
+    async DescribeAssetSync(req, cb) {
+        return this.request("DescribeAssetSync", req, cb);
+    }
+    async CreateSecurityGroupRules(req, cb) {
+        return this.request("CreateSecurityGroupRules", req, cb);
+    }
+    async DescribeDefenseSwitch(req, cb) {
+        return this.request("DescribeDefenseSwitch", req, cb);
+    }
+    async DescribeFwGroupInstanceInfo(req, cb) {
+        return this.request("DescribeFwGroupInstanceInfo", req, cb);
+    }
+    async ModifyNatFwVpcDnsSwitch(req, cb) {
+        return this.request("ModifyNatFwVpcDnsSwitch", req, cb);
+    }
+    async ModifySecurityGroupItemRuleStatus(req, cb) {
+        return this.request("ModifySecurityGroupItemRuleStatus", req, cb);
+    }
+    async DescribeNatFwInstanceWithRegion(req, cb) {
+        return this.request("DescribeNatFwInstanceWithRegion", req, cb);
+    }
+    async DeleteIdsWhiteRule(req, cb) {
+        return this.request("DeleteIdsWhiteRule", req, cb);
+    }
+    async CreateBlockIgnoreRuleNew(req, cb) {
+        return this.request("CreateBlockIgnoreRuleNew", req, cb);
+    }
+    async DescribeSourceAsset(req, cb) {
+        return this.request("DescribeSourceAsset", req, cb);
+    }
+    async DeleteResourceGroup(req, cb) {
+        return this.request("DeleteResourceGroup", req, cb);
+    }
+    async RemoveAcRule(req, cb) {
+        return this.request("RemoveAcRule", req, cb);
+    }
+    async ModifyVpcFwSequenceRules(req, cb) {
+        return this.request("ModifyVpcFwSequenceRules", req, cb);
+    }
+    async CreateAlertCenterOmit(req, cb) {
+        return this.request("CreateAlertCenterOmit", req, cb);
+    }
+    async CreateIdsWhiteRule(req, cb) {
+        return this.request("CreateIdsWhiteRule", req, cb);
+    }
+    async DescribeVpcAcRule(req, cb) {
+        return this.request("DescribeVpcAcRule", req, cb);
+    }
+    async ModifyEnterpriseSecurityGroupRule(req, cb) {
+        return this.request("ModifyEnterpriseSecurityGroupRule", req, cb);
+    }
+    async AddAclRule(req, cb) {
+        return this.request("AddAclRule", req, cb);
+    }
+    async ModifyNatAcRule(req, cb) {
+        return this.request("ModifyNatAcRule", req, cb);
+    }
+    async DeleteSecurityGroupRule(req, cb) {
+        return this.request("DeleteSecurityGroupRule", req, cb);
+    }
+    async ModifyAddressTemplate(req, cb) {
+        return this.request("ModifyAddressTemplate", req, cb);
+    }
+    async DescribeSwitchLists(req, cb) {
+        return this.request("DescribeSwitchLists", req, cb);
+    }
+    async ModifyTableStatus(req, cb) {
+        return this.request("ModifyTableStatus", req, cb);
+    }
+    async CreateAlertCenterIsolate(req, cb) {
+        return this.request("CreateAlertCenterIsolate", req, cb);
+    }
+    async ModifyBlockIgnoreList(req, cb) {
+        return this.request("ModifyBlockIgnoreList", req, cb);
+    }
+    async CreateChooseVpcs(req, cb) {
+        return this.request("CreateChooseVpcs", req, cb);
+    }
+    async ModifyAssetScan(req, cb) {
+        return this.request("ModifyAssetScan", req, cb);
+    }
+    async DeleteAddressTemplate(req, cb) {
+        return this.request("DeleteAddressTemplate", req, cb);
+    }
+    async ModifySequenceRules(req, cb) {
+        return this.request("ModifySequenceRules", req, cb);
+    }
+    async ModifySequenceAclRules(req, cb) {
+        return this.request("ModifySequenceAclRules", req, cb);
+    }
+    async DescribeRuleOverview(req, cb) {
+        return this.request("DescribeRuleOverview", req, cb);
+    }
+    async DescribeIPStatusList(req, cb) {
+        return this.request("DescribeIPStatusList", req, cb);
+    }
+    async DescribeEnterpriseSecurityGroupRule(req, cb) {
+        return this.request("DescribeEnterpriseSecurityGroupRule", req, cb);
+    }
+    async ModifyFwGroupSwitch(req, cb) {
+        return this.request("ModifyFwGroupSwitch", req, cb);
+    }
+    async DescribeLogs(req, cb) {
+        return this.request("DescribeLogs", req, cb);
+    }
+    async SetNatFwDnatRule(req, cb) {
+        return this.request("SetNatFwDnatRule", req, cb);
+    }
+    async ModifyAllRuleStatus(req, cb) {
+        return this.request("ModifyAllRuleStatus", req, cb);
+    }
+    async DeleteBlockIgnoreRuleList(req, cb) {
+        return this.request("DeleteBlockIgnoreRuleList", req, cb);
+    }
+    async SetNatFwEip(req, cb) {
+        return this.request("SetNatFwEip", req, cb);
+    }
+    async CreateAlertCenterRule(req, cb) {
+        return this.request("CreateAlertCenterRule", req, cb);
+    }
+    async ModifyAclRule(req, cb) {
+        return this.request("ModifyAclRule", req, cb);
+    }
+    async DescribeEnterpriseSecurityGroupRuleList(req, cb) {
+        return this.request("DescribeEnterpriseSecurityGroupRuleList", req, cb);
+    }
+    async DescribeCfwEips(req, cb) {
+        return this.request("DescribeCfwEips", req, cb);
+    }
+    async DescribeBlockIgnoreList(req, cb) {
+        return this.request("DescribeBlockIgnoreList", req, cb);
+    }
+    async RemoveNatAcRule(req, cb) {
+        return this.request("RemoveNatAcRule", req, cb);
+    }
+    async DescribeAcLists(req, cb) {
+        return this.request("DescribeAcLists", req, cb);
+    }
+    async ExpandCfwVertical(req, cb) {
+        return this.request("ExpandCfwVertical", req, cb);
+    }
+    async CreateVpcFwGroup(req, cb) {
+        return this.request("CreateVpcFwGroup", req, cb);
+    }
+    async ModifyAllPublicIPSwitchStatus(req, cb) {
+        return this.request("ModifyAllPublicIPSwitchStatus", req, cb);
+    }
+    async DescribeAssociatedInstanceList(req, cb) {
+        return this.request("DescribeAssociatedInstanceList", req, cb);
+    }
+    async ModifyNatInstance(req, cb) {
+        return this.request("ModifyNatInstance", req, cb);
+    }
+    async DeleteAcRule(req, cb) {
+        return this.request("DeleteAcRule", req, cb);
+    }
+    async DescribeNatAcRule(req, cb) {
+        return this.request("DescribeNatAcRule", req, cb);
+    }
+    async DescribeFwSyncStatus(req, cb) {
+        return this.request("DescribeFwSyncStatus", req, cb);
+    }
+    async DescribeNatFwInstance(req, cb) {
+        return this.request("DescribeNatFwInstance", req, cb);
+    }
+    async CreateDatabaseWhiteListRules(req, cb) {
+        return this.request("CreateDatabaseWhiteListRules", req, cb);
+    }
+    async CreateNatFwInstanceWithDomain(req, cb) {
+        return this.request("CreateNatFwInstanceWithDomain", req, cb);
+    }
+    async CreateAcRules(req, cb) {
+        return this.request("CreateAcRules", req, cb);
+    }
+    async ModifyEnterpriseSecurityDispatchStatus(req, cb) {
+        return this.request("ModifyEnterpriseSecurityDispatchStatus", req, cb);
+    }
+    async DescribeTLogInfo(req, cb) {
+        return this.request("DescribeTLogInfo", req, cb);
+    }
+    async ModifyRunSyncAsset(req, cb) {
+        return this.request("ModifyRunSyncAsset", req, cb);
+    }
+    async DescribeGuideScanInfo(req, cb) {
+        return this.request("DescribeGuideScanInfo", req, cb);
+    }
+    async DescribeAddressTemplateList(req, cb) {
+        return this.request("DescribeAddressTemplateList", req, cb);
+    }
+    async DescribeNatFwInstancesInfo(req, cb) {
+        return this.request("DescribeNatFwInstancesInfo", req, cb);
+    }
+    async ModifyNatFwReSelect(req, cb) {
+        return this.request("ModifyNatFwReSelect", req, cb);
+    }
+    async ModifyStorageSetting(req, cb) {
+        return this.request("ModifyStorageSetting", req, cb);
+    }
+    async DescribeResourceGroup(req, cb) {
+        return this.request("DescribeResourceGroup", req, cb);
+    }
+    async SyncFwOperate(req, cb) {
+        return this.request("SyncFwOperate", req, cb);
+    }
+    async ModifyAcRule(req, cb) {
+        return this.request("ModifyAcRule", req, cb);
+    }
+    async DescribeFwEdgeIps(req, cb) {
+        return this.request("DescribeFwEdgeIps", req, cb);
+    }
+    async ModifyNatFwSwitch(req, cb) {
+        return this.request("ModifyNatFwSwitch", req, cb);
+    }
+    async DescribeTLogIpList(req, cb) {
+        return this.request("DescribeTLogIpList", req, cb);
+    }
+    async CreateAddressTemplate(req, cb) {
+        return this.request("CreateAddressTemplate", req, cb);
+    }
+    async AddNatAcRule(req, cb) {
+        return this.request("AddNatAcRule", req, cb);
+    }
+    async DescribeBlockStaticList(req, cb) {
+        return this.request("DescribeBlockStaticList", req, cb);
+    }
+    async DescribeIdsWhiteRule(req, cb) {
+        return this.request("DescribeIdsWhiteRule", req, cb);
+    }
+}

package/es/services/cfw/v20190904/index.js

@@ -0,0 +1,6 @@
+import * as Models from "./cfw_models";
+import { Client } from "./cfw_client";
+export const v20190904 = {
+    Client: Client,
+    Models: Models,
+};

package/es/services/index.js

@@ -0,0 +1 @@
+export { cfw } from "./cfw";

package/package.json

@@ -1,16 +1,26 @@
 {
   "name": "tencentcloud-sdk-nodejs-cfw",
-  "version": "4.0.1042",
-  "description": "Tencent Cloud API NODEJS SDK",
-  "main": "tencentcloud/index.js",
+  "version": "4.1.7",
+  "description": "腾讯云 API NODEJS SDK",
+  "main": "./tencentcloud/index.js",
+  "module": "./es/index.js",
+  "types": "./tencentcloud/index.d.ts",
   "scripts": {
     "test": "mocha -t 10000",
-    "build": "tsc",
-    "prettier": "prettier --config prettier.config.js --write 'src/**/*.{tsx,ts,jsx,js,css,json,vue}'"
+    "build": "concurrently 'npm:build:cjs' 'npm:build:es'",
+    "build:cjs": "tsc -p tsconfig.json",
+    "build:es": "tsc -p tsconfig.es.json",
+    "build:slim": "node ./scripts/build_slim.js",
+    "prettier": "prettier --config prettier.config.js --write 'src/**/*.{tsx,ts,jsx,js,css,json,vue}'",
+    "clean": "rimraf tencentcloud es"
   },
   "engines": {
     "node": ">=10"
   },
+  "files": [
+    "tencentcloud",
+    "es"
+  ],
   "keywords": [
     "tencentcloudapi",
     "tencentcloud",
@@ -22,7 +32,7 @@
   "author": "tencentcloudapi",
   "license": "Apache-2.0",
   "dependencies": {
-    "tencentcloud-sdk-nodejs-common": "^4.0.488",
+    "tencentcloud-sdk-nodejs-common": "*",
     "tslib": "1.13.0"
   },
   "directories": {
@@ -35,14 +45,22 @@
   },
   "devDependencies": {
     "@types/form-data": "^2.5.0",
+    "@types/json-bigint": "^1.0.1",
     "@types/node": "^14.0.26",
     "@types/node-fetch": "^2.5.7",
+    "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^2.34.0",
     "@typescript-eslint/parser": "^2.34.0",
+    "babel-eslint": "^10.0.2",
     "chai": "^4.2.0",
+    "concurrently": "^6.5.1",
+    "esbuild": "^0.25.0",
     "eslint": "^6.8.0",
-    "mocha": "^8.1.1",
+    "eslint-plugin-react": "^7.17.0",
+    "mocha": "^8.4.0",
+    "prettier": "^2.3.0",
+    "rimraf": "^5.0.10",
     "ts-node": "^8.10.2",
     "typescript": "^3.9.7"
   }
-}
+}

package/tencentcloud/services/cfw/v20190904/cfw_client.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = void 0;
+const tslib_1 = require("tslib");
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /*
  * Copyright (c) 2018 THL A29 Limited, a Tencent company. All Rights Reserved.
@@ -18,7 +19,7 @@ exports.Client = void 0;
  * specific language governing permissions and limitations
  * under the License.
  */
-const TencentCloudCommon = require("tencentcloud-sdk-nodejs-common");
+const TencentCloudCommon = tslib_1.__importStar(require("tencentcloud-sdk-nodejs-common"));
 /**
  * cfw client
  * @class

package/tencentcloud/services/cfw/v20190904/cfw_models.d.ts

@@ -29,7 +29,7 @@ export declare type DescribeNatFwInstanceWithRegionRequest = null;
 export interface DescribeLogsRequest {
     /**
      * 日志类型标识
-  流量日志：互联网边界防火墙netflow_border，NAT边界防火墙netflow_nat，VPC间防火墙vpcnetflow，内网流量日志netflow_fl
+  流量日志：互联网边界防火墙netflow_border，NAT边界防火墙netflow_nat，VPC间防火墙vpcnetflow，内网流量日志netflow_fl，流量分析日志netflow_nta
   入侵防御日志rule_threatinfo
   访问控制日志：互联网边界规则rule_acl，NAT边界规则rule_acl，内网间规则rule_vpcacl，企业安全组rule_sg
   操作日志：防火墙开关-开关操作operate_switch，防火墙开关-实例配置operate_instance，资产中心操作operate_assetgroup，访问控制操作operate_acl，零信任防护操作operate_identity，入侵防御操作-入侵防御operate_ids，入侵防御操作-安全基线operate_baseline，常用工具操作operate_tool，网络蜜罐操作operate_honeypot，日志投递操作operate_logdelivery，通用设置操作operate_logstorage，登录日志operate_login

package/tencentcloud/services/cfw/v20190904/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.v20190904 = void 0;
-const Models = require("./cfw_models");
+const tslib_1 = require("tslib");
+const Models = tslib_1.__importStar(require("./cfw_models"));
 const cfw_client_1 = require("./cfw_client");
 exports.v20190904 = {
     Client: cfw_client_1.Client,

package/index.d.ts

@@ -1,2 +0,0 @@
-import * as tencentcloud from './tencentcloud';
-export default tencentcloud;

package/index.js

@@ -1,6 +0,0 @@
-'use strict'
-Object.defineProperty(exports, '__esModule', { value: true })
-const tslib_1 = require('tslib')
-const tencentcloud = tslib_1.__importStar(require('./tencentcloud'))
-exports.default = tencentcloud
-//# sourceMappingURL=index.js.map

package/prettier.config.js

@@ -1,38 +0,0 @@
-// prettier.config.js
-module.exports = {
-  // 一行最多 100 字符
-  printWidth: 100,
-  // 使用 4 个空格缩进
-  tabWidth: 2,
-  // 不使用缩进符，而使用空格
-  useTabs: false,
-  // 行尾需要有分号
-  semi: false,
-  // 使用单引号
-  singleQuote: false,
-  // 对象的 key 仅在必要时用引号
-  quoteProps: "as-needed",
-  // jsx 不使用单引号，而使用双引号
-  jsxSingleQuote: false,
-  // 末尾不需要逗号
-  trailingComma: "es5",
-  // 大括号内的首尾需要空格
-  bracketSpacing: true,
-  // jsx 标签的反尖括号需要换行
-  jsxBracketSameLine: false,
-  // 箭头函数，只有一个参数的时候，也需要括号
-  arrowParens: "always",
-  // 每个文件格式化的范围是文件的全部内容
-  rangeStart: 0,
-  rangeEnd: Infinity,
-  // 不需要写文件开头的 @prettier
-  requirePragma: false,
-  // 不需要自动在文件开头插入 @prettier
-  insertPragma: false,
-  // 使用默认的折行标准
-  proseWrap: "preserve",
-  // 根据显示样式决定 html 要不要折行
-  htmlWhitespaceSensitivity: "css",
-  // 换行符使用 lf
-  endOfLine: "lf",
-}

package/src/index.ts

@@ -1 +0,0 @@
-export * from "./services"

package/src/services/cfw/index.ts

@@ -1,5 +0,0 @@
-import { v20190904 } from "./v20190904"
-
-export const cfw = {
-  v20190904: v20190904,
-}