@lcap/nasl 1.0.1 → 1.0.2

package/src/service/storage/init.ts

@@ -83,7 +83,7 @@ async function doAction(app: any, actionItem: any) {
         }
         view?.children?.forEach((item) => loopEle(item, checkAuth));
         if (view instanceof ViewElement) {
-            if (view.tag === 'u-uploader') {
+            if (view.tag === 'u-uploader' || view.tag === 'van-uploader') {
                 const bute = view?.bindAttrs.find((item) => item.name === 'url');
                 if (checkAuth) {
                     if (bute?.value.endsWith('/import') && !view.view.parentAuth) {
@@ -273,7 +273,10 @@ function handleApp(app: any) {
         if (app._timer) {
             clearTimeout(app._timer);
         }
-        if (!event.noTimer) {
+        if (!app._noTimer) {
+            app._noTimer = event.noTimer;
+        }
+        if (!app._noTimer) {
             app._timer = setTimeout(() => {
                 console.error('收集超时，请及时排查原因');
                 app.emit('refresh');
@@ -295,20 +298,24 @@ function handleApp(app: any) {
             if (app._timer) {
                 clearTimeout(app._timer);
             }
-            if (Array.isArray(app._collectingList) && app._collectingList.length) {
+            // 结束收集时，立即将全局收集变量状态重置，防止下次收集数据混乱
+            const collectingList = app._collectingList;
+            const actionMsg = app._actionMsg;
+            const action = app._action;
+            app._collectingList = [];
+            app._actionMsg = '';
+            app._action = '';
+            app._noTimer = undefined;
+            if (Array.isArray(collectingList) && collectingList.length) {
                 embeddedTSEmitter.emit('change', {
-                    value: app._collectingList,
+                    value: collectingList,
                 });
                 await doAction(app, {
-                    list: app._collectingList,
-                    actionMsg: app._actionMsg,
-                    action: app._action,
+                    list: collectingList,
+                    actionMsg,
+                    action,
                 });
             }
-
-            app._collectingList = [];
-            app._actionMsg = '';
-            app._action = '';
         } else if (app._isCollectingCount < 0) {
             app._isCollectingCount = 0;
             throw Error('关闭收集有问题，请排查');

package/src/templator/genGetBlock.ts

@@ -24,7 +24,7 @@ export function genGetTemplate(entity: Entity, nameGroup: NameGroup) {
 }
 
 function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
-    const params = [genLogicParam(`${getLogic.params[0].name}`, 'id')];
+    const params = [genLogicParam(`${getLogic.params[0].name}`, nameGroup.viewParamId)];
 
     return NaslNode.Logic({
         name: nameGroup.viewLogicLoad,

package/src/templator/genQueryComponent.ts

@@ -106,10 +106,13 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
         }),
         right: NaslQueryExpression.CallQueryComponent({
             label: '数据查询',
-            typeAnnotation: NaslTypeAnnotation.Reference({
-                typeNamespace: `${parentNamespace}.structures`,
-                typeName: nameGroup.structure,
-            }),
+            ideVersion: '2.11', // 2.11版本新创建的数据查询组件，返回类型将自动推断
+            typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
+                NaslTypeAnnotation.Reference({
+                    typeNamespace: `${parentNamespace}.structures`,
+                    typeName: nameGroup.structure,
+                }),
+            ]),
             select: NaslQueryExpression.QuerySelectExpression({
                 label: '查询组件Select子句',
                 distinct: false,

package/src/templator/genSelectBlock.ts

@@ -15,8 +15,8 @@ import {
  */
 export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup) {
     return `<u-select clearable placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
-    text-field="${nameGroup.viewVariableEntity}.${property.name}"
-    value-field="${nameGroup.viewVariableEntity}.id" :pageable="true" :remote-paging="true">
+    text-field="${nameGroup.lowerEntity}.${property.name}"
+    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
 </u-select>`;
 }
 
@@ -29,8 +29,8 @@ export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup
 export function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGroup) {
     const label = property.label || property.name;
     return `<van-cascader title="请选择" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
-    text-field="${nameGroup.viewVariableEntity}.${property.name}"
-    value-field="${nameGroup.viewVariableEntity}.id" :pageable="true" :remote-paging="true"  v-model="${nameGroup.viewVariableEntity}.${property.name}" labelField="${label}">
+    text-field="${nameGroup.lowerEntity}.${property.name}"
+    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true" labelField="${label}">
 </van-cascader>`;
 }
 
@@ -90,7 +90,7 @@ export function genSelectBlock(entity: Entity, view: View) {
     const viewElementMainView = view.getViewElementUniqueName('select');
     const nameGroup = genUniqueQueryNameGroup(parentNode, view, viewElementMainView, false);
     nameGroup.viewElementMainView = viewElementMainView;
-    nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
+    nameGroup.lowerEntity = utils.firstLowerCase(entity.name);
 
     const displayedProperty = getFirstDisplayedProperty(entity);
 
@@ -115,16 +115,6 @@ export function genSelectBlock(entity: Entity, view: View) {
     "viewLogics": [
         ${JSON.stringify(genLoadSelectLogic(entity, nameGroup, newLogic))}
     ],
-    "viewVariables": [
-        {
-            "concept": "Variable",
-            "name": "${nameGroup.viewVariableEntity}",
-            "typeAnnotation":  ${JSON.stringify(NaslTypeAnnotation.Reference({
-        typeNamespace: entity.getNamespace(),
-        typeName: entity.name,
-    }))}
-        }
-    ],
     "logics": ${JSON.stringify(newLogics)},
     "structures": ${JSON.stringify(newStructures)}
 }

package/src/templator/genUpdateBlock.ts

@@ -226,7 +226,7 @@ function genSubmitLogic(updateLogic: Logic, nameGroup: NameGroup) {
 }
 
 function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
-    const params = [genLogicParam(`${getLogic.params[0].name}`, 'id')];
+    const params = [genLogicParam(`${getLogic.params[0].name}`, nameGroup.viewParamId)];
     return NaslNode.Logic({
         name: nameGroup.viewLogicLoad,
         description: '',

package/src/templator/utils.ts

@@ -440,6 +440,7 @@ export const NaslQueryExpression = {
         orderBy,
         logicName,
         structureName,
+        ideVersion,
     }: {
         label?: string;
         typeAnnotation: any;
@@ -452,6 +453,7 @@ export const NaslQueryExpression = {
         orderBy: any[];
         logicName: string;
         structureName: string;
+        ideVersion: string
     }) => ({
         concept: 'CallQueryComponent',
         name: '',
@@ -467,6 +469,7 @@ export const NaslQueryExpression = {
         orderBy,
         logicName,
         structureName,
+        ideVersion,
     }),
 };
 

package/out/concepts/basics/stdlib/nasl.browser copy.d.ts

@@ -1,3 +0,0 @@
-import Namespace from '../../Namespace__';
-declare const _default: Namespace;
-export default _default;

package/out/concepts/basics/stdlib/nasl.browser copy.js

@@ -1,70 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Namespace__1 = __importDefault(require("../../Namespace__"));
-const Param__1 = __importDefault(require("../../Param__"));
-const Logic__1 = __importDefault(require("../../Logic__"));
-const TypeAnnotation__1 = __importDefault(require("../../TypeAnnotation__"));
-exports.default = new Namespace__1.default({
-    name: 'browser',
-    logics: [
-        new Logic__1.default({
-            name: 'requestFullscreen',
-            params: [],
-        }),
-        new Logic__1.default({
-            name: 'exitFullscreen',
-        }),
-        new Logic__1.default({
-            name: 'hasAuth',
-            params: [
-                new Param__1.default({
-                    name: 'authPath',
-                    typeAnnotation: TypeAnnotation__1.default.createPrimitive('String'),
-                }),
-            ],
-            returns: [],
-        }),
-        new Logic__1.default({
-            name: 'getDistance',
-            params: [
-                new Param__1.default({
-                    name: 'Point1',
-                    typeAnnotation: TypeAnnotation__1.default.createPrimitive('String'),
-                }),
-                new Param__1.default({
-                    name: 'Point2',
-                    typeAnnotation: TypeAnnotation__1.default.createPrimitive('String'),
-                }),
-            ],
-            returns: [],
-        }),
-        new Logic__1.default({
-            name: 'logOut',
-            params: [
-                new Param__1.default({
-                    name: 'Point1',
-                    typeAnnotation: TypeAnnotation__1.default.createPrimitive('String'),
-                }),
-                new Param__1.default({
-                    name: 'Point2',
-                    typeAnnotation: TypeAnnotation__1.default.createPrimitive('String'),
-                }),
-            ],
-            returns: [],
-        }),
-        new Logic__1.default({
-            name: 'getConfiguration',
-            params: [
-                new Param__1.default({
-                    name: 'name',
-                    typeAnnotation: TypeAnnotation__1.default.createPrimitive('String'),
-                }),
-            ],
-            returns: [],
-        }),
-    ],
-});
-//# sourceMappingURL=nasl.browser%20copy.js.map

package/out/concepts/basics/stdlib/nasl.browser copy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"nasl.browser copy.js","sourceRoot":"","sources":["../../../../src/concepts/basics/stdlib/nasl.browser copy.ts"],"names":[],"mappings":";;;;;AAAA,mEAA0C;AAC1C,2DAAkC;AAElC,2DAAkC;AAClC,6EAAoD;AAEpD,kBAAe,IAAI,oBAAS,CAAC;IACzB,IAAI,EAAE,SAAS;IACf,MAAM,EAAE;QACJ,IAAI,gBAAK,CAAC;YACN,IAAI,EAAE,mBAAmB;YACzB,MAAM,EAAE,EACP;SACJ,CAAC;QACF,IAAI,gBAAK,CAAC;YACN,IAAI,EAAE,gBAAgB;SACzB,CAAC;QACF,IAAI,gBAAK,CAAC;YACN,IAAI,EAAE,SAAS;YACf,MAAM,EAAE;gBACJ,IAAI,gBAAK,CAAC;oBACN,IAAI,EAAE,UAAU;oBAChB,cAAc,EAAE,yBAAc,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC3D,CAAC;aACL;YACD,OAAO,EAAE,EACR;SACJ,CAAC;QACF,IAAI,gBAAK,CAAC;YACN,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE;gBACJ,IAAI,gBAAK,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,cAAc,EAAE,yBAAc,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC3D,CAAC;gBACF,IAAI,gBAAK,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,cAAc,EAAE,yBAAc,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC3D,CAAC;aACL;YACD,OAAO,EAAE,EACR;SACJ,CAAC;QACF,IAAI,gBAAK,CAAC;YACN,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE;gBACJ,IAAI,gBAAK,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,cAAc,EAAE,yBAAc,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC3D,CAAC;gBACF,IAAI,gBAAK,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,cAAc,EAAE,yBAAc,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC3D,CAAC;aACL;YACD,OAAO,EAAE,EACR;SACJ,CAAC;QACF,IAAI,gBAAK,CAAC;YACN,IAAI,EAAE,kBAAkB;YACxB,MAAM,EAAE;gBACJ,IAAI,gBAAK,CAAC;oBACN,IAAI,EAAE,MAAM;oBACZ,cAAc,EAAE,yBAAc,CAAC,eAAe,CAAC,QAAQ,CAAC;iBAC3D,CAAC;aACL;YACD,OAAO,EAAE,EACR;SACJ,CAAC;KACL;CACJ,CAAC,CAAC"}

package/out/terms/LEVEL_NAME_MAP.d.ts

@@ -1,26 +0,0 @@
-export declare const LEVEL_NAME_MAP: {
-    app: string;
-    service: string;
-    page: string;
-    view: string;
-    block: string;
-    logic: string;
-    param: string;
-    timer: string;
-    variable: string;
-    return: string;
-    interface: string;
-    dataNode: string;
-    entity: string;
-    structure: string;
-    enum: string;
-    enumItem: string;
-    property: string;
-    element: string;
-    attr: string;
-    event: string;
-    directive: string;
-    logicItem: string;
-    logicNode: string;
-    expressionNode: string;
-};

package/out/terms/LEVEL_NAME_MAP.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LEVEL_NAME_MAP = void 0;
-exports.LEVEL_NAME_MAP = {
-    app: '应用',
-    service: '服务',
-    page: '页面',
-    view: '子页面',
-    block: '区块',
-    logic: '逻辑',
-    param: '输入参数',
-    timer: '定时任务',
-    variable: '局部变量',
-    return: '输出参数',
-    interface: '接口',
-    dataNode: '数据',
-    entity: '实体',
-    structure: '数据结构',
-    enum: '枚举',
-    enumItem: '枚举项',
-    property: '属性',
-    element: '元素',
-    attr: '属性',
-    event: '事件',
-    directive: '指令',
-    logicItem: '逻辑项',
-    logicNode: '逻辑节点',
-    expressionNode: '表达式节点',
-};
-//# sourceMappingURL=LEVEL_NAME_MAP.js.map

package/out/terms/LEVEL_NAME_MAP.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LEVEL_NAME_MAP.js","sourceRoot":"","sources":["../../src/terms/LEVEL_NAME_MAP.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG;IAC1B,GAAG,EAAE,IAAI;IACT,OAAO,EAAE,IAAI;IAEb,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,KAAK;IACX,KAAK,EAAE,IAAI;IAEX,KAAK,EAAE,IAAI;IACX,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,MAAM;IACd,SAAS,EAAE,IAAI;IAEf,QAAQ,EAAE,IAAI;IACd,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,MAAM;IACjB,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,KAAK;IACf,QAAQ,EAAE,IAAI;IAEd,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,IAAI;IACV,KAAK,EAAE,IAAI;IACX,SAAS,EAAE,IAAI;IAEf,SAAS,EAAE,KAAK;IAChB,SAAS,EAAE,MAAM;IACjB,cAAc,EAAE,OAAO;CAC1B,CAAC"}

package/out/test/integration/connect-file copy.js

@@ -1,50 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const chai_1 = require("chai");
-const path = __importStar(require("path"));
-const nasl = __importStar(require("../.."));
-describe('connect-file', () => {
-    it('loadApp', async () => {
-        await nasl.connect('file', path.join(__dirname, '../examples/app1.json'));
-        const app = await nasl.loadApp();
-        console.log(app);
-        (0, chai_1.expect)(app.id).to.equal('app1');
-    });
-    it('batchAction', async () => {
-        await nasl.connect('file', path.join(__dirname, '../examples/app1.json'));
-        const app = await nasl.loadApp();
-        if (app.entities.length > 0) {
-            const oldLength = app.entities.length;
-            await app.entities[0].delete();
-            (0, chai_1.expect)(app.entities.length).to.equal(oldLength - 1);
-        }
-        else {
-            await app.addEntity();
-            (0, chai_1.expect)(app.entities.length).to.equal(1);
-        }
-    });
-});
-//# sourceMappingURL=connect-file%20copy.js.map

package/out/test/integration/connect-file copy.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"connect-file copy.js","sourceRoot":"","sources":["../../../src/test/integration/connect-file copy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA8B;AAC9B,2CAA6B;AAC7B,4CAA8B;AAE9B,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC1B,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;QACrB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAC;QAC1E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,IAAA,aAAM,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;QACzB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAC;QAC1E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACjC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;YACtC,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YAC/B,IAAA,aAAM,EAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;SACvD;aAAM;YACH,MAAM,GAAG,CAAC,SAAS,EAAE,CAAC;YACtB,IAAA,aAAM,EAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC3C;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/out/test/integration/node-nasl-server.d.ts

@@ -1 +0,0 @@
-export {};

package/out/test/integration/node-nasl-server.js

@@ -1,41 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __importStar(require("path"));
-const nasl = __importStar(require("../.."));
-const naslServer_1 = __importDefault(require("../../server/naslServer"));
-describe('node-nasl-server', () => {
-    it('loadNASLServer', async () => {
-        await nasl.connect('file', path.join(__dirname, '../examples/app1.json'));
-        const app = await nasl.loadApp();
-        // console.log(app);
-        // expect(app.id).to.equal('app1');
-        await naslServer_1.default.openApp(app);
-    });
-});
-//# sourceMappingURL=node-nasl-server.js.map

package/out/test/integration/node-nasl-server.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"node-nasl-server.js","sourceRoot":"","sources":["../../../src/test/integration/node-nasl-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2CAA6B;AAC7B,4CAA8B;AAC9B,yEAAqD;AAErD,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAC9B,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;QAC5B,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC,CAAC;QAC1E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACjC,oBAAoB;QACpB,mCAAmC;QACnC,MAAM,oBAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}