bt-core-app 1.1.8 → 1.2.0

package/src/composables/dates.ts

@@ -12,7 +12,13 @@ export interface BTDates {
 export interface CreateDatesOptions {
   getTimeZone: () => string
 }
+
+let current: BTDates
  
+export function useDates(): BTDates {
+    return current
+}
+
 export function createDates(options: CreateDatesOptions): BTDates {
 
     function getToday(): string {
@@ -67,7 +73,7 @@ export function createDates(options: CreateDatesOptions): BTDates {
         }
     }
 
-    return {
+    current = {
         getToday,
         getTomorrow,
         tzDate,
@@ -75,4 +81,6 @@ export function createDates(options: CreateDatesOptions): BTDates {
         utcDate,
         utcString
     }
+
+    return current
 }

package/src/composables/demo.ts

@@ -6,6 +6,12 @@ export interface BTDemo {
     startDemo: () => void
 }
 
+let current: BTDemo
+
+export function useDemo(): BTDemo {
+    return current
+}
+
 export function createDemo(): BTDemo {
     const isDemoing = ref(false)
 
@@ -17,9 +23,11 @@ export function createDemo(): BTDemo {
 
     }
 
-    return {
+    current = {
         endDemo,
         isDemoing,
         startDemo
     }
+
+    return current
 }

package/src/composables/filters.ts

@@ -9,6 +9,12 @@ export interface UseFiltersOptions {
     dates: BTDates
 }
 
+let current: BTFilters
+
+export function useFilters(): BTFilters {
+    return current
+}
+
 export function createFilters(options: UseFiltersOptions): BTFilters {
     // const { tzString, tzDate, utcString } = useDates()
 
@@ -247,10 +253,12 @@ export function createFilters(options: UseFiltersOptions): BTFilters {
         return (v: any) => v
     }
 
-    return {
+    current = {
         findFilter,
         ...e
     }
+
+    return current
 }
 
 export type Textfilter = 'toLocationLine' | 'toLocationLineNoCommas' | 'toLongDate' | 'toLongDateAndTime' | 'toPercent' | 'toPrettyCSV' | 'toShortDate' | 'toShortDateAndTime' | 'toTime' | 'toTimeOfDay' | 'toCompanyNameAndLocationLine' | 'toCurrency' | 'toDayDate' | 'toDayMonth' | 'toDayOfWeek' | 'toDayShortDate' | 'toDayShortDateAndTime' | 'toDisplayNumber' | 'toDisplayNumberOver' | 'toDisplayNumberSigned' | 'toFormat'

package/src/composables/list.ts

@@ -7,7 +7,7 @@ import { computed, ref, onMounted, toValue, shallowRef, MaybeRefOrGetter, watch
 import { useRoute, useRouter } from 'vue-router'
 import { useArrayDifference, useArrayUnique, watchArray, watchDebounced } from '@vueuse/core'
 import { useActions } from '../composables/actions'
-import { StorageMode, StoreMode, useStore } from '../index'
+import { StorageMode, StoreMode, useStoreDefinition } from '../index'
 
 export interface RefreshOptions {
     deepRefresh?: boolean,
@@ -16,6 +16,7 @@ export interface RefreshOptions {
 
 export interface TableColumn {
     align?: 'start' | 'end' | 'center'
+    bool?: number
     csv?: boolean,
     csvArray?: boolean,
     csvFilter?: string,
@@ -25,8 +26,10 @@ export interface TableColumn {
     level?: number
     maxWidth?: string
     minWidth?: string
+    nav?: string
     prefix?: string
     searchable?: boolean
+    single?: boolean
     sublevel?: number,
     suffix?: string
     textFilter?: string
@@ -205,7 +208,7 @@ export function useList(props: ListProps, emit?: ListEvents, options?: UseListOp
     const { actionErrorMsg, actionLoadingMsg, deleteItem, doAction, getItem, getAllItems, restoreItem } = useActions({
         nav: props.nav ?? props.bladeName ?? props.itemBladeName,
         proxyID: proxyID.value,
-        store: useStore()({
+        store: useStoreDefinition({
             storeMode: storeMode,
             storageMode: storageMode,
             storeName: nav
@@ -563,7 +566,7 @@ export function useList(props: ListProps, emit?: ListEvents, options?: UseListOp
 
     onMounted(async () => {
         if (props.eager == true)
-            await refresh({ deepRefresh: route.params?.refresh == 'true' ?? false })
+            await refresh({ deepRefresh: route.params?.refresh == 'true' })
     })
 
     return {

package/src/composables/navigation.ts

@@ -99,6 +99,12 @@ export interface UseNavigationOptions {
     navItems?: NavigationItem[]
 }
 
+let current: BTNavigation
+
+export function useNavigation(): BTNavigation {
+    return current
+}
+
 export function createNavigation(options: UseNavigationOptions): BTNavigation {
     const cacheExpiryHours = options.defaultCacheExpiryHours ?? 7
     const navigationList = options.navItems ?? []
@@ -195,7 +201,7 @@ export function createNavigation(options: UseNavigationOptions): BTNavigation {
             })
     }
 
-    return {
+    current = {
         showAppBar: appBar,
         showAppNavigation: appNavigation,
         backgroundName,
@@ -211,4 +217,6 @@ export function createNavigation(options: UseNavigationOptions): BTNavigation {
         findSingleDisplay,
         updateNavigationProperties
     }
+
+    return current
 }

package/src/composables/presets.ts

@@ -6,6 +6,12 @@ export interface CreatePresetsOptions {
     presets: any
 }
 
+let current: BTPresets
+
+export function usePresets(preset?: string): any {
+    return current.usePresets(preset)
+}
+
 export function createPresets(options: CreatePresetsOptions): BTPresets {
     
     function usePresets(preset?: string): any {
@@ -14,7 +20,9 @@ export function createPresets(options: CreatePresetsOptions): BTPresets {
         return options.presets[mPreset] ?? {}
     }
 
-    return {
+    current = {
         usePresets
     }
+
+    return current
 }

package/src/composables/pwa.ts

@@ -23,6 +23,12 @@ export interface BTPWA {
     updateApp: () => void
 }
 
+let current: BTPWA
+
+export function usePWA(): BTPWA {
+    return current
+}
+
 export function createPWA(): BTPWA {
 
     function notifyUpdateAvailable(e: any) {
@@ -79,11 +85,13 @@ export function createPWA(): BTPWA {
             promptListener = window.addEventListener('beforeinstallprompt', storePrompt)
     })
 
-    return {
+    current = {
         canInstallApp,
         canUpdateApp,
         installApp,
         isInstalled,
         updateApp
     }
+
+    return current
 }

package/src/composables/stores.ts

@@ -1,4 +1,4 @@
-import { defineStore, StoreDefinition } from 'pinia'
+import { defineStore, Store, StoreDefinition } from 'pinia'
 import { ref, type Ref } from 'vue'
 import { type PathOptions, type BTApi } from '../composables/api'
 import { DateTime } from 'luxon'
@@ -36,7 +36,7 @@ export interface StoreGetReturn<T> {
     data: T
 }
 
-export interface BTStore extends StoreDefinition<any, {}, {},
+export interface BTStoreDefinition extends StoreDefinition<any, {}, {},
 {
     deleteItem: (dOptions: PathOptions) => Promise<string | undefined>
     get: <T extends BaseModel>(dOptions: PathOptions) => Promise<StoreGetReturn<T>>
@@ -46,6 +46,15 @@ export interface BTStore extends StoreDefinition<any, {}, {},
     restore: <T extends BaseModel>(dOptions: PathOptions) => Promise<T | undefined>
 }> {}
 
+export interface BTStore extends Store<any, {}, {}, {
+    deleteItem: (dOptions: PathOptions) => Promise<string | undefined>
+    get: <T extends BaseModel>(dOptions: PathOptions) => Promise<StoreGetReturn<T>>
+    getAll: <T extends BaseModel>(dOptions: PathOptions) => Promise<StoreGetAllReturn<T>>
+    patch: <T extends BaseModel>(dOptions: PathOptions) => Promise<T | undefined>
+    post: <T extends BaseModel>(dOptions: PathOptions) => Promise<T | undefined>
+    restore: <T extends BaseModel>(dOptions: PathOptions) => Promise<T | undefined>
+}> {}
+
 export interface ApiError {
     message: string
 }
@@ -87,28 +96,40 @@ export interface CreateStoreOptions {
     storeName: string
 }
 
-export function createStoreBuilder(options: CreateStoreBuilderOptions): (opt: CreateStoreOptions) => BTStore {
-    return (opt: CreateStoreOptions) => {
-        return createStore({
+let currentBuilder: (opt: CreateStoreOptions) => BTStoreDefinition
+
+export function useStore(options: CreateStoreOptions): BTStore {
+    return currentBuilder(options)()
+}
+
+export function useStoreDefinition(options: CreateStoreOptions): BTStoreDefinition {
+    return currentBuilder(options)
+}
+
+export function createStoreBuilder(options: CreateStoreBuilderOptions): (opt: CreateStoreOptions) => BTStoreDefinition {
+    currentBuilder = (opt: CreateStoreOptions) => {
+        return createStoreDefinition({
             ...options,
             ...opt
         })
     }
+
+    return currentBuilder
 }
 
-export function createStore(options: UseStoreOptions): BTStore {
+export function createStoreDefinition(options: UseStoreOptions): BTStoreDefinition {
     if (options.storeMode == 'whole-last-updated') {
         if (options.api == null) throw new Error('Must supply an api object to use store')
 
-        return createWholeLastUpdateStore(options)
+        return createWholeLastUpdateStoreDefinition(options)
     }
     else if (options.storeMode == 'partial-last-updated') {
         if (options.api == null) throw new Error('Must supply an api object to use store')
 
-        return createWholeLastUpdateStore(options)
+        return createWholeLastUpdateStoreDefinition(options)
     }
     else { //if (options.storeMode == 'session') {
-        return createSessionStore(options)
+        return createSessionStoreDefinition(options)
     }
 }
 
@@ -161,7 +182,7 @@ interface UseSessionStoreOptions {
     storeName: string
 }
 
-export function createSessionStore(options: UseSessionStoreOptions): BTStore {
+export function createSessionStoreDefinition(options: UseSessionStoreOptions): BTStoreDefinition {
     return defineStore(options.storeName, () => {
         const currentTimeStampDays = DateTime.utc().toSeconds() / 86400
         const searchMemory: Ref<any> = ref({})
@@ -476,7 +497,7 @@ interface UseWholeLastUpdateStoreOptions {
     storeName: string
 }
 
-export function createWholeLastUpdateStore(options: UseWholeLastUpdateStoreOptions): BTStore {
+export function createWholeLastUpdateStoreDefinition(options: UseWholeLastUpdateStoreOptions): BTStoreDefinition {
     return defineStore(options.storeName, () => {
         const dataItems: Ref<any[] | undefined> = ref()
         const count = ref(0)

package/src/core.ts

@@ -11,6 +11,23 @@ import { createPWA } from './composables/pwa'
 import { createStoreBuilder } from './composables/stores'
 import { RemovableRef } from '@vueuse/core'
 
+
+import BTBtn from './components/BT-Btn.vue'
+import BTCol from './components/BT-Col.vue'
+import BTFieldCheckbox from './components/BT-Field-Checkbox.vue'
+import BTFieldDate from './components/BT-Field-Date.vue'
+import BTFieldEntity from './components/BT-Field-Entity.vue'
+import BTFieldSelect from './components/BT-Field-Select.vue'
+import BTFieldString from './components/BT-Field-String.vue'
+import BTFieldSwitch from './components/BT-Field-Switch.vue'
+import BTFieldTags from './components/BT-Field-Tags.vue'
+import BTFieldTextarea from './components/BT-Field-Textarea.vue'
+import BTFieldTrigger from './components/BT-Field-Trigger.vue'
+import BTHeaderOption from './components/BT-Header-Option.vue'
+import BTJson from './components/BT-Json.vue'
+import BTSelectListBox from './components/BT-Select-List-Box.vue'
+import BTSelect from './components/BT-Select.vue'
+import BTSnack from './components/BT-Snack.vue'
 import BTSpan from './components/BT-Span.vue'
 
 export interface CoreApp {
@@ -34,18 +51,34 @@ export function createCore(options: CreateCoreOptions): CoreApp {
             // const core = this
 
             //register components
+            app.component('bt-btn', BTBtn)
+            app.component('bt-col', BTCol)
+            app.component('bt-field-checkbox', BTFieldCheckbox)
+            app.component('bt-field-date', BTFieldDate)
+            app.component('bt-field-entity', BTFieldEntity)
+            app.component('bt-field-select', BTFieldSelect)
+            app.component('bt-field-string', BTFieldString)
+            app.component('bt-field-switch', BTFieldSwitch)
+            app.component('bt-field-tags', BTFieldTags)
+            app.component('bt-field-text-area', BTFieldTextarea)
+            app.component('bt-field-trigger', BTFieldTrigger)
+            app.component('bt-header-option', BTHeaderOption)
+            app.component('bt-json', BTJson)
+            app.component('bt-select-list-box', BTSelectListBox)
+            app.component('bt-select', BTSelect)
+            app.component('bt-snack', BTSnack)
             app.component('bt-span', BTSpan)
 
             //define globals
             // app.config.globalProperties.$btcore = core
 
-            const cosmetics = createCosmetics(options)
+            createCosmetics(options)
             
             const demo = createDemo()
             
             const navigation = createNavigation(options)
 
-            const presets = createPresets(options)
+            createPresets(options)
 
             const auth = createAuth({ 
                 demo: demo,
@@ -65,28 +98,28 @@ export function createCore(options: CreateCoreOptions): CoreApp {
                 getTimeZone: auth.getTimeZone
             })
 
-            const filters = createFilters({
+            createFilters({
                 dates: dates
             })
 
-            const pwa = createPWA()
+            createPWA()
 
-            const storeBuilder = createStoreBuilder({
+            createStoreBuilder({
                 api,
                 auth
             })
 
-            //provide
-            app.provide('bt-api', api)
-            app.provide('bt-auth', auth)
-            app.provide('bt-cosmetics', cosmetics)
-            app.provide('bt-dates', dates)
-            app.provide('bt-demo', demo)
-            app.provide('bt-filters', filters)
-            app.provide('bt-navigation', navigation)
-            app.provide('bt-presets', presets)
-            app.provide('bt-pwa', pwa)
-            app.provide('bt-store', storeBuilder)
+            // //provide
+            // app.provide('bt-api', api)
+            // app.provide('bt-auth', auth)
+            // // app.provide('bt-cosmetics', cosmetics)
+            // app.provide('bt-dates', dates)
+            // app.provide('bt-demo', demo)
+            // app.provide('bt-filters', filters)
+            // app.provide('bt-navigation', navigation)
+            // app.provide('bt-presets', presets)
+            // app.provide('bt-pwa', pwa)
+            // app.provide('bt-store', storeBuilder)
         }
     }
 }

package/src/index.ts

@@ -2,42 +2,42 @@ export { useActionsTracker } from './composables/actions-tracker'
 export type { BTActions, GetOptions, DeleteOptions, RestoreOptions, SaveOptions, ApiActionOptions, UseActionsOptions } from './composables/actions'
 export { useActions } from './composables/actions'
 export type { BTApi, UseApiOptions, PathOptions, QueryParams } from './composables/api'
-export { createApi } from './composables/api'
+export { createApi, useApi } from './composables/api'
 export type { BTAuth, AuthItem, AuthSubscription, BaseAuthCredentials, CreateAuthOptions } from './composables/auth'
-export { createAuth } from './composables/auth'
+export { createAuth, useAuth } from './composables/auth'
 export type { BTCosmetics, BaseCosmeticTheme, UseCosmeticsOptions } from './composables/cosmetics'
-export { createCosmetics } from './composables/cosmetics'
+export { createCosmetics, useCosmetics } from './composables/cosmetics'
 export * from './composables/csv'
 export type { BTDates, CreateDatesOptions } from './composables/dates'
-export { createDates } from './composables/dates'
+export { createDates, useDates } from './composables/dates'
 export type { BTDemo } from './composables/demo'
-export { createDemo } from './composables/demo'
+export { createDemo, useDemo } from './composables/demo'
 export * from './composables/dialogs'
 export type { BTDocumentMeta, UseDocumentMetaOptions } from './composables/document-meta'
 export { useDocumentMeta } from './composables/document-meta'
 export * from './composables/draggable'
 export type { BTFilters, UseFiltersOptions } from './composables/filters'
-export { createFilters } from './composables/filters'
+export { createFilters, useFilters } from './composables/filters'
 export { useLocalDb, useLocalCache } from './composables/forage'
 export * from './composables/helpers'
 export { useId } from './composables/id'
 export type { TableColumn, CustomFilterParam, ListEvents, ListProps, GroupedHeaderOption, UseListOptions } from './composables/list'
 export { useList } from './composables/list'
 export type { BTNavigation, ExternalParty, ExternalNavigation, NavigationItem, UseNavigationOptions } from './composables/navigation'
-export { createNavigation } from './composables/navigation'
+export { createNavigation, useNavigation } from './composables/navigation'
 export type { BTPresets, CreatePresetsOptions } from './composables/presets'
-export { createPresets } from './composables/presets'
+export { createPresets, usePresets } from './composables/presets'
 export type { BTPWA, SWEvent } from './composables/pwa'
-export { createPWA } from './composables/pwa'
+export { createPWA, usePWA } from './composables/pwa'
 export * from './composables/resizable'
 export type { UseRulesOptions } from './composables/rules'
 export { useRules } from './composables/rules'
-export type { BTStore, StoreMode, StorageMode, LocalMeta, LocallyStoredItem, StoreGetAllReturn, StoreGetReturn, UseStoreOptions, CreateStoreBuilderOptions, CreateStoreOptions } from './composables/stores'
-export { createStoreBuilder, createStore, createWholeLastUpdateStore, createSessionStore } from './composables/stores'
+export type { BTStoreDefinition, BTStore, StoreMode, StorageMode, LocalMeta, LocallyStoredItem, StoreGetAllReturn, StoreGetReturn, UseStoreOptions, CreateStoreBuilderOptions, CreateStoreOptions } from './composables/stores'
+export { createStoreBuilder, createStoreDefinition, useStore, useStoreDefinition, createWholeLastUpdateStoreDefinition, createSessionStoreDefinition } from './composables/stores'
 export type { UseTrackerOptions } from './composables/track'
 export { useTracker } from './composables/track'
 export { useUrl } from './composables/urls'
-export { useApi, useAuth, useCosmetics, useDates, useDemo, useFilters, useNavigation, usePresets, usePWA, useStore } from './useApi'
+// export { useApi, useAuth, useDates, useDemo, useFilters, useNavigation, usePresets, usePWA, useStore } from './useApi'
 export * from './types'
 export type { CoreApp, CreateCoreOptions } from './core'
 export { createCore } from './core'

package/src/types.ts

@@ -6,8 +6,12 @@
  */
 export type BladeVariant = 'page' | 'blade' | 'freestyle' | 'inline' | 'pane'
 
+export type BladeDensity = 'default' | 'comfortable' | 'compact'
+
 export type BladeMode = 'new' | 'view' | 'edit'
 
+export type FieldVariant = 'underlined' | 'outlined' | 'filled' | 'solo' | 'solo-inverted' | 'solo-filled' | 'plain'
+
 export interface BaseModel {
     id?: string
-}
+}

package/src/useApi.ts

@@ -1,68 +1,68 @@
-import { inject } from 'vue'
-// import { BTActions } from './composables/actions'
-import { BTAuth } from './composables/auth'
-import { BTApi } from './composables/api'
-import { BTCosmetics } from './composables/cosmetics'
-import { BTDates } from './composables/dates'
-import { BTDemo } from './composables/demo'
-import { BTFilters } from './composables/filters'
-import { BTNavigation } from './composables/navigation'
-import { BTPresets } from './composables/presets'
-import { BTPWA } from './composables/pwa'
-import { BTStore, CreateStoreOptions } from './composables/stores'
+// import { inject } from 'vue'
+// // import { BTActions } from './composables/actions'
+// import { BTAuth } from './composables/auth'
+// import { BTApi } from './composables/api'
+// import { BTCosmetics } from './composables/cosmetics'
+// import { BTDates } from './composables/dates'
+// import { BTDemo } from './composables/demo'
+// import { BTFilters } from './composables/filters'
+// import { BTNavigation } from './composables/navigation'
+// import { BTPresets } from './composables/presets'
+// import { BTPWA } from './composables/pwa'
+// import { BTStore, CreateStoreOptions } from './composables/stores'
 
-// /**returns a new instance */
-// export function useActions(): BTActions {
-//     return inject('bt-actions')!
-// }
+// // /**returns a new instance */
+// // export function useActions(): BTActions {
+// //     return inject('bt-actions')!
+// // }
 
-/**returns a singleton */
-export function useApi(): BTApi {
-    return inject('bt-api')!
-}
+// /**returns a singleton */
+// export function useApi(): BTApi {
+//     return inject('bt-api')!
+// }
 
-/**returns a singleton */
-export function useAuth(): BTAuth {
-    return inject('bt-auth')!
-}
+// /**returns a singleton */
+// export function useAuth(): BTAuth {
+//     return inject('bt-auth')!
+// }
 
-/**returns a singleton */
-export function useCosmetics(): BTCosmetics {
-    return inject('bt-cosmetics')!
-}
+// /**returns a singleton */
+// export function useCosmetics(): BTCosmetics {
+//     return inject('bt-cosmetics')!
+// }
 
-/**returns a singleton */
-export function useDates(): BTDates {
-    return inject('bt-dates')!
-}
+// /**returns a singleton */
+// export function useDates(): BTDates {
+//     return inject('bt-dates')!
+// }
 
-/**returns a singleton */
-export function useDemo(): BTDemo {
-    return inject('bt-demo')!
-}
+// /**returns a singleton */
+// export function useDemo(): BTDemo {
+//     return inject('bt-demo')!
+// }
 
-/**returns a singleton */
-export function useFilters(): BTFilters {
-    return inject('bt-filters')!
-}
+// /**returns a singleton */
+// export function useFilters(): BTFilters {
+//     return inject('bt-filters')!
+// }
 
-/**returns a singleton */
-export function useNavigation(): BTNavigation {
-    return inject('bt-navigation')!
-}
+// /**returns a singleton */
+// export function useNavigation(): BTNavigation {
+//     return inject('bt-navigation')!
+// }
 
-/**returns a singleton */
-export function usePresets(preset?: string): any {
-    const p = inject('bt-presets')! as BTPresets
-    return p.usePresets(preset)
-}
+// /**returns a singleton */
+// export function usePresets(preset?: string): any {
+//     const p = inject('bt-presets')! as BTPresets
+//     return p.usePresets(preset)
+// }
 
-/**returns a singleton */
-export function usePWA(): BTPWA {
-    return inject('bt-pwa')!
-}
+// /**returns a singleton */
+// export function usePWA(): BTPWA {
+//     return inject('bt-pwa')!
+// }
 
-/**returns a new instance */
-export function useStore(): (opt: CreateStoreOptions) => BTStore {
-    return inject('bt-store')!
-}
+// /**returns a new instance */
+// export function useStore(): (opt: CreateStoreOptions) => BTStore {
+//     return inject('bt-store')!
+// }

package/vite.config.ts

@@ -2,6 +2,7 @@
 import { defineConfig } from 'vite'
 import path from 'path'
 import vue from '@vitejs/plugin-vue'
+import vuetify, { transformAssetUrls } from 'vite-plugin-vuetify'
 import dts from 'vite-plugin-dts'
 
 // https://vitejs.dev/config/
@@ -26,9 +27,12 @@ export default defineConfig({
     }
   },
   plugins: [
+    // vue({
+    //   template: { transformAssetUrls }
+    // }),
     vue(),
-    dts()
-    // dts({ rollupTypes: true })
+    dts(),
+    vuetify()
   ],
   resolve: {
     alias: {

package/.vscode/extensions.json

@@ -1,3 +0,0 @@
-{
-  "recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"]
-}