bundle started

app.js

@@ -1,4 +1,4 @@
-const {DOM, Tag, H} = Gale({
+const {DOM, Tag, Div} = Gale({
     Button: {
         padding: "20px",
         background: "orange",
@@ -30,15 +30,15 @@ const {DOM, Tag, H} = Gale({
     Orange:{
         background:"orange"
     }
-}, "abilities");
+});
 
 const UI =()=>
 {
-  return H.Window(
-    H.Ability({class:Tag("Ability", "Orange")}),
-    H.Ability(),
-    H.Ability(),
-    H.Ability.Orange(),
+  return Div.Window(
+    Div.Ability({class:Tag("Ability", "Orange")}),
+    Div.Ability(),
+    Div.Ability(),
+    Div.Ability.Orange(),
   )
 }
 

deno.json

@@ -9,7 +9,8 @@
     {
         "work": "deno run -Ar ./scripts/dev_server.ts",
         "scan": "deno run -Ar ./scripts/refresh_types.ts",
-        "html": "deno run -Ar ./scripts/scaffold.ts --html"
+        "html": "deno run -Ar ./scripts/scaffold.ts --html",
+        "make": "deno bundle --no-lock --platform=browser --inline-imports=true --output=bundle.js --minify src/bundle_entry.ts"
     },
     "imports":
     {

deno.lock

@@ -1,13 +1,27 @@
 {
-  "version": "4",
+  "version": "5",
   "specifiers": {
-    "jsr:@std/media-types@*": "1.1.0"
+    "jsr:@std/media-types@*": "1.1.0",
+    "npm:vanjs-core@*": "1.5.5",
+    "npm:vanjs-core@^1.5.5": "1.5.5",
+    "npm:vanjs-ext@~0.6.3": "0.6.3"
   },
   "jsr": {
     "@std/media-types@1.1.0": {
       "integrity": "c9d093f0c05c3512932b330e3cc1fe1d627b301db33a4c2c2185c02471d6eaa4"
     }
   },
+  "npm": {
+    "vanjs-core@1.5.5": {
+      "integrity": "sha512-BC9MjbXYIRqnwncXfacT6upJpVmIKyrV2MjZi8NuCK+yc9RP0hfdghTpmEuYswXOfkLarDPPcYK4X6q68T9e+g=="
+    },
+    "vanjs-ext@0.6.3": {
+      "integrity": "sha512-Jmaeqx9nCjelwDVSQEaRtt7R4Y/Kj/zJBG3bZSiIPj8Wtr8nEFRsJX9K5qcGl1o3cGEEFBE9suyoSqs/6tiOBg==",
+      "dependencies": [
+        "vanjs-core"
+      ]
+    }
+  },
   "redirects": {
     "https://deno.land/std/path/mod.ts": "https://deno.land/std@0.224.0/path/mod.ts"
   },

dist/core.d.ts

@@ -62,26 +62,42 @@ declare global
     readonly noreactive: <T extends object>(obj: T) => T
     readonly stateFields: <T extends object>(obj: T) => VanX.StateOf<T>
     readonly raw: <T extends object>(obj: T) => T
-    readonly list: <T extends object, ElementType extends Element>(container: (() => ElementType) | ElementType, items: T,itemFunc: (v: Van.State<VanX.ValueType<T>>, deleter: () => void, k: VanX.KeyType<T>) => Node) => ElementType
+    readonly list: <T extends object, ElementType extends Element>(
+      container: (() => ElementType) | ElementType,
+      items: T,itemFunc: (v: Van.State<VanX.ValueType<T>>, deleter: () => void, k: VanX.KeyType<T>) => Node
+    ) => ElementType
     readonly replace: <T extends object>(obj: T, replacement: VanX.ReplacementFunc<T> | T) => T
     readonly compact: <T extends object>(obj: T) => T
+    // my addition
+    readonly Store: <T extends object>(obj:T, key:string)=>T
   };
 
   namespace Gale { 
     type KeyQuery = "@";
-    type KeyPseudo = ":";
+    type KeyState = ":";
     type KeyChild = ".";
     type KeyGroup = "^";
-    type UserStyles = Partial<CSSStyleDeclaration> & {[key: `${KeyQuery|KeyPseudo|KeyChild|KeyGroup}${string}`]: UserStyles }
+    type UserStyles = Partial<CSSStyleDeclaration> & {[key: `${KeyQuery|KeyState|KeyChild|KeyGroup}${string}`]: UserStyles }
     type UserSheet = Record<string, UserStyles>
     type CollectKeys<Obj> = {[Key in keyof Obj]: Obj[Key] extends object ? Key | CollectKeys<Obj[Key]> : Key }[keyof Obj]
     type FilterKeys<Keys> = Keys extends `${KeyChild|KeyGroup}${infer Rest}` ? Keys : never
     type CrossMultiply<A, B> = A extends string ? B extends string ? `${A}${B}` : never : never 
     type CrossMultiplyRecord<Rec> = keyof Rec | { [K in keyof Rec]: K extends string ? CrossMultiply<K, FilterKeys<CollectKeys<Rec[K]>>> : never }[keyof Rec]
-    type Tier = (selector:string, obj:UserStyles)=>string;
-    type CreateSheet = <T extends UserSheet>(sheet:UserSheet&T)=> ((...args:CrossMultiplyRecord<T>[])=>string)&{css:string}
+    type Tier = (selector:string, obj:UserStyles, suffix:string)=>string;
+    type CreateSheet = <T extends UserSheet>(sheet:UserSheet&T, hash?:string)=>{
+      Tag:(...args:CrossMultiplyRecord<T>[])=>string,
+      CSS:string,
+      DOM:Elemental<CrossMultiplyRecord<T>>,
+      Div:Circular<CrossMultiplyRecord<T>, Van.TagFunc<HTMLDivElement>>
     }
     
-  const Gale:Gale.CreateSheet
 
+    type Elemental<T extends string> = {[K in keyof HTMLElementTagNameMap]: Van.TagFunc<HTMLElementTagNameMap[K]>&Circular<T, Van.TagFunc<HTMLElementTagNameMap[K]>>}
+
+    type Circular<Keys extends string, Func> = {
+        [K in Keys]: Circular<Keys, Func>&Func
+    };
+    
+  }
+  const Gale:Gale.CreateSheet
 }

dist/core.js

@@ -1,3 +1,4 @@
+
 //van
 {let e,t,r,o,n,l,s,i,f,h,w,a,d,u,_,c,S,g,y,b,m,v,j,x,O;s=Object.getPrototypeOf,f={},h=s(i={isConnected:1}),w=s(s),a=(e,t,r,o)=>(e??(setTimeout(r,o),new Set)).add(t),d=(e,t,o)=>{let n=r;r=t;try{return e(o)}catch(e){return console.error(e),o}finally{r=n}},u=e=>e.filter(e=>e.t?.isConnected),_=e=>n=a(n,e,()=>{for(let e of n)e.o=u(e.o),e.l=u(e.l);n=l},1e3),c={get val(){return r?.i?.add(this),this.rawVal},get oldVal(){return r?.i?.add(this),this.h},set val(o){r?.u?.add(this),o!==this.rawVal&&(this.rawVal=o,this.o.length+this.l.length?(t?.add(this),e=a(e,this,x)):this.h=o)}},S=e=>({__proto__:c,rawVal:e,h:e,o:[],l:[]}),g=(e,t)=>{let r={i:new Set,u:new Set},n={f:e},l=o;o=[];let s=d(e,r,t);s=(s??document).nodeType?s:new Text(s);for(let e of r.i)r.u.has(e)||(_(e),e.o.push(n));for(let e of o)e.t=s;return o=l,n.t=s},y=(e,t=S(),r)=>{let n={i:new Set,u:new Set},l={f:e,s:t};l.t=r??o?.push(l)??i,t.val=d(e,n,t.rawVal);for(let e of n.i)n.u.has(e)||(_(e),e.l.push(l));return t},b=(e,...t)=>{for(let r of t.flat(1/0)){let t=s(r??0),o=t===c?g(()=>r.val):t===w?g(r):r;o!=l&&e.append(o)}return e},m=(e,t,...r)=>{let[{is:o,...n},...i]=s(r[0]??0)===h?r:[{},...r],a=e?document.createElementNS(e,t,{is:o}):document.createElement(t,{is:o});for(let[e,r]of Object.entries(n)){let o=t=>t?Object.getOwnPropertyDescriptor(t,e)??o(s(t)):l,n=t+","+e,i=f[n]??=o(s(a))?.set??0,h=e.startsWith("on")?(t,r)=>{let o=e.slice(2);a.removeEventListener(o,r),a.addEventListener(o,t)}:i?i.bind(a):a.setAttribute.bind(a,e),d=s(r??0);e.startsWith("on")||d===w&&(r=y(r),d=c),d===c?g(()=>(h(r.val,r.h),a)):h(r)}return b(a,i)},v=e=>({get:(t,r)=>m.bind(l,e,r)}),j=(e,t)=>t?t!==e&&e.replaceWith(t):e.remove(),x=()=>{let r=0,o=[...e].filter(e=>e.rawVal!==e.h);do{t=new Set;for(let e of new Set(o.flatMap(e=>e.l=u(e.l))))y(e.f,e.s,e.t),e.t=l}while(++r<100&&(o=[...t]).length);let n=[...e].filter(e=>e.rawVal!==e.h);e=l;for(let e of new Set(n.flatMap(e=>e.o=u(e.o))))j(e.t,g(e.f,e.t)),e.t=l;for(let e of n)e.h=e.rawVal},O={tags:new Proxy(e=>new Proxy(m,v(e)),v()),hydrate:(e,t)=>j(e,g(t,e)),add:b,state:S,derive:y},window.van=O;}
 
@@ -5,7 +6,13 @@
 {let e,t,r,{fromEntries:o,entries:l,keys:n,hasOwn:f,getPrototypeOf:a}=Object,{get:i,set:y,deleteProperty:c,ownKeys:s}=Reflect,{state:m,derive:d,add:u}=van,b=1e3,w=Symbol(),A=Symbol(),S=Symbol(),_=Symbol(),g=Symbol(),p=Symbol(),P=e=>(e[A]=1,e),v=e=>e instanceof Object&&!(e instanceof Function)&&!e[p],h=e=>{if(e?.[A]){let t=m();return d(()=>{let r=e();v(t.rawVal)&&v(r)?B(t.rawVal,r):t.val=x(r)}),t}return m(x(e))},F=e=>{let t=Array.isArray(e)?[]:{__proto__:a(e)};for(let[r,o]of l(e))t[r]=h(o);return t[S]=[],t[_]=m(1),t},O={get:(e,t,r)=>t===w?e:f(e,t)?Array.isArray(e)&&"length"===t?(e[_].val,e.length):e[t].val:i(e,t,r),set:(e,o,l,n)=>f(e,o)?Array.isArray(e)&&"length"===o?(l!==e.length&&++e[_].val,e.length=l,1):(e[o].val=x(l),1):o in e?y(e,o,l,n):y(e,o,h(l))&&(++e[_].val,C(e).forEach(E.bind(t,n,o,e[o],r)),1),deleteProperty:(e,t)=>(c(e,t)&&R(e,t),++e[_].val),ownKeys:e=>(e[_].val,s(e))},x=e=>!v(e)||e[w]?e:new Proxy(F(e),O),D=e=>(e[p]=1,e),j=e=>e[w],K=a(m()),N=e=>new Proxy(e,{get:(e,t,r)=>a(e[t]??0)===K?{val:k(e[t].rawVal)}:i(e,t,r)}),k=e=>e?.[w]?new Proxy(N(e[w]),O):e,C=e=>e[S]=e[S].filter(e=>e.t.isConnected),E=(e,t,r,o,{t:l,f:f})=>{let a=Array.isArray(e),i=a?Number(t):t;u(l,()=>l[g][t]=f(r,()=>delete e[t],i)),a&&!o&&i!==e.length-1&&l.insertBefore(l.lastChild,l[g][n(e).find(e=>Number(e)>i)])},R=(e,t)=>{for(let r of C(e)){let e=r.t[g];e[t]?.remove(),delete e[t]}},T=r=>(e??(setTimeout(()=>(e.forEach(C),e=t),b),e=new Set)).add(r),q=(e,t,r)=>{let o={t:e instanceof Function?e():e,f:r},n=t[w];o.t[g]={},n[S].push(o),T(n);for(let[e,r]of l(n))E(t,e,r,1,o);return o.t},z=(e,t)=>{for(let[r,o]of l(t)){let t=e[r];v(t)&&v(o)?z(t,o):e[r]=o}for(let r in e)f(t,r)||delete e[r];let r=n(t),o=Array.isArray(e);if(o||n(e).some((e,t)=>e!==r[t])){let l=e[w];if(o)e.length=t.length;else{++l[_].val;let e={...l};for(let e of r)delete l[e];for(let t of r)l[t]=e[t]}for(let{t:e}of C(l)){let{firstChild:t,[g]:o}=e;for(let l of r)t===o[l]?t=t.nextSibling:e.insertBefore(o[l],t)}}return e},B=(e,n)=>{r=1;try{return z(e,n instanceof Function?Array.isArray(e)?n(e.filter(e=>1)):o(n(l(e))):n)}finally{r=t}},G=e=>Array.isArray(e)?e.filter(e=>1).map(G):v(e)?o(l(e).map(([e,t])=>[e,G(t)])):e;window.vanX={calc:P,reactive:x,noreactive:D,stateFields:j,raw:k,list:q,replace:B,compact:G}}
 
 //Store
-vanX.Store=(e,t)=>{const a=localStorage.getItem(t),r=vanX.reactive(a?JSON.parse(a):e);return van.derive((()=>localStorage.setItem(t,JSON.stringify(vanX.compact(r))))),r};
+vanX.Store=(e,t)=>
+{
+    const a = localStorage.getItem(t);
+    const r = vanX.reactive( a ? JSON.parse(a) : e );
+    
+    return van.derive( (()=>localStorage.setItem(t,JSON.stringify(vanX.compact(r)))) ),r
+};
 
 //gale
 globalThis.Gale=(e,t="")=>{const n=(e,t,s)=>`${e}{${Object.keys(t).map((e=>{const r=t[e];switch(e[0]){case"@":return n(`@media(max-width:${e.substring(1)})`,r,s);case":":return n(`&${e}`,r,s);case".":return n(`${e}${s}`,r,s);case"^":return n(`&:hover .${e.substring(1)}${s}`,r,s)}return`${e.replace(/([a-z])([A-Z])/g,"$1-$2")}: ${r};`})).join("\n")}}`,s=(e,t)=>{const n=t.lastIndexOf(e)+e.length;return n?t.substring(n):t},r=e=>{const t=van.tags[e];let n=[];const s=new Proxy(((...e)=>{const s=t(...e);return s.className=n.join(a+" ")+a+" "+s.className,n=[],s}),{get:(e,t)=>(n.push(t.substring(t.lastIndexOf(".")+1)),s)});return s},a=t?"_"+t:"",c=Object.keys(e).map((t=>n("."+t+a,e[t],a))).join("\n");return globalThis.document?.head.insertAdjacentHTML("beforeend",`<style data-sheet="${a}">${c}</style>`),{Tag:(...e)=>e.map((e=>s("^",s(".",e)))).join(a+" ")+a,CSS:c,DOM:new Proxy({},{get:(e,t)=>r(t)}),H:new Proxy({},{get:(e,t)=>r("div")[t]})}};

index.html

@@ -4,8 +4,12 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <!-- css reset --><style>*{margin:0;padding:0;box-sizing:border-box;}html, body{height:100%;width:100%;font-family:Arial, sans-serif;line-height:1.6;}body{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;}img, video{max-width:100%;height:auto;}a{text-decoration:none;color:inherit;}ul, ol{list-style:none;}button, input, textarea{font-family:inherit;font-size:inherit;line-height:inherit;border:none;background:none;padding:0;margin:0;outline:none;}table{border-collapse:collapse;width:100%;}</style>
-        <script src="./dist/core.js"></script>
-        <script src="./src/gale.js"></script>
+        <script src="./bundle.js"></script>
+        <script>
+            console.log(Gale);
+            console.log(van);
+            console.log(vanX);
+        </script>
     </head>
     <body></body>
 </html>

scripts/bundle_subprocess.ts

@@ -0,0 +1,8 @@
+const command = new Deno.Command("deno bundle", {});
+const decode = new TextDecoder("utf-8");
+
+const output = await command.output();
+
+
+
+console.assert()

src/bundle_entry.ts

@@ -0,0 +1,10 @@
+import Van from "npm:vanjs-core@^1.5.5";
+globalThis.van = Van;
+
+import * as VanX from "npm:vanjs-ext@^0.6.3";
+globalThis.vanX = VanX;
+
+import Gale from "./gale.js";
+globalThis.Gale = Gale;
+
+import "./hmr.js";

src/gale.js

@@ -1,5 +1,5 @@
 /** @type {Gale.CreateSheet} */
-globalThis.Gale = (sheet, hash="")=>
+export default (sheet, hash="")=>
 {
     const KeyQuery = "@";
     const KeyState = ":";
@@ -76,7 +76,7 @@ globalThis.Gale = (sheet, hash="")=>
                 }
             }
         ),
-        H: new Proxy(
+        Div: new Proxy(
             {},
             {
                 get(_, prop)

src/hmr.js

@@ -1,6 +1,4 @@
-//@ts-check
-// hmr
-const HMR = globalThis.HMR = {
+export default {
     Time: 0,
     /** @type {Record<string, string>} */
     Temp:{},