feat: support partly vendored

api/rockamalg.proto

@@ -20,6 +20,7 @@ message AmalgRequest {
     bool isolate = 5;
     bool disable_debug = 6;
     bool allow_dev_dependencies = 7;
+    bytes vendor = 8;
 }
 
 message AmalgResponse {

internal/rockamalg/rockamalg.go

@@ -126,6 +126,16 @@ func (a *amalg) Do(ctx context.Context) error {
 		}
 	}
 
+	if a.p.Vendor != "" {
+		if empty, err := isFileEmpty(a.p.Vendor); err != nil {
+			return fmt.Errorf("check vendor file is empty: %w", err)
+		} else if !empty {
+			if err := a.wrapWithMsg(a.extractVendorArchive, "Extracting vendor archive")(ctx); err != nil {
+				return fmt.Errorf("extract vendor archive: %w", err)
+			}
+		}
+	}
+
 	if a.p.Rockspec != "" {
 		if err := a.wrapWithMsg(a.installDependencies, "Installing dependencies")(ctx); err != nil {
 			return fmt.Errorf("install dependencies: %w", err)
@@ -248,6 +258,10 @@ func (a *amalg) installDependencies(ctx context.Context) error {
 	return nil
 }
 
+func (a *amalg) extractVendorArchive(_ context.Context) error {
+	return archive.UnzipFileToDir(a.p.Vendor, a.tree)
+}
+
 func (a *amalg) buildVendorArchive(_ context.Context) error {
 	return archive.ZipDirToFile(a.tree, a.p.Vendor)
 }
@@ -444,3 +458,16 @@ func isDirectory(path string) (bool, error) {
 
 	return fileInfo.IsDir(), err
 }
+
+func isFileEmpty(path string) (bool, error) {
+	fi, err := os.Stat(path)
+	if err == nil {
+		return fi.Size() == 0, nil
+	}
+
+	if os.IsNotExist(err) {
+		return true, nil
+	}
+
+	return false, err
+}

internal/server/server.go

@@ -100,13 +100,20 @@ func (s *Server) prepareAmalgParams(
 		AllowDevDeps: req.GetAllowDevDependencies(),
 	}
 
+	if len(req.GetVendor()) != 0 {
+		if err := os.WriteFile(amalgParams.Vendor, req.GetVendor(), newFilePerm); err != nil {
+			return zero, status.Newf(codes.Internal, "create vendor.zip file: %v", err)
+		}
+	}
+
 	if len(req.GetDependencies()) != 0 {
 		amalgParams.Dependencies = filepath.Join(amalgDir, "deps")
 		if err := s.writeDependenciesFile(req.GetDependencies(), amalgParams.Dependencies); err != nil {
 			return zero, status.Newf(codes.Internal, "create dependencies file: %v", err)
 		}
 	}
 
+	var err error
 	amalgParams.Rockspec, err = s.writeRockspec(ctx, req.GetRockspec(), amalgDir)
 	if err != nil {
 		return zero, status.Newf(codes.Internal, "create rockspec file: %v", err)

tests/integration/amalg_test.go

@@ -27,6 +27,7 @@ const (
 	publicRocks rockstype = iota
 	privateRocks
 	devRocksTest
+	vendoredRocks
 )
 
 func TestAmalgCommandPublicRocks(t *testing.T) {
@@ -41,6 +42,12 @@ func TestAmalgCommandPrivateRocks(t *testing.T) {
 	testAmalg(t, "testdata/amalg-private", privateRocks)
 }
 
+func TestAmalgCommandPartlyVendored(t *testing.T) {
+	t.Parallel()
+
+	testAmalg(t, "testdata/amalg-partly-vendor", vendoredRocks)
+}
+
 func TestAmalgDevDeps(t *testing.T) {
 	t.Parallel()
 
@@ -197,6 +204,11 @@ func buildTestOpts(
 	t.Cleanup(func() { os.Remove(vendorFile.Name()) })
 	require.NoError(t, vendorFile.Close())
 
+	if rt == vendoredRocks {
+		vendorInPath := filepath.Join(testdataPath, "vendor_in")
+		require.NoError(t, archive.ZipDirToFile(vendorInPath, vendorFile.Name()))
+	}
+
 	luaNameBytes, err := os.ReadFile(filepath.Join(testdataPath, "lua"))
 	require.NoError(t, err)
 

tests/integration/server_test.go

@@ -37,6 +37,12 @@ func TestServerPrivateRocks(t *testing.T) {
 	testServer(t, "testdata/amalg-private", port, privateRocks)
 }
 
+func TestServerCommandPartlyVendored(t *testing.T) {
+	t.Parallel()
+
+	testAmalg(t, "testdata/amalg-partly-vendor", vendoredRocks)
+}
+
 func TestServerDevDeps(t *testing.T) {
 	t.Parallel()
 
@@ -61,7 +67,7 @@ func TestServerDevDeps(t *testing.T) {
 			req := buildReq(t, testOpts{
 				luaPath:      filepath.Join(testdataPath, "test.lua"),
 				depsFileName: filepath.Join(testdataPath, "deps"),
-			}, false)
+			}, devRocksTest, false)
 
 			expectedStdout := filepath.Join(testdataPath, "rpc.err")
 			if tc.allowDevDeps {
@@ -96,7 +102,7 @@ func testServer(t *testing.T, testdataDir string, port int, rt rockstype) {
 		t.Run(test.PrettyName(), func(t *testing.T) {
 			t.Parallel()
 			testOpts := buildTestOpts(t, testdataDir, rt, test)
-			req := buildReq(t, testOpts, test.isolate)
+			req := buildReq(t, testOpts, rt, test.isolate)
 
 			resp, err := cli.Amalg(context.Background(), req)
 			require.NoError(t, err)
@@ -110,7 +116,7 @@ func testServer(t *testing.T, testdataDir string, port int, rt rockstype) {
 	}
 }
 
-func buildReq(t *testing.T, opts testOpts, isolate bool) *rockamalgrpc.AmalgRequest {
+func buildReq(t *testing.T, opts testOpts, rt rockstype, isolate bool) *rockamalgrpc.AmalgRequest {
 	t.Helper()
 
 	req := &rockamalgrpc.AmalgRequest{Isolate: isolate, DisableDebug: opts.disableDebug}
@@ -129,6 +135,10 @@ func buildReq(t *testing.T, opts testOpts, isolate bool) *rockamalgrpc.AmalgRequ
 		req.Dependencies = readDependencies(t, opts.depsFileName)
 	}
 
+	if rt == vendoredRocks {
+		req.Vendor = zipDir(t, opts.vendorFileName)
+	}
+
 	return req
 }
 

tests/integration/testdata/amalg-partly-vendor/single_file_with_deps/deps

@@ -0,0 +1,2 @@
+lua-string == 1.2.0
+inspect ~> 3.1.2

tests/integration/testdata/amalg-partly-vendor/single_file_with_deps/fw.lua

@@ -0,0 +1,5 @@
+require "lua-string"
+inspect = require "inspect"
+
+local v = ("Hello world!"):trimend("!"):sub(6):trim():totable()
+print(inspect(v))