@spirobel/mininext 0.4.2 → 0.5.0

package/dist/mininext.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bun-types" />
 /// <reference types="bun-types" />
-import { url, Mini, type HtmlHandler } from "./url";
+import { url, Mini, has, type HtmlHandler } from "./url";
 import { isError, HtmlString, BasedHtml, head, commonHead, cssReset, basedHtml as html } from "./html";
 import type { Server, WebSocketHandler } from "bun";
 declare global {
@@ -12,4 +12,5 @@ declare function makeEntrypoint(): Promise<{
     fetch: (req: Request, server: Server) => Promise<Response>;
     websocket: WebSocketHandler;
 }>;
-export { html, url, head, build, makeEntrypoint, isError, BasedHtml, HtmlString, type HtmlHandler, Mini, standardDevReloader, commonHead, cssReset, };
+export declare function getCallerFilePath(): string;
+export { has, html, url, head, build, makeEntrypoint, isError, BasedHtml, HtmlString, type HtmlHandler, Mini, standardDevReloader, commonHead, cssReset, };

package/dist/mininext.js

@@ -1,4 +1,4 @@
-import { url, Mini } from "./url";
+import { url, Mini, has } from "./url";
 import { isError, HtmlString, BasedHtml, head, commonHead, cssReset, basedHtml as html, } from "./html";
 import { watch } from "fs/promises";
 import * as path from "path";
@@ -53,7 +53,12 @@ async function buildBackend(backendPath = "backend/backend.ts") {
     global.bundledSVGs = {};
     const i = await import(path.resolve(projectRoot(), backendPath));
     for (const frontend of url.getFrontends()) {
-        const f = await buildFrontend(frontend);
+        const firstPlaceToLook = path.resolve(path.dirname(frontend.callerPath), `frontend/${frontend.path}`);
+        const secondPlaceToLook = path.resolve(projectRoot(), `frontend/${frontend.path}`);
+        const frontEndPath = (await Bun.file(firstPlaceToLook).exists())
+            ? firstPlaceToLook
+            : secondPlaceToLook;
+        const f = await buildFrontend(frontEndPath);
         FrontendScriptUrls.push("/" + f.url);
         FrontendScripts.push(f.script);
     }
@@ -82,7 +87,7 @@ async function buildBackend(backendPath = "backend/backend.ts") {
 }
 async function buildFrontend(file) {
     const result = await Bun.build({
-        entrypoints: [path.resolve(projectRoot(), `frontend/${file}`)],
+        entrypoints: [file],
         outdir: path.resolve(projectRoot(), "dist"),
         naming: "[name]-[hash].[ext]",
         minify: Bun.argv[2] === "dev" ? false : true, //production
@@ -182,4 +187,14 @@ async function makeEntrypoint() {
     }
     return module.default();
 }
-export { html, url, head, build, makeEntrypoint, isError, BasedHtml, HtmlString, Mini, standardDevReloader, commonHead, cssReset, };
+export function getCallerFilePath() {
+    // const stack = new Error().stack?.split("\n");
+    // //console.log(stack);
+    // if (!stack) return "";
+    // return stack[2].slice(
+    //   stack[2].lastIndexOf("(") + 1,
+    //   stack[2].lastIndexOf(")") + 3
+    // );
+    return __dirname;
+}
+export { has, html, url, head, build, makeEntrypoint, isError, BasedHtml, HtmlString, Mini, standardDevReloader, commonHead, cssReset, };

package/dist/url.d.ts

@@ -2,12 +2,25 @@
 /// <reference types="bun-types" />
 import type { Server, WebSocketHandler } from "bun";
 import { html, json, dangerjson, HtmlString } from "./html";
-import type { BasedHtml, DangerJsonInHtml, JsonString, JsonStringValues } from "./html";
+import { BasedHtml, type DangerJsonInHtml, type JsonString, type JsonStringValues } from "./html";
+/**
+ * A helper function that helps narrow unknown objects
+ * @param object - the object of type unknown that is to be narrowed
+ * @param key - the key that may or may not exist in object
+ * @returns true if the key is present and false if not
+ * @example
+ * ``` js
+ * has(this.form.formJson, "formName") &&
+ * this.form.formJson.formName === this.form.formName
+ * ```
+ * https://stackoverflow.com/questions/70028907/narrowing-an-object-of-type-unknown
+ */
+export declare function has<T, K extends string>(object: T, key: K): object is T & object & Record<K, unknown>;
 export type Form = {
     post: boolean;
     urlencoded: boolean;
     multipart: boolean;
-    formJson?: any;
+    formJson?: unknown;
     formData?: FormData;
     formName?: string;
     hiddenField?: HtmlString;
@@ -79,11 +92,15 @@ export declare class url {
     private static frontends;
     private static svgs;
     static svg(path: string, options?: ResponseInit): string | undefined;
-    static frontend(path: string, snippet?: HtmlHandler | BasedHtml): HtmlString;
+    static frontend<X>(path: string, snippet?: BasedHtml): HtmlString;
+    static frontend<X>(path: string, snippet?: HtmlHandler<X>): (mini: Mini<X>) => HtmlString;
     /**
      * This is used by the frontend bundler in order to find all frontends and their corresponding script files.
      */
-    static getFrontends(): string[];
+    static getFrontends(): {
+        path: string;
+        callerPath: string;
+    }[];
     static getSvgPaths(): string[];
     static serveFrontend(req: Request): Response | undefined;
     static serveSvg(req: Request): Response | undefined;

package/dist/url.js

@@ -1,4 +1,20 @@
 import { htmlResponder, html, json, dangerjson, HtmlString } from "./html";
+import { BasedHtml, } from "./html";
+/**
+ * A helper function that helps narrow unknown objects
+ * @param object - the object of type unknown that is to be narrowed
+ * @param key - the key that may or may not exist in object
+ * @returns true if the key is present and false if not
+ * @example
+ * ``` js
+ * has(this.form.formJson, "formName") &&
+ * this.form.formJson.formName === this.form.formName
+ * ```
+ * https://stackoverflow.com/questions/70028907/narrowing-an-object-of-type-unknown
+ */
+export function has(object, key) {
+    return typeof object === "object" && object !== null && key in object;
+}
 /**
  * Mini - the data object can be filled with url.data
  * @example
@@ -37,7 +53,7 @@ export class Mini {
                     this.form.formData.get("formName") === this.form.formName) {
                     return cb();
                 }
-                else if (this.form.formJson &&
+                else if (has(this.form.formJson, "formName") &&
                     this.form.formJson.formName === this.form.formName) {
                     return cb();
                 }
@@ -67,10 +83,21 @@ export class url {
         return foundEntry && foundEntry[0];
     }
     static frontend(path, snippet) {
-        const frontendIndex = url.frontends.push(path) - 1;
+        const stack = new Error().stack?.split("\n");
+        let callerPath = "";
+        if (stack) {
+            callerPath = stack[2].slice(stack[2].lastIndexOf("(") + 1, stack[2].lastIndexOf(".") + 3);
+        }
+        const frontendIndex = url.frontends.push({ path, callerPath }) - 1;
         const scriptUrl = FrontendScriptUrls[frontendIndex];
-        return html ` ${snippet}
-      <script type="module" src="${scriptUrl}"></script>`; // return an html script tag with the index hash
+        if (snippet instanceof BasedHtml || !snippet) {
+            return html ` ${snippet}
+        <script type="module" src="${scriptUrl}"></script>`; // return an html script tag with the index hash
+        }
+        return (mini) => {
+            return mini.html `${snippet}
+        <script type="module" src="${scriptUrl}"></script>`;
+        };
     }
     /**
      * This is used by the frontend bundler in order to find all frontends and their corresponding script files.

package/package.json

@@ -11,7 +11,7 @@
     "clean":"rm -rf ./dist"
   },
   "files": ["dist"],
-  "version": "0.4.2",
+  "version": "0.5.0",
   "devDependencies": {
     "@types/bun": "latest"
   },