@spirobel/mininext 0.2.13 → 0.2.15

package/README.md

@@ -20,6 +20,12 @@ quickstart:
 bun create spirobel/gucci yournewproject
 ```
 
+barebones quickstart:
+
+```bash
+bun create spirobel/aldi yournewproject
+```
+
 if you don't have bun installed, run first:
 
 ```bash

package/dist/html.js

@@ -13,6 +13,16 @@ export class HtmlString extends Array {
                 if (resolvedHtmlPiece instanceof HtmlString) {
                     resolvedHtmlPiece = await resolvedHtmlPiece.resolve(mini);
                 }
+                else {
+                    if (this instanceof JsonString) {
+                        resolvedHtmlPiece = JSON.stringify(resolvedHtmlPiece);
+                    }
+                    else {
+                        const notEmpty = resolvedHtmlPiece || "";
+                        // values will be escaped by default
+                        resolvedHtmlPiece = Bun.escapeHTML(notEmpty + "");
+                    }
+                }
                 // Replace the function with the resolved HTML piece in place
                 this[index] = resolvedHtmlPiece;
             }
@@ -40,6 +50,7 @@ export function html(strings, ...values) {
                 value.every((val) => val instanceof HtmlString)) {
                 // If the value is an array of HtmlString objects, add the whole array as a single value
                 values[index] = value;
+                htmlStringArray.resolved = false; // we could bother with .find here
             }
             else if (typeof value === "function") {
                 htmlStringArray.resolved = false;
@@ -57,6 +68,11 @@ export function html(strings, ...values) {
                 // values will be escaped by default
                 values[index] = Bun.escapeHTML(notEmpty + "");
             }
+            else if (value instanceof HtmlString) {
+                if (!value.resolved) {
+                    htmlStringArray.resolved = false;
+                }
+            }
             htmlStringArray.push(values[index]);
         }
     }
@@ -84,6 +100,7 @@ function JsonTemplateProcessor(danger = false) {
                     value.every((val) => val instanceof HtmlString)) {
                     // If the value is an array of HtmlString objects, add the whole array as a single value
                     values[index] = value;
+                    jsonStringArray.resolved = false; // we could bother with .find here
                 }
                 else if (typeof value === "function") {
                     jsonStringArray.resolved = false;
@@ -94,6 +111,11 @@ function JsonTemplateProcessor(danger = false) {
                     // values will be turned into a JSON string
                     values[index] = JSON.stringify(notEmpty);
                 }
+                else if (value instanceof HtmlString) {
+                    if (!value.resolved) {
+                        jsonStringArray.resolved = false;
+                    }
+                }
                 jsonStringArray.push(values[index]);
             }
         }

package/dist/url.d.ts

@@ -41,6 +41,7 @@ export declare class Mini<X = undefined> {
     route: string;
     params: URLSearchParams;
     form: Form;
+    requrl: Readonly<URL>;
     constructor(mini: Mini<undefined | any>, data: X);
 }
 /**

package/dist/url.js

@@ -20,6 +20,7 @@ export class Mini {
     route;
     params;
     form;
+    requrl;
     constructor(mini, data) {
         Object.assign(this, mini);
         this.html = (html);
@@ -307,8 +308,9 @@ export class url {
         return Url;
     }
     static async match(req, reqPath) {
+        const miniurl = Object.freeze(new URL(req.url));
         if (typeof reqPath === "undefined") {
-            reqPath = new URL(req.url).pathname;
+            reqPath = miniurl.pathname;
         }
         const handler = url.direct_handlers_html.get(reqPath);
         if (handler) {
@@ -331,6 +333,7 @@ export class url {
                 formData = await req.formData();
             }
             const mini = new Mini({
+                requrl: miniurl,
                 data: undefined,
                 req,
                 html,

package/mininext/html.ts

@@ -30,6 +30,14 @@ export class HtmlString extends Array {
         let resolvedHtmlPiece = await htmlPiece(mini); //passing mini
         if (resolvedHtmlPiece instanceof HtmlString) {
           resolvedHtmlPiece = await resolvedHtmlPiece.resolve(mini);
+        } else {
+          if (this instanceof JsonString) {
+            resolvedHtmlPiece = JSON.stringify(resolvedHtmlPiece);
+          } else {
+            const notEmpty = resolvedHtmlPiece || "";
+            // values will be escaped by default
+            resolvedHtmlPiece = Bun.escapeHTML(notEmpty + "");
+          }
         }
         // Replace the function with the resolved HTML piece in place
         this[index] = resolvedHtmlPiece;
@@ -67,6 +75,7 @@ export function html<X = undefined>(
       ) {
         // If the value is an array of HtmlString objects, add the whole array as a single value
         values[index] = value;
+        htmlStringArray.resolved = false; // we could bother with .find here
       } else if (typeof value === "function") {
         htmlStringArray.resolved = false;
         values[index] = value;
@@ -80,6 +89,10 @@ export function html<X = undefined>(
         const notEmpty = value || "";
         // values will be escaped by default
         values[index] = Bun.escapeHTML(notEmpty + "");
+      } else if (value instanceof HtmlString) {
+        if (!value.resolved) {
+          htmlStringArray.resolved = false;
+        }
       }
       htmlStringArray.push(values[index]);
     }
@@ -128,6 +141,7 @@ function JsonTemplateProcessor(danger: boolean = false) {
         ) {
           // If the value is an array of HtmlString objects, add the whole array as a single value
           values[index] = value;
+          jsonStringArray.resolved = false; // we could bother with .find here
         } else if (typeof value === "function") {
           jsonStringArray.resolved = false;
           values[index] = value;
@@ -135,6 +149,10 @@ function JsonTemplateProcessor(danger: boolean = false) {
           const notEmpty = value || "";
           // values will be turned into a JSON string
           values[index] = JSON.stringify(notEmpty);
+        } else if (value instanceof HtmlString) {
+          if (!value.resolved) {
+            jsonStringArray.resolved = false;
+          }
         }
         jsonStringArray.push(values[index]);
       }

package/mininext/url.ts

@@ -61,6 +61,7 @@ export class Mini<X = undefined> {
   route!: string;
   params!: URLSearchParams;
   form!: Form;
+  requrl!: Readonly<URL>;
 
   constructor(mini: Mini<undefined | any>, data: X) {
     Object.assign(this, mini);
@@ -401,8 +402,9 @@ export class url {
     return Url;
   }
   static async match(req: Request, reqPath?: string) {
+    const miniurl: Readonly<URL> = Object.freeze(new URL(req.url));
     if (typeof reqPath === "undefined") {
-      reqPath = new URL(req.url).pathname;
+      reqPath = miniurl.pathname;
     }
     const handler = url.direct_handlers_html.get(reqPath);
     if (handler) {
@@ -431,6 +433,7 @@ export class url {
 
       const mini = new Mini(
         {
+          requrl: miniurl,
           data: undefined,
           req,
           html,

package/package.json

@@ -7,12 +7,11 @@
   "scripts": {
     "publish": "bun run build && npm publish",
     "build": "tsc",
-    "postversion": "git push --follow-tags",
     "preversion": "bun run build"
 
   },
   "files": ["dist", "mininext"],
-  "version": "0.2.13",
+  "version": "0.2.15",
   "devDependencies": {
     "@types/bun": "latest"
   },