terrier-engine 4.6.2 → 4.7.3

package/data-dive/dd-session.ts

@@ -1,7 +1,7 @@
 import {DdUser} from "./dd-user"
 import Api from "../terrier/api"
 import {DdDiveGroup} from "./gen/models"
-import {arrays} from "tuff-core";
+import Arrays from "tuff-core/arrays"
 import {SelectOptions} from "tuff-core/forms"
 import {Logger} from "tuff-core/logging"
 
@@ -76,7 +76,7 @@ export default class DdSession {
     }
 
     groupsInOrder(): DdDiveGroup[] {
-        return arrays.sortBy(Object.values(this.data.groupMap), 'name')
+        return Arrays.sortBy(Object.values(this.data.groupMap), 'name')
     }
 
     groupOptions(): SelectOptions {

package/data-dive/dives/dive-editor.ts

@@ -5,7 +5,6 @@ import {Query, QueryModelPicker} from "../queries/queries"
 import QueryEditor from "../queries/query-editor"
 import {Logger} from "tuff-core/logging"
 import QueryForm from "../queries/query-form"
-import {arrays, messages} from "tuff-core"
 import {TabContainerPart} from "../../terrier/tabs"
 import PagePart from "../../terrier/parts/page-part"
 import ContentPart from "../../terrier/parts/content-part"
@@ -15,7 +14,9 @@ import Ids from "../../terrier/ids"
 import Db from "../dd-db"
 import DdSession from "../dd-session"
 import {DiveRunModal} from "./dive-runs"
-import Nav from "tuff-core/nav";
+import Nav from "tuff-core/nav"
+import Messages from "tuff-core/messages"
+import Arrays from "tuff-core/arrays"
 
 const log = new Logger("DiveEditor")
 
@@ -34,9 +35,9 @@ export default class DiveEditor extends ContentPart<DiveEditorState> {
 
     tabs!: TabContainerPart
 
-    newQueryKey = messages.untypedKey()
+    newQueryKey = Messages.untypedKey()
 
-    static readonly diveChangedKey = messages.untypedKey()
+    static readonly diveChangedKey = Messages.untypedKey()
 
     queries = new Array<Query>()
 
@@ -88,7 +89,7 @@ export default class DiveEditor extends ContentPart<DiveEditorState> {
 
     deleteQuery(id: string) {
         log.info(`Deleting query ${id}`)
-        if (arrays.deleteIf(this.queries, q => q.id == id) > 0) {
+        if (Arrays.deleteIf(this.queries, q => q.id == id) > 0) {
             this.tabs.removeTab(id)
             this.dirty()
         }
@@ -102,7 +103,7 @@ export default class DiveEditor extends ContentPart<DiveEditorState> {
         parent.part(this.tabs)
     }
 
-    static readonly deleteQueryKey = messages.typedKey<{ id: string }>()
+    static readonly deleteQueryKey = Messages.typedKey<{ id: string }>()
 
     async serialize(): Promise<DdDive> {
         const queries = this.queries
@@ -117,10 +118,10 @@ export class DiveEditorPage extends PagePart<{id: string}> {
     editor!: DiveEditor
     session!: DdSession
 
-    showHintsKey = messages.untypedKey()
-    saveKey = messages.untypedKey()
-    discardKey = messages.untypedKey()
-    runKey = messages.untypedKey()
+    showHintsKey = Messages.untypedKey()
+    saveKey = Messages.untypedKey()
+    discardKey = Messages.untypedKey()
+    runKey = Messages.untypedKey()
 
     async init() {
         log.info(`Loading dive ${this.state.id}`)
@@ -233,7 +234,7 @@ type NewQueryState = {
 
 class NewQueryModal extends ModalPart<NewQueryState> {
 
-    addKey = messages.untypedKey()
+    addKey = Messages.untypedKey()
     settingsForm!: QueryForm
     modelPicker!: QueryModelPicker
 

package/data-dive/dives/dive-list.ts

@@ -2,7 +2,6 @@ import {Logger} from "tuff-core/logging"
 import PagePart from "../../terrier/parts/page-part"
 import {PartTag} from "tuff-core/parts"
 import Schema, {SchemaDef} from "../../terrier/schema"
-import {arrays, messages} from "tuff-core"
 import {DdDive, DdDiveGroup, UnpersistedDdDive, UnpersistedDdDiveGroup} from "../gen/models"
 import Dives, {DiveListResult} from "./dives"
 import {GroupEditorModal} from "./group-editor"
@@ -11,6 +10,8 @@ import {IconName} from "../../terrier/theme"
 import {routes} from "../dd-routes"
 import {DiveSettingsModal} from "./dive-settings"
 import DdSession from "../dd-session"
+import Messages from "tuff-core/messages"
+import Arrays from "tuff-core/arrays"
 
 const log = new Logger("DiveList")
 
@@ -21,10 +22,10 @@ const log = new Logger("DiveList")
 
 export class DiveListPage extends PagePart<{}> {
 
-    newGroupKey = messages.untypedKey()
-    editGroupKey = messages.typedKey<{id: string}>()
-    newDiveKey = messages.typedKey<{group_id: string}>()
-    editDiveKey = messages.typedKey<{id: string}>()
+    newGroupKey = Messages.untypedKey()
+    editGroupKey = Messages.typedKey<{id: string}>()
+    newDiveKey = Messages.typedKey<{group_id: string}>()
+    editDiveKey = Messages.typedKey<{id: string}>()
 
     session!: DdSession
     result!: DiveListResult
@@ -104,16 +105,16 @@ export class DiveListPage extends PagePart<{}> {
         this.result = await Dives.list()
         log.info("Loading data dive list", this.result)
         this.groupMap = this.session.data.groupMap
-        this.diveMap = arrays.indexBy(this.result.dives, 'id')
+        this.diveMap = Arrays.indexBy(this.result.dives, 'id')
         this.dirty()
     }
 
     renderContent(parent: PartTag): void {
 
-        const groupedDives = arrays.groupBy(this.result.dives, 'dd_dive_group_id')
+        const groupedDives = Arrays.groupBy(this.result.dives, 'dd_dive_group_id')
 
         parent.div('.dd-group-grid', grid => {
-            const groups = arrays.sortBy(Object.values(this.groupMap), 'name')
+            const groups = Arrays.sortBy(Object.values(this.groupMap), 'name')
             for (const group of groups) {
                 this.renderGroupPanel(grid, group, groupedDives[group.id] || [])
             }
@@ -127,7 +128,7 @@ export class DiveListPage extends PagePart<{}> {
             .classes('group')
             .content(content => {
                 content.class('tt-list')
-                for (const dive of arrays.sortBy(dives, 'name')) {
+                for (const dive of Arrays.sortBy(dives, 'name')) {
                     this.renderDiveRow(content, dive)
                 }
             })

package/data-dive/dives/dive-runs.ts

@@ -5,7 +5,6 @@ import Db from "../dd-db"
 import Api, {ErrorEvent} from "../../terrier/api"
 import {Query} from "../queries/queries"
 import {DivTag, HtmlParentTag} from "tuff-core/html"
-import {messages} from "tuff-core"
 import {IconName} from "../../terrier/theme"
 import Filters, {DateRangeFilter, DirectFilter, FilterInput, InclusionFilter} from "../queries/filters"
 import Dives from "./dives"
@@ -17,6 +16,7 @@ import Dates, {DateLiteral, DatePeriodPickerPart, DatePeriodPickerState, Literal
 import dayjs from "dayjs"
 import {ProgressBarPart} from "../../terrier/progress";
 import {LogListPart} from "../../terrier/logging";
+import Messages from "tuff-core/messages"
 
 const log = new Logger("DiveRuns")
 
@@ -55,8 +55,8 @@ export class DiveRunModal extends ModalPart<{dive: DdDive }> {
     progressBar!: ProgressBarPart
     logList!: LogListPart
 
-    startKey = messages.untypedKey()
-    pickDateKey = messages.typedKey<{ input_key: string }>()
+    startKey = Messages.untypedKey()
+    pickDateKey = Messages.typedKey<{ input_key: string }>()
 
     async init() {
         this.setTitle("Run Dive")

package/data-dive/dives/dive-settings.ts

@@ -1,6 +1,5 @@
 import TerrierPart from "../../terrier/parts/terrier-part"
 import {Logger} from "tuff-core/logging"
-import {messages} from "tuff-core"
 import {PartTag} from "tuff-core/parts"
 import {DdDive, DdDiveEnumFields, UnpersistedDdDive} from "../gen/models"
 import inflection from "inflection"
@@ -15,6 +14,7 @@ import {DbErrors} from "../../terrier/db-client"
 import {TerrierFormFields} from "../../terrier/forms"
 import DdSession from "../dd-session"
 import Dives from "./dives";
+import Messages from "tuff-core/messages"
 
 const log = new Logger("DiveForm")
 
@@ -39,7 +39,7 @@ class DiveForm extends TerrierPart<{dive: DiveSettings, session: DdSession}> {
         }, {attach: 'passive'})
     }
 
-    static readonly settingsChangedKey = messages.typedKey<DiveSettings>()
+    static readonly settingsChangedKey = Messages.typedKey<DiveSettings>()
 
 
     get parentClasses(): Array<string> {
@@ -109,8 +109,8 @@ export class DiveSettingsModal extends ModalPart<DiveSettingsState> {
 
     settingsForm!: DiveForm
     modelPicker!: QueryModelPicker
-    saveKey = messages.untypedKey()
-    deleteKey = messages.untypedKey()
+    saveKey = Messages.untypedKey()
+    deleteKey = Messages.untypedKey()
     isNew = true
 
     async init() {

package/data-dive/dives/group-editor.ts

@@ -3,12 +3,12 @@ import TerrierPart from "../../terrier/parts/terrier-part"
 import {DdDiveGroup, UnpersistedDdDiveGroup} from "../gen/models"
 import Db from "../dd-db"
 import {PartTag} from "tuff-core/parts"
-import {messages} from "tuff-core"
 import {DbErrors} from "../../terrier/db-client"
 import DdSession from "../dd-session"
 import Nav from "tuff-core/nav"
 import {routes} from "../dd-routes"
 import {TerrierFormFields} from "../../terrier/forms"
+import Messages from "tuff-core/messages"
 
 class GroupForm extends TerrierPart<{ group: UnpersistedDdDiveGroup }> {
 
@@ -66,8 +66,8 @@ export type GroupModalState = {
 export class GroupEditorModal extends ModalPart<GroupModalState> {
 
     form!: GroupForm
-    saveKey = messages.untypedKey()
-    deleteKey = messages.untypedKey()
+    saveKey = Messages.untypedKey()
+    deleteKey = Messages.untypedKey()
 
     async init() {
         const group = this.state.group

package/data-dive/queries/columns.ts

@@ -4,12 +4,13 @@ import {TableRef, TableView} from "./tables"
 import {Logger} from "tuff-core/logging"
 import {FormFields, SelectOptions} from "tuff-core/forms"
 import Forms from "../../terrier/forms"
-import {arrays, messages} from "tuff-core"
 import Objects from "tuff-core/objects"
 import {ModalPart} from "../../terrier/modals";
 import TerrierFormPart from "../../terrier/parts/terrier-form-part"
 import {Dropdown} from "../../terrier/dropdowns"
 import DiveEditor from "../dives/dive-editor"
+import Messages from "tuff-core/messages"
+import Arrays from "tuff-core/arrays"
 
 const log = new Logger("Columns")
 
@@ -90,10 +91,10 @@ export type ColumnsEditorState = {
     tableView: TableView<TableRef>
 }
 
-const saveKey = messages.untypedKey()
-const addKey = messages.untypedKey()
-const addSingleKey = messages.typedKey<{ name: string }>()
-const removeKey = messages.typedKey<{id: string}>()
+const saveKey = Messages.untypedKey()
+const addKey = Messages.untypedKey()
+const addSingleKey = Messages.typedKey<{ name: string }>()
+const removeKey = Messages.typedKey<{id: string}>()
 
 /**
  * A modal that lets the user edit the columns being referenced for a particular table.
@@ -235,9 +236,9 @@ export class ColumnsEditorModal extends ModalPart<ColumnsEditorState> {
     }
 
     removeColumn(id: string) {
-        const col = arrays.find(this.columnStates, c => c.id == id)
+        const col = Arrays.find(this.columnStates, c => c.id == id)
         if (col) {
-            this.columnStates = arrays.without(this.columnStates, col)
+            this.columnStates = Arrays.without(this.columnStates, col)
             this.updateColumnEditors()
         }
     }
@@ -315,9 +316,9 @@ class ColumnEditor extends TerrierFormPart<ColumnState> {
 // Add Column Dropdown
 ////////////////////////////////////////////////////////////////////////////////
 
-const checkAllKey = messages.untypedKey()
-const applySelectionKey = messages.untypedKey()
-const checkChangedKey = messages.typedKey<{column: string}>()
+const checkAllKey = Messages.untypedKey()
+const applySelectionKey = Messages.untypedKey()
+const checkChangedKey = Messages.typedKey<{column: string}>()
 
 type SelectColumnsCallback = (columns: string[]) => any
 

package/data-dive/queries/dates.ts

@@ -2,8 +2,8 @@ import inflection from "inflection"
 import dayjs from "dayjs"
 import {Dropdown} from "../../terrier/dropdowns"
 import {PartTag} from "tuff-core/parts"
-import {messages} from "tuff-core"
 import {Logger} from "tuff-core/logging"
+import Messages from "tuff-core/messages"
 
 const log = new Logger("Dates")
 
@@ -211,7 +211,7 @@ export type DatePeriodPickerState = {
  */
 export class DatePeriodPickerPart extends Dropdown<DatePeriodPickerState> {
 
-    periodKey = messages.typedKey<{period: string}>()
+    periodKey = Messages.typedKey<{period: string}>()
 
     async init() {
         await super.init()

package/data-dive/queries/filters.ts

@@ -2,16 +2,17 @@ import {Part, PartTag} from "tuff-core/parts"
 import Dates, {DateLiteral, VirtualDatePeriod, VirtualDateRange} from "./dates"
 import {ColumnDef, ModelDef, SchemaDef} from "../../terrier/schema"
 import {TableRef, TableView} from "./tables"
-import {arrays, messages} from "tuff-core"
 import {Logger} from "tuff-core/logging"
 import Objects from "tuff-core/objects"
 import inflection from "inflection"
-import {ModalPart} from "../../terrier/modals";
+import {ModalPart} from "../../terrier/modals"
 import TerrierFormPart from "../../terrier/parts/terrier-form-part"
 import {Dropdown} from "../../terrier/dropdowns"
 import dayjs from "dayjs"
 import Format from "../../terrier/format"
 import DiveEditor from "../dives/dive-editor"
+import Messages from "tuff-core/messages"
+import Arrays from "tuff-core/arrays"
 
 const log = new Logger("Filters")
 
@@ -125,9 +126,9 @@ export type FiltersEditorState = {
     tableView: TableView<TableRef>
 }
 
-const saveKey = messages.untypedKey()
-const addKey = messages.untypedKey()
-const removeKey = messages.typedKey<{ id: string }>()
+const saveKey = Messages.untypedKey()
+const addKey = Messages.untypedKey()
+const removeKey = Messages.typedKey<{ id: string }>()
 
 export class FiltersEditorModal extends ModalPart<FiltersEditorState> {
 
@@ -202,10 +203,10 @@ export class FiltersEditorModal extends ModalPart<FiltersEditorState> {
     }
 
     removeFilter(id: string) {
-        const filter = arrays.find(this.filterStates, f => f.id == id)
+        const filter = Arrays.find(this.filterStates, f => f.id == id)
         if (filter) {
             log.info(`Removing filter ${id}`, filter)
-            this.filterStates = arrays.without(this.filterStates, filter)
+            this.filterStates = Arrays.without(this.filterStates, filter)
             this.updateFilterEditors()
         }
     }
@@ -336,7 +337,7 @@ class FilterEditorContainer extends Part<FilterState> {
 
 class DirectFilterEditor extends FilterEditor<DirectFilter> {
 
-    numericChangeKey = messages.untypedKey()
+    numericChangeKey = Messages.untypedKey()
 
     async init() {
         await super.init()
@@ -399,7 +400,7 @@ class DirectFilterEditor extends FilterEditor<DirectFilter> {
 // Inclusion Editor
 ////////////////////////////////////////////////////////////////////////////////
 
-const inclusionChangedKey = messages.typedKey<{value: string}>()
+const inclusionChangedKey = Messages.typedKey<{value: string}>()
 
 class InclusionFilterEditor extends FilterEditor<InclusionFilter> {
 
@@ -456,9 +457,9 @@ class InclusionFilterEditor extends FilterEditor<InclusionFilter> {
 // Date Range Editor
 ////////////////////////////////////////////////////////////////////////////////
 
-const dateRangeRelativeChangedKey = messages.untypedKey()
-const dateRangePeriodChangedKey = messages.typedKey<{period: string}>()
-const dateRangePreselectKey = messages.typedKey<VirtualDateRange>()
+const dateRangeRelativeChangedKey = Messages.untypedKey()
+const dateRangePeriodChangedKey = Messages.typedKey<{period: string}>()
+const dateRangePreselectKey = Messages.typedKey<VirtualDateRange>()
 
 class DateRangeFilterEditor extends FilterEditor<DateRangeFilter> {
 
@@ -550,7 +551,7 @@ class DateRangeFilterEditor extends FilterEditor<DateRangeFilter> {
 
 type AddFilterCallback = (filter: Filter) => any
 
-const columnSelectedKey = messages.typedKey<{column: string}>()
+const columnSelectedKey = Messages.typedKey<{column: string}>()
 
 class AddFilterDropdown extends Dropdown<{modelDef: ModelDef, callback: AddFilterCallback}> {
     columns!: ColumnDef[]
@@ -562,7 +563,7 @@ class AddFilterDropdown extends Dropdown<{modelDef: ModelDef, callback: AddFilte
     async init() {
         await super.init()
 
-        this.columns = arrays.sortByFunction(Object.values(this.state.modelDef.columns), col => {
+        this.columns = Arrays.sortByFunction(Object.values(this.state.modelDef.columns), col => {
             const visibility = col.metadata?.visibility
             const sort = visibility == 'common' ? '0' : '1'
             return `${sort}${col.name}`

package/data-dive/queries/queries.ts

@@ -6,9 +6,11 @@ import dayjs from "dayjs"
 import QueryEditor from "./query-editor"
 import TerrierPart from "../../terrier/parts/terrier-part"
 import Schema, {ModelDef, SchemaDef} from "../../terrier/schema"
-import {arrays, messages, strings} from "tuff-core"
 import {Logger} from "tuff-core/logging"
-import inflection from "inflection";
+import inflection from "inflection"
+import Messages from "tuff-core/messages"
+import Strings from "tuff-core/strings"
+import Arrays from "tuff-core/arrays"
 
 const log = new Logger("Queries")
 
@@ -184,7 +186,7 @@ export type QueryModelPickerState = {
  */
 export class QueryModelPicker extends TerrierPart<QueryModelPickerState> {
 
-    pickedKey = messages.typedKey<{ model: string }>()
+    pickedKey = Messages.typedKey<{ model: string }>()
     model?: ModelDef
 
     async init() {
@@ -205,7 +207,7 @@ export class QueryModelPicker extends TerrierPart<QueryModelPickerState> {
             label.input({type: 'radio', name: `new-query-model-${this.id}`, value: model.name})
                 .emitChange(this.pickedKey, {model: model.name})
             label.div(col => {
-                const name = inflection.pluralize(strings.titleize(model.name))
+                const name = inflection.pluralize(Strings.titleize(model.name))
                 col.div('.name').text(name)
                 if (model.metadata?.description) {
                     col.div('.description').text(model.metadata.description)
@@ -228,7 +230,7 @@ export class QueryModelPicker extends TerrierPart<QueryModelPickerState> {
                         h3.i('.glyp-refresh')
                         h3.span().text("Common Tables")
                     })
-                    for (const model of arrays.sortBy(commonModels, 'name')) {
+                    for (const model of Arrays.sortBy(commonModels, 'name')) {
                         this.renderModelOption(col, model)
                     }
                 }
@@ -241,7 +243,7 @@ export class QueryModelPicker extends TerrierPart<QueryModelPickerState> {
                         h3.i('.glyp-pending')
                         h3.span().text("Other Tables")
                     })
-                    for (const model of arrays.sortBy(uncommonModels, 'name')) {
+                    for (const model of Arrays.sortBy(uncommonModels, 'name')) {
                         this.renderModelOption(col, model)
                     }
                 }

package/data-dive/queries/query-editor.ts

@@ -5,10 +5,10 @@ import {Logger} from "tuff-core/logging"
 import QueryForm, {QuerySettings, QuerySettingsColumns} from "./query-form"
 import DiveEditor, {DiveEditorState} from "../dives/dive-editor"
 import Objects from "tuff-core/objects"
-import {messages} from "tuff-core"
 import Html from "tuff-core/html"
 import ContentPart from "../../terrier/parts/content-part"
 import {TabContainerPart} from "../../terrier/tabs"
+import Messages from "tuff-core/messages"
 
 const log = new Logger("QueryEditor")
 
@@ -17,7 +17,7 @@ const log = new Logger("QueryEditor")
 // Keys
 ////////////////////////////////////////////////////////////////////////////////
 
-const validationKey = messages.typedKey<QueryValidation>()
+const validationKey = Messages.typedKey<QueryValidation>()
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -157,7 +157,7 @@ export default class QueryEditor extends ContentPart<QueryEditorState> {
     sqlPart!: SqlPart
     previewPart!: PreviewPart
 
-    updatePreviewKey = messages.untypedKey()
+    updatePreviewKey = Messages.untypedKey()
 
     async init() {
         const query = this.state.query
@@ -231,5 +231,5 @@ export default class QueryEditor extends ContentPart<QueryEditorState> {
         this.tabs.showTab('preview')
     }
 
-    static readonly copyToClipboardKey = messages.typedKey<{ value: string }>()
+    static readonly copyToClipboardKey = Messages.typedKey<{ value: string }>()
 }

package/data-dive/queries/query-form.ts

@@ -2,8 +2,8 @@ import {Query} from "./queries"
 import {PartTag} from "tuff-core/parts"
 import {FormFields} from "tuff-core/forms"
 import {Logger} from "tuff-core/logging"
-import {messages} from "tuff-core"
-import ContentPart from "../../terrier/parts/content-part";
+import ContentPart from "../../terrier/parts/content-part"
+import Messages from "tuff-core/messages"
 
 const log = new Logger("QueryForm")
 
@@ -46,6 +46,6 @@ export default class QueryForm extends ContentPart<{ query: QuerySettings }> {
         })
     }
 
-    static readonly settingsChangedKey = messages.typedKey<QuerySettings>()
+    static readonly settingsChangedKey = Messages.typedKey<QuerySettings>()
 
 }

package/data-dive/queries/tables.ts

@@ -3,13 +3,14 @@ import Schema, {BelongsToDef, ModelDef, SchemaDef} from "../../terrier/schema"
 import inflection from "inflection"
 import Filters, {Filter, FilterInput, FiltersEditorModal} from "./filters"
 import Columns, {ColumnRef, ColumnsEditorModal} from "./columns"
-import {arrays, messages} from "tuff-core"
 import {Logger} from "tuff-core/logging"
 import ContentPart from "../../terrier/parts/content-part"
 import {ActionsDropdown} from "../../terrier/dropdowns"
 import {ModalPart} from "../../terrier/modals"
 import TerrierFormPart from "../../terrier/parts/terrier-form-part"
-import DiveEditor from "../dives/dive-editor";
+import DiveEditor from "../dives/dive-editor"
+import Messages from "tuff-core/messages"
+import Arrays from "tuff-core/arrays"
 
 const log = new Logger("Tables")
 
@@ -35,7 +36,7 @@ export type JoinedTableRef = TableRef & {
 // Keys
 ////////////////////////////////////////////////////////////////////////////////
 
-const updatedKey = messages.typedKey<TableRef>()
+const updatedKey = Messages.typedKey<TableRef>()
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -75,11 +76,11 @@ export class TableView<T extends TableRef> extends ContentPart<{ schema: SchemaD
     modelDef!: ModelDef
     parentView?: TableView<any>
 
-    editTableKey = messages.untypedKey()
-    editColumnsKey = messages.untypedKey()
-    editFiltersKey = messages.untypedKey()
-    newJoinedKey = messages.untypedKey()
-    createJoinedKey = messages.typedKey<{name: string}>()
+    editTableKey = Messages.untypedKey()
+    editColumnsKey = Messages.untypedKey()
+    editFiltersKey = Messages.untypedKey()
+    newJoinedKey = Messages.untypedKey()
+    createJoinedKey = Messages.typedKey<{name: string}>()
 
     async init() {
         this.schema = this.state.schema
@@ -111,7 +112,7 @@ export class TableView<T extends TableRef> extends ContentPart<{ schema: SchemaD
 
             // show the common tables at the top
             let showingCommon = true
-            const actions = arrays.sortByFunction(newJoins, bt => {
+            const actions = Arrays.sortByFunction(newJoins, bt => {
                 const model = this.schema.models[bt.model]
                 const common = model.metadata?.visibility == 'common' ? '0' : '1'
                 return `${common}${bt.name}`
@@ -394,7 +395,7 @@ class JoinedTableEditorForm extends TerrierFormPart<JoinedTableRef> {
 class JoinedTableEditorModal extends ModalPart<JoinedTableEditorState> {
 
     form!: JoinedTableEditorForm
-    applyKey = messages.untypedKey()
+    applyKey = Messages.untypedKey()
 
     async init() {
         this.form = this.makePart(JoinedTableEditorForm, this.state.table)

package/package.json

@@ -4,7 +4,7 @@
   "files": [
     "*"
   ],
-  "version": "4.6.2",
+  "version": "4.7.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/Terrier-Tech/terrier-engine"

package/terrier/app.ts

@@ -1,4 +1,4 @@
-import { Logger } from "tuff-core/logging"
+import {Logger} from "tuff-core/logging"
 import {Part, PartConstructor, PartParent} from "tuff-core/parts"
 import TerrierPart from "./parts/terrier-part"
 import Tooltips from "./tooltips"
@@ -6,11 +6,12 @@ import Lightbox from "./lightbox"
 import Theme from "./theme"
 import {ModalPart, ModalStackPart} from "./modals"
 import {OverlayLayerType, OverlayPart} from "./overlays"
+import Messages from "tuff-core/messages"
 
 // @ts-ignore
 import logoUrl from './images/optimized/terrier-hub-logo-light.svg'
-import Sheets, {AlertSheetState, ConfirmSheetState, Sheet, SheetState} from "./sheets";
-import {messages} from "tuff-core";
+import Sheets, {AlertSheetState, ConfirmSheetState, Sheet, SheetState} from "./sheets"
+
 
 const log = new Logger('App')
 Logger.level = 'info'
@@ -103,7 +104,7 @@ export abstract class TerrierApp<TState> extends TerrierPart<TState> {
      * @param callback gets called if the user hits "Confirm"
      */
     confirm(options: ConfirmSheetState, callback: () => any) {
-        const key = messages.untypedKey()
+        const key = Messages.untypedKey()
         const state = {...options,
             primaryActions: [
                 {

package/terrier/dropdowns.ts

@@ -1,15 +1,15 @@
 import {Logger} from "tuff-core/logging"
-import {untypedKey} from "tuff-core/messages"
-import {unique} from "tuff-core/arrays"
+import Messages from "tuff-core/messages"
 import {PartTag, StatelessPart} from "tuff-core/parts"
 import Overlays from "./overlays"
 import TerrierPart from "./parts/terrier-part"
 import Objects from "tuff-core/objects"
 import {Action} from "./theme"
+import Arrays from "tuff-core/arrays"
 
 const log = new Logger('Dropdowns')
 
-const clearDropdownKey = untypedKey()
+const clearDropdownKey = Messages.untypedKey()
 
 /**
  * Abstract base class for dropdown parts.
@@ -109,7 +109,7 @@ export class ActionsDropdown extends Dropdown<Array<Action>> {
     renderContent(parent: PartTag) {
         // handle each key declared on the actions directly,
         // then clear the dropdown and re-emit them on the parent part
-        const keys = unique(this.state.map(action => action.click?.key).filter(Objects.notNull))
+        const keys = Arrays.unique(this.state.map(action => action.click?.key).filter(Objects.notNull))
         for (const key of keys) {
             this.onClick(key, m => {
                 this.clear()

package/terrier/forms.ts

@@ -1,13 +1,15 @@
 import {Field, FormFields, FormPartData, InputType, KeyOfType, SelectOptions} from "tuff-core/forms"
-import {logging, messages, strings} from "tuff-core"
 import {DbErrors} from "./db-client"
 import {PartTag} from "tuff-core/parts"
 import {InputTag, InputTagAttrs} from "tuff-core/html"
 import TerrierPart from "./parts/terrier-part"
 import GlypPicker from "./parts/glyp-picker"
 import Glyps from "./glyps"
+import Messages from "tuff-core/messages"
+import {Logger} from "tuff-core/logging"
+import Strings from "tuff-core/strings"
 
-const log = new logging.Logger("TerrierForms")
+const log = new Logger("TerrierForms")
 
 ////////////////////////////////////////////////////////////////////////////////
 // Options
@@ -19,7 +21,7 @@ const log = new logging.Logger("TerrierForms")
  */
 function titleizeOptions(opts: string[], blank?: string): SelectOptions {
     const out = opts.map(c => {
-        return {value: c, title: strings.titleize(c)}
+        return {value: c, title: Strings.titleize(c)}
     })
     if (blank != undefined) { // don't test length, allow it to be a blank string
         out.unshift({title: blank, value: ''})
@@ -39,7 +41,7 @@ export class TerrierFormFields<T extends FormPartData> extends FormFields<T> {
 
     errors?: DbErrors<T>
 
-    pickGlypKey = messages.typedKey<{ key: KeyOfType<T, string | undefined> & string }>()
+    pickGlypKey = Messages.typedKey<{ key: KeyOfType<T, string | undefined> & string }>()
 
     /**
      * You must pass a `TerrierPart` so that we can render the error bubble with it.

package/terrier/glyps.ts

@@ -1,6 +1,7 @@
 // This file was automatically generated by glyps:compile on 08/19/23  9:07 AM, DO NOT MANUALLY EDIT!
 
-import {strings} from "tuff-core"
+
+import Strings from "tuff-core/strings"
 
 const names = ['glyp-abacus', 'glyp-account', 'glyp-accounts_payable', 'glyp-accounts_receivable', 'glyp-action_log', 'glyp-activate', 'glyp-active', 'glyp-activity_high', 'glyp-activity_low', 'glyp-activity_medium', 'glyp-activity_none', 'glyp-address1', 'glyp-adjustment', 'glyp-admin', 'glyp-administration', 'glyp-air_freshener', 'glyp-alert', 'glyp-align_horizontal', 'glyp-align_vertical', 'glyp-anchor', 'glyp-announcement', 'glyp-app_update', 'glyp-append_selection', 'glyp-appointment', 'glyp-appointment_setup', 'glyp-archive', 'glyp-arrow_down', 'glyp-arrow_left', 'glyp-arrow_right', 'glyp-arrow_transfer', 'glyp-arrow_up', 'glyp-ascending', 'glyp-attachment', 'glyp-audit_analyzer', 'glyp-autopay', 'glyp-availability', 'glyp-background_batch', 'glyp-background_job', 'glyp-bait_for_demolition', 'glyp-bar_chart', 'glyp-barcode', 'glyp-bat_exclusion', 'glyp-bed_bug_fumigation', 'glyp-begin_service', 'glyp-belongs_to', 'glyp-billing', 'glyp-billing_office', 'glyp-billing_terms', 'glyp-billto', 'glyp-bioremediation', 'glyp-bird_exclusion', 'glyp-black_light', 'glyp-branch', 'glyp-branch_bats', 'glyp-branch_birds', 'glyp-branch_general', 'glyp-branch_irrigation', 'glyp-branch_landscape', 'glyp-branch_multi_housing', 'glyp-branch_office', 'glyp-branch_orders', 'glyp-branch_residential', 'glyp-branch_sales', 'glyp-branch_termites', 'glyp-branch_weeds', 'glyp-branch_wildlife', 'glyp-build', 'glyp-calculate', 'glyp-calendar', 'glyp-calendar_branch', 'glyp-calendar_map', 'glyp-calendar_rolling', 'glyp-calendar_share', 'glyp-calendar_snap', 'glyp-california', 'glyp-call', 'glyp-callback', 'glyp-camera', 'glyp-cancellation', 'glyp-cancelled', 'glyp-card_american_express', 'glyp-card_discover', 'glyp-card_mastercard', 'glyp-card_visa', 'glyp-catalog', 'glyp-caught', 'glyp-cert', 'glyp-check_all', 'glyp-check_in', 'glyp-check_in_service', 'glyp-checked', 'glyp-checked_empty', 'glyp-checkmark', 'glyp-checkmark_filled', 'glyp-checkout', 'glyp-chemical', 'glyp-chemical_authorization', 'glyp-chemical_backpack_sprayer', 'glyp-chemical_biological_controls', 'glyp-chemical_disinfectant', 'glyp-chemical_fertilizer', 'glyp-chemical_flying_insect_bait', 'glyp-chemical_fumigants', 'glyp-chemical_insect_aerosol', 'glyp-chemical_insect_bait', 'glyp-chemical_insect_dust', 'glyp-chemical_insect_granules', 'glyp-chemical_insect_spray', 'glyp-chemical_label', 'glyp-chemical_mole_bait', 'glyp-chemical_pest_bird_control', 'glyp-chemical_pheromone_products', 'glyp-chemical_power_sprayer', 'glyp-chemical_rodenticide_block', 'glyp-chemical_rodenticide_non_block', 'glyp-chemical_sds', 'glyp-chemical_tree_products', 'glyp-chemical_weed_control', 'glyp-chemical_wildlife_repellents', 'glyp-chemical_wildlife_toxicants', 'glyp-chevron_down', 'glyp-chevron_left', 'glyp-chevron_right', 'glyp-chevron_up', 'glyp-city', 'glyp-click', 'glyp-client_actions', 'glyp-client_pest_sightings', 'glyp-client_required', 'glyp-close', 'glyp-cloud', 'glyp-clypboard', 'glyp-clypedia', 'glyp-clypmart', 'glyp-code', 'glyp-code_details', 'glyp-collections', 'glyp-columns', 'glyp-comment', 'glyp-comment_filled', 'glyp-commission_origin', 'glyp-commissions', 'glyp-company_setup', 'glyp-compass', 'glyp-complete', 'glyp-complete_certificate', 'glyp-complete_enrollment', 'glyp-condition_appliance_machinery', 'glyp-condition_customer', 'glyp-condition_device', 'glyp-condition_door_window', 'glyp-condition_dumpster', 'glyp-condition_entry_point', 'glyp-condition_evidence', 'glyp-condition_exclusion', 'glyp-condition_exterior', 'glyp-condition_interior', 'glyp-condition_plumbing', 'glyp-condition_prep_storage', 'glyp-condition_rodent_evidence', 'glyp-condition_rodent_exclusion', 'glyp-condition_roof_ceiling', 'glyp-condition_structure', 'glyp-condition_supplies', 'glyp-condition_termites', 'glyp-condition_ventilation', 'glyp-condition_wall_floor', 'glyp-condition_wildlife', 'glyp-conditions', 'glyp-consolidate', 'glyp-construction', 'glyp-contract', 'glyp-contract_cancellation', 'glyp-contract_overview', 'glyp-conversation', 'glyp-copesan', 'glyp-copy', 'glyp-credit_memo', 'glyp-credit_non_revenue', 'glyp-credit_production', 'glyp-credit_prospect', 'glyp-credit_sales_bonus', 'glyp-crew', 'glyp-cumulative', 'glyp-cursor', 'glyp-custom_form', 'glyp-customer', 'glyp-customer_service', 'glyp-dashboard', 'glyp-data_dive', 'glyp-data_dive_query', 'glyp-data_dives', 'glyp-database', 'glyp-dead_animal_removal', 'glyp-default', 'glyp-delete', 'glyp-demo_mode', 'glyp-descending', 'glyp-design', 'glyp-desktop', 'glyp-detail_report', 'glyp-developer', 'glyp-device', 'glyp-device_sync', 'glyp-differential', 'glyp-disable', 'glyp-disabled_filled', 'glyp-distribute_horizontal', 'glyp-distribute_vertical', 'glyp-division', 'glyp-document', 'glyp-documentation', 'glyp-documents', 'glyp-download', 'glyp-driving', 'glyp-duplicate', 'glyp-duplicate_location', 'glyp-duration', 'glyp-edit', 'glyp-email', 'glyp-employment', 'glyp-entertainment_public_venues', 'glyp-equipment_bear_trap', 'glyp-equipment_flying_insect_bait_station', 'glyp-equipment_flying_insect_light_trap', 'glyp-equipment_insect_monitor', 'glyp-equipment_lethal_animal_trap', 'glyp-equipment_live_animal_trap', 'glyp-equipment_live_rodent_trap', 'glyp-equipment_maintenance', 'glyp-equipment_map_viewer', 'glyp-equipment_maps', 'glyp-equipment_mosquito_trap', 'glyp-equipment_other', 'glyp-equipment_pheromone_trap', 'glyp-equipment_pick_up', 'glyp-equipment_rodent_bait', 'glyp-equipment_rodent_trap', 'glyp-equipment_termite_bait_station', 'glyp-equipment_termite_monitor', 'glyp-exclusion', 'glyp-expand', 'glyp-expired', 'glyp-expiring', 'glyp-exterior', 'glyp-extras', 'glyp-facebook', 'glyp-farm', 'glyp-farm_grain_seed', 'glyp-fast_and_frequent', 'glyp-favorite', 'glyp-feedback', 'glyp-field_guide', 'glyp-field_training', 'glyp-file_blank', 'glyp-file_html', 'glyp-file_image', 'glyp-file_pdf', 'glyp-file_printable', 'glyp-file_spreadsheet', 'glyp-file_text', 'glyp-filter', 'glyp-finance', 'glyp-finding', 'glyp-folder', 'glyp-followup', 'glyp-food_bev_pharma', 'glyp-formula', 'glyp-fuel', 'glyp-fumigation', 'glyp-function', 'glyp-function_aggregate', 'glyp-function_time', 'glyp-gain_loss', 'glyp-generate_invoices', 'glyp-generate_orders', 'glyp-geo', 'glyp-geo_heat_map', 'glyp-google', 'glyp-google_calendar', 'glyp-government', 'glyp-grain_seed', 'glyp-grid', 'glyp-grouped', 'glyp-grouping_combine', 'glyp-grouping_separate', 'glyp-has_many', 'glyp-health_care', 'glyp-heat_map', 'glyp-heat_treatment', 'glyp-help', 'glyp-hidden', 'glyp-hint', 'glyp-honeybee_removal', 'glyp-housing', 'glyp-in_progress', 'glyp-inbox', 'glyp-incomplete_certificate', 'glyp-industrial', 'glyp-info', 'glyp-information_technology', 'glyp-inspect_map', 'glyp-inspections', 'glyp-insulation', 'glyp-interior', 'glyp-invoice', 'glyp-invoice_review', 'glyp-irrigation_install', 'glyp-irrigation_maintenance', 'glyp-items', 'glyp-job', 'glyp-join', 'glyp-join_inner', 'glyp-join_left', 'glyp-justice', 'glyp-k9_inspection', 'glyp-key', 'glyp-label_bottom', 'glyp-label_left', 'glyp-label_right', 'glyp-label_top', 'glyp-labor', 'glyp-landscape', 'glyp-landscape_maintenance', 'glyp-laptop', 'glyp-lead', 'glyp-lead_listing', 'glyp-lead_source', 'glyp-leads_report', 'glyp-learning_hub', 'glyp-ledger', 'glyp-legal', 'glyp-license', 'glyp-lifetime', 'glyp-line_cap_arrow', 'glyp-line_cap_bar', 'glyp-line_cap_circle', 'glyp-line_cap_none', 'glyp-line_caps', 'glyp-line_style', 'glyp-link', 'glyp-location', 'glyp-location_charge', 'glyp-location_credit', 'glyp-location_kind', 'glyp-location_message', 'glyp-location_origin', 'glyp-location_tags', 'glyp-locations', 'glyp-locked', 'glyp-lodging', 'glyp-log_in', 'glyp-log_out', 'glyp-log_report', 'glyp-logbook', 'glyp-logbook_documents', 'glyp-lot_number', 'glyp-manager', 'glyp-map', 'glyp-markdown', 'glyp-market', 'glyp-materials', 'glyp-mattress_encasement', 'glyp-merge', 'glyp-message_billing', 'glyp-message_collections', 'glyp-message_complaint', 'glyp-message_misc', 'glyp-message_technician', 'glyp-messages', 'glyp-misc', 'glyp-miscellaneous', 'glyp-move_order', 'glyp-mowing', 'glyp-multi_housing', 'glyp-mute', 'glyp-navicon', 'glyp-new_location', 'glyp-new_ticket', 'glyp-no_charge', 'glyp-no_service', 'glyp-note', 'glyp-note_access', 'glyp-note_billing', 'glyp-note_collection', 'glyp-note_complaint', 'glyp-note_directions', 'glyp-note_focused', 'glyp-note_office', 'glyp-note_preservice', 'glyp-note_sales', 'glyp-note_service', 'glyp-notification', 'glyp-number', 'glyp-office', 'glyp-office_government', 'glyp-office_training', 'glyp-on_demand', 'glyp-on_demand_order', 'glyp-open', 'glyp-open_invoice', 'glyp-operations', 'glyp-options', 'glyp-order_actions', 'glyp-order_approved', 'glyp-order_batch', 'glyp-order_editor', 'glyp-order_pending', 'glyp-order_series', 'glyp-order_unapproved', 'glyp-org_structure', 'glyp-org_unit', 'glyp-org_unit_settings', 'glyp-origin', 'glyp-origin_client', 'glyp-origin_tech', 'glyp-outbox', 'glyp-outlook', 'glyp-overlap', 'glyp-password', 'glyp-past_due', 'glyp-paused', 'glyp-pay_brackets', 'glyp-payment', 'glyp-payment_ach', 'glyp-payment_application_apply', 'glyp-payment_application_correction', 'glyp-payment_application_initial', 'glyp-payment_application_refund', 'glyp-payment_application_transfer', 'glyp-payment_application_unapply', 'glyp-payment_application_unapply_all', 'glyp-payment_applications', 'glyp-payment_batch', 'glyp-payment_cash', 'glyp-payment_check', 'glyp-payment_coupon', 'glyp-payment_credit', 'glyp-payment_discount', 'glyp-payment_eft', 'glyp-payment_finance_charge', 'glyp-payments', 'glyp-payroll', 'glyp-pdf', 'glyp-pending', 'glyp-periodic', 'glyp-periodic_assessment', 'glyp-permission', 'glyp-pest', 'glyp-pest_ants', 'glyp-pest_bats', 'glyp-pest_bed_bugs', 'glyp-pest_birds', 'glyp-pest_crawling_insects', 'glyp-pest_dermestids', 'glyp-pest_fall_invaders', 'glyp-pest_flying_insects', 'glyp-pest_moles', 'glyp-pest_mosquitoes', 'glyp-pest_nuisance_animals', 'glyp-pest_ornamental', 'glyp-pest_ornamental_diseases', 'glyp-pest_roaches', 'glyp-pest_rodents', 'glyp-pest_scorpions', 'glyp-pest_snakes', 'glyp-pest_spiders', 'glyp-pest_stinging_insects', 'glyp-pest_stored_product_pests', 'glyp-pest_ticks_and_fleas', 'glyp-pest_viruses_and_bacteria', 'glyp-pest_weeds', 'glyp-pest_wood_destroyers', 'glyp-phone', 'glyp-pick_date', 'glyp-pick_list', 'glyp-platform_android', 'glyp-platform_ios', 'glyp-platform_macos', 'glyp-platform_windows', 'glyp-play', 'glyp-plus', 'glyp-plus_filled', 'glyp-plus_outline', 'glyp-portal', 'glyp-price_increase', 'glyp-price_increase_alt', 'glyp-pricing_table', 'glyp-print', 'glyp-privacy', 'glyp-product_sale', 'glyp-production', 'glyp-professional_consultation', 'glyp-program', 'glyp-program_elements', 'glyp-program_initiation', 'glyp-program_order', 'glyp-program_review', 'glyp-promo', 'glyp-proposal', 'glyp-protection', 'glyp-purchase_order', 'glyp-quality', 'glyp-query', 'glyp-radio_checked', 'glyp-radio_empty', 'glyp-reassign', 'glyp-receipt', 'glyp-recent', 'glyp-recommendation', 'glyp-record_details', 'glyp-recurring_revenue', 'glyp-redo', 'glyp-refresh', 'glyp-refund', 'glyp-region', 'glyp-released', 'glyp-remove', 'glyp-renewal', 'glyp-report', 'glyp-required_input', 'glyp-reschedule', 'glyp-restaurant_bar', 'glyp-revenue', 'glyp-review', 'glyp-rfid', 'glyp-ride_along', 'glyp-rodent_exclusion', 'glyp-route_change', 'glyp-route_optimization', 'glyp-rows', 'glyp-ruler', 'glyp-sales', 'glyp-sales_contest', 'glyp-sales_pipeline', 'glyp-sales_tax', 'glyp-sales_tax_exemption', 'glyp-schedule_lock', 'glyp-schedule_lock_afternoon', 'glyp-schedule_lock_day', 'glyp-schedule_lock_exact', 'glyp-schedule_lock_four_hour', 'glyp-schedule_lock_morning', 'glyp-schedule_lock_none', 'glyp-schedule_lock_two_day', 'glyp-schedule_lock_two_hour', 'glyp-schedule_lock_week', 'glyp-schedule_tyoe_every', 'glyp-schedule_type_every', 'glyp-schedule_type_none', 'glyp-schedule_type_on_demand', 'glyp-schedule_type_schedule', 'glyp-scheduled', 'glyp-scheduling', 'glyp-school_church', 'glyp-script', 'glyp-search', 'glyp-seeding', 'glyp-segment', 'glyp-sent', 'glyp-sentricon', 'glyp-service_agreement', 'glyp-service_form', 'glyp-service_miscellaneous', 'glyp-service_reminder', 'glyp-service_report', 'glyp-service_request', 'glyp-services', 'glyp-settings', 'glyp-setup', 'glyp-signature', 'glyp-simulator', 'glyp-site_map', 'glyp-site_map_annotation', 'glyp-site_map_chemical', 'glyp-site_map_edit_details', 'glyp-site_map_edit_geo', 'glyp-site_map_equipment', 'glyp-site_map_exterior', 'glyp-site_map_foundation', 'glyp-site_map_icon', 'glyp-site_map_interior', 'glyp-site_map_label', 'glyp-site_map_perimeter', 'glyp-site_map_settings_left', 'glyp-site_map_settings_right', 'glyp-site_map_template', 'glyp-skip', 'glyp-smart_traps', 'glyp-sms', 'glyp-snow_removal', 'glyp-sort', 'glyp-special', 'glyp-split', 'glyp-spp_scorecard', 'glyp-square_edge', 'glyp-start_sheet', 'glyp-start_time', 'glyp-statement', 'glyp-states', 'glyp-sticky', 'glyp-stop_time', 'glyp-store_material', 'glyp-store_order', 'glyp-store_order_back_order', 'glyp-store_order_cancelled', 'glyp-store_order_complete', 'glyp-store_order_pending', 'glyp-store_order_pending_return', 'glyp-store_order_pre_order', 'glyp-store_order_returned', 'glyp-stores', 'glyp-styling', 'glyp-subscribe', 'glyp-supplemental', 'glyp-support', 'glyp-sync', 'glyp-table', 'glyp-tablet', 'glyp-tablets', 'glyp-tag_manager', 'glyp-tags', 'glyp-task_runs', 'glyp-tech_pest_sightings', 'glyp-technician', 'glyp-technician_approach', 'glyp-template', 'glyp-termite_fumigation', 'glyp-terrier', 'glyp-territory', 'glyp-text', 'glyp-thermometer', 'glyp-third_party_billing', 'glyp-ticket', 'glyp-ticket_type', 'glyp-tickets', 'glyp-tidy', 'glyp-time', 'glyp-time_entry', 'glyp-timeline', 'glyp-toolbox', 'glyp-tqi', 'glyp-tracker', 'glyp-tracking', 'glyp-training_course', 'glyp-treatment_split', 'glyp-trends', 'glyp-trip_charge', 'glyp-ui_type', 'glyp-unarchive', 'glyp-unchecked', 'glyp-undo', 'glyp-unfavorite', 'glyp-unit_sweep', 'glyp-unit_tag', 'glyp-university', 'glyp-unlocked', 'glyp-unmute', 'glyp-unscheduled', 'glyp-update_check_positions', 'glyp-upload', 'glyp-user', 'glyp-user_credit', 'glyp-user_tags', 'glyp-users', 'glyp-utility', 'glyp-vacation', 'glyp-vacuum', 'glyp-variant', 'glyp-vendor', 'glyp-versions', 'glyp-video', 'glyp-visible', 'glyp-warehouse', 'glyp-wdo', 'glyp-web_dusting', 'glyp-website', 'glyp-wildlife', 'glyp-wildlife_exclusion', 'glyp-winter_check', 'glyp-wizard', 'glyp-work', 'glyp-work_class', 'glyp-work_code', 'glyp-work_order', 'glyp-work_production', 'glyp-work_progress', 'glyp-work_yield', 'glyp-year', 'glyp-yield', 'glyp-zip_code', 'glyp-zone_adjacent', 'glyp-zone_check', 'glyp-zone_production', 'glyp-zone_remote', 'glyp-zoom_fit'] as const
 
@@ -9,7 +10,7 @@ const names = ['glyp-abacus', 'glyp-account', 'glyp-accounts_payable', 'glyp-acc
  * @param glyp
  */
 const displayName = (glyp: string): string => {
-  return strings.titleize(glyp.replace('glyp-', ''))
+  return Strings.titleize(glyp.replace('glyp-', ''))
 }
 
 const Glyps = {

package/terrier/lightbox.ts

@@ -1,5 +1,5 @@
 import {Logger} from "tuff-core/logging"
-import {untypedKey} from "tuff-core/messages"
+import Messages from "tuff-core/messages"
 import {Part, PartTag} from "tuff-core/parts"
 import {TerrierApp} from "./app"
 
@@ -52,7 +52,7 @@ function showPart(app: TerrierApp<any>, state: LightboxState) {
     app.addOverlay(LightboxPart, state, 'lightbox')
 }
 
-const closeKey = untypedKey()
+const closeKey = Messages.untypedKey()
 
 class LightboxPart extends Part<LightboxState> {
 

package/terrier/modals.ts

@@ -1,8 +1,8 @@
 import {Logger} from "tuff-core/logging"
-import {untypedKey} from "tuff-core/messages"
 import TerrierPart from "./parts/terrier-part"
 import {PartConstructor, PartTag} from "tuff-core/parts"
 import ContentPart from "./parts/content-part"
+import Messages from "tuff-core/messages"
 
 const log = new Logger('Modals')
 
@@ -99,7 +99,7 @@ export abstract class ModalPart<TState> extends ContentPart<TState> {
 /**
  * Emit this key from anywhere inside a modal to pop it off the stack.
  */
-export const modalPopKey = untypedKey()
+export const modalPopKey = Messages.untypedKey()
 
 export class ModalStackPart extends TerrierPart<{}> {
 

package/terrier/overlays.ts

@@ -1,7 +1,7 @@
 import {Part, PartTag, StatelessPart, NoState, PartConstructor} from "tuff-core/parts"
-import { Size, Box, Side } from "tuff-core/box"
+import { Size, Box, Side } from "tuff-core/boxes"
 import { Logger } from "tuff-core/logging"
-import {arrays} from "tuff-core";
+import Arrays from "tuff-core/arrays"
 
 const log = new Logger('Overlays')
 
@@ -73,7 +73,7 @@ export class OverlayPart extends Part<NoState> {
             for (let i = this.layerStates.length-1; i>=0; i--) {
                 if (this.layerStates[i].type == type) {
                     const part = oldParts[i]
-                    this.layerStates = arrays.without(this.layerStates, this.layerStates[i])
+                    this.layerStates = Arrays.without(this.layerStates, this.layerStates[i])
                     this.updateLayers()
                     return part
                 }
@@ -96,7 +96,7 @@ export class OverlayPart extends Part<NoState> {
     removeLayer<StateType>(state: StateType): boolean {
         for (const layerState of this.layerStates) {
             if (layerState.partState == state) {
-                this.layerStates = arrays.without(this.layerStates, layerState)
+                this.layerStates = Arrays.without(this.layerStates, layerState)
                 this.updateLayers()
                 return true
             }

package/terrier/parts/glyp-picker.ts

@@ -1,12 +1,13 @@
 import {ModalPart} from "../modals"
 import {Part, PartTag} from "tuff-core/parts"
-import {messages, logging} from "tuff-core"
 import Glyps from "../glyps"
+import {Logger} from "tuff-core/logging"
+import Messages from "tuff-core/messages"
 
-const log = new logging.Logger("GlypPicker")
+const log = new Logger("GlypPicker")
 
 
-const pickKey = messages.typedKey<{ icon: string }>()
+const pickKey = Messages.typedKey<{ icon: string }>()
 
 export type GlypPickerState = {
     icon?: string
@@ -20,7 +21,7 @@ class GlypPickerModal extends ModalPart<GlypPickerState> {
 
     grid!: GlypGrid
 
-    filterKey = messages.untypedKey()
+    filterKey = Messages.untypedKey()
 
     async init() {
         await super.init()

package/terrier/parts/panel-part.ts

@@ -1,7 +1,7 @@
 import ContentPart from "./content-part"
 import {PartTag} from "tuff-core/parts"
 import Fragments from "../fragments"
-import {untypedKey} from "tuff-core/messages";
+import Messages from "tuff-core/messages"
 
 export type CollapsibleConfig = {
     collapsed?: boolean
@@ -13,8 +13,8 @@ export type CollapsibleConfig = {
 export default abstract class PanelPart<TState> extends ContentPart<TState & { collapsible?: CollapsibleConfig}> {
     protected static readonly DEFAULT_CHEVRON_SIDE: 'left' | 'right' = 'left'
 
-    private _toggleCollapseKey = untypedKey()
-    private _transitionEndKey = untypedKey()
+    private _toggleCollapseKey = Messages.untypedKey()
+    private _transitionEndKey = Messages.untypedKey()
 
     private _prevCollapsedState?: boolean
 

package/terrier/sheets.ts

@@ -2,8 +2,8 @@ import {Action, IconName} from "./theme"
 import TerrierPart from "./parts/terrier-part"
 import {PartTag} from "tuff-core/parts"
 import Fragments from "./fragments"
-import {messages} from "tuff-core"
 import {Logger} from "tuff-core/logging"
+import Messages from "tuff-core/messages"
 
 const log = new Logger('Sheets')
 
@@ -20,7 +20,7 @@ export type SheetState = {
     secondaryActions?: Action[]
 }
 
-const clearKey = messages.untypedKey()
+const clearKey = Messages.untypedKey()
 
 export class Sheet<TState extends SheetState> extends TerrierPart<TState> {
 

package/terrier/tabs.ts

@@ -1,5 +1,5 @@
 import {Logger} from "tuff-core/logging"
-import {typedKey} from "tuff-core/messages"
+import Messages from "tuff-core/messages"
 import {Part, PartParent, PartTag, StatelessPart} from "tuff-core/parts"
 import TerrierPart from "./parts/terrier-part"
 import {Action, IconName, Packet} from "./theme"
@@ -37,8 +37,8 @@ export type TabContainerState = {
 export class TabContainerPart extends TerrierPart<TabContainerState> {
 
     private tabs = {} as Record<string, TabDefinition>
-    changeTabKey = typedKey<{ tabKey: string }>()
-    changeSideKey = typedKey<{ side: TabSide }>()
+    changeTabKey = Messages.typedKey<{ tabKey: string }>()
+    changeSideKey = Messages.typedKey<{ side: TabSide }>()
 
     async init() {
         this.onClick(this.changeTabKey, m => {

package/terrier/theme.ts

@@ -1,7 +1,7 @@
 import {PartTag} from "tuff-core/parts"
-import {messages} from "tuff-core"
 import {GlypName} from "./glyps"
 import HubIcons, {HubIconName} from "./gen/hub-icons"
+import {Key} from "tuff-core/messages"
 
 export interface ThemeType {
     readonly icons: string
@@ -22,7 +22,7 @@ export type ColorName = typeof ColorNames[number]
  * A combination of a message key and its associated data.
  */
 export type Packet = {
-    key: messages.Key
+    key: Key
     data?: Record<string, unknown>
 }
 
@@ -102,7 +102,7 @@ export default class Theme {
                 if (action.subtitle?.length) {
                     a.div('.subtitle', {text: action.subtitle})
                 }
-                else {
+                if (!(action.title?.length || action.subtitle?.length)) {
                     a.class('icon-only')
                 }
                 if (action.href?.length) {