tools: remove the src subdir from projects, created by v new (#24236)

JalonSolov · web-flow · commit c3d6858bf318 · 2025-04-16T06:37:51.000+03:00
diff --git a/cmd/tools/vcreate/project_model_bin.v b/cmd/tools/vcreate/project_model_bin.v
@@ -5,7 +5,7 @@ import os
 fn (mut c Create) set_bin_project_files() {
 	base := if c.new_dir { c.name } else { '' }
 	c.files << ProjectFiles{
-		path:    os.join_path(base, 'src', 'main.v')
+		path:    os.join_path(base, 'main.v')
 		content: "module main
 
 fn main() {
diff --git a/cmd/tools/vcreate/project_model_lib.v b/cmd/tools/vcreate/project_model_lib.v
@@ -5,7 +5,7 @@ import os
 fn (mut c Create) set_lib_project_files() {
 	base := if c.new_dir { c.name } else { '' }
 	c.files << ProjectFiles{
-		path:    os.join_path(base, 'src', c.name + '.v')
+		path:    os.join_path(base, c.name + '.v')
 		content: 'module ${c.name}
 
 // square calculates the second power of `x`
diff --git a/cmd/tools/vcreate/project_model_web.v b/cmd/tools/vcreate/project_model_web.v
@@ -5,7 +5,7 @@ import os { join_path }
 fn (mut c Create) set_web_project_files() {
 	base := if c.new_dir { c.name } else { '' }
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'databases', 'config_databases_sqlite.v')
+		path:    join_path(base, 'databases', 'config_databases_sqlite.v')
 		content: "module databases
 
 import db.sqlite // can change to 'db.mysql', 'db.pg'
@@ -17,14 +17,14 @@ pub fn create_db_connection() !sqlite.DB {
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'templates', 'header_component.html')
+		path:    join_path(base, 'templates', 'header_component.html')
 		content: "<nav>
 	<div class='nav-wrapper'>
 		<a href='javascript:window.history.back();' class='left'>
 			<i class='material-icons'>arrow_back_ios_new</i>
 		</a>
 		<a href='/'>
-			<img src='src/assets/veasel.png' alt='logo' style='max-height: 100%' />
+			<img src='assets/veasel.png' alt='logo' style='max-height: 100%' />
 		</a>
 		<ul id='nav-mobile' class='right'>
 			<li><a href='https://github.com/vlang/v'>github</a></li>
@@ -36,7 +36,7 @@ pub fn create_db_connection() !sqlite.DB {
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'templates', 'products.css')
+		path:    join_path(base, 'templates', 'products.css')
 		content: 'h1.title {
 	font-family: Arial, Helvetica, sans-serif;
 	color: #3b7bbf;
@@ -50,7 +50,7 @@ div.products-table {
 }'
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'templates', 'products.html')
+		path:    join_path(base, 'templates', 'products.html')
 		content: "<!DOCTYPE html>
 <html>
 <head>
@@ -67,7 +67,7 @@ div.products-table {
 	<link href='https://fonts.googleapis.com/icon?family=Material+Icons' rel='stylesheet'>
 
 	<title>Login</title>
-	@css 'src/templates/products.css'
+	@css 'templates/products.css'
 </head>
 <body>
 	<div>@include 'header_component.html'</div>
@@ -147,7 +147,7 @@ div.products-table {
 </html>"
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'auth_controllers.v')
+		path:    join_path(base, 'auth_controllers.v')
 		content: "module main
 
 import vweb
@@ -164,7 +164,7 @@ pub fn (mut app App) controller_auth(username string, password string) vweb.Resu
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'auth_dto.v')
+		path:    join_path(base, 'auth_dto.v')
 		content: 'module main
 
 struct AuthRequestDto {
@@ -174,7 +174,7 @@ struct AuthRequestDto {
 '
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'auth_services.v')
+		path:    join_path(base, 'auth_services.v')
 		content: "module main
 
 import crypto.hmac
@@ -269,7 +269,7 @@ fn auth_verify(token string) bool {
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'index.html')
+		path:    join_path(base, 'index.html')
 		content: "<!DOCTYPE html>
 <html>
 <head>
@@ -348,7 +348,7 @@ fn auth_verify(token string) bool {
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'main.v')
+		path:    join_path(base, 'main.v')
 		content: "module main
 
 import vweb
@@ -376,7 +376,7 @@ fn main() {
 	db.close() or { panic(err) }
 
 	mut app := &App{}
-	app.serve_static('/favicon.ico', 'src/assets/favicon.ico')
+	app.serve_static('/favicon.ico', 'assets/favicon.ico')
 	// makes all static files available.
 	app.mount_static_folder_at(os.resource_abs_path('.'), '/')
 
@@ -391,7 +391,7 @@ pub fn (mut app App) index() vweb.Result {
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'product_controller.v')
+		path:    join_path(base, 'product_controller.v')
 		content: "module main
 
 import vweb
@@ -457,7 +457,7 @@ pub fn (mut app App) controller_create_product(product_name string) vweb.Result
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'product_entities.v')
+		path:    join_path(base, 'product_entities.v')
 		content: "module main
 
 @[table: 'products']
@@ -470,7 +470,7 @@ struct Product {
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'product_service.v')
+		path:    join_path(base, 'product_service.v')
 		content: "module main
 
 import databases
@@ -517,7 +517,7 @@ fn (mut app App) service_get_all_products_from(user_id int) ![]Product {
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'product_view_api.v')
+		path:    join_path(base, 'product_view_api.v')
 		content: "module main
 
 import json
@@ -556,7 +556,7 @@ pub fn get_product(token string) ![]User {
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'product_view.v')
+		path:    join_path(base, 'product_view.v')
 		content: "module main
 
 import vweb
@@ -578,7 +578,7 @@ pub fn (mut app App) products() !vweb.Result {
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'user_controllers.v')
+		path:    join_path(base, 'user_controllers.v')
 		content: "module main
 
 import vweb
@@ -648,7 +648,7 @@ pub fn (mut app App) controller_create_user(username string, password string) vw
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'user_entities.v')
+		path:    join_path(base, 'user_entities.v')
 		content: "module main
 
 @[table: 'users']
@@ -663,7 +663,7 @@ mut:
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'user_services.v')
+		path:    join_path(base, 'user_services.v')
 		content: "module main
 
 import crypto.bcrypt
@@ -732,7 +732,7 @@ fn (mut app App) service_get_user(id int) !User {
 "
 	}
 	c.files << ProjectFiles{
-		path:    join_path(base, 'src', 'user_view_api.v')
+		path:    join_path(base, 'user_view_api.v')
 		content: "module main
 
 import json
diff --git a/cmd/tools/vcreate/vcreate_init_test.v b/cmd/tools/vcreate/vcreate_init_test.v
@@ -24,8 +24,8 @@ fn init_and_check() ! {
 	os.chdir(test_path)!
 
 	// Keep track of the last modified time of the main file to ensure it is not modified if it already exists.
-	main_exists := os.exists('src/main.v')
-	main_last_modified := if main_exists { os.file_last_mod_unix('src/main.v') } else { 0 }
+	main_exists := os.exists('main.v')
+	main_last_modified := if main_exists { os.file_last_mod_unix('main.v') } else { 0 }
 
 	// Initialize project.
 	os.execute_or_exit('${expect_exe} ${os.join_path(expect_tests_path, 'init.expect')} ${vroot}')
@@ -34,9 +34,9 @@ fn init_and_check() ! {
 	assert x.output.trim_space() == 'Hello World!'
 
 	if main_exists {
-		assert main_last_modified == os.file_last_mod_unix('src/main.v')
+		assert main_last_modified == os.file_last_mod_unix('main.v')
 	} else {
-		assert os.read_file('src/main.v')! == [
+		assert os.read_file('main.v')! == [
 			'module main\n',
 			'fn main() {',
 			"	println('Hello World!')",

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import os { join_path }`
`5`	`5`	`fn (mut c Create) set_web_project_files() {`
`6`	`6`	`base := if c.new_dir { c.name } else { '' }`
`7`	`7`	`c.files << ProjectFiles{`
`8`		`- path: join_path(base, 'src', 'databases', 'config_databases_sqlite.v')`
	`8`	`+ path: join_path(base, 'databases', 'config_databases_sqlite.v')`
`9`	`9`	`content: "module databases`
`10`	`10`
`11`	`11`	`import db.sqlite // can change to 'db.mysql', 'db.pg'`
`@@ -17,14 +17,14 @@ pub fn create_db_connection() !sqlite.DB {`
`17`	`17`	`"`
`18`	`18`	`}`
`19`	`19`	`c.files << ProjectFiles{`
`20`		`- path: join_path(base, 'src', 'templates', 'header_component.html')`
	`20`	`+ path: join_path(base, 'templates', 'header_component.html')`
`21`	`21`	`content: "<nav>`
`22`	`22`	`<div class='nav-wrapper'>`
`23`	`23`	`<a href='javascript:window.history.back();' class='left'>`
`24`	`24`	`<i class='material-icons'>arrow_back_ios_new</i>`
`25`	`25`	`</a>`
`26`	`26`	`<a href='/'>`
`27`		`- <img src='src/assets/veasel.png' alt='logo' style='max-height: 100%' />`
	`27`	`+ <img src='assets/veasel.png' alt='logo' style='max-height: 100%' />`
`28`	`28`	`</a>`
`29`	`29`	`<ul id='nav-mobile' class='right'>`
`30`	`30`	`<li><a href='https://github.com/vlang/v'>github</a></li>`
`@@ -36,7 +36,7 @@ pub fn create_db_connection() !sqlite.DB {`
`36`	`36`	`"`
`37`	`37`	`}`
`38`	`38`	`c.files << ProjectFiles{`
`39`		`- path: join_path(base, 'src', 'templates', 'products.css')`
	`39`	`+ path: join_path(base, 'templates', 'products.css')`
`40`	`40`	`content: 'h1.title {`
`41`	`41`	`font-family: Arial, Helvetica, sans-serif;`
`42`	`42`	`color: #3b7bbf;`
`@@ -50,7 +50,7 @@ div.products-table {`
`50`	`50`	`}'`
`51`	`51`	`}`
`52`	`52`	`c.files << ProjectFiles{`
`53`		`- path: join_path(base, 'src', 'templates', 'products.html')`
	`53`	`+ path: join_path(base, 'templates', 'products.html')`
`54`	`54`	`content: "<!DOCTYPE html>`
`55`	`55`	`<html>`
`56`	`56`	`<head>`
`@@ -67,7 +67,7 @@ div.products-table {`
`67`	`67`	`<link href='https://fonts.googleapis.com/icon?family=Material+Icons' rel='stylesheet'>`
`68`	`68`
`69`	`69`	`<title>Login</title>`
`70`		`- @css 'src/templates/products.css'`
	`70`	`+ @css 'templates/products.css'`
`71`	`71`	`</head>`
`72`	`72`	`<body>`
`73`	`73`	`<div>@include 'header_component.html'</div>`
`@@ -147,7 +147,7 @@ div.products-table {`
`147`	`147`	`</html>"`
`148`	`148`	`}`
`149`	`149`	`c.files << ProjectFiles{`
`150`		`- path: join_path(base, 'src', 'auth_controllers.v')`
	`150`	`+ path: join_path(base, 'auth_controllers.v')`
`151`	`151`	`content: "module main`
`152`	`152`
`153`	`153`	`import vweb`
`@@ -164,7 +164,7 @@ pub fn (mut app App) controller_auth(username string, password string) vweb.Resu`
`164`	`164`	`"`
`165`	`165`	`}`
`166`	`166`	`c.files << ProjectFiles{`
`167`		`- path: join_path(base, 'src', 'auth_dto.v')`
	`167`	`+ path: join_path(base, 'auth_dto.v')`
`168`	`168`	`content: 'module main`
`169`	`169`
`170`	`170`	`struct AuthRequestDto {`
`@@ -174,7 +174,7 @@ struct AuthRequestDto {`
`174`	`174`	`'`
`175`	`175`	`}`
`176`	`176`	`c.files << ProjectFiles{`
`177`		`- path: join_path(base, 'src', 'auth_services.v')`
	`177`	`+ path: join_path(base, 'auth_services.v')`
`178`	`178`	`content: "module main`
`179`	`179`
`180`	`180`	`import crypto.hmac`
`@@ -269,7 +269,7 @@ fn auth_verify(token string) bool {`
`269`	`269`	`"`
`270`	`270`	`}`
`271`	`271`	`c.files << ProjectFiles{`
`272`		`- path: join_path(base, 'src', 'index.html')`
	`272`	`+ path: join_path(base, 'index.html')`
`273`	`273`	`content: "<!DOCTYPE html>`
`274`	`274`	`<html>`
`275`	`275`	`<head>`
`@@ -348,7 +348,7 @@ fn auth_verify(token string) bool {`
`348`	`348`	`"`
`349`	`349`	`}`
`350`	`350`	`c.files << ProjectFiles{`
`351`		`- path: join_path(base, 'src', 'main.v')`
	`351`	`+ path: join_path(base, 'main.v')`
`352`	`352`	`content: "module main`
`353`	`353`
`354`	`354`	`import vweb`
`@@ -376,7 +376,7 @@ fn main() {`
`376`	`376`	`db.close() or { panic(err) }`
`377`	`377`
`378`	`378`	`mut app := &App{}`
`379`		`- app.serve_static('/favicon.ico', 'src/assets/favicon.ico')`
	`379`	`+ app.serve_static('/favicon.ico', 'assets/favicon.ico')`
`380`	`380`	`// makes all static files available.`
`381`	`381`	`app.mount_static_folder_at(os.resource_abs_path('.'), '/')`
`382`	`382`
`@@ -391,7 +391,7 @@ pub fn (mut app App) index() vweb.Result {`
`391`	`391`	`"`
`392`	`392`	`}`
`393`	`393`	`c.files << ProjectFiles{`
`394`		`- path: join_path(base, 'src', 'product_controller.v')`
	`394`	`+ path: join_path(base, 'product_controller.v')`
`395`	`395`	`content: "module main`
`396`	`396`
`397`	`397`	`import vweb`
`@@ -457,7 +457,7 @@ pub fn (mut app App) controller_create_product(product_name string) vweb.Result`
`457`	`457`	`"`
`458`	`458`	`}`
`459`	`459`	`c.files << ProjectFiles{`
`460`		`- path: join_path(base, 'src', 'product_entities.v')`
	`460`	`+ path: join_path(base, 'product_entities.v')`
`461`	`461`	`content: "module main`
`462`	`462`
`463`	`463`	`@[table: 'products']`
`@@ -470,7 +470,7 @@ struct Product {`
`470`	`470`	`"`
`471`	`471`	`}`
`472`	`472`	`c.files << ProjectFiles{`
`473`		`- path: join_path(base, 'src', 'product_service.v')`
	`473`	`+ path: join_path(base, 'product_service.v')`
`474`	`474`	`content: "module main`
`475`	`475`
`476`	`476`	`import databases`
`@@ -517,7 +517,7 @@ fn (mut app App) service_get_all_products_from(user_id int) ![]Product {`
`517`	`517`	`"`
`518`	`518`	`}`
`519`	`519`	`c.files << ProjectFiles{`
`520`		`- path: join_path(base, 'src', 'product_view_api.v')`
	`520`	`+ path: join_path(base, 'product_view_api.v')`
`521`	`521`	`content: "module main`
`522`	`522`
`523`	`523`	`import json`
`@@ -556,7 +556,7 @@ pub fn get_product(token string) ![]User {`
`556`	`556`	`"`
`557`	`557`	`}`
`558`	`558`	`c.files << ProjectFiles{`
`559`		`- path: join_path(base, 'src', 'product_view.v')`
	`559`	`+ path: join_path(base, 'product_view.v')`
`560`	`560`	`content: "module main`
`561`	`561`
`562`	`562`	`import vweb`
`@@ -578,7 +578,7 @@ pub fn (mut app App) products() !vweb.Result {`
`578`	`578`	`"`
`579`	`579`	`}`
`580`	`580`	`c.files << ProjectFiles{`
`581`		`- path: join_path(base, 'src', 'user_controllers.v')`
	`581`	`+ path: join_path(base, 'user_controllers.v')`
`582`	`582`	`content: "module main`
`583`	`583`
`584`	`584`	`import vweb`
`@@ -648,7 +648,7 @@ pub fn (mut app App) controller_create_user(username string, password string) vw`
`648`	`648`	`"`
`649`	`649`	`}`
`650`	`650`	`c.files << ProjectFiles{`
`651`		`- path: join_path(base, 'src', 'user_entities.v')`
	`651`	`+ path: join_path(base, 'user_entities.v')`
`652`	`652`	`content: "module main`
`653`	`653`
`654`	`654`	`@[table: 'users']`
`@@ -663,7 +663,7 @@ mut:`
`663`	`663`	`"`
`664`	`664`	`}`
`665`	`665`	`c.files << ProjectFiles{`
`666`		`- path: join_path(base, 'src', 'user_services.v')`
	`666`	`+ path: join_path(base, 'user_services.v')`
`667`	`667`	`content: "module main`
`668`	`668`
`669`	`669`	`import crypto.bcrypt`
`@@ -732,7 +732,7 @@ fn (mut app App) service_get_user(id int) !User {`
`732`	`732`	`"`
`733`	`733`	`}`
`734`	`734`	`c.files << ProjectFiles{`
`735`		`- path: join_path(base, 'src', 'user_view_api.v')`
	`735`	`+ path: join_path(base, 'user_view_api.v')`
`736`	`736`	`content: "module main`
`737`	`737`
`738`	`738`	`import json`