@isopodlabs/vscode_utils 0.2.6 → 0.4.0

package/dist/fs.js

@@ -34,6 +34,15 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Change = exports.Glob = exports.SubfileFileSystem = exports.ReadOnlyFilesystem = exports.NormalFile = exports.BaseFileSystem = void 0;
+exports.stat_reject = stat_reject;
+exports.exists = exists;
+exports.check_exists = check_exists;
+exports.getStat = getStat;
+exports.isDirectory = isDirectory;
+exports.loadFile = loadFile;
+exports.writeFile = writeFile;
+exports.deleteFile = deleteFile;
+exports.createDirectory = createDirectory;
 exports.isFile = isFile;
 exports.withOffset = withOffset;
 exports.openFile = openFile;
@@ -43,29 +52,21 @@ exports.directories = directories;
 exports.files = files;
 exports.search = search;
 exports.mapDirs = mapDirs;
-exports.stat_reject = stat_reject;
-exports.exists = exists;
-exports.getStat = getStat;
-exports.isDirectory = isDirectory;
-exports.loadFile = loadFile;
-exports.writeFile = writeFile;
-exports.deleteFile = deleteFile;
-exports.createDirectory = createDirectory;
+exports.searchPath = searchPath;
 exports.createNewName = createNewName;
 exports.copyFile = copyFile;
 exports.copyFileToDir = copyFileToDir;
 exports.copyDirectory = copyDirectory;
 exports.onChange = onChange;
-exports.arrayRemove = arrayRemove;
 exports.removeOnChange = removeOnChange;
-const vscode = __importStar(require("vscode"));
 const nodefs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const vscode_1 = require("vscode");
 function uri(value) {
-    return value instanceof vscode.Uri ? value : vscode.Uri.file(value);
+    return value instanceof vscode_1.Uri ? value : vscode_1.Uri.file(value);
 }
 function file(value) {
-    return value instanceof vscode.Uri ? value.fsPath : value;
+    return value instanceof vscode_1.Uri ? value.fsPath : value;
 }
 function file_id(value) {
     return typeof (value) === 'string' ? value : value.scheme === 'file' ? value.fsPath : value.toString();
@@ -79,25 +80,58 @@ function ext(value) {
 function dirname(value) {
     return path.dirname(file(value));
 }
+function isAbsolute(value) {
+    return path.isAbsolute(file(value));
+}
 function pathComponents(value) {
     return path.parse(file(value));
 }
 function withPathComponents(value, ...comp) {
     const p = path.join(...comp);
-    return value instanceof vscode.Uri ? value.with({ path: p }) : p;
+    return value instanceof vscode_1.Uri ? value.with({ path: p }) : path.join(p, value);
 }
 function join(directory, ...comp) {
     return withPathComponents(directory, file(directory), ...comp);
 }
+//-----------------------------------------------------------------------------
+//	helpers
+//-----------------------------------------------------------------------------
+function stat_reject(value) {
+    return vscode_1.workspace.fs.stat(uri(value));
+}
+function exists(value) {
+    return vscode_1.workspace.fs.stat(uri(value)).then(() => true, () => false);
+}
+function check_exists(value) {
+    return vscode_1.workspace.fs.stat(uri(value)).then(() => value, () => undefined);
+}
+function getStat(value) {
+    return vscode_1.workspace.fs.stat(uri(value)).then(stat => stat, () => undefined);
+}
+function isDirectory(value) {
+    return vscode_1.workspace.fs.stat(uri(value)).then(stat => stat.type == vscode_1.FileType.Directory, () => ext(value) === "");
+}
+async function loadFile(file) {
+    return vscode_1.workspace.fs.readFile(uri(file)).then(bytes => bytes, error => console.log(`Failed to load ${file} : ${error}`));
+}
+function writeFile(file, bytes) {
+    return vscode_1.workspace.fs.writeFile(uri(file), bytes).then(() => true, error => (console.log(`Failed to save ${file} : ${error}`), false));
+}
+function deleteFile(file) {
+    return vscode_1.workspace.fs.delete(uri(file)).then(() => true, error => (console.log(`Failed to delete ${file} : ${error}`), false));
+}
+function createDirectory(path) {
+    return vscode_1.workspace.fs.createDirectory(uri(path)).then(() => true, error => (console.log(`Failed to create ${path} : ${error}`), false));
+}
 function isFile(obj) {
     return obj && typeof obj.dispose === 'function' && typeof obj.read === 'function' && typeof obj.write === 'function';
 }
 const filesystems = {};
 class BaseFileSystem {
-    _onDidChangeFile = new vscode.EventEmitter();
+    _onDidChangeFile = new vscode_1.EventEmitter();
     constructor(context, scheme) {
         filesystems[scheme] = this;
-        context.subscriptions.push(vscode.workspace.registerFileSystemProvider(scheme, this, { isCaseSensitive: true }));
+        context.subscriptions.push(vscode_1.workspace.registerFileSystemProvider(scheme, this, { isCaseSensitive: true }));
     }
     get onDidChangeFile() { return this._onDidChangeFile.event; }
     //stubs
@@ -111,7 +145,7 @@ class BaseFileSystem {
 }
 exports.BaseFileSystem = BaseFileSystem;
 function withOffset(file, offset) {
-    if (file instanceof vscode.Uri)
+    if (file instanceof vscode_1.Uri)
         return SubfileFileSystem.makeUri(file, offset);
     return new class {
         length = offset.toOffset - offset.fromOffset;
@@ -182,7 +216,7 @@ function getEncapsulatedUri(uri) {
         scheme: uri.authority,
         authority: '',
     });
-    //	return vscode.Uri.parse(uri.fsPath);
+    //	return Uri.parse(uri.fsPath);
 }
 class ReadOnlyFilesystem extends BaseFileSystem {
     static SCHEME = 'readonly';
@@ -190,13 +224,13 @@ class ReadOnlyFilesystem extends BaseFileSystem {
         super(context, ReadOnlyFilesystem.SCHEME);
     }
     async stat(uri) {
-        return { ...await vscode.workspace.fs.stat(getEncapsulatedUri(uri)), permissions: vscode.FilePermission.Readonly };
+        return { ...await vscode_1.workspace.fs.stat(getEncapsulatedUri(uri)), permissions: vscode_1.FilePermission.Readonly };
     }
     openFile(uri) {
         return openFile(getEncapsulatedUri(uri));
     }
     readFile(uri) {
-        return vscode.workspace.fs.readFile(getEncapsulatedUri(uri));
+        return vscode_1.workspace.fs.readFile(getEncapsulatedUri(uri));
     }
 }
 exports.ReadOnlyFilesystem = ReadOnlyFilesystem;
@@ -221,7 +255,7 @@ class SubfileFileSystem extends BaseFileSystem {
     }
     async stat(uri) {
         const { uri: uri2, offset } = SubfileFileSystem.parseUri(uri);
-        return { ...await vscode.workspace.fs.stat(uri2), size: offset.toOffset - offset.fromOffset };
+        return { ...await vscode_1.workspace.fs.stat(uri2), size: offset.toOffset - offset.fromOffset };
     }
     async readFile(uri) {
         const { uri: uri2, offset } = SubfileFileSystem.parseUri(uri);
@@ -235,7 +269,7 @@ class SubfileFileSystem extends BaseFileSystem {
             }
         }
         else {
-            const data = await vscode.workspace.fs.readFile(uri2);
+            const data = await vscode_1.workspace.fs.readFile(uri2);
             return data.subarray(offset.fromOffset, offset.toOffset);
         }
     }
@@ -327,9 +361,9 @@ function toRegExp(pattern) {
     return re;
 }
 function readDirectory(dir) {
-    return vscode.workspace.fs.stat(uri(dir)).then(stat => {
-        if (stat.type == vscode.FileType.Directory) {
-            return vscode.workspace.fs.readDirectory(uri(dir)).then(items => items, error => {
+    return vscode_1.workspace.fs.stat(uri(dir)).then(stat => {
+        if (stat.type == vscode_1.FileType.Directory) {
+            return vscode_1.workspace.fs.readDirectory(uri(dir)).then(items => items, error => {
                 console.log(`readDirectory failed with ${error}`);
                 return [];
             });
@@ -344,18 +378,18 @@ function readDirectory(dir) {
     });
 }
 function directories(entries) {
-    return entries.filter(e => e[1] == vscode.FileType.Directory).map(e => e[0]);
+    return entries.filter(e => e[1] == vscode_1.FileType.Directory).map(e => e[0]);
 }
 function files(entries, glob) {
     if (glob) {
         const include = typeof glob === 'string' ? new Glob(glob) : glob;
-        return entries.filter(e => e[1] == vscode.FileType.File && include.test(e[0])).map(e => e[0]);
+        return entries.filter(e => e[1] == vscode_1.FileType.File && include.test(e[0])).map(e => e[0]);
     }
     else {
-        return entries.filter(e => e[1] == vscode.FileType.File).map(e => e[0]);
+        return entries.filter(e => e[1] == vscode_1.FileType.File).map(e => e[0]);
     }
 }
-async function search(pattern, _exclude, want = vscode.FileType.Unknown) {
+async function search(pattern, _exclude, want = vscode_1.FileType.Unknown) {
     const m = /[*?[{}]/.exec(pattern);
     if (!m)
         return [pattern];
@@ -363,7 +397,7 @@ async function search(pattern, _exclude, want = vscode.FileType.Unknown) {
     const basePath = pattern.substring(0, sep);
     const include = new Glob(pattern.substring(sep + 1));
     const exclude = _exclude ? new Glob(_exclude) : undefined;
-    const keep = want || vscode.FileType.File;
+    const keep = want || vscode_1.FileType.File;
     const recurse = async (basePath) => {
         const items = await readDirectory(basePath);
         const result = [];
@@ -375,7 +409,7 @@ async function search(pattern, _exclude, want = vscode.FileType.Unknown) {
                 continue;
             if (i[1] === keep && include.test(filename))
                 result.push(filename);
-            if (i[1] == vscode.FileType.Directory)
+            if (i[1] == vscode_1.FileType.Directory)
                 result.push(...await recurse(filename));
         }
         return result;
@@ -386,32 +420,16 @@ async function mapDirs(root, glob, onFile, combine) {
     const glob2 = typeof glob === 'string' ? new Glob(glob) : glob;
     return readDirectory(root).then(async (dir) => combine(...await Promise.all(files(dir, glob).map(i => onFile(path.join(root, i)))), ...await Promise.all(directories(dir).map(async (i) => mapDirs(path.join(root, i), glob2, onFile, combine)))));
 }
-//-----------------------------------------------------------------------------
-//	helpers
-//-----------------------------------------------------------------------------
-function stat_reject(value) {
-    return vscode.workspace.fs.stat(uri(value));
-}
-function exists(value) {
-    return vscode.workspace.fs.stat(uri(value)).then(() => true, () => false);
-}
-function getStat(value) {
-    return vscode.workspace.fs.stat(uri(value)).then(stat => stat, () => undefined);
-}
-function isDirectory(value) {
-    return vscode.workspace.fs.stat(uri(value)).then(stat => stat.type == vscode.FileType.Directory, () => ext(value) === "");
-}
-async function loadFile(file) {
-    return vscode.workspace.fs.readFile(uri(file)).then(bytes => bytes, error => console.log(`Failed to load ${file} : ${error}`));
-}
-function writeFile(file, bytes) {
-    return vscode.workspace.fs.writeFile(uri(file), bytes).then(() => true, error => (console.log(`Failed to save ${file} : ${error}`), false));
-}
-function deleteFile(file) {
-    return vscode.workspace.fs.delete(uri(file)).then(() => true, error => (console.log(`Failed to delete ${file} : ${error}`), false));
-}
-function createDirectory(path) {
-    return vscode.workspace.fs.createDirectory(uri(path)).then(() => true, error => (console.log(`Failed to create ${path} : ${error}`), false));
+async function searchPath(target, paths) {
+    if (isAbsolute(target))
+        return check_exists(target);
+    const promises = paths.map(async (i) => check_exists(withPathComponents(target, i)));
+    for (const p of promises) {
+        const result = await p;
+        if (result)
+            return result;
+    }
+    return undefined;
 }
 async function createNewName(filepath) {
     const parsed = pathComponents(filepath);
@@ -435,13 +453,13 @@ async function createCopyName(filepath) {
     return filepath;
 }
 async function copyFile(sourcepath, destpath) {
-    return vscode.workspace.fs.readFile(uri(sourcepath)).then(async (bytes) => vscode.workspace.fs.writeFile(uri(destpath), bytes));
+    return vscode_1.workspace.fs.readFile(uri(sourcepath)).then(async (bytes) => vscode_1.workspace.fs.writeFile(uri(destpath), bytes));
 }
 async function copyFileToDir(sourcepath, destdir) {
     const dest = createCopyName(join(destdir, basename(sourcepath)));
-    const bytes = await vscode.workspace.fs.readFile(uri(sourcepath));
+    const bytes = await vscode_1.workspace.fs.readFile(uri(sourcepath));
     const destpath = await dest;
-    vscode.workspace.fs.writeFile(uri(destpath), bytes);
+    vscode_1.workspace.fs.writeFile(uri(destpath), bytes);
     return destpath;
 }
 async function copyDirectory(sourcepath, targetpath) {
@@ -450,7 +468,7 @@ async function copyDirectory(sourcepath, targetpath) {
     let result = [];
     for (const i of dir) {
         const sourcepath2 = join(sourcepath, i[0]);
-        if (i[1] === vscode.FileType.Directory)
+        if (i[1] === vscode_1.FileType.Directory)
             result = [...result, ...await copyDirectory(sourcepath2, await dest)];
         else
             result.push(await copyFileToDir(sourcepath2, await dest));
@@ -542,14 +560,14 @@ function onChange(filename, func) {
                     delete dirWatchers[i];
                 }
             }
-            watcher = vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(withPathComponents(fulluri, dir), "**/*.*"));
+            watcher = vscode_1.workspace.createFileSystemWatcher(new vscode_1.RelativePattern(withPathComponents(fulluri, dir), "**/*.*"));
             watcher.onDidChange((uri) => recCallback(uri, exports.Change.changed));
             watcher.onDidCreate((uri) => recCallback(uri, exports.Change.created));
             watcher.onDidDelete((uri) => recCallback(uri, exports.Change.deleted));
             recWatchers[dir] = watcher;
         }
         else {
-            watcher = vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(withPathComponents(fulluri, dir), "*.*"));
+            watcher = vscode_1.workspace.createFileSystemWatcher(new vscode_1.RelativePattern(withPathComponents(fulluri, dir), "*.*"));
             watcher.onDidChange((uri) => dirCallback(uri, exports.Change.changed));
             watcher.onDidCreate((uri) => dirCallback(uri, exports.Change.created));
             watcher.onDidDelete((uri) => dirCallback(uri, exports.Change.deleted));
@@ -570,7 +588,7 @@ function onChange(filename, func) {
         (fileCallbacks[filename.toString()] ??= []).push(func);
     }
 }
-function arrayRemove(array, item) {
+function array_remove(array, item) {
     const index = array.indexOf(item);
     if (index === -1)
         return false;
@@ -583,7 +601,7 @@ function removeOnChange(filename, func) {
         //recursive
         const callbacks = recCallbacks[dir];
         if (callbacks) {
-            arrayRemove(callbacks, func);
+            array_remove(callbacks, func);
             if (callbacks.length === 0) {
                 delete recCallbacks[dir];
                 const watcher = recWatchers[dir];
@@ -599,7 +617,7 @@ function removeOnChange(filename, func) {
             //file
             const callbacks = fileCallbacks[filename.toString()];
             if (callbacks) {
-                arrayRemove(callbacks, func);
+                array_remove(callbacks, func);
                 if (callbacks.length)
                     return;
                 delete fileCallbacks[filename.toString()];

package/dist/icon-theme.js

@@ -66,16 +66,16 @@ class IconTheme {
         return webview.asWebviewUri(vscode.Uri.file(path.join(this.themeFolder.fsPath, file)));
     }
     style(webview) {
-        return this.theme.fonts ? this.theme.fonts.map(f => `@font-face {
-				font-family: '${f.id}';
-				src: ${f.src.map(s => `url('${this.getUri(webview, s.path)}') format('${s.format}')`).join(', ')};
-				font-weight: ${f.weight};
-				font-style: ${f.style};
-			}
-			[font=${f.id}]::before {
-				font-family: ${f.id};
-				font-size: ${f.size};
-			}
+        return this.theme.fonts ? this.theme.fonts.map(f => `@font-face {
+				font-family: '${f.id}';
+				src: ${f.src.map(s => `url('${this.getUri(webview, s.path)}') format('${s.format}')`).join(', ')};
+				font-weight: ${f.weight};
+				font-style: ${f.style};
+			}
+			[font=${f.id}]::before {
+				font-family: ${f.id};
+				font-size: ${f.size};
+			}
 			`).join('\n') : '';
     }
     csp(webview) {

package/dist/jsx-runtime.d.ts

@@ -1,5 +1,5 @@
 /** @jsxImportSource . */
-import * as vscode from 'vscode';
+import { Uri, Webview } from 'vscode';
 export declare function jsx(type: any, props: any): any;
 export declare function jsxs(type: any, props: any): any;
 export declare function jsxFrag(props: any): {
@@ -16,23 +16,10 @@ export declare namespace JSX {
     function render(element: any): string;
 }
 export declare function id_selector(id: string | number): string;
-export declare const codicons: Record<string, string>;
-type IconType0 = string | vscode.Uri;
-export type IconType = IconType0 | vscode.ThemeIcon | {
-    light: IconType0;
-    dark: IconType0;
-};
-export declare function iconAttribute(icon: IconType0): string;
-export declare function iconAttributes(icon?: IconType): {
-    icon: string;
-    color?: undefined;
-} | {
-    icon: string;
-    color: string;
-} | undefined;
-export declare function Label({ id, display }: {
+export declare function Label({ id, display, title }: {
     id: string;
     display: string;
+    title?: string;
 }): JSX.Element;
 export declare class Hash {
     algorithm: string;
@@ -51,16 +38,23 @@ declare const CSPkeywords: {
     readonly inline_speculation_rules: "'inline-speculation-rules'";
     readonly strict_dynamic: "'strict-dynamic'";
 };
-type CSPSource = Hash | vscode.Uri | (typeof CSPkeywords)[keyof typeof CSPkeywords] | CSPSource[];
-export declare function CSPdefault(extension: vscode.Uri): CSPSource;
+type CSPSource1 = Hash | Uri | (typeof CSPkeywords)[keyof typeof CSPkeywords] | CSPSource1[];
+interface plus<T> {
+    source: T;
+    plus: boolean;
+}
+declare function plus(source: CSPSource1): plus<CSPSource1>;
+type CSPSource = CSPSource1 | plus<CSPSource1>;
+interface CSPSources {
+    main: CSPSource;
+    attr?: CSPSource;
+    elem?: CSPSource;
+}
+export declare function CSPdefault(extension: Uri): CSPSource1;
 declare function CSPFunction({ csp, ...others }: {
-    csp: string;
-    script?: CSPSource;
-    script_elem?: CSPSource;
-    script_attr?: CSPSource;
-    style?: CSPSource;
-    stype_elem?: CSPSource;
-    style_attr?: CSPSource;
+    csp: CSPSource1;
+    script?: CSPSource | CSPSources;
+    style?: CSPSource | CSPSources;
     font?: CSPSource;
     img?: CSPSource;
     media?: CSPSource;
@@ -75,8 +69,8 @@ export declare const CSP: typeof CSPFunction & {
     readonly strict_dynamic: "'strict-dynamic'";
 };
 export declare function ImportMap(props: {
-    map: Record<string, vscode.Uri>;
-    webview: vscode.Webview;
+    map: Record<string, Uri>;
+    webview: Webview;
     nonce?: Hash;
 }): JSX.Element;
 export {};