valyrian.js 7.2.8 → 7.2.10

package/lib/node/utils/inline.ts

@@ -6,7 +6,11 @@ import esbuild from "esbuild";
 /* eslint-disable sonarjs/cognitive-complexity */
 import fs from "fs";
 
-export async function inline(file: string | { raw: string; map?: string | null; file: string }, options: Record<string, any> = {}) {
+// eslint-disable-next-line complexity
+export async function inline(
+  file: string | { raw: string; map?: string | null; file: string },
+  options: Record<string, any> = {}
+) {
   if (typeof file === "string") {
     let ext = file.split(".").pop();
     if (ext && /(js|cjs|jsx|mjs|ts|tsx)/.test(ext)) {
@@ -69,6 +73,9 @@ export async function inline(file: string | { raw: string; map?: string | null;
       };
 
       let result = await esbuild.build(esbuildOptions);
+      if (result.outputFiles?.length !== 2) {
+        throw new Error(result.errors.join("\n"));
+      }
 
       if (options.compact) {
         const terser = await import("terser");
@@ -86,6 +93,10 @@ export async function inline(file: string | { raw: string; map?: string | null;
           ...(options.terser || {})
         });
 
+        if (!result2.code || !result2.map) {
+          throw new Error("Unknown error");
+        }
+
         let mapBase64 = Buffer.from(result2.map.toString()).toString("base64");
         let suffix = `//# sourceMappingURL=data:application/json;charset=utf-8;base64,${mapBase64}`;
         return { raw: result2.code, map: suffix, file };
@@ -117,7 +128,11 @@ export async function inline(file: string | { raw: string; map?: string | null;
   }
 }
 
-inline.uncss = async function (renderedHtml: (string | Promise<string>)[], css: string, options: Record<string, any> = {}) {
+inline.uncss = async function (
+  renderedHtml: (string | Promise<string>)[],
+  css: string,
+  options: Record<string, any> = {}
+) {
   let html = await Promise.all(renderedHtml);
 
   let contents = html.map((item) => {

package/lib/router/index.ts

@@ -65,7 +65,11 @@ interface RouterInterface {
 
 interface RedirectFunction {
   // eslint-disable-next-line no-unused-vars
-  (url: string, parentComponent?: Component, preventPushState?: boolean): string | void;
+  (
+    path: string,
+    parentComponent?: Component | POJOComponent | VnodeComponentInterface,
+    preventPushState?: boolean
+  ): Promise<string | void>;
 }
 
 function flat(array: any) {
@@ -181,7 +185,7 @@ async function searchComponent(
     url: router.url,
     path: router.path,
     matches: router.matches,
-    redirect: (path: string, parentComponent?: Component) => {
+    redirect: (path: string, parentComponent?: Component | POJOComponent | VnodeComponentInterface) => {
       router.go(path, parentComponent);
       // Return false to stop the middleware chain
       return false;
@@ -260,7 +264,11 @@ export class Router implements RouterInterface {
     return this.paths.filter((path) => path.method === "add").map((path) => path.path);
   }
 
-  async go(path: string, parentComponent?: Component, preventPushState = false): Promise<string | void> {
+  async go(
+    path: string,
+    parentComponent?: Component | POJOComponent | VnodeComponentInterface,
+    preventPushState = false
+  ): Promise<string | void> {
     if (!path) {
       throw new Error("router.url.required");
     }
@@ -312,7 +320,11 @@ export class Router implements RouterInterface {
 
 let localRedirect: RedirectFunction;
 
-export function redirect(url: string, parentComponent?: Component, preventPushState = false): string | void {
+export function redirect(
+  url: string,
+  parentComponent?: Component | POJOComponent | VnodeComponentInterface,
+  preventPushState = false
+): Promise<string | void> {
   if (!localRedirect) {
     throw new Error("router.redirect.not.found");
   }

package/lib/signal/index.ts

@@ -22,12 +22,12 @@ export interface SignalInterface extends Array<any> {
 }
 
 // eslint-disable-next-line sonarjs/cognitive-complexity
-export function Signal(initialValue): SignalInterface {
+export function Signal(initialValue: any): SignalInterface {
   // Create a copy of the current context object
   const { vnode, component } = { ...current };
 
   // Check if the context object has a vnode property
-  if (vnode) {
+  if (vnode && component) {
     // Is first call
     if (!vnode.components) {
       // Set the components property to an empty array
@@ -70,7 +70,7 @@ export function Signal(initialValue): SignalInterface {
   const subscriptions: SubscriptionsInterface = [];
 
   // Define a function that allows other parts of the code to subscribe to changes to the Signal's value
-  const subscribe = (callback) => {
+  const subscribe = (callback: Function) => {
     // Add the callback function to the subscriptions array if it is not already in the array
     if (subscriptions.indexOf(callback) === -1) {
       subscriptions.push(callback);
@@ -127,7 +127,7 @@ export function Signal(initialValue): SignalInterface {
   }
 
   // Define a function that allows the value of the Signal to be updated and notifies any subscribed functions of the change
-  const set = (newValue) => {
+  const set = (newValue: any) => {
     // If we have a current event on going, prevent the default action
     if (current.event) {
       current.event.preventDefault();
@@ -152,7 +152,7 @@ export function Signal(initialValue): SignalInterface {
 
   // If the context object has a vnode property, add the signal to the vnode's signals array
   // and add the subscriptions array to the vnode's subscriptions array
-  if (vnode) {
+  if (vnode && component) {
     component.signals.push(signal);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "valyrian.js",
-  "version": "7.2.8",
+  "version": "7.2.10",
   "description": "Lightweight steel to forge PWAs. (Minimal Frontend Framework with server side rendering and other capabilities)",
   "repository": "git@github.com:Masquerade-Circus/valyrian.js.git",
   "author": "Masquerade <christian@masquerade-circus.net>",

package/tsconfig.json

@@ -1,20 +1,34 @@
 {
   "compilerOptions": {
-    "jsx": "react",
-    "target": "ES2022",
-    "module": "ES2022",
+    // enable latest features
+    "lib": ["esnext", "dom"],
+    "module": "NodeNext",
+    "target": "ESNext",
+
     "moduleResolution": "NodeNext",
-    "resolveJsonModule": true,
-    "allowSyntheticDefaultImports": true,
-    "allowJs": false,
-    "esModuleInterop": true,
+    "noEmit": false,
+    "moduleDetection": "force",
+
+    "jsx": "react", // support JSX
     "jsxFactory": "v",
     "jsxFragmentFactory": "v.fragment",
+    "allowJs": true, // allow importing `.js` from `.ts`
+    "esModuleInterop": true, // allow default imports for CommonJS modules
+
+    // best practices
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "skipLibCheck": true,
+    "composite": true,
+    "downlevelIteration": true,
+    "allowSyntheticDefaultImports": true,
+    "resolveJsonModule": true,
+
     "rootDir": "lib",
     "paths": {
       "node_modules/*": ["./node_modules/*"]
     }
   },
   "include": ["./lib"],
-  "exclude": ["./dist/**"]
+  "exclude": ["./dist"]
 }

package/dist/interfaces.d.ts

@@ -1,96 +0,0 @@
-declare module "valyrian.js" {
-    interface Props {
-        key?: string | number;
-        state?: any;
-        oncreate?: {
-            (vnode: VnodeInterface): never;
-        };
-        onupdate?: {
-            (vnode: VnodeInterface, oldVnode: VnodeInterface): never;
-        };
-        onremove?: {
-            (oldVnode: VnodeInterface): never;
-        };
-        shouldupdate?: {
-            (vnode: VnodeInterface, oldVnode: VnodeInterface): undefined | boolean;
-        };
-        [key: string | number | symbol]: any;
-    }
-    interface DomElement extends Element {
-        [key: string]: any;
-    }
-    interface VnodeInterface {
-        new (tag: string | Component | POJOComponent, props: Props, children: Children): VnodeInterface;
-        tag: string | Component | POJOComponent;
-        props: Props;
-        children: Children;
-        isSVG?: boolean;
-        dom?: DomElement;
-        processed?: boolean;
-        [key: string | number | symbol]: any;
-    }
-    interface VnodeWithDom extends VnodeInterface {
-        dom: DomElement;
-    }
-    interface Component {
-        (props?: Props | null, ...children: any[]): VnodeInterface | Children | any;
-        [key: string]: any;
-    }
-    interface POJOComponent {
-        view: Component;
-        props?: Props | null;
-        children?: any[];
-        [key: string]: any;
-    }
-    interface VnodeComponentInterface extends VnodeInterface {
-        tag: Component | POJOComponent;
-        props: Props;
-        children: Children;
-    }
-    interface Children extends Array<VnodeInterface | VnodeComponentInterface | any> {
-    }
-    interface Directive {
-        (value: any, vnode: VnodeWithDom, oldVnode?: VnodeWithDom): void | boolean;
-    }
-    interface Directives {
-        [key: string]: Directive;
-    }
-    interface ReservedProps {
-        [key: string]: true;
-    }
-    interface Current {
-        component: Component | POJOComponent | null;
-        vnode: VnodeWithDom | null;
-        oldVnode?: VnodeWithDom | null;
-        event: Event | null;
-    }
-    interface V {
-        (tagOrComponent: string | Component | POJOComponent, props: Props | null, ...children: Children): VnodeInterface | VnodeComponentInterface;
-        fragment(_: any, ...children: Children): Children;
-    }
-    let isNodeJs: boolean;
-    function createDomElement(tag: string, isSVG?: boolean): DomElement;
-    const Vnode: VnodeInterface;
-    function isComponent(component: any): component is Component;
-    const isVnode: (object?: unknown | VnodeInterface) => object is VnodeInterface;
-    const isVnodeComponent: (object?: unknown | VnodeComponentInterface) => object is VnodeComponentInterface;
-    function domToVnode(dom: any): VnodeWithDom;
-    function trust(htmlString: string): any;
-    const current: Current;
-    const reservedProps: Record<string, true>;
-    function onMount(callback: any): void;
-    function onUpdate(callback: any): void;
-    function onCleanup(callback: any): void;
-    function onUnmount(callback: any): void;
-    const directives: Directives;
-    function directive(name: string, directive: Directive): void;
-    function setAttribute(name: string, value: any, newVnode: VnodeWithDom, oldVnode?: VnodeWithDom): void;
-    function updateAttributes(newVnode: VnodeWithDom, oldVnode?: VnodeWithDom): void;
-    function patch(newVnode: VnodeWithDom, oldVnode?: VnodeWithDom): void;
-    function update(): void | string;
-    function updateVnode(vnode: VnodeWithDom, oldVnode: VnodeWithDom): string | void;
-    function unmount(): string | void;
-    function mount(dom: any, component: any): string | void;
-    const v: V;
-}
-//# sourceMappingURL=interfaces.d.ts.map

package/dist/interfaces.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../lib/interfaces.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,aAAa,CAAC;IAC3B,UAAiB,KAAK;QACpB,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;QACtB,KAAK,CAAC,EAAE,GAAG,CAAC;QACZ,QAAQ,CAAC,EAAE;YACT,CAAC,KAAK,EAAE,cAAc,GAAG,KAAK,CAAC;SAChC,CAAC;QACF,QAAQ,CAAC,EAAE;YACT,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,GAAG,KAAK,CAAC;SAC1D,CAAC;QACF,QAAQ,CAAC,EAAE;YACT,CAAC,QAAQ,EAAE,cAAc,GAAG,KAAK,CAAC;SACnC,CAAC;QACF,YAAY,CAAC,EAAE;YACb,CAAC,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,GAAG,SAAS,GAAG,OAAO,CAAC;SACxE,CAAC;QACF,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;KACtC;IACD,UAAiB,UAAW,SAAQ,OAAO;QACzC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB;IACD,UAAiB,cAAc;QAC7B,KAAK,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAG,cAAc,CAAC;QAChG,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,CAAC;QACxC,KAAK,EAAE,KAAK,CAAC;QACb,QAAQ,EAAE,QAAQ,CAAC;QACnB,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,GAAG,CAAC,EAAE,UAAU,CAAC;QACjB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;KACtC;IACD,UAAiB,YAAa,SAAQ,cAAc;QAClD,GAAG,EAAE,UAAU,CAAC;KACjB;IACD,UAAiB,SAAS;QACxB,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,QAAQ,EAAE,GAAG,EAAE,GAAG,cAAc,GAAG,QAAQ,GAAG,GAAG,CAAC;QAC5E,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB;IACD,UAAiB,aAAa;QAC5B,IAAI,EAAE,SAAS,CAAC;QAChB,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;QACrB,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;QACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB;IACD,UAAiB,uBAAwB,SAAQ,cAAc;QAC7D,GAAG,EAAE,SAAS,GAAG,aAAa,CAAC;QAC/B,KAAK,EAAE,KAAK,CAAC;QACb,QAAQ,EAAE,QAAQ,CAAC;KACpB;IACD,UAAiB,QAAS,SAAQ,KAAK,CAAC,cAAc,GAAG,uBAAuB,GAAG,GAAG,CAAC;KAAG;IAC1F,UAAiB,SAAS;QACxB,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC;KAC5E;IACD,UAAiB,UAAU;QACzB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;KAC1B;IACD,UAAiB,aAAa;QAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;KACrB;IACD,UAAiB,OAAO;QACtB,SAAS,EAAE,SAAS,GAAG,aAAa,GAAG,IAAI,CAAC;QAC5C,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;QAC3B,QAAQ,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;QAC/B,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;KACrB;IACD,UAAiB,CAAC;QAChB,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,QAAQ,EAAE,QAAQ,GAC3F,cAAc,GACd,uBAAuB,CAAC;QAC5B,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAAC;KACnD;IACM,IAAI,QAAQ,EAAE,OAAO,CAAC;IAC7B,SAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IACpE,MAAM,KAAK,EAAE,cAAc,CAAC;IACnC,SAAgB,WAAW,CAAC,SAAS,EAAE,GAAG,GAAG,SAAS,IAAI,SAAS,CAAC;IAC7D,MAAM,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,cAAc,KAAK,MAAM,IAAI,cAAc,CAAC;IAC/E,MAAM,gBAAgB,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,uBAAuB,KAAK,MAAM,IAAI,uBAAuB,CAAC;IACjH,SAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC;IACnD,SAAgB,KAAK,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC;IACxC,MAAM,OAAO,EAAE,OAAO,CAAC;IACvB,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACjD,SAAgB,OAAO,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI,CAAC;IAC7C,SAAgB,QAAQ,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI,CAAC;IAC9C,SAAgB,SAAS,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI,CAAC;IAC/C,SAAgB,SAAS,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI,CAAC;IACxC,MAAM,UAAU,EAAE,UAAU,CAAC;IACpC,SAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACpE,SAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IAC9G,SAAgB,gBAAgB,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IACxF,SAAgB,KAAK,CAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;IAC7E,SAAgB,MAAM,IAAI,IAAI,GAAG,MAAM,CAAC;IACxC,SAAgB,WAAW,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI,CAAC;IACxF,SAAgB,OAAO,IAAI,MAAM,GAAG,IAAI,CAAC;IACzC,SAAgB,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAAC;IACxD,MAAM,CAAC,EAAE,CAAC,CAAC;CACnB"}

package/lib/interfaces.ts

@@ -1,98 +0,0 @@
-/* eslint-disable no-use-before-define */
-/* eslint-disable no-unused-vars */
-declare module "valyrian.js" {
-  export interface Props {
-    key?: string | number;
-    state?: any;
-    oncreate?: {
-      (vnode: VnodeInterface): never;
-    };
-    onupdate?: {
-      (vnode: VnodeInterface, oldVnode: VnodeInterface): never;
-    };
-    onremove?: {
-      (oldVnode: VnodeInterface): never;
-    };
-    shouldupdate?: {
-      (vnode: VnodeInterface, oldVnode: VnodeInterface): undefined | boolean;
-    };
-    [key: string | number | symbol]: any;
-  }
-  export interface DomElement extends Element {
-    [key: string]: any;
-  }
-  export interface VnodeInterface {
-    new (tag: string | Component | POJOComponent, props: Props, children: Children): VnodeInterface;
-    tag: string | Component | POJOComponent;
-    props: Props;
-    children: Children;
-    isSVG?: boolean;
-    dom?: DomElement;
-    processed?: boolean;
-    [key: string | number | symbol]: any;
-  }
-  export interface VnodeWithDom extends VnodeInterface {
-    dom: DomElement;
-  }
-  export interface Component {
-    (props?: Props | null, ...children: any[]): VnodeInterface | Children | any;
-    [key: string]: any;
-  }
-  export interface POJOComponent {
-    view: Component;
-    props?: Props | null;
-    children?: any[];
-    [key: string]: any;
-  }
-  export interface VnodeComponentInterface extends VnodeInterface {
-    tag: Component | POJOComponent;
-    props: Props;
-    children: Children;
-  }
-  export interface Children extends Array<VnodeInterface | VnodeComponentInterface | any> {}
-  export interface Directive {
-    (value: any, vnode: VnodeWithDom, oldVnode?: VnodeWithDom): void | boolean;
-  }
-  export interface Directives {
-    [key: string]: Directive;
-  }
-  export interface ReservedProps {
-    [key: string]: true;
-  }
-  export interface Current {
-    component: Component | POJOComponent | null;
-    vnode: VnodeWithDom | null;
-    oldVnode?: VnodeWithDom | null;
-    event: Event | null;
-  }
-  export interface V {
-    (tagOrComponent: string | Component | POJOComponent, props: Props | null, ...children: Children):
-      | VnodeInterface
-      | VnodeComponentInterface;
-    fragment(_: any, ...children: Children): Children;
-  }
-  export let isNodeJs: boolean;
-  export function createDomElement(tag: string, isSVG?: boolean): DomElement;
-  export const Vnode: VnodeInterface;
-  export function isComponent(component: any): component is Component;
-  export const isVnode: (object?: unknown | VnodeInterface) => object is VnodeInterface;
-  export const isVnodeComponent: (object?: unknown | VnodeComponentInterface) => object is VnodeComponentInterface;
-  export function domToVnode(dom: any): VnodeWithDom;
-  export function trust(htmlString: string): any;
-  export const current: Current;
-  export const reservedProps: Record<string, true>;
-  export function onMount(callback: any): void;
-  export function onUpdate(callback: any): void;
-  export function onCleanup(callback: any): void;
-  export function onUnmount(callback: any): void;
-  export const directives: Directives;
-  export function directive(name: string, directive: Directive): void;
-  export function setAttribute(name: string, value: any, newVnode: VnodeWithDom, oldVnode?: VnodeWithDom): void;
-  export function updateAttributes(newVnode: VnodeWithDom, oldVnode?: VnodeWithDom): void;
-  export function patch(newVnode: VnodeWithDom, oldVnode?: VnodeWithDom): void;
-  export function update(): void | string;
-  export function updateVnode(vnode: VnodeWithDom, oldVnode: VnodeWithDom): string | void;
-  export function unmount(): string | void;
-  export function mount(dom: any, component: any): string | void;
-  export const v: V;
-}