$mol_task bases $mol_dom_jsx. Bundle relative $mol_file base.

hyoo-ru · Dec 6, 2017 · a2e9ac8 · a2e9ac8
1 parent f121e84
commit a2e9ac8
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/app/bench/bench.view.css → app/bench/bench/bench.view.css b/app/bench/bench.view.css → app/bench/bench/bench.view.css
diff --git a/app/bench/bench.view.tree → app/bench/bench/bench.view.tree b/app/bench/bench.view.tree → app/bench/bench/bench.view.tree
diff --git a/app/bench/bench.view.ts → app/bench/bench/bench.view.ts b/app/bench/bench.view.ts → app/bench/bench/bench.view.ts
diff --git a/app/bench/index.html b/app/bench/index.html
@@ -4,7 +4,7 @@
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1">
 
-<script src="-/web.js"></script>
+<script src="bench/-/web.js"></script>
 <link rel="stylesheet" href="-/web.css" />
 
 <body mol_view_root="$mol_app_bench">
diff --git a/app/bench/list/index.html b/app/bench/list/index.html
@@ -62,7 +62,7 @@
 			} ,
 			'tsx' : {
 				title : { 'en' : '$mol_dom_jsx' } ,
-				weight : '2.8 KB' ,
+				weight : '3.4 KB' ,
 			} ,
 			'react' : {
 				title : { 'en' : 'ReactJS 16.0.0' } ,

diff --git a/app/bench/list/tsx/index.tsx b/app/bench/list/tsx/index.tsx
@@ -18,6 +18,7 @@ namespace $ {
 			this.render()
 		}
 
+		@ $mol_task
 		static render() {
 			return (
 				<div id="list" className="list">
@@ -36,7 +37,6 @@ namespace $ {
 							<div
 								id={ 'list-item#' + item.id + '-content' }
 								className="list-item-content"
-								childNodes={[ item.content ]}
 								>
 								{ item.content }
 							</div>

diff --git a/app/quine/quine.view.tree b/app/quine/quine.view.tree
@@ -7,7 +7,7 @@ $mol_app_quine $mol_page
 					text <= content \
 	-
 	paths /
-		\-/mol/app/quine/quine.view.tree
-		\-/mol/app/quine/quine.view.ts
-		\-/mol/app/quine/index.html
-		\-/mol/app/quine/quine.locale=ru.json
+		\mol/app/quine/quine.view.tree
+		\mol/app/quine/quine.view.ts
+		\mol/app/quine/index.html
+		\mol/app/quine/quine.locale=ru.json
diff --git a/dom/jsx/jsx.ts b/dom/jsx/jsx.ts
@@ -7,11 +7,12 @@ namespace JSX {
 
 namespace $ {
 
-	export function $mol_dom_jsx< Props >(
+	export const $mol_dom_jsx = $mol_task_wrap( function $mol_dom_jsx< Props >(
 		Elem : string | { ( props : Props ) : Element } | { new( props : Props ) : { render() : Element } } ,
 		props : Props ,
 		...children : Array< Node | string >
 	) {
+
 		let node : Element
 		if( typeof Elem === 'string' ) {
 
@@ -33,6 +34,6 @@ namespace $ {
 		}
 
 		return node
-	}
+	} )
 
 }
diff --git a/file/file.web.ts b/file/file.web.ts
@@ -10,11 +10,10 @@ namespace $ {
 		}
 
 		static relative( path : string ) : $mol_file {
-			const resolver = $mol_dom_context.document.createElement( 'a' )
-			resolver.href = path
-
-			return this.absolute( resolver.href )
+			return this.absolute( new URL( path , this.base ).toString() )
 		}
+
+		static base = new URL( '.' , document.currentScript['src'] ).toString()
 
 		path() {
 			return '.'

diff --git a/locale/locale.ts b/locale/locale.ts
@@ -18,7 +18,7 @@ namespace $ {
 
 		@ $mol_mem_key
 		static source( lang : string ) {
-			return JSON.parse( $mol_file.relative( `-/web.locale=${ lang }.json` ).content() )
+			return JSON.parse( $mol_file.relative( `web.locale=${ lang }.json` ).content() )
 		}
 
 		@ $mol_mem_key