itty-router 3.0.10 → 3.0.11

package/CHANGELOG.md

@@ -3,6 +3,7 @@ Until this library makes it to a production release of v1.x, **minor versions ma
 
 [@SupremeTechnopriest)(https://github.com/SupremeTechnopriest) - improved TypeScript support and documentation! :D\
 
+- **v3.0.11** - changed environment build to rollup (from tsup) and code golfed the toQuery logic. (credit [@DrLoopFall](https://github.com/DrLoopFall))
 - **v3.0.9** - fixes some TS issue, previously requiring you to define Router Methods to chain request definitions. (credit [@jahands](https://github.com/jahands))
 - **v3.0.0** - total TS conversion with improved types, adding greedy params (credit [@markusahlstrand](https://github.com/markusahlstrand))
 - **v2.6.4** - merely a republish, attempting to solve NPM test scores vs CI/CD

package/README.md

@@ -29,7 +29,8 @@ Here are the major changes in version 3, with `itty-router-extras` (certainly) a
   ```js
   router.handle('/foo', ({ query }) => query)
   
-  // GET /foo?pets=mittens&pets=fluffy&pets=rex&bar=baz => { bar: "baz", pets: ["mittens", "fluffy", "rex"] }
+  // GET /foo?pets=mittens&pets=fluffy&pets=rex&bar=baz
+  // ==> { bar: "baz", pets: ["mittens", "fluffy", "rex"] }
   ```
   
 ### Addons & Related Libraries
@@ -38,7 +39,7 @@ Here are the major changes in version 3, with `itty-router-extras` (certainly) a
 2. [itty-durable](https://www.npmjs.com/package/itty-durable) - creates a more direct object-like API for interacting with [Cloudflare Durable Objects](https://developers.cloudflare.com/workers/learning/using-durable-objects).
 
 ## Features
-- [x] Tiny ([~780 bytes](https://bundlephobia.com/package/itty-router) compressed), with zero dependencies.
+- [x] Tiny ([~550 bytes](https://bundlephobia.com/package/itty-router) compressed), with zero dependencies.
 - [x] [Fully typed/TypeScript support](#typescript)
 - [x] Supports sync/async handlers/middleware.
 - [x] Parses route params, with wildcards and optionals (e.g. `/api/:collection/:id?`)
@@ -467,12 +468,14 @@ This trick allows methods (e.g. "get", "post") to by defined dynamically by the
 ## Contributors
 These folks are the real heroes, making open source the powerhouse that it is!  Help out and get your name added to this list! <3
 
-#### Core, Concepts, and Codebase
+#### Core Concepts
 - [@mvasigh](https://github.com/mvasigh) - proxy hack wizard behind itty, coding partner in crime, maker of the entire doc site, etc, etc.
-- [@taralx](https://github.com/taralx) - router internal code-golfing refactor for performance and character savings
 - [@hunterloftis](https://github.com/hunterloftis) - router.handle() method now accepts extra arguments and passed them to route functions
 - [@SupremeTechnopriest](https://github.com/SupremeTechnopriest) - improved TypeScript support and documentation! :D
-#### Fixes
+#### Code Golfing
+- [@taralx](https://github.com/taralx) - router internal code-golfing refactor for performance and character savings
+- [@DrLoopFall](https://github.com/DrLoopFall) - v3.x re-minification
+#### Fixes & Build
 - [@taralx](https://github.com/taralx) - QOL fixes for contributing (dev dep fix and test file consistency) <3
 - [@technoyes](https://github.com/technoyes) - three kind-of-a-big-deal errors fixed.  Imagine the look on my face... thanks man!! :)
 - [@roojay520](https://github.com/roojay520) - TS interface fixes

package/dist/itty-router.d.ts

@@ -1,31 +1,31 @@
-declare type GenericTraps = {
+export declare type GenericTraps = {
     [key: string]: any;
 };
-declare type RequestLike = {
+export declare type RequestLike = {
     method: string;
     url: string;
 } & GenericTraps;
-declare type IRequest = {
+export declare type IRequest = {
     method: string;
     url: string;
     params: {
         [key: string]: string;
     };
     query: {
-        [key: string]: string | undefined;
+        [key: string]: string | string[] | undefined;
     };
     proxy?: any;
 } & GenericTraps;
-interface RouterOptions {
+export interface RouterOptions {
     base?: string;
     routes?: RouteEntry[];
 }
-interface RouteHandler {
+export interface RouteHandler {
     (request: IRequest, ...args: any): any;
 }
-declare type RouteEntry = [string, RegExp, RouteHandler[]];
-declare type Route = <T extends RouterType>(path: string, ...handlers: RouteHandler[]) => T;
-declare type RouterHints = {
+export declare type RouteEntry = [string, RegExp, RouteHandler[]];
+export declare type Route = <T extends RouterType>(path: string, ...handlers: RouteHandler[]) => T;
+export declare type RouterHints = {
     all: Route;
     delete: Route;
     get: Route;
@@ -34,11 +34,9 @@ declare type RouterHints = {
     post: Route;
     put: Route;
 };
-declare type RouterType = {
+export declare type RouterType = {
     __proto__: RouterType;
     routes: RouteEntry[];
     handle: (request: RequestLike, ...extra: any) => Promise<any>;
 } & RouterHints;
-declare const Router: ({ base, routes }?: RouterOptions) => RouterType;
-
-export { GenericTraps, IRequest, RequestLike, Route, RouteEntry, RouteHandler, Router, RouterHints, RouterOptions, RouterType };
+export declare const Router: ({ base, routes }?: RouterOptions) => RouterType;

package/dist/itty-router.js

@@ -1 +1 @@
-"use strict";var s=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var g=Object.getOwnPropertyNames;var d=Object.prototype.hasOwnProperty;var x=(r,e)=>{for(var t in e)s(r,t,{get:e[t],enumerable:!0})},h=(r,e,t,n)=>{if(e&&typeof e=="object"||typeof e=="function")for(let o of g(e))!d.call(r,o)&&o!==t&&s(r,o,{get:()=>e[o],enumerable:!(n=l(e,o))||n.enumerable});return r};var f=r=>h(s({},"__esModule",{value:!0}),r);var $={};x($,{Router:()=>T});module.exports=f($);var m=r=>[...r.entries()].reduce((e,[t,n])=>(e[t]===void 0?e[t]=n:e[t]=[e[t],n].flat())&&e||e,{}),T=({base:r="",routes:e=[]}={})=>({__proto__:new Proxy({},{get:(t,n,o)=>(p,...a)=>e.push([n.toUpperCase(),RegExp(`^${(r+p).replace(/(\/?)\*/g,"($1.*)?").replace(/(\/$)|((?<=\/)\/)/,"").replace(/(:(\w+)\+)/,"(?<$2>.*)").replace(/:(\w+)(\?)?(\.)?/g,"$2(?<$1>[^/]+)$2$3").replace(/\.(?=[\w(])/,"\\.").replace(/\)\.\?\(([^\[]+)\[\^/g,"?)\\.?($1(?<=\\.)[^\\.")}/*$`),a])&&o}),routes:e,async handle(t,...n){let o,p,a=new URL(t.url);t.query=m(a.searchParams);for(let[u,i,R]of e)if((u===t.method||u==="ALL")&&(p=a.pathname.match(i))){t.params=p.groups||{};for(let y of R)if((o=await y(t.proxy||t,...n))!==void 0)return o}}});0&&(module.exports={Router});
+"use strict";exports.Router=({base:e="",routes:r=[]}={})=>({__proto__:new Proxy({},{get:(a,o,t)=>(a,...p)=>r.push([o.toUpperCase(),RegExp(`^${(e+a).replace(/(\/?)\*/g,"($1.*)?").replace(/(\/$)|((?<=\/)\/)/,"").replace(/(:(\w+)\+)/,"(?<$2>.*)").replace(/:(\w+)(\?)?(\.)?/g,"$2(?<$1>[^/]+)$2$3").replace(/\.(?=[\w(])/,"\\.").replace(/\)\.\?\(([^\[]+)\[\^/g,"?)\\.?($1(?<=\\.)[^\\.")}/*$`),p])&&t}),routes:r,async handle(e,...a){let o,t,p=new URL(e.url),l=e.query={};for(let[e,r]of p.searchParams)l[e]=void 0===l[e]?r:[l[e],r].flat();for(let[l,s,c]of r)if((l===e.method||"ALL"===l)&&(t=p.pathname.match(s))){e.params=t.groups||{};for(let r of c)if(void 0!==(o=await r(e.proxy||e,...a)))return o}}});

package/dist/itty-router.mjs

@@ -1 +1 @@
-var y=a=>[...a.entries()].reduce((t,[e,r])=>(t[e]===void 0?t[e]=r:t[e]=[t[e],r].flat())&&t||t,{}),l=({base:a="",routes:t=[]}={})=>({__proto__:new Proxy({},{get:(e,r,o)=>(n,...p)=>t.push([r.toUpperCase(),RegExp(`^${(a+n).replace(/(\/?)\*/g,"($1.*)?").replace(/(\/$)|((?<=\/)\/)/,"").replace(/(:(\w+)\+)/,"(?<$2>.*)").replace(/:(\w+)(\?)?(\.)?/g,"$2(?<$1>[^/]+)$2$3").replace(/\.(?=[\w(])/,"\\.").replace(/\)\.\?\(([^\[]+)\[\^/g,"?)\\.?($1(?<=\\.)[^\\.")}/*$`),p])&&o}),routes:t,async handle(e,...r){let o,n,p=new URL(e.url);e.query=y(p.searchParams);for(let[s,u,i]of t)if((s===e.method||s==="ALL")&&(n=p.pathname.match(u))){e.params=n.groups||{};for(let R of i)if((o=await R(e.proxy||e,...r))!==void 0)return o}}});export{l as Router};
+const e=({base:e="",routes:r=[]}={})=>({__proto__:new Proxy({},{get:(a,o,t)=>(a,...p)=>r.push([o.toUpperCase(),RegExp(`^${(e+a).replace(/(\/?)\*/g,"($1.*)?").replace(/(\/$)|((?<=\/)\/)/,"").replace(/(:(\w+)\+)/,"(?<$2>.*)").replace(/:(\w+)(\?)?(\.)?/g,"$2(?<$1>[^/]+)$2$3").replace(/\.(?=[\w(])/,"\\.").replace(/\)\.\?\(([^\[]+)\[\^/g,"?)\\.?($1(?<=\\.)[^\\.")}/*$`),p])&&t}),routes:r,async handle(e,...a){let o,t,p=new URL(e.url),l=e.query={};for(let[e,r]of p.searchParams)l[e]=void 0===l[e]?r:[l[e],r].flat();for(let[l,s,c]of r)if((l===e.method||"ALL"===l)&&(t=p.pathname.match(s))){e.params=t.groups||{};for(let r of c)if(void 0!==(o=await r(e.proxy||e,...a)))return o}}});export{e as Router};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itty-router",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "description": "Tiny, zero-dependency API router - built for Cloudflare Workers, but works everywhere!",
   "sourceType": "module",
   "main": "./dist/itty-router.js",
@@ -41,7 +41,7 @@
     "dev": "yarn test",
     "prerelease": "yarn verify",
     "prebuild": "rimraf dist && mkdir dist",
-    "build": "tsup src/itty-router.ts --format cjs,esm --dts --minify --clean",
+    "build": "rollup -c",
     "release": "release --tag --push --patch",
     "prerelease:next": "yarn verify",
     "release:next": "release --push --type=next"
@@ -58,6 +58,8 @@
   "homepage": "https://itty-router.dev",
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20221111.1",
+    "@rollup/plugin-terser": "^0.2.1",
+    "@rollup/plugin-typescript": "^10.0.1",
     "@vitejs/plugin-vue": "^2.2.4",
     "@vitest/coverage-c8": "^0.24.3",
     "coveralls": "^3.1.1",
@@ -70,7 +72,8 @@
     "jsdom": "^20.0.1",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
-    "tsup": "^6.3.0",
+    "rollup": "^3.8.1",
+    "rollup-plugin-bundle-size": "^1.0.3",
     "typescript": "^4.8.4",
     "vite": "^2.8.6",
     "vitest": "^0.24.3",