@prosopo/types-database 5.18.4 → 5.19.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -42,7 +42,7 @@ dist/cjs/types/spamEmailDomain.cjs 0.25 kB │ gzip: 0.17 kB
42
42
  dist/cjs/types/captcha.cjs 1.88 kB │ gzip: 0.40 kB
43
43
  dist/cjs/types/index.cjs 2.92 kB │ gzip: 0.53 kB
44
44
  dist/cjs/index.cjs 3.03 kB │ gzip: 0.59 kB
45
- dist/cjs/types/client.cjs 11.42 kB │ gzip: 2.17 kB
46
- dist/cjs/types/provider.cjs 34.89 kB │ gzip: 5.52 kB
45
+ dist/cjs/types/client.cjs 11.52 kB │ gzip: 2.19 kB
46
+ dist/cjs/types/provider.cjs 35.26 kB │ gzip: 5.59 kB
47
47
 
48
- ✓ built in 29ms
48
+ ✓ built in 53ms
@@ -14,6 +14,7 @@ ViteEsmConfig: .
14
14
  '/home/runner/work/captcha/captcha/packages/api/tsconfig.json'
15
15
  ]
16
16
  }
17
+ The plugin "vite-tsconfig-paths" is detected. Vite now supports tsconfig paths resolution natively via the resolve.tsconfigPaths option. You can remove the plugin and set resolve.tsconfigPaths: true in your Vite config instead.
17
18
  {
18
19
  externals: [
19
20
  '@prosopo/common',
@@ -28,7 +29,6 @@ ViteEsmConfig: .
28
29
  '@prosopo/api'
29
30
  ]
30
31
  }
31
- The plugin "vite-tsconfig-paths" is detected. Vite now supports tsconfig paths resolution natively via the resolve.tsconfigPaths option. You can remove the plugin and set resolve.tsconfigPaths: true in your Vite config instead.
32
32
  vite v8.1.6 building ssr environment for production...
33
33
  Bundle build started
34
34
  
@@ -37,13 +37,13 @@ rendering chunks...
37
37
  computing gzip size...
38
38
  dist/esm/types/mongo.js 0.01 kB │ gzip: 0.03 kB
39
39
  dist/esm/types/userAgent.js 0.01 kB │ gzip: 0.03 kB
40
- dist/esm/_virtual/_rolldown/runtime.js 0.04 kB │ gzip: 0.06 kB
40
+ dist/esm/_virtual/_rolldown/runtime.js 0.02 kB │ gzip: 0.04 kB
41
41
  dist/esm/types/bannedDomain.js 0.22 kB │ gzip: 0.17 kB
42
42
  dist/esm/types/spamEmailDomain.js 0.23 kB │ gzip: 0.17 kB
43
43
  dist/esm/types/captcha.js 1.63 kB │ gzip: 0.39 kB
44
44
  dist/esm/types/index.js 1.95 kB │ gzip: 0.42 kB
45
45
  dist/esm/index.js 2.03 kB │ gzip: 0.45 kB
46
- dist/esm/types/client.js 11.21 kB │ gzip: 2.21 kB
47
- dist/esm/types/provider.js 33.58 kB │ gzip: 5.50 kB
46
+ dist/esm/types/client.js 11.32 kB │ gzip: 2.24 kB
47
+ dist/esm/types/provider.js 33.94 kB │ gzip: 5.56 kB
48
48
 
49
- ✓ built in 36ms
49
+ ✓ built in 30ms
@@ -1,5 +1,5 @@
1
1
  $ tsc --build --verbose
2
- 2:42:20 PM - Projects in this build:
2
+ 6:23:38 PM - Projects in this build:
3
3
  * ../../dev/config/tsconfig.json
4
4
  * ../util/tsconfig.json
5
5
  * ../locale/tsconfig.json
@@ -13,29 +13,29 @@ $ tsc --build --verbose
13
13
  * ../user-access-policy/tsconfig.json
14
14
  * tsconfig.json
15
15
 
16
- 2:42:21 PM - Project '../../dev/config/tsconfig.json' is up to date because newest input '../../dev/config/src/webpack/webpack.config.ts' is older than output '../../dev/config/dist/tsc/tsconfig.tsbuildinfo'
16
+ 6:23:38 PM - Project '../../dev/config/tsconfig.json' is up to date because newest input '../../dev/config/src/webpack/webpack.config.ts' is older than output '../../dev/config/dist/tsc/tsconfig.tsbuildinfo'
17
17
 
18
- 2:42:21 PM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/text.ts' is older than output '../util/dist/tsc/tsconfig.tsbuildinfo'
18
+ 6:23:38 PM - Project '../util/tsconfig.json' is up to date because newest input '../util/src/text.ts' is older than output '../util/dist/tsc/tsconfig.tsbuildinfo'
19
19
 
20
- 2:42:21 PM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/process.ts' is older than output '../locale/dist/tsc/tsconfig.tsbuildinfo'
20
+ 6:23:38 PM - Project '../locale/tsconfig.json' is up to date because newest input '../locale/src/translationKey.ts' is older than output '../locale/dist/tsc/tsconfig.tsbuildinfo'
21
21
 
22
- 2:42:21 PM - Project '../util-crypto/tsconfig.json' is up to date because newest input '../util-crypto/src/types.ts' is older than output '../util-crypto/dist/tsc/tsconfig.tsbuildinfo'
22
+ 6:23:38 PM - Project '../util-crypto/tsconfig.json' is up to date because newest input '../util-crypto/src/types.ts' is older than output '../util-crypto/dist/tsc/tsconfig.tsbuildinfo'
23
23
 
24
- 2:42:21 PM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/index.ts' is older than output '../types/dist/tsc/tsconfig.tsbuildinfo'
24
+ 6:23:38 PM - Project '../types/tsconfig.json' is up to date because newest input '../types/src/types.test-d.ts' is older than output '../types/dist/tsc/tsconfig.tsbuildinfo'
25
25
 
26
- 2:42:21 PM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/tests/utils/objectUtils.unit.test.ts' is older than output '../common/dist/tsc/tsconfig.tsbuildinfo'
26
+ 6:23:38 PM - Project '../common/tsconfig.json' is up to date because newest input '../common/src/errorCodes.ts' is older than output '../common/dist/tsc/tsconfig.tsbuildinfo'
27
27
 
28
- 2:42:21 PM - Project '../logger/tsconfig.json' is up to date because newest input '../logger/src/logger.ts' is older than output '../logger/dist/tsc/tsconfig.tsbuildinfo'
28
+ 6:23:38 PM - Project '../logger/tsconfig.json' is up to date because newest input '../logger/src/index.ts' is older than output '../logger/dist/tsc/tsconfig.tsbuildinfo'
29
29
 
30
- 2:42:21 PM - Project '../api-route/tsconfig.json' is up to date because newest input '../api-route/src/apiRoutes.ts' is older than output '../api-route/dist/tsc/tsconfig.tsbuildinfo'
30
+ 6:23:38 PM - Project '../api-route/tsconfig.json' is up to date because newest input '../api-route/src/apiRoutes.ts' is older than output '../api-route/dist/tsc/tsconfig.tsbuildinfo'
31
31
 
32
- 2:42:21 PM - Project '../redis-client/tsconfig.json' is up to date because newest input '../redis-client/src/index.ts' is older than output '../redis-client/dist/tsc/tsconfig.tsbuildinfo'
32
+ 6:23:38 PM - Project '../redis-client/tsconfig.json' is up to date because newest input '../redis-client/src/redisClient.ts' is older than output '../redis-client/dist/tsc/tsconfig.tsbuildinfo'
33
33
 
34
- 2:42:21 PM - Project '../api/tsconfig.json' is up to date because newest input '../api/src/index.ts' is older than output '../api/dist/tsc/tsconfig.tsbuildinfo'
34
+ 6:23:38 PM - Project '../api/tsconfig.json' is up to date because newest input '../api/src/tests/apiHarness.ts' is older than output '../api/dist/tsc/tsconfig.tsbuildinfo'
35
35
 
36
- 2:42:21 PM - Project '../user-access-policy/tsconfig.json' is up to date because newest input '../user-access-policy/src/transformRule.ts' is older than output '../user-access-policy/dist/tsc/tsconfig.tsbuildinfo'
36
+ 6:23:38 PM - Project '../user-access-policy/tsconfig.json' is up to date because newest input '../user-access-policy/src/transformRule.ts' is older than output '../user-access-policy/dist/tsc/tsconfig.tsbuildinfo'
37
37
 
38
- 2:42:21 PM - Project 'tsconfig.json' is out of date because output file 'dist/tsc/tsconfig.tsbuildinfo' does not exist
38
+ 6:23:38 PM - Project 'tsconfig.json' is out of date because output file 'dist/tsc/tsconfig.tsbuildinfo' does not exist
39
39
 
40
- 2:42:21 PM - Building project '/home/runner/work/captcha/captcha/packages/types-database/tsconfig.json'...
40
+ 6:23:38 PM - Building project '/home/runner/work/captcha/captcha/packages/types-database/tsconfig.json'...
41
41
 
package/CHANGELOG.md CHANGED
@@ -1,5 +1,63 @@
1
1
  # @prosopo/types-database
2
2
 
3
+ ## 5.19.1
4
+ ### Patch Changes
5
+
6
+ - 93620d4: Make the puzzle easier for people to read, and make how many decoys copy the real hole's outline depend on the difficulty level.
7
+
8
+ A new puzzle setting, `lookalikeDecoys`, sets how many decoys copy the real hole's outline; the rest each have their own shape. At the default and at levels 0 and 1 there are none, so the piece fits only the real hole. From level 2 a few decoys copy it (1-2 at level 2, 2-3 at level 3, 3-5 at level 4), and among those the real hole is the darkest. The value is stored with each puzzle so it replays as it was shown.
9
+
10
+ Look-alike decoys keep clear of the real hole and of each other, so they no longer pile into a dark patch that looks deeper than the real hole, and no decoy covers the real hole. The default puzzle and levels 0 and 1 use fewer, lighter decoys with softer edges, and decoys at levels 2 and 3 are a little lighter than before.
11
+
12
+ The decoy cap no longer raises a small decoy count up to its minimum; it only ever lowers it.
13
+
14
+ Boards vary much more. Six new patterns join the existing ones: wavy stripes, sawtooth stripes, tangent stripes, stripes shaped by a random polynomial drawn for each puzzle, a mosaic of tinted cells, and marble veining. Each board now gets one to three patterns, never two of the same family, and the stripe styles together are picked no more often than any other family, so boards no longer come out mostly ruled. The stripe and dot patterns can be bolder than before.
15
+ - Updated dependencies [93620d4]
16
+ - @prosopo/types@5.29.1
17
+ - @prosopo/common@3.3.2
18
+ - @prosopo/user-access-policy@3.17.1
19
+
20
+ ## 5.19.0
21
+ ### Minor Changes
22
+
23
+ - c677fb6: Read the new X-TCP-Probe header from chaddy and save the whole record on the Session as `tcpProbe`. This adds IPv6 connections and the packets sent after the first handshake to what we store. The older X-TLS-* signals keep working.
24
+
25
+ ### Patch Changes
26
+
27
+ - f9540f2: The scheduled client sync no longer brings back site keys from disabled accounts or deleted sites. It used to copy any recently edited site to the provider, so disabling an account or deleting a site shortly after an edit was undone on the next run. The sync now skips those sites and removes their keys from the provider on every run, so a disabled account stays off even if the direct removal call failed. Removing keys that are not stored no longer empties the client record cache.
28
+ - 32075aa: `saveCaptchas`, the `getUnstored*` paging methods, `disapproveDappUserCommitment` and `getDecisionMachineArtifact` now take a single object argument instead of several optional positional ones.
29
+ - 8e1ce57: The database methods that store and update captcha records (PoW, puzzle, audio, icon order, pending image commitments) now take one named-field object instead of long positional parameter lists. Stored data is unchanged.
30
+ - a676f91: Importing `@prosopo/database` no longer prints `[Function: makeDirectory]` to the console at start-up, and the unused `make-dir` dependency is gone.
31
+
32
+ Two provider database methods that nothing called are removed. `updateCaptcha` overwrote the first captcha it found in the dataset rather than the one passed to it. `flagProcessedDappUserCommitments` set a field the commitment schema does not have, so it never changed anything.
33
+ - eb5b4ae: Image captcha requests that point at a record that is not there now get a clean "not verified" instead of a 500 error:
34
+
35
+ - A server verify naming a commitment id that does not exist answers `verified: false` with `API.USER_NOT_VERIFIED_NO_SOLUTION`.
36
+ - Submitting a solution to an image request that was already answered (a double click or a network retry), or that never existed, answers `verified: false`.
37
+
38
+ `getPendingImageCommitment` now returns `undefined` when no pending request matches, instead of throwing.
39
+ - 2e606df: Puzzle records now store where the piece was dropped (`finalX`, `finalY`) and its distance from the target, so a rejected solve shows how far off it was.
40
+ - f7e7ea0: Add puzzle renderer version 2, record the renderer version on each puzzle, and deliver the puzzle piece inside the board image.
41
+ - c8f0b16: A puzzle challenge now takes its one submission with an atomic database update, as audio and icon-order challenges already do, so two answers sent at the same time cannot both be graded.
42
+ - Updated dependencies [051d218]
43
+ - Updated dependencies [391182a]
44
+ - Updated dependencies [0b6e928]
45
+ - Updated dependencies [88aa878]
46
+ - Updated dependencies [768c8f8]
47
+ - Updated dependencies [89c3078]
48
+ - Updated dependencies [96e1295]
49
+ - Updated dependencies [206235c]
50
+ - Updated dependencies [5345619]
51
+ - Updated dependencies [2e606df]
52
+ - Updated dependencies [f7e7ea0]
53
+ - Updated dependencies [8c68a26]
54
+ - Updated dependencies [c677fb6]
55
+ - @prosopo/user-access-policy@3.17.0
56
+ - @prosopo/types@5.29.0
57
+ - @prosopo/logger@2.1.12
58
+ - @prosopo/common@3.3.2
59
+ - @prosopo/locale@3.14.4
60
+
3
61
  ## 5.18.4
4
62
  ### Patch Changes
5
63
 
@@ -112,6 +112,12 @@ var PuzzleRenderSettingsSchema = new mongoose.Schema({
112
112
  max: 1,
113
113
  required: false
114
114
  },
115
+ lookalikeDecoys: {
116
+ type: Number,
117
+ min: 0,
118
+ max: 200,
119
+ required: false
120
+ },
115
121
  pieceScale: {
116
122
  type: new mongoose.Schema({
117
123
  min: {
@@ -546,6 +552,7 @@ var AccountSchema = new mongoose.Schema({
546
552
  default: void 0
547
553
  },
548
554
  marketingPreferences: Boolean,
555
+ accountDisabled: Boolean,
549
556
  users: [{
550
557
  email: String,
551
558
  name: String,
@@ -591,6 +591,18 @@ var PuzzleCaptchaRecordSchema = new mongoose.Schema({
591
591
  type: Number,
592
592
  required: true
593
593
  },
594
+ finalX: {
595
+ type: Number,
596
+ required: false
597
+ },
598
+ finalY: {
599
+ type: Number,
600
+ required: false
601
+ },
602
+ distanceFromTarget: {
603
+ type: Number,
604
+ required: false
605
+ },
594
606
  retried: {
595
607
  type: Boolean,
596
608
  required: false
@@ -639,6 +651,10 @@ var PuzzleCaptchaRecordSchema = new mongoose.Schema({
639
651
  decoyHoleDarken: {
640
652
  type: Number,
641
653
  required: true
654
+ },
655
+ lookalikeDecoys: {
656
+ type: Number,
657
+ required: false
642
658
  }
643
659
  },
644
660
  backgroundSeed: {
@@ -648,6 +664,10 @@ var PuzzleCaptchaRecordSchema = new mongoose.Schema({
648
664
  renderSeed: {
649
665
  type: String,
650
666
  required: true
667
+ },
668
+ renderer: {
669
+ type: Number,
670
+ required: false
651
671
  }
652
672
  }, { _id: false }),
653
673
  required: false
@@ -1572,6 +1592,10 @@ var SessionRecordSchema = new mongoose.Schema({
1572
1592
  type: Number,
1573
1593
  required: false
1574
1594
  },
1595
+ tcpProbe: {
1596
+ type: mongoose.Schema.Types.Mixed,
1597
+ required: false
1598
+ },
1575
1599
  tlsHandshakeRttUs: {
1576
1600
  type: Number,
1577
1601
  required: false
@@ -1860,6 +1884,7 @@ var SESSION_PROJECTION = {
1860
1884
  ipTos: 1,
1861
1885
  tcpOptsFlags: 1,
1862
1886
  tcpOptsOrder: 1,
1887
+ tcpProbe: 1,
1863
1888
  tlsHandshakeRttUs: 1,
1864
1889
  "headers.user-agent": 1,
1865
1890
  "headers.accept": 1,
@@ -1,3 +1,2 @@
1
- import "node:module";
2
1
  //#endregion
3
2
  export {};
@@ -112,6 +112,12 @@ var PuzzleRenderSettingsSchema = new Schema({
112
112
  max: 1,
113
113
  required: false
114
114
  },
115
+ lookalikeDecoys: {
116
+ type: Number,
117
+ min: 0,
118
+ max: 200,
119
+ required: false
120
+ },
115
121
  pieceScale: {
116
122
  type: new Schema({
117
123
  min: {
@@ -546,6 +552,7 @@ var AccountSchema = new Schema({
546
552
  default: void 0
547
553
  },
548
554
  marketingPreferences: Boolean,
555
+ accountDisabled: Boolean,
549
556
  users: [{
550
557
  email: String,
551
558
  name: String,
@@ -591,6 +591,18 @@ var PuzzleCaptchaRecordSchema = new Schema({
591
591
  type: Number,
592
592
  required: true
593
593
  },
594
+ finalX: {
595
+ type: Number,
596
+ required: false
597
+ },
598
+ finalY: {
599
+ type: Number,
600
+ required: false
601
+ },
602
+ distanceFromTarget: {
603
+ type: Number,
604
+ required: false
605
+ },
594
606
  retried: {
595
607
  type: Boolean,
596
608
  required: false
@@ -639,6 +651,10 @@ var PuzzleCaptchaRecordSchema = new Schema({
639
651
  decoyHoleDarken: {
640
652
  type: Number,
641
653
  required: true
654
+ },
655
+ lookalikeDecoys: {
656
+ type: Number,
657
+ required: false
642
658
  }
643
659
  },
644
660
  backgroundSeed: {
@@ -648,6 +664,10 @@ var PuzzleCaptchaRecordSchema = new Schema({
648
664
  renderSeed: {
649
665
  type: String,
650
666
  required: true
667
+ },
668
+ renderer: {
669
+ type: Number,
670
+ required: false
651
671
  }
652
672
  }, { _id: false }),
653
673
  required: false
@@ -1572,6 +1592,10 @@ var SessionRecordSchema = new Schema({
1572
1592
  type: Number,
1573
1593
  required: false
1574
1594
  },
1595
+ tcpProbe: {
1596
+ type: Schema.Types.Mixed,
1597
+ required: false
1598
+ },
1575
1599
  tlsHandshakeRttUs: {
1576
1600
  type: Number,
1577
1601
  required: false
@@ -1860,6 +1884,7 @@ var SESSION_PROJECTION = {
1860
1884
  ipTos: 1,
1861
1885
  tcpOptsFlags: 1,
1862
1886
  tcpOptsOrder: 1,
1887
+ tcpProbe: 1,
1863
1888
  tlsHandshakeRttUs: 1,
1864
1889
  "headers.user-agent": 1,
1865
1890
  "headers.accept": 1,
@@ -9,8 +9,16 @@ export declare const StoredPoWCaptchaRecordSchema: Schema;
9
9
  export declare const StoredPuzzleCaptchaRecordSchema: Schema;
10
10
  export declare const StoredAudioCaptchaRecordSchema: Schema;
11
11
  export declare const StoredIconOrderCaptchaRecordSchema: Schema;
12
+ export type SaveCaptchasArgs = {
13
+ sessionEvents?: StoredSession[];
14
+ imageCaptchaEvents?: UserCommitmentRecord[];
15
+ powCaptchaEvents?: PoWCaptchaRecord[];
16
+ puzzleCaptchaEvents?: PuzzleCaptchaRecord[];
17
+ iconOrderCaptchaEvents?: IconOrderCaptchaRecord[];
18
+ audioCaptchaEvents?: AudioCaptchaRecord[];
19
+ };
12
20
  export interface ICaptchaDatabase extends IDatabase {
13
- saveCaptchas(sessionEvents: StoredSession[], imageCaptchaEvents: UserCommitmentRecord[], powCaptchaEvents: PoWCaptchaRecord[], puzzleCaptchaEvents?: PuzzleCaptchaRecord[], iconOrderCaptchaEvents?: IconOrderCaptchaRecord[], audioCaptchaEvents?: AudioCaptchaRecord[]): Promise<void>;
21
+ saveCaptchas(events: SaveCaptchasArgs): Promise<void>;
14
22
  getCaptchas(filter: QueryFilter<CaptchaProperties>, limit: number): Promise<{
15
23
  userCommitmentRecords: UserCommitmentRecord[];
16
24
  powCaptchaRecords: PoWCaptchaRecord[];
@@ -1 +1 @@
1
- {"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../../src/types/captcha.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EACN,KAAK,kBAAkB,EAEvB,KAAK,sBAAsB,EAE3B,KAAK,gBAAgB,EAErB,KAAK,mBAAmB,EAExB,KAAK,aAAa,EAElB,KAAK,oBAAoB,EAEzB,MAAM,eAAe,CAAC;AAGvB,MAAM,MAAM,aAAa,GAAG,aAAa,CAAC;AAE1C,eAAO,MAAM,yBAAyB,EAAE,MAA4B,CAAC;AAMrE,eAAO,MAAM,gCAAgC,EAAE,MAE7C,CAAC;AAIH,eAAO,MAAM,4BAA4B,EAAE,MAEzC,CAAC;AAIH,eAAO,MAAM,+BAA+B,EAAE,MAE5C,CAAC;AAIH,eAAO,MAAM,8BAA8B,EAAE,MAE3C,CAAC;AAIH,eAAO,MAAM,kCAAkC,EAAE,MAE/C,CAAC;AAIH,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IAClD,YAAY,CACX,aAAa,EAAE,aAAa,EAAE,EAC9B,kBAAkB,EAAE,oBAAoB,EAAE,EAC1C,gBAAgB,EAAE,gBAAgB,EAAE,EACpC,mBAAmB,CAAC,EAAE,mBAAmB,EAAE,EAC3C,sBAAsB,CAAC,EAAE,sBAAsB,EAAE,EACjD,kBAAkB,CAAC,EAAE,kBAAkB,EAAE,GACvC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,WAAW,CACV,MAAM,EAAE,WAAW,CAAC,iBAAiB,CAAC,EACtC,KAAK,EAAE,MAAM,GACX,OAAO,CAAC;QACV,qBAAqB,EAAE,oBAAoB,EAAE,CAAC;QAC9C,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;QACtC,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;QAC5C,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;QAC1C,uBAAuB,EAAE,sBAAsB,EAAE,CAAC;KAClD,CAAC,CAAC;CACH;AAED,MAAM,WAAW,iBAChB,SAAQ,OAAO,CAAC,cAAc,GAAG,UAAU,CAAC;CAAG"}
1
+ {"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../../src/types/captcha.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EACN,KAAK,kBAAkB,EAEvB,KAAK,sBAAsB,EAE3B,KAAK,gBAAgB,EAErB,KAAK,mBAAmB,EAExB,KAAK,aAAa,EAElB,KAAK,oBAAoB,EAEzB,MAAM,eAAe,CAAC;AAGvB,MAAM,MAAM,aAAa,GAAG,aAAa,CAAC;AAE1C,eAAO,MAAM,yBAAyB,EAAE,MAA4B,CAAC;AAMrE,eAAO,MAAM,gCAAgC,EAAE,MAE7C,CAAC;AAIH,eAAO,MAAM,4BAA4B,EAAE,MAEzC,CAAC;AAIH,eAAO,MAAM,+BAA+B,EAAE,MAE5C,CAAC;AAIH,eAAO,MAAM,8BAA8B,EAAE,MAE3C,CAAC;AAIH,eAAO,MAAM,kCAAkC,EAAE,MAE/C,CAAC;AAIH,MAAM,MAAM,gBAAgB,GAAG;IAC9B,aAAa,CAAC,EAAE,aAAa,EAAE,CAAC;IAChC,kBAAkB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC5C,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IACtC,mBAAmB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAC5C,sBAAsB,CAAC,EAAE,sBAAsB,EAAE,CAAC;IAClD,kBAAkB,CAAC,EAAE,kBAAkB,EAAE,CAAC;CAC1C,CAAC;AAEF,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IAClD,YAAY,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,WAAW,CACV,MAAM,EAAE,WAAW,CAAC,iBAAiB,CAAC,EACtC,KAAK,EAAE,MAAM,GACX,OAAO,CAAC;QACV,qBAAqB,EAAE,oBAAoB,EAAE,CAAC;QAC9C,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;QACtC,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;QAC5C,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;QAC1C,uBAAuB,EAAE,sBAAsB,EAAE,CAAC;KAClD,CAAC,CAAC;CACH;AAED,MAAM,WAAW,iBAChB,SAAQ,OAAO,CAAC,cAAc,GAAG,UAAU,CAAC;CAAG"}