@takeshape/cli 11.124.6 → 11.125.0

package/dist/index.js

@@ -1729,9 +1729,9 @@ var require_p_locate = __commonJS({
     };
     var testElement = async (element, tester) => tester(await element);
     var finder = async (element) => {
-      const values2 = await Promise.all(element);
-      if (values2[1] === true) {
-        throw new EndError(values2[0]);
+      const values = await Promise.all(element);
+      if (values[1] === true) {
+        throw new EndError(values[0]);
       }
       return false;
     };
@@ -23174,8 +23174,8 @@ var require_lib7 = __commonJS({
         }
         var _INTERNAL = this[INTERNAL];
         const target = _INTERNAL.target, kind = _INTERNAL.kind, index2 = _INTERNAL.index;
-        const values2 = getHeaders(target, kind);
-        const len = values2.length;
+        const values = getHeaders(target, kind);
+        const len = values.length;
         if (index2 >= len) {
           return {
             value: void 0,
@@ -23184,7 +23184,7 @@ var require_lib7 = __commonJS({
         }
         this[INTERNAL].index = index2 + 1;
         return {
-          value: values2[index2],
+          value: values[index2],
           done: false
         };
       }
@@ -26778,10 +26778,10 @@ var require_lodash = __commonJS({
       }
       return array;
     }
-    function arrayPush(array, values2) {
-      var index2 = -1, length = values2.length, offset = array.length;
+    function arrayPush(array, values) {
+      var index2 = -1, length = values.length, offset = array.length;
       while (++index2 < length) {
-        array[offset + index2] = values2[index2];
+        array[offset + index2] = values[index2];
       }
       return array;
     }
@@ -29810,10 +29810,10 @@ var require_json_variables_cjs = __commonJS({
 // ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_arrayPush.js
 var require_arrayPush = __commonJS({
   "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_arrayPush.js"(exports2, module2) {
-    function arrayPush(array, values2) {
-      var index2 = -1, length = values2.length, offset = array.length;
+    function arrayPush(array, values) {
+      var index2 = -1, length = values.length, offset = array.length;
       while (++index2 < length) {
-        array[offset + index2] = values2[index2];
+        array[offset + index2] = values[index2];
       }
       return array;
     }
@@ -37626,14 +37626,14 @@ var require_promise_array = __commonJS({
             return /* @__PURE__ */ new Map();
         }
       }
-      function PromiseArray(values2) {
+      function PromiseArray(values) {
         var promise = this._promise = new Promise2(INTERNAL);
-        if (values2 instanceof Promise2) {
-          promise._propagateFrom(values2, 3);
-          values2.suppressUnhandledRejections();
+        if (values instanceof Promise2) {
+          promise._propagateFrom(values, 3);
+          values.suppressUnhandledRejections();
         }
         promise._setOnCancel(this);
-        this._values = values2;
+        this._values = values;
         this._length = 0;
         this._totalResolved = 0;
         this._init(void 0, -2);
@@ -37646,15 +37646,15 @@ var require_promise_array = __commonJS({
         return this._promise;
       };
       PromiseArray.prototype._init = function init(_, resolveValueIfEmpty) {
-        var values2 = tryConvertToPromise(this._values, this._promise);
-        if (values2 instanceof Promise2) {
-          values2 = values2._target();
-          var bitField = values2._bitField;
+        var values = tryConvertToPromise(this._values, this._promise);
+        if (values instanceof Promise2) {
+          values = values._target();
+          var bitField = values._bitField;
           ;
-          this._values = values2;
+          this._values = values;
           if ((bitField & 50397184) === 0) {
             this._promise._setAsyncGuaranteed();
-            return values2._then(
+            return values._then(
               init,
               this._reject,
               void 0,
@@ -37662,22 +37662,22 @@ var require_promise_array = __commonJS({
               resolveValueIfEmpty
             );
           } else if ((bitField & 33554432) !== 0) {
-            values2 = values2._value();
+            values = values._value();
           } else if ((bitField & 16777216) !== 0) {
-            return this._reject(values2._reason());
+            return this._reject(values._reason());
           } else {
             return this._cancel();
           }
         }
-        values2 = util.asArray(values2);
-        if (values2 === null) {
+        values = util.asArray(values);
+        if (values === null) {
           var err = apiRejection(
-            "expecting an array or an iterable object but got " + util.classString(values2)
+            "expecting an array or an iterable object but got " + util.classString(values)
           ).reason();
           this._promise._rejectCallback(err, false);
           return;
         }
-        if (values2.length === 0) {
+        if (values.length === 0) {
           if (resolveValueIfEmpty === -5) {
             this._resolveEmptyArray();
           } else {
@@ -37685,17 +37685,17 @@ var require_promise_array = __commonJS({
           }
           return;
         }
-        this._iterate(values2);
+        this._iterate(values);
       };
-      PromiseArray.prototype._iterate = function(values2) {
-        var len = this.getActualLength(values2.length);
+      PromiseArray.prototype._iterate = function(values) {
+        var len = this.getActualLength(values.length);
         this._length = len;
         this._values = this.shouldCopyValues() ? new Array(len) : this._values;
         var result = this._promise;
         var isResolved = false;
         var bitField = null;
         for (var i2 = 0; i2 < len; ++i2) {
-          var maybePromise = tryConvertToPromise(values2[i2], result);
+          var maybePromise = tryConvertToPromise(values[i2], result);
           if (maybePromise instanceof Promise2) {
             maybePromise = maybePromise._target();
             bitField = maybePromise._bitField;
@@ -37762,14 +37762,14 @@ var require_promise_array = __commonJS({
       PromiseArray.prototype._resultCancelled = function() {
         if (this._isResolved())
           return;
-        var values2 = this._values;
+        var values = this._values;
         this._cancel();
-        if (values2 instanceof Promise2) {
-          values2.cancel();
+        if (values instanceof Promise2) {
+          values.cancel();
         } else {
-          for (var i2 = 0; i2 < values2.length; ++i2) {
-            if (values2[i2] instanceof Promise2) {
-              values2[i2].cancel();
+          for (var i2 = 0; i2 < values.length; ++i2) {
+            if (values[i2] instanceof Promise2) {
+              values[i2].cancel();
             }
           }
         }
@@ -39956,13 +39956,13 @@ var require_map2 = __commonJS({
       MappingPromiseArray.prototype._init = function() {
       };
       MappingPromiseArray.prototype._promiseFulfilled = function(value2, index2) {
-        var values2 = this._values;
+        var values = this._values;
         var length = this.length();
         var preservedValues = this._preservedValues;
         var limit = this._limit;
         if (index2 < 0) {
           index2 = index2 * -1 - 1;
-          values2[index2] = value2;
+          values[index2] = value2;
           if (limit >= 1) {
             this._inFlight--;
             this._drainQueue();
@@ -39971,7 +39971,7 @@ var require_map2 = __commonJS({
           }
         } else {
           if (limit >= 1 && this._inFlight >= limit) {
-            values2[index2] = value2;
+            values[index2] = value2;
             this._queue.push(index2);
             return false;
           }
@@ -40001,7 +40001,7 @@ var require_map2 = __commonJS({
             if ((bitField & 50397184) === 0) {
               if (limit >= 1)
                 this._inFlight++;
-              values2[index2] = maybePromise;
+              values[index2] = maybePromise;
               maybePromise._proxy(this, (index2 + 1) * -1);
               return false;
             } else if ((bitField & 33554432) !== 0) {
@@ -40014,14 +40014,14 @@ var require_map2 = __commonJS({
               return true;
             }
           }
-          values2[index2] = ret2;
+          values[index2] = ret2;
         }
         var totalResolved = ++this._totalResolved;
         if (totalResolved >= length) {
           if (preservedValues !== null) {
-            this._filter(values2, preservedValues);
+            this._filter(values, preservedValues);
           } else {
-            this._resolve(values2);
+            this._resolve(values);
           }
           return true;
         }
@@ -40030,21 +40030,21 @@ var require_map2 = __commonJS({
       MappingPromiseArray.prototype._drainQueue = function() {
         var queue = this._queue;
         var limit = this._limit;
-        var values2 = this._values;
+        var values = this._values;
         while (queue.length > 0 && this._inFlight < limit) {
           if (this._isResolved())
             return;
           var index2 = queue.pop();
-          this._promiseFulfilled(values2[index2], index2);
+          this._promiseFulfilled(values[index2], index2);
         }
       };
-      MappingPromiseArray.prototype._filter = function(booleans, values2) {
-        var len = values2.length;
+      MappingPromiseArray.prototype._filter = function(booleans, values) {
+        var len = values.length;
         var ret2 = new Array(len);
         var j = 0;
         for (var i2 = 0; i2 < len; ++i2) {
           if (booleans[i2])
-            ret2[j++] = values2[i2];
+            ret2[j++] = values[i2];
         }
         ret2.length = j;
         this._resolve(ret2);
@@ -40642,21 +40642,21 @@ var require_reduce = __commonJS({
           this._initialValue.cancel();
         }
       };
-      ReductionPromiseArray.prototype._iterate = function(values2) {
-        this._values = values2;
+      ReductionPromiseArray.prototype._iterate = function(values) {
+        this._values = values;
         var value2;
         var i2;
-        var length = values2.length;
+        var length = values.length;
         if (this._initialValue !== void 0) {
           value2 = this._initialValue;
           i2 = 0;
         } else {
-          value2 = Promise2.resolve(values2[0]);
+          value2 = Promise2.resolve(values[0]);
           i2 = 1;
         }
         this._currentCancellable = value2;
         for (var j = i2; j < length; ++j) {
-          var maybePromise = values2[j];
+          var maybePromise = values[j];
           if (maybePromise instanceof Promise2) {
             maybePromise.suppressUnhandledRejections();
           }
@@ -40665,7 +40665,7 @@ var require_reduce = __commonJS({
           for (; i2 < length; ++i2) {
             var ctx = {
               accum: null,
-              value: values2[i2],
+              value: values[i2],
               index: i2,
               length,
               array: this
@@ -40752,8 +40752,8 @@ var require_settle = __commonJS({
     module2.exports = function(Promise2, PromiseArray, debug) {
       var PromiseInspection = Promise2.PromiseInspection;
       var util = require_util();
-      function SettledPromiseArray(values2) {
-        this.constructor$(values2);
+      function SettledPromiseArray(values) {
+        this.constructor$(values);
       }
       util.inherits(SettledPromiseArray, PromiseArray);
       SettledPromiseArray.prototype._promiseResolved = function(index2, inspection) {
@@ -40801,8 +40801,8 @@ var require_some = __commonJS({
       var AggregateError2 = require_errors2().AggregateError;
       var isArray3 = util.isArray;
       var CANCELLATION = {};
-      function SomePromiseArray(values2) {
-        this.constructor$(values2);
+      function SomePromiseArray(values) {
+        this.constructor$(values);
         this._howMany = 0;
         this._unwrap = false;
         this._initialized = false;
@@ -44469,11 +44469,11 @@ var require_SetCache = __commonJS({
     var MapCache = require_MapCache();
     var setCacheAdd = require_setCacheAdd();
     var setCacheHas = require_setCacheHas();
-    function SetCache(values2) {
-      var index2 = -1, length = values2 == null ? 0 : values2.length;
+    function SetCache(values) {
+      var index2 = -1, length = values == null ? 0 : values.length;
       this.__data__ = new MapCache();
       while (++index2 < length) {
-        this.add(values2[index2]);
+        this.add(values[index2]);
       }
     }
     SetCache.prototype.add = SetCache.prototype.push = setCacheAdd;
@@ -45488,28 +45488,99 @@ var require_partition = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_baseValues.js
-var require_baseValues = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_baseValues.js"(exports2, module2) {
-    var arrayMap = require_arrayMap();
-    function baseValues(object2, props) {
-      return arrayMap(props, function(key) {
-        return object2[key];
-      });
+// ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_arrayIncludesWith.js
+var require_arrayIncludesWith = __commonJS({
+  "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_arrayIncludesWith.js"(exports2, module2) {
+    function arrayIncludesWith(array, value2, comparator) {
+      var index2 = -1, length = array == null ? 0 : array.length;
+      while (++index2 < length) {
+        if (comparator(value2, array[index2])) {
+          return true;
+        }
+      }
+      return false;
     }
-    module2.exports = baseValues;
+    module2.exports = arrayIncludesWith;
   }
 });
 
-// ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/values.js
-var require_values = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/values.js"(exports2, module2) {
-    var baseValues = require_baseValues();
-    var keys = require_keys();
-    function values2(object2) {
-      return object2 == null ? [] : baseValues(object2, keys(object2));
+// ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_createSet.js
+var require_createSet = __commonJS({
+  "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_createSet.js"(exports2, module2) {
+    var Set2 = require_Set();
+    var noop = require_noop();
+    var setToArray = require_setToArray();
+    var INFINITY = 1 / 0;
+    var createSet = !(Set2 && 1 / setToArray(new Set2([, -0]))[1] == INFINITY) ? noop : function(values) {
+      return new Set2(values);
+    };
+    module2.exports = createSet;
+  }
+});
+
+// ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_baseUniq.js
+var require_baseUniq = __commonJS({
+  "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_baseUniq.js"(exports2, module2) {
+    var SetCache = require_SetCache();
+    var arrayIncludes = require_arrayIncludes();
+    var arrayIncludesWith = require_arrayIncludesWith();
+    var cacheHas = require_cacheHas();
+    var createSet = require_createSet();
+    var setToArray = require_setToArray();
+    var LARGE_ARRAY_SIZE = 200;
+    function baseUniq(array, iteratee, comparator) {
+      var index2 = -1, includes = arrayIncludes, length = array.length, isCommon = true, result = [], seen = result;
+      if (comparator) {
+        isCommon = false;
+        includes = arrayIncludesWith;
+      } else if (length >= LARGE_ARRAY_SIZE) {
+        var set13 = iteratee ? null : createSet(array);
+        if (set13) {
+          return setToArray(set13);
+        }
+        isCommon = false;
+        includes = cacheHas;
+        seen = new SetCache();
+      } else {
+        seen = iteratee ? [] : result;
+      }
+      outer:
+        while (++index2 < length) {
+          var value2 = array[index2], computed = iteratee ? iteratee(value2) : value2;
+          value2 = comparator || value2 !== 0 ? value2 : 0;
+          if (isCommon && computed === computed) {
+            var seenIndex = seen.length;
+            while (seenIndex--) {
+              if (seen[seenIndex] === computed) {
+                continue outer;
+              }
+            }
+            if (iteratee) {
+              seen.push(computed);
+            }
+            result.push(value2);
+          } else if (!includes(seen, computed, comparator)) {
+            if (seen !== result) {
+              seen.push(computed);
+            }
+            result.push(value2);
+          }
+        }
+      return result;
     }
-    module2.exports = values2;
+    module2.exports = baseUniq;
+  }
+});
+
+// ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/uniqBy.js
+var require_uniqBy = __commonJS({
+  "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/uniqBy.js"(exports2, module2) {
+    var baseIteratee = require_baseIteratee();
+    var baseUniq = require_baseUniq();
+    function uniqBy4(array, iteratee) {
+      return array && array.length ? baseUniq(array, baseIteratee(iteratee, 2)) : [];
+    }
+    module2.exports = uniqBy4;
   }
 });
 
@@ -53986,8 +54057,8 @@ var require_async3 = __commonJS({
       var concat = doLimit(concatLimit, Infinity);
       var concatSeries = doLimit(concatLimit, 1);
       var constant = function() {
-        var values2 = slice(arguments);
-        var args = [null].concat(values2);
+        var values = slice(arguments);
+        var args = [null].concat(values);
         return function() {
           var callback = arguments[arguments.length - 1];
           return callback.apply(this, args);
@@ -57385,13 +57456,13 @@ var require_parser = __commonJS({
         this.expectKeyword("enum");
         const name = this.parseName();
         const directives = this.parseConstDirectives();
-        const values2 = this.parseEnumValuesDefinition();
+        const values = this.parseEnumValuesDefinition();
         return this.node(start, {
           kind: _kinds.Kind.ENUM_TYPE_DEFINITION,
           description,
           name,
           directives,
-          values: values2
+          values
         });
       }
       /**
@@ -57630,15 +57701,15 @@ var require_parser = __commonJS({
         this.expectKeyword("enum");
         const name = this.parseName();
         const directives = this.parseConstDirectives();
-        const values2 = this.parseEnumValuesDefinition();
-        if (directives.length === 0 && values2.length === 0) {
+        const values = this.parseEnumValuesDefinition();
+        if (directives.length === 0 && values.length === 0) {
           throw this.unexpected();
         }
         return this.node(start, {
           kind: _kinds.Kind.ENUM_TYPE_EXTENSION,
           name,
           directives,
-          values: values2
+          values
         });
       }
       /**
@@ -58681,7 +58752,7 @@ var require_printer = __commonJS({
         leave: ({ value: value2 }) => value2
       },
       ListValue: {
-        leave: ({ values: values2 }) => "[" + join4(values2, ", ") + "]"
+        leave: ({ values }) => "[" + join4(values, ", ") + "]"
       },
       ObjectValue: {
         leave: ({ fields }) => "{" + join4(fields, ", ") + "}"
@@ -58753,7 +58824,7 @@ var require_printer = __commonJS({
         )
       },
       EnumTypeDefinition: {
-        leave: ({ description, name, directives, values: values2 }) => wrap2("", description, "\n") + join4(["enum", name, join4(directives, " "), block2(values2)], " ")
+        leave: ({ description, name, directives, values }) => wrap2("", description, "\n") + join4(["enum", name, join4(directives, " "), block2(values)], " ")
       },
       EnumValueDefinition: {
         leave: ({ description, name, directives }) => wrap2("", description, "\n") + join4([name, join4(directives, " ")], " ")
@@ -58809,7 +58880,7 @@ var require_printer = __commonJS({
         )
       },
       EnumTypeExtension: {
-        leave: ({ name, directives, values: values2 }) => join4(["extend enum", name, join4(directives, " "), block2(values2)], " ")
+        leave: ({ name, directives, values }) => join4(["extend enum", name, join4(directives, " "), block2(values)], " ")
       },
       InputObjectTypeExtension: {
         leave: ({ name, directives, fields }) => join4(["extend input", name, join4(directives, " "), block2(fields)], " ")
@@ -59614,7 +59685,7 @@ var require_definition = __commonJS({
         return enumValue.value;
       }
       toConfig() {
-        const values2 = (0, _keyValMap.keyValMap)(
+        const values = (0, _keyValMap.keyValMap)(
           this.getValues(),
           (value2) => value2.name,
           (value2) => ({
@@ -59628,7 +59699,7 @@ var require_definition = __commonJS({
         return {
           name: this.name,
           description: this.description,
-          values: values2,
+          values,
           extensions: this.extensions,
           astNode: this.astNode,
           extensionASTNodes: this.extensionASTNodes
@@ -60672,8 +60743,8 @@ var require_introspection = __commonJS({
           },
           resolve(type, { includeDeprecated }) {
             if ((0, _definition.isEnumType)(type)) {
-              const values2 = type.getValues();
-              return includeDeprecated ? values2 : values2.filter((field) => field.deprecationReason == null);
+              const values = type.getValues();
+              return includeDeprecated ? values : values.filter((field) => field.deprecationReason == null);
             }
           }
         },
@@ -60689,8 +60760,8 @@ var require_introspection = __commonJS({
           },
           resolve(type, { includeDeprecated }) {
             if ((0, _definition.isInputObjectType)(type)) {
-              const values2 = Object.values(type.getFields());
-              return includeDeprecated ? values2 : values2.filter((field) => field.deprecationReason == null);
+              const values = Object.values(type.getFields());
+              return includeDeprecated ? values : values.filter((field) => field.deprecationReason == null);
             }
           }
         },
@@ -64077,7 +64148,7 @@ var require_valueFromAST = __commonJS({
 });
 
 // ../../node_modules/.pnpm/graphql@16.10.0_patch_hash=urcamzmv3g5r4lglgjucxsrxqm/node_modules/graphql/execution/values.js
-var require_values2 = __commonJS({
+var require_values = __commonJS({
   "../../node_modules/.pnpm/graphql@16.10.0_patch_hash=urcamzmv3g5r4lglgjucxsrxqm/node_modules/graphql/execution/values.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", {
@@ -64300,7 +64371,7 @@ var require_collectFields = __commonJS({
     var _definition = require_definition();
     var _directives = require_directives();
     var _typeFromAST = require_typeFromAST();
-    var _values = require_values2();
+    var _values = require_values();
     function collectFields(schema22, fragments, variableValues, runtimeType, selectionSet) {
       const fields = /* @__PURE__ */ new Map();
       collectFieldsImpl(
@@ -65871,9 +65942,9 @@ var require_promiseReduce = __commonJS({
     });
     exports2.promiseReduce = promiseReduce;
     var _isPromise = require_isPromise();
-    function promiseReduce(values2, callbackFn, initialValue) {
+    function promiseReduce(values, callbackFn, initialValue) {
       let accumulator = initialValue;
-      for (const value2 of values2) {
+      for (const value2 of values) {
         accumulator = (0, _isPromise.isPromise)(accumulator) ? accumulator.then((resolved) => callbackFn(resolved, value2)) : callbackFn(accumulator, value2);
       }
       return accumulator;
@@ -65965,7 +66036,7 @@ var require_execute = __commonJS({
     var _introspection = require_introspection();
     var _validate = require_validate();
     var _collectFields = require_collectFields();
-    var _values = require_values2();
+    var _values = require_values();
     var collectSubfields = (0, _memoize.memoize3)(
       (exeContext, returnType, fieldNodes) => (0, _collectFields.collectSubfields)(
         exeContext.schema,
@@ -67487,7 +67558,7 @@ var require_subscribe = __commonJS({
     var _collectFields = require_collectFields();
     var _execute = require_execute();
     var _mapAsyncIterator = require_mapAsyncIterator();
-    var _values = require_values2();
+    var _values = require_values();
     async function subscribe2(args) {
       arguments.length < 2 || (0, _devAssert.devAssert)(
         false,
@@ -67678,7 +67749,7 @@ var require_execution = __commonJS({
     var _Path = require_Path();
     var _execute = require_execute();
     var _subscribe = require_subscribe();
-    var _values = require_values2();
+    var _values = require_values();
   }
 });
 
@@ -68720,7 +68791,7 @@ var require_extendSchema = __commonJS({
     var _scalars = require_scalars();
     var _schema = require_schema2();
     var _validate = require_validate2();
-    var _values = require_values2();
+    var _values = require_values();
     var _valueFromAST = require_valueFromAST();
     function extendSchema2(schema22, documentAST, options2) {
       (0, _schema.assertSchema)(schema22);
@@ -69526,10 +69597,10 @@ ${operationTypes.join("\n")}
       return printDescription(type) + "union " + type.name + possibleTypes;
     }
     function printEnum(type) {
-      const values2 = type.getValues().map(
+      const values = type.getValues().map(
         (value2, i2) => printDescription(value2, "  ", !i2) + "  " + value2.name + printDeprecated(value2.deprecationReason)
       );
-      return printDescription(type) + `enum ${type.name}` + printBlock(values2);
+      return printDescription(type) + `enum ${type.name}` + printBlock(values);
     }
     function printInputObject(type) {
       const fields = Object.values(type.getFields()).map(
@@ -72506,22 +72577,6 @@ var require_query_string = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_arrayIncludesWith.js
-var require_arrayIncludesWith = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_arrayIncludesWith.js"(exports2, module2) {
-    function arrayIncludesWith(array, value2, comparator) {
-      var index2 = -1, length = array == null ? 0 : array.length;
-      while (++index2 < length) {
-        if (comparator(value2, array[index2])) {
-          return true;
-        }
-      }
-      return false;
-    }
-    module2.exports = arrayIncludesWith;
-  }
-});
-
 // ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_baseDifference.js
 var require_baseDifference = __commonJS({
   "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_baseDifference.js"(exports2, module2) {
@@ -72532,21 +72587,21 @@ var require_baseDifference = __commonJS({
     var baseUnary = require_baseUnary();
     var cacheHas = require_cacheHas();
     var LARGE_ARRAY_SIZE = 200;
-    function baseDifference(array, values2, iteratee, comparator) {
-      var index2 = -1, includes = arrayIncludes, isCommon = true, length = array.length, result = [], valuesLength = values2.length;
+    function baseDifference(array, values, iteratee, comparator) {
+      var index2 = -1, includes = arrayIncludes, isCommon = true, length = array.length, result = [], valuesLength = values.length;
       if (!length) {
         return result;
       }
       if (iteratee) {
-        values2 = arrayMap(values2, baseUnary(iteratee));
+        values = arrayMap(values, baseUnary(iteratee));
       }
       if (comparator) {
         includes = arrayIncludesWith;
         isCommon = false;
-      } else if (values2.length >= LARGE_ARRAY_SIZE) {
+      } else if (values.length >= LARGE_ARRAY_SIZE) {
         includes = cacheHas;
         isCommon = false;
-        values2 = new SetCache(values2);
+        values = new SetCache(values);
       }
       outer:
         while (++index2 < length) {
@@ -72555,12 +72610,12 @@ var require_baseDifference = __commonJS({
           if (isCommon && computed === computed) {
             var valuesIndex = valuesLength;
             while (valuesIndex--) {
-              if (values2[valuesIndex] === computed) {
+              if (values[valuesIndex] === computed) {
                 continue outer;
               }
             }
             result.push(value2);
-          } else if (!includes(values2, computed, comparator)) {
+          } else if (!includes(values, computed, comparator)) {
             result.push(value2);
           }
         }
@@ -72577,8 +72632,8 @@ var require_difference = __commonJS({
     var baseFlatten = require_baseFlatten();
     var baseRest = require_baseRest();
     var isArrayLikeObject = require_isArrayLikeObject();
-    var difference3 = baseRest(function(array, values2) {
-      return isArrayLikeObject(array) ? baseDifference(array, baseFlatten(values2, 1, isArrayLikeObject, true)) : [];
+    var difference3 = baseRest(function(array, values) {
+      return isArrayLikeObject(array) ? baseDifference(array, baseFlatten(values, 1, isArrayLikeObject, true)) : [];
     });
     module2.exports = difference3;
   }
@@ -72708,74 +72763,6 @@ var require_omit = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_createSet.js
-var require_createSet = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_createSet.js"(exports2, module2) {
-    var Set2 = require_Set();
-    var noop = require_noop();
-    var setToArray = require_setToArray();
-    var INFINITY = 1 / 0;
-    var createSet = !(Set2 && 1 / setToArray(new Set2([, -0]))[1] == INFINITY) ? noop : function(values2) {
-      return new Set2(values2);
-    };
-    module2.exports = createSet;
-  }
-});
-
-// ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_baseUniq.js
-var require_baseUniq = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_baseUniq.js"(exports2, module2) {
-    var SetCache = require_SetCache();
-    var arrayIncludes = require_arrayIncludes();
-    var arrayIncludesWith = require_arrayIncludesWith();
-    var cacheHas = require_cacheHas();
-    var createSet = require_createSet();
-    var setToArray = require_setToArray();
-    var LARGE_ARRAY_SIZE = 200;
-    function baseUniq(array, iteratee, comparator) {
-      var index2 = -1, includes = arrayIncludes, length = array.length, isCommon = true, result = [], seen = result;
-      if (comparator) {
-        isCommon = false;
-        includes = arrayIncludesWith;
-      } else if (length >= LARGE_ARRAY_SIZE) {
-        var set13 = iteratee ? null : createSet(array);
-        if (set13) {
-          return setToArray(set13);
-        }
-        isCommon = false;
-        includes = cacheHas;
-        seen = new SetCache();
-      } else {
-        seen = iteratee ? [] : result;
-      }
-      outer:
-        while (++index2 < length) {
-          var value2 = array[index2], computed = iteratee ? iteratee(value2) : value2;
-          value2 = comparator || value2 !== 0 ? value2 : 0;
-          if (isCommon && computed === computed) {
-            var seenIndex = seen.length;
-            while (seenIndex--) {
-              if (seen[seenIndex] === computed) {
-                continue outer;
-              }
-            }
-            if (iteratee) {
-              seen.push(computed);
-            }
-            result.push(value2);
-          } else if (!includes(seen, computed, comparator)) {
-            if (seen !== result) {
-              seen.push(computed);
-            }
-            result.push(value2);
-          }
-        }
-      return result;
-    }
-    module2.exports = baseUniq;
-  }
-});
-
 // ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/union.js
 var require_union = __commonJS({
   "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/union.js"(exports2, module2) {
@@ -82649,10 +82636,10 @@ var require_main = __commonJS({
        * @return {this} This for chaining.
        * @throws {*} If the setter of a global throws an exception it is propagated. And the remaining globals will not be written.
        */
-      setGlobals(values2) {
-        for (const name in values2) {
-          if (Object.prototype.hasOwnProperty.call(values2, name)) {
-            this._internal.Contextify.setGlobal(name, values2[name]);
+      setGlobals(values) {
+        for (const name in values) {
+          if (Object.prototype.hasOwnProperty.call(values, name)) {
+            this._internal.Contextify.setGlobal(name, values[name]);
           }
         }
         return this;
@@ -84764,13 +84751,13 @@ var require_moment = __commonJS({
         }
         return locales2[name];
       }
-      function getSetGlobalLocale(key, values2) {
+      function getSetGlobalLocale(key, values) {
         var data;
         if (key) {
-          if (isUndefined4(values2)) {
+          if (isUndefined4(values)) {
             data = getLocale(key);
           } else {
-            data = defineLocale(key, values2);
+            data = defineLocale(key, values);
           }
           if (data) {
             globalLocale = data;
@@ -98280,8 +98267,8 @@ var require_pusher = __commonJS({
               return offers;
             if (!EXT_LIST.test(header))
               throw new SyntaxError("Invalid Sec-WebSocket-Extensions header: " + header);
-            var values2 = header.match(EXT);
-            values2.forEach(function(value2) {
+            var values = header.match(EXT);
+            values.forEach(function(value2) {
               var params = value2.match(new RegExp(PARAM.source, "g")), name = params.shift(), offer = {};
               params.forEach(function(param) {
                 var args = param.match(PARAM), key = args[1], data;
@@ -98306,25 +98293,25 @@ var require_pusher = __commonJS({
             return offers;
           },
           serializeParams: function(name, params) {
-            var values2 = [];
+            var values = [];
             var print11 = function(key2, value2) {
               if (value2 instanceof Array) {
                 value2.forEach(function(v) {
                   print11(key2, v);
                 });
               } else if (value2 === true) {
-                values2.push(key2);
+                values.push(key2);
               } else if (typeof value2 === "number") {
-                values2.push(key2 + "=" + value2);
+                values.push(key2 + "=" + value2);
               } else if (NOTOKEN.test(value2)) {
-                values2.push(key2 + '="' + value2.replace(/"/g, '\\"') + '"');
+                values.push(key2 + '="' + value2.replace(/"/g, '\\"') + '"');
               } else {
-                values2.push(key2 + "=" + value2);
+                values.push(key2 + "=" + value2);
               }
             };
             for (var key in params)
               print11(key, params[key]);
-            return [name].concat(values2).join("; ");
+            return [name].concat(values).join("; ");
           }
         };
         var Offers = function() {
@@ -99213,12 +99200,12 @@ var require_pusher = __commonJS({
           });
           return keys2;
         }
-        function values2(object2) {
-          var values3 = [];
+        function values(object2) {
+          var values2 = [];
           objectApply(object2, function(value2) {
-            values3.push(value2);
+            values2.push(value2);
           });
-          return values3;
+          return values2;
         }
         function apply(array, f, context) {
           for (var i2 = 0; i2 < array.length; i2++) {
@@ -100921,7 +100908,7 @@ var require_pusher = __commonJS({
             return this.channels[name];
           };
           Channels.prototype.all = function() {
-            return values2(this.channels);
+            return values(this.channels);
           };
           Channels.prototype.find = function(name) {
             return this.channels[name];
@@ -106643,11 +106630,11 @@ var require_class_utils = __commonJS({
       }
       throw new TypeError("expected an array or object.");
     };
-    cu.hasAll = function hasAll(val, values2) {
-      values2 = cu.arrayify(values2);
-      var len = values2.length;
+    cu.hasAll = function hasAll(val, values) {
+      values = cu.arrayify(values);
+      var len = values.length;
       while (len--) {
-        if (!cu.has(val, values2[len])) {
+        if (!cu.has(val, values[len])) {
           return false;
         }
       }
@@ -120280,10 +120267,10 @@ var require_lodash3 = __commonJS({
         }
         return result;
       }
-      function arrayPush(array, values2) {
-        var index2 = -1, length = values2.length, offset = array.length;
+      function arrayPush(array, values) {
+        var index2 = -1, length = values.length, offset = array.length;
         while (++index2 < length) {
-          array[offset + index2] = values2[index2];
+          array[offset + index2] = values[index2];
         }
         return array;
       }
@@ -120849,11 +120836,11 @@ var require_lodash3 = __commonJS({
         MapCache.prototype.get = mapCacheGet;
         MapCache.prototype.has = mapCacheHas;
         MapCache.prototype.set = mapCacheSet;
-        function SetCache(values3) {
-          var index2 = -1, length = values3 == null ? 0 : values3.length;
+        function SetCache(values2) {
+          var index2 = -1, length = values2 == null ? 0 : values2.length;
           this.__data__ = new MapCache();
           while (++index2 < length) {
-            this.add(values3[index2]);
+            this.add(values2[index2]);
           }
         }
         function setCacheAdd(value2) {
@@ -121077,21 +121064,21 @@ var require_lodash3 = __commonJS({
             func.apply(undefined2, args);
           }, wait);
         }
-        function baseDifference(array, values3, iteratee2, comparator) {
-          var index2 = -1, includes2 = arrayIncludes, isCommon = true, length = array.length, result2 = [], valuesLength = values3.length;
+        function baseDifference(array, values2, iteratee2, comparator) {
+          var index2 = -1, includes2 = arrayIncludes, isCommon = true, length = array.length, result2 = [], valuesLength = values2.length;
           if (!length) {
             return result2;
           }
           if (iteratee2) {
-            values3 = arrayMap(values3, baseUnary(iteratee2));
+            values2 = arrayMap(values2, baseUnary(iteratee2));
           }
           if (comparator) {
             includes2 = arrayIncludesWith;
             isCommon = false;
-          } else if (values3.length >= LARGE_ARRAY_SIZE) {
+          } else if (values2.length >= LARGE_ARRAY_SIZE) {
             includes2 = cacheHas;
             isCommon = false;
-            values3 = new SetCache(values3);
+            values2 = new SetCache(values2);
           }
           outer:
             while (++index2 < length) {
@@ -121100,12 +121087,12 @@ var require_lodash3 = __commonJS({
               if (isCommon && computed === computed) {
                 var valuesIndex = valuesLength;
                 while (valuesIndex--) {
-                  if (values3[valuesIndex] === computed) {
+                  if (values2[valuesIndex] === computed) {
                     continue outer;
                   }
                 }
                 result2.push(value2);
-              } else if (!includes2(values3, computed, comparator)) {
+              } else if (!includes2(values2, computed, comparator)) {
                 result2.push(value2);
               }
             }
@@ -121536,16 +121523,16 @@ var require_lodash3 = __commonJS({
             return baseGet(object2, path16);
           };
         }
-        function basePullAll(array, values3, iteratee2, comparator) {
-          var indexOf2 = comparator ? baseIndexOfWith : baseIndexOf, index2 = -1, length = values3.length, seen = array;
-          if (array === values3) {
-            values3 = copyArray(values3);
+        function basePullAll(array, values2, iteratee2, comparator) {
+          var indexOf2 = comparator ? baseIndexOfWith : baseIndexOf, index2 = -1, length = values2.length, seen = array;
+          if (array === values2) {
+            values2 = copyArray(values2);
           }
           if (iteratee2) {
             seen = arrayMap(array, baseUnary(iteratee2));
           }
           while (++index2 < length) {
-            var fromIndex = 0, value2 = values3[index2], computed = iteratee2 ? iteratee2(value2) : value2;
+            var fromIndex = 0, value2 = values2[index2], computed = iteratee2 ? iteratee2(value2) : value2;
             while ((fromIndex = indexOf2(seen, computed, fromIndex, comparator)) > -1) {
               if (seen !== array) {
                 splice.call(seen, fromIndex, 1);
@@ -121601,10 +121588,10 @@ var require_lodash3 = __commonJS({
           return setToString(overRest(func, start, identity2), func + "");
         }
         function baseSample(collection) {
-          return arraySample(values2(collection));
+          return arraySample(values(collection));
         }
         function baseSampleSize(collection, n) {
-          var array = values2(collection);
+          var array = values(collection);
           return shuffleSelf(array, baseClamp(n, 0, array.length));
         }
         function baseSet(object2, path16, value2, customizer) {
@@ -121643,7 +121630,7 @@ var require_lodash3 = __commonJS({
           });
         };
         function baseShuffle(collection) {
-          return shuffleSelf(values2(collection));
+          return shuffleSelf(values(collection));
         }
         function baseSlice(array, start, end) {
           var index2 = -1, length = array.length;
@@ -121827,10 +121814,10 @@ var require_lodash3 = __commonJS({
           }
           return baseUniq(baseFlatten(result2, 1), iteratee2, comparator);
         }
-        function baseZipObject(props, values3, assignFunc) {
-          var index2 = -1, length = props.length, valsLength = values3.length, result2 = {};
+        function baseZipObject(props, values2, assignFunc) {
+          var index2 = -1, length = props.length, valsLength = values2.length, result2 = {};
           while (++index2 < length) {
-            var value2 = index2 < valsLength ? values3[index2] : undefined2;
+            var value2 = index2 < valsLength ? values2[index2] : undefined2;
             assignFunc(result2, props[index2], value2);
           }
           return result2;
@@ -122332,8 +122319,8 @@ var require_lodash3 = __commonJS({
             return func(number);
           };
         }
-        var createSet = !(Set2 && 1 / setToArray(new Set2([, -0]))[1] == INFINITY) ? noop : function(values3) {
-          return new Set2(values3);
+        var createSet = !(Set2 && 1 / setToArray(new Set2([, -0]))[1] == INFINITY) ? noop : function(values2) {
+          return new Set2(values2);
         };
         function createToPairs(keysFunc) {
           return function(object2) {
@@ -123024,22 +123011,22 @@ var require_lodash3 = __commonJS({
           }
           return arrayPush(isArray3(array) ? copyArray(array) : [array], baseFlatten(args, 1));
         }
-        var difference3 = baseRest(function(array, values3) {
-          return isArrayLikeObject(array) ? baseDifference(array, baseFlatten(values3, 1, isArrayLikeObject, true)) : [];
+        var difference3 = baseRest(function(array, values2) {
+          return isArrayLikeObject(array) ? baseDifference(array, baseFlatten(values2, 1, isArrayLikeObject, true)) : [];
         });
-        var differenceBy = baseRest(function(array, values3) {
-          var iteratee2 = last4(values3);
+        var differenceBy = baseRest(function(array, values2) {
+          var iteratee2 = last4(values2);
           if (isArrayLikeObject(iteratee2)) {
             iteratee2 = undefined2;
           }
-          return isArrayLikeObject(array) ? baseDifference(array, baseFlatten(values3, 1, isArrayLikeObject, true), getIteratee(iteratee2, 2)) : [];
+          return isArrayLikeObject(array) ? baseDifference(array, baseFlatten(values2, 1, isArrayLikeObject, true), getIteratee(iteratee2, 2)) : [];
         });
-        var differenceWith = baseRest(function(array, values3) {
-          var comparator = last4(values3);
+        var differenceWith = baseRest(function(array, values2) {
+          var comparator = last4(values2);
           if (isArrayLikeObject(comparator)) {
             comparator = undefined2;
           }
-          return isArrayLikeObject(array) ? baseDifference(array, baseFlatten(values3, 1, isArrayLikeObject, true), undefined2, comparator) : [];
+          return isArrayLikeObject(array) ? baseDifference(array, baseFlatten(values2, 1, isArrayLikeObject, true), undefined2, comparator) : [];
         });
         function drop(array, n, guard) {
           var length = array == null ? 0 : array.length;
@@ -123184,14 +123171,14 @@ var require_lodash3 = __commonJS({
           return array && array.length ? baseNth(array, toInteger2(n)) : undefined2;
         }
         var pull = baseRest(pullAll);
-        function pullAll(array, values3) {
-          return array && array.length && values3 && values3.length ? basePullAll(array, values3) : array;
+        function pullAll(array, values2) {
+          return array && array.length && values2 && values2.length ? basePullAll(array, values2) : array;
         }
-        function pullAllBy(array, values3, iteratee2) {
-          return array && array.length && values3 && values3.length ? basePullAll(array, values3, getIteratee(iteratee2, 2)) : array;
+        function pullAllBy(array, values2, iteratee2) {
+          return array && array.length && values2 && values2.length ? basePullAll(array, values2, getIteratee(iteratee2, 2)) : array;
         }
-        function pullAllWith(array, values3, comparator) {
-          return array && array.length && values3 && values3.length ? basePullAll(array, values3, undefined2, comparator) : array;
+        function pullAllWith(array, values2, comparator) {
+          return array && array.length && values2 && values2.length ? basePullAll(array, values2, undefined2, comparator) : array;
         }
         var pullAt = flatRest(function(array, indexes) {
           var length = array == null ? 0 : array.length, result2 = baseAt(array, indexes);
@@ -123316,7 +123303,7 @@ var require_lodash3 = __commonJS({
         function uniq5(array) {
           return array && array.length ? baseUniq(array) : [];
         }
-        function uniqBy3(array, iteratee2) {
+        function uniqBy4(array, iteratee2) {
           return array && array.length ? baseUniq(array, getIteratee(iteratee2, 2)) : [];
         }
         function uniqWith(array, comparator) {
@@ -123350,8 +123337,8 @@ var require_lodash3 = __commonJS({
             return apply(iteratee2, undefined2, group);
           });
         }
-        var without = baseRest(function(array, values3) {
-          return isArrayLikeObject(array) ? baseDifference(array, values3) : [];
+        var without = baseRest(function(array, values2) {
+          return isArrayLikeObject(array) ? baseDifference(array, values2) : [];
         });
         var xor = baseRest(function(arrays) {
           return baseXor(arrayFilter2(arrays, isArrayLikeObject));
@@ -123369,11 +123356,11 @@ var require_lodash3 = __commonJS({
           return baseXor(arrayFilter2(arrays, isArrayLikeObject), undefined2, comparator);
         });
         var zip = baseRest(unzip);
-        function zipObject(props, values3) {
-          return baseZipObject(props || [], values3 || [], assignValue);
+        function zipObject(props, values2) {
+          return baseZipObject(props || [], values2 || [], assignValue);
         }
-        function zipObjectDeep(props, values3) {
-          return baseZipObject(props || [], values3 || [], baseSet);
+        function zipObjectDeep(props, values2) {
+          return baseZipObject(props || [], values2 || [], baseSet);
         }
         var zipWith = baseRest(function(arrays) {
           var length = arrays.length, iteratee2 = length > 1 ? arrays[length - 1] : undefined2;
@@ -123511,7 +123498,7 @@ var require_lodash3 = __commonJS({
           }
         });
         function includes(collection, value2, fromIndex, guard) {
-          collection = isArrayLike(collection) ? collection : values2(collection);
+          collection = isArrayLike(collection) ? collection : values(collection);
           fromIndex = fromIndex && !guard ? toInteger2(fromIndex) : 0;
           var length = collection.length;
           if (fromIndex < 0) {
@@ -124050,7 +124037,7 @@ var require_lodash3 = __commonJS({
           if (symIterator && value2[symIterator]) {
             return iteratorToArray(value2[symIterator]());
           }
-          var tag3 = getTag(value2), func = tag3 == mapTag ? mapToArray : tag3 == setTag ? setToArray : values2;
+          var tag3 = getTag(value2), func = tag3 == mapTag ? mapToArray : tag3 == setTag ? setToArray : values;
           return func(value2);
         }
         function toFinite(value2) {
@@ -124322,7 +124309,7 @@ var require_lodash3 = __commonJS({
           customizer = typeof customizer == "function" ? customizer : undefined2;
           return object2 == null ? object2 : baseUpdate(object2, path16, castFunction(updater), customizer);
         }
-        function values2(object2) {
+        function values(object2) {
           return object2 == null ? [] : baseValues(object2, keys(object2));
         }
         function valuesIn(object2) {
@@ -124976,14 +124963,14 @@ var require_lodash3 = __commonJS({
         lodash.unionBy = unionBy;
         lodash.unionWith = unionWith;
         lodash.uniq = uniq5;
-        lodash.uniqBy = uniqBy3;
+        lodash.uniqBy = uniqBy4;
         lodash.uniqWith = uniqWith;
         lodash.unset = unset7;
         lodash.unzip = unzip;
         lodash.unzipWith = unzipWith;
         lodash.update = update;
         lodash.updateWith = updateWith;
-        lodash.values = values2;
+        lodash.values = values;
         lodash.valuesIn = valuesIn;
         lodash.without = without;
         lodash.words = words;
@@ -141338,21 +141325,21 @@ var require_reader = __commonJS({
       var b2 = this.readString(tag3, true);
       if (b2 === null)
         return null;
-      var values2 = [];
+      var values = [];
       var value2 = 0;
       for (var i2 = 0; i2 < b2.length; i2++) {
         var byte = b2[i2] & 255;
         value2 <<= 7;
         value2 += byte & 127;
         if ((byte & 128) === 0) {
-          values2.push(value2);
+          values.push(value2);
           value2 = 0;
         }
       }
-      value2 = values2.shift();
-      values2.unshift(value2 % 40);
-      values2.unshift(value2 / 40 >> 0);
-      return values2.join(".");
+      value2 = values.shift();
+      values.unshift(value2 % 40);
+      values.unshift(value2 / 40 >> 0);
+      return values.join(".");
     };
     Reader.prototype._readTag = function(tag3) {
       assert2.ok(tag3 !== void 0);
@@ -155538,12 +155525,12 @@ var require_form_data = __commonJS({
         process.nextTick(cb.bind(this, null, knownLength));
         return;
       }
-      asynckit.parallel(this._valuesToMeasure, this._lengthRetriever, function(err, values2) {
+      asynckit.parallel(this._valuesToMeasure, this._lengthRetriever, function(err, values) {
         if (err) {
           cb(err);
           return;
         }
-        values2.forEach(function(length) {
+        values.forEach(function(length) {
           knownLength += length;
         });
         cb(null, knownLength);
@@ -155937,9 +155924,9 @@ var require_stringify3 = __commonJS({
         }
         return [formatter(prefix) + "=" + formatter(String(obj2))];
       }
-      var values2 = [];
+      var values = [];
       if (typeof obj2 === "undefined") {
-        return values2;
+        return values;
       }
       var objKeys;
       if (Array.isArray(filter)) {
@@ -155954,7 +155941,7 @@ var require_stringify3 = __commonJS({
           continue;
         }
         if (Array.isArray(obj2)) {
-          values2 = values2.concat(stringify2(
+          values = values.concat(stringify2(
             obj2[key],
             generateArrayPrefix(prefix, key),
             generateArrayPrefix,
@@ -155969,7 +155956,7 @@ var require_stringify3 = __commonJS({
             encodeValuesOnly
           ));
         } else {
-          values2 = values2.concat(stringify2(
+          values = values.concat(stringify2(
             obj2[key],
             prefix + (allowDots ? "." + key : "[" + key + "]"),
             generateArrayPrefix,
@@ -155985,7 +155972,7 @@ var require_stringify3 = __commonJS({
           ));
         }
       }
-      return values2;
+      return values;
     };
     module2.exports = function(object2, opts) {
       var obj2 = object2;
@@ -172194,22 +172181,22 @@ var require_combineLatest = __commonJS({
         }
       };
       CombineLatestSubscriber2.prototype.notifyNext = function(_outerValue, innerValue, outerIndex) {
-        var values2 = this.values;
-        var oldVal = values2[outerIndex];
+        var values = this.values;
+        var oldVal = values[outerIndex];
         var toRespond = !this.toRespond ? 0 : oldVal === NONE ? --this.toRespond : this.toRespond;
-        values2[outerIndex] = innerValue;
+        values[outerIndex] = innerValue;
         if (toRespond === 0) {
           if (this.resultSelector) {
-            this._tryResultSelector(values2);
+            this._tryResultSelector(values);
           } else {
-            this.destination.next(values2.slice());
+            this.destination.next(values.slice());
           }
         }
       };
-      CombineLatestSubscriber2.prototype._tryResultSelector = function(values2) {
+      CombineLatestSubscriber2.prototype._tryResultSelector = function(values) {
         var result;
         try {
-          result = this.resultSelector.apply(this, values2);
+          result = this.resultSelector.apply(this, values);
         } catch (err) {
           this.destination.error(err);
           return;
@@ -172792,7 +172779,7 @@ var require_forkJoin = __commonJS({
           subscriber.complete();
           return;
         }
-        var values2 = new Array(len);
+        var values = new Array(len);
         var completed = 0;
         var emitted = 0;
         var _loop_1 = function(i3) {
@@ -172804,7 +172791,7 @@ var require_forkJoin = __commonJS({
                 hasValue = true;
                 emitted++;
               }
-              values2[i3] = value2;
+              values[i3] = value2;
             },
             error: function(err) {
               return subscriber.error(err);
@@ -172814,8 +172801,8 @@ var require_forkJoin = __commonJS({
               if (completed === len || !hasValue) {
                 if (emitted === len) {
                   subscriber.next(keys ? keys.reduce(function(result, key, i4) {
-                    return result[key] = values2[i4], result;
-                  }, {}) : values2);
+                    return result[key] = values[i4], result;
+                  }, {}) : values);
                 }
                 subscriber.complete();
               }
@@ -173668,9 +173655,9 @@ var require_zip2 = __commonJS({
     exports2.ZipOperator = ZipOperator;
     var ZipSubscriber = function(_super) {
       __extends2(ZipSubscriber2, _super);
-      function ZipSubscriber2(destination, resultSelector, values2) {
-        if (values2 === void 0) {
-          values2 = /* @__PURE__ */ Object.create(null);
+      function ZipSubscriber2(destination, resultSelector, values) {
+        if (values === void 0) {
+          values = /* @__PURE__ */ Object.create(null);
         }
         var _this = _super.call(this, destination) || this;
         _this.resultSelector = resultSelector;
@@ -175583,9 +175570,9 @@ var require_distinct = __commonJS({
         this._finalizeNext(key, value2);
       };
       DistinctSubscriber2.prototype._finalizeNext = function(key, value2) {
-        var values2 = this.values;
-        if (!values2.has(key)) {
-          values2.add(key);
+        var values = this.values;
+        if (!values.has(key)) {
+          values.add(key);
           this.destination.next(value2);
         }
       };
@@ -192279,24 +192266,24 @@ var require_scope = __commonJS({
           return;
         return vs.get(keyOrRef);
       }
-      scopeRefs(scopeName, values2 = this._values) {
-        return this._reduceValues(values2, (name) => {
+      scopeRefs(scopeName, values = this._values) {
+        return this._reduceValues(values, (name) => {
           if (name.scopePath === void 0)
             throw new Error(`CodeGen: name "${name}" has no value`);
           return (0, code_1._)`${scopeName}${name.scopePath}`;
         });
       }
-      scopeCode(values2 = this._values, usedValues, getCode) {
-        return this._reduceValues(values2, (name) => {
+      scopeCode(values = this._values, usedValues, getCode) {
+        return this._reduceValues(values, (name) => {
           if (name.value === void 0)
             throw new Error(`CodeGen: name "${name}" has no value`);
           return name.value.code;
         }, usedValues, getCode);
       }
-      _reduceValues(values2, valueCode, usedValues = {}, getCode) {
+      _reduceValues(values, valueCode, usedValues = {}, getCode) {
         let code2 = code_1.nil;
-        for (const prefix in values2) {
-          const vs = values2[prefix];
+        for (const prefix in values) {
+          const vs = values[prefix];
           if (!vs)
             continue;
           const nameSet = usedValues[prefix] = usedValues[prefix] || /* @__PURE__ */ new Map();
@@ -198453,18 +198440,6 @@ var require_size = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/uniqBy.js
-var require_uniqBy = __commonJS({
-  "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/uniqBy.js"(exports2, module2) {
-    var baseIteratee = require_baseIteratee();
-    var baseUniq = require_baseUniq();
-    function uniqBy3(array, iteratee) {
-      return array && array.length ? baseUniq(array, baseIteratee(iteratee, 2)) : [];
-    }
-    module2.exports = uniqBy3;
-  }
-});
-
 // ../../node_modules/.pnpm/clean-stack@2.2.0/node_modules/clean-stack/index.js
 var require_clean_stack = __commonJS({
   "../../node_modules/.pnpm/clean-stack@2.2.0/node_modules/clean-stack/index.js"(exports2, module2) {
@@ -206930,7 +206905,7 @@ var engines = {
 };
 var package_default = {
   name: "@takeshape/cli",
-  version: "11.124.6",
+  version: "11.125.0",
   description: "TakeShape CLI",
   homepage: "https://www.takeshape.io",
   repository: {
@@ -207861,7 +207836,7 @@ var import_bluebird2 = __toESM(require_bluebird(), 1);
 var import_compose = __toESM(require_compose(), 1);
 var import_flatten2 = __toESM(require_flatten2(), 1);
 var import_partition = __toESM(require_partition(), 1);
-var import_values = __toESM(require_values(), 1);
+var import_uniqBy = __toESM(require_uniqBy(), 1);
 var import_pumpify = __toESM(require_pumpify(), 1);
 
 // ../ssg/dist/compress-html.js
@@ -214215,22 +214190,31 @@ function renderTemplates(generateContext) {
     const routeContext = await resolveRouteContext(generateContext, route2);
     const context = combineContext(config.env, globalContext, route2, routeContext);
     const path16 = joinPath(pathPrefix, route2.path);
-    return renderTemplate(path16, route2.template, context);
+    const page = await renderTemplate(path16, route2.template, context);
+    return {
+      pages: [page],
+      order: route2._routeOrder
+    };
   });
 }
 function renderPaginatedTemplates(generateContext) {
   const render3 = renderPaginatedTemplate(generateContext, getPaginatedData);
   return async (routes) => {
     const { config, globalContext } = generateContext;
-    const pages = await import_bluebird2.default.map(routes, async (route2) => {
+    return import_bluebird2.default.map(routes, async (route2) => {
       const routeContext = await resolveRouteContext(generateContext, route2);
-      return render3(route2, combineContext(config.env, globalContext, route2, routeContext));
+      const renderedPages = await render3(route2, combineContext(config.env, globalContext, route2, routeContext));
+      return {
+        pages: renderedPages,
+        order: route2._routeOrder
+      };
     });
-    return (0, import_flatten2.default)(pages);
   };
 }
 async function generatePages(config, generateContext) {
-  const [paginatedRoutes, singleRoutes] = (0, import_partition.default)((0, import_values.default)(config.routes), "paginate");
+  const routeEntries = Object.entries(config.routes);
+  const routesWithOrder = routeEntries.map(([, route2], index2) => ({ ...route2, _routeOrder: index2 }));
+  const [paginatedRouteConfigs, singleRouteConfigs] = (0, import_partition.default)(routesWithOrder, "paginate");
   const renderContext = {
     ...generateContext,
     globalContext: {
@@ -214244,9 +214228,12 @@ async function generatePages(config, generateContext) {
       locale: config.locale
     }
   };
-  const singlePages = await renderTemplates(renderContext)(singleRoutes);
-  const paginatedPages = await renderPaginatedTemplates(renderContext)(paginatedRoutes);
-  return singlePages.concat(paginatedPages);
+  const singleRoutes = await renderTemplates(renderContext)(singleRouteConfigs);
+  const paginatedRoutes = await renderPaginatedTemplates(renderContext)(paginatedRouteConfigs);
+  const allRoutes = singleRoutes.concat(paginatedRoutes);
+  const sortedRoutes = allRoutes.sort((a3, b2) => a3.order - b2.order);
+  const allPages = sortedRoutes.flatMap((route2) => route2.pages);
+  return (0, import_uniqBy.default)(allPages, "path");
 }
 var identity = (obj2) => obj2;
 function getRenderTemplateDecorator(config) {
@@ -401971,7 +401958,7 @@ var import_isUndefined3 = __toESM(require_isUndefined(), 1);
 var import_last3 = __toESM(require_last(), 1);
 var import_pick4 = __toESM(require_pick(), 1);
 var import_size = __toESM(require_size(), 1);
-var import_uniqBy = __toESM(require_uniqBy(), 1);
+var import_uniqBy2 = __toESM(require_uniqBy(), 1);
 var import_p_map = __toESM(require_p_map(), 1);
 var import_coerce2 = __toESM(require_coerce(), 1);
 var import_gte2 = __toESM(require_gte(), 1);
@@ -404625,7 +404612,7 @@ function validateOneOfs(projectSchema) {
         message: "Invalid oneOf must contain only @ref or title + enum/const schemas"
       });
     }
-    if (isUnion && schema22.oneOf.length !== (0, import_uniqBy.default)(schema22.oneOf, (refSchema) => getRefShapeName(projectSchema, refSchema)).length) {
+    if (isUnion && schema22.oneOf.length !== (0, import_uniqBy2.default)(schema22.oneOf, (refSchema) => getRefShapeName(projectSchema, refSchema)).length) {
       errors.push({
         type: "conflict",
         path: propertyPath.concat(oneOfPath),
@@ -405025,7 +405012,7 @@ var TemplateVerbs;
 // ../schema/dist/template-shapes/where.js
 var import_blueimp_md5 = __toESM(require_md5(), 1);
 var import_isFunction = __toESM(require_isFunction(), 1);
-var import_uniqBy2 = __toESM(require_uniqBy(), 1);
+var import_uniqBy3 = __toESM(require_uniqBy(), 1);
 var import_unset5 = __toESM(require_unset(), 1);
 var MAX_RELATIONSHIP_DEPTH = 1;
 var exceededRelationshipDepth = (depth = 0) => depth >= MAX_RELATIONSHIP_DEPTH;
@@ -405345,7 +405332,7 @@ function getReferencedShape(context) {
   };
 }
 function expandUnionShapes(projectSchema, shapes) {
-  return (0, import_uniqBy2.default)(shapes.flatMap((shape) => isUnionSchema(shape.schema) ? shape.schema.oneOf.map(getReferencedShape(projectSchema)).filter(isDefined) : shape), "name");
+  return (0, import_uniqBy3.default)(shapes.flatMap((shape) => isUnionSchema(shape.schema) ? shape.schema.oneOf.map(getReferencedShape(projectSchema)).filter(isDefined) : shape), "name");
 }
 function getWhereShape(projectSchema, selectedShapes) {
   const shapeName14 = selectedShapes.length === 1 ? `TSWhere${pascalCase(selectedShapes[0].name)}Input` : "TSWhereInput";
@@ -407202,7 +407189,7 @@ var printDocASTReducer = {
   BooleanValue: { leave: ({ value: value2 }) => value2 ? "true" : "false" },
   NullValue: { leave: () => "null" },
   EnumValue: { leave: ({ value: value2 }) => value2 },
-  ListValue: { leave: ({ values: values2 }) => "[" + join(values2, ", ") + "]" },
+  ListValue: { leave: ({ values }) => "[" + join(values, ", ") + "]" },
   ObjectValue: { leave: ({ fields }) => "{" + join(fields, ", ") + "}" },
   ObjectField: { leave: ({ name, value: value2 }) => name + ": " + value2 },
   // Directive
@@ -407251,7 +407238,7 @@ var printDocASTReducer = {
     leave: ({ name, directives, types }) => join(["union", name, join(directives, " "), wrap("= ", join(types, " | "))], " ")
   },
   EnumTypeDefinition: {
-    leave: ({ name, directives, values: values2 }) => join(["enum", name, join(directives, " "), block(values2)], " ")
+    leave: ({ name, directives, values }) => join(["enum", name, join(directives, " "), block(values)], " ")
   },
   EnumValueDefinition: {
     leave: ({ name, directives }) => join([name, join(directives, " ")], " ")
@@ -407290,7 +407277,7 @@ var printDocASTReducer = {
     leave: ({ name, directives, types }) => join(["extend union", name, join(directives, " "), wrap("= ", join(types, " | "))], " ")
   },
   EnumTypeExtension: {
-    leave: ({ name, directives, values: values2 }) => join(["extend enum", name, join(directives, " "), block(values2)], " ")
+    leave: ({ name, directives, values }) => join(["extend enum", name, join(directives, " "), block(values)], " ")
   },
   InputObjectTypeExtension: {
     leave: ({ name, directives, fields }) => join(["extend input", name, join(directives, " "), block(fields)], " ")
@@ -408112,16 +408099,16 @@ function correctASTNodes(type) {
   } else if ((0, import_graphql36.isEnumType)(type)) {
     const config = type.toConfig();
     if (config.astNode != null) {
-      const values2 = [];
+      const values = [];
       for (const enumKey in config.values) {
         const enumValueConfig = config.values[enumKey];
         if (enumValueConfig.astNode != null) {
-          values2.push(enumValueConfig.astNode);
+          values.push(enumValueConfig.astNode);
         }
       }
       config.astNode = {
         ...config.astNode,
-        values: values2
+        values
       };
     }
     if (config.extensionASTNodes != null) {
@@ -408269,8 +408256,8 @@ function getResolversFromSchema(schema22, includeDefaultMergedResolver) {
         }
       } else if ((0, import_graphql38.isEnumType)(type)) {
         resolvers[typeName] = {};
-        const values2 = type.getValues();
-        for (const value2 of values2) {
+        const values = type.getValues();
+        for (const value2 of values) {
           resolvers[typeName][value2.name] = value2.value;
         }
       } else if ((0, import_graphql38.isInterfaceType)(type)) {
@@ -408773,9 +408760,9 @@ function addResolversToSchema({ schema: schema22, resolvers: inputResolvers, def
         }
       }
     } else if ((0, import_graphql45.isEnumType)(type)) {
-      const values2 = type.getValues();
+      const values = type.getValues();
       for (const fieldName in resolverValue) {
-        if (!fieldName.startsWith("__") && !values2.some((value2) => value2.name === fieldName) && requireResolversToMatchSchema && requireResolversToMatchSchema !== "ignore") {
+        if (!fieldName.startsWith("__") && !values.some((value2) => value2.name === fieldName) && requireResolversToMatchSchema && requireResolversToMatchSchema !== "ignore") {
           const msg = `${type.name}.${fieldName} was defined in resolvers, but not present within ${type.name}`;
           if (requireResolversToMatchSchema === "error") {
             throw new Error(msg);
@@ -409825,10 +409812,10 @@ var import_graphql58 = __toESM(require_graphql2(), 1);
 function isObjectMap(obj2) {
   return obj2 && typeof obj2 === "object" && !Array.isArray(obj2);
 }
-function prioritize(...values2) {
-  const picked = values2.find((val) => typeof val === "boolean");
+function prioritize(...values) {
+  const picked = values.find((val) => typeof val === "boolean");
   if (typeof picked !== "boolean") {
-    return values2[values2.length - 1];
+    return values[values.length - 1];
   }
   return picked;
 }
@@ -410039,8 +410026,8 @@ function resolveCompareValue(a3) {
   }
   return 3;
 }
-function sortPrependValues(values2) {
-  return values2.sort((a3, b2) => {
+function sortPrependValues(values) {
+  return values.sort((a3, b2) => {
     const aV = resolveCompareValue(a3);
     const bV = resolveCompareValue(b2);
     if (aV < bV) {
@@ -411284,9 +411271,9 @@ var BaseTypesVisitor = class extends BaseVisitor {
     }
     return identifier;
   }
-  buildEnumValuesBlock(typeName, values2) {
+  buildEnumValuesBlock(typeName, values) {
     const schemaEnumType = this._schema ? this._schema.getType(typeName) : void 0;
-    return values2.map((enumOption) => {
+    return values.map((enumOption) => {
       const optionName = this.makeValidEnumIdentifier(this.convertName(enumOption, {
         useTypesPrefix: false,
         transformUnderscore: true