fix: ignore hidden folders from oa

devthefuture-org · Dec 15, 2023 · 27a4151 · 27a4151
1 parent a027ec2
commit 27a4151
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 26 deletions.
diff --git a/packages/core/libs/build.js b/packages/core/libs/build.js
@@ -39,11 +39,11 @@ function treeFileLoader(filename) {
   return `require("${src}")`
 }
 
-function buildDirTree(treeDirs) {
+function buildDirTree(treeDirs, { filter } = {}) {
   for (const { dir, pattern, dirName } of treeDirs) {
     const dirPath = path.resolve(srcDir, dir)
     const content = fs.existsSync(dirPath)
-      ? dirtree2static(dirPath, { pattern, loader: treeFileLoader })
+      ? dirtree2static(dirPath, { pattern, loader: treeFileLoader, filter })
       : JSON.stringify({})
     const dest = path.join(buildDir, `${dirName || dir}.js`)
     ensureFileHasDir(dest)

diff --git a/packages/core/utils/fs/dirtree2static.js b/packages/core/utils/fs/dirtree2static.js
@@ -28,19 +28,22 @@ module.exports = function dirtree2static(
     defaultsDeep(options, defaultOptions)
     rootDir = filename
   }
-  const { pattern, loader } = options
+  const { pattern, loader, filter = () => true } = options
   const stats = fs.lstatSync(filename)
   if (stats.isDirectory()) {
-    const files = fs.readdirSync(filename).filter((file) => {
-      const absPath = `${filename}/${file}`
-      const relPath = absPath.slice(rootDir.length)
-      return (
-        (typeof pattern === "function"
-          ? pattern(relPath)
-          : relPath.match(pattern)) ||
-        fs.lstatSync(`${filename}/${file}`).isDirectory()
-      )
-    })
+    const files = fs
+      .readdirSync(filename)
+      .filter(filter)
+      .filter((file) => {
+        const absPath = `${filename}/${file}`
+        const relPath = absPath.slice(rootDir.length)
+        return (
+          (typeof pattern === "function"
+            ? pattern(relPath)
+            : relPath.match(pattern)) ||
+          fs.lstatSync(`${filename}/${file}`).isDirectory()
+        )
+      })
 
     const results = {}
     for (const file of files) {

diff --git a/plugins/oa/index.js b/plugins/oa/index.js
@@ -86,20 +86,25 @@ module.exports.build = (options = {}) => {
 
   compileDirList(apiPath)
 
-  buildDirTree([
-    {
-      dir: apiPath,
-      pattern:
-        /^\/v\d+\/(formats|operations|security|spec|validators|services)\/(.*)\.(js|yaml|yml)$/,
-      dirName: "api",
-    },
+  buildDirTree(
+    [
+      {
+        dir: apiPath,
+        pattern:
+          /^\/v\d+\/(formats|operations|security|spec|validators|services)\/(.*)\.(js|yaml|yml)$/,
+        dirName: "api",
+      },
+      {
+        dir: sharedApiPath,
+        pattern:
+          /^\/(formats|operations|security|spec|validators|services)\/(.*)\.(js|yaml|yml)$/,
+        dirName: "sharedApi",
+      },
+    ],
     {
-      dir: sharedApiPath,
-      pattern:
-        /^\/(formats|operations|security|spec|validators|services)\/(.*)\.(js|yaml|yml)$/,
-      dirName: "sharedApi",
-    },
-  ])
+      filter: (p) => !/(^|\/)\.[^/]+/.test(p),
+    }
+  )
 
   fs.copySync(
     path.dirname(require.resolve("swagger-ui-dist")),