Merge pull request #437 from zong-zhe/rm-kclmod-gen

fix: rm the generation of kcl.mod when compile virtual package

pkg/client/client.go

@@ -414,7 +414,7 @@ func (c *KpmClient) resolvePkgDeps(kclPkg *pkg.KclPkg, lockDeps *pkg.Dependencie
 	}
 
 	// Generate file kcl.mod.lock.
-	if !kclPkg.NoSumCheck || !update {
+	if kclPkg.ModFile.Dependencies.Deps.Len() > 0 && !kclPkg.NoSumCheck || !update {
 		err := kclPkg.LockDepsVersion()
 		if err != nil {
 			return err

pkg/client/client_test.go

@@ -1965,3 +1965,27 @@ func TestRunWithLogger(t *testing.T) {
 	assert.Equal(t, err, nil)
 	assert.Equal(t, logbuf.String(), "Hello, World!\n")
 }
+
+func TestVirtualPackageVisiter(t *testing.T) {
+	pkgPath := getTestDir("test_virtual_pkg_visitor")
+	kpmcli, err := NewKpmClient()
+	assert.Equal(t, err, nil)
+
+	pkgSource, err := downloader.NewSourceFromStr(pkgPath)
+	assert.Equal(t, err, nil)
+
+	v := NewVisitor(*pkgSource, kpmcli)
+	err = v.Visit(pkgSource, func(p *pkg.KclPkg) error {
+		assert.Contains(t, p.GetPkgName(), "vPkg_")
+		_, err = os.Stat(filepath.Join(pkgPath, "kcl.mod"))
+		assert.Equal(t, os.IsNotExist(err), true)
+		_, err = os.Stat(filepath.Join(pkgPath, "kcl.mod.lock"))
+		assert.Equal(t, os.IsNotExist(err), true)
+		return nil
+	})
+	assert.Equal(t, err, nil)
+	_, err = os.Stat(filepath.Join(pkgPath, "kcl.mod"))
+	assert.Equal(t, os.IsNotExist(err), true)
+	_, err = os.Stat(filepath.Join(pkgPath, "kcl.mod.lock"))
+	assert.Equal(t, os.IsNotExist(err), true)
+}

pkg/client/test_data/test_virtual_pkg_visitor/main.k

@@ -0,0 +1 @@
+The_first_kcl_program = 'Hello World!'

pkg/client/visitor.go

@@ -77,48 +77,14 @@ func (vpv *VirtualPkgVisitor) Visit(s *downloader.Source, v visitFunc) error {
 		return err
 	}
 
-	// If the source path does not contain a kcl.mod file, create a virtual kcl.mod file.
-	vKclModPath := filepath.Join(sourcePath, constants.KCL_MOD)
-	if !utils.DirExists(vKclModPath) {
-		// After the visitFunc is executed, clean the virtual kcl.mod file.
-		defer func() error {
-			vKclModLockPath := filepath.Join(sourcePath, constants.KCL_MOD_LOCK)
-			if utils.DirExists(vKclModPath) {
-				err := os.RemoveAll(vKclModPath)
-				if err != nil {
-					return err
-				}
-			}
-			if utils.DirExists(vKclModLockPath) {
-				err := os.RemoveAll(vKclModLockPath)
-				if err != nil {
-					return err
-				}
-			}
-			return nil
-		}()
-		initOpts := opt.InitOptions{
-			Name:     "vPkg_" + uuid.New().String(),
-			InitPath: sourcePath,
-		}
-
-		modfile := pkg.NewModFile(&initOpts)
-		logWriter := vpv.kpmcli.GetLogWriter()
-		vpv.kpmcli.SetLogWriter(nil)
-		err = vpv.kpmcli.createIfNotExist(modfile.GetModFilePath(), modfile.StoreModFile)
-		if err != nil {
-			return err
-		}
-		vpv.kpmcli.SetLogWriter(logWriter)
-	}
-
-	kclPkg, err := vpv.kpmcli.LoadPkgFromPath(sourcePath)
-	if err != nil {
-		return err
+	initOpts := opt.InitOptions{
+		Name:     "vPkg_" + uuid.New().String(),
+		InitPath: sourcePath,
 	}
 
+	kpkg := pkg.NewKclPkg(&initOpts)
 	// If the required files are present, proceed with the visitFunc
-	return v(kclPkg)
+	return v(&kpkg)
 }
 
 // RemoteVisitor is the visitor for visiting a remote package.