sliftutils 0.14.0 → 0.16.0

package/.cursorrules

@@ -79,6 +79,14 @@ Coding Styles
 
     Never use environment variables. All configuration should be on the disk, or, if specific to a current run, passed as command line parameters. 
 
+    Never use inline styles, always use the CSS helper. 
+
+    Don't use as any.
+    
+    DO NOT redeclare constants and copy their value. JUST IMPORT THEM!
+
+    DO NOT redeclare types. JUST IMPORT THEM!
+
 
 General Styling
     Never use em or rem. Only use px or vw/vh/%.

package/index.d.ts

@@ -19,6 +19,7 @@ declare module "sliftutils/misc/fs" {
 }
 
 declare module "sliftutils/misc/getSecret" {
+    export declare function resetSecret(key: string): void;
     export declare const getSecret: {
         (key: string): Promise<string>;
         clear(key: string): void;
@@ -30,6 +31,13 @@ declare module "sliftutils/misc/getSecret" {
 
 }
 
+declare module "sliftutils/misc/matchFilter" {
+    export declare function matchFilter(filter: {
+        value: string;
+    }, value: string): boolean;
+
+}
+
 declare module "sliftutils/misc/types" {
     export declare function isDefined<T>(value: T | undefined | null): value is T;
 

package/misc/getSecret.d.ts

@@ -1,3 +1,4 @@
+export declare function resetSecret(key: string): void;
 export declare const getSecret: {
     (key: string): Promise<string>;
     clear(key: string): void;

package/misc/getSecret.ts

@@ -1,28 +1,98 @@
 
 import { cache } from "socket-function/src/caching";
-import os from "os";
-import fs from "fs";
+import { isNode } from "typesafecss";
 
-export const getSecret = cache(async function getSecret(key: string): Promise<string> {
-    const jsonIndex = key.indexOf(".json");
-    if (jsonIndex === -1) {
-        const filePath = os.homedir() + "/" + key;
-        return fs.readFileSync(filePath, "utf-8").trim();
+const secretStoragePrefix = "secret_";
+
+function getStorageKey(key: string) {
+    return secretStoragePrefix + key.replace(/[\/\\\.]/g, "_");
+}
+
+export function resetSecret(key: string) {
+    if (isNode()) {
+        throw new Error("resetSecret is only supported in the browser");
     }
+    localStorage.removeItem(getStorageKey(key));
+}
+
+export const getSecret = cache(async function getSecret(key: string): Promise<string> {
+    if (isNode()) {
+        const os = await import("os");
+        const fs = await import("fs");
+        const jsonIndex = key.indexOf(".json");
+        if (jsonIndex === -1) {
+            const filePath = os.homedir() + "/" + key;
+            return fs.readFileSync(filePath, "utf-8").trim();
+        }
 
-    const pathPart = key.slice(0, jsonIndex + ".json".length);
-    const filePath = os.homedir() + "/" + pathPart;
-    const contents = fs.readFileSync(filePath, "utf-8");
-    const json = JSON.parse(contents);
+        const pathPart = key.slice(0, jsonIndex + ".json".length);
+        const filePath = os.homedir() + "/" + pathPart;
+        const contents = fs.readFileSync(filePath, "utf-8");
+        const json = JSON.parse(contents);
 
-    const keyPart = key.slice(jsonIndex + ".json.".length);
-    if (!keyPart) {
-        return JSON.stringify(json);
+        const keyPart = key.slice(jsonIndex + ".json.".length);
+        if (!keyPart) {
+            return JSON.stringify(json);
+        }
+
+        const value = json[keyPart];
+        if (value === undefined) {
+            throw new Error(`Expected key "${keyPart}" in ${filePath}, was undefined`);
+        }
+        return String(value);
     }
 
-    const value = json[keyPart];
-    if (value === undefined) {
-        throw new Error(`Expected key "${keyPart}" in ${filePath}, was undefined`);
+    // Browser implementation
+    const storageKey = getStorageKey(key);
+    const cached = localStorage.getItem(storageKey);
+    if (cached) {
+        return cached;
     }
-    return String(value);
-});
+
+    // Show modal to prompt user for secret
+    const { showFullscreenModal, FullscreenModal } = await import("../render-utils/FullscreenModal");
+    const { showModal } = await import("../render-utils/modal");
+    const { observable } = await import("mobx");
+    const preact = await import("preact");
+
+    return new Promise<string>((resolve) => {
+        const state = observable({
+            value: "",
+        });
+
+        const { close } = showModal({
+            contents: preact.createElement(FullscreenModal, {
+                onCancel: () => {
+                    // Don't allow cancel without a value
+                },
+            },
+                preact.createElement("div", { style: { display: "flex", flexDirection: "column", gap: 10 } },
+                    preact.createElement("div", { style: { fontWeight: "bold" } }, `Enter secret for: ${key}`),
+                    preact.createElement("input", {
+                        style: { padding: 10, fontSize: 16 },
+                        onInput: (e: Event) => {
+                            state.value = (e.target as HTMLInputElement).value;
+                        },
+                        onKeyDown: (e: KeyboardEvent) => {
+                            if (e.code === "Enter" && state.value) {
+                                localStorage.setItem(storageKey, state.value);
+                                close();
+                                resolve(state.value);
+                            }
+                        },
+                    }),
+                    preact.createElement("button", {
+                        style: { padding: 10, fontSize: 16, cursor: "pointer" },
+                        onClick: () => {
+                            if (state.value) {
+                                localStorage.setItem(storageKey, state.value);
+                                close();
+                                resolve(state.value);
+                            }
+                        },
+                    }, "Save"),
+                ),
+            ),
+        });
+    });
+});

package/misc/matchFilter.d.ts

@@ -0,0 +1,3 @@
+export declare function matchFilter(filter: {
+    value: string;
+}, value: string): boolean;

package/misc/matchFilter.ts

@@ -0,0 +1,15 @@
+export function matchFilter(filter: { value: string }, value: string) {
+    let filterValue = filter.value.toLowerCase().trim();
+    if (!filterValue) return true;
+    value = value.toLowerCase().trim();
+    return filterValue.split("|").some(part =>
+        part.split("&").every(part => {
+            part = part.trim();
+            if (part.startsWith("!")) {
+                part = part.slice(1).trim();
+                return !value.includes(part);
+            }
+            return value.includes(part);
+        })
+    );
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "sliftutils",
-    "version": "0.14.0",
+    "version": "0.16.0",
     "main": "index.js",
     "license": "MIT",
     "files": [

package/web/browser.tsx

@@ -14,6 +14,24 @@ class App extends preact.Component {
         count: 0,
     });
 
+    onKeyDown = (e: KeyboardEvent) => {
+        // Skip if the current target is an ipnut
+        if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) {
+            return;
+        }
+        let hotkeySelector = `[data-hotkey="${e.code}"]`;
+        let elements = document.querySelectorAll(hotkeySelector);
+        for (let element of elements) {
+            (element as HTMLElement).click();
+        }
+    };
+    componentDidMount(): void {
+        document.addEventListener("keydown", this.onKeyDown);
+    }
+    componentWillUnmount(): void {
+        document.removeEventListener("keydown", this.onKeyDown);
+    }
+
     render() {
         return (
             <div className={css.pad2(20)}>