Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
refactor: harden custom code execution paths and remove Uniscript (#7217)
白熱20a71033acbb
diff --git a/common/mockdata/package.json b/common/mockdata/package.jsonindex 76ff5a22af..00c6d39a44 100644--- a/common/mockdata/package.json+++ b/common/mockdata/package.json@@ -70,8 +70,7 @@"@univerjs/slides-ui": "workspace:*","@univerjs/thread-comment": "workspace:*","@univerjs/thread-comment-ui": "workspace:*",- "@univerjs/ui": "workspace:*",- "@univerjs/uniscript": "workspace:*"+ "@univerjs/ui": "workspace:*"},"devDependencies": {"@univerjs-infra/shared": "workspace:*",diff --git a/common/mockdata/src/sheets/index.ts b/common/mockdata/src/sheets/index.tsindex 69c29f7bb2..6d38108f5e 100644--- a/common/mockdata/src/sheets/index.ts+++ b/common/mockdata/src/sheets/index.ts@@ -1,4 +1,3 @@export * from './default-workbook-data';export * from './demo';export * from './slide-workbook-data';-export * from './uniscript-data';diff --git a/common/mockdata/src/sheets/uniscript-data.ts b/common/mockdata/src/sheets/uniscript-data.tsdeleted file mode 100644index deeb28b9e9..0000000000--- a/common/mockdata/src/sheets/uniscript-data.ts+++ /dev/null@@ -1,5673 +0,0 @@-import type { IWorkbookData } from '@univerjs/core';-import { LocaleType } from '@univerjs/core';--export const UNISCRIT_WORKBOOK_DATA_DEMO: IWorkbookData = {- id: 'uniscript-demo',- locale: LocaleType.ZH_CN,- name: 'Uniscript Demo',- sheetOrder: ['sheet-01'],- styles: {},- appVersion: '3.0.0-alpha',- sheets: {- 'sheet-01': {- id: 'sheet-01',- name: '身份信息统计表',- tabColor: '',- hidden: 0,- rowCount: 1000,- columnCount: 20,- zoomRatio: 1,- freeze: {- xSplit: 0,- ySplit: 0,- startRow: -1,- startColumn: -1,- },- scrollTop: 0,- scrollLeft: 0,- defaultColumnWidth: 73,- defaultRowHeight: 19,- mergeData: [],- cellData: {- 0: {- 0: {- v: '名字',- t: 1,- },- 1: {- v: '身份证号',- s: 'urBVIA',- t: 1,- },- 2: {- v: '',- },- 3: {- v: '',- },- 4: {- v: '',- },- 5: {- v: '',- },- 6: {- v: '',- },- 7: {- v: '',- },- 8: {- v: '',- },- 9: {- v: '',- },- 10: {- v: '',- },- 11: {- v: '',- },- 12: {- v: '',- },- 13: {- v: '',- },- 14: {- v: '',- },- 15: {- v: '',- },- 16: {- v: '',- },- 17: {- v: '',- },- 18: {- v: '',- },- 19: {- v: '',- },- },- 1: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '450102201206029128',- t: 1,- s: 'urBVIA',- },- },- 2: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '513432197805297321',- t: 1,- s: 'urBVIA',- },- },- 3: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '150921200908152318',- t: 1,- s: 'urBVIA',- },- },- 4: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '130284198501223311',- t: 1,- s: 'urBVIA',- },- },- 5: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '411302191512060332',- t: 1,- s: 'urBVIA',- },- },- 6: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '530302200705223757',- t: 1,- s: 'urBVIA',- },- },- 7: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '421022202011146262',- t: 1,- s: 'urBVIA',- },- },- 8: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '511303201005152984',- t: 1,- s: 'urBVIA',- },- },- 9: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '410328190806183731',- t: 1,- s: 'urBVIA',- },- },- 10: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '210702199706180877',- t: 1,- s: 'urBVIA',- },- },- 11: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '41160219400414015X',- t: 1,- s: 'urBVIA',- },- },- 12: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '330402200511254203',- t: 1,- s: 'urBVIA',- },- },- 13: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '130304196701219661',- t: 1,- s: 'urBVIA',- },- },- 14: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '140525193406079919',- t: 1,- s: 'urBVIA',- },- },- 15: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '320213196005272238',- t: 1,- s: 'urBVIA',- },- },- 16: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '130424190507184649',- t: 1,- s: 'urBVIA',- },- },- 17: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '110109198003098379',- t: 1,- s: 'urBVIA',- },- },- 18: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '370523196008305312',- t: 1,- s: 'urBVIA',- },- },- 19: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '130109198711252473',- t: 1,- s: 'urBVIA',- },- },- 20: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '230826197805195696',- t: 1,- s: 'urBVIA',- },- },- 21: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '110102192312179736',- t: 1,- s: 'urBVIA',- },- },- 22: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '210421193312166736',- t: 1,- s: 'urBVIA',- },- },- 23: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '231225193702115941',- t: 1,- s: 'urBVIA',- },- },- 24: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '45051219831211828X',- t: 1,- s: 'urBVIA',- },- },- 25: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '420582200110037899',- t: 1,- s: 'urBVIA',- },- },- 26: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '440781200705121895',- t: 1,- s: 'urBVIA',- },- },- 27: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '210181202108283662',- t: 1,- s: 'urBVIA',- },- },- 28: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '542524193702277071',- t: 1,- s: 'urBVIA',- },- },- 29: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '621224197212056250',- t: 1,- s: 'urBVIA',- },- },- 30: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '330782191802278404',- t: 1,- s: 'urBVIA',- },- },- 31: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '371721190703175961',- t: 1,- s: 'urBVIA',- },- },- 32: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '220381190508028684',- t: 1,- s: 'urBVIA',- },- },- 33: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '130827193105286903',- t: 1,- s: 'urBVIA',- },- },- 34: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '211402191902052424',- t: 1,- s: 'urBVIA',- },- },- 35: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '361103194408040678',- t: 1,- s: 'urBVIA',- },- },- 36: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '53060220090601283X',- t: 1,- s: 'urBVIA',- },- },- 37: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '610527200702042860',- t: 1,- s: 'urBVIA',- },- },- 38: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '330522192507165367',- t: 1,- s: 'urBVIA',- },- },- 39: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '53042819220323997X',- t: 1,- s: 'urBVIA',- },- },- 40: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '441882200010310529',- t: 1,- s: 'urBVIA',- },- },- 41: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '451203193210269517',- t: 1,- s: 'urBVIA',- },- },- 42: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '150783196409272159',- t: 1,- s: 'urBVIA',- },- },- 43: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '520502201011045072',- t: 1,- s: 'urBVIA',- },- },- 44: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '210602201411137294',- t: 1,- s: 'urBVIA',- },- },- 45: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '230826190408047620',- t: 1,- s: 'urBVIA',- },- },- 46: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '42112619330124831X',- t: 1,- s: 'urBVIA',- },- },- 47: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '441623193701203446',- t: 1,- s: 'urBVIA',- },- },- 48: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '522626191402037426',- t: 1,- s: 'urBVIA',- },- },- 49: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '63272219160509096X',- t: 1,- s: 'urBVIA',- },- },- 50: {- 0: {- v: 'A',- t: 1,- },- 1: {- v: '370705195105122060',- t: 1,- s: 'urBVIA',- },- },- },- rowData: {- 0: {- h: 19,- hd: 0,- ah: 19,- },- 1: {- hd: 0,- h: 19,- ah: 19,- },- 2: {- hd: 0,- h: 19,- ah: 19,- },- 3: {- hd: 0,- h: 19,- ah: 19,- },- 4: {- hd: 0,- h: 19,- ah: 19,- },- 5: {- hd: 0,- h: 19,- ah: 19,- },- 6: {- hd: 0,- h: 19,- ah: 19,- },- 7: {- hd: 0,- h: 19,- ah: 19,- },- 8: {- hd: 0,- h: 19,- ah: 19,- },- 9: {- hd: 0,- h: 19,- ah: 19,- },- 10: {- hd: 0,- h: 19,- ah: 19,- },- 11: {- hd: 0,- h: 19,- ah: 19,- },- 12: {- hd: 0,- h: 19,- ah: 19,- },- 13: {- hd: 0,- h: 19,- ah: 19,- },- 14: {- hd: 0,- h: 19,- ah: 19,- },- 15: {- hd: 0,- h: 19,- ah: 19,- },- 16: {- hd: 0,- h: 19,- ah: 19,- },- 17: {- hd: 0,- h: 19,- ah: 19,- },- 18: {- hd: 0,- h: 19,- ah: 19,- },- 19: {- hd: 0,- h: 19,- ah: 19,- },- 20: {- hd: 0,- h: 19,- ah: 19,- },- 21: {- hd: 0,- h: 19,- ah: 19,- },- 22: {- hd: 0,- h: 19,- ah: 19,- },- 23: {- hd: 0,- h: 19,- ah: 19,- },- 24: {- hd: 0,- h: 19,- ah: 19,- },- 25: {- hd: 0,- h: 19,- ah: 19,- },- 26: {- hd: 0,- h: 19,- ah: 19,- },- 27: {- hd: 0,- h: 19,- ah: 19,- },- 28: {- hd: 0,- h: 19,- ah: 19,- },- 29: {- hd: 0,- h: 19,- ah: 19,- },- 30: {- hd: 0,- h: 19,- ah: 19,- },- 31: {- hd: 0,- h: 19,- ah: 19,- },- 32: {- hd: 0,- h: 19,- ah: 19,- },- 33: {- hd: 0,- h: 19,- ah: 19,- },- 34: {- hd: 0,- h: 19,- ah: 19,- },- 35: {- hd: 0,- h: 19,- ah: 19,- },- 36: {- hd: 0,- h: 19,- ah: 19,- },- 37: {- hd: 0,- h: 19,- ah: 19,- },- 38: {- hd: 0,- h: 19,- ah: 19,- },- 39: {- hd: 0,- h: 19,- ah: 19,- },- 40: {- hd: 0,- h: 19,- ah: 19,- },- 41: {- hd: 0,- h: 19,- ah: 19,- },- 42: {- hd: 0,- h: 19,- ah: 19,- },- 43: {- hd: 0,- h: 19,- ah: 19,- },- 44: {- hd: 0,- h: 19,- ah: 19,- },- 45: {- hd: 0,- h: 19,- ah: 19,- },- 46: {- hd: 0,- h: 19,- ah: 19,- },- 47: {- hd: 0,- h: 19,- ah: 19,- },- 48: {- hd: 0,- h: 19,- ah: 19,- },- 49: {- hd: 0,- h: 19,- ah: 19,- },- 50: {- hd: 0,- h: 19,- ah: 19,- },- 51: {- hd: 0,- h: 19,- ah: 19,- },- 52: {- hd: 0,- h: 19,- ah: 19,- },- 53: {- hd: 0,- h: 19,- ah: 19,- },- 54: {- hd: 0,- h: 19,- ah: 19,- },- 55: {- hd: 0,- h: 19,- ah: 19,- },- 56: {- hd: 0,- h: 19,- ah: 19,- },- 57: {- hd: 0,- h: 19,- ah: 19,- },- 58: {- hd: 0,- h: 19,- ah: 19,- },- 59: {- hd: 0,- h: 19,- ah: 19,- },- 60: {- hd: 0,- h: 19,- ah: 19,- },- 61: {- hd: 0,- h: 19,- ah: 19,- },- 62: {- hd: 0,- h: 19,- ah: 19,- },- 63: {- hd: 0,- h: 19,- ah: 19,- },- 64: {- hd: 0,- h: 19,- ah: 19,- },- 65: {- hd: 0,- h: 19,- ah: 19,- },- 66: {- hd: 0,- h: 19,- ah: 19,- },- 67: {- hd: 0,- h: 19,- ah: 19,- },- 68: {- hd: 0,- h: 19,- ah: 19,- },- 69: {- hd: 0,- h: 19,- ah: 19,- },- 70: {- hd: 0,- h: 19,- ah: 19,- },- 71: {- hd: 0,- h: 19,- ah: 19,- },- 72: {- hd: 0,- h: 19,- ah: 19,- },- 73: {- hd: 0,- h: 19,- ah: 19,- },- 74: {- hd: 0,- h: 19,- ah: 19,- },- 75: {- hd: 0,- h: 19,- ah: 19,- },- 76: {- hd: 0,- h: 19,- ah: 19,- },- 77: {- hd: 0,- h: 19,- ah: 19,- },- 78: {- hd: 0,- h: 19,- ah: 19,- },- 79: {- hd: 0,- h: 19,- ah: 19,- },- 80: {- hd: 0,- h: 19,- ah: 19,- },- 81: {- hd: 0,- h: 19,- ah: 19,- },- 82: {- hd: 0,- h: 19,- ah: 19,- },- 83: {- hd: 0,- h: 19,- ah: 19,- },- 84: {- hd: 0,- h: 19,- ah: 19,- },- 85: {- hd: 0,- h: 19,- ah: 19,- },- 86: {- hd: 0,- h: 19,- ah: 19,- },- 87: {- hd: 0,- h: 19,- ah: 19,- },- 88: {- hd: 0,- h: 19,- ah: 19,- },- 89: {- hd: 0,- h: 19,- ah: 19,- },- 90: {- hd: 0,- h: 19,- ah: 19,- },- 91: {- hd: 0,- h: 19,- ah: 19,- },- 92: {- hd: 0,- h: 19,- ah: 19,- },- 93: {- hd: 0,- h: 19,- ah: 19,- },- 94: {- hd: 0,- h: 19,- ah: 19,- },- 95: {- hd: 0,- h: 19,- ah: 19,- },- 96: {- hd: 0,- h: 19,- ah: 19,- },- 97: {- hd: 0,- h: 19,- ah: 19,- },- 98: {- hd: 0,- h: 19,- ah: 19,- },- 99: {- hd: 0,- h: 19,- ah: 19,- },- 100: {- hd: 0,- h: 19,- ah: 19,- },- 101: {- hd: 0,- h: 19,- ah: 19,- },- 102: {- hd: 0,- h: 19,- ah: 19,- },- 103: {- hd: 0,- h: 19,- ah: 19,- },- 104: {- hd: 0,- h: 19,- ah: 19,- },- 105: {- hd: 0,- h: 19,- ah: 19,- },- 106: {- hd: 0,- h: 19,- ah: 19,- },- 107: {- hd: 0,- h: 19,- ah: 19,- },- 108: {- hd: 0,- h: 19,- ah: 19,- },- 109: {- hd: 0,- h: 19,- ah: 19,- },- 110: {- hd: 0,- h: 19,- ah: 19,- },- 111: {- hd: 0,- h: 19,- ah: 19,- },- 112: {- hd: 0,- h: 19,- ah: 19,- },- 113: {- hd: 0,- h: 19,- ah: 19,- },- 114: {- hd: 0,- h: 19,- ah: 19,- },- 115: {- hd: 0,- h: 19,- ah: 19,- },- 116: {- hd: 0,- h: 19,- ah: 19,- },- 117: {- hd: 0,- h: 19,- ah: 19,- },- 118: {- hd: 0,- h: 19,- ah: 19,- },- 119: {- hd: 0,- h: 19,- ah: 19,- },- 120: {- hd: 0,- h: 19,- ah: 19,- },- 121: {- hd: 0,- h: 19,- ah: 19,- },- 122: {- hd: 0,- h: 19,- ah: 19,- },- 123: {- hd: 0,- h: 19,- ah: 19,- },- 124: {- hd: 0,- h: 19,- ah: 19,- },- 125: {- hd: 0,- h: 19,- ah: 19,- },- 126: {- hd: 0,- h: 19,- ah: 19,- },- 127: {- hd: 0,- h: 19,- ah: 19,- },- 128: {- hd: 0,- h: 19,- ah: 19,- },- 129: {- hd: 0,- h: 19,- ah: 19,- },- 130: {- hd: 0,- h: 19,- ah: 19,- },- 131: {- hd: 0,- h: 19,- ah: 19,- },- 132: {- hd: 0,- h: 19,- ah: 19,- },- 133: {- hd: 0,- h: 19,- ah: 19,- },- 134: {- hd: 0,- h: 19,- ah: 19,- },- 135: {- hd: 0,- h: 19,- ah: 19,- },- 136: {- hd: 0,- h: 19,- ah: 19,- },- 137: {- hd: 0,- h: 19,- ah: 19,- },- 138: {- hd: 0,- h: 19,- ah: 19,- },- 139: {- hd: 0,- h: 19,- ah: 19,- },- 140: {- hd: 0,- h: 19,- ah: 19,- },- 141: {- hd: 0,- h: 19,- ah: 19,- },- 142: {- hd: 0,- h: 19,- ah: 19,- },- 143: {- hd: 0,- h: 19,- ah: 19,- },- 144: {- hd: 0,- h: 19,- ah: 19,- },- 145: {- hd: 0,- h: 19,- ah: 19,- },- 146: {- hd: 0,- h: 19,- ah: 19,- },- 147: {- hd: 0,- h: 19,- ah: 19,- },- 148: {- hd: 0,- h: 19,- ah: 19,- },- 149: {- hd: 0,- h: 19,- ah: 19,- },- 150: {- hd: 0,- h: 19,- ah: 19,- },- 151: {- hd: 0,- h: 19,- ah: 19,- },- 152: {- hd: 0,- h: 19,- ah: 19,- },- 153: {- hd: 0,- h: 19,- ah: 19,- },- 154: {- hd: 0,- h: 19,- ah: 19,- },- 155: {- hd: 0,- h: 19,- ah: 19,- },- 156: {- hd: 0,- h: 19,- ah: 19,- },- 157: {- hd: 0,- h: 19,- ah: 19,- },- 158: {- hd: 0,- h: 19,- ah: 19,- },- 159: {- hd: 0,- h: 19,- ah: 19,- },- 160: {- hd: 0,- h: 19,- ah: 19,- },- 161: {- hd: 0,- h: 19,- ah: 19,- },- 162: {- hd: 0,- h: 19,- ah: 19,- },- 163: {- hd: 0,- h: 19,- ah: 19,- },- 164: {- hd: 0,- h: 19,- ah: 19,- },- 165: {- hd: 0,- h: 19,- ah: 19,- },- 166: {- hd: 0,- h: 19,- ah: 19,- },- 167: {- hd: 0,- h: 19,- ah: 19,- },- 168: {- hd: 0,- h: 19,- ah: 19,- },- 169: {- hd: 0,- h: 19,- ah: 19,- },- 170: {- hd: 0,- h: 19,- ah: 19,- },- 171: {- hd: 0,- h: 19,- ah: 19,- },- 172: {- hd: 0,- h: 19,- ah: 19,- },- 173: {- hd: 0,- h: 19,- ah: 19,- },- 174: {- hd: 0,- h: 19,- ah: 19,- },- 175: {- hd: 0,- h: 19,- ah: 19,- },- 176: {- hd: 0,- h: 19,- ah: 19,- },- 177: {- hd: 0,- h: 19,- ah: 19,- },- 178: {- hd: 0,- h: 19,- ah: 19,- },- 179: {- hd: 0,- h: 19,- ah: 19,- },- 180: {- hd: 0,- h: 19,- ah: 19,- },- 181: {- hd: 0,- h: 19,- ah: 19,- },- 182: {- hd: 0,- h: 19,- ah: 19,- },- 183: {- hd: 0,- h: 19,- ah: 19,- },- 184: {- hd: 0,- h: 19,- ah: 19,- },- 185: {- hd: 0,- h: 19,- ah: 19,- },- 186: {- hd: 0,- h: 19,- ah: 19,- },- 187: {- hd: 0,- h: 19,- ah: 19,- },- 188: {- hd: 0,- h: 19,- ah: 19,- },- 189: {- hd: 0,- h: 19,- ah: 19,- },- 190: {- hd: 0,- h: 19,- ah: 19,- },- 191: {- hd: 0,- h: 19,- ah: 19,- },- 192: {- hd: 0,- h: 19,- ah: 19,- },- 193: {- hd: 0,- h: 19,- ah: 19,- },- 194: {- hd: 0,- h: 19,- ah: 19,- },- 195: {- hd: 0,- h: 19,- ah: 19,- },- 196: {- hd: 0,- h: 19,- ah: 19,- },- 197: {- hd: 0,- h: 19,- ah: 19,- },- 198: {- hd: 0,- h: 19,- ah: 19,- },- 199: {- hd: 0,- h: 19,- ah: 19,- },- 200: {- hd: 0,- h: 19,- ah: 19,- },- 201: {- hd: 0,- h: 19,- ah: 19,- },- 202: {- hd: 0,- h: 19,- ah: 19,- },- 203: {- hd: 0,- h: 19,- ah: 19,- },- 204: {- hd: 0,- h: 19,- ah: 19,- },- 205: {- hd: 0,- h: 19,- ah: 19,- },- 206: {- hd: 0,- h: 19,- ah: 19,- },- 207: {- hd: 0,- h: 19,- ah: 19,- },- 208: {- hd: 0,- h: 19,- ah: 19,- },- 209: {- hd: 0,- h: 19,- ah: 19,- },- 210: {- hd: 0,- h: 19,- ah: 19,- },- 211: {- hd: 0,- h: 19,- ah: 19,- },- 212: {- hd: 0,- h: 19,- ah: 19,- },- 213: {- hd: 0,- h: 19,- ah: 19,- },- 214: {- hd: 0,- h: 19,- ah: 19,- },- 215: {- hd: 0,- h: 19,- ah: 19,- },- 216: {- hd: 0,- h: 19,- ah: 19,- },- 217: {- hd: 0,- h: 19,- ah: 19,- },- 218: {- hd: 0,- h: 19,- ah: 19,- },- 219: {- hd: 0,- h: 19,- ah: 19,- },- 220: {- hd: 0,- h: 19,- ah: 19,- },- 221: {- hd: 0,- h: 19,- ah: 19,- },- 222: {- hd: 0,- h: 19,- ah: 19,- },- 223: {- hd: 0,- h: 19,- ah: 19,- },- 224: {- hd: 0,- h: 19,- ah: 19,- },- 225: {- hd: 0,- h: 19,- ah: 19,- },- 226: {- hd: 0,- h: 19,- ah: 19,- },- 227: {- hd: 0,- h: 19,- ah: 19,- },- 228: {- hd: 0,- h: 19,- ah: 19,- },- 229: {- hd: 0,- h: 19,- ah: 19,- },- 230: {- hd: 0,- h: 19,- ah: 19,- },- 231: {- hd: 0,- h: 19,- ah: 19,- },- 232: {- hd: 0,- h: 19,- ah: 19,- },- 233: {- hd: 0,- h: 19,- ah: 19,- },- 234: {- hd: 0,- h: 19,- ah: 19,- },- 235: {- hd: 0,- h: 19,- ah: 19,- },- 236: {- hd: 0,- h: 19,- ah: 19,- },- 237: {- hd: 0,- h: 19,- ah: 19,- },- 238: {- hd: 0,- h: 19,- ah: 19,- },- 239: {- hd: 0,- h: 19,- ah: 19,- },- 240: {- hd: 0,- h: 19,- ah: 19,- },- 241: {- hd: 0,- h: 19,- ah: 19,- },- 242: {- hd: 0,- h: 19,- ah: 19,- },- 243: {- hd: 0,- h: 19,- ah: 19,- },- 244: {- hd: 0,- h: 19,- ah: 19,- },- 245: {- hd: 0,- h: 19,- ah: 19,- },- 246: {- hd: 0,- h: 19,- ah: 19,- },- 247: {- hd: 0,- h: 19,- ah: 19,- },- 248: {- hd: 0,- h: 19,- ah: 19,- },- 249: {- hd: 0,- h: 19,- ah: 19,- },- 250: {- hd: 0,- h: 19,- ah: 19,- },- 251: {- hd: 0,- h: 19,- ah: 19,- },- 252: {- hd: 0,- h: 19,- ah: 19,- },- 253: {- hd: 0,- h: 19,- ah: 19,- },- 254: {- hd: 0,- h: 19,- ah: 19,- },- 255: {- hd: 0,- h: 19,- ah: 19,- },- 256: {- hd: 0,- h: 19,- ah: 19,- },- 257: {- hd: 0,- h: 19,- ah: 19,- },- 258: {- hd: 0,- h: 19,- ah: 19,- },- 259: {- hd: 0,- h: 19,- ah: 19,- },- 260: {- hd: 0,- h: 19,- ah: 19,- },- 261: {- hd: 0,- h: 19,- ah: 19,- },- 262: {- hd: 0,- h: 19,- ah: 19,- },- 263: {- hd: 0,- h: 19,- ah: 19,- },- 264: {- hd: 0,- h: 19,- ah: 19,- },- 265: {- hd: 0,- h: 19,- ah: 19,- },- 266: {- hd: 0,- h: 19,- ah: 19,- },- 267: {- hd: 0,- h: 19,- ah: 19,- },- 268: {- hd: 0,- h: 19,- ah: 19,- },- 269: {- hd: 0,- h: 19,- ah: 19,- },- 270: {- hd: 0,- h: 19,- ah: 19,- },- 271: {- hd: 0,- h: 19,- ah: 19,- },- 272: {- hd: 0,- h: 19,- ah: 19,- },- 273: {- hd: 0,- h: 19,- ah: 19,- },- 274: {- hd: 0,- h: 19,- ah: 19,- },- 275: {- hd: 0,- h: 19,- ah: 19,- },- 276: {- hd: 0,- h: 19,- ah: 19,- },- 277: {- hd: 0,- h: 19,- ah: 19,- },- 278: {- hd: 0,- h: 19,- ah: 19,- },- 279: {- hd: 0,- h: 19,- ah: 19,- },- 280: {- hd: 0,- h: 19,- ah: 19,- },- 281: {- hd: 0,- h: 19,- ah: 19,- },- 282: {- hd: 0,- h: 19,- ah: 19,- },- 283: {- hd: 0,- h: 19,- ah: 19,- },- 284: {- hd: 0,- h: 19,- ah: 19,- },- 285: {- hd: 0,- h: 19,- ah: 19,- },- 286: {- hd: 0,- h: 19,- ah: 19,- },- 287: {- hd: 0,- h: 19,- ah: 19,- },- 288: {- hd: 0,- h: 19,- ah: 19,- },- 289: {- hd: 0,- h: 19,- ah: 19,- },- 290: {- hd: 0,- h: 19,- ah: 19,- },- 291: {- hd: 0,- h: 19,- ah: 19,- },- 292: {- hd: 0,- h: 19,- ah: 19,- },- 293: {- hd: 0,- h: 19,- ah: 19,- },- 294: {- hd: 0,- h: 19,- ah: 19,- },- 295: {- hd: 0,- h: 19,- ah: 19,- },- 296: {- hd: 0,- h: 19,- ah: 19,- },- 297: {- hd: 0,- h: 19,- ah: 19,- },- 298: {- hd: 0,- h: 19,- ah: 19,- },- 299: {- hd: 0,- h: 19,- ah: 19,- },- 300: {- hd: 0,- h: 19,- ah: 19,- },- 301: {- hd: 0,- h: 19,- ah: 19,- },- 302: {- hd: 0,- h: 19,- ah: 19,- },- 303: {- hd: 0,- h: 19,- ah: 19,- },- 304: {- hd: 0,- h: 19,- ah: 19,- },- 305: {- hd: 0,- h: 19,- ah: 19,- },- 306: {- hd: 0,- h: 19,- ah: 19,- },- 307: {- hd: 0,- h: 19,- ah: 19,- },- 308: {- hd: 0,- h: 19,- ah: 19,- },- 309: {- hd: 0,- h: 19,- ah: 19,- },- 310: {- hd: 0,- h: 19,- ah: 19,- },- 311: {- hd: 0,- h: 19,- ah: 19,- },- 312: {- hd: 0,- h: 19,- ah: 19,- },- 313: {- hd: 0,- h: 19,- ah: 19,- },- 314: {- hd: 0,- h: 19,- ah: 19,- },- 315: {- hd: 0,- h: 19,- ah: 19,- },- 316: {- hd: 0,- h: 19,- ah: 19,- },- 317: {- hd: 0,- h: 19,- ah: 19,- },- 318: {- hd: 0,- h: 19,- ah: 19,- },- 319: {- hd: 0,- h: 19,- ah: 19,- },- 320: {- hd: 0,- h: 19,- ah: 19,- },- 321: {- hd: 0,- h: 19,- ah: 19,- },- 322: {- hd: 0,- h: 19,- ah: 19,- },- 323: {- hd: 0,- h: 19,- ah: 19,- },- 324: {- hd: 0,- h: 19,- ah: 19,- },- 325: {- hd: 0,- h: 19,- ah: 19,- },- 326: {- hd: 0,- h: 19,- ah: 19,- },- 327: {- hd: 0,- h: 19,- ah: 19,- },- 328: {- hd: 0,- h: 19,- ah: 19,- },- 329: {- hd: 0,- h: 19,- ah: 19,- },- 330: {- hd: 0,- h: 19,- ah: 19,- },- 331: {- hd: 0,- h: 19,- ah: 19,- },- 332: {- hd: 0,- h: 19,- ah: 19,- },- 333: {- hd: 0,- h: 19,- ah: 19,- },- 334: {- hd: 0,- h: 19,- ah: 19,- },- 335: {- hd: 0,- h: 19,- ah: 19,- },- 336: {- hd: 0,- h: 19,- ah: 19,- },- 337: {- hd: 0,- h: 19,- ah: 19,- },- 338: {- hd: 0,- h: 19,- ah: 19,- },- 339: {- hd: 0,- h: 19,- ah: 19,- },- 340: {- hd: 0,- h: 19,- ah: 19,- },- 341: {- hd: 0,- h: 19,- ah: 19,- },- 342: {- hd: 0,- h: 19,- ah: 19,- },- 343: {- hd: 0,- h: 19,- ah: 19,- },- 344: {- hd: 0,- h: 19,- ah: 19,- },- 345: {- hd: 0,- h: 19,- ah: 19,- },- 346: {- hd: 0,- h: 19,- ah: 19,- },- 347: {- hd: 0,- h: 19,- ah: 19,- },- 348: {- hd: 0,- h: 19,- ah: 19,- },- 349: {- hd: 0,- h: 19,- ah: 19,- },- 350: {- hd: 0,- h: 19,- ah: 19,- },- 351: {- hd: 0,- h: 19,- ah: 19,- },- 352: {- hd: 0,- h: 19,- ah: 19,- },- 353: {- hd: 0,- h: 19,- ah: 19,- },- 354: {- hd: 0,- h: 19,- ah: 19,- },- 355: {- hd: 0,- h: 19,- ah: 19,- },- 356: {- hd: 0,- h: 19,- ah: 19,- },- 357: {- hd: 0,- h: 19,- ah: 19,- },- 358: {- hd: 0,- h: 19,- ah: 19,- },- 359: {- hd: 0,- h: 19,- ah: 19,- },- 360: {- hd: 0,- h: 19,- ah: 19,- },- 361: {- hd: 0,- h: 19,- ah: 19,- },- 362: {- hd: 0,- h: 19,- ah: 19,- },- 363: {- hd: 0,- h: 19,- ah: 19,- },- 364: {- hd: 0,- h: 19,- ah: 19,- },- 365: {- hd: 0,- h: 19,- ah: 19,- },- 366: {- hd: 0,- h: 19,- ah: 19,- },- 367: {- hd: 0,- h: 19,- ah: 19,- },- 368: {- hd: 0,- h: 19,- ah: 19,- },- 369: {- hd: 0,- h: 19,- ah: 19,- },- 370: {- hd: 0,- h: 19,- ah: 19,- },- 371: {- hd: 0,- h: 19,- ah: 19,- },- 372: {- hd: 0,- h: 19,- ah: 19,- },- 373: {- hd: 0,- h: 19,- ah: 19,- },- 374: {- hd: 0,- h: 19,- ah: 19,- },- 375: {- hd: 0,- h: 19,- ah: 19,- },- 376: {- hd: 0,- h: 19,- ah: 19,- },- 377: {- hd: 0,- h: 19,- ah: 19,- },- 378: {- hd: 0,- h: 19,- ah: 19,- },- 379: {- hd: 0,- h: 19,- ah: 19,- },- 380: {- hd: 0,- h: 19,- ah: 19,- },- 381: {- hd: 0,- h: 19,- ah: 19,- },- 382: {- hd: 0,- h: 19,- ah: 19,- },- 383: {- hd: 0,- h: 19,- ah: 19,- },- 384: {- hd: 0,- h: 19,- ah: 19,- },- 385: {- hd: 0,- h: 19,- ah: 19,- },- 386: {- hd: 0,- h: 19,- ah: 19,- },- 387: {- hd: 0,- h: 19,- ah: 19,- },- 388: {- hd: 0,- h: 19,- ah: 19,- },- 389: {- hd: 0,- h: 19,- ah: 19,- },- 390: {- hd: 0,- h: 19,- ah: 19,- },- 391: {- hd: 0,- h: 19,- ah: 19,- },- 392: {- hd: 0,- h: 19,- ah: 19,- },- 393: {- hd: 0,- h: 19,- ah: 19,- },- 394: {- hd: 0,- h: 19,- ah: 19,- },- 395: {- hd: 0,- h: 19,- ah: 19,- },- 396: {- hd: 0,- h: 19,- ah: 19,- },- 397: {- hd: 0,- h: 19,- ah: 19,- },- 398: {- hd: 0,- h: 19,- ah: 19,- },- 399: {- hd: 0,- h: 19,- ah: 19,- },- 400: {- hd: 0,- h: 19,- ah: 19,- },- 401: {- hd: 0,- h: 19,- ah: 19,- },- 402: {- hd: 0,- h: 19,- ah: 19,- },- 403: {- hd: 0,- h: 19,- ah: 19,- },- 404: {- hd: 0,- h: 19,- ah: 19,- },- 405: {- hd: 0,- h: 19,- ah: 19,- },- 406: {- hd: 0,- h: 19,- ah: 19,- },- 407: {- hd: 0,- h: 19,- ah: 19,- },- 408: {- hd: 0,- h: 19,- ah: 19,- },- 409: {- hd: 0,- h: 19,- ah: 19,- },- 410: {- hd: 0,- h: 19,- ah: 19,- },- 411: {- hd: 0,- h: 19,- ah: 19,- },- 412: {- hd: 0,- h: 19,- ah: 19,- },- 413: {- hd: 0,- h: 19,- ah: 19,- },- 414: {- hd: 0,- h: 19,- ah: 19,- },- 415: {- hd: 0,- h: 19,- ah: 19,- },- 416: {- hd: 0,- h: 19,- ah: 19,- },- 417: {- hd: 0,- h: 19,- ah: 19,- },- 418: {- hd: 0,- h: 19,- ah: 19,- },- 419: {- hd: 0,- h: 19,- ah: 19,- },- 420: {- hd: 0,- h: 19,- ah: 19,- },- 421: {- hd: 0,- h: 19,- ah: 19,- },- 422: {- hd: 0,- h: 19,- ah: 19,- },- 423: {- hd: 0,- h: 19,- ah: 19,- },- 424: {- hd: 0,- h: 19,- ah: 19,- },- 425: {- hd: 0,- h: 19,- ah: 19,- },- 426: {- hd: 0,- h: 19,- ah: 19,- },- 427: {- hd: 0,- h: 19,- ah: 19,- },- 428: {- hd: 0,- h: 19,- ah: 19,- },- 429: {- hd: 0,- h: 19,- ah: 19,- },- 430: {- hd: 0,- h: 19,- ah: 19,- },- 431: {- hd: 0,- h: 19,- ah: 19,- },- 432: {- hd: 0,- h: 19,- ah: 19,- },- 433: {- hd: 0,- h: 19,- ah: 19,- },- 434: {- hd: 0,- h: 19,- ah: 19,- },- 435: {- hd: 0,- h: 19,- ah: 19,- },- 436: {- hd: 0,- h: 19,- ah: 19,- },- 437: {- hd: 0,- h: 19,- ah: 19,- },- 438: {- hd: 0,- h: 19,- ah: 19,- },- 439: {- hd: 0,- h: 19,- ah: 19,- },- 440: {- hd: 0,- h: 19,- ah: 19,- },- 441: {- hd: 0,- h: 19,- ah: 19,- },- 442: {- hd: 0,- h: 19,- ah: 19,- },- 443: {- hd: 0,- h: 19,- ah: 19,- },- 444: {- hd: 0,- h: 19,- ah: 19,- },- 445: {- hd: 0,- h: 19,- ah: 19,- },- 446: {- hd: 0,- h: 19,- ah: 19,- },- 447: {- hd: 0,- h: 19,- ah: 19,- },- 448: {- hd: 0,- h: 19,- ah: 19,- },- 449: {- hd: 0,- h: 19,- ah: 19,- },- 450: {- hd: 0,- h: 19,- ah: 19,- },- 451: {- hd: 0,- h: 19,- ah: 19,- },- 452: {- hd: 0,- h: 19,- ah: 19,- },- 453: {- hd: 0,- h: 19,- ah: 19,- },- 454: {- hd: 0,- h: 19,- ah: 19,- },- 455: {- hd: 0,- h: 19,- ah: 19,- },- 456: {- hd: 0,- h: 19,- ah: 19,- },- 457: {- hd: 0,- h: 19,- ah: 19,- },- 458: {- hd: 0,- h: 19,- ah: 19,- },- 459: {- hd: 0,- h: 19,- ah: 19,- },- 460: {- hd: 0,- h: 19,- ah: 19,- },- 461: {- hd: 0,- h: 19,- ah: 19,- },- 462: {- hd: 0,- h: 19,- ah: 19,- },- 463: {- hd: 0,- h: 19,- ah: 19,- },- 464: {- hd: 0,- h: 19,- ah: 19,- },- 465: {- hd: 0,- h: 19,- ah: 19,- },- 466: {- hd: 0,- h: 19,- ah: 19,- },- 467: {- hd: 0,- h: 19,- ah: 19,- },- 468: {- hd: 0,- h: 19,- ah: 19,- },- 469: {- hd: 0,- h: 19,- ah: 19,- },- 470: {- hd: 0,- h: 19,- ah: 19,- },- 471: {- hd: 0,- h: 19,- ah: 19,- },- 472: {- hd: 0,- h: 19,- ah: 19,- },- 473: {- hd: 0,- h: 19,- ah: 19,- },- 474: {- hd: 0,- h: 19,- ah: 19,- },- 475: {- hd: 0,- h: 19,- ah: 19,- },- 476: {- hd: 0,- h: 19,- ah: 19,- },- 477: {- hd: 0,- h: 19,- ah: 19,- },- 478: {- hd: 0,- h: 19,- ah: 19,- },- 479: {- hd: 0,- h: 19,- ah: 19,- },- 480: {- hd: 0,- h: 19,- ah: 19,- },- 481: {- hd: 0,- h: 19,- ah: 19,- },- 482: {- hd: 0,- h: 19,- ah: 19,- },- 483: {- hd: 0,- h: 19,- ah: 19,- },- 484: {- hd: 0,- h: 19,- ah: 19,- },- 485: {- hd: 0,- h: 19,- ah: 19,- },- 486: {- hd: 0,- h: 19,- ah: 19,- },- 487: {- hd: 0,- h: 19,- ah: 19,- },- 488: {- hd: 0,- h: 19,- ah: 19,- },- 489: {- hd: 0,- h: 19,- ah: 19,- },- 490: {- hd: 0,- h: 19,- ah: 19,- },- 491: {- hd: 0,- h: 19,- ah: 19,- },- 492: {- hd: 0,- h: 19,- ah: 19,- },- 493: {- hd: 0,- h: 19,- ah: 19,- },- 494: {- hd: 0,- h: 19,- ah: 19,- },- 495: {- hd: 0,- h: 19,- ah: 19,- },- 496: {- hd: 0,- h: 19,- ah: 19,- },- 497: {- hd: 0,- h: 19,- ah: 19,- },- 498: {- hd: 0,- h: 19,- ah: 19,- },- 499: {- hd: 0,- h: 19,- ah: 19,- },- 500: {- hd: 0,- h: 19,- ah: 19,- },- 501: {- hd: 0,- h: 19,- ah: 19,- },- 502: {- hd: 0,- h: 19,- ah: 19,- },- 503: {- hd: 0,- h: 19,- ah: 19,- },- 504: {- hd: 0,- h: 19,- ah: 19,- },- 505: {- hd: 0,- h: 19,- ah: 19,- },- 506: {- hd: 0,- h: 19,- ah: 19,- },- 507: {- hd: 0,- h: 19,- ah: 19,- },- 508: {- hd: 0,- h: 19,- ah: 19,- },- 509: {- hd: 0,- h: 19,- ah: 19,- },- 510: {- hd: 0,- h: 19,- ah: 19,- },- 511: {- hd: 0,- h: 19,- ah: 19,- },- 512: {- hd: 0,- h: 19,- ah: 19,- },- 513: {- hd: 0,- h: 19,- ah: 19,- },- 514: {- hd: 0,- h: 19,- ah: 19,- },- 515: {- hd: 0,- h: 19,- ah: 19,- },- 516: {- hd: 0,- h: 19,- ah: 19,- },- 517: {- hd: 0,- h: 19,- ah: 19,- },- 518: {- hd: 0,- h: 19,- ah: 19,- },- 519: {- hd: 0,- h: 19,- ah: 19,- },- 520: {- hd: 0,- h: 19,- ah: 19,- },- 521: {- hd: 0,- h: 19,- ah: 19,- },- 522: {- hd: 0,- h: 19,- ah: 19,- },- 523: {- hd: 0,- h: 19,- ah: 19,- },- 524: {- hd: 0,- h: 19,- ah: 19,- },- 525: {- hd: 0,- h: 19,- ah: 19,- },- 526: {- hd: 0,- h: 19,- ah: 19,- },- 527: {- hd: 0,- h: 19,- ah: 19,- },- 528: {- hd: 0,- h: 19,- ah: 19,- },- 529: {- hd: 0,- h: 19,- ah: 19,- },- 530: {- hd: 0,- h: 19,- ah: 19,- },- 531: {- hd: 0,- h: 19,- ah: 19,- },- 532: {- hd: 0,- h: 19,- ah: 19,- },- 533: {- hd: 0,- h: 19,- ah: 19,- },- 534: {- hd: 0,- h: 19,- ah: 19,- },- 535: {- hd: 0,- h: 19,- ah: 19,- },- 536: {- hd: 0,- h: 19,- ah: 19,- },- 537: {- hd: 0,- h: 19,- ah: 19,- },- 538: {- hd: 0,- h: 19,- ah: 19,- },- 539: {- hd: 0,- h: 19,- ah: 19,- },- 540: {- hd: 0,- h: 19,- ah: 19,- },- 541: {- hd: 0,- h: 19,- ah: 19,- },- 542: {- hd: 0,- h: 19,- ah: 19,- },- 543: {- hd: 0,- h: 19,- ah: 19,- },- 544: {- hd: 0,- h: 19,- ah: 19,- },- 545: {- hd: 0,- h: 19,- ah: 19,- },- 546: {- hd: 0,- h: 19,- ah: 19,- },- 547: {- hd: 0,- h: 19,- ah: 19,- },- 548: {- hd: 0,- h: 19,- ah: 19,- },- 549: {- hd: 0,- h: 19,- ah: 19,- },- 550: {- hd: 0,- h: 19,- ah: 19,- },- 551: {- hd: 0,- h: 19,- ah: 19,- },- 552: {- hd: 0,- h: 19,- ah: 19,- },- 553: {- hd: 0,- h: 19,- ah: 19,- },- 554: {- hd: 0,- h: 19,- ah: 19,- },- 555: {- hd: 0,- h: 19,- ah: 19,- },- 556: {- hd: 0,- h: 19,- ah: 19,- },- 557: {- hd: 0,- h: 19,- ah: 19,- },- 558: {- hd: 0,- h: 19,- ah: 19,- },- 559: {- hd: 0,- h: 19,- ah: 19,- },- 560: {- hd: 0,- h: 19,- ah: 19,- },- 561: {- hd: 0,- h: 19,- ah: 19,- },- 562: {- hd: 0,- h: 19,- ah: 19,- },- 563: {- hd: 0,- h: 19,- ah: 19,- },- 564: {- hd: 0,- h: 19,- ah: 19,- },- 565: {- hd: 0,- h: 19,- ah: 19,- },- 566: {- hd: 0,- h: 19,- ah: 19,- },- 567: {- hd: 0,- h: 19,- ah: 19,- },- 568: {- hd: 0,- h: 19,- ah: 19,- },- 569: {- hd: 0,- h: 19,- ah: 19,- },- 570: {- hd: 0,- h: 19,- ah: 19,- },- 571: {- hd: 0,- h: 19,- ah: 19,- },- 572: {- hd: 0,- h: 19,- ah: 19,- },- 573: {- hd: 0,- h: 19,- ah: 19,- },- 574: {- hd: 0,- h: 19,- ah: 19,- },- 575: {- hd: 0,- h: 19,- ah: 19,- },- 576: {- hd: 0,- h: 19,- ah: 19,- },- 577: {- hd: 0,- h: 19,- ah: 19,- },- 578: {- hd: 0,- h: 19,- ah: 19,- },- 579: {- hd: 0,- h: 19,- ah: 19,- },- 580: {- hd: 0,- h: 19,- ah: 19,- },- 581: {- hd: 0,- h: 19,- ah: 19,- },- 582: {- hd: 0,- h: 19,- ah: 19,- },- 583: {- hd: 0,- h: 19,- ah: 19,- },- 584: {- hd: 0,- h: 19,- ah: 19,- },- 585: {- hd: 0,- h: 19,- ah: 19,- },- 586: {- hd: 0,- h: 19,- ah: 19,- },- 587: {- hd: 0,- h: 19,- ah: 19,- },- 588: {- hd: 0,- h: 19,- ah: 19,- },- 589: {- hd: 0,- h: 19,- ah: 19,- },- 590: {- hd: 0,- h: 19,- ah: 19,- },- 591: {- hd: 0,- h: 19,- ah: 19,- },- 592: {- hd: 0,- h: 19,- ah: 19,- },- 593: {- hd: 0,- h: 19,- ah: 19,- },- 594: {- hd: 0,- h: 19,- ah: 19,- },- 595: {- hd: 0,- h: 19,- ah: 19,- },- 596: {- hd: 0,- h: 19,- ah: 19,- },- 597: {- hd: 0,- h: 19,- ah: 19,- },- 598: {- hd: 0,- h: 19,- ah: 19,- },- 599: {- hd: 0,- h: 19,- ah: 19,- },- 600: {- hd: 0,- h: 19,- ah: 19,- },- 601: {- hd: 0,- h: 19,- ah: 19,- },- 602: {- hd: 0,- h: 19,- ah: 19,- },- 603: {- hd: 0,- h: 19,- ah: 19,- },- 604: {- hd: 0,- h: 19,- ah: 19,- },- 605: {- hd: 0,- h: 19,- ah: 19,- },- 606: {- hd: 0,- h: 19,- ah: 19,- },- 607: {- hd: 0,- h: 19,- ah: 19,- },- 608: {- hd: 0,- h: 19,- ah: 19,- },- 609: {- hd: 0,- h: 19,- ah: 19,- },- 610: {- hd: 0,- h: 19,- ah: 19,- },- 611: {- hd: 0,- h: 19,- ah: 19,- },- 612: {- hd: 0,- h: 19,- ah: 19,- },- 613: {- hd: 0,- h: 19,- ah: 19,- },- 614: {- hd: 0,- h: 19,- ah: 19,- },- 615: {- hd: 0,- h: 19,- ah: 19,- },- 616: {- hd: 0,- h: 19,- ah: 19,- },- 617: {- hd: 0,- h: 19,- ah: 19,- },- 618: {- hd: 0,- h: 19,- ah: 19,- },- 619: {- hd: 0,- h: 19,- ah: 19,- },- 620: {- hd: 0,- h: 19,- ah: 19,- },- 621: {- hd: 0,- h: 19,- ah: 19,- },- 622: {- hd: 0,- h: 19,- ah: 19,- },- 623: {- hd: 0,- h: 19,- ah: 19,- },- 624: {- hd: 0,- h: 19,- ah: 19,- },- 625: {- hd: 0,- h: 19,- ah: 19,- },- 626: {- hd: 0,- h: 19,- ah: 19,- },- 627: {- hd: 0,- h: 19,- ah: 19,- },- 628: {- hd: 0,- h: 19,- ah: 19,- },- 629: {- hd: 0,- h: 19,- ah: 19,- },- 630: {- hd: 0,- h: 19,- ah: 19,- },- 631: {- hd: 0,- h: 19,- ah: 19,- },- 632: {- hd: 0,- h: 19,- ah: 19,- },- 633: {- hd: 0,- h: 19,- ah: 19,- },- 634: {- hd: 0,- h: 19,- ah: 19,- },- 635: {- hd: 0,- h: 19,- ah: 19,- },- 636: {- hd: 0,- h: 19,- ah: 19,- },- 637: {- hd: 0,- h: 19,- ah: 19,- },- 638: {- hd: 0,- h: 19,- ah: 19,- },- 639: {- hd: 0,- h: 19,- ah: 19,- },- 640: {- hd: 0,- h: 19,- ah: 19,- },- 641: {- hd: 0,- h: 19,- ah: 19,- },- 642: {- hd: 0,- h: 19,- ah: 19,- },- 643: {- hd: 0,- h: 19,- ah: 19,- },- 644: {- hd: 0,- h: 19,- ah: 19,- },- 645: {- hd: 0,- h: 19,- ah: 19,- },- 646: {- hd: 0,- h: 19,- ah: 19,- },- 647: {- hd: 0,- h: 19,- ah: 19,- },- 648: {- hd: 0,- h: 19,- ah: 19,- },- 649: {- hd: 0,- h: 19,- ah: 19,- },- 650: {- hd: 0,- h: 19,- ah: 19,- },- 651: {- hd: 0,- h: 19,- ah: 19,- },- 652: {- hd: 0,- h: 19,- ah: 19,- },- 653: {- hd: 0,- h: 19,- ah: 19,- },- 654: {- hd: 0,- h: 19,- ah: 19,- },- 655: {- hd: 0,- h: 19,- ah: 19,- },- 656: {- hd: 0,- h: 19,- ah: 19,- },- 657: {- hd: 0,- h: 19,- ah: 19,- },- 658: {- hd: 0,- h: 19,- ah: 19,- },- 659: {- hd: 0,- h: 19,- ah: 19,- },- 660: {- hd: 0,- h: 19,- ah: 19,- },- 661: {- hd: 0,- h: 19,- ah: 19,- },- 662: {- hd: 0,- h: 19,- ah: 19,- },- 663: {- hd: 0,- h: 19,- ah: 19,- },- 664: {- hd: 0,- h: 19,- ah: 19,- },- 665: {- hd: 0,- h: 19,- ah: 19,- },- 666: {- hd: 0,- h: 19,- ah: 19,- },- 667: {- hd: 0,- h: 19,- ah: 19,- },- 668: {- hd: 0,- h: 19,- ah: 19,- },- 669: {- hd: 0,- h: 19,- ah: 19,- },- 670: {- hd: 0,- h: 19,- ah: 19,- },- 671: {- hd: 0,- h: 19,- ah: 19,- },- 672: {- hd: 0,- h: 19,- ah: 19,- },- 673: {- hd: 0,- h: 19,- ah: 19,- },- 674: {- hd: 0,- h: 19,- ah: 19,- },- 675: {- hd: 0,- h: 19,- ah: 19,- },- 676: {- hd: 0,- h: 19,- ah: 19,- },- 677: {- hd: 0,- h: 19,- ah: 19,- },- 678: {- hd: 0,- h: 19,- ah: 19,- },- 679: {- hd: 0,- h: 19,- ah: 19,- },- 680: {- hd: 0,- h: 19,- ah: 19,- },- 681: {- hd: 0,- h: 19,- ah: 19,- },- 682: {- hd: 0,- h: 19,- ah: 19,- },- 683: {- hd: 0,- h: 19,- ah: 19,- },- 684: {- hd: 0,- h: 19,- ah: 19,- },- 685: {- hd: 0,- h: 19,- ah: 19,- },- 686: {- hd: 0,- h: 19,- ah: 19,- },- 687: {- hd: 0,- h: 19,- ah: 19,- },- 688: {- hd: 0,- h: 19,- ah: 19,- },- 689: {- hd: 0,- h: 19,- ah: 19,- },- 690: {- hd: 0,- h: 19,- ah: 19,- },- 691: {- hd: 0,- h: 19,- ah: 19,- },- 692: {- hd: 0,- h: 19,- ah: 19,- },- 693: {- hd: 0,- h: 19,- ah: 19,- },- 694: {- hd: 0,- h: 19,- ah: 19,- },- 695: {- hd: 0,- h: 19,- ah: 19,- },- 696: {- hd: 0,- h: 19,- ah: 19,- },- 697: {- hd: 0,- h: 19,- ah: 19,- },- 698: {- hd: 0,- h: 19,- ah: 19,- },- 699: {- hd: 0,- h: 19,- ah: 19,- },- 700: {- hd: 0,- h: 19,- ah: 19,- },- 701: {- hd: 0,- h: 19,- ah: 19,- },- 702: {- hd: 0,- h: 19,- ah: 19,- },- 703: {- hd: 0,- h: 19,- ah: 19,- },- 704: {- hd: 0,- h: 19,- ah: 19,- },- 705: {- hd: 0,- h: 19,- ah: 19,- },- 706: {- hd: 0,- h: 19,- ah: 19,- },- 707: {- hd: 0,- h: 19,- ah: 19,- },- 708: {- hd: 0,- h: 19,- ah: 19,- },- 709: {- hd: 0,- h: 19,- ah: 19,- },- 710: {- hd: 0,- h: 19,- ah: 19,- },- 711: {- hd: 0,- h: 19,- ah: 19,- },- 712: {- hd: 0,- h: 19,- ah: 19,- },- 713: {- hd: 0,- h: 19,- ah: 19,- },- 714: {- hd: 0,- h: 19,- ah: 19,- },- 715: {- hd: 0,- h: 19,- ah: 19,- },- 716: {- hd: 0,- h: 19,- ah: 19,- },- 717: {- hd: 0,- h: 19,- ah: 19,- },- 718: {- hd: 0,- h: 19,- ah: 19,- },- 719: {- hd: 0,- h: 19,- ah: 19,- },- 720: {- hd: 0,- h: 19,- ah: 19,- },- 721: {- hd: 0,- h: 19,- ah: 19,- },- 722: {- hd: 0,- h: 19,- ah: 19,- },- 723: {- hd: 0,- h: 19,- ah: 19,- },- 724: {- hd: 0,- h: 19,- ah: 19,- },- 725: {- hd: 0,- h: 19,- ah: 19,- },- 726: {- hd: 0,- h: 19,- ah: 19,- },- 727: {- hd: 0,- h: 19,- ah: 19,- },- 728: {- hd: 0,- h: 19,- ah: 19,- },- 729: {- hd: 0,- h: 19,- ah: 19,- },- 730: {- hd: 0,- h: 19,- ah: 19,- },- 731: {- hd: 0,- h: 19,- ah: 19,- },- 732: {- hd: 0,- h: 19,- ah: 19,- },- 733: {- hd: 0,- h: 19,- ah: 19,- },- 734: {- hd: 0,- h: 19,- ah: 19,- },- 735: {- hd: 0,- h: 19,- ah: 19,- },- 736: {- hd: 0,- h: 19,- ah: 19,- },- 737: {- hd: 0,- h: 19,- ah: 19,- },- 738: {- hd: 0,- h: 19,- ah: 19,- },- 739: {- hd: 0,- h: 19,- ah: 19,- },- 740: {- hd: 0,- h: 19,- ah: 19,- },- 741: {- hd: 0,- h: 19,- ah: 19,- },- 742: {- hd: 0,- h: 19,- ah: 19,- },- 743: {- hd: 0,- h: 19,- ah: 19,- },- 744: {- hd: 0,- h: 19,- ah: 19,- },- 745: {- hd: 0,- h: 19,- ah: 19,- },- 746: {- hd: 0,- h: 19,- ah: 19,- },- 747: {- hd: 0,- h: 19,- ah: 19,- },- 748: {- hd: 0,- h: 19,- ah: 19,- },- 749: {- hd: 0,- h: 19,- ah: 19,- },- 750: {- hd: 0,- h: 19,- ah: 19,- },- 751: {- hd: 0,- h: 19,- ah: 19,- },- 752: {- hd: 0,- h: 19,- ah: 19,- },- 753: {- hd: 0,- h: 19,- ah: 19,- },- 754: {- hd: 0,- h: 19,- ah: 19,- },- 755: {- hd: 0,- h: 19,- ah: 19,- },- 756: {- hd: 0,- h: 19,- ah: 19,- },- 757: {- hd: 0,- h: 19,- ah: 19,- },- 758: {- hd: 0,- h: 19,- ah: 19,- },- 759: {- hd: 0,- h: 19,- ah: 19,- },- 760: {- hd: 0,- h: 19,- ah: 19,- },- 761: {- hd: 0,- h: 19,- ah: 19,- },- 762: {- hd: 0,- h: 19,- ah: 19,- },- 763: {- hd: 0,- h: 19,- ah: 19,- },- 764: {- hd: 0,- h: 19,- ah: 19,- },- 765: {- hd: 0,- h: 19,- ah: 19,- },- 766: {- hd: 0,- h: 19,- ah: 19,- },- 767: {- hd: 0,- h: 19,- ah: 19,- },- 768: {- hd: 0,- h: 19,- ah: 19,- },- 769: {- hd: 0,- h: 19,- ah: 19,- },- 770: {- hd: 0,- h: 19,- ah: 19,- },- 771: {- hd: 0,- h: 19,- ah: 19,- },- 772: {- hd: 0,- h: 19,- ah: 19,- },- 773: {- hd: 0,- h: 19,- ah: 19,- },- 774: {- hd: 0,- h: 19,- ah: 19,- },- 775: {- hd: 0,- h: 19,- ah: 19,- },- 776: {- hd: 0,- h: 19,- ah: 19,- },- 777: {- hd: 0,- h: 19,- ah: 19,- },- 778: {- hd: 0,- h: 19,- ah: 19,- },- 779: {- hd: 0,- h: 19,- ah: 19,- },- 780: {- hd: 0,- h: 19,- ah: 19,- },- 781: {- hd: 0,- h: 19,- ah: 19,- },- 782: {- hd: 0,- h: 19,- ah: 19,- },- 783: {- hd: 0,- h: 19,- ah: 19,- },- 784: {- hd: 0,- h: 19,- ah: 19,- },- 785: {- hd: 0,- h: 19,- ah: 19,- },- 786: {- hd: 0,- h: 19,- ah: 19,- },- 787: {- hd: 0,- h: 19,- ah: 19,- },- 788: {- hd: 0,- h: 19,- ah: 19,- },- 789: {- hd: 0,- h: 19,- ah: 19,- },- 790: {- hd: 0,- h: 19,- ah: 19,- },- 791: {- hd: 0,- h: 19,- ah: 19,- },- 792: {- hd: 0,- h: 19,- ah: 19,- },- 793: {- hd: 0,- h: 19,- ah: 19,- },- 794: {- hd: 0,- h: 19,- ah: 19,- },- 795: {- hd: 0,- h: 19,- ah: 19,- },- 796: {- hd: 0,- h: 19,- ah: 19,- },- 797: {- hd: 0,- h: 19,- ah: 19,- },- 798: {- hd: 0,- h: 19,- ah: 19,- },- 799: {- hd: 0,- h: 19,- ah: 19,- },- 800: {- hd: 0,- h: 19,- ah: 19,- },- 801: {- hd: 0,- h: 19,- ah: 19,- },- 802: {- hd: 0,- h: 19,- ah: 19,- },- 803: {- hd: 0,- h: 19,- ah: 19,- },- 804: {- hd: 0,- h: 19,- ah: 19,- },- 805: {- hd: 0,- h: 19,- ah: 19,- },- 806: {- hd: 0,- h: 19,- ah: 19,- },- 807: {- hd: 0,- h: 19,- ah: 19,- },- 808: {- hd: 0,- h: 19,- ah: 19,- },- 809: {- hd: 0,- h: 19,- ah: 19,- },- 810: {- hd: 0,- h: 19,- ah: 19,- },- 811: {- hd: 0,- h: 19,- ah: 19,- },- 812: {- hd: 0,- h: 19,- ah: 19,- },- 813: {- hd: 0,- h: 19,- ah: 19,- },- 814: {- hd: 0,- h: 19,- ah: 19,- },- 815: {- hd: 0,- h: 19,- ah: 19,- },- 816: {- hd: 0,- h: 19,- ah: 19,- },- 817: {- hd: 0,- h: 19,- ah: 19,- },- 818: {- hd: 0,- h: 19,- ah: 19,- },- 819: {- hd: 0,- h: 19,- ah: 19,- },- 820: {- hd: 0,- h: 19,- ah: 19,- },- 821: {- hd: 0,- h: 19,- ah: 19,- },- 822: {- hd: 0,- h: 19,- ah: 19,- },- 823: {- hd: 0,- h: 19,- ah: 19,- },- 824: {- hd: 0,- h: 19,- ah: 19,- },- 825: {- hd: 0,- h: 19,- ah: 19,- },- 826: {- hd: 0,- h: 19,- ah: 19,- },- 827: {- hd: 0,- h: 19,- ah: 19,- },- 828: {- hd: 0,- h: 19,- ah: 19,- },- 829: {- hd: 0,- h: 19,- ah: 19,- },- 830: {- hd: 0,- h: 19,- ah: 19,- },- 831: {- hd: 0,- h: 19,- ah: 19,- },- 832: {- hd: 0,- h: 19,- ah: 19,- },- 833: {- hd: 0,- h: 19,- ah: 19,- },- 834: {- hd: 0,- h: 19,- ah: 19,- },- 835: {- hd: 0,- h: 19,- ah: 19,- },- 836: {- hd: 0,- h: 19,- ah: 19,- },- 837: {- hd: 0,- h: 19,- ah: 19,- },- 838: {- hd: 0,- h: 19,- ah: 19,- },- 839: {- hd: 0,- h: 19,- ah: 19,- },- 840: {- hd: 0,- h: 19,- ah: 19,- },- 841: {- hd: 0,- h: 19,- ah: 19,- },- 842: {- hd: 0,- h: 19,- ah: 19,- },- 843: {- hd: 0,- h: 19,- ah: 19,- },- 844: {- hd: 0,- h: 19,- ah: 19,- },- 845: {- hd: 0,- h: 19,- ah: 19,- },- 846: {- hd: 0,- h: 19,- ah: 19,- },- 847: {- hd: 0,- h: 19,- ah: 19,- },- 848: {- hd: 0,- h: 19,- ah: 19,- },- 849: {- hd: 0,- h: 19,- ah: 19,- },- 850: {- hd: 0,- h: 19,- ah: 19,- },- 851: {- hd: 0,- h: 19,- ah: 19,- },- 852: {- hd: 0,- h: 19,- ah: 19,- },- 853: {- hd: 0,- h: 19,- ah: 19,- },- 854: {- hd: 0,- h: 19,- ah: 19,- },- 855: {- hd: 0,- h: 19,- ah: 19,- },- 856: {- hd: 0,- h: 19,- ah: 19,- },- 857: {- hd: 0,- h: 19,- ah: 19,- },- 858: {- hd: 0,- h: 19,- ah: 19,- },- 859: {- hd: 0,- h: 19,- ah: 19,- },- 860: {- hd: 0,- h: 19,- ah: 19,- },- 861: {- hd: 0,- h: 19,- ah: 19,- },- 862: {- hd: 0,- h: 19,- ah: 19,- },- 863: {- hd: 0,- h: 19,- ah: 19,- },- 864: {- hd: 0,- h: 19,- ah: 19,- },- 865: {- hd: 0,- h: 19,- ah: 19,- },- 866: {- hd: 0,- h: 19,- ah: 19,- },- 867: {- hd: 0,- h: 19,- ah: 19,- },- 868: {- hd: 0,- h: 19,- ah: 19,- },- 869: {- hd: 0,- h: 19,- ah: 19,- },- 870: {- hd: 0,- h: 19,- ah: 19,- },- 871: {- hd: 0,- h: 19,- ah: 19,- },- 872: {- hd: 0,- h: 19,- ah: 19,- },- 873: {- hd: 0,- h: 19,- ah: 19,- },- 874: {- hd: 0,- h: 19,- ah: 19,- },- 875: {- hd: 0,- h: 19,- ah: 19,- },- 876: {- hd: 0,- h: 19,- ah: 19,- },- 877: {- hd: 0,- h: 19,- ah: 19,- },- 878: {- hd: 0,- h: 19,- ah: 19,- },- 879: {- hd: 0,- h: 19,- ah: 19,- },- 880: {- hd: 0,- h: 19,- ah: 19,- },- 881: {- hd: 0,- h: 19,- ah: 19,- },- 882: {- hd: 0,- h: 19,- ah: 19,- },- 883: {- hd: 0,- h: 19,- ah: 19,- },- 884: {- hd: 0,- h: 19,- ah: 19,- },- 885: {- hd: 0,- h: 19,- ah: 19,- },- 886: {- hd: 0,- h: 19,- ah: 19,- },- 887: {- hd: 0,- h: 19,- ah: 19,- },- 888: {- hd: 0,- h: 19,- ah: 19,- },- 889: {- hd: 0,- h: 19,- ah: 19,- },- 890: {- hd: 0,- h: 19,- ah: 19,- },- 891: {- hd: 0,- h: 19,- ah: 19,- },- 892: {- hd: 0,- h: 19,- ah: 19,- },- 893: {- hd: 0,- h: 19,- ah: 19,- },- 894: {- hd: 0,- h: 19,- ah: 19,- },- 895: {- hd: 0,- h: 19,- ah: 19,- },- 896: {- hd: 0,- h: 19,- ah: 19,- },- 897: {- hd: 0,- h: 19,- ah: 19,- },- 898: {- hd: 0,- h: 19,- ah: 19,- },- 899: {- hd: 0,- h: 19,- ah: 19,- },- 900: {- hd: 0,- h: 19,- ah: 19,- },- 901: {- hd: 0,- h: 19,- ah: 19,- },- 902: {- hd: 0,- h: 19,- ah: 19,- },- 903: {- hd: 0,- h: 19,- ah: 19,- },- 904: {- hd: 0,- h: 19,- ah: 19,- },- 905: {- hd: 0,- h: 19,- ah: 19,- },- 906: {- hd: 0,- h: 19,- ah: 19,- },- 907: {- hd: 0,- h: 19,- ah: 19,- },- 908: {- hd: 0,- h: 19,- ah: 19,- },- 909: {- hd: 0,- h: 19,- ah: 19,- },- 910: {- hd: 0,- h: 19,- ah: 19,- },- 911: {- hd: 0,- h: 19,- ah: 19,- },- 912: {- hd: 0,- h: 19,- ah: 19,- },- 913: {- hd: 0,- h: 19,- ah: 19,- },- 914: {- hd: 0,- h: 19,- ah: 19,- },- 915: {- hd: 0,- h: 19,- ah: 19,- },- 916: {- hd: 0,- h: 19,- ah: 19,- },- 917: {- hd: 0,- h: 19,- ah: 19,- },- 918: {- hd: 0,- h: 19,- ah: 19,- },- 919: {- hd: 0,- h: 19,- ah: 19,- },- 920: {- hd: 0,- h: 19,- ah: 19,- },- 921: {- hd: 0,- h: 19,- ah: 19,- },- 922: {- hd: 0,- h: 19,- ah: 19,- },- 923: {- hd: 0,- h: 19,- ah: 19,- },- 924: {- hd: 0,- h: 19,- ah: 19,- },- 925: {- hd: 0,- h: 19,- ah: 19,- },- 926: {- hd: 0,- h: 19,- ah: 19,- },- 927: {- hd: 0,- h: 19,- ah: 19,- },- 928: {- hd: 0,- h: 19,- ah: 19,- },- 929: {- hd: 0,- h: 19,- ah: 19,- },- 930: {- hd: 0,- h: 19,- ah: 19,- },- 931: {- hd: 0,- h: 19,- ah: 19,- },- 932: {- hd: 0,- h: 19,- ah: 19,- },- 933: {- hd: 0,- h: 19,- ah: 19,- },- 934: {- hd: 0,- h: 19,- ah: 19,- },- 935: {- hd: 0,- h: 19,- ah: 19,- },- 936: {- hd: 0,- h: 19,- ah: 19,- },- 937: {- hd: 0,- h: 19,- ah: 19,- },- 938: {- hd: 0,- h: 19,- ah: 19,- },- 939: {- hd: 0,- h: 19,- ah: 19,- },- 940: {- hd: 0,- h: 19,- ah: 19,- },- 941: {- hd: 0,- h: 19,- ah: 19,- },- 942: {- hd: 0,- h: 19,- ah: 19,- },- 943: {- hd: 0,- h: 19,- ah: 19,- },- 944: {- hd: 0,- h: 19,- ah: 19,- },- 945: {- hd: 0,- h: 19,- ah: 19,- },- 946: {- hd: 0,- h: 19,- ah: 19,- },- 947: {- hd: 0,- h: 19,- ah: 19,- },- 948: {- hd: 0,- h: 19,- ah: 19,- },- 949: {- hd: 0,- h: 19,- ah: 19,- },- 950: {- hd: 0,- h: 19,- ah: 19,- },- 951: {- hd: 0,- h: 19,- ah: 19,- },- 952: {- hd: 0,- h: 19,- ah: 19,- },- 953: {- hd: 0,- h: 19,- ah: 19,- },- 954: {- hd: 0,- h: 19,- ah: 19,- },- 955: {- hd: 0,- h: 19,- ah: 19,- },- 956: {- hd: 0,- h: 19,- ah: 19,- },- 957: {- hd: 0,- h: 19,- ah: 19,- },- 958: {- hd: 0,- h: 19,- ah: 19,- },- 959: {- hd: 0,- h: 19,- ah: 19,- },- 960: {- hd: 0,- h: 19,- ah: 19,- },- 961: {- hd: 0,- h: 19,- ah: 19,- },- 962: {- hd: 0,- h: 19,- ah: 19,- },- 963: {- hd: 0,- h: 19,- ah: 19,- },- 964: {- hd: 0,- h: 19,- ah: 19,- },- 965: {- hd: 0,- h: 19,- ah: 19,- },- 966: {- hd: 0,- h: 19,- ah: 19,- },- 967: {- hd: 0,- h: 19,- ah: 19,- },- 968: {- hd: 0,- h: 19,- ah: 19,- },- 969: {- hd: 0,- h: 19,- ah: 19,- },- 970: {- hd: 0,- h: 19,- ah: 19,- },- 971: {- hd: 0,- h: 19,- ah: 19,- },- 972: {- hd: 0,- h: 19,- ah: 19,- },- 973: {- hd: 0,- h: 19,- ah: 19,- },- 974: {- hd: 0,- h: 19,- ah: 19,- },- 975: {- hd: 0,- h: 19,- ah: 19,- },- 976: {- hd: 0,- h: 19,- ah: 19,- },- 977: {- hd: 0,- h: 19,- ah: 19,- },- 978: {- hd: 0,- h: 19,- ah: 19,- },- 979: {- hd: 0,- h: 19,- ah: 19,- },- 980: {- hd: 0,- h: 19,- ah: 19,- },- 981: {- hd: 0,- h: 19,- ah: 19,- },- 982: {- hd: 0,- h: 19,- ah: 19,- },- 983: {- hd: 0,- h: 19,- ah: 19,- },- 984: {- hd: 0,- h: 19,- ah: 19,- },- 985: {- hd: 0,- h: 19,- ah: 19,- },- 986: {- hd: 0,- h: 19,- ah: 19,- },- 987: {- hd: 0,- h: 19,- ah: 19,- },- 988: {- hd: 0,- h: 19,- ah: 19,- },- 989: {- hd: 0,- h: 19,- ah: 19,- },- 990: {- hd: 0,- h: 19,- ah: 19,- },- 991: {- hd: 0,- h: 19,- ah: 19,- },- 992: {- hd: 0,- h: 19,- ah: 19,- },- 993: {- hd: 0,- h: 19,- ah: 19,- },- 994: {- hd: 0,- h: 19,- ah: 19,- },- 995: {- hd: 0,- h: 19,- ah: 19,- },- 996: {- hd: 0,- h: 19,- ah: 19,- },- 997: {- hd: 0,- h: 19,- ah: 19,- },- 998: {- hd: 0,- h: 19,- ah: 19,- },- 999: {- hd: 0,- h: 19,- ah: 19,- },- 1000: {- hd: 0,- h: 19,- ah: 19,- },- },- columnData: {- 1: {- w: 246,- hd: 0,- },- },- showGridlines: 1,- rowHeader: {- width: 46,- hidden: 0,- },- columnHeader: {- height: 20,- hidden: 0,- },- rightToLeft: 0,- },- },-};diff --git a/common/shared/tsdown/data/peer-deps.ts b/common/shared/tsdown/data/peer-deps.tsindex 169682c78d..f37b9f444c 100644--- a/common/shared/tsdown/data/peer-deps.ts+++ b/common/shared/tsdown/data/peer-deps.ts@@ -39,11 +39,6 @@ export const peerDepsMap = {name: '@wendellhu/redi',version: '@wendellhu/redi',},- 'monaco-editor': {- global: 'monaco',- name: 'monaco-editor',- version: '>=0.50.0',- },vue: {global: 'Vue',name: 'vue',diff --git a/examples/esbuild.config.mts b/examples/esbuild.config.mtsindex 253aa0a9ed..107f704a9b 100644--- a/examples/esbuild.config.mts+++ b/examples/esbuild.config.mts@@ -4,7 +4,7 @@ import detect from 'detect-port';import esbuild from 'esbuild';import minimist from 'minimist';import { createBuildConfig } from './scripts/esbuild/build-config.mts';-import { monacoBuildTask, nodeBuildTask } from './scripts/esbuild/build-tasks.mts';+import { nodeBuildTask } from './scripts/esbuild/build-tasks.mts';import { createLogger, formatDuration } from './scripts/esbuild/logger.mts';const args = minimist(process.argv.slice(2));@@ -76,8 +76,6 @@ async function main() {all: !!args.all,});- await monacoBuildTask();-if (args.watch) {const watchStatus = createWatchStatusPlugin();config.plugins?.push(watchStatus.plugin);diff --git a/examples/package.json b/examples/package.jsonindex 624752adad..45628b80bc 100644--- a/examples/package.json+++ b/examples/package.json@@ -91,10 +91,8 @@"@univerjs/ui": "workspace:*","@univerjs/ui-adapter-vue3": "workspace:*","@univerjs/ui-adapter-web-component": "workspace:*",- "@univerjs/uniscript": "workspace:*","@univerjs/watermark": "workspace:*","lit": "^3.3.3",- "monaco-editor": "0.55.1","react": "19.2.7","react-dom": "19.2.7","react-mosaic-component": "^6.2.0",diff --git a/examples/scripts/esbuild/build-tasks.mts b/examples/scripts/esbuild/build-tasks.mtsindex 5c998e6803..5ef795f0ae 100644--- a/examples/scripts/esbuild/build-tasks.mts+++ b/examples/scripts/esbuild/build-tasks.mts@@ -1,30 +1,4 @@import esbuild from 'esbuild';-import cleanPlugin from 'esbuild-plugin-clean';--export function monacoBuildTask() {- const monacoEditorEntryPoints = [- 'vs/language/json/json.worker.js',- 'vs/language/css/css.worker.js',- 'vs/language/html/html.worker.js',- 'vs/language/typescript/ts.worker.js',- 'vs/editor/editor.worker.js',- ];-- return esbuild.build({- entryPoints: monacoEditorEntryPoints.map((entry) => `./node_modules/monaco-editor/esm/${entry}`),- bundle: true,- color: true,- target: 'chrome70',- format: 'iife',- outbase: './node_modules/monaco-editor/esm/',- outdir: './local',- plugins: [- cleanPlugin({- patterns: ['./local'],- }),- ],- });-}export function nodeBuildTask() {return esbuild.build({diff --git a/examples/src/docs-uniscript/main.ts b/examples/src/docs-uniscript/main.tsdeleted file mode 100644index 9277ffa7fc..0000000000--- a/examples/src/docs-uniscript/main.ts+++ /dev/null@@ -1,59 +0,0 @@-import { LocaleType, LogLevel, Univer, UniverInstanceType } from '@univerjs/core';-import { UniverDocsPlugin } from '@univerjs/docs';-import { UniverDocsUIPlugin } from '@univerjs/docs-ui';-import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';-import { UniverRenderEnginePlugin } from '@univerjs/engine-render';-import { DEFAULT_DOCUMENT_DATA_CN } from '@univerjs/mockdata';-import zhCN from '@univerjs/mockdata/locales/zh-CN';-import { UniverSheetsPlugin } from '@univerjs/sheets';-import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui';-import { UniverUIPlugin } from '@univerjs/ui';-import { UniverUniscriptPlugin } from '@univerjs/uniscript';-import '../global.css';--// univer-const univer = new Univer({- locale: LocaleType.ZH_CN,- locales: {- [LocaleType.ZH_CN]: zhCN,- },- logLevel: LogLevel.VERBOSE,-});--// core plugins--univer.registerPlugin(UniverRenderEnginePlugin);-univer.registerPlugin(UniverFormulaEnginePlugin);-univer.registerPlugin(UniverUIPlugin, {- container: 'app',- ribbonType: 'classic',- footer: false,-});--univer.registerPlugin(UniverDocsPlugin);-univer.registerPlugin(UniverDocsUIPlugin);--univer.registerPlugin(UniverSheetsPlugin);-univer.registerPlugin(UniverSheetsUIPlugin);--univer.registerPlugin(UniverUniscriptPlugin, {- getWorkerUrl(moduleID: string, label: string) {- if (label === 'typescript' || label === 'javascript') {- return '/vs/language/typescript/ts.worker.js';- }-- return '/vs/editor/editor.worker.js';- },-});--// create univer doc instance-univer.createUnit(UniverInstanceType.UNIVER_DOC, DEFAULT_DOCUMENT_DATA_CN);--declare global {-- interface Window {- univer?: Univer;- }-}--window.univer = univer;diff --git a/examples/src/sheets-multi-units/very-lazy.ts b/examples/src/sheets-multi-units/very-lazy.tsindex 05d0e8dcc8..dc7981aca4 100644--- a/examples/src/sheets-multi-units/very-lazy.ts+++ b/examples/src/sheets-multi-units/very-lazy.ts@@ -7,7 +7,6 @@ import { UniverSheetsCrosshairHighlightPlugin } from '@univerjs/sheets-crosshairimport { UniverSheetsFindReplacePlugin } from '@univerjs/sheets-find-replace';import { UniverSheetsHyperLinkUIPlugin } from '@univerjs/sheets-hyper-link-ui';import { UniverSheetsSortUIPlugin } from '@univerjs/sheets-sort-ui';-import { UniverUniscriptPlugin } from '@univerjs/uniscript';import { UniverWatermarkPlugin } from '@univerjs/watermark';/* eslint-disable-next-line node/prefer-global/process */@@ -29,23 +28,6 @@ export default function getVeryLazyPlugins() {fabEntryUnitType: UniverInstanceType.UNIVER_SHEET,localeLoader: loadDebuggerLocale,}]);- plugins.push([UniverUniscriptPlugin, {- getWorkerUrl(_: string, label: string) {- if (label === 'json') {- return '/vs/language/json/json.worker.js';- }- if (label === 'css' || label === 'scss' || label === 'less') {- return '/vs/language/css/css.worker.js';- }- if (label === 'html' || label === 'handlebars' || label === 'razor') {- return '/vs/language/html/html.worker.js';- }- if (label === 'typescript' || label === 'javascript') {- return '/vs/language/typescript/ts.worker.js';- }- return '/vs/editor/editor.worker.js';- },- }]);}return plugins;diff --git a/examples/src/sheets-no-worker/very-lazy.ts b/examples/src/sheets-no-worker/very-lazy.tsindex 0c5d054c8f..7c75b6f217 100644--- a/examples/src/sheets-no-worker/very-lazy.ts+++ b/examples/src/sheets-no-worker/very-lazy.ts@@ -7,7 +7,6 @@ import { UniverSheetsCrosshairHighlightPlugin } from '@univerjs/sheets-crosshairimport { UniverSheetsFindReplacePlugin } from '@univerjs/sheets-find-replace';import { UniverSheetsHyperLinkUIPlugin } from '@univerjs/sheets-hyper-link-ui';import { UniverSheetsSortUIPlugin } from '@univerjs/sheets-sort-ui';-import { UniverUniscriptPlugin } from '@univerjs/uniscript';import { UniverWatermarkPlugin } from '@univerjs/watermark';/* eslint-disable-next-line node/prefer-global/process */@@ -28,23 +27,6 @@ export default function getVeryLazyPlugins() {fabEntryUnitType: UniverInstanceType.UNIVER_SHEET,localeLoader: loadDebuggerLocale,}]);- plugins.push([UniverUniscriptPlugin, {- getWorkerUrl(_: string, label: string) {- if (label === 'json') {- return '/vs/language/json/json.worker.js';- }- if (label === 'css' || label === 'scss' || label === 'less') {- return '/vs/language/css/css.worker.js';- }- if (label === 'html' || label === 'handlebars' || label === 'razor') {- return '/vs/language/html/html.worker.js';- }- if (label === 'typescript' || label === 'javascript') {- return '/vs/language/typescript/ts.worker.js';- }- return '/vs/editor/editor.worker.js';- },- }]);}return plugins;diff --git a/examples/src/sheets-uniscript/change-font-style.js b/examples/src/sheets-uniscript/change-font-style.jsdeleted file mode 100644index ecae8c0735..0000000000--- a/examples/src/sheets-uniscript/change-font-style.js+++ /dev/null@@ -1,12 +0,0 @@-// eslint-disable-next-line no-undef-const activeSheet = univerAPI.getActiveWorkbook().getActiveSheet();--// Set A1:B2 to bold-activeSheet.getRange(0, 0, 2, 2).setFontWeight('bold');-// Set B2 to normal-activeSheet.getRange(1, 1, 1, 1).setFontWeight('normal');--setTimeout(() => {- // reset A1 to normal- activeSheet.getRange(0, 0, 1, 1).setFontWeight(null);-}, 3000);diff --git a/examples/src/sheets-uniscript/china-id-validation.js b/examples/src/sheets-uniscript/china-id-validation.jsdeleted file mode 100644index 9b9150a088..0000000000--- a/examples/src/sheets-uniscript/china-id-validation.js+++ /dev/null@@ -1,61 +0,0 @@-const mutliNum = (function generate() {- const obj = {};- for (let i = 0, len = 17; i < len; i++) {- obj[i] = 2 ** (17 - i) % 11;- }- return obj;-})();--const xCodeMap = {- 0: '1',- 1: '0',- 2: 'X',- 3: '9',- 4: '8',- 5: '7',- 6: '6',- 7: '5',- 8: '4',- 9: '3',- 10: '2',-};--function getXCode(szID) {- let sum = 0;- for (let i = 0, len = szID.length - 1; i < len; i++) {- sum += szID[i] * mutliNum[i];- }- let xCode = sum % 11;- xCode = xCodeMap[xCode];- return xCode === 10 ? 'X' : `${xCode}`;-}--function validIDNum(szID) {- if (szID.length !== 18) {- return false;- }-- const xCode = getXCode(szID);- return xCode === szID[17];-}--const redColor = 'rgb(240, 55, 31)';--// eslint-disable-next-line no-undef-const activeSheet = univerAPI.getActiveWorkbook().getActiveSheet();-const range = activeSheet.getRange(1, 1, 50, 1);-const row = range.getRow();-const col = range.getColumn();-const width = range.getWidth();-const height = range.getHeight();--for (let i = row; i < row + height; i++) {- for (let j = col; j < col + width; j++) {- const range = activeSheet.getRange(i, j);- const ID = range.getValue();- const valid = validIDNum(ID);- if (!valid) {- range.setBackgroundColor(redColor);- }- }-}diff --git a/examples/src/sheets-uniscript/data.csv b/examples/src/sheets-uniscript/data.csvdeleted file mode 100644index b1760bc2f7..0000000000--- a/examples/src/sheets-uniscript/data.csv+++ /dev/null@@ -1,50 +0,0 @@-450102201206029128-513432197805297321-150921200908152312-130284198501223311-411302191512060332-530302200705223757-421022202011146252-511303201005152984-410328190806183731-210702199706180877-41160219400414015X-330402200511254203-130304196701219661-140525193406079919-320213196005272238-130424190507184649-110109198003098379-370523196008305312-130109198711252473-230826197805195696-110102192312179736-210421193312166736-231225193702115941-45051219831211828X-420582200110037899-440781200705121895-210181202108283662-542524193702277071-621224197212056250-330782191802278404-371721190703175961-220381190508028684-130827193105286903-211402191902052424-361103194408040678-53060220090601283X-610527200702042860-330522192507165367-53042819220323997X-441882200010310529-451203193210269517-150783196409272159-520502201011045072-210602201411137294-230826190408047620-42112619330124831X-441623193701203446-522626191402037426-63272219160509096X-370705195105122060diff --git a/examples/src/sheets-uniscript/draw-univer-logo.js b/examples/src/sheets-uniscript/draw-univer-logo.jsdeleted file mode 100644index 2594e6b4cd..0000000000--- a/examples/src/sheets-uniscript/draw-univer-logo.js+++ /dev/null@@ -1,1536 +0,0 @@-/* eslint-disable */--const newSheet = univerAPI.getActiveWorkbook().create("Draw Univer Logo", 80, 80);-newSheet.setRowHeights(0, 80, 6);-newSheet.setColumnWidths(0, 80, 6);--let colors = [- { row: 9, col: 27, rgb: '#D9D7F8' },- { row: 9, col: 28, rgb: '#D5D4F7' },- { row: 10, col: 26, rgb: '#A9A4EE' },- { row: 10, col: 27, rgb: '#120ED2' },- { row: 10, col: 28, rgb: '#1D1AD5' },- { row: 10, col: 29, rgb: '#EEEEFC' },- { row: 11, col: 25, rgb: '#ADA9EF' },- { row: 11, col: 26, rgb: '#0A04D0' },- { row: 11, col: 27, rgb: '#0000CF' },- { row: 11, col: 28, rgb: '#6D6CE4' },- { row: 11, col: 29, rgb: '#F9F9FE' },- { row: 12, col: 24, rgb: '#DBDAF8' },- { row: 12, col: 25, rgb: '#1A12D3' },- { row: 12, col: 26, rgb: '#0000CF' },- { row: 12, col: 27, rgb: '#7E7DE7' },- { row: 13, col: 24, rgb: '#5B53DF' },- { row: 13, col: 25, rgb: '#0000CD' },- { row: 13, col: 26, rgb: '#5754DF' },- { row: 13, col: 27, rgb: '#FEFEFF' },- { row: 14, col: 23, rgb: '#B9B5F1' },- { row: 14, col: 24, rgb: '#0601CF' },- { row: 14, col: 25, rgb: '#1713D3' },- { row: 14, col: 26, rgb: '#DCDCF8' },- { row: 15, col: 22, rgb: '#F6F5FD' },- { row: 15, col: 23, rgb: '#382FD9' },- { row: 15, col: 24, rgb: '#0000CE' },- { row: 15, col: 25, rgb: '#8784E8' },- { row: 15, col: 28, rgb: '#FBFCFE' },- { row: 15, col: 29, rgb: '#FDFDFF' },- { row: 16, col: 22, rgb: '#928CEA' },- { row: 16, col: 23, rgb: '#0000CE' },- { row: 16, col: 24, rgb: '#2F2BD8' },- { row: 16, col: 25, rgb: '#F1F1FC' },- { row: 16, col: 27, rgb: '#D2D4F7' },- { row: 16, col: 28, rgb: '#3542DC' },- { row: 16, col: 29, rgb: '#404FDF' },- { row: 16, col: 30, rgb: '#DEE1F9' },- { row: 17, col: 21, rgb: '#E3E1F9' },- { row: 17, col: 22, rgb: '#1D15D4' },- { row: 17, col: 23, rgb: '#0301CF' },- { row: 17, col: 24, rgb: '#AEADF0' },- { row: 17, col: 26, rgb: '#FBFBFE' },- { row: 17, col: 27, rgb: '#4650DF' },- { row: 17, col: 28, rgb: '#000FD3' },- { row: 17, col: 29, rgb: '#0011D3' },- { row: 17, col: 30, rgb: '#919CED' },- { row: 18, col: 21, rgb: '#6962E2' },- { row: 18, col: 22, rgb: '#0000CD' },- { row: 18, col: 23, rgb: '#504DDE' },- { row: 18, col: 24, rgb: '#FDFDFF' },- { row: 18, col: 26, rgb: '#A4A9EF' },- { row: 18, col: 27, rgb: '#0212D4' },- { row: 18, col: 28, rgb: '#071DD5' },- { row: 18, col: 29, rgb: '#0E28D8' },- { row: 18, col: 30, rgb: '#CDD3F7' },- { row: 19, col: 20, rgb: '#C6C3F4' },- { row: 19, col: 21, rgb: '#0B05D0' },- { row: 19, col: 22, rgb: '#100DD2' },- { row: 19, col: 23, rgb: '#D1D0F6' },- { row: 19, col: 25, rgb: '#EDEEFC' },- { row: 19, col: 26, rgb: '#2834DA' },- { row: 19, col: 27, rgb: '#0518D5' },- { row: 19, col: 28, rgb: '#0019D5' },- { row: 19, col: 29, rgb: '#7484E9' },- { row: 20, col: 19, rgb: '#FAFAFE' },- { row: 20, col: 20, rgb: '#443CDB' },- { row: 20, col: 21, rgb: '#0000CE' },- { row: 20, col: 22, rgb: '#7775E5' },- { row: 20, col: 25, rgb: '#7C83E8' },- { row: 20, col: 26, rgb: '#0011D4' },- { row: 20, col: 27, rgb: '#051CD5' },- { row: 20, col: 28, rgb: '#223BDB' },- { row: 20, col: 29, rgb: '#E9ECFB' },- { row: 20, col: 52, rgb: '#F5FAFE' },- { row: 20, col: 53, rgb: '#EEF8FD' },- { row: 20, col: 54, rgb: '#F5FAFE' },- { row: 21, col: 19, rgb: '#A19CED' },- { row: 21, col: 20, rgb: '#0100CE' },- { row: 21, col: 21, rgb: '#2522D6' },- { row: 21, col: 22, rgb: '#EAEAFB' },- { row: 21, col: 24, rgb: '#D4D7F8' },- { row: 21, col: 25, rgb: '#1221D6' },- { row: 21, col: 26, rgb: '#071CD5' },- { row: 21, col: 27, rgb: '#011CD6' },- { row: 21, col: 28, rgb: '#9CA8EF' },- { row: 21, col: 33, rgb: '#EAEFFC' },- { row: 21, col: 34, rgb: '#ECF0FC' },- { row: 21, col: 49, rgb: '#DCEFFC' },- { row: 21, col: 50, rgb: '#87C8F6' },- { row: 21, col: 51, rgb: '#44ADF1' },- { row: 21, col: 52, rgb: '#24A1ED' },- { row: 21, col: 53, rgb: '#1C9EEA' },- { row: 21, col: 54, rgb: '#24A2E8' },- { row: 21, col: 55, rgb: '#44B1E9' },- { row: 21, col: 56, rgb: '#87CDEF' },- { row: 21, col: 57, rgb: '#DDF1FA' },- { row: 22, col: 18, rgb: '#EBEAFB' },- { row: 22, col: 19, rgb: '#261ED6' },- { row: 22, col: 20, rgb: '#0100CF' },- { row: 22, col: 21, rgb: '#9F9FED' },- { row: 22, col: 23, rgb: '#FEFEFF' },- { row: 22, col: 24, rgb: '#545EE1' },- { row: 22, col: 25, rgb: '#0114D4' },- { row: 22, col: 26, rgb: '#021BD5' },- { row: 22, col: 27, rgb: '#4056E0' },- { row: 22, col: 28, rgb: '#F9FAFE' },- { row: 22, col: 31, rgb: '#FBFCFE' },- { row: 22, col: 32, rgb: '#7694EC' },- { row: 22, col: 33, rgb: '#184EDF' },- { row: 22, col: 34, rgb: '#1A54E0' },- { row: 22, col: 35, rgb: '#7FA2EE' },- { row: 22, col: 36, rgb: '#FCFDFF' },- { row: 22, col: 47, rgb: '#F7FBFE' },- { row: 22, col: 48, rgb: '#7FC2F5' },- { row: 22, col: 49, rgb: '#1290ED' },- { row: 22, col: 50, rgb: '#008BEC' },- { row: 22, col: 51, rgb: '#008FEB' },- { row: 22, col: 52, rgb: '#0092E8' },- { row: 22, col: 53, rgb: '#0093E5' },- { row: 22, col: 54, rgb: '#0094E2' },- { row: 22, col: 55, rgb: '#0094DF' },- { row: 22, col: 56, rgb: '#0093DB' },- { row: 22, col: 57, rgb: '#139EDC' },- { row: 22, col: 58, rgb: '#82CCEB' },- { row: 22, col: 59, rgb: '#F8FCFE' },- { row: 22, col: 65, rgb: '#FEFFFF' },- { row: 22, col: 66, rgb: '#F9FDFD' },- { row: 23, col: 18, rgb: '#7872E5' },- { row: 23, col: 19, rgb: '#0000CE' },- { row: 23, col: 20, rgb: '#4341DC' },- { row: 23, col: 21, rgb: '#FAFAFE' },- { row: 23, col: 23, rgb: '#B2B7F2' },- { row: 23, col: 24, rgb: '#0516D4' },- { row: 23, col: 25, rgb: '#071ED6' },- { row: 23, col: 26, rgb: '#0924D8' },- { row: 23, col: 27, rgb: '#C2CAF5' },- { row: 23, col: 31, rgb: '#9AAFF0' },- { row: 23, col: 32, rgb: '#0036DB' },- { row: 23, col: 33, rgb: '#0441DD' },- { row: 23, col: 34, rgb: '#0346DE' },- { row: 23, col: 35, rgb: '#0046DF' },- { row: 23, col: 36, rgb: '#B2C9F5' },- { row: 23, col: 46, rgb: '#EFF7FD' },- { row: 23, col: 47, rgb: '#4CA8F0' },- { row: 23, col: 48, rgb: '#0083EB' },- { row: 23, col: 49, rgb: '#018DEC' },- { row: 23, col: 50, rgb: '#0492EC' },- { row: 23, col: 51, rgb: '#0493EA' },- { row: 23, col: 52, rgb: '#0394E7' },- { row: 23, col: 53, rgb: '#0395E4' },- { row: 23, col: 54, rgb: '#0397E1' },- { row: 23, col: 55, rgb: '#0397DE' },- { row: 23, col: 56, rgb: '#0398DB' },- { row: 23, col: 57, rgb: '#0098D7' },- { row: 23, col: 58, rgb: '#0096D3' },- { row: 23, col: 59, rgb: '#4EB9DF' },- { row: 23, col: 60, rgb: '#F1F9FC' },- { row: 23, col: 64, rgb: '#E7F6F9' },- { row: 23, col: 65, rgb: '#44BAD1' },- { row: 23, col: 66, rgb: '#2AAFC8' },- { row: 23, col: 67, rgb: '#BBE6ED' },- { row: 24, col: 17, rgb: '#D2D0F6' },- { row: 24, col: 18, rgb: '#100AD2' },- { row: 24, col: 19, rgb: '#0A08D1' },- { row: 24, col: 20, rgb: '#C5C4F4' },- { row: 24, col: 22, rgb: '#F3F4FD' },- { row: 24, col: 23, rgb: '#323FDC' },- { row: 24, col: 24, rgb: '#0418D5' },- { row: 24, col: 25, rgb: '#001AD6' },- { row: 24, col: 26, rgb: '#6477E6' },- { row: 24, col: 30, rgb: '#E7ECFB' },- { row: 24, col: 31, rgb: '#1F50DF' },- { row: 24, col: 32, rgb: '#043FDD' },- { row: 24, col: 33, rgb: '#0847DE' },- { row: 24, col: 34, rgb: '#074CDF' },- { row: 24, col: 35, rgb: '#0048DF' },- { row: 24, col: 36, rgb: '#83A9F0' },- { row: 24, col: 45, rgb: '#FBFDFF' },- { row: 24, col: 46, rgb: '#55ABF1' },- { row: 24, col: 47, rgb: '#0081EA' },- { row: 24, col: 48, rgb: '#048CEC' },- { row: 24, col: 49, rgb: '#0491ED' },- { row: 24, col: 50, rgb: '#0493EB' },- { row: 24, col: 51, rgb: '#0494E8' },- { row: 24, col: 52, rgb: '#0194E4' },- { row: 24, col: 53, rgb: '#0095E2' },- { row: 24, col: 54, rgb: '#0196DF' },- { row: 24, col: 55, rgb: '#0398DC' },- { row: 24, col: 56, rgb: '#0499D9' },- { row: 24, col: 57, rgb: '#039AD6' },- { row: 24, col: 58, rgb: '#029BD3' },- { row: 24, col: 59, rgb: '#0097CD' },- { row: 24, col: 60, rgb: '#57BEDE' },- { row: 24, col: 61, rgb: '#FCFEFE' },- { row: 24, col: 64, rgb: '#A5DEE9' },- { row: 24, col: 65, rgb: '#009BBB' },- { row: 24, col: 66, rgb: '#00A0BB' },- { row: 24, col: 67, rgb: '#19ACC0' },- { row: 24, col: 68, rgb: '#DFF4F6' },- { row: 25, col: 16, rgb: '#FDFDFF' },- { row: 25, col: 17, rgb: '#524ADE' },- { row: 25, col: 18, rgb: '#0000CE' },- { row: 25, col: 19, rgb: '#6867E3' },- { row: 25, col: 22, rgb: '#8B92EB' },- { row: 25, col: 23, rgb: '#0013D4' },- { row: 25, col: 24, rgb: '#061ED6' },- { row: 25, col: 25, rgb: '#1934DB' },- { row: 25, col: 26, rgb: '#E0E4FA' },- { row: 25, col: 30, rgb: '#708FEB' },- { row: 25, col: 31, rgb: '#0039DB' },- { row: 25, col: 32, rgb: '#0846DE' },- { row: 25, col: 33, rgb: '#074ADF' },- { row: 25, col: 34, rgb: '#064EE0' },- { row: 25, col: 35, rgb: '#0551E0' },- { row: 25, col: 36, rgb: '#BDD2F7' },- { row: 25, col: 45, rgb: '#9BCDF6' },- { row: 25, col: 46, rgb: '#0081EA' },- { row: 25, col: 47, rgb: '#038AEC' },- { row: 25, col: 48, rgb: '#048FED' },- { row: 25, col: 49, rgb: '#0493EC' },- { row: 25, col: 50, rgb: '#0293E9' },- { row: 25, col: 51, rgb: '#0091E5' },- { row: 25, col: 52, rgb: '#0897E3' },- { row: 25, col: 53, rgb: '#159EE2' },- { row: 25, col: 54, rgb: '#0899DD' },- { row: 25, col: 55, rgb: '#0095D9' },- { row: 25, col: 56, rgb: '#0299D7' },- { row: 25, col: 57, rgb: '#029BD4' },- { row: 25, col: 58, rgb: '#029CD1' },- { row: 25, col: 59, rgb: '#019CCE' },- { row: 25, col: 60, rgb: '#009BCA' },- { row: 25, col: 61, rgb: '#A0DBEB' },- { row: 25, col: 64, rgb: '#DFF3F7' },- { row: 25, col: 65, rgb: '#1DACC5' },- { row: 25, col: 66, rgb: '#00A2BA' },- { row: 25, col: 67, rgb: '#00A1B5' },- { row: 25, col: 68, rgb: '#5DC6D0' },- { row: 26, col: 16, rgb: '#AFACEF' },- { row: 26, col: 17, rgb: '#0400CF' },- { row: 26, col: 18, rgb: '#1C1AD4' },- { row: 26, col: 19, rgb: '#E2E2FA' },- { row: 26, col: 21, rgb: '#DFE0F9' },- { row: 26, col: 22, rgb: '#1929D8' },- { row: 26, col: 23, rgb: '#061CD5' },- { row: 26, col: 24, rgb: '#001BD6' },- { row: 26, col: 25, rgb: '#8D9BED' },- { row: 26, col: 29, rgb: '#CCD7F8' },- { row: 26, col: 30, rgb: '#0C42DD' },- { row: 26, col: 31, rgb: '#0643DD' },- { row: 26, col: 32, rgb: '#0849DE' },- { row: 26, col: 33, rgb: '#074DE0' },- { row: 26, col: 34, rgb: '#004BDF' },- { row: 26, col: 35, rgb: '#588DEB' },- { row: 26, col: 36, rgb: '#FEFEFF' },- { row: 26, col: 44, rgb: '#E8F4FD' },- { row: 26, col: 45, rgb: '#1E91EC' },- { row: 26, col: 46, rgb: '#0186EB' },- { row: 26, col: 47, rgb: '#048EEC' },- { row: 26, col: 48, rgb: '#0492EC' },- { row: 26, col: 49, rgb: '#0292EA' },- { row: 26, col: 50, rgb: '#0896E7' },- { row: 26, col: 51, rgb: '#77C5F0' },- { row: 26, col: 52, rgb: '#D2ECFA' },- { row: 26, col: 53, rgb: '#E8F5FC' },- { row: 26, col: 54, rgb: '#D1ECF8' },- { row: 26, col: 55, rgb: '#74C7E9' },- { row: 26, col: 56, rgb: '#069BD5' },- { row: 26, col: 57, rgb: '#019BD2' },- { row: 26, col: 58, rgb: '#029CCF' },- { row: 26, col: 59, rgb: '#029ECC' },- { row: 26, col: 60, rgb: '#009CC8' },- { row: 26, col: 61, rgb: '#2BAFD0' },- { row: 26, col: 62, rgb: '#F6FCFD' },- { row: 26, col: 65, rgb: '#B1E3EA' },- { row: 26, col: 66, rgb: '#03A3B9' },- { row: 26, col: 67, rgb: '#00A4B6' },- { row: 26, col: 68, rgb: '#07A8B5' },- { row: 26, col: 69, rgb: '#D4F0F2' },- { row: 27, col: 15, rgb: '#F2F1FC' },- { row: 27, col: 16, rgb: '#3029D8' },- { row: 27, col: 17, rgb: '#0000CE' },- { row: 27, col: 18, rgb: '#9090EA' },- { row: 27, col: 21, rgb: '#636DE4' },- { row: 27, col: 22, rgb: '#0014D4' },- { row: 27, col: 23, rgb: '#031DD6' },- { row: 27, col: 24, rgb: '#334CDF' },- { row: 27, col: 25, rgb: '#F4F6FD' },- { row: 27, col: 28, rgb: '#FCFDFE' },- { row: 27, col: 29, rgb: '#4971E5' },- { row: 27, col: 30, rgb: '#003CDC' },- { row: 27, col: 31, rgb: '#0847DE' },- { row: 27, col: 32, rgb: '#074CDF' },- { row: 27, col: 33, rgb: '#044EE0' },- { row: 27, col: 34, rgb: '#125CE2' },- { row: 27, col: 35, rgb: '#D8E5FA' },- { row: 27, col: 44, rgb: '#70B9F3' },- { row: 27, col: 45, rgb: '#0082EA' },- { row: 27, col: 46, rgb: '#048CEC' },- { row: 27, col: 47, rgb: '#0491ED' },- { row: 27, col: 48, rgb: '#0392EB' },- { row: 27, col: 49, rgb: '#0292E8' },- { row: 27, col: 50, rgb: '#9FD6F5' },- { row: 27, col: 56, rgb: '#9AD7ED' },- { row: 27, col: 57, rgb: '#029BCF' },- { row: 27, col: 58, rgb: '#019DCD' },- { row: 27, col: 59, rgb: '#029FCB' },- { row: 27, col: 60, rgb: '#019FC8' },- { row: 27, col: 61, rgb: '#019FC5' },- { row: 27, col: 62, rgb: '#C0E7F0' },- { row: 27, col: 66, rgb: '#44BDCA' },- { row: 27, col: 67, rgb: '#00A3B3' },- { row: 27, col: 68, rgb: '#00A3AF' },- { row: 27, col: 69, rgb: '#83D4D9' },- { row: 28, col: 15, rgb: '#8883E8' },- { row: 28, col: 16, rgb: '#0000CE' },- { row: 28, col: 17, rgb: '#3735DA' },- { row: 28, col: 18, rgb: '#F5F5FD' },- { row: 28, col: 20, rgb: '#C0C4F4' },- { row: 28, col: 21, rgb: '#091BD5' },- { row: 28, col: 22, rgb: '#071FD6' },- { row: 28, col: 23, rgb: '#0521D7' },- { row: 28, col: 24, rgb: '#B5BEF3' },- { row: 28, col: 28, rgb: '#A8BBF3' },- { row: 28, col: 29, rgb: '#023BDC' },- { row: 28, col: 30, rgb: '#0845DE' },- { row: 28, col: 31, rgb: '#074ADF' },- { row: 28, col: 32, rgb: '#074EE0' },- { row: 28, col: 33, rgb: '#004CDF' },- { row: 28, col: 34, rgb: '#80A9EF' },- { row: 28, col: 43, rgb: '#CDE6FB' },- { row: 28, col: 44, rgb: '#0B88EB' },- { row: 28, col: 45, rgb: '#0289EB' },- { row: 28, col: 46, rgb: '#048FED' },- { row: 28, col: 47, rgb: '#0492EC' },- { row: 28, col: 48, rgb: '#008FE8' },- { row: 28, col: 49, rgb: '#54B6EE' },- { row: 28, col: 57, rgb: '#3FB5DA' },- { row: 28, col: 58, rgb: '#009CCA' },- { row: 28, col: 59, rgb: '#029FC9' },- { row: 28, col: 60, rgb: '#02A0C7' },- { row: 28, col: 61, rgb: '#009DC1' },- { row: 28, col: 62, rgb: '#88D3E2' },- { row: 28, col: 66, rgb: '#9BDCE2' },- { row: 28, col: 67, rgb: '#00A3B0' },- { row: 28, col: 68, rgb: '#00A5AE' },- { row: 28, col: 69, rgb: '#46C0C5' },- { row: 29, col: 14, rgb: '#DDDBF8' },- { row: 29, col: 15, rgb: '#1712D3' },- { row: 29, col: 16, rgb: '#0605D0' },- { row: 29, col: 17, rgb: '#B7B7F2' },- { row: 29, col: 19, rgb: '#F8F9FE' },- { row: 29, col: 20, rgb: '#3E4BDE' },- { row: 29, col: 21, rgb: '#0318D5' },- { row: 29, col: 22, rgb: '#001CD6' },- { row: 29, col: 23, rgb: '#566BE4' },- { row: 29, col: 24, rgb: '#FEFFFF' },- { row: 29, col: 27, rgb: '#EFF2FD' },- { row: 29, col: 28, rgb: '#2959E1' },- { row: 29, col: 29, rgb: '#033FDC' },- { row: 29, col: 30, rgb: '#0848DE' },- { row: 29, col: 31, rgb: '#074DE0' },- { row: 29, col: 32, rgb: '#024DE0' },- { row: 29, col: 33, rgb: '#296DE5' },- { row: 29, col: 34, rgb: '#F0F5FD' },- { row: 29, col: 42, rgb: '#FCFEFF' },- { row: 29, col: 43, rgb: '#49A6F0' },- { row: 29, col: 44, rgb: '#0084EB' },- { row: 29, col: 45, rgb: '#048DEC' },- { row: 29, col: 46, rgb: '#0491ED' },- { row: 29, col: 47, rgb: '#0292EA' },- { row: 29, col: 48, rgb: '#0F98E8' },- { row: 29, col: 49, rgb: '#D6EEFB' },- { row: 29, col: 57, rgb: '#7FCEE5' },- { row: 29, col: 58, rgb: '#009BC8' },- { row: 29, col: 59, rgb: '#029FC7' },- { row: 29, col: 60, rgb: '#02A0C5' },- { row: 29, col: 61, rgb: '#009DBF' },- { row: 29, col: 62, rgb: '#6BC9DA' },- { row: 29, col: 66, rgb: '#CBEDEF' },- { row: 29, col: 67, rgb: '#02A7B2' },- { row: 29, col: 68, rgb: '#00A6AD' },- { row: 29, col: 69, rgb: '#28B6B9' },- { row: 29, col: 70, rgb: '#F9FDFD' },- { row: 30, col: 14, rgb: '#605AE1' },- { row: 30, col: 15, rgb: '#0000CD' },- { row: 30, col: 16, rgb: '#5959E0' },- { row: 30, col: 19, rgb: '#9AA1EE' },- { row: 30, col: 20, rgb: '#0115D4' },- { row: 30, col: 21, rgb: '#0620D6' },- { row: 30, col: 22, rgb: '#122EDA' },- { row: 30, col: 23, rgb: '#D6DBF8' },- { row: 30, col: 27, rgb: '#7F9BED' },- { row: 30, col: 28, rgb: '#003ADC' },- { row: 30, col: 29, rgb: '#0847DE' },- { row: 30, col: 30, rgb: '#074BDF' },- { row: 30, col: 31, rgb: '#064FE0' },- { row: 30, col: 32, rgb: '#0150E0' },- { row: 30, col: 33, rgb: '#A9C5F4' },- { row: 30, col: 42, rgb: '#A9D5F8' },- { row: 30, col: 43, rgb: '#0183EA' },- { row: 30, col: 44, rgb: '#038BEC' },- { row: 30, col: 45, rgb: '#0490ED' },- { row: 30, col: 46, rgb: '#0493EB' },- { row: 30, col: 47, rgb: '#008FE7' },- { row: 30, col: 48, rgb: '#7DC8F2' },- { row: 30, col: 57, rgb: '#7ECEE4' },- { row: 30, col: 58, rgb: '#009BC6' },- { row: 30, col: 59, rgb: '#02A0C6' },- { row: 30, col: 60, rgb: '#01A1C3' },- { row: 30, col: 61, rgb: '#009EBD' },- { row: 30, col: 62, rgb: '#6CC9D9' },- { row: 30, col: 66, rgb: '#D8F1F3' },- { row: 30, col: 67, rgb: '#07AAB2' },- { row: 30, col: 68, rgb: '#00A6AB' },- { row: 30, col: 69, rgb: '#1FB4B5' },- { row: 30, col: 70, rgb: '#F3FBFB' },- { row: 31, col: 13, rgb: '#BDBBF2' },- { row: 31, col: 14, rgb: '#0804D0' },- { row: 31, col: 15, rgb: '#1413D3' },- { row: 31, col: 16, rgb: '#D8D8F8' },- { row: 31, col: 18, rgb: '#E8E9FB' },- { row: 31, col: 19, rgb: '#2131D9' },- { row: 31, col: 20, rgb: '#051CD5' },- { row: 31, col: 21, rgb: '#001CD6' },- { row: 31, col: 22, rgb: '#7E8EEA' },- { row: 31, col: 26, rgb: '#D7E0F9' },- { row: 31, col: 27, rgb: '#1248DE' },- { row: 31, col: 28, rgb: '#0543DD' },- { row: 31, col: 29, rgb: '#084ADE' },- { row: 31, col: 30, rgb: '#074EE0' },- { row: 31, col: 31, rgb: '#004DDF' },- { row: 31, col: 32, rgb: '#4A84E9' },- { row: 31, col: 33, rgb: '#FCFDFF' },- { row: 31, col: 41, rgb: '#F0F7FE' },- { row: 31, col: 42, rgb: '#2896EE' },- { row: 31, col: 43, rgb: '#0087EB' },- { row: 31, col: 44, rgb: '#048FEC' },- { row: 31, col: 45, rgb: '#0492EC' },- { row: 31, col: 46, rgb: '#0091E9' },- { row: 31, col: 47, rgb: '#25A3EA' },- { row: 31, col: 48, rgb: '#EFF8FD' },- { row: 31, col: 56, rgb: '#FDFEFE' },- { row: 31, col: 57, rgb: '#3CB5D5' },- { row: 31, col: 58, rgb: '#009DC5' },- { row: 31, col: 59, rgb: '#01A1C4' },- { row: 31, col: 60, rgb: '#01A1C1' },- { row: 31, col: 61, rgb: '#009FBC' },- { row: 31, col: 62, rgb: '#89D5E0' },- { row: 31, col: 66, rgb: '#CBEDEF' },- { row: 31, col: 67, rgb: '#02A8AF' },- { row: 31, col: 68, rgb: '#00A7A9' },- { row: 31, col: 69, rgb: '#28B7B7' },- { row: 31, col: 70, rgb: '#F9FDFD' },- { row: 32, col: 12, rgb: '#F7F7FD' },- { row: 32, col: 13, rgb: '#3C36DA' },- { row: 32, col: 14, rgb: '#0000CE' },- { row: 32, col: 15, rgb: '#8181E8' },- { row: 32, col: 18, rgb: '#727BE7' },- { row: 32, col: 19, rgb: '#0015D4' },- { row: 32, col: 20, rgb: '#041FD6' },- { row: 32, col: 21, rgb: '#2943DD' },- { row: 32, col: 22, rgb: '#EEF0FC' },- { row: 32, col: 26, rgb: '#577DE8' },- { row: 32, col: 27, rgb: '#003CDC' },- { row: 32, col: 28, rgb: '#0848DE' },- { row: 32, col: 29, rgb: '#074CE0' },- { row: 32, col: 30, rgb: '#0550E0' },- { row: 32, col: 31, rgb: '#0C59E1' },- { row: 32, col: 32, rgb: '#CDDDF9' },- { row: 32, col: 41, rgb: '#80C1F4' },- { row: 32, col: 42, rgb: '#0083EA' },- { row: 32, col: 43, rgb: '#048DEC' },- { row: 32, col: 44, rgb: '#0491ED' },- { row: 32, col: 45, rgb: '#0393EA' },- { row: 32, col: 46, rgb: '#0091E7' },- { row: 32, col: 47, rgb: '#A6D9F6' },- { row: 32, col: 56, rgb: '#AADFED' },- { row: 32, col: 57, rgb: '#019DC7' },- { row: 32, col: 58, rgb: '#01A0C5' },- { row: 32, col: 59, rgb: '#01A1C2' },- { row: 32, col: 60, rgb: '#00A2BF' },- { row: 32, col: 61, rgb: '#01A2BC' },- { row: 32, col: 62, rgb: '#C1E9EE' },- { row: 32, col: 66, rgb: '#9BDDDF' },- { row: 32, col: 67, rgb: '#00A5AA' },- { row: 32, col: 68, rgb: '#00A7A7' },- { row: 32, col: 69, rgb: '#46C1C0' },- { row: 33, col: 12, rgb: '#9793EB' },- { row: 33, col: 13, rgb: '#0000CE' },- { row: 33, col: 14, rgb: '#2B2BD8' },- { row: 33, col: 15, rgb: '#EFEFFC' },- { row: 33, col: 17, rgb: '#CDD0F6' },- { row: 33, col: 18, rgb: '#0E20D6' },- { row: 33, col: 19, rgb: '#0720D6' },- { row: 33, col: 20, rgb: '#0220D7' },- { row: 33, col: 21, rgb: '#A6B2F1' },- { row: 33, col: 25, rgb: '#B6C6F5' },- { row: 33, col: 26, rgb: '#053EDC' },- { row: 33, col: 27, rgb: '#0746DE' },- { row: 33, col: 28, rgb: '#074BDF' },- { row: 33, col: 29, rgb: '#074FE0' },- { row: 33, col: 30, rgb: '#004DE0' },- { row: 33, col: 31, rgb: '#719FEE' },- { row: 33, col: 40, rgb: '#D8ECFC' },- { row: 33, col: 41, rgb: '#118CEC' },- { row: 33, col: 42, rgb: '#028AEC' },- { row: 33, col: 43, rgb: '#0490ED' },- { row: 33, col: 44, rgb: '#0493EB' },- { row: 33, col: 45, rgb: '#0090E8' },- { row: 33, col: 46, rgb: '#45B1EC' },- { row: 33, col: 47, rgb: '#FCFEFF' },- { row: 33, col: 55, rgb: '#F0F9FC' },- { row: 33, col: 56, rgb: '#27ADD0' },- { row: 33, col: 57, rgb: '#009EC5' },- { row: 33, col: 58, rgb: '#01A1C3' },- { row: 33, col: 59, rgb: '#01A2C0' },- { row: 33, col: 60, rgb: '#00A1BC' },- { row: 33, col: 61, rgb: '#2EB4C7' },- { row: 33, col: 62, rgb: '#F7FCFD' },- { row: 33, col: 65, rgb: '#FEFFFF' },- { row: 33, col: 66, rgb: '#42BFC2' },- { row: 33, col: 67, rgb: '#00A7A8' },- { row: 33, col: 68, rgb: '#00A7A4' },- { row: 33, col: 69, rgb: '#83D6D4' },- { row: 34, col: 11, rgb: '#E6E5FA' },- { row: 34, col: 12, rgb: '#201AD5' },- { row: 34, col: 13, rgb: '#0202CF' },- { row: 34, col: 14, rgb: '#A9AAEF' },- { row: 34, col: 16, rgb: '#FCFCFE' },- { row: 34, col: 17, rgb: '#4B58E0' },- { row: 34, col: 18, rgb: '#0118D5' },- { row: 34, col: 19, rgb: '#011DD6' },- { row: 34, col: 20, rgb: '#485FE2' },- { row: 34, col: 21, rgb: '#FCFCFE' },- { row: 34, col: 24, rgb: '#F5F7FD' },- { row: 34, col: 25, rgb: '#3463E3' },- { row: 34, col: 26, rgb: '#023FDD' },- { row: 34, col: 27, rgb: '#0849DE' },- { row: 34, col: 28, rgb: '#074EE0' },- { row: 34, col: 29, rgb: '#034FE0' },- { row: 34, col: 30, rgb: '#1F68E4' },- { row: 34, col: 31, rgb: '#E8F0FC' },- { row: 34, col: 40, rgb: '#57AEF1' },- { row: 34, col: 41, rgb: '#0085EB' },- { row: 34, col: 42, rgb: '#048EEC' },- { row: 34, col: 43, rgb: '#0492EC' },- { row: 34, col: 44, rgb: '#0293E9' },- { row: 34, col: 45, rgb: '#0996E7' },- { row: 34, col: 46, rgb: '#CBE9F9' },- { row: 34, col: 55, rgb: '#80CFE4' },- { row: 34, col: 56, rgb: '#009CC5' },- { row: 34, col: 57, rgb: '#01A1C4' },- { row: 34, col: 58, rgb: '#01A1C1' },- { row: 34, col: 59, rgb: '#01A2BF' },- { row: 34, col: 60, rgb: '#00A1BA' },- { row: 34, col: 61, rgb: '#A4DEE6' },- { row: 34, col: 65, rgb: '#B4E5E7' },- { row: 34, col: 66, rgb: '#02A8AB' },- { row: 34, col: 67, rgb: '#00A9A8' },- { row: 34, col: 68, rgb: '#07ACA8' },- { row: 34, col: 69, rgb: '#D4F1F0' },- { row: 35, col: 11, rgb: '#6F6AE4' },- { row: 35, col: 12, rgb: '#0000CE' },- { row: 35, col: 13, rgb: '#4B4BDE' },- { row: 35, col: 14, rgb: '#FCFCFF' },- { row: 35, col: 16, rgb: '#A9AFF0' },- { row: 35, col: 17, rgb: '#0318D5' },- { row: 35, col: 18, rgb: '#0721D7' },- { row: 35, col: 19, rgb: '#0C2AD9' },- { row: 35, col: 20, rgb: '#CAD2F7' },- { row: 35, col: 24, rgb: '#8FA8EF' },- { row: 35, col: 25, rgb: '#003BDC' },- { row: 35, col: 26, rgb: '#0848DE' },- { row: 35, col: 27, rgb: '#074CE0' },- { row: 35, col: 28, rgb: '#0750E0' },- { row: 35, col: 29, rgb: '#004FE0' },- { row: 35, col: 30, rgb: '#9ABBF3' },- { row: 35, col: 39, rgb: '#B7DCF9' },- { row: 35, col: 40, rgb: '#0486EB' },- { row: 35, col: 41, rgb: '#038CEC' },- { row: 35, col: 42, rgb: '#0491ED' },- { row: 35, col: 43, rgb: '#0493EB' },- { row: 35, col: 44, rgb: '#0090E7' },- { row: 35, col: 45, rgb: '#6DC1F0' },- { row: 35, col: 54, rgb: '#D9F1F7' },- { row: 35, col: 55, rgb: '#10A4CA' },- { row: 35, col: 56, rgb: '#009FC5' },- { row: 35, col: 57, rgb: '#01A1C2' },- { row: 35, col: 58, rgb: '#01A2BF' },- { row: 35, col: 59, rgb: '#00A0BB' },- { row: 35, col: 60, rgb: '#42BBCC' },- { row: 35, col: 61, rgb: '#FBFEFE' },- { row: 35, col: 64, rgb: '#F5FBFC' },- { row: 35, col: 65, rgb: '#2EB8BB' },- { row: 35, col: 66, rgb: '#00A8A8' },- { row: 35, col: 67, rgb: '#00A7A4' },- { row: 35, col: 68, rgb: '#5CC9C6' },- { row: 36, col: 10, rgb: '#CAC8F5' },- { row: 36, col: 11, rgb: '#0C09D1' },- { row: 36, col: 12, rgb: '#0D0DD2' },- { row: 36, col: 13, rgb: '#CCCDF6' },- { row: 36, col: 15, rgb: '#EFF0FC' },- { row: 36, col: 16, rgb: '#2B3CDB' },- { row: 36, col: 17, rgb: '#041CD6' },- { row: 36, col: 18, rgb: '#001DD6' },- { row: 36, col: 19, rgb: '#6E81E8' },- { row: 36, col: 23, rgb: '#E1E8FB' },- { row: 36, col: 24, rgb: '#1A4FDF' },- { row: 36, col: 25, rgb: '#0443DD' },- { row: 36, col: 26, rgb: '#074BDF' },- { row: 36, col: 27, rgb: '#074FE0' },- { row: 36, col: 28, rgb: '#004FE0' },- { row: 36, col: 29, rgb: '#3D7CE8' },- { row: 36, col: 30, rgb: '#F9FBFE' },- { row: 36, col: 39, rgb: '#59AFF2' },- { row: 36, col: 40, rgb: '#0086EB' },- { row: 36, col: 41, rgb: '#0490ED' },- { row: 36, col: 42, rgb: '#0492EC' },- { row: 36, col: 43, rgb: '#0192E8' },- { row: 36, col: 44, rgb: '#1B9FE8' },- { row: 36, col: 45, rgb: '#E7F5FC' },- { row: 36, col: 54, rgb: '#57BFDA' },- { row: 36, col: 55, rgb: '#009CC4' },- { row: 36, col: 56, rgb: '#01A1C3' },- { row: 36, col: 57, rgb: '#01A2C0' },- { row: 36, col: 58, rgb: '#01A2BE' },- { row: 36, col: 59, rgb: '#07A5BC' },- { row: 36, col: 60, rgb: '#C9EBF0' },- { row: 36, col: 64, rgb: '#8BD8DA' },- { row: 36, col: 65, rgb: '#00A6A8' },- { row: 36, col: 66, rgb: '#00A9A7' },- { row: 36, col: 67, rgb: '#11AFAB' },- { row: 36, col: 68, rgb: '#DCF3F2' },- { row: 37, col: 9, rgb: '#FBFBFE' },- { row: 37, col: 10, rgb: '#4944DD' },- { row: 37, col: 11, rgb: '#0000CE' },- { row: 37, col: 12, rgb: '#7172E5' },- { row: 37, col: 15, rgb: '#818AE9' },- { row: 37, col: 16, rgb: '#0016D4' },- { row: 37, col: 17, rgb: '#0521D7' },- { row: 37, col: 18, rgb: '#1F3BDC' },- { row: 37, col: 19, rgb: '#E6EAFB' },- { row: 37, col: 23, rgb: '#6689EA' },- { row: 37, col: 24, rgb: '#003CDC' },- { row: 37, col: 25, rgb: '#0849DE' },- { row: 37, col: 26, rgb: '#074DE0' },- { row: 37, col: 27, rgb: '#0651E0' },- { row: 37, col: 28, rgb: '#0756E1' },- { row: 37, col: 29, rgb: '#C0D5F7' },- { row: 37, col: 39, rgb: '#62B6F3' },- { row: 37, col: 40, rgb: '#0088EB' },- { row: 37, col: 41, rgb: '#0492EC' },- { row: 37, col: 42, rgb: '#0293EA' },- { row: 37, col: 43, rgb: '#0090E6' },- { row: 37, col: 44, rgb: '#96D3F4' },- { row: 37, col: 53, rgb: '#B8E4F0' },- { row: 37, col: 54, rgb: '#039EC6' },- { row: 37, col: 55, rgb: '#01A0C4' },- { row: 37, col: 56, rgb: '#01A1C1' },- { row: 37, col: 57, rgb: '#01A2BF' },- { row: 37, col: 58, rgb: '#00A0B9' },- { row: 37, col: 59, rgb: '#69C9D6' },- { row: 37, col: 63, rgb: '#E1F5F5' },- { row: 37, col: 64, rgb: '#14AFB2' },- { row: 37, col: 65, rgb: '#00A9A8' },- { row: 37, col: 66, rgb: '#00A7A3' },- { row: 37, col: 67, rgb: '#84D6D3' },- { row: 37, col: 70, rgb: '#95DDD7' },- { row: 37, col: 71, rgb: '#86D9D0' },- { row: 37, col: 72, rgb: '#FAFEFD' },- { row: 38, col: 9, rgb: '#A6A3EE' },- { row: 38, col: 10, rgb: '#0200CF' },- { row: 38, col: 11, rgb: '#2122D6' },- { row: 38, col: 12, rgb: '#E7E8FB' },- { row: 38, col: 14, rgb: '#D8DBF8' },- { row: 38, col: 15, rgb: '#1427D7' },- { row: 38, col: 16, rgb: '#0620D6' },- { row: 38, col: 17, rgb: '#001FD7' },- { row: 38, col: 18, rgb: '#97A5EF' },- { row: 38, col: 22, rgb: '#C4D1F7' },- { row: 38, col: 23, rgb: '#0943DD' },- { row: 38, col: 24, rgb: '#0646DE' },- { row: 38, col: 25, rgb: '#074CDF' },- { row: 38, col: 26, rgb: '#0750E0' },- { row: 38, col: 27, rgb: '#004EE0' },- { row: 38, col: 28, rgb: '#6296EC' },- { row: 38, col: 39, rgb: '#D0EAFB' },- { row: 38, col: 40, rgb: '#1E9BEE' },- { row: 38, col: 41, rgb: '#008DEA' },- { row: 38, col: 42, rgb: '#008FE7' },- { row: 38, col: 43, rgb: '#50B5ED' },- { row: 38, col: 44, rgb: '#F8FCFE' },- { row: 38, col: 52, rgb: '#F6FCFD' },- { row: 38, col: 53, rgb: '#33B2D2' },- { row: 38, col: 54, rgb: '#009DC4' },- { row: 38, col: 55, rgb: '#01A1C2' },- { row: 38, col: 56, rgb: '#01A2BF' },- { row: 38, col: 57, rgb: '#00A2BC' },- { row: 38, col: 58, rgb: '#19ACC0' },- { row: 38, col: 59, rgb: '#E5F6F8' },- { row: 38, col: 63, rgb: '#61CACC' },- { row: 38, col: 64, rgb: '#00A6A7' },- { row: 38, col: 65, rgb: '#00A8A6' },- { row: 38, col: 66, rgb: '#29B8B3' },- { row: 38, col: 67, rgb: '#F2FBFA' },- { row: 38, col: 69, rgb: '#C4ECE8' },- { row: 38, col: 70, rgb: '#00AD9B' },- { row: 38, col: 71, rgb: '#08B29F' },- { row: 38, col: 72, rgb: '#E9F8F6' },- { row: 39, col: 8, rgb: '#EEEDFC' },- { row: 39, col: 9, rgb: '#2925D7' },- { row: 39, col: 10, rgb: '#0000CF' },- { row: 39, col: 11, rgb: '#9A9BEC' },- { row: 39, col: 14, rgb: '#5966E3' },- { row: 39, col: 15, rgb: '#0018D5' },- { row: 39, col: 16, rgb: '#021FD7' },- { row: 39, col: 17, rgb: '#3B55E0' },- { row: 39, col: 18, rgb: '#F8F9FE' },- { row: 39, col: 21, rgb: '#FAFBFE' },- { row: 39, col: 22, rgb: '#416DE5' },- { row: 39, col: 23, rgb: '#0140DC' },- { row: 39, col: 24, rgb: '#084ADF' },- { row: 39, col: 25, rgb: '#074FE0' },- { row: 39, col: 26, rgb: '#0451E0' },- { row: 39, col: 27, rgb: '#1762E3' },- { row: 39, col: 28, rgb: '#DFEAFB' },- { row: 39, col: 40, rgb: '#E3F3FD' },- { row: 39, col: 41, rgb: '#A0D6F7' },- { row: 39, col: 42, rgb: '#B1DEF7' },- { row: 39, col: 43, rgb: '#F8FCFE' },- { row: 39, col: 52, rgb: '#90D5E7' },- { row: 39, col: 53, rgb: '#009CC4' },- { row: 39, col: 54, rgb: '#01A1C3' },- { row: 39, col: 55, rgb: '#01A2C0' },- { row: 39, col: 56, rgb: '#01A3BE' },- { row: 39, col: 57, rgb: '#00A0B9' },- { row: 39, col: 58, rgb: '#94D8E1' },- { row: 39, col: 62, rgb: '#C2EAEB' },- { row: 39, col: 63, rgb: '#05A9AC' },- { row: 39, col: 64, rgb: '#00A9A8' },- { row: 39, col: 65, rgb: '#00A9A4' },- { row: 39, col: 66, rgb: '#ADE4E2' },- { row: 39, col: 68, rgb: '#FAFDFD' },- { row: 39, col: 69, rgb: '#3CC1B5' },- { row: 39, col: 70, rgb: '#00AA95' },- { row: 39, col: 71, rgb: '#6FD2C6' },- { row: 39, col: 72, rgb: '#FEFFFF' },- { row: 40, col: 8, rgb: '#7D79E6' },- { row: 40, col: 9, rgb: '#0000CE' },- { row: 40, col: 10, rgb: '#3E3FDB' },- { row: 40, col: 11, rgb: '#F8F8FE' },- { row: 40, col: 13, rgb: '#B7BDF3' },- { row: 40, col: 14, rgb: '#061CD5' },- { row: 40, col: 15, rgb: '#0722D7' },- { row: 40, col: 16, rgb: '#0727D8' },- { row: 40, col: 17, rgb: '#BEC7F5' },- { row: 40, col: 21, rgb: '#9EB4F1' },- { row: 40, col: 22, rgb: '#003DDC' },- { row: 40, col: 23, rgb: '#0748DE' },- { row: 40, col: 24, rgb: '#074DE0' },- { row: 40, col: 25, rgb: '#0751E0' },- { row: 40, col: 26, rgb: '#0050E0' },- { row: 40, col: 27, rgb: '#8BB1F1' },- { row: 40, col: 36, rgb: '#FBFDFF' },- { row: 40, col: 37, rgb: '#B8DEF9' },- { row: 40, col: 38, rgb: '#A7D7F8' },- { row: 40, col: 39, rgb: '#E6F4FD' },- { row: 40, col: 51, rgb: '#E3F4F9' },- { row: 40, col: 52, rgb: '#17A7CC' },- { row: 40, col: 53, rgb: '#009FC4' },- { row: 40, col: 54, rgb: '#01A1C1' },- { row: 40, col: 55, rgb: '#01A2BF' },- { row: 40, col: 56, rgb: '#00A1BB' },- { row: 40, col: 57, rgb: '#35B7C8' },- { row: 40, col: 58, rgb: '#F7FCFD' },- { row: 40, col: 61, rgb: '#FAFDFD' },- { row: 40, col: 62, rgb: '#3BBDBF' },- { row: 40, col: 63, rgb: '#00A7A7' },- { row: 40, col: 64, rgb: '#00A7A4' },- { row: 40, col: 65, rgb: '#4BC4BF' },- { row: 40, col: 66, rgb: '#FEFEFE' },- { row: 40, col: 68, rgb: '#9DE0DA' },- { row: 40, col: 69, rgb: '#00AB98' },- { row: 40, col: 70, rgb: '#1CB8A6' },- { row: 40, col: 71, rgb: '#E9F8F6' },- { row: 41, col: 7, rgb: '#ECECFB' },- { row: 41, col: 8, rgb: '#1612D3' },- { row: 41, col: 9, rgb: '#0304D0' },- { row: 41, col: 10, rgb: '#C0C1F3' },- { row: 41, col: 12, rgb: '#F5F6FD' },- { row: 41, col: 13, rgb: '#3647DD' },- { row: 41, col: 14, rgb: '#031CD6' },- { row: 41, col: 15, rgb: '#001ED7' },- { row: 41, col: 16, rgb: '#6075E6' },- { row: 41, col: 20, rgb: '#EAEFFC' },- { row: 41, col: 21, rgb: '#2357E1' },- { row: 41, col: 22, rgb: '#0343DD' },- { row: 41, col: 23, rgb: '#074BDF' },- { row: 41, col: 24, rgb: '#0750E0' },- { row: 41, col: 25, rgb: '#0150E0' },- { row: 41, col: 26, rgb: '#3175E6' },- { row: 41, col: 27, rgb: '#F4F8FE' },- { row: 41, col: 35, rgb: '#FAFDFF' },- { row: 41, col: 36, rgb: '#59B0F2' },- { row: 41, col: 37, rgb: '#0087EB' },- { row: 41, col: 38, rgb: '#008BEC' },- { row: 41, col: 39, rgb: '#209EED' },- { row: 41, col: 40, rgb: '#D1EBFB' },- { row: 41, col: 51, rgb: '#66C5DE' },- { row: 41, col: 52, rgb: '#009CC4' },- { row: 41, col: 53, rgb: '#01A1C3' },- { row: 41, col: 54, rgb: '#01A2C0' },- { row: 41, col: 55, rgb: '#01A3BD' },- { row: 41, col: 56, rgb: '#03A3BA' },- { row: 41, col: 57, rgb: '#BBE7EC' },- { row: 41, col: 61, rgb: '#9BDDDF' },- { row: 41, col: 62, rgb: '#00A7A8' },- { row: 41, col: 63, rgb: '#00A9A7' },- { row: 41, col: 64, rgb: '#0AADA8' },- { row: 41, col: 65, rgb: '#D1F0EE' },- { row: 41, col: 67, rgb: '#EBF8F7' },- { row: 41, col: 68, rgb: '#1EB7A8' },- { row: 41, col: 69, rgb: '#00AB96' },- { row: 41, col: 70, rgb: '#9AE0D7' },- { row: 42, col: 7, rgb: '#FAFAFE' },- { row: 42, col: 8, rgb: '#8686E8' },- { row: 42, col: 9, rgb: '#9192EB' },- { row: 42, col: 12, rgb: '#9099EC' },- { row: 42, col: 13, rgb: '#0017D4' },- { row: 42, col: 14, rgb: '#0622D7' },- { row: 42, col: 15, rgb: '#1735DB' },- { row: 42, col: 16, rgb: '#DDE2FA' },- { row: 42, col: 20, rgb: '#7595EC' },- { row: 42, col: 21, rgb: '#003DDC' },- { row: 42, col: 22, rgb: '#084ADF' },- { row: 42, col: 23, rgb: '#074EE0' },- { row: 42, col: 24, rgb: '#0652E0' },- { row: 42, col: 25, rgb: '#0355E1' },- { row: 42, col: 26, rgb: '#B3CCF6' },- { row: 42, col: 35, rgb: '#9FD1F7' },- { row: 42, col: 36, rgb: '#0085EB' },- { row: 42, col: 37, rgb: '#038EEC' },- { row: 42, col: 38, rgb: '#0492EC' },- { row: 42, col: 39, rgb: '#008EE8' },- { row: 42, col: 40, rgb: '#60BCF0' },- { row: 42, col: 50, rgb: '#C6E9F3' },- { row: 42, col: 51, rgb: '#07A0C7' },- { row: 42, col: 52, rgb: '#00A0C3' },- { row: 42, col: 53, rgb: '#01A1C1' },- { row: 42, col: 54, rgb: '#01A3BE' },- { row: 42, col: 55, rgb: '#00A0B9' },- { row: 42, col: 56, rgb: '#5AC4D2' },- { row: 42, col: 60, rgb: '#EAF8F8' },- { row: 42, col: 61, rgb: '#1DB3B4' },- { row: 42, col: 62, rgb: '#00A8A8' },- { row: 42, col: 63, rgb: '#00A7A2' },- { row: 42, col: 64, rgb: '#74D1CD' },- { row: 42, col: 67, rgb: '#73D3CA' },- { row: 42, col: 68, rgb: '#00A995' },- { row: 42, col: 69, rgb: '#3AC2B2' },- { row: 42, col: 70, rgb: '#F9FDFD' },- { row: 43, col: 11, rgb: '#E2E4FA' },- { row: 43, col: 12, rgb: '#1C2FD9' },- { row: 43, col: 13, rgb: '#0520D7' },- { row: 43, col: 14, rgb: '#001FD7' },- { row: 43, col: 15, rgb: '#8898EC' },- { row: 43, col: 19, rgb: '#D0DBF8' },- { row: 43, col: 20, rgb: '#0E48DE' },- { row: 43, col: 21, rgb: '#0646DE' },- { row: 43, col: 22, rgb: '#074DE0' },- { row: 43, col: 23, rgb: '#0751E1' },- { row: 43, col: 24, rgb: '#0050E0' },- { row: 43, col: 25, rgb: '#538DEA' },- { row: 43, col: 26, rgb: '#FEFFFF' },- { row: 43, col: 34, rgb: '#EBF5FD' },- { row: 43, col: 35, rgb: '#2196ED' },- { row: 43, col: 36, rgb: '#018BEC' },- { row: 43, col: 37, rgb: '#0491ED' },- { row: 43, col: 38, rgb: '#0493EA' },- { row: 43, col: 39, rgb: '#0090E6' },- { row: 43, col: 40, rgb: '#53B6ED' },- { row: 43, col: 49, rgb: '#FBFDFE' },- { row: 43, col: 50, rgb: '#3FB7D5' },- { row: 43, col: 51, rgb: '#009DC3' },- { row: 43, col: 52, rgb: '#01A1C2' },- { row: 43, col: 53, rgb: '#01A2BF' },- { row: 43, col: 54, rgb: '#00A2BC' },- { row: 43, col: 55, rgb: '#11A9BE' },- { row: 43, col: 56, rgb: '#DCF2F5' },- { row: 43, col: 60, rgb: '#71CFD0' },- { row: 43, col: 61, rgb: '#00A6A6' },- { row: 43, col: 62, rgb: '#00A9A5' },- { row: 43, col: 63, rgb: '#1EB5AF' },- { row: 43, col: 64, rgb: '#EBF8F8' },- { row: 43, col: 66, rgb: '#D1F0ED' },- { row: 43, col: 67, rgb: '#0AB19F' },- { row: 43, col: 68, rgb: '#04AF9A' },- { row: 43, col: 69, rgb: '#C1ECE6' },- { row: 44, col: 11, rgb: '#6A76E6' },- { row: 44, col: 12, rgb: '#0018D5' },- { row: 44, col: 13, rgb: '#0321D7' },- { row: 44, col: 14, rgb: '#304CDF' },- { row: 44, col: 15, rgb: '#F2F4FD' },- { row: 44, col: 18, rgb: '#FDFDFF' },- { row: 44, col: 19, rgb: '#4E78E7' },- { row: 44, col: 20, rgb: '#0040DC' },- { row: 44, col: 21, rgb: '#074BDF' },- { row: 44, col: 22, rgb: '#074FE0' },- { row: 44, col: 23, rgb: '#0453E0' },- { row: 44, col: 24, rgb: '#105FE2' },- { row: 44, col: 25, rgb: '#D5E3FA' },- { row: 44, col: 34, rgb: '#75BDF4' },- { row: 44, col: 35, rgb: '#0086EB' },- { row: 44, col: 36, rgb: '#0490ED' },- { row: 44, col: 37, rgb: '#0493EB' },- { row: 44, col: 38, rgb: '#0394E8' },- { row: 44, col: 39, rgb: '#0292E5' },- { row: 44, col: 40, rgb: '#B0DEF6' },- { row: 44, col: 49, rgb: '#A0DBEA' },- { row: 44, col: 50, rgb: '#009DC4' },- { row: 44, col: 51, rgb: '#01A1C3' },- { row: 44, col: 52, rgb: '#01A2C0' },- { row: 44, col: 53, rgb: '#02A3BE' },- { row: 44, col: 54, rgb: '#00A0B8' },- { row: 44, col: 55, rgb: '#84D3DD' },- { row: 44, col: 59, rgb: '#CFEFEF' },- { row: 44, col: 60, rgb: '#09ACAD' },- { row: 44, col: 61, rgb: '#00A9A7' },- { row: 44, col: 62, rgb: '#00A8A2' },- { row: 44, col: 63, rgb: '#9EDFDC' },- { row: 44, col: 65, rgb: '#FDFEFE' },- { row: 44, col: 66, rgb: '#4AC6BA' },- { row: 44, col: 67, rgb: '#00A994' },- { row: 44, col: 68, rgb: '#60CEC0' },- { row: 45, col: 10, rgb: '#DBDEF9' },- { row: 45, col: 11, rgb: '#1228D7' },- { row: 45, col: 12, rgb: '#0622D7' },- { row: 45, col: 13, rgb: '#0525D8' },- { row: 45, col: 14, rgb: '#B0BBF3' },- { row: 45, col: 18, rgb: '#ADC0F4' },- { row: 45, col: 19, rgb: '#0340DD' },- { row: 45, col: 20, rgb: '#0749DE' },- { row: 45, col: 21, rgb: '#074EE0' },- { row: 45, col: 22, rgb: '#0753E1' },- { row: 45, col: 23, rgb: '#0050E0' },- { row: 45, col: 24, rgb: '#7BA8EF' },- { row: 45, col: 33, rgb: '#D1E9FB' },- { row: 45, col: 34, rgb: '#0C8DEC' },- { row: 45, col: 35, rgb: '#028DEC' },- { row: 45, col: 36, rgb: '#0492EC' },- { row: 45, col: 37, rgb: '#0493E9' },- { row: 45, col: 38, rgb: '#0090E5' },- { row: 45, col: 39, rgb: '#4EB5EC' },- { row: 45, col: 40, rgb: '#FEFEFF' },- { row: 45, col: 48, rgb: '#ECF8FB' },- { row: 45, col: 49, rgb: '#20ABCD' },- { row: 45, col: 50, rgb: '#009FC3' },- { row: 45, col: 51, rgb: '#01A1C1' },- { row: 45, col: 52, rgb: '#01A3BE' },- { row: 45, col: 53, rgb: '#00A2BA' },- { row: 45, col: 54, rgb: '#29B2C4' },- { row: 45, col: 55, rgb: '#F2FAFB' },- { row: 45, col: 58, rgb: '#FDFEFE' },- { row: 45, col: 59, rgb: '#48C2C3' },- { row: 45, col: 60, rgb: '#00A7A6' },- { row: 45, col: 61, rgb: '#00A8A3' },- { row: 45, col: 62, rgb: '#3DC0BA' },- { row: 45, col: 63, rgb: '#FAFDFD' },- { row: 45, col: 65, rgb: '#ADE5DF' },- { row: 45, col: 66, rgb: '#00AC99' },- { row: 45, col: 67, rgb: '#13B5A2' },- { row: 45, col: 68, rgb: '#E0F5F3' },- { row: 46, col: 10, rgb: '#8D98EC' },- { row: 46, col: 11, rgb: '#0019D5' },- { row: 46, col: 12, rgb: '#0221D7' },- { row: 46, col: 13, rgb: '#445EE2' },- { row: 46, col: 14, rgb: '#FDFDFF' },- { row: 46, col: 17, rgb: '#F9FAFE' },- { row: 46, col: 18, rgb: '#3968E4' },- { row: 46, col: 19, rgb: '#0143DD' },- { row: 46, col: 20, rgb: '#074CE0' },- { row: 46, col: 21, rgb: '#0751E0' },- { row: 46, col: 22, rgb: '#0252E0' },- { row: 46, col: 23, rgb: '#266FE5' },- { row: 46, col: 24, rgb: '#EDF3FD' },- { row: 46, col: 32, rgb: '#FDFEFF' },- { row: 46, col: 33, rgb: '#4DABF1' },- { row: 46, col: 34, rgb: '#0088EB' },- { row: 46, col: 35, rgb: '#0491ED' },- { row: 46, col: 36, rgb: '#0493EA' },- { row: 46, col: 37, rgb: '#0293E7' },- { row: 46, col: 38, rgb: '#0D98E5' },- { row: 46, col: 39, rgb: '#D2ECFA' },- { row: 46, col: 48, rgb: '#76CBE1' },- { row: 46, col: 49, rgb: '#009CC3' },- { row: 46, col: 50, rgb: '#01A1C2' },- { row: 46, col: 51, rgb: '#01A2BF' },- { row: 46, col: 52, rgb: '#01A3BD' },- { row: 46, col: 53, rgb: '#01A2B8' },- { row: 46, col: 54, rgb: '#ADE2E8' },- { row: 46, col: 58, rgb: '#ABE3E3' },- { row: 46, col: 59, rgb: '#00A8A8' },- { row: 46, col: 60, rgb: '#00AAA6' },- { row: 46, col: 61, rgb: '#06ACA5' },- { row: 46, col: 62, rgb: '#C5ECEA' },- { row: 46, col: 64, rgb: '#F2FBFA' },- { row: 46, col: 65, rgb: '#28BBAC' },- { row: 46, col: 66, rgb: '#00AB95' },- { row: 46, col: 67, rgb: '#8ADBD1' },- { row: 47, col: 10, rgb: '#5163E2' },- { row: 47, col: 11, rgb: '#011ED7' },- { row: 47, col: 12, rgb: '#0022D7' },- { row: 47, col: 13, rgb: '#98A8EF' },- { row: 47, col: 17, rgb: '#C8D5F7' },- { row: 47, col: 18, rgb: '#0645DD' },- { row: 47, col: 19, rgb: '#064ADF' },- { row: 47, col: 20, rgb: '#074FE0' },- { row: 47, col: 21, rgb: '#0654E1' },- { row: 47, col: 22, rgb: '#0254E0' },- { row: 47, col: 23, rgb: '#A4C3F4' },- { row: 47, col: 32, rgb: '#AED8F8' },- { row: 47, col: 33, rgb: '#0188EB' },- { row: 47, col: 34, rgb: '#0390ED' },- { row: 47, col: 35, rgb: '#0493EB' },- { row: 47, col: 36, rgb: '#0494E9' },- { row: 47, col: 37, rgb: '#0090E4' },- { row: 47, col: 38, rgb: '#77C6F0' },- { row: 47, col: 47, rgb: '#D2EEF5' },- { row: 47, col: 48, rgb: '#0CA3C8' },- { row: 47, col: 49, rgb: '#00A0C3' },- { row: 47, col: 50, rgb: '#01A2C0' },- { row: 47, col: 51, rgb: '#02A3BE' },- { row: 47, col: 52, rgb: '#00A0B8' },- { row: 47, col: 53, rgb: '#4BBFCD' },- { row: 47, col: 54, rgb: '#FEFFFF' },- { row: 47, col: 57, rgb: '#F1FAFA' },- { row: 47, col: 58, rgb: '#27B6B7' },- { row: 47, col: 59, rgb: '#00A8A7' },- { row: 47, col: 60, rgb: '#00A8A2' },- { row: 47, col: 61, rgb: '#64CCC8' },- { row: 47, col: 64, rgb: '#83D8D0' },- { row: 47, col: 65, rgb: '#00AA95' },- { row: 47, col: 66, rgb: '#2DBEAC' },- { row: 47, col: 67, rgb: '#F4FCFB' },- { row: 48, col: 9, rgb: '#FBFBFE' },- { row: 48, col: 10, rgb: '#3349DE' },- { row: 48, col: 11, rgb: '#0323D7' },- { row: 48, col: 12, rgb: '#082CD9' },- { row: 48, col: 13, rgb: '#C8D1F7' },- { row: 48, col: 17, rgb: '#91ADF0' },- { row: 48, col: 18, rgb: '#0041DD' },- { row: 48, col: 19, rgb: '#074DE0' },- { row: 48, col: 20, rgb: '#0752E1' },- { row: 48, col: 21, rgb: '#0153E0' },- { row: 48, col: 22, rgb: '#3B7DE8' },- { row: 48, col: 23, rgb: '#FBFCFE' },- { row: 48, col: 31, rgb: '#F2F9FE' },- { row: 48, col: 32, rgb: '#2B9CEE' },- { row: 48, col: 33, rgb: '#008BEC' },- { row: 48, col: 34, rgb: '#0492EC' },- { row: 48, col: 35, rgb: '#0493EA' },- { row: 48, col: 36, rgb: '#0092E6' },- { row: 48, col: 37, rgb: '#21A1E7' },- { row: 48, col: 38, rgb: '#ECF7FD' },- { row: 48, col: 46, rgb: '#FEFFFF' },- { row: 48, col: 47, rgb: '#4DBCD7' },- { row: 48, col: 48, rgb: '#009DC2' },- { row: 48, col: 49, rgb: '#01A1C1' },- { row: 48, col: 50, rgb: '#01A2BF' },- { row: 48, col: 51, rgb: '#01A3BC' },- { row: 48, col: 52, rgb: '#0BA7BB' },- { row: 48, col: 53, rgb: '#D1EEF2' },- { row: 48, col: 57, rgb: '#81D5D6' },- { row: 48, col: 58, rgb: '#00A6A6' },- { row: 48, col: 59, rgb: '#00A9A5' },- { row: 48, col: 60, rgb: '#16B2AB' },- { row: 48, col: 61, rgb: '#E2F6F5' },- { row: 48, col: 63, rgb: '#DCF4F1' },- { row: 48, col: 64, rgb: '#10B3A2' },- { row: 48, col: 65, rgb: '#01AE98' },- { row: 48, col: 66, rgb: '#B3E7E1' },- { row: 49, col: 9, rgb: '#F6F7FD' },- { row: 49, col: 10, rgb: '#2944DD' },- { row: 49, col: 11, rgb: '#0326D8' },- { row: 49, col: 12, rgb: '#0E34DA' },- { row: 49, col: 13, rgb: '#D6DEF9' },- { row: 49, col: 17, rgb: '#7498EC' },- { row: 49, col: 18, rgb: '#0044DE' },- { row: 49, col: 19, rgb: '#0750E0' },- { row: 49, col: 20, rgb: '#0755E1' },- { row: 49, col: 21, rgb: '#0053E0' },- { row: 49, col: 22, rgb: '#7CAAF0' },- { row: 49, col: 31, rgb: '#85C5F5' },- { row: 49, col: 32, rgb: '#0087EB' },- { row: 49, col: 33, rgb: '#0491ED' },- { row: 49, col: 34, rgb: '#0493EB' },- { row: 49, col: 35, rgb: '#0394E8' },- { row: 49, col: 36, rgb: '#0091E3' },- { row: 49, col: 37, rgb: '#A1D7F4' },- { row: 49, col: 46, rgb: '#AFE1ED' },- { row: 49, col: 47, rgb: '#019EC4' },- { row: 49, col: 48, rgb: '#01A1C2' },- { row: 49, col: 49, rgb: '#01A2BF' },- { row: 49, col: 50, rgb: '#02A3BD' },- { row: 49, col: 51, rgb: '#00A0B7' },- { row: 49, col: 52, rgb: '#74CDD8' },- { row: 49, col: 56, rgb: '#DAF2F3' },- { row: 49, col: 57, rgb: '#0FAEAE' },- { row: 49, col: 58, rgb: '#00A9A7' },- { row: 49, col: 59, rgb: '#00A8A1' },- { row: 49, col: 60, rgb: '#8EDAD6' },- { row: 49, col: 63, rgb: '#59CBBF' },- { row: 49, col: 64, rgb: '#00A994' },- { row: 49, col: 65, rgb: '#51C9BA' },- { row: 50, col: 9, rgb: '#FBFBFE' },- { row: 50, col: 10, rgb: '#324DDF' },- { row: 50, col: 11, rgb: '#0329D8' },- { row: 50, col: 12, rgb: '#0833DA' },- { row: 50, col: 13, rgb: '#CAD4F7' },- { row: 50, col: 17, rgb: '#7399ED' },- { row: 50, col: 18, rgb: '#0047DF' },- { row: 50, col: 19, rgb: '#0753E1' },- { row: 50, col: 20, rgb: '#0758E1' },- { row: 50, col: 21, rgb: '#0056E1' },- { row: 50, col: 22, rgb: '#7FADF1' },- { row: 50, col: 30, rgb: '#DCEEFC' },- { row: 50, col: 31, rgb: '#1391EC' },- { row: 50, col: 32, rgb: '#028EEC' },- { row: 50, col: 33, rgb: '#0492EC' },- { row: 50, col: 34, rgb: '#0494E9' },- { row: 50, col: 35, rgb: '#0091E5' },- { row: 50, col: 36, rgb: '#40AFEA' },- { row: 50, col: 37, rgb: '#FBFDFE' },- { row: 50, col: 45, rgb: '#F3FAFC' },- { row: 50, col: 46, rgb: '#2BAFCF' },- { row: 50, col: 47, rgb: '#009EC2' },- { row: 50, col: 48, rgb: '#01A2C0' },- { row: 50, col: 49, rgb: '#02A3BE' },- { row: 50, col: 50, rgb: '#00A2BA' },- { row: 50, col: 51, rgb: '#1FAFC1' },- { row: 50, col: 52, rgb: '#EBF8F9' },- { row: 50, col: 56, rgb: '#57C7C7' },- { row: 50, col: 57, rgb: '#00A7A6' },- { row: 50, col: 58, rgb: '#00A9A3' },- { row: 50, col: 59, rgb: '#31BBB5' },- { row: 50, col: 60, rgb: '#F6FCFC' },- { row: 50, col: 62, rgb: '#BBE9E5' },- { row: 50, col: 63, rgb: '#03AE9A' },- { row: 50, col: 64, rgb: '#0CB29E' },- { row: 50, col: 65, rgb: '#D5F2EE' },- { row: 51, col: 10, rgb: '#4F69E4' },- { row: 51, col: 11, rgb: '#012BD8' },- { row: 51, col: 12, rgb: '#002FD9' },- { row: 51, col: 13, rgb: '#9CB0F1' },- { row: 51, col: 17, rgb: '#8DAEF1' },- { row: 51, col: 18, rgb: '#004ADF' },- { row: 51, col: 19, rgb: '#0757E1' },- { row: 51, col: 20, rgb: '#075BE2' },- { row: 51, col: 21, rgb: '#005BE2' },- { row: 51, col: 22, rgb: '#4289EA' },- { row: 51, col: 30, rgb: '#5BB3F2' },- { row: 51, col: 31, rgb: '#0089EB' },- { row: 51, col: 32, rgb: '#0492ED' },- { row: 51, col: 33, rgb: '#0493EA' },- { row: 51, col: 34, rgb: '#0294E7' },- { row: 51, col: 35, rgb: '#0795E4' },- { row: 51, col: 36, rgb: '#C6E7F8' },- { row: 51, col: 45, rgb: '#86D1E4' },- { row: 51, col: 46, rgb: '#009CC2' },- { row: 51, col: 47, rgb: '#01A1C1' },- { row: 51, col: 48, rgb: '#01A2BF' },- { row: 51, col: 49, rgb: '#02A4BC' },- { row: 51, col: 50, rgb: '#00A1B7' },- { row: 51, col: 51, rgb: '#9EDDE4' },- { row: 51, col: 55, rgb: '#B9E7E8' },- { row: 51, col: 56, rgb: '#02A9A9' },- { row: 51, col: 57, rgb: '#00AAA6' },- { row: 51, col: 58, rgb: '#02ABA3' },- { row: 51, col: 59, rgb: '#B7E7E5' },- { row: 51, col: 61, rgb: '#F7FDFC' },- { row: 51, col: 62, rgb: '#34C0B1' },- { row: 51, col: 63, rgb: '#00AA94' },- { row: 51, col: 64, rgb: '#7AD6CA' },- { row: 52, col: 10, rgb: '#899CED' },- { row: 52, col: 11, rgb: '#002CD8' },- { row: 52, col: 12, rgb: '#0134DA' },- { row: 52, col: 13, rgb: '#4870E5' },- { row: 52, col: 17, rgb: '#C3D5F7' },- { row: 52, col: 18, rgb: '#0452E0' },- { row: 52, col: 19, rgb: '#0659E1' },- { row: 52, col: 20, rgb: '#065EE3' },- { row: 52, col: 21, rgb: '#0562E4' },- { row: 52, col: 22, rgb: '#0465E4' },- { row: 52, col: 23, rgb: '#9DC5F5' },- { row: 52, col: 29, rgb: '#A8D6F8' },- { row: 52, col: 30, rgb: '#048BEC' },- { row: 52, col: 31, rgb: '#0390ED' },- { row: 52, col: 32, rgb: '#0493EB' },- { row: 52, col: 33, rgb: '#0494E8' },- { row: 52, col: 34, rgb: '#0090E4' },- { row: 52, col: 35, rgb: '#67C0EE' },- { row: 52, col: 44, rgb: '#DDF2F7' },- { row: 52, col: 45, rgb: '#12A6C9' },- { row: 52, col: 46, rgb: '#00A0C2' },- { row: 52, col: 47, rgb: '#01A2C0' },- { row: 52, col: 48, rgb: '#02A3BE' },- { row: 52, col: 49, rgb: '#00A1B8' },- { row: 52, col: 50, rgb: '#3EBAC9' },- { row: 52, col: 51, rgb: '#FAFDFE' },- { row: 52, col: 54, rgb: '#F7FCFC' },- { row: 52, col: 55, rgb: '#32BABB' },- { row: 52, col: 56, rgb: '#00A8A6' },- { row: 52, col: 57, rgb: '#00A8A1' },- { row: 52, col: 58, rgb: '#55C7C2' },- { row: 52, col: 61, rgb: '#93DDD5' },- { row: 52, col: 62, rgb: '#00AB96' },- { row: 52, col: 63, rgb: '#22BAA7' },- { row: 52, col: 64, rgb: '#EEFAF8' },- { row: 53, col: 10, rgb: '#D6DDF9' },- { row: 53, col: 11, rgb: '#0D3CDC' },- { row: 53, col: 12, rgb: '#053ADC' },- { row: 53, col: 13, rgb: '#063FDD' },- { row: 53, col: 14, rgb: '#B4C6F5' },- { row: 53, col: 17, rgb: '#F6F9FE' },- { row: 53, col: 18, rgb: '#3074E6' },- { row: 53, col: 19, rgb: '#0158E2' },- { row: 53, col: 20, rgb: '#0661E3' },- { row: 53, col: 21, rgb: '#0665E4' },- { row: 53, col: 22, rgb: '#0469E5' },- { row: 53, col: 23, rgb: '#0A70E6' },- { row: 53, col: 24, rgb: '#7AB4F2' },- { row: 53, col: 25, rgb: '#D6E9FB' },- { row: 53, col: 26, rgb: '#ECF5FD' },- { row: 53, col: 27, rgb: '#D8ECFC' },- { row: 53, col: 28, rgb: '#80C2F5' },- { row: 53, col: 29, rgb: '#0B8DEC' },- { row: 53, col: 30, rgb: '#028EEC' },- { row: 53, col: 31, rgb: '#0492EC' },- { row: 53, col: 32, rgb: '#0494E9' },- { row: 53, col: 33, rgb: '#0193E5' },- { row: 53, col: 34, rgb: '#189EE5' },- { row: 53, col: 35, rgb: '#E3F4FC' },- { row: 53, col: 44, rgb: '#5CC2DA' },- { row: 53, col: 45, rgb: '#009DC1' },- { row: 53, col: 46, rgb: '#01A1C1' },- { row: 53, col: 47, rgb: '#01A3BE' },- { row: 53, col: 48, rgb: '#01A3BB' },- { row: 53, col: 49, rgb: '#06A5B9' },- { row: 53, col: 50, rgb: '#C4EAEE' },- { row: 53, col: 54, rgb: '#91DADA' },- { row: 53, col: 55, rgb: '#00A7A6' },- { row: 53, col: 56, rgb: '#00AAA5' },- { row: 53, col: 57, rgb: '#0FB0A8' },- { row: 53, col: 58, rgb: '#D8F2F1' },- { row: 53, col: 60, rgb: '#E5F7F5' },- { row: 53, col: 61, rgb: '#18B6A5' },- { row: 53, col: 62, rgb: '#00AC96' },- { row: 53, col: 63, rgb: '#A4E3DB' },- { row: 54, col: 11, rgb: '#6182E8' },- { row: 54, col: 12, rgb: '#0036DB' },- { row: 54, col: 13, rgb: '#0440DD' },- { row: 54, col: 14, rgb: '#225CE2' },- { row: 54, col: 15, rgb: '#E0E9FB' },- { row: 54, col: 18, rgb: '#A2C2F4' },- { row: 54, col: 19, rgb: '#0059E2' },- { row: 54, col: 20, rgb: '#0563E4' },- { row: 54, col: 21, rgb: '#0669E5' },- { row: 54, col: 22, rgb: '#066DE5' },- { row: 54, col: 23, rgb: '#0470E6' },- { row: 54, col: 24, rgb: '#0071E7' },- { row: 54, col: 25, rgb: '#0C7FE9' },- { row: 54, col: 26, rgb: '#1B8BEB' },- { row: 54, col: 27, rgb: '#0D88EB' },- { row: 54, col: 28, rgb: '#0084EB' },- { row: 54, col: 29, rgb: '#028CEC' },- { row: 54, col: 30, rgb: '#0492ED' },- { row: 54, col: 31, rgb: '#0493EA' },- { row: 54, col: 32, rgb: '#0394E7' },- { row: 54, col: 33, rgb: '#0090E3' },- { row: 54, col: 34, rgb: '#92D2F2' },- { row: 54, col: 43, rgb: '#C2E8F1' },- { row: 54, col: 44, rgb: '#04A0C4' },- { row: 54, col: 45, rgb: '#00A1C1' },- { row: 54, col: 46, rgb: '#01A2BF' },- { row: 54, col: 47, rgb: '#02A4BD' },- { row: 54, col: 48, rgb: '#00A1B7' },- { row: 54, col: 49, rgb: '#64C8D3' },- { row: 54, col: 53, rgb: '#E4F6F6' },- { row: 54, col: 54, rgb: '#17B1B1' },- { row: 54, col: 55, rgb: '#00A9A6' },- { row: 54, col: 56, rgb: '#00A8A1' },- { row: 54, col: 57, rgb: '#7ED5D1' },- { row: 54, col: 60, rgb: '#69D0C5' },- { row: 54, col: 61, rgb: '#00AA94' },- { row: 54, col: 62, rgb: '#42C5B4' },- { row: 54, col: 63, rgb: '#FCFEFE' },- { row: 55, col: 11, rgb: '#E0E6FB' },- { row: 55, col: 12, rgb: '#1D52E0' },- { row: 55, col: 13, rgb: '#0040DC' },- { row: 55, col: 14, rgb: '#003FDD' },- { row: 55, col: 15, rgb: '#A3BEF3' },- { row: 55, col: 18, rgb: '#FCFDFF' },- { row: 55, col: 19, rgb: '#5896ED' },- { row: 55, col: 20, rgb: '#005FE3' },- { row: 55, col: 21, rgb: '#066CE5' },- { row: 55, col: 22, rgb: '#0670E6' },- { row: 55, col: 23, rgb: '#0574E8' },- { row: 55, col: 24, rgb: '#0579E8' },- { row: 55, col: 25, rgb: '#037DE9' },- { row: 55, col: 26, rgb: '#0281E9' },- { row: 55, col: 27, rgb: '#0386EB' },- { row: 55, col: 28, rgb: '#048CEC' },- { row: 55, col: 29, rgb: '#0490ED' },- { row: 55, col: 30, rgb: '#0493EB' },- { row: 55, col: 31, rgb: '#0394E8' },- { row: 55, col: 32, rgb: '#008FE4' },- { row: 55, col: 33, rgb: '#4BB4EB' },- { row: 55, col: 34, rgb: '#F9FDFE' },- { row: 55, col: 43, rgb: '#84D1E3' },- { row: 55, col: 44, rgb: '#009CC0' },- { row: 55, col: 45, rgb: '#01A2C0' },- { row: 55, col: 46, rgb: '#02A3BE' },- { row: 55, col: 47, rgb: '#00A3BA' },- { row: 55, col: 48, rgb: '#16ACBD' },- { row: 55, col: 49, rgb: '#E2F5F7' },- { row: 55, col: 53, rgb: '#67CCCC' },- { row: 55, col: 54, rgb: '#00A6A5' },- { row: 55, col: 55, rgb: '#00A9A3' },- { row: 55, col: 56, rgb: '#25B8B1' },- { row: 55, col: 57, rgb: '#F0FAF9' },- { row: 55, col: 59, rgb: '#C8EEEA' },- { row: 55, col: 60, rgb: '#07B09C' },- { row: 55, col: 61, rgb: '#07B19B' },- { row: 55, col: 62, rgb: '#CAEEE9' },- { row: 56, col: 12, rgb: '#BACBF5' },- { row: 56, col: 13, rgb: '#2760E2' },- { row: 56, col: 14, rgb: '#4076E7' },- { row: 56, col: 15, rgb: '#E3EBFB' },- { row: 56, col: 19, rgb: '#F0F6FD' },- { row: 56, col: 20, rgb: '#4D94EC' },- { row: 56, col: 21, rgb: '#0067E4' },- { row: 56, col: 22, rgb: '#0371E7' },- { row: 56, col: 23, rgb: '#0578E8' },- { row: 56, col: 24, rgb: '#057CE9' },- { row: 56, col: 25, rgb: '#0581E9' },- { row: 56, col: 26, rgb: '#0585EB' },- { row: 56, col: 27, rgb: '#048AEC' },- { row: 56, col: 28, rgb: '#048FEC' },- { row: 56, col: 29, rgb: '#0492EC' },- { row: 56, col: 30, rgb: '#0192E9' },- { row: 56, col: 31, rgb: '#008FE5' },- { row: 56, col: 32, rgb: '#43AFEA' },- { row: 56, col: 33, rgb: '#EBF7FD' },- { row: 56, col: 43, rgb: '#B1E2EC' },- { row: 56, col: 44, rgb: '#009EBE' },- { row: 56, col: 45, rgb: '#00A1BD' },- { row: 56, col: 46, rgb: '#00A3BB' },- { row: 56, col: 47, rgb: '#00A0B5' },- { row: 56, col: 48, rgb: '#8FD7DF' },- { row: 56, col: 52, rgb: '#C7ECEC' },- { row: 56, col: 53, rgb: '#06ABAA' },- { row: 56, col: 54, rgb: '#00AAA5' },- { row: 56, col: 55, rgb: '#00AAA2' },- { row: 56, col: 56, rgb: '#A8E3DF' },- { row: 56, col: 58, rgb: '#FBFEFE' },- { row: 56, col: 59, rgb: '#41C4B6' },- { row: 56, col: 60, rgb: '#00AA93' },- { row: 56, col: 61, rgb: '#6AD1C4' },- { row: 57, col: 13, rgb: '#F6F9FE' },- { row: 57, col: 14, rgb: '#FCFDFF' },- { row: 57, col: 20, rgb: '#F7FAFE' },- { row: 57, col: 21, rgb: '#7EB5F2' },- { row: 57, col: 22, rgb: '#117CE9' },- { row: 57, col: 23, rgb: '#0075E7' },- { row: 57, col: 24, rgb: '#007CE8' },- { row: 57, col: 25, rgb: '#0182EA' },- { row: 57, col: 26, rgb: '#0187EB' },- { row: 57, col: 27, rgb: '#008BEC' },- { row: 57, col: 28, rgb: '#008EEC' },- { row: 57, col: 29, rgb: '#008EE9' },- { row: 57, col: 30, rgb: '#0E98E8' },- { row: 57, col: 31, rgb: '#76C5F1' },- { row: 57, col: 32, rgb: '#F3FAFE' },- { row: 57, col: 43, rgb: '#FBFEFE' },- { row: 57, col: 44, rgb: '#78CEDD' },- { row: 57, col: 45, rgb: '#14A9C1' },- { row: 57, col: 46, rgb: '#11A8BD' },- { row: 57, col: 47, rgb: '#69CAD5' },- { row: 57, col: 48, rgb: '#F8FDFD' },- { row: 57, col: 51, rgb: '#FBFEFE' },- { row: 57, col: 52, rgb: '#3FBFBF' },- { row: 57, col: 53, rgb: '#00A8A5' },- { row: 57, col: 54, rgb: '#00A8A1' },- { row: 57, col: 55, rgb: '#46C3BD' },- { row: 57, col: 56, rgb: '#FDFEFE' },- { row: 57, col: 58, rgb: '#A3E2DB' },- { row: 57, col: 59, rgb: '#00AC97' },- { row: 57, col: 60, rgb: '#19B7A3' },- { row: 57, col: 61, rgb: '#E6F7F5' },- { row: 58, col: 22, rgb: '#DAEBFC' },- { row: 58, col: 23, rgb: '#82BDF4' },- { row: 58, col: 24, rgb: '#3F9FEE' },- { row: 58, col: 25, rgb: '#2093ED' },- { row: 58, col: 26, rgb: '#1794ED' },- { row: 58, col: 27, rgb: '#1F9CEF' },- { row: 58, col: 28, rgb: '#3DABF0' },- { row: 58, col: 29, rgb: '#7EC7F4' },- { row: 58, col: 30, rgb: '#D6EEFB' },- { row: 58, col: 45, rgb: '#E7F6F9' },- { row: 58, col: 46, rgb: '#E5F6F8' },- { row: 58, col: 51, rgb: '#A1DFDF' },- { row: 58, col: 52, rgb: '#00A7A6' },- { row: 58, col: 53, rgb: '#00AAA4' },- { row: 58, col: 54, rgb: '#09ADA6' },- { row: 58, col: 55, rgb: '#CDEFED' },- { row: 58, col: 57, rgb: '#EDF9F8' },- { row: 58, col: 58, rgb: '#21BAA8' },- { row: 58, col: 59, rgb: '#00AB95' },- { row: 58, col: 60, rgb: '#95DED4' },- { row: 59, col: 25, rgb: '#F1F8FE' },- { row: 59, col: 26, rgb: '#EAF5FD' },- { row: 59, col: 27, rgb: '#F1F9FE' },- { row: 59, col: 50, rgb: '#ECF9F9' },- { row: 59, col: 51, rgb: '#20B4B4' },- { row: 59, col: 52, rgb: '#00A9A5' },- { row: 59, col: 53, rgb: '#00A8A0' },- { row: 59, col: 54, rgb: '#6ED0CB' },- { row: 59, col: 57, rgb: '#79D5CB' },- { row: 59, col: 58, rgb: '#00AA94' },- { row: 59, col: 59, rgb: '#35C1AF' },- { row: 59, col: 60, rgb: '#F8FDFC' },- { row: 60, col: 50, rgb: '#76D1D1' },- { row: 60, col: 51, rgb: '#00A7A4' },- { row: 60, col: 52, rgb: '#00AAA3' },- { row: 60, col: 53, rgb: '#1CB4AD' },- { row: 60, col: 54, rgb: '#E8F8F7' },- { row: 60, col: 56, rgb: '#D5F2EE' },- { row: 60, col: 57, rgb: '#0CB29F' },- { row: 60, col: 58, rgb: '#03AF98' },- { row: 60, col: 59, rgb: '#BCEAE4' },- { row: 61, col: 49, rgb: '#D1F0F0' },- { row: 61, col: 50, rgb: '#0BADAB' },- { row: 61, col: 51, rgb: '#00AAA5' },- { row: 61, col: 52, rgb: '#00A9A1' },- { row: 61, col: 53, rgb: '#99DEDA' },- { row: 61, col: 55, rgb: '#FEFFFF' },- { row: 61, col: 56, rgb: '#4FC8BB' },- { row: 61, col: 57, rgb: '#00AA93' },- { row: 61, col: 58, rgb: '#5ACCBD' },- { row: 62, col: 49, rgb: '#90DAD9' },- { row: 62, col: 50, rgb: '#00A4A0' },- { row: 62, col: 51, rgb: '#00A8A0' },- { row: 62, col: 52, rgb: '#38BEB7' },- { row: 62, col: 53, rgb: '#F9FDFD' },- { row: 62, col: 55, rgb: '#B2E7E1' },- { row: 62, col: 56, rgb: '#01AD98' },- { row: 62, col: 57, rgb: '#11B49F' },- { row: 62, col: 58, rgb: '#DCF4F1' },- { row: 63, col: 49, rgb: '#DBF3F3' },- { row: 63, col: 50, rgb: '#36BCB7' },- { row: 63, col: 51, rgb: '#2BB8B1' },- { row: 63, col: 52, rgb: '#CAEEEB' },- { row: 63, col: 54, rgb: '#F4FBFB' },- { row: 63, col: 55, rgb: '#2CBDAD' },- { row: 63, col: 56, rgb: '#00AB93' },- { row: 63, col: 57, rgb: '#85D9CE' },- { row: 64, col: 50, rgb: '#FBFEFD' },- { row: 64, col: 51, rgb: '#F8FDFC' },- { row: 64, col: 54, rgb: '#89DAD1' },- { row: 64, col: 55, rgb: '#00AA94' },- { row: 64, col: 56, rgb: '#29BDA9' },- { row: 64, col: 57, rgb: '#F2FBFA' },- { row: 65, col: 53, rgb: '#E0F5F3' },- { row: 65, col: 54, rgb: '#13B5A1' },- { row: 65, col: 55, rgb: '#00AD96' },- { row: 65, col: 56, rgb: '#AEE6DE' },- { row: 66, col: 53, rgb: '#57CBBE' },- { row: 66, col: 54, rgb: '#00AA92' },- { row: 66, col: 55, rgb: '#4BC8B7' },- { row: 66, col: 56, rgb: '#FEFFFE' },- { row: 67, col: 52, rgb: '#82D8CE' },- { row: 67, col: 53, rgb: '#00AC97' },- { row: 67, col: 54, rgb: '#0EB49D' },- { row: 67, col: 55, rgb: '#D4F2ED' },- { row: 68, col: 50, rgb: '#FAFDFD' },- { row: 68, col: 51, rgb: '#6FD2C7' },- { row: 68, col: 52, rgb: '#00AC97' },- { row: 68, col: 53, rgb: '#02AF98' },- { row: 68, col: 54, rgb: '#A1E2D9' },- { row: 69, col: 50, rgb: '#EEFAF8' },- { row: 69, col: 51, rgb: '#13B6A3' },- { row: 69, col: 52, rgb: '#09B19B' },- { row: 69, col: 53, rgb: '#9BE0D7' },- { row: 70, col: 51, rgb: '#CFF0EC' },- { row: 70, col: 52, rgb: '#D0F1ED' },-];--function shuffle(array) {- let currentIndex = array.length,- randomIndex;-- // While there remain elements to shuffle.- while (currentIndex > 0) {- // Pick a remaining element.- randomIndex = Math.floor(Math.random() * currentIndex);- currentIndex--;-- // And swap it with the current element.- [array[currentIndex], array[randomIndex]] = [array[randomIndex], array[currentIndex]];- }-- return array;-}--colors = shuffle(colors);--let index = 0;-const key = setInterval(() => {- if (index < colors.length) {- const cell = colors[index];- const range = newSheet.getRange(cell.row, cell.col);- range.setBackgroundColor(cell.rgb);- } else {- clearInterval(key);- }-- index += 1;-}, 23);-diff --git a/examples/src/sheets-uniscript/main.ts b/examples/src/sheets-uniscript/main.tsdeleted file mode 100644index 95ad441330..0000000000--- a/examples/src/sheets-uniscript/main.ts+++ /dev/null@@ -1,80 +0,0 @@-import { LocaleType, LogLevel, Univer, UniverInstanceType } from '@univerjs/core';-import { UniverDebuggerPlugin } from '@univerjs/debugger';-import { UniverDocsPlugin } from '@univerjs/docs';-import { UniverDocsUIPlugin } from '@univerjs/docs-ui';-import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';-import { UniverRenderEnginePlugin } from '@univerjs/engine-render';-import { loadDebuggerLocale, UNISCRIT_WORKBOOK_DATA_DEMO } from '@univerjs/mockdata';-import zhCN from '@univerjs/mockdata/locales/zh-CN';-import { UniverSheetsPlugin } from '@univerjs/sheets';-import { UniverSheetsFormulaPlugin } from '@univerjs/sheets-formula';-import { UniverSheetsNumfmtPlugin } from '@univerjs/sheets-numfmt';-import { UniverSheetsNumfmtUIPlugin } from '@univerjs/sheets-numfmt-ui';-import { UniverSheetsUIPlugin } from '@univerjs/sheets-ui';-import { UniverUIPlugin } from '@univerjs/ui';-import { UniverUniscriptPlugin } from '@univerjs/uniscript';-import '../global.css';--/* eslint-disable-next-line node/prefer-global/process */-const IS_E2E: boolean = !!process.env.IS_E2E;--// univer-const univer = new Univer({- locale: LocaleType.ZH_CN,- locales: {- [LocaleType.ZH_CN]: zhCN,- },- logLevel: LogLevel.VERBOSE,-});--// core plugins-univer.registerPlugin(UniverRenderEnginePlugin);-univer.registerPlugin(UniverUIPlugin, {- container: 'app',- ribbonType: 'classic',-});--univer.registerPlugin(UniverDocsPlugin);-univer.registerPlugin(UniverDocsUIPlugin);--univer.registerPlugin(UniverSheetsPlugin);-univer.registerPlugin(UniverSheetsUIPlugin);--// sheet feature plugins-univer.registerPlugin(UniverSheetsNumfmtPlugin);-univer.registerPlugin(UniverSheetsNumfmtUIPlugin);-univer.registerPlugin(UniverFormulaEnginePlugin);-univer.registerPlugin(UniverSheetsFormulaPlugin);-univer.registerPlugin(UniverUniscriptPlugin, {- getWorkerUrl(_: string, label: string) {- if (label === 'typescript' || label === 'javascript') {- return '/vs/language/typescript/ts.worker.js';- }-- return '/vs/editor/editor.worker.js';- },-});--// If we are running in e2e platform, we should immediately register the debugger plugin.-if (IS_E2E) {- univer.registerPlugin(UniverDebuggerPlugin, {- fab: false,- fabEntryUnitType: UniverInstanceType.UNIVER_SHEET,- localeLoader: loadDebuggerLocale,- performanceMonitor: {- enabled: false,- },- });-}--// create univer sheet instance-univer.createUnit(UniverInstanceType.UNIVER_SHEET, UNISCRIT_WORKBOOK_DATA_DEMO);--declare global {-- interface Window {- univer?: Univer;- }-}--window.univer = univer;diff --git a/examples/src/sheets/very-lazy.ts b/examples/src/sheets/very-lazy.tsindex 0c5d054c8f..7c75b6f217 100644--- a/examples/src/sheets/very-lazy.ts+++ b/examples/src/sheets/very-lazy.ts@@ -7,7 +7,6 @@ import { UniverSheetsCrosshairHighlightPlugin } from '@univerjs/sheets-crosshairimport { UniverSheetsFindReplacePlugin } from '@univerjs/sheets-find-replace';import { UniverSheetsHyperLinkUIPlugin } from '@univerjs/sheets-hyper-link-ui';import { UniverSheetsSortUIPlugin } from '@univerjs/sheets-sort-ui';-import { UniverUniscriptPlugin } from '@univerjs/uniscript';import { UniverWatermarkPlugin } from '@univerjs/watermark';/* eslint-disable-next-line node/prefer-global/process */@@ -28,23 +27,6 @@ export default function getVeryLazyPlugins() {fabEntryUnitType: UniverInstanceType.UNIVER_SHEET,localeLoader: loadDebuggerLocale,}]);- plugins.push([UniverUniscriptPlugin, {- getWorkerUrl(_: string, label: string) {- if (label === 'json') {- return '/vs/language/json/json.worker.js';- }- if (label === 'css' || label === 'scss' || label === 'less') {- return '/vs/language/css/css.worker.js';- }- if (label === 'html' || label === 'handlebars' || label === 'razor') {- return '/vs/language/html/html.worker.js';- }- if (label === 'typescript' || label === 'javascript') {- return '/vs/language/typescript/ts.worker.js';- }- return '/vs/editor/editor.worker.js';- },- }]);}return plugins;diff --git a/packages/core/src/common/__tests__/regexp.spec.ts b/packages/core/src/common/__tests__/regexp.spec.tsnew file mode 100644index 0000000000..5595e1b809--- /dev/null+++ b/packages/core/src/common/__tests__/regexp.spec.ts@@ -0,0 +1,76 @@+/**+ * Copyright 2023-present DreamNum Co., Ltd.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { describe, expect, it } from 'vitest';+import { regexp } from '../regexp';++describe('regexp utilities', () => {+ it('escapes regular expression syntax characters', () => {+ expect(regexp.escapeRegExp('a+b*c?.[test]')).toBe(String.raw`a\+b\*c\?\.\[test\]`);+ expect(new RegExp(regexp.escapeRegExp('a+b*c?.[test]')).test('a+b*c?.[test]')).toBe(true);+ });++ it('converts wildcard text to an anchored regular expression', () => {+ const regex = regexp.createFromWildcard('file-??-*.ts');++ expect(regex.test('file-ab-index.ts')).toBe(true);+ expect(regex.test('FILE-12-.ts')).toBe(true);+ expect(regex.test('prefix-file-ab-index.ts')).toBe(false);+ expect(regex.test('file-a-index.ts')).toBe(false);+ });++ it('builds literal regexes from text containing regex syntax', () => {+ const regex = regexp.createLiteralRegExp('a.b+(test)?', 'g');++ expect('a.b+(test)? aXb+(test)?'.replace(regex, 'hit')).toBe('hit aXb+(test)?');+ });++ it('builds character sets with union, subtraction, and intersection', () => {+ const letters = regexp.charset(['a', 'f']).subtract('b', ['d', 'e']);+ const reg = letters.toRegExp();++ expect(letters.toString()).toBe('[acf]');+ expect(reg.test('a')).toBe(true);+ expect(reg.test('b')).toBe(false);+ expect(reg.test('c')).toBe(true);+ expect(reg.test('d')).toBe(false);+ expect(reg.test('e')).toBe(false);+ expect(reg.test('f')).toBe(true);++ const intersection = regexp.charset(['a', 'z']).intersect(['m', 'p']);+ expect(intersection.toString()).toBe('[m-p]');+ });++ it('validates dynamic regexp flags before constructing regexes', () => {+ expect(regexp.charset(['a', 'z']).toRegExp('iu').flags).toBe('iu');+ expect(regexp.or('SUM', 'AVERAGE').toRegExp('i').test('sum')).toBe(true);++ expect(() => regexp.charset(['a', 'z']).toRegExp('ii')).toThrow('Invalid regular expression flags');+ expect(() => regexp.charset(['a', 'z']).toRegExp('x')).toThrow('Invalid regular expression flags');+ expect(() => regexp.or('SUM').toRegExp('gg')).toThrow('Invalid regular expression flags');+ });++ it('builds alternatives from strings and character sets', () => {+ const keyword = regexp.or('SUM', 'SUMIF', regexp.charset('A', 'B'));+ const reg = new RegExp(`^${keyword}$`);++ expect(keyword.toString()).toBe('(?:[A-B]|SUM|SUMIF)');+ expect(reg.test('A')).toBe(true);+ expect(reg.test('SUM')).toBe(true);+ expect(reg.test('SUMIF')).toBe(true);+ expect(reg.test('AVERAGE')).toBe(false);+ });+});diff --git a/packages/core/src/common/regexp/charset.ts b/packages/core/src/common/regexp/charset.tsnew file mode 100644index 0000000000..0a227b86f5--- /dev/null+++ b/packages/core/src/common/regexp/charset.ts@@ -0,0 +1,210 @@+/**+ * Copyright 2023-present DreamNum Co., Ltd.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { createRegExpFromSafeFragment } from './factory';++export type CharsetDataUnit = [number, number];++/**+ * A single character, code point, or inclusive range used to build a character class.+ *+ * String inputs must contain exactly one Unicode code point. Use `or()` for multi-character+ * alternatives such as keywords or table names.+ */+export type CharsetRawInput = string | number | [string, string] | [number, number];+export type CharsetInput = Charset | CharsetRawInput;++const MAX_CODE_POINT = 0x10FFFF;++/**+ * Builds a normalized regular-expression character class.+ *+ * `Charset` is intended for dynamic character sets, especially when callers need set+ * operations that are hard to read or easy to get wrong with handwritten `[...]` strings.+ * Ranges are stored as inclusive Unicode code-point pairs and merged during construction.+ */+export class Charset {+ readonly data: CharsetDataUnit[];++ constructor(...inputs: CharsetInput[]) {+ this.data = normalizeData(inputs.flatMap((input) => inputToData(input)));+ }++ /**+ * Returns a new charset containing this charset and all provided characters or ranges.+ */+ union(...inputs: CharsetInput[]): Charset {+ return new Charset(this, ...inputs);+ }++ /**+ * Returns a new charset with the provided characters or ranges removed.+ */+ subtract(...inputs: CharsetInput[]): Charset {+ const subtractData = normalizeData(inputs.flatMap((input) => inputToData(input)));+ let next = this.data.slice();++ for (const [removeStart, removeEnd] of subtractData) {+ const fragments: CharsetDataUnit[] = [];++ for (const [start, end] of next) {+ if (removeEnd < start || removeStart > end) {+ fragments.push([start, end]);+ continue;+ }++ if (removeStart > start) {+ fragments.push([start, removeStart - 1]);+ }++ if (removeEnd < end) {+ fragments.push([removeEnd + 1, end]);+ }+ }++ next = fragments;+ }++ return new Charset(...next);+ }++ /**+ * Returns a new charset containing only characters shared with the provided inputs.+ */+ intersect(...inputs: CharsetInput[]): Charset {+ const intersectData = normalizeData(inputs.flatMap((input) => inputToData(input)));+ const next: CharsetDataUnit[] = [];++ for (const [start, end] of this.data) {+ for (const [intersectStart, intersectEnd] of intersectData) {+ const nextStart = Math.max(start, intersectStart);+ const nextEnd = Math.min(end, intersectEnd);++ if (nextStart <= nextEnd) {+ next.push([nextStart, nextEnd]);+ }+ }+ }++ return new Charset(...next);+ }++ /**+ * Returns whether this charset would match no characters.+ */+ isEmpty(): boolean {+ return this.data.length === 0;+ }++ /**+ * Serializes to a regex fragment, not a full anchored pattern.+ */+ toString(): string {+ if (this.isEmpty()) {+ return '(?!)';+ }++ return `[${this.data.map(rangeToString).join('')}]`;+ }++ /**+ * Creates a `RegExp` from this charset fragment with optional flags.+ */+ toRegExp(flags?: string): RegExp {+ return createRegExpFromSafeFragment(this.toString(), flags);+ }+}++/**+ * Convenience factory for `new Charset(...)`.+ */+export const charset = (...inputs: CharsetInput[]): Charset => new Charset(...inputs);++function inputToData(input: CharsetInput): CharsetDataUnit[] {+ if (input instanceof Charset) {+ return input.data;+ }++ if (Array.isArray(input)) {+ const start = codePoint(input[0]);+ const end = codePoint(input[1]);++ return [[Math.min(start, end), Math.max(start, end)]];+ }++ const point = codePoint(input);+ return [[point, point]];+}++function codePoint(input: string | number): number {+ if (typeof input === 'number') {+ if (!Number.isInteger(input) || input < 0 || input > MAX_CODE_POINT) {+ throw new RangeError(`Invalid code point: ${input}`);+ }++ return input;+ }++ const point = input.codePointAt(0);+ if (point == null || String.fromCodePoint(point) !== input) {+ throw new RangeError(`Charset string inputs must contain exactly one code point: ${input}`);+ }++ return point;+}++function normalizeData(data: CharsetDataUnit[]): CharsetDataUnit[] {+ if (data.length === 0) {+ return [];+ }++ const sorted = data.slice().sort((a, b) => a[0] - b[0] || a[1] - b[1]);+ const result: CharsetDataUnit[] = [];++ for (const [start, end] of sorted) {+ const last = result[result.length - 1];++ if (!last || start > last[1] + 1) {+ result.push([start, end]);+ } else {+ last[1] = Math.max(last[1], end);+ }+ }++ return result;+}++function rangeToString([start, end]: CharsetDataUnit): string {+ if (start === end) {+ return escapeCharClassCodePoint(start);+ }++ return `${escapeCharClassCodePoint(start)}-${escapeCharClassCodePoint(end)}`;+}++function escapeCharClassCodePoint(point: number): string {+ const char = String.fromCodePoint(point);++ if (char === '\\' || char === ']' || char === '-' || char === '^') {+ return `\\${char}`;+ }++ if (point <= 0x1F || point === 0x7F) {+ return `\\u${point.toString(16).padStart(4, '0')}`;+ }++ return char;+}diff --git a/packages/core/src/common/regexp/escape.ts b/packages/core/src/common/regexp/escape.tsnew file mode 100644index 0000000000..7b60b39e18--- /dev/null+++ b/packages/core/src/common/regexp/escape.ts@@ -0,0 +1,43 @@+/**+ * Copyright 2023-present DreamNum Co., Ltd.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { createRegExpFromSafeFragment } from './factory';++/**+ * Escapes text so it can be embedded in a regular-expression pattern as a literal.+ */+export function escapeRegExp(value: string): string {+ return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');+}++/**+ * Creates a `RegExp` that matches literal text rather than regular-expression syntax.+ */+export function createLiteralRegExp(value: string, flags?: string): RegExp {+ return createRegExpFromSafeFragment(escapeRegExp(value), flags);+}++/**+ * Converts a spreadsheet-style wildcard pattern to an anchored regular expression.+ *+ * `*` matches any number of characters and `?` matches one character. All other+ * regular-expression syntax is treated as literal text. Matching is case-insensitive.+ */+export function createFromWildcard(pattern: string): RegExp {+ const escaped = escapeRegExp(pattern);+ const source = escaped.replace(/\\\*/g, '.*').replace(/\\\?/g, '.');+ return createRegExpFromSafeFragment(`^${source}$`, 'i');+}diff --git a/packages/core/src/common/regexp/factory.ts b/packages/core/src/common/regexp/factory.tsnew file mode 100644index 0000000000..643485ea95--- /dev/null+++ b/packages/core/src/common/regexp/factory.ts@@ -0,0 +1,41 @@+/**+ * Copyright 2023-present DreamNum Co., Ltd.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++const REGEXP_FLAGS = new Set(['d', 'g', 'i', 'm', 's', 'u', 'v', 'y']);++export function createRegExpFromSafeFragment(fragment: string, flags?: string): RegExp {+ const safeFlags = normalizeRegExpFlags(flags);++ // Fragments passed here must come from regexp helpers that escape literals or normalize charsets.+ return new RegExp(fragment, safeFlags); // nosemgrep: javascript.lang.security.audit.detect-non-literal-regexp.detect-non-literal-regexp+}++function normalizeRegExpFlags(flags: string | undefined): string | undefined {+ if (flags === undefined) {+ return undefined;+ }++ const seen = new Set<string>();+ for (const flag of flags) {+ if (!REGEXP_FLAGS.has(flag) || seen.has(flag)) {+ throw new SyntaxError(`Invalid regular expression flags: ${flags}`);+ }++ seen.add(flag);+ }++ return flags;+}diff --git a/packages/core/src/common/regexp/index.ts b/packages/core/src/common/regexp/index.tsnew file mode 100644index 0000000000..8dc6b161d6--- /dev/null+++ b/packages/core/src/common/regexp/index.ts@@ -0,0 +1,39 @@+/**+ * Copyright 2023-present DreamNum Co., Ltd.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { Charset, charset } from './charset';+import { createFromWildcard, createLiteralRegExp, escapeRegExp } from './escape';+import { createRegExpFromSafeFragment } from './factory';+import { Or, or } from './or';++/**+ * Namespace-style public API for regex helpers.+ *+ * Import this as `regexp` and call methods through the namespace, for example+ * `regexp.escapeRegExp(value)` or `regexp.or(...names)`. Do not export these+ * helpers individually from the package root; keeping one namespace avoids+ * scattered regex APIs and accidental name collisions.+ */+export const regexp = {+ Charset,+ Or,+ charset,+ or,+ createRegExpFromSafeFragment,+ escapeRegExp,+ createLiteralRegExp,+ createFromWildcard,+};diff --git a/packages/core/src/common/regexp/or.ts b/packages/core/src/common/regexp/or.tsnew file mode 100644index 0000000000..00359db55f--- /dev/null+++ b/packages/core/src/common/regexp/or.ts@@ -0,0 +1,108 @@+/**+ * Copyright 2023-present DreamNum Co., Ltd.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import type { CharsetInput } from './charset';+import { Charset, charset } from './charset';+import { escapeRegExp } from './escape';+import { createRegExpFromSafeFragment } from './factory';++/**+ * A literal string, existing `Or`, or character-set input used to build alternatives.+ */+export type OrInput = string | Or | CharsetInput;++/**+ * Builds a regex alternation from literal strings and character sets.+ *+ * Literal strings are escaped automatically. Character-set inputs are folded into one+ * `Charset`, so `or('SUM', charset('A', 'B'))` serializes to an alternation containing+ * both the string branch and the character-class branch.+ */+export class Or {+ readonly charset: Charset;+ readonly strings: string[];++ constructor(...inputs: OrInput[]) {+ const charsetInputs: CharsetInput[] = [];+ const strings: string[] = [];++ for (const input of inputs) {+ if (input instanceof Or) {+ charsetInputs.push(input.charset);+ strings.push(...input.strings);+ } else if (input instanceof Charset || typeof input === 'number' || Array.isArray(input)) {+ charsetInputs.push(input);+ } else {+ strings.push(input);+ }+ }++ this.charset = charset(...charsetInputs);+ this.strings = Array.from(new Set(strings));+ }++ /**+ * Returns a new alternation containing this instance and all provided inputs.+ */+ union(...inputs: OrInput[]): Or {+ return new Or(this, ...inputs);+ }++ /**+ * Returns a new alternation with matching string and charset inputs removed.+ */+ subtract(...inputs: OrInput[]): Or {+ const other = new Or(...inputs);+ const nextStrings = this.strings.filter((item) => !other.strings.includes(item));++ return new Or(this.charset.subtract(other.charset), ...nextStrings);+ }++ /**+ * Returns whether this alternation would match no branches.+ */+ isEmpty(): boolean {+ return this.charset.isEmpty() && this.strings.length === 0;+ }++ /**+ * Serializes to a regex fragment, not a full anchored pattern.+ */+ toString(): string {+ if (this.isEmpty()) {+ return '(?!)';+ }++ const alternatives = [+ ...(!this.charset.isEmpty() ? [this.charset.toString()] : []),+ ...this.strings.map(escapeRegExp),+ ];++ return alternatives.length === 1 ? alternatives[0] : `(?:${alternatives.join('|')})`;+ }++ /**+ * Creates a `RegExp` from this alternation fragment with optional flags.+ */+ toRegExp(flags?: string): RegExp {+ return createRegExpFromSafeFragment(this.toString(), flags);+ }+}++/**+ * Convenience factory for `new Or(...)`.+ */+export const or = (...inputs: OrInput[]): Or => new Or(...inputs);diff --git a/packages/core/src/index.ts b/packages/core/src/index.tsindex a8808aac8e..f1d97bafb9 100644--- a/packages/core/src/index.ts+++ b/packages/core/src/index.ts@@ -51,6 +51,7 @@ export * from './common/lodash';export { MemoryCursor } from './common/memory-cursor';export { mixinClass } from './common/mixin';export { isNumeric, isSafeNumeric, willLoseNumericPrecision } from './common/number';+export { regexp } from './common/regexp';export { Registry, RegistryAsMap } from './common/registry';export { requestImmediateMacroTask } from './common/request-immediate-macro-task';export { sequence, sequenceAsync } from './common/sequence';diff --git a/packages/core/src/shared/__tests__/tools.spec.ts b/packages/core/src/shared/__tests__/tools.spec.tsindex 7c0af5de61..afc1221521 100644--- a/packages/core/src/shared/__tests__/tools.spec.ts+++ b/packages/core/src/shared/__tests__/tools.spec.ts@@ -15,7 +15,7 @@*/import { afterEach, describe, expect, it, vi } from 'vitest';-import { createREGEXFromWildChar, Tools } from '../tools';+import { Tools } from '../tools';class CustomProto {value = 1;@@ -110,13 +110,9 @@ describe('Tools extra coverage', () => {expect(({} as any).polluted).toBeUndefined();});- it('should read timing, ids and wildcard regex helpers', () => {+ it('should read timing helpers', () => {vi.spyOn(globalThis.performance, 'now').mockReturnValue(123.456);expect(Tools.now()).toBe(123.456);-- const regex = createREGEXFromWildChar('file-??-*.ts');- expect(regex.test('file-ab-index.ts')).toBe(true);- expect(regex.test('file-a-index.ts')).toBe(false);});});diff --git a/packages/core/src/shared/numfmt.ts b/packages/core/src/shared/numfmt.tsindex fbf7b1bf9a..aab77742f8 100644--- a/packages/core/src/shared/numfmt.ts+++ b/packages/core/src/shared/numfmt.ts@@ -15,6 +15,7 @@*/import * as numfmt from 'numfmt';+import { regexp } from '../common/regexp';export * as numfmt from 'numfmt';@@ -126,7 +127,7 @@ const ignoreCommonPatterns = new Set(['m d']);const ignoreAMPMPatterns = new Set(['h:mm AM/PM', 'hh:mm AM/PM']);export const currencySymbols = ['Rp', 'zł', 'NT$', 'R$', 'HK$', '$', '£', '¥', '¤', '֏', '؋', '৳', '฿', '៛', '₡', '₦', '₩', '₪', '₫', '€', '₭', '₮', '₱', '₲', '₴', '₸', '₹', '₺', '₼', '₽', '₾', '₿', '﷼'];-const currencySymbolSet = new Set(currencySymbols);+const CURRENCY_SYMBOL_PREFIX_REG = new RegExp(`^${regexp.charset(...Array.from(new Set(currencySymbols.join(''))))}+`);/*** Get the numfmt parse value, and filter out the parse error.@@ -162,7 +163,7 @@ export const getNumfmtParseValueFilter = (value: string): numfmt.ParseData | nulif (z.includes('#,##0')) {if (/[.,]$/.test(value)) return null;- const normalized = value.replace(new RegExp(`^[${[...currencySymbolSet].join('')}]+`), '').trim();+ const normalized = value.replace(CURRENCY_SYMBOL_PREFIX_REG, '').trim();if (normalized.includes(',')) {const validGrouping = /^-?\d{1,3}(,\d{3})*(\.\d+)?$/.test(normalized);diff --git a/packages/core/src/shared/tools.ts b/packages/core/src/shared/tools.tsindex 9f132ee6af..22c4a8567c 100644--- a/packages/core/src/shared/tools.ts+++ b/packages/core/src/shared/tools.ts@@ -538,22 +538,3 @@ export const isNodeEnv = () => {// eslint-disable-next-line node/prefer-global/processreturn typeof process !== 'undefined' && process.versions != null && process.versions.node != null;};--/**- * Converts a wildcard pattern with ? and * to a regular expression.- * @param {string} wildChar - The wildcard string containing ? and *- * @returns {RegExp} The generated regular expression- */-export function createREGEXFromWildChar(wildChar: string): RegExp {- const escaped = escapeRegExp(wildChar);- const regexpStr = escaped.replace(/\\\*/g, '.*').replace(/\\\?/g, '.');- return new RegExp(`^${regexpStr}$`, 'i');-}--/**- * Escapes characters that have special meaning in a regular expression so the- * returned string can be safely embedded in a RegExp pattern as literal text.- */-export function escapeRegExp(str: string): string {- return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');-}diff --git a/packages/engine-formula/src/engine/utils/__tests__/generate-ast-node.spec.ts b/packages/engine-formula/src/engine/utils/__tests__/generate-ast-node.spec.tsindex 013849f8a1..d2dea04196 100644--- a/packages/engine-formula/src/engine/utils/__tests__/generate-ast-node.spec.ts+++ b/packages/engine-formula/src/engine/utils/__tests__/generate-ast-node.spec.ts@@ -188,6 +188,38 @@ describe('generateAstNode defined name cache invalidation', () => {expect(harness.getParseCount()).toBe(2);});+ it('treats dirty super table names as literal text when building cache invalidation patterns', () => {+ const harness = createHarness({}, {+ 'unit-1': {+ 'Sales.Table+': '1',+ },+ });++ generateAstNode(+ 'unit-1',+ '=SUM(Sales.Table+[col1])',+ harness.lexer as never,+ harness.astTreeBuilder as never,+ harness.currentConfigService as never+ );+ generateAstNode(+ 'unit-1',+ '=SUM(SalesXTable+[col1])',+ harness.lexer as never,+ harness.astTreeBuilder as never,+ harness.currentConfigService as never+ );+ generateAstNode(+ 'unit-1',+ '=SUM(SalesXTable+[col1])',+ harness.lexer as never,+ harness.astTreeBuilder as never,+ harness.currentConfigService as never+ );++ expect(harness.getParseCount()).toBe(2);+ });+it('reuses cache when formula references a dirty super table in another unit', () => {const harness = createHarness({}, {'unit-2': {diff --git a/packages/engine-formula/src/engine/utils/generate-ast-node.ts b/packages/engine-formula/src/engine/utils/generate-ast-node.tsindex 82b86805e7..bf65819251 100644--- a/packages/engine-formula/src/engine/utils/generate-ast-node.ts+++ b/packages/engine-formula/src/engine/utils/generate-ast-node.ts@@ -23,7 +23,7 @@ import type { AstTreeBuilder } from '../analysis/parser';import type { AstRootNode } from '../ast-node/ast-root-node';import type { BaseAstNode } from '../ast-node/base-ast-node';import type { IFormulaDependencyTree } from '../dependency/dependency-tree';-import { escapeRegExp } from '@univerjs/core';+import { regexp } from '@univerjs/core';import { FormulaAstLRU } from '../../basics/cache-lru';import { ERROR_TYPE_SET } from '../../basics/error-type';import { ErrorNode } from '../ast-node/base-ast-node';@@ -129,12 +129,11 @@ function getNormalizedDirtyDefinedNameSet(unitDefinedNameMap: IDirtyStringMap):function getDirtySuperTableReferencePattern(unitSuperTableMap: IDirtyStringMap): RegExp | null {let tableReferencePattern = DIRTY_SUPER_TABLE_PATTERN_CACHE.get(unitSuperTableMap);if (tableReferencePattern === undefined) {- const escapedTableNames = Object.keys(unitSuperTableMap)- .filter((tableName) => tableName.length > 0)- .map(escapeRegExp);+ const tableNames = Object.keys(unitSuperTableMap)+ .filter((tableName) => tableName.length > 0);- tableReferencePattern = escapedTableNames.length > 0- ? new RegExp(`(^|[^A-Za-z0-9_])(?:${escapedTableNames.join('|')})(\\s*\\[|$|[^A-Za-z0-9_])`, 'i')+ tableReferencePattern = tableNames.length > 0+ ? regexp.createRegExpFromSafeFragment(`(^|[^A-Za-z0-9_])${regexp.or(...tableNames)}(\\s*\\[|$|[^A-Za-z0-9_])`, 'i'): null;DIRTY_SUPER_TABLE_PATTERN_CACHE.set(unitSuperTableMap, tableReferencePattern);}diff --git a/packages/engine-formula/src/functions/text/textsplit/index.ts b/packages/engine-formula/src/functions/text/textsplit/index.tsindex d0a6e63f62..42cae3185a 100644--- a/packages/engine-formula/src/functions/text/textsplit/index.ts+++ b/packages/engine-formula/src/functions/text/textsplit/index.ts@@ -15,7 +15,7 @@*/import type { BaseValueObject } from '../../../engine/value-object/base-value-object';-import { escapeRegExp } from '@univerjs/core';+import { regexp } from '@univerjs/core';import { ErrorType } from '../../../basics/error-type';import { expandArrayValueObject } from '../../../engine/utils/array-object';import { ArrayValueObject } from '../../../engine/value-object/array-value-object';@@ -274,7 +274,7 @@ export class Textsplit extends BaseFunction {value += '';- return escapeRegExp(value);+ return regexp.escapeRegExp(value);}private _isBlankScalarDelimiter(valueObject: BaseValueObject): boolean {diff --git a/packages/engine-render/package.json b/packages/engine-render/package.jsonindex 46807909b0..894b8c5383 100644--- a/packages/engine-render/package.json+++ b/packages/engine-render/package.json@@ -71,7 +71,6 @@"@floating-ui/dom": "^1.7.6","@floating-ui/utils": "^0.2.11","@univerjs/core": "workspace:*",- "cjk-regex": "^3.4.0","franc-min": "^6.2.0","opentype.js": "^2.0.0"},diff --git a/packages/engine-render/src/basics/__tests__/cjk-regexp.spec.ts b/packages/engine-render/src/basics/__tests__/cjk-regexp.spec.tsnew file mode 100644index 0000000000..f71bd0a8c0--- /dev/null+++ b/packages/engine-render/src/basics/__tests__/cjk-regexp.spec.ts@@ -0,0 +1,132 @@+/**+ * Copyright 2023-present DreamNum Co., Ltd.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { describe, expect, it } from 'vitest';+import { cjk } from '../cjk-regexp';++type CharsetDataUnit = [number, number];+type TestType = 'non-cjk' | 'cjk-letter' | 'cjk-punctuation';+type TestCases = Record<string, TestType>;++const CJK_LETTER_SOURCE = String.raw`[\u1100-\u11ff\u2e80-\u2e99\u2e9b-\u2ef3\u2f00-\u2fd5\u3005\u3007\u3021-\u3029\u3038-\u303b\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fd-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u321e\u3260-\u327e\u32d0-\u32fe\u3300-\u3357\u3400-\u4dbf\u4e00-\u9fff\ua960-\ua97c\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\uff66-\uff6f\uff71-\uff9d\uffa0-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]|[\ud840-\ud868\ud86a-\ud86d\ud86f-\ud872\ud874-\ud879\ud880-\ud883\ud885-\ud88c][\udc00-\udfff]|\ud81b[\udfe3\udff2-\udff6]|\ud82b[\udff0-\udff3\udff5-\udffb\udffd-\udffe]|\ud82c[\udc00-\udd22\udd32\udd50-\udd52\udd55\udd64-\udd67]|\ud83c[\ude00]|\ud869[\udc00-\udedf\udf00-\udfff]|\ud86e[\udc00-\udc1d\udc20-\udfff]|\ud873[\udc00-\udead\udeb0-\udfff]|\ud87a[\udc00-\udfe0\udff0-\udfff]|\ud87b[\udc00-\ude5d]|\ud87e[\udc00-\ude1d]|\ud884[\udc00-\udf4a\udf50-\udfff]|\ud88d[\udc00-\udc79]`;+const CJK_PUNCTUATION_SOURCE = String.raw`[\u2ff0-\u3004\u3006\u3008-\u3020\u302a-\u3037\u303c-\u303f\u30a0\u30fb-\u30fc\u3190-\u319f\u31c0-\u31ef\u321f-\u325f\u327f-\u32cf\u32ff\u3358-\u33ff\ufe10-\ufe1f\ufe30-\ufe6f\uff00-\uff65\uff70\uff9e-\uff9f\uffbf-\uffc1\uffc8-\uffc9\uffd0-\uffd1\uffd8-\uffd9\uffdd-\uffef]`;+const CJK_ALL_SOURCE = String.raw`[\u1100-\u11ff\u2e80-\u2e99\u2e9b-\u2ef3\u2f00-\u2fd5\u2ff0-\u303f\u3041-\u3096\u309d-\u30ff\u3105-\u312f\u3131-\u318e\u3190-\u4dbf\u4e00-\u9fff\ua960-\ua97c\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufe10-\ufe1f\ufe30-\ufe6f\uff00-\uffef]|[\ud840-\ud868\ud86a-\ud86d\ud86f-\ud872\ud874-\ud879\ud880-\ud883\ud885-\ud88c][\udc00-\udfff]|\ud81b[\udfe3\udff2-\udff6]|\ud82b[\udff0-\udff3\udff5-\udffb\udffd-\udffe]|\ud82c[\udc00-\udd22\udd32\udd50-\udd52\udd55\udd64-\udd67]|\ud83c[\ude00]|\ud869[\udc00-\udedf\udf00-\udfff]|\ud86e[\udc00-\udc1d\udc20-\udfff]|\ud873[\udc00-\udead\udeb0-\udfff]|\ud87a[\udc00-\udfe0\udff0-\udfff]|\ud87b[\udc00-\ude5d]|\ud87e[\udc00-\ude1d]|\ud884[\udc00-\udf4a\udf50-\udfff]|\ud88d[\udc00-\udc79]`;++const EXPECTED_CJK_LETTER_DATA: CharsetDataUnit[] = [[4352, 4607], [11904, 11929], [11931, 12019], [12032, 12245], [12293, 12293], [12295, 12295], [12321, 12329], [12344, 12347], [12353, 12438], [12445, 12447], [12449, 12538], [12541, 12543], [12549, 12591], [12593, 12686], [12704, 12735], [12784, 12830], [12896, 12926], [13008, 13054], [13056, 13143], [13312, 19903], [19968, 40959], [43360, 43388], [44032, 55203], [55216, 55238], [55243, 55291], [63744, 64109], [64112, 64217], [65382, 65391], [65393, 65437], [65440, 65470], [65474, 65479], [65482, 65487], [65490, 65495], [65498, 65500], [94179, 94179], [94194, 94198], [110576, 110579], [110581, 110587], [110589, 110590], [110592, 110882], [110898, 110898], [110928, 110930], [110933, 110933], [110948, 110951], [127488, 127488], [131072, 173791], [173824, 178205], [178208, 183981], [183984, 191456], [191472, 192093], [194560, 195101], [196608, 201546], [201552, 210041]];+const EXPECTED_CJK_PUNCTUATION_DATA: CharsetDataUnit[] = [[12272, 12292], [12294, 12294], [12296, 12320], [12330, 12343], [12348, 12351], [12448, 12448], [12539, 12540], [12688, 12703], [12736, 12783], [12831, 12895], [12927, 13007], [13055, 13055], [13144, 13311], [65040, 65055], [65072, 65135], [65280, 65381], [65392, 65392], [65438, 65439], [65471, 65473], [65480, 65481], [65488, 65489], [65496, 65497], [65501, 65519]];+const EXPECTED_CJK_ALL_DATA: CharsetDataUnit[] = [[4352, 4607], [11904, 11929], [11931, 12019], [12032, 12245], [12272, 12351], [12353, 12438], [12445, 12543], [12549, 12591], [12593, 12686], [12688, 19903], [19968, 40959], [43360, 43388], [44032, 55203], [55216, 55238], [55243, 55291], [63744, 64109], [64112, 64217], [65040, 65055], [65072, 65135], [65280, 65519], [94179, 94179], [94194, 94198], [110576, 110579], [110581, 110587], [110589, 110590], [110592, 110882], [110898, 110898], [110928, 110930], [110933, 110933], [110948, 110951], [127488, 127488], [131072, 173791], [173824, 178205], [178208, 183981], [183984, 191456], [191472, 192093], [194560, 195101], [196608, 201546], [201552, 210041]];++function casify(chars: string, type: TestType): TestCases {+ return Object.fromEntries(Array.from(chars).map((character) => [character, type]));+}++// Character samples copied from cjk-regex 3.4.0 upstream tests.+const cjkTestCases: TestCases = {+ ...casify('⻁⺪⻏', 'cjk-letter'),+ ...casify('。「」〒〓〱', 'cjk-punctuation'),+ ...casify('〻〧〨〤々', 'cjk-letter'),+ ...casify('⽒⽓⽔⽕', 'cjk-letter'),+ ...casify('⿰⿱⿲⿳', 'cjk-punctuation'),+ ...casify('あどなにぬハヒヘホ', 'cjk-letter'),+ ...casify('゠・', 'cjk-punctuation'),+ ...casify('ㇼㇽㇾㇿ', 'cjk-letter'),+ ...casify('㈱㋋㋌㋿', 'cjk-punctuation'),+ ...casify('㇀㇁㇂㇃㇄㇅㇆㇇㇈㇉㇊㇢㇣', 'cjk-punctuation'),+ ...casify('ㄅㄬㄭㄮㄯㆠㆡㆾㆿ', 'cjk-letter'),+ ...casify('ㅂㅵㅶㅷㅸꥠꥹꥺꥻퟔퟸퟹퟺퟻ', 'cjk-letter'),+ ...casify('가힠힡힢힣', 'cjk-letter'),+ ...casify('㆐㆑㆒㆓', 'cjk-punctuation'),+ ...casify('㌕㍕㍖㍗', 'cjk-letter'),+ ...casify('㍧㍻㍿㏄㏾', 'cjk-punctuation'),+ ...casify('䶼䶽䶾䶿中', 'cjk-letter'),+ ...casify('豈兀﨔隷侮恵並﨎', 'cjk-letter'),+ ...casify('﹌﹍﹎﹏﹨﹩﹪﹫!D「¥○', 'cjk-punctuation'),+ ...casify('ヲユᅦ', 'cjk-letter'),+ ...casify('𬉼𬷰𬷱𬺠𬺡', 'cjk-letter'),+ ...casify('𛋸𛋹𛋺𛋻', 'non-cjk'),+ ...casify('𘳒𘳓𘳔𘳕', 'non-cjk'),+ ...casify('.a', 'non-cjk'),+ ...casify('𪛜𪛝𪛞𪛟', 'cjk-letter'),+ ...casify('𫚄𫚅𫜸𫜹', 'cjk-letter'),+ ...casify('𫝀𫝁𫝂𫝃', 'cjk-letter'),+ ...casify('𮨥𮨦𮯠', 'cjk-letter'),+ ...casify('𰀀𰀁𱍀𱍊', 'cjk-letter'),+ ...casify('𱍐𱍑𲎬𲎭', 'cjk-letter'),+ ...casify('乁你鼻𪘀', 'cjk-letter'),+ ...casify('𛄀𛄁𛄡𛄢𚿵𚿶𚿷𚿸𛀂𛀀𛀁𛃾𛃿𛅕𛄲𛅤𛅥𛅦𛅧', 'cjk-letter'),+};++describe('cjk', () => {+ it('keeps cjk-regex 3.4.0 generated sources', () => {+ expect(cjk.CJK_LETTER_REG.source).toBe(CJK_LETTER_SOURCE);+ expect(cjk.CJK_PUNCTUATION_REG.source).toBe(CJK_PUNCTUATION_SOURCE);+ expect(cjk.CJK_ALL_REG.source).toBe(CJK_ALL_SOURCE);+ });++ it('builds charset-compatible cjk-regex snapshots', () => {+ expect(cjk.letters().data).toEqual(EXPECTED_CJK_LETTER_DATA);+ expect(cjk.punctuations().data).toEqual(EXPECTED_CJK_PUNCTUATION_DATA);+ expect(cjk.all().data).toEqual(EXPECTED_CJK_ALL_DATA);+ expect(cjk.CJK_LETTER_DATA).toEqual(EXPECTED_CJK_LETTER_DATA);+ expect(cjk.CJK_PUNCTUATION_DATA).toEqual(EXPECTED_CJK_PUNCTUATION_DATA);+ expect(cjk.CJK_ALL_DATA).toEqual(EXPECTED_CJK_ALL_DATA);+ });++ describe('matches cjk-regex 3.4.0 character categories', () => {+ const allReg = cjk.all().toRegExp('u');+ const lettersReg = cjk.letters().toRegExp('u');+ const punctuationsReg = cjk.punctuations().toRegExp('u');++ for (const [character, category] of Object.entries(cjkTestCases)) {+ const title = `"${character}" (0x${character.codePointAt(0)!.toString(16)}) is ${category}`;++ it(title, () => {+ switch (category) {+ case 'non-cjk': {+ expect(character).not.toMatch(allReg);+ expect(character).not.toMatch(lettersReg);+ expect(character).not.toMatch(punctuationsReg);+ expect(cjk.hasCJK(character)).toBe(false);+ expect(cjk.hasCJKText(character)).toBe(false);+ expect(cjk.hasCJKPunctuation(character)).toBe(false);+ break;+ }+ case 'cjk-letter': {+ expect(character).toMatch(allReg);+ expect(character).toMatch(lettersReg);+ expect(character).not.toMatch(punctuationsReg);+ expect(cjk.hasCJK(character)).toBe(true);+ expect(cjk.hasCJKText(character)).toBe(true);+ expect(cjk.hasCJKPunctuation(character)).toBe(false);+ break;+ }+ case 'cjk-punctuation': {+ expect(character).toMatch(allReg);+ expect(character).not.toMatch(lettersReg);+ expect(character).toMatch(punctuationsReg);+ expect(cjk.hasCJK(character)).toBe(true);+ expect(cjk.hasCJKText(character)).toBe(false);+ expect(cjk.hasCJKPunctuation(character)).toBe(true);+ break;+ }+ default: {+ throw new Error(`Unexpected category "${category}"`);+ }+ }+ });+ }+ });+});diff --git a/packages/engine-render/src/basics/__tests__/tools.spec.ts b/packages/engine-render/src/basics/__tests__/tools.spec.tsindex fee8d1c10d..cdeb8bd56e 100644--- a/packages/engine-render/src/basics/__tests__/tools.spec.ts+++ b/packages/engine-render/src/basics/__tests__/tools.spec.ts@@ -40,9 +40,6 @@ import {hasAllLatin,hasArabic,hasBasicLatin,- hasCJK,- hasCJKPunctuation,- hasCJKText,hasLatinExtendedA,hasLatinExtendedB,hasLatinOneSupplement,@@ -189,9 +186,6 @@ describe('tools extra', () => {expect(superscript.fontSize).toBeCloseTo(7.2);expect(baselineSpy).toHaveBeenCalled();- expect(hasCJKText('中文')).toBe(true);- expect(hasCJK('。')).toBe(true);- expect(hasCJKPunctuation(',')).toBe(true);expect(hasAllLatin('abc')).toBe(true);expect(hasBasicLatin('A')).toBe(true);expect(hasLatinOneSupplement('é')).toBe(true);diff --git a/packages/engine-render/src/basics/cjk-regexp.ts b/packages/engine-render/src/basics/cjk-regexp.tsnew file mode 100644index 0000000000..79ec93bfe3--- /dev/null+++ b/packages/engine-render/src/basics/cjk-regexp.ts@@ -0,0 +1,108 @@+/**+ * Copyright 2023-present DreamNum Co., Ltd.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { regexp } from '@univerjs/core';++type CharsetDataUnit = [number, number];++/**+ * Golden regex sources generated from `[email protected]`.+ *+ * Keep these strings stable unless intentionally upgrading cjk-regex semantics. The tests+ * assert exact source equality so document CJK layout behavior does not drift through+ * manual range edits.+ */+const CJK_LETTER_SOURCE = String.raw`[\u1100-\u11ff\u2e80-\u2e99\u2e9b-\u2ef3\u2f00-\u2fd5\u3005\u3007\u3021-\u3029\u3038-\u303b\u3041-\u3096\u309d-\u309f\u30a1-\u30fa\u30fd-\u30ff\u3105-\u312f\u3131-\u318e\u31a0-\u31bf\u31f0-\u321e\u3260-\u327e\u32d0-\u32fe\u3300-\u3357\u3400-\u4dbf\u4e00-\u9fff\ua960-\ua97c\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\uff66-\uff6f\uff71-\uff9d\uffa0-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]|[\ud840-\ud868\ud86a-\ud86d\ud86f-\ud872\ud874-\ud879\ud880-\ud883\ud885-\ud88c][\udc00-\udfff]|\ud81b[\udfe3\udff2-\udff6]|\ud82b[\udff0-\udff3\udff5-\udffb\udffd-\udffe]|\ud82c[\udc00-\udd22\udd32\udd50-\udd52\udd55\udd64-\udd67]|\ud83c[\ude00]|\ud869[\udc00-\udedf\udf00-\udfff]|\ud86e[\udc00-\udc1d\udc20-\udfff]|\ud873[\udc00-\udead\udeb0-\udfff]|\ud87a[\udc00-\udfe0\udff0-\udfff]|\ud87b[\udc00-\ude5d]|\ud87e[\udc00-\ude1d]|\ud884[\udc00-\udf4a\udf50-\udfff]|\ud88d[\udc00-\udc79]`;+const CJK_PUNCTUATION_SOURCE = String.raw`[\u2ff0-\u3004\u3006\u3008-\u3020\u302a-\u3037\u303c-\u303f\u30a0\u30fb-\u30fc\u3190-\u319f\u31c0-\u31ef\u321f-\u325f\u327f-\u32cf\u32ff\u3358-\u33ff\ufe10-\ufe1f\ufe30-\ufe6f\uff00-\uff65\uff70\uff9e-\uff9f\uffbf-\uffc1\uffc8-\uffc9\uffd0-\uffd1\uffd8-\uffd9\uffdd-\uffef]`;+const CJK_ALL_SOURCE = String.raw`[\u1100-\u11ff\u2e80-\u2e99\u2e9b-\u2ef3\u2f00-\u2fd5\u2ff0-\u303f\u3041-\u3096\u309d-\u30ff\u3105-\u312f\u3131-\u318e\u3190-\u4dbf\u4e00-\u9fff\ua960-\ua97c\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\uf900-\ufa6d\ufa70-\ufad9\ufe10-\ufe1f\ufe30-\ufe6f\uff00-\uffef]|[\ud840-\ud868\ud86a-\ud86d\ud86f-\ud872\ud874-\ud879\ud880-\ud883\ud885-\ud88c][\udc00-\udfff]|\ud81b[\udfe3\udff2-\udff6]|\ud82b[\udff0-\udff3\udff5-\udffb\udffd-\udffe]|\ud82c[\udc00-\udd22\udd32\udd50-\udd52\udd55\udd64-\udd67]|\ud83c[\ude00]|\ud869[\udc00-\udedf\udf00-\udfff]|\ud86e[\udc00-\udc1d\udc20-\udfff]|\ud873[\udc00-\udead\udeb0-\udfff]|\ud87a[\udc00-\udfe0\udff0-\udfff]|\ud87b[\udc00-\ude5d]|\ud87e[\udc00-\ude1d]|\ud884[\udc00-\udf4a\udf50-\udfff]|\ud88d[\udc00-\udc79]`;++const CJK_LETTER_REG = new RegExp(CJK_LETTER_SOURCE);+// eslint-disable-next-line no-misleading-character-class -- Generated cjk-regex punctuation class intentionally matches this exact source.+const CJK_PUNCTUATION_REG = new RegExp(CJK_PUNCTUATION_SOURCE);+const CJK_ALL_REG = new RegExp(CJK_ALL_SOURCE);++/**+ * Golden code-point ranges generated from `[email protected]` snapshots.+ *+ * These are kept alongside the regex sources so compatibility can be checked against+ * both matching behavior and `Charset.data`-style range snapshots.+ */+const CJK_LETTER_DATA: CharsetDataUnit[] = [[4352, 4607], [11904, 11929], [11931, 12019], [12032, 12245], [12293, 12293], [12295, 12295], [12321, 12329], [12344, 12347], [12353, 12438], [12445, 12447], [12449, 12538], [12541, 12543], [12549, 12591], [12593, 12686], [12704, 12735], [12784, 12830], [12896, 12926], [13008, 13054], [13056, 13143], [13312, 19903], [19968, 40959], [43360, 43388], [44032, 55203], [55216, 55238], [55243, 55291], [63744, 64109], [64112, 64217], [65382, 65391], [65393, 65437], [65440, 65470], [65474, 65479], [65482, 65487], [65490, 65495], [65498, 65500], [94179, 94179], [94194, 94198], [110576, 110579], [110581, 110587], [110589, 110590], [110592, 110882], [110898, 110898], [110928, 110930], [110933, 110933], [110948, 110951], [127488, 127488], [131072, 173791], [173824, 178205], [178208, 183981], [183984, 191456], [191472, 192093], [194560, 195101], [196608, 201546], [201552, 210041]];+const CJK_PUNCTUATION_DATA: CharsetDataUnit[] = [[12272, 12292], [12294, 12294], [12296, 12320], [12330, 12343], [12348, 12351], [12448, 12448], [12539, 12540], [12688, 12703], [12736, 12783], [12831, 12895], [12927, 13007], [13055, 13055], [13144, 13311], [65040, 65055], [65072, 65135], [65280, 65381], [65392, 65392], [65438, 65439], [65471, 65473], [65480, 65481], [65488, 65489], [65496, 65497], [65501, 65519]];+const CJK_ALL_DATA: CharsetDataUnit[] = [[4352, 4607], [11904, 11929], [11931, 12019], [12032, 12245], [12272, 12351], [12353, 12438], [12445, 12543], [12549, 12591], [12593, 12686], [12688, 19903], [19968, 40959], [43360, 43388], [44032, 55203], [55216, 55238], [55243, 55291], [63744, 64109], [64112, 64217], [65040, 65055], [65072, 65135], [65280, 65519], [94179, 94179], [94194, 94198], [110576, 110579], [110581, 110587], [110589, 110590], [110592, 110882], [110898, 110898], [110928, 110930], [110933, 110933], [110948, 110951], [127488, 127488], [131072, 173791], [173824, 178205], [178208, 183981], [183984, 191456], [191472, 192093], [194560, 195101], [196608, 201546], [201552, 210041]];++/**+ * Returns the CJK letter charset generated from `[email protected]`.+ */+function letters() {+ return regexp.charset(...CJK_LETTER_DATA);+}++/**+ * Returns the CJK punctuation charset generated from `[email protected]`.+ */+function punctuations() {+ return regexp.charset(...CJK_PUNCTUATION_DATA);+}++/**+ * Returns the combined CJK letter and punctuation charset generated from `[email protected]`.+ */+function all() {+ return regexp.charset(...CJK_ALL_DATA);+}++/**+ * Returns true when text contains CJK letters, excluding punctuation and symbols.+ */+function hasCJKText(text: string): boolean {+ return CJK_LETTER_REG.test(text);+}++/**+ * Returns true when text contains CJK letters or CJK punctuation.+ */+function hasCJK(text: string): boolean {+ return CJK_ALL_REG.test(text);+}++/**+ * Returns true when text contains CJK punctuation, excluding CJK letters.+ */+function hasCJKPunctuation(text: string): boolean {+ return CJK_PUNCTUATION_REG.test(text);+}++/**+ * Namespace-style CJK regex API used by document rendering and layout.+ */+export const cjk = {+ CJK_LETTER_SOURCE,+ CJK_PUNCTUATION_SOURCE,+ CJK_ALL_SOURCE,+ CJK_LETTER_REG,+ CJK_PUNCTUATION_REG,+ CJK_ALL_REG,+ CJK_LETTER_DATA,+ CJK_PUNCTUATION_DATA,+ CJK_ALL_DATA,+ letters,+ punctuations,+ all,+ hasCJKText,+ hasCJK,+ hasCJKPunctuation,+};diff --git a/packages/engine-render/src/basics/index.ts b/packages/engine-render/src/basics/index.tsindex 2ef84cb2ed..6e203f10ab 100644--- a/packages/engine-render/src/basics/index.ts+++ b/packages/engine-render/src/basics/index.ts@@ -16,6 +16,7 @@export * from '../components/docs/layout/shaping-engine/font-cache';export * from './cell-data';+export { cjk } from './cjk-regexp';export * from './const';export * from './document-node-tools';export * from './draw';diff --git a/packages/engine-render/src/basics/tools.ts b/packages/engine-render/src/basics/tools.tsindex 150e2d7a2c..86a7ef0655 100644--- a/packages/engine-render/src/basics/tools.ts+++ b/packages/engine-render/src/basics/tools.ts@@ -35,7 +35,6 @@ import {Rectangle,Tools,} from '@univerjs/core';-import * as cjk from 'cjk-regex';import { FontCache } from '../components/docs/layout/shaping-engine/font-cache';import { DEFAULT_FONTFACE_PLANE } from './const';@@ -338,23 +337,6 @@ function normalizeFontFamily(fontFamily: Nullable<string>, defaultFont: string):.join(', ');}-// Whether it contains CJK characters, excluding symbols-const CJK_LETTER_REG = cjk.letters().toRegExp();-export function hasCJKText(text: string) {- return CJK_LETTER_REG.test(text);-}--// Whether it contains CJK characters that support vertical layout, including punctuation-const CJK_ALL_REG = cjk.all().toRegExp();-export function hasCJK(text: string) {- return CJK_ALL_REG.test(text);-}--const CJK_PUNCTUATION_REG = cjk.punctuations().toRegExp();-export function hasCJKPunctuation(text: string) {- return CJK_PUNCTUATION_REG.test(text);-}-export function hasAllLatin(text: string) {const pattern = /[\u0000-\u024F]/gi;if (!pattern.exec(text)) {diff --git a/packages/engine-render/src/components/docs/extensions/font-and-base-line.ts b/packages/engine-render/src/components/docs/extensions/font-and-base-line.tsindex 8386f707e2..4a8a6aaca8 100644--- a/packages/engine-render/src/components/docs/extensions/font-and-base-line.ts+++ b/packages/engine-render/src/components/docs/extensions/font-and-base-line.ts@@ -20,7 +20,8 @@ import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeletonimport type { UniverRenderingContext } from '../../../context';import type { IDrawInfo } from '../../extension';import { BaselineOffset, getColorStyle } from '@univerjs/core';-import { GlyphType, hasCJK } from '../../../basics';+import { GlyphType } from '../../../basics';+import { cjk } from '../../../basics/cjk-regexp';import { COLOR_BLACK_RGB } from '../../../basics/const';import { Vector2 } from '../../../basics/vector2';import { CheckboxShape } from '../../../shape';@@ -358,7 +359,7 @@ export class FontAndBaseLine extends docExtension {const isVertical = vertexAngle === VERTICAL_DEG && centerAngle === VERTICAL_DEG;- if (isVertical && !hasCJK(content)) {+ if (isVertical && !cjk.hasCJK(content)) {ctx.save();ctx.translate(spanStartPoint.x + centerPoint.x, spanStartPoint.y + centerPoint.y);ctx.rotate(Math.PI / 2);diff --git a/packages/engine-render/src/components/docs/layout/block/paragraph/line-adjustment.ts b/packages/engine-render/src/components/docs/layout/block/paragraph/line-adjustment.tsindex e1bbd9a698..081755e423 100644--- a/packages/engine-render/src/components/docs/layout/block/paragraph/line-adjustment.ts+++ b/packages/engine-render/src/components/docs/layout/block/paragraph/line-adjustment.ts@@ -24,9 +24,8 @@ import type {import type { DataStreamTreeNode } from '../../../view-model/data-stream-tree-node';import type { DocumentViewModel } from '../../../view-model/document-view-model';import { HorizontalAlign, WrapStrategy } from '@univerjs/core';+import { cjk } from '../../../../../basics/cjk-regexp';import {- hasCJK,- hasCJKText,isCjkLeftAlignedPunctuation,isCjkRightAlignedPunctuation,} from '../../../../../basics/tools';@@ -97,7 +96,7 @@ function getJustifiables(divide: IDocumentSkeletonDivide): number {const lastGlyph = divide.glyphGroup[divide.glyphGroup.length - 1];// CJK character at line end should not be adjusted.- if (hasCJK(lastGlyph.content)) {+ if (cjk.hasCJK(lastGlyph.content)) {return justifiables - 1;}@@ -279,7 +278,7 @@ function restoreLastCJKGlyphWidth(line: IDocumentSkeletonLine) {if (lastGlyph &÷.isFull &&- hasCJKText(lastGlyph.content) &&+ cjk.hasCJKText(lastGlyph.content) &&lastGlyph.width - lastGlyph.xOffset > lastGlyph.bBox.width) {const shrinkAmount = lastGlyph.width - lastGlyph.xOffset - lastGlyph.bBox.width;diff --git a/packages/engine-render/src/components/docs/layout/block/paragraph/shaping.ts b/packages/engine-render/src/components/docs/layout/block/paragraph/shaping.tsindex 880c4c24d7..2e5db75cde 100644--- a/packages/engine-render/src/components/docs/layout/block/paragraph/shaping.ts+++ b/packages/engine-render/src/components/docs/layout/block/paragraph/shaping.ts@@ -22,11 +22,9 @@ import type { DocumentViewModel } from '../../../view-model/document-view-model'import type { IOpenTypeGlyphInfo } from '../../shaping-engine/text-shaping';import type { ILayoutContext } from '../../tools';import { BooleanNumber, DataStreamTreeTokenType, GridType, PositionedObjectLayoutType } from '@univerjs/core';+import { cjk } from '../../../../../basics/cjk-regexp';import {hasArabic,- hasCJK,- hasCJKPunctuation,- hasCJKText,hasThai,hasTibetan,startWithEmoji,@@ -64,8 +62,8 @@ function punctuationSpaceAdjustment(shapedGlyphs: IDocumentSkeletonGlyph[]) {const delta = width / 2;if (- hasCJKPunctuation(content) &&- hasCJKPunctuation(nextGlyph.content) &&+ cjk.hasCJKPunctuation(content) &&+ cjk.hasCJKPunctuation(nextGlyph.content) &&curGlyph.adjustability.shrinkability[1] + nextGlyph.adjustability.shrinkability[0] >= delta) {const leftDelta = Math.min(curGlyph.adjustability.shrinkability[1], delta);@@ -91,13 +89,13 @@ function addCJKLatinSpacing(shapedTextList: IShapedText[]) {const { width } = curGlyph;// Case 1: CJ followed by a Latin character.- if (hasCJKText(curGlyph.content) && nextGlyph && LATIN_REG.test(nextGlyph.content)) {+ if (cjk.hasCJKText(curGlyph.content) && nextGlyph && LATIN_REG.test(nextGlyph.content)) {curGlyph.width += width / 4;curGlyph.adjustability.shrinkability[1] += width / 8;}// Case 2: Latin followed by a CJ character.- if (hasCJKText(curGlyph.content) && prevGlyph && LATIN_REG.test(prevGlyph.content)) {+ if (cjk.hasCJKText(curGlyph.content) && prevGlyph && LATIN_REG.test(prevGlyph.content)) {curGlyph.width += width / 4;curGlyph.xOffset += width / 4;curGlyph.adjustability.shrinkability[0] += width / 8;@@ -257,7 +255,7 @@ export function shaping(shapedGlyphs.push(newGlyph);i += char.length;src = src.substring(char.length);- } else if (/\s/.test(char) || hasCJK(char)) {+ } else if (/\s/.test(char) || cjk.hasCJK(char)) {const config = getFontCreateConfig(i, viewModel, paragraphNode, sectionBreakConfig, paragraph);let newGlyph: Nullable<IDocumentSkeletonGlyph> = null;diff --git a/packages/engine-render/src/components/docs/layout/model/glyph.ts b/packages/engine-render/src/components/docs/layout/model/glyph.tsindex d84dd037f9..b9c42ae416 100644--- a/packages/engine-render/src/components/docs/layout/model/glyph.ts+++ b/packages/engine-render/src/components/docs/layout/model/glyph.ts@@ -24,10 +24,9 @@ import type {import type { IFontCreateConfig } from '../../../../basics/interfaces';import type { IOpenTypeGlyphInfo } from '../shaping-engine/text-shaping';import { BooleanNumber, BulletAlignment, DataStreamTreeTokenType as DT, GridType } from '@univerjs/core';+import { cjk } from '../../../../basics/cjk-regexp';import { GlyphType } from '../../../../basics/i-document-skeleton-cached';import {- hasCJK,- hasCJKText,isCjkCenterAlignedPunctuation,isCjkLeftAlignedPunctuation,isCjkRightAlignedPunctuation,@@ -48,7 +47,7 @@ export function isJustifiable() {// punctuation style is not relevant here.return isSpace(content)- || hasCJKText(content)+ || cjk.hasCJKText(content)|| isCjkLeftAlignedPunctuation(content)|| isCjkRightAlignedPunctuation(content)|| isCjkCenterAlignedPunctuation(content);@@ -231,7 +230,7 @@ export function _createSkeletonWordOrLetter(if (validationGrid(gridType, snapToGrid)) {// When text also needs to align to the grid, process it// const multiple = Math.ceil(contentWidth / charSpace);- width = contentWidth + (hasCJK(content) ? charSpace : charSpace / 2);+ width = contentWidth + (cjk.hasCJK(content) ? charSpace : charSpace / 2);if (gridType === GridType.SNAP_TO_CHARS) {xOffset = (width - contentWidth) / 2;}diff --git a/packages/engine-render/tsconfig.json b/packages/engine-render/tsconfig.jsonindex 1249f9b6dc..d4f9172636 100644--- a/packages/engine-render/tsconfig.json+++ b/packages/engine-render/tsconfig.json@@ -4,5 +4,5 @@"rootDir": "src","outDir": "lib/types"},- "include": ["src", "types"]+ "include": ["src"]}diff --git a/packages/engine-render/tsconfig.node.json b/packages/engine-render/tsconfig.node.jsonindex ee4536da90..2abfa07367 100644--- a/packages/engine-render/tsconfig.node.json+++ b/packages/engine-render/tsconfig.node.json@@ -8,8 +8,7 @@"outDir": "lib/types"},"include": [- "src",- "types"+ "src"],"exclude": ["src/**/__tests__/**",diff --git a/packages/sheets-filter/src/models/custom-filters.ts b/packages/sheets-filter/src/models/custom-filters.tsindex 69f11e065f..cac2bd92a0 100644--- a/packages/sheets-filter/src/models/custom-filters.ts+++ b/packages/sheets-filter/src/models/custom-filters.ts@@ -15,7 +15,7 @@*/import type { CellValue, Nullable } from '@univerjs/core';-import { createREGEXFromWildChar, isNumeric } from '@univerjs/core';+import { isNumeric, regexp } from '@univerjs/core';import { CustomFilterOperator } from './types';export interface IFilterFn<P extends unknown[]> {@@ -115,7 +115,7 @@ export const notEquals: ICustomFilterFn<TwoParameters<number | string>> = {};const ensuredString = ensureString(value);- if (ensuredString && isWildCardString(compare)) return !createREGEXFromWildChar(compare as string).test(ensuredString);+ if (ensuredString && isWildCardString(compare)) return !regexp.createFromWildcard(compare as string).test(ensuredString);return ensuredString !== compare;}@@ -146,7 +146,7 @@ export const textMatch: ICustomFilterFn<TwoParameters<string>> = {return false;}- return createREGEXFromWildChar(compare).test(ensured);+ return regexp.createFromWildcard(compare).test(ensured);},};diff --git a/packages/sheets-find-replace/src/controllers/__tests__/sheet-find-replace.controller.spec.ts b/packages/sheets-find-replace/src/controllers/__tests__/sheet-find-replace.controller.spec.tsindex 5d790f74f8..04ef86ff2e 100644--- a/packages/sheets-find-replace/src/controllers/__tests__/sheet-find-replace.controller.spec.ts+++ b/packages/sheets-find-replace/src/controllers/__tests__/sheet-find-replace.controller.spec.ts@@ -506,6 +506,34 @@ describe('SheetFindModel search and replace', () => {model.dispose();});+ it('treats find strings as literal text when replacing plain cells', async () => {+ const activeSheet = createWorksheet('sheet-1', {+ '0,0': { v: 'a.b aXb a.b' },+ });+ const workbook = createWorkbook(activeSheet);+ const { model, commandService } = createModel(workbook);++ model.start({ ...baseQuery, findString: 'a.b' });++ await expect(model.replaceAll('hit')).resolves.toBe(true);+ expect(commandService.executeCommand).toHaveBeenLastCalledWith(SheetReplaceCommand.id, {+ unitId: 'unit-1',+ replacements: [+ {+ count: 1,+ subUnitId: 'sheet-1',+ value: {+ 0: {+ 0: { v: 'hit aXb hit' },+ },+ },+ },+ ],+ });++ model.dispose();+ });+it('returns empty replacement results when nothing is searchable', async () => {const activeSheet = createWorksheet('sheet-1', {});const workbook = createWorkbook(activeSheet);diff --git a/packages/sheets-find-replace/src/controllers/sheet-find-replace.controller.ts b/packages/sheets-find-replace/src/controllers/sheet-find-replace.controller.tsindex 6ba95d1f7c..31305a35e7 100644--- a/packages/sheets-find-replace/src/controllers/sheet-find-replace.controller.ts+++ b/packages/sheets-find-replace/src/controllers/sheet-find-replace.controller.ts@@ -33,7 +33,6 @@ import {CommandType,Disposable,EDITOR_ACTIVATED,- escapeRegExp,fromCallback,groupBy,ICommandService,@@ -42,6 +41,7 @@ import {Injector,IUniverInstanceService,ObjectMatrix,+ regexp,replaceInDocumentBody,rotate,ThemeService,@@ -953,7 +953,7 @@ export class SheetFindModel extends FindModel {return null;}- const newContent = currentContent!.f!.replace(new RegExp(escapeRegExp(findString), replaceFlag), replaceString);+ const newContent = currentContent!.f!.replace(regexp.createLiteralRegExp(findString, replaceFlag), replaceString);return { f: newContent, v: null };}@@ -966,7 +966,7 @@ export class SheetFindModel extends FindModel {}// replace plain text string- const newContent = currentContent.v!.toString().replace(new RegExp(escapeRegExp(findString), replaceFlag), replaceString!);+ const newContent = currentContent.v!.toString().replace(regexp.createLiteralRegExp(findString, replaceFlag), replaceString!);return { v: newContent };}}diff --git a/packages/sheets-formula/src/services/__tests__/register-function.service.spec.ts b/packages/sheets-formula/src/services/__tests__/register-function.service.spec.tsindex 8f546d2962..3abb897663 100644--- a/packages/sheets-formula/src/services/__tests__/register-function.service.spec.ts+++ b/packages/sheets-formula/src/services/__tests__/register-function.service.spec.ts@@ -96,7 +96,7 @@ describe('RegisterFunctionService', () => {expect(functionService.hasExecutor('ADD2')).toBe(false);});- it('uses remote registration hooks for grouped and async functions when the remote service is present', () => {+ it('does not serialize functions for remote registration when the remote service is present', () => {const registerFunctions = vi.fn().mockResolvedValue(undefined);const registerAsyncFunctions = vi.fn().mockResolvedValue(undefined);const unregisterFunctions = vi.fn().mockResolvedValue(undefined);@@ -111,31 +111,36 @@ describe('RegisterFunctionService', () => {injector.add([IRegisterFunctionService, { useClass: RegisterFunctionService }]);const registerFunctionService = injector.get(IRegisterFunctionService);+ const functionService = injector.get(IFunctionService);++ const groupedFunction = () => 1;+ const asyncFunction = async () => 2;+ const groupedToString = vi.fn(() => '() => 1');+ const asyncToString = vi.fn(() => 'async () => 2');+ groupedFunction.toString = groupedToString;+ asyncFunction.toString = asyncToString;const groupedDisposable = registerFunctionService.registerFunctions({calculate: [- [() => 1, 'REMOTE_GROUPED', 'Remote grouped function'],+ [groupedFunction, 'REMOTE_GROUPED', 'Remote grouped function'],],});const asyncDisposable = registerFunctionService.registerAsyncFunction({name: 'REMOTE_ASYNC',- func: async () => 2,+ func: asyncFunction,description: 'Remote async function',});- expect(registerFunctions).toHaveBeenCalledTimes(1);- expect(registerFunctions).toHaveBeenCalledWith([- [expect.stringContaining('() => 1'), 'REMOTE_GROUPED'],- ]);- expect(registerAsyncFunctions).toHaveBeenCalledTimes(1);- expect(registerAsyncFunctions).toHaveBeenCalledWith([- [expect.stringContaining('async'), 'REMOTE_ASYNC'],- ]);+ expect(functionService.hasExecutor('REMOTE_GROUPED')).toBe(true);+ expect(functionService.hasExecutor('REMOTE_ASYNC')).toBe(true);+ expect(groupedToString).not.toHaveBeenCalled();+ expect(asyncToString).not.toHaveBeenCalled();+ expect(registerFunctions).not.toHaveBeenCalled();+ expect(registerAsyncFunctions).not.toHaveBeenCalled();groupedDisposable.dispose();asyncDisposable.dispose();- expect(unregisterFunctions).toHaveBeenCalledWith(['REMOTE_GROUPED']);- expect(unregisterFunctions).toHaveBeenCalledWith(['REMOTE_ASYNC']);+ expect(unregisterFunctions).not.toHaveBeenCalled();});});diff --git a/packages/sheets-formula/src/services/register-function.service.ts b/packages/sheets-formula/src/services/register-function.service.tsindex 9e170559cd..3a98fb4064 100644--- a/packages/sheets-formula/src/services/register-function.service.ts+++ b/packages/sheets-formula/src/services/register-function.service.ts@@ -16,10 +16,9 @@import type { IDisposable, ILocales } from '@univerjs/core';import type { FormulaFunctionResultValueType, FormulaFunctionValueType, IFunctionInfo } from '@univerjs/engine-formula';-import { createIdentifier, Disposable, DisposableCollection, Inject, LocaleService, Optional, toDisposable } from '@univerjs/core';+import { createIdentifier, Disposable, DisposableCollection, Inject, LocaleService, toDisposable } from '@univerjs/core';import { AsyncCustomFunction, CustomFunction, FunctionType, IFunctionService } from '@univerjs/engine-formula';import { IDescriptionService } from './description.service';-import { IRemoteRegisterFunctionService } from './remote/remote-register-function.service';export type IRegisterFunction = (...arg: Array<FormulaFunctionValueType>@@ -129,9 +128,7 @@ export class RegisterFunctionService extends Disposable implements IRegisterFuncconstructor(@Inject(LocaleService) private readonly _localeService: LocaleService,@Inject(IDescriptionService) private readonly _descriptionService: IDescriptionService,- @IFunctionService private readonly _functionService: IFunctionService,- @Optional(IRemoteRegisterFunctionService)- private readonly _remoteRegisterFunctionService?: IRemoteRegisterFunctionService+ @IFunctionService private readonly _functionService: IFunctionService) {super();}@@ -169,9 +166,6 @@ export class RegisterFunctionService extends Disposable implements IRegisterFunc// calculationdisposables.add(this._registerLocalExecutors(calculate));- if (this._remoteRegisterFunctionService) {- disposables.add(this._registerRemoteExecutors(calculate));- }return disposables;}@@ -207,14 +201,6 @@ export class RegisterFunctionService extends Disposable implements IRegisterFuncdisposables.add(toDisposable(() => this._functionService.unregisterDescriptions(name)));disposables.add(toDisposable(() => this._functionService.deleteFormulaAstCacheKey(name)));- // Handle remote registration if available- if (this._remoteRegisterFunctionService) {- this._remoteRegisterFunctionService.registerAsyncFunctions([[func.toString(), name]]);- disposables.add(- toDisposable(() => this._remoteRegisterFunctionService!.unregisterFunctions([name]))- );- }-return disposables;}@@ -229,15 +215,4 @@ export class RegisterFunctionService extends Disposable implements IRegisterFuncthis._functionService.registerExecutors(...functions);return toDisposable(() => this._functionService.unregisterExecutors(...names));}-- private _registerRemoteExecutors(list: IRegisterFunctionList): IDisposable {- const functionNameList: string[] = []; // used to unregister functions- const functions = list.map(([func, name]) => {- functionNameList.push(name);- return [func.toString(), name] as [string, string];- });-- this._remoteRegisterFunctionService!.registerFunctions(functions);- return toDisposable(() => this._remoteRegisterFunctionService!.unregisterFunctions(functionNameList));- }}diff --git a/packages/sheets-formula/src/services/remote/__tests__/remote-register-function.service.spec.ts b/packages/sheets-formula/src/services/remote/__tests__/remote-register-function.service.spec.tsindex 702d7dd9d2..0036fe023f 100644--- a/packages/sheets-formula/src/services/remote/__tests__/remote-register-function.service.spec.ts+++ b/packages/sheets-formula/src/services/remote/__tests__/remote-register-function.service.spec.ts@@ -30,14 +30,29 @@ function createService(): { service: IRemoteRegisterFunctionService; functionSer}describe('RemoteRegisterFunctionService', () => {- it('registers remote formula executors and removes them with their metadata', async () => {+ it('rejects serialized remote formula executors without evaluating them', async () => {const { service, functionService } = createService();+ const marker = '__REMOTE_REGISTER_FUNCTION_SERVICE_POC_EXECUTED__';- await service.registerFunctions([['(value) => value + 1', 'REMOTE_ADD_ONE']]);- expect(functionService.hasExecutor('REMOTE_ADD_ONE')).toBe(true);+ delete (globalThis as Record<string, unknown>)[marker];- await service.registerAsyncFunctions([['async (value) => value * 2', 'REMOTE_DOUBLE']]);- expect(functionService.hasExecutor('REMOTE_DOUBLE')).toBe(true);+ await expect(service.registerFunctions([+ [`(() => { globalThis.${marker} = true; return (value) => value + 1; })()`, 'REMOTE_ADD_ONE'],+ ])).rejects.toThrow('Remote custom function registration is disabled');++ await expect(service.registerAsyncFunctions([+ [`(() => { globalThis.${marker} = true; return async (value) => value * 2; })()`, 'REMOTE_DOUBLE'],+ ])).rejects.toThrow('Remote custom function registration is disabled');++ expect((globalThis as Record<string, unknown>)[marker]).toBeUndefined();+ expect(functionService.hasExecutor('REMOTE_ADD_ONE')).toBe(false);+ expect(functionService.hasExecutor('REMOTE_DOUBLE')).toBe(false);++ delete (globalThis as Record<string, unknown>)[marker];+ });++ it('removes remote formula executors and their metadata', async () => {+ const { service, functionService } = createService();functionService.registerDescriptions({functionName: 'REMOTE_ADD_ONE',diff --git a/packages/sheets-formula/src/services/remote/remote-register-function.service.ts b/packages/sheets-formula/src/services/remote/remote-register-function.service.tsindex abf385b820..b0e4359c0b 100644--- a/packages/sheets-formula/src/services/remote/remote-register-function.service.ts+++ b/packages/sheets-formula/src/services/remote/remote-register-function.service.ts@@ -14,9 +14,8 @@* limitations under the License.*/-import type { BaseFunction } from '@univerjs/engine-formula';import { createIdentifier } from '@univerjs/core';-import { AsyncCustomFunction, CustomFunction, IFunctionService } from '@univerjs/engine-formula';+import { IFunctionService } from '@univerjs/engine-formula';export interface IRemoteRegisterFunctionService {registerFunctions(serializedFuncs: Array<[string, string]>): Promise<void>;@@ -36,19 +35,11 @@ export class RemoteRegisterFunctionService implements IRemoteRegisterFunctionSer) {}async registerFunctions(serializedFuncs: Array<[string, string]>): Promise<void> {- const functionList = serializedFuncs.map(([func, name]) => {- return createFunction(func, name);- });-- this._functionService.registerExecutors(...functionList);+ rejectRemoteCustomFunctionRegistration(serializedFuncs);}async registerAsyncFunctions(serializedFuncs: Array<[string, string]>): Promise<void> {- const functionList = serializedFuncs.map(([func, name]) => {- return createAsyncFunction(func, name);- });-- this._functionService.registerExecutors(...functionList);+ rejectRemoteCustomFunctionRegistration(serializedFuncs);}async unregisterFunctions(names: string[]): Promise<void> {@@ -58,18 +49,10 @@ export class RemoteRegisterFunctionService implements IRemoteRegisterFunctionSer}}-function createFunction(functionString: string, functionName: string) {- const instance = new CustomFunction(functionName);- // eslint-disable-next-line no-new-func- const functionCalculate = new Function(`return ${functionString}`)();- instance.calculateCustom = functionCalculate;- return instance as BaseFunction;-}+function rejectRemoteCustomFunctionRegistration(serializedFuncs: Array<[string, string]>): void {+ if (serializedFuncs.length === 0) {+ return;+ }-function createAsyncFunction(functionString: string, functionName: string) {- const instance = new AsyncCustomFunction(functionName);- // eslint-disable-next-line no-new-func- const functionCalculate = new Function(`return ${functionString}`)();- instance.calculateCustom = functionCalculate;- return instance as BaseFunction;+ throw new Error('Remote custom function registration is disabled because function deserialization over RPC is unsafe.');}diff --git a/packages/sheets-table/src/models/filter-util/text-filter-util.ts b/packages/sheets-table/src/models/filter-util/text-filter-util.tsindex 99df1cebf0..7c1603407d 100644--- a/packages/sheets-table/src/models/filter-util/text-filter-util.ts+++ b/packages/sheets-table/src/models/filter-util/text-filter-util.ts@@ -15,36 +15,36 @@*/import type { ITableStringFilterInfo } from '../../types/type';-import { createREGEXFromWildChar } from '@univerjs/core';+import { regexp } from '@univerjs/core';import { TableStringCompareTypeEnum } from '../../types/enum';export const textEqual = (compareValue: string, expectedValue: string) => {- const regex = createREGEXFromWildChar(expectedValue);+ const regex = regexp.createFromWildcard(expectedValue);return regex.test(compareValue);};export const textNotEqual = (compareValue: string, expectedValue: string) => {- const regex = createREGEXFromWildChar(expectedValue);+ const regex = regexp.createFromWildcard(expectedValue);return !regex.test(compareValue);};export const textContain = (compareValue: string, expectedValue: string) => {- const regex = createREGEXFromWildChar(`*${expectedValue}*`);+ const regex = regexp.createFromWildcard(`*${expectedValue}*`);return regex.test(compareValue);};export const textNotContain = (compareValue: string, expectedValue: string) => {- const regex = createREGEXFromWildChar(`*${expectedValue}*`);+ const regex = regexp.createFromWildcard(`*${expectedValue}*`);return !regex.test(compareValue);};export const textStartWith = (compareValue: string, expectedValue: string) => {- const regex = createREGEXFromWildChar(`${expectedValue}*`);+ const regex = regexp.createFromWildcard(`${expectedValue}*`);return regex.test(compareValue);};export const textEndWith = (compareValue: string, expectedValue: string) => {- const regex = createREGEXFromWildChar(`*${expectedValue}`);+ const regex = regexp.createFromWildcard(`*${expectedValue}`);return regex.test(compareValue);};diff --git a/packages/sheets/src/basics/defined-name-utils.ts b/packages/sheets/src/basics/defined-name-utils.tsindex 8d69b8fd36..418f7e5e96 100644--- a/packages/sheets/src/basics/defined-name-utils.ts+++ b/packages/sheets/src/basics/defined-name-utils.ts@@ -18,7 +18,7 @@ import type { IUniverInstanceService, Workbook } from '@univerjs/core';import type { IDefinedNamesService, IFunctionService, ISuperTableService } from '@univerjs/engine-formula';import { Tools, UniverInstanceType } from '@univerjs/core';import { isReferenceStringWithEffectiveColumn } from '@univerjs/engine-formula';-import { hasCJKText } from '@univerjs/engine-render';+import { cjk } from '@univerjs/engine-render';interface IValidateDefinedNameOptions {unitId: string;@@ -58,7 +58,7 @@ export function validateDefinedName(name: string, options: IValidateDefinedNameOif (!Tools.isValidParameter(name) ||isReferenceStringWithEffectiveColumn(name) ||- (!Tools.isStartValidPosition(name) && !hasCJKText(name.substring(0, 1)))+ (!Tools.isStartValidPosition(name) && !cjk.hasCJKText(name.substring(0, 1)))) {return 'sheets.definedName.nameInvalid';}diff --git a/packages/sheets/src/basics/split-range-text.ts b/packages/sheets/src/basics/split-range-text.tsindex 01c90b8776..23a78a8cd6 100644--- a/packages/sheets/src/basics/split-range-text.ts+++ b/packages/sheets/src/basics/split-range-text.ts@@ -15,7 +15,7 @@*/import type { ICellData, IDocumentData, IRange, Nullable, Worksheet } from '@univerjs/core';-import { CellValueType, escapeRegExp, Range } from '@univerjs/core';+import { CellValueType, Range, regexp } from '@univerjs/core';/*** The default delimiter to split the text.@@ -128,7 +128,7 @@ function getDelimiterRegexItem(delimiter: SplitDelimiterEnum, treatMultipleDelimlet str = '';for (const delimiter of delimiterList) {- str += escapeRegExp(delimiter);+ str += regexp.escapeRegExp(delimiter);}let allStr = '['.concat(str, ']');diff --git a/packages/uniscript/README.md b/packages/uniscript/README.mddeleted file mode 100644index e16ab57bfc..0000000000--- a/packages/uniscript/README.md+++ /dev/null@@ -1,42 +0,0 @@-# @univerjs/uniscript--[](https://npmjs.com/package/@univerjs/uniscript)-[](https://npmjs.com/package/@univerjs/uniscript)-[](https://npmjs.com/package/@univerjs/uniscript)--`@univerjs/uniscript` provides a Monaco-based code editor for writing scripts that operate on Univer data structures through the Facade API.--## Package Overview--| Package | UMD global | CSS | Locales | Facade entry |-| --- | --- | :---: | :---: | :---: |-| `@univerjs/uniscript` | `UniverUniscript` | Yes | Yes | No |--## Installation--```sh-pnpm add @univerjs/uniscript-# or-npm install @univerjs/uniscript-```--Keep all `@univerjs/*` packages on the same version.--## Usage--```ts-import '@univerjs/uniscript/lib/index.css';-import EnUS from '@univerjs/uniscript/locale/en-US';-import { UniverUniscriptPlugin } from '@univerjs/uniscript';--univer.registerPlugin(UniverUniscriptPlugin);--// Merge EnUS into your Univer locale map when this package contributes UI text.-```--## Resources--- [Documentation](https://docs.univer.ai)-- [NPM package](https://npmjs.com/package/@univerjs/uniscript)-- [GitHub repository](https://github.com/dream-num/univer)-diff --git a/packages/uniscript/assets/uniscript.jpeg b/packages/uniscript/assets/uniscript.jpegdeleted file mode 100644index 272f2309bb..0000000000Binary files a/packages/uniscript/assets/uniscript.jpeg and /dev/null differdiff --git a/packages/uniscript/package.json b/packages/uniscript/package.jsondeleted file mode 100644index 3822ea12f9..0000000000--- a/packages/uniscript/package.json+++ /dev/null@@ -1,93 +0,0 @@-{- "name": "@univerjs/uniscript",- "version": "1.0.0-alpha.2",- "private": false,- "description": "Monaco-based scripting editor for operating Univer through Facade APIs.",- "author": "DreamNum Co., Ltd. <[email protected]>",- "license": "Apache-2.0",- "funding": {- "type": "opencollective",- "url": "https://opencollective.com/univer"- },- "homepage": "https://univer.ai",- "repository": {- "type": "git",- "url": "https://github.com/dream-num/univer"- },- "bugs": {- "url": "https://github.com/dream-num/univer/issues"- },- "keywords": [- "univer",- "uniscript",- "scripting",- "monaco-editor",- "automation"- ],- "exports": {- ".": "./src/index.ts",- "./*": "./src/*",- "./locale/*": "./src/locale/*.ts"- },- "main": "./src/index.ts",- "types": "./lib/types/index.d.ts",- "publishConfig": {- "access": "public",- "main": "./lib/es/index.js",- "module": "./lib/es/index.js",- "exports": {- ".": {- "import": "./lib/es/index.js",- "require": "./lib/cjs/index.js",- "types": "./lib/types/index.d.ts"- },- "./*": {- "import": "./lib/es/*",- "require": "./lib/cjs/*",- "types": "./lib/types/index.d.ts"- },- "./locale/*": {- "import": "./lib/es/locale/*.js",- "require": "./lib/cjs/locale/*.js",- "types": "./lib/types/locale/*.d.ts"- },- "./lib/*": "./lib/*"- }- },- "directories": {- "lib": "lib"- },- "files": [- "lib"- ],- "scripts": {- "test": "vitest run",- "test:watch": "vitest",- "coverage": "vitest run --coverage",- "typecheck": "tsc --noEmit",- "build:bundle": "univer-cli build",- "build:types": "tsc -p tsconfig.node.json",- "build": "pnpm run build:bundle && pnpm run build:types"- },- "peerDependencies": {- "react": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc",- "rxjs": ">=7.0.0"- },- "dependencies": {- "@univerjs/core": "workspace:*",- "@univerjs/design": "workspace:*",- "@univerjs/sheets": "workspace:*",- "@univerjs/sheets-ui": "workspace:*",- "@univerjs/ui": "workspace:*",- "monaco-editor": "0.55.1"- },- "devDependencies": {- "@univerjs-infra/shared": "workspace:*",- "postcss": "^8.5.16",- "react": "18.3.1",- "rxjs": "^7.8.2",- "tailwindcss": "3.4.18",- "typescript": "^6.0.3",- "vitest": "^4.1.10"- }-}diff --git a/packages/uniscript/postcss.config.mjs b/packages/uniscript/postcss.config.mjsdeleted file mode 100644index 7d59f53133..0000000000--- a/packages/uniscript/postcss.config.mjs+++ /dev/null@@ -1 +0,0 @@-export { default } from '@univerjs-infra/shared/postcss';diff --git a/packages/uniscript/src/commands/operations/__tests__/panel.operation.spec.ts b/packages/uniscript/src/commands/operations/__tests__/panel.operation.spec.tsdeleted file mode 100644index cbc3d07e3e..0000000000--- a/packages/uniscript/src/commands/operations/__tests__/panel.operation.spec.ts+++ /dev/null@@ -1,64 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import { ICommandService, Univer } from '@univerjs/core';-import { DesktopSidebarService, ISidebarService } from '@univerjs/ui';-import { afterEach, beforeEach, describe, expect, it } from 'vitest';-import { ScriptPanelService } from '../../../services/script-panel.service';-import { ScriptPanelComponentName, ToggleScriptPanelOperation } from '../panel.operation';--describe('ToggleScriptPanelOperation', () => {- let univer: Univer;- let commandService: ICommandService;- let scriptPanelService: ScriptPanelService;- let sidebarService: ISidebarService;-- beforeEach(() => {- univer = new Univer();- const injector = univer.__getInjector();- injector.add([ISidebarService, { useClass: DesktopSidebarService }]);- injector.add([ScriptPanelService]);-- commandService = injector.get(ICommandService);- commandService.registerCommand(ToggleScriptPanelOperation);- scriptPanelService = injector.get(ScriptPanelService);- sidebarService = injector.get(ISidebarService);- });-- afterEach(() => {- univer.dispose();- });-- it('opens the Uniscript sidebar when the panel is closed', async () => {- const result = await commandService.executeCommand(ToggleScriptPanelOperation.id);-- expect(result).toBe(true);- expect(scriptPanelService.isOpen).toBe(true);- expect(sidebarService.visible).toBe(true);- expect(sidebarService.options.children?.label).toBe(ScriptPanelComponentName);- expect(sidebarService.width).toBeUndefined();- });-- it('closes the Uniscript sidebar when the panel is already open', async () => {- await commandService.executeCommand(ToggleScriptPanelOperation.id);-- const result = await commandService.executeCommand(ToggleScriptPanelOperation.id);-- expect(result).toBe(true);- expect(scriptPanelService.isOpen).toBe(false);- expect(sidebarService.visible).toBe(false);- });-});diff --git a/packages/uniscript/src/commands/operations/panel.operation.ts b/packages/uniscript/src/commands/operations/panel.operation.tsdeleted file mode 100644index ab5e6a9d74..0000000000--- a/packages/uniscript/src/commands/operations/panel.operation.ts+++ /dev/null@@ -1,47 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { IAccessor, IOperation } from '@univerjs/core';-import { CommandType } from '@univerjs/core';-import { ISidebarService } from '@univerjs/ui';-import { ScriptPanelService } from '../../services/script-panel.service';--export const ScriptPanelComponentName = 'ScriptPanel';--export const ToggleScriptPanelOperation: IOperation = {- type: CommandType.OPERATION,- id: 'univer.operation.toggle-script-panel',- handler: (accessor: IAccessor) => {- const scriptPanelService = accessor.get(ScriptPanelService);- const sidebarService = accessor.get(ISidebarService);-- const isOpen = scriptPanelService.isOpen;-- if (isOpen) {- scriptPanelService.close();- sidebarService.close();- } else {- scriptPanelService.open();- sidebarService.open({- header: { title: 'uniscript.title' },- children: { label: ScriptPanelComponentName },- width: 600,- });- }-- return true;- },-};diff --git a/packages/uniscript/src/config/config.ts b/packages/uniscript/src/config/config.tsdeleted file mode 100644index a20c674172..0000000000--- a/packages/uniscript/src/config/config.ts+++ /dev/null@@ -1,28 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { MenuConfig } from '@univerjs/ui';--export const UNISCRIPT_PLUGIN_CONFIG_KEY = 'uniscript.config';--export const configSymbol = Symbol(UNISCRIPT_PLUGIN_CONFIG_KEY);--export interface IUniverUniscriptConfig {- menu?: MenuConfig;- getWorkerUrl?: (moduleID: string, label: string) => string;-}--export const defaultPluginConfig: IUniverUniscriptConfig = {};diff --git a/packages/uniscript/src/controllers/components.controller.ts b/packages/uniscript/src/controllers/components.controller.tsdeleted file mode 100644index 60a2782a6f..0000000000--- a/packages/uniscript/src/controllers/components.controller.ts+++ /dev/null@@ -1,34 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import { Disposable, Inject } from '@univerjs/core';-import { ComponentManager } from '@univerjs/ui';-import { ScriptPanelComponentName } from '../commands/operations/panel.operation';-import { ScriptEditorPanel } from '../views/components/ScriptEditorPanel';--export class ComponentsController extends Disposable {- constructor(- @Inject(ComponentManager) private readonly _componentManager: ComponentManager- ) {- super();-- this._registerComponents();- }-- private _registerComponents(): void {- this.disposeWithMe(this._componentManager.register(ScriptPanelComponentName, ScriptEditorPanel));- }-}diff --git a/packages/uniscript/src/controllers/uniscript.controller.ts b/packages/uniscript/src/controllers/uniscript.controller.tsdeleted file mode 100644index fc12addd27..0000000000--- a/packages/uniscript/src/controllers/uniscript.controller.ts+++ /dev/null@@ -1,32 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import { Disposable, ICommandService } from '@univerjs/core';-import { IMenuManagerService } from '@univerjs/ui';-import { ToggleScriptPanelOperation } from '../commands/operations/panel.operation';-import { menuSchema } from '../menu/schema';--export class UniscriptController extends Disposable {- constructor(- @IMenuManagerService private readonly _menuManagerService: IMenuManagerService,- @ICommandService commandService: ICommandService- ) {- super();-- this._menuManagerService.mergeMenu(menuSchema);- this.disposeWithMe(commandService.registerCommand(ToggleScriptPanelOperation));- }-}diff --git a/packages/uniscript/src/global.css b/packages/uniscript/src/global.cssdeleted file mode 100644index 7c05d4ddc4..0000000000--- a/packages/uniscript/src/global.css+++ /dev/null@@ -1,2 +0,0 @@-@tailwind components;-@tailwind utilities;diff --git a/packages/uniscript/src/index.ts b/packages/uniscript/src/index.tsdeleted file mode 100644index 8660add8d1..0000000000--- a/packages/uniscript/src/index.ts+++ /dev/null@@ -1,23 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import './global.css';--export { ToggleScriptPanelOperation } from './commands/operations/panel.operation';-export type { IUniverUniscriptConfig } from './config/config';-export { UniverUniscriptPlugin } from './plugin';-export { ScriptEditorService } from './services/script-editor.service';-export { IUniscriptExecutionService } from './services/script-execution.service';diff --git a/packages/uniscript/src/locale/ar-SA.ts b/packages/uniscript/src/locale/ar-SA.tsdeleted file mode 100644index cd5beb59a7..0000000000--- a/packages/uniscript/src/locale/ar-SA.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'تبديل لوحة Uniscript',- },- panel: {- execute: 'تنفيذ البرنامج النصي',- },- message: {- success: 'نجح التنفيذ',- failed: 'فشل التنفيذ',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/ca-ES.ts b/packages/uniscript/src/locale/ca-ES.tsdeleted file mode 100644index 2f66549719..0000000000--- a/packages/uniscript/src/locale/ca-ES.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Mostra/Oculta el panell Uniscript',- },- panel: {- execute: 'Executa l\'script',- },- message: {- success: 'Execució correcta',- failed: 'Execució fallida',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/de-DE.ts b/packages/uniscript/src/locale/de-DE.tsdeleted file mode 100644index 6c59fd7d1a..0000000000--- a/packages/uniscript/src/locale/de-DE.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Uniscript-Panel ein-/ausblenden',- },- panel: {- execute: 'Skript ausführen',- },- message: {- success: 'Ausführung erfolgreich',- failed: 'Ausführung fehlgeschlagen',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/en-US.ts b/packages/uniscript/src/locale/en-US.tsdeleted file mode 100644index 2040cf3a53..0000000000--- a/packages/uniscript/src/locale/en-US.ts+++ /dev/null@@ -1,33 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--const locale = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Toggle Uniscript Panel',- },- panel: {- execute: 'Execute Script',- },- message: {- success: 'Execution Success',- failed: 'Execution Failed',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/es-ES.ts b/packages/uniscript/src/locale/es-ES.tsdeleted file mode 100644index 57cd3c88f4..0000000000--- a/packages/uniscript/src/locale/es-ES.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Mostrar/Ocultar panel de Uniscript',- },- panel: {- execute: 'Ejecutar script',- },- message: {- success: 'Ejecución exitosa',- failed: 'Ejecución fallida',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/fa-IR.ts b/packages/uniscript/src/locale/fa-IR.tsdeleted file mode 100644index d6eea63af2..0000000000--- a/packages/uniscript/src/locale/fa-IR.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'نمایش/مخفی کردن پنل Uniscript',- },- panel: {- execute: 'اجرای اسکریپت',- },- message: {- success: 'اجرای موفق',- failed: 'اجرای ناموفق',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/fr-FR.ts b/packages/uniscript/src/locale/fr-FR.tsdeleted file mode 100644index 16edc50b10..0000000000--- a/packages/uniscript/src/locale/fr-FR.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Basculer le panneau Uniscript',- },- panel: {- execute: 'Exécuter le script',- },- message: {- success: 'Exécution réussie',- failed: 'Échec de l\'exécution',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/id-ID.ts b/packages/uniscript/src/locale/id-ID.tsdeleted file mode 100644index 78f9157e69..0000000000--- a/packages/uniscript/src/locale/id-ID.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Alihkan Panel Uniscript',- },- panel: {- execute: 'Jalankan Skrip',- },- message: {- success: 'Eksekusi Berhasil',- failed: 'Eksekusi Gagal',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/it-IT.ts b/packages/uniscript/src/locale/it-IT.tsdeleted file mode 100644index c22b9b659f..0000000000--- a/packages/uniscript/src/locale/it-IT.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Attiva/Disattiva Pannello Uniscript',- },- panel: {- execute: 'Esegui Script',- },- message: {- success: 'Esecuzione Riuscita',- failed: 'Esecuzione Fallita',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/ja-JP.ts b/packages/uniscript/src/locale/ja-JP.tsdeleted file mode 100644index 74ef5b107e..0000000000--- a/packages/uniscript/src/locale/ja-JP.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Uniscriptパネルを切り替え',- },- panel: {- execute: 'スクリプトを実行',- },- message: {- success: '実行に成功しました',- failed: '実行に失敗しました',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/ko-KR.ts b/packages/uniscript/src/locale/ko-KR.tsdeleted file mode 100644index c084b6b39d..0000000000--- a/packages/uniscript/src/locale/ko-KR.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Uniscript 패널 전환',- },- panel: {- execute: '스크립트 실행',- },- message: {- success: '실행 성공',- failed: '실행 실패',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/pl-PL.ts b/packages/uniscript/src/locale/pl-PL.tsdeleted file mode 100644index 870d9eaa54..0000000000--- a/packages/uniscript/src/locale/pl-PL.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Przełącz panel Uniscript',- },- panel: {- execute: 'Wykonaj skrypt',- },- message: {- success: 'Wykonanie zakończone sukcesem',- failed: 'Wykonanie nie powiodło się',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/pt-BR.ts b/packages/uniscript/src/locale/pt-BR.tsdeleted file mode 100644index 911f4d1ca0..0000000000--- a/packages/uniscript/src/locale/pt-BR.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Alternar Painel do Uniscript',- },- panel: {- execute: 'Executar Script',- },- message: {- success: 'Execução bem-sucedida',- failed: 'Execução falhou',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/ru-RU.ts b/packages/uniscript/src/locale/ru-RU.tsdeleted file mode 100644index 70a92e36e1..0000000000--- a/packages/uniscript/src/locale/ru-RU.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Юнискрипт',- tooltip: {- 'menu-button': 'Переключить панель Юнискрипт',- },- panel: {- execute: 'Выполнить скрипт',- },- message: {- success: 'Выполнение успешно',- failed: 'Выполнение не удалось',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/sk-SK.ts b/packages/uniscript/src/locale/sk-SK.tsdeleted file mode 100644index 3122b1b5c1..0000000000--- a/packages/uniscript/src/locale/sk-SK.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Prepnúť panel Uniscript',- },- panel: {- execute: 'Spustiť skript',- },- message: {- success: 'Spustenie úspešné',- failed: 'Spustenie zlyhalo',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/types.ts b/packages/uniscript/src/locale/types.tsdeleted file mode 100644index b83cb8e9ce..0000000000--- a/packages/uniscript/src/locale/types.ts+++ /dev/null@@ -1,20 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { LocaleLeafKeys } from '@univerjs/core';-import type enUS from './en-US';--export type LocaleKey = LocaleLeafKeys<typeof enUS>;diff --git a/packages/uniscript/src/locale/vi-VN.ts b/packages/uniscript/src/locale/vi-VN.tsdeleted file mode 100644index d19990ca10..0000000000--- a/packages/uniscript/src/locale/vi-VN.ts+++ /dev/null@@ -1,36 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': 'Mở/Thu gọn bảng điều khiển Uniscript',- },- panel: {- execute: 'Thực thi Uniscript',- },- message: {- success: 'Thực thi thành công',- failed: 'Thực thi thất bại',- },- },--};--export default locale;diff --git a/packages/uniscript/src/locale/zh-CN.ts b/packages/uniscript/src/locale/zh-CN.tsdeleted file mode 100644index 74fb09850e..0000000000--- a/packages/uniscript/src/locale/zh-CN.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': '打开收起 Uniscript 面板',- },- panel: {- execute: '执行 Uniscript',- },- message: {- success: '执行成功',- failed: '执行失败',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/zh-HK.ts b/packages/uniscript/src/locale/zh-HK.tsdeleted file mode 100644index 4fece97698..0000000000--- a/packages/uniscript/src/locale/zh-HK.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': '打開收起 Uniscript 面板',- },- panel: {- execute: '執行 Uniscript',- },- message: {- success: '執行成功',- failed: '執行失敗',- },- },-};--export default locale;diff --git a/packages/uniscript/src/locale/zh-TW.ts b/packages/uniscript/src/locale/zh-TW.tsdeleted file mode 100644index 4fece97698..0000000000--- a/packages/uniscript/src/locale/zh-TW.ts+++ /dev/null@@ -1,35 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type enUS from './en-US';--const locale: typeof enUS = {- uniscript: {- title: 'Uniscript',- tooltip: {- 'menu-button': '打開收起 Uniscript 面板',- },- panel: {- execute: '執行 Uniscript',- },- message: {- success: '執行成功',- failed: '執行失敗',- },- },-};--export default locale;diff --git a/packages/uniscript/src/menu/menu.ts b/packages/uniscript/src/menu/menu.tsdeleted file mode 100644index a87bce93a2..0000000000--- a/packages/uniscript/src/menu/menu.ts+++ /dev/null@@ -1,47 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { IAccessor } from '@univerjs/core';-import type { IMenuButtonItem } from '@univerjs/ui';-import type { LocaleKey } from '../locale/types';-import { UniverInstanceType } from '@univerjs/core';-import {- RangeProtectionPermissionEditPoint,- WorkbookEditablePermission,- WorksheetEditPermission,- WorksheetSetCellStylePermission,- WorksheetSetCellValuePermission,-} from '@univerjs/sheets';-import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui';-import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';-import { ToggleScriptPanelOperation } from '../commands/operations/panel.operation';--export function UniscriptMenuItemFactory(accessor: IAccessor): IMenuButtonItem<LocaleKey> {- return {- id: ToggleScriptPanelOperation.id,- title: 'uniscript.title',- tooltip: 'uniscript.tooltip.menu-button',- icon: 'CodeIcon',- type: MenuItemType.BUTTON,- // FIXME hidden$ and disabled$ are not correctly in doc- hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),- disabled$: getCurrentRangeDisable$(accessor, {- workbookTypes: [WorkbookEditablePermission],- worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission],- rangeTypes: [RangeProtectionPermissionEditPoint],- }),- };-}diff --git a/packages/uniscript/src/menu/schema.ts b/packages/uniscript/src/menu/schema.tsdeleted file mode 100644index a21830f49a..0000000000--- a/packages/uniscript/src/menu/schema.ts+++ /dev/null@@ -1,29 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { MenuSchemaType } from '@univerjs/ui';-import { RibbonOthersGroup } from '@univerjs/ui';-import { ToggleScriptPanelOperation } from '../commands/operations/panel.operation';-import { UniscriptMenuItemFactory } from './menu';--export const menuSchema: MenuSchemaType = {- [RibbonOthersGroup.OTHERS]: {- [ToggleScriptPanelOperation.id]: {- order: 0,- menuItemFactory: UniscriptMenuItemFactory,- },- },-};diff --git a/packages/uniscript/src/plugin.ts b/packages/uniscript/src/plugin.tsdeleted file mode 100644index 57ead3358b..0000000000--- a/packages/uniscript/src/plugin.ts+++ /dev/null@@ -1,77 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { Dependency } from '@univerjs/core';-import type { IUniverUniscriptConfig } from './config/config';-import { IConfigService, Inject, Injector, merge, Plugin } from '@univerjs/core';-import pkg from '../package.json';-import { defaultPluginConfig, UNISCRIPT_PLUGIN_CONFIG_KEY } from './config/config';-import { ComponentsController } from './controllers/components.controller';-import { UniscriptController } from './controllers/uniscript.controller';-import { ScriptEditorService } from './services/script-editor.service';-import { IUniscriptExecutionService, UniscriptExecutionService } from './services/script-execution.service';-import { ScriptPanelService } from './services/script-panel.service';--export class UniverUniscriptPlugin extends Plugin {- static override pluginName = 'UNIVER_UNISCRIPT_PLUGIN';- static override packageName = pkg.name;- static override version = pkg.version;-- constructor(- private readonly _config: Partial<IUniverUniscriptConfig> = defaultPluginConfig,- @Inject(Injector) protected override _injector: Injector,- @IConfigService private readonly _configService: IConfigService- ) {- super();-- // Manage the plugin configuration.- const { menu, ...rest } = merge(- {},- defaultPluginConfig,- this._config- );- if (menu) {- this._configService.setConfig('menu', menu, { merge: true });- }- this._configService.setConfig(UNISCRIPT_PLUGIN_CONFIG_KEY, rest);- }-- override onStarting(): void {- const injector = this._injector;- const dependencies: Dependency[] = [- [ComponentsController],- [UniscriptController],- [ScriptEditorService],- [ScriptPanelService],- ];-- dependencies.forEach((d) => injector.add(d));-- this.registerExecution();- this._injector.get(ComponentsController);- }-- override onSteady(): void {- this._injector.get(UniscriptController);- }-- /**- * Allows being overridden, replacing with a new UniscriptExecutionService.- */- registerExecution(): void {- this._injector.add([IUniscriptExecutionService, { useClass: UniscriptExecutionService }]);- }-}diff --git a/packages/uniscript/src/services/__tests__/script-editor.service.spec.ts b/packages/uniscript/src/services/__tests__/script-editor.service.spec.tsdeleted file mode 100644index 4e191113a2..0000000000--- a/packages/uniscript/src/services/__tests__/script-editor.service.spec.ts+++ /dev/null@@ -1,58 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import { IConfigService, Injector } from '@univerjs/core';-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';-import { UNISCRIPT_PLUGIN_CONFIG_KEY } from '../../config/config';-import { ScriptEditorService } from '../script-editor.service';--describe('ScriptEditorService', () => {- let service: ScriptEditorService;-- beforeEach(() => {- vi.stubGlobal('window', globalThis);- Reflect.deleteProperty(window, 'MonacoEnvironment');- const injector = new Injector();- class TestConfigService {- getConfig = (key: string) => key === UNISCRIPT_PLUGIN_CONFIG_KEY ? { getWorkerUrl: () => 'worker.js' } : undefined;- }-- injector.add([IConfigService, { useClass: TestConfigService as never }]);- injector.add([ScriptEditorService]);- service = injector.get(ScriptEditorService);- });-- afterEach(() => {- Reflect.deleteProperty(window, 'MonacoEnvironment');- vi.unstubAllGlobals();- });-- it('keeps the active Monaco editor instance until the registration is disposed', () => {- const editor = { dispose: vi.fn() };-- const disposable = service.setEditorInstance(editor as never);-- expect(service.getEditorInstance()).toBe(editor);- disposable.dispose();- expect(service.getEditorInstance()).toBeNull();- });-- it('initializes Monaco worker loading from plugin config', () => {- service.requireVscodeEditor();-- expect(window.MonacoEnvironment?.getWorkerUrl?.('', '')).toBe('worker.js');- });-});diff --git a/packages/uniscript/src/services/__tests__/script-execution.service.spec.ts b/packages/uniscript/src/services/__tests__/script-execution.service.spec.tsdeleted file mode 100644index 178afe99c0..0000000000--- a/packages/uniscript/src/services/__tests__/script-execution.service.spec.ts+++ /dev/null@@ -1,61 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import { DesktopLogService, ICommandService, ILogService, Injector, IUniverInstanceService, LifecycleService } from '@univerjs/core';-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';-import { IUniscriptExecutionService, UniscriptExecutionService } from '../script-execution.service';--type UniscriptGlobal = typeof globalThis & { __uniscriptResult?: boolean };--describe('UniscriptExecutionService', () => {- let service: IUniscriptExecutionService;- let logService: ILogService;-- beforeEach(() => {- Reflect.deleteProperty(globalThis, '__uniscriptResult');- const injector = new Injector();- class TestCommandService {}-- class TestUniverInstanceService {}-- injector.add([ILogService, { useClass: DesktopLogService }]);- injector.add([ICommandService, { useClass: TestCommandService as never }]);- injector.add([IUniverInstanceService, { useClass: TestUniverInstanceService as never }]);- injector.add([LifecycleService]);- injector.add([IUniscriptExecutionService, { useClass: UniscriptExecutionService }]);- service = injector.get(IUniscriptExecutionService);- logService = injector.get(ILogService);- });-- afterEach(() => {- Reflect.deleteProperty(globalThis, '__uniscriptResult');- vi.restoreAllMocks();- });-- it('executes user script code with the Univer API argument available', async () => {- await expect(service.execute('globalThis.__uniscriptResult = typeof univerAPI === "object";')).resolves.toBe(true);-- expect((globalThis as UniscriptGlobal).__uniscriptResult).toBe(true);- });-- it('logs script runtime errors and reports failure', async () => {- const errorSpy = vi.spyOn(logService, 'error');-- await expect(service.execute('throw new Error("boom");')).resolves.toBe(false);-- expect(errorSpy).toHaveBeenCalledWith(expect.any(Error));- });-});diff --git a/packages/uniscript/src/services/__tests__/script-panel.service.spec.ts b/packages/uniscript/src/services/__tests__/script-panel.service.spec.tsdeleted file mode 100644index 4364cb95e7..0000000000--- a/packages/uniscript/src/services/__tests__/script-panel.service.spec.ts+++ /dev/null@@ -1,41 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import { Injector } from '@univerjs/core';-import { beforeEach, describe, expect, it } from 'vitest';-import { ScriptPanelService } from '../script-panel.service';--describe('ScriptPanelService', () => {- let service: ScriptPanelService;-- beforeEach(() => {- const injector = new Injector();- injector.add([ScriptPanelService]);- service = injector.get(ScriptPanelService);- });-- it('publishes panel open state changes for the Uniscript sidebar', () => {- const states: boolean[] = [];- service.open$.subscribe((state) => states.push(state));-- service.open();- service.open();- service.close();-- expect(service.isOpen).toBe(false);- expect(states).toEqual([false, true, false]);- });-});diff --git a/packages/uniscript/src/services/script-editor.service.ts b/packages/uniscript/src/services/script-editor.service.tsdeleted file mode 100644index 0ee8876fe5..0000000000--- a/packages/uniscript/src/services/script-editor.service.ts+++ /dev/null@@ -1,57 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { IDisposable } from '@univerjs/core';-import type { editor } from 'monaco-editor';-import type { IUniverUniscriptConfig } from '../config/config';-import { Disposable, IConfigService, toDisposable } from '@univerjs/core';-import { UNISCRIPT_PLUGIN_CONFIG_KEY } from '../config/config';--/**- * This service is for loading monaco editor and its resources. It also holds the- * monaco editor instance so user can interact with the editor programmatically.- */-export class ScriptEditorService extends Disposable {- private _editorInstance: editor.IStandaloneCodeEditor | null = null;-- constructor(@IConfigService private readonly _configService: IConfigService) {- super();- }-- override dispose(): void {- super.dispose();-- if (this._editorInstance) {- this._editorInstance.dispose();- }- }-- setEditorInstance(editor: editor.IStandaloneCodeEditor): IDisposable {- this._editorInstance = editor;- return toDisposable(() => (this._editorInstance = null));- }-- getEditorInstance(): editor.IStandaloneCodeEditor | null {- return this._editorInstance;- }-- requireVscodeEditor(): void {- if (!window.MonacoEnvironment) {- const config = this._configService.getConfig<IUniverUniscriptConfig>(UNISCRIPT_PLUGIN_CONFIG_KEY);- window.MonacoEnvironment = { getWorkerUrl: config?.getWorkerUrl };- }- }-}diff --git a/packages/uniscript/src/services/script-execution.service.ts b/packages/uniscript/src/services/script-execution.service.tsdeleted file mode 100644index cf84d1b144..0000000000--- a/packages/uniscript/src/services/script-execution.service.ts+++ /dev/null@@ -1,52 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import { createIdentifier, Disposable, ILogService, Inject, Injector } from '@univerjs/core';-// eslint-disable-next-line univer/no-facade-imports-outside-facade-import { FUniver } from '@univerjs/core/facade';--export const IUniscriptExecutionService = createIdentifier<IUniscriptExecutionService>('univer.uniscript.execution-service');--export interface IUniscriptExecutionService {- execute(code: string): Promise<boolean>;-}-/**- * This service is to execute Uniscript code.- */-export class UniscriptExecutionService extends Disposable implements IUniscriptExecutionService {- constructor(- @ILogService private readonly _logService: ILogService,- @Inject(Injector) private readonly _injector: Injector- ) {- super();- }-- async execute(code: string): Promise<boolean> {- this._logService.log('[UniscriptExecutionService]', 'executing Uniscript...');-- const apiInstance = FUniver.newAPI(this._injector);- // eslint-disable-next-line no-new-func- const scriptFunction = new Function('univerAPI', `(() => {${code}})()`);-- try {- scriptFunction(apiInstance);- return true;- } catch (e) {- this._logService.error(e);- return false;- }- }-}diff --git a/packages/uniscript/src/services/script-panel.service.ts b/packages/uniscript/src/services/script-panel.service.tsdeleted file mode 100644index a18c94feec..0000000000--- a/packages/uniscript/src/services/script-panel.service.ts+++ /dev/null@@ -1,41 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import { Disposable } from '@univerjs/core';-import { BehaviorSubject, distinctUntilChanged } from 'rxjs';--export class ScriptPanelService extends Disposable {- private _open$ = new BehaviorSubject<boolean>(false);- open$ = this._open$.pipe(distinctUntilChanged());- get isOpen(): boolean {- return this._open$.getValue();- }-- override dispose(): void {- super.dispose();-- this._open$.next(false);- this._open$.complete();- }-- open(): void {- this._open$.next(true);- }-- close(): void {- this._open$.next(false);- }-}diff --git a/packages/uniscript/src/views/components/ScriptEditorPanel.spec.tsx b/packages/uniscript/src/views/components/ScriptEditorPanel.spec.tsxdeleted file mode 100644index 9809e1a1c6..0000000000--- a/packages/uniscript/src/views/components/ScriptEditorPanel.spec.tsx+++ /dev/null@@ -1,430 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { IDisposable } from '@univerjs/core';-import type { IMessageProps } from '@univerjs/design';-import type { IShortcutItem } from '@univerjs/ui';-import type { Root } from 'react-dom/client';-import {- ConfigService,- IConfigService,- Injector,- LocaleService,- LocaleType,- ThemeService,- toDisposable,-} from '@univerjs/core';-import { MessageType } from '@univerjs/design';-import { IMessageService, IShortcutService, RediContext } from '@univerjs/ui';-import { editor as monacoEditor } from 'monaco-editor';-import { act } from 'react';-import { createRoot } from 'react-dom/client';-import { Observable } from 'rxjs';-import { afterEach, beforeEach, describe, expect, it } from 'vitest';-import enUS from '../../locale/en-US';-import { ScriptEditorService } from '../../services/script-editor.service';-import { IUniscriptExecutionService } from '../../services/script-execution.service';-import { ScriptEditorPanel } from './ScriptEditorPanel';--(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;--type EditorListener = () => void;--class TestEditorModel {- constructor(private _value = '') {}-- setValue(value: string) {- this._value = value;- }-- getValue() {- return this._value;- }-}--class TestCodeEditor {- private readonly _model = new TestEditorModel();- private readonly _focusListeners: EditorListener[] = [];- private readonly _blurListeners: EditorListener[] = [];- readonly layouts: Array<{ width: number; height: number }> = [];-- setValue(value: string) {- this._model.setValue(value);- }-- getModel() {- return this._model;- }-- layout(size: { width: number; height: number }) {- this.layouts.push(size);- }-- onDidFocusEditorWidget(listener: EditorListener): IDisposable {- this._focusListeners.push(listener);- return toDisposable(() => {- const index = this._focusListeners.indexOf(listener);- if (index >= 0) {- this._focusListeners.splice(index, 1);- }- });- }-- onDidBlurEditorWidget(listener: EditorListener): IDisposable {- this._blurListeners.push(listener);- return toDisposable(() => {- const index = this._blurListeners.indexOf(listener);- if (index >= 0) {- this._blurListeners.splice(index, 1);- }- });- }-- focus() {- this._focusListeners.forEach((listener) => listener());- }-- blur() {- this._blurListeners.forEach((listener) => listener());- }-- dispose() {- TestEditorState.disposed += 1;- }-}--class TestEditorState {- static created: TestCodeEditor | null = null;- static disposed = 0;-- static reset() {- this.created = null;- this.disposed = 0;- }-}--class TestExecutionState {- static codes: string[] = [];- static failNext = false;-- static reset() {- this.codes = [];- this.failNext = false;- }-}--class TestExecutionService implements IUniscriptExecutionService {- execute(code: string): Promise<boolean> {- TestExecutionState.codes.push(code);- return TestExecutionState.failNext ? Promise.reject(new Error('Execution stopped')) : Promise.resolve(true);- }-}--class TestMessageState {- static messages: IMessageProps[] = [];-- static reset() {- this.messages = [];- }-}--class TestMessageService implements IMessageService {- show(options: IMessageProps): IDisposable {- TestMessageState.messages.push(options);- return toDisposable(() => undefined);- }-- remove(): void {- // Not part of this panel behavior.- }-- removeAll(): void {- TestMessageState.messages = [];- }-}--class TestShortcutState {- static activeEscapes = 0;- static startedEscapes = 0;- static releasedEscapes = 0;-- static reset() {- this.activeEscapes = 0;- this.startedEscapes = 0;- this.releasedEscapes = 0;- }-}--class TestShortcutService implements IShortcutService {- readonly shortcutChanged$ = new Observable<void>();-- forceEscape(): IDisposable {- TestShortcutState.activeEscapes += 1;- TestShortcutState.startedEscapes += 1;- let released = false;-- return toDisposable(() => {- if (!released) {- released = true;- TestShortcutState.activeEscapes -= 1;- TestShortcutState.releasedEscapes += 1;- }- });- }-- forceDisable(): IDisposable {- return toDisposable(() => undefined);- }-- dispatch(): IShortcutItem<object> | undefined {- return undefined;- }-- registerShortcut(): IDisposable {- return toDisposable(() => undefined);- }-- getShortcutDisplay(): string | null {- return null;- }-- getShortcutDisplayOfCommand(): string | null {- return null;- }-- getAllShortcuts(): IShortcutItem[] {- return [];- }-}--class TestResizeObserver {- constructor(private readonly _listener: ResizeObserverCallback) {}-- observe(target: Element) {- setTimeout(() => {- this._listener([{ target }] as ResizeObserverEntry[], this as unknown as ResizeObserver);- }, 0);- }-- unobserve(): void {- // No external observer resources are allocated in this test.- }-- disconnect(): void {- // No external observer resources are allocated in this test.- }-}--function createPanelTestBed() {- const injector = new Injector();-- injector.add([IConfigService, { useClass: ConfigService }]);- injector.add([LocaleService]);- injector.add([ThemeService]);- injector.add([IMessageService, { useClass: TestMessageService as never }]);- injector.add([IShortcutService, { useClass: TestShortcutService as never }]);- injector.add([ScriptEditorService]);- injector.add([IUniscriptExecutionService, { useClass: TestExecutionService }]);-- const localeService = injector.get(LocaleService);- localeService.load({ [LocaleType.EN_US]: enUS });- localeService.setLocale(LocaleType.EN_US);-- return {- injector,- editorService: injector.get(ScriptEditorService),- };-}--async function renderPanel(root: Root, injector: Injector) {- await act(async () => {- root.render(- <RediContext.Provider value={{ injector }}>- <ScriptEditorPanel />- </RediContext.Provider>- );- await Promise.resolve();- });-}--function getEditor() {- if (!TestEditorState.created) {- throw new Error('The editor was not created.');- }-- return TestEditorState.created;-}--function getExecuteButton(container: HTMLElement) {- const button = Array.from(container.querySelectorAll<HTMLButtonElement>('[data-u-comp="button"]'))- .find((item) => item.textContent === 'Execute Script');-- if (!button) {- throw new Error('The execute action was not rendered.');- }-- return button;-}--function installBrowserAPIs() {- const resizeObserverDescriptor = Object.getOwnPropertyDescriptor(globalThis, 'ResizeObserver');- const idleDescriptor = Object.getOwnPropertyDescriptor(globalThis, 'requestIdleCallback');- const createDescriptor = Object.getOwnPropertyDescriptor(monacoEditor, 'create');-- Object.defineProperty(globalThis, 'ResizeObserver', {- configurable: true,- value: TestResizeObserver,- });- Object.defineProperty(globalThis, 'requestIdleCallback', {- configurable: true,- value: (task: IdleRequestCallback) => {- setTimeout(() => {- task({ didTimeout: false, timeRemaining: () => 50 });- }, 0);- return 1;- },- });- Object.defineProperty(monacoEditor, 'create', {- configurable: true,- value: () => {- const editor = new TestCodeEditor();- TestEditorState.created = editor;- return editor;- },- });-- return () => {- if (resizeObserverDescriptor) {- Object.defineProperty(globalThis, 'ResizeObserver', resizeObserverDescriptor);- } else {- Reflect.deleteProperty(globalThis, 'ResizeObserver');- }-- if (idleDescriptor) {- Object.defineProperty(globalThis, 'requestIdleCallback', idleDescriptor);- } else {- Reflect.deleteProperty(globalThis, 'requestIdleCallback');- }-- if (createDescriptor) {- Object.defineProperty(monacoEditor, 'create', createDescriptor);- }- };-}--describe('ScriptEditorPanel', () => {- let root: Root | undefined;- let container: HTMLDivElement | undefined;- let restoreAPIs: (() => void) | undefined;- let currentTestBed: ReturnType<typeof createPanelTestBed> | undefined;-- beforeEach(() => {- TestEditorState.reset();- TestExecutionState.reset();- TestMessageState.reset();- TestShortcutState.reset();- restoreAPIs = installBrowserAPIs();- });-- afterEach(() => {- act(() => {- root?.unmount();- });- currentTestBed?.editorService.dispose();- restoreAPIs?.();- Reflect.deleteProperty(window, 'MonacoEnvironment');- container?.remove();- root = undefined;- container = undefined;- restoreAPIs = undefined;- currentTestBed = undefined;- });-- it('executes the edited editor content and reports success', async () => {- currentTestBed = createPanelTestBed();- container = document.createElement('div');- document.body.appendChild(container);- root = createRoot(container);-- await renderPanel(root, currentTestBed.injector);- getEditor().setValue('const total = 1 + 2;');-- await act(async () => {- getExecuteButton(container!).dispatchEvent(new MouseEvent('click', { bubbles: true }));- await Promise.resolve();- });-- expect(TestExecutionState.codes).toEqual(['const total = 1 + 2;']);- expect(TestMessageState.messages).toMatchObject([- { content: 'Execution Success', type: MessageType.Success },- ]);- expect(currentTestBed.editorService.getEditorInstance()).toBe(getEditor());- });-- it('reports an execution failure when the execution service rejects the script', async () => {- TestExecutionState.failNext = true;- currentTestBed = createPanelTestBed();- container = document.createElement('div');- document.body.appendChild(container);- root = createRoot(container);-- await renderPanel(root, currentTestBed.injector);- getEditor().setValue('throw new Error("boom");');-- await act(async () => {- getExecuteButton(container!).dispatchEvent(new MouseEvent('click', { bubbles: true }));- await Promise.resolve();- });-- expect(TestExecutionState.codes).toEqual(['throw new Error("boom");']);- expect(TestMessageState.messages).toMatchObject([- { content: 'Execution Failed', type: MessageType.Error },- ]);- });-- it('holds shortcut escape while the editor is focused and releases it after blur or unmount', async () => {- currentTestBed = createPanelTestBed();- container = document.createElement('div');- document.body.appendChild(container);- root = createRoot(container);-- await renderPanel(root, currentTestBed.injector);-- act(() => {- getEditor().focus();- });- expect(TestShortcutState.startedEscapes).toBe(1);- expect(TestShortcutState.activeEscapes).toBe(1);-- act(() => {- getEditor().blur();- });- expect(TestShortcutState.activeEscapes).toBe(0);- expect(TestShortcutState.releasedEscapes).toBe(1);-- act(() => {- getEditor().focus();- });- expect(TestShortcutState.activeEscapes).toBe(1);-- act(() => {- root?.unmount();- });- expect(TestShortcutState.activeEscapes).toBe(0);- expect(TestShortcutState.releasedEscapes).toBe(2);- expect(currentTestBed.editorService.getEditorInstance()).toBeNull();- });-});diff --git a/packages/uniscript/src/views/components/ScriptEditorPanel.tsx b/packages/uniscript/src/views/components/ScriptEditorPanel.tsxdeleted file mode 100644index 6c646e55c0..0000000000--- a/packages/uniscript/src/views/components/ScriptEditorPanel.tsx+++ /dev/null@@ -1,132 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { IDisposable, Nullable } from '@univerjs/core';-import type { LocaleKey } from '../../locale/types';-import { DisposableCollection, LocaleService, ThemeService, toDisposable } from '@univerjs/core';-import { Button, MessageType } from '@univerjs/design';-import { IMessageService, IShortcutService, useDependency } from '@univerjs/ui';-import { editor } from 'monaco-editor';-import { useCallback, useEffect, useRef } from 'react';-import { ScriptEditorService } from '../../services/script-editor.service';-import { IUniscriptExecutionService } from '../../services/script-execution.service';--export function ScriptEditorPanel() {- const editorContentRef = useRef<HTMLDivElement | null>(null);- const editorContainerRef = useRef<HTMLDivElement | null>(null);-- const monacoEditorRef = useRef<editor.IStandaloneCodeEditor | null>(null);-- const localeService = useDependency(LocaleService);- const shortcutService = useDependency(IShortcutService);- const editorService = useDependency(ScriptEditorService);- const themeService = useDependency(ThemeService);-- useEffect(() => {- const containerElement = editorContainerRef.current;- const contentElement = editorContentRef.current;-- let disposableCollection: Nullable<DisposableCollection> = null;- let resizeObserver: Nullable<ResizeObserver> = null;-- if (containerElement && contentElement) {- editorService.requireVscodeEditor();- const monacoEditor = (monacoEditorRef.current = editor.create(containerElement, {- value: '',- language: 'javascript',- theme: themeService.darkMode ? 'vs-dark' : 'vs-light',- }));-- resizeObserver = new ResizeObserver(() => {- let timer: number | undefined = requestIdleCallback(() => {- if (!timer) return;-- const { height, width } = contentElement.getBoundingClientRect();- monacoEditor.layout({ width, height });-- timer = undefined;- });- });- resizeObserver.observe(contentElement);-- let terminateEscaping: IDisposable | undefined;- disposableCollection = new DisposableCollection();- disposableCollection.add(editorService.setEditorInstance(monacoEditor));- disposableCollection.add(- monacoEditor.onDidFocusEditorWidget(() => {- terminateEscaping = shortcutService.forceEscape();- })- );- disposableCollection.add(- monacoEditor.onDidBlurEditorWidget(() => {- terminateEscaping?.dispose();- terminateEscaping = undefined;- })- );- disposableCollection.add(toDisposable(() => terminateEscaping?.dispose()));- }-- return () => {- if (resizeObserver && contentElement) {- resizeObserver.unobserve(contentElement);- }-- disposableCollection?.dispose();- };- }, [editorService, shortcutService]);-- const getMonacoEditor = useCallback(() => monacoEditorRef.current, []);- const startExecution = useExecution(getMonacoEditor);-- return (- <div className="univer-h-full">- <div ref={editorContentRef} className="univer-h-[calc(100%-60px)] univer-w-full univer-overflow-hidden">- <div ref={editorContainerRef} />- </div>- <div className="univer-mt-2.5">- <Button variant="primary" onClick={startExecution}>- {localeService.t<LocaleKey>('uniscript.panel.execute')}- </Button>- </div>- </div>- );-}--function useExecution(getMonacoEditor: () => Nullable<editor.IStandaloneCodeEditor>) {- const scriptService = useDependency(IUniscriptExecutionService);- const messageService = useDependency(IMessageService);- const localeService = useDependency(LocaleService);-- return useCallback(() => {- const model = getMonacoEditor()?.getModel();- if (model) {- scriptService- .execute(model.getValue())- .then(() => {- messageService.show({- content: localeService.t<LocaleKey>('uniscript.message.success'),- type: MessageType.Success,- });- })- .catch(() => {- messageService.show({- content: localeService.t<LocaleKey>('uniscript.message.failed'),- type: MessageType.Error,- });- });- }- }, [getMonacoEditor, localeService, messageService, scriptService]);-}diff --git a/packages/uniscript/tailwind.config.ts b/packages/uniscript/tailwind.config.tsdeleted file mode 100644index 75967f186f..0000000000--- a/packages/uniscript/tailwind.config.ts+++ /dev/null@@ -1,27 +0,0 @@-/**- * Copyright 2023-present DreamNum Co., Ltd.- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--import type { Config } from 'tailwindcss';-import preset from '@univerjs-infra/shared/tailwind';--const config: Config = {- presets: [preset],- content: [- './src/**/*.{js,ts,jsx,tsx}',- ],-};--export default config;diff --git a/packages/uniscript/tsconfig.json b/packages/uniscript/tsconfig.jsondeleted file mode 100644index d4f9172636..0000000000--- a/packages/uniscript/tsconfig.json+++ /dev/null@@ -1,8 +0,0 @@-{- "extends": "@univerjs-infra/shared/tsconfigs/base",- "compilerOptions": {- "rootDir": "src",- "outDir": "lib/types"- },- "include": ["src"]-}diff --git a/packages/uniscript/tsconfig.node.json b/packages/uniscript/tsconfig.node.jsondeleted file mode 100644index 2abfa07367..0000000000--- a/packages/uniscript/tsconfig.node.json+++ /dev/null@@ -1,18 +0,0 @@-{- "extends": "@univerjs-infra/shared/tsconfigs/node",- "compilerOptions": {- "rootDir": "src",- "declaration": true,- "emitDeclarationOnly": true,- "noEmit": false,- "outDir": "lib/types"- },- "include": [- "src"- ],- "exclude": [- "src/**/__tests__/**",- "src/**/*.spec.ts",- "src/**/*.test.ts"- ]-}diff --git a/packages/uniscript/vitest.config.ts b/packages/uniscript/vitest.config.tsdeleted file mode 100644index 6354b61423..0000000000--- a/packages/uniscript/vitest.config.ts+++ /dev/null@@ -1,13 +0,0 @@-import createConfig from '@univerjs-infra/shared/vitest';--export default createConfig({- test: {- alias: [- {- find: /^monaco-editor$/,- // eslint-disable-next-line node/no-path-concat- replacement: `${__dirname}/node_modules/monaco-editor/esm/vs/editor/editor.api`,- },- ],- },-});diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex c9fe10693e..0c6da0ed5a 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -289,9 +289,6 @@ importers:'@univerjs/ui':specifier: workspace:*version: link:../../packages/ui- '@univerjs/uniscript':- specifier: workspace:*- version: link:../../packages/uniscriptdevDependencies:'@univerjs-infra/shared':specifier: workspace:*@@ -667,18 +664,12 @@ importers:'@univerjs/ui-adapter-web-component':specifier: workspace:*version: link:../packages/ui-adapter-web-component- '@univerjs/uniscript':- specifier: workspace:*- version: link:../packages/uniscript'@univerjs/watermark':specifier: workspace:*version: link:../packages/watermarklit:specifier: ^3.3.3version: 3.3.3- monaco-editor:- specifier: 0.55.1- version: 0.55.1react:specifier: 19.2.7version: 19.2.7@@ -1404,9 +1395,6 @@ importers:'@univerjs/core':specifier: workspace:*version: link:../core- cjk-regex:- specifier: ^3.4.0- version: 3.4.0franc-min:specifier: ^6.2.0version: 6.2.0@@ -2927,49 +2915,6 @@ importers:specifier: ^4.1.10version: 4.1.10(@types/[email protected])(@vitest/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))- packages/uniscript:- dependencies:- '@univerjs/core':- specifier: workspace:*- version: link:../core- '@univerjs/design':- specifier: workspace:*- version: link:../design- '@univerjs/sheets':- specifier: workspace:*- version: link:../sheets- '@univerjs/sheets-ui':- specifier: workspace:*- version: link:../sheets-ui- '@univerjs/ui':- specifier: workspace:*- version: link:../ui- monaco-editor:- specifier: 0.55.1- version: 0.55.1- devDependencies:- '@univerjs-infra/shared':- specifier: workspace:*- version: link:../../common/shared- postcss:- specifier: ^8.5.16- version: 8.5.16- react:- specifier: 19.2.7- version: 19.2.7- rxjs:- specifier: ^7.8.2- version: 7.8.2- tailwindcss:- specifier: 3.4.18- version: 3.4.18- typescript:- specifier: ^6.0.3- version: 6.0.3- vitest:- specifier: ^4.1.10- version: 4.1.10(@types/[email protected])(@vitest/[email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))-packages/watermark:dependencies:'@univerjs/core':@@ -7529,10 +7474,6 @@ packages:resolution: {integrity: sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==}engines: {node: '>=8'}- resolution: {integrity: sha512-m+gbmlIP6gAG7tDvo2kpeSPAz/uh5wY5/zx10ymjdpbbiTHNTNoYnP2lCiyqtmbLxwhEdq8/lsVbsy4GTc9oUw==}- engines: {node: '>=16'}-resolution: {integrity: sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==}@@ -7939,9 +7880,6 @@ packages:resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}engines: {node: '>= 4'}- resolution: {integrity: sha512-WhL/YuveyGXJaerVlMYGWhvQswa7myDG17P7Vu65EWC05o8vfeNbvNf4d/BOvH99+ZW+LlQsc1GDKMa1vNK6dw==}-resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}@@ -9376,11 +9314,6 @@ packages:resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}- resolution: {integrity: sha512-uIj4+faQ+MgHgwUW1l2PsPglZLOLOT1uErt06dAPtx2kjteLAkbsd/0FiYg/MGS+i7ZKLb7w2WClxHkzOOuryQ==}- engines: {node: '>= 18'}- hasBin: true-resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}engines: {node: '>= 0.4'}@@ -9605,9 +9538,6 @@ packages:resolution: {integrity: sha512-sc8TepP9elxoOBXEpxmhPzKKjTjbswHVcmsKGbgvm3k6jZlLu/WMV/Lfmga6IGMgHU/V3WtY2s6VEgM4nTElUQ==}- resolution: {integrity: sha512-jz4x+TJNFHwHtwuV9vA9rMujcZRb0CEilTEwG2rRSpe/A7Jdkuj8xPKttCgOh+v/lkHy7HsZ64oj+q3xoAFl9A==}-resolution: {integrity: sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ==}@@ -10441,10 +10371,6 @@ packages:resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==}hasBin: true- resolution: {integrity: sha512-GP6h9OgJmhAZpb3dbNbXTfRWVnGcoMhWRZv/HxgM4/qCVqs1P9ukQdYxaUhjWBSAs9oJ/uPXUUvGT1VMe0Bs0Q==}- engines: {node: '>=16'}-resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}engines: {node: '>= 0.4'}@@ -11183,10 +11109,6 @@ packages:resolution: {integrity: sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==}engines: {node: '>=20.18.1'}- resolution: {integrity: sha512-fEYz7CCnvHDAdrb8OYAP7qlQCWzXBO5cHXQ3XI+HoZaBpiAwyC6b2nixMGl91yrDYEIRm7NDskgTvnLZ7mqrKQ==}- engines: {node: '>=16'}-resolution: {integrity: sha512-RlwWt1ywVW4WErPGAVHw/rIuJ2+MxvTME0siJ6lk9zBhpDfExDbspe6SRlWT3qU6AucNjotPl9qAJRVjP7guCQ==}@@ -15275,11 +15197,6 @@ snapshots:- dependencies:- regexp-util: 2.0.3- unicode-regex: 4.2.0-@@ -15664,10 +15581,6 @@ snapshots:dependencies:domelementtype: 2.3.0- optionalDependencies:- '@types/trusted-types': 2.0.7-dependencies:dom-serializer: 1.4.1@@ -17334,8 +17247,6 @@ snapshots:- [email protected]: {}-@@ -17747,11 +17658,6 @@ snapshots:- dependencies:- dompurify: 3.2.7- marked: 14.0.0-dependencies:color-name: 1.1.4@@ -18733,8 +18639,6 @@ snapshots:- [email protected]: {}-dependencies:call-bind: 1.0.8@@ -19598,10 +19502,6 @@ snapshots:- dependencies:- regexp-util: 2.0.3-