migrate from vweb to veb

vlang · Sep 18, 2024 · 704ec38 · 704ec38
1 parent 5001da5
commit 704ec38
Show file tree

Hide file tree

Showing 68 changed files with 878 additions and 937 deletions.
diff --git a/git/libgit.v b/git/libgit.v
@@ -168,7 +168,7 @@ pub fn new_repo(path string) &Repo {
 	println('ff ${ret}')
 	// git_reference_free(head_ref);
 	return &Repo{
-		obj: repo_obj
+		obj:  repo_obj
 		path: path
 	}
 }

diff --git a/git/util.v b/git/util.v
@@ -51,7 +51,7 @@ pub fn check_git_repo_url(url string) bool {
 	headers.add_custom('User-Agent', 'git/2.30.0') or {}
 	headers.add_custom('Git-Protocol', 'version=2') or {}
 	config := http.FetchConfig{
-		url: refs_url
+		url:    refs_url
 		header: headers
 	}
 	response := http.fetch(config) or { return false }

diff --git a/highlight/c.v b/highlight/c.v
@@ -2,13 +2,13 @@ module highlight
 
 fn init_c() Lang {
 	return Lang{
-		name: 'C'
+		name:            'C'
 		lang_extensions: ['c']
-		line_comments: '//'
-		mline_comments: ['/*', '*/']
-		string_start: ['"', "'"]
-		color: '#555555'
-		keywords: [
+		line_comments:   '//'
+		mline_comments:  ['/*', '*/']
+		string_start:    ['"', "'"]
+		color:           '#555555'
+		keywords:        [
 			'auto',
 			'double',
 			'int',

diff --git a/highlight/cpp.v b/highlight/cpp.v
@@ -2,13 +2,13 @@ module highlight
 
 fn init_cpp() Lang {
 	return Lang{
-		name: 'C++'
+		name:            'C++'
 		lang_extensions: ['cpp', 'cc', 'hh', 'h']
-		line_comments: '//'
-		mline_comments: ['/*', '*/']
-		string_start: ['"', "'"]
-		color: '#f34b7d'
-		keywords: [
+		line_comments:   '//'
+		mline_comments:  ['/*', '*/']
+		string_start:    ['"', "'"]
+		color:           '#f34b7d'
+		keywords:        [
 			'int',
 			'float',
 			'while',

diff --git a/highlight/d.v b/highlight/d.v
@@ -2,13 +2,13 @@ module highlight
 
 fn init_d() Lang {
 	return Lang{
-		name: 'D'
+		name:            'D'
 		lang_extensions: ['d']
-		line_comments: '//'
-		mline_comments: ['/*', '*/', '/+', '+/']
-		string_start: ['"', "'"]
-		color: '#ba595e'
-		keywords: [
+		line_comments:   '//'
+		mline_comments:  ['/*', '*/', '/+', '+/']
+		string_start:    ['"', "'"]
+		color:           '#ba595e'
+		keywords:        [
 			'abstract',
 			'alias',
 			'align',

diff --git a/highlight/go.v b/highlight/go.v
@@ -2,13 +2,13 @@ module highlight
 
 fn init_go() Lang {
 	return Lang{
-		name: 'Go'
+		name:            'Go'
 		lang_extensions: ['go']
-		line_comments: '//'
-		mline_comments: ['/*', '*/']
-		string_start: ['"', '`']
-		color: '#00add8'
-		keywords: [
+		line_comments:   '//'
+		mline_comments:  ['/*', '*/']
+		string_start:    ['"', '`']
+		color:           '#00add8'
+		keywords:        [
 			'break',
 			'chan',
 			'const',

diff --git a/highlight/highlight.v b/highlight/highlight.v
@@ -2,9 +2,7 @@
 // Use of this source code is governed by a GPL license that can be found in the LICENSE file.
 module highlight
 
-const (
-	tab = '    ' //        '
-)
+const tab = '    ' //        '
 
 // returns HTML code, number of lines, number of lines with source code
 pub fn highlight_text(st string, file_path string, commit bool) (string, int, int) {
@@ -69,7 +67,7 @@ pub fn highlight_text(st string, file_path string, commit bool) (string, int, in
 			continue
 		}
 		if c == `\t` {
-			res << highlight.tab.bytes()
+			res << tab.bytes()
 			continue
 		}
 		if in_comment {

diff --git a/highlight/javascript.v b/highlight/javascript.v
@@ -2,13 +2,13 @@ module highlight
 
 fn init_js() Lang {
 	return Lang{
-		name: 'JavaScript'
+		name:            'JavaScript'
 		lang_extensions: ['js', 'mjs', 'jsx']
-		line_comments: '//'
-		mline_comments: ['/*', '*/']
-		string_start: ['"', "'"]
-		color: '#f1e05a'
-		keywords: [
+		line_comments:   '//'
+		mline_comments:  ['/*', '*/']
+		string_start:    ['"', "'"]
+		color:           '#f1e05a'
+		keywords:        [
 			'break',
 			'do',
 			'instanceof',

diff --git a/highlight/langs.v b/highlight/langs.v
@@ -2,13 +2,9 @@
 // Use of this source code is governed by a GPL license that can be found in the LICENSE file.
 module highlight
 
-const (
-	lang_path = 'langs'
-)
+const lang_path = 'langs'
 
-const (
-	langs = init_langs()
-)
+const langs = init_langs()
 
 pub struct Lang {
 	keywords        []string
@@ -28,7 +24,7 @@ fn is_source(ext string) bool {
 
 pub fn extension_to_lang(ext string) !Lang {
 	ending := ext.split('.').last()
-	for lang in highlight.langs {
+	for lang in langs {
 		if ending in lang.lang_extensions {
 			return lang
 		}

diff --git a/highlight/lua.v b/highlight/lua.v
@@ -2,13 +2,13 @@ module highlight
 
 fn init_lua() Lang {
 	return Lang{
-		name: 'Lua'
+		name:            'Lua'
 		lang_extensions: ['lua']
-		line_comments: '--'
-		mline_comments: ['--[[', ']]']
-		string_start: ['"', "'"]
-		color: '#00007d'
-		keywords: [
+		line_comments:   '--'
+		mline_comments:  ['--[[', ']]']
+		string_start:    ['"', "'"]
+		color:           '#00007d'
+		keywords:        [
 			'and',
 			'break',
 			'do',

diff --git a/highlight/markdown.v b/highlight/markdown.v
@@ -3,73 +3,71 @@ module highlight
 import markdown
 import pcre
 
-const (
-	allowed_tags       = [
-		'a',
-		'abbr',
-		'b',
-		'blockquote',
-		'body',
-		'br',
-		'center',
-		'code',
-		'dd',
-		'details',
-		'div',
-		'dl',
-		'dt',
-		'em',
-		'font',
-		'h1',
-		'h2',
-		'h3',
-		'h4',
-		'h5',
-		'h6',
-		'hr',
-		'i',
-		'img',
-		'kbd',
-		'label',
-		'li',
-		'ol',
-		'p',
-		'pre',
-		'small',
-		'source',
-		'span',
-		'strong',
-		'sub',
-		'summary',
-		'sup',
-		'table',
-		'tbody',
-		'tr',
-		'td',
-		'th',
-		'thead',
-		'ul',
-		'u',
-		'video',
-	]
-	allowed_attributes = [
-		'align',
-		'color',
-		'controls',
-		'height',
-		'href',
-		'id',
-		'src',
-		'style',
-		'target',
-		'title',
-		'type',
-		'width',
-	]
-	unallowed_schemas  = [
-		'javascript:',
-	]
-)
+const allowed_tags = [
+	'a',
+	'abbr',
+	'b',
+	'blockquote',
+	'body',
+	'br',
+	'center',
+	'code',
+	'dd',
+	'details',
+	'div',
+	'dl',
+	'dt',
+	'em',
+	'font',
+	'h1',
+	'h2',
+	'h3',
+	'h4',
+	'h5',
+	'h6',
+	'hr',
+	'i',
+	'img',
+	'kbd',
+	'label',
+	'li',
+	'ol',
+	'p',
+	'pre',
+	'small',
+	'source',
+	'span',
+	'strong',
+	'sub',
+	'summary',
+	'sup',
+	'table',
+	'tbody',
+	'tr',
+	'td',
+	'th',
+	'thead',
+	'ul',
+	'u',
+	'video',
+]
+const allowed_attributes = [
+	'align',
+	'color',
+	'controls',
+	'height',
+	'href',
+	'id',
+	'src',
+	'style',
+	'target',
+	'title',
+	'type',
+	'width',
+]
+const unallowed_schemas = [
+	'javascript:',
+]
 
 pub fn convert_markdown_to_html(code string) string {
 	markdown_code := sanitize_markdown_code(code)
@@ -121,7 +119,7 @@ fn sanitize_html_tags_with_re(re string, code string) string {
 		tag_name := tag_parts[0].trim_space().to_lower()
 		tag_attributes := tag_parts[1].trim_space()
 		tag_content := tag_parts[2].trim_space()
-		is_allowed_tag := highlight.allowed_tags.contains(tag_name)
+		is_allowed_tag := allowed_tags.contains(tag_name)
 
 		if !is_allowed_tag {
 			result = result.replace(tag, '')
@@ -174,8 +172,8 @@ fn sanitize_html_attributes(attributes string) string {
 		attribute_name := attribute_parts[0].trim_space().to_lower()
 		attribute_value := attribute_parts[1].trim_space()
 
-		is_allowed_attribute := highlight.allowed_attributes.contains(attribute_name)
-		is_unallowed_schemas := highlight.unallowed_schemas.any(attribute_value.starts_with(it))
+		is_allowed_attribute := allowed_attributes.contains(attribute_name)
+		is_unallowed_schemas := unallowed_schemas.any(attribute_value.starts_with(it))
 
 		if !is_allowed_attribute || is_unallowed_schemas {
 			result = result.replace(attribute, '')

diff --git a/highlight/markdown_test.v b/highlight/markdown_test.v
@@ -1,10 +1,8 @@
 module highlight
 
-const (
-	markdown = '<script>  alert(true) </script> <!--  comment -->test'
-	html     = '<p>test</p>'
-)
+const markdown = '<script>  alert(true) </script> <!--  comment -->test'
+const html = '<p>test</p>'
 
 fn test_convert_markdown_to_html() {
-	assert convert_markdown_to_html(highlight.markdown) == highlight.html
+	assert convert_markdown_to_html(markdown) == html
 }
diff --git a/highlight/python.v b/highlight/python.v
@@ -2,12 +2,12 @@ module highlight
 
 fn init_py() Lang {
 	return Lang{
-		name: 'Python'
+		name:            'Python'
 		lang_extensions: ['py', 'ipynb']
-		line_comments: '#'
-		string_start: ['"', "'", '"""', "'''"]
-		color: '#3572A5'
-		keywords: [
+		line_comments:   '#'
+		string_start:    ['"', "'", '"""', "'''"]
+		color:           '#3572A5'
+		keywords:        [
 			'None',
 			'True',
 			'and',

diff --git a/highlight/typescript.v b/highlight/typescript.v
@@ -2,13 +2,13 @@ module highlight
 
 fn init_ts() Lang {
 	return Lang{
-		name: 'TypeScript'
+		name:            'TypeScript'
 		lang_extensions: ['ts', 'tsx']
-		line_comments: '//'
-		mline_comments: ['/*', '*/']
-		string_start: ['"', "'"]
-		color: '#2b7489'
-		keywords: [
+		line_comments:   '//'
+		mline_comments:  ['/*', '*/']
+		string_start:    ['"', "'"]
+		color:           '#2b7489'
+		keywords:        [
 			'any',
 			'as',
 			'boolean',