Remove strict from GlobOptions

denoland · Sep 30, 2019 · 9d46b1a · 9d46b1a
1 parent 1f2dbd3
commit 9d46b1a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/fs/glob.ts b/fs/glob.ts
@@ -8,7 +8,6 @@ type FileInfo = Deno.FileInfo;
 export interface GlobOptions {
  extended?: boolean;
  globstar?: boolean;
- strict?: boolean;
 }
 
 export interface GlobToRegExpOptions extends GlobOptions {
@@ -43,7 +42,7 @@ export function globToRegExp(
  glob: string,
  options: GlobToRegExpOptions = {}
 ): RegExp {
- const result = globrex(glob, { ...options, filepath: true });
+ const result = globrex(glob, { ...options, strict: false, filepath: true });
  return result.path!.regex;
 }
 
@@ -118,13 +117,12 @@ export async function* expandGlob(
  exclude = [],
  includeDirs = true,
  extended = false,
- globstar = false,
- strict = false
+ globstar = false
  }: ExpandGlobOptions = {}
 ): AsyncIterableIterator<WalkInfo> {
  const resolveFromRoot = (path: string): string =>
  isAbsolute(path) ? normalize(path) : join(root, path);
- const globOptions: GlobOptions = { extended, globstar, strict };
+ const globOptions: GlobOptions = { extended, globstar };
  const excludePatterns = exclude
  .map(resolveFromRoot)
  .map((s: string): RegExp => globToRegExp(s, globOptions));
@@ -213,13 +211,12 @@ export function* expandGlobSync(
  exclude = [],
  includeDirs = true,
  extended = false,
- globstar = false,
- strict = false
+ globstar = false
  }: ExpandGlobOptions = {}
 ): IterableIterator<WalkInfo> {
  const resolveFromRoot = (path: string): string =>
  isAbsolute(path) ? normalize(path) : join(root, path);
- const globOptions: GlobOptions = { extended, globstar, strict };
+ const globOptions: GlobOptions = { extended, globstar };
  const excludePatterns = exclude
  .map(resolveFromRoot)
  .map((s: string): RegExp => globToRegExp(s, globOptions));

diff --git a/fs/glob_test.ts b/fs/glob_test.ts
@@ -292,8 +292,7 @@ const EG_OPTIONS: ExpandGlobOptions = {
  root: urlToFilePath(new URL(join("testdata", "glob"), import.meta.url)),
  includeDirs: true,
  extended: false,
- globstar: false,
- strict: false
+ globstar: false
 };
 
 test(async function expandGlobWildcard(): Promise<void> {

diff --git a/prettier/main.ts b/prettier/main.ts
@@ -307,8 +307,7 @@ async function* getTargetFiles(
  exclude,
  includeDirs: true,
  extended: true,
- globstar: true,
- strict: false
+ globstar: true
  };
 
  async function* expandDirectory(d: string): AsyncIterableIterator<WalkInfo> {

diff --git a/testing/runner.ts b/testing/runner.ts
@@ -77,8 +77,7 @@ export async function* findTestModules(
  exclude: excludePaths,
  includeDirs: true,
  extended: true,
- globstar: true,
- strict: false
+ globstar: true
  };
 
  async function* expandDirectory(d: string): AsyncIterableIterator<string> {