one 1.1.324 → 1.1.325

Sign up to get free protection for your applications and to get access to all the features.
@@ -88,6 +88,7 @@ function createHandleRequest(options, handlers) {
88
88
  url,
89
89
  loaderProps: {
90
90
  path: finalUrl.pathname,
91
+ request: route.type === "ssr" ? request : void 0,
91
92
  params: getLoaderParams(finalUrl, route)
92
93
  }
93
94
  });
@@ -146,5 +147,5 @@ function getLoaderParams(url, config) {
146
147
  }
147
148
  function getRouteParams(pathname, route) {
148
149
  const match = new RegExp(route.namedRegex).exec(pathname);
149
- return match ? Object.fromEntries(Object.entries(route.routeKeys).map(([key, value]) => [value, match.groups?.[key]])) : {};
150
+ return match ? Object.fromEntries(Object.entries(route.routeKeys).map(([key, value]) => [value, match.groups?.[key] || ""])) : {};
150
151
  }
@@ -75,6 +75,7 @@ function createHandleRequest(options, handlers) {
75
75
  url,
76
76
  loaderProps: {
77
77
  path: finalUrl.pathname,
78
+ request: route.type === "ssr" ? request : void 0,
78
79
  params: getLoaderParams(finalUrl, route)
79
80
  }
80
81
  });
@@ -132,7 +133,7 @@ function getLoaderParams(url, config) {
132
133
  function getRouteParams(pathname, route) {
133
134
  const match = new RegExp(route.namedRegex).exec(pathname);
134
135
  return match ? Object.fromEntries(
135
- Object.entries(route.routeKeys).map(([key, value]) => [value, match.groups?.[key]])
136
+ Object.entries(route.routeKeys).map(([key, value]) => [value, match.groups?.[key] || ""])
136
137
  ) : {};
137
138
  }
138
139
  //# sourceMappingURL=createHandleRequest.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/createHandleRequest.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
@@ -86,6 +86,7 @@ function createHandleRequest(options, handlers) {
86
86
  url,
87
87
  loaderProps: {
88
88
  path: finalUrl.pathname,
89
+ request: route.type === "ssr" ? request : void 0,
89
90
  params: getLoaderParams(finalUrl, route)
90
91
  }
91
92
  });
@@ -184,7 +185,7 @@ function getRouteParams(pathname, route) {
184
185
  var [key, value] = param, _match_groups;
185
186
  return [
186
187
  value,
187
- (_match_groups = match.groups) === null || _match_groups === void 0 ? void 0 : _match_groups[key]
188
+ ((_match_groups = match.groups) === null || _match_groups === void 0 ? void 0 : _match_groups[key]) || ""
188
189
  ];
189
190
  })) : {};
190
191
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Users/n8/one/packages/one/src/createHandleRequest.ts"],
4
- "mappings": "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",
5
- "names": ["createHandleRequest", "options", "handlers", "manifest", "getManifest", "Error", "apiRoutesMap", "apiRoutes", "reduce", "acc", "cur", "page", "compiledRegex", "RegExp", "namedRegex", "apiRoutesList", "Object", "values", "activeRequests", "pageRoutes", "map", "route", "workingRegex", "handler", "request", "urlString", "url", "URL", "headers", "get", "pathname", "search", "process", "env", "NODE_ENV", "startsWith", "handleAPI", "apiRoute", "find", "regex", "test", "params", "getRouteParams", "loaderProps", "path", "err", "isResponse", "method", "handleLoader", "isClientRequestingNewRoute", "endsWith", "LOADER_JS_POSTFIX_UNCACHED", "originalUrl", "getPathFromLoaderPath", "finalUrl", "origin", "file", "console", "info", "Headers", "set", "loaderResponse", "getLoaderParams", "Response", "error", "routes", "handleSSR", "promise", "reject", "resolve", "promiseWithResolvers", "ssrResponse", "config", "match", "exec", "groups", "entries", "key", "value", "namedKey", "routeKeys", "fromEntries"]
4
+ "mappings": "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",
5
+ "names": ["createHandleRequest", "options", "handlers", "manifest", "getManifest", "Error", "apiRoutesMap", "apiRoutes", "reduce", "acc", "cur", "page", "compiledRegex", "RegExp", "namedRegex", "apiRoutesList", "Object", "values", "activeRequests", "pageRoutes", "map", "route", "workingRegex", "handler", "request", "urlString", "url", "URL", "headers", "get", "pathname", "search", "process", "env", "NODE_ENV", "startsWith", "handleAPI", "apiRoute", "find", "regex", "test", "params", "getRouteParams", "loaderProps", "path", "err", "isResponse", "method", "handleLoader", "isClientRequestingNewRoute", "endsWith", "LOADER_JS_POSTFIX_UNCACHED", "originalUrl", "getPathFromLoaderPath", "finalUrl", "origin", "file", "console", "info", "Headers", "set", "loaderResponse", "type", "undefined", "getLoaderParams", "Response", "error", "routes", "handleSSR", "promise", "reject", "resolve", "promiseWithResolvers", "ssrResponse", "config", "match", "exec", "groups", "entries", "key", "value", "namedKey", "routeKeys", "fromEntries"]
6
6
  }
@@ -60,6 +60,7 @@ function createHandleRequest(options, handlers) {
60
60
  url,
61
61
  loaderProps: {
62
62
  path: finalUrl.pathname,
63
+ request: route.type === "ssr" ? request : void 0,
63
64
  params: getLoaderParams(finalUrl, route)
64
65
  }
65
66
  });
@@ -117,7 +118,7 @@ function getLoaderParams(url, config) {
117
118
  function getRouteParams(pathname, route) {
118
119
  const match = new RegExp(route.namedRegex).exec(pathname);
119
120
  return match ? Object.fromEntries(
120
- Object.entries(route.routeKeys).map(([key, value]) => [value, match.groups?.[key]])
121
+ Object.entries(route.routeKeys).map(([key, value]) => [value, match.groups?.[key] || ""])
121
122
  ) : {};
122
123
  }
123
124
  export {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/createHandleRequest.ts"],
4
- "mappings": "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",
4
+ "mappings": "AAAA,SAAS,6BAA6B;AACtC,SAAkC,kCAAkC;AAGpE,SAAS,kBAAkB;AAC3B,SAAS,4BAA4B;AACrC,SAAS,mBAAmB;AAYrB,SAAS,oBACd,SACA,UAKA;AACA,QAAM,WAAW,YAAY;AAC7B,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,oBAAoB;AAGtC,QAAM,eACJ,SAAS,UAAU,OAAO,CAAC,KAAK,SAC9B,IAAI,IAAI,IAAI,IAAI,EAAE,GAAG,KAAK,eAAe,IAAI,OAAO,IAAI,UAAU,EAAE,GAC7D,MACN,CAAC,CAAC,GAED,gBAAgB,OAAO,OAAO,YAAY,GAK1C,iBAAiB,CAAC,GAGlB,aAAa,SAAS,WAAW,IAAI,CAAC,WAAW;AAAA,IACrD,GAAG;AAAA,IACH,cAAc,IAAI,OAAO,MAAM,UAAU;AAAA,EAC3C,EAAE;AAEF,SAAO;AAAA,IACL;AAAA,IACA,SAAS,eAA6B,SAAmD;AACvF,YAAM,YAAY,QAAQ,OAAO,IAC3B,MAAM,IAAI;AAAA,QACd,aAAa;AAAA,QACb,QAAQ,QAAQ,IAAI,MAAM,IAAI,UAAU,QAAQ,QAAQ,IAAI,MAAM,CAAC,KAAK;AAAA,MAC1E,GACM,EAAE,UAAU,OAAO,IAAI;AAE7B,UAAI,QAAQ,IAAI,aAAa,gBACvB,eAAe,QAAQ;AACzB,eAAO,MAAM,eAAe,QAAQ;AAIxC,UAAI,aAAa,gBAAgB,SAAS,WAAW,IAAI;AACvD,eAAO;AAGT,UAAI,SAAS,WAAW;AACtB,cAAM,WAAW,cAAc,KAAK,CAAC,UACrB,MAAM,cACP,KAAK,QAAQ,CAC3B;AAED,YAAI,UAAU;AACZ,gBAAM,SAAS,eAAe,UAAU,QAAQ;AAEhD,cAAI;AACF,mBAAO,MAAM,SAAS,UAAU;AAAA,cAC9B;AAAA,cACA,OAAO;AAAA,cACP;AAAA,cACA,aAAa;AAAA,gBACX,MAAM;AAAA,gBACN;AAAA,cACF;AAAA,YACF,CAAC;AAAA,UACH,SAAS,KAAK;AACZ,gBAAI,WAAW,GAAG;AAChB,qBAAO;AAET,kBAAM;AAAA,UACR;AAAA,QACF;AAAA,MACF;AAEA,UAAI,QAAQ,WAAW;AACrB,eAAO;AAGT,UAAI,SAAS,gBACwB,SAAS,SAAS,0BAA0B,GAE/C;AAC9B,cAAM,cAAc,sBAAsB,QAAQ,GAE5C,WAAW,IAAI,IAAI,aAAa,IAAI,MAAM;AAEhD,mBAAW,SAAS,YAAY;AAO9B,cANI,MAAM,SAAS,MAMf,CAAC,MAAM,aAAa,KAAK,SAAS,QAAQ;AAC5C;AAGF,UAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,KAAK,qCAAgC,SAAS,QAAQ,EAAE;AAGlE,gBAAM,UAAU,IAAI,QAAQ;AAC5B,kBAAQ,IAAI,gBAAgB,iBAAiB;AAE7C,cAAI;AACF,kBAAM,iBAAiB,MAAM,SAAS,aAAa;AAAA,cACjD;AAAA,cACA;AAAA,cACA;AAAA,cACA,aAAa;AAAA,gBACX,MAAM,SAAS;AAAA,gBACf,SAAS,MAAM,SAAS,QAAQ,UAAU;AAAA,gBAC1C,QAAQ,gBAAgB,UAAU,KAAK;AAAA,cACzC;AAAA,YACF,CAAC;AAED,mBAAO,IAAI,SAAS,gBAAgB;AAAA,cAClC;AAAA,YACF,CAAC;AAAA,UACH,SAAS,KAAK;AAEZ,gBAAI,WAAW,GAAG;AAChB,qBAAO;AAGT,0BAAQ,MAAM,yBAAyB,GAAG,EAAE,GAEtC;AAAA,UACR;AAAA,QACF;AAEA,eAAI,QAAQ,IAAI,aAAa,iBAC3B,QAAQ,MAAM,4BAA4B;AAAA,UACxC;AAAA,UACA,QAAQ,SAAS;AAAA,QACnB,CAAC,GAKI,SAAS,MAAM;AAAA,MACxB;AAGF,UAAI,SAAS,WAAW;AACtB,cAAM,EAAE,SAAS,QAAQ,QAAQ,IAAI,qBAAqB;AAG1D,uBAAe,QAAQ,IAAI;AAE3B,YAAI;AACF,qBAAW,SAAS,YAAY;AAC9B,gBAAI,CAAC,MAAM,aAAa,KAAK,QAAQ;AACnC;AAGF,kBAAM,cAAc,MAAM,SAAS,UAAU;AAAA,cAC3C;AAAA,cACA;AAAA,cACA;AAAA,cACA,aAAa;AAAA,gBACX,MAAM,WAAW;AAAA,gBACjB,QAAQ,gBAAgB,KAAK,KAAK;AAAA,cACpC;AAAA,YACF,CAAC;AAED,2BAAQ,WAAW,GACZ;AAAA,UACT;AAAA,QACF,SAAS,KAAK;AACZ,uBAAO,GAAG,GACJ;AAAA,QACR,UAAE;AACA,iBAAO,eAAe,QAAQ;AAAA,QAChC;AAAA,MACF;AAEA,aAAO;AAAA,IACT;AAAA,EACF;AACF;AAEA,SAAS,gBACP,KACA,QACA;AACA,QAAM,SAAiC,CAAC,GAClC,QAAQ,IAAI,OAAO,OAAO,YAAY,EAAE,KAAK,IAAI,QAAQ;AAC/D,MAAI,OAAO;AACT,eAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,MAAM,MAAM,GAAG;AACvD,YAAM,WAAW,OAAO,UAAU,GAAG;AACrC,aAAO,QAAQ,IAAI;AAAA,IACrB;AAEF,SAAO;AACT;AAGA,SAAS,eAAe,UAAkB,OAA0B;AAElE,QAAM,QADQ,IAAI,OAAO,MAAM,UAAU,EACrB,KAAK,QAAQ;AACjC,SAAK,QACE,OAAO;AAAA,IACZ,OAAO,QAAQ,MAAM,SAAS,EAAE,IAAI,CAAC,CAAC,KAAK,KAAK,MACvC,CAAC,OAAQ,MAAM,SAAS,GAAG,KAAK,EAAa,CACrD;AAAA,EACH,IALmB,CAAC;AAMtB;",
5
5
  "names": []
6
6
  }
@@ -63,6 +63,7 @@ function createHandleRequest(options, handlers) {
63
63
  url,
64
64
  loaderProps: {
65
65
  path: finalUrl.pathname,
66
+ request: route.type === "ssr" ? request : void 0,
66
67
  params: getLoaderParams(finalUrl, route)
67
68
  }
68
69
  });
@@ -121,7 +122,7 @@ function getLoaderParams(url, config) {
121
122
  }
122
123
  function getRouteParams(pathname, route) {
123
124
  const match = new RegExp(route.namedRegex).exec(pathname);
124
- return match ? Object.fromEntries(Object.entries(route.routeKeys).map(([key, value]) => [value, match.groups?.[key]])) : {};
125
+ return match ? Object.fromEntries(Object.entries(route.routeKeys).map(([key, value]) => [value, match.groups?.[key] || ""])) : {};
125
126
  }
126
127
  export { createHandleRequest };
127
128
  //# sourceMappingURL=createHandleRequest.mjs.map
@@ -1 +1 @@
1
- {"version":3,"names":["getPathFromLoaderPath","LOADER_JS_POSTFIX_UNCACHED","isResponse","promiseWithResolvers","getManifest","createHandleRequest","options","handlers","manifest","Error","apiRoutesMap","apiRoutes","reduce","acc","cur","page","compiledRegex","RegExp","namedRegex","apiRoutesList","Object","values","activeRequests","pageRoutes","map","route","workingRegex","handler","request","urlString","url","URL","headers","get","pathname","search","process","env","NODE_ENV","startsWith","handleAPI","apiRoute","find","test","params","getRouteParams","loaderProps","path","err","method","handleLoader","endsWith","originalUrl","finalUrl","origin","file","console","info","Headers","set","loaderResponse","getLoaderParams","Response","error","routes","handleSSR","promise","reject","resolve","ssrResponse","config","match","exec","groups","key","value","entries","namedKey","routeKeys","fromEntries"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,qBAAA,QAA6B;AACtC,SAAkCC,0BAAA,QAAkC;AAEpE,SAASC,UAAA,QAAkB;AAC3B,SAASC,oBAAA,QAA4B;AACrC,SAASC,WAAA,QAAmB;AAYrB,SAASC,oBACdC,OAAA,EACAC,QAAA,EAKA;EACA,MAAMC,QAAA,GAAWJ,WAAA,CAAY;EAC7B,IAAI,CAACI,QAAA,EACH,MAAM,IAAIC,KAAA,CAAM,oBAAoB;EAGtC,MAAMC,YAAA,GACJF,QAAA,CAASG,SAAA,CAAUC,MAAA,CAAO,CAACC,GAAA,EAAKC,GAAA,MAC9BD,GAAA,CAAIC,GAAA,CAAIC,IAAI,IAAI;MAAE,GAAGD,GAAA;MAAKE,aAAA,EAAe,IAAIC,MAAA,CAAOH,GAAA,CAAII,UAAU;IAAE,GAC7DL,GAAA,GACN,CAAC,CAAC;IAEDM,aAAA,GAAgBC,MAAA,CAAOC,MAAA,CAAOX,YAAY;IAK1CY,cAAA,GAAiB,CAAC;IAGlBC,UAAA,GAAaf,QAAA,CAASe,UAAA,CAAWC,GAAA,CAAKC,KAAA,KAAW;MACrD,GAAGA,KAAA;MACHC,YAAA,EAAc,IAAIT,MAAA,CAAOQ,KAAA,CAAMP,UAAU;IAC3C,EAAE;EAEF,OAAO;IACLV,QAAA;IACAmB,OAAA,EAAS,eAAAA,CAA6BC,OAAA,EAAmD;MACvF,MAAMC,SAAA,GAAYD,OAAA,CAAQE,GAAA,IAAO;QAC3BA,GAAA,GAAM,IAAIC,GAAA,CACdF,SAAA,IAAa,IACbD,OAAA,CAAQI,OAAA,CAAQC,GAAA,CAAI,MAAM,IAAI,UAAUL,OAAA,CAAQI,OAAA,CAAQC,GAAA,CAAI,MAAM,CAAC,KAAK,EAC1E;QACM;UAAEC,QAAA;UAAUC;QAAO,IAAIL,GAAA;MAE7B,IAAIM,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,gBACvBhB,cAAA,CAAeY,QAAQ,GACzB,OAAO,MAAMZ,cAAA,CAAeY,QAAQ;MAIxC,IAAIA,QAAA,KAAa,gBAAgBA,QAAA,CAASK,UAAA,CAAW,IAAI,GACvD,OAAO;MAGT,IAAIhC,QAAA,CAASiC,SAAA,EAAW;QACtB,MAAMC,QAAA,GAAWtB,aAAA,CAAcuB,IAAA,CAAMjB,KAAA,IACrBA,KAAA,CAAMT,aAAA,CACP2B,IAAA,CAAKT,QAAQ,CAC3B;QAED,IAAIO,QAAA,EAAU;UACZ,MAAMG,MAAA,GAASC,cAAA,CAAeX,QAAA,EAAUO,QAAQ;UAEhD,IAAI;YACF,OAAO,MAAMlC,QAAA,CAASiC,SAAA,CAAU;cAC9BZ,OAAA;cACAH,KAAA,EAAOgB,QAAA;cACPX,GAAA;cACAgB,WAAA,EAAa;gBACXC,IAAA,EAAMb,QAAA;gBACNU;cACF;YACF,CAAC;UACH,SAASI,GAAA,EAAK;YACZ,IAAI9C,UAAA,CAAW8C,GAAG,GAChB,OAAOA,GAAA;YAET,MAAMA,GAAA;UACR;QACF;MACF;MAEA,IAAIpB,OAAA,CAAQqB,MAAA,KAAW,OACrB,OAAO;MAGT,IAAI1C,QAAA,CAAS2C,YAAA,IACwBhB,QAAA,CAASiB,QAAA,CAASlD,0BAA0B,GAE/C;QAC9B,MAAMmD,WAAA,GAAcpD,qBAAA,CAAsBkC,QAAQ;UAE5CmB,QAAA,GAAW,IAAItB,GAAA,CAAIqB,WAAA,EAAatB,GAAA,CAAIwB,MAAM;QAEhD,WAAW7B,KAAA,IAASF,UAAA,EAAY;UAO9B,IANIE,KAAA,CAAM8B,IAAA,KAAS,MAMf,CAAC9B,KAAA,CAAMC,YAAA,CAAaiB,IAAA,CAAKU,QAAA,CAASnB,QAAQ,GAC5C;UAGEE,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBAC3BkB,OAAA,CAAQC,IAAA,CAAK,qCAAgCJ,QAAA,CAASnB,QAAQ,EAAE;UAGlE,MAAMF,OAAA,GAAU,IAAI0B,OAAA,CAAQ;UAC5B1B,OAAA,CAAQ2B,GAAA,CAAI,gBAAgB,iBAAiB;UAE7C,IAAI;YACF,MAAMC,cAAA,GAAiB,MAAMrD,QAAA,CAAS2C,YAAA,CAAa;cACjDtB,OAAA;cACAH,KAAA;cACAK,GAAA;cACAgB,WAAA,EAAa;gBACXC,IAAA,EAAMM,QAAA,CAASnB,QAAA;gBACfU,MAAA,EAAQiB,eAAA,CAAgBR,QAAA,EAAU5B,KAAK;cACzC;YACF,CAAC;YAED,OAAO,IAAIqC,QAAA,CAASF,cAAA,EAAgB;cAClC5B;YACF,CAAC;UACH,SAASgB,GAAA,EAAK;YAEZ,IAAI9C,UAAA,CAAW8C,GAAG,GAChB,OAAOA,GAAA;YAGT,MAAAQ,OAAA,CAAQO,KAAA,CAAM,yBAAyBf,GAAG,EAAE,GAEtCA,GAAA;UACR;QACF;QAEA,OAAIZ,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,iBAC3BkB,OAAA,CAAQO,KAAA,CAAM,4BAA4B;UACxCX,WAAA;UACAY,MAAA,EAAQxD,QAAA,CAASe;QACnB,CAAC,GAKIuC,QAAA,CAASC,KAAA,CAAM;MACxB;MAGF,IAAIxD,QAAA,CAAS0D,SAAA,EAAW;QACtB,MAAM;UAAEC,OAAA;UAASC,MAAA;UAAQC;QAAQ,IAAIjE,oBAAA,CAAqB;QAG1DmB,cAAA,CAAeY,QAAQ,IAAIgC,OAAA;QAE3B,IAAI;UACF,WAAWzC,KAAA,IAASF,UAAA,EAAY;YAC9B,IAAI,CAACE,KAAA,CAAMC,YAAA,CAAaiB,IAAA,CAAKT,QAAQ,GACnC;YAGF,MAAMmC,WAAA,GAAc,MAAM9D,QAAA,CAAS0D,SAAA,CAAU;cAC3CrC,OAAA;cACAH,KAAA;cACAK,GAAA;cACAgB,WAAA,EAAa;gBACXC,IAAA,EAAMb,QAAA,GAAWC,MAAA;gBACjBS,MAAA,EAAQiB,eAAA,CAAgB/B,GAAA,EAAKL,KAAK;cACpC;YACF,CAAC;YAED,OAAA2C,OAAA,CAAQC,WAAW,GACZA,WAAA;UACT;QACF,SAASrB,GAAA,EAAK;UACZ,MAAAmB,MAAA,CAAOnB,GAAG,GACJA,GAAA;QACR,UAAE;UACA,OAAO1B,cAAA,CAAeY,QAAQ;QAChC;MACF;MAEA,OAAO;IACT;EACF;AACF;AAEA,SAAS2B,gBACP/B,GAAA,EACAwC,MAAA,EACA;EACA,MAAM1B,MAAA,GAAiC,CAAC;IAClC2B,KAAA,GAAQ,IAAItD,MAAA,CAAOqD,MAAA,CAAO5C,YAAY,EAAE8C,IAAA,CAAK1C,GAAA,CAAII,QAAQ;EAC/D,IAAIqC,KAAA,EAAOE,MAAA,EACT,WAAW,CAACC,GAAA,EAAKC,KAAK,KAAKvD,MAAA,CAAOwD,OAAA,CAAQL,KAAA,CAAME,MAAM,GAAG;IACvD,MAAMI,QAAA,GAAWP,MAAA,CAAOQ,SAAA,CAAUJ,GAAG;IACrC9B,MAAA,CAAOiC,QAAQ,IAAIF,KAAA;EACrB;EAEF,OAAO/B,MAAA;AACT;AAGA,SAASC,eAAeX,QAAA,EAAkBT,KAAA,EAA0B;EAElE,MAAM8C,KAAA,GADQ,IAAItD,MAAA,CAAOQ,KAAA,CAAMP,UAAU,EACrBsD,IAAA,CAAKtC,QAAQ;EACjC,OAAKqC,KAAA,GACEnD,MAAA,CAAO2D,WAAA,CACZ3D,MAAA,CAAOwD,OAAA,CAAQnD,KAAA,CAAMqD,SAAS,EAAEtD,GAAA,CAAI,CAAC,CAACkD,GAAA,EAAKC,KAAK,MAAM,CAACA,KAAA,EAAOJ,KAAA,CAAME,MAAA,GAASC,GAAG,CAAC,CAAC,CACpF,IAHmB,CAAC;AAItB","ignoreList":[]}
1
+ {"version":3,"names":["getPathFromLoaderPath","LOADER_JS_POSTFIX_UNCACHED","isResponse","promiseWithResolvers","getManifest","createHandleRequest","options","handlers","manifest","Error","apiRoutesMap","apiRoutes","reduce","acc","cur","page","compiledRegex","RegExp","namedRegex","apiRoutesList","Object","values","activeRequests","pageRoutes","map","route","workingRegex","handler","request","urlString","url","URL","headers","get","pathname","search","process","env","NODE_ENV","startsWith","handleAPI","apiRoute","find","test","params","getRouteParams","loaderProps","path","err","method","handleLoader","endsWith","originalUrl","finalUrl","origin","file","console","info","Headers","set","loaderResponse","type","getLoaderParams","Response","error","routes","handleSSR","promise","reject","resolve","ssrResponse","config","match","exec","groups","key","value","entries","namedKey","routeKeys","fromEntries"],"sources":["../../src/createHandleRequest.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -70,6 +70,7 @@ function createHandleRequest(options, handlers) {
70
70
  url,
71
71
  loaderProps: {
72
72
  path: finalUrl.pathname,
73
+ request: route.type === "ssr" ? request : void 0,
73
74
  params: getLoaderParams(finalUrl, route)
74
75
  }
75
76
  });
@@ -168,7 +169,7 @@ function getRouteParams(pathname, route) {
168
169
  var [key, value] = param, _match_groups;
169
170
  return [
170
171
  value,
171
- (_match_groups = match.groups) === null || _match_groups === void 0 ? void 0 : _match_groups[key]
172
+ ((_match_groups = match.groups) === null || _match_groups === void 0 ? void 0 : _match_groups[key]) || ""
172
173
  ];
173
174
  })) : {};
174
175
  }
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/Users/n8/one/packages/one/src/createHandleRequest.ts"],
4
- "mappings": "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",
5
- "names": ["getPathFromLoaderPath", "LOADER_JS_POSTFIX_UNCACHED", "isResponse", "promiseWithResolvers", "getManifest", "createHandleRequest", "options", "handlers", "manifest", "Error", "apiRoutesMap", "apiRoutes", "reduce", "acc", "cur", "page", "compiledRegex", "RegExp", "namedRegex", "apiRoutesList", "Object", "values", "activeRequests", "pageRoutes", "map", "route", "workingRegex", "handler", "request", "urlString", "url", "URL", "headers", "get", "pathname", "search", "process", "env", "NODE_ENV", "startsWith", "handleAPI", "apiRoute", "find", "regex", "test", "params", "getRouteParams", "loaderProps", "path", "err", "method", "handleLoader", "isClientRequestingNewRoute", "endsWith", "originalUrl", "finalUrl", "origin", "file", "console", "info", "Headers", "set", "loaderResponse", "getLoaderParams", "Response", "error", "routes", "handleSSR", "promise", "reject", "resolve", "ssrResponse", "config", "match", "exec", "groups", "entries", "key", "value", "namedKey", "routeKeys", "fromEntries"]
4
+ "mappings": "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",
5
+ "names": ["getPathFromLoaderPath", "LOADER_JS_POSTFIX_UNCACHED", "isResponse", "promiseWithResolvers", "getManifest", "createHandleRequest", "options", "handlers", "manifest", "Error", "apiRoutesMap", "apiRoutes", "reduce", "acc", "cur", "page", "compiledRegex", "RegExp", "namedRegex", "apiRoutesList", "Object", "values", "activeRequests", "pageRoutes", "map", "route", "workingRegex", "handler", "request", "urlString", "url", "URL", "headers", "get", "pathname", "search", "process", "env", "NODE_ENV", "startsWith", "handleAPI", "apiRoute", "find", "regex", "test", "params", "getRouteParams", "loaderProps", "path", "err", "method", "handleLoader", "isClientRequestingNewRoute", "endsWith", "originalUrl", "finalUrl", "origin", "file", "console", "info", "Headers", "set", "loaderResponse", "type", "undefined", "getLoaderParams", "Response", "error", "routes", "handleSSR", "promise", "reject", "resolve", "ssrResponse", "config", "match", "exec", "groups", "entries", "key", "value", "namedKey", "routeKeys", "fromEntries"]
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "one",
3
- "version": "1.1.324",
3
+ "version": "1.1.325",
4
4
  "source": "src/index.ts",
5
5
  "types": "./types/index.d.ts",
6
6
  "sideEffects": false,
@@ -91,14 +91,14 @@
91
91
  "@react-navigation/native-stack": "~6.9.13",
92
92
  "@react-navigation/routers": "~6.1.9",
93
93
  "@ungap/structured-clone": "^1.2.0",
94
- "@vxrn/resolve": "1.1.324",
95
- "@vxrn/tslib-lite": "1.1.324",
96
- "@vxrn/universal-color-scheme": "1.1.324",
97
- "@vxrn/use-isomorphic-layout-effect": "1.1.324",
94
+ "@vxrn/resolve": "1.1.325",
95
+ "@vxrn/tslib-lite": "1.1.325",
96
+ "@vxrn/universal-color-scheme": "1.1.325",
97
+ "@vxrn/use-isomorphic-layout-effect": "1.1.325",
98
98
  "babel-dead-code-elimination": "^1.0.6",
99
99
  "citty": "^0.1.6",
100
100
  "core-js": "^3.38.1",
101
- "create-vxrn": "1.1.324",
101
+ "create-vxrn": "1.1.325",
102
102
  "escape-string-regexp": "^5.0.0",
103
103
  "expo-linking": "~6.3.1",
104
104
  "expo-modules-core": "^1.12.24",
@@ -120,7 +120,7 @@
120
120
  "url-parse": "^1.5.10",
121
121
  "vite": "6.0.0-beta.1",
122
122
  "vite-tsconfig-paths": "^5.0.1",
123
- "vxrn": "1.1.324",
123
+ "vxrn": "1.1.325",
124
124
  "ws": "^8.18.0",
125
125
  "xxhashjs": "^0.2.2"
126
126
  },
@@ -128,7 +128,7 @@
128
128
  "react-native": "*"
129
129
  },
130
130
  "devDependencies": {
131
- "@tamagui/build": "^1.116.4",
131
+ "@tamagui/build": "^1.116.7",
132
132
  "@types/node": "^22.1.0",
133
133
  "@types/react-dom": "^18.2.25",
134
134
  "@types/url-parse": "^1.4.11",
@@ -1,6 +1,7 @@
1
1
  import { getPathFromLoaderPath } from './cleanUrl'
2
2
  import { LOADER_JS_POSTFIX_REGEX, LOADER_JS_POSTFIX_UNCACHED } from './constants'
3
3
  import type { RouteInfo } from './server/createRoutesManifest'
4
+ import type { LoaderProps } from './types'
4
5
  import { isResponse } from './utils/isResponse'
5
6
  import { promiseWithResolvers } from './utils/promiseWithResolvers'
6
7
  import { getManifest } from './vite/getManifest'
@@ -10,7 +11,7 @@ type RequestHandlerProps<RouteExtraProps extends Object = {}> = {
10
11
  request: Request
11
12
  route: RouteInfo<string> & RouteExtraProps
12
13
  url: URL
13
- loaderProps?: { path: string; params: Record<string, any> }
14
+ loaderProps?: LoaderProps
14
15
  }
15
16
 
16
17
  type RequestHandlerResponse = null | string | Response
@@ -132,6 +133,7 @@ export function createHandleRequest(
132
133
  url,
133
134
  loaderProps: {
134
135
  path: finalUrl.pathname,
136
+ request: route.type === 'ssr' ? request : undefined,
135
137
  params: getLoaderParams(finalUrl, route),
136
138
  },
137
139
  })
@@ -223,6 +225,8 @@ function getRouteParams(pathname: string, route: RouteInfo<string>) {
223
225
  const match = regex.exec(pathname)
224
226
  if (!match) return {}
225
227
  return Object.fromEntries(
226
- Object.entries(route.routeKeys).map(([key, value]) => [value, match.groups?.[key]])
228
+ Object.entries(route.routeKeys).map(([key, value]) => {
229
+ return [value, (match.groups?.[key] || '') as string]
230
+ })
227
231
  )
228
232
  }
package/src/types.ts CHANGED
@@ -26,6 +26,7 @@ export type RenderApp = (props: RenderAppProps) => Promise<string>
26
26
  export type LoaderProps<Params extends Object = Record<string, string>> = {
27
27
  path: string
28
28
  params: Params
29
+ request?: Request
29
30
  }
30
31
 
31
32
  export type RenderAppProps = {
@@ -1,13 +1,11 @@
1
1
  import type { RouteInfo } from './server/createRoutesManifest';
2
+ import type { LoaderProps } from './types';
2
3
  import type { One } from './vite/types';
3
4
  type RequestHandlerProps<RouteExtraProps extends Object = {}> = {
4
5
  request: Request;
5
6
  route: RouteInfo<string> & RouteExtraProps;
6
7
  url: URL;
7
- loaderProps?: {
8
- path: string;
9
- params: Record<string, any>;
10
- };
8
+ loaderProps?: LoaderProps;
11
9
  };
12
10
  type RequestHandlerResponse = null | string | Response;
13
11
  export declare function createHandleRequest(options: One.PluginOptions, handlers: {
@@ -1 +1 @@
1
- {"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAI9D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,KAAK,mBAAmB,CAAC,eAAe,SAAS,MAAM,GAAG,EAAE,IAAI;IAC9D,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,eAAe,CAAA;IAC1C,GAAG,EAAE,GAAG,CAAA;IACR,WAAW,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,CAAA;CAC5D,CAAA;AAED,KAAK,sBAAsB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAA;AAEtD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,GAAG,CAAC,aAAa,EAC1B,QAAQ,EAAE;IACR,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACxD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACzD;;uBA4BgD,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;EAuJ3F"}
1
+ {"version":3,"file":"createHandleRequest.d.ts","sourceRoot":"","sources":["../src/createHandleRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAI1C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAEvC,KAAK,mBAAmB,CAAC,eAAe,SAAS,MAAM,GAAG,EAAE,IAAI;IAC9D,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,eAAe,CAAA;IAC1C,GAAG,EAAE,GAAG,CAAA;IACR,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA;AAED,KAAK,sBAAsB,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAA;AAEtD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,GAAG,CAAC,aAAa,EAC1B,QAAQ,EAAE;IACR,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IACxD,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAC3D,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;CACzD;;uBA4BgD,OAAO,KAAG,OAAO,CAAC,sBAAsB,CAAC;EAwJ3F"}
package/types/types.d.ts CHANGED
@@ -17,6 +17,7 @@ export type RenderApp = (props: RenderAppProps) => Promise<string>;
17
17
  export type LoaderProps<Params extends Object = Record<string, string>> = {
18
18
  path: string;
19
19
  params: Params;
20
+ request?: Request;
20
21
  };
21
22
  export type RenderAppProps = {
22
23
  path: string;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA,yFAAyF;AACzF,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAEhF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;AAExE,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;AAE1E,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAE3B,uBAAuB,CAAC,EAAE,OAAO,CAAA;IAEjC,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAElE,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI;IACxE,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;IACd,gBAAgB,CAAC,EAAE,GAAG,CAAA;IACtB,UAAU,CAAC,EAAE,GAAG,CAAA;IAChB,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA,yFAAyF;AACzF,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAEhF,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;AAExE,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;AAE1E,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAE3B,uBAAuB,CAAC,EAAE,OAAO,CAAA;IAEjC,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;AAElE,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI;IACxE,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAA;IACd,gBAAgB,CAAC,EAAE,GAAG,CAAA;IACtB,UAAU,CAAC,EAAE,GAAG,CAAA;IAChB,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B,CAAA"}