@server/next 0.22.1 → 0.23.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.22.1",
+  "version": "0.23.1",
   "description": "A fully-fledged web server with routing, file uploads, sessions, static files, schema validation, websockets, testing, etc.",
   "homepage": "https://server-js.com/",
   "repository": "https://github.com/franciscop/server-next.git",
@@ -20,7 +20,7 @@
   "scripts": {
     "start": "bun test --watch",
     "lint": "npx @biomejs/biome lint ./src --skip=lint/style/noParameterAssign",
-    "test": "bun test",
+    "test": "bun test && check-dts ./src/**",
     "test:jest": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
   },
   "keywords": [
@@ -29,15 +29,15 @@
     "server.js"
   ],
   "type": "module",
-  "types": "index.d.ts",
   "main": "src/index.js",
+  "types": "src/index.d.ts",
   "files": [
     "src/",
-    "index.d.ts",
     "jsx-dev-runtime.js"
   ],
   "devDependencies": {
     "argon2": "^0.40.3",
+    "check-dts": "^0.8.2",
     "jest": "^29.7.0",
     "polystore": "^0.14.1"
   },

package/src/helpers/createId.js

@@ -45,8 +45,7 @@ const randomId = (size = 16) => {
   return id;
 };
 
-export default function createId(source) {
-  const size = 16;
+export default function createId(source, size = 16) {
   if (source) return hash(source, size);
   return randomId(size);
 }

package/src/helpers/jsx.js

@@ -16,6 +16,7 @@ const altAttrs = {
 // "" and 0 are valid children, false and null and undefined are not
 const isValidChild = (child) => child || child === "" || child === 0;
 
+const escapeCSS = (value) => String(value).replace(/[<>&"'`]/g, "\\$&");
 const minifyCss = (str) =>
   str
     .replace(/\s+/g, " ")
@@ -42,7 +43,7 @@ export const jsx = (tag, { children, ...props }) => {
     children = () => src;
   }
   if (tag === "style" && children && typeof children === "string") {
-    const src = minifyCss(children);
+    const src = minifyCss(escapeCSS(children));
     children = () => src;
   }
   if (props.dangerouslySetInnerHTML)

package/src/index.d.ts

@@ -0,0 +1,152 @@
+type Method =
+  | "socket"
+  | "get"
+  | "head"
+  | "post"
+  | "put"
+  | "patch"
+  | "delete"
+  | "options";
+
+type Store = {
+  get: (key: string) => Promise<any>;
+  set: (
+    key: string,
+    value: any,
+    { expires }?: { expires?: string | number },
+  ) => Promise<any>;
+};
+
+type Bucket = any;
+
+type Auth = {
+  type: "cookie" | "token";
+  provider: "github" | "email";
+};
+type AuthString = `${Auth["type"]}:${Auth["provider"]}`;
+
+type Domain = `https://${string}/`;
+type Origin = boolean | "*" | Domain | Domain[];
+type Cors = {
+  origin: Origin;
+  methods: string;
+  headers: string;
+  credentials?: boolean;
+};
+
+type ServerOptions = {
+  port?: number;
+  views?: string | Bucket;
+  public?: string | Bucket;
+  uploads?: string | Bucket;
+  cors?: boolean | Origin | Cors;
+  auth?: AuthString | Auth;
+  store?: Store;
+};
+
+type ExtractPathParams<Path extends string> =
+  Path extends `${string}:${infer Param}/${infer Rest}`
+    ? Param | ExtractPathParams<`/${Rest}`>
+    : Path extends `${string}:${infer Param}`
+      ? Param
+      : never;
+
+type ParamsToObject<Params extends string> = {
+  [K in Params as K extends `${infer Key}?`
+    ? Key
+    : K]: K extends `${infer Key}?` ? string | undefined : string;
+};
+
+type PathToParams<Path extends string> = ParamsToObject<
+  ExtractPathParams<Path>
+>;
+
+type Simplify<T> = T extends object ? { [K in keyof T]: T[K] } : T;
+
+type Context<Path extends string = string> = {
+  method: Method;
+  headers: { [key: string]: string | string[] };
+  cookies: { [key: string]: any };
+  body?: any;
+  url: URL & {
+    params: Simplify<PathToParams<Path>>; // Simplify here
+    query: { [key: string]: string };
+  };
+  options: ServerOptions;
+};
+
+type Body = string;
+
+type ContentType = "application/json" | "text/plain" | (string & {});
+
+// (src: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers)
+type Headers = {
+  "cache-control"?: string;
+  "content-type"?: ContentType;
+  "set-cookie"?: string;
+  "content-length"?: string;
+  server?: string;
+  location?: string;
+
+  [key: string]: string | undefined;
+};
+
+type InlineReply =
+  | Response
+  | { body: Body; headers?: Headers }
+  | string
+  | number
+  | void;
+
+type Middleware<Path extends string = string> = (
+  ctx: Context<Path>,
+) => InlineReply;
+
+declare interface Router {
+  get<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+  head<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+  post<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+  put<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+  patch<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+  del<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+  options<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+}
+
+declare interface Server {
+  /**
+   * Launch the server with the optional configuration:
+   *
+   * ```js
+   * export default server({
+   *   port: 3000,
+   *   public: './public',
+   *   store: kv(new Map()),
+   * })
+   * ```
+   *
+   * **[→ Getting Started](https://react-test.dev/documentation#attr)**
+   *
+   * **[→ Options Docs](https://react-test.dev/documentation#attr)**
+   */
+  (options?: ServerOptions): this;
+
+  socket(path: string, ...middle: Middleware[]): this;
+
+  get<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+  head<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+  post<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+  put<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+  patch<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+  del<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+  options<Path extends string>(path: Path, ...middle: Middleware<Path>[]): this;
+
+  use(...middle: Middleware[]): this;
+  router(router: Router): this;
+}
+
+type headers = (obj?: Headers) => any;
+
+declare const server: Server;
+export const router: Router;
+export const headers: headers;
+export default server;

package/src/index.js

@@ -21,7 +21,6 @@ export { default as ServerError } from "./ServerError.js";
 // Allow to create a sub-router
 export { default as router } from "./router.js";
 
-// #region server()
 export default function server(options = {}) {
   // Make it so that the exported one is a prototype of function()
   if (!(this instanceof server)) {

package/src/index.types.ts

@@ -0,0 +1,28 @@
+import server, { headers, router } from ".";
+
+const users = router
+  .post("/users", (ctx) => {
+    console.log(ctx.url.pathname);
+    console.log(ctx.url.query);
+    console.log(ctx.url.params); // No .id
+  })
+  .get("/users/:id?", (ctx) => {
+    console.log(ctx.url.params.id);
+  })
+  .del("/users/:id", (ctx) => {
+    console.log(ctx.url.params.id);
+  });
+
+server()
+  .get("/", (ctx) => {
+    console.log(ctx.method);
+    console.log(ctx.url);
+    console.log(ctx.headers);
+    console.log(ctx.cookies);
+    console.log(ctx.body);
+    return headers();
+  })
+  .router(users)
+  .post("/", () => {
+    return 201;
+  });

package/src/parseResponse.js

@@ -1,6 +1,4 @@
-// import { Readable } from "node:stream";
-
-import { cors, createCookies, createId } from "./helpers/index.js";
+import { cors, createId } from "./helpers/index.js";
 import { json } from "./reply.js";
 import ServerError from "./ServerError.js";
 

package/index.d.ts

@@ -1,84 +0,0 @@
-type Bucket = {};
-
-type Method =
-  | "socket"
-  | "get"
-  | "head"
-  | "post"
-  | "put"
-  | "patch"
-  | "delete"
-  | "options";
-
-type ServerOptions = {
-  port?: number;
-  views?: string | Bucket;
-  public?: string | Bucket;
-  uploads?: string | Bucket;
-  auth?: string | { type: string; provider: string };
-};
-
-type Context = {
-  method: Method;
-  headers: { [key: string]: string | string[] };
-  cookies: { [key: string]: any };
-  body?: any;
-  url: URL & { params: {}; query: {} };
-  options: ServerOptions;
-};
-
-type Body = string;
-
-type ContentType = "application/json" | "text/plain" | (string & {});
-
-// (src: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers)
-type Headers = {
-  "Cache-Control"?: string;
-  "Content-Type"?: ContentType;
-  Server?: string;
-  "Set-Cookie"?: string;
-  "Content-Length"?: string;
-  Location?: string;
-
-  "cache-control"?: string;
-  "content-type"?: ContentType;
-  server?: string;
-  "set-cookie"?: string;
-  "content-length"?: string;
-  location?: string;
-
-  [key: string]: string | undefined;
-};
-
-type InlineReply =
-  | Response
-  | { body: Body; headers?: Headers }
-  | string
-  | number
-  | void;
-
-type Middleware = (ctx: Context) => InlineReply;
-
-type Router = {};
-
-declare interface Server {
-  (options?: ServerOptions): this;
-
-  socket(path: string, ...middleware: Middleware[]): this;
-  get(path: string, ...middleware: Middleware[]): this;
-  head(path: string, ...middleware: Middleware[]): this;
-  post(path: string, ...middleware: Middleware[]): this;
-  put(path: string, ...middleware: Middleware[]): this;
-  patch(path: string, ...middleware: Middleware[]): this;
-  del(path: string, ...middleware: Middleware[]): this;
-  options(path: string, ...middleware: Middleware[]): this;
-
-  use(...middleware: Middleware[]): this;
-  router(router: Router): this;
-}
-
-type headers = (obj?: Headers) => any;
-
-declare const server: Server;
-export const headers: headers;
-export default server;