shared: Moved utils from core package to shared

prozilla-os · Oct 3, 2024 · 7a69a2b · 7a69a2b
1 parent d3fd8ea
commit 7a69a2b
Show file tree

Hide file tree

Showing 68 changed files with 6,006 additions and 207 deletions.
diff --git a/package.json b/package.json
@@ -6,6 +6,7 @@
 		"email": "business@prozilla.dev",
 		"url": "https://prozilla.dev/"
 	},
+	"funding": "https://ko-fi.com/prozilla",
 	"homepage": "https://os.prozilla.dev/",
 	"type": "module",
 	"license": "MIT",

diff --git a/packages/apps/browser/package.json b/packages/apps/browser/package.json
@@ -8,6 +8,7 @@
 		"email": "business@prozilla.dev",
 		"url": "https://prozilla.dev/"
 	},
+	"funding": "https://ko-fi.com/prozilla",
 	"type": "module",
 	"main": "dist/main.js",
 	"types": "dist/main.d.ts",

diff --git a/packages/apps/calculator/package.json b/packages/apps/calculator/package.json
@@ -8,6 +8,7 @@
 		"email": "business@prozilla.dev",
 		"url": "https://prozilla.dev/"
 	},
+	"funding": "https://ko-fi.com/prozilla",
 	"type": "module",
 	"main": "dist/main.js",
 	"types": "dist/main.d.ts",

diff --git a/packages/apps/file-explorer/package.json b/packages/apps/file-explorer/package.json
@@ -8,6 +8,7 @@
 		"email": "business@prozilla.dev",
 		"url": "https://prozilla.dev/"
 	},
+	"funding": "https://ko-fi.com/prozilla",
 	"type": "module",
 	"main": "dist/main.js",
 	"types": "dist/main.d.ts",

diff --git a/packages/apps/logic-sim/package.json b/packages/apps/logic-sim/package.json
@@ -8,6 +8,7 @@
 		"email": "business@prozilla.dev",
 		"url": "https://prozilla.dev/"
 	},
+	"funding": "https://ko-fi.com/prozilla",
 	"type": "module",
 	"main": "dist/main.js",
 	"types": "dist/main.d.ts",
@@ -22,6 +23,7 @@
 	"license": "MIT",
 	"dependencies": {
 		"@prozilla-os/core": "workspace:*",
+		"@prozilla-os/shared": "workspace:*",
 		"react": "^18.3.1"
 	},
 	"devDependencies": {
@@ -31,8 +33,7 @@
 		"typescript": "^5.4.5",
 		"vite": "^5.3.1",
 		"vite-plugin-dts": "^3.9.1",
-		"vite-plugin-lib-inject-css": "^2.1.1",
-		"@prozilla-os/shared": "workspace:*"
+		"vite-plugin-lib-inject-css": "^2.1.1"
 	},
 	"files": [
 		"dist"

diff --git a/packages/apps/logic-sim/src/core/circuit.ts b/packages/apps/logic-sim/src/core/circuit.ts
@@ -1,9 +1,10 @@
-import { clamp, Vector2 } from "@prozilla-os/core";
+import { Vector2 } from "@prozilla-os/core";
 import { Chip, ChipJson } from "./chips/chip";
 import { ControlledPin } from "./pins/controlledPin";
 import { InputHandler } from "./inputHandler";
 import { Wire, WireJson } from "./wires/wire";
 import { BACKGROUND, COLORS, CONTROLLER, CURSORS, ENABLE_COLOR_CACHING, FONT } from "../constants/logicSim.const";
+import { clamp } from "@prozilla-os/shared";
 
 export interface CircuitJson extends ChipJson {
 	wires: WireJson[];

diff --git a/packages/apps/media-viewer/package.json b/packages/apps/media-viewer/package.json
@@ -8,6 +8,7 @@
 		"email": "business@prozilla.dev",
 		"url": "https://prozilla.dev/"
 	},
+	"funding": "https://ko-fi.com/prozilla",
 	"type": "module",
 	"main": "dist/main.js",
 	"types": "dist/main.d.ts",

diff --git a/packages/apps/settings/package.json b/packages/apps/settings/package.json
@@ -8,6 +8,7 @@
 		"email": "business@prozilla.dev",
 		"url": "https://prozilla.dev/"
 	},
+	"funding": "https://ko-fi.com/prozilla",
 	"type": "module",
 	"main": "dist/main.js",
 	"types": "dist/main.d.ts",
@@ -26,10 +27,10 @@
 		"@fortawesome/react-fontawesome": "^0.2.2",
 		"@prozilla-os/core": "workspace:*",
 		"@prozilla-os/file-explorer": "workspace:*",
+		"@prozilla-os/shared": "^1.1.1",
 		"react": "^18.3.1"
 	},
 	"devDependencies": {
-		"@prozilla-os/shared": "workspace:*",
 		"@types/node": "^20.14.5",
 		"@types/react": "^18.3.3",
 		"@vitejs/plugin-react-swc": "^3.7.0",

diff --git a/packages/apps/settings/src/components/tabs/AppOption.tsx b/packages/apps/settings/src/components/tabs/AppOption.tsx
@@ -2,7 +2,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import styles from "../Settings.module.css";
 import { faEllipsisVertical, faThumbTack } from "@fortawesome/free-solid-svg-icons";
 import { MouseEventHandler } from "react";
-import { Actions, App, ClickAction, ImagePreview, removeFromArray, SettingsManager, useContextMenu, useSettingsManager, useWindowsManager } from "@prozilla-os/core";
+import { Actions, App, ClickAction, ImagePreview, SettingsManager, useContextMenu, useSettingsManager, useWindowsManager } from "@prozilla-os/core";
+import { removeFromArray } from "@prozilla-os/shared";
 
 interface AppOptionProps {
 	app: App;

diff --git a/packages/apps/settings/src/components/tabs/StorageSettings.tsx b/packages/apps/settings/src/components/tabs/StorageSettings.tsx
@@ -1,5 +1,6 @@
+import { round } from "@prozilla-os/shared";
 import styles from "../Settings.module.css";
-import { Button, ProgressBar, round, StorageManager, useVirtualRoot, utilStyles } from "@prozilla-os/core";
+import { Button, ProgressBar, StorageManager, useVirtualRoot, utilStyles } from "@prozilla-os/core";
 
 export function StorageTab() {
 	const virtualRoot = useVirtualRoot();

diff --git a/packages/apps/terminal/package.json b/packages/apps/terminal/package.json
@@ -8,6 +8,7 @@
 		"email": "business@prozilla.dev",
 		"url": "https://prozilla.dev/"
 	},
+	"funding": "https://ko-fi.com/prozilla",
 	"type": "module",
 	"main": "dist/main.js",
 	"types": "dist/main.d.ts",
@@ -22,6 +23,7 @@
 	"license": "MIT",
 	"dependencies": {
 		"@prozilla-os/core": "workspace:*",
+		"@prozilla-os/shared": "workspace:*",
 		"anser": "^2.1.1",
 		"escape-carriage": "^1.3.1",
 		"react": "^18.3.1"
@@ -33,8 +35,7 @@
 		"typescript": "^5.4.5",
 		"vite": "^5.3.1",
 		"vite-plugin-dts": "^3.9.1",
-		"vite-plugin-lib-inject-css": "^2.1.1",
-		"@prozilla-os/shared": "workspace:*"
+		"vite-plugin-lib-inject-css": "^2.1.1"
 	},
 	"files": [
 		"dist"

diff --git a/packages/apps/terminal/src/components/Terminal.tsx b/packages/apps/terminal/src/components/Terminal.tsx
@@ -2,12 +2,13 @@ import { MouseEventHandler, MutableRefObject, useEffect, useRef, useState } from
 import styles from "./Terminal.module.css";
 import { OutputLine } from "./OutputLine";
 import { InputLine } from "./InputLine";
-import { ANSI, App, clamp, removeFromArray, SettingsManager, useSettingsManager, useSystemManager, useVirtualRoot, VirtualFolder, WindowProps } from "@prozilla-os/core";
+import { App, SettingsManager, useSettingsManager, useSystemManager, useVirtualRoot, VirtualFolder, WindowProps } from "@prozilla-os/core";
 import { HOSTNAME, USERNAME, WELCOME_MESSAGE } from "../constants/terminal.const";
 import { Stream } from "../core/stream";
 import { CommandResponse } from "../core/command";
 import { formatError } from "../core/_utils/terminal.utils";
 import { CommandsManager } from "../core/commands";
+import { ANSI, clamp, removeFromArray } from "@prozilla-os/shared";
 
 export interface TerminalProps extends WindowProps {
 	path?: string;

diff --git a/packages/apps/terminal/src/constants/terminal.const.ts b/packages/apps/terminal/src/constants/terminal.const.ts
@@ -1,4 +1,4 @@
-import { ANSI } from "@prozilla-os/core";
+import { ANSI } from "@prozilla-os/shared";
 
 export const USERNAME = "user";
 export const HOSTNAME = "prozilla-os";

diff --git a/packages/apps/terminal/src/core/_utils/terminal.utils.ts b/packages/apps/terminal/src/core/_utils/terminal.utils.ts
@@ -1,4 +1,4 @@
-import { ANSI } from "@prozilla-os/core";
+import { ANSI } from "@prozilla-os/shared";
 
 export function formatError(commandName: string, error: string): string {
 	return `${ANSI.fg.red}${commandName}: ${error}${ANSI.reset}`;

diff --git a/packages/apps/terminal/src/core/commands/cmatrix.ts b/packages/apps/terminal/src/core/commands/cmatrix.ts
@@ -1,4 +1,5 @@
-import { ANSI, randomFromArray, randomRange, removeFromArray, Vector2 } from "@prozilla-os/core";
+import { Vector2 } from "@prozilla-os/core";
+import { ANSI, randomFromArray, randomRange, removeFromArray } from "@prozilla-os/shared";
 import { Command } from "../command";
 import { Stream } from "../stream";
 

diff --git a/packages/apps/terminal/src/core/commands/fortune.ts b/packages/apps/terminal/src/core/commands/fortune.ts
@@ -1,4 +1,4 @@
-import { randomFromArray } from "@prozilla-os/core";
+import { randomFromArray } from "@prozilla-os/shared";
 import { Command } from "../command";
 
 /**

diff --git a/packages/apps/terminal/src/core/commands/help.ts b/packages/apps/terminal/src/core/commands/help.ts
@@ -1,4 +1,4 @@
-import { ANSI } from "@prozilla-os/core";
+import { ANSI } from "@prozilla-os/shared";
 import { formatError } from "../_utils/terminal.utils";
 import { Command } from "../command";
 import { CommandsManager } from "../commands";

diff --git a/packages/apps/terminal/src/core/commands/history.ts b/packages/apps/terminal/src/core/commands/history.ts
@@ -0,0 +1,18 @@
+// import { Command, CommandResponse } from "../command";
+
+// const historyCommand = new Command()
+// 	.setRequireArgs(true)
+// 	.setManual({
+// 		purpose: "Command Line history",
+// 		usage: "history",
+// 	})
+// 	.setRequireArgs(true)
+// 	.setExecute(function(this: Command, args, { history }) {
+// 		if (args == null || args.length == 0)
+// 			return;
+
+// 		const output = eval(args[0]) as CommandResponse ?? { blank: true };
+// 		return output;
+// 	});
+
+// export { historyCommand as eval };
diff --git a/packages/apps/terminal/src/core/commands/lolcat.ts b/packages/apps/terminal/src/core/commands/lolcat.ts
@@ -1,4 +1,4 @@
-import { ANSI } from "@prozilla-os/core";
+import { ANSI } from "@prozilla-os/shared";
 import { removeAnsi } from "../_utils/terminal.utils";
 import { Command, ExecuteParams } from "../command";
 

diff --git a/packages/apps/terminal/src/core/commands/ls.ts b/packages/apps/terminal/src/core/commands/ls.ts
@@ -1,6 +1,7 @@
-import { ANSI, VirtualFolder } from "@prozilla-os/core";
+import { VirtualFolder } from "@prozilla-os/core";
 import { formatError } from "../_utils/terminal.utils";
 import { Command, ExecuteParams } from "../command";
+import { ANSI } from "@prozilla-os/shared";
 
 export const ls = new Command()
 	.setManual({

diff --git a/packages/apps/terminal/src/core/commands/man.ts b/packages/apps/terminal/src/core/commands/man.ts
@@ -1,4 +1,4 @@
-import { ANSI } from "@prozilla-os/core";
+import { ANSI } from "@prozilla-os/shared";
 import { formatError } from "../_utils/terminal.utils";
 import { Command, ExecuteParams } from "../command";
 import { CommandsManager } from "../commands";

diff --git a/packages/apps/terminal/src/core/commands/neofetch.ts b/packages/apps/terminal/src/core/commands/neofetch.ts
@@ -1,4 +1,5 @@
-import { ANSI, SettingsManager, THEMES } from "@prozilla-os/core";
+import { SettingsManager, THEMES } from "@prozilla-os/core";
+import { ANSI } from "@prozilla-os/shared";
 import { ANSI_ASCII_LOGO, ANSI_LOGO_COLOR } from "../../constants/terminal.const";
 import { Command, ExecuteParams } from "../command";
 

diff --git a/packages/apps/terminal/src/core/commands/whatis.ts b/packages/apps/terminal/src/core/commands/whatis.ts
@@ -1,4 +1,4 @@
-import { ANSI } from "@prozilla-os/core";
+import { ANSI } from "@prozilla-os/shared";
 import { formatError } from "../_utils/terminal.utils";
 import { Command } from "../command";
 import { CommandsManager } from "../commands";

diff --git a/packages/apps/terminal/src/core/stream.ts b/packages/apps/terminal/src/core/stream.ts
@@ -1,4 +1,4 @@
-import { EventEmitter } from "@prozilla-os/core";
+import { EventEmitter } from "@prozilla-os/shared";
 
 const StreamEvents = {
 	new: "new",

diff --git a/packages/apps/text-editor/package.json b/packages/apps/text-editor/package.json
@@ -8,6 +8,7 @@
 		"email": "business@prozilla.dev",
 		"url": "https://prozilla.dev/"
 	},
+	"funding": "https://ko-fi.com/prozilla",
 	"type": "module",
 	"main": "dist/main.js",
 	"types": "dist/main.d.ts",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -8,6 +8,7 @@
 		"email": "business@prozilla.dev",
 		"url": "https://prozilla.dev/"
 	},
+	"funding": "https://ko-fi.com/prozilla",
 	"type": "module",
 	"main": "dist/main.js",
 	"types": "dist/main.d.ts",
@@ -25,6 +26,7 @@
 		"@fortawesome/free-regular-svg-icons": "^6.5.2",
 		"@fortawesome/free-solid-svg-icons": "^6.5.2",
 		"@fortawesome/react-fontawesome": "^0.2.2",
+		"@prozilla-os/shared": "workspace:*",
 		"@prozilla-os/skins": "workspace:*",
 		"react": "^18.3.1",
 		"react-draggable": "^4.4.6",

diff --git a/packages/core/src/components/_utils/dropdown-button/DropdownButton.tsx b/packages/core/src/components/_utils/dropdown-button/DropdownButton.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import styles from "./DropdownButton.module.css";
 import { OutsideClickListener } from "../../../hooks/_utils/outsideClick";
-import { formatShortcut } from "../../../features/_utils/string.utils";
+import { formatShortcut } from "../../../features/_utils/keyboard.utils";
 
 export function DropdownButton({ label, options, shortcuts }: { label: string; options: { [s: string]: Function; }; shortcuts: { [s: string]: string[]; }; }) {
 	const [open, setOpen] = useState(false);

diff --git a/packages/core/src/components/_utils/progress-bar/ProgressBar.tsx b/packages/core/src/components/_utils/progress-bar/ProgressBar.tsx
@@ -1,7 +1,7 @@
 import { CSSProperties } from "react";
 import styles from "./ProgressBar.module.css";
-import { clamp } from "../../../features/_utils/math.utils";
 import { useClassNames } from "../../../hooks";
+import { clamp } from "@prozilla-os/shared";
 
 interface ProgressBarProps {
 	fillPercentage: number;

diff --git a/packages/core/src/components/actions/actions/RadioAction.tsx b/packages/core/src/components/actions/actions/RadioAction.tsx
@@ -1,5 +1,5 @@
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { formatShortcut } from "../../../features/_utils/string.utils";
+import { formatShortcut } from "../../../features/_utils/keyboard.utils";
 import styles from "../Actions.module.css";
 import { faCircleDot } from "@fortawesome/free-solid-svg-icons";
 import { ReactElement, useState } from "react";

diff --git a/packages/core/src/components/actions/actions/ToggleAction.tsx b/packages/core/src/components/actions/actions/ToggleAction.tsx
@@ -1,5 +1,5 @@
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { formatShortcut } from "../../../features/_utils/string.utils";
+import { formatShortcut } from "../../../features/_utils/keyboard.utils";
 import styles from "../Actions.module.css";
 import { ReactElement, useState } from "react";
 import { faSquare } from "@fortawesome/free-regular-svg-icons";

diff --git a/packages/core/src/components/desktop/Desktop.tsx b/packages/core/src/components/desktop/Desktop.tsx
@@ -10,13 +10,14 @@ import { RadioAction } from "../actions/actions/RadioAction";
 import { Divider } from "../actions/actions/Divider";
 import { Share } from "../modals/share/Share";
 import { ModalProps } from "../modals/ModalView";
-import { SettingsManager, reloadViewport, ModalsManager, Vector2, isValidInteger, AppsConfig } from "../../features";
+import { SettingsManager, reloadViewport, ModalsManager, Vector2, AppsConfig } from "../../features";
 import { VirtualFile } from "../../features/virtual-drive/file";
 import { VirtualFolder, VirtualFolderLink } from "../../features/virtual-drive/folder";
 import { useSettingsManager, useWindowsManager, useVirtualRoot, useWindowedModal, useContextMenu, useSystemManager } from "../../hooks";
 import { DirectoryList } from "../_utils";
 import { FileEventHandler, FolderEventHandler } from "../_utils/directory-list/DirectoryList";
 import { useClassNames } from "../../hooks";
+import { isValidInteger } from "@prozilla-os/shared";
 
 export const Desktop = memo(() => {
 	const { desktopConfig, skin, appsConfig } = useSystemManager();

diff --git a/packages/core/src/components/windows/WindowsView.tsx b/packages/core/src/components/windows/WindowsView.tsx
@@ -1,9 +1,10 @@
 import { FC, memo, useEffect, useState } from "react";
 import { WindowProps, WindowView } from "./WindowView";
-import { setViewportTitle, setViewportIcon, getViewportParams, SettingsManager, removeDuplicatesFromArray } from "../../features";
+import { setViewportTitle, setViewportIcon, getViewportParams, SettingsManager } from "../../features";
 import { WindowOptions } from "../../features/windows/windowsManager";
 import { useClassNames, useSettingsManager, useSystemManager, useWindowsManager } from "../../hooks";
 import { useWindows } from "../../hooks/windows/windowsContext";
+import { removeDuplicatesFromArray } from "@prozilla-os/shared";
 
 export const WindowsView: FC = memo(() => {
 	const { systemName, tagLine } = useSystemManager();

diff --git a/packages/core/src/constants/index.ts b/packages/core/src/constants/index.ts
@@ -1,3 +1,2 @@
 export { CODE_EXTENSIONS, IMAGE_EXTENSIONS } from "./virtualDrive.const";
-export { ANSI } from "./utils.const";
 export { THEMES } from "./themes.const";
diff --git a/packages/core/src/features/_utils/index.ts b/packages/core/src/features/_utils/index.ts
@@ -1,8 +1,3 @@
-export * from "./array.utils";
 export * from "./browser.utils";
-export * from "./date.utils";
-export * from "./event.utils";
-export * from "./math.utils";
-export * from "./number.utils";
-export * from "./string.utils";
+export * from "./keyboard.utils";
 export * from "./time.utils";
diff --git a/.../core/src/features/_utils/string.utils.ts → ...ore/src/features/_utils/keyboard.utils.ts b/.../core/src/features/_utils/string.utils.ts → ...ore/src/features/_utils/keyboard.utils.ts
diff --git a/packages/core/src/features/_utils/time.utils.ts b/packages/core/src/features/_utils/time.utils.ts
@@ -1,4 +1,4 @@
-import { formatRelativeTime } from "./date.utils";
+import { formatRelativeTime } from "@prozilla-os/shared";
 
 export class TimeManager {
 	static startDate: Date;

diff --git a/packages/core/src/features/system/systemManager.ts b/packages/core/src/features/system/systemManager.ts
@@ -1,4 +1,3 @@
-import { formatRelativeTime } from "../_utils";
 import { Skin } from "@prozilla-os/skins";
 import { VirtualDriveConfig } from "./configs";
 import { AppsConfig } from "./configs/appsConfig";
@@ -8,6 +7,7 @@ import { ModalsConfig } from "./configs/modalsConfig";
 import { TaskbarConfig } from "./configs/taskbarConfig";
 import { TrackingConfig } from "./configs/trackingConfig";
 import { WindowsConfig } from "./configs/windowsConfig";
+import { formatRelativeTime } from "@prozilla-os/shared";
 
 export interface SystemManagerParams {
 	systemName: SystemManager["systemName"] | null;

diff --git a/packages/core/src/features/virtual-drive/folder/virtualFolder.ts b/packages/core/src/features/virtual-drive/folder/virtualFolder.ts
@@ -1,10 +1,10 @@
-import { removeFromArray } from "../../_utils/array.utils";
 import { WindowsManager } from "../../windows/windowsManager";
 import { VirtualFileJson } from "../file/virtualFile";
 import { VirtualBase, VirtualBaseJson } from "../virtualBase";
 import { VirtualFolderLink } from ".";
 import { VirtualFile, VirtualFileLink } from "../file";
 import { AppsConfig } from "../../system/configs";
+import { removeFromArray } from "@prozilla-os/shared";
 
 export interface VirtualFolderJson extends VirtualBaseJson {
 	fls?: VirtualFileJson[];

diff --git a/packages/core/src/features/virtual-drive/virtualBase.ts b/packages/core/src/features/virtual-drive/virtualBase.ts
@@ -1,7 +1,7 @@
-import { EventEmitter, EventNamesMap } from "../_utils/event.utils";
 import { VirtualRoot } from "./root/virtualRoot";
 import { VirtualFile } from "./file";
 import { VirtualFolder } from "./folder";
+import { EventEmitter, EventNamesMap } from "@prozilla-os/shared";
 
 export interface VirtualBaseJson {
 	nam: string;

diff --git a/packages/core/src/features/windows/windowsManager.ts b/packages/core/src/features/windows/windowsManager.ts
@@ -1,4 +1,4 @@
-import { randomRange } from "../_utils/math.utils";
+import { randomRange } from "@prozilla-os/shared";
 import { App } from "../";
 import { Vector2 } from "../math/vector2";
 import { SystemManager } from "../system/systemManager";

diff --git a/packages/core/src/features/z-index/zIndexManager.ts b/packages/core/src/features/z-index/zIndexManager.ts
@@ -1,4 +1,4 @@
-import { EventEmitter } from "../_utils/event.utils";
+import { EventEmitter } from "@prozilla-os/shared";
 import { ZIndexGroup } from "./zIndexGroup";
 
 const ZIndexManagerEvents = {