fix: fix match files issue.

jaywcjlove · Aug 31, 2023 · 6449b02 · 6449b02
1 parent 95862fb
commit 6449b02
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/core/README.md b/core/README.md
@@ -22,7 +22,7 @@ $ ejsc "template/*.ejs" "template/about/*.ejs" --watch
 
 ## Command Help
 
-Below is a help of commands you might find useful.
+Below is a help of commands you might find useful. You can use the `ejsc` and `ejs-cli` commands:
 
 ```shell
 Usage: ejs-cli <source...> [options]
@@ -41,12 +41,23 @@ Examples:
 
   $ ejsc "template/*.ejs" "template/about/*.ejs"
   $ ejsc "template/*.ejs" "template/about/*.ejs" --watch
-  $ ejsc "template/*.ejs" --watch
+  # The above command: matches all `.ejs` files in the template folder
+  $ ejsc "template/**/*" --watch
   $ ejs-cli "template/*.ejs" --watch
 
 Copyright 2023
 ```
 
+## Match files
+
+Folders and `.ejs` files starting with an _underscore_ (`_`) will be ignored.
+
+```shell
+$ ejsc "template/**/*"
+```
+
+The above command: matches all `.ejs` files in the template folder, excluding files starting with **`_`** and `.ejs` files in folders starting with **`_`**.
+
 ## Inject data
 
 Inject data by default

diff --git a/core/src/cli.mts b/core/src/cli.mts
@@ -69,7 +69,13 @@ import { helpStr } from "./help.mjs";
     const output = path.resolve(process.cwd(), cli.flags.out);
     let entry = [...cli.input];
 
-    entry = await glob(entry, { ignore: "node_modules/**" });
+    entry = await glob(entry, {
+      ignore: {
+        ignored: (p) => !/\.ejs$/i.test(p.name) || p.name.startsWith("_"),
+        childrenIgnored: (p) => p.name.startsWith("_"),
+      },
+    });
+    console.log("entry:2", entry);
     const isWatch = cli.flags.watch;
 
     const defaultOption: Options = {

diff --git a/core/src/watch.mts b/core/src/watch.mts
@@ -37,11 +37,8 @@ export async function watch(
         fs.removeSync(outputPath);
         console.log("🗑️ Delete folder \x1b[32;1m%s\x1b[0m !!!", filepath);
       }
-      const isPartial = !!filepath
-        .split(path.sep)
-        .find((m) => m.startsWith("_"));
 
-      if (!/(add|change)$/i.test(eventName) || isPartial) return;
+      if (!/(add|change)$/i.test(eventName)) return;
 
       if (/(.ejs)$/.test(filepath)) {
         try {

diff --git a/examples/package.json b/examples/package.json
@@ -4,8 +4,8 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "build": "ejs-cli 'template/*.ejs' 'template/about/*.ejs' -f data.json",
-    "start": "ejs-cli 'template/*.ejs' 'template/about/*.ejs' -f data.json --watch"
+    "build": "ejs-cli 'template/**/*' -f data.json",
+    "start": "ejs-cli 'template/**/*' -f data.json --watch"
   },
   "devDependencies": {
     "@wcj/ejs-cli": "1.1.0"