primate 0.29.1 → 0.29.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primate",
-  "version": "0.29.1",
+  "version": "0.29.2",
   "description": "Polymorphic development platform",
   "homepage": "https://primatejs.com",
   "bugs": "https://github.com/primatejs/primate/issues",

package/src/errors.json

@@ -91,9 +91,9 @@
       "fix": "add configuration options or remove file",
       "level": "Warn"
     },
-    "NoHandlerForExtension": {
-      "message": "no handler for {0} extension",
-      "fix": "add handler module for {0} files or remove {1}",
+    "NoHandlerForComponent": {
+      "message": "no handler for {0}",
+      "fix": "add handler module for this component or remove {0}",
       "level": "Error"
     },
     "NoRouteToPath": {

package/src/handlers.js

@@ -67,11 +67,12 @@ const html = (name, options) => async app => {
 };
 // }}}
 // {{{ view
-const view = (name, props, options) => async (app, ...rest) => {
-  const { fullExtension: extension } = new File(name);
-  return app.extensions[extension]?.handle(name, props, options)(app, ...rest)
-    ?? errors.NoHandlerForExtension.throw(extension, name);
-};
+const extensions = ["fullExtension", "extension"];
+const view = (name, props, options) => (app, ...rest) => extensions
+  .map(extension => app.extensions[new File(name)[extension]])
+  .find(extension => extension?.handle)
+  ?.handle(name, props, options)(app, ...rest)
+    ?? errors.NoHandlerForComponent.throw(name);
 // }}}
 
 export { text, json, stream, redirect, error, html, view, ws, sse };

package/src/loaders/routes/routes.js

@@ -3,6 +3,8 @@ import errors from "../../errors.js";
 
 const normalize = route => {
   let i = 0;
+  // user/ -> user
+  // user/{id=number}/{id2=number} -> user/{0}/{1}
   return (route.endsWith("/") ? route.slice(0, -1) : route)
     .replaceAll(/\{(?:\w*)(?:=\w+)?\}?/gu, _ => `{${i++}}`);
 };

package/types/index.d.ts

@@ -1,69 +1,30 @@
-declare module "primate" {
-  type App = any;
-
-  interface MinOptions {
-    status: number,
-    headers: Headers | {},
-  }
-  
-  interface ErrorOptions extends MinOptions {
-    page: string,
-  }
-
-  interface Options extends ErrorOptions {
-    placeholders: {},
-  }
-
-  type Dispatcher = {
-    get(property: string): string,
-  };
-
-  type RequestFacade = {
-    body: {}
-    path: Dispatcher,
-    query: Dispatcher,
-    cookies: Dispatcher,
-    headers: Dispatcher,
-    original: Request,
-  };
-
-  type ResponseFn = (app: App, ...rest: any) => Response;
-  type ResponseFacade = 
-    string 
-  | object
-  | URL
-  | Blob
-  | ReadableStream
-  | Response
-  | ResponseFn;
-
-  type RouteFunction = (request?: RequestFacade) => ResponseFacade;
-
-  type Streamable = ReadableStream | Blob;
-
-  export type Route = {
-    get?: RouteFunction,
-    post?: RouteFunction,
-    put?: RouteFunction,
-    delete?: RouteFunction,
-  };
-
-  export function text(body: string, options?: MinOptions): ResponseFn;
-
-  export function json(body: {}, options?: MinOptions): ResponseFn;
-
-  export function stream(body: Streamable, options?: MinOptions): ResponseFn;
-
-  export function redirect(location: string, options?: MinOptions): ResponseFn;
-
-  export function html(name: string, options?: MinOptions): ResponseFn;
-
-  export function view(name: string, props: {}, options?: Options): ResponseFn;
-
-  export function error(body: string, options?: ErrorOptions): ResponseFn;
-
-  export function sse(implementation: {
-    open?: () => void,
-    close?: () => void,
-  }, options?: MinOptions): ResponseFn;
+declare module 'primate' {
+	function _default(command: any): Promise<any>;
+	export default _default;
+	export function text(body: any, options: any): (app: any) => any;
+	export function json(body: any, options: any): (app: any) => any;
+	export function stream(body: any, options: any): (app: any) => any;
+	export function redirect(Location: any, { status }?: {
+		status?: any;
+	}): (app: any) => any;
+	export function error(body?: string, { status, page }?: {
+		status?: any;
+		page: any;
+	}): (app: any) => any;
+	export function html(name: any, options: any): (app: any) => Promise<any>;
+	/**
+	 * Render a component using handler for the given filename extension.
+	 * @param name component filename
+	 * @param props props passed to component
+	 * @param options rendering options
+	 */
+	export function view(name: string, props: object, options: object): (app: any, ...rest: any[]) => Promise<any>;
+	export function ws(implementation: any): ({ server }: {
+		server: any;
+	}, _: any, { original }: {
+		original: any;
+	}) => any;
+	export function sse(body: any, options: any): (app: any) => any;
 }
+
+//# sourceMappingURL=index.d.ts.map