pg: exec_no_null(); gx: remove deprecated test; parser/tmpl: %raw translations; veb: time_to_render()

Author: medvednikov

cmd/tools/vwatch.v

@@ -15,7 +15,7 @@ const scan_period_ms = 1000 / scan_frequency_hz
 
 const max_scan_cycles = scan_timeout_s * scan_frequency_hz
 
-const default_vweb_suffixes = '*.v,*.html,*.css,*.js,*.md'
+const default_veb_suffixes = '*.v,*.html,*.css,*.js,*.md,*.tr'
 
 fn get_scan_timeout_seconds() int {
 	env_vw_timeout := os.getenv('VWATCH_TIMEOUT').int()
@@ -171,14 +171,14 @@ fn (mut context Context) get_stats_for_affected_vfiles() []VFileStat {
 
 		if is_vweb_found {
 			if !os.args.any(it.starts_with('--only-watch')) {
-				context.only_watch = default_vweb_suffixes.split_any(',')
+				context.only_watch = default_veb_suffixes.split_any(',')
 				// vweb is often used with SQLite .db or .sqlite3 files right next to the executable/source,
 				// that are updated by the vweb app, causing a restart of the app, which in turn causes the
 				// browser to reload the current page, that probably triggered the update in the first place.
 				// Note that the problem is not specific to SQLite, any database that stores its files in the
 				// current (project) folder, will also cause this.
 				println('`v watch` detected that you are compiling a vweb project.')
-				println('   Because of that, the `--only-watch=${default_vweb_suffixes}` flag was also implied.')
+				println('   Because of that, the `--only-watch=${default_veb_suffixes}` flag was also implied.')
 				println('   In result, `v watch` will ignore changes to other files.')
 				println('   Add your own --only-watch filter, if you wish to override that choice.')
 				println('')

vlib/db/pg/pg.c.v

@@ -69,6 +69,11 @@ pub mut:
 	vals []?string
 }
 
+pub struct RowNoNull {
+pub mut:
+	vals []string
+}
+
 pub struct Result {
 pub:
 	cols map[string]int
@@ -259,6 +264,22 @@ fn res_to_rows(res voidptr) []Row {
 	return rows
 }
 
+fn res_to_rows_no_null(res voidptr) []RowNoNull {
+	nr_rows := C.PQntuples(res)
+	nr_cols := C.PQnfields(res)
+	mut rows := []RowNoNull{}
+	for i in 0 .. nr_rows {
+		mut row := RowNoNull{}
+		for j in 0 .. nr_cols {
+			val := C.PQgetvalue(res, i, j)
+			row.vals << unsafe { cstring_to_vstring(val) }
+		}
+		rows << row
+	}
+	C.PQclear(res)
+	return rows
+}
+
 // res_to_result creates a `Result` struct out of a `C.PGresult` pointer
 fn res_to_result(res voidptr) Result {
 	nr_rows := C.PQntuples(res)
@@ -338,6 +359,12 @@ pub fn (db &DB) exec(query string) ![]Row {
 	return db.handle_error_or_rows(res, 'exec')
 }
 
+// exec_no_null works like exec, but the fields can't be NULL, no optionals
+pub fn (db &DB) exec_no_null(query string) ![]RowNoNull {
+	res := C.PQexec(db.conn, &char(query.str))
+	return db.handle_error_or_rows_no_null(res, 'exec')
+}
+
 // exec_result submits a command to the database server and wait for the result, returning an error on failure and a `Result` set on success
 pub fn (db &DB) exec_result(query string) !Result {
 	res := C.PQexec(db.conn, &char(query.str))
@@ -440,6 +467,7 @@ fn (db &DB) handle_error_or_rows(res voidptr, elabel string) ![]Row {
 	e := unsafe { C.PQerrorMessage(db.conn).vstring() }
 	if e != '' {
 		C.PQclear(res)
+		// TODO make it default
 		$if trace_pg_error ? {
 			eprintln('pg error: ${e}')
 		}
@@ -448,6 +476,19 @@ fn (db &DB) handle_error_or_rows(res voidptr, elabel string) ![]Row {
 	return res_to_rows(res)
 }
 
+fn (db &DB) handle_error_or_rows_no_null(res voidptr, elabel string) ![]RowNoNull {
+	// TODO copypasta
+	e := unsafe { C.PQerrorMessage(db.conn).vstring() }
+	if e != '' {
+		C.PQclear(res)
+		$if trace_pg_error ? {
+			eprintln('pg error: ${e}')
+		}
+		return error('pg ${elabel} error:\n${e}')
+	}
+	return res_to_rows_no_null(res)
+}
+
 // hande_error_or_result is an internal function similar to handle_error_or_rows that returns `Result` instead of `[]Row`
 fn (db &DB) handle_error_or_result(res voidptr, elabel string) !Result {
 	e := unsafe { C.PQerrorMessage(db.conn).vstring() }

vlib/gx/color_test.v

@@ -2176,7 +2176,8 @@ fn (mut c Checker) method_call(mut node ast.CallExpr, mut continue_check &bool)
 
 	method_name := node.name
 	if left_type.has_flag(.option) {
-		c.error('Option type cannot be called directly, you should unwrap it first', node.left.pos())
+		c.error('Option type `${left_sym.name}` cannot be called directly, you should unwrap it first',
+			node.left.pos())
 		return ast.void_type
 	} else if left_type.has_flag(.result) {
 		c.error('Result type cannot be called directly', node.left.pos())

vlib/v/checker/fn.v

@@ -1,4 +1,4 @@
-vlib/v/checker/tests/option_str_call.vv:7:10: error: Option type cannot be called directly, you should unwrap it first
+vlib/v/checker/tests/option_str_call.vv:7:10: error: Option type `net.html.Tag` cannot be called directly, you should unwrap it first
     5 |     footer := doc.get_tags_by_class_name('Box-footer')[0]
     6 |     invalid := footer.get_tag_by_class_name('invalid')
     7 |     println(invalid.str())

vlib/v/checker/tests/option_str_call.out

@@ -429,17 +429,33 @@ fn veb_tmpl_${fn_name}() string {
 
 		if pos := line.index('%') {
 			// %translation_key => ${tr('translation_key')}
+			is_raw := line.contains('%raw ')
 			mut line_ := line
-			if pos + 1 < line.len && line[pos + 1].is_letter() { //|| line[pos + 1] == '_' {
-				mut end := pos + 1
+			if is_raw {
+				// Start reading the key after "raw " (pos + 1 + 4)
+				mut end := pos + 5
+				// valid variable characters
 				for end < line.len && (line[end].is_letter() || line[end] == `_`) {
 					end++
 				}
-				key := line[pos + 1..end]
-				// println('GOT tr key line="${line}" key="${key}"')
-				// source.writeln('\${tr("${key}")}')
-				line_ = line.replace('%${key}', '\${veb.tr(ctx.lang.str(), "${key}")}')
-				// i += key.len
+				// Extract the key
+				key := line[pos + 5..end]
+				// Replace '%raw key' with just '${key}'
+				// We escape it as \${key} so the generated V code performs the interpolation
+				// line_ = line.replace('%raw ${key}', '\${${key}}')
+				line_ = line.replace('%raw ${key}', '\${veb.raw(veb.tr(ctx.lang.str(), "${key}"))}')
+			} else {
+				if pos + 1 < line.len && line[pos + 1].is_letter() { //|| line[pos + 1] == '_' {
+					mut end := pos + 1
+					for end < line.len && (line[end].is_letter() || line[end] == `_`) {
+						end++
+					}
+					key := line[pos + 1..end]
+					// println('GOT tr key line="${line}" key="${key}"')
+					// source.writeln('\${tr("${key}")}')
+					line_ = line.replace('%${key}', '\${veb.tr(ctx.lang.str(), "${key}")}')
+					// i += key.len
+				}
 			}
 			// println(source.str())
 			source.writeln(insert_template_code(fn_name, tmpl_str_start, line_))

vlib/v/parser/tmpl.v

@@ -6,6 +6,7 @@ import json
 import net
 import net.http
 import os
+import time
 
 enum ContextReturnType {
 	normal
@@ -443,3 +444,11 @@ pub fn (ctx &Context) ip() string {
 	}
 	return ip
 }
+
+// time_to_render returns the time in milliseconds that it took to render the page
+pub fn (ctx &Context) time_to_render() i64 {
+	if ctx.page_gen_start == 0 {
+		return 0
+	}
+	return time.ticks() - ctx.page_gen_start
+}

vlib/veb/context.v

@@ -72,11 +72,12 @@ pub fn run[A, X](mut global_app A, port int) {
 pub struct RunParams {
 pub:
 	// use `family: .ip, host: 'localhost'` when you want it to bind only to 127.0.0.1
-	family               net.AddrFamily = .ip6
-	host                 string
-	port                 int  = default_port
-	show_startup_message bool = true
-	timeout_in_seconds   int  = 30
+	family                    net.AddrFamily = .ip6
+	host                      string
+	port                      int  = default_port
+	show_startup_message      bool = true
+	timeout_in_seconds        int  = 30
+	benchmark_page_generation bool // for the "page rendered in X ms"
 }
 
 struct FileResponse {