@mintlify/cli 4.0.1488 → 4.0.1489

package/bin/format.js

@@ -33,7 +33,7 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
     function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import { isMintIgnored, processMintIgnoreString } from '@mintlify/common';
+import { createMintIgnoreMatcher, isMintIgnoredBy, processMintIgnoreString, } from '@mintlify/common';
 import { getMintIgnore } from '@mintlify/prebuild';
 import { addLog, ErrorLog, SuccessLog } from '@mintlify/previewing';
 import fs from 'node:fs/promises';
@@ -50,20 +50,18 @@ function getGitIgnore() {
         }
     });
 }
-function walk(dir, ignores) {
+function walk(dir, matcher) {
     return __asyncGenerator(this, arguments, function* walk_1() {
         const entries = yield __await(fs.readdir(dir, { withFileTypes: true }));
         for (const entry of entries) {
             const full = path.join(dir, entry.name);
             const relative = path.relative(CMD_EXEC_PATH, full).split(path.sep).join('/');
+            if (isMintIgnoredBy(relative, matcher, entry.isDirectory()))
+                continue;
             if (entry.isDirectory()) {
-                if (isMintIgnored(`${relative}/`, ignores))
-                    continue;
-                yield __await(yield* __asyncDelegator(__asyncValues(walk(full, ignores))));
+                yield __await(yield* __asyncDelegator(__asyncValues(walk(full, matcher))));
             }
             else if (entry.name.endsWith('.mdx')) {
-                if (isMintIgnored(relative, ignores))
-                    continue;
                 yield yield __await(full);
             }
         }
@@ -73,11 +71,12 @@ export const formatHandler = () => __awaiter(void 0, void 0, void 0, function* (
     var _a, e_1, _b, _c;
     const { mdxToPm, pmToMdx, canonicalPmToMdxOptions } = yield import('./vendor/converter.js');
     const ignores = [...(yield getGitIgnore()), ...(yield getMintIgnore(CMD_EXEC_PATH))];
+    const matcher = createMintIgnoreMatcher(ignores);
     let total = 0;
     let changed = 0;
     let failed = 0;
     try {
-        for (var _d = true, _e = __asyncValues(walk(CMD_EXEC_PATH, ignores)), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
+        for (var _d = true, _e = __asyncValues(walk(CMD_EXEC_PATH, matcher)), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
             _c = _f.value;
             _d = false;
             const file = _c;