sliftutils 0.48.0 → 0.50.0

package/bundler/bundleWrapper.ts

@@ -15,9 +15,16 @@ const getPackageJsonPath = cache((directory: string): string | undefined => {
 const getMainPath = cache((directory: string): string | undefined => {
     let packageJsonPath = getPackageJsonPath(directory);
     if (!packageJsonPath) return undefined;
-    let packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+    let packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8")) as {
+        main?: string;
+        exports?: {
+            "."?: {
+                require?: string;
+            };
+        };
+    };
     let dir = path.dirname(packageJsonPath);
-    let mainName = packageJson.main;
+    let mainName = packageJson.exports?.["."]?.require || packageJson.main;
     if (!mainName) {
         if (fs.existsSync(path.resolve(dir, "index.js"))) {
             mainName = "index.js";
@@ -29,6 +36,7 @@ const getMainPath = cache((directory: string): string | undefined => {
             mainName = "index.js";
         }
     }
+    // Handle the negative value ESM exports thing.
     let mainPath = path.resolve(dir, mainName);
     return mainPath;
 });
@@ -62,14 +70,14 @@ export function wrapModule(module: NodeJS.Module): string {
         }
     }
 
-    let isModuleMain: string | undefined;
+    let moduleMain: string | undefined;
     let dirname = path.dirname(module.filename);
     let packageJsonPath = getPackageJsonPath(dirname);
     if (packageJsonPath) {
         let mainPath = getMainPath(dirname);
         if (mainPath?.replaceAll("\\", "/") === module.filename.replaceAll("\\", "/")) {
             // Then we are the main of the module
-            isModuleMain = path.dirname(packageJsonPath).replaceAll("\\", "/");
+            moduleMain = path.dirname(packageJsonPath).replaceAll("\\", "/");
         }
     }
 
@@ -77,7 +85,7 @@ export function wrapModule(module: NodeJS.Module): string {
     let objWrapped = `{`
         + ` id: ${JSON.stringify(module.id.replaceAll("\\", "/"))},`
         + ` filename: ${JSON.stringify(module.filename.replaceAll("\\", "/"))},`
-        + ` isModuleMain: ${JSON.stringify(isModuleMain)},`
+        + ` isModuleMain: ${JSON.stringify(moduleMain)},`
         + ` paths: ${JSON.stringify(module.paths.map(p => p.replaceAll("\\", "/")))},`
         + ` moduleFields: ${JSON.stringify(moduleFields)},`
         + ` moduleFnc: ${wrapped}`

package/index.d.ts

@@ -622,6 +622,32 @@ declare module "sliftutils/storage/FileFolderAPI" {
     /// <reference types="node" />
     /// <reference types="node" />
     import { IStorageRaw } from "./IStorage";
+    declare global {
+        interface Window {
+            showSaveFilePicker(config?: {
+                types: {
+                    description: string;
+                    accept: {
+                        [mimeType: string]: string[];
+                    };
+                }[];
+            }): Promise<FileSystemFileHandle>;
+            showDirectoryPicker(): Promise<FileSystemDirectoryHandle>;
+            showOpenFilePicker(config?: {
+                types: {
+                    description: string;
+                    accept: {
+                        [mimeType: string]: string[];
+                    };
+                }[];
+            }): Promise<FileSystemFileHandle[]>;
+        }
+        interface FileSystemDirectoryHandle {
+            requestPermission(config?: {
+                mode: "read" | "readwrite";
+            }): Promise<PermissionState>;
+        }
+    }
     type FileWrapper = {
         getFile(): Promise<{
             size: number;

package/package.json

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

package/storage/FileFolderAPI.d.ts

@@ -1,6 +1,32 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { IStorageRaw } from "./IStorage";
+declare global {
+    interface Window {
+        showSaveFilePicker(config?: {
+            types: {
+                description: string;
+                accept: {
+                    [mimeType: string]: string[];
+                };
+            }[];
+        }): Promise<FileSystemFileHandle>;
+        showDirectoryPicker(): Promise<FileSystemDirectoryHandle>;
+        showOpenFilePicker(config?: {
+            types: {
+                description: string;
+                accept: {
+                    [mimeType: string]: string[];
+                };
+            }[];
+        }): Promise<FileSystemFileHandle[]>;
+    }
+    interface FileSystemDirectoryHandle {
+        requestPermission(config?: {
+            mode: "read" | "readwrite";
+        }): Promise<PermissionState>;
+    }
+}
 type FileWrapper = {
     getFile(): Promise<{
         size: number;

package/storage/FileFolderAPI.tsx

@@ -10,20 +10,26 @@ import { getFileStorageIndexDB } from "./IndexedDBFileFolderAPI";
 import fs from "fs";
 import path from "path";
 
-interface Window {
-    showSaveFilePicker(config?: {
-        types: {
-            description: string; accept: { [mimeType: string]: string[] }
-        }[];
-    }): Promise<FileSystemFileHandle>;
-    showDirectoryPicker(): Promise<FileSystemDirectoryHandle>;
-    showOpenFilePicker(config?: {
-        types: {
-            description: string; accept: { [mimeType: string]: string[] }
-        }[];
-    }): Promise<FileSystemFileHandle[]>;
+declare global {
+    interface Window {
+        showSaveFilePicker(config?: {
+            types: {
+                description: string; accept: { [mimeType: string]: string[] }
+            }[];
+        }): Promise<FileSystemFileHandle>;
+        showDirectoryPicker(): Promise<FileSystemDirectoryHandle>;
+        showOpenFilePicker(config?: {
+            types: {
+                description: string; accept: { [mimeType: string]: string[] }
+            }[];
+        }): Promise<FileSystemFileHandle[]>;
+    }
+    interface FileSystemDirectoryHandle {
+        requestPermission(config?: { mode: "read" | "readwrite" }): Promise<PermissionState>;
+    }
 }
 
+
 // NOTE: IndexedDB is required for iOS, at least. We MIGHT want to make
 //  this a user supported toggle too, so they can choose during runtime if they want it.
 // DO NOT enable this is isNode