@datagrok-libraries/bio 5.34.1 → 5.34.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # bio changelog
2
2
 
3
+ ## 5.35.0 (WIP)
4
+
5
+ Add WebLogo property showPositionLabels
6
+
7
+ ### Features
8
+
9
+ * Add WebLogo property showPositionLabels
10
+
3
11
  ## 5.34.1 (2023-08-01)
4
12
 
5
13
  Patch release for a small fix for Macromolecule cell renderer
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "access": "public"
9
9
  },
10
10
  "friendlyName": "Datagrok bio library",
11
- "version": "5.34.1",
11
+ "version": "5.34.3",
12
12
  "description": "",
13
13
  "dependencies": {
14
14
  "@datagrok-libraries/gridext": "^1.3.64",
@@ -36,9 +36,10 @@
36
36
  "link": "npm link",
37
37
  "link-api": "npm link datagrok-api",
38
38
  "link-utils": "npm link @datagrok-libraries/utils",
39
- "link-all": "npm link datagrok-api @datagrok-libraries/utils @datagrok-libraries/gridext @datagrok-libraries/ml",
39
+ "link-all": "npm link datagrok-api @datagrok-libraries/gridext @datagrok-libraries/utils @datagrok-libraries/ml",
40
40
  "build-bio": "git clean -f -X -d ./src && tsc",
41
41
  "build": "git clean -f -X -d ./src && tsc",
42
+ "build-all": "npm --prefix ./../../js-api run build && npm --prefix ./../../libraries/gridext run build && npm --prefix ./../../libraries/utils run build && npm --prefix ./../../libraries/ml run build && npm run build",
42
43
  "lint": "eslint \"./src/**/*.ts\"",
43
44
  "lint-fix": "eslint \"./src/**/*.ts\" --fix"
44
45
  }
@@ -60,5 +60,5 @@ export declare function detectAlphabet(freq: MonomerFreqs, candidates: Candidate
60
60
  */
61
61
  export declare function pickUpPalette(seqCol: DG.Column, minLength?: number): SeqPalette;
62
62
  export declare function getPaletteByType(paletteType: string): SeqPalette;
63
- export declare function pickUpSeqCol(df: DG.DataFrame): DG.Column | null;
63
+ export declare function pickUpSeqCol(df: DG.DataFrame): DG.Column<string> | null;
64
64
  //# sourceMappingURL=utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGtC,OAAO,EAAmB,aAAa,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC;AACjG,OAAO,EAAC,QAAQ,EAA2D,MAAM,UAAU,CAAC;AAI5F,OAAO,EAAC,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAK9C;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,WAAW,CAKxG;AAwBD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,EAAE,CASlD;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,GAAG,SAAqB,GAAG,YAAY,CAI/G;AAKD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,EAAE,CAgBjD;AAED,4EAA4E;AAC5E,MAAM,MAAM,kBAAkB,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;AAEjF;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,GAAG,SAAqB,GAAG,YAAY,CAWjH;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,GAAG,YAAY,CAOjE;AAID,+CAA+C;AAC/C,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAQhF;AAED,MAAM;AACN,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,CAW3D;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,SAAS,GAAE,MAAY,GAAG,MAAM,CAchH;AAED,+BAA+B;AAC/B,wBAAgB,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,SAAS,GAAE,MAAY,UAgBtG;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,SAAS,GAAE,MAAU,GAAG,UAAU,CAYlF;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,UAAU,CAWhE;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,MAAM,GAAG,IAAI,CAS/D"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAGtC,OAAO,EAAmB,aAAa,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC;AACjG,OAAO,EAAC,QAAQ,EAA2D,MAAM,UAAU,CAAC;AAI5F,OAAO,EAAC,UAAU,EAAC,MAAM,oBAAoB,CAAC;AAK9C;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,GAAG,WAAW,CAKxG;AAwBD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,EAAE,CASlD;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,GAAG,SAAqB,GAAG,YAAY,CAI/G;AAKD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,EAAE,CAgBjD;AAED,4EAA4E;AAC5E,MAAM,MAAM,kBAAkB,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;AAEjF;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,GAAG,SAAqB,GAAG,YAAY,CAWjH;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,GAAG,YAAY,CAOjE;AAID,+CAA+C;AAC/C,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAQhF;AAED,MAAM;AACN,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,CAW3D;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,SAAS,GAAE,MAAY,GAAG,MAAM,CAchH;AAED,+BAA+B;AAC/B,wBAAgB,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,SAAS,GAAE,MAAY,UAgBtG;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,SAAS,GAAE,MAAU,GAAG,UAAU,CAYlF;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,UAAU,CAWhE;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CASvE"}
@@ -49,6 +49,7 @@ export declare const WebLogoPropsDefault: {
49
49
  fitArea: boolean;
50
50
  minHeight: number;
51
51
  maxHeight: number;
52
+ showPositionLabels: boolean;
52
53
  positionMarginState: PositionMarginStates;
53
54
  positionMargin: number;
54
55
  filterSource: FilterSources;
@@ -1 +1 @@
1
- {"version":3,"file":"web-logo.d.ts","sourceRoot":"","sources":["web-logo.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAC,UAAU,EAAC,MAAM,MAAM,CAAC;AAEhC,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AAEjC,oBAAY,IAAI;IACd,aAAa,sBAAsB;IACnC,cAAc,uBAAuB;IAErC,6EAA6E;IAC7E,cAAc,oBAAoB;CACnC;AAED,oBAAY,cAAc;IACxB,OAAO,YAAY;IACnB,IAAI,SAAS;CACd;AAED,oBAAY,kBAAkB;IAC5B,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED,oBAAY,oBAAoB;IAC9B,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,oBAAY,oBAAoB;IAC9B,IAAI,SAAS;IACb,EAAE,OAAO;IACT,GAAG,QAAQ;CACZ;AAED,qEAAqE;AACrE,oBAAY,aAAa;IACvB,0DAA0D;IAC1D,QAAQ,aAAa;IACrB,oFAAoF;IACpF,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,mBAAmB;wBAEV,MAAM,GAAG,IAAI;uBACd,MAAM,GAAG,IAAI;qBACf,MAAM,GAAG,IAAI;wBACV,OAAO;wBACP,OAAO;qBACV,OAAO;qBAGP,MAAM;oBACP,MAAM;mBACP,MAAM;uBAGF,kBAAkB;yBAChB,oBAAoB;cAC/B,OAAO;aACR,OAAO;eACL,MAAM;eACN,MAAM;yBACI,oBAAoB;oBACzB,MAAM;kBAGR,aAAa;CAC1B,CAAC;AAEJ,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,MAAM,WAAW,cAAe,SAAQ,YAAY,EAAE,OAAO;IAC3D,IAAI,aAAa,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;IAEtC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;CAClD;AAED,eAAO,MAAM,iBAAiB,EAAE,MAAa,CAAC;AAC9C,eAAO,MAAM,UAAU,EAAE,MAAwB,CAAC;AAElD,OAAO,QAAQ,iBAAiB,CAAC;IAC/B,UAAiB,mBAAmB;QAClC,QAAQ,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC;KACtG;CACF"}
1
+ {"version":3,"file":"web-logo.d.ts","sourceRoot":"","sources":["web-logo.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAC,UAAU,EAAC,MAAM,MAAM,CAAC;AAEhC,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AAEjC,oBAAY,IAAI;IACd,aAAa,sBAAsB;IACnC,cAAc,uBAAuB;IAErC,6EAA6E;IAC7E,cAAc,oBAAoB;CACnC;AAED,oBAAY,cAAc;IACxB,OAAO,YAAY;IACnB,IAAI,SAAS;CACd;AAED,oBAAY,kBAAkB;IAC5B,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED,oBAAY,oBAAoB;IAC9B,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,oBAAY,oBAAoB;IAC9B,IAAI,SAAS;IACb,EAAE,OAAO;IACT,GAAG,QAAQ;CACZ;AAED,qEAAqE;AACrE,oBAAY,aAAa;IACvB,0DAA0D;IAC1D,QAAQ,aAAa;IACrB,oFAAoF;IACpF,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,mBAAmB;wBAEV,MAAM,GAAG,IAAI;uBACd,MAAM,GAAG,IAAI;qBACf,MAAM,GAAG,IAAI;wBACV,OAAO;wBACP,OAAO;qBACV,OAAO;qBAGP,MAAM;oBACP,MAAM;mBACP,MAAM;uBAGF,kBAAkB;yBAChB,oBAAoB;cAC/B,OAAO;aACR,OAAO;eACL,MAAM;eACN,MAAM;wBACG,OAAO;yBACN,oBAAoB;oBACzB,MAAM;kBAGR,aAAa;CAC1B,CAAC;AAEJ,MAAM,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEhE,MAAM,WAAW,cAAe,SAAQ,YAAY,EAAE,OAAO;IAC3D,IAAI,aAAa,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;IAEtC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;CAClD;AAED,eAAO,MAAM,iBAAiB,EAAE,MAAa,CAAC;AAC9C,eAAO,MAAM,UAAU,EAAE,MAAwB,CAAC;AAElD,OAAO,QAAQ,iBAAiB,CAAC;IAC/B,UAAiB,mBAAmB;QAClC,QAAQ,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC;KACtG;CACF"}
@@ -56,6 +56,7 @@ export const WebLogoPropsDefault = new class {
56
56
  this.fitArea = true;
57
57
  this.minHeight = 50;
58
58
  this.maxHeight = 100;
59
+ this.showPositionLabels = true;
59
60
  this.positionMarginState = PositionMarginStates.AUTO;
60
61
  this.positionMargin = 0;
61
62
  // -- Behavior --
@@ -1 +1 @@
1
- {"version":3,"file":"web-logo.js","sourceRoot":"","sources":["web-logo.ts"],"names":[],"mappings":"AAQA,MAAM,CAAN,IAAY,IAMX;AAND,WAAY,IAAI;IACd,2CAAmC,CAAA;IACnC,6CAAqC,CAAA;IAErC,6EAA6E;IAC7E,0CAAkC,CAAA;AACpC,CAAC,EANW,IAAI,KAAJ,IAAI,QAMf;AAED,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,qCAAmB,CAAA;IACnB,+BAAa,CAAA;AACf,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB;AAED,MAAM,CAAN,IAAY,kBAIX;AAJD,WAAY,kBAAkB;IAC5B,iCAAW,CAAA;IACX,uCAAiB,CAAA;IACjB,uCAAiB,CAAA;AACnB,CAAC,EAJW,kBAAkB,KAAlB,kBAAkB,QAI7B;AAED,MAAM,CAAN,IAAY,oBAIX;AAJD,WAAY,oBAAoB;IAC9B,qCAAa,CAAA;IACb,yCAAiB,CAAA;IACjB,uCAAe,CAAA;AACjB,CAAC,EAJW,oBAAoB,KAApB,oBAAoB,QAI/B;AAED,MAAM,CAAN,IAAY,oBAIX;AAJD,WAAY,oBAAoB;IAC9B,qCAAa,CAAA;IACb,iCAAS,CAAA;IACT,mCAAW,CAAA;AACb,CAAC,EAJW,oBAAoB,KAApB,oBAAoB,QAI/B;AAED,qEAAqE;AACrE,MAAM,CAAN,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,0DAA0D;IAC1D,sCAAqB,CAAA;IACrB,oFAAoF;IACpF,sCAAqB,CAAA;AACvB,CAAC,EALW,aAAa,KAAb,aAAa,QAKxB;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI;IAAA;QACrC,aAAa;QACb,uBAAkB,GAAkB,IAAI,CAAC;QACzC,sBAAiB,GAAkB,IAAI,CAAC;QACxC,oBAAe,GAAkB,IAAI,CAAC;QACtC,uBAAkB,GAAY,IAAI,CAAC;QACnC,uBAAkB,GAAY,KAAK,CAAC;QACpC,oBAAe,GAAY,IAAI,CAAC;QAEhC,cAAc;QACd,oBAAe,GAAW,UAAU,CAAC;QACrC,mBAAc,GAAW,cAAc,CAAC,IAAI,CAAC;QAC7C,kBAAa,GAAW,EAAE,CAAC;QAE3B,eAAe;QACf,sBAAiB,GAAuB,kBAAkB,CAAC,MAAM,CAAC;QAClE,wBAAmB,GAAyB,oBAAoB,CAAC,MAAM,CAAC;QACxE,aAAQ,GAAY,KAAK,CAAC;QAC1B,YAAO,GAAY,IAAI,CAAC;QACxB,cAAS,GAAW,EAAE,CAAC;QACvB,cAAS,GAAW,GAAG,CAAC;QACxB,wBAAmB,GAAyB,oBAAoB,CAAC,IAAI,CAAC;QACtE,mBAAc,GAAW,CAAC,CAAC;QAE3B,iBAAiB;QACjB,iBAAY,GAAkB,aAAa,CAAC,QAAQ,CAAC;IACvD,CAAC;CAAA,EAAE,CAAC;AAUJ,MAAM,CAAC,MAAM,iBAAiB,GAAW,IAAI,CAAC;AAC9C,MAAM,CAAC,MAAM,UAAU,GAAW,eAAe,CAAC"}
1
+ {"version":3,"file":"web-logo.js","sourceRoot":"","sources":["web-logo.ts"],"names":[],"mappings":"AAQA,MAAM,CAAN,IAAY,IAMX;AAND,WAAY,IAAI;IACd,2CAAmC,CAAA;IACnC,6CAAqC,CAAA;IAErC,6EAA6E;IAC7E,0CAAkC,CAAA;AACpC,CAAC,EANW,IAAI,KAAJ,IAAI,QAMf;AAED,MAAM,CAAN,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,qCAAmB,CAAA;IACnB,+BAAa,CAAA;AACf,CAAC,EAHW,cAAc,KAAd,cAAc,QAGzB;AAED,MAAM,CAAN,IAAY,kBAIX;AAJD,WAAY,kBAAkB;IAC5B,iCAAW,CAAA;IACX,uCAAiB,CAAA;IACjB,uCAAiB,CAAA;AACnB,CAAC,EAJW,kBAAkB,KAAlB,kBAAkB,QAI7B;AAED,MAAM,CAAN,IAAY,oBAIX;AAJD,WAAY,oBAAoB;IAC9B,qCAAa,CAAA;IACb,yCAAiB,CAAA;IACjB,uCAAe,CAAA;AACjB,CAAC,EAJW,oBAAoB,KAApB,oBAAoB,QAI/B;AAED,MAAM,CAAN,IAAY,oBAIX;AAJD,WAAY,oBAAoB;IAC9B,qCAAa,CAAA;IACb,iCAAS,CAAA;IACT,mCAAW,CAAA;AACb,CAAC,EAJW,oBAAoB,KAApB,oBAAoB,QAI/B;AAED,qEAAqE;AACrE,MAAM,CAAN,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,0DAA0D;IAC1D,sCAAqB,CAAA;IACrB,oFAAoF;IACpF,sCAAqB,CAAA;AACvB,CAAC,EALW,aAAa,KAAb,aAAa,QAKxB;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI;IAAA;QACrC,aAAa;QACb,uBAAkB,GAAkB,IAAI,CAAC;QACzC,sBAAiB,GAAkB,IAAI,CAAC;QACxC,oBAAe,GAAkB,IAAI,CAAC;QACtC,uBAAkB,GAAY,IAAI,CAAC;QACnC,uBAAkB,GAAY,KAAK,CAAC;QACpC,oBAAe,GAAY,IAAI,CAAC;QAEhC,cAAc;QACd,oBAAe,GAAW,UAAU,CAAC;QACrC,mBAAc,GAAW,cAAc,CAAC,IAAI,CAAC;QAC7C,kBAAa,GAAW,EAAE,CAAC;QAE3B,eAAe;QACf,sBAAiB,GAAuB,kBAAkB,CAAC,MAAM,CAAC;QAClE,wBAAmB,GAAyB,oBAAoB,CAAC,MAAM,CAAC;QACxE,aAAQ,GAAY,KAAK,CAAC;QAC1B,YAAO,GAAY,IAAI,CAAC;QACxB,cAAS,GAAW,EAAE,CAAC;QACvB,cAAS,GAAW,GAAG,CAAC;QACxB,uBAAkB,GAAY,IAAI,CAAC;QACnC,wBAAmB,GAAyB,oBAAoB,CAAC,IAAI,CAAC;QACtE,mBAAc,GAAW,CAAC,CAAC;QAE3B,iBAAiB;QACjB,iBAAY,GAAkB,aAAa,CAAC,QAAQ,CAAC;IACvD,CAAC;CAAA,EAAE,CAAC;AAUJ,MAAM,CAAC,MAAM,iBAAiB,GAAW,IAAI,CAAC;AAC9C,MAAM,CAAC,MAAM,UAAU,GAAW,eAAe,CAAC"}