Skip to content

Commit 2b2d81b

Browse files
HelpfulScriptsHelpfulScripts
committed
mithril type update
1 parent 41b9855 commit 2b2d81b

File tree

11 files changed

+39
-180
lines changed

11 files changed

+39
-180
lines changed

‎Gruntfile.cjs

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function make(grunt) {
4646
const devPath = dir.slice(0, dir.indexOf('/dev/')+5);
4747
const pkg = grunt.file.readJSON(dir+'/package.json');
4848
const slash = pkg.name.lastIndexOf('/');
49-
lib = cfg.lib || hsCamelCase(slash<0? pkg.name : pkg.name.slice(slash+1));
49+
const lib = cfg.lib || hsCamelCase(slash<0? pkg.name : pkg.name.slice(slash+1));
5050
const libPath = lib.toLowerCase();
5151
console.log(`${devPath} > ${lib}: ${type}`);
5252

@@ -166,6 +166,7 @@ function make(grunt) {
166166
src:['**/*.*'], dest:`node_modules/${libPath}/` },
167167
{ expand:true, cwd: './', // copy everything from bin
168168
src:['package.json', '*.md'], dest:`node_modules/${libPath}/` },
169+
// mark cjs folder as commonJS to Node:
169170
{ src:'./packageCJS.json', dest:`./node_modules/${libPath}/cjs/package.json` },
170171
]},
171172
app2NPM: { files: [

‎docs/data/hsLayout.json

-91
Original file line numberDiff line numberDiff line change
@@ -565,96 +565,6 @@
565565
},
566566
{
567567
"id": 265,
568-
"name": "\"mithril\"",
569-
"kind": 1,
570-
"kindString": "Module",
571-
"flags": {
572-
"isExported": true
573-
},
574-
"originalName": "/Users/sth1pal/Documents/Development/JavaScript/nodejs/ts6/dev/hsLibs/mithril/hsLayout/src/mithril.ts",
575-
"comment": {
576-
"shortText": "translates mithril libraries to an ES6 module and provides some Typescript type shortcuts."
577-
},
578-
"children": [
579-
{
580-
"id": 267,
581-
"name": "Vnode",
582-
"kind": 4194304,
583-
"kindString": "Type alias",
584-
"flags": {
585-
"isExported": true
586-
},
587-
"sources": [
588-
{
589-
"fileName": "mithril.ts",
590-
"line": 12,
591-
"character": 17
592-
}
593-
],
594-
"type": {
595-
"type": "reference",
596-
"typeArguments": [
597-
{
598-
"type": "intrinsic",
599-
"name": "any"
600-
},
601-
{
602-
"type": "intrinsic",
603-
"name": "any"
604-
}
605-
],
606-
"name": "_m.Vnode"
607-
}
608-
},
609-
{
610-
"id": 266,
611-
"name": "m",
612-
"kind": 32,
613-
"kindString": "Variable",
614-
"flags": {
615-
"isExported": true,
616-
"isConst": true
617-
},
618-
"sources": [
619-
{
620-
"fileName": "mithril.ts",
621-
"line": 11,
622-
"character": 14
623-
}
624-
],
625-
"type": {
626-
"type": "reference",
627-
"name": "Static"
628-
},
629-
"defaultValue": "_m"
630-
}
631-
],
632-
"groups": [
633-
{
634-
"title": "Type aliases",
635-
"kind": 4194304,
636-
"children": [
637-
267
638-
]
639-
},
640-
{
641-
"title": "Variables",
642-
"kind": 32,
643-
"children": [
644-
266
645-
]
646-
}
647-
],
648-
"sources": [
649-
{
650-
"fileName": "mithril.ts",
651-
"line": 1,
652-
"character": 0
653-
}
654-
]
655-
},
656-
{
657-
"id": 268,
658568
"name": "\"overview\"",
659569
"kind": 1,
660570
"kindString": "Module",
@@ -5905,7 +5815,6 @@
59055815
1,
59065816
256,
59075817
265,
5908-
268,
59095818
62,
59105819
84,
59115820
109,

‎docs/data/src/hsLayout/coverage/index.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ <h1>hsLayout: All files</h1>
2323
<div class='clearfix'>
2424

2525
<div class='fl pad1y space-right2'>
26-
<span class="strong">95.16% </span>
26+
<span class="strong">95.12% </span>
2727
<span class="quiet">Statements</span>
28-
<span class='fraction'>275/289</span>
28+
<span class='fraction'>273/287</span>
2929
</div>
3030

3131

@@ -46,7 +46,7 @@ <h1>hsLayout: All files</h1>
4646
<div class='fl pad1y space-right2'>
4747
<span class="strong">100% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>233/233</span>
49+
<span class='fraction'>231/231</span>
5050
</div>
5151

5252

@@ -89,17 +89,17 @@ <h1>hsLayout: All files</h1>
8989

9090
<tr>
9191
<td class="file high" data-value="src/view"><a href="src/view/index.html">src/view</a></td>
92-
<td data-value="95.82" class="pic high">
92+
<td data-value="95.78" class="pic high">
9393
<div class="chart"><div class="cover-fill" style="width: 95%"></div><div class="cover-empty" style="width: 5%"></div></div>
9494
</td>
95-
<td data-value="95.82" class="pct high">95.82%</td>
96-
<td data-value="239" class="abs high">229/239</td>
95+
<td data-value="95.78" class="pct high">95.78%</td>
96+
<td data-value="237" class="abs high">227/237</td>
9797
<td data-value="78.85" class="pct medium">78.85%</td>
9898
<td data-value="104" class="abs medium">82/104</td>
9999
<td data-value="98.08" class="pct high">98.08%</td>
100100
<td data-value="52" class="abs high">51/52</td>
101101
<td data-value="100" class="pct high">100%</td>
102-
<td data-value="197" class="abs high">197/197</td>
102+
<td data-value="195" class="abs high">195/195</td>
103103
</tr>
104104

105105
</tbody>

‎docs/data/src/hsLayout/coverage/src/view/Layout.ts.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ <h1><a href="../../index.html">hsLayout: All files</a> / <a href="index.html">sr
2323
<div class='clearfix'>
2424

2525
<div class='fl pad1y space-right2'>
26-
<span class="strong">96.88% </span>
26+
<span class="strong">96.67% </span>
2727
<span class="quiet">Statements</span>
28-
<span class='fraction'>31/32</span>
28+
<span class='fraction'>29/30</span>
2929
</div>
3030

3131

@@ -46,7 +46,7 @@ <h1><a href="../../index.html">hsLayout: All files</a> / <a href="index.html">sr
4646
<div class='fl pad1y space-right2'>
4747
<span class="strong">100% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>28/28</span>
49+
<span class='fraction'>26/26</span>
5050
</div>
5151

5252

@@ -408,8 +408,8 @@ <h1><a href="../../index.html">hsLayout: All files</a> / <a href="index.html">sr
408408
<span class="cline-any cline-yes">2x</span>
409409
<span class="cline-any cline-yes">2x</span>
410410
<span class="cline-any cline-yes">2x</span>
411-
<span class="cline-any cline-yes">2x</span>
412-
<span class="cline-any cline-yes">2x</span>
411+
<span class="cline-any cline-neutral">&nbsp;</span>
412+
<span class="cline-any cline-neutral">&nbsp;</span>
413413
<span class="cline-any cline-neutral">&nbsp;</span>
414414
<span class="cline-any cline-yes">4x</span>
415415
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -575,8 +575,8 @@ <h1><a href="../../index.html">hsLayout: All files</a> / <a href="index.html">sr
575575
view(node:Vnode): Vnode {
576576
const content = this.normalizeContent(this.getComponents(node)); // --&gt; Vnode[]
577577
let css = Layouter.createLayout(node.attrs, content);
578-
const attrs:any = {
579-
// style: node.style,
578+
const attrs:m.Attributes = {
579+
style: (&lt;any&gt;node).style,
580580
route: node.attrs.route,
581581
onclick: node.attrs.onclick,
582582
onmouseenter: node.attrs.onmouseenter,
@@ -588,8 +588,8 @@ <h1><a href="../../index.html">hsLayout: All files</a> / <a href="index.html">sr
588588
log.debug(<span class="fstat-no" title="function not covered" >()=</span>&gt;<span class="cstat-no" title="statement not covered" >`href ${node.attrs.href}`)</span>;
589589
attrs.href = node.attrs.href;
590590
attrs.target = attrs.target || '_blank';
591-
attrs.oncreate = m.route.Link;
592-
attrs.onupdate = m.route.Link;
591+
// attrs.oncreate = m.route.Link;
592+
// attrs.onupdate = m.route.Link;
593593
// attrs.onclick = () =&gt; window.open(node.attrs.href, '_blank');
594594
return m(`a.hs-layout ${css} ${this.getCSS(node)}`, attrs, content.map((c:any) =&gt; c));
595595
} else {

‎docs/data/src/hsLayout/coverage/src/view/index.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ <h1><a href="../../index.html">hsLayout: All files</a> src/view</h1>
2323
<div class='clearfix'>
2424

2525
<div class='fl pad1y space-right2'>
26-
<span class="strong">95.82% </span>
26+
<span class="strong">95.78% </span>
2727
<span class="quiet">Statements</span>
28-
<span class='fraction'>229/239</span>
28+
<span class='fraction'>227/237</span>
2929
</div>
3030

3131

@@ -46,7 +46,7 @@ <h1><a href="../../index.html">hsLayout: All files</a> src/view</h1>
4646
<div class='fl pad1y space-right2'>
4747
<span class="strong">100% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>197/197</span>
49+
<span class='fraction'>195/195</span>
5050
</div>
5151

5252

@@ -74,17 +74,17 @@ <h1><a href="../../index.html">hsLayout: All files</a> src/view</h1>
7474
</thead>
7575
<tbody><tr>
7676
<td class="file high" data-value="Layout.ts"><a href="Layout.ts.html">Layout.ts</a></td>
77-
<td data-value="96.88" class="pic high">
77+
<td data-value="96.67" class="pic high">
7878
<div class="chart"><div class="cover-fill" style="width: 96%"></div><div class="cover-empty" style="width: 4%"></div></div>
7979
</td>
80-
<td data-value="96.88" class="pct high">96.88%</td>
81-
<td data-value="32" class="abs high">31/32</td>
80+
<td data-value="96.67" class="pct high">96.67%</td>
81+
<td data-value="30" class="abs high">29/30</td>
8282
<td data-value="93.75" class="pct high">93.75%</td>
8383
<td data-value="16" class="abs high">15/16</td>
8484
<td data-value="88.89" class="pct high">88.89%</td>
8585
<td data-value="9" class="abs high">8/9</td>
8686
<td data-value="100" class="pct high">100%</td>
87-
<td data-value="28" class="abs high">28/28</td>
87+
<td data-value="26" class="abs high">26/26</td>
8888
</tr>
8989

9090
<tr>

‎docs/data/src/hsLayout/mithril.html

-38
This file was deleted.

‎docs/data/src/hsLayout/view/Layout.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ <h1>Layout.ts</h1>
179179
<p id=156 class="line"><span>&nbsp;156</span>&nbsp;&nbsp;&nbsp;&nbsp;view(node:Vnode):&nbsp;Vnode&nbsp;{</p>
180180
<p id=157 class="line"><span>&nbsp;157</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const&nbsp;content&nbsp;=&nbsp;this.normalizeContent(this.getComponents(node));&nbsp;<comment>//&nbsp;-->&nbsp;Vnode[]</comment></p>
181181
<p id=158 class="line"><span>&nbsp;158</span><comment></comment>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;let&nbsp;css&nbsp;=&nbsp;Layouter.createLayout(node.attrs,&nbsp;content);</p>
182-
<p id=159 class="line"><span>&nbsp;159</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const&nbsp;attrs:any&nbsp;=&nbsp;{</p>
183-
<p id=160 class="line"><span>&nbsp;160</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<comment>//&nbsp;style:&nbsp;node.style,</comment></p>
184-
<p id=161 class="line"><span>&nbsp;161</span><comment></comment>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;route:&nbsp;node.attrs.route,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
182+
<p id=159 class="line"><span>&nbsp;159</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const&nbsp;attrs:m.Attributes&nbsp;=&nbsp;{</p>
183+
<p id=160 class="line"><span>&nbsp;160</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;style:&nbsp;(<any>node).style,</p>
184+
<p id=161 class="line"><span>&nbsp;161</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;route:&nbsp;node.attrs.route,&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
185185
<p id=162 class="line"><span>&nbsp;162</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;onclick:&nbsp;node.attrs.onclick,</p>
186186
<p id=163 class="line"><span>&nbsp;163</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;onmouseenter:&nbsp;node.attrs.onmouseenter,</p>
187187
<p id=164 class="line"><span>&nbsp;164</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;onmousemove:&nbsp;node.attrs.onmousemove,</p>
@@ -192,9 +192,9 @@ <h1>Layout.ts</h1>
192192
<p id=169 class="line"><span>&nbsp;169</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;log.debug(()=>`href&nbsp;${node.attrs.href}`);</p>
193193
<p id=170 class="line"><span>&nbsp;170</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;attrs.href&nbsp;=&nbsp;node.attrs.href;</p>
194194
<p id=171 class="line"><span>&nbsp;171</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;attrs.target&nbsp;=&nbsp;attrs.target&nbsp;||&nbsp;<quote>'_blank'</quote>;</p>
195-
<p id=172 class="line"><span>&nbsp;172</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;attrs.oncreate&nbsp;=&nbsp;m.route.Link;</p>
196-
<p id=173 class="line"><span>&nbsp;173</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;attrs.onupdate&nbsp;=&nbsp;m.route.Link;</p>
197-
<p id=174 class="line"><span>&nbsp;174</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<comment>//&nbsp;attrs.onclick&nbsp;=&nbsp;()&nbsp;=>&nbsp;window.open(node.attrs.href,&nbsp;<quote>'_blank'</quote>);</comment></p>
195+
<p id=172 class="line"><span>&nbsp;172</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<comment>//&nbsp;attrs.oncreate&nbsp;=&nbsp;m.route.Link;</comment></p>
196+
<p id=173 class="line"><span>&nbsp;173</span><comment></comment>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<comment>//&nbsp;attrs.onupdate&nbsp;=&nbsp;m.route.Link;</comment></p>
197+
<p id=174 class="line"><span>&nbsp;174</span><comment></comment>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<comment>//&nbsp;attrs.onclick&nbsp;=&nbsp;()&nbsp;=>&nbsp;window.open(node.attrs.href,&nbsp;<quote>'_blank'</quote>);</comment></p>
198198
<p id=175 class="line"><span>&nbsp;175</span><comment></comment>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;m(`a.hs-layout&nbsp;${css}&nbsp;${this.getCSS(node)}`,&nbsp;attrs,&nbsp;content.map((c:any)&nbsp;=>&nbsp;c));</p>
199199
<p id=176 class="line"><span>&nbsp;176</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;{</p>
200200
<p id=177 class="line"><span>&nbsp;177</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;m(`.hs-layout&nbsp;${css}&nbsp;${this.getCSS(node)}`,&nbsp;attrs,&nbsp;content.map((c:any)&nbsp;=>&nbsp;c));</p>

0 commit comments

Comments
 (0)