rename model to models

src/app/app.tsx

@@ -9,7 +9,7 @@ import { If } from "tsx-control-statements/components";
 import dayjs from "dayjs";
 import type { ContextMenuOpts } from "../types/types";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../model";
+import { GlobalModel } from "../models";
 import { isBlank } from "../util/util";
 import { WorkspaceView } from "./workspace/workspaceview";
 import { PluginsView } from "./pluginsview/pluginsview";

src/app/bookmarks/bookmarks.tsx

@@ -8,7 +8,7 @@ import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
 import type { BookmarkType } from "../../types/types";
-import { Model } from "../../model";
+import { Model } from "../../models";
 import { CmdStrCode, Markdown } from "../common/elements";
 
 import { ReactComponent as XmarkIcon } from "../assets/icons/line/xmark.svg";

src/app/clientsettings/clientsettings.tsx

@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../model";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../models";
 import { Toggle, InlineSettingsTextEdit, SettingsError, Dropdown } from "../common/elements";
 import * as types from "../../types/types";
 import { commandRtnHandler, isBlank } from "../../util/util";

src/app/common/elements/markdown.tsx

@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
 import cn from "classnames";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 
 import "./markdown.less";
 

src/app/common/elements/resizablesidebar.tsx

@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner } from "../../../model";
+import { GlobalModel, GlobalCommandRunner } from "../../../models";
 import { MagicLayout } from "../../magiclayout";
 
 import "./resizablesidebar.less";

src/app/common/elements/showwaveshellinstallprompt.tsx

@@ -1,7 +1,7 @@
 // Copyright 2023, Command Line Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import * as appconst from "../../appconst";
 
 function ShowWaveShellInstallPrompt(callbackFn: () => void) {

src/app/common/modals/about.tsx

@@ -5,7 +5,7 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { Modal, LinkButton } from "../elements";
 import * as util from "../../../util/util";
 import * as appconst from "../../appconst";

src/app/common/modals/alert.tsx

@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
 import { Markdown, Modal, Button, Checkbox } from "../elements";
-import { GlobalModel, GlobalCommandRunner } from "../../../model";
+import { GlobalModel, GlobalCommandRunner } from "../../../models";
 
 import "./alert.less";
 

src/app/common/modals/clientstop.tsx

@@ -5,7 +5,7 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { Modal, Button } from "../elements";
 
 import "./clientstop.less";

src/app/common/modals/createremoteconn.tsx

@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If } from "tsx-control-statements/components";
-import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../models";
 import * as T from "../../../types/types";
 import {
     Modal,

src/app/common/modals/disconnected.tsx

@@ -5,7 +5,7 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { Modal, Button } from "../elements";
 
 import "./disconnected.less";

src/app/common/modals/editremoteconn.tsx

@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { If } from "tsx-control-statements/components";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../models";
 import * as T from "../../../types/types";
 import { Modal, TextField, InputDecoration, Dropdown, PasswordField, Tooltip } from "../elements";
 import * as util from "../../../util/util";

src/app/common/modals/linesettings.tsx

@@ -5,7 +5,7 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel, GlobalCommandRunner } from "../../../model";
+import { GlobalModel, GlobalCommandRunner } from "../../../models";
 import { SettingsError, Modal, Dropdown } from "../elements";
 import { LineType, RendererPluginType } from "../../../types/types";
 import { PluginModel } from "../../../plugins/plugins";

src/app/common/modals/provider.tsx

@@ -3,7 +3,7 @@
 
 import * as React from "react";
 import * as mobxReact from "mobx-react";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { TosModal } from "./tos";
 
 @mobxReact.observer

src/app/common/modals/screensettings.tsx

@@ -7,7 +7,7 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, Screen } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, Screen } from "../../../models";
 import { Toggle, InlineSettingsTextEdit, SettingsError, Modal, Dropdown, Tooltip } from "../elements";
 import { RemoteType } from "../../../types/types";
 import * as util from "../../../util/util";

src/app/common/modals/sessionsettings.tsx

@@ -5,7 +5,7 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel, GlobalCommandRunner, Session } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, Session } from "../../../models";
 import { Toggle, InlineSettingsTextEdit, SettingsError, Modal, Tooltip } from "../elements";
 import * as util from "../../../util/util";
 import { commandRtnHandler } from "../../../util/util";

src/app/common/modals/tabswitcher.tsx

@@ -7,10 +7,10 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner } from "../../../model";
+import { GlobalModel, GlobalCommandRunner } from "../../../models";
 import { Modal, TextField, InputDecoration, Tooltip } from "../elements";
 import * as util from "../../../util/util";
-import { Screen } from "../../../model";
+import { Screen } from "../../../models";
 import { ReactComponent as SquareIcon } from "../../assets/icons/tab/square.svg";
 
 import "./tabswitcher.less";

src/app/common/modals/tos.tsx

@@ -4,7 +4,7 @@
 import * as React from "react";
 import * as mobxReact from "mobx-react";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel, GlobalCommandRunner } from "../../../model";
+import { GlobalModel, GlobalCommandRunner } from "../../../models";
 import { Toggle, Modal, Button } from "../elements";
 import * as util from "../../../util/util";
 import { ClientDataType } from "../../../types/types";

src/app/common/modals/viewremoteconndetail.tsx

@@ -7,7 +7,7 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, RemotesModel } from "../../../models";
 import * as T from "../../../types/types";
 import { Modal, Tooltip, Button, Status } from "../elements";
 import * as util from "../../../util/util";

src/app/common/prompt/prompt.tsx

@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel, LineContainerModel } from "../../../model";
+import { GlobalModel, LineContainerModel } from "../../../models";
 import type { LineType, RemoteType, RemotePtrType, LineHeightChangeCallbackType } from "../../../types/types";
 import cn from "classnames";
 import { isBlank } from "../../../util/util";

src/app/connections/connections.tsx

@@ -7,7 +7,7 @@ import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
-import { GlobalModel, RemotesModel, GlobalCommandRunner } from "../../model";
+import { GlobalModel, RemotesModel, GlobalCommandRunner } from "../../models";
 import { Button, Status, ShowWaveShellInstallPrompt } from "../common/elements";
 import * as T from "../../types/types";
 import * as util from "../../util/util";

src/app/history/history.tsx

@@ -8,7 +8,7 @@ import { If, For } from "tsx-control-statements/components";
 import { sprintf } from "sprintf-js";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, Cmd } from "../../model";
+import { GlobalModel, GlobalCommandRunner, Cmd } from "../../models";
 import { HistoryItem, RemotePtrType, LineType, CmdDataType } from "../../types/types";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";

src/app/line/linecomps.tsx

@@ -9,7 +9,7 @@ import { boundMethod } from "autobind-decorator";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
 import { If } from "tsx-control-statements/components";
-import { GlobalModel, GlobalCommandRunner, Cmd } from "../../model";
+import { GlobalModel, GlobalCommandRunner, Cmd } from "../../models";
 import { termHeightFromRows } from "../../util/textmeasure";
 import type {
     LineType,

src/app/line/renderer/basicrenderer.tsx

@@ -25,7 +25,7 @@ import type {
 } from "../../../types/types";
 import { debounce } from "throttle-debounce";
 import * as util from "../../../util/util";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 
 type OV<V> = mobx.IObservableValue<V>;
 type CV<V> = mobx.IComputedValue<V>;

src/app/pluginsview/pluginsview.tsx

@@ -5,7 +5,7 @@ import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
-import { GlobalModel } from "../../model";
+import { GlobalModel } from "../../models";
 import { PluginModel } from "../../plugins/plugins";
 import { Markdown } from "../common/elements";
 

src/app/sidebar/sidebar.tsx

@@ -17,7 +17,7 @@ import { ReactComponent as WorkspacesIcon } from "../assets/icons/workspaces.svg
 import { ReactComponent as SettingsIcon } from "../assets/icons/settings.svg";
 
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel, GlobalCommandRunner, Session } from "../../model";
+import { GlobalModel, GlobalCommandRunner, Session } from "../../models";
 import { isBlank, openLink } from "../../util/util";
 import { ResizableSidebar } from "../common/elements";
 import * as appconst from "../appconst";

src/app/workspace/cmdinput/aichat.tsx

@@ -4,7 +4,7 @@
 import * as React from "react";
 import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { isBlank } from "../../../util/util";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";

src/app/workspace/cmdinput/cmdinput.tsx

@@ -10,7 +10,7 @@ import cn from "classnames";
 import dayjs from "dayjs";
 import type { RemoteType, RemoteInstanceType, RemotePtrType } from "../../../types/types";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel, GlobalCommandRunner, Screen } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, Screen } from "../../../models";
 import { renderCmdText } from "../../common/elements";
 import { TextAreaInput } from "./textareainput";
 import { InfoMsg } from "./infomsg";

src/app/workspace/cmdinput/historyinfo.tsx

@@ -11,7 +11,7 @@ import cn from "classnames";
 import dayjs from "dayjs";
 import type { HistoryItem, HistoryQueryOpts } from "../../../types/types";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { isBlank } from "../../../util/util";
 
 dayjs.extend(localizedFormat);

src/app/workspace/cmdinput/infomsg.tsx

@@ -7,7 +7,7 @@ import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../../../model";
+import { GlobalModel } from "../../../models";
 import { makeExternLink } from "../../../util/util";
 
 dayjs.extend(localizedFormat);

src/app/workspace/cmdinput/textareainput.tsx

@@ -9,7 +9,7 @@ import * as util from "../../../util/util";
 import { If } from "tsx-control-statements/components";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, Screen } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, Screen } from "../../../models";
 import { getMonoFontSize } from "../../../util/textmeasure";
 import { isModKeyPress, hasNoModifiers } from "../../../util/util";
 import * as appconst from "../../appconst";

src/app/workspace/screen/screenview.tsx

@@ -10,7 +10,7 @@ import { If, For } from "tsx-control-statements/components";
 import cn from "classnames";
 import { debounce } from "throttle-debounce";
 import dayjs from "dayjs";
-import { GlobalCommandRunner, ForwardLineContainer, GlobalModel, ScreenLines, Screen, Session } from "../../../model";
+import { GlobalCommandRunner, ForwardLineContainer, GlobalModel, ScreenLines, Screen, Session } from "../../../models";
 import type { LineType, RenderModeType, LineFactoryProps } from "../../../types/types";
 import * as T from "../../../types/types";
 import localizedFormat from "dayjs/plugin/localizedFormat";

src/app/workspace/screen/tab.tsx

@@ -6,7 +6,7 @@ import * as mobxReact from "mobx-react";
 import * as mobx from "mobx";
 import { boundMethod } from "autobind-decorator";
 import cn from "classnames";
-import { GlobalModel, GlobalCommandRunner, Screen } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, Screen } from "../../../models";
 import { ActionsIcon, StatusIndicator, CenteredIcon } from "../../common/icons/icons";
 import { renderCmdText } from "../../common/elements";
 import { ReactComponent as SquareIcon } from "../../assets/icons/tab/square.svg";

src/app/workspace/screen/tabs.tsx

@@ -7,7 +7,7 @@ import * as mobx from "mobx";
 import { sprintf } from "sprintf-js";
 import { boundMethod } from "autobind-decorator";
 import { For } from "tsx-control-statements/components";
-import { GlobalModel, GlobalCommandRunner, Session, Screen } from "../../../model";
+import { GlobalModel, GlobalCommandRunner, Session, Screen } from "../../../models";
 import { ReactComponent as AddIcon } from "../../assets/icons/add.svg";
 import { Reorder } from "framer-motion";
 import { ScreenTab } from "./tab";

src/app/workspace/workspaceview.tsx

@@ -7,7 +7,7 @@ import * as mobx from "mobx";
 import cn from "classnames";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
-import { GlobalModel } from "../../model";
+import { GlobalModel } from "../../models";
 import { CmdInput } from "./cmdinput/cmdinput";
 import { ScreenView } from "./screen/screenview";
 import { ScreenTabs } from "./screen/tabs";

src/plugins/code/code.tsx

@@ -6,7 +6,7 @@ import * as T from "../../types/types";
 import Editor, { Monaco } from "@monaco-editor/react";
 import type * as MonacoTypes from "monaco-editor/esm/vs/editor/editor.api";
 import { Markdown } from "../../app/common/elements";
-import { GlobalModel, GlobalCommandRunner } from "../../model";
+import { GlobalModel, GlobalCommandRunner } from "../../models";
 import Split from "react-split-it";
 import loader from "@monaco-editor/loader";
 loader.config({ paths: { vs: "./node_modules/monaco-editor/min/vs" } });

src/plugins/core/basicrenderer.tsx

@@ -20,7 +20,7 @@ import type {
 import * as T from "../../types/types";
 import { debounce, throttle } from "throttle-debounce";
 import * as util from "../../util/util";
-import { GlobalModel } from "../../model";
+import { GlobalModel } from "../../models";
 
 type OV<V> = mobx.IObservableValue<V>;
 type CV<V> = mobx.IComputedValue<V>;

src/plugins/csv/csv.tsx

@@ -4,7 +4,7 @@
 import React, { FC, useEffect, useState, useRef, useMemo } from "react";
 import { RendererContext, RendererOpts, LineStateType, RendererModelContainerApi } from "../../types/types";
 import * as T from "../../types/types";
-import { GlobalModel } from "../../model";
+import { GlobalModel } from "../../models";
 import Papa from "papaparse";
 import {
     createColumnHelper,

src/plugins/mustache/mustache.tsx

@@ -9,7 +9,7 @@ import * as T from "../../types/types";
 import { isBlank } from "../../util/util";
 import mustache from "mustache";
 import * as DOMPurify from "dompurify";
-import { GlobalModel } from "../../model";
+import { GlobalModel } from "../../models";
 
 import "./mustache.less";
 

src/plugins/terminal/term.ts

@@ -9,8 +9,8 @@ import { sprintf } from "sprintf-js";
 import { boundMethod } from "autobind-decorator";
 import { windowWidthToCols, windowHeightToRows } from "../../util/textmeasure";
 import { boundInt } from "../../util/util";
-import { GlobalModel } from "../../model";
-import { Model } from "../../model/model";
+import { GlobalModel } from "../../models";
+import { Model } from "../../models/model";
 import type {
     TermContextUnion,
     TermOptsType,

src/plugins/terminal/terminal.tsx

@@ -8,7 +8,7 @@ import { boundMethod } from "autobind-decorator";
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
 import { If } from "tsx-control-statements/components";
-import { GlobalModel, LineContainerModel } from "../../model";
+import { GlobalModel, LineContainerModel } from "../../models";
 import { termHeightFromRows } from "../../util/textmeasure";
 import type { LineType } from "../../types/types";
 import cn from "classnames";

src/types/types.ts

@@ -4,7 +4,7 @@
 import * as React from "react";
 import * as mobx from "mobx";
 import { TermWrap } from "../plugins/terminal/term";
-import { Cmd, Model } from "../model";
+import { Cmd, Model } from "../models";
 
 type ShareModeType = "local" | "web";
 type FocusTypeStrs = "input" | "cmd";

src/util/modelutil.ts

@@ -1,5 +1,5 @@
 import { sprintf } from "sprintf-js";
-import { Model } from "../model/model";
+import { Model } from "../models/model";
 import {
     SessionDataType,
     LineType,