Fix regression of symlink handling during packing.

Author: whitequark

bin/pack-resources.js

@@ -72,18 +72,22 @@ const filesystem = async (fetch) => ({
 
 if (shareDirectory !== undefined) {
     const tarEntries = [];
-    for (const dirent of await readdir(shareDirectory, { withFileTypes: true, recursive: true })) {
-        const name = `${dirent.parentPath}/${dirent.name}`.replace(`${shareDirectory}/`, '');
-        if (dirent.isDirectory()) {
-            tarEntries.push({name: name});
-        } else if (dirent.isFile()) {
-            tarEntries.push({name, data: await readFile(`${dirent.parentPath}/${dirent.name}`)});
+    async function archivePath(pathName) {
+        const pathStat = await stat(pathName);
+        const tarName = pathName.replace(`${shareDirectory}/`, '');
+        if (pathStat.isDirectory()) {
+            if (pathName !== shareDirectory)
+                tarEntries.push({name: tarName});
+            for (const name of await readdir(pathName))
+                await archivePath(`${pathName}/${name}`);
+        } else if (pathStat.isFile()) {
+            tarEntries.push({name: tarName, data: await readFile(pathName)});
         } else {
-            console.error(`Unsupported type of '${dirent.name}'!`);
+            console.error(`Unsupported type of '${pathName}'!`);
             process.exit(2);
         }
     }
-
+    await archivePath(shareDirectory);
     const tarData = createTar(tarEntries);
     const tarFilePath = resourceFilePath.replace(/\.js$/, '.tar');
     await writeFile(tarFilePath, tarData);

test/yowasp_runtime_test/index.js

@@ -12,6 +12,10 @@ if ((await yowaspRuntimeTest.run(['share/bar/baz.txt', 'bar.txt'], {}))['bar.txt
     throw 'test 1 failed (2)';
 if ((await yowaspRuntimeTest.run(['share/bar/cat/stat.txt', 'bar.txt'], {}))['bar.txt'] !== 'im drumnk\n')
     throw 'test 1 failed (3)';
+if ((await yowaspRuntimeTest.run(['share/sym.txt', 'bar.txt'], {}))['bar.txt'] !== 'meow\n')
+    throw 'test 1 failed (4)';
+if ((await yowaspRuntimeTest.run(['share/cat/stat.txt', 'bar.txt'], {}))['bar.txt'] !== 'im drumnk\n')
+    throw 'test 1 failed (5)';
 
 if ((await yowaspRuntimeTest.run(['baz.txt', 'bar.txt'], {'baz.txt': 'contents of baz'}))['bar.txt'] !== 'contents of baz')
     throw 'test 2 failed';

test/yowasp_runtime_test/share/cat

@@ -0,0 +1 @@
+bar/cat

test/yowasp_runtime_test/share/sym.txt

@@ -0,0 +1 @@
+bar/baz.txt