@vesperjs/nuxt 0.7.1 → 0.8.0

package/app/composables/backend/api/use-http-headers.ts

@@ -1,4 +1,4 @@
-import { computed, type Ref } from '@vue/reactivity'
+import { computed, type Ref } from 'vue'
 
 import { useLocale } from '../../use-locale'
 import { useTimeZone } from '../../use-time-zone'

package/app/composables/backend/api/use-query-api.ts

@@ -2,7 +2,7 @@ import { useAsyncData, useNuxtApp, type NuxtError } from 'nuxt/app'
 
 import type { FetchContext, FetchError, FetchOptions, FetchResponse } from 'ofetch'
 
-import { ref } from '@vue/reactivity'
+import { ref } from 'vue'
 
 import { useHttpHeaders } from './use-http-headers'
 import { useApiConstants } from './use-api-constants'

package/app/composables/backend/use-api-error.ts

@@ -3,7 +3,7 @@ import { useNuxtApp } from 'nuxt/app'
 import type { FetchError } from 'ofetch'
 import type { NuxtError } from 'nuxt/app'
 
-import type { Ref } from '@vue/reactivity'
+import type { Ref } from 'vue'
 
 import type {
   ErrorsResource,

package/app/composables/use-datetime-local.ts

@@ -33,7 +33,7 @@ export const useDatetimeLocal = function (fmtDT = 'YYYY/MM/DD HH:mm'): {
   }
 
   const formatHTML = (datetime: string | null, fmt: string): string => {
-    return datetime ? format(parse(datetime, fmtDT, locale.value), fmt, locale.value) : ''
+    return datetime ? format(parseDT(datetime, fmtDT), fmt, locale.value) : ''
   }
 
   return { upDTL, downDTL, toISO8601, formatHTML }

package/app/composables/use-more-page.ts

@@ -0,0 +1,114 @@
+import { useState } from 'nuxt/app'
+
+interface MorePage {
+  first: number
+  pages: number
+  current: number
+  prev: boolean
+  next: boolean
+  min: number
+  max: number
+}
+
+export const useMorePage = function (options?: { key?: string | null }): {
+  firstPage: WritableComputedRef<number>
+  pages: WritableComputedRef<number>
+  currentPage: ComputedRef<number>
+  prev: ComputedRef<boolean>
+  next: ComputedRef<boolean>
+  minPage: ComputedRef<number>
+  maxPage: ComputedRef<number>
+  decrement: () => void
+  increment: () => void
+} {
+  const key = options?.key
+
+  const toFirstUpper = (str: string): string => {
+    return str.charAt(0).toUpperCase() + str.slice(1)
+  }
+
+  const morePage = useState<MorePage>(key ? `morePageFor${toFirstUpper(key)}` : 'morePage', () => {
+    return {
+      first: 1,
+      pages: 1,
+      current: 1,
+      prev: false,
+      next: false,
+      min: 1,
+      max: 1,
+    }
+  })
+
+  const firstPage = computed<number>({
+    get() {
+      return morePage.value.first
+    },
+    set(value: number) {
+      morePage.value.first = value
+      morePage.value.current = value
+
+      morePage.value.prev = false
+      morePage.value.next = false
+    },
+  })
+
+  const pages = computed<number>({
+    get() {
+      return morePage.value.pages
+    },
+    set(value: number) {
+      morePage.value.pages = value
+
+      minMaxPage()
+      prevNext()
+    },
+  })
+
+  const currentPage = computed<number>(() => morePage.value.current)
+
+  const prev = computed<boolean>(() => morePage.value.prev)
+  const next = computed<boolean>(() => morePage.value.next)
+
+  const minPage = computed<number>(() => morePage.value.min)
+  const maxPage = computed<number>(() => morePage.value.max)
+
+  const minMaxPage = () => {
+    morePage.value.min =
+      morePage.value.current < morePage.value.first ? morePage.value.current : morePage.value.first
+    morePage.value.max =
+      morePage.value.current > morePage.value.first ? morePage.value.current : morePage.value.first
+  }
+
+  const prevNext = () => {
+    morePage.value.prev = morePage.value.min === 1 ? false : true
+    morePage.value.next = morePage.value.max === morePage.value.pages ? false : true
+    // console.log(`page prev: ${prev.value}`)
+    // console.log(`page next: ${next.value}`)
+  }
+
+  const decrement = () => {
+    morePage.value.current = morePage.value.min - 1
+    minMaxPage()
+    prevNext()
+  }
+
+  const increment = () => {
+    morePage.value.current = morePage.value.max + 1
+    minMaxPage()
+    prevNext()
+  }
+
+  return {
+    firstPage,
+    pages,
+    currentPage,
+    prev,
+    next,
+    minPage,
+    maxPage,
+    decrement,
+    increment,
+  }
+}
+
+export const useMoreScroll = useMorePage

package/app/composables/use-time-zone.ts

@@ -28,11 +28,13 @@ export const useTimeZone = function (fmtDT = 'YYYY/MM/DD HH:mm'): {
   const { locale } = useLocale()
   const { toISO8601, formatHTML } = useDatetimeLocal(fmtDT)
 
-  const serverTimeZone = runtimeConfig.public.timeZone as string
+  const serverTZ = runtimeConfig.public.timeZone as string
+
+  const clientTZ = computed<string>(() => Intl.DateTimeFormat().resolvedOptions().timeZone)
 
   const timeZone = computed<TimeZone>(() => ({
-    client: Intl.DateTimeFormat().resolvedOptions().timeZone,
-    server: serverTimeZone,
+    client: clientTZ.value,
+    server: serverTZ ? serverTZ : clientTZ.value,
   }))
 
   const tzOptions = computed<TZOptions[]>(() =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesperjs/nuxt",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "keywords": [
     "nuxt",
     "vue.js"
@@ -24,16 +24,17 @@
     "@nuxt/eslint": "1.15.2",
     "@nuxtjs/i18n": "^10.3.0",
     "@types/node": "^24.12.3",
-    "@vesperjs/shared": "0.7.1",
+    "@vesperjs/shared": "0.8.0",
     "eslint": "^10.3.0",
     "eslint-typegen": "2.3.1",
     "nuxt": "^4.3.1",
     "ofetch": "^1.5.1",
-    "oxfmt": "^0.48.0",
+    "oxfmt": "^0.50.0",
     "typescript": "^6.0.3"
   },
   "peerDependencies": {
-    "typescript-eslint": "^8.59.2",
+    "@typescript-eslint/typescript-estree": "^8.59.3",
+    "typescript-eslint": "^8.59.3",
     "vue": "^3.5.34 || ^3.6.0-beta.11"
   },
   "scripts": {

package/app/composables/use-more-scroll.ts

@@ -1,79 +0,0 @@
-import { useState } from 'nuxt/app'
-
-export const useMoreScroll = function ({
-  key = null,
-  page = 1,
-  pages,
-}: {
-  key?: string | null
-  page: number
-  pages: number
-}): {
-  currentPage: Ref<number>
-  pagePrev: Ref<boolean>
-  pageNext: Ref<boolean>
-  minPage: Ref<number>
-  maxPage: Ref<number>
-  init: () => void
-  decrement: () => void
-  increment: () => void
-} {
-  const toFirstUpper = (str: string): string => {
-    return str.charAt(0).toUpperCase() + str.slice(1)
-  }
-
-  const currentPage = useState<number>(
-    key ? `currentPageFor${toFirstUpper(key)}` : 'currentPage',
-    () => {
-      return 1
-    },
-  )
-
-  const pagePrev = useState<boolean>(key ? `pagePrevFor${toFirstUpper(key)}` : 'pagePrev', () => {
-    return false
-  })
-  const pageNext = useState<boolean>(key ? `pageNextFor${toFirstUpper(key)}` : 'pageNext', () => {
-    return false
-  })
-
-  const minPage = useState<number>(key ? `minPageFor${toFirstUpper(key)}` : 'minPage', () => {
-    return 1
-  })
-  const maxPage = useState<number>(key ? `maxPageFor${toFirstUpper(key)}` : 'maxPage', () => {
-    return 1
-  })
-
-  const minMaxPage = () => {
-    minPage.value = currentPage.value < page ? currentPage.value : page
-    maxPage.value = currentPage.value > page ? currentPage.value : page
-  }
-
-  const pagePrevNext = () => {
-    if (currentPage.value === 1) pagePrev.value = false
-    if (currentPage.value === pages) pageNext.value = false
-    // console.log(`page prev: ${pagePrev.value}`)
-    // console.log(`page next: ${pageNext.value}`)
-  }
-
-  const init = () => {
-    currentPage.value = page
-    pagePrev.value = true
-    pageNext.value = true
-    minMaxPage()
-    pagePrevNext()
-  }
-
-  const decrement = () => {
-    currentPage.value = minPage.value - 1
-    minMaxPage()
-    pagePrevNext()
-  }
-
-  const increment = () => {
-    currentPage.value = maxPage.value + 1
-    minMaxPage()
-    pagePrevNext()
-  }
-
-  return { currentPage, pagePrev, pageNext, minPage, maxPage, init, decrement, increment }
-}