@takeshape/cli 11.122.2 → 11.124.0

package/dist/index.js

@@ -1471,7 +1471,7 @@ var require_camelcase_keys = __commonJS({
       x2.lastIndex = 0;
       return x2.test(key);
     });
-    var cache = new QuickLru({ maxSize: 1e5 });
+    var cache2 = new QuickLru({ maxSize: 1e5 });
     var isObject7 = (value2) => typeof value2 === "object" && value2 !== null && !(value2 instanceof RegExp) && !(value2 instanceof Error) && !(value2 instanceof Date);
     var camelCaseConvert = (input, options2) => {
       if (!isObject7(input)) {
@@ -1493,12 +1493,12 @@ var require_camelcase_keys = __commonJS({
         }
         if (!(exclude && has2(exclude, key))) {
           const cacheKey = pascalCase5 ? `${key}_` : key;
-          if (cache.has(cacheKey)) {
-            key = cache.get(cacheKey);
+          if (cache2.has(cacheKey)) {
+            key = cache2.get(cacheKey);
           } else {
             const ret2 = camelCase3(key, { pascalCase: pascalCase5 });
             if (key.length < 100) {
-              cache.set(cacheKey, ret2);
+              cache2.set(cacheKey, ret2);
             }
             key = ret2;
           }
@@ -5209,15 +5209,15 @@ var require_hosted_git_info = __commonJS({
       "http:": true,
       "git+http:": true
     };
-    var cache = {};
+    var cache2 = {};
     module2.exports.fromUrl = function(giturl, opts) {
       if (typeof giturl !== "string")
         return;
       var key = giturl + JSON.stringify(opts || {});
-      if (!(key in cache)) {
-        cache[key] = fromUrl(giturl, opts);
+      if (!(key in cache2)) {
+        cache2[key] = fromUrl(giturl, opts);
       }
-      return cache[key];
+      return cache2[key];
     };
     function fromUrl(giturl, opts) {
       if (giturl == null || giturl === "")
@@ -8107,7 +8107,7 @@ var require_range = __commonJS({
       parseRange(range) {
         const memoOpts = (this.options.includePrerelease && FLAG_INCLUDE_PRERELEASE) | (this.options.loose && FLAG_LOOSE);
         const memoKey = memoOpts + ":" + range;
-        const cached = cache.get(memoKey);
+        const cached = cache2.get(memoKey);
         if (cached) {
           return cached;
         }
@@ -8141,7 +8141,7 @@ var require_range = __commonJS({
           rangeMap.delete("");
         }
         const result = [...rangeMap.values()];
-        cache.set(memoKey, result);
+        cache2.set(memoKey, result);
         return result;
       }
       intersects(range, options2) {
@@ -8180,7 +8180,7 @@ var require_range = __commonJS({
     };
     module2.exports = Range;
     var LRU = require_lrucache();
-    var cache = new LRU();
+    var cache2 = new LRU();
     var parseOptions = require_parse_options();
     var Comparator = require_comparator();
     var debug = require_debug();
@@ -9982,7 +9982,7 @@ var require_hosted_git_info2 = __commonJS({
     var gitHosts = require_git_host_info2();
     var GitHost = module2.exports = require_git_host2();
     var LRU = require_lru_cache();
-    var cache = new LRU({ max: 1e3 });
+    var cache2 = new LRU({ max: 1e3 });
     var protocolToRepresentationMap = {
       "git+ssh:": "sshurl",
       "git+https:": "https",
@@ -10005,10 +10005,10 @@ var require_hosted_git_info2 = __commonJS({
         return;
       }
       const key = giturl + JSON.stringify(opts || {});
-      if (!cache.has(key)) {
-        cache.set(key, fromUrl(giturl, opts));
+      if (!cache2.has(key)) {
+        cache2.set(key, fromUrl(giturl, opts));
       }
-      return cache.get(key);
+      return cache2.get(key);
     };
     function fromUrl(giturl, opts) {
       if (!giturl) {
@@ -16663,33 +16663,33 @@ var require_ignore = __commonJS({
         };
       }
       // @returns {TestResult}
-      _test(originalPath, cache, checkUnignored, slices) {
+      _test(originalPath, cache2, checkUnignored, slices) {
         const path16 = originalPath && checkPath.convert(originalPath);
         checkPath(
           path16,
           originalPath,
           this._allowRelativePaths ? RETURN_FALSE : throwError
         );
-        return this._t(path16, cache, checkUnignored, slices);
+        return this._t(path16, cache2, checkUnignored, slices);
       }
-      _t(path16, cache, checkUnignored, slices) {
-        if (path16 in cache) {
-          return cache[path16];
+      _t(path16, cache2, checkUnignored, slices) {
+        if (path16 in cache2) {
+          return cache2[path16];
         }
         if (!slices) {
           slices = path16.split(SLASH);
         }
         slices.pop();
         if (!slices.length) {
-          return cache[path16] = this._testOne(path16, checkUnignored);
+          return cache2[path16] = this._testOne(path16, checkUnignored);
         }
         const parent = this._t(
           slices.join(SLASH) + SLASH,
-          cache,
+          cache2,
           checkUnignored,
           slices
         );
-        return cache[path16] = parent.ignored ? parent : this._testOne(path16, checkUnignored);
+        return cache2[path16] = parent.ignored ? parent : this._testOne(path16, checkUnignored);
       }
       ignores(path16) {
         return this._test(path16, this._ignoreCache, false).ignored;
@@ -27001,16 +27001,16 @@ var require_lodash = __commonJS({
       return this.__data__.has(key);
     }
     function stackSet(key, value2) {
-      var cache = this.__data__;
-      if (cache instanceof ListCache) {
-        var pairs = cache.__data__;
+      var cache2 = this.__data__;
+      if (cache2 instanceof ListCache) {
+        var pairs = cache2.__data__;
         if (!Map2 || pairs.length < LARGE_ARRAY_SIZE - 1) {
           pairs.push([key, value2]);
           return this;
         }
-        cache = this.__data__ = new MapCache(pairs);
+        cache2 = this.__data__ = new MapCache(pairs);
       }
-      cache.set(key, value2);
+      cache2.set(key, value2);
       return this;
     }
     Stack.prototype.clear = stackClear;
@@ -39611,20 +39611,20 @@ var require_call_get = __commonJS({
         var makeGetter = function(propertyName) {
           return new Function("obj", "                                             \n        'use strict';                                                        \n        return obj.propertyName;                                             \n        ".replace("propertyName", propertyName));
         };
-        var getCompiled = function(name, compiler, cache) {
-          var ret2 = cache[name];
+        var getCompiled = function(name, compiler, cache2) {
+          var ret2 = cache2[name];
           if (typeof ret2 !== "function") {
             if (!isIdentifier2(name)) {
               return null;
             }
             ret2 = compiler(name);
-            cache[name] = ret2;
-            cache[" size"]++;
-            if (cache[" size"] > 512) {
-              var keys = Object.keys(cache);
+            cache2[name] = ret2;
+            cache2[" size"]++;
+            if (cache2[" size"] > 512) {
+              var keys = Object.keys(cache2);
               for (var i2 = 0; i2 < 256; ++i2)
-                delete cache[keys[i2]];
-              cache[" size"] = keys.length - 256;
+                delete cache2[keys[i2]];
+              cache2[" size"] = keys.length - 256;
             }
           }
           return ret2;
@@ -44501,8 +44501,8 @@ var require_arraySome = __commonJS({
 // ../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_cacheHas.js
 var require_cacheHas = __commonJS({
   "../../node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_cacheHas.js"(exports2, module2) {
-    function cacheHas(cache, key) {
-      return cache.has(key);
+    function cacheHas(cache2, key) {
+      return cache2.has(key);
     }
     module2.exports = cacheHas;
   }
@@ -44923,12 +44923,12 @@ var require_memoize = __commonJS({
         throw new TypeError(FUNC_ERROR_TEXT);
       }
       var memoized = function() {
-        var args = arguments, key = resolver ? resolver.apply(this, args) : args[0], cache = memoized.cache;
-        if (cache.has(key)) {
-          return cache.get(key);
+        var args = arguments, key = resolver ? resolver.apply(this, args) : args[0], cache2 = memoized.cache;
+        if (cache2.has(key)) {
+          return cache2.get(key);
         }
         var result = func.apply(this, args);
-        memoized.cache = cache.set(key, result) || cache;
+        memoized.cache = cache2.set(key, result) || cache2;
         return result;
       };
       memoized.cache = new (memoize2.Cache || MapCache)();
@@ -44946,12 +44946,12 @@ var require_memoizeCapped = __commonJS({
     var MAX_MEMOIZE_SIZE = 500;
     function memoizeCapped(func) {
       var result = memoize2(func, function(key) {
-        if (cache.size === MAX_MEMOIZE_SIZE) {
-          cache.clear();
+        if (cache2.size === MAX_MEMOIZE_SIZE) {
+          cache2.clear();
         }
         return key;
       });
-      var cache = result.cache;
+      var cache2 = result.cache;
       return result;
     }
     module2.exports = memoizeCapped;
@@ -83161,8 +83161,8 @@ var require_baseIntersection = __commonJS({
           if (!(seen ? cacheHas(seen, computed) : includes(result, computed, comparator))) {
             othIndex = othLength;
             while (--othIndex) {
-              var cache = caches[othIndex];
-              if (!(cache ? cacheHas(cache, computed) : includes(arrays[othIndex], computed, comparator))) {
+              var cache2 = caches[othIndex];
+              if (!(cache2 ? cacheHas(cache2, computed) : includes(arrays[othIndex], computed, comparator))) {
                 continue outer;
               }
             }
@@ -88857,26 +88857,26 @@ var require_encode2 = __commonJS({
     "use strict";
     var encodeCache = {};
     function getEncodeCache(exclude) {
-      var i2, ch, cache = encodeCache[exclude];
-      if (cache) {
-        return cache;
+      var i2, ch, cache2 = encodeCache[exclude];
+      if (cache2) {
+        return cache2;
       }
-      cache = encodeCache[exclude] = [];
+      cache2 = encodeCache[exclude] = [];
       for (i2 = 0; i2 < 128; i2++) {
         ch = String.fromCharCode(i2);
         if (/^[0-9a-z]$/i.test(ch)) {
-          cache.push(ch);
+          cache2.push(ch);
         } else {
-          cache.push("%" + ("0" + i2.toString(16).toUpperCase()).slice(-2));
+          cache2.push("%" + ("0" + i2.toString(16).toUpperCase()).slice(-2));
         }
       }
       for (i2 = 0; i2 < exclude.length; i2++) {
-        cache[exclude.charCodeAt(i2)] = exclude[i2];
+        cache2[exclude.charCodeAt(i2)] = exclude[i2];
       }
-      return cache;
+      return cache2;
     }
     function encode2(string, exclude, keepEscaped) {
-      var i2, l, code2, nextCode, cache, result = "";
+      var i2, l, code2, nextCode, cache2, result = "";
       if (typeof exclude !== "string") {
         keepEscaped = exclude;
         exclude = encode2.defaultChars;
@@ -88884,7 +88884,7 @@ var require_encode2 = __commonJS({
       if (typeof keepEscaped === "undefined") {
         keepEscaped = true;
       }
-      cache = getEncodeCache(exclude);
+      cache2 = getEncodeCache(exclude);
       for (i2 = 0, l = string.length; i2 < l; i2++) {
         code2 = string.charCodeAt(i2);
         if (keepEscaped && code2 === 37 && i2 + 2 < l) {
@@ -88895,7 +88895,7 @@ var require_encode2 = __commonJS({
           }
         }
         if (code2 < 128) {
-          result += cache[code2];
+          result += cache2[code2];
           continue;
         }
         if (code2 >= 55296 && code2 <= 57343) {
@@ -103388,7 +103388,7 @@ var require_to_regex = __commonJS({
     var extend = require_extend_shallow();
     var not = require_regex_not();
     var MAX_LENGTH = 1024 * 64;
-    var cache = {};
+    var cache2 = {};
     module2.exports = function(patterns, options2) {
       if (!Array.isArray(patterns)) {
         return makeRe(patterns, options2);
@@ -103408,8 +103408,8 @@ var require_to_regex = __commonJS({
       var key = pattern;
       if (!options2 || options2 && options2.cache !== false) {
         key = createKey(pattern, options2);
-        if (cache.hasOwnProperty(key)) {
-          return cache[key];
+        if (cache2.hasOwnProperty(key)) {
+          return cache2[key];
         }
       }
       var opts = extend({}, options2);
@@ -103464,7 +103464,7 @@ var require_to_regex = __commonJS({
       define2(regex, "pattern", pattern);
       define2(regex, "options", options2);
       define2(regex, "key", key);
-      cache[key] = regex;
+      cache2[key] = regex;
     }
     function createKey(pattern, options2) {
       if (!options2)
@@ -103852,7 +103852,7 @@ var require_repeat_string = __commonJS({
   "../../node_modules/.pnpm/repeat-string@1.6.1/node_modules/repeat-string/index.js"(exports2, module2) {
     "use strict";
     var res = "";
-    var cache;
+    var cache2;
     module2.exports = repeat;
     function repeat(str, num) {
       if (typeof str !== "string") {
@@ -103863,8 +103863,8 @@ var require_repeat_string = __commonJS({
       if (num === 2)
         return str + str;
       var max = str.length * num;
-      if (cache !== str || typeof cache === "undefined") {
-        cache = str;
+      if (cache2 !== str || typeof cache2 === "undefined") {
+        cache2 = str;
         res = "";
       } else if (res.length >= max) {
         return res.substr(0, max);
@@ -103889,7 +103889,7 @@ var require_to_regex_range = __commonJS({
     "use strict";
     var repeat = require_repeat_string();
     var isNumber = require_is_number();
-    var cache = {};
+    var cache2 = {};
     function toRegexRange(min, max, options2) {
       if (isNumber(min) === false) {
         throw new RangeError("toRegexRange: first argument is invalid.");
@@ -103905,8 +103905,8 @@ var require_to_regex_range = __commonJS({
       var shorthand = String(options2.shorthand);
       var capture = String(options2.capture);
       var key = min + ":" + max + "=" + relax + shorthand + capture;
-      if (cache.hasOwnProperty(key)) {
-        return cache[key].result;
+      if (cache2.hasOwnProperty(key)) {
+        return cache2[key].result;
       }
       var a3 = Math.min(min, max);
       var b2 = Math.max(min, max);
@@ -103940,7 +103940,7 @@ var require_to_regex_range = __commonJS({
       if (options2.capture && positives.length + negatives.length > 1) {
         tok.result = "(" + tok.result + ")";
       }
-      cache[key] = tok;
+      cache2[key] = tok;
       return tok.result;
     }
     function siftPatterns(neg, pos, options2) {
@@ -106068,12 +106068,12 @@ var require_cache_base = __commonJS({
     var has2 = require_has_value2();
     var set13 = require_set_value();
     function namespace(prop) {
-      function Cache(cache) {
+      function Cache(cache2) {
         if (prop) {
           this[prop] = {};
         }
-        if (cache) {
-          this.set(cache);
+        if (cache2) {
+          this.set(cache2);
         }
       }
       Emitter(Cache.prototype);
@@ -110310,13 +110310,13 @@ var require_braces2 = __commonJS({
     var Braces = require_braces();
     var utils = require_utils4();
     var MAX_LENGTH = 1024 * 64;
-    var cache = {};
+    var cache2 = {};
     function braces(pattern, options2) {
       var key = utils.createKey(String(pattern), options2);
       var arr = [];
       var disabled = options2 && options2.cache === false;
-      if (!disabled && cache.hasOwnProperty(key)) {
-        return cache[key];
+      if (!disabled && cache2.hasOwnProperty(key)) {
+        return cache2[key];
       }
       if (Array.isArray(pattern)) {
         for (var i2 = 0; i2 < pattern.length; i2++) {
@@ -110329,7 +110329,7 @@ var require_braces2 = __commonJS({
         arr = unique2(arr);
       }
       if (!disabled) {
-        cache[key] = arr;
+        cache2[key] = arr;
       }
       return arr;
     }
@@ -110398,7 +110398,7 @@ var require_braces2 = __commonJS({
       return proto2.compile(ast, options2);
     };
     braces.clearCache = function() {
-      cache = braces.cache = {};
+      cache2 = braces.cache = {};
     };
     function memoize2(type, pattern, options2, fn) {
       var key = utils.createKey(type + ":" + pattern, options2);
@@ -110407,17 +110407,17 @@ var require_braces2 = __commonJS({
         braces.clearCache();
         return fn(pattern, options2);
       }
-      if (cache.hasOwnProperty(key)) {
-        return cache[key];
+      if (cache2.hasOwnProperty(key)) {
+        return cache2[key];
       }
       var res = fn(pattern, options2);
-      cache[key] = res;
+      cache2[key] = res;
       return res;
     }
     braces.Braces = Braces;
     braces.compilers = compilers;
     braces.parsers = parsers;
-    braces.cache = cache;
+    braces.cache = cache2;
     module2.exports = braces;
   }
 });
@@ -110937,9 +110937,9 @@ var require_fragment_cache = __commonJS({
        * @api public
        */
       set: function(cacheName, key, val) {
-        var cache = this.cache(cacheName);
-        cache.set(key, val);
-        return cache;
+        var cache2 = this.cache(cacheName);
+        cache2.set(key, val);
+        return cache2;
       },
       /**
        * Returns true if a non-undefined value is set for `key` on fragment cache `name`.
@@ -110981,11 +110981,11 @@ var require_fragment_cache = __commonJS({
        * @api public
        */
       get: function(name, key) {
-        var cache = this.cache(name);
+        var cache2 = this.cache(name);
         if (typeof key === "string") {
-          return cache.get(key);
+          return cache2.get(key);
         }
-        return cache;
+        return cache2;
       }
     };
     exports2 = module2.exports = FragmentCache;
@@ -111288,7 +111288,7 @@ var require_nanomatch = __commonJS({
     var extend = require_extend_shallow();
     var compilers = require_compilers2();
     var parsers = require_parsers2();
-    var cache = require_cache();
+    var cache2 = require_cache();
     var utils = require_utils6();
     var MAX_LENGTH = 1024 * 64;
     function nanomatch(list2, patterns, options2) {
@@ -111610,16 +111610,16 @@ var require_nanomatch = __commonJS({
       if (options2 && options2.cache === false) {
         return fn(pattern, options2);
       }
-      if (cache.has(type, key)) {
-        return cache.get(type, key);
+      if (cache2.has(type, key)) {
+        return cache2.get(type, key);
       }
       var val = fn(pattern, options2);
-      cache.set(type, key, val);
+      cache2.set(type, key, val);
       return val;
     }
     nanomatch.compilers = compilers;
     nanomatch.parsers = parsers;
-    nanomatch.cache = cache;
+    nanomatch.cache = cache2;
     module2.exports = nanomatch;
   }
 });
@@ -112064,7 +112064,7 @@ var require_utils8 = __commonJS({
     var regex = require_regex_not();
     var Cache = require_fragment_cache();
     var utils = module2.exports;
-    var cache = utils.cache = new Cache();
+    var cache2 = utils.cache = new Cache();
     utils.arrayify = function(val) {
       if (!Array.isArray(val)) {
         return [val];
@@ -112073,14 +112073,14 @@ var require_utils8 = __commonJS({
     };
     utils.memoize = function(type, pattern, options2, fn) {
       var key = utils.createKey(type + pattern, options2);
-      if (cache.has(type, key)) {
-        return cache.get(type, key);
+      if (cache2.has(type, key)) {
+        return cache2.get(type, key);
       }
       var val = fn(pattern, options2);
       if (options2 && options2.cache === false) {
         return val;
       }
-      cache.set(type, key, val);
+      cache2.set(type, key, val);
       return val;
     };
     utils.createKey = function(pattern, options2) {
@@ -112655,7 +112655,7 @@ var require_micromatch = __commonJS({
     var extend = require_extend_shallow();
     var compilers = require_compilers5();
     var parsers = require_parsers5();
-    var cache = require_cache2();
+    var cache2 = require_cache2();
     var utils = require_utils9();
     var MAX_LENGTH = 1024 * 64;
     function micromatch(list2, patterns, options2) {
@@ -112995,16 +112995,16 @@ var require_micromatch = __commonJS({
       if (options2 && options2.cache === false) {
         return fn(pattern, options2);
       }
-      if (cache.has(type, key)) {
-        return cache.get(type, key);
+      if (cache2.has(type, key)) {
+        return cache2.get(type, key);
       }
       var val = fn(pattern, options2);
-      cache.set(type, key, val);
+      cache2.set(type, key, val);
       return val;
     }
     micromatch.compilers = compilers;
     micromatch.parsers = parsers;
-    micromatch.caches = cache.caches;
+    micromatch.caches = cache2.caches;
     module2.exports = micromatch;
   }
 });
@@ -117591,10 +117591,10 @@ var require_old = __commonJS({
       splitRootRe = /^[\/]*/;
     }
     var splitRootRe;
-    exports2.realpathSync = function realpathSync2(p, cache) {
+    exports2.realpathSync = function realpathSync2(p, cache2) {
       p = pathModule.resolve(p);
-      if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-        return cache[p];
+      if (cache2 && Object.prototype.hasOwnProperty.call(cache2, p)) {
+        return cache2[p];
       }
       var original = p, seenLinks = {}, knownHard = {};
       var pos;
@@ -117620,18 +117620,18 @@ var require_old = __commonJS({
         current += result[0];
         base = previous + result[1];
         pos = nextPartRe.lastIndex;
-        if (knownHard[base] || cache && cache[base] === base) {
+        if (knownHard[base] || cache2 && cache2[base] === base) {
           continue;
         }
         var resolvedLink;
-        if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
-          resolvedLink = cache[base];
+        if (cache2 && Object.prototype.hasOwnProperty.call(cache2, base)) {
+          resolvedLink = cache2[base];
         } else {
           var stat = fs11.lstatSync(base);
           if (!stat.isSymbolicLink()) {
             knownHard[base] = true;
-            if (cache)
-              cache[base] = base;
+            if (cache2)
+              cache2[base] = base;
             continue;
           }
           var linkTarget = null;
@@ -117646,26 +117646,26 @@ var require_old = __commonJS({
             linkTarget = fs11.readlinkSync(base);
           }
           resolvedLink = pathModule.resolve(previous, linkTarget);
-          if (cache)
-            cache[base] = resolvedLink;
+          if (cache2)
+            cache2[base] = resolvedLink;
           if (!isWindows)
             seenLinks[id] = linkTarget;
         }
         p = pathModule.resolve(resolvedLink, p.slice(pos));
         start();
       }
-      if (cache)
-        cache[original] = p;
+      if (cache2)
+        cache2[original] = p;
       return p;
     };
-    exports2.realpath = function realpath(p, cache, cb) {
+    exports2.realpath = function realpath(p, cache2, cb) {
       if (typeof cb !== "function") {
-        cb = maybeCallback(cache);
-        cache = null;
+        cb = maybeCallback(cache2);
+        cache2 = null;
       }
       p = pathModule.resolve(p);
-      if (cache && Object.prototype.hasOwnProperty.call(cache, p)) {
-        return process.nextTick(cb.bind(null, null, cache[p]));
+      if (cache2 && Object.prototype.hasOwnProperty.call(cache2, p)) {
+        return process.nextTick(cb.bind(null, null, cache2[p]));
       }
       var original = p, seenLinks = {}, knownHard = {};
       var pos;
@@ -117692,8 +117692,8 @@ var require_old = __commonJS({
       }
       function LOOP() {
         if (pos >= p.length) {
-          if (cache)
-            cache[original] = p;
+          if (cache2)
+            cache2[original] = p;
           return cb(null, p);
         }
         nextPartRe.lastIndex = pos;
@@ -117702,11 +117702,11 @@ var require_old = __commonJS({
         current += result[0];
         base = previous + result[1];
         pos = nextPartRe.lastIndex;
-        if (knownHard[base] || cache && cache[base] === base) {
+        if (knownHard[base] || cache2 && cache2[base] === base) {
           return process.nextTick(LOOP);
         }
-        if (cache && Object.prototype.hasOwnProperty.call(cache, base)) {
-          return gotResolvedLink(cache[base]);
+        if (cache2 && Object.prototype.hasOwnProperty.call(cache2, base)) {
+          return gotResolvedLink(cache2[base]);
         }
         return fs11.lstat(base, gotStat);
       }
@@ -117715,8 +117715,8 @@ var require_old = __commonJS({
           return cb(err);
         if (!stat.isSymbolicLink()) {
           knownHard[base] = true;
-          if (cache)
-            cache[base] = base;
+          if (cache2)
+            cache2[base] = base;
           return process.nextTick(LOOP);
         }
         if (!isWindows) {
@@ -117739,8 +117739,8 @@ var require_old = __commonJS({
         if (err)
           return cb(err);
         var resolvedLink = pathModule.resolve(previous, target);
-        if (cache)
-          cache[base2] = resolvedLink;
+        if (cache2)
+          cache2[base2] = resolvedLink;
         gotResolvedLink(resolvedLink);
       }
       function gotResolvedLink(resolvedLink) {
@@ -117769,31 +117769,31 @@ var require_fs3 = __commonJS({
     function newError(er) {
       return er && er.syscall === "realpath" && (er.code === "ELOOP" || er.code === "ENOMEM" || er.code === "ENAMETOOLONG");
     }
-    function realpath(p, cache, cb) {
+    function realpath(p, cache2, cb) {
       if (ok) {
-        return origRealpath(p, cache, cb);
+        return origRealpath(p, cache2, cb);
       }
-      if (typeof cache === "function") {
-        cb = cache;
-        cache = null;
+      if (typeof cache2 === "function") {
+        cb = cache2;
+        cache2 = null;
       }
-      origRealpath(p, cache, function(er, result) {
+      origRealpath(p, cache2, function(er, result) {
         if (newError(er)) {
-          old.realpath(p, cache, cb);
+          old.realpath(p, cache2, cb);
         } else {
           cb(er, result);
         }
       });
     }
-    function realpathSync2(p, cache) {
+    function realpathSync2(p, cache2) {
       if (ok) {
-        return origRealpathSync(p, cache);
+        return origRealpathSync(p, cache2);
       }
       try {
-        return origRealpathSync(p, cache);
+        return origRealpathSync(p, cache2);
       } catch (er) {
         if (newError(er)) {
-          return old.realpathSync(p, cache);
+          return old.realpathSync(p, cache2);
         } else {
           throw er;
         }
@@ -120420,8 +120420,8 @@ var require_lodash3 = __commonJS({
           return object2[key];
         });
       }
-      function cacheHas(cache, key) {
-        return cache.has(key);
+      function cacheHas(cache2, key) {
+        return cache2.has(key);
       }
       function charsStartIndex(strSymbols, chrSymbols) {
         var index2 = -1, length = strSymbols.length;
@@ -121236,8 +121236,8 @@ var require_lodash3 = __commonJS({
               if (!(seen ? cacheHas(seen, computed) : includes2(result2, computed, comparator))) {
                 othIndex = othLength;
                 while (--othIndex) {
-                  var cache = caches[othIndex];
-                  if (!(cache ? cacheHas(cache, computed) : includes2(arrays[othIndex], computed, comparator))) {
+                  var cache2 = caches[othIndex];
+                  if (!(cache2 ? cacheHas(cache2, computed) : includes2(arrays[othIndex], computed, comparator))) {
                     continue outer;
                   }
                 }
@@ -122811,12 +122811,12 @@ var require_lodash3 = __commonJS({
         }
         function memoizeCapped(func) {
           var result2 = memoize2(func, function(key) {
-            if (cache.size === MAX_MEMOIZE_SIZE) {
-              cache.clear();
+            if (cache2.size === MAX_MEMOIZE_SIZE) {
+              cache2.clear();
             }
             return key;
           });
-          var cache = result2.cache;
+          var cache2 = result2.cache;
           return result2;
         }
         function mergeData(data, source) {
@@ -123770,12 +123770,12 @@ var require_lodash3 = __commonJS({
             throw new TypeError2(FUNC_ERROR_TEXT);
           }
           var memoized = function() {
-            var args = arguments, key = resolver ? resolver.apply(this, args) : args[0], cache = memoized.cache;
-            if (cache.has(key)) {
-              return cache.get(key);
+            var args = arguments, key = resolver ? resolver.apply(this, args) : args[0], cache2 = memoized.cache;
+            if (cache2.has(key)) {
+              return cache2.get(key);
             }
             var result2 = func.apply(this, args);
-            memoized.cache = cache.set(key, result2) || cache;
+            memoized.cache = cache2.set(key, result2) || cache2;
             return result2;
           };
           memoized.cache = new (memoize2.Cache || MapCache)();
@@ -200906,13 +200906,13 @@ var require_parse_filepath = __commonJS({
     var isAbsolute3 = require_is_absolute();
     var pathRoot = require_path_root();
     var MapCache = require_map_cache();
-    var cache = new MapCache();
+    var cache2 = new MapCache();
     module2.exports = function(filepath) {
       if (typeof filepath !== "string") {
         throw new TypeError("parse-filepath expects a string");
       }
-      if (cache.has(filepath)) {
-        return cache.get(filepath);
+      if (cache2.has(filepath)) {
+        return cache2.get(filepath);
       }
       var obj2 = {};
       if (typeof path16.parse === "function") {
@@ -200962,7 +200962,7 @@ var require_parse_filepath = __commonJS({
       define2(obj2, "isAbsolute", function() {
         return isAbsolute3(this.path);
       });
-      cache.set(filepath, obj2);
+      cache2.set(filepath, obj2);
       return obj2;
     };
     function define2(obj2, prop, fn) {
@@ -204950,7 +204950,7 @@ var require_queue3 = __commonJS({
       if (!(_concurrency >= 1)) {
         throw new Error("fastqueue concurrency must be equal to or greater than 1");
       }
-      var cache = reusify(Task);
+      var cache2 = reusify(Task);
       var queueHead = null;
       var queueTail = null;
       var _running = 0;
@@ -205030,7 +205030,7 @@ var require_queue3 = __commonJS({
         return _running === 0 && self2.length() === 0;
       }
       function push2(value2, done) {
-        var current = cache.get();
+        var current = cache2.get();
         current.context = context;
         current.release = release;
         current.value = value2;
@@ -205051,7 +205051,7 @@ var require_queue3 = __commonJS({
         }
       }
       function unshift2(value2, done) {
-        var current = cache.get();
+        var current = cache2.get();
         current.context = context;
         current.release = release;
         current.value = value2;
@@ -205073,7 +205073,7 @@ var require_queue3 = __commonJS({
       }
       function release(holder) {
         if (holder) {
-          cache.release(holder);
+          cache2.release(holder);
         }
         var next2 = queueHead;
         if (next2 && _running <= _concurrency) {
@@ -206930,7 +206930,7 @@ var engines = {
 };
 var package_default = {
   name: "@takeshape/cli",
-  version: "11.122.2",
+  version: "11.124.0",
   description: "TakeShape CLI",
   homepage: "https://www.takeshape.io",
   repository: {
@@ -398014,6 +398014,34 @@ var createWrapTransform = (projectSchema) => (obj2, schema22, name, shape, next2
   }
 };
 
+// ../schema/dist/util/find-shape-at-path.js
+function findSchemaAtPath(projectSchema, schema22, queryPath) {
+  if (queryPath.length === 0) {
+    return schema22;
+  }
+  const [prop, ...rest] = queryPath;
+  if (isRefSchema(schema22)) {
+    const ref = getRef(projectSchema, schema22);
+    if (ref) {
+      const shapeSchema = refItemToShapeSchema(projectSchema, ref);
+      if (shapeSchema) {
+        return findSchemaAtPath(projectSchema, shapeSchema, queryPath);
+      }
+    }
+    return void 0;
+  }
+  if (isArraySchema(schema22)) {
+    return findSchemaAtPath(projectSchema, schema22.items, queryPath);
+  }
+  if (isObjectSchema(schema22)) {
+    const propSchema = schema22.properties[prop];
+    if (propSchema) {
+      return findSchemaAtPath(projectSchema, propSchema, rest);
+    }
+  }
+  return void 0;
+}
+
 // ../schema/dist/util/has-arg.js
 function getArgs(prop) {
   return "@args" in prop ? prop["@args"] : "args" in prop ? prop.args : void 0;
@@ -398871,12 +398899,12 @@ var import_defaults = __toESM(require_defaults4(), 1);
 var inputSchemaCache = /* @__PURE__ */ new Map();
 function getInputSchemaCache(options2) {
   const key = JSON.stringify(options2, Object.keys(options2).sort());
-  let cache = inputSchemaCache.get(key);
-  if (!cache) {
-    cache = /* @__PURE__ */ new WeakMap();
-    inputSchemaCache.set(key, cache);
+  let cache2 = inputSchemaCache.get(key);
+  if (!cache2) {
+    cache2 = /* @__PURE__ */ new WeakMap();
+    inputSchemaCache.set(key, cache2);
   }
-  return cache;
+  return cache2;
 }
 function createInputSchema(schema22, options2 = {}) {
   const inputSchemaCache2 = getInputSchemaCache((0, import_defaults.default)({ isUpdate: false }, options2));
@@ -401898,10 +401926,10 @@ JSONPath.toPointer = function(pointer) {
 };
 JSONPath.toPathArray = function(expr) {
   const {
-    cache
+    cache: cache2
   } = JSONPath;
-  if (cache[expr]) {
-    return cache[expr].concat();
+  if (cache2[expr]) {
+    return cache2[expr].concat();
   }
   const subx = [];
   const normalized = expr.replaceAll(/@(?:null|boolean|number|string|integer|undefined|nonFinite|scalar|array|object|function|other)\(\)/gu, ";$&;").replaceAll(/[['](\??\(.*?\))[\]'](?!.\])/gu, function($0, $1) {
@@ -401915,8 +401943,8 @@ JSONPath.toPathArray = function(expr) {
     const match3 = exp.match(/#(\d+)/u);
     return !match3 || !match3[1] ? exp : subx[match3[1]];
   });
-  cache[expr] = exprList;
-  return cache[expr].concat();
+  cache2[expr] = exprList;
+  return cache2[expr].concat();
 };
 JSONPath.prototype.safeVm = {
   Script: SafeScript
@@ -402600,6 +402628,50 @@ function getMcpToolMap(projectSchema) {
   return projectSchema.mcp?.tools;
 }
 
+// ../schema/dist/util/get-return-shape.js
+function isQuery(propOrQuery) {
+  return "shape" in propOrQuery && "resolver" in propOrQuery;
+}
+function getReturnShapeHelper(projectSchema, propOrQuery) {
+  let shape;
+  if (isQuery(propOrQuery)) {
+    const { shapeName: shapeName14 } = parseReturnShape(projectSchema, propOrQuery.shape);
+    shape = projectSchema.shapes[shapeName14];
+  } else {
+    const ref = getRef(projectSchema, propOrQuery);
+    if (ref) {
+      shape = refItemToShape(projectSchema, ref);
+    }
+  }
+  return shape;
+}
+var cache = /* @__PURE__ */ new WeakMap();
+function getReturnShape(projectSchema, propOrQuery) {
+  let result = cache.get(propOrQuery);
+  if (result === void 0) {
+    result = getReturnShapeHelper(projectSchema, propOrQuery);
+    cache.set(propOrQuery, result ?? null);
+  }
+  return result ?? void 0;
+}
+
+// ../schema/dist/util/query-field-path.js
+function parseFieldName(fieldName) {
+  return fieldName.split(".");
+}
+function getQueryFieldPath(operation, fieldName) {
+  return [operation === "query" ? "queries" : "mutations", ...parseFieldName(fieldName)];
+}
+function findSchemaAtQueryFieldPath(schema22, queryFieldPath) {
+  const [operationName, queryName, ...fieldPath] = queryFieldPath;
+  const queryOrMutation = schema22[operationName]?.[queryName];
+  if (!queryOrMutation) {
+    return void 0;
+  }
+  const shape = getReturnShape(schema22, queryOrMutation);
+  return shape ? findSchemaAtPath(schema22, shape.schema, fieldPath) : void 0;
+}
+
 // ../schema/dist/validate/ai.js
 var import_get11 = __toESM(require_get(), 1);
 
@@ -404212,15 +404284,16 @@ async function validateResolverReferences(context, basePath, baseResolver) {
   await (0, import_p_map.default)(enumerateBasicResolvers(baseResolver, basePath), async ([resolver, path16]) => {
     if (resolver.name === "graphql:query" || resolver.name === "graphql:mutation") {
       const { service, fieldName } = resolver;
-      const prop = resolver.name === "graphql:query" ? "queries" : "mutations";
+      const operationProp = resolver.name === "graphql:query" ? "query" : "mutation";
+      const { projectSchema: { services } } = context;
       const layerState = await context.resolveLayer(service);
-      const valid = layerState.status === "ok" ? Boolean(layerState.schema[prop][fieldName]) : allowDisconnected(context, layerState.status);
+      const { schema: layerSchema, status: layerStatus } = layerState;
+      const valid = layerStatus === "ok" ? Boolean(findSchemaAtQueryFieldPath({ ...layerSchema, services }, getQueryFieldPath(operationProp, fieldName))) : allowDisconnected(context, layerState.status);
       if (!valid) {
-        const operation = resolver.name === "graphql:query" ? "query" : "mutation";
         errors.push({
           type: "notFound",
           path: path16.concat("fieldName"),
-          message: `Missing ${operation} "${resolver.fieldName}" in service layer "${service}"`
+          message: `Missing ${operationProp} "${resolver.fieldName}" in service layer "${service}"`
         });
       }
     } else if (resolver.name === "delegate") {
@@ -404794,10 +404867,14 @@ async function validateSchema(context, obj2) {
     return invalidVersionResult;
   }
   const syntaxValidation = validateSyntax(contextWithDefaults, schema22);
-  if (!syntaxValidation.valid || !isValidateReferencesContext(contextWithDefaults)) {
+  const validateReferencesContext = {
+    ...contextWithDefaults,
+    projectSchema: schema22
+  };
+  if (!syntaxValidation.valid || !isValidateReferencesContext(validateReferencesContext)) {
     return syntaxValidation;
   }
-  return validateReferences(contextWithDefaults, schema22);
+  return validateReferences(validateReferencesContext, schema22);
 }
 function createRoleImportValidator() {
   const validator = createAjv({ useDefaults: true, removeAdditional: true });
@@ -405769,18 +405846,18 @@ function flattenListQueryConfigs(base, queryConfig, maybeConfigArray) {
 }
 function getQueryIndexConfigHelper(op) {
   return ({ shapes }, shapeName14) => {
-    const { cache, loaders } = shapes[shapeName14] ?? {};
-    if (cache && loaders) {
-      const idField = getIdField(cache);
+    const { cache: cache2, loaders } = shapes[shapeName14] ?? {};
+    if (cache2 && loaders) {
+      const idField = getIdField(cache2);
       if (op === "list") {
-        return flattenListQueryConfigs({ shapeName: shapeName14, idField }, cache.fragment, loaders.list);
+        return flattenListQueryConfigs({ shapeName: shapeName14, idField }, cache2.fragment, loaders.list);
       }
       const queryConfig = loaders.get;
       if (queryConfig) {
         return {
           idField,
           shapeName: shapeName14,
-          ...cache.fragment,
+          ...cache2.fragment,
           ...queryConfig
         };
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/cli",
-  "version": "11.122.2",
+  "version": "11.124.0",
   "description": "TakeShape CLI",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -69,11 +69,11 @@
     "stream-to-promise": "2.2.0",
     "tmp": "0.0.33",
     "unzipper": "0.10.11",
-    "@takeshape/branches": "11.122.2",
-    "@takeshape/util": "11.122.2",
-    "@takeshape/ssg": "11.122.2",
-    "@takeshape/streams": "11.122.2",
-    "@takeshape/schema": "11.122.2"
+    "@takeshape/branches": "11.124.0",
+    "@takeshape/schema": "11.124.0",
+    "@takeshape/ssg": "11.124.0",
+    "@takeshape/util": "11.124.0",
+    "@takeshape/streams": "11.124.0"
   },
   "engines": {
     "node": ">=22"