Merge pull request #1 from hyoo-ru/new-tree2

nin-jin · web-flow · commit 15b658ac4890 · 2024-02-11T15:19:17.000+03:00
$mol_view_tree2 refactor, hyoo-ru/mam_mol#646
diff --git a/scout.view.ts b/scout.view.ts
@@ -19,7 +19,7 @@ namespace $.$$ {
 		@ $mol_mem
 		data() {
 			const text = $mol_fetch.text( 'hyoo/scout/_games.tree' )
-			const json = $mol_tree.fromString( text ).sub.map( tree => tree.clone({ type : '*' }).toJSON() )
+			const json = this.$.$mol_tree2_from_string( text ).kids.map( tree => this.$.$mol_tree2_to_json(tree.struct('*', tree.kids)) )
 			return json as $hyoo_scout_gist[]
 		}
 
diff --git a/suggest/suggest.view.ts b/suggest/suggest.view.ts
@@ -40,7 +40,7 @@ namespace $.$$ {
 				content : this.descr() ,
 			}
 			
-			const gist = new $mol_tree({ type : 'game' , sub : $mol_tree.fromJSON( data ).sub })
+			const gist = $mol_tree2.struct('game', $mol_tree2_from_json( data ).kids)
 
 			const body = encodeURIComponent( gist.toString() + '\n' )
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace $.$$ {`
`19`	`19`	`@ $mol_mem`
`20`	`20`	`data() {`
`21`	`21`	`const text = $mol_fetch.text( 'hyoo/scout/_games.tree' )`
`22`		`- const json = $mol_tree.fromString( text ).sub.map( tree => tree.clone({ type : '*' }).toJSON() )`
	`22`	`+ const json = this.$.$mol_tree2_from_string( text ).kids.map( tree => this.$.$mol_tree2_to_json(tree.struct('*', tree.kids)) )`
`23`	`23`	`return json as $hyoo_scout_gist[]`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ namespace $.$$ {`
`40`	`40`	`content : this.descr() ,`
`41`	`41`	`}`
`42`	`42`
`43`		`- const gist = new $mol_tree({ type : 'game' , sub : $mol_tree.fromJSON( data ).sub })`
	`43`	`+ const gist = $mol_tree2.struct('game', $mol_tree2_from_json( data ).kids)`
`44`	`44`
`45`	`45`	`const body = encodeURIComponent( gist.toString() + '\n' )`
`46`	`46`