goscript 0.0.29 → 0.0.31

package/gs/io/fs/glob.ts

@@ -1,22 +1,52 @@
-import * as $ from "@goscript/builtin/builtin.js";
-import { Stat } from "./stat.js";
-import { ReadDir } from "./readdir.js";
-import { FS } from "./fs.js";
-
-import * as path from "@goscript/path/index.js"
-
-export type GlobFS = null | {
-	// Glob returns the names of all files matching pattern,
-	// providing an implementation of the top-level
-	// Glob function.
-	Glob(pattern: string): [$.Slice<string>, $.GoError]
-} & FS
+import * as $ from '@goscript/builtin/builtin.js'
+import { Stat } from './stat.js'
+import { ReadDir } from './readdir.js'
+import { FS } from './fs.js'
+
+import * as path from '@goscript/path/index.js'
+
+export type GlobFS =
+  | null
+  | ({
+      // Glob returns the names of all files matching pattern,
+      // providing an implementation of the top-level
+      // Glob function.
+      Glob(pattern: string): [$.Slice<string>, $.GoError]
+    } & FS)
 
 $.registerInterfaceType(
   'GlobFS',
   null, // Zero value for interface is null
-  [{ name: "Glob", args: [{ name: "pattern", type: { kind: $.TypeKind.Basic, name: "string" } }], returns: [{ type: { kind: $.TypeKind.Slice, elemType: { kind: $.TypeKind.Basic, name: "string" } } }, { type: { kind: $.TypeKind.Interface, name: 'GoError', methods: [{ name: 'Error', args: [], returns: [{ type: { kind: $.TypeKind.Basic, name: 'string' } }] }] } }] }]
-);
+  [
+    {
+      name: 'Glob',
+      args: [
+        { name: 'pattern', type: { kind: $.TypeKind.Basic, name: 'string' } },
+      ],
+      returns: [
+        {
+          type: {
+            kind: $.TypeKind.Slice,
+            elemType: { kind: $.TypeKind.Basic, name: 'string' },
+          },
+        },
+        {
+          type: {
+            kind: $.TypeKind.Interface,
+            name: 'GoError',
+            methods: [
+              {
+                name: 'Error',
+                args: [],
+                returns: [{ type: { kind: $.TypeKind.Basic, name: 'string' } }],
+              },
+            ],
+          },
+        },
+      ],
+    },
+  ],
+)
 
 // Glob returns the names of all files matching pattern or nil
 // if there is no matching file. The syntax of patterns is the same
@@ -31,137 +61,140 @@ $.registerInterfaceType(
 // Otherwise, Glob uses [ReadDir] to traverse the directory tree
 // and look for matches for the pattern.
 export function Glob(fsys: FS, pattern: string): [$.Slice<string>, $.GoError] {
-	let matches: $.Slice<string> = null
-	let err: $.GoError = null
-	{
-		return globWithLimit(fsys, pattern, 0)
-	}
+  return globWithLimit(fsys, pattern, 0)
 }
 
-export function globWithLimit(fsys: FS, pattern: string, depth: number): [$.Slice<string>, $.GoError] {
-	let matches: $.Slice<string> = null
-	let err: $.GoError = null
-	{
-		// This limit is added to prevent stack exhaustion issues. See
-		// CVE-2022-30630.
-		let pathSeparatorsLimit: number = 10000
-		if (depth > 10000) {
-			return [null, path.ErrBadPattern]
-		}
-		{
-			let { value: fsysTyped, ok: ok } = $.typeAssert<GlobFS>(fsys, 'GlobFS')
-			if (ok) {
-				return fsysTyped!.Glob(pattern)
-			}
-		}
-
-		// Check pattern is well-formed.
-		{
-			let [, err] = path.Match(pattern, "")
-			if (err != null) {
-				return [null, err]
-			}
-		}
-		if (!hasMeta(pattern)) {
-			{
-				[, err] = Stat(fsys, pattern)
-				if (err != null) {
-					return [null, null]
-				}
-			}
-			return [$.arrayToSlice<string>([pattern]), null]
-		}
-
-		let [dir, file] = path.Split(pattern)
-		dir = cleanGlobPath(dir)
-
-		if (!hasMeta(dir)) {
-			return glob(fsys, dir, file, null)
-		}
-
-		// Prevent infinite recursion. See issue 15879.
-		if (dir == pattern) {
-			return [null, path.ErrBadPattern]
-		}
-
-		let m: $.Slice<string>
-		[m, err] = globWithLimit(fsys, dir, depth + 1)
-		if (err != null) {
-			return [null, err]
-		}
-		for (let _i = 0; _i < $.len(m); _i++) {
-			const d = m![_i]
-			{
-				[matches, err] = glob(fsys, d, file, matches)
-				if (err != null) {
-					return [matches, err]
-				}
-			}
-		}
-		return [matches, err]
-	}
+export function globWithLimit(
+  fsys: FS,
+  pattern: string,
+  depth: number,
+): [$.Slice<string>, $.GoError] {
+  let matches: $.Slice<string> = null
+  let err: $.GoError = null
+  {
+    // This limit is added to prevent stack exhaustion issues. See
+    // CVE-2022-30630.
+    let pathSeparatorsLimit: number = 10000
+    if (depth > pathSeparatorsLimit) {
+      return [null, path.ErrBadPattern]
+    }
+    {
+      let { value: fsysTyped, ok: ok } = $.typeAssert<GlobFS>(fsys, 'GlobFS')
+      if (ok) {
+        return fsysTyped!.Glob(pattern)
+      }
+    }
+
+    // Check pattern is well-formed.
+    {
+      let [, err] = path.Match(pattern, '')
+      if (err != null) {
+        return [null, err]
+      }
+    }
+    if (!hasMeta(pattern)) {
+      {
+        ;[, err] = Stat(fsys, pattern)
+        if (err != null) {
+          return [null, null]
+        }
+      }
+      return [$.arrayToSlice<string>([pattern]), null]
+    }
+
+    let [dir, file] = path.Split(pattern)
+    dir = cleanGlobPath(dir)
+
+    if (!hasMeta(dir)) {
+      return glob(fsys, dir, file, null)
+    }
+
+    // Prevent infinite recursion. See issue 15879.
+    if (dir == pattern) {
+      return [null, path.ErrBadPattern]
+    }
+
+    let m: $.Slice<string>
+    ;[m, err] = globWithLimit(fsys, dir, depth + 1)
+    if (err != null) {
+      return [null, err]
+    }
+    for (let _i = 0; _i < $.len(m); _i++) {
+      const d = m![_i]
+      {
+        ;[matches, err] = glob(fsys, d, file, matches)
+        if (err != null) {
+          return [matches, err]
+        }
+      }
+    }
+    return [matches, err]
+  }
 }
 
 // cleanGlobPath prepares path for glob matching.
 export function cleanGlobPath(path: string): string {
-
-	// chop off trailing separator
-	switch (path) {
-		case "":
-			return "."
-			break
-		default:
-			return $.sliceString(path, 0, $.len(path) - 1)
-			break
-	}
+  // chop off trailing separator
+  switch (path) {
+    case '':
+      return '.'
+      break
+    default:
+      return $.sliceString(path, 0, $.len(path) - 1)
+      break
+  }
 }
 
 // glob searches for files matching pattern in the directory dir
 // and appends them to matches, returning the updated slice.
 // If the directory cannot be opened, glob returns the existing matches.
 // New matches are added in lexicographical order.
-export function glob(fs: FS, dir: string, pattern: string, matches: $.Slice<string>): [$.Slice<string>, $.GoError] {
-	let m: $.Slice<string> = null
-	let e: $.GoError = null
-	{
-		m = matches
-		let [infos, err] = ReadDir(fs, dir)
-
-		// ignore I/O error
-		if (err != null) {
-			return [m, e]
-		}
-
-		for (let _i = 0; _i < $.len(infos); _i++) {
-			const info = infos![_i]
-			{
-				let n = info!.Name()
-				let [matched, err] = path.Match(pattern, n)
-				if (err != null) {
-					return [m, err]
-				}
-				if (matched) {
-					m = $.append(m, path.Join(dir, n))
-				}
-			}
-		}
-		return [m, e]
-	}
+export function glob(
+  fs: FS,
+  dir: string,
+  pattern: string,
+  matches: $.Slice<string>,
+): [$.Slice<string>, $.GoError] {
+  let m: $.Slice<string> = null
+  let e: $.GoError = null
+  {
+    m = matches
+    let [infos, err] = ReadDir(fs, dir)
+
+    // ignore I/O error
+    if (err != null) {
+      return [m, e]
+    }
+
+    for (let _i = 0; _i < $.len(infos); _i++) {
+      const info = infos![_i]
+      {
+        let n = info!.Name()
+        let [matched, err] = path.Match(pattern, n)
+        if (err != null) {
+          return [m, err]
+        }
+        if (matched) {
+          m = $.append(m, path.Join(dir, n))
+        }
+      }
+    }
+    return [m, e]
+  }
 }
 
 // hasMeta reports whether path contains any of the magic characters
 // recognized by path.Match.
 export function hasMeta(path: string): boolean {
-	for (let i = 0; i < $.len(path); i++) {
-		switch ($.indexString(path, i)) {
-			case 42:
-			case 63:
-			case 91:
-			case 92:
-				return true
-				break
-		}
-	}
-	return false
+  for (let i = 0; i < $.len(path); i++) {
+    switch ($.indexString(path, i)) {
+      case 42:
+      case 63:
+      case 91:
+      case 92:
+        return true
+        break
+    }
+  }
+  return false
 }
-

package/gs/io/fs/index.ts

@@ -1,8 +1,8 @@
-export * from "./format.js"
-export * from "./fs.js"
-export * from "./glob.js"
-export * from "./readdir.js"
-export * from "./readfile.js"
-export * from "./stat.js"
-export * from "./sub.js"
-export * from "./walk.js"
+export * from './format.js'
+export * from './fs.js'
+export * from './glob.js'
+export * from './readdir.js'
+export * from './readfile.js'
+export * from './stat.js'
+export * from './sub.js'
+export * from './walk.js'

package/gs/io/fs/readdir.ts

@@ -1,22 +1,53 @@
-import * as $ from "@goscript/builtin/builtin.js";
-import { FormatDirEntry } from "./format.js";
-import { FS, DirEntry, ReadDirFile, PathError, FileInfo, FileMode, fileModeType } from "./fs.js";
-
-import * as errors from "@goscript/errors/index.js"
-
-import * as slices from "@goscript/slices/index.js"
-
-export type ReadDirFS = null | {
-	// ReadDir reads the named directory
-	// and returns a list of directory entries sorted by filename.
-	ReadDir(name: string): [$.Slice<DirEntry>, $.GoError]
-} & FS
+import * as $ from '@goscript/builtin/builtin.js'
+import { FormatDirEntry } from './format.js'
+import {
+  FS,
+  DirEntry,
+  ReadDirFile,
+  PathError,
+  FileInfo,
+  FileMode,
+  fileModeType,
+} from './fs.js'
+
+import * as errors from '@goscript/errors/index.js'
+
+export type ReadDirFS =
+  | null
+  | ({
+      // ReadDir reads the named directory
+      // and returns a list of directory entries sorted by filename.
+      ReadDir(name: string): [$.Slice<DirEntry>, $.GoError]
+    } & FS)
 
 $.registerInterfaceType(
   'ReadDirFS',
   null, // Zero value for interface is null
-  [{ name: "ReadDir", args: [{ name: "name", type: { kind: $.TypeKind.Basic, name: "string" } }], returns: [{ type: { kind: $.TypeKind.Slice, elemType: "DirEntry" } }, { type: { kind: $.TypeKind.Interface, name: 'GoError', methods: [{ name: 'Error', args: [], returns: [{ type: { kind: $.TypeKind.Basic, name: 'string' } }] }] } }] }]
-);
+  [
+    {
+      name: 'ReadDir',
+      args: [
+        { name: 'name', type: { kind: $.TypeKind.Basic, name: 'string' } },
+      ],
+      returns: [
+        { type: { kind: $.TypeKind.Slice, elemType: 'DirEntry' } },
+        {
+          type: {
+            kind: $.TypeKind.Interface,
+            name: 'GoError',
+            methods: [
+              {
+                name: 'Error',
+                args: [],
+                returns: [{ type: { kind: $.TypeKind.Basic, name: 'string' } }],
+              },
+            ],
+          },
+        },
+      ],
+    },
+  ],
+)
 
 // ReadDir reads the named directory
 // and returns a list of directory entries sorted by filename.
@@ -24,103 +55,154 @@ $.registerInterfaceType(
 // If fs implements [ReadDirFS], ReadDir calls fs.ReadDir.
 // Otherwise ReadDir calls fs.Open and uses ReadDir and Close
 // on the returned file.
-export function ReadDir(fsys: FS, name: string): [$.Slice<DirEntry>, $.GoError] {
-	using __defer = new $.DisposableStack();
-	{
-		let { value: fsysTyped, ok: ok } = $.typeAssert<ReadDirFS>(fsys, 'ReadDirFS')
-		if (ok) {
-			return fsysTyped!.ReadDir(name)
-		}
-	}
-
-	let [file, err] = fsys!.Open(name)
-	if (err != null) {
-		return [null, err]
-	}
-	__defer.defer(() => {
-		file!.Close()
-	});
-
-	let { value: dir, ok: ok } = $.typeAssert<ReadDirFile>(file, 'ReadDirFile')
-	if (!ok) {
-		return [null, new PathError({Err: errors.New("not implemented"), Op: "readdir", Path: name})]
-	}
-
-	let list: $.Slice<DirEntry>
-	[list, err] = dir!.ReadDir(-1)
-	list!.sort((a: DirEntry, b: DirEntry): number => {
-		return a!.Name().localeCompare(b!.Name())
-	})
-	return [list, err]
+export function ReadDir(
+  fsys: FS,
+  name: string,
+): [$.Slice<DirEntry>, $.GoError] {
+  using __defer = new $.DisposableStack()
+  {
+    let { value: fsysTyped, ok: ok } = $.typeAssert<ReadDirFS>(
+      fsys,
+      'ReadDirFS',
+    )
+    if (ok) {
+      return fsysTyped!.ReadDir(name)
+    }
+  }
+
+  let [file, err] = fsys!.Open(name)
+  if (err != null) {
+    return [null, err]
+  }
+  __defer.defer(() => {
+    file!.Close()
+  })
+
+  let { value: dir, ok: ok } = $.typeAssert<ReadDirFile>(file, 'ReadDirFile')
+  if (!ok) {
+    return [
+      null,
+      new PathError({
+        Err: errors.New('not implemented'),
+        Op: 'readdir',
+        Path: name,
+      }),
+    ]
+  }
+
+  let list: $.Slice<DirEntry>
+  ;[list, err] = dir!.ReadDir(-1)
+  list!.sort((a: DirEntry, b: DirEntry): number => {
+    return a!.Name().localeCompare(b!.Name())
+  })
+  return [list, err]
 }
 
 class dirInfo {
-	public get fileInfo(): FileInfo {
-		return this._fields.fileInfo.value
-	}
-	public set fileInfo(value: FileInfo) {
-		this._fields.fileInfo.value = value
-	}
-
-	public _fields: {
-		fileInfo: $.VarRef<FileInfo>;
-	}
-
-	constructor(init?: Partial<{fileInfo?: FileInfo}>) {
-		this._fields = {
-			fileInfo: $.varRef(init?.fileInfo ?? null)
-		}
-	}
-
-	public clone(): dirInfo {
-		const cloned = new dirInfo()
-		cloned._fields = {
-			fileInfo: $.varRef(this._fields.fileInfo.value)
-		}
-		return cloned
-	}
-
-	public IsDir(): boolean {
-		const di = this
-		return di.fileInfo!.IsDir()
-	}
-
-	public Type(): FileMode {
-		const di = this
-		return fileModeType(di.fileInfo!.Mode())
-	}
-
-	public Info(): [FileInfo, $.GoError] {
-		const di = this
-		return [di.fileInfo, null]
-	}
-
-	public Name(): string {
-		const di = this
-		return di.fileInfo!.Name()
-	}
-
-	public String(): string {
-		const di = this
-		return FormatDirEntry(di)
-	}
-
-	// Register this type with the runtime type system
-	static __typeInfo = $.registerStructType(
-	  'dirInfo',
-	  new dirInfo(),
-	  [{ name: "IsDir", args: [], returns: [{ type: { kind: $.TypeKind.Basic, name: "boolean" } }] }, { name: "Type", args: [], returns: [{ type: "FileMode" }] }, { name: "Info", args: [], returns: [{ type: "FileInfo" }, { type: { kind: $.TypeKind.Interface, name: 'GoError', methods: [{ name: 'Error', args: [], returns: [{ type: { kind: $.TypeKind.Basic, name: 'string' } }] }] } }] }, { name: "Name", args: [], returns: [{ type: { kind: $.TypeKind.Basic, name: "string" } }] }, { name: "String", args: [], returns: [{ type: { kind: $.TypeKind.Basic, name: "string" } }] }],
-	  dirInfo,
-	  {"fileInfo": "FileInfo"}
-	);
+  public get fileInfo(): FileInfo {
+    return this._fields.fileInfo.value
+  }
+  public set fileInfo(value: FileInfo) {
+    this._fields.fileInfo.value = value
+  }
+
+  public _fields: {
+    fileInfo: $.VarRef<FileInfo>
+  }
+
+  constructor(init?: Partial<{ fileInfo?: FileInfo }>) {
+    this._fields = {
+      fileInfo: $.varRef(init?.fileInfo ?? null),
+    }
+  }
+
+  public clone(): dirInfo {
+    const cloned = new dirInfo()
+    cloned._fields = {
+      fileInfo: $.varRef(this._fields.fileInfo.value),
+    }
+    return cloned
+  }
+
+  public IsDir(): boolean {
+    const di = this
+    return di.fileInfo!.IsDir()
+  }
+
+  public Type(): FileMode {
+    const di = this
+    return fileModeType(di.fileInfo!.Mode())
+  }
+
+  public Info(): [FileInfo, $.GoError] {
+    const di = this
+    return [di.fileInfo, null]
+  }
+
+  public Name(): string {
+    const di = this
+    return di.fileInfo!.Name()
+  }
+
+  public String(): string {
+    const di = this
+    return FormatDirEntry(di)
+  }
+
+  // Register this type with the runtime type system
+  static __typeInfo = $.registerStructType(
+    'dirInfo',
+    new dirInfo(),
+    [
+      {
+        name: 'IsDir',
+        args: [],
+        returns: [{ type: { kind: $.TypeKind.Basic, name: 'boolean' } }],
+      },
+      { name: 'Type', args: [], returns: [{ type: 'FileMode' }] },
+      {
+        name: 'Info',
+        args: [],
+        returns: [
+          { type: 'FileInfo' },
+          {
+            type: {
+              kind: $.TypeKind.Interface,
+              name: 'GoError',
+              methods: [
+                {
+                  name: 'Error',
+                  args: [],
+                  returns: [
+                    { type: { kind: $.TypeKind.Basic, name: 'string' } },
+                  ],
+                },
+              ],
+            },
+          },
+        ],
+      },
+      {
+        name: 'Name',
+        args: [],
+        returns: [{ type: { kind: $.TypeKind.Basic, name: 'string' } }],
+      },
+      {
+        name: 'String',
+        args: [],
+        returns: [{ type: { kind: $.TypeKind.Basic, name: 'string' } }],
+      },
+    ],
+    dirInfo,
+    { fileInfo: 'FileInfo' },
+  )
 }
 
 // FileInfoToDirEntry returns a [DirEntry] that returns information from info.
 // If info is nil, FileInfoToDirEntry returns nil.
 export function FileInfoToDirEntry(info: FileInfo): DirEntry {
-	if (info == null) {
-		return null
-	}
-	return new dirInfo({fileInfo: info})
+  if (info == null) {
+    return null
+  }
+  return new dirInfo({ fileInfo: info })
 }
-