adds included packages and glob without gitignore options for finding…

… packages purescript#1231
OxfordAbstracts · Jun 17, 2024 · 638629a · 638629a
1 parent 42e70a1
commit 638629a
Show file tree

Hide file tree

Showing 8 changed files with 403 additions and 58 deletions.
diff --git a/core/src/Config.purs b/core/src/Config.purs
@@ -8,6 +8,7 @@ module Spago.Core.Config
   , Dependencies(..)
   , ExtraPackage(..)
   , GitPackage
+  , IncludedPackages
   , LegacyPackageSetEntry
   , LocalPackage
   , PackageBuildOptionsInput
@@ -34,7 +35,8 @@ module Spago.Core.Config
   , remotePackageCodec
   , setAddressCodec
   , widestRange
-  ) where
+  )
+  where
 
 import Spago.Core.Prelude
 
@@ -285,6 +287,8 @@ printSpagoRange range =
 
 type WorkspaceConfig =
   { packageSet :: Maybe SetAddress
+  , includedPackages :: Maybe IncludedPackages
+  , searchIgnoredFiles :: Maybe Boolean
   , extraPackages :: Maybe (Map PackageName ExtraPackage)
   , backend :: Maybe BackendConfig
   , buildOpts :: Maybe WorkspaceBuildOptionsInput
@@ -296,6 +300,8 @@ workspaceConfigCodec = CJ.named "WorkspaceConfig" $ CJ.object
   $ CJ.recordPropOptional (Proxy :: _ "backend") backendConfigCodec
   $ CJ.recordPropOptional (Proxy :: _ "buildOpts") buildOptionsCodec
   $ CJ.recordPropOptional (Proxy :: _ "extraPackages") (Internal.Codec.packageMap extraPackageCodec)
+  $ CJ.recordPropOptional (Proxy :: _ "includedPackages") buildIncludedPackages
+  $ CJ.recordPropOptional (Proxy :: _ "searchIgnoredFiles") CJ.boolean
   $ CJ.record
 
 type WorkspaceBuildOptionsInput =
@@ -311,6 +317,11 @@ buildOptionsCodec = CJ.named "WorkspaceBuildOptionsInput" $ CJ.object
   $ CJ.recordPropOptional (Proxy :: _ "statVerbosity") statVerbosityCodec
   $ CJ.record
 
+type IncludedPackages = Array String
+
+buildIncludedPackages :: CJ.Codec IncludedPackages
+buildIncludedPackages = CJ.named "IncludedPackages" $ CJ.array CJ.string
+
 data CensorBuildWarnings
   = CensorAllWarnings
   | CensorSpecificWarnings (NonEmptyArray WarningCensorTest)

diff --git a/docs-search/index/src/Docs/Search/IndexBuilder.js b/docs-search/index/src/Docs/Search/IndexBuilder.js
@@ -1,4 +1,4 @@
-import globMain from "glob";
+import { globSync } from "glob";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -21,6 +21,6 @@ export function getDocsSearchAppPath() {
 
 export function glob(pattern) {
   return function () {
-    return globMain.sync(pattern);
+    return globSync(pattern);
   };
 }