htmv 0.0.53 → 0.0.55

package/README.md

@@ -162,4 +162,9 @@ Having to restart the server every time you make a change can be quite tedious.
 
 # Still have questions?
 How about asking the DeepWiki instead?
-[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/Fabrisdev/htmv)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/Fabrisdev/htmv)
+
+# Interested in HTMV's development or would like to contribute?
+There's still a ton of work left! Check out features to come at [**HTMV's Trello page**](https://trello.com/b/rhprnM4y/htmv)! 
+
+If you would like to contribute, check out the Trello for ideas on what to work on!

package/dist/compiler/parser.js

@@ -79,8 +79,16 @@ export function parse(tokens) {
                     text: `<${tag} `,
                 });
                 let nextToken = tokens[i];
+                let isFirstAttribute = true;
                 while (nextToken?.type === "arguments" ||
                     nextToken?.type === "attr-binding") {
+                    if (!isFirstAttribute) {
+                        nodes.push({
+                            type: "text",
+                            text: " ",
+                        });
+                    }
+                    isFirstAttribute = false;
                     if (nextToken.type === "arguments") {
                         parseArgs(nextToken.value);
                         i++;

package/dist/compiler/tokenizer.js

@@ -35,7 +35,8 @@ export function tokenize(input) {
                 i = finishingPosition;
                 continue;
             }
-            const args = values.slice(1);
+            const rawArgs = values.slice(1);
+            const args = splitRawArguments(rawArgs);
             tokens.push({
                 type: "open",
                 tag,
@@ -93,3 +94,37 @@ function readTill(charToSearchFor, startingPosition, text) {
         finishingPosition,
     };
 }
+function splitRawArguments(args) {
+    const result = [];
+    let current = null;
+    let quote = null;
+    for (const part of args) {
+        if (current === null) {
+            const match = part.match(/(['"])/);
+            if (match) {
+                const q = match[1];
+                const count = (part.match(new RegExp(q, "g")) || []).length;
+                if (count === 1) {
+                    current = part;
+                    quote = q;
+                }
+                else {
+                    result.push(part);
+                }
+            }
+            else {
+                result.push(part);
+            }
+        }
+        else {
+            current += " " + part;
+            const count = (current.match(new RegExp(quote, "g")) || []).length;
+            if (count % 2 === 0) {
+                result.push(current);
+                current = null;
+                quote = null;
+            }
+        }
+    }
+    return result;
+}

package/dist/http/response.d.ts

@@ -4,7 +4,6 @@ export type HttpResponse = {
     headers?: Headers;
     body?: string;
 };
-type ResponseLike = string | object | HttpResponse;
+export type ResponseLike = string | object | HttpResponse;
 export declare function resolveResponse(result: ResponseLike): Response;
 export declare function requestHelper(status: number, body?: string | object, headers?: Headers): HttpResponse;
-export {};

package/dist/index.js

@@ -1,5 +1,5 @@
 import { createApp } from "./app";
-import { registerRoutes } from "./routing";
+import { registerRoutes } from "./routing/routing";
 import { setViewsPath } from "./views";
 export { view } from "./views";
 export async function setup(paths) {

package/dist/routing/helpers.d.ts

@@ -0,0 +1,2 @@
+import type { Method } from "./types";
+export declare function isMethod(value: string): value is Method;

package/dist/routing/helpers.js

@@ -0,0 +1,3 @@
+export function isMethod(value) {
+    return ["get", "post", "put", "patch", "delete", "all"].includes(value);
+}

package/dist/routing/modules-handler.d.ts

@@ -0,0 +1,2 @@
+import type Elysia from "elysia";
+export declare function registerModuleRoutes(app: Elysia, prefix: string, path: string): Promise<void>;

package/dist/routing/modules-handler.js

@@ -0,0 +1,25 @@
+import { isMethod } from "./helpers";
+import { registerRoute } from "./routes-handler";
+export async function registerModuleRoutes(app, prefix, path) {
+    const module = (await import(path));
+    for (const propName in module) {
+        const prop = module[propName];
+        if (typeof prop !== "function")
+            continue;
+        const fn = prop;
+        const name = fn.name.toLowerCase();
+        const method = isMethod(name)
+            ? name
+            : propName === "default"
+                ? "all"
+                : undefined;
+        if (method) {
+            registerRoute({
+                app,
+                method,
+                path: prefix,
+                fn,
+            });
+        }
+    }
+}

package/dist/routing/routes-handler.d.ts

@@ -0,0 +1,10 @@
+import type Elysia from "elysia";
+import type { Method, RouteFn } from "./types";
+type RegisterRouteParams = {
+    app: Elysia;
+    method: Method;
+    path: string;
+    fn: RouteFn;
+};
+export declare function registerRoute({ app, method, path, fn }: RegisterRouteParams): void;
+export {};

package/dist/routing/routes-handler.js

@@ -0,0 +1,7 @@
+import { resolveResponse } from "../http/response";
+export function registerRoute({ app, method, path, fn }) {
+    app[method](path, async ({ request, query, params }) => {
+        const result = await fn({ request, query, params });
+        return resolveResponse(result);
+    });
+}

package/dist/routing/routing.js

@@ -0,0 +1,16 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+import { registerModuleRoutes } from "./modules-handler";
+export async function registerRoutes(app, baseDir, prefix = "/") {
+    const entries = await fs.readdir(baseDir, { withFileTypes: true });
+    for (const entry of entries) {
+        const fullPath = path.join(baseDir, entry.name);
+        if (entry.isDirectory()) {
+            await registerRoutes(app, fullPath, path.join(prefix, entry.name));
+            continue;
+        }
+        if (entry.name !== "index.ts")
+            continue;
+        await registerModuleRoutes(app, prefix, fullPath);
+    }
+}

package/dist/types.d.ts

@@ -9,4 +9,3 @@ export type Paths = {
     public: string;
     port: number;
 };
-export type RouteFn = (_: RouteParams) => Promise<Response> | Response | Promise<string> | string;

package/package.json

@@ -2,7 +2,7 @@
 	"name": "htmv",
 	"main": "dist/index.js",
 	"type": "module",
-	"version": "0.0.53",
+	"version": "0.0.55",
 	"exports": {
 		".": {
 			"types": "./dist/index.d.ts",

package/dist/routing.js

@@ -1,38 +0,0 @@
-import fs from "node:fs/promises";
-import path from "node:path";
-import { resolveResponse } from "./http/response";
-export async function registerRoutes(app, baseDir, prefix = "/") {
-    const entries = await fs.readdir(baseDir, { withFileTypes: true });
-    for (const entry of entries) {
-        const fullPath = path.join(baseDir, entry.name);
-        if (entry.isDirectory()) {
-            await registerRoutes(app, fullPath, path.join(prefix, entry.name));
-            continue;
-        }
-        if (entry.name !== "index.ts")
-            continue;
-        const module = (await import(fullPath));
-        const defaultFn = module.default;
-        if (defaultFn && typeof defaultFn === "function") {
-            app.all(prefix, async ({ request, query, params }) => {
-                const result = await defaultFn({ request, query, params });
-                return resolveResponse(result);
-            });
-            console.log(`Registered ${fullPath} on ${prefix} route with method all`);
-        }
-        for (const propName in module) {
-            const prop = module[propName];
-            if (typeof prop !== "function")
-                continue;
-            const fn = prop;
-            const name = fn.name.toLowerCase();
-            if (!["get", "post", "put", "patch", "delete"].includes(name))
-                continue;
-            app[name](prefix, async ({ request, query, params }) => {
-                const result = await fn({ request, query, params });
-                return resolveResponse(result);
-            });
-            console.log(`Registered ${fullPath} on ${prefix} route with method ${name}`);
-        }
-    }
-}