Merge pull request #5 from xp-forge/refactor/sources

Unique given sources

Author: thekid

src/main/php/xp/lambda/PackageLambda.class.php

@@ -1,18 +1,17 @@
 <?php namespace xp\lambda;
 
 use io\Path;
-use io\archive\zip\{ZipFile, ZipDirEntry, ZipFileEntry, Compression};
+use io\archive\zip\{ZipFile, ZipArchiveWriter, ZipDirEntry, ZipFileEntry, Compression};
 use io\streams\StreamTransfer;
 use util\cmd\Console;
 
 class PackageLambda {
   const COMPRESSION_THRESHOLD = 24;
 
-  private $target, $sources, $base, $exclude, $compression;
+  private $target, $sources, $exclude, $compression;
 
-  public function __construct(Path $target, Path $base, array $sources, string $exclude= '#(^|/)(\..+|src/test|src/it)(/|$)#') {
+  public function __construct(Path $target, Sources $sources, string $exclude= '#(^|/)(\..+|src/test|src/it)(/|$)#') {
     $this->target= $target;
-    $this->base= $base->asRealpath();
     $this->sources= $sources;
     $this->exclude= $exclude;
 
@@ -26,38 +25,38 @@ public function __construct(Path $target, Path $base, array $sources, string $ex
     }
   }
 
-  /** Returns ZIP file entries */
-  private function entries(Path $path) {
+  /** Adds ZIP file entries */
+  private function add(ZipArchiveWriter $zip, Path $path) {
     if (preg_match($this->exclude, $path->toString('/'))) return;
 
-    $relative= trim(str_replace($this->base, '', $path), DIRECTORY_SEPARATOR);
+    $relative= $path->relativeTo($this->sources->base);
     if ($path->isFile()) {
-      yield function($z) use($relative, $path) {
-        $file= $z->add(new ZipFileEntry($relative));
+      $file= $zip->add(new ZipFileEntry($relative));
 
-        // See https://stackoverflow.com/questions/46716095/minimum-file-size-for-compression-algorithms
-        if (filesize($path) > self::COMPRESSION_THRESHOLD) {
-          $file->setCompression($this->compression, 9);
-        }
-        (new StreamTransfer($path->asFile()->in(), $file->out()))->transferAll();
-        return $file;
-      };
+      // See https://stackoverflow.com/questions/46716095/minimum-file-size-for-compression-algorithms
+      if (filesize($path) > self::COMPRESSION_THRESHOLD) {
+        $file->setCompression($this->compression, 9);
+      }
+      (new StreamTransfer($path->asFile()->in(), $file->out()))->transferAll();
+      yield $file;
     } else {
-      yield function($z) use($relative) { return $z->add(new ZipDirEntry($relative)); };
+      yield $zip->add(new ZipDirEntry($relative));
       foreach ($path->asFolder()->entries() as $entry) {
-        yield from $this->entries($entry);
+        yield from $this->add($zip, $entry);
       }
     }
   }
 
   public function run(): int {
     Console::writeLine('[+] Creating ', $this->target, ' (compression: ', $this->compression, ')');
     $z= ZipFile::create($this->target->asFile()->out());
-    foreach ($this->sources as $i => $source) {
-      Console::writef("\e[34m => [%d/%d] ", $i + 1, sizeof($this->sources) + 1);
+
+    $sources= [...$this->sources];
+    $total= sizeof($sources) + 1;
+    foreach ($sources as $i => $source) {
+      Console::writef("\e[34m => [%d/%d] ", $i + 1, $total);
       $entries= 0;
-      foreach ($this->entries(new Path($source)) as $action) {
-        $entry= $action($z);
+      foreach ($this->add($z, new Path($source)) as $entry) {
         $entries++;
         Console::writef('%-60s %4d%s', substr($entry->getName(), -60), $entries, str_repeat("\x08", 65));
       }
@@ -66,7 +65,7 @@ public function run(): int {
 
     $file= $z->add(new ZipFileEntry('class.pth'));
     $file->out()->write(preg_replace($this->exclude.'m', '?$1', file_get_contents('class.pth')));
-    Console::writeLinef("\e[34m => [%1\$d/%1\$d] class.pth\e[0m", sizeof($this->sources) + 1);
+    Console::writeLinef("\e[34m => [%1\$d/%1\$d] class.pth\e[0m", $total);
 
     $z->close();
     Console::writeLine();

src/main/php/xp/lambda/Runner.class.php

@@ -52,7 +52,7 @@ private static function resolve(string $version= null): string {
   private static function command(string $name, array $args): object {
     sscanf($name, "%[^:]:%[^\r]", $command, $version);
     switch ($command) {
-      case 'package': return new PackageLambda(new Path('function.zip'), new Path('.'), [...$args, 'src', 'vendor']);
+      case 'package': return new PackageLambda(new Path('function.zip'), new Sources(new Path('.'), [...$args, 'src', 'vendor']));
       case 'runtime': return new CreateRuntime(self::resolve($version), new Path('runtime-%s.zip'), in_array('-b', $args));
       case 'test': return new TestLambda(self::resolve($version), new Path('.'), $args[0] ?? 'Handler', $args[1] ?? '{}');
       default: return new DisplayError('Unknown command "'.$args[0].'"');

src/main/php/xp/lambda/Sources.class.php

@@ -0,0 +1,28 @@
+<?php namespace xp\lambda;
+
+use IteratorAggregate, Traversable;
+use io\Path;
+
+/** Returns a unique list of sources */
+class Sources implements IteratorAggregate {
+  public $base;
+  private $sources;
+
+  public function __construct(Path $base, array $sources) {
+    $this->base= $base->asRealpath();
+    $this->sources= $sources;
+  }
+
+  public function getIterator(): Traversable {
+    $seen= [];
+    foreach ($this->sources as $source) {
+      $path= ($source instanceof Path ? $source : new Path($source))->asRealpath();
+
+      $key= $path->hashCode(); 
+      if (isset($seen[$key])) continue;
+
+      yield $path;
+      $seen[$key]= true;
+    }
+  }
+}

src/test/php/com/amazon/aws/lambda/unittest/SourcesTest.class.php

@@ -0,0 +1,79 @@
+<?php namespace com\amazon\aws\lambda\unittest;
+
+use io\{Folder, File, Path};
+use lang\Environment;
+use unittest\{Assert, After, Test, Values};
+use xp\lambda\Sources;
+
+class SourcesTest {
+  private $cleanup= [];
+
+  /** Creates a directory given a layout */
+  private function directory(array $layout): Path {
+    $dir= new Folder(Environment::tempDir(), uniqid());
+    $dir->create() && $this->cleanup[]= $dir;
+
+    foreach ($layout as $name => $contents) {
+      if (null === $contents) {
+        $f= new Folder($dir, $name);
+        $f->create();
+      } else {
+        $f= new File($dir, $name);
+        $f->touch();
+      }
+    }
+
+    return new Path($dir);
+  }
+
+  #[After]
+  public function cleanup() {
+    foreach ($this->cleanup as $folder) {
+      $folder->unlink();
+    }
+  }
+
+  #[Test]
+  public function can_create() {
+    new Sources(new Path('.'), []);
+  }
+
+  #[Test, Values([[['%s/test.txt']], [['%s/test.txt', '%s/test.txt', '%s/./test.txt', '%s/../%s/test.txt']]])]
+  public function with_one_file($sources) {
+    $dir= $this->directory(['test.txt' => 'Test']);
+
+    Assert::equals(
+      [new Path($dir, 'test.txt')],
+      iterator_to_array(new Sources($dir, array_map(
+        function($source) use($dir) { return sprintf($source, $dir, $dir->name()); },
+        $sources
+      )))
+    );
+  }
+
+  #[Test, Values([[['%s/src']], [['%s/src', '%s/src', '%s/./src', '%s/../%s/src']]])]
+  public function with_one_directory($sources) {
+    $dir= $this->directory(['src' => null]);
+
+    Assert::equals(
+      [new Path($dir, 'src')],
+      iterator_to_array(new Sources($dir, array_map(
+        function($source) use($dir) { return sprintf($source, $dir, $dir->name()); },
+        $sources
+      )))
+    );
+  }
+
+  #[Test, Values([[['%s/src', '%s/vendor', '%s/test.txt']], [['%s/src', '%s/vendor', '%s/test.txt', '%s/src', '%s/./vendor']]])]
+  public function with_files_and_directories($sources) {
+    $dir= $this->directory(['src' => null, 'vendor' => null, 'test.txt' => 'Test']);
+
+    Assert::equals(
+      [new Path($dir, 'src'), new Path($dir, 'vendor'), new Path($dir, 'test.txt')],
+      iterator_to_array(new Sources($dir,  array_map(
+        function($source) use($dir) { return sprintf($source, $dir, $dir->name()); },
+        $sources
+      )))
+    );
+  }
+}