Move the APIs into shared so we can make better use of code splitting

src/extension/background/APIHandler/AICoreModelHandler.ts

@@ -1,4 +1,4 @@
-import { getNonEmptyString } from '#Shared/API/Untrusted/UntrustedParser'
+import { getNonEmptyString } from '#Shared/Typo/TypoParser'
 import {
   AICoreModelData
 } from '#Shared/API/AICoreModel/AICoreModelTypes'

src/extension/background/APIHandler/AIEmbeddingHandler.ts

@@ -1,4 +1,4 @@
-import { getNonEmptyString } from '#Shared/API/Untrusted/UntrustedParser'
+import { getNonEmptyString } from '#Shared/Typo/TypoParser'
 import {
   AIEmbeddingData,
   AIEmbeddingVector

src/extension/background/APIHandler/AILanguageDetectorHandler.ts

@@ -1,4 +1,4 @@
-import { getNonEmptyString } from '#Shared/API/Untrusted/UntrustedParser'
+import { getNonEmptyString } from '#Shared/Typo/TypoParser'
 import {
   AILanguageDetectorData,
   AILanguageDetectorDetectResult,

src/extension/background/APIHandler/AILanguageModelHandler.ts

@@ -15,7 +15,7 @@ import {
   AILanguageModelPrompt,
   AILanguageModelPromptRole
 } from '#Shared/API/AILanguageModel/AILanguageModelTypes'
-import { getNonEmptyString } from '#Shared/API/Untrusted/UntrustedParser'
+import { getNonEmptyString } from '#Shared/Typo/TypoParser'
 import { kModelPromptAborted, kModelPromptTypeNotSupported } from '#Shared/Errors'
 import APIHelper from './APIHelper'
 import AILlmSession from '../AI/AILlmSession'

src/extension/background/APIHandler/AIRewriterHandler.ts

@@ -1,4 +1,4 @@
-import { getNonEmptyString } from '#Shared/API/Untrusted/UntrustedParser'
+import { getNonEmptyString } from '#Shared/Typo/TypoParser'
 import {
   AIRewriterTone,
   AIRewriterFormat,

src/extension/background/APIHandler/AISummarizerHandler.ts

@@ -1,4 +1,4 @@
-import { getNonEmptyString } from '#Shared/API/Untrusted/UntrustedParser'
+import { getNonEmptyString } from '#Shared/Typo/TypoParser'
 import {
   AISummarizerType,
   AISummarizerFormat,

src/extension/background/APIHandler/AITranslatorHandler.ts

@@ -1,4 +1,4 @@
-import { getNonEmptyString } from '#Shared/API/Untrusted/UntrustedParser'
+import { getNonEmptyString } from '#Shared/Typo/TypoParser'
 import { AITranslatorData } from '#Shared/API/AITranslator/AITranslatorTypes'
 import {
   kTranslatorGetCapabilities,

src/extension/background/APIHandler/AIWriterHandler.ts

@@ -1,4 +1,4 @@
-import { getNonEmptyString } from '#Shared/API/Untrusted/UntrustedParser'
+import { getNonEmptyString } from '#Shared/Typo/TypoParser'
 import {
   AIWriterTone,
   AIWriterFormat,

src/extension/background/APIHandler/APIHandlerFactory.ts

@@ -1,4 +1,4 @@
-import { kContentScriptPortName, kExtensionLibPortName } from '#Shared/API/ContentScript'
+import { kContentScriptPortName, kExtensionLibPortName } from '#Shared/IPC/ContentScriptIPC'
 import APIHandler from './APIHandler'
 import NativeIPC from '../NativeIPC'
 import { updateOverrideBrowserAIScriptInjection, getOverrideBrowserAI } from '#Shared/Prefs'

src/extension/background/APIHandler/APIHelper.ts

@@ -1,4 +1,4 @@
-import { clamp } from '#Shared/API/Untrusted/UntrustedParser'
+import { clamp } from '#Shared/Typo/TypoParser'
 import {
   getDefaultModel,
   getDefaultModelEngine,
@@ -37,7 +37,7 @@ import { IPCInflightChannel } from '#Shared/IPC/IPCServer'
 import PermissionProvider from '../PermissionProvider'
 import AILlmSession from '../AI/AILlmSession'
 import { AIModelManifest } from '#Shared/AIModelManifest'
-import UntrustedParser from '#Shared/API/Untrusted/UntrustedObject'
+import TypoParser from '#Shared/Typo/TypoObject'
 import AIModelManager from '../AI/AIModelManager'
 import config from '#Shared/Config'
 
@@ -210,7 +210,7 @@ class APIHelper {
    * @returns the core llm prompt options
    */
   async #sanitizeModelProps (modelId: AIModelId, gpuEngine: AICapabilityGpuEngine, manifest: AIModelManifest, modelProps: any) {
-    const props = new UntrustedParser(modelProps)
+    const props = new TypoParser(modelProps)
     return {
       model: modelId.toString(),
       gpuEngine,
@@ -239,7 +239,7 @@ class APIHelper {
     promptType: AICapabilityPromptType,
     postflightFn: (
       manifest: AIModelManifest,
-      payload: UntrustedParser,
+      payload: TypoParser,
       props: AIRootModelProps
     ) => Promise<any>
   ) {
@@ -251,7 +251,7 @@ class APIHelper {
       throw new Error(kGpuEngineNotSupported)
     }
 
-    const payload = new UntrustedParser(rawPayload)
+    const payload = new TypoParser(rawPayload)
     return await this.captureCommonErrorsForResponse(async () => {
       // Values with user-defined defaults
       const modelId = await this.getModelId(rawPayload?.model, modelType)
@@ -314,12 +314,12 @@ class APIHelper {
     modelType: AIModelType,
     postflightFn: (
       manifest: AIModelManifest,
-      payload: UntrustedParser,
+      payload: TypoParser,
       props: AIRootModelProps
     ) => Promise<any>
   ) {
     const rawPayload = channel.payload
-    const payload = new UntrustedParser(rawPayload)
+    const payload = new TypoParser(rawPayload)
 
     // Values with user-defined defaults
     const modelId = await this.getModelId(rawPayload?.props?.model, modelType)

src/extension/contentscript-isolated/index.ts

@@ -2,7 +2,7 @@ import {
   kContentScriptMessageChannel,
   kContentScriptDisconnectChannel,
   kContentScriptPortName
-} from '#Shared/API/ContentScript'
+} from '#Shared/IPC/ContentScriptIPC'
 
 let port: chrome.runtime.Port | undefined
 

src/extension/contentscript-main/AI.ts

@@ -1,11 +1,11 @@
-import AISummarizerFactory from './AISummarizer/AISummarizerFactory'
-import AIWriterFactory from './AIWriter/AIWriterFactory'
-import AIRewriterFactory from './AIRewriter/AIRewriterFactory'
-import AILanguageModelFactory from './AILanguageModel/AILanguageModelFactory'
-import AICoreModelFactory from './AICoreModel/AICoreModelFactory'
-import AIEmbeddingFactory from './AIEmbedding/AIEmbeddingFactory'
-import AITranslatorFactory from './AITranslator/AITranslatorFactory'
-import AILanguageDetectorFactory from './AILanguageDetector/AILanguageDetectorFactory'
+import AISummarizerFactory from '#Shared/API/AISummarizer/AISummarizerFactory'
+import AIWriterFactory from '#Shared/API/AIWriter/AIWriterFactory'
+import AIRewriterFactory from '#Shared/API/AIRewriter/AIRewriterFactory'
+import AILanguageModelFactory from '#Shared/API/AILanguageModel/AILanguageModelFactory'
+import AICoreModelFactory from '#Shared/API/AICoreModel/AICoreModelFactory'
+import AIEmbeddingFactory from '#Shared/API/AIEmbedding/AIEmbeddingFactory'
+import AITranslatorFactory from '#Shared/API/AITranslator/AITranslatorFactory'
+import AILanguageDetectorFactory from '#Shared/API/AILanguageDetector/AILanguageDetectorFactory'
 import IPC from './IPC'
 import {
   kAIGetCapabilities,

src/extension/contentscript-main/IPC/ContentScriptPort.ts

@@ -1,7 +1,7 @@
 import {
   kContentScriptMessageChannel,
   kContentScriptDisconnectChannel
-} from '#Shared/API/ContentScript'
+} from '#Shared/IPC/ContentScriptIPC'
 import { PortEventHandler } from './PortEventHandler'
 
 export default class ContentScriptPort {

src/extension/contentscript-main/IPC/ExtensionLibPort.ts

@@ -1,6 +1,6 @@
 import {
   kExtensionLibPortName
-} from '#Shared/API/ContentScript'
+} from '#Shared/IPC/ContentScriptIPC'
 import config from '#Shared/Config'
 import { PortEventHandler } from './PortEventHandler'
 import { kExtensionNotFound } from '#Shared/BrowserErrors'

src/extension/contentscript-main/Translation.ts

@@ -1,6 +1,6 @@
 import AI from './AI'
-import AILanguageDetector from './AILanguageDetector/AILanguageDetector'
-import AITranslator from './AITranslator/AITranslator'
+import AILanguageDetector from '#Shared/API/AILanguageDetector/AILanguageDetector'
+import AITranslator from '#Shared/API/AITranslator/AITranslator'
 import { AICapabilityAvailability } from '#Shared/API/AI'
 
 type DetectorBridge = {

src/native/main/APIHandler/LlmSessionAPIHandler.ts

@@ -16,9 +16,9 @@ import config from '#Shared/Config'
 import type { Llama, LlamaCompletion, LlamaContext, LlamaModel, LlamaGrammar, LlamaEmbeddingContext } from 'node-llama-cpp'
 import AIModelFileSystem from '#R/AI/AIModelFileSystem'
 import { kModelPromptAborted } from '#Shared/Errors'
-import UntrustedParser from '#Shared/API/Untrusted/UntrustedObject'
+import TypoParser from '#Shared/Typo/TypoObject'
 import { nanoid } from 'nanoid'
-import { clamp } from '#Shared/API/Untrusted/UntrustedParser'
+import { clamp } from '#Shared/Typo/TypoParser'
 import { AIModelManifest } from '#Shared/AIModelManifest'
 import AsyncQueue from '#Shared/AsyncQueue'
 import AIModelId from '#Shared/AIModelId'
@@ -112,7 +112,7 @@ class LlmSessionAPIHandler {
   }
 
   #handleGetModelScore = async (channel: IPCInflightChannel) => {
-    const props = new UntrustedParser(channel.payload)
+    const props = new TypoParser(channel.payload)
     const gpuEngine = props.getEnum('gpuEngine', AICapabilityGpuEngine, undefined)
     const flashAttention = props.getBool('flashAttention', false)
     const contextSize = props.getNumber('contextSize', 2048)
@@ -365,7 +365,7 @@ class LlmSessionAPIHandler {
    * @returns the model props sanitized with the manifest
    */
   #sanitizeModelProps = (modelProps: any, manifest: AIModelManifest) => {
-    const props = new UntrustedParser(modelProps)
+    const props = new TypoParser(modelProps)
     return {
       model: manifest.id,
       gpuEngine: props.getEnum('gpuEngine', AICapabilityGpuEngine, undefined),
@@ -386,7 +386,7 @@ class LlmSessionAPIHandler {
 
       try {
         // Extract the options
-        const payload = new UntrustedParser(channel.payload)
+        const payload = new TypoParser(channel.payload)
         const modelId = new AIModelId(payload.getNonEmptyString('props.model', config.defaultModels[AIModelType.Text]))
         const manifest = await AIModelFileSystem.readModelManifest(modelId)
 
@@ -456,7 +456,7 @@ class LlmSessionAPIHandler {
     return await this.#requestQueue.push(async () => {
       try {
         // Extract the options
-        const payload = new UntrustedParser(channel.payload)
+        const payload = new TypoParser(channel.payload)
         const modelId = new AIModelId(payload.getNonEmptyString('props.model', config.defaultModels[AIModelType.Embedding]))
         const manifest = await AIModelFileSystem.readModelManifest(modelId)
 
@@ -498,7 +498,7 @@ class LlmSessionAPIHandler {
     return await this.#requestQueue.push(async () => {
       try {
         // Extract the options
-        const payload = new UntrustedParser(channel.payload)
+        const payload = new TypoParser(channel.payload)
         const modelId = new AIModelId(payload.getNonEmptyString('props.model', config.defaultModels[AIModelType.Text]))
         const input = payload.getString('input')
         const manifest = await AIModelFileSystem.readModelManifest(modelId)

src/native/main/APIHandler/ModelDownloadAPIHandler.ts

@@ -17,7 +17,7 @@ import { finished } from 'stream/promises'
 import { withDir, withFile } from 'tmp-promise'
 import config from '#Shared/Config'
 import { importLlama } from '#R/Llama'
-import { getNonEmptyString } from '#Shared/API/Untrusted/UntrustedParser'
+import { getNonEmptyString } from '#Shared/Typo/TypoParser'
 import AIModelId, { AIModelIdProvider } from '#Shared/AIModelId'
 import AIModelAssetId from '#Shared/AIModelAssetId'
 

src/extension/contentscript-main/AICoreModel/AICoreModel.ts → src/shared/API/AICoreModel/AICoreModel.ts

@@ -3,12 +3,12 @@ import {
   AICoreModelData,
   AICoreModelProps,
   AICoreModelCloneOptions
-} from '#Shared/API/AICoreModel/AICoreModelTypes'
-import { kCoreModelCreate, kCoreModelPrompt, kCoreModelCountTokens } from '#Shared/API/AICoreModel/AICoreModelIPCTypes'
-import { kSessionDestroyed } from '#Shared/Errors'
+} from './AICoreModelTypes'
+import { kCoreModelCreate, kCoreModelPrompt, kCoreModelCountTokens } from './AICoreModelIPCTypes'
+import { kSessionDestroyed } from '../../Errors'
 import { readablePromptStreamToString } from '../AIHelpers'
 import AIRootModel from '../AIRootModel'
-import IPCClient from '#Shared/IPC/IPCClient'
+import IPCClient from '../../IPC/IPCClient'
 
 class AICoreModel extends AIRootModel {
   /* **************************************************************************/

src/extension/contentscript-main/AICoreModel/AICoreModelCapabilities.ts → src/shared/API/AICoreModel/AICoreModelCapabilities.ts

@@ -1,4 +1,4 @@
-import { AICoreModelCapabilitiesData } from '#Shared/API/AICoreModel/AICoreModelTypes'
+import { AICoreModelCapabilitiesData } from './AICoreModelTypes'
 import AIRootModelCapabilities from '../AIRootModelCapabilities'
 
 class AICoreModelCapabilities extends AIRootModelCapabilities {

src/extension/contentscript-main/AICoreModel/AICoreModelFactory.ts → src/shared/API/AICoreModel/AICoreModelFactory.ts

@@ -3,17 +3,17 @@ import {
   AICoreModelCreateOptions,
   AICoreModelData,
   AICoreModelCapabilitiesData
-} from '#Shared/API/AICoreModel/AICoreModelTypes'
+} from './AICoreModelTypes'
 import {
   kCoreModelGetCapabilities,
   kCoreModelCreate
-} from '#Shared/API/AICoreModel/AICoreModelIPCTypes'
-import { throwIPCErrorResponse } from '#Shared/IPC/IPCErrorHelper'
+} from './AICoreModelIPCTypes'
+import { throwIPCErrorResponse } from '../../IPC/IPCErrorHelper'
 import AICoreModelCapabilities from './AICoreModelCapabilities'
 import AICoreModel from './AICoreModel'
-import { kModelCreationAborted } from '#Shared/Errors'
+import { kModelCreationAborted } from '../../Errors'
 import { createDownloadProgressFn } from '../AIHelpers'
-import IPCClient from '#Shared/IPC/IPCClient'
+import IPCClient from '../../IPC/IPCClient'
 
 class AICoreModelFactory {
   /* **************************************************************************/

src/extension/contentscript-main/AIEmbedding/AIEmbedding.ts → src/shared/API/AIEmbedding/AIEmbedding.ts

@@ -4,12 +4,12 @@ import {
   AIEmbeddingData,
   AIEmbeddingProps,
   AIEmbeddingCloneOptions
-} from '#Shared/API/AIEmbedding/AIEmbeddingTypes'
-import { kEmbeddingCreate, kEmbeddingGet } from '#Shared/API/AIEmbedding/AIEmbeddingIPCTypes'
-import { kSessionDestroyed } from '#Shared/Errors'
+} from './AIEmbeddingTypes'
+import { kEmbeddingCreate, kEmbeddingGet } from './AIEmbeddingIPCTypes'
+import { kSessionDestroyed } from '../../Errors'
 import AIRootModel from '../AIRootModel'
 import { calculateCosineSimilarity, findSimilar } from './AIEmbeddingUtil'
-import IPCClient from '#Shared/IPC/IPCClient'
+import IPCClient from '../../IPC/IPCClient'
 
 class AIEmbedding extends AIRootModel {
   /* **************************************************************************/

src/extension/contentscript-main/AIEmbedding/AIEmbeddingCapabilities.ts → src/shared/API/AIEmbedding/AIEmbeddingCapabilities.ts

@@ -1,4 +1,4 @@
-import { AIEmbeddingCapabilitiesData } from '#Shared/API/AIEmbedding/AIEmbeddingTypes'
+import { AIEmbeddingCapabilitiesData } from './AIEmbeddingTypes'
 import AIRootModelCapabilities from '../AIRootModelCapabilities'
 
 class AIEmbeddingCapabilities extends AIRootModelCapabilities {

src/extension/contentscript-main/AIEmbedding/AIEmbeddingFactory.ts → src/shared/API/AIEmbedding/AIEmbeddingFactory.ts

@@ -3,18 +3,18 @@ import {
   AIEmbeddingCreateOptions,
   AIEmbeddingData,
   AIEmbeddingCapabilitiesData
-} from '#Shared/API/AIEmbedding/AIEmbeddingTypes'
+} from './AIEmbeddingTypes'
 import {
   kEmbeddingGetCapabilities,
   kEmbeddingCreate
-} from '#Shared/API/AIEmbedding/AIEmbeddingIPCTypes'
-import { throwIPCErrorResponse } from '#Shared/IPC/IPCErrorHelper'
+} from './AIEmbeddingIPCTypes'
+import { throwIPCErrorResponse } from '../../IPC/IPCErrorHelper'
 import AIEmbeddingCapabilities from './AIEmbeddingCapabilities'
 import AIEmbedding from './AIEmbedding'
-import { kModelCreationAborted } from '#Shared/Errors'
+import { kModelCreationAborted } from '../../Errors'
 import { createDownloadProgressFn } from '../AIHelpers'
 import { calculateCosineSimilarity, findSimilar } from './AIEmbeddingUtil'
-import IPCClient from '#Shared/IPC/IPCClient'
+import IPCClient from '../../IPC/IPCClient'
 
 class AIEmbeddingFactory {
   /* **************************************************************************/

src/extension/contentscript-main/AIEmbedding/AIEmbeddingUtil.ts → src/shared/API/AIEmbedding/AIEmbeddingUtil.ts

@@ -1,6 +1,6 @@
 import {
   AIEmbeddingVector
-} from '#Shared/API/AIEmbedding/AIEmbeddingTypes'
+} from './AIEmbeddingTypes'
 
 type AIEmbeddingVectorListItem = Array<{
   id: any

src/extension/contentscript-main/AILanguageDetector/AILanguageDetector.ts → src/shared/API/AILanguageDetector/AILanguageDetector.ts

@@ -4,11 +4,11 @@ import {
   AILanguageDetectorCloneOptions,
   AILanguageDetectorDetectOptions,
   AILanguageDetectorDetectResult
-} from '#Shared/API/AILanguageDetector/AILanguageDetectorTypes'
-import { kLanguageDetectorCreate, kLanguageDetectorDetect } from '#Shared/API/AILanguageDetector/AILanguageDetectorIPCTypes'
-import { kSessionDestroyed } from '#Shared/Errors'
+} from './AILanguageDetectorTypes'
+import { kLanguageDetectorCreate, kLanguageDetectorDetect } from './AILanguageDetectorIPCTypes'
+import { kSessionDestroyed } from '../../Errors'
 import AIRootModel from '../AIRootModel'
-import IPCClient from '#Shared/IPC/IPCClient'
+import IPCClient from '../../IPC/IPCClient'
 
 class AILanguageDetector extends AIRootModel {
   /* **************************************************************************/

src/extension/contentscript-main/AILanguageDetector/AILanguageDetectorCapabilities.ts → src/shared/API/AILanguageDetector/AILanguageDetectorCapabilities.ts

@@ -1,4 +1,4 @@
-import { AILanguageDetectorCapabilitiesData } from '#Shared/API/AILanguageDetector/AILanguageDetectorTypes'
+import { AILanguageDetectorCapabilitiesData } from './AILanguageDetectorTypes'
 import AIRootModelCapabilities from '../AIRootModelCapabilities'
 
 class AILanguageDetectorCapabilities extends AIRootModelCapabilities {

src/extension/contentscript-main/AILanguageDetector/AILanguageDetectorFactory.ts → src/shared/API/AILanguageDetector/AILanguageDetectorFactory.ts

@@ -3,17 +3,17 @@ import {
   AILanguageDetectorCreateOptions,
   AILanguageDetectorData,
   AILanguageDetectorCapabilitiesData
-} from '#Shared/API/AILanguageDetector/AILanguageDetectorTypes'
+} from './AILanguageDetectorTypes'
 import {
   kLanguageDetectorGetCapabilities,
   kLanguageDetectorCreate
-} from '#Shared/API/AILanguageDetector/AILanguageDetectorIPCTypes'
-import { throwIPCErrorResponse } from '#Shared/IPC/IPCErrorHelper'
+} from './AILanguageDetectorIPCTypes'
+import { throwIPCErrorResponse } from '../../IPC/IPCErrorHelper'
 import AILanguageDetectorCapabilities from './AILanguageDetectorCapabilities'
 import AILanguageDetector from './AILanguageDetector'
-import { kModelCreationAborted } from '#Shared/Errors'
+import { kModelCreationAborted } from '../../Errors'
 import { createDownloadProgressFn } from '../AIHelpers'
-import IPCClient from '#Shared/IPC/IPCClient'
+import IPCClient from '../../IPC/IPCClient'
 
 class AILanguageDetectorFactory {
   /* **************************************************************************/