@ryupold/vode 0.12.3 → 0.13.1

package/.github/workflows/npm-publish.yml

@@ -1,7 +1,8 @@
 name: Publish to https://registry.npmjs.org
 
 on:
-  push:
+  release:
+    types: published
     branches:
       - 'main'
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ryupold/vode",
-    "version": "0.12.3",
+    "version": "0.13.1",
     "description": "Small web framework for minimal websites",
     "author": "Michael Scherbakow (ryupold)",
     "license": "MIT",

package/src/vode.ts

@@ -1,8 +1,8 @@
 export type Vode<S> = FullVode<S> | JustTagVode | NoPropsVode<S>;
-export type ChildVode<S> = Vode<S> | TextVode | NoVode | Component<S>;
 export type FullVode<S> = [tag: Tag, props: Props<S>, ...children: ChildVode<S>[]];
 export type NoPropsVode<S> = [tag: Tag, ...children: ChildVode<S>[]] | string[];
 export type JustTagVode = [tag: Tag];
+export type ChildVode<S> = Vode<S> | TextVode | NoVode | Component<S>;
 export type TextVode = string;
 export type NoVode = undefined | null | number | boolean | bigint | void;
 export type AttachedVode<S> = Vode<S> & { node: ChildNode, id?: string } | Text & { node?: never, id?: never };
@@ -11,12 +11,12 @@ export type Component<S> = (s: S) => ChildVode<S>;
 
 export type Patch<S> =
     | NoRenderPatch // ignored
-    | {} | DeepPartial<S> // render patches
+    | RenderPatch<S>
     | Promise<Patch<S>> | Effect<S>; // effects resulting in patches
 
 export type NoRenderPatch = undefined | null | number | boolean | bigint | string | symbol | void;
-
-export type DeepPartial<S> = { [P in keyof S]?: S[P] extends Array<infer I> ? Array<Patch<I>> : Patch<S[P]> };
+export type RenderPatch<S> = {} | DeepPartial<S>;
+export type DeepPartial<S> = { [P in keyof S]?: S[P] extends Array<infer I> ? Array<DeepPartial<I>> : DeepPartial<S[P]> };
 
 export type Effect<S> =
     | (() => Patch<S>)
@@ -62,8 +62,10 @@ export type EventsMap =
     & { [K in keyof SVGElementEventMap as `on${K}`]: SVGElementEventMap[K] }
     & { onsearch: Event };
 
-export type PropertyValue<S> = string | boolean | null | undefined | StyleProp | ClassProp | Patch<S> | void;
-
+export type PropertyValue<S> =
+    | string | boolean | null | undefined | void
+    | StyleProp | ClassProp
+    | Patch<S>;
 
 export type Dispatch<S> = (action: Patch<S>) => void;
 export type PatchableState<S> = S & { patch: Dispatch<Patch<S>> };
@@ -319,16 +321,6 @@ export function childrenStart<S>(vode: ChildVode<S> | AttachedVode<S>): number {
     return props(vode) ? 2 : 1;
 }
 
-/** @returns multiple merged objects as one, applying from left to right ({}, first, ...p) */
-export function merge(first?: object | unknown, ...p: (object | unknown)[]): object {
-    first = mergeState({}, first);
-    for (const pp of p) {
-        if (!pp) continue;
-        first = mergeState(first, pp);
-    }
-    return first!;
-}
-
 function mergeState(target: any, source: any) {
     if (!source) return target;
 
@@ -663,13 +655,12 @@ function patchProperty<S>(patch: Dispatch<S>, node: ChildNode, key: string | key
 }
 
 function classString(classProp: ClassProp): string {
-    if (typeof classProp === "string") {
+    if (typeof classProp === "string")
         return classProp;
-    } else if (Array.isArray(classProp)) {
+    else if (Array.isArray(classProp))
         return classProp.map(classString).join(" ");
-    } else if (typeof classProp === "object") {
+    else if (typeof classProp === "object")
         return Object.keys(classProp!).filter(k => classProp![k]).join(" ");
-    } else {
+    else
         return "";
-    }
 }

package/vode.mjs

@@ -187,15 +187,6 @@ function child(vode2, index) {
 function childrenStart(vode2) {
   return props(vode2) ? 2 : 1;
 }
-function merge(first, ...p) {
-  first = mergeState({}, first);
-  for (const pp of p) {
-    if (!pp)
-      continue;
-    first = mergeState(first, pp);
-  }
-  return first;
-}
 function mergeState(target, source) {
   if (!source)
     return target;
@@ -478,15 +469,14 @@ function patchProperty(patch, node, key, oldValue, newValue, isSvg) {
   return newValue;
 }
 function classString(classProp) {
-  if (typeof classProp === "string") {
+  if (typeof classProp === "string")
     return classProp;
-  } else if (Array.isArray(classProp)) {
+  else if (Array.isArray(classProp))
     return classProp.map(classString).join(" ");
-  } else if (typeof classProp === "object") {
+  else if (typeof classProp === "object")
     return Object.keys(classProp).filter((k) => classProp[k]).join(" ");
-  } else {
+  else
     return "";
-  }
 }
 // src/vode-tags.ts
 var A = "a";
@@ -727,7 +717,6 @@ export {
   tag,
   props,
   mergeClass,
-  merge,
   memo,
   htmlToVode,
   createState,