Merge pull request #6 from BossSloth/improvements

Small type improvements and fixed the webkit package not building right again

Author: shdwmtr

pnpm-lock.yaml

@@ -1,6 +1,5 @@
 {
 	"compilerOptions": {
-		"outDir": "build",
 		"module": "ESNext",
 		"target": "ES2021",
 		"jsx": "react",

tsconfig.base.json

@@ -1,3 +1,5 @@
+import { constSysfsExpr } from "./shared/constSysfsExpr";
+
 declare global {
 	interface Window {
 		Millennium: Millennium;
@@ -7,7 +9,7 @@ declare global {
 /** Returnable IPC types */
 type IPC_types = string | number | boolean | void;
 /*
- Global Millennium API for developers. 
+ Global Millennium API for developers.
 */
 type Millennium = {
 	/**
@@ -40,4 +42,5 @@ declare global {
 declare const BindPluginSettings: () => any;
 
 const Millennium: Millennium = window.Millennium;
-export { Millennium, callable, BindPluginSettings };
+export { BindPluginSettings, callable, constSysfsExpr, Millennium };
+

typescript-packages/browser/src/index.ts

@@ -0,0 +1 @@
+../../shared

typescript-packages/browser/src/shared

@@ -1,7 +1,8 @@
 {
 	"extends": "../../tsconfig.base.json",
 	"compilerOptions": {
-		"rootDir": "src"
+		"outDir": "build",
+		"rootDir": "src",
 	},
 	"include": ["**/*"],
 	"exclude": ["build"]

typescript-packages/browser/tsconfig.json

@@ -37,6 +37,7 @@
 		"@rollup/plugin-terser": "^0.4.4",
 		"@rollup/plugin-typescript": "^11.1.6",
 		"chalk": "^4.1.0",
+		"devtools-protocol": "^0.0.1485358",
 		"fs": "0.0.1-security",
 		"path": "^0.12.7",
 		"rollup": "^4.17.2",

typescript-packages/client/package.json

@@ -1,13 +1,14 @@
+export * from './class-mapper';
+export * from './components';
 export * from './custom-components';
 export * from './custom-hooks';
-export * from './components';
 export * from './deck-hooks';
-export * from './modules';
 export * from './globals';
-export * from './webpack';
-export * from './utils';
-export * from './class-mapper';
 export * from './millennium-api';
+export * from './modules';
+export * from './shared/constSysfsExpr';
+export * from './utils';
+export * from './webpack';
 
 import ErrorBoundaryHook from './hooks/error-boundary-hook';
 import RouterHook from './hooks/router/router-hook';

typescript-packages/client/src/index.ts

@@ -1,8 +1,10 @@
+import ProtocolMapping from 'devtools-protocol/types/protocol-mapping';
+
 /** Returnable IPC types */
 type IPC_types = string | number | boolean;
 
 /*
- Global Millennium API for developers. 
+ Global Millennium API for developers.
 */
 type Millennium = {
 	/**
@@ -55,34 +57,6 @@ declare global {
 
 declare const BindPluginSettings: () => any;
 
-interface FileInfo {
-	content: string;
-	filePath: string;
-	fileName: string;
-}
-
-type BufferEncoding = 'ascii' | 'utf8' | 'utf-8' | 'utf16le' | 'ucs2' | 'ucs-2' | 'base64' | 'latin1' | 'binary' | 'hex';
-
-interface SingleFileExprProps {
-	basePath?: string;
-	encoding?: BufferEncoding;
-}
-
-interface MultiFileExprProps {
-	basePath?: string;
-	include?: string; // A regex pattern to include files
-	encoding?: BufferEncoding;
-}
-
-/**
- * Create a compile time filesystem expression.
- * This function will evaluate a file path at compile time, and embed a files content statically into the bundle.
- */
-declare const constSysfsExpr: {
-	(fileName: string, props: SingleFileExprProps): FileInfo;
-	(props: MultiFileExprProps): FileInfo[];
-};
-
 interface CDPMessage {
 	id?: number;
 	method: string;
@@ -130,7 +104,7 @@ class MillenniumChromeDevToolsProtocol {
 		}
 	}
 
-	send(method: string, params: any = {}, sessionId?: string) {
+	send<T extends keyof ProtocolMapping.Commands>(method: T, params: ProtocolMapping.Commands[T]['paramsType'][0] = {}, sessionId?: string): Promise<ProtocolMapping.Commands[T]['returnType']> {
 		return new Promise((resolve, reject) => {
 			const id = this.currentId++;
 
@@ -165,7 +139,7 @@ class MillenniumChromeDevToolsProtocol {
 	}
 
 	// Helper method to send without waiting for response (fire and forget)
-	sendNoResponse(method: string, params = {}) {
+	sendNoResponse<T extends keyof ProtocolMapping.Commands>(method: T, params: ProtocolMapping.Commands[T]['paramsType'][0] = {}) {
 		const message: CDPMessage = {
 			id: this.currentId++,
 			method: method,
@@ -181,4 +155,5 @@ class MillenniumChromeDevToolsProtocol {
 
 const ChromeDevToolsProtocol: MillenniumChromeDevToolsProtocol = new MillenniumChromeDevToolsProtocol();
 const Millennium: Millennium = window.Millennium;
-export { ChromeDevToolsProtocol, Millennium, callable, BindPluginSettings, constSysfsExpr };
+export { BindPluginSettings, callable, ChromeDevToolsProtocol, Millennium };
+

typescript-packages/client/src/millennium-api.ts

@@ -0,0 +1 @@
+../../shared

typescript-packages/client/src/shared

@@ -0,0 +1,29 @@
+interface FileInfo {
+	content: string;
+	filePath: string;
+	fileName: string;
+}
+
+type BufferEncoding = 'ascii' | 'utf8' | 'utf-8' | 'utf16le' | 'ucs2' | 'ucs-2' | 'base64' | 'latin1' | 'binary' | 'hex';
+
+interface SingleFileExprProps {
+	basePath?: string;
+	encoding?: BufferEncoding;
+}
+
+interface MultiFileExprProps {
+	basePath?: string;
+	include?: string; // A regex pattern to include files
+	encoding?: BufferEncoding;
+}
+
+/**
+ * Create a compile time filesystem expression.
+ * This function will evaluate a file path at compile time, and embed a files content statically into the bundle.
+ */
+declare const constSysfsExpr: {
+	(fileName: string, props: SingleFileExprProps): FileInfo;
+	(props: MultiFileExprProps): FileInfo[];
+};
+
+export { constSysfsExpr };