netlify-cli 27.0.2 → 27.1.0

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.
@@ -52,7 +52,8 @@ export declare class EdgeFunctionsRegistryImpl implements EdgeFunctionsRegistry
52
52
  private declarationsFromDeployConfig;
53
53
  private declarationsFromTOML;
54
54
  private dependencyPaths;
55
- private directoryWatchers;
55
+ private functionsWatcher?;
56
+ private watchedDependencyPaths;
56
57
  private env;
57
58
  private featureFlags;
58
59
  private userFunctions;
@@ -135,7 +136,9 @@ export declare class EdgeFunctionsRegistryImpl implements EdgeFunctionsRegistry
135
136
  private scanForDeployConfig;
136
137
  private scanForFunctions;
137
138
  private setupWatchers;
138
- private setupWatcherForDirectory;
139
+ private get edgeFunctionsDirectories();
140
+ private setupFunctionsWatcher;
141
+ private syncDependencyWatchers;
139
142
  private get usesFrameworksAPI();
140
143
  }
141
144
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/registry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/registry.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAG7D,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EASL,KAAK,4BAA4B,EAClC,MAAM,gCAAgC,CAAA;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAchE,KAAK,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,uBAAuB,EAAE,KAAK,CAAC,CAAC,CAAA;AAInF,UAAU,4BAA4B;IACpC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;IAC1C,OAAO,EAAE,cAAc,uBAAuB,CAAC,CAAA;IAC/C,OAAO,EAAE,WAAW,CAAA;IACpB,MAAM,EAAE,4BAA4B,CAAA;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,OAAO,CAAA;IACd,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACzD,YAAY,EAAE,YAAY,CAAA;IAC1B,gBAAgB,EAAE,MAAM,OAAO,CAAC,4BAA4B,CAAC,CAAA;IAC7D,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,iBAAiB,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,EAAE,CAAA;CACvE;AA6CD,iFAAiF;AACjF,MAAM,WAAW,qBAAqB;IACpC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3B,YAAY,CACV,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,GACrD;QAAE,aAAa,EAAE,MAAM,EAAE,CAAC;QAAC,kBAAkB,EAAE,OAAO,CAAA;KAAE,CAAA;CAC5D;AAED,qBAAa,yBAA0B,YAAW,qBAAqB;IAC9D,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAEzC,OAAO,CAAC,gBAAgB,CAAC,CAAyB;IAClD,OAAO,CAAC,UAAU,CAAqB;IAEvC,6FAA6F;IACtF,YAAY,UAAQ;IAC3B,6FAA6F;IACtF,YAAY,EAAE,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;KAAE,CAAC,GAAG,IAAI,CAAO;IAClF,OAAO,CAAC,OAAO,CAAwC;IACvD,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,iBAAiB,CAAC,CAAQ;IAClC,OAAO,CAAC,4BAA4B,CAAoB;IACxD,OAAO,CAAC,oBAAoB,CAAe;IAG3C,OAAO,CAAC,eAAe,CAAiC;IAExD,OAAO,CAAC,gBAAgB,CAAC,CAA8B;IAIvD,OAAO,CAAC,sBAAsB,CAAoB;IAElD,OAAO,CAAC,GAAG,CAAwB;IACnC,OAAO,CAAC,YAAY,CAAc;IAElC,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,iBAAiB,CAAqB;IAK9C,OAAO,CAAC,aAAa,CAA4B;IAEjD,OAAO,CAAC,gBAAgB,CAA6C;IACrE,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,OAAO,CAAa;IAE5B,YAAY,EACV,gBAAgB,EAChB,OAAO,EACP,OAAO,EACP,MAAM,EACN,UAAU,EACV,GAAG,EACH,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,UAAU,EACV,SAAS,EACT,WAAW,EACX,iBAAiB,GAClB,EAAE,4BAA4B,EAoB9B;YAEa,aAAa;IAc3B,OAAO,KAAK,SAAS,GAEpB;IAED;;;;;;;;OAQG;IACU,KAAK,IAAI,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;KAAE,CAAC,CAgCpE;IAED,6FAA6F;IAChF,OAAO,IAAI,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;KAAE,CAAC,CAuDtE;IAED;;;;;OAKG;IACH,OAAO,CAAC,WAAW;YA0BL,+BAA+B;IAsB7C,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAMtC,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,MAAM,CAAC,uBAAuB;YA2BxB,gBAAgB;IAoCxB,UAAU,kBAEf;IAED;;OAEG;IACH,OAAO,CAAC,QAAQ;IA2ChB;;;OAGG;IACH,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;;;;;;;;;;;MAsEnG;IAED;;;OAGG;IACH,OAAO,CAAC,YAAY;IA8CpB;;;OAGG;YACW,QAAQ;IA0BtB,OAAO,KAAK,qBAAqB,GAEhC;YAEa,gBAAgB;YAShB,mBAAmB;YAgBnB,gBAAgB;YAiChB,aAAa;IA0B3B,OAAO,KAAK,wBAAwB,GAcnC;YAEa,qBAAqB;IA+BnC,OAAO,CAAC,sBAAsB;IA+B9B,OAAO,KAAK,iBAAiB,GAE5B;CACF"}
@@ -1,6 +1,6 @@
1
1
  import { readFile } from 'fs/promises';
2
2
  import { statSync } from 'fs';
3
- import { join, resolve } from 'path';
3
+ import { join, resolve, sep } from 'path';
4
4
  import { fileURLToPath } from 'url';
5
5
  import { watchDebounced } from '@netlify/dev-utils';
6
6
  import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, nonNullable, chalk, log, warn, isNodeError, } from '../../utils/command-helpers.js';
@@ -54,7 +54,10 @@ export class EdgeFunctionsRegistryImpl {
54
54
  declarationsFromTOML;
55
55
  // Mapping file URLs to names of functions that use them as dependencies.
56
56
  dependencyPaths = new MultiMap();
57
- directoryWatchers = new Map();
57
+ functionsWatcher;
58
+ // Dependency files outside the edge function directories that are being
59
+ // explicitly watched, so we can unwatch them when they stop being imported.
60
+ watchedDependencyPaths = new Set();
58
61
  env;
59
62
  featureFlags;
60
63
  userFunctions = [];
@@ -405,6 +408,7 @@ export class EdgeFunctionsRegistryImpl {
405
408
  this.dependencyPaths.add(dependencyPath, functionName);
406
409
  });
407
410
  });
411
+ this.syncDependencyWatchers();
408
412
  }
409
413
  /**
410
414
  * Thin wrapper for `#runIsolate` that skips running a build and returns an
@@ -479,11 +483,13 @@ export class EdgeFunctionsRegistryImpl {
479
483
  return { all: functions, new: newFunctions, deleted: deletedFunctions };
480
484
  }
481
485
  async setupWatchers() {
482
- // While functions are guaranteed to be inside one of the configured
483
- // directories, they might be importing files that are located in
484
- // parent directories. So we watch the entire project directory for
485
- // changes.
486
- await this.setupWatcherForDirectory();
486
+ // Watching the entire project directory would open one file descriptor
487
+ // per file on some platforms, which exhausts the file descriptor table
488
+ // in large projects and makes any subsequent `spawn` fail with EBADF.
489
+ // Instead, we watch the edge function directories and explicitly watch
490
+ // any files outside of them that functions import (see
491
+ // `syncDependencyWatchers`).
492
+ await this.setupFunctionsWatcher();
487
493
  if (!this.configPath) {
488
494
  return;
489
495
  }
@@ -497,7 +503,18 @@ export class EdgeFunctionsRegistryImpl {
497
503
  },
498
504
  });
499
505
  }
500
- async setupWatcherForDirectory() {
506
+ get edgeFunctionsDirectories() {
507
+ const directories = [getInternalEdgeFunctionsDirectory(this.command)];
508
+ if (this.usesFrameworksAPI) {
509
+ directories.push(getFrameworkEdgeFunctionsDirectory(this.command));
510
+ }
511
+ const userFunctionsDirectory = getUserEdgeFunctionsDirectory(this.command);
512
+ if (userFunctionsDirectory !== undefined) {
513
+ directories.push(userFunctionsDirectory);
514
+ }
515
+ return directories;
516
+ }
517
+ async setupFunctionsWatcher() {
501
518
  const toIgnoredRegex = (dir) => new RegExp(`^${dir.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}(/|$)`);
502
519
  const toIgnoredEntry = (p) => {
503
520
  try {
@@ -515,13 +532,34 @@ export class EdgeFunctionsRegistryImpl {
515
532
  ...this.watchIgnore.map(toIgnoredEntry),
516
533
  this.internalImportMapPath,
517
534
  ];
518
- const watcher = await watchDebounced(this.projectDir, {
535
+ this.functionsWatcher = await watchDebounced(this.edgeFunctionsDirectories, {
519
536
  ignored,
520
537
  onAdd: () => this.checkForAddedOrDeletedFunctions(),
521
538
  onChange: (paths) => this.handleFileChange(paths),
522
539
  onUnlink: () => this.checkForAddedOrDeletedFunctions(),
523
540
  });
524
- this.directoryWatchers.set(this.projectDir, watcher);
541
+ // The initial build may have finished before the watcher was created, in
542
+ // which case its dependencies haven't been picked up by a sync yet.
543
+ this.syncDependencyWatchers();
544
+ }
545
+ syncDependencyWatchers() {
546
+ const watcher = this.functionsWatcher;
547
+ if (watcher === undefined) {
548
+ return;
549
+ }
550
+ const directories = this.edgeFunctionsDirectories;
551
+ const dependencyPaths = new Set([...this.dependencyPaths.keys()].filter((path) => !directories.some((directory) => path.startsWith(`${directory}${sep}`))));
552
+ this.watchedDependencyPaths.forEach((path) => {
553
+ if (!dependencyPaths.has(path)) {
554
+ watcher.unwatch(path);
555
+ }
556
+ });
557
+ dependencyPaths.forEach((path) => {
558
+ if (!this.watchedDependencyPaths.has(path)) {
559
+ watcher.add(path);
560
+ }
561
+ });
562
+ this.watchedDependencyPaths = dependencyPaths;
525
563
  }
526
564
  // We only take into account edge functions from the Frameworks API in
527
565
  // the `serve` command, since we don't run the build command in `dev`.
@@ -1 +1 @@
1
- {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/lib/edge-functions/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AAInC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAGnD,OAAO,EACL,aAAa,EACb,aAAa,EACb,cAAc,EACd,WAAW,EACX,KAAK,EACL,GAAG,EACH,IAAI,EACJ,WAAW,GAEZ,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAEjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,EACL,kCAAkC,EAClC,iCAAiC,EACjC,6BAA6B,GAC9B,MAAM,sBAAsB,CAAA;AA4B7B;;;;GAIG;AACH,SAAS,yBAAyB,CAChC,EAAE,YAAY,GAAG,EAAE,EAAE,SAAS,EAAc,EAC5C,aAAsC,EACtC,KAAsB;IAEtB,uEAAuE;IACvE,gBAAgB;IAChB,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;QACnC,OAAO,KAAK,CAAC,SAAS,CAAC,CAAA;IACzB,CAAC;IAED,OAAO,YAAY,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACzC,sEAAsE;QACtE,wCAAwC;QACxC,IACE,UAAU,CAAC,IAAI,KAAK,SAAS;YAC7B,OAAO,UAAU,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ;YAC7C,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,EAChD,CAAC;YACD,OAAO,EAAE,CAAA;QACX,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,UAAU,CAAC,IAAI,CAAA;QACpD,MAAM,cAAc,GAAG,aAAa,CAAC,aAAa,CAAC,CAAA;QACnD,MAAM,gBAAgB,GAAG,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAE1D,yCAAyC;QACzC,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,CAAC,cAAc,CAAC,CAAA;QACzB,CAAC;QAED,iFAAiF;QACjF,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,yBAAyB,CAAC,gBAAgB,EAAE,aAAa,EAAE,KAAK,CAAC,EAAE,cAAc,CAAC,CAAA;QAEzG,OAAO,KAAK,CAAC,SAAS,CAAC,CAAA;IACzB,CAAC,CAAC,CAAA;AACJ,CAAC;AAYD,MAAM,OAAO,yBAAyB;IAC7B,yBAAyB,CAAS;IAEjC,gBAAgB,CAA0B;IAC1C,UAAU,GAAiB,IAAI,CAAA;IAEvC,6FAA6F;IACtF,YAAY,GAAG,KAAK,CAAA;IAC3B,6FAA6F;IACtF,YAAY,GAA2D,IAAI,CAAA;IAC1E,OAAO,CAAwC;IAC/C,UAAU,CAAQ;IAClB,iBAAiB,CAAS;IAC1B,4BAA4B,GAAkB,EAAE,CAAA;IAChD,oBAAoB,CAAe;IAE3C,yEAAyE;IACjE,eAAe,GAAG,IAAI,QAAQ,EAAkB,CAAA;IAEhD,iBAAiB,GAAG,IAAI,GAAG,EAAwC,CAAA;IACnE,GAAG,CAAwB;IAC3B,YAAY,CAAc;IAE1B,aAAa,GAAmB,EAAE,CAAA;IAClC,iBAAiB,GAAmB,EAAE,CAAA;IAE9C,mEAAmE;IACnE,2EAA2E;IAC3E,mBAAmB;IACX,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAA;IAEzC,gBAAgB,CAA6C;IAC7D,WAAW,CAAe;IAC1B,QAAQ,GAAoB,IAAI,CAAA;IAChC,MAAM,GAAY,EAAE,CAAA;IACpB,UAAU,CAAY;IACtB,SAAS,CAAQ;IACjB,UAAU,CAAQ;IAClB,WAAW,CAAU;IACrB,UAAU,CAAQ;IAClB,OAAO,CAAa;IAE5B,YAAY,EACV,gBAAgB,EAChB,OAAO,EACP,OAAO,EACP,MAAM,EACN,UAAU,EACV,GAAG,EACH,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,UAAU,EACV,SAAS,EACT,WAAW,EACX,iBAAiB,GACY;QAC7B,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;QACjD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAA;QACjE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAE5B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAA;QACrF,IAAI,CAAC,GAAG,GAAG,yBAAyB,CAAC,uBAAuB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAA;QAEpF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QAEvC,IAAI,CAAC,aAAa,EAAE,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAE7B,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAEvC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC9B,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACrF,CAAC,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,EAAE,UAAU,EAAE,KAA8B,EAAE,CAAC,CAAA;QAC7E,CAAC;IACH,CAAC;IAED,IAAY,SAAS;QACnB,OAAO,CAAC,GAAG,IAAI,CAAC,iBAAiB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3D,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,KAAK;QAChB,qEAAqE;QACrE,iEAAiE;QACjE,+DAA+D;QAC/D,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;YACxB,OAAO,IAAI,CAAC,YAAY,CAAA;QAC1B,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;QACzB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAElC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAA;YACtC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;YAExB,oEAAoE;YACpE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,OAAO,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAC3B,CAAC;YAED,OAAO,MAAM,CAAA;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;YAExB,oEAAoE;YACpE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,OAAO,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAC3B,CAAC;YAED,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC;IAED,6FAA6F;IACtF,KAAK,CAAC,OAAO;QAClB,MAAM,QAAQ,GAA6B,EAAE,CAAA;QAE7C,IAAI,CAAC;YACH,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;YAEjE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAA;YAChC,CAAC;YAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAA;YAEtB,mIAAmI;YACnI,sGAAsG;YACtG,IAAI,KAAK,GAAG,CAAC,CAAA;YAEb,MAAM,uBAAuB,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAC3D,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAClE,EAAE,CACH,CAAA;YAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CACnD,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAClE,EAAE,CACH,CAAA;YAED,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,uBAAuB,EAAE,mBAAmB,CAAC,CAAA;YAE9G,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;YACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;YAEpB,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;gBACrC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CACjB,wHAAwH,CACzH,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,KAAK,MAAM,YAAY,IAAI,mBAAmB,EAAE,CAAC;gBAC/C,IAAI,OAAO,IAAI,mBAAmB,CAAC,YAAY,CAAC,EAAE,CAAC;oBACjD,QAAQ,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAA;oBACrD,QAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAA;gBAC7F,CAAC;YACH,CAAC;YAED,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;YAExB,OAAO,EAAE,QAAQ,EAAE,CAAA;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAA;YACzB,CAAC;YAED,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACK,WAAW,CACjB,uBAAuD,EACvD,mBAAmD;QAEnD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CACjD,IAAI,CAAC,oBAAoB,EACzB,mBAAmB,EACnB,uBAAuB,EACvB,IAAI,CAAC,4BAA4B,EACjC,IAAI,CAAC,YAAY,CAClB,CAAA;QACD,MAAM,EAAE,2BAA2B,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;YACjG,YAAY;YACZ,kBAAkB,EAAE,mBAAmB;YACvC,sBAAsB,EAAE,uBAAuB;YAC/C,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACjF,GAAG,KAAK;YACR,OAAO,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;SACnC,CAAC,CAAC,CAAA;QAEH,OAAO,EAAE,2BAA2B,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;IAC7E,CAAC;IAEO,KAAK,CAAC,+BAA+B;QAC3C,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAEtF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/D,OAAM;QACR,CAAC;QAED,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAEvC,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACtF,CAAC,CAAC,CAAA;YAEF,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC5B,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACrF,CAAC,CAAC,CAAA;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,QAAQ;QACV,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,uBAAuB,CAAC,MAAoC;QACzE,MAAM,EAAE,cAAc,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,MAAM,CAAA;QAErD,OAAO,aAAa,CAAA;IACtB,CAAC;IAEO,cAAc,CAAC,IAAY;QACjC,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,GAAG,IAAI,CAAC,4BAA4B,CAAC,CAAA;QAEzF,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,KAAK,IAAI,CAAC,EAAE,IAAI,IAAI,IAAI,CAAA;IACxF,CAAC;IAEO,MAAM,CAAC,uBAAuB,CACpC,SAA+D,EAC/D,iBAAsE;QAEtE,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAE/B,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,EAAE;YACpD,IACE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC/B,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBACpC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACnC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACrC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAC5D,CAAC;gBACD,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAA;YAC3B,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,KAAK,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,iBAAiB,EAAE,CAAC;YAC/C,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;QAClB,CAAC;QAED,GAAG,CAAC,WAAW,GAAG,OAAO,CAAA;QAEzB,OAAO,GAAG,CAAA;IACZ,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,KAAe;QAC5C,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B;YACE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACpD,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAC3D,CAAC,MAAM,CAAC,WAAW,CAAC,CACtB,CAAA;QAED,uEAAuE;QACvE,0EAA0E;QAC1E,2EAA2E;QAC3E,+CAA+C;QAC/C,IAAI,iBAAiB,CAAC,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YAC7D,OAAM;QACR,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;QAE9B,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YACvC,MAAM,aAAa,GAAG,CAAC,GAAG,iBAAiB,CAAC,CAAA;YAE5C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;YAC/B,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;oBACrC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;gBAC/E,CAAC,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAA;YACpD,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,WAAW,CAAA;IACxB,CAAC;IAED;;OAEG;IACK,QAAQ,CACd,KAAwB,EACxB,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,GAAG,EAAE,EAAsE;QAE/G,MAAM,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,iBAAiB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAA;QACpH,MAAM,YAAY,GAChB,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;QAE3G,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;YAC3B,GAAG,CAAC,GAAG,aAAa,IAAI,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC,CAAA;YAEhF,OAAM;QACR,CAAC;QAED,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,CAAA;YAC1D,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAA;YAEvD,GAAG,CAAC,GAAG,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,OAAO,GAAG,YAAY,EAAE,CAAC,CAAA;YAE3D,OAAM;QACR,CAAC;QAED,IAAI,KAAK,KAAK,UAAU,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,CAAA;YAC1D,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAA;YAEvD,GAAG,CAAC,GAAG,IAAI,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,OAAO,GAAG,YAAY,EAAE,CAAC,CAAA;YAE7D,OAAM;QACR,CAAC;QAED,IAAI,KAAK,KAAK,WAAW,EAAE,CAAC;YAC1B,GAAG,CAAC,GAAG,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,OAAO,KAAK,CAAC,CAAA;YAEnE,OAAM;QACR,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,GAAG,CAAC,GAAG,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,OAAO,EAAE,CAAC,CAAA;QAChE,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,YAAY,CAAC,OAAe,EAAE,MAAc,EAAE,OAAsD;QAClG,MAAM,aAAa,GAAa,EAAE,CAAA;QAClC,MAAM,YAAY,GAAa,EAAE,CAAA;QAEjC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACnC,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnF,OAAM;YACR,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjC,OAAM;YACR,CAAC;YAED,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;gBAClB,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,EAAE,EAAE;oBACzF,MAAM,UAAU,GAAG,aAAa,CAAC,WAAW,EAAE,CAAA;oBAC9C,MAAM,iBAAiB,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;wBAC1D,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;wBAC/C,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;oBAEvB,IAAI,WAAW,EAAE,OAAO,KAAK,QAAQ,EAAE,CAAC;wBACtC,OAAO,OAAO,CAAC,UAAU,CAAC,KAAK,SAAS,CAAA;oBAC1C,CAAC;oBAED,IAAI,WAAW,EAAE,OAAO,KAAK,SAAS,EAAE,CAAC;wBACvC,OAAO,OAAO,CAAC,UAAU,CAAC,KAAK,SAAS,CAAA;oBAC1C,CAAC;oBAED,IAAI,iBAAiB,IAAI,WAAW,EAAE,OAAO,KAAK,OAAO,EAAE,CAAC;wBAC1D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;wBAE/C,OAAO,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;oBACxC,CAAC;oBAED,OAAO,KAAK,CAAA;gBACd,CAAC,CAAC,CAAA;gBAEF,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,OAAM;gBACR,CAAC;YACH,CAAC;YAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAChH,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAClC,CAAA;YACD,IAAI,qBAAqB,EAAE,CAAC;gBAC1B,OAAM;YACR,CAAC;YAED,MAAM,kBAAkB,GAAG,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;YACvG,IAAI,kBAAkB,EAAE,CAAC;gBACvB,OAAM;YACR,CAAC;YAED,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YAClC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC1B,CAAC,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC7G,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC,CAAA;QACH,MAAM,kBAAkB,GAAG;YACzB,eAAe,EAAE,IAAI,CAAC,QAAQ,EAAE,eAAe;YAC/C,UAAU,EAAE,YAAY;YACxB,MAAM;SACP,CAAA;QAED,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,CAAA;IAC9C,CAAC;IAED;;;OAGG;IACK,YAAY,CAAC,KAA8B;QACjD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAChC,IAAI,CAAC,uFAAuF,CAAC,CAAA;YAC/F,CAAC;YAED,OAAM;QACR,CAAC;QAED,IAAI,CAAC,eAAe,GAAG,IAAI,QAAQ,EAAkB,CAAA;QAErD,gEAAgE;QAChE,MAAM,aAAa,GAAG,IAAI,GAAG,EAAsB,CAAA;QAEnD,6FAA6F;QAC7F,MAAM,eAAe,GAAG,IAAI,GAAG,EAAgD,CAAA;QAC/E,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC/B,sEAAsE;YACtE,wCAAwC;YACxC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;YAC5B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrC,OAAM;YACR,CAAC;YAED,MAAM,IAAI,GAAG,aAAa,CAAC,SAAS,CAAC,CAAA;YACrC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YAE/B,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACjD,IAAI,YAAY,EAAE,CAAC;gBACjB,eAAe,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,eAAe,GAAoB,EAAE,CAAA;QAE3C,4EAA4E;QAC5E,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE;YACnD,MAAM,cAAc,GAAG,yBAAyB,CAAC,MAAM,EAAE,aAAa,EAAE,eAAe,CAAC,CAAA;YACxF,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;gBACxC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;YACxD,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,QAAQ;QACpB,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO;gBACL,eAAe,EAAE,EAAE;gBACnB,OAAO,EAAE,IAAI;aACd,CAAA;QACH,CAAC;QAED,MAAM,cAAc,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAA;QAE/E,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAA;YAE1E,IAAI,MAAM,sBAAsB,CAAC,MAAM,EAAE,EAAE,CAAC;gBAC1C,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAA;YAClD,CAAC;QACH,CAAC;QAED,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YAC1F,kBAAkB,EAAE,IAAI;YACxB,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC;SACnD,CAAC,CAAA;QAEF,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;IAC5C,CAAC;IAED,IAAY,qBAAqB;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAA;IACxE,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,CAAA;QAC3F,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;YACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YACrC,OAAO,QAAQ,CAAA;QACjB,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC/B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAClD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAM;QACR,CAAC;QAED,IAAI,YAAY,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAChD,CAAC;QAED,IAAI,CAAC,4BAA4B,GAAG,YAAY,CAAC,SAAS,CAAA;QAC1D,IAAI,CAAC,yBAAyB,GAAG,YAAY,CAAC,UAAU;YACtD,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,UAAU,CAAC;YAChF,CAAC,CAAC,SAAS,CAAA;IACf,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,MAAM,qBAAqB,GAAG,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACzE,MAAM,CAAC,kBAAkB,EAAE,oBAAoB,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAClF,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,kCAAkC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YACnG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,iCAAiC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACpE,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YACvE,IAAI,CAAC,mBAAmB,EAAE;SAC3B,CAAC,CAAA;QACF,MAAM,iBAAiB,GAAG,CAAC,GAAG,kBAAkB,EAAE,GAAG,oBAAoB,CAAC,CAAA;QAC1E,MAAM,SAAS,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,aAAa,CAAC,CAAA;QAC1D,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAC7C,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CACxC,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CACrF,CAAA;YAED,OAAO,CAAC,cAAc,CAAA;QACxB,CAAC,CAAC,CAAA;QACF,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE;YAC9D,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CACnC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAC7E,CAAA;YAED,OAAO,CAAC,cAAc,CAAA;QACxB,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAElC,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAE1F,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAA;IACzE,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,oEAAoE;QACpE,iEAAiE;QACjE,mEAAmE;QACnE,WAAW;QACX,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAA;QAErC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,OAAM;QACR,CAAC;QAED,yEAAyE;QACzE,2EAA2E;QAC3E,MAAM,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE;YACpC,QAAQ,EAAE,KAAK,IAAI,EAAE;gBACnB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;gBAE/C,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAA;gBAExF,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAA;YAC9C,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,wBAAwB;QACpC,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;QAEzG,MAAM,cAAc,GAAG,CAAC,CAAS,EAAmB,EAAE;YACpD,IAAI,CAAC;gBACH,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE;oBAAE,OAAO,CAAC,CAAA;YACpC,CAAC;YAAC,MAAM,CAAC;gBACP,oFAAoF;YACtF,CAAC;YACD,OAAO,cAAc,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC,CAAA;QAED,MAAM,OAAO,GAAwB;YACnC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC;YAC9B,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACjF,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC;YACvC,IAAI,CAAC,qBAAqB;SAC3B,CAAA;QACD,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE;YACpD,OAAO;YACP,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,+BAA+B,EAAE;YACnD,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;YACjD,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,+BAA+B,EAAE;SACvD,CAAC,CAAA;QAEF,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IACtD,CAAC;IAED,sEAAsE;IACtE,sEAAsE;IACtE,IAAY,iBAAiB;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,OAAO,CAAA;IACxC,CAAC;CACF"}
1
+ {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/lib/edge-functions/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AAInC,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAGnD,OAAO,EACL,aAAa,EACb,aAAa,EACb,cAAc,EACd,WAAW,EACX,KAAK,EACL,GAAG,EACH,IAAI,EACJ,WAAW,GAEZ,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAEjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,EACL,kCAAkC,EAClC,iCAAiC,EACjC,6BAA6B,GAC9B,MAAM,sBAAsB,CAAA;AA4B7B;;;;GAIG;AACH,SAAS,yBAAyB,CAChC,EAAE,YAAY,GAAG,EAAE,EAAE,SAAS,EAAc,EAC5C,aAAsC,EACtC,KAAsB;IAEtB,uEAAuE;IACvE,gBAAgB;IAChB,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;QACnC,OAAO,KAAK,CAAC,SAAS,CAAC,CAAA;IACzB,CAAC;IAED,OAAO,YAAY,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACzC,sEAAsE;QACtE,wCAAwC;QACxC,IACE,UAAU,CAAC,IAAI,KAAK,SAAS;YAC7B,OAAO,UAAU,CAAC,IAAI,CAAC,SAAS,KAAK,QAAQ;YAC7C,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,EAChD,CAAC;YACD,OAAO,EAAE,CAAA;QACX,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,UAAU,CAAC,IAAI,CAAA;QACpD,MAAM,cAAc,GAAG,aAAa,CAAC,aAAa,CAAC,CAAA;QACnD,MAAM,gBAAgB,GAAG,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAE1D,yCAAyC;QACzC,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,CAAC,cAAc,CAAC,CAAA;QACzB,CAAC;QAED,iFAAiF;QACjF,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,yBAAyB,CAAC,gBAAgB,EAAE,aAAa,EAAE,KAAK,CAAC,EAAE,cAAc,CAAC,CAAA;QAEzG,OAAO,KAAK,CAAC,SAAS,CAAC,CAAA;IACzB,CAAC,CAAC,CAAA;AACJ,CAAC;AAYD,MAAM,OAAO,yBAAyB;IAC7B,yBAAyB,CAAS;IAEjC,gBAAgB,CAA0B;IAC1C,UAAU,GAAiB,IAAI,CAAA;IAEvC,6FAA6F;IACtF,YAAY,GAAG,KAAK,CAAA;IAC3B,6FAA6F;IACtF,YAAY,GAA2D,IAAI,CAAA;IAC1E,OAAO,CAAwC;IAC/C,UAAU,CAAQ;IAClB,iBAAiB,CAAS;IAC1B,4BAA4B,GAAkB,EAAE,CAAA;IAChD,oBAAoB,CAAe;IAE3C,yEAAyE;IACjE,eAAe,GAAG,IAAI,QAAQ,EAAkB,CAAA;IAEhD,gBAAgB,CAA+B;IAEvD,wEAAwE;IACxE,4EAA4E;IACpE,sBAAsB,GAAG,IAAI,GAAG,EAAU,CAAA;IAE1C,GAAG,CAAwB;IAC3B,YAAY,CAAc;IAE1B,aAAa,GAAmB,EAAE,CAAA;IAClC,iBAAiB,GAAmB,EAAE,CAAA;IAE9C,mEAAmE;IACnE,2EAA2E;IAC3E,mBAAmB;IACX,aAAa,GAAG,IAAI,GAAG,EAAkB,CAAA;IAEzC,gBAAgB,CAA6C;IAC7D,WAAW,CAAe;IAC1B,QAAQ,GAAoB,IAAI,CAAA;IAChC,MAAM,GAAY,EAAE,CAAA;IACpB,UAAU,CAAY;IACtB,SAAS,CAAQ;IACjB,UAAU,CAAQ;IAClB,WAAW,CAAU;IACrB,UAAU,CAAQ;IAClB,OAAO,CAAa;IAE5B,YAAY,EACV,gBAAgB,EAChB,OAAO,EACP,OAAO,EACP,MAAM,EACN,UAAU,EACV,GAAG,EACH,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,UAAU,EACV,SAAS,EACT,WAAW,EACX,iBAAiB,GACY;QAC7B,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;QACjD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAA;QACjE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAE5B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAA;QACrF,IAAI,CAAC,GAAG,GAAG,yBAAyB,CAAC,uBAAuB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAA;QAEpF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QAEvC,IAAI,CAAC,aAAa,EAAE,CAAA;IACtB,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAE7B,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAEvC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC9B,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACrF,CAAC,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,EAAE,UAAU,EAAE,KAA8B,EAAE,CAAC,CAAA;QAC7E,CAAC;IACH,CAAC;IAED,IAAY,SAAS;QACnB,OAAO,CAAC,GAAG,IAAI,CAAC,iBAAiB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3D,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,KAAK;QAChB,qEAAqE;QACrE,iEAAiE;QACjE,+DAA+D;QAC/D,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;YACxB,OAAO,IAAI,CAAC,YAAY,CAAA;QAC1B,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;QACzB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAElC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAA;YACtC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;YAExB,oEAAoE;YACpE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,OAAO,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAC3B,CAAC;YAED,OAAO,MAAM,CAAA;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;YAExB,oEAAoE;YACpE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,OAAO,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAC3B,CAAC;YAED,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC;IAED,6FAA6F;IACtF,KAAK,CAAC,OAAO;QAClB,MAAM,QAAQ,GAA6B,EAAE,CAAA;QAE7C,IAAI,CAAC;YACH,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;YAEjE,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAA;YAChC,CAAC;YAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAA;YAEtB,mIAAmI;YACnI,sGAAsG;YACtG,IAAI,KAAK,GAAG,CAAC,CAAA;YAEb,MAAM,uBAAuB,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAC3D,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAClE,EAAE,CACH,CAAA;YAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CACnD,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAClE,EAAE,CACH,CAAA;YAED,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,uBAAuB,EAAE,mBAAmB,CAAC,CAAA;YAE9G,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;YACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;YAEpB,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;gBACrC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CACjB,wHAAwH,CACzH,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,KAAK,MAAM,YAAY,IAAI,mBAAmB,EAAE,CAAC;gBAC/C,IAAI,OAAO,IAAI,mBAAmB,CAAC,YAAY,CAAC,EAAE,CAAC;oBACjD,QAAQ,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAA;oBACrD,QAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAA;gBAC7F,CAAC;YACH,CAAC;YAED,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;YAExB,OAAO,EAAE,QAAQ,EAAE,CAAA;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;gBAC3B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAA;YACzB,CAAC;YAED,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACK,WAAW,CACjB,uBAAuD,EACvD,mBAAmD;QAEnD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CACjD,IAAI,CAAC,oBAAoB,EACzB,mBAAmB,EACnB,uBAAuB,EACvB,IAAI,CAAC,4BAA4B,EACjC,IAAI,CAAC,YAAY,CAClB,CAAA;QACD,MAAM,EAAE,2BAA2B,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;YACjG,YAAY;YACZ,kBAAkB,EAAE,mBAAmB;YACvC,sBAAsB,EAAE,uBAAuB;YAC/C,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACjF,GAAG,KAAK;YACR,OAAO,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC;SACnC,CAAC,CAAC,CAAA;QAEH,OAAO,EAAE,2BAA2B,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;IAC7E,CAAC;IAEO,KAAK,CAAC,+BAA+B;QAC3C,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAEtF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/D,OAAM;QACR,CAAC;QAED,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YAEvC,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACtF,CAAC,CAAC,CAAA;YAEF,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC5B,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACrF,CAAC,CAAC,CAAA;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,QAAQ;QACV,CAAC;IACH,CAAC;IAEO,MAAM,CAAC,uBAAuB,CAAC,MAAoC;QACzE,MAAM,EAAE,cAAc,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,MAAM,CAAA;QAErD,OAAO,aAAa,CAAA;IACtB,CAAC;IAEO,cAAc,CAAC,IAAY;QACjC,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,oBAAoB,EAAE,GAAG,IAAI,CAAC,4BAA4B,CAAC,CAAA;QAEzF,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,KAAK,IAAI,CAAC,EAAE,IAAI,IAAI,IAAI,CAAA;IACxF,CAAC;IAEO,MAAM,CAAC,uBAAuB,CACpC,SAA+D,EAC/D,iBAAsE;QAEtE,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAE/B,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,EAAE;YACpD,IACE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAC/B,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;gBACpC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBACnC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACrC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAC5D,CAAC;gBACD,GAAG,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAA;YAC3B,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,KAAK,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,iBAAiB,EAAE,CAAC;YAC/C,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;QAClB,CAAC;QAED,GAAG,CAAC,WAAW,GAAG,OAAO,CAAA;QAEzB,OAAO,GAAG,CAAA;IACZ,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,KAAe;QAC5C,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAC/B;YACE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACpD,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAC3D,CAAC,MAAM,CAAC,WAAW,CAAC,CACtB,CAAA;QAED,uEAAuE;QACvE,0EAA0E;QAC1E,2EAA2E;QAC3E,+CAA+C;QAC/C,IAAI,iBAAiB,CAAC,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YAC7D,OAAM;QACR,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;QAE9B,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;YACvC,MAAM,aAAa,GAAG,CAAC,GAAG,iBAAiB,CAAC,CAAA;YAE5C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;YAC/B,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;oBACrC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;gBAC/E,CAAC,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAA;YACpD,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,WAAW,CAAA;IACxB,CAAC;IAED;;OAEG;IACK,QAAQ,CACd,KAAwB,EACxB,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,GAAG,EAAE,EAAsE;QAE/G,MAAM,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,iBAAiB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAA;QACpH,MAAM,YAAY,GAChB,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;QAE3G,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;YAC3B,GAAG,CAAC,GAAG,aAAa,IAAI,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC,CAAA;YAEhF,OAAM;QACR,CAAC;QAED,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,CAAA;YAC1D,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAA;YAEvD,GAAG,CAAC,GAAG,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,OAAO,GAAG,YAAY,EAAE,CAAC,CAAA;YAE3D,OAAM;QACR,CAAC;QAED,IAAI,KAAK,KAAK,UAAU,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,CAAA;YAC1D,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAA;YAEvD,GAAG,CAAC,GAAG,IAAI,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,OAAO,GAAG,YAAY,EAAE,CAAC,CAAA;YAE7D,OAAM;QACR,CAAC;QAED,IAAI,KAAK,KAAK,WAAW,EAAE,CAAC;YAC1B,GAAG,CAAC,GAAG,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,OAAO,KAAK,CAAC,CAAA;YAEnE,OAAM;QACR,CAAC;QAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,GAAG,CAAC,GAAG,aAAa,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,OAAO,EAAE,CAAC,CAAA;QAChE,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,YAAY,CAAC,OAAe,EAAE,MAAc,EAAE,OAAsD;QAClG,MAAM,aAAa,GAAa,EAAE,CAAA;QAClC,MAAM,YAAY,GAAa,EAAE,CAAA;QAEjC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACnC,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnF,OAAM;YACR,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjC,OAAM;YACR,CAAC;YAED,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;gBAClB,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,EAAE,EAAE;oBACzF,MAAM,UAAU,GAAG,aAAa,CAAC,WAAW,EAAE,CAAA;oBAC9C,MAAM,iBAAiB,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;wBAC1D,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;wBAC/C,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;oBAEvB,IAAI,WAAW,EAAE,OAAO,KAAK,QAAQ,EAAE,CAAC;wBACtC,OAAO,OAAO,CAAC,UAAU,CAAC,KAAK,SAAS,CAAA;oBAC1C,CAAC;oBAED,IAAI,WAAW,EAAE,OAAO,KAAK,SAAS,EAAE,CAAC;wBACvC,OAAO,OAAO,CAAC,UAAU,CAAC,KAAK,SAAS,CAAA;oBAC1C,CAAC;oBAED,IAAI,iBAAiB,IAAI,WAAW,EAAE,OAAO,KAAK,OAAO,EAAE,CAAC;wBAC1D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;wBAE/C,OAAO,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;oBACxC,CAAC;oBAED,OAAO,KAAK,CAAA;gBACd,CAAC,CAAC,CAAA;gBAEF,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,OAAM;gBACR,CAAC;YACH,CAAC;YAED,MAAM,qBAAqB,GAAG,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAChH,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAClC,CAAA;YACD,IAAI,qBAAqB,EAAE,CAAC;gBAC1B,OAAM;YACR,CAAC;YAED,MAAM,kBAAkB,GAAG,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;YACvG,IAAI,kBAAkB,EAAE,CAAC;gBACvB,OAAM;YACR,CAAC;YAED,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YAClC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC1B,CAAC,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC7G,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC,CAAA;QACH,MAAM,kBAAkB,GAAG;YACzB,eAAe,EAAE,IAAI,CAAC,QAAQ,EAAE,eAAe;YAC/C,UAAU,EAAE,YAAY;YACxB,MAAM;SACP,CAAA;QAED,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,CAAA;IAC9C,CAAC;IAED;;;OAGG;IACK,YAAY,CAAC,KAA8B;QACjD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAChC,IAAI,CAAC,uFAAuF,CAAC,CAAA;YAC/F,CAAC;YAED,OAAM;QACR,CAAC;QAED,IAAI,CAAC,eAAe,GAAG,IAAI,QAAQ,EAAkB,CAAA;QAErD,gEAAgE;QAChE,MAAM,aAAa,GAAG,IAAI,GAAG,EAAsB,CAAA;QAEnD,6FAA6F;QAC7F,MAAM,eAAe,GAAG,IAAI,GAAG,EAAgD,CAAA;QAC/E,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC/B,sEAAsE;YACtE,wCAAwC;YACxC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;YAC5B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrC,OAAM;YACR,CAAC;YAED,MAAM,IAAI,GAAG,aAAa,CAAC,SAAS,CAAC,CAAA;YACrC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YAE/B,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACjD,IAAI,YAAY,EAAE,CAAC;gBACjB,eAAe,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAA;YAC/C,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,eAAe,GAAoB,EAAE,CAAA;QAE3C,4EAA4E;QAC5E,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE;YACnD,MAAM,cAAc,GAAG,yBAAyB,CAAC,MAAM,EAAE,aAAa,EAAE,eAAe,CAAC,CAAA;YACxF,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;gBACxC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;YACxD,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,sBAAsB,EAAE,CAAA;IAC/B,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,QAAQ;QACpB,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO;gBACL,eAAe,EAAE,EAAE;gBACnB,OAAO,EAAE,IAAI;aACd,CAAA;QACH,CAAC;QAED,MAAM,cAAc,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAA;QAE/E,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,MAAM,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAA;YAE1E,IAAI,MAAM,sBAAsB,CAAC,MAAM,EAAE,EAAE,CAAC;gBAC1C,cAAc,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAA;YAClD,CAAC;QACH,CAAC;QAED,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YAC1F,kBAAkB,EAAE,IAAI;YACxB,cAAc,EAAE,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC;SACnD,CAAC,CAAA;QAEF,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,CAAA;IAC5C,CAAC;IAED,IAAY,qBAAqB;QAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAA;IACxE,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,CAAA;QAC3F,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;YACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YACrC,OAAO,QAAQ,CAAA;QACjB,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC/B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAClD,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAM;QACR,CAAC;QAED,IAAI,YAAY,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAChD,CAAC;QAED,IAAI,CAAC,4BAA4B,GAAG,YAAY,CAAC,SAAS,CAAA;QAC1D,IAAI,CAAC,yBAAyB,GAAG,YAAY,CAAC,UAAU;YACtD,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,UAAU,CAAC;YAChF,CAAC,CAAC,SAAS,CAAA;IACf,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,MAAM,qBAAqB,GAAG,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACzE,MAAM,CAAC,kBAAkB,EAAE,oBAAoB,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAClF,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,kCAAkC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YACnG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,iCAAiC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACpE,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YACvE,IAAI,CAAC,mBAAmB,EAAE;SAC3B,CAAC,CAAA;QACF,MAAM,iBAAiB,GAAG,CAAC,GAAG,kBAAkB,EAAE,GAAG,oBAAoB,CAAC,CAAA;QAC1E,MAAM,SAAS,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,aAAa,CAAC,CAAA;QAC1D,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAC7C,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CACxC,CAAC,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CACrF,CAAA;YAED,OAAO,CAAC,cAAc,CAAA;QACxB,CAAC,CAAC,CAAA;QACF,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,EAAE;YAC9D,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CACnC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAC7E,CAAA;YAED,OAAO,CAAC,cAAc,CAAA;QACxB,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAElC,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAE1F,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAA;IACzE,CAAC;IAEO,KAAK,CAAC,aAAa;QACzB,uEAAuE;QACvE,uEAAuE;QACvE,sEAAsE;QACtE,uEAAuE;QACvE,uDAAuD;QACvD,6BAA6B;QAC7B,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAA;QAElC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,OAAM;QACR,CAAC;QAED,yEAAyE;QACzE,2EAA2E;QAC3E,MAAM,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE;YACpC,QAAQ,EAAE,KAAK,IAAI,EAAE;gBACnB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;gBAE/C,IAAI,CAAC,oBAAoB,GAAG,yBAAyB,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAA;gBAExF,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAA;YAC9C,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;IAED,IAAY,wBAAwB;QAClC,MAAM,WAAW,GAAG,CAAC,iCAAiC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QAErE,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,WAAW,CAAC,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;QACpE,CAAC;QAED,MAAM,sBAAsB,GAAG,6BAA6B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAE1E,IAAI,sBAAsB,KAAK,SAAS,EAAE,CAAC;YACzC,WAAW,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;QAC1C,CAAC;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;IAEO,KAAK,CAAC,qBAAqB;QACjC,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;QAEzG,MAAM,cAAc,GAAG,CAAC,CAAS,EAAmB,EAAE;YACpD,IAAI,CAAC;gBACH,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE;oBAAE,OAAO,CAAC,CAAA;YACpC,CAAC;YAAC,MAAM,CAAC;gBACP,oFAAoF;YACtF,CAAC;YACD,OAAO,cAAc,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC,CAAA;QAED,MAAM,OAAO,GAAwB;YACnC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC;YAC9B,GAAG,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACjF,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC;YACvC,IAAI,CAAC,qBAAqB;SAC3B,CAAA;QAED,IAAI,CAAC,gBAAgB,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,wBAAwB,EAAE;YAC1E,OAAO;YACP,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,+BAA+B,EAAE;YACnD,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;YACjD,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,+BAA+B,EAAE;SACvD,CAAC,CAAA;QAEF,yEAAyE;QACzE,oEAAoE;QACpE,IAAI,CAAC,sBAAsB,EAAE,CAAA;IAC/B,CAAC;IAEO,sBAAsB;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAA;QAErC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAM;QACR,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,wBAAwB,CAAA;QACjD,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CACrC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,GAAG,EAAE,CAAC,CAAC,CAClF,CACF,CAAA;QAED,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC/B,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;YACvB,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,eAAe,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACnB,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,sBAAsB,GAAG,eAAe,CAAA;IAC/C,CAAC;IAED,sEAAsE;IACtE,sEAAsE;IACtE,IAAY,iBAAiB;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,OAAO,CAAA;IACxC,CAAC;CACF"}
@@ -1 +1 @@
1
- {"version":3,"file":"deploy-site.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"AAKA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAsBvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAGjD,YAAY,EAAE,WAAW,EAAE,CAAA;AAS3B,eAAO,MAAM,UAAU,YACZ,WAAW,OACf,QAAQ,6QAsCV;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAA;IACxC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;CACnB;;;;EA+IF,CAAA"}
1
+ {"version":3,"file":"deploy-site.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"AAKA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAuBvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAGjD,YAAY,EAAE,WAAW,EAAE,CAAA;AAS3B,eAAO,MAAM,UAAU,YACZ,WAAW,OACf,QAAQ,6QAsCV;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAA;IACxC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;CACnB;;;;EAmJF,CAAA"}
@@ -4,6 +4,7 @@ import cleanDeep from 'clean-deep';
4
4
  import { warn } from '../command-helpers.js';
5
5
  import { DEFAULT_CONCURRENT_HASH, DEFAULT_CONCURRENT_UPLOAD, DEFAULT_DEPLOY_TIMEOUT, DEFAULT_MAX_RETRY, DEFAULT_SYNC_LIMIT, } from './constants.js';
6
6
  import { hashConfig } from './hash-config.js';
7
+ import hashEdgeFunctions from './hash-edge-functions.js';
7
8
  import hashFiles from './hash-files.js';
8
9
  import hashFns from './hash-fns.js';
9
10
  import { deployFileNormalizer, getDbMigrationsDistPathIfExists, getDeployConfigPathIfExists, getEdgeFunctionsDistPathIfExists, isEdgeFunctionFile, } from './process-files.js';
@@ -50,7 +51,7 @@ skipFunctionsCache, statusCb = () => {
50
51
  const edgeFunctionsDistPath = await getEdgeFunctionsDistPathIfExists(workingDir);
51
52
  const deployConfigPath = await getDeployConfigPathIfExists(workingDir);
52
53
  const dbMigrationsDistPath = await getDbMigrationsDistPathIfExists(workingDir);
53
- const [{ files: staticFiles, filesShaMap: staticShaMap }, { fnConfig, fnShaMap, functionSchedules, functions, functionsWithNativeModules }, configFile,] = await Promise.all([
54
+ const [{ files: staticFiles, filesShaMap: staticShaMap }, { fnConfig, fnShaMap, functionSchedules, functions, functionsWithNativeModules }, configFile, { edgeFunctions, edgeFnShaMap },] = await Promise.all([
54
55
  hashFiles({
55
56
  assetType,
56
57
  concurrentHash,
@@ -71,6 +72,7 @@ skipFunctionsCache, statusCb = () => {
71
72
  rootDir: siteRoot,
72
73
  }),
73
74
  hashConfig({ config }),
75
+ hashEdgeFunctions(edgeFunctionsDistPath, { hashAlgorithm, statusCb }),
74
76
  ]);
75
77
  const files = { ...staticFiles, [configFile.normalizedPath]: configFile.hash };
76
78
  const filesShaMap = { ...staticShaMap, [configFile.hash]: [configFile] };
@@ -119,6 +121,7 @@ For more information, visit https://ntl.fyi/cli-native-modules.`);
119
121
  body: {
120
122
  files,
121
123
  functions,
124
+ edge_functions: edgeFunctions,
122
125
  function_schedules: functionSchedules,
123
126
  functions_config: fnConfig,
124
127
  async: Object.keys(files).length > syncFileLimit,
@@ -132,15 +135,16 @@ For more information, visit https://ntl.fyi/cli-native-modules.`);
132
135
  let deploy = await api.updateSiteDeploy(deployParams);
133
136
  if (deployParams.body.async)
134
137
  deploy = await waitForDiff(api, deploy.id, siteId, deployTimeout);
135
- const { required: requiredFiles, required_functions: requiredFns } = deploy;
138
+ const { required: requiredFiles, required_functions: requiredFns, required_edge_functions: requiredEdgeFns } = deploy;
136
139
  statusCb({
137
140
  type: 'create-deploy',
138
- msg: `CDN requesting ${requiredFiles.length} files${Array.isArray(requiredFns) ? ` and ${requiredFns.length} functions` : ''}`,
141
+ msg: `CDN requesting ${requiredFiles.length} files${Array.isArray(requiredFns) ? ` and ${requiredFns.length} functions` : ''}${Array.isArray(requiredEdgeFns) ? ` and ${requiredEdgeFns.length} edge functions` : ''}`,
139
142
  phase: 'stop',
140
143
  });
141
144
  const filesUploadList = getUploadList(requiredFiles, filesShaMap);
142
145
  const functionsUploadList = getUploadList(requiredFns, fnShaMap);
143
- const uploadList = [...filesUploadList, ...functionsUploadList];
146
+ const edgeFunctionsUploadList = getUploadList(requiredEdgeFns, edgeFnShaMap);
147
+ const uploadList = [...filesUploadList, ...functionsUploadList, ...edgeFunctionsUploadList];
144
148
  await uploadFiles(api, deployId, uploadList, { concurrentUpload, statusCb, maxRetry });
145
149
  statusCb({
146
150
  type: 'wait-for-deploy',
@@ -1 +1 @@
1
- {"version":3,"file":"deploy-site.js","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deploy-site.js","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-site.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,11 @@
1
+ import type { StatusCallback } from './status-cb.js';
2
+ import type { EdgeFunctionUploadFile } from './upload-files.js';
3
+ declare const hashEdgeFunctions: (edgeFunctionsDistPath: string | undefined, { hashAlgorithm, statusCb }: {
4
+ hashAlgorithm?: string;
5
+ statusCb: StatusCallback;
6
+ }) => Promise<{
7
+ edgeFunctions: Record<string, string>;
8
+ edgeFnShaMap: Record<string, EdgeFunctionUploadFile[]>;
9
+ }>;
10
+ export default hashEdgeFunctions;
11
+ //# sourceMappingURL=hash-edge-functions.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hash-edge-functions.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-edge-functions.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AACpD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAa/D,QAAA,MAAM,iBAAiB,0BACE,MAAM,GAAG,SAAS,+BACD;IAAE,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAA;CAAE,KAC3F,OAAO,CAAC;IAET,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAErC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAC,CAAA;CACvD,CAwCA,CAAA;eAEc,iBAAiB"}
@@ -0,0 +1,53 @@
1
+ import { createHash } from 'node:crypto';
2
+ import { createReadStream } from 'node:fs';
3
+ import { readFile } from 'node:fs/promises';
4
+ import { join } from 'node:path';
5
+ import { pipeline } from 'node:stream/promises';
6
+ const hashBundle = async (filepath, hashAlgorithm) => {
7
+ const hasher = createHash(hashAlgorithm);
8
+ await pipeline([createReadStream(filepath), hasher]);
9
+ return hasher.digest('hex');
10
+ };
11
+ // Reads the edge-bundler manifest from the dist directory and, for every bundle, computes its
12
+ // `code_sha` (sha256 of the bundle bytes — the deploy identity, recomputed rather than trusting the
13
+ // bundler's asset filename) so we can both declare it on deploy create and stream it on upload. We
14
+ // declare every format; bitballoon decides which ones actually ride this path and returns them in
15
+ // `required_edge_functions`.
16
+ const hashEdgeFunctions = async (edgeFunctionsDistPath, { hashAlgorithm = 'sha256', statusCb }) => {
17
+ const edgeFunctions = {};
18
+ const edgeFnShaMap = {};
19
+ if (!edgeFunctionsDistPath) {
20
+ return { edgeFunctions, edgeFnShaMap };
21
+ }
22
+ // `Partial` because this is whatever happens to be on disk, not something we produced.
23
+ let manifest;
24
+ try {
25
+ manifest = JSON.parse(await readFile(join(edgeFunctionsDistPath, 'manifest.json'), 'utf8'));
26
+ }
27
+ catch {
28
+ // No manifest (or an unreadable one) means there are no edge functions to declare.
29
+ return { edgeFunctions, edgeFnShaMap };
30
+ }
31
+ const bundles = manifest.bundles ?? [];
32
+ for (const bundle of bundles) {
33
+ const filepath = join(edgeFunctionsDistPath, bundle.asset);
34
+ const codeSha = await hashBundle(filepath, hashAlgorithm);
35
+ edgeFunctions[bundle.format] = codeSha;
36
+ const fileObj = {
37
+ assetType: 'edge-function',
38
+ filepath,
39
+ normalizedPath: codeSha,
40
+ hash: codeSha,
41
+ };
42
+ if (Array.isArray(edgeFnShaMap[codeSha])) {
43
+ edgeFnShaMap[codeSha].push(fileObj);
44
+ }
45
+ else {
46
+ edgeFnShaMap[codeSha] = [fileObj];
47
+ }
48
+ statusCb({ type: 'hashing', msg: `Hashing edge function bundle ${bundle.asset}`, phase: 'progress' });
49
+ }
50
+ return { edgeFunctions, edgeFnShaMap };
51
+ };
52
+ export default hashEdgeFunctions;
53
+ //# sourceMappingURL=hash-edge-functions.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hash-edge-functions.js","sourceRoot":"","sources":["../../../src/utils/deploy/hash-edge-functions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAO/C,MAAM,UAAU,GAAG,KAAK,EAAE,QAAgB,EAAE,aAAqB,EAAmB,EAAE;IACpF,MAAM,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC,CAAA;IACxC,MAAM,QAAQ,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IACpD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAC7B,CAAC,CAAA;AAED,8FAA8F;AAC9F,oGAAoG;AACpG,mGAAmG;AACnG,kGAAkG;AAClG,6BAA6B;AAC7B,MAAM,iBAAiB,GAAG,KAAK,EAC7B,qBAAyC,EACzC,EAAE,aAAa,GAAG,QAAQ,EAAE,QAAQ,EAAwD,EAM3F,EAAE;IACH,MAAM,aAAa,GAA2B,EAAE,CAAA;IAChD,MAAM,YAAY,GAA6C,EAAE,CAAA;IAEjE,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC3B,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,CAAA;IACxC,CAAC;IAED,uFAAuF;IACvF,IAAI,QAA2B,CAAA;IAC/B,IAAI,CAAC;QACH,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,qBAAqB,EAAE,eAAe,CAAC,EAAE,MAAM,CAAC,CAAsB,CAAA;IAClH,CAAC;IAAC,MAAM,CAAC;QACP,mFAAmF;QACnF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,CAAA;IACxC,CAAC;IAED,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAA;IACtC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAA;QAC1D,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;QAEzD,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,OAAO,CAAA;QAEtC,MAAM,OAAO,GAA2B;YACtC,SAAS,EAAE,eAAe;YAC1B,QAAQ;YACR,cAAc,EAAE,OAAO;YACvB,IAAI,EAAE,OAAO;SACd,CAAA;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACzC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACrC,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACnC,CAAC;QAED,QAAQ,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,gCAAgC,MAAM,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAA;IACvG,CAAC;IAED,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,CAAA;AACxC,CAAC,CAAA;AAED,eAAe,iBAAiB,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"hash-fns.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AAOA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAkGlD,QAAA,MAAM,OAAO,YACF,WAAW,eACP,MAAM,EAAE,oHAUlB;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,eAAe,CAAC,EAAE,QAAQ,CAAA;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACxC,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,QAAQ,CAAA;CACjB,KACA,OAAO,CAAC;IACT,iBAAiB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,SAAS,CAAA;IAChE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjC,0BAA0B,EAAE,QAAQ,EAAE,CAAA;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAA;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,SAAS,CAAA;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAA;CAChD,CAuGA,CAAA;eAEc,OAAO"}
1
+ {"version":3,"file":"hash-fns.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AAOA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAkGlD,QAAA,MAAM,OAAO,YACF,WAAW,eACP,MAAM,EAAE,oHAUlB;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,eAAe,CAAC,EAAE,QAAQ,CAAA;IAC1B,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAClC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACjC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,kBAAkB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACxC,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,QAAQ,CAAA;CACjB,KACA,OAAO,CAAC;IACT,iBAAiB,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,SAAS,CAAA;IAChE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjC,0BAA0B,EAAE,QAAQ,EAAE,CAAA;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAA;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,SAAS,CAAA;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,SAAS,CAAA;CAChD,CAmHA,CAAA;eAEc,OAAO"}
@@ -90,6 +90,16 @@ const hashFns = async (command, directories, { concurrentHash, functionsConfig,
90
90
  statusCb,
91
91
  tmpDir,
92
92
  });
93
+ // ZISI's in-memory FunctionResult only nests bootstrap/runtime version into
94
+ // buildData when writing the manifest cache. Reconstruct it for direct-zip paths.
95
+ for (const func of functionZips) {
96
+ if (!func.buildData) {
97
+ func.buildData = {
98
+ bootstrapVersion: func.bootstrapVersion,
99
+ runtimeAPIVersion: func.runtimeAPIVersion,
100
+ };
101
+ }
102
+ }
93
103
  const fileObjs = functionZips.map(({ buildData, displayName, generator, invocationMode, path: functionPath, priority, runtime, runtimeVersion, timeout, trafficRules, }) => ({
94
104
  filepath: functionPath,
95
105
  root: tmpDir,
@@ -1 +1 @@
1
- {"version":3,"file":"hash-fns.js","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"hash-fns.js","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,42 @@
1
- declare const uploadFiles: (api: any, deployId: any, uploadList: any, { concurrentUpload, maxRetry, statusCb }: {
2
- concurrentUpload: any;
3
- maxRetry: any;
4
- statusCb: any;
5
- }) => Promise<unknown[]>;
1
+ import fs from 'fs';
2
+ import type { NetlifyAPI } from '@netlify/api';
3
+ import type { StatusCallback } from './status-cb.js';
4
+ export type UploadApi = Pick<NetlifyAPI, 'uploadDeployFile' | 'uploadDeployFunction' | 'uploadDeployEdgeFunction'>;
5
+ interface UploadFileBase {
6
+ filepath: string;
7
+ normalizedPath: string;
8
+ body?: fs.ReadStream;
9
+ }
10
+ export interface StaticUploadFile extends UploadFileBase {
11
+ assetType: 'file';
12
+ }
13
+ export interface FunctionUploadFile extends UploadFileBase {
14
+ assetType: 'function';
15
+ runtime?: string;
16
+ invocationMode?: string;
17
+ timeout?: number;
18
+ }
19
+ export interface EdgeFunctionUploadFile extends UploadFileBase {
20
+ assetType: 'edge-function';
21
+ hash: string;
22
+ }
23
+ export type UploadFile = StaticUploadFile | FunctionUploadFile | EdgeFunctionUploadFile;
24
+ interface UploadFilesOptions {
25
+ concurrentUpload: number;
26
+ maxRetry: number;
27
+ statusCb: StatusCallback;
28
+ }
29
+ declare const uploadFiles: (api: UploadApi, deployId: string, uploadList: UploadFile[], { concurrentUpload, maxRetry, statusCb }: UploadFilesOptions) => Promise<({
30
+ id?: string;
31
+ path?: string;
32
+ sha?: string;
33
+ mime_type?: string;
34
+ size?: number;
35
+ } | {
36
+ id?: string;
37
+ name?: string;
38
+ sha?: string;
39
+ region?: string;
40
+ })[]>;
6
41
  export default uploadFiles;
7
42
  //# sourceMappingURL=upload-files.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"upload-files.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/upload-files.ts"],"names":[],"mappings":"AAQA,QAAA,MAAM,WAAW;;;;wBAwEhB,CAAA;eA2Dc,WAAW"}
1
+ {"version":3,"file":"upload-files.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/upload-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAK9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD,MAAM,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,kBAAkB,GAAG,sBAAsB,GAAG,0BAA0B,CAAC,CAAA;AASlH,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAA;IAChB,cAAc,EAAE,MAAM,CAAA;IACtB,IAAI,CAAC,EAAE,EAAE,CAAC,UAAU,CAAA;CACrB;AAED,MAAM,WAAW,gBAAiB,SAAQ,cAAc;IACtD,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACxD,SAAS,EAAE,UAAU,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAC5D,SAAS,EAAE,eAAe,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,MAAM,UAAU,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,sBAAsB,CAAA;AAQvF,UAAU,kBAAkB;IAC1B,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,cAAc,CAAA;CACzB;AAED,QAAA,MAAM,WAAW,QACV,SAAS,YACJ,MAAM,cACJ,UAAU,EAAE,4CACkB,kBAAkB;;;;;;;;;;;KAgF7D,CAAA;eA6Dc,WAAW"}
@@ -2,37 +2,40 @@ import fs from 'fs';
2
2
  import backoff from 'backoff';
3
3
  import pMap from 'p-map';
4
4
  import { UPLOAD_INITIAL_DELAY, UPLOAD_MAX_DELAY, UPLOAD_RANDOM_FACTOR } from './constants.js';
5
- // @ts-expect-error TS(7006) FIXME: Parameter 'api' implicitly has an 'any' type.
5
+ class MissingAssetTypeError extends Error {
6
+ fileObj;
7
+ constructor(fileObj) {
8
+ super('File Object missing assetType property');
9
+ this.fileObj = fileObj;
10
+ }
11
+ }
6
12
  const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRetry, statusCb }) => {
7
- if (!concurrentUpload || !statusCb || !maxRetry)
13
+ if (!concurrentUpload || !maxRetry)
8
14
  throw new Error('Missing required option concurrentUpload');
9
15
  statusCb({
10
16
  type: 'upload',
11
17
  msg: `Uploading ${uploadList.length} files`,
12
18
  phase: 'start',
13
19
  });
14
- // @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
15
20
  const uploadFile = async (fileObj, index) => {
16
- const { assetType, body, filepath, invocationMode, normalizedPath, runtime, timeout } = fileObj;
21
+ const { body, filepath, normalizedPath } = fileObj;
17
22
  const readStreamCtor = () => body ?? fs.createReadStream(filepath);
18
23
  statusCb({
19
24
  type: 'upload',
20
25
  msg: `(${index}/${uploadList.length}) Uploading ${normalizedPath}...`,
21
26
  phase: 'progress',
22
27
  });
23
- let response;
24
- switch (assetType) {
28
+ switch (fileObj.assetType) {
25
29
  case 'file': {
26
- response = await retryUpload(() => api.uploadDeployFile({
30
+ return await retryUpload(() => api.uploadDeployFile({
27
31
  body: readStreamCtor,
28
32
  deployId,
29
33
  path: encodeURI(normalizedPath),
30
34
  }), maxRetry);
31
- break;
32
35
  }
33
36
  case 'function': {
34
- // @ts-expect-error TS(7006) FIXME: Parameter 'retryCount' implicitly has an 'any' typ... Remove this comment to see the full error message
35
- response = await retryUpload((retryCount) => {
37
+ const { invocationMode, runtime, timeout } = fileObj;
38
+ return await retryUpload((retryCount) => {
36
39
  const params = {
37
40
  body: readStreamCtor,
38
41
  deployId,
@@ -42,21 +45,28 @@ const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRet
42
45
  runtime,
43
46
  };
44
47
  if (retryCount > 0) {
45
- // @ts-expect-error TS(2339) FIXME: Property 'xNfRetryCount' does not exist on type '{... Remove this comment to see the full error message
46
48
  params.xNfRetryCount = retryCount;
47
49
  }
48
50
  return api.uploadDeployFunction(params);
49
51
  }, maxRetry);
50
- break;
52
+ }
53
+ case 'edge-function': {
54
+ return await retryUpload((retryCount) => {
55
+ const params = {
56
+ body: readStreamCtor,
57
+ deployId,
58
+ codeSha: normalizedPath,
59
+ };
60
+ if (retryCount > 0) {
61
+ params.xNfRetryCount = retryCount;
62
+ }
63
+ return api.uploadDeployEdgeFunction(params);
64
+ }, maxRetry);
51
65
  }
52
66
  default: {
53
- const error = new Error('File Object missing assetType property');
54
- // @ts-expect-error TS(2339) FIXME: Property 'fileObj' does not exist on type 'Error'.
55
- error.fileObj = fileObj;
56
- throw error;
67
+ throw new MissingAssetTypeError(fileObj);
57
68
  }
58
69
  }
59
- return response;
60
70
  };
61
71
  const results = await pMap(uploadList, uploadFile, { concurrency: concurrentUpload });
62
72
  statusCb({
@@ -66,9 +76,10 @@ const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRet
66
76
  });
67
77
  return results;
68
78
  };
69
- // @ts-expect-error TS(7006) FIXME: Parameter 'uploadFn' implicitly has an 'any' type.
79
+ const getErrorStatus = (error) => typeof error === 'object' && error !== null && 'status' in error && typeof error.status === 'number'
80
+ ? error.status
81
+ : undefined;
70
82
  const retryUpload = (uploadFn, maxRetry) => new Promise((resolve, reject) => {
71
- // @ts-expect-error TS(7034) FIXME: Variable 'lastError' implicitly has type 'any' in ... Remove this comment to see the full error message
72
83
  let lastError;
73
84
  const fibonacciBackoff = backoff.fibonacci({
74
85
  randomisationFactor: UPLOAD_RANDOM_FACTOR,
@@ -83,15 +94,14 @@ const retryUpload = (uploadFn, maxRetry) => new Promise((resolve, reject) => {
83
94
  }
84
95
  catch (error) {
85
96
  lastError = error;
97
+ const status = getErrorStatus(error);
86
98
  // We don't need to retry for 400 or 422 errors
87
- // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
88
- if (error.status === 400 || error.status === 422) {
99
+ if (status === 400 || status === 422) {
89
100
  reject(error);
90
101
  return;
91
102
  }
92
103
  // observed errors: 408, 401 (4** swallowed), 502
93
- // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
94
- if (error.status > 400 || error.name === 'FetchError') {
104
+ if ((status !== undefined && status > 400) || (error instanceof Error && error.name === 'FetchError')) {
95
105
  fibonacciBackoff.backoff();
96
106
  return;
97
107
  }
@@ -107,7 +117,6 @@ const retryUpload = (uploadFn, maxRetry) => new Promise((resolve, reject) => {
107
117
  // eslint-disable-next-line @typescript-eslint/no-misused-promises
108
118
  fibonacciBackoff.on('ready', tryUpload);
109
119
  fibonacciBackoff.on('fail', () => {
110
- // @ts-expect-error TS(7005) FIXME: Variable 'lastError' implicitly has an 'any' type.
111
120
  reject(lastError);
112
121
  });
113
122
  tryUpload();
@@ -1 +1 @@
1
- {"version":3,"file":"upload-files.js","sourceRoot":"","sources":["../../../src/utils/deploy/upload-files.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upload-files.js","sourceRoot":"","sources":["../../../src/utils/deploy/upload-files.ts"],"names":[],"mappings":"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"}
@@ -2,5 +2,6 @@ export declare class MultiMap<K, V> {
2
2
  private map;
3
3
  add(key: K, value: V): void;
4
4
  get(key: K): readonly V[];
5
+ keys(): IterableIterator<K>;
5
6
  }
6
7
  //# sourceMappingURL=multimap.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"multimap.d.ts","sourceRoot":"","sources":["../../src/utils/multimap.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAQ,CAAC,CAAC,EAAE,CAAC;IACxB,OAAO,CAAC,GAAG,CAAoB;IAE/B,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,QAEnB;IAED,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,SAAS,CAAC,EAAE,CAExB;CACF"}
1
+ {"version":3,"file":"multimap.d.ts","sourceRoot":"","sources":["../../src/utils/multimap.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAQ,CAAC,CAAC,EAAE,CAAC;IACxB,OAAO,CAAC,GAAG,CAAoB;IAE/B,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,QAEnB;IAED,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,SAAS,CAAC,EAAE,CAExB;IAED,IAAI,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAE1B;CACF"}
@@ -6,5 +6,8 @@ export class MultiMap {
6
6
  get(key) {
7
7
  return this.map.get(key) ?? [];
8
8
  }
9
+ keys() {
10
+ return this.map.keys();
11
+ }
9
12
  }
10
13
  //# sourceMappingURL=multimap.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"multimap.js","sourceRoot":"","sources":["../../src/utils/multimap.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,QAAQ;IACX,GAAG,GAAG,IAAI,GAAG,EAAU,CAAA;IAE/B,GAAG,CAAC,GAAM,EAAE,KAAQ;QAClB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;IAC1D,CAAC;IAED,GAAG,CAAC,GAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;IAChC,CAAC;CACF"}
1
+ {"version":3,"file":"multimap.js","sourceRoot":"","sources":["../../src/utils/multimap.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,QAAQ;IACX,GAAG,GAAG,IAAI,GAAG,EAAU,CAAA;IAE/B,GAAG,CAAC,GAAM,EAAE,KAAQ;QAClB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;IAC1D,CAAC;IAED,GAAG,CAAC,GAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;IAChC,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;IACxB,CAAC;CACF"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "netlify-cli",
3
3
  "description": "Netlify command line tool",
4
- "version": "27.0.2",
4
+ "version": "27.1.0",
5
5
  "author": "Netlify Inc.",
6
6
  "type": "module",
7
7
  "engines": {