bt-core-app 1.2.2 → 1.2.3

package/dist/composables/auth.d.ts

@@ -24,7 +24,6 @@ export interface BaseAuthCredentials {
     userID?: string;
     userPermissions?: string[];
 }
-export type GetAuthUrl = (redirectPath?: string, state?: string) => string;
 export interface CreateAuthOptions {
     defaultTimeZone?: string;
     demo?: BTDemo;
@@ -33,7 +32,7 @@ export interface CreateAuthOptions {
     /**retrieve the auth item */
     getAuthItem: (navName?: string | AuthItem) => AuthItem | null;
     /**retrieve the url to navigate to for the OAuth 2.0 process */
-    getAuthUrl: GetAuthUrl;
+    getAuthQuery: (redirectPath?: string, state?: string) => string;
     /**sets current credentials on top of default function*/
     setCredentials?: (state: RemovableRef<any>, payload: any) => void;
     /**suboptions */

package/dist/composables/urls.d.ts

@@ -1,7 +1,21 @@
 export type Environment = 'production' | 'staging' | 'development';
+export interface CreateUrlOptions {
+    production: UrlSet;
+    staging: UrlSet;
+    development: UrlSet;
+}
+export interface UrlSet {
+    auth?: string;
+    data?: string;
+    localDbName?: string;
+    other?: any;
+}
+export declare function useDbName(): string;
+export declare function useAuthUrl(): string;
 /**
- * ms: BASE_AUTH_URL, BASE_DATA_URL, WEB_APP_URL, Microservice, LOCAL_DB_NAME
+ *
  * @param microservice
  * @returns
  */
-export declare function useUrl(microservice?: string): string | undefined;
+export declare function useDataUrl(microservice?: string): string;
+export declare function createUrl(options: CreateUrlOptions): void;

package/dist/core.d.ts

@@ -1,18 +1,20 @@
 import { RemovableRef } from '@vueuse/core';
+import { CreateUrlOptions } from './composables/urls';
 import { NavigationItem } from './composables/navigation';
 import { BaseCosmeticTheme, UseCosmeticsOptions } from './composables/cosmetics';
-import { GetAuthUrl, AuthSubscription } from './composables/auth';
+import { AuthSubscription } from './composables/auth';
 import { App } from 'vue';
 
 export interface CoreApp {
     install(app: App): void;
 }
-export interface CreateCoreOptions extends UseCosmeticsOptions<BaseCosmeticTheme> {
+export interface CreateCoreOptions extends UseCosmeticsOptions<BaseCosmeticTheme>, CreateUrlOptions {
     defaultCacheExpiryHours?: number;
+    getAuthQuery: (redirectPath?: string, state?: string) => string;
     navItems?: NavigationItem[];
-    getAuthUrl: GetAuthUrl;
     presets: any;
     setCredentials?: (state: RemovableRef<any>, payload: any) => void;
+    /**suboptions */
     subscriptionOptions?: AuthSubscription[];
 }
 export declare function createCore(options: CreateCoreOptions): CoreApp;

package/dist/index.d.ts

@@ -36,7 +36,7 @@ export type { BTStoreDefinition, BTStore, StoreMode, StorageMode, LocalMeta, Loc
 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 { createUrl, useAuthUrl, useDbName, useDataUrl } from './composables/urls';
 export * from './types';
 export type { CoreApp, CreateCoreOptions } from './core';
 export { createCore } from './core';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-core-app",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Core app tools for some basic features like navigation, authentication, server apis, and cosmetics",
   "homepage": "https://github.com/BlitzItTech/bt-core",
   "bugs": {

package/src/composables/auth.ts

@@ -1,9 +1,10 @@
-import { isLengthyArray } from '../composables/helpers';
+import { isLengthyArray } from '../composables/helpers'
 import { DateTime } from 'luxon'
 import { type RemovableRef, useStorage } from '@vueuse/core'
 import { type BTDemo } from '../composables/demo'
 import { useRouter } from 'vue-router'
 import { toValue } from 'vue'
+import { useAuthUrl } from './urls'
 
 export interface AuthItem {
     children?: AuthItem[]
@@ -33,7 +34,7 @@ export interface BaseAuthCredentials {
 
 let defaultTimeZone = 'Australia/Melbourne'
 
-export type GetAuthUrl = (redirectPath?: string, state?: string) => string
+// export type GetAuthUrl = (redirectPath?: string, state?: string) => string
 
 export interface CreateAuthOptions {
     defaultTimeZone?: string,
@@ -43,7 +44,7 @@ export interface CreateAuthOptions {
     /**retrieve the auth item */
     getAuthItem: (navName?: string | AuthItem) => AuthItem | null
     /**retrieve the url to navigate to for the OAuth 2.0 process */
-    getAuthUrl: GetAuthUrl
+    getAuthQuery: (redirectPath?: string, state?: string) => string
     /**sets current credentials on top of default function*/
     setCredentials?: (state: RemovableRef<any>, payload: any) => void
     /**suboptions */
@@ -222,7 +223,8 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
     }
 
     function getAuthUrl(redirectPath?: string) {
-        return options.getAuthUrl(redirectPath, authState.value)
+        return `${useAuthUrl()}?${options.getAuthQuery(redirectPath, authState.value)}`
+        //return options.getAuthUrl(redirectPath, authState.value)
     }
 
     /**undefined or unfound is worth 0 */

package/src/composables/forage.ts

@@ -1,14 +1,14 @@
 import localforage from 'localforage';
-import { useUrl } from '../composables/urls';
+import { useDbName } from '../composables/urls';
 
 let localDb: LocalForage | null = null;
 
 localforage.config({
-    name: useUrl(`Db_${import.meta.env.MODE}`)
+    name: useDbName()
 })
 
 export function useLocalDb(): LocalForage {
-    const dbName = `Db_${useUrl('LOCAL_DB_NAME')}`
+    const dbName = useDbName()
     if (localDb == null || localDb.config.name != dbName) {
         localDb = localforage.createInstance({ name: dbName })
     }

package/src/composables/navigation.ts

@@ -1,5 +1,5 @@
 //nav item needs to have a 'ignore Suspension' prop
-import { useUrl } from '../composables/urls'
+import { useDataUrl } from '../composables/urls'
 import { appendUrl, deepSelect } from '../composables/helpers'
 import { ref, type Ref } from 'vue'
 import { type AuthItem } from './auth'
@@ -141,7 +141,7 @@ export function createNavigation(options: UseNavigationOptions): BTNavigation {
         const navItem = findItem(navName)
         if (navItem == null) return undefined
 
-        let vPath = useUrl(navItem.microservice ?? 'default') ?? ''
+        let vPath = useDataUrl(navItem.microservice ?? 'default') ?? ''
 
         if (navItem.path != null)
             vPath = appendUrl(vPath, navItem.path)

package/src/composables/urls.ts

@@ -1,11 +1,61 @@
 export type Environment = 'production' | 'staging' | 'development'
 
+export interface CreateUrlOptions {
+    production: UrlSet
+    staging: UrlSet
+    development: UrlSet
+}
+
+export interface UrlSet {
+    auth?: string
+    data?: string
+    localDbName?: string
+    other?: any
+}
+
+let current: CreateUrlOptions
+
+export function useDbName(): string {
+    const env = import.meta.env.MODE as Environment
+
+    if (current == null)
+        return env as string
+    
+    const urlSet = current[env] ?? current['development']
+    return urlSet.localDbName ?? env as string
+}
+
+export function useAuthUrl(): string {
+    const env = import.meta.env.MODE as Environment
+
+    if (current == null)
+        return ''
+
+    const urlSet = current[env] ?? current['development']
+    return urlSet.auth ?? ''
+}
+
 /**
- * ms: BASE_AUTH_URL, BASE_DATA_URL, WEB_APP_URL, Microservice, LOCAL_DB_NAME
+ *
  * @param microservice 
  * @returns 
  */
-export function useUrl(microservice?: string) {
-    let ms = `VITE_${microservice ?? 'BASE_DATA_URL'}`
-    return import.meta.env[ms] as string | undefined
+export function useDataUrl(microservice?: string): string {
+    const env = import.meta.env.MODE as Environment
+
+    if (current == null)
+        return ''
+
+    const urlSet = current[env] ?? current['development']
+
+    if (microservice == null)
+        return urlSet.data ?? ''
+
+    let other = urlSet.other[microservice]
+
+    return other ?? urlSet.data ?? ''
+}
+
+export function createUrl(options: CreateUrlOptions) {
+    current = options
 }

package/src/core.ts

@@ -1,6 +1,6 @@
 import { App } from 'vue'
 import { createApi } from './composables/api'
-import { createAuth, type GetAuthUrl, type AuthSubscription } from './composables/auth'
+import { createAuth, type AuthSubscription } from './composables/auth'
 import { BaseCosmeticTheme, createCosmetics, UseCosmeticsOptions } from './composables/cosmetics'
 import { createDates } from './composables/dates'
 import { createDemo } from './composables/demo'
@@ -9,6 +9,7 @@ import { createNavigation, type NavigationItem } from './composables/navigation'
 import { createPresets } from './composables/presets'
 import { createPWA } from './composables/pwa'
 import { createStoreBuilder } from './composables/stores'
+import { CreateUrlOptions, createUrl } from './composables/urls'
 import { RemovableRef } from '@vueuse/core'
 
 
@@ -34,13 +35,13 @@ export interface CoreApp {
     install(app: App) : void
 }
 
-export interface CreateCoreOptions extends UseCosmeticsOptions<BaseCosmeticTheme> {
+export interface CreateCoreOptions extends UseCosmeticsOptions<BaseCosmeticTheme>, CreateUrlOptions {
     defaultCacheExpiryHours?: number
+    getAuthQuery: (redirectPath?: string, state?: string) => string
     navItems?: NavigationItem[]
-
-    getAuthUrl: GetAuthUrl
     presets: any
     setCredentials?: (state: RemovableRef<any>, payload: any) => void
+    /**suboptions */
     subscriptionOptions?: AuthSubscription[]
 }
 
@@ -83,7 +84,7 @@ export function createCore(options: CreateCoreOptions): CoreApp {
             const auth = createAuth({ 
                 demo: demo,
                 getAuthItem: navigation.findItem,
-                getAuthUrl: options.getAuthUrl,
+                getAuthQuery: options.getAuthQuery,
                 setCredentials: options.setCredentials,
                 subscriptionOptions: options.subscriptionOptions
             })
@@ -109,17 +110,7 @@ export function createCore(options: CreateCoreOptions): CoreApp {
                 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)
+            createUrl(options)
         }
     }
 }

package/src/index.ts

@@ -36,7 +36,7 @@ export type { BTStoreDefinition, BTStore, StoreMode, StorageMode, LocalMeta, Loc
 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 { createUrl, useAuthUrl, useDbName, useDataUrl } from './composables/urls'
 // export { useApi, useAuth, useDates, useDemo, useFilters, useNavigation, usePresets, usePWA, useStore } from './useApi'
 export * from './types'
 export type { CoreApp, CreateCoreOptions } from './core'
@@ -46,4 +46,4 @@ export { createCore } from './core'
 // import BTBtn from './components/BT-Btn.vue'
 // import BTCol from './components/BT-Col.vue'
 
-// export { BTBtn, BTCol }
+// export { BTBtn, BTCol }

package/test/auth.test.ts

@@ -43,7 +43,7 @@ describe('default auth', () => {
     const auth = createAuth({
         defaultTimeZone: 'Aus',
         getAuthItem: () => { return {}},
-        getAuthUrl: () => ''
+        getAuthQuery: () => ''
     })
 
     test('creates successfully', () => {
@@ -61,7 +61,6 @@ describe('default auth', () => {
         expect(a.authState).toEqual(auth.authState)
     })
 
-    
     test('login', () => {
         auth.login()
     })

package/test/forage.test.ts

@@ -7,7 +7,7 @@ describe('foraging', () => {
     
     test('local db exists', () => {
         expect(db).not.toBeNull()
-        expect(db._config.name).toEqual('Db_undefined')
+        expect(db._config.name).toEqual('test')
     })
 
 })

package/test/stores-session.test.ts

@@ -1,5 +1,5 @@
 import { setActivePinia, createPinia } from 'pinia'
-import { createSessionStore, createWholeLastUpdateStore } from '../src/composables/stores'
+import { createSessionStoreDefinition, createWholeLastUpdateStoreDefinition } from '../src/composables/stores'
 import { createApi } from '../src/composables/api'
 import { describe, test, expect, beforeEach, afterAll, afterEach, beforeAll } from 'vitest'
 import { setupServer } from 'msw/node'
@@ -50,7 +50,7 @@ describe('use session store with no api no caching', () => {
     app.use(pinia)
     setActivePinia(pinia)
 
-    const store = createSessionStore({
+    const store = createSessionStoreDefinition({
         storageMode: 'session',
         storeName: 'sesh'
     })()
@@ -79,7 +79,7 @@ describe('use session store with api no caching', () => {
 
     setActivePinia(pinia)
 
-    const store = createSessionStore({
+    const store = createSessionStoreDefinition({
         storageMode: 'session',
         api: api,
         storeName: 'test'

package/test/urls.test.ts

@@ -0,0 +1,42 @@
+import { describe, test, expect } from 'vitest'
+import { createUrl, useDbName, useAuthUrl, useDataUrl } from '../src/composables/urls'
+
+describe('default urls', () => {
+    const url = createUrl({
+        production: {
+            auth: 'pauth',
+            data: 'pdata',
+            localDbName: 'pdb',
+            other: {
+                ordering: 'pordering',
+                stock: 'pstock'
+            }
+        },
+        staging: {
+            auth: 'sauth',
+            data: 'sdata',
+            localDbName: 'sdb',
+            other: {
+                ordering: 'sordering',
+                stock: 'sstock'
+            }
+        },
+        development: {
+            auth: 'dauth',
+            data: 'ddata',
+            localDbName: 'ddb',
+            other: {
+                ordering: 'dordering',
+                stock: 'dstock'
+            }
+        }
+    })
+    
+    test('use prod db name', () => {
+        const d = useDbName()
+        expect(useDbName()).toEqual('ddb')
+        expect(useAuthUrl()).toEqual('dauth')
+        expect(useDataUrl()).toEqual('ddata')
+        expect(useDataUrl('stock')).toEqual('dstock')
+    })
+})