Merge pull request #180 from ghostdevv/fix-read

Author: ghostdevv

.changeset/five-trees-flow.md

@@ -0,0 +1,5 @@
+---
+'jellycommands': patch
+---
+
+nested files with \_ are now ignored correctly

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
             - name: Setup PNPM
               uses: pnpm/[email protected]
               with:
-                  version: 7.0.0
+                  version: 8
 
             - name: Install Dependencies
               run: pnpm install

.github/workflows/tests.yml

@@ -26,7 +26,7 @@ jobs:
               uses: pnpm/[email protected]
               id: pnpm-install
               with:
-                  version: 7
+                  version: 8
                   run_install: false
 
             - name: Get pnpm store directory

package.json

@@ -2,7 +2,6 @@
     "name": "jellycommands-monorepo",
     "private": true,
     "license": "MIT",
-    "packageManager": "[email protected]",
     "devDependencies": {
         "@changesets/cli": "^2.26.0",
         "@svitejs/changesets-changelog-github-compact": "^1.1.0",
@@ -22,7 +21,7 @@
         "test-create": "node packages/create-jellycommands/src/bin.js"
     },
     "engines": {
-        "pnpm": "^7.0.0",
+        "pnpm": "^8.0.0",
         "npm": "forbidden, use pnpm",
         "node": ">= 16"
     },

packages/jellycommands/package.json

@@ -34,6 +34,7 @@
     "@types/node": "^18.14.0",
     "@typescript-eslint/eslint-plugin": "^5.53.0",
     "@typescript-eslint/parser": "^5.53.0",
+    "desm": "^1.3.0",
     "discord.js": "^14.7.1",
     "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",

packages/jellycommands/src/utils/files.ts

@@ -1,3 +1,4 @@
+import { basename } from 'path';
 import { totalist } from 'totalist';
 import { pathToFileURL } from 'url';
 
@@ -12,7 +13,9 @@ export async function read<T>(things: string | Array<string | T>, callback: (ite
             continue;
         }
 
-        await totalist(item, async (name, rawPath) => {
+        await totalist(item, async (relPath, rawPath) => {
+            const name = basename(relPath);
+
             // If it starts with an _ we ignore it
             if (name.startsWith('_')) return;
 

packages/jellycommands/tests/files/read.test.ts

@@ -0,0 +1,28 @@
+import { read } from '../../src/utils/files';
+import { notEqual, ok } from 'assert';
+import { join } from 'desm';
+import { test } from 'uvu';
+
+const TEST_FILES = join(import.meta.url, './test-files');
+
+test('can read files', async () => {
+    const data: string[] = [];
+
+    await read<string>(TEST_FILES, (item) => {
+        data.push(item);
+    });
+
+    notEqual(data.length, 0);
+});
+
+test('ignores files with _ in name', async () => {
+    const data: string[] = [];
+
+    await read<string>(TEST_FILES, (item) => {
+        data.push(item);
+    });
+
+    ok(!data.includes('WRONG'));
+});
+
+test.run();

packages/jellycommands/tests/files/test-files/index.mjs

@@ -0,0 +1 @@
+export default 'correct';

packages/jellycommands/tests/files/test-files/nested/_ignored.mjs

@@ -0,0 +1 @@
+export default 'WRONG';

packages/jellycommands/tests/files/test-files/nested/hello.mjs

@@ -0,0 +1 @@
+export default 'correct';