slot into the package loading system for portable scripts

Author: KristofferC

base/client.jl

@@ -346,7 +346,17 @@ function exec_options(opts)
             if PROGRAM_FILE == "-"
                 include_string(Main, read(stdin, String), "stdin")
             else
-                include(Main, PROGRAM_FILE)
+                abs_script_path = abspath(PROGRAM_FILE)
+                if has_inline_project(abs_script_path)
+                    set_portable_script_state(abs_script_path)
+                    try
+                        include(Main, PROGRAM_FILE)
+                    finally
+                        global portable_script_state_global = nothing
+                    end
+                else
+                    include(Main, PROGRAM_FILE)
+                end
             end
         catch
             invokelatest(display_error, scrub_repl_backtrace(current_exceptions()))

base/loading.jl

@@ -346,6 +346,24 @@ function has_inline_project(path::String)::Bool
 end
 
 
+struct PortableScriptState
+    path::String
+    pkg::PkgId
+end
+
+portable_script_state_global::Union{PortableScriptState, Nothing} = nothing
+
+function set_portable_script_state(abs_path::Union{Nothing, String})
+    pkg = project_file_name_uuid(abs_path, splitext(basename(abs_path))[1])
+
+    # Verify the project and manifest delimiters:
+    parsed_toml(abs_path)
+    parsed_toml(abs_path; manifest=true)
+
+    global portable_script_state_global = PortableScriptState(abs_path, pkg)
+end
+
+
 struct LoadingCache
     load_path::Vector{String}
     dummy_uuid::Dict{String, UUID}
@@ -440,7 +458,12 @@ end
 Same as [`Base.identify_package`](@ref) except that the path to the environment where the package is identified
 is also returned, except when the identity is not identified.
 """
-identify_package_env(where::Module, name::String) = identify_package_env(PkgId(where), name)
+function identify_package_env(where::Module, name::String)
+    if where === Main && portable_script_state_global !== nothing
+        return identify_package_env(portable_script_state_global.pkg, name)
+    end
+    return identify_package_env(PkgId(where), name)
+end
 function identify_package_env(where::Union{PkgId, Nothing}, name::String)
     # Special cases
     if where !== nothing

test/loading.jl

@@ -1873,7 +1873,7 @@ module M58272_to end
 
 @testset "Portable scripts" begin
     # Test with line-by-line comment syntax and path dependencies
-    portable_script = joinpath(@__DIR__, "project", "portable_script.jl")
+    portable_script = joinpath(@__DIR__, "project", "portable", "portable_script.jl")
     output = read(`$(Base.julia_cmd()) --startup-file=no $portable_script`, String)
 
     @test occursin("Active project: $portable_script", output)
@@ -1886,9 +1886,9 @@ module M58272_to end
     @test occursin("Pass", output)
 
     # Test with custom manifest= entry in project section
-    portable_script_cm = joinpath(@__DIR__, "project", "portable_script_custom_manifest.jl")
+    portable_script_cm = joinpath(@__DIR__, "project", "portable", "portable_script_custom_manifest.jl")
     output_cm = read(`$(Base.julia_cmd()) --startup-file=no $portable_script_cm`, String)
-    expected_cm = joinpath(@__DIR__, "project", "portable_script_custom.toml")
+    expected_cm = joinpath(@__DIR__, "project", "portable", "portable_script_custom.toml")
 
     @test occursin("Active project: $portable_script_cm", output_cm)
     @test occursin("Active manifest: $expected_cm", output_cm)
@@ -1904,7 +1904,7 @@ module M58272_to end
     @test occursin("✓ Random (stdlib) loaded successfully", output_script)
 
     # Test that regular Julia files (without inline sections) work fine as projects
-    regular_script = joinpath(@__DIR__, "project", "regular_script.jl")
+    regular_script = joinpath(@__DIR__, "project", "portable", "regular_script.jl")
 
     # Running the script with --project= should set it as active project
     output = read(`$(Base.julia_cmd()) --startup-file=no --project=$regular_script $regular_script`, String)
@@ -1918,29 +1918,35 @@ module M58272_to end
     @test occursin("Hello from regular script", output)
     @test occursin("x = 42", output)
 
+    portable_script_missing = joinpath(@__DIR__, "project", "portable", "portable_script_missing_dep.jl")
+    err_output = IOBuffer()
+    result = run(pipeline(ignorestatus(`$(Base.julia_cmd()) --startup-file=no $portable_script_missing`), stderr=err_output))
+    @test !success(result)
+    @test occursin("Package Rot13 not found in current path", String(take!(err_output)))
+
     # Test 1: Project section not first (has code before it)
-    invalid_project_not_first = joinpath(@__DIR__, "project", "invalid_project_not_first.jl")
+    invalid_project_not_first = joinpath(@__DIR__, "project", "portable", "invalid_project_not_first.jl")
     err_output = IOBuffer()
     result = run(pipeline(ignorestatus(`$(Base.julia_cmd()) --startup-file=no $invalid_project_not_first`), stderr=err_output))
     @test !success(result)
     @test occursin("#!project section must come first", String(take!(err_output)))
 
     # Test 2: Manifest section not last (has code after it)
-    invalid_manifest_not_last = joinpath(@__DIR__, "project", "invalid_manifest_not_last.jl")
+    invalid_manifest_not_last = joinpath(@__DIR__, "project", "portable", "invalid_manifest_not_last.jl")
     err_output = IOBuffer()
     result = run(pipeline(ignorestatus(`$(Base.julia_cmd()) --startup-file=no $invalid_manifest_not_last`), stderr=err_output))
     @test !success(result)
     @test occursin("#!manifest section must come last", String(take!(err_output)))
 
     # Test 3: Project not first, but manifest present
-    invalid_both = joinpath(@__DIR__, "project", "invalid_both.jl")
+    invalid_both = joinpath(@__DIR__, "project", "portable", "invalid_both.jl")
     err_output = IOBuffer()
     result = run(pipeline(ignorestatus(`$(Base.julia_cmd()) --startup-file=no --project=$invalid_both -e "using Test"`), stderr=err_output))
     @test !success(result)
     @test occursin("#!project section must come first", String(take!(err_output)))
 
     # Test 4: Manifest with code in between sections
-    invalid_code_between = joinpath(@__DIR__, "project", "invalid_code_between.jl")
+    invalid_code_between = joinpath(@__DIR__, "project", "portable", "invalid_code_between.jl")
     err_output = IOBuffer()
     result = run(pipeline(ignorestatus(`$(Base.julia_cmd()) --startup-file=no --project=$invalid_code_between -e "using Test"`), stderr=err_output))
     @test !success(result)

test/project/invalid_both.jl renamed to test/project/portable/invalid_both.jl

@@ -1,5 +1,3 @@
-using Test
-
 function foo()
     return 42
 end

test/project/invalid_code_between.jl renamed to test/project/portable/invalid_code_between.jl

@@ -1,8 +1,6 @@
 #!project begin
 #!project end
 
-using Test
-
 # Some actual Julia code
 function bar()
     println("hello")

test/project/invalid_manifest_not_last.jl renamed to test/project/portable/invalid_manifest_not_last.jl

@@ -3,8 +3,6 @@
 # Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 #!project end
 
-using Test
-
 #!manifest begin
 # julia_version = "1.11.0"
 #!manifest end

test/project/invalid_project_not_first.jl renamed to test/project/portable/invalid_project_not_first.jl

@@ -1,6 +1,5 @@
 # Some code before project section
 
-using Test
 x = 1
 
 #!project begin

test/project/portable_script.jl renamed to test/project/portable/portable_script.jl

@@ -85,7 +85,7 @@ end
 # version = "1.11.0"
 #
 # [[deps.Rot13]]
-# path = "Rot13"
+# path = "../Rot13"
 # uuid = "43ef800a-eac4-47f4-949b-25107b932e8f"
 # version = "0.1.0"
 #!manifest end

test/project/portable_script_custom.toml renamed to test/project/portable/portable_script_custom.toml

@@ -1,6 +1,5 @@
 julia_version = "1.13.0"
 manifest_format = "2.0"
-project_hash = "custom_manifest_test"
 
 [[deps.Random]]
 uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"