@isopodlabs/vscode_utils 0.3.0 → 0.5.0

package/assets/shared.css

@@ -73,6 +73,33 @@ body {
     to { transform: rotate(360deg); }
 }
 
+/* For font icons (character in fonticon attribute)*/
+[fonticon]::before {
+	content: attr(icon);
+	font: normal normal normal 16px/1 var(--icon-font);
+	display: inline-block;
+	color: var(--icon-color);
+	text-decoration: none;
+	text-rendering: auto;
+	text-align: center;
+	vertical-align: text-top;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	user-select: none;
+	-webkit-user-select: none;
+	-ms-user-select: none;
+}
+
+/* For img icons (img in --icon)*/
+[imgicon]::before {
+    content: '';
+	display: inline-block;
+	text-decoration: none;
+	width: 16px;
+	height: 16px;
+    background-image: var(--icon);
+	margin-right: 5px;
+}
 
 /* For img icons (img in --icon)*/
 .icon::before {

package/assets/tree.css

@@ -1,4 +1,7 @@
 .caret {
+	cursor: pointer;
+	user-select: none;
+
 	&::before {
 		font-family: 'codicon';
 		content: '\eab6';

package/dist/codicon.d.ts

@@ -6,11 +6,13 @@ export type IconType = IconType0 | ThemeIcon | {
     dark: IconType0;
 };
 export declare function iconAttribute(icon: IconType0): string;
-export declare function iconAttributes(icon?: IconType): {
+declare function iconAttributes1(icon: IconType): {
     icon: string;
     color?: undefined;
 } | {
     icon: string;
     color: string;
-} | undefined;
+};
+export declare function iconAttributes(icon: IconType): ReturnType<typeof iconAttributes1>;
+export declare function iconAttributes(icon?: IconType): ReturnType<typeof iconAttributes1> | undefined;
 export {};

package/dist/codicon.js

@@ -478,13 +478,15 @@ function getColor(col) {
     const id = col instanceof vscode_1.ThemeColor ? col.id : col;
     return `var(--vscode-${id.replace('.', '-')})`;
 }
+function iconAttributes1(icon) {
+    if (typeof icon === 'string' || icon instanceof vscode_1.Uri)
+        return { icon: iconAttribute(icon) };
+    if (icon instanceof vscode_1.ThemeIcon)
+        return icon.color ? { icon: exports.codicons[icon.id], color: getColor(icon.color) } : { icon: exports.codicons[icon.id] };
+    return { icon: iconAttribute(currentlyLight() ? icon.light : icon.dark) };
+}
 function iconAttributes(icon) {
-    if (icon) {
-        if (typeof icon === 'string' || icon instanceof vscode_1.Uri)
-            return { icon: iconAttribute(icon) };
-        if (icon instanceof vscode_1.ThemeIcon)
-            return icon.color ? { icon: exports.codicons[icon.id], color: getColor(icon.color) } : { icon: exports.codicons[icon.id] };
-        return { icon: iconAttribute(currentlyLight() ? icon.light : icon.dark) };
-    }
+    if (icon)
+        return iconAttributes1(icon);
 }
 //# sourceMappingURL=codicon.js.map

package/dist/fs.d.ts

@@ -4,6 +4,15 @@ export interface FileRange {
     fromOffset: number;
     toOffset: number;
 }
+export declare function stat_reject(value: Filename): Thenable<FileStat>;
+export declare function exists(value: Filename): Thenable<boolean>;
+export declare function check_exists<T extends Filename>(value: T): Thenable<T | undefined>;
+export declare function getStat(value: Filename): Thenable<FileStat | undefined>;
+export declare function isDirectory(value: Filename): Thenable<boolean>;
+export declare function loadFile(file: Filename, log?: boolean): Promise<Uint8Array | void>;
+export declare function writeFile(file: Filename, bytes: Uint8Array, log?: boolean): PromiseLike<boolean>;
+export declare function deleteFile(file: Filename, log?: boolean): PromiseLike<boolean>;
+export declare function createDirectory(path: Filename, log?: boolean): PromiseLike<boolean>;
 export interface File {
     dispose(): void;
     read(pos: number, length: number): Promise<Uint8Array>;
@@ -13,6 +22,7 @@ export declare function isFile(obj: any): obj is File;
 interface FileSystem extends FileSystemProvider {
     openFile(uri: Uri): File | Promise<File>;
 }
+type MaybeThenable<T> = T | Thenable<T>;
 export declare abstract class BaseFileSystem implements FileSystem {
     protected _onDidChangeFile: EventEmitter<FileChangeEvent[]>;
     constructor(context: ExtensionContext, scheme: string);
@@ -23,8 +33,8 @@ export declare abstract class BaseFileSystem implements FileSystem {
         readonly recursive: boolean;
         readonly excludes: readonly string[];
     }): Disposable;
-    stat(_uri: Uri): FileStat | Thenable<FileStat>;
-    readDirectory(_uri: Uri): [string, FileType][];
+    stat(_uri: Uri): MaybeThenable<FileStat>;
+    readDirectory(_uri: Uri): MaybeThenable<[string, FileType][]>;
     createDirectory(_uri: Uri): void;
     writeFile(_uri: Uri, _content: Uint8Array, _options: {
         readonly create: boolean;
@@ -94,14 +104,7 @@ export declare function directories(entries: Entry[]): string[];
 export declare function files(entries: Entry[], glob?: string | Glob): string[];
 export declare function search(pattern: string, _exclude?: string | string[], want?: FileType): Promise<string[]>;
 export declare function mapDirs<T>(root: string, glob: string | Glob, onFile: (filename: string) => T, combine: (...results: T[]) => T): Promise<T>;
-export declare function stat_reject(value: Filename): Thenable<FileStat>;
-export declare function exists(value: Filename): Thenable<boolean>;
-export declare function getStat(value: Filename): Thenable<FileStat | undefined>;
-export declare function isDirectory(value: Filename): Thenable<boolean>;
-export declare function loadFile(file: Filename): Promise<Uint8Array | void>;
-export declare function writeFile(file: Filename, bytes: Uint8Array): PromiseLike<boolean>;
-export declare function deleteFile(file: Filename): PromiseLike<boolean>;
-export declare function createDirectory(path: Filename): PromiseLike<boolean>;
+export declare function searchPath<T extends Filename>(target: T, paths: string[]): Promise<T | undefined>;
 export declare function createNewName(filepath: string): Promise<string>;
 export declare function createNewName(filepath: Uri): Promise<Uri>;
 export declare function copyFile(sourcepath: string, destpath: string): Promise<void>;

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,14 +52,7 @@ 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;
@@ -78,16 +80,64 @@ 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_1.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, log = false) {
+    return vscode_1.workspace.fs.readFile(uri(file)).then(bytes => bytes, error => {
+        if (log)
+            console.log(`Failed to load ${file} : ${error}`);
+    });
+}
+function writeFile(file, bytes, log = false) {
+    return vscode_1.workspace.fs.writeFile(uri(file), bytes).then(() => true, error => {
+        if (log)
+            console.log(`Failed to save ${file} : ${error}`);
+        return false;
+    });
+}
+function deleteFile(file, log = false) {
+    return vscode_1.workspace.fs.delete(uri(file)).then(() => true, error => {
+        if (log)
+            console.log(`Failed to delete ${file} : ${error}`);
+        return false;
+    });
+}
+function createDirectory(path, log = false) {
+    return vscode_1.workspace.fs.createDirectory(uri(path)).then(() => true, error => {
+        if (log)
+            console.log(`Failed to create ${path} : ${error}`);
+        return false;
+    });
+}
 function isFile(obj) {
     return obj && typeof obj.dispose === 'function' && typeof obj.read === 'function' && typeof obj.write === 'function';
 }
@@ -385,32 +435,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_1.workspace.fs.stat(uri(value));
-}
-function exists(value) {
-    return vscode_1.workspace.fs.stat(uri(value)).then(() => true, () => false);
-}
-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));
+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);

package/dist/jsx-runtime.d.ts

@@ -16,9 +16,10 @@ export declare namespace JSX {
     function render(element: any): string;
 }
 export declare function id_selector(id: string | number): string;
-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;

package/dist/jsx-runtime.js

@@ -48,6 +48,10 @@ function escape(v) {
 // eslint-disable-next-line @typescript-eslint/no-namespace
 var JSX;
 (function (JSX) {
+    function renderRawText(element, type) {
+        const text = typeof element === 'number' ? element.toString() : String(element ?? '');
+        return type === 'script' ? text.replace(/<\/(script)/gi, '<\\/$1') : text;
+    }
     function render(element) {
         if (typeof element === 'string')
             return element.replace(/[\\&<>]/g, match => escaped[match]);
@@ -57,9 +61,13 @@ var JSX;
             return '';
         const { type, props } = element;
         const children = props.children;
-        const renderedChildren = Array.isArray(children)
-            ? children.flat().map(child => render(child)).join('')
-            : render(children);
+        const renderedChildren = type === 'script' || type === 'style'
+            ? (Array.isArray(children)
+                ? children.flat().map(child => renderRawText(child, type)).join('')
+                : renderRawText(children, type))
+            : (Array.isArray(children)
+                ? children.flat().map(child => render(child)).join('')
+                : render(children));
         return type
             ? `<${type}${renderProps(props)}>${renderedChildren}</${type}>`
             : renderedChildren;
@@ -75,8 +83,8 @@ function id_selector(id) {
     id = id.replace(/[!"#$%&'()*+,./:;<=>?@[\\\]^`{|}~]/g, "\\$&");
     return id[0] >= '0' && id[0] <= '9' ? `[id="${id}"]` : `#${id}`;
 }
-function Label({ id, display }) {
-    return (0, jsx_runtime_1.jsx)("label", { for: id, children: display });
+function Label({ id, display, title }) {
+    return (0, jsx_runtime_1.jsx)("label", { for: id, title: title, children: display });
 }
 //-----------------------------------------------------------------------------
 //	CSP
@@ -116,7 +124,7 @@ function CSPdefault(extension) {
 }
 function CSPFunction({ csp, ...others }) {
     const val = (v) => v instanceof Array ? v.map(v => val(v)).join(' ')
-        : v instanceof vscode_1.Uri ? v.toString(true)
+        : v instanceof vscode_1.Uri ? v.toString(true).replace(/ /g, '%20')
             : v instanceof Hash ? v.toValue()
                 : /*typeof v === 'string' ? `'${v}` :*/ v.toString();
     const resolve = (v, parent) => {

package/dist/webview/shared.d.ts

@@ -435,6 +435,6 @@ export declare class Tooltip {
     show(text: string, x: number, y: number): void;
     hide(): void;
 }
-export declare function template(template: HTMLElement, parent: HTMLElement, values: Record<string, string>[]): void;
+export declare function template(template: HTMLElement, parent: HTMLElement, values: Record<string, string>[]): HTMLElement[];
 export declare function generateSelector(e: Node | null): string;
 export {};

package/dist/webview/shared.js

@@ -318,11 +318,9 @@ export function template(template, parent, values) {
         replace_in_element(child, /\$\((.*)\)/g, m => i[m[1]]);
         return child;
     });
-    //	const parent = after.parentNode;
-    //	const before = after.nextSibling;
-    const before = null;
     for (const i of newnodes)
-        parent.insertBefore(i, before);
+        parent.insertBefore(i, null);
+    return newnodes;
 }
 export function generateSelector(e) {
     const path = [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@isopodlabs/vscode_utils",
-	"version": "0.3.0",
+	"version": "0.5.0",
 	"description": "vscode utilities",
 	"repository": {
 		"type": "git",
@@ -20,6 +20,7 @@
 	],
 	"scripts": {
 		"build": "tsc -b",
+		"watch": "tsc -watch -p ./",
 		"lint": "eslint \"src/**/*.ts\""
 	},
 	"keywords": [