vxrn 1.13.6 → 1.13.7

package/dist/exports/serveStaticAssets.mjs

@@ -1,6 +1,7 @@
 import { serveStatic } from "@hono/node-server/serve-static";
 import micromatch from "micromatch";
-const hashedAssetRe = /[.-](?=[a-zA-Z0-9_-]*\d)[a-zA-Z0-9_-]{8,}\.\w+$/;
+const assetsPathRe = /[\\/]assets[\\/]/,
+  hashedAssetRe = /[.-](?=[a-zA-Z0-9_-]*\d)[a-zA-Z0-9_-]{8,}\.\w+$/;
 function compileCacheRules(cacheControl) {
   const groups = /* @__PURE__ */new Map();
   for (const [pattern, value] of Object.entries(cacheControl)) {
@@ -41,7 +42,7 @@ async function serveStaticAssets({
             }
           }
         }
-        hashedAssetRe.test(fsPath) ? c.header("Cache-Control", "public, immutable, max-age=31536000") : c.header("Cache-Control", "public, max-age=0, must-revalidate");
+        assetsPathRe.test(fsPath) || hashedAssetRe.test(fsPath) ? c.header("Cache-Control", "public, immutable, max-age=31536000") : c.header("Cache-Control", "public, max-age=0, must-revalidate");
       }
     })(context, async () => {
       didCallNext = !0, await next?.();

package/dist/exports/serveStaticAssets.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["serveStatic","micromatch","hashedAssetRe","compileCacheRules","cacheControl","groups","Map","pattern","value","Object","entries","arr","get","set","push","values","groupSources","patterns","sources","map","p","makeRe","source","join","re","RegExp","serveStaticAssets","context","next","outDir","cacheRules","didCallNext","root","rootPrefix","response","onFound","fsPath","c","path","startsWith","slice","length","m","exec","i","header","test"],"sources":["../../src/exports/serveStaticAssets.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAE5B,OAAOC,UAAA,MAAgB;AAGvB,MAAMC,aAAA,GAAgB;AASf,SAASC,kBACdC,YAAA,EACoB;EAEpB,MAAMC,MAAA,GAAS,mBAAIC,GAAA,CAAsB;EACzC,WAAW,CAACC,OAAA,EAASC,KAAK,KAAKC,MAAA,CAAOC,OAAA,CAAQN,YAAY,GAAG;IAC3D,IAAIO,GAAA,GAAMN,MAAA,CAAOO,GAAA,CAAIJ,KAAK;IACrBG,GAAA,KACHA,GAAA,GAAM,EAAC,EACPN,MAAA,CAAOQ,GAAA,CAAIL,KAAA,EAAOG,GAAG,IAEvBA,GAAA,CAAIG,IAAA,CAAKP,OAAO;EAClB;EAIA,MAAMQ,MAAA,GAAmB,EAAC;IACpBC,YAAA,GAAyB,EAAC;EAEhC,WAAW,CAACR,KAAA,EAAOS,QAAQ,KAAKZ,MAAA,EAAQ;IACtCU,MAAA,CAAOD,IAAA,CAAKN,KAAK;IACjB,MAAMU,OAAA,GAAUD,QAAA,CAASE,GAAA,CAAKC,CAAA,IAAMnB,UAAA,CAAWoB,MAAA,CAAOD,CAAC,EAAEE,MAAM;IAC/DN,YAAA,CAAaF,IAAA,CAAK,IAAII,OAAA,CAAQK,IAAA,CAAK,GAAG,CAAC,GAAG;EAC5C;EAGA,OAAO;IAAEC,EAAA,EADE,IAAIC,MAAA,CAAOT,YAAA,CAAaO,IAAA,CAAK,GAAG,CAAC;IAC/BR;EAAO;AACtB;AAEA,eAAsBW,kBAAkB;EACtCC,OAAA;EACAC,IAAA;EACAC,MAAA,GAAS;EACTC;AACF,GAKG;EACD,IAAIC,WAAA,GAAc;EAElB,MAAMC,IAAA,GAAO,KAAKH,MAAM;IAElBI,UAAA,GAAa,GAAGJ,MAAM;IAEtBK,QAAA,GAAW,MAAMlC,WAAA,CAAY;MACjCgC,IAAA;MACAG,OAAA,EAASA,CAACC,MAAA,EAAQC,CAAA,KAAM;QAGtB,MAAMC,IAAA,GAAOF,MAAA,CAAOG,UAAA,CAAWN,UAAU,IACrCG,MAAA,CAAOI,KAAA,CAAMP,UAAA,CAAWQ,MAAM,IAC9BL,MAAA;QAGJ,IAAIN,UAAA,EAAY;UACd,MAAMY,CAAA,GAAIZ,UAAA,CAAWN,EAAA,CAAGmB,IAAA,CAAKL,IAAI;UACjC,IAAII,CAAA;YAEF,SAASE,CAAA,GAAI,GAAGA,CAAA,GAAIF,CAAA,CAAED,MAAA,EAAQG,CAAA,IAC5B,IAAIF,CAAA,CAAEE,CAAC,MAAM,QAAW;cACtBP,CAAA,CAAEQ,MAAA,CAAO,iBAAiBf,UAAA,CAAWf,MAAA,CAAO6B,CAAA,GAAI,CAAC,CAAE;cACnD;YACF;UAAA;QAGN;QAEI1C,aAAA,CAAc4C,IAAA,CAAKV,MAAM,IAC3BC,CAAA,CAAEQ,MAAA,CAAO,iBAAiB,qCAAqC,IAE/DR,CAAA,CAAEQ,MAAA,CAAO,iBAAiB,oCAAoC;MAElE;IACF,CAAC,EAAElB,OAAA,EAAS,YAAY;MACtBI,WAAA,GAAc,IACd,MAAMH,IAAA,GAAO;IACf,CAAC;EAED,IAAI,GAACM,QAAA,IAAYH,WAAA,GAIjB,OAAOG,QAAA;AACT","ignoreList":[]}
+{"version":3,"names":["serveStatic","micromatch","assetsPathRe","hashedAssetRe","compileCacheRules","cacheControl","groups","Map","pattern","value","Object","entries","arr","get","set","push","values","groupSources","patterns","sources","map","p","makeRe","source","join","re","RegExp","serveStaticAssets","context","next","outDir","cacheRules","didCallNext","root","rootPrefix","response","onFound","fsPath","c","path","startsWith","slice","length","m","exec","i","header","test"],"sources":["../../src/exports/serveStaticAssets.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAE5B,OAAOC,UAAA,MAAgB;AAIvB,MAAMC,YAAA,GAAe;EAEfC,aAAA,GAAgB;AASf,SAASC,kBACdC,YAAA,EACoB;EAEpB,MAAMC,MAAA,GAAS,mBAAIC,GAAA,CAAsB;EACzC,WAAW,CAACC,OAAA,EAASC,KAAK,KAAKC,MAAA,CAAOC,OAAA,CAAQN,YAAY,GAAG;IAC3D,IAAIO,GAAA,GAAMN,MAAA,CAAOO,GAAA,CAAIJ,KAAK;IACrBG,GAAA,KACHA,GAAA,GAAM,EAAC,EACPN,MAAA,CAAOQ,GAAA,CAAIL,KAAA,EAAOG,GAAG,IAEvBA,GAAA,CAAIG,IAAA,CAAKP,OAAO;EAClB;EAIA,MAAMQ,MAAA,GAAmB,EAAC;IACpBC,YAAA,GAAyB,EAAC;EAEhC,WAAW,CAACR,KAAA,EAAOS,QAAQ,KAAKZ,MAAA,EAAQ;IACtCU,MAAA,CAAOD,IAAA,CAAKN,KAAK;IACjB,MAAMU,OAAA,GAAUD,QAAA,CAASE,GAAA,CAAKC,CAAA,IAAMpB,UAAA,CAAWqB,MAAA,CAAOD,CAAC,EAAEE,MAAM;IAC/DN,YAAA,CAAaF,IAAA,CAAK,IAAII,OAAA,CAAQK,IAAA,CAAK,GAAG,CAAC,GAAG;EAC5C;EAGA,OAAO;IAAEC,EAAA,EADE,IAAIC,MAAA,CAAOT,YAAA,CAAaO,IAAA,CAAK,GAAG,CAAC;IAC/BR;EAAO;AACtB;AAEA,eAAsBW,kBAAkB;EACtCC,OAAA;EACAC,IAAA;EACAC,MAAA,GAAS;EACTC;AACF,GAKG;EACD,IAAIC,WAAA,GAAc;EAElB,MAAMC,IAAA,GAAO,KAAKH,MAAM;IAElBI,UAAA,GAAa,GAAGJ,MAAM;IAEtBK,QAAA,GAAW,MAAMnC,WAAA,CAAY;MACjCiC,IAAA;MACAG,OAAA,EAASA,CAACC,MAAA,EAAQC,CAAA,KAAM;QAGtB,MAAMC,IAAA,GAAOF,MAAA,CAAOG,UAAA,CAAWN,UAAU,IACrCG,MAAA,CAAOI,KAAA,CAAMP,UAAA,CAAWQ,MAAM,IAC9BL,MAAA;QAGJ,IAAIN,UAAA,EAAY;UACd,MAAMY,CAAA,GAAIZ,UAAA,CAAWN,EAAA,CAAGmB,IAAA,CAAKL,IAAI;UACjC,IAAII,CAAA;YAEF,SAASE,CAAA,GAAI,GAAGA,CAAA,GAAIF,CAAA,CAAED,MAAA,EAAQG,CAAA,IAC5B,IAAIF,CAAA,CAAEE,CAAC,MAAM,QAAW;cACtBP,CAAA,CAAEQ,MAAA,CAAO,iBAAiBf,UAAA,CAAWf,MAAA,CAAO6B,CAAA,GAAI,CAAC,CAAE;cACnD;YACF;UAAA;QAGN;QAEI3C,YAAA,CAAa6C,IAAA,CAAKV,MAAM,KAAKlC,aAAA,CAAc4C,IAAA,CAAKV,MAAM,IACxDC,CAAA,CAAEQ,MAAA,CAAO,iBAAiB,qCAAqC,IAE/DR,CAAA,CAAEQ,MAAA,CAAO,iBAAiB,oCAAoC;MAElE;IACF,CAAC,EAAElB,OAAA,EAAS,YAAY;MACtBI,WAAA,GAAc,IACd,MAAMH,IAAA,GAAO;IACf,CAAC;EAED,IAAI,GAACM,QAAA,IAAYH,WAAA,GAIjB,OAAOG,QAAA;AACT","ignoreList":[]}

package/dist/exports/serveStaticAssets.native.js

@@ -1,6 +1,7 @@
 import { serveStatic } from "@hono/node-server/serve-static";
 import micromatch from "micromatch";
-var hashedAssetRe = /[.-](?=[a-zA-Z0-9_-]*\d)[a-zA-Z0-9_-]{8,}\.\w+$/;
+var assetsPathRe = /[\\/]assets[\\/]/,
+  hashedAssetRe = /[.-](?=[a-zA-Z0-9_-]*\d)[a-zA-Z0-9_-]{8,}\.\w+$/;
 function compileCacheRules(cacheControl) {
   var groups = /* @__PURE__ */new Map(),
     _iteratorNormalCompletion = !0,
@@ -73,7 +74,7 @@ async function serveStaticAssets(param) {
             }
           }
         }
-        hashedAssetRe.test(fsPath) ? c.header("Cache-Control", "public, immutable, max-age=31536000") : c.header("Cache-Control", "public, max-age=0, must-revalidate");
+        assetsPathRe.test(fsPath) || hashedAssetRe.test(fsPath) ? c.header("Cache-Control", "public, immutable, max-age=31536000") : c.header("Cache-Control", "public, max-age=0, must-revalidate");
       }
     })(context, async function () {
       didCallNext = !0, await next?.();

package/dist/exports/serveStaticAssets.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["serveStatic","micromatch","hashedAssetRe","compileCacheRules","cacheControl","groups","Map","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","entries","Symbol","iterator","_step","next","done","pattern","value","arr","get","set","push","err","return","values","groupSources","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","value1","patterns","sources","map","p","makeRe","source","join","re","RegExp"],"sources":["../../src/exports/serveStaticAssets.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAE5B,OAAOC,UAAA,MAAgB;AAGvB,IAAAC,aAAM,oDAAgB;AASf,SAASC,kBACdC,YAAA,EACoB;EAEpB,IAAAC,MAAM,kBAAS,IAAAC,GAAI;IAAsBC,yBAAA;IAAAC,iBAAA;IAAAC,cAAA;EACzC;IACE,KAAI,IAAAC,SAAa,GAAIC,MAAK,CAAAC,OAAA,CAAAR,YAAA,EAAAS,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAR,yBAAA,IAAAQ,KAAA,GAAAL,SAAA,CAAAM,IAAA,IAAAC,IAAA,GAAAV,yBAAA;MACrB,KAAAW,OACG,EAACC,KACP,IAAOJ,KAAI,CAAAI,KAAO;QAAAC,GAAG,GAEvBf,MAAI,CAAAgB,GAAK,CAAAF,KAAO;MAClBC,GAAA,KAAAA,GAAA,OAAAf,MAAA,CAAAiB,GAAA,CAAAH,KAAA,EAAAC,GAAA,IAAAA,GAAA,CAAAG,IAAA,CAAAL,OAAA;IAIA;EAGA,SAAAM,GAAY;IACVhB,iBAAiB,OAAAC,cAAA,GAAAe,GAAA;EACjB,UAAM;IACN;MACF,CAAAjB,yBAAA,IAAAG,SAAA,CAAAe,MAAA,YAAAf,SAAA,CAAAe,MAAA;IAGA,UAAS;MACX,IAAAjB,iBAAA,EAEA,MAAAC,cAAsB;IACpB;EACA;EACA,IAAAiB,MAAS;IAAAC,YAAA;IAAAC,0BAAA;IAAAC,kBAAA;IAAAC,eAAA;EACT;IAMC,SAAAC,UAAA,GAAA1B,MAAA,CAAAQ,MAAA,CAAAC,QAAA,KAAAkB,MAAA,IAAAJ,0BAAA,IAAAI,MAAA,GAAAD,UAAA,CAAAf,IAAA,IAAAC,IAAA,GAAAW,0BAAA;MACG,KAAAK,MAAA,EAAAC,QAAc,IAAAF,MAAA,CAAAb,KAAA;MAElBO,MAAM,CAAAH,IAAO,CAAAU,MAAK;MAKhB,IAAAE,OAAA,GAAAD,QAAA,CAAAE,GAAA,WAAAC,CAAA;QACA,OAAUpC,UAAQ,CAAAqC,MAAM,CAAAD,CAAA,EAAAE,MAAA;MAGtB;MAKAZ,YAAI,CAAAJ,IAAY,KAAAY,OAAA,CAAAK,IAAA;IACd;EACA,SAAAhB,GAAI;IAEFK,kBAAS,GAAI,CAAG,GAAAC,eAAc,GAAAN,GAAA;EAC5B;IACE;MACA,CAAAI,0BAAA,IAAAG,UAAA,CAAAN,MAAA,YAAAM,UAAA,CAAAN,MAAA;IAAA,UACF;MAAA,IAAAI,kBAAA,EAGN,MAAAC,eAAA;IAEA;EAGgE;EAGpE,IAAGW,EAAA,OAASC,MAAA,CAAAf,YAAY,CAAAa,IAAA;EACtB;IAEDC,EAAA;IAEDf;EAIA;AACF","ignoreList":[]}
+{"version":3,"names":["serveStatic","micromatch","assetsPathRe","hashedAssetRe","compileCacheRules","cacheControl","groups","Map","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","entries","Symbol","iterator","_step","next","done","pattern","value","arr","get","set","push","err","return","values","groupSources","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","value1","patterns","sources","map","p","makeRe","source","join","re","RegExp"],"sources":["../../src/exports/serveStaticAssets.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,WAAA,QAAmB;AAE5B,OAAOC,UAAA,MAAgB;AAIvB,IAAAC,YAAM,qBAAe;EAAAC,aAEf,oDAAgB;AASf,SAASC,kBACdC,YAAA,EACoB;EAEpB,IAAAC,MAAM,kBAAS,IAAAC,GAAI;IAAsBC,yBAAA;IAAAC,iBAAA;IAAAC,cAAA;EACzC;IACE,KAAI,IAAAC,SAAa,GAAIC,MAAK,CAAAC,OAAA,CAAAR,YAAA,EAAAS,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAR,yBAAA,IAAAQ,KAAA,GAAAL,SAAA,CAAAM,IAAA,IAAAC,IAAA,GAAAV,yBAAA;MACrB,KAAAW,OACG,EAACC,KACP,IAAOJ,KAAI,CAAAI,KAAO;QAAAC,GAAG,GAEvBf,MAAI,CAAAgB,GAAK,CAAAF,KAAO;MAClBC,GAAA,KAAAA,GAAA,OAAAf,MAAA,CAAAiB,GAAA,CAAAH,KAAA,EAAAC,GAAA,IAAAA,GAAA,CAAAG,IAAA,CAAAL,OAAA;IAIA;EAGA,SAAAM,GAAY;IACVhB,iBAAiB,OAAAC,cAAA,GAAAe,GAAA;EACjB,UAAM;IACN;MACF,CAAAjB,yBAAA,IAAAG,SAAA,CAAAe,MAAA,YAAAf,SAAA,CAAAe,MAAA;IAGA,UAAS;MACX,IAAAjB,iBAAA,EAEA,MAAAC,cAAsB;IACpB;EACA;EACA,IAAAiB,MAAS;IAAAC,YAAA;IAAAC,0BAAA;IAAAC,kBAAA;IAAAC,eAAA;EACT;IAMC,SAAAC,UAAA,GAAA1B,MAAA,CAAAQ,MAAA,CAAAC,QAAA,KAAAkB,MAAA,IAAAJ,0BAAA,IAAAI,MAAA,GAAAD,UAAA,CAAAf,IAAA,IAAAC,IAAA,GAAAW,0BAAA;MACG,KAAAK,MAAA,EAAAC,QAAc,IAAAF,MAAA,CAAAb,KAAA;MAElBO,MAAM,CAAAH,IAAO,CAAAU,MAAK;MAKhB,IAAAE,OAAA,GAAAD,QAAA,CAAAE,GAAA,WAAAC,CAAA;QACA,OAAUrC,UAAQ,CAAAsC,MAAM,CAAAD,CAAA,EAAAE,MAAA;MAGtB;MAKAZ,YAAI,CAAAJ,IAAY,KAAAY,OAAA,CAAAK,IAAA;IACd;EACA,SAAAhB,GAAI;IAEFK,kBAAS,GAAI,CAAG,GAAAC,eAAc,GAAAN,GAAA;EAC5B;IACE;MACA,CAAAI,0BAAA,IAAAG,UAAA,CAAAN,MAAA,YAAAM,UAAA,CAAAN,MAAA;IAAA,UACF;MAAA,IAAAI,kBAAA,EAGN,MAAAC,eAAA;IAEA;EAGgE;EAGpE,IAAGW,EAAA,OAASC,MAAA,CAAAf,YAAY,CAAAa,IAAA;EACtB;IAEDC,EAAA;IAEDf;EAIA;AACF","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "1.13.6",
+  "version": "1.13.7",
   "sideEffects": false,
   "type": "module",
   "exports": {
@@ -59,16 +59,16 @@
     "@expo/config-plugins": "~55.0.6",
     "@hono/node-server": "^1.19.10",
     "@react-native/dev-middleware": "^0.83.4",
-    "@vxrn/compiler": "1.13.6",
-    "@vxrn/debug": "1.13.6",
-    "@vxrn/query-string": "1.13.6",
-    "@vxrn/resolve": "1.13.6",
-    "@vxrn/safe-area": "1.13.6",
-    "@vxrn/url-parse": "1.13.6",
-    "@vxrn/utils": "1.13.6",
-    "@vxrn/vendor": "1.13.6",
-    "@vxrn/vite-flow": "1.13.6",
-    "@vxrn/vite-plugin-metro": "1.13.6",
+    "@vxrn/compiler": "1.13.7",
+    "@vxrn/debug": "1.13.7",
+    "@vxrn/query-string": "1.13.7",
+    "@vxrn/resolve": "1.13.7",
+    "@vxrn/safe-area": "1.13.7",
+    "@vxrn/url-parse": "1.13.7",
+    "@vxrn/utils": "1.13.7",
+    "@vxrn/vendor": "1.13.7",
+    "@vxrn/vite-flow": "1.13.7",
+    "@vxrn/vite-plugin-metro": "1.13.7",
     "citty": "^0.1.6",
     "dotenv": "^17.2.1",
     "dotenv-expand": "^12.0.2",

package/src/exports/serveStaticAssets.ts

@@ -3,6 +3,9 @@ import type { Context } from 'hono'
 import micromatch from 'micromatch'
 
 // hashed assets can be cached forever, html must revalidate
+// vite/rolldown always puts content-hashed files in the assets/ directory
+const assetsPathRe = /[\\/]assets[\\/]/
+// fallback regex for hashed filenames outside assets/
 const hashedAssetRe = /[.-](?=[a-zA-Z0-9_-]*\d)[a-zA-Z0-9_-]{8,}\.\w+$/
 
 export type CompiledCacheRules = { re: RegExp; values: string[] }
@@ -81,7 +84,7 @@ export async function serveStaticAssets({
         }
       }
 
-      if (hashedAssetRe.test(fsPath)) {
+      if (assetsPathRe.test(fsPath) || hashedAssetRe.test(fsPath)) {
         c.header('Cache-Control', 'public, immutable, max-age=31536000')
       } else {
         c.header('Cache-Control', 'public, max-age=0, must-revalidate')

package/types/exports/serveStaticAssets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serveStaticAssets.d.ts","sourceRoot":"","sources":["../../src/exports/serveStaticAssets.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAMnC,MAAM,MAAM,kBAAkB,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AAEjE;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,kBAAkB,CAyBpB;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,IAAI,EACJ,MAAe,EACf,UAAU,GACX,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,kBAAkB,CAAA;CAChC,iCA8CA"}
+{"version":3,"file":"serveStaticAssets.d.ts","sourceRoot":"","sources":["../../src/exports/serveStaticAssets.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AASnC,MAAM,MAAM,kBAAkB,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AAEjE;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,kBAAkB,CAyBpB;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,IAAI,EACJ,MAAe,EACf,UAAU,GACX,EAAE;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,kBAAkB,CAAA;CAChC,iCA8CA"}