@spirobel/mininext 0.2.23 → 0.2.24

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 spirobel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/html.d.ts

@@ -1,6 +1,6 @@
 import type { HandlerReturnType, HtmlHandler, LazyHandlerReturnType, Mini } from "./url";
-export type HtmlStringValues<T = undefined> = HtmlString | HtmlString[] | string | number | HtmlHandler<T> | JsonString | LazyHandlerReturnType | undefined;
-export type JsonStringValues<T = undefined> = HtmlStringValues<T> | {
+export type HtmlStringValues<T = unknown> = HtmlString | HtmlString[] | string | number | HtmlHandler<T> | JsonString | LazyHandlerReturnType | undefined;
+export type JsonStringValues<T = unknown> = HtmlStringValues<T> | {
     [key: string]: any;
 };
 export declare class HtmlString extends Array {
@@ -13,13 +13,13 @@ export declare class HtmlString extends Array {
     resolve<T>(mini: Mini<T>): Promise<this>;
     flat(depth?: number): this;
 }
-export declare function html<X = undefined>(strings: TemplateStringsArray, ...values: HtmlStringValues<X>[]): HtmlString;
+export declare function html<X = unknown>(strings: TemplateStringsArray, ...values: HtmlStringValues<X>[]): HtmlString;
 export declare class JsonString extends HtmlString {
 }
 export declare class DangerJsonInHtml extends HtmlString {
 }
-export declare const json: <X = undefined>(strings: TemplateStringsArray, ...values: JsonStringValues<X>[]) => JsonString;
-export declare const dangerjson: <X = undefined>(strings: TemplateStringsArray, ...values: JsonStringValues<X>[]) => DangerJsonInHtml;
+export declare const json: <X = unknown>(strings: TemplateStringsArray, ...values: JsonStringValues<X>[]) => JsonString;
+export declare const dangerjson: <X = unknown>(strings: TemplateStringsArray, ...values: JsonStringValues<X>[]) => DangerJsonInHtml;
 export declare const commonHead: HtmlString;
 export declare const cssReset: HtmlString;
 /**

package/dist/url.d.ts

@@ -8,10 +8,10 @@ export type Form = {
     formData?: FormData;
     formName?: string;
     hiddenField?: HtmlString;
-    actionlink<Y = undefined>(qs?: string[] | string, settings?: LinkSettings): (mini: Mini<Y>) => string;
+    actionlink<Y = unknown>(qs?: string[] | string, settings?: LinkSettings): (mini: Mini<Y>) => string;
     onPostSubmit<F>(cb: () => F): F | undefined;
 };
-export type DataMaker<X> = ((mini: Mini) => DataMakerReturnType<X>) | (() => DataMakerReturnType<X>);
+export type DataMaker<X, Z = unknown> = ((mini: Mini<Z>) => DataMakerReturnType<X>) | (() => DataMakerReturnType<X>);
 export type DataMakerReturnType<X> = X | Promise<X>;
 export type HandlerReturnType = JsonString | DangerJsonInHtml | HtmlString | string | void;
 export type LazyHandlerReturnType = HandlerReturnType | Promise<HandlerReturnType>;
@@ -27,7 +27,7 @@ export type NamedFormHandlerReturnType<X> = HandlerReturnType | Promise<HandlerR
  * const {html,json, css, data, req, form, link, svg, deliver, route, params, header, head } = mini  //pull everything out of the mini handbag
  * ```
  */
-export declare class Mini<X = undefined> {
+export declare class Mini<X = unknown> {
     html: typeof html<X>;
     css: typeof html<X>;
     json: typeof json<X>;
@@ -42,7 +42,7 @@ export declare class Mini<X = undefined> {
     params: URLSearchParams;
     form: Form;
     requrl: Readonly<URL>;
-    constructor(mini: Mini<undefined | any>, data: X);
+    constructor(mini: Mini<unknown>, data: X);
 }
 /**
  * HtmlHandler
@@ -53,8 +53,8 @@ export declare class Mini<X = undefined> {
  * const {html,json, css, data, req, form, link, svg, deliver, route, params, header, head } = mini  //pull everything out of the mini handbag
  * ```
  */
-export type HtmlHandler<Y = undefined> = ((mini: Mini<Y>) => LazyHandlerReturnType) | (() => LazyHandlerReturnType);
-export type NamedFormHandler<Y = undefined, Z = undefined> = ((mini: Mini<Y>) => NamedFormHandlerReturnType<Z>) | (() => NamedFormHandlerReturnType<Z>);
+export type HtmlHandler<Y = unknown> = ((mini: Mini<Y>) => LazyHandlerReturnType) | (() => LazyHandlerReturnType);
+export type NamedFormHandler<Y = unknown, Z = undefined> = ((mini: Mini<Y>) => NamedFormHandlerReturnType<Z>) | (() => NamedFormHandlerReturnType<Z>);
 declare global {
     var FrontendScripts: Array<string>;
     var FrontendScriptUrls: Array<string>;
@@ -106,13 +106,14 @@ export declare class url {
      * @example const {html,json, css, data, req, form, link, svg, deliver, route, params, header, head } = mini  //pull everything out of the mini handbag
      * @returns
      */
-    static data<T>(dataMaker: DataMaker<T>): {
+    static data<T, Z>(dataMaker: DataMaker<T, Z>): {
         /**
          * @param dataHandler the function that prepares the data for the handlers
          * @example const {html,json, css, data, req, form, link, svg, deliver, route, params, header, head } = mini  //pull everything out of the mini handbag
          * @returns
          */
-        handler: (dataHandler: HtmlHandler<T>) => (oldmini: Mini) => Promise<string | void | DangerJsonInHtml>;
+        handler: (dataHandler: HtmlHandler<T>) => (oldmini: Mini<Z>) => Promise<string | void | DangerJsonInHtml>;
+        dataMaker: DataMaker<T, Z>;
         /**
          * use this to **specify the input type for the functions**,
          *
@@ -164,7 +165,7 @@ export declare class url {
      * @param handler just like a normal handler (aka you can return the form as a HtmlString), but you can optionally return additional data in formInfo
      * @returns - { formResponse: result of the handler, formInfo?: some info about the form. Totally up to you}
      */
-    static namedForm<X = undefined, Z = undefined>(name: string, handler: NamedFormHandler<X, Z>): (mini: Mini<X>) => Promise<NamedForm<Z>>;
+    static namedForm<X = unknown, Z = undefined>(name: string, handler: NamedFormHandler<X, Z>): (mini: Mini<X>) => Promise<NamedForm<Z>>;
     /**
      * pass in all the query string parameter names that you want to preserve in the link
      * @param Url - the url that you want to link to (example: "/login")

package/dist/url.js

@@ -149,6 +149,7 @@ export class url {
                     return unresolvedDataHandler;
                 };
             },
+            dataMaker,
             /**
              * use this to **specify the input type for the functions**,
              *

package/mininext/html.ts

@@ -4,7 +4,7 @@ import type {
   LazyHandlerReturnType,
   Mini,
 } from "./url";
-export type HtmlStringValues<T = undefined> =
+export type HtmlStringValues<T = unknown> =
   | HtmlString
   | HtmlString[]
   | string
@@ -13,7 +13,7 @@ export type HtmlStringValues<T = undefined> =
   | JsonString
   | LazyHandlerReturnType
   | undefined;
-export type JsonStringValues<T = undefined> =
+export type JsonStringValues<T = unknown> =
   | HtmlStringValues<T>
   | { [key: string]: any };
 export class HtmlString extends Array {
@@ -62,7 +62,7 @@ export class HtmlString extends Array {
   }
 }
 
-export function html<X = undefined>(
+export function html<X = unknown>(
   strings: TemplateStringsArray,
   ...values: HtmlStringValues<X>[]
 ) {
@@ -109,16 +109,15 @@ export function html<X = undefined>(
 }
 export class JsonString extends HtmlString {}
 export class DangerJsonInHtml extends HtmlString {}
-//type JsonTemplateInput <X = undefined> = (strings: TemplateStringsArray, ...values: JsonStringValues<X>[])
 function JsonTemplateProcessor(
   danger: true
-): <X = undefined>(
+): <X = unknown>(
   strings: TemplateStringsArray,
   ...values: JsonStringValues<X>[]
 ) => DangerJsonInHtml;
 function JsonTemplateProcessor(
   danger?: false | undefined
-): <X = undefined>(
+): <X = unknown>(
   strings: TemplateStringsArray,
   ...values: JsonStringValues<X>[]
 ) => JsonString;
@@ -127,7 +126,7 @@ function JsonTemplateProcessor(danger: boolean = false) {
   const constructorr = danger
     ? () => new DangerJsonInHtml()
     : () => new JsonString();
-  return function <X = undefined>(
+  return function <X = unknown>(
     strings: TemplateStringsArray,
     ...values: JsonStringValues<X>[]
   ) {

package/mininext/url.ts

@@ -8,15 +8,15 @@ export type Form = {
   formData?: FormData;
   formName?: string;
   hiddenField?: HtmlString;
-  actionlink<Y = undefined>(
+  actionlink<Y = unknown>(
     qs?: string[] | string,
     settings?: LinkSettings
   ): (mini: Mini<Y>) => string;
   onPostSubmit<F>(cb: () => F): F | undefined;
 };
 
-export type DataMaker<X> =
-  | ((mini: Mini) => DataMakerReturnType<X>)
+export type DataMaker<X, Z = unknown> =
+  | ((mini: Mini<Z>) => DataMakerReturnType<X>)
   | (() => DataMakerReturnType<X>);
 export type DataMakerReturnType<X> = X | Promise<X>;
 export type HandlerReturnType =
@@ -46,7 +46,7 @@ export type NamedFormHandlerReturnType<X> =
  * const {html,json, css, data, req, form, link, svg, deliver, route, params, header, head } = mini  //pull everything out of the mini handbag
  * ```
  */
-export class Mini<X = undefined> {
+export class Mini<X = unknown> {
   html: typeof html<X>;
   css: typeof html<X>;
   json: typeof json<X>;
@@ -63,7 +63,7 @@ export class Mini<X = undefined> {
   form!: Form;
   requrl!: Readonly<URL>;
 
-  constructor(mini: Mini<undefined | any>, data: X) {
+  constructor(mini: Mini<unknown>, data: X) {
     Object.assign(this, mini);
     this.html = html<X>;
     this.css = html<X>;
@@ -99,10 +99,10 @@ export class Mini<X = undefined> {
  * const {html,json, css, data, req, form, link, svg, deliver, route, params, header, head } = mini  //pull everything out of the mini handbag
  * ```
  */
-export type HtmlHandler<Y = undefined> =
+export type HtmlHandler<Y = unknown> =
   | ((mini: Mini<Y>) => LazyHandlerReturnType)
   | (() => LazyHandlerReturnType);
-export type NamedFormHandler<Y = undefined, Z = undefined> =
+export type NamedFormHandler<Y = unknown, Z = undefined> =
   | ((mini: Mini<Y>) => NamedFormHandlerReturnType<Z>)
   | (() => NamedFormHandlerReturnType<Z>);
 
@@ -213,7 +213,7 @@ export class url {
    * @example const {html,json, css, data, req, form, link, svg, deliver, route, params, header, head } = mini  //pull everything out of the mini handbag
    * @returns
    */
-  static data<T>(dataMaker: DataMaker<T>) {
+  static data<T, Z>(dataMaker: DataMaker<T, Z>) {
     return {
       /**
        * @param dataHandler the function that prepares the data for the handlers
@@ -221,7 +221,7 @@ export class url {
        * @returns
        */
       handler: (dataHandler: HtmlHandler<T>) => {
-        return async (oldmini: Mini) => {
+        return async (oldmini: Mini<Z>) => {
           const data = await dataMaker(oldmini);
           const mini = new Mini(oldmini, data);
 
@@ -232,6 +232,7 @@ export class url {
           return unresolvedDataHandler;
         };
       },
+      dataMaker,
       /**
        * use this to **specify the input type for the functions**,
        *
@@ -314,7 +315,7 @@ export class url {
    * @param handler just like a normal handler (aka you can return the form as a HtmlString), but you can optionally return additional data in formInfo
    * @returns - { formResponse: result of the handler, formInfo?: some info about the form. Totally up to you}
    */
-  static namedForm<X = undefined, Z = undefined>(
+  static namedForm<X = unknown, Z = undefined>(
     name: string,
     handler: NamedFormHandler<X, Z>
   ) {

package/package.json

@@ -11,7 +11,7 @@
 
   },
   "files": ["dist", "mininext"],
-  "version": "0.2.23",
+  "version": "0.2.24",
   "devDependencies": {
     "@types/bun": "latest"
   },