simplify logic (JS)

Author: mishushakov

packages/js-sdk/src/template/index.ts

@@ -359,7 +359,7 @@ export class TemplateBase
 
     for (const src of srcs) {
       const args = [
-        relativizePath(src, this.fileContextPath),
+        relativizePath(src),
         dest.toString(),
         options?.user ?? '',
         options?.mode ? padOctal(options.mode) : '',

packages/js-sdk/src/template/utils.ts

@@ -259,7 +259,6 @@ export function padOctal(mode: number): string {
  * Create a compressed tar stream of files matching a pattern.
  *
  * @param filePath Glob pattern for files to include
- * @param fileName Name of the file in the tar archive
  * @param fileContextPath Base directory for resolving file paths
  * @param ignorePatterns Ignore patterns to exclude from the archive
  * @param resolveSymlinks Whether to follow symbolic links
@@ -291,7 +290,7 @@ export async function tarFileStream(
 
   for (const file of allFiles) {
     const sourcePath = file.fullpathPosix()
-    const targetPath = relativizePath(sourcePath, fileContextPath)
+    const targetPath = relativizePath(filePath)
 
     if (file.isDirectory()) {
       sources.push({
@@ -323,7 +322,7 @@ export async function tarFileStream(
 /**
  * Create a tar stream and calculate its compressed size for upload.
  *
- * @param fileName Glob pattern for files to include
+ * @param filePath Glob pattern for files to include
  * @param fileContextPath Base directory for resolving file paths
  * @param resolveSymlinks Whether to follow symbolic links
  * @returns Object containing the content length and upload stream
@@ -410,21 +409,9 @@ export function readGCPServiceAccountJSON(
  * @param fileContextPath Base directory for resolving relative paths
  * @returns Relative path with forward slashes (for tar/cross-platform compatibility)
  */
-export function relativizePath(
-  src: PathLike,
-  fileContextPath: PathLike
-): string {
-  let rewrittenPath = src.toString()
-
-  // Convert absolute paths to relative paths
-  if (path.isAbsolute(rewrittenPath)) {
-    const contextPath = path.resolve(fileContextPath.toString())
-    const relativePath = path.relative(contextPath, rewrittenPath)
-    rewrittenPath = relativePath
-  }
-
+export function relativizePath(src: PathLike): string {
   // Strip up directories (../ or ..\ on Windows)
-  rewrittenPath = rewrittenPath.replace(/\.\.(\/|\\)/g, '')
+  const rewrittenPath = src.toString().replace(/\.\.(\/|\\)/g, '')
 
   // Normalize to forward slashes for cross-platform compatibility (tar archives require forward slashes)
   return normalizePath(rewrittenPath)

packages/js-sdk/tests/template/build.test.ts

@@ -77,14 +77,13 @@ buildTemplateTest(
   'build template with absolute paths',
   async ({ buildTemplate }) => {
     const packageTxt = path.resolve(process.cwd(), folderPath, 'test.txt')
-    const rootTxt = path.resolve(process.cwd(), '..', '..', 'package.json')
 
     const template = Template()
       // using base image to avoid re-building ubuntu:22.04 image
       .fromBaseImage()
       .skipCache()
       .copy(packageTxt, 'text.txt', { forceUpload: true })
-      .copy(rootTxt, 'package.json', { forceUpload: true })
+      .copy('../../../../package.json', 'package.json', { forceUpload: true })
       .runCmd(['ls -l .', 'cat text.txt', 'cat package.json'])
 
     await buildTemplate(template, {}, defaultBuildLogger())