Merge pull request #482 from metacall/feature/cli-full-refactor

Feature/cli full refactor

Author: viferga

.env

@@ -23,4 +23,4 @@ COMPOSE_PROJECT_NAME='metacall'
 # Configure default variables
 METACALL_PATH=/usr/local/metacall
 METACALL_BUILD_TYPE=relwithdebinfo
-METACALL_BASE_IMAGE=debian:bookworm-slim # debian:bullseye-slim # ubuntu:jammy # alpine:3.17
+METACALL_BASE_IMAGE=debian:trixie-slim # debian:bookworm-slim # ubuntu:jammy # alpine:3.17

.github/workflows/linux-sanitizer.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image: ["debian:bookworm-slim", "debian:bullseye-slim", "ubuntu:jammy"]
+        image: ["debian:trixie-slim", "debian:bookworm-slim", "ubuntu:jammy"]
         sanitizer: [address-sanitizer, thread-sanitizer] # TODO: memory-sanitizer not supported by GCC
 
     env:

.github/workflows/linux-test.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         build: [debug, release]
-        image: ["debian:bookworm-slim", "debian:bullseye-slim", "ubuntu:jammy"] # TODO: "alpine:3.17"
+        image: ["debian:trixie-slim", "debian:bookworm-slim", "ubuntu:jammy"] # TODO: "alpine:3.17"
 
     steps:
       - name: Check out the repository

.github/workflows/windows-test.yml

@@ -31,7 +31,7 @@ jobs:
           # {build: debug, sanitizer: memory-sanitizer},
 
           # TODO: https://github.com/metacall/core/issues/461
-          {build: release, sanitizer: without-sanitizer}
+          # {build: release, sanitizer: without-sanitizer}
         ]
 
     steps:

.gitignore

@@ -33,13 +33,6 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 
-# Avoid ignoring build hooks
-!hooks/build
-!tools/deps/hooks/build
-!tools/dev/hooks/build
-!tools/runtime/hooks/build
-!tools/cli/hooks/build
-
 # Qt cache
 CMakeLists.txt.user
 CMakeLists.txt.user.*

source/cli/metacallcli/CMakeLists.txt

@@ -25,22 +25,13 @@ include(SecurityFlags)
 #
 
 set(include_path "${CMAKE_CURRENT_SOURCE_DIR}/include/${target}")
-set(inline_path "${CMAKE_CURRENT_SOURCE_DIR}/inline/${target}")
 set(source_path "${CMAKE_CURRENT_SOURCE_DIR}/source")
 
 set(headers
-	${include_path}/tokenizer.hpp
-	${include_path}/parser.hpp
 	${include_path}/application.hpp
 )
 
-set(inline
-	${inline_path}/parser.inl
-)
-
 set(sources
-	${source_path}/tokenizer.cpp
-	${source_path}/parser.cpp
 	${source_path}/application.cpp
 	${source_path}/main.cpp
 )
@@ -97,9 +88,6 @@ target_include_directories(${target}
 	${PROJECT_BINARY_DIR}/source/include
 	${CMAKE_CURRENT_SOURCE_DIR}/include
 	${CMAKE_CURRENT_BINARY_DIR}/include
-	${PROJECT_BINARY_DIR}/source/inline
-	${CMAKE_CURRENT_SOURCE_DIR}/inline
-	${CMAKE_CURRENT_BINARY_DIR}/inline
 	${DEFAULT_INCLUDE_DIRECTORIES}
 
 	PUBLIC
@@ -173,6 +161,11 @@ add_loader_dependencies(${target}
 	ts_loader
 )
 
+add_dependencies(${target}
+	cli_repl_plugin
+	cli_core_plugin
+)
+
 #
 # Deployment
 #
@@ -234,7 +227,7 @@ if(OPTION_BUILD_LOADERS AND OPTION_BUILD_LOADERS_NODE AND OPTION_BUILD_SCRIPTS A
 		PROPERTY LABELS ${target}-node
 	)
 	set_tests_properties(${target}-node PROPERTIES
-		PASS_REGULAR_EXPRESSION "700.0"
+		PASS_REGULAR_EXPRESSION "4001534"
 	)
 	test_environment_variables(${target}-node
 		""
@@ -374,7 +367,7 @@ if(OPTION_BUILD_LOADERS AND OPTION_BUILD_LOADERS_FILE AND OPTION_BUILD_SCRIPTS A
 		PROPERTY LABELS ${target}-file-fail
 	)
 	set_tests_properties(${target}-file-fail PROPERTIES
-		PASS_REGULAR_EXPRESSION "Script \\(this-does-not-exist\\) load error in loader \\(file\\)"
+		PASS_REGULAR_EXPRESSION "Error: Failed to load script 'this-does-not-exist' with loader 'file'"
 	)
 	test_environment_variables(${target}-file-fail
 		""
@@ -450,7 +443,7 @@ if(OPTION_BUILD_LOADERS AND OPTION_BUILD_LOADERS_TS AND OPTION_BUILD_SCRIPTS AND
 		PROPERTY LABELS ${target}-ts
 	)
 	set_tests_properties(${target}-ts PROPERTIES
-		PASS_REGULAR_EXPRESSION "9.0"
+		PASS_REGULAR_EXPRESSION "51354"
 	)
 	test_environment_variables(${target}-ts
 		""