add a fixed version of expandGlob

Author: cscheid

src/core/deno/expand-glob.ts

@@ -0,0 +1,42 @@
+/*
+* expand-glob.ts
+*
+* Copyright (C) 2023 Posit Software, PBC
+*
+* Fixed version of expandGlob, expandGlobSync (https://github.com/denoland/deno_std/issues/3099)
+*
+*/
+
+import {
+  expandGlob as badExpandGlob,
+  ExpandGlobOptions,
+  expandGlobSync as badExpandGlobSync,
+} from "fs/mod.ts";
+
+export function expandGlobSync(
+  glob: string,
+  options?: ExpandGlobOptions,
+): ReturnType<typeof badExpandGlobSync> {
+  if (options === undefined) {
+    return badExpandGlobSync(glob, { globstar: true });
+  } else {
+    return badExpandGlobSync(glob, {
+      ...options,
+      globstar: options.globstar ?? true,
+    });
+  }
+}
+
+export function expandGlob(
+  glob: string,
+  options?: ExpandGlobOptions,
+): ReturnType<typeof badExpandGlob> {
+  if (options === undefined) {
+    return badExpandGlob(glob, { globstar: true });
+  } else {
+    return badExpandGlob(glob, {
+      ...options,
+      globstar: options.globstar ?? true,
+    });
+  }
+}

src/core/schema/yaml-schema.ts

@@ -12,7 +12,7 @@ import { YAMLSchema } from "../lib/yaml-validation/yaml-schema.ts";
 import { MappedString } from "../lib/text-types.ts";
 import { readAnnotatedYamlFromMappedString } from "./annotated-yaml.ts";
 import { loadDefaultSchemaDefinitions } from "../lib/yaml-schema/definitions.ts";
-import { expandGlobSync } from "fs/mod.ts";
+import { expandGlobSync } from "../deno/expand-glob.ts";
 import { resourcePath } from "../resources.ts";
 import { readYaml } from "../yaml.ts";
 import { JSONValue } from "../lib/yaml-schema/types.ts";

src/extension/extension.ts

@@ -5,7 +5,8 @@
 *
 */
 
-import { existsSync, expandGlobSync, walkSync } from "fs/mod.ts";
+import { existsSync, walkSync } from "fs/mod.ts";
+import { expandGlobSync } from "../core/deno/expand-glob.ts";
 import { warning } from "log/mod.ts";
 import { coerce, Range, satisfies } from "semver/mod.ts";
 

tests/integration/playwright-tests.test.ts

@@ -5,7 +5,7 @@
  *
  */
 
-import { expandGlobSync } from "fs/mod.ts";
+import { expandGlobSync } from "../../src/core/deno/expand-glob.ts";
 import { initYamlIntelligenceResourcesFromFilesystem } from "../../src/core/schema/utils.ts";
 import {
   initState,

tests/smoke/smoke-all.test.ts

@@ -5,7 +5,7 @@
  *
  */
 
-import { expandGlobSync } from "fs/mod.ts";
+import { expandGlobSync } from "../../src/core/deno/expand-glob.ts";
 import { testQuartoCmd, Verify } from "../test.ts";
 
 import { initYamlIntelligenceResourcesFromFilesystem } from "../../src/core/schema/utils.ts";

tests/smoke/yaml-intelligence/yaml-intelligence.test.ts

@@ -5,7 +5,7 @@
  *
  */
 
-import { expandGlobSync } from "fs/mod.ts";
+import { expandGlobSync } from "../../../src/core/deno/expand-glob.ts";
 import { unitTest } from "../../test.ts";
 
 import { assert, assertEquals } from "testing/asserts.ts";

tests/unit/schema-validation/schema-schema.test.ts

@@ -15,7 +15,7 @@ import {
   refSchema,
 } from "../../../src/core/lib/yaml-schema/common.ts";
 import { readAndValidateYamlFromFile } from "../../../src/core/schema/validated-yaml.ts";
-import { expandGlobSync } from "fs/expand_glob.ts";
+import { expandGlobSync } from "../../../src/core/deno/expand-glob.ts";
 import { readAndValidateYamlFromMappedString } from "../../../src/core/lib/yaml-schema/validated-yaml.ts";
 import { asMappedString } from "../../../src/core/lib/mapped-text.ts";