@jayfong/x-server 1.35.5 → 1.35.6

package/lib/_cjs/cli/templates/routes.ts

@@ -6,6 +6,38 @@ const basePathWithHandlers: Array<[string, Record<string, Handler>]> = [
   // @endindex
 ]
 
+// https://stackoverflow.com/questions/50374908/transform-union-type-to-intersection-type
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
+  k: infer I,
+) => void
+  ? I
+  : never
+type RouteMap = {
+  // @index(['../../src/handlers/**/*.ts', '!**/_*'], (f, _) => `'${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}': typeof handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__,`)
+  // @endindex
+}
+export type HandlerMap = UnionToIntersection<
+  {
+    [K in keyof RouteMap]: {
+      [X in keyof RouteMap[K]]: {
+        [Y in `${K}${X & string}`]: RouteMap[K][X]
+      }
+    }[keyof RouteMap[K]]
+  }[keyof RouteMap]
+>
+export type HandlerPath = keyof HandlerMap
+export type HandlerPayloadMap = {
+  [K in HandlerPath]: HandlerMap[K] extends Handler<infer X> ? X : {}
+}
+export type HandlerResultMap = {
+  [K in HandlerPath]: HandlerMap[K] extends Handler<any, infer X> ? X : {}
+}
+export type HandlerMethodMap = {
+  [K in HandlerPath]: HandlerMap[K] extends Handler<any, any, infer X>
+    ? X
+    : never
+}
+
 export const routes: XServer.Route[] = basePathWithHandlers.reduce<
   XServer.Route[]
 >((res, item) => {

package/lib/_cjs/core/get_handler_url.js

@@ -0,0 +1,12 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getHandlerUrl = getHandlerUrl;
+
+var _vtils = require("vtils");
+
+var _x = require("../x");
+
+function getHandlerUrl(path, query) {
+  return `${_x.x.env.APP_URL.replace(/\/+$/, '')}${path}${query ? `?${(0, _vtils.createUrlQueryString)(query)}` : ''}`;
+}

package/lib/_cjs/index.js

@@ -50,6 +50,14 @@ Object.keys(_define_task).forEach(function (key) {
   exports[key] = _define_task[key];
 });
 
+var _get_handler_url = require("./core/get_handler_url");
+
+Object.keys(_get_handler_url).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _get_handler_url[key]) return;
+  exports[key] = _get_handler_url[key];
+});
+
 var _handler = require("./core/handler");
 
 Object.keys(_handler).forEach(function (key) {

package/lib/cli/templates/routes.ts

@@ -6,6 +6,38 @@ const basePathWithHandlers: Array<[string, Record<string, Handler>]> = [
   // @endindex
 ]
 
+// https://stackoverflow.com/questions/50374908/transform-union-type-to-intersection-type
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
+  k: infer I,
+) => void
+  ? I
+  : never
+type RouteMap = {
+  // @index(['../../src/handlers/**/*.ts', '!**/_*'], (f, _) => `'${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}': typeof handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__,`)
+  // @endindex
+}
+export type HandlerMap = UnionToIntersection<
+  {
+    [K in keyof RouteMap]: {
+      [X in keyof RouteMap[K]]: {
+        [Y in `${K}${X & string}`]: RouteMap[K][X]
+      }
+    }[keyof RouteMap[K]]
+  }[keyof RouteMap]
+>
+export type HandlerPath = keyof HandlerMap
+export type HandlerPayloadMap = {
+  [K in HandlerPath]: HandlerMap[K] extends Handler<infer X> ? X : {}
+}
+export type HandlerResultMap = {
+  [K in HandlerPath]: HandlerMap[K] extends Handler<any, infer X> ? X : {}
+}
+export type HandlerMethodMap = {
+  [K in HandlerPath]: HandlerMap[K] extends Handler<any, any, infer X>
+    ? X
+    : never
+}
+
 export const routes: XServer.Route[] = basePathWithHandlers.reduce<
   XServer.Route[]
 >((res, item) => {

package/lib/core/get_handler_url.d.ts

@@ -0,0 +1,2 @@
+import type { HandlerPath, HandlerPayloadMap } from '.x/routes';
+export declare function getHandlerUrl<T extends HandlerPath>(path: T, query?: Partial<HandlerPayloadMap[T]>): string;

package/lib/core/get_handler_url.js

@@ -0,0 +1,6 @@
+import { createUrlQueryString } from 'vtils';
+import { x } from "../x"; // @ts-ignore
+
+export function getHandlerUrl(path, query) {
+  return `${x.env.APP_URL.replace(/\/+$/, '')}${path}${query ? `?${createUrlQueryString(query)}` : ''}`;
+}

package/lib/index.d.ts

@@ -4,6 +4,7 @@ export * from './core/define_handler';
 export * from './core/define_hook';
 export * from './core/define_server';
 export * from './core/define_task';
+export * from './core/get_handler_url';
 export * from './core/handler';
 export * from './core/http_error';
 export * from './core/http_header';

package/lib/index.js

@@ -5,6 +5,7 @@ export * from "./core/define_handler";
 export * from "./core/define_hook";
 export * from "./core/define_server";
 export * from "./core/define_task";
+export * from "./core/get_handler_url";
 export * from "./core/handler";
 export * from "./core/http_error";
 export * from "./core/http_header";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.35.5",
+  "version": "1.35.6",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",