diff --git a/.firebaserc b/.firebaserc index eb80fd5ff..a1215de8a 100644 --- a/.firebaserc +++ b/.firebaserc @@ -1,6 +1,6 @@ { "projects": { "default": "talking-dictionaries-dev", - "production": "talking-dictionaries-alpha" + "production": "talking-dictionaries-alpha", } } diff --git a/.github/workflows/lighthouse-audit.yml b/.github/workflows/lighthouse-audit.yml index fa9ba6b82..30a1fdb6c 100644 --- a/.github/workflows/lighthouse-audit.yml +++ b/.github/workflows/lighthouse-audit.yml @@ -21,7 +21,7 @@ jobs: with: urls: | ${{ github.event.deployment_status.target_url }} - ${{ github.event.deployment_status.target_url }}/achi/entries/list + ${{ github.event.deployment_status.target_url }}/achi/entries ${{ github.event.deployment_status.target_url }}/jaRhn6MAZim4Blvr1iEv/entry/yt9ja7ymh9xgba5i # configPath: './.github/lighthouserc.json' # https://github.com/GoogleChrome/lighthouse-ci/blob/main/docs/getting-started.md https://github.com/GoogleChrome/lighthouse-ci/blob/main/docs/configuration.md#assert uploadArtifacts: true diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e6a433825..7011ba684 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,11 +11,11 @@ jobs: - uses: pnpm/action-setup@v2 with: - version: 8.6.0 + version: 9.6.0 - uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 20 cache: pnpm - run: pnpm install diff --git a/.vscode/settings.json b/.vscode/settings.json index cfcb791c5..ba9865865 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -33,9 +33,9 @@ }, // Silence stylistic rules in IDE, but still auto fix them "eslint.rules.customizations": [ - { "rule": "@stylistic/*", "severity": "off" }, - { "rule": "style*", "severity": "off" }, - { "rule": "*indent", "severity": "off" }, + { "rule": "style/*", "severity": "off" }, + { "rule": "format/*", "severity": "off" }, + { "rule": "*-indent", "severity": "off" }, { "rule": "*-spacing", "severity": "off" }, { "rule": "*-spaces", "severity": "off" }, { "rule": "*-order", "severity": "off" }, @@ -47,6 +47,7 @@ { "rule": "import/order", "severity": "off" }, { "rule": "sort-imports", "severity": "off" }, { "rule": "ts/no-empty-function", "severity": "off" }, + { "rule": "svelte/indent", "severity": "off" }, ], "eslint.validate": [ "javascript", diff --git a/README.md b/README.md index deb4ffcd7..ef189d5be 100644 --- a/README.md +++ b/README.md @@ -7,22 +7,12 @@ A mobile-first community focused dictionary-building web app built by [Living To [](https://svelte.dev/) [](https://kit.svelte.dev/) [](https://unocss.dev/integrations/svelte-scoped) -[](https://firebase.google.com/) -[](https://firebase.google.com/) +[](https://firebase.google.com/) [](https://vercel.com/) -[](https://www.algolia.com/) - -Firebase is used for: - -- Authentication -- Cloud Firestore -- Storage - -These functions are being transitioned to Supabase with the exception of Storage, images will remain in GCP. Supabase may support this directly in the future. +[](https://www.orama.com/) +[](https://cloud.google.com/storage) ## Contributing -- Choose an already approved task from the [Development Roadmap](https://github.com/jwrunner/Living-Dictionaries/projects/1) or [create an issue](https://github.com/jwrunner/Living-Dictionaries/issues) to propose a new feature (please await discussion before creating a pull request). +- Choose an already approved task from the [Development Roadmap](https://github.com/jwrunner/Living-Dictionaries/projects/1) or [create an issue](https://github.com/jwrunner/Living-Dictionaries/issues) to propose a new feature (please await discussion before creating a pull request). - Read [CONTRIBUTING](https://livingdictionaries.app/kitbook/docs/CONTRIBUTING) and then move on to all the other pages under "Docs" in the Kitbook to understand how to set up a dev environment, repo conventions, commit conventions, and more. - - diff --git a/package.json b/package.json index 44f50437e..3fc10c07e 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,8 @@ "type": "module", "scripts": { "dev": "pnpm --filter=site dev", + "prod": "pnpm --filter=site prod", + "mixed": "pnpm --filter=site mixed", "dev:open": "pnpm --filter=site dev --open", "build": "pnpm --filter=site build", "preview": "pnpm --filter=site preview", @@ -19,22 +21,22 @@ "lint:inspect": "npx @eslint/config-inspector", "lint:inspect-future": "eslint --inspect-config", "reset-db": "pnpm --filter=site reset-db", - "generate-types": "supabase gen types typescript --local --schema public > packages/site/src/lib/supabase/generated.types.ts", + "generate-types": "supabase gen types typescript --local --schema public > packages/types/supabase/generated.types.ts", "check-packages": "pnpm update --interactive --recursive --latest" }, "devDependencies": { - "@antfu/eslint-config": "^2.12.1", - "@typescript-eslint/eslint-plugin": "6.21.0", - "eslint": "^8.56.0", - "eslint-plugin-svelte": "^2.33.2", + "@antfu/eslint-config": "^2.27.3", + "@typescript-eslint/eslint-plugin": "8.3.0", + "eslint": "^9.9.1", + "eslint-plugin-svelte": "^2.43.0", "eslint-plugin-svelte-stylistic": "^0.0.4", - "lint-staged": "^13.2.2", - "simple-git-hooks": "^2.11.0", - "start-server-and-test": "^2.0.3", + "lint-staged": "^15.2.9", + "simple-git-hooks": "^2.11.1", + "start-server-and-test": "^2.0.5", "supabase": "^1.145.4", "svelte": "^4.2.12", "typescript": "~5.1.6", - "vitest": "^1.4.0" + "vitest": "^2.1.3" }, "simple-git-hooks": { "pre-commit": "pnpm lint-staged" diff --git a/packages/functions/package.json b/packages/functions/package.json index 1cc22153f..86131acad 100644 --- a/packages/functions/package.json +++ b/packages/functions/package.json @@ -30,6 +30,6 @@ "@types/node": "^18.11.18", "node-fetch": "^2.6.7", "typescript": "^5.1.6", - "vitest": "^1.4.0" + "vitest": "^2.0.5" } } diff --git a/packages/functions/tsconfig.json b/packages/functions/tsconfig.json.bak similarity index 100% rename from packages/functions/tsconfig.json rename to packages/functions/tsconfig.json.bak diff --git a/packages/scripts/.gitignore b/packages/scripts/.gitignore index 7f2090e84..032816f4e 100644 --- a/packages/scripts/.gitignore +++ b/packages/scripts/.gitignore @@ -2,4 +2,5 @@ logs service-account* .env sheets-viewer-SA.json -.env.supabase \ No newline at end of file +.env.supabase +.env.production.supabase \ No newline at end of file diff --git a/packages/scripts/config-firebase.ts b/packages/scripts/config-firebase.ts index b84985f6e..f66131373 100644 --- a/packages/scripts/config-firebase.ts +++ b/packages/scripts/config-firebase.ts @@ -1,4 +1,3 @@ -import fs from 'node:fs' import { program } from 'commander' import { cert, initializeApp } from 'firebase-admin/app' import { FieldValue, getFirestore } from 'firebase-admin/firestore' @@ -7,8 +6,7 @@ import { getAuth } from 'firebase-admin/auth' // import serviceAccountDev from './service-account-dev.json'; // import serviceAccountProd from './service-account-prod.json'; import { serviceAccountDev, serviceAccountProd } from './service-accounts' - -/// LOGGER/// +import './record-logs' program // .version('0.0.1') @@ -34,11 +32,5 @@ export const db = getFirestore() export const timestamp = FieldValue.serverTimestamp() export const storage = getStorage() export const auth = getAuth() -const logFile = fs.createWriteStream(`./logs/${Date.now()}.txt`, { flags: 'w' }) // 'a' to append, 'w' to truncate the file every time the process starts. -console.log = function (data: any) { - logFile.write(`${JSON.stringify(data)}\n`) - process.stdout.write(`${JSON.stringify(data)}\n`) -} -/// END-LOGGER/// -console.log(`Running on ${environment}`) +console.log(`Firebase running on ${environment}`) diff --git a/packages/scripts/config-supabase.ts b/packages/scripts/config-supabase.ts index 3e36fd64d..066714030 100644 --- a/packages/scripts/config-supabase.ts +++ b/packages/scripts/config-supabase.ts @@ -1,31 +1,63 @@ import PG from 'pg' import { createClient } from '@supabase/supabase-js' -import type { Database } from '@living-dictionaries/site/src/lib/supabase/database.types' +import type { Database } from '@living-dictionaries/types' import * as dotenv from 'dotenv' +import './record-logs' -dotenv.config({ path: '.env.supabase' }) +// TODO: change to .env.development and .env.production +dotenv.config({ path: '.env.supabase' }) // local project variables +// dotenv.config({ path: '.env.production.supabase' }) // production project variables -export const supabase = createClient(process.env.PUBLIC_SUPABASE_API_URL, process.env.SUPABASE_SERVICE_ROLE_KEY) +export const admin_supabase = createClient(process.env.PUBLIC_SUPABASE_API_URL, process.env.SUPABASE_SERVICE_ROLE_KEY) +export const anon_supabase = createClient(process.env.PUBLIC_SUPABASE_API_URL, process.env.PUBLIC_SUPABASE_ANON_KEY) +export const jacob_ld_user_id = 'de2d3715-6337-45a3-a81a-d82c3210b2a7' -export async function executeQuery(query: string) { - const client = new PG.Client({ +class DB { + private pool: PG.Pool + + private config: PG.PoolConfig = { user: 'postgres', host: '127.0.0.1', - // host: 'db.actkqboqpzniojhgtqzw.supabase.co', database: 'postgres', password: 'postgres', - // password: '**', port: 54322, - // port: 5432, - }) - try { - await client.connect() - await client.query(query) - } catch (error) { - console.error('Error in connection/executing query:', error) - } finally { - await client.end().catch((error) => { - console.error('Error ending client connection:', error) - }) + + // user: 'postgres.actkqboqpzniojhgtqzw', + // host: 'aws-0-us-west-1.pooler.supabase.com', + // database: 'postgres', + // password: '**', + // port: 6543, + + max: 10, + idleTimeoutMillis: 30000, + connectionTimeoutMillis: 5000, + allowExitOnIdle: false, + } + + async get_db_connection(): Promise { + if (!this.pool) { + this.pool = new PG.Pool(this.config) + const client = await this.pool.connect() + console.info(`----> √ Postgres DB connection established! <----`) + return client + } + return this.pool.connect() + } + + async execute_query(query: string): Promise { + const client = await this.get_db_connection() + try { + await client.query(query) + } catch (error) { + console.error('Error executing query:', error) + throw new Error(error) + } finally { + client.release() + } } } + +export const postgres = new DB() + +const environment = 'dev' +console.log(`Supabase running on ${environment}`) diff --git a/packages/scripts/import/post-request.ts b/packages/scripts/import/post-request.ts index 16ca684d3..35e9ddf1b 100644 --- a/packages/scripts/import/post-request.ts +++ b/packages/scripts/import/post-request.ts @@ -16,6 +16,10 @@ export async function post_request, ExpectedRespon fetch?: typeof fetch headers?: RequestInit['headers'] }): Promise> { + console.info(data) + // for running through data without db involved + // return { data: { speaker_id: data?.speaker_id, dialect_id: data?.dialect_id }, error: null } + const fetch_to_use = options?.fetch || fetch const response = await fetch_to_use(route, { diff --git a/packages/scripts/migrate-to-supabase/.gitignore b/packages/scripts/migrate-to-supabase/.gitignore deleted file mode 100644 index c0bf54b75..000000000 --- a/packages/scripts/migrate-to-supabase/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -entries_full.json -entries.json \ No newline at end of file diff --git a/packages/scripts/migrate-to-supabase/all-current-senses-have-entry-placeholders.ts b/packages/scripts/migrate-to-supabase/all-current-senses-have-entry-placeholders.ts new file mode 100644 index 000000000..9b380c726 --- /dev/null +++ b/packages/scripts/migrate-to-supabase/all-current-senses-have-entry-placeholders.ts @@ -0,0 +1,72 @@ +import fs from 'node:fs' +import Chain from 'stream-chain' +import Parser from 'stream-json' +import StreamArray from 'stream-json/streamers/StreamArray' +import { admin_supabase, jacob_ld_user_id } from '../config-supabase' +import { remove_seconds_underscore } from './utils/remove-seconds-underscore' +import { convert_entry } from './convert-entries' + +export async function ensure_all_current_senses_have_entry_placeholders() { + // load + const { data: senses } = await admin_supabase.from('senses') + .select('id, entry_id') + const { data: entries } = await admin_supabase.from('entries') + .select('id') + + const entries_needing_added = new Set() + for (const sense of senses) { + if (!entries.find(entry => entry.id === sense.entry_id)) { + console.log(`need placeholder entry for sense ${sense.id}, entry ${sense.entry_id}`) + entries_needing_added.add(sense.entry_id) + } + } + console.log({ entries_to_add: entries_needing_added.size }) + + const pipeline = Chain.chain([ + fs.createReadStream('./migrate-to-supabase/firestore-data/firestore-entries.json'), + Parser.parser(), + StreamArray.streamArray(), + ]) + + try { + for await (const { value: fb_entry } of pipeline) { + if (entries_needing_added.has(fb_entry.id)) { + const corrected_fb_entry = remove_seconds_underscore(fb_entry) + const [, supa_data] = convert_entry(JSON.parse(JSON.stringify(corrected_fb_entry))) + const { entry } = supa_data + + const { data: dictionary } = await admin_supabase.from('dictionaries').select().eq('id', entry.dictionary_id).single() + if (!dictionary) { + console.log({ creating_dict: entry.dictionary_id }) + const { error } = await admin_supabase.from('dictionaries').insert({ + created_by: jacob_ld_user_id, + updated_by: jacob_ld_user_id, + id: entry.dictionary_id, + name: 'CHANGE', + }) + if (error) { + console.info({ entry }) + throw new Error(error.message) + } + } + + const insert = { + id: entry.id, + dictionary_id: entry.dictionary_id, + lexeme: {}, + created_by: entry.created_by, + created_at: entry.created_at, + updated_by: entry.updated_by, + updated_at: entry.updated_at, + } + console.log({ insert }) + await admin_supabase.from('entries').insert(insert) + } + } + console.log('finished') + } catch (err) { + console.error(err) + pipeline.destroy() + pipeline.input.destroy() + } +} diff --git a/packages/scripts/migrate-to-supabase/auth.ts b/packages/scripts/migrate-to-supabase/auth.ts index 5ec6b2ef2..25d94519e 100644 --- a/packages/scripts/migrate-to-supabase/auth.ts +++ b/packages/scripts/migrate-to-supabase/auth.ts @@ -1,11 +1,9 @@ import type { UserRecord } from 'firebase-admin/auth' import { auth } from '../config-firebase' -import { executeQuery } from '../config-supabase' +import { postgres } from '../config-supabase' import { write_users_insert } from './write-users-insert' -migrate_users() - -async function migrate_users() { +export async function migrate_users() { const users = await get_users() console.log({ total_users: users.length }) for (const user of users) @@ -14,12 +12,12 @@ async function migrate_users() { console.log(user.toJSON()) const sql = write_users_insert(users) console.log(sql) - await executeQuery(sql) + await postgres.execute_query(sql) } const BATCH_SIZE = 1000 -async function get_users(): Promise { +export async function get_users(): Promise { try { const listUsersResult = await auth.listUsers() const { users, pageToken } = listUsersResult @@ -29,7 +27,7 @@ async function get_users(): Promise { if (pageToken) { const listUsersResult = await auth.listUsers(BATCH_SIZE, pageToken) const { users: nextUsers } = listUsersResult - // const nextUsers = await get_users(pageToken) + // const nextUsers = await get_users(pageToken) // had issue return [...users, ...nextUsers] } diff --git a/packages/scripts/migrate-to-supabase/convert-entries.test.ts b/packages/scripts/migrate-to-supabase/convert-entries.test.ts index cfda26c1a..3a50a90a1 100644 --- a/packages/scripts/migrate-to-supabase/convert-entries.test.ts +++ b/packages/scripts/migrate-to-supabase/convert-entries.test.ts @@ -2,10 +2,28 @@ import fs from 'node:fs' import { chain } from 'stream-chain' import { parser } from 'stream-json' import { streamArray } from 'stream-json/streamers/StreamArray' -import type { ActualDatabaseEntry } from '@living-dictionaries/types' import { convert_entry } from './convert-entries' +import entries_to_test from './entries_to_test.json' +import { remove_seconds_underscore } from './utils/remove-seconds-underscore' -// Snapshotting 1-255 and specific entries moving beyond that point +let id_count = 0 +function randomUUID() { + id_count++ + return `use-crypto-uuid-in-real-thing_${id_count}` +} + +test(convert_entry, () => { + const converted_entries = entries_to_test.map((entry) => { + const [processed_fb_entry_remains, supa_data] = convert_entry(JSON.parse(JSON.stringify(entry)), randomUUID) + if (Object.keys(processed_fb_entry_remains).length !== 0) + throw new Error('Entry not fully converted') + return { entry, supa_data } + }, + ) + expect(converted_entries).toMatchFileSnapshot('convert-entries-to-test.snap.json') +}) + +// Snapshotting 1-228 and specific entries moving beyond that point // 229 - has write-in semantic domains (sd array) // 231 - has no ab for audio and sf.ts is an object with seconds and nanoseconds // 235 - rare xe for vernacular example sentence @@ -47,17 +65,16 @@ import { convert_entry } from './convert-entries' // 266408 - deleted vfs date const to_snapshot = [229, 231, 235, 252, 253, 254, 255, 1228, 1718, 1759, 4577, 4609, 4945, 5377, 5394, 8005, 14072, 15715, 16141, 23958, 29994, 36138, 39845, 39858, 47304, 47829, 85363, 128736, 166042, 167017, 172023, 200582, 248444, 251721, 253088, 266408] -// pnpm t -- --ui convert-entries -// eslint-disable-next-line test/no-disabled-tests -- only run locally and not in CI because data does not exist in repo -test.skip(convert_entry, { timeout: 16000 }, async () => { - // const count = 266408 +// pnpm -F scripts test:migration convert-entries -- --ui +test(convert_entry, { timeout: 26000 }, async () => { + // const count = 300 const count = 278631 // total entries - const success: any[] = [] + const success: { entry: any, supa_data: any }[] = [] const todo: any[] = [] - const result: Promise = new Promise((resolve, reject) => { + const result = new Promise<{ entry: any, supa_data: any }[]>((resolve, reject) => { const pipeline = chain([ - fs.createReadStream('./packages/scripts/migrate-to-supabase/entries_full.json'), + fs.createReadStream('./migrate-to-supabase/entries_full.json'), parser(), streamArray(), ]) @@ -105,40 +122,7 @@ test.skip(convert_entry, { timeout: 16000 }, async () => { const specific_entries = converted_entries.filter((_, index) => to_snapshot.includes(index + 1)) expect(specific_entries).toMatchFileSnapshot('convert-entries.specific.snap.json') -}) -function remove_seconds_underscore(entry: Partial & Record) { - // @ts-expect-error - if (entry.updatedAt?._seconds) { - // @ts-expect-error - entry.updatedAt = { - // @ts-expect-error - seconds: entry.updatedAt._seconds, - } - } - // @ts-expect-error - if (entry.createdAt?._seconds) { - // @ts-expect-error - entry.createdAt = { - // @ts-expect-error - seconds: entry.createdAt._seconds, - } - } - // @ts-expect-error - if (entry.ua?._seconds) { - // @ts-expect-error - entry.ua = { - // @ts-expect-error - seconds: entry.ua._seconds, - } - } - // @ts-expect-error - if (entry.ca?._seconds) { - // @ts-expect-error - entry.ca = { - // @ts-expect-error - seconds: entry.ca._seconds, - } - } - return entry -} + // const entries_to_test = [...first_chunk, ...specific_entries].map(({ entry }) => entry) + // fs.writeFileSync('entries_to_test.json', JSON.stringify(entries_to_test, null, 2)) +}) diff --git a/packages/scripts/migrate-to-supabase/convert-entries.ts b/packages/scripts/migrate-to-supabase/convert-entries.ts index 20d3eafa5..296ed6e64 100644 --- a/packages/scripts/migrate-to-supabase/convert-entries.ts +++ b/packages/scripts/migrate-to-supabase/convert-entries.ts @@ -1,39 +1,47 @@ -// import { randomUUID } from 'node:crypto' -import type { ActualDatabaseEntry } from '@living-dictionaries/types' -import type { TablesInsert } from '../../site/src/lib/supabase/generated.types' -// import { log_once } from './log-once' - -let id_count = 0 -function randomUUID() { - id_count++ - return `use-crypto-uuid-in-real-thing_${id_count}` +import { randomUUID } from 'node:crypto' +import type { TablesInsert } from '@living-dictionaries/types' +import type { ActualDatabaseEntry } from '@living-dictionaries/types/entry.interface' +import type { ActualDatabaseVideo } from '@living-dictionaries/types/video.interface' +import { jacob_ld_user_id } from '../config-supabase' +import { get_supabase_user_id_from_firebase_uid } from './get-user-id' + +interface DataForSupabase { + entry: TablesInsert<'entries'> + senses: TablesInsert<'senses'>[] + sentences: TablesInsert<'sentences'>[] + senses_in_sentences: TablesInsert<'senses_in_sentences'>[] + audios: TablesInsert<'audio'>[] + audio_speakers: TablesInsert<'audio_speakers'>[] + photos: TablesInsert<'photos'>[] + sense_photos: TablesInsert<'sense_photos'>[] + videos: TablesInsert<'videos'>[] + video_speakers: TablesInsert<'video_speakers'>[] + sense_videos: TablesInsert<'sense_videos'>[] + dialects: string[] + new_speaker_name?: string + prior_import_id: string | null } -const admin_uid_if_no_owner = 'de2d3715-6337-45a3-a81a-d82c3210b2a7' // jacob@livingtongues.org -const old_talking_dictionaries = '00000000-0000-0000-0000-000000000000' // TODO - decide what user to use or create one for attribution - -export function convert_entry(_entry: Partial & Record) { - // if (_entry.deletedVfs) { - // console.log(`deletedVfs in ${_entry.id} in ${_entry.dictionary_id}, ${_entry.deletedVfs[0].youtubeId}`) - // } - // if (_entry.xv && _entry.xs?.vn) - // console.log(`both xv ${_entry.xv} and xs.vn ${_entry.xs.vn} for ${_entry.id} in ${_entry.dictionary_id}`) - // if (_entry.lo && _entry.lo1 && _entry.lo !== _entry.lo1) - // console.log(`lost lo: ${_entry.lo} in favor of lo1: ${_entry.lo1} for ${_entry.id} in ${_entry.dictionary_id}`) - - // if (_entry.sf && _entry.sfs?.length) { - // if (!_entry.sfs[0].sp.includes(_entry.sf.sp)) - // console.log(`${_entry.id} in ${_entry.dictionary_id} has speaker ${_entry.sf.sp} in sf and ${_entry.sfs[0].sp.join(', ')} sfs`) - // } - // if (_entry.source) - // console.log(`source ${_entry.source} in ${_entry.id} in ${_entry.dictionary_id}`) - // return [{}, {}] +export function convert_entry(_entry: ActualDatabaseEntry & Record, uuid: () => string = randomUUID): [any, DataForSupabase] { + const dict_entry_id = `${_entry.dictionary_id}:${_entry.id}` + if (_entry.deletedVfs) + console.log(`deletedVfs in ${dict_entry_id} - youtubeId: ${_entry.deletedVfs[0].youtubeId}`) + + if (_entry.xv && _entry.xs?.vn) + console.log(`both xv ${_entry.xv} and xs.vn ${_entry.xs.vn} for ${dict_entry_id}`) + + if (_entry.lo && _entry.lo1 && _entry.lo !== _entry.lo1) + console.log(`lost lo: ${_entry.lo} in favor of lo1: ${_entry.lo1} for ${dict_entry_id}`) + + if (_entry.sf && _entry.sfs?.length && !_entry.sfs[0].sp.includes(_entry.sf.sp)) + console.log(`different speakers in ${dict_entry_id} - ${_entry.sf.sp} in sf and ${_entry.sfs[0].sp.join(', ')} sfs`) try { - const entry: Partial> = { - id: _entry.id, + const entry: TablesInsert<'entries'> = { + id: _entry.id!, dictionary_id: _entry.dictionary_id, - } + } as TablesInsert<'entries'> + let prior_import_id = null if (typeof _entry.updatedAt?.seconds === 'number') { entry.updated_at = seconds_to_timestamp_string(_entry.updatedAt.seconds) @@ -44,11 +52,11 @@ export function convert_entry(_entry: Partial & Record & Record[] = [] + const dialects = new Set() const first_sense_from_base: TablesInsert<'senses'> = { entry_id: _entry.id, - created_by: entry.created_by, + created_by: entry.created_by || entry.updated_by, + created_at: entry.created_at || entry.updated_at, updated_by: entry.updated_by || entry.created_by, - id: randomUUID(), + updated_at: entry.updated_at || entry.created_at, + id: uuid(), } + if (!_entry.lx) + console.log(`no lexeme for ${dict_entry_id}`) entry.lexeme = { default: _entry.lx || '' } delete _entry.lx @@ -143,16 +154,7 @@ export function convert_entry(_entry: Partial & Record & Record & Record dialects.add(d)) delete _entry[key] continue } @@ -346,7 +348,7 @@ export function convert_entry(_entry: Partial & Record = { id: sentence_id, @@ -371,10 +373,12 @@ export function convert_entry(_entry: Partial & Record[] = [] let new_speaker_name: string = null + if (_entry.sf && !_entry.sf.path) + delete _entry.sf if (_entry.sf?.path || _entry.sfs?.[0].path) { - const audio_id = randomUUID() - const sf = _entry.sf?.path ? _entry.sf : _entry.sfs[0] as unknown as ActualDatabaseEntry['sf'] - const { ab, path, ts, cr, sp, speakerName, source } = sf + const audio_id = uuid() + const sf = _entry.sf?.path ? _entry.sf : _entry.sfs![0] as unknown as ActualDatabaseEntry['sf'] + const { ab, path, ts, cr, sp, speakerName, source } = sf! if (typeof speakerName === 'string') { if (speakerName.trim()) new_speaker_name = speakerName.trim() @@ -383,11 +387,13 @@ export function convert_entry(_entry: Partial & Record = { id: audio_id, + dictionary_id: entry.dictionary_id, entry_id: _entry.id, - created_by: ab || entry.created_by, - updated_by: ab || entry.created_by, + created_by, + updated_by: created_by, storage_path: path, } delete sf.ab @@ -395,12 +401,13 @@ export function convert_entry(_entry: Partial & Record & Record & Record & Record[] = [] if (_entry.pf) { - const photo_id = randomUUID() + const photo_id = uuid() const { ab, path, ts, sc, cr, gcs, source, uploadedAt, uploadedBy } = _entry.pf if (uploadedAt) console.info({ uploadedAt }) if (!ab && !entry.created_by) console.info(`No ab for ${_entry.id} pf`) + + const created_by = get_supabase_user_id_from_firebase_uid(ab) || get_supabase_user_id_from_firebase_uid(uploadedBy) || entry.created_by const photo: TablesInsert<'photos'> = { id: photo_id, - created_by: ab || uploadedBy || entry.created_by, - updated_by: ab || uploadedBy || entry.created_by, + dictionary_id: entry.dictionary_id, + created_by, + updated_by: created_by, storage_path: path, serving_url: remove_newline_from_end(gcs), } @@ -470,6 +484,7 @@ export function convert_entry(_entry: Partial & Record & Record & Record & Record = { id: video_id, - created_by: ab || entry.created_by, - updated_by: ab || entry.created_by, + dictionary_id: entry.dictionary_id, + created_by, + updated_by: created_by, } delete vf.ab if (path) { @@ -536,27 +557,32 @@ export function convert_entry(_entry: Partial & Record & Record & Record { @@ -599,7 +627,7 @@ export function convert_entry(_entry: Partial & Record { + const converted_speakers: Record> = {} + for (const fb_speaker of firebase_speakers) { + const { id, speaker } = convert_speaker(JSON.parse(JSON.stringify(fb_speaker))) + const jacob_test_speaker_id = '2PELJgjxMHXEOcuZfv9MtGyiXdE3' + if (id === jacob_test_speaker_id) + continue + converted_speakers[id] = speaker + } + expect(converted_speakers).toMatchFileSnapshot('converted-speakers.snap.json') +}) diff --git a/packages/scripts/migrate-to-supabase/convert-speakers.ts b/packages/scripts/migrate-to-supabase/convert-speakers.ts new file mode 100644 index 000000000..d588e5d24 --- /dev/null +++ b/packages/scripts/migrate-to-supabase/convert-speakers.ts @@ -0,0 +1,58 @@ +import type { TablesUpdate } from '@living-dictionaries/types' +import type { ISpeaker } from '@living-dictionaries/types/speaker.interface' +import { jacob_ld_user_id } from '../config-supabase' +import { seconds_to_timestamp_string } from './convert-entries' +import { get_supabase_user_id_from_firebase_uid } from './get-user-id' + +export function convert_speaker(fb_speaker: ISpeaker): { id: string, speaker: TablesUpdate<'speakers'> } { + const { + displayName, + uid, + decade, + birthplace, + contributingTo, + gender, + id, + createdAt, + createdBy, + updatedAt, + updatedBy, + } = fb_speaker + + if (!contributingTo || contributingTo.length === 0) { + throw new Error(`Speaker ${displayName} has no contributingTo`) + } + + if (contributingTo.length > 1) { + console.log(`Speaker ${displayName} has multiple contributingTo`) + } + + if (!createdBy) + console.log(`Speaker ${displayName} has no createdBy`) + + const created_by = get_supabase_user_id_from_firebase_uid(createdBy) || jacob_ld_user_id + + const decade_number = (typeof decade === 'string' && decade.trim() !== '') + ? Number.parseInt(decade) + : (typeof decade === 'number') + ? decade + : null + + const speaker: TablesUpdate<'speakers'> = { + dictionary_id: contributingTo[0], + birthplace, + name: displayName, + decade: decade_number, + gender: gender ? gender.trim() as 'm' | 'f' | 'o' : null, + created_by, + updated_by: get_supabase_user_id_from_firebase_uid(updatedBy) || created_by, + user_id: get_supabase_user_id_from_firebase_uid(uid) || null, + } + + if (createdAt?.seconds) { + speaker.created_at = seconds_to_timestamp_string(createdAt.seconds) + speaker.updated_at = updatedAt ? seconds_to_timestamp_string(updatedAt.seconds) : speaker.created_at + } + + return { id, speaker } +} diff --git a/packages/scripts/migrate-to-supabase/create-rest-of-dictionary-placeholders.ts b/packages/scripts/migrate-to-supabase/create-rest-of-dictionary-placeholders.ts new file mode 100644 index 000000000..79ad35e5c --- /dev/null +++ b/packages/scripts/migrate-to-supabase/create-rest-of-dictionary-placeholders.ts @@ -0,0 +1,47 @@ +import fs from 'node:fs' +import Chain from 'stream-chain' +import Parser from 'stream-json' +import StreamArray from 'stream-json/streamers/StreamArray' +import { admin_supabase, jacob_ld_user_id } from '../config-supabase' + +export async function create_rest_of_dictionary_placeholders() { + const { data: dictionaries } = await admin_supabase.from('dictionaries') + .select('id') + + const dictionary_ids = new Set(dictionaries.map(dict => dict.id)) + const dictionary_ids_needing_added = new Set() + + const pipeline = Chain.chain([ + fs.createReadStream('./migrate-to-supabase/firestore-data/firestore-entries.json'), + Parser.parser(), + StreamArray.streamArray(), + ]) + + try { + for await (const { value: fb_entry } of pipeline) { + if (!dictionary_ids.has(fb_entry.dictionary_id)) { + dictionary_ids_needing_added.add(fb_entry.dictionary_id) + } + } + console.log('finished') + } catch (err) { + console.error(err) + pipeline.destroy() + pipeline.input.destroy() + } + + const inserts = Array.from(dictionary_ids_needing_added).map(dictionary_id => ({ + created_by: jacob_ld_user_id, + updated_by: jacob_ld_user_id, + id: dictionary_id, + name: 'CHANGE', + })) + + console.log({ inserts }) + + const { error } = await admin_supabase.from('dictionaries').insert(inserts) + if (error) { + console.info({ error }) + throw new Error(error.message) + } +} diff --git a/packages/scripts/migrate-to-supabase/fetch-entries.ts b/packages/scripts/migrate-to-supabase/fetch-entries.ts deleted file mode 100644 index 78258c2de..000000000 --- a/packages/scripts/migrate-to-supabase/fetch-entries.ts +++ /dev/null @@ -1,31 +0,0 @@ -import fs from 'node:fs' -import path, { dirname } from 'node:path' -import { fileURLToPath } from 'node:url' -import type { ActualDatabaseEntry } from '@living-dictionaries/types' -import { db } from '../config-firebase' - -write_entries() - -async function write_entries() { - const entries: ActualDatabaseEntry[] = [] - - const dict_snapshot = await db.collection('dictionaries').get() - - for (const { id: dictionary_id } of dict_snapshot.docs) { - console.log(dictionary_id) - // const allow = /^[a].*/ - // if (!allow.test(dictionary_id.toLowerCase())) continue - - const snapshot = await db.collection(`dictionaries/${dictionary_id}/words`).get() - - for (const snap of snapshot.docs) { - const entry = { id: snap.id, dictionary_id, ...(snap.data() as ActualDatabaseEntry) } - entries.push(entry) - } - } - - console.log(`Done fetching ${entries.length} entries from ${dict_snapshot.docs.length} dictionaries.`) - - const __dirname = dirname(fileURLToPath(import.meta.url)) - fs.writeFileSync(path.resolve(__dirname, 'entries.json'), JSON.stringify(entries, null, 2)) -} diff --git a/packages/scripts/migrate-to-supabase/get-user-id.ts b/packages/scripts/migrate-to-supabase/get-user-id.ts new file mode 100644 index 000000000..7e68e04ca --- /dev/null +++ b/packages/scripts/migrate-to-supabase/get-user-id.ts @@ -0,0 +1,20 @@ +import { log_once } from './log-once' + +let firebase_uid_to_supabase_user_ids: Record | null = null + +export async function load_fb_to_sb_user_ids() { + if (!firebase_uid_to_supabase_user_ids) { + // eslint-disable-next-line require-atomic-updates + firebase_uid_to_supabase_user_ids = (await import('./firestore-data/fb-sb-user-ids.json')).default + } +} + +export function get_supabase_user_id_from_firebase_uid(firebase_uid: string): string | null { + if (!firebase_uid) return null + + const supabase_user_id = firebase_uid_to_supabase_user_ids![firebase_uid] + if (!supabase_user_id) { + log_once(`No Supabase user found for Firebase UID: ${firebase_uid}`) + } + return supabase_user_id +} diff --git a/packages/scripts/migrate-to-supabase/log-once.ts b/packages/scripts/migrate-to-supabase/log-once.ts index c8bc91410..7ebcfcf91 100644 --- a/packages/scripts/migrate-to-supabase/log-once.ts +++ b/packages/scripts/migrate-to-supabase/log-once.ts @@ -3,6 +3,6 @@ const logged = new Set() export function log_once(msg: string) { if (logged.has(msg)) return - console.info(msg) + console.log(msg) logged.add(msg) } diff --git a/packages/scripts/migrate-to-supabase/migrate-entries.test.ts b/packages/scripts/migrate-to-supabase/migrate-entries.test.ts new file mode 100644 index 000000000..a25e374af --- /dev/null +++ b/packages/scripts/migrate-to-supabase/migrate-entries.test.ts @@ -0,0 +1,65 @@ +import type { ISpeaker } from '@living-dictionaries/types/speaker.interface' +import { anon_supabase } from '../config-supabase' +import { migrate_entries, migrate_speakers } from './migrate-entries' +import entries_to_test_264 from './entries_to_test.json' +import firebase_speakers from './speakers.json' +import { reset_db } from './reset-db' + +vi.mock('node:crypto', () => { + const uuid_template = '11111111-1111-1111-1111-111111111111' + let current_uuid_index = 0 + + function incremental_consistent_uuid() { + return uuid_template.slice(0, -5) + (current_uuid_index++).toString().padStart(5, '0') + } + + return { + randomUUID: incremental_consistent_uuid, + } +}) + +vi.mock('./test-timestamp', () => { + return { + test_timestamp: new Date('2024-03-08T00:44:04.600392+00:00').toISOString(), + } +}) + +describe(migrate_entries, () => { + beforeEach(reset_db) + + test.todo('works on all use cases', { timeout: 60000 }, async () => { + const speakers = await migrate_speakers(firebase_speakers as ISpeaker[]) + await migrate_entries(entries_to_test_264, speakers) + const { data: entry_view } = await anon_supabase.from('entries_view').select() + expect(entry_view).toMatchFileSnapshot('view-after-migrating-entries.json') + }) + + test('write in speaker names are added but not duplicated and assigned', async () => { + const speakerName = 'Write-in Speaker Name not in db' + await migrate_entries([{ + id: 'custom-id-1', + dictionary_id: 'create-me', + lx: 'hi', + sf: { + path: 'foo.mp3', + speakerName, + }, + }, { + id: 'custom-id-2', + dictionary_id: 'create-me', + lx: 'hello', + sf: { + path: 'food.mp3', + speakerName, + }, + }], {}) + + const { data: entry_view } = await anon_supabase.from('entries_view').select() + expect(entry_view[0].audios[0].speaker_ids[0]).toMatchInlineSnapshot(`"11111111-1111-1111-1111-111111100005"`) + expect(entry_view[0].audios[0].speaker_ids[0]).toEqual(entry_view[1].audios[0].speaker_ids[0]) + + const { data: speakers } = await anon_supabase.from('speakers_view').select() + expect(speakers).toHaveLength(1) + expect(speakers[0].name).toEqual(speakerName) + }) +}) diff --git a/packages/scripts/migrate-to-supabase/migrate-entries.ts b/packages/scripts/migrate-to-supabase/migrate-entries.ts new file mode 100644 index 000000000..ef0822b31 --- /dev/null +++ b/packages/scripts/migrate-to-supabase/migrate-entries.ts @@ -0,0 +1,184 @@ +import { randomUUID } from 'node:crypto' +import fs from 'node:fs' +import path, { dirname } from 'node:path' +import { fileURLToPath } from 'node:url' +import type { TablesUpdate } from '@living-dictionaries/types' +import type { ISpeaker } from '@living-dictionaries/types/speaker.interface' +import { convert_entry } from './convert-entries' +import { assign_dialect, assign_speaker, insert_dialect, insert_entry, insert_photo, insert_sense, insert_sentence, insert_video, upsert_audio, upsert_speaker } from './operations/operations' +import { convert_speaker } from './convert-speakers' +import { log_once } from './log-once' + +const import_id = 'fb_sb_migration' +const FOLDER = 'firestore-data' +const __dirname = dirname(fileURLToPath(import.meta.url)) + +export type AllSpeakerData = Record }> + +export async function migrate_speakers() { + const converted_speakers: AllSpeakerData = {} + + const firebase_speakers = (await import('./firestore-data/firestore-speakers.json')).default as ISpeaker[] + + for (const fb_speaker of firebase_speakers) { + const { id: firebase_id, speaker } = convert_speaker(JSON.parse(JSON.stringify(fb_speaker))) + const jacob_test_speaker_id = '2PELJgjxMHXEOcuZfv9MtGyiXdE3' + if (firebase_id === jacob_test_speaker_id) + continue + + const supabase_speaker_id = randomUUID() + const { error } = await upsert_speaker({ dictionary_id: speaker.dictionary_id, speaker, speaker_id: supabase_speaker_id, import_id }) + if (error) + throw new Error(error.message) + + converted_speakers[firebase_id] = { supabase_id: supabase_speaker_id, speaker } + } + + fs.writeFileSync(path.resolve(__dirname, FOLDER, 'fb-to-sb-speakers-mapping.json'), JSON.stringify(converted_speakers, null, 2)) +} + +export async function load_speakers() { + const speakers = (await import('./firestore-data/fb-to-sb-speakers-mapping.json')).default as AllSpeakerData + return speakers +} + +export function migrate_entries(entries_to_test: any[], speakers: AllSpeakerData) { + const dictionary_dialects: Record> = {} + const dictionary_new_speakers: Record> = {} + for (const fb_entry of entries_to_test) { + migrate_entry(fb_entry, speakers, dictionary_dialects, dictionary_new_speakers) + } +} + +export function migrate_entry(fb_entry: any, speakers: AllSpeakerData, dictionary_dialects: Record>, dictionary_new_speakers: Record>) { + const [processed_fb_entry_remains, supa_data] = convert_entry(JSON.parse(JSON.stringify(fb_entry))) + if (Object.keys(processed_fb_entry_remains).length > 0) { + console.log({ fb_entry, processed_fb_entry_remains, supa_data }) + throw new Error('processed_fb_entry_remains not empty') + } + + const { entry, audio_speakers, audios, dialects, photos, sense_photos, sense_videos, senses, senses_in_sentences, sentences, videos, video_speakers, new_speaker_name, prior_import_id } = supa_data + const { id: entry_id, dictionary_id } = entry + + let sql_statements = '' + + const sql = insert_entry({ + dictionary_id, + entry, + entry_id, + import_id: prior_import_id || import_id, + }) + sql_statements += `\n${sql}` + + for (const audio of audios) { + const sql = upsert_audio({ dictionary_id, entry_id, audio, audio_id: audio.id, import_id }) + sql_statements += `\n${sql}` + + if (new_speaker_name) { + let new_speaker_id = dictionary_new_speakers[dictionary_id]?.[new_speaker_name] + + if (!new_speaker_id) { + new_speaker_id = randomUUID() + + const sql = upsert_speaker({ dictionary_id, speaker_id: new_speaker_id, speaker: { name: new_speaker_name, created_at: entry.created_at, created_by: entry.created_by }, import_id }) + sql_statements += `\n${sql}` + + if (!dictionary_new_speakers[dictionary_id]) + dictionary_new_speakers[dictionary_id] = { [new_speaker_name]: new_speaker_id } + else + dictionary_new_speakers[dictionary_id] = { ...dictionary_new_speakers[dictionary_id], [new_speaker_name]: new_speaker_id } + } + + const sql = assign_speaker({ + dictionary_id, + speaker_id: new_speaker_id, + media_id: audio.id, + media: 'audio', + import_id, + user_id: entry.created_by, + timestamp: entry.created_at, + }) + sql_statements += `\n${sql}` + } + } + + for (const audio_speaker of audio_speakers) { + if (speakers[audio_speaker.speaker_id]) { + const sql = assign_speaker({ + dictionary_id, + speaker_id: speakers[audio_speaker.speaker_id].supabase_id, + media_id: audio_speaker.audio_id, + media: 'audio', + import_id, + user_id: audio_speaker.created_by, + timestamp: audio_speaker.created_at, + }) + sql_statements += `\n${sql}` + } else { + log_once(`speaker ${audio_speaker.speaker_id} in ${dictionary_id}:${entry_id} not found`) + } + } + + for (const dialect of dialects) { + let dialect_id = dictionary_dialects[dictionary_id]?.[dialect] + + if (!dialect_id) { + dialect_id = randomUUID() + + const sql = insert_dialect({ dictionary_id, name: dialect, import_id, user_id: entry.created_by, timestamp: entry.created_at, dialect_id }) + sql_statements += `\n${sql}` + + if (!dictionary_dialects[dictionary_id]) + dictionary_dialects[dictionary_id] = { [dialect]: dialect_id } + else + dictionary_dialects[dictionary_id] = { ...dictionary_dialects[dictionary_id], [dialect]: dialect_id } + } + + const sql = assign_dialect({ dictionary_id, dialect_id, entry_id, import_id, user_id: entry.created_by, timestamp: entry.created_at }) + sql_statements += `\n${sql}` + } + + for (const sense of senses) { + const sql = insert_sense({ dictionary_id, entry_id, sense, sense_id: sense.id, import_id }) + sql_statements += `\n${sql}` + } + + for (const sentence of sentences) { + const { sense_id } = senses_in_sentences.find(s => s.sentence_id === sentence.id) + if (!sense_id) + throw new Error('sense_id not found') + const sql = insert_sentence({ dictionary_id, sense_id, sentence, sentence_id: sentence.id, import_id }) + sql_statements += `\n${sql}` + } + + for (const photo of photos) { + const { sense_id } = sense_photos.find(s => s.photo_id === photo.id) + if (!sense_id) + throw new Error('sense_id not found') + const sql = insert_photo({ dictionary_id, sense_id, photo, photo_id: photo.id, import_id }) + sql_statements += `\n${sql}` + } + + for (const video of videos) { + const { sense_id } = sense_videos.find(s => s.video_id === video.id) + if (!sense_id) + throw new Error('sense_id not found') + const sql = insert_video({ dictionary_id, sense_id, video, video_id: video.id, import_id }) + sql_statements += `\n${sql}` + } + + for (const video_speaker of video_speakers) { + const sql = assign_speaker({ + dictionary_id, + speaker_id: speakers[video_speaker.speaker_id].supabase_id, + media_id: video_speaker.video_id, + media: 'video', + import_id, + user_id: video_speaker.created_by, + timestamp: video_speaker.created_at, + }) + sql_statements += `\n${sql}` + } + + return sql_statements +} diff --git a/packages/scripts/migrate-to-supabase/notes.md b/packages/scripts/migrate-to-supabase/notes.md index 0547b9839..fdc62a7a2 100644 --- a/packages/scripts/migrate-to-supabase/notes.md +++ b/packages/scripts/migrate-to-supabase/notes.md @@ -1,32 +1,47 @@ # Migrate Entries and Speakers from Firestore to Supabase - -## TODO -- Move off Algolia fully onto local Orama + using Orama Cloud for (100K max*3 indexes) for large, public dictionaries + Onondaga - - solve bugs - - flip usage to using the new search but make Algolia still available as a second option -- On a new migration branch - - Make sure all items from "clean-up" below are being actively logged again as they are run into - - update migration script to migrate speakers across as they are needed, when one is found, save into speakers table, then create a map of firestore speaker id to supabase speaker id, in future times when this Firestore speaker id comes up, check the map first to see if speaker already exists - - figure out how different user ids (creater of speaker) between Firestore and Firebase will be handled and document - - run tests on migration - - visual inspection of the results locally - should work similar to current prod - - update saving functions - - make all types of edits -- Run migration process below - -## Migration Process -- post notice on logged-in users a week ahead of time -- send email notice a week ahead of time -- Lock down Firestore dictionary words and speakers using security rules (tell admins not to edit anything) -- Make Supabase backup -- Migrate data -- Test viewing -- Merge new saving methods code (this will be a natural unblock) -- Test editing entries -- Remove notice -- Email letting everyone know editing is available again +- Push migration +- Merge PR to unblock +- Test editing entries on live site +- Remove banner +- build Orama indexes in Cloudflare R2 for dictionaries over 1000 entries (try dictionaries from phone and test load speeds) + - run size check query on prod to get a few dictionaries +- Use cached Orama indexes from Cloudflare R2 if it exists ## Clean-up +- optimize searching for entries in the dictionary layout page (and error handling) +- check how the view is if an audio file does not have a speaker +- Delayed email letting everyone know editing is available again +- migrate dictionaries and setup materialized view with entry counts +- cached_data_store should set store value from cached items instead of waiting until all load is done. +- get semantic domains working in filters ( currently just filters out entries without a semantic domain) +- get exports working again +- create indexes using help from index_advisor https://supabase.com/docs/guides/database/extensions/index_advisor +- Orama: replaceState in createQueryParamStore? look into improving the history to change for view and page changes but not for the others +- look at print, table, gallery, and list page files history to make sure there are no missed improvements - check github history too +- drop content_updates' table column +- drop entry_updates +- ensure all auth users are brought over +- clean up old history data in content_updates +- make alternate writing systems of the sentence translations as different bcp keys (same as for glosses) +- get failed tests working again +- bring back in variants and tests that relied on old forms of test data +- look at deletedEntries to see if they should be saved somewhere +- rework about content loading in dictionary layout page +- test new db triggers, especially when deleting relationships +- change cb/ub ids on old senses from firebase ids to user_ids and then connect relationships +- look at how the quotes came through in arrays with strings (like sources in https://livingdictionaries.app/canichana/entry/ehRKCec3J4flzJhscXiQ) https://www.postgresql.org/message-id/CAEs%3D6DnhWbh5QfbZAZy6BdoGdLJ28MCoU1T6pAiZhw6Ze4gMUw%40mail.gmail.com +- search enzi in http://localhost:3041/sora/entries?q=%7B%22query%22%3A%22enz%22%2C%22view%22%3A%22gallery%22%7D will show no results and then pagination goes full bore +- remove `pnpm mixed` +- remove `pnpm -F scripts test:migration` +- Remove algolia keys from vercel +- cleaner format for content-updates and refactor current ones + +## Notes +- 1st manual backup was before any action +- 11:37 at 50, 13:54 at 100 = 2 min 17 seconds for 50 entries, 387000/50 = 7740 chunks, 7740 * 2:17 = 17492 minutes = 12 days (1440 minutes in a day), 18:30 at 200 +- didn't add 331 megabytes of content_updates to db just yet, rather save those sql queries aside for now to avoid upgrading to the $25/month +- `pnpm -F scripts run-migration` +- look through local orthographies - especially in the table view, `/birhor/entries?q=%7B"query"%3A"horomsi"%2C"view"%3A"table"%7D` ### No lexeme no lx for 0svukh699MsB4svuCDdO in ho diff --git a/packages/scripts/migrate-to-supabase/operations/constants.ts b/packages/scripts/migrate-to-supabase/operations/constants.ts new file mode 100644 index 000000000..ead0acf2e --- /dev/null +++ b/packages/scripts/migrate-to-supabase/operations/constants.ts @@ -0,0 +1,2 @@ +export const dictionary_id = 'import_dictionary' +export const content_update_endpoint = 'http://localhost:3041/api/db/content-update' diff --git a/packages/scripts/migrate-to-supabase/operations/operations.test.ts b/packages/scripts/migrate-to-supabase/operations/operations.test.ts new file mode 100644 index 000000000..603ae50de --- /dev/null +++ b/packages/scripts/migrate-to-supabase/operations/operations.test.ts @@ -0,0 +1,213 @@ +import type { TablesUpdate } from '@living-dictionaries/types' +import { anon_supabase, jacob_ld_user_id } from '../../config-supabase' +import { reset_db } from '../reset-db' +import { assign_dialect, assign_speaker, insert_dialect, insert_entry, insert_photo, insert_sense, insert_sentence, insert_video, upsert_audio, upsert_speaker } from './operations' +import { dictionary_id } from './constants' +import { test_timestamp } from './test-timestamp' + +vi.mock('node:crypto', () => { + const uuid_template = '11111111-1111-1111-1111-111111111111' + let current_uuid_index = 0 + + function incremental_consistent_uuid() { + return uuid_template.slice(0, -2) + (current_uuid_index++).toString().padStart(2, '0') + } + + return { + randomUUID: incremental_consistent_uuid, + } +}) + +const import_id = '1' + +async function seed_entry_and_sense() { + const { data } = await insert_entry({ dictionary_id, entry: { lexeme: { default: 'hi' } }, entry_id: '1', import_id }) + const { data: sense_data } = await insert_sense({ dictionary_id, entry_id: data.entry_id, sense: { glosses: { en: 'hello' } }, import_id }) + return { entry_id: data.entry_id, sense_id: sense_data.sense_id } +} + +describe('entries and senses', () => { + beforeAll(reset_db) + + describe(insert_entry, () => { + test('adds entry, adds sense, and deletes sense', async () => { + const lexeme = { default: 'hi' } + const { data } = await insert_entry({ dictionary_id, entry: { lexeme }, import_id, entry_id: '1' }) + expect(data?.import_id).toEqual('1') + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', data.entry_id).single() + expect(entry_view.dictionary_id).toEqual(dictionary_id) + expect(entry_view.dictionary_id).toEqual(dictionary_id) + expect(entry_view.main.lexeme).toEqual(lexeme) + expect(entry_view.senses).toBeNull() + const glosses = { en: 'hello' } + const { data: sense_save } = await insert_sense({ dictionary_id, entry_id: data.entry_id, sense: { + glosses, + }, import_id: '1' }) + const { data: entry_view2 } = await anon_supabase.from('entries_view').select().eq('id', data.entry_id).single() + expect(entry_view2.senses[0].glosses).toEqual(glosses) + + await insert_sense({ dictionary_id, entry_id: data.entry_id, sense: { deleted: 'true' }, sense_id: sense_save.sense_id, import_id }) + const { data: entry_view3 } = await anon_supabase.from('entries_view').select().eq('id', data.entry_id).single() + expect(entry_view3.senses).toBeNull() + }) + }) +}) + +describe(insert_dialect, () => { + beforeAll(reset_db) + + test('adds to dialects table, edits dialect, and connects to entry', async () => { + const name = 'Eastern' + const { data } = await insert_dialect({ dictionary_id, name, import_id, user_id: jacob_ld_user_id, timestamp: test_timestamp }) + expect(data?.import_id).toEqual('1') + const { data: dialect } = await anon_supabase.from('dialects').select('*').eq('id', data.dialect_id).single() + expect(dialect.name.default).toEqual(name) + expect(dialect.dictionary_id).toEqual(dictionary_id) + + const edited_name = 'Western' + await insert_dialect({ dictionary_id, name: edited_name, dialect_id: data.dialect_id, import_id, user_id: jacob_ld_user_id, timestamp: test_timestamp }) + const { data: edited_dialect } = await anon_supabase.from('dialects').select('name').eq('id', data.dialect_id).single() + expect(edited_dialect.name.default).toEqual(edited_name) + + const { entry_id } = await seed_entry_and_sense() + await assign_dialect({ dictionary_id, dialect_id: data.dialect_id, entry_id, import_id, user_id: jacob_ld_user_id, timestamp: test_timestamp }) + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', entry_id).single() + expect(entry_view.dialect_ids).toEqual([data.dialect_id]) + }) +}) + +describe(upsert_audio, () => { + beforeAll(reset_db) + + test('adds audio and displays properly in view', async () => { + const { entry_id } = await seed_entry_and_sense() + + const audio: TablesUpdate<'audio'> = { + created_at: '2019-08-27T05:06:40.796Z', + // created_by: 'Wr77x8C4e0PI3TMqOnJnJ7VmlLF3', + entry_id, + id: 'use-crypto-uuid-in-real-thing_2', + source: 'javier domingo', + storage_path: 'audio/dict_80CcDQ4DRyiYSPIWZ9Hy/0DyO0JQrRUVXPvVNLEyN_1566882399481.mpeg', + updated_at: '2019-08-27T05:06:40.796Z', + // updated_by: 'Wr77x8C4e0PI3TMqOnJnJ7VmlLF3', + } + await upsert_audio({ dictionary_id, entry_id, audio, import_id: '1' }) + + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', entry_id).single() + expect(entry_view.audios[0].source).toEqual(audio.source) + expect(entry_view.audios[0].storage_path).toEqual(audio.storage_path) + }) +}) + +describe(insert_sentence, () => { + beforeAll(reset_db) + + test('adds sentence and links to sense', async () => { + const { entry_id, sense_id } = await seed_entry_and_sense() + const { data } = await insert_sentence({ dictionary_id, sense_id, sentence: { text: { default: 'hello, this is my sentence' } }, import_id: '1' }) + + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', entry_id).single() + expect(entry_view.senses[0].sentence_ids).toEqual([data.sentence_id]) + }) +}) + +describe(insert_photo, () => { + beforeAll(reset_db) + + test('adds photo and links to sense', async () => { + const { entry_id, sense_id } = await seed_entry_and_sense() + const storage_path = 'bee/images/baz.jpeg' + const { data } = await insert_photo({ dictionary_id, photo: { serving_url: 'foo', source: 'Bob', storage_path }, sense_id }) + + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', entry_id).single() + expect(entry_view.senses[0].photo_ids).toEqual([data.photo_id]) + const { data: photo } = await anon_supabase.from('photos').select().eq('id', data.photo_id).single() + expect(photo.storage_path).toEqual(storage_path) + }) +}) + +describe(insert_video, () => { + beforeAll(reset_db) + + test('adds video and links to sense', async () => { + const { entry_id, sense_id } = await seed_entry_and_sense() + const { data } = await insert_video({ dictionary_id, video: { source: 'Bob', storage_path: 'baz.wbm' }, sense_id }) + + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', entry_id).single() + expect(entry_view.senses[0].video_ids).toEqual([data.video_id]) + }) +}) + +describe(upsert_speaker, () => { + beforeAll(reset_db) + + test('adds speaker to audio and to video', async () => { + const { entry_id, sense_id } = await seed_entry_and_sense() + const { data: speaker_change } = await upsert_speaker({ dictionary_id, speaker: { name: 'Bob', created_at: test_timestamp, created_by: jacob_ld_user_id }, import_id }) + + const { data: audio_change } = await upsert_audio({ dictionary_id, entry_id, audio: { storage_path: 'foo.mp3' } }) + await assign_speaker({ dictionary_id, speaker_id: speaker_change.speaker_id, media_id: audio_change.audio_id, media: 'audio', import_id, user_id: jacob_ld_user_id, timestamp: test_timestamp }) + + const { data: video_change } = await insert_video({ dictionary_id, video: { source: 'Bob Family', storage_path: 'baz.wbm' }, sense_id }) + await assign_speaker({ dictionary_id, speaker_id: speaker_change.speaker_id, media_id: video_change.video_id, media: 'video', import_id, user_id: jacob_ld_user_id, timestamp: test_timestamp }) + + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', entry_id).single() + expect(entry_view.audios[0].speaker_ids).toEqual([speaker_change.speaker_id]) + const { data: videos_view } = await anon_supabase.from('videos_view').select().eq('id', video_change.video_id).single() + expect(videos_view.speaker_ids).toEqual([speaker_change.speaker_id]) + }) +}) + +describe('entries have their updated_at timestamp updated whenever nested properties change', () => { + beforeEach(reset_db) + + describe('values which are props', () => { + test('audio', async () => { + const { entry_id } = await seed_entry_and_sense() + const { data: audio_change } = await upsert_audio({ dictionary_id, entry_id, audio: { storage_path: 'foo.mp3' } }) + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', entry_id).single() + expect(entry_view.updated_at).not.toEqual(entry_view.created_at) + expect(entry_view.updated_at).toEqual(audio_change.timestamp) + }) + + test('sense', async () => { + const { entry_id, sense_id } = await seed_entry_and_sense() + const { data: sense_change } = await insert_sense({ dictionary_id, entry_id, sense_id, sense: { glosses: { en: 'hi, again' } }, import_id }) + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', entry_id).single() + expect(entry_view.updated_at).toEqual(sense_change.timestamp) + }) + + test('dialect ids', async () => { + const { entry_id } = await seed_entry_and_sense() + const { data: dialect_addition } = await insert_dialect({ dictionary_id, name: 'Eastern', import_id, user_id: jacob_ld_user_id, timestamp: test_timestamp }) + const { data: dialect_assign } = await assign_dialect({ dictionary_id, dialect_id: dialect_addition.dialect_id, entry_id, import_id, user_id: jacob_ld_user_id, timestamp: test_timestamp }) + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', entry_id).single() + console.log({ entry_view, dialect_addition, dialect_assign }) + expect(entry_view.updated_at).toEqual(dialect_assign.timestamp) + }) + }) + + describe('id-related fields', () => { + test('sentence', async () => { + const { entry_id, sense_id } = await seed_entry_and_sense() + const { data: sentence_change } = await insert_sentence({ dictionary_id, sense_id, sentence: { text: { default: 'hi, this is my sentence' } } }) + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', entry_id).single() + expect(entry_view.updated_at).toEqual(sentence_change.timestamp) + }) + + test('photo', async () => { + const { entry_id, sense_id } = await seed_entry_and_sense() + const { data: photo_change } = await insert_photo({ dictionary_id, photo: { serving_url: 'foo', source: 'Bob', storage_path: 'bee/images/baz.jpeg' }, sense_id }) + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', entry_id).single() + expect(entry_view.updated_at).toEqual(photo_change.timestamp) + }) + + test('video', async () => { + const { entry_id, sense_id } = await seed_entry_and_sense() + const { data: video_change } = await insert_video({ dictionary_id, video: { source: 'Bob', storage_path: 'baz.wbm' }, sense_id }) + const { data: entry_view } = await anon_supabase.from('entries_view').select().eq('id', entry_id).single() + expect(entry_view.updated_at).toEqual(video_change.timestamp) + }) + }) +}) diff --git a/packages/scripts/migrate-to-supabase/operations/operations.ts b/packages/scripts/migrate-to-supabase/operations/operations.ts new file mode 100644 index 000000000..b54640852 --- /dev/null +++ b/packages/scripts/migrate-to-supabase/operations/operations.ts @@ -0,0 +1,266 @@ +import { randomUUID } from 'node:crypto' +import type { TablesInsert, TablesUpdate } from '@living-dictionaries/types' +import { prepare_sql } from '../save-content-update' + +export function insert_entry({ + dictionary_id, + entry, + entry_id, + import_id, +}: { + dictionary_id: string + entry: Omit, 'dictionary_id' | 'id'> + entry_id: string + import_id: string +}) { + return prepare_sql({ + update_id: randomUUID(), + auth_token: null, + dictionary_id, + entry_id, + type: 'insert_entry', + data: entry, + import_id, + }) +} + +export function insert_sense({ + dictionary_id, + entry_id, + sense, + sense_id, + import_id, +}: { + dictionary_id: string + entry_id: string + sense: Omit, 'dictionary_id' | 'id' | 'entry_id'> + sense_id: string + import_id: string +}) { + return prepare_sql({ + update_id: randomUUID(), + auth_token: null, + dictionary_id, + entry_id, + sense_id, + type: 'insert_sense', + data: sense, + import_id, + }) +} + +export function insert_dialect({ + dictionary_id, + name, + dialect_id, + import_id, + user_id, + timestamp, +}: { + dictionary_id: string + name: string + dialect_id: string + import_id: string + user_id: string + timestamp: string +}) { + return prepare_sql({ + update_id: randomUUID(), + auth_token: null, + dictionary_id, + dialect_id, + type: 'insert_dialect', + data: { + name: { + default: name, + }, + created_by: user_id, + created_at: timestamp, + }, + import_id, + }) +} + +export function assign_dialect({ + dictionary_id, + dialect_id, + entry_id, + import_id, + user_id, + timestamp, +}: { + dictionary_id: string + dialect_id: string + entry_id: string + import_id: string + user_id: string + timestamp: string +}) { + return prepare_sql({ + update_id: randomUUID(), + auth_token: null, + dictionary_id, + dialect_id, + entry_id, + type: 'assign_dialect', + data: { + created_by: user_id, + created_at: timestamp, + }, + import_id, + }) +} + +export function upsert_speaker({ + dictionary_id, + speaker, + speaker_id, + import_id, +}: { + dictionary_id: string + speaker: Omit, 'updated_by' | 'dictionary_id' | 'id'> + speaker_id: string + import_id: string +}) { + return prepare_sql({ + update_id: randomUUID(), + auth_token: null, + dictionary_id, + speaker_id, + type: 'upsert_speaker', + data: speaker, + import_id, + }) +} + +export function assign_speaker({ + dictionary_id, + speaker_id, + media_id, + media, + import_id, + user_id, + timestamp, +}: { + dictionary_id: string + speaker_id: string + media_id: string + media: 'audio' | 'video' + import_id: string + user_id: string + timestamp: string +}) { + return prepare_sql({ + update_id: randomUUID(), + auth_token: null, + data: { + created_by: user_id, + created_at: timestamp, + }, + dictionary_id, + speaker_id, + ...(media === 'audio' ? { audio_id: media_id } : { video_id: media_id }), + type: 'assign_speaker', + import_id, + }) +} + +export function upsert_audio({ + dictionary_id, + audio, + entry_id, + audio_id, + import_id, +}: { + dictionary_id: string + audio: Omit, 'updated_by' | 'dictionary_id' | 'id'> + entry_id: string + audio_id: string + import_id: string +}) { + return prepare_sql({ + update_id: randomUUID(), + auth_token: null, + dictionary_id, + entry_id, + audio_id, + type: 'upsert_audio', + data: audio, + import_id, + }) +} + +export function insert_sentence({ + dictionary_id, + sense_id, + sentence, + sentence_id, + import_id, +}: { + dictionary_id: string + sense_id: string + sentence: TablesInsert<'sentences'> + sentence_id: string + import_id: string +}) { + return prepare_sql({ + update_id: randomUUID(), + auth_token: null, + dictionary_id, + sentence_id, + sense_id, + type: 'insert_sentence', + data: sentence, + import_id, + }) +} + +export function insert_photo({ + dictionary_id, + photo, + sense_id, + photo_id, + import_id, +}: { + dictionary_id: string + photo: Omit, 'updated_by' | 'dictionary_id' | 'id'> + sense_id: string + photo_id: string + import_id: string +}) { + return prepare_sql({ + update_id: randomUUID(), + auth_token: null, + dictionary_id, + sense_id, + photo_id, + type: 'insert_photo', + data: photo, + import_id, + }) +} + +export function insert_video({ + dictionary_id, + video, + sense_id, + video_id, + import_id, +}: { + dictionary_id: string + video: TablesUpdate<'videos'> + sense_id: string + video_id: string + import_id: string +}) { + return prepare_sql({ + update_id: randomUUID(), + auth_token: null, + dictionary_id, + sense_id, + video_id, + type: 'insert_video', + data: video, + import_id, + }) +} diff --git a/packages/scripts/migrate-to-supabase/operations/test-timestamp.ts b/packages/scripts/migrate-to-supabase/operations/test-timestamp.ts new file mode 100644 index 000000000..7c1332ac1 --- /dev/null +++ b/packages/scripts/migrate-to-supabase/operations/test-timestamp.ts @@ -0,0 +1 @@ +export const test_timestamp: string = null diff --git a/packages/scripts/migrate-to-supabase/operations/utils.ts b/packages/scripts/migrate-to-supabase/operations/utils.ts new file mode 100644 index 000000000..9ee2c343f --- /dev/null +++ b/packages/scripts/migrate-to-supabase/operations/utils.ts @@ -0,0 +1,6 @@ +const uuid_template = '11111111-1111-1111-1111-111111111111' +let current_uuid_index = 0 + +export function incremental_consistent_uuid() { + return uuid_template.slice(0, -2) + (current_uuid_index++).toString().padStart(2, '0') +} diff --git a/packages/scripts/migrate-to-supabase/reset-db.ts b/packages/scripts/migrate-to-supabase/reset-db.ts new file mode 100644 index 000000000..7b7bf484a --- /dev/null +++ b/packages/scripts/migrate-to-supabase/reset-db.ts @@ -0,0 +1,17 @@ +// import { readFileSync } from 'node:fs' +import { jacob_ld_user_id, postgres } from '../config-supabase' + +export async function reset_db() { + console.info('reseting db from seed sql') + + await postgres.execute_query(`truncate table auth.users cascade;`) + await postgres.execute_query('truncate table senses cascade;') + + // const seedFilePath = '../../supabase/seed.sql' + // const seed_sql = readFileSync(seedFilePath, 'utf8') + // await postgres.execute_query(seed_sql) + + const add_user_sql = `INSERT INTO auth.users ("aud", "email", "id", "instance_id", "role") VALUES +('authenticated', 'jacob@livingtongues.org', '${jacob_ld_user_id}', '00000000-0000-0000-0000-000000000000', 'authenticated');` + await postgres.execute_query(add_user_sql) +} diff --git a/packages/scripts/migrate-to-supabase/run-migration.ts b/packages/scripts/migrate-to-supabase/run-migration.ts new file mode 100644 index 000000000..1e1dac4e6 --- /dev/null +++ b/packages/scripts/migrate-to-supabase/run-migration.ts @@ -0,0 +1,198 @@ +import fs, { writeFileSync } from 'node:fs' +import path from 'node:path' +import { fileURLToPath } from 'node:url' +import { access } from 'node:fs/promises' +import type { GoogleAuthUserMetaData, IUser } from '@living-dictionaries/types' +import Chain from 'stream-chain' +import Parser from 'stream-json' +import StreamArray from 'stream-json/streamers/StreamArray' +import type { UserRecord } from 'firebase-admin/auth' +import { admin_supabase, postgres } from '../config-supabase' +import type { AllSpeakerData } from './migrate-entries' +import { load_speakers, migrate_entry } from './migrate-entries' +import { remove_seconds_underscore } from './utils/remove-seconds-underscore' +import { load_fb_to_sb_user_ids } from './get-user-id' +import { write_users_insert } from './write-users-insert' + +const FOLDER = 'firestore-data' + +const __dirname = path.dirname(fileURLToPath(import.meta.url)) + +function local_filepath(filename: string): string { + return path.join(__dirname, FOLDER, filename) +} + +async function file_exists(filename: string): Promise { + try { + await access(local_filepath(filename), fs.constants.F_OK) + return true + } catch { + return false + } +} + +// run_migration({ start_index: 2233, batch_size: 47767 }) + +async function run_migration({ start_index, batch_size }: { start_index: number, batch_size: number }) { + console.log({ start_index, batch_size }) + + // if local + // await seed_local_db_with_production_data() + + // const entries_downloaded = await file_exists('firestore-entries.json') + // if (!entries_downloaded) + // await write_entries() + // const speakers_downloaded = await file_exists('firestore-speakers.json') + // if (!speakers_downloaded) + // await write_speakers() + // const users_downloaded = await file_exists('firestore-users.json') + // if (!users_downloaded) + // await write_users() + + // if (start_index === 0) { + // await write_fb_sb_mappings() // user mappings + // } + + await load_fb_to_sb_user_ids() + + // if (start_index === 0) { + // await migrate_speakers() // speaker mappings + // } + + const fb_to_sb_speakers = await load_speakers() + await migrate_all_entries({ fb_to_sb_speakers, start_index, batch_size }) +} + +async function migrate_all_entries({ fb_to_sb_speakers, start_index, batch_size }: { fb_to_sb_speakers: AllSpeakerData, start_index: number, batch_size: number }) { + const { data: dialects } = await admin_supabase.from('dialects').select('id, name, dictionary_id') + const dictionary_dialects: Record> = dialects.reduce((acc: Record>, { id, name, dictionary_id }) => { + if (!acc[dictionary_id]) { + acc[dictionary_id] = {} + } + acc[dictionary_id][name.default] = id + return acc + }, {}) + + const { data: speakers_added_to_sb_by_name } = await admin_supabase.from('speakers').select('id, name, dictionary_id') + const dictionary_new_speakers: Record> = speakers_added_to_sb_by_name.reduce((acc: Record>, { id, name, dictionary_id }) => { + if (!acc[dictionary_id]) { + acc[dictionary_id] = {} + } + acc[dictionary_id][name] = id + return acc + }, {}) + + const pipeline = Chain.chain([ + fs.createReadStream('./migrate-to-supabase/firestore-data/firestore-entries.json'), + Parser.parser(), + StreamArray.streamArray(), + ]) + + const end_index = start_index + batch_size + let index = 0 + let current_dictionary_entry_id = '' + let sql_query = 'BEGIN;' // Start a transaction + + try { + for await (const { value: fb_entry } of pipeline) { + if (index >= start_index && index < end_index) { + current_dictionary_entry_id = `${fb_entry.dictionary_id}/${fb_entry.id}` + const seconds_corrected_entry = remove_seconds_underscore(fb_entry) + console.info(index) + const sql_statements = migrate_entry(seconds_corrected_entry, fb_to_sb_speakers, dictionary_dialects, dictionary_new_speakers) + sql_query += `${sql_statements}\n` + + if (index % 500 === 0) + console.log(`import reached ${index}`) + } + index++ + } + } catch (err) { + console.log(`error at index ${index}: _ROOT_/${current_dictionary_entry_id}, ${err}`) + console.error(err) + } finally { + pipeline.destroy() + pipeline.input.destroy() + } + + sql_query += '\nCOMMIT;' // End the transaction + + try { + writeFileSync(`./logs/${Date.now()}_${start_index}-${start_index + batch_size}-query.sql`, sql_query) + console.log('executing sql query') + await postgres.execute_query(sql_query) + console.log('finished') + } catch (err) { + console.error(err) + await postgres.execute_query('ROLLBACK;') // Rollback the transaction in case of error + } +} + +// async function seed_local_db_with_production_data() { +// console.log('Seeding local db with production data') +// await postgres.execute_query(`truncate table auth.users cascade;`) +// await postgres.execute_query('truncate table entry_updates cascade;') +// await postgres.execute_query(readFileSync('../../supabase/seeds/backup-after-2232-imported-ready-for-local.sql', 'utf8')) +// } + +async function write_fb_sb_mappings() { + console.log('writing user mappings') + const firebase_uid_to_supabase_user_id: Record = {} + const { data: sb_users_1 } = await admin_supabase.from('user_emails') + .select('id, email') + .order('id', { ascending: true }) + .range(0, 999) + const { data: sb_users_2 } = await admin_supabase.from('user_emails') + .select('id, email') + .order('id', { ascending: true }) + .range(1000, 1999) + + const sb_users = [...sb_users_1, ...sb_users_2] + + const supabase_users_not_in_firebase = new Set(sb_users.map(sb_user => sb_user.email)) + const unmatched_firebase = [] + + const firebase_users = (await import('./firestore-data/firestore-users.json')).default + + for (const fb_user of firebase_users) { + const matching_sb_user = sb_users.find(sb_user => sb_user.email === fb_user.email) + + if (matching_sb_user) { + firebase_uid_to_supabase_user_id[fb_user.uid] = matching_sb_user.id + supabase_users_not_in_firebase.delete(matching_sb_user.email) + } else { + const sql = write_users_insert([fb_user as UserRecord]) + console.log(sql) + // await execute_query(sql) + + // const new_sb_user_id = await save_user_to_supabase(fb_user as UserRecord) + // firebase_uid_to_supabase_user_id[fb_user.uid] = new_sb_user_id + } + } + + console.log({ unmatched_firebase: unmatched_firebase.length, sb_users: sb_users.length, firebase_users: firebase_users.length, supabase_users_not_in_firebase: supabase_users_not_in_firebase.size }) + + fs.writeFileSync(path.resolve(__dirname, FOLDER, 'fb-sb-user-ids.json'), JSON.stringify(firebase_uid_to_supabase_user_id, null, 2)) +} + +async function save_user_to_supabase(user: UserRecord): Promise { + const { data, error } = await admin_supabase.auth.admin.createUser({ + email: user.email, + email_confirm: user.emailVerified, + app_metadata: { fb_uid: user.uid }, + user_metadata: get_firebase_user_meta_data(user), + }) + if (error) + throw new Error(`Error creating user: ${user.email}`) + console.info({ created: data.user.email }) + return data?.user?.id +} + +function get_firebase_user_meta_data({ displayName, photoURL }: IUser) { + const metadata: GoogleAuthUserMetaData = {} + if (displayName) + metadata.full_name = displayName + if (photoURL) + metadata.avatar_url = photoURL + return metadata +} diff --git a/packages/scripts/migrate-to-supabase/save-content-update.ts b/packages/scripts/migrate-to-supabase/save-content-update.ts new file mode 100644 index 000000000..e470f4e10 --- /dev/null +++ b/packages/scripts/migrate-to-supabase/save-content-update.ts @@ -0,0 +1,216 @@ +import fs from 'node:fs' +import type { ContentImportBody } from '@living-dictionaries/types/supabase/content-import.interface' +import { jacob_ld_user_id } from '../config-supabase' +import { sql_file_string } from './to-sql-string' + +const content_update_file = fs.createWriteStream(`./logs/${Date.now()}_content-updates.json`, { flags: 'w' }) // 'a' to append, 'w' to truncate the file every time the process starts. +content_update_file.write('[\n') + +const yesterday = new Date(Date.now() - 24 * 60 * 60 * 1000) +let milliseconds_to_add = 0 + +function millisecond_incrementing_timestamp(): string { + milliseconds_to_add += 1 + return new Date(yesterday.getTime() + milliseconds_to_add).toISOString() +} + +export function prepare_sql(body: ContentImportBody) { + console.info(body) + + let sql_statements = '' + + const { update_id, dictionary_id, import_id, type, data } = body + + const created_at = data?.created_at || millisecond_incrementing_timestamp() + // @ts-expect-error + const updated_at = data?.updated_at || created_at + + // @ts-expect-error + const created_by = data?.created_by || jacob_ld_user_id + // @ts-expect-error + const updated_by = data?.updated_by || created_by + + const c_u_meta = { + created_by, + updated_by, + created_at, + updated_at, + } + + const c_meta = { + created_by, + created_at, + } + + if (type === 'insert_entry') { + const sql = sql_file_string('entries', { + ...data, + ...c_u_meta, + dictionary_id, + id: body.entry_id, + }, 'UPSERT') + sql_statements += `\n${sql}` + } + + if (type === 'insert_sense') { + const sql = sql_file_string('senses', { + ...data, + ...c_u_meta, + entry_id: body.entry_id, + id: body.sense_id, + }) + sql_statements += `\n${sql}` + } + + if (type === 'insert_dialect') { + const sql = sql_file_string('dialects', { + ...data, + ...c_u_meta, + dictionary_id, + id: body.dialect_id, + }) + sql_statements += `\n${sql}` + } + + if (type === 'assign_dialect') { + const sql = sql_file_string('entry_dialects', { + ...c_meta, + dialect_id: body.dialect_id, + entry_id: body.entry_id, + }) + sql_statements += `\n${sql}` + } + + if (type === 'upsert_speaker') { + const sql = sql_file_string('speakers', { + ...data, + ...c_u_meta, + dictionary_id, + id: body.speaker_id, + }) + sql_statements += `\n${sql}` + } + + if (type === 'assign_speaker' && body.audio_id) { + const sql = sql_file_string('audio_speakers', { + ...c_meta, + speaker_id: body.speaker_id, + audio_id: body.audio_id, + }) + sql_statements += `\n${sql}` + } + + if (type === 'assign_speaker' && body.video_id) { + const sql = sql_file_string('video_speakers', { + ...c_meta, + speaker_id: body.speaker_id, + video_id: body.video_id, + }) + sql_statements += `\n${sql}` + } + + if (type === 'insert_sentence') { + const sql = sql_file_string('sentences', { + ...data, + ...c_u_meta, + dictionary_id, + id: body.sentence_id, + }) + sql_statements += `\n${sql}` + + const sql2 = sql_file_string('senses_in_sentences', { + ...c_meta, + sentence_id: body.sentence_id, + sense_id: body.sense_id, + }) + sql_statements += `\n${sql2}` + } + + if (type === 'upsert_audio') { + const sql = sql_file_string('audio', { + ...data, + ...c_u_meta, + dictionary_id, + id: body.audio_id, + entry_id: body.entry_id, + }) + sql_statements += `\n${sql}` + } + + if (type === 'insert_photo') { + const sql = sql_file_string('photos', { + ...data, + ...c_u_meta, + dictionary_id, + id: body.photo_id, + }) + sql_statements += `\n${sql}` + + const sql2 = sql_file_string('sense_photos', { + ...c_meta, + photo_id: body.photo_id, + sense_id: body.sense_id, + }) + sql_statements += `\n${sql2}` + } + + if (type === 'insert_video') { + const sql = sql_file_string('videos', { + ...data, + ...c_u_meta, + dictionary_id, + id: body.video_id, + }) + sql_statements += `\n${sql}` + + const sql2 = sql_file_string('sense_videos', { + ...c_meta, + video_id: body.video_id, + sense_id: body.sense_id, + }) + sql_statements += `\n${sql2}` + } + + const data_without_ids = { ...data } + delete data_without_ids.id + delete data_without_ids.dictionary_id + delete data_without_ids.entry_id + delete data_without_ids.sense_id + delete data_without_ids.created_at + delete data_without_ids.created_by + delete data_without_ids.updated_at + delete data_without_ids.updated_by + + const content_update = { + id: update_id, + user_id: updated_by, + dictionary_id, + timestamp: updated_at, + import_id, + type, + data: Object.keys(data_without_ids)?.length ? data_without_ids : null, + // @ts-expect-error - avoiding verbosity but requires manual type checking + ...(body.audio_id && { audio_id: body.audio_id }), + // @ts-expect-error + ...(body.dialect_id && { dialect_id: body.dialect_id }), + // @ts-expect-error + ...(body.entry_id && { entry_id: body.entry_id }), + // @ts-expect-error + ...(body.photo_id && { photo_id: body.photo_id }), + // @ts-expect-error + ...(body.sense_id && { sense_id: body.sense_id }), + // @ts-expect-error + ...(body.sentence_id && { sentence_id: body.sentence_id }), + // @ts-expect-error + ...(body.speaker_id && { speaker_id: body.speaker_id }), + // @ts-expect-error + ...(body.text_id && { text_id: body.text_id }), + // @ts-expect-error + ...(body.video_id && { video_id: body.video_id }), + // This is the properly typed version but much more verbose as requires one for each change type + // ...(type === 'insert_sense' && { sense_id: body.sense_id, entry_id: body.entry_id }), + } + content_update_file.write(`${JSON.stringify(content_update)},\n`) + + return sql_statements +} diff --git a/packages/scripts/migrate-to-supabase/save-firestore-data.ts b/packages/scripts/migrate-to-supabase/save-firestore-data.ts new file mode 100644 index 000000000..959e3c04d --- /dev/null +++ b/packages/scripts/migrate-to-supabase/save-firestore-data.ts @@ -0,0 +1,56 @@ +import fs from 'node:fs' +import path, { dirname } from 'node:path' +import { fileURLToPath } from 'node:url' +import type { ActualDatabaseEntry } from '@living-dictionaries/types/entry.interface' +import type { ISpeaker } from '@living-dictionaries/types/speaker.interface' +import { db } from '../config-firebase' +import { get_users } from './auth' + +const FOLDER = 'firestore-data' +const __dirname = dirname(fileURLToPath(import.meta.url)) + +export async function write_entries() { + const entries: ActualDatabaseEntry[] = [] + + const dict_snapshot = await db.collection('dictionaries').get() + + for (const { id: dictionary_id } of dict_snapshot.docs) { + console.log(dictionary_id) + // const allow = /^[a].*/ + // if (!allow.test(dictionary_id.toLowerCase())) continue + + const snapshot = await db.collection(`dictionaries/${dictionary_id}/words`).get() + + for (const snap of snapshot.docs) { + const entry = { id: snap.id, dictionary_id, ...(snap.data() as ActualDatabaseEntry) } + entries.push(entry) + } + } + + console.log(`Done fetching ${entries.length} entries from ${dict_snapshot.docs.length} dictionaries.`) + + fs.writeFileSync(path.resolve(__dirname, FOLDER, 'firestore-entries.json'), JSON.stringify(entries, null, 2)) +} + +export async function write_speakers() { + const speakers: ISpeaker[] = [] + + const speaker_snapshots = await db.collection('speakers').get() + + for (const speaker_snap of speaker_snapshots.docs) { + const speaker = { id: speaker_snap.id, ...(speaker_snap.data() as ISpeaker) } + speakers.push(speaker) + } + + console.log(`Done fetching ${speakers.length} speakers.`) + + fs.writeFileSync(path.resolve(__dirname, FOLDER, 'firestore-speakers.json'), JSON.stringify(speakers, null, 2)) +} + +export async function write_users() { + const users = await get_users() + + console.log(`Done fetching ${users.length} users.`) + + fs.writeFileSync(path.resolve(__dirname, FOLDER, 'firestore-users.json'), JSON.stringify(users, null, 2)) +} diff --git a/packages/scripts/migrate-to-supabase/to-sql-string.ts b/packages/scripts/migrate-to-supabase/to-sql-string.ts new file mode 100644 index 000000000..bb88fc72c --- /dev/null +++ b/packages/scripts/migrate-to-supabase/to-sql-string.ts @@ -0,0 +1,15 @@ +import type { Database, TablesInsert } from '@living-dictionaries/types' +import { convert_to_sql_string } from '../../site/src/lib/mocks/seed/to-sql-string' + +export function sql_file_string(table_name: Table, row: TablesInsert
, operation: 'INSERT' | 'UPSERT' = 'INSERT') { + const column_names = Object.keys(row).sort() + const column_names_string = `"${column_names.join('", "')}"` + + const values = column_names.map(column => convert_to_sql_string(row[column])) + const values_string = `(${values.join(', ')})` + if (operation === 'INSERT') { + return `INSERT INTO ${table_name} (${column_names_string}) VALUES\n${values_string};` + } else if (operation === 'UPSERT') { + return `INSERT INTO ${table_name} (${column_names_string}) VALUES\n${values_string}\nON CONFLICT (id) DO UPDATE SET ${column_names.map(column => `"${column}" = EXCLUDED."${column}"`).join(', ')};` + } +} diff --git a/packages/scripts/migrate-to-supabase/utils/remove-seconds-underscore.ts b/packages/scripts/migrate-to-supabase/utils/remove-seconds-underscore.ts new file mode 100644 index 000000000..d2af613d7 --- /dev/null +++ b/packages/scripts/migrate-to-supabase/utils/remove-seconds-underscore.ts @@ -0,0 +1,37 @@ +import type { ActualDatabaseEntry } from '@living-dictionaries/types/entry.interface' + +export function remove_seconds_underscore(entry: ActualDatabaseEntry & Record) { + // @ts-expect-error + if (entry.updatedAt?._seconds) { + // @ts-expect-error + entry.updatedAt = { + // @ts-expect-error + seconds: entry.updatedAt._seconds, + } + } + // @ts-expect-error + if (entry.createdAt?._seconds) { + // @ts-expect-error + entry.createdAt = { + // @ts-expect-error + seconds: entry.createdAt._seconds, + } + } + // @ts-expect-error + if (entry.ua?._seconds) { + // @ts-expect-error + entry.ua = { + // @ts-expect-error + seconds: entry.ua._seconds, + } + } + // @ts-expect-error + if (entry.ca?._seconds) { + // @ts-expect-error + entry.ca = { + // @ts-expect-error + seconds: entry.ca._seconds, + } + } + return entry +} diff --git a/packages/scripts/migrate-to-supabase/write-users-insert.ts b/packages/scripts/migrate-to-supabase/write-users-insert.ts index 4b3f5df2d..74e503136 100644 --- a/packages/scripts/migrate-to-supabase/write-users-insert.ts +++ b/packages/scripts/migrate-to-supabase/write-users-insert.ts @@ -1,9 +1,10 @@ -import { UserRecord } from 'firebase-admin/auth'; +import type { UserRecord } from 'firebase-admin/auth' + const POSTGRES_NOW = 'NOW()' const POSTGRESS_UUID_GENERATE_V4 = 'uuid_generate_v4()' export function write_users_insert(users: UserRecord[]) { - const user_rows = users.map(user => { + const user_rows = users.map((user) => { return { instance_id: '00000000-0000-0000-0000-000000000000', id: POSTGRESS_UUID_GENERATE_V4, @@ -26,7 +27,7 @@ function write_sql_insert(table_name: string, rows: object[]) { const column_names = Object.keys(rows[0]).sort() const column_names_string = `"${column_names.join('", "')}"` - const values_string = rows.map(row => { + const values_string = rows.map((row) => { // @ts-expect-error const values = column_names.map(column => convert_to_sql_string(row[column])) return `(${values.join(', ')})` @@ -37,7 +38,7 @@ function write_sql_insert(table_name: string, rows: object[]) { function convert_to_sql_string(value: string | number | object) { if (value === POSTGRES_NOW || value === POSTGRESS_UUID_GENERATE_V4) - return value; + return value if (typeof value === 'boolean') return `${value}` @@ -56,75 +57,60 @@ function convert_to_sql_string(value: string | number | object) { if (import.meta.vitest) { const users: UserRecord[] = [ - { 'uid': '024bvoAhcSaAiBfZ8Um2KQaQRc92', - 'email': 'robert@me.org', - 'emailVerified': true, - 'disabled': false, - 'metadata': { - 'lastSignInTime': 'Thu, 08 Jun 2023 04:42:14 GMT', - 'creationTime': 'Thu, 08 Jun 2023 04:42:14 GMT', - 'lastRefreshTime': 'Thu, 08 Jun 2023 04:42:14 GMT', - }, - 'tokensValidAfterTime': 'Thu, 08 Jun 2023 04:42:14 GMT', - 'providerData': [{ 'email': 'robert@me.org', 'providerId': 'password' }], - }, - {'uid':'0FCdmOc6qlWuKxFkKPi7VeC2mp52', - 'email':'bob@gmail.com', - 'emailVerified':false, - 'displayName':'Bob D\'Smith', - 'photoURL':'https://lh3.googleusercontent.com/a-/AOh14Gg-GMlUaNPYaSYvzMEjyHW9Q5PAngePLc26LsI4=s96-c', - 'disabled':false, - 'metadata':{ - 'lastSignInTime':'Fri, 12 Mar 2021 21:04:29 GMT', - 'creationTime':'Tue, 29 Dec 2020 00:08:26 GMT', - 'lastRefreshTime':null - }, - 'tokensValidAfterTime':'Thu, 18 Mar 2021 08:26:40 GMT', - 'providerData':[{'displayName':'Bob Smith','email':'bob@gmail.com','photoURL':'https://lh3.googleusercontent.com/a-/AOh14Gg-GMlUaNPYaSYvzMEjyHW9Q5PAngePLc26LsI4=s96-c','providerId':'google.com'}]} - ] as UserRecord[]; + { uid: '024bvoAhcSaAiBfZ8Um2KQaQRc92', email: 'robert@me.org', emailVerified: true, disabled: false, metadata: { + lastSignInTime: 'Thu, 08 Jun 2023 04:42:14 GMT', + creationTime: 'Thu, 08 Jun 2023 04:42:14 GMT', + lastRefreshTime: 'Thu, 08 Jun 2023 04:42:14 GMT', + }, tokensValidAfterTime: 'Thu, 08 Jun 2023 04:42:14 GMT', providerData: [{ email: 'robert@me.org', providerId: 'password' }] }, + { uid: '0FCdmOc6qlWuKxFkKPi7VeC2mp52', email: 'bob@gmail.com', emailVerified: false, displayName: 'Bob D\'Smith', photoURL: 'https://lh3.googleusercontent.com/a-/AOh14Gg-GMlUaNPYaSYvzMEjyHW9Q5PAngePLc26LsI4=s96-c', disabled: false, metadata: { + lastSignInTime: 'Fri, 12 Mar 2021 21:04:29 GMT', + creationTime: 'Tue, 29 Dec 2020 00:08:26 GMT', + lastRefreshTime: null, + }, tokensValidAfterTime: 'Thu, 18 Mar 2021 08:26:40 GMT', providerData: [{ displayName: 'Bob Smith', email: 'bob@gmail.com', photoURL: 'https://lh3.googleusercontent.com/a-/AOh14Gg-GMlUaNPYaSYvzMEjyHW9Q5PAngePLc26LsI4=s96-c', providerId: 'google.com' }] }, + ] as UserRecord[] test(write_users_insert, () => { - expect(write_users_insert(users)).toMatchFileSnapshot('./users-js.sql'); - }); + expect(write_users_insert(users)).toMatchFileSnapshot('./users-js.sql') + }) } function convert_utc_string_to_timestamp(dateString: string) { - const date = new Date(dateString); - const isoString = date.toISOString(); - return isoString.replace('T', ' ').replace('Z', '1+00'); // if decimal are all zeros as they are in coming from Firebase, postgres will reject the timestamp so we must remove it or add a final 1 + const date = new Date(dateString) + const isoString = date.toISOString() + return isoString.replace('T', ' ').replace('Z', '1+00') // if decimal are all zeros as they are in coming from Firebase, postgres will reject the timestamp so we must remove it or add a final 1 } if (import.meta.vitest) { test('times', () => { - expect(convert_utc_string_to_timestamp('Fri, 12 Mar 2021 21:04:29 GMT')).toEqual('2021-03-12 21:04:29.0001+00'); - expect(convert_utc_string_to_timestamp('Thu, 08 Jun 2023 04:42:14 GMT')).toEqual('2023-06-08 04:42:14.0001+00'); - }); + expect(convert_utc_string_to_timestamp('Fri, 12 Mar 2021 21:04:29 GMT')).toEqual('2021-03-12 21:04:29.0001+00') + expect(convert_utc_string_to_timestamp('Thu, 08 Jun 2023 04:42:14 GMT')).toEqual('2023-06-08 04:42:14.0001+00') + }) } -function get_firebase_app_meta_data({providerData, uid}: UserRecord) { - const providers = providerData.map(({providerId}) => { +function get_firebase_app_meta_data({ providerData, uid }: UserRecord) { + const providers = providerData.map(({ providerId }) => { if (providerId === 'password') - return 'email'; + return 'email' if (providerId === 'google.com') - return 'google'; - return 'email'; + return 'google' + return 'email' }) - return `{"provider": "${providers[0]}","providers":["${providers.join('","')}"], "fb_uid": "${uid}"}`; + return `{"provider": "${providers[0]}","providers":["${providers.join('","')}"], "fb_uid": "${uid}"}` } -function get_firebase_user_meta_data({displayName, photoURL}: UserRecord) { - const escapedDisplayName = displayName ? escape_apostrophes(displayName) : ''; +function get_firebase_user_meta_data({ displayName, photoURL }: UserRecord) { + const escapedDisplayName = displayName ? escape_apostrophes(displayName) : '' if (!escapedDisplayName && !photoURL) - return '{}'; + return '{}' if (!escapedDisplayName) - return `{"avatar_url":"${photoURL}"}`; + return `{"avatar_url":"${photoURL}"}` if (!photoURL) - return `{"full_name": "${escapedDisplayName}"}`; - return `{"full_name": "${escapedDisplayName}","avatar_url":"${photoURL}"}`; + return `{"full_name": "${escapedDisplayName}"}` + return `{"full_name": "${escapedDisplayName}","avatar_url":"${photoURL}"}` } function escape_apostrophes(str: string): string { - return str.replace(/'/g, '\'\''); + return str.replace(/'/g, '\'\'') } diff --git a/packages/scripts/package.json b/packages/scripts/package.json index d63d83fd1..22ed27e61 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -14,7 +14,7 @@ }, "main": "index.ts", "scripts": { - "fetch-entries": "tsx migrate-to-supabase/fetch-entries.ts -e prod", + "run-migration": "tsx migrate-to-supabase/run-migration.ts -e prod", "migrate-users": "tsx migrate-to-supabase/auth.ts", "countAllEntries": "tsx countAllEntries.ts", "getEmails": "tsx refactor/get-email.ts -e prod", @@ -24,18 +24,15 @@ "importDictionary:dev:dry": "tsx import/import.ts --id tseltal", "importDictionary:dev:live": "tsx import/import.ts --id tseltal --live", "importDictionary:prod:live": "tsx import/import.ts --id tseltal -e prod --live", - "addDictionariesToIndex:dev": "tsx algolia/addDictionariesToIndex.ts dev", - "addDictionariesToIndex:prod": "tsx algolia/addDictionariesToIndex.js prod", - "updateIndex": "tsx algolia/updateIndex.ts -e prod", - "test": "vitest" + "test": "vitest", + "test:migration": "vitest --config ./vitest.config.migration.ts" }, "devDependencies": { - "@living-dictionaries/functions": "workspace:^0.0.1", "@living-dictionaries/site": "workspace:^0.0.1", - "@living-dictionaries/types": "^1.0.0", + "@living-dictionaries/types": "workspace:^1.0.0", "@supabase/supabase-js": "^2.38.4", "@types/node": "^18.11.18", - "@types/pg": "^8.10.9", + "@types/pg": "^8.11.8", "@types/stream-chain": "^2.1.0", "@types/stream-json": "^1.7.7", "algoliasearch": "^4.11.0", @@ -50,8 +47,8 @@ "pg": "^8.11.3", "stream-chain": "^2.2.5", "stream-json": "^1.8.0", - "tsx": "^4.7.1", + "tsx": "^4.19.0", "typescript": "~5.1.6", - "vitest": "^1.4.0" + "vitest": "^2.1.3" } } diff --git a/packages/scripts/record-logs.ts b/packages/scripts/record-logs.ts new file mode 100644 index 000000000..42ca148f1 --- /dev/null +++ b/packages/scripts/record-logs.ts @@ -0,0 +1,11 @@ +import fs from 'node:fs' + +const logFile = fs.createWriteStream(`./logs/${Date.now()}.txt`, { flags: 'w' }) // 'a' to append, 'w' to truncate the file every time the process starts. +console.log = function (data: any) { + logFile.write(`${JSON.stringify(data)}\n`) + process.stdout.write(`${JSON.stringify(data)}\n`) +} +const postFile = fs.createWriteStream(`./logs/${Date.now()}_post_requests.txt`, { flags: 'w' }) // 'a' to append, 'w' to truncate the file every time the process starts. +console.info = function (data: any) { + postFile.write(`${JSON.stringify(data)}\n`) +} diff --git a/packages/scripts/vitest.config.migration.ts b/packages/scripts/vitest.config.migration.ts new file mode 100644 index 000000000..bfd63ffa6 --- /dev/null +++ b/packages/scripts/vitest.config.migration.ts @@ -0,0 +1,15 @@ +import { defineConfig } from 'vitest/config' + +// run separately from other unit tests because it requires local Supabase running +export default defineConfig({ + test: { + name: 'scripts:migration', + globals: true, + poolOptions: { + threads: { + singleThread: true, + }, + }, + include: ['migrate-to-supabase/**/*.test.ts'], + }, +}) diff --git a/packages/scripts/vitest.config.ts b/packages/scripts/vitest.config.ts index df66a8db5..686dcd3b5 100644 --- a/packages/scripts/vitest.config.ts +++ b/packages/scripts/vitest.config.ts @@ -1,9 +1,10 @@ -import { defineProject } from 'vitest/config'; +import { defaultExclude, defineProject } from 'vitest/config' export default defineProject({ test: { name: 'scripts:unit', globals: true, - includeSource: ['./migrate-to-supabase/**/*.ts', './import/**/*.ts', './refactor/**/*.ts', './spreadsheet_helpers/**/*.ts'], + includeSource: ['./import/**/*.ts', './refactor/**/*.ts', './spreadsheet_helpers/**/*.ts'], + exclude: [...defaultExclude, 'migrate-to-supabase/**'], }, -}); +}) diff --git a/packages/site/.env b/packages/site/.env index 01af5389e..2b7942039 100644 --- a/packages/site/.env +++ b/packages/site/.env @@ -1,8 +1,5 @@ # See https://vitejs.dev/config/#envdir if wanting to store these in monorepo root -PUBLIC_ALGOLIA_APPLICATION_ID=XCVBAYSYXD -PUBLIC_ALGOLIA_SEARCH_ONLY_API_KEY=e6d98efb32d3dc2435dce7b97ea87c3e - # URL Restricted PUBLIC_mapboxAccessToken=pk.eyJ1IjoidGFsa2luZ2RpY3Rpb25hcmllcyIsImEiOiJja3BkYW84NjcwYXA2Mm90NjEzemdrZmxjIn0.W9YL4gEpnfIvHhZ_XaFa1g diff --git a/packages/site/package.json b/packages/site/package.json index 239fd22be..51a689711 100644 --- a/packages/site/package.json +++ b/packages/site/package.json @@ -7,6 +7,7 @@ "scripts": { "dev": "vite dev", "prod": "vite dev --mode production", + "mixed": "vite dev --mode mixed", "build": "vite build", "preview": "vite preview", "sync": "svelte-kit sync", @@ -24,10 +25,11 @@ "local-sveltefirets": "link:../../../sveltefirets" }, "devDependencies": { - "@iconify/json": "^2.2.192", + "@iconify/json": "^2.2.242", "@julr/unocss-preset-forms": "^0.0.5", "@living-dictionaries/types": "workspace:^1.0.0", - "@orama/orama": "^2.0.11", + "@orama/orama": "2.0.23", + "@orama/plugin-data-persistence": "2.0.23", "@playwright/test": "1.41.2", "@resvg/resvg-js": "^2.2.0", "@sentry/browser": "^6.18.2", @@ -45,12 +47,11 @@ "@types/geojson": "^7946.0.10", "@types/mapbox-gl": "^2.7.6", "@types/mapbox__mapbox-gl-geocoder": "^4.7.3", - "@types/pg": "^8.10.9", + "@types/pg": "^8.11.8", "@types/recordrtc": "^5.6.10", "@unocss/preset-icons": "^0.58.5", "@unocss/svelte-scoped": "^0.58.5", - "@vitest/ui": "^1.4.0", - "algoliasearch": "^4.11.0", + "@vitest/ui": "^2.1.3", "ckeditor5-build-classic-with-alignment-underline-smallcaps": "^1.0.0", "comlink": "^4.4.1", "csvtojson": "^2.0.10", @@ -59,26 +60,24 @@ "file-saver": "^2.0.5", "firebase": "^10.9.0", "firebase-admin": "^12.0.0", - "instantsearch.js": "^4.33.2", + "idb-keyval": "^6.2.1", "jszip": "^3.7.1", "kitbook": "1.0.0-beta.31", "logrocket": "^2.1.2", - "lz-string": "^1.4.4", "pg": "^8.11.3", "recordrtc": "^5.6.2", "satori": "^0.0.44", "satori-html": "^0.3.0", "svelte": "^4.2.12", "svelte-check": "^3.6.8", - "svelte-pieces": "2.0.0-next.14", + "svelte-pieces": "2.0.0-next.16", "sveltefirets": "0.0.42", "topojson-client": "^3.1.0", "tslib": "^2.6.1", - "type-fest": "^4.13.0", "typescript": "^5.1.6", "unocss": "^0.58.5", - "vite": "^5.1.4", - "vitest": "^1.4.0", + "vite": "^5.4.2", + "vitest": "^2.1.3", "wavesurfer.js": "^5.2.0", "web-vitals": "^2.1.2", "xss": "^1.0.14" diff --git a/packages/site/src/app.d.ts b/packages/site/src/app.d.ts index df3d939a6..0fdfbba15 100644 --- a/packages/site/src/app.d.ts +++ b/packages/site/src/app.d.ts @@ -2,11 +2,8 @@ // import type { BaseUser } from '$lib/supabase/user' // import type { AuthResponse } from '@supabase/supabase-js' import type { Readable } from 'svelte/store' -import type { collectionStore } from 'sveltefirets' -import type { ISpeaker } from '@living-dictionaries/types' -import type { DbOperations } from '$lib/dbOperations' - -// import type { Supabase } from '$lib/supabase/database.types' +import type { LayoutData as DictionaryLayoutData } from './routes/[dictionaryId]/$types' +import type { Supabase } from '$lib/supabase/database.types' declare global { namespace App { @@ -18,12 +15,19 @@ declare global { t: import('$lib/i18n/types.ts').TranslateFunction user: Readable admin: Readable - // supabase: Supabase // authResponse: AuthResponse // From dictionary layout so all optional - dbOperations?: DbOperations - speakers?: Awaited>> + supabase?: Supabase + dictionary?: DictionaryLayoutData['dictionary'] + dbOperations?: DictionaryLayoutData['dbOperations'] + url_from_storage_path?: DictionaryLayoutData['url_from_storage_path'] + entries?: DictionaryLayoutData['entries'] + speakers?: DictionaryLayoutData['speakers'] + dialects?: DictionaryLayoutData['dialects'] + photos?: DictionaryLayoutData['photos'] + videos?: DictionaryLayoutData['videos'] + sentences?: DictionaryLayoutData['sentences'] } interface PageState { entry_id?: string diff --git a/packages/site/src/db-tests/cached-data.test.ts b/packages/site/src/db-tests/cached-data.test.ts new file mode 100644 index 000000000..7ad4a96a5 --- /dev/null +++ b/packages/site/src/db-tests/cached-data.test.ts @@ -0,0 +1,441 @@ +import { get as getStore } from 'svelte/store' +import { get as get_idb } from 'idb-keyval' +import type { TablesInsert, TablesUpdate } from '@living-dictionaries/types' +import { anon_supabase } from './clients' +import { cached_data_store } from '$lib/supabase/cached-data' +import { postgres } from '$lib/mocks/seed/postgres' +import { sql_file_string } from '$lib/mocks/seed/to-sql-string' +import { seeded_dictionary_id as dictionary_id, seed_dictionaries, seeded_user_id_1, users } from '$lib/mocks/seed/tables' + +const log = false + +vi.mock('$app/environment', () => { + return { + browser: true, + } +}) + +let cached_data: any[] = [] + +vi.mock('idb-keyval', () => { + return { + set: vi.fn((key: string, value: any[]) => { + cached_data = value + }), + get: vi.fn((_key: string) => { + return cached_data?.length ? cached_data : undefined + }), + } +}) + +function incremental_consistent_uuid(index: number) { + return '22222222-2222-2222-2222-222222222222'.slice(0, -6) + (index).toString().padStart(6, '0') +} + +const refresh_materialized_view_sql = 'REFRESH MATERIALIZED VIEW materialized_entries_view' +const reset_db_sql = ` + truncate table auth.users cascade; + ${sql_file_string('auth.users', users)} + ${sql_file_string('dictionaries', seed_dictionaries)} + ${refresh_materialized_view_sql}` + +const startTimestamp = new Date('1980-01-01T00:00:00Z').getTime() + +function seed_with_entries({ count, offset }: { count: number, offset: number }) { + const seed_entries: TablesInsert<'entries'>[] = Array.from({ length: count }, (_, index) => { + const offset_index = index + offset + const entryTimestamp = new Date(startTimestamp + offset_index * 1000).toISOString() + return { + id: incremental_consistent_uuid(offset_index), + lexeme: { + default: `${offset_index} lexeme`, + }, + dictionary_id, + created_by: seeded_user_id_1, + updated_by: seeded_user_id_1, + created_at: entryTimestamp, + updated_at: entryTimestamp, + } + }) + + return `${sql_file_string('entries', seed_entries)}` +} + +describe(cached_data_store, () => { + beforeEach(async () => { + cached_data = [] + await postgres.execute_query(reset_db_sql) + }) + + test('gets materialized_entries_view in batches and then gets rest from entries_view', async () => { + const materialized_count = 1500 + const recent_count = 20 + await postgres.execute_query(seed_with_entries({ offset: 0, count: materialized_count })) + await postgres.execute_query(refresh_materialized_view_sql) + await postgres.execute_query(seed_with_entries({ offset: materialized_count, count: recent_count })) + + const cache_key = `entries_${dictionary_id}` + + const store = cached_data_store({ + dictionary_id, + materialized_view: 'materialized_entries_view', + table: 'entries_view', + supabase: anon_supabase, + log, + }) + + expect(getStore(store.error)).toBe(null) + expect(getStore(store.loading)).toBeTruthy() + + await new Promise((r) => { + const unsub = store.loading.subscribe((loading) => { + if (!loading) { + r('loaded') + unsub() + } + }) + }) + const $store = getStore(store) + expect($store).toHaveLength(materialized_count + recent_count) + + const cached = get_idb(cache_key) + expect(cached).toEqual($store) + }) + + test('first gets cached items, then gets more recent from db starting with materialized_entries_view and then from entries_view', async () => { + const cache_key = `entries_${dictionary_id}` + const cached_count = 30 + const materialized_count = 1200 + const recent_count = 1100 + + await postgres.execute_query(seed_with_entries({ offset: 0, count: cached_count })) + + const store_to_set_up_cache = cached_data_store({ + dictionary_id, + table: 'entries_view', + supabase: anon_supabase, + log, + }) + await new Promise((r) => { + const unsub = store_to_set_up_cache.loading.subscribe((loading) => { + if (!loading) { + r('loaded') + unsub() + } + }) + }) + const cached = get_idb(cache_key) + expect(cached).toHaveLength(cached_count) + + await postgres.execute_query(seed_with_entries({ offset: cached_count, count: materialized_count })) + await postgres.execute_query(refresh_materialized_view_sql) + await postgres.execute_query(seed_with_entries({ offset: cached_count + materialized_count, count: recent_count })) + + const store = cached_data_store({ + dictionary_id, + materialized_view: 'materialized_entries_view', + table: 'entries_view', + supabase: anon_supabase, + log, + }) + + await new Promise((r) => { + const unsub = store.loading.subscribe((loading) => { + if (!loading) { + r('loaded') + unsub() + } + }) + }) + const $store = getStore(store) + expect($store).toHaveLength(cached_count + materialized_count + recent_count) + + const cached_2 = get_idb(cache_key) + expect(cached_2).toEqual($store) + }) + + test('logs errors properly', async () => { + const store = cached_data_store({ + dictionary_id, + // @ts-expect-error + table: 'not_real', + supabase: anon_supabase, + log, + }) + + await new Promise((r) => { + const unsub = store.loading.subscribe((loading) => { + if (!loading) { + r('loaded') + unsub() + } + }) + }) + expect(getStore(store.error)).toEqual(`relation "public.not_real" does not exist`) + }) + + test('updates an item already cached if changes are made to it', async () => { + const cached_count = 3 + const recent_count = 3 + await postgres.execute_query(seed_with_entries({ offset: 0, count: cached_count })) + + const store = cached_data_store({ + dictionary_id, + table: 'entries_view', + supabase: anon_supabase, + log, + }) + await new Promise((r) => { + const unsub = store.loading.subscribe((loading) => { + if (!loading) { + r('loaded') + unsub() + } + }) + }) + + await postgres.execute_query(seed_with_entries({ offset: cached_count, count: recent_count })) + + const id_to_update = incremental_consistent_uuid(1) + const phonetic = '[fu]' + const updated_entry: TablesUpdate<'entries'> = { + id: id_to_update, + phonetic, + updated_at: new Date(startTimestamp + 10000 * 1000).toISOString(), + } + await postgres.execute_query(sql_file_string('entries', [updated_entry], 'UPDATE')) + await store.refresh() + const $store = getStore(store) + const total_entries = cached_count + recent_count + expect($store).toHaveLength(total_entries) + const updated_index = $store.findIndex(entry => entry.id === id_to_update) + expect(updated_index).toEqual(total_entries - 1) + expect($store[updated_index].main.phonetic).toEqual(phonetic) + }) + + test('does not load down deleted items if there is nothing cached yet', async () => { + const initial_count = 2 + await postgres.execute_query(seed_with_entries({ offset: 0, count: initial_count })) + const id_to_update = incremental_consistent_uuid(1) + const timestamp = new Date(startTimestamp + 10000 * 1000).toISOString() + const updated_entry: TablesUpdate<'entries'> = { + id: id_to_update, + updated_at: timestamp, + deleted: timestamp, + } + await postgres.execute_query(sql_file_string('entries', [updated_entry], 'UPDATE')) + const store = cached_data_store({ + dictionary_id, + table: 'entries_view', + supabase: anon_supabase, + log, + }) + await new Promise((r) => { + const unsub = store.loading.subscribe((loading) => { + if (!loading) { + r('loaded') + unsub() + } + }) + }) + expect(getStore(store)).toHaveLength(initial_count - 1) + }) + + test('removes deleted items from the cache when they are deleted at a later date (without materialized view)', async () => { + const initial_count = 3 + await postgres.execute_query(seed_with_entries({ offset: 0, count: initial_count })) + + const store = cached_data_store({ + dictionary_id, + table: 'entries_view', + supabase: anon_supabase, + log, + }) + await new Promise((r) => { + const unsub = store.loading.subscribe((loading) => { + if (!loading) { + r('loaded') + unsub() + } + }) + }) + expect(getStore(store)).toHaveLength(initial_count) + + const id_to_update = incremental_consistent_uuid(1) + const timestamp = new Date(startTimestamp + 10000 * 1000).toISOString() + const updated_entry: TablesUpdate<'entries'> = { + id: id_to_update, + updated_at: timestamp, + deleted: timestamp, + } + await postgres.execute_query(sql_file_string('entries', [updated_entry], 'UPDATE')) + await store.refresh() + + expect(getStore(store)).toHaveLength(initial_count - 1) + }) + + test('removes deleted items from the cache when they are deleted at a later date (materialized view)', async () => { + const initial_count = 1 + await postgres.execute_query(seed_with_entries({ offset: 0, count: initial_count })) + await postgres.execute_query(refresh_materialized_view_sql) + + const store = cached_data_store({ + dictionary_id, + materialized_view: 'materialized_entries_view', + table: 'entries_view', + supabase: anon_supabase, + log, + }) + await new Promise((r) => { + const unsub = store.loading.subscribe((loading) => { + if (!loading) { + r('loaded') + unsub() + } + }) + }) + expect(getStore(store)).toHaveLength(initial_count) + + const id_to_update = incremental_consistent_uuid(0) + const timestamp = new Date(startTimestamp + 10000 * 1000).toISOString() + const updated_entry: TablesUpdate<'entries'> = { + id: id_to_update, + updated_at: timestamp, + deleted: timestamp, + } + await postgres.execute_query(sql_file_string('entries', [updated_entry], 'UPDATE')) + + const store2 = cached_data_store({ + dictionary_id, + materialized_view: 'materialized_entries_view', + table: 'entries_view', + supabase: anon_supabase, + log, + }) + await new Promise((r) => { + const unsub = store2.loading.subscribe((loading) => { + if (!loading) { + r('loaded') + unsub() + } + }) + }) + expect(getStore(store2)).toHaveLength(initial_count - 1) + + const store3 = cached_data_store({ + dictionary_id, + materialized_view: 'materialized_entries_view', + table: 'entries_view', + supabase: anon_supabase, + log, + }) + await new Promise((r) => { + const unsub = store3.loading.subscribe((loading) => { + if (!loading) { + r('loaded') + unsub() + } + }) + }) + expect(getStore(store3)).toHaveLength(initial_count - 1) + }) + + test('updated store emits new arrivals after store refresh', async () => { + const initial_count = 3 + await postgres.execute_query(seed_with_entries({ offset: 0, count: initial_count })) + + const store = cached_data_store({ + dictionary_id, + table: 'entries_view', + supabase: anon_supabase, + log, + }) + await new Promise((r) => { + const unsub = store.loading.subscribe((loading) => { + if (!loading) { + r('loaded') + unsub() + } + }) + }) + + const updated_items = [] + const unsub = store.updated_item.subscribe((item) => { + if (item) { + updated_items.push(item) + unsub() + } + }) + + const id_to_update = incremental_consistent_uuid(1) + const timestamp = new Date(startTimestamp + 10000 * 1000).toISOString() + const updated_entry: TablesUpdate<'entries'> = { + id: id_to_update, + updated_at: timestamp, + lexeme: { default: 'a change!' }, + } + await postgres.execute_query(sql_file_string('entries', [updated_entry], 'UPDATE')) + await store.refresh() + expect(updated_items).toHaveLength(1) + }) + + test('speakers_view', async () => { + const speakers: TablesInsert<'speakers'>[] = [{ + id: incremental_consistent_uuid(0), + dictionary_id, + name: 'Bob', + created_by: seeded_user_id_1, + updated_by: seeded_user_id_1, + created_at: new Date(startTimestamp).toISOString(), + updated_at: new Date(startTimestamp).toISOString(), + }] + await postgres.execute_query(`${sql_file_string('speakers', speakers)}`) + + const store = cached_data_store({ + dictionary_id, + table: 'speakers_view', + supabase: anon_supabase, + log, + }) + + await new Promise((r) => { + const unsub = store.loading.subscribe((loading) => { + if (!loading) { + r('loaded') + unsub() + } + }) + }) + + const $store = getStore(store) + expect($store).toMatchInlineSnapshot(` + [ + { + "birthplace": null, + "created_at": "1980-01-01T00:00:00+00:00", + "decade": null, + "deleted": null, + "dictionary_id": "dictionary1", + "gender": null, + "id": "22222222-2222-2222-2222-222222000000", + "name": "Bob", + "updated_at": "1980-01-01T00:00:00+00:00", + }, + ] + `) + + const { data: speakers_view } = await anon_supabase.from('speakers_view') + .select() + .limit(1000) + .order('updated_at', { ascending: true }) + .gt('updated_at', '1971-01-01T00:00:00Z') + expect(speakers_view).toEqual($store) + }) +}) + +// const { data: materialized_entries } = await anon_supabase.from('materialized_entries_view') +// .select() +// .limit(1000) +// .order('updated_at', { ascending: true }) +// .gt('updated_at', '1971-01-01T00:00:00Z') +// expect(materialized_entries).toMatchFileSnapshot('materialized_entries.snaps.json') diff --git a/packages/site/src/db-tests/clients.ts b/packages/site/src/db-tests/clients.ts index 8e0c43364..e92e9242d 100644 --- a/packages/site/src/db-tests/clients.ts +++ b/packages/site/src/db-tests/clients.ts @@ -1,5 +1,5 @@ -import type { Database } from '$lib/supabase/generated.types'; -import { createClient } from '@supabase/supabase-js'; +import type { Database } from '@living-dictionaries/types' +import { createClient } from '@supabase/supabase-js' // local keys from .env.development - ok to commit const PUBLIC_SUPABASE_API_URL = 'http://127.0.0.1:54321' diff --git a/packages/site/src/db-tests/content-update.test.ts b/packages/site/src/db-tests/content-update.test.bak similarity index 61% rename from packages/site/src/db-tests/content-update.test.ts rename to packages/site/src/db-tests/content-update.test.bak index 775ed4753..affae4233 100644 --- a/packages/site/src/db-tests/content-update.test.ts +++ b/packages/site/src/db-tests/content-update.test.bak @@ -1,10 +1,12 @@ +import type { ContentUpdateRequestBody } from '@living-dictionaries/types' import { admin_supabase, anon_supabase, uuid_template } from './clients' -import type { ContentUpdateRequestBody, ContentUpdateResponseBody } from '$api/db/content-update/+server' +import type { ContentUpdateResponseBody } from '$api/db/content-update/+server' import { post_request } from '$lib/helpers/get-post-requests' import { first_entry_id, seeded_dictionary_id, seeded_user_id_1, seeded_user_id_2 } from '$lib/mocks/seed/tables' import { reset_db } from '$lib/mocks/seed/write-seed-and-reset-db' const content_update_endpoint = 'http://localhost:3041/api/db/content-update' +const test_timestamp = new Date('2024-03-08T00:44:04.600392+00:00').toISOString() beforeAll(async () => { await reset_db() @@ -22,78 +24,68 @@ const first_entry_third_sense_id = incremental_consistent_uuid() describe('sense operations', () => { test('add sense with noun class to first entry', async () => { const { error } = await post_request(content_update_endpoint, { - id: incremental_consistent_uuid(), + update_id: incremental_consistent_uuid(), auth_token: null, - user_id_from_local: seeded_user_id_1, + import_meta: { + user_id: seeded_user_id_1, + timestamp: test_timestamp, + }, dictionary_id: seeded_dictionary_id, entry_id: first_entry_id, sense_id: first_entry_first_sense_id, - table: 'senses', - change: { - sense: { - noun_class: { - new: '2', - }, - }, + type: 'insert_sense', + data: { + noun_class: '2', }, - timestamp: new Date('2024-03-08T00:44:04.600392+00:00').toISOString(), }) expect(error?.message).toBeFalsy() const { data } = await anon_supabase.from('entries_view').select() - expect(data).toMatchInlineSnapshot(` - [ - { - "id": "entry1", - "senses": [ - { - "id": "11111111-1111-1111-1111-111111111100", - "noun_class": "2", - }, - ], - }, - ] + const [first_entry] = data + expect({ id: first_entry.id, senses: first_entry.senses }).toMatchInlineSnapshot(` + { + "id": "entry1", + "senses": [ + { + "id": "11111111-1111-1111-1111-111111111100", + "noun_class": "2", + }, + ], + } `) }) describe('different user add parts of speech to first sense in first entry', () => { - test('noun class remains (upsert)', async () => { - const { error } = await post_request(content_update_endpoint, { - id: incremental_consistent_uuid(), - auth_token: null, - user_id_from_local: seeded_user_id_2, - dictionary_id: seeded_dictionary_id, - entry_id: first_entry_id, - sense_id: first_entry_first_sense_id, - table: 'senses', - change: { - sense: { - parts_of_speech: { - new: ['n', 'v'], - }, - }, - }, - timestamp: new Date('2024-03-08T00:44:04.600392+00:00').toISOString(), - }) - expect(error?.message).toBeFalsy() - const { data } = await anon_supabase.from('entries_view').select() - expect(data).toMatchInlineSnapshot(` - [ - { - "id": "entry1", - "senses": [ - { - "id": "11111111-1111-1111-1111-111111111100", - "noun_class": "2", - "parts_of_speech": [ - "n", - "v", - ], - }, - ], - }, - ] - `) - }) + // test.fails('noun class remains (upsert)', async () => { + // const { error } = await post_request(content_update_endpoint, { + // update_id: incremental_consistent_uuid(), + // auth_token: null, + // import_meta: { + // user_id: seeded_user_id_2, + // timestamp: test_timestamp, + // }, + // dictionary_id: seeded_dictionary_id, + // entry_id: first_entry_id, + // sense_id: first_entry_first_sense_id, + // type: 'insert_sense', + // data: { + // parts_of_speech: ['n', 'v'], + // }, + // }) + // expect(error?.message).toBeFalsy() + // const { data } = await anon_supabase.from('entries_view').select() + // expect(data[0].senses).toMatchInlineSnapshot(` + // [ + // { + // "id": "11111111-1111-1111-1111-111111111100", + // "noun_class": "2", + // "parts_of_speech": [ + // "n", + // "v", + // ], + // }, + // ] + // `) + // }) test('updated_by is set to the second user but created_by is left alone', async () => { const { data } = await admin_supabase.from('senses').select().eq('id', first_entry_first_sense_id).single() @@ -104,101 +96,85 @@ describe('sense operations', () => { test('adds glosses field to second sense in first entry', async () => { const { error } = await post_request(content_update_endpoint, { - id: incremental_consistent_uuid(), + update_id: incremental_consistent_uuid(), auth_token: null, - user_id_from_local: seeded_user_id_1, + import_meta: { + user_id: seeded_user_id_1, + timestamp: test_timestamp, + }, dictionary_id: seeded_dictionary_id, entry_id: first_entry_id, sense_id: first_entry_second_sense_id, - table: 'senses', - change: { - sense: { - glosses: { - new: { - en: 'Hi', - es: 'Hola', - }, - }, + type: 'insert_sense', + data: { + glosses: { + en: 'Hi', + es: 'Hola', }, }, - timestamp: new Date('2024-03-08T00:44:04.600392+00:00').toISOString(), }) expect(error?.message).toBeFalsy() const { data } = await anon_supabase.from('entries_view').select() - expect(data).toMatchInlineSnapshot(` + expect(data[0].senses).toMatchInlineSnapshot(` [ { - "id": "entry1", - "senses": [ - { - "id": "11111111-1111-1111-1111-111111111100", - "noun_class": "2", - "parts_of_speech": [ - "n", - "v", - ], - }, - { - "glosses": { - "en": "Hi", - "es": "Hola", - }, - "id": "11111111-1111-1111-1111-111111111101", - }, + "id": "11111111-1111-1111-1111-111111111100", + "noun_class": "2", + "parts_of_speech": [ + "n", + "v", ], }, + { + "glosses": { + "en": "Hi", + "es": "Hola", + }, + "id": "11111111-1111-1111-1111-111111111101", + }, ] `) }) test('add a third sense to first entry with a glosses field', async () => { const { error } = await post_request(content_update_endpoint, { - id: incremental_consistent_uuid(), + update_id: incremental_consistent_uuid(), auth_token: null, user_id_from_local: seeded_user_id_1, dictionary_id: seeded_dictionary_id, entry_id: first_entry_id, sense_id: first_entry_third_sense_id, - table: 'senses', - change: { - sense: { - semantic_domains: { - new: ['1', '2'], - }, - }, + type: 'insert_sense', + data: { + semantic_domains: ['1', '2'], }, - timestamp: new Date('2024-03-08T00:44:04.600392+00:00').toISOString(), + test_timestamp, }) expect(error?.message).toBeFalsy() const { data } = await anon_supabase.from('entries_view').select() - expect(data).toMatchInlineSnapshot(` + expect(data[0].senses).toMatchInlineSnapshot(` [ { - "id": "entry1", - "senses": [ - { - "id": "11111111-1111-1111-1111-111111111100", - "noun_class": "2", - "parts_of_speech": [ - "n", - "v", - ], - }, - { - "glosses": { - "en": "Hi", - "es": "Hola", - }, - "id": "11111111-1111-1111-1111-111111111101", - }, - { - "id": "11111111-1111-1111-1111-111111111102", - "semantic_domains": [ - "1", - "2", - ], - }, + "id": "11111111-1111-1111-1111-111111111100", + "noun_class": "2", + "parts_of_speech": [ + "n", + "v", + ], + }, + { + "glosses": { + "en": "Hi", + "es": "Hola", + }, + "id": "11111111-1111-1111-1111-111111111101", + }, + { + "id": "11111111-1111-1111-1111-111111111102", + "semantic_domains": [ + "1", + "2", ], }, ] @@ -207,44 +183,37 @@ describe('sense operations', () => { test('delete the third sense from the first entry', async () => { const { error } = await post_request(content_update_endpoint, { - id: incremental_consistent_uuid(), + update_id: incremental_consistent_uuid(), auth_token: null, user_id_from_local: seeded_user_id_1, dictionary_id: seeded_dictionary_id, entry_id: first_entry_id, sense_id: first_entry_third_sense_id, - table: 'senses', - change: { - sense: { - deleted: true, - }, + type: 'insert_sense', + data: { + deleted: 'true', }, - timestamp: new Date('2024-03-08T00:44:04.600392+00:00').toISOString(), + test_timestamp, }) expect(error?.message).toBeFalsy() const { data } = await anon_supabase.from('entries_view').select() - expect(data).toMatchInlineSnapshot(` + expect(data[0].senses).toMatchInlineSnapshot(` [ { - "id": "entry1", - "senses": [ - { - "id": "11111111-1111-1111-1111-111111111100", - "noun_class": "2", - "parts_of_speech": [ - "n", - "v", - ], - }, - { - "glosses": { - "en": "Hi", - "es": "Hola", - }, - "id": "11111111-1111-1111-1111-111111111101", - }, + "id": "11111111-1111-1111-1111-111111111100", + "noun_class": "2", + "parts_of_speech": [ + "n", + "v", ], }, + { + "glosses": { + "en": "Hi", + "es": "Hola", + }, + "id": "11111111-1111-1111-1111-111111111101", + }, ] `) }) @@ -258,24 +227,19 @@ describe('sense sentence operations', () => { test('post to endpoint', async () => { const { data, error } = await post_request(content_update_endpoint, { - id: change_id, + update_id: change_id, auth_token: null, user_id_from_local: seeded_user_id_1, dictionary_id: seeded_dictionary_id, - entry_id: first_entry_id, sentence_id: first_sentence_id, sense_id: first_entry_first_sense_id, - table: 'sentences', - change: { - sentence: { - text: { - new: { - lo1: 'abcd efgh ijkl', - }, - }, + type: 'insert_sentence', + data: { + text: { + lo1: 'abcd efgh ijkl', }, }, - timestamp: new Date('2024-03-08T00:44:04.600392+00:00').toISOString(), + test_timestamp, }) expect(error?.message).toBeFalsy() @@ -283,23 +247,23 @@ describe('sense sentence operations', () => { { "audio_id": null, "change": { - "sentence": { + "data": { "text": { - "new": { - "lo1": "abcd efgh ijkl", - }, + "lo1": "abcd efgh ijkl", }, }, + "type": "add_sentence", }, + "dialect_id": null, "dictionary_id": "dictionary1", - "entry_id": "entry1", + "entry_id": null, "id": "11111111-1111-1111-1111-111111111104", "import_id": null, "photo_id": null, "sense_id": "11111111-1111-1111-1111-111111111100", "sentence_id": "11111111-1111-1111-1111-111111111103", "speaker_id": null, - "table": "sentences", + "table": null, "text_id": null, "timestamp": "2024-03-08T00:44:04.6+00:00", "user_id": "12345678-abcd-efab-cdef-123456789012", @@ -316,23 +280,23 @@ describe('sense sentence operations', () => { { "audio_id": null, "change": { - "sentence": { + "data": { "text": { - "new": { - "lo1": "abcd efgh ijkl", - }, + "lo1": "abcd efgh ijkl", }, }, + "type": "add_sentence", }, + "dialect_id": null, "dictionary_id": "dictionary1", - "entry_id": "entry1", + "entry_id": null, "id": "11111111-1111-1111-1111-111111111104", "import_id": null, "photo_id": null, "sense_id": "11111111-1111-1111-1111-111111111100", "sentence_id": "11111111-1111-1111-1111-111111111103", "speaker_id": null, - "table": "sentences", + "table": null, "text_id": null, "timestamp": "2024-03-08T00:44:04.6+00:00", "user_id": "12345678-abcd-efab-cdef-123456789012", @@ -355,38 +319,6 @@ describe('sense sentence operations', () => { }, ] `) - expect(data).toMatchInlineSnapshot(` - [ - { - "id": "entry1", - "senses": [ - { - "id": "11111111-1111-1111-1111-111111111100", - "noun_class": "2", - "parts_of_speech": [ - "n", - "v", - ], - "sentences": [ - { - "id": "11111111-1111-1111-1111-111111111103", - "text": { - "lo1": "abcd efgh ijkl", - }, - }, - ], - }, - { - "glosses": { - "en": "Hi", - "es": "Hola", - }, - "id": "11111111-1111-1111-1111-111111111101", - }, - ], - }, - ] - `) }) }) @@ -395,24 +327,18 @@ describe('sense sentence operations', () => { test('post to endpoint', async () => { const { data, error } = await post_request(content_update_endpoint, { - id: change_id, + update_id: change_id, auth_token: null, user_id_from_local: seeded_user_id_1, dictionary_id: seeded_dictionary_id, - entry_id: first_entry_id, sentence_id: first_sentence_id, - sense_id: first_entry_first_sense_id, - table: 'sentences', - change: { - sentence: { - translation: { - new: { - en: 'I am hungry', - }, - }, + type: 'update_sentence', + data: { + translation: { + en: 'I am hungry', }, }, - timestamp: new Date('2024-03-09T00:44:04.600392+00:00').toISOString(), + test_timestamp: new Date('2024-03-09T00:44:04.600392+00:00').toISOString(), }) expect(error?.message).toBeFalsy() @@ -420,23 +346,23 @@ describe('sense sentence operations', () => { { "audio_id": null, "change": { - "sentence": { + "data": { "translation": { - "new": { - "en": "I am hungry", - }, + "en": "I am hungry", }, }, + "type": "update_sentence", }, + "dialect_id": null, "dictionary_id": "dictionary1", - "entry_id": "entry1", + "entry_id": null, "id": "11111111-1111-1111-1111-111111111105", "import_id": null, "photo_id": null, - "sense_id": "11111111-1111-1111-1111-111111111100", + "sense_id": null, "sentence_id": "11111111-1111-1111-1111-111111111103", "speaker_id": null, - "table": "sentences", + "table": null, "text_id": null, "timestamp": "2024-03-09T00:44:04.6+00:00", "user_id": "12345678-abcd-efab-cdef-123456789012", @@ -473,26 +399,18 @@ describe('sense sentence operations', () => { test('update sentence text updates just the text and leaves translation alone', async () => { const change_id = incremental_consistent_uuid() await post_request(content_update_endpoint, { - id: change_id, + update_id: change_id, auth_token: null, user_id_from_local: seeded_user_id_1, dictionary_id: seeded_dictionary_id, sentence_id: first_sentence_id, - sense_id: first_entry_first_sense_id, - table: 'sentences', - change: { - sentence: { - text: { - new: { - lo1: 'abcd efgh', - }, - old: { - lo1: 'abcd efgh ijkl', - }, - }, + type: 'update_sentence', + data: { + text: { + lo1: 'abcd efgh', }, }, - timestamp: new Date('2024-03-09T00:44:04.600392+00:00').toISOString(), + test_timestamp: new Date('2024-03-09T00:44:04.600392+00:00').toISOString(), }) const { data: { senses }, error } = await anon_supabase.from('entries_view').select().eq('id', first_entry_id).single() @@ -516,37 +434,31 @@ describe('sense sentence operations', () => { const { data: { senses: old_senses } } = await anon_supabase.from('entries_view').select().eq('id', first_entry_id).single() const change_id = incremental_consistent_uuid() const { data, error } = await post_request(content_update_endpoint, { - id: change_id, + update_id: change_id, auth_token: null, user_id_from_local: seeded_user_id_1, dictionary_id: seeded_dictionary_id, sentence_id: first_sentence_id, - sense_id: first_entry_first_sense_id, - table: 'sentences', - change: { - sentence: { - translation: { - new: { - ...old_senses[0].sentences[0].translation, - es: 'Estoy hambriento', - }, - }, + type: 'update_sentence', + data: { + translation: { + ...old_senses[0].sentences[0].translation, + es: 'Estoy hambriento', }, }, - timestamp: new Date('2024-03-09T00:44:04.600392+00:00').toISOString(), + test_timestamp: new Date('2024-03-09T00:44:04.600392+00:00').toISOString(), }) expect(error?.message).toBeFalsy() expect(data.change).toMatchInlineSnapshot(` { - "sentence": { + "data": { "translation": { - "new": { - "en": "I am hungry", - "es": "Estoy hambriento", - }, + "en": "I am hungry", + "es": "Estoy hambriento", }, }, + "type": "update_sentence", } `) }) @@ -571,19 +483,14 @@ describe('sense sentence operations', () => { test('remove sentence from sense', async () => { const { error } = await post_request(content_update_endpoint, { - id: incremental_consistent_uuid(), + update_id: incremental_consistent_uuid(), auth_token: null, user_id_from_local: seeded_user_id_1, dictionary_id: seeded_dictionary_id, sentence_id: first_sentence_id, sense_id: first_entry_first_sense_id, - table: 'sentences', - change: { - sentence: { - removed_from_sense: true, - }, - }, - timestamp: new Date('2024-03-08T00:44:04.600392+00:00').toISOString(), + type: 'remove_sentence', + test_timestamp, }) expect(error?.message).toBeFalsy() diff --git a/packages/site/src/db-tests/users.test.ts b/packages/site/src/db-tests/users.test.ts index 2c56f5ac3..4a1c398dd 100644 --- a/packages/site/src/db-tests/users.test.ts +++ b/packages/site/src/db-tests/users.test.ts @@ -1,20 +1,19 @@ -import { seed_user_email_1, seeded_user_id_1 } from '$lib/mocks/seed/tables'; -import { reset_db } from '$lib/mocks/seed/write-seed-and-reset-db'; -import { admin_supabase, anon_supabase } from './clients'; - -beforeAll(async () => { - await reset_db() -}) +import { admin_supabase, anon_supabase } from './clients' +import { seed_user_email_1, seeded_user_id_1 } from '$lib/mocks/seed/tables' +import { reset_db } from '$lib/mocks/seed/write-seed-and-reset-db' describe('users table access', () => { + beforeEach(async () => { + await reset_db() + }) + test('admin can check user emails', async () => { const { data } = await admin_supabase.from('user_emails').select().eq('id', seeded_user_id_1).single() - expect(data.email).toEqual(seed_user_email_1); - }); + expect(data.email).toEqual(seed_user_email_1) + }) test('normal users cannot check user emails', async () => { const { data } = await anon_supabase.from('user_emails').select().eq('id', seeded_user_id_1).single() - expect(data).toBeNull(); - }); -}); - + expect(data).toBeNull() + }) +}) diff --git a/packages/site/src/docs/CONTRIBUTING.md b/packages/site/src/docs/CONTRIBUTING.md index 87f27ae53..91d2c63a3 100644 --- a/packages/site/src/docs/CONTRIBUTING.md +++ b/packages/site/src/docs/CONTRIBUTING.md @@ -3,15 +3,12 @@ ## Set Up Dev Environment - Install the recommended VSCode extensions. -- Install [pnpm](https://pnpm.io/) globaly using `npm install -g pnpm` if you don't have it yet. +- Install [pnpm](https://pnpm.io/) globaly using `npm install -g pnpm` if you don't have it yet. - Then install dependencies with `pnpm i` and run `pnpm dev`. Each command will start up a Vite dev server which will give you a link to open on localhost. Changes will hot reload almost instantly (consider using auto-save if you want to). - -Note that you will need to ask for our dev Mapbox and Firebase API keys or bring your own by adding `PUBLIC_mapboxAccessToken=...` and -`PUBLIC_FIREBASE_CONFIG=...` to a `.env.local` file on the root level. +...notes outdated and incomplete \*_Note that on localhost you will not see the live (prod) site's data, but rather the data from the dev database, which allows us to develop and make changes freely without worrying about deleting or corrupting important data._ - ## Git methodology We follow [Github flow](https://guides.github.com/introduction/flow/). Changes are made on feature branches and then pull requests are submitted to the main branch. The main branch code is automatically deployed to production. Be sure to read through the GitHub flow article as it gives important information on how often to commit. diff --git a/packages/site/src/docs/Supabase.md b/packages/site/src/docs/Supabase.md index ff385f96b..15430d033 100644 --- a/packages/site/src/docs/Supabase.md +++ b/packages/site/src/docs/Supabase.md @@ -23,7 +23,12 @@ Once you have run `supabase start` you can open the Studio URL to explore your l ## Generate Types -- `supabase gen types typescript --local --schema public > packages/site/src/lib/supabase/generated.types.ts` +Local: +- `pnpm generate-types` to run `supabase gen types typescript --local --schema public > packages/types/supabase/generated.types.ts` +- save the file to have lint fix auto-run +- `pnpm t merge-types` to merge the generated types with the manually written types + +Deployed (we don't use this): - `supabase gen types typescript --project-id=actkqboqpzniojhgtqzw --schema public > packages/site/src/lib/supabase/generated.types.ts` ## Tests @@ -43,3 +48,38 @@ You can check current prod migrations at https://supabase.com/dashboard/project/ ## Misc - `supabase status` check status and get local urls + +## Use data from a `pg_dump` backup locally + +These four commands are run daily to backup the production database: +- `supabase db dump --db-url "$supabase_db_url" -f roles.sql --role-only` +- `supabase db dump --db-url "$supabase_db_url" -f schema.sql` +- `supabase db dump --db-url "$supabase_db_url" -f data-copy.sql --data-only --use-copy` +- `supabase db dump --db-url "$supabase_db_url" -f data-insert.sql --data-only` + +To make the local DB match the current production download just download the data as the schema already matches production (or is a step ahead): +- Get the DB url by pasting the password into here: postgresql://postgres.actkqboqpzniojhgtqzw:[YOUR-PASSWORD]@aws-0-us-west-1.pooler.supabase.com:6543/postgres +- Run `supabase db dump --db-url "your-db-url" -f supabase/seed.sql --data-only` but using the db url above +- Remove the `is_anonymous` column in auth.users and find-replace `, false),` for `),` (and don't forget the last row with a semi-colon) because `is_anonymous` doesn't exist in local db. Remove the audit_log block if using a reset sql script instead of fully resetting the db. +- Run `supabase db reset` to build the db with the production data + +## Other `pg_dump` notes that did not pan out but may be useful in other situations + +- Read how to migrate a project: https://supabase.com/docs/guides/platform/migrating-and-upgrading-projects#migrate-your-project +- The dump file produced by pg_dump does not contain the statistics used by the optimizer to make query planning decisions. Therefore, it is wise to run ANALYZE after restoring from a dump file to ensure good performance. (source: https://www.postgresql.org/docs/8.0/app-pgdump.html) `psql -d 'postgres://supabase_admin:postgres@127.0.0.1:54322/postgres' -c 'ANALYZE;'` +- comment out `COPY "auth"."flow_state"...` block +- reset db with no migrations + +psql \ + --single-transaction \ + --file roles.sql \ + --file schema.sql \ + --command 'SET session_replication_role = replica' \ + --file data.sql \ + --dbname "postgresql://postgres:postgres@127.0.0.1:54322/postgres" + +Other options + --variable ON_ERROR_STOP=1 \ - not using because of syntax errors + +- `psql postgresql://postgres:postgres@127.0.0.1:54322/postgres -f live-db-dump.sql` +- `psql -d database -f data.sql` to restore the data from a dump file obtained from Supabase's automatic backup. -d database: Specifies the name of the database to connect to. diff --git a/packages/site/src/docs/data/new-entry-field-creation.md b/packages/site/src/docs/data/new-entry-field-creation.md index 5e760c220..61ad7eb4e 100644 --- a/packages/site/src/docs/data/new-entry-field-creation.md +++ b/packages/site/src/docs/data/new-entry-field-creation.md @@ -14,6 +14,6 @@ These are the main steps to follow if you need to add a new entry field: 6. Add the new field in `packages/site/src/routes/[dictionaryId]/export/_formatEntries.ts` in the `headers` object and in the `itemsFormatted` array. -7. Consider whether the new field needs added to the dictionary import spreadsheet template. If so add to the latest spreadsheet template. Then update the example import csv (`packages/scripts/import/data/example/example.csv`) then in `packages/scripts` run `pnpm test` to run tests while you add the needed code in `packages/scripts/import/convertJsonRowToEntryFormat.ts` to import the new field. You are finished when the test results include the new field and nothing is broken. +7. Consider whether the new field needs added to the dictionary import spreadsheet template. If so add to the latest spreadsheet template. Then update the example import csv (`packages/scripts/import/data/example/example.csv`) then in `packages/scripts` run `pnpm test` to run tests while you add the needed code in `packages/scripts/import/convertJsonRowToEntryFormat.ts` to import the new field. You are finished when the test results include the new field and nothing is broken. -8. Ask if a new filter is needed for this new field. If so, add to `packages/scripts/algolia/prepareDataForIndex.ts` and deploy the updated cloud functions that use that function (add, update, and delete). Then update Algolia to be aware of the new field and add a search filter to the front end if appropriate (e.g. add a ToggleRefinement component for `hasPluralForm` in `packages\site\src\routes\[dictionaryId]\entries\_EntryFilters.svelte`) +8. Ask if a new filter is needed for this new field. If so, add to Orama code and add a search filter to the front end if appropriate (e.g. add a ToggleRefinement component for `hasPluralForm` in `packages\site\src\routes\[dictionaryId]\entries\_EntryFilters.svelte`) diff --git a/packages/site/src/docs/misc/entry-fields.md b/packages/site/src/docs/misc/entry-fields.md index db599192c..fd0b888a2 100644 --- a/packages/site/src/docs/misc/entry-fields.md +++ b/packages/site/src/docs/misc/entry-fields.md @@ -4,12 +4,12 @@ ### Glosses containing scientific names -In these cases, when scientific names are italicized by convention we need to create a specific field for scientific names, such as many entries in [Birhor's Plants domain](https://livingdictionaries.app/birhor/entries/list?entries_prod%5BrefinementList%5D%5Bsdn%5D%5B0%5D=1.4) +In these cases, when scientific names are italicized by convention we need to create a specific field for scientific names, such as many entries in [Birhor's Plants domain](https://livingdictionaries.app/birhor/entries) ## Interlinearization - Consider researching more about [Leipzig glossing](https://ctan.org/pkg/leipzig?lang=en) - Need to be able to support small-caps, used and [Unicode Lookup](https://unicode.emnudge.dev/) to find characters. -- Can be done via rich-text as in `3sg.pres` or via specific small capitals unicode letters like done in [Toggle SmallCaps](https://svelte.dev/repl/231af5758d6b484dbbee7827b0b95540?version=3.46.4) to come up with "3sg.ᴘʀᴇꜱ" these can actually be typed/pasted into this text box that text doesn't support smallCaps in the rich-text sort of manner. The benefit of doing this via unicode is that we can export dictionaries with the smallCaps intact, as well as people can copy paste into and out of the site and keep the small caps intact. This is a topic to research more on as small caps q is not contained in common fonts and may need a font added. https://en.wikipedia.org/wiki/Small_caps and https://yaytext.com/small-caps/#preview_small-caps are good resources. See also https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant-caps +- Can be done via rich-text as in `3sg.pres` or via specific small capitals unicode letters like done in [Toggle SmallCaps](https://svelte.dev/repl/231af5758d6b484dbbee7827b0b95540?version=3.46.4) to come up with "3sg.ᴘʀᴇꜱ" these can actually be typed/pasted into this text box that text doesn't support smallCaps in the rich-text sort of manner. The benefit of doing this via unicode is that we can export dictionaries with the smallCaps intact, as well as people can copy paste into and out of the site and keep the small caps intact. This is a topic to research more on as small caps q is not contained in common fonts and may need a font added. https://en.wikipedia.org/wiki/Small_caps and https://yaytext.com/small-caps/#preview_small-caps are good resources. See also https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant-caps ?? What about other rich-text features? @@ -24,4 +24,4 @@ Is there a need for rich-text and which ones? If so use [QuillJs](https://quillj ### Scientific Name -- for Latin names that are normally italicized - do we need to support italics as optional here using *italics* or not - if so we can do them using something like https://svelte.dev/examples/textarea-inputs \ No newline at end of file +- for Latin names that are normally italicized - do we need to support italics as optional here using *italics* or not - if so we can do them using something like https://svelte.dev/examples/textarea-inputs diff --git a/packages/site/src/docs/misc/import-dictionary.md b/packages/site/src/docs/misc/import-dictionary.md index 7027f075b..10be69bdb 100644 --- a/packages/site/src/docs/misc/import-dictionary.md +++ b/packages/site/src/docs/misc/import-dictionary.md @@ -12,7 +12,7 @@ - Run `pnpm importDictionary -- --id example --dry` if you want to test things are working - Start by running `pnpm importDictionary -- --id kalinago --dry` but use your appropriate dictionary id instead. This will emulate (dry run) an import to dev environment to let you inspect the log and see if there are any missing files - Check the console log or the outputted log file found in `packages/scripts/logs` - it will be the newest one as they are saved by datestamp. -- Rerun your script with the `--dry` option: `pnpm importDictionary -- --id kalinago` and inspect the dev-imported dictionary on localhost (or any deployed dev url) to make sure all is good - Note that because we don't have Algolia indexing the dev database currently, I added some code that let's dev show the 10 most recent entries from Firestore, but that's all you'll get for now until we make further changes - and only 10 from the last 60 minutes (see `Hits.svelte`). +- Rerun your script with the `--dry` option: `pnpm importDictionary -- --id kalinago` and inspect the dev-imported dictionary on localhost (or any deployed dev url) to make sure all is good. - Before moving on to prod, delete all media that has been imported to dev DB. - If all looks good then run `pnpm importDictionary -- --id kalinago --environment prod` to push the data live - Look through the imported dictionary and then tell Anna to look at it and make it public if everyone is happy with it. diff --git a/packages/site/src/docs/misc/power-search.md b/packages/site/src/docs/misc/power-search.md deleted file mode 100644 index 5997b956b..000000000 --- a/packages/site/src/docs/misc/power-search.md +++ /dev/null @@ -1,23 +0,0 @@ -# Power Search - -There are a few features in the pipeline and a few pain points that would all be solved by a better search system: -- API -- No advanced search ability with Algolia, for example, search just the start or end of lexemes, search for minimal pairs, use wildcards, etc... (phoneme analysis features, etc...) -- Sort by any field -- Offline search (and usage), server-side search - -Three possible solutions would be: - -## 1 -- Index all dictionaries up-front (and when adding features like a "hasAudio" flag) -- Update the current indexing function that listens to document writes to download the proper csv for that dictionary, update the row by entry id and then save the csv back to the cloud -- Con: Race conditions, possible to get around this by writing each value to a KV store and then updating the overall CSV from there - sounds over-engineered - -## 2 -- Run a persistent server (App Engine or other?) with firebase client SDK (firebase-admin doesn't cache reads) running that is subscribed to each dictionary's words collection and on changes, writes over the cloud csv for that dictionary. -- Con: this sounds fraught with the chance that Firebase on that server will crash as the client SDK wasn't built to be subscribed to 150K documents at once nor do I trust it's cache to be 100% reliable at that scale. - -## 3 -- Load collection of entries from Firestore, but perform searching in worker thread to avoid jank we previously experienced using this method. -- If the collection is to heavy, then create a parallel collection in Firestore that's lighter weight w/o data not needed for search - this will nix the ability to do offline edits so perhaps not so good - perhaps another solution if entries are too heavy is to pull out some data from the main entry body into sub documents if just needed for the entry view as a manager sees it, not for first load. -- Con: must wait for all entries to come down from Firestore before allowing search (just on the first time through as they will be cached after that), this can be mitigated by having a dictionary landing page which loads entries in the background. Another possible con is costs, for every 5,000 new browsers searching entries from a dictionary averaging 2,000 entries in size, that will cost us $6. $6 per 5,000 new dictionary visits (not return visitors) isn't so bad. Also because of the free tier we get the first 25 visits/day for free, adding up to 750 free new visitors a month. (Based on $0.06/100,000 reads = $6 per 10 million reads) \ No newline at end of file diff --git a/packages/site/src/lib/components/SeoMetaTags.svelte b/packages/site/src/lib/components/SeoMetaTags.svelte index cc841fc10..9f5065146 100644 --- a/packages/site/src/lib/components/SeoMetaTags.svelte +++ b/packages/site/src/lib/components/SeoMetaTags.svelte @@ -1,10 +1,8 @@ - {entry.lexeme} + {entry.main.lexeme.default} - {#if sound_file?.speakerName} -
- {$page.data.t('entry_field.speaker')}: - {sound_file.speakerName} -
- - {:else} - - {#if sound_file} -
- -
- {:else if speakerId} - {#if file || audioBlob} - {#if file} - - {:else} - - {/if} -
- {#if file || audioBlob} - {@const upload_status = dbOperations.addAudio({ file: file || audioBlob, entryId: entry.id, speakerId })} - {#await import('$lib/components/audio/UploadAudioStatus.svelte') then { default: UploadAudioStatus }} - - {/await} - {/if} + + {#if sound_file} +
+ +
+ {:else if speaker_id} + {#if file || audioBlob} + {#if file} + {:else} -
-
- -
- {#if !readyToRecord} - - {/if} -
+ {/if} +
+ {#if file || audioBlob} + {@const upload_status = dbOperations.addAudio({ file: file || audioBlob, entry_id: entry.id, speaker_id })} + {#await import('$lib/components/audio/UploadProgressBarStatus.svelte') then { default: UploadProgressBarStatus }} + + {/await} + {/if} + {:else} +
+
+ +
+ {#if !readyToRecord} + + {/if} +
{/if} - - {/if} + {/if} +
{#if sound_file} @@ -100,14 +79,14 @@ {/if}
- diff --git a/packages/site/src/lib/components/audio/EditAudio.variants.ts b/packages/site/src/lib/components/audio/EditAudio.variants.ts index 7caf24fbc..6ab718ae5 100644 --- a/packages/site/src/lib/components/audio/EditAudio.variants.ts +++ b/packages/site/src/lib/components/audio/EditAudio.variants.ts @@ -1,30 +1,30 @@ -import type { Variant, VariantMeta } from 'kitbook' -import type Component from './EditAudio.svelte' +// import type { Variant, VariantMeta } from 'kitbook' +// import type Component from './EditAudio.svelte' -export const shared_meta: VariantMeta = { - // viewports: [ - // { width: 500, height: 200 } - // ] -} +// export const shared_meta: VariantMeta = { +// // viewports: [ +// // { width: 500, height: 200 } +// // ] +// } -const shared = { - entry: { - id: 'entry11', - lexeme: 'Banana', - }, - sound_file: null, - on_close: () => console.info('closed'), -} satisfies Partial> +// const shared = { +// entry: { +// id: 'entry11', +// lexeme: 'Banana', +// }, +// sound_file: null, +// on_close: () => console.info('closed'), +// } satisfies Partial> -export const Has_Audio: Variant = { - ...shared, - sound_file: { - fb_storage_path: 'iipay-aa/audio/o6TP02FiMiXSnedKo4kQ_1691957248951.mpeg', - storage_url: 'https://firebasestorage.googleapis.com/v0/b/talking-dictionaries-alpha.appspot.com/o/iipay-aa%2Faudio%2Fo6TP02FiMiXSnedKo4kQ_1691957248951.mpeg?alt=media', - speaker_ids: ['1'], - }, -} +// export const Has_Audio: Variant = { +// ...shared, +// sound_file: { +// fb_storage_path: 'iipay-aa/audio/o6TP02FiMiXSnedKo4kQ_1691957248951.mpeg', +// storage_url: 'https://firebasestorage.googleapis.com/v0/b/talking-dictionaries-alpha.appspot.com/o/iipay-aa%2Faudio%2Fo6TP02FiMiXSnedKo4kQ_1691957248951.mpeg?alt=media', +// speaker_ids: ['1'], +// }, +// } -export const No_Audio: Variant = { - ...shared, -} +// export const No_Audio: Variant = { +// ...shared, +// } diff --git a/packages/site/src/lib/components/audio/UploadAudioStatus.svelte b/packages/site/src/lib/components/audio/UploadProgressBarStatus.svelte similarity index 92% rename from packages/site/src/lib/components/audio/UploadAudioStatus.svelte rename to packages/site/src/lib/components/audio/UploadProgressBarStatus.svelte index 6f1fb4bdc..af53d577a 100644 --- a/packages/site/src/lib/components/audio/UploadAudioStatus.svelte +++ b/packages/site/src/lib/components/audio/UploadProgressBarStatus.svelte @@ -1,9 +1,9 @@ {#if $upload_status.error} diff --git a/packages/site/src/lib/components/audio/UploadAudioStatus.variants.ts b/packages/site/src/lib/components/audio/UploadProgressBarStatus.variants.ts similarity index 89% rename from packages/site/src/lib/components/audio/UploadAudioStatus.variants.ts rename to packages/site/src/lib/components/audio/UploadProgressBarStatus.variants.ts index 9dc16c943..d44167387 100644 --- a/packages/site/src/lib/components/audio/UploadAudioStatus.variants.ts +++ b/packages/site/src/lib/components/audio/UploadProgressBarStatus.variants.ts @@ -1,6 +1,6 @@ import type { Variant, VariantMeta } from 'kitbook' import { readable } from 'svelte/store' -import type Component from './UploadAudioStatus.svelte' +import type Component from './UploadProgressBarStatus.svelte' export const shared_meta: VariantMeta = { viewports: [ diff --git a/packages/site/src/lib/components/audio/upload-audio.ts b/packages/site/src/lib/components/audio/upload-audio.ts index 23fe953be..2e27fa2dd 100644 --- a/packages/site/src/lib/components/audio/upload-audio.ts +++ b/packages/site/src/lib/components/audio/upload-audio.ts @@ -2,20 +2,21 @@ import { getStorage, ref, uploadBytesResumable } from 'firebase/storage' import { type Readable, get, writable } from 'svelte/store' import { page } from '$app/stores' -export interface AudioUploadStatus { +export interface AudioVideoUploadStatus { progress: number error?: string storage_path?: string } -export function upload_audio({ file, folder }: { file: File | Blob, folder: string }): Readable { - const { set, subscribe } = writable({ progress: 0 }) +export function upload_audio({ file, folder }: { file: File | Blob, folder: string }): Readable { + const { set, subscribe } = writable({ progress: 0 }) const [,fileTypeSuffix] = file.type.split('/') const storage_path = `${folder}/${new Date().getTime()}.${fileTypeSuffix}` const { data: { user } } = get(page) const $user = get(user) const customMetadata = { uploadedBy: $user.displayName, + // @ts-ignore originalFileName: file.name, } // https://firebase.google.com/docs/storage/web/upload-files diff --git a/packages/site/src/lib/components/entry/EditField.svelte b/packages/site/src/lib/components/entry/EditField.svelte index 0c1010e87..c8cbd1bc1 100644 --- a/packages/site/src/lib/components/entry/EditField.svelte +++ b/packages/site/src/lib/components/entry/EditField.svelte @@ -1,26 +1,28 @@ -
+
{#if field === 'notes'} {#await import('$lib/components/editor/ClassicCustomized.svelte') then { default: ClassicCustomized }} @@ -142,6 +142,19 @@ class:sompeng={isSompeng} class="form-input block w-full pr-9" /> + {:else if field === 'phonetic'} + {#await import('$lib/components/keyboards/ipa/IpaKeyboard.svelte') then { default: IpaKeyboard }} +
+ value = new_value}> + + +
+ {/await} {:else} {/if} - {#if field === 'phonetic'} - {#await import('$lib/components/keyboards/ipa/IpaKeyboard.svelte') then { default: IpaKeyboard }} -
- -
- {/await} - {/if} - {#if field === 'interlinearization'}
-
{#if addingLexeme} - {:else} - {/if}
- + diff --git a/packages/site/src/routes/[dictionaryId]/entries-local/EntryFilters.svelte b/packages/site/src/routes/[dictionaryId]/entries-local/EntryFilters.svelte deleted file mode 100644 index 0a06c365e..000000000 --- a/packages/site/src/routes/[dictionaryId]/entries-local/EntryFilters.svelte +++ /dev/null @@ -1,172 +0,0 @@ - - - -
- {#if result_facets} -
-

- {$page.data.t('entry.filters')} -

- - -
-
- {#if result_facets._parts_of_speech.count} - - {/if} - {#if result_facets._semantic_domains.count} - - {/if} - {#if result_facets._dialects.count} - - {/if} - {#if result_facets._speakers.count} - { - acc[speaker.id] = speaker.displayName - return acc - }, {})} - label={$page.data.t('entry_field.speaker')} /> - {/if} -
- - {#if $search_params.view !== 'gallery'} - {#if result_facets.has_image?.values.true} - - {/if} - {#if result_facets.has_image?.values.false} - - {/if} - {/if} - {#if result_facets.has_audio?.values.true} - - {/if} - {#if result_facets.has_audio?.values.false} - - {/if} - {#if result_facets.has_video?.values.true} - - {/if} - - - {#if result_facets.has_speaker?.values.true} - - {/if} - {#if result_facets.has_speaker?.values.false} - - {/if} - {#if result_facets.has_noun_class?.values.true} - - {/if} - {#if result_facets.has_noun_class?.values.false} - - {/if} - {#if result_facets.has_plural_form?.values.true} - - {/if} - {#if result_facets.has_plural_form?.values.false} - - {/if} - {#if result_facets.has_part_of_speech?.values.true} - - {/if} - {#if result_facets.has_part_of_speech?.values.false} - - {/if} - {#if result_facets.has_semantic_domain?.values.true} - - {/if} - {#if result_facets.has_semantic_domain?.values.false} - - {/if} -
- {/if} -
- diff --git a/packages/site/src/routes/[dictionaryId]/entries-local/FilterList.variants.ts b/packages/site/src/routes/[dictionaryId]/entries-local/FilterList.variants.ts deleted file mode 100644 index 7f271fb49..000000000 --- a/packages/site/src/routes/[dictionaryId]/entries-local/FilterList.variants.ts +++ /dev/null @@ -1,75 +0,0 @@ -import type { DeprecatedVariant, Viewport } from 'kitbook' -import { writable } from 'svelte/store' -import type { QueryParamStore } from 'svelte-pieces' -import type Component from './FilterList.svelte' -import type { QueryParams } from '$lib/search/types' - -export const viewports: Viewport[] = [ - { width: 200, height: 500 }, -] - -export const variants: DeprecatedVariant[] = [ - // TODO: no search params variant - { - name: 'Few', - viewports: [ - { width: 200, height: 100 }, - ], - props: { - label: 'Dialect', - search_params: writable({ dialects: ['north'] }) as QueryParamStore, - search_param_key: 'dialects', - values: { - west: 2, - east: 1, - north: 10, - }, - }, - }, - { - name: 'Many', - props: { - label: 'Dialect', - search_params: writable({ dialects: ['north'] }) as QueryParamStore, - search_param_key: 'dialects', - values: { - 'west': 2, - 'east': 1, - 'north': 10, - 'south': 5, - 'central': 3, - 'north west': 2, - 'north east': 1, - 'south east': 10, - 'south west': 5, - 'central west': 3, - 'central east': 2, - 'northwest west': 1, - 'northeast west': 10, - }, - }, - }, - { - name: 'Speaker Ids mapped to speaker names', - description: 'Can search for Brim even though does not exist in the list of values.', - viewports: [ - { width: 200, height: 200 }, - ], - props: { - label: 'Speaker', - search_params: writable({ speakers: ['1'] }) as QueryParamStore, - search_param_key: 'speakers', - values: { - '1234-------------------------1234': 2, - 'Bob_Smith': 1, - 'John_Boot': 10, - 'John_Lee': 5, - 'John_Lewis': 3, - 'John_Littlejohn': 2, - }, - speaker_ids_to_names: { - '1234-------------------------1234': 'John Brim', - }, - }, - }, -] diff --git a/packages/site/src/routes/[dictionaryId]/entries-local/Pagination.svelte b/packages/site/src/routes/[dictionaryId]/entries-local/Pagination.svelte deleted file mode 100644 index 277c67a61..000000000 --- a/packages/site/src/routes/[dictionaryId]/entries-local/Pagination.svelte +++ /dev/null @@ -1,34 +0,0 @@ - - -{#if can_edit} - {#await import('$lib/components/search/AddEntry.svelte') then { default: AddEntry }} - - {/await} -{/if} - - diff --git a/packages/site/src/routes/[dictionaryId]/entries-local/View.svelte b/packages/site/src/routes/[dictionaryId]/entries-local/View.svelte deleted file mode 100644 index 1bae0a200..000000000 --- a/packages/site/src/routes/[dictionaryId]/entries-local/View.svelte +++ /dev/null @@ -1,93 +0,0 @@ - - -{#if entries.size} - {#if !view} - {#each entries as [id, entry] (id)} - 0} - can_edit={$can_edit} - on_click={(e) => { handle_entry_click(e, entry) }} - {dbOperations} /> - {/each} - {:else if view === 'table'} - - {:else if view === 'gallery'} - - {:else if view === 'print'} - - {/if} -{/if} - -{#if $page.state.entry_id} - history.back()}> - - -{/if} diff --git a/packages/site/src/routes/[dictionaryId]/entries/+layout.svelte b/packages/site/src/routes/[dictionaryId]/entries/+layout.svelte deleted file mode 100644 index 1455cb33c..000000000 --- a/packages/site/src/routes/[dictionaryId]/entries/+layout.svelte +++ /dev/null @@ -1,104 +0,0 @@ - - -{#if browser} - -
-
- (showMobileFilters = true)} /> - -
-
- - - - - - -
-
- - -
- -
- -{/if} - - - 0} - title="Entries" - dictionaryName={$dictionary.name} - gcsPath={$dictionary.featuredImage?.specifiable_image_url} - lng={$dictionary.coordinates?.longitude} - lat={$dictionary.coordinates?.latitude} - description="The entries in this Living Dictionary are displayed in a comprehensive list that visitors can easily browse by using the page tabs at the bottom of the screen, or search by using the powerful search bar located at the top of the page." - keywords="Endangered Languages, Language Documentation, Language Revitalization, Build a Dictionary, Online Dictionary, Digital Dictionary, Dictionary Software, Free Software, Online Dictionary Builder, Living Dictionaries, Living Dictionary, Edit a dictionary, Search a dictionary, Browse a dictionary, Explore a Dictionary" /> diff --git a/packages/site/src/routes/[dictionaryId]/entries/+page.svelte b/packages/site/src/routes/[dictionaryId]/entries/+page.svelte new file mode 100644 index 000000000..dcbc0e6b5 --- /dev/null +++ b/packages/site/src/routes/[dictionaryId]/entries/+page.svelte @@ -0,0 +1,111 @@ + + + +
+ + +
+ +
+ +
+
+
+ {#if search_results_count !== 0} + {#if typeof search_results_count === 'number'} + {$page.data.t('dictionary.entries')}: {current_page_index * entries_per_page + 1}-{Math.min((current_page_index + 1) * entries_per_page, search_results_count)} / + {search_results_count} + ({search_time.includes('μs') ? '<1ms' : search_time}) + {:else if $entries.length} + {$page.data.t('dictionary.entries')}: + {$entries.length} + {/if} + {#if dev || $admin} +
+ + {/if} + {/if} + {#if $loading} + + {/if} +
+ {#if $entries_error} +
Loading error: {$entries_error}
+ {/if} + + +
+ + + + 0} + title="Entries" + dictionaryName={$dictionary.name} + gcsPath={$dictionary.featuredImage?.specifiable_image_url} + lng={$dictionary.coordinates?.longitude} + lat={$dictionary.coordinates?.latitude} + description="The entries in this Living Dictionary are displayed in a comprehensive list that visitors can easily browse by using the page tabs at the bottom of the screen, or search by using the powerful search bar located at the top of the page." + keywords="Endangered Languages, Language Documentation, Language Revitalization, Build a Dictionary, Online Dictionary, Digital Dictionary, Dictionary Software, Free Software, Online Dictionary Builder, Living Dictionaries, Living Dictionary, Edit a dictionary, Search a dictionary, Browse a dictionary, Explore a Dictionary" /> diff --git a/packages/site/src/routes/[dictionaryId]/entries-local/+page.ts b/packages/site/src/routes/[dictionaryId]/entries/+page.ts similarity index 93% rename from packages/site/src/routes/[dictionaryId]/entries-local/+page.ts rename to packages/site/src/routes/[dictionaryId]/entries/+page.ts index 257c41edb..8f05158f8 100644 --- a/packages/site/src/routes/[dictionaryId]/entries-local/+page.ts +++ b/packages/site/src/routes/[dictionaryId]/entries/+page.ts @@ -11,6 +11,7 @@ export function load({ params: { dictionaryId } }) { startWith: default_params, storagePrefix: `${dictionaryId}_`, cleanFalseValues: true, + // replaceState: false, }) return { diff --git a/packages/site/src/lib/components/search/AddEntry.svelte b/packages/site/src/routes/[dictionaryId]/entries/AddEntry.svelte similarity index 61% rename from packages/site/src/lib/components/search/AddEntry.svelte rename to packages/site/src/routes/[dictionaryId]/entries/AddEntry.svelte index d5d37009c..b53b94fb6 100644 --- a/packages/site/src/lib/components/search/AddEntry.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/AddEntry.svelte @@ -1,11 +1,11 @@ @@ -23,7 +23,11 @@ addNewEntry(new_value)} + on_update={async (new_value) => { + if (new_value) { + await add_entry({ default: new_value }) + } + }} on_close={toggle} addingLexeme /> {/if} diff --git a/packages/site/src/routes/[dictionaryId]/entries/Audio.variants.ts b/packages/site/src/routes/[dictionaryId]/entries/Audio.variants.ts deleted file mode 100644 index 1cffa44e2..000000000 --- a/packages/site/src/routes/[dictionaryId]/entries/Audio.variants.ts +++ /dev/null @@ -1,79 +0,0 @@ -import type { DeprecatedVariant, Viewport } from 'kitbook' -import type { ExpandedEntry } from '@living-dictionaries/types' -import type Component from './Audio.svelte' -import { logDbOperations } from '$lib/mocks/db' - -export const viewports: Viewport[] = [ - { width: 80, height: 80 }, -] - -export const languages = [] - -const entry: ExpandedEntry = { - sound_files: [ - { fb_storage_path: '', storage_url: '' }, - ], -} - -export const variants: DeprecatedVariant[] = [ - { - name: 'List sound', - props: { - entry, - context: 'list', - updateEntryOnline: logDbOperations.updateEntryOnline, - }, - }, - { - name: 'Table sound', - props: { - entry, - context: 'table', - updateEntryOnline: logDbOperations.updateEntryOnline, - }, - }, - { - name: 'Entry sound', - props: { - entry, - context: 'entry', - updateEntryOnline: logDbOperations.updateEntryOnline, - }, - }, - { - name: 'Entry sound, can edit', - props: { - entry, - context: 'entry', - can_edit: true, - updateEntryOnline: logDbOperations.updateEntryOnline, - }, - }, - { - name: 'List no sound, can edit', - props: { - entry: {}, - context: 'list', - can_edit: true, - updateEntryOnline: logDbOperations.updateEntryOnline, - }, - }, - { - name: 'Table no sound, can edit', - props: { - entry: {}, - context: 'table', - can_edit: true, - updateEntryOnline: logDbOperations.updateEntryOnline, - }, - }, - { - name: 'Entry no sound, can edit', - props: { - entry: {}, - context: 'entry', - can_edit: true, - updateEntryOnline: logDbOperations.updateEntryOnline, - }, - }, -] diff --git a/packages/site/src/routes/[dictionaryId]/entries-local/ClearFilters.svelte b/packages/site/src/routes/[dictionaryId]/entries/ClearFilters.svelte similarity index 59% rename from packages/site/src/routes/[dictionaryId]/entries-local/ClearFilters.svelte rename to packages/site/src/routes/[dictionaryId]/entries/ClearFilters.svelte index 1dfe8441a..6f8b8c345 100644 --- a/packages/site/src/routes/[dictionaryId]/entries-local/ClearFilters.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/ClearFilters.svelte @@ -1,12 +1,12 @@ diff --git a/packages/site/src/routes/[dictionaryId]/entries/EntriesGallery.svelte b/packages/site/src/routes/[dictionaryId]/entries/EntriesGallery.svelte new file mode 100644 index 000000000..19ef1d617 --- /dev/null +++ b/packages/site/src/routes/[dictionaryId]/entries/EntriesGallery.svelte @@ -0,0 +1,23 @@ + + +
+ {#each entries as entry (entry.id)} + + {/each} +
+ + diff --git a/packages/site/src/routes/[dictionaryId]/entries-local/EntriesPrint.svelte b/packages/site/src/routes/[dictionaryId]/entries/EntriesPrint.svelte similarity index 84% rename from packages/site/src/routes/[dictionaryId]/entries-local/EntriesPrint.svelte rename to packages/site/src/routes/[dictionaryId]/entries/EntriesPrint.svelte index ba756c7e2..7a9c01203 100644 --- a/packages/site/src/routes/[dictionaryId]/entries-local/EntriesPrint.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/EntriesPrint.svelte @@ -1,26 +1,28 @@ {#if dictionary.printAccess || can_edit} @@ -51,7 +52,7 @@ type="number" min="1" max={can_edit ? 1000000 : visitor_max_entries} - bind:value={entries_per_page} /> + bind:value={$search_params.entries_per_page} />
diff --git a/packages/site/src/routes/[dictionaryId]/entries/EntryFilters.svelte b/packages/site/src/routes/[dictionaryId]/entries/EntryFilters.svelte index eb8367eb5..817af408f 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/EntryFilters.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/EntryFilters.svelte @@ -1,134 +1,184 @@ + showWidth="md" + open={show_mobile_filters} + {on_close}>
-
-

- {$page.data.t('entry.filters')} -

- - -
-
- - - - -
+ class="md:w-52 md:sticky md:top-24 h-100vh h-100dvh! md:max-h-[calc(100vh-107px)] print:hidden p-4 pl-3 md:p-0 flex flex-col"> + {#if result_facets} +
+

+ {$page.data.t('entry.filters')} +

+ + +
+
+ {#if result_facets._parts_of_speech.count} + { + acc[key] = $page.data.t({ dynamicKey: `ps.${key}`, fallback: key }) + return acc + }, {})} + label={$page.data.t('entry_field.parts_of_speech')} /> + {/if} + {#if result_facets._semantic_domains.count} + { + acc[key] = $page.data.t({ dynamicKey: `sd.${key}`, fallback: key }) + return acc + }, {})} + label={$page.data.t('entry_field.semantic_domains')} /> + {/if} + {#if result_facets._dialects.count} + { + acc[dialect.id] = dialect.name.default + return acc + }, {})} + label={$page.data.t('entry_field.dialects')} /> + {/if} + {#if result_facets._speakers.count} + { + acc[speaker.id] = speaker.name + return acc + }, {})} + label={$page.data.t('entry_field.speaker')} /> + {/if} +
- - {#if show_negatives} - {#if !$page.url.pathname.includes('gallery')} - + {#if $search_params.view !== 'gallery'} + {#if result_facets.has_image?.values.true} + {/if} - - - - - - - {:else} - {#if !$page.url.pathname.includes('gallery')} - + {#if result_facets.has_image?.values.false} + {/if} - - - - - - {/if} - - {#if $is_manager} - - {/if} - -
- - Search by Algolia - + {#if result_facets.has_audio?.values.true} + + {/if} + {#if result_facets.has_audio?.values.false} + + {/if} + {#if result_facets.has_video?.values.true} + + {/if} + + + {#if result_facets.has_speaker?.values.true} + + {/if} + {#if result_facets.has_speaker?.values.false} + + {/if} + {#if result_facets.has_noun_class?.values.true} + + {/if} + {#if result_facets.has_noun_class?.values.false} + + {/if} + {#if result_facets.has_plural_form?.values.true} + + {/if} + {#if result_facets.has_plural_form?.values.false} + + {/if} + {#if result_facets.has_part_of_speech?.values.true} + + {/if} + {#if result_facets.has_part_of_speech?.values.false} + + {/if} + {#if result_facets.has_semantic_domain?.values.true} + + {/if} + {#if result_facets.has_semantic_domain?.values.false} + + {/if} +
+ {/if}
diff --git a/packages/site/src/routes/[dictionaryId]/entries-local/FilterList.svelte b/packages/site/src/routes/[dictionaryId]/entries/FilterList.svelte similarity index 84% rename from packages/site/src/routes/[dictionaryId]/entries-local/FilterList.svelte rename to packages/site/src/routes/[dictionaryId]/entries/FilterList.svelte index 9014357ac..43827c870 100644 --- a/packages/site/src/routes/[dictionaryId]/entries-local/FilterList.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/FilterList.svelte @@ -8,12 +8,12 @@ export let search_params: QueryParamStore export let search_param_key: FilterListKeys export let label: string - export let values: Record // keys are item name, numbers are count found - export let speaker_ids_to_names: Record = undefined + export let values: Record // keys are item key, numbers are count found + export let keys_to_values: Record $: count = Object.values(values).length let search_value: string - $: filtered_values = Object.entries(values).filter(([item]) => search_value ? make_item_readable(item).toLowerCase().includes(search_value.toLowerCase()) : true) + $: filtered_values = Object.entries(values).filter(([item]) => search_value ? make_item_readable(item, keys_to_values).toLowerCase().includes(search_value.toLowerCase()) : true) $: max_show = search_value ? 10 : 5 function add_filter(item: string) { @@ -24,10 +24,8 @@ $search_params[search_param_key] = $search_params[search_param_key].filter((existing_item: string) => existing_item !== item) } - function make_item_readable(item: string) { - if (speaker_ids_to_names) - return speaker_ids_to_names[item] || restore_spaces_from_underscores(item) - return restore_spaces_from_underscores(item) + function make_item_readable(item: string, keys_to_values: Record) { + return keys_to_values?.[item] || restore_spaces_from_underscores(item) } @@ -65,7 +63,7 @@ }} />
diff --git a/packages/site/src/routes/[dictionaryId]/entries/FilterList.variants.ts b/packages/site/src/routes/[dictionaryId]/entries/FilterList.variants.ts new file mode 100644 index 000000000..3c32b7183 --- /dev/null +++ b/packages/site/src/routes/[dictionaryId]/entries/FilterList.variants.ts @@ -0,0 +1,75 @@ +// import type { DeprecatedVariant, Viewport } from 'kitbook' +// import { writable } from 'svelte/store' +// import type { QueryParamStore } from 'svelte-pieces' +// import type Component from './FilterList.svelte' +// import type { QueryParams } from '$lib/search/types' + +// export const viewports: Viewport[] = [ +// { width: 200, height: 500 }, +// ] + +// export const variants: DeprecatedVariant[] = [ +// // TODO: no search params variant +// { +// name: 'Few', +// viewports: [ +// { width: 200, height: 100 }, +// ], +// props: { +// label: 'Dialect', +// search_params: writable({ dialects: ['north'] }) as QueryParamStore, +// search_param_key: 'dialects', +// values: { +// west: 2, +// east: 1, +// north: 10, +// }, +// }, +// }, +// { +// name: 'Many', +// props: { +// label: 'Dialect', +// search_params: writable({ dialects: ['north'] }) as QueryParamStore, +// search_param_key: 'dialects', +// values: { +// 'west': 2, +// 'east': 1, +// 'north': 10, +// 'south': 5, +// 'central': 3, +// 'north west': 2, +// 'north east': 1, +// 'south east': 10, +// 'south west': 5, +// 'central west': 3, +// 'central east': 2, +// 'northwest west': 1, +// 'northeast west': 10, +// }, +// }, +// }, +// { +// name: 'Speaker Ids mapped to speaker names', +// description: 'Can search for Brim even though does not exist in the list of values.', +// viewports: [ +// { width: 200, height: 200 }, +// ], +// props: { +// label: 'Speaker', +// search_params: writable({ speakers: ['1'] }) as QueryParamStore, +// search_param_key: 'speakers', +// values: { +// '1234-------------------------1234': 2, +// 'Bob_Smith': 1, +// 'John_Boot': 10, +// 'John_Lee': 5, +// 'John_Lewis': 3, +// 'John_Littlejohn': 2, +// }, +// speaker_ids_to_names: { +// '1234-------------------------1234': 'John Brim', +// }, +// }, +// }, +// ] diff --git a/packages/site/src/routes/[dictionaryId]/entries/Pagination.svelte b/packages/site/src/routes/[dictionaryId]/entries/Pagination.svelte new file mode 100644 index 000000000..2145c83da --- /dev/null +++ b/packages/site/src/routes/[dictionaryId]/entries/Pagination.svelte @@ -0,0 +1,34 @@ + + +{#if can_edit} + {#await import('./AddEntry.svelte') then { default: AddEntry }} + + {/await} +{/if} + + diff --git a/packages/site/src/lib/components/search/PaginationButtons.svelte b/packages/site/src/routes/[dictionaryId]/entries/PaginationButtons.svelte similarity index 86% rename from packages/site/src/lib/components/search/PaginationButtons.svelte rename to packages/site/src/routes/[dictionaryId]/entries/PaginationButtons.svelte index 4c212b62f..e83990dcf 100644 --- a/packages/site/src/lib/components/search/PaginationButtons.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/PaginationButtons.svelte @@ -70,11 +70,15 @@ { - if (event.key === 'j' && (isMac ? event.metaKey : event.ctrlKey)) { + const ctrl = isMac ? event.metaKey : event.ctrlKey + if (event.key === 'j' && ctrl) { event.preventDefault() const page = prompt('Go to page:') if (page) go_to_page(+page) } + // Requires way to keep keystrokes from spilling out of modal before using + // if (event.key === 'ArrowLeft' && event.altKey && current_page > 1) go_to_page(current_page - 1) + // if (event.key === 'ArrowRight' && event.altKey && current_page < pages) go_to_page(current_page + 1) }} /> diff --git a/packages/site/src/routes/[dictionaryId]/entries/gallery/GalleryEntry.svelte b/packages/site/src/routes/[dictionaryId]/entries/gallery/GalleryEntry.svelte index 2c4dfab50..4dd811e6a 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/gallery/GalleryEntry.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/gallery/GalleryEntry.svelte @@ -1,14 +1,14 @@ -
-
-
- deleteImage(entry)} /> -
- -
- {entry.lexeme} +{#if first_photo} +
+
+
+ await dbOperations.update_photo({ photo: { deleted: 'true' }, photo_id: first_photo_id })} />
-
- {glosses[0] || ''} -
- + +
+ {entry.main.lexeme.default} +
+
+ {glosses[0] || ''} +
+ +
-
+{/if} diff --git a/packages/site/src/routes/[dictionaryId]/entries/gallery/GalleryEntry.variants.ts b/packages/site/src/routes/[dictionaryId]/entries/gallery/GalleryEntry.variants.ts index 5e9c16878..287fd7bee 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/gallery/GalleryEntry.variants.ts +++ b/packages/site/src/routes/[dictionaryId]/entries/gallery/GalleryEntry.variants.ts @@ -1,122 +1,122 @@ -import type { DeprecatedVariant, Viewport } from 'kitbook' -import type { IDictionary } from '@living-dictionaries/types' -import type Component from './GalleryEntry.svelte' -import { butterfly_google_storage_url } from '$lib/mocks/entries' -import { logDbOperations } from '$lib/mocks/db' +// import type { DeprecatedVariant, Viewport } from 'kitbook' +// import type { IDictionary } from '@living-dictionaries/types' +// import type Component from './GalleryEntry.svelte' +// import { butterfly_google_storage_url } from '$lib/mocks/entries' +// import { logDbOperations } from '$lib/mocks/db' -// optionally override your kitbook viewports for all variants in this file -export const viewports: Viewport[] = [ - { name: 'Mobile', width: 320, height: 380 }, -] +// // optionally override your kitbook viewports for all variants in this file +// export const viewports: Viewport[] = [ +// { name: 'Mobile', width: 320, height: 380 }, +// ] -export const languages = [] +// export const languages = [] -const dictionary: IDictionary = { - glossLanguages: ['es', 'it'], -} as IDictionary +// const dictionary: IDictionary = { +// glossLanguages: ['es', 'it'], +// } as IDictionary -export const variants: DeprecatedVariant[] = [ - { - name: 'First gloss exists', - description: 'Spanish should show because it is first', - props: { - dictionary, - deleteImage: logDbOperations.deleteImage, - entry: { - lexeme: 'tree', - senses: [ - { - glosses: { - es: 'árbol', - it: 'albero', - }, - photo_files: [ - { - specifiable_image_url: butterfly_google_storage_url, - fb_storage_path: null, - storage_url: null, - uid_added_by: null, - }, - ], - }, - ], - }, - }, - }, - { - name: 'First gloss does not exist', - description: 'Italian should show because Spanish it is not there', - props: { - dictionary, - deleteImage: logDbOperations.deleteImage, - entry: { - lexeme: 'lion', - senses: [ - { - glosses: { - it: 'leone', - }, - photo_files: [ - { - specifiable_image_url: butterfly_google_storage_url, - fb_storage_path: null, - storage_url: null, - uid_added_by: null, - }, - ], - }, - ], - }, - }, - }, - { - name: 'Very long gloss', - description: 'Very long glosses are clamped to avoid having different card (or box) sizes', - props: { - dictionary, - deleteImage: logDbOperations.deleteImage, - entry: { - lexeme: 'Castle', - senses: [ - { - glosses: { - es: 'Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit', - }, - photo_files: [ - { - specifiable_image_url: butterfly_google_storage_url, - fb_storage_path: null, - storage_url: null, - uid_added_by: null, - }, - ], - }, - ], - }, - }, - }, - { - name: 'Entry without gloss', - props: { - dictionary, - deleteImage: logDbOperations.deleteImage, - entry: { - lexeme: 'Castle', - senses: [ - { - photo_files: [ - { - specifiable_image_url: butterfly_google_storage_url, - fb_storage_path: null, - storage_url: null, - uid_added_by: null, - }, - ], - }, - ], - }, - }, - }, -] +// export const variants: DeprecatedVariant[] = [ +// { +// name: 'First gloss exists', +// description: 'Spanish should show because it is first', +// props: { +// dictionary, +// deleteImage: logDbOperations.deleteImage, +// entry: { +// lexeme: 'tree', +// senses: [ +// { +// glosses: { +// es: 'árbol', +// it: 'albero', +// }, +// photo_files: [ +// { +// specifiable_image_url: butterfly_google_storage_url, +// fb_storage_path: null, +// storage_url: null, +// uid_added_by: null, +// }, +// ], +// }, +// ], +// }, +// }, +// }, +// { +// name: 'First gloss does not exist', +// description: 'Italian should show because Spanish it is not there', +// props: { +// dictionary, +// deleteImage: logDbOperations.deleteImage, +// entry: { +// lexeme: 'lion', +// senses: [ +// { +// glosses: { +// it: 'leone', +// }, +// photo_files: [ +// { +// specifiable_image_url: butterfly_google_storage_url, +// fb_storage_path: null, +// storage_url: null, +// uid_added_by: null, +// }, +// ], +// }, +// ], +// }, +// }, +// }, +// { +// name: 'Very long gloss', +// description: 'Very long glosses are clamped to avoid having different card (or box) sizes', +// props: { +// dictionary, +// deleteImage: logDbOperations.deleteImage, +// entry: { +// lexeme: 'Castle', +// senses: [ +// { +// glosses: { +// es: 'Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit', +// }, +// photo_files: [ +// { +// specifiable_image_url: butterfly_google_storage_url, +// fb_storage_path: null, +// storage_url: null, +// uid_added_by: null, +// }, +// ], +// }, +// ], +// }, +// }, +// }, +// { +// name: 'Entry without gloss', +// props: { +// dictionary, +// deleteImage: logDbOperations.deleteImage, +// entry: { +// lexeme: 'Castle', +// senses: [ +// { +// photo_files: [ +// { +// specifiable_image_url: butterfly_google_storage_url, +// fb_storage_path: null, +// storage_url: null, +// uid_added_by: null, +// }, +// ], +// }, +// ], +// }, +// }, +// }, +// ] -// Tip: This is just a TypeScript file so you can be as creative as you want with the variants array using mock data imports, .map(), etc, to quickly create variants. If you have multiple different views that display the same data then each variants.ts file can import the same mock data to test all your views against the same use cases. +// // Tip: This is just a TypeScript file so you can be as creative as you want with the variants array using mock data imports, .map(), etc, to quickly create variants. If you have multiple different views that display the same data then each variants.ts file can import the same mock data to test all your views against the same use cases. diff --git a/packages/site/src/routes/[dictionaryId]/entries/list/+page.svelte b/packages/site/src/routes/[dictionaryId]/entries/list/+page.svelte deleted file mode 100644 index 1ab169940..000000000 --- a/packages/site/src/routes/[dictionaryId]/entries/list/+page.svelte +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - {#if $can_edit} - {#each entries as algoliaEntry (algoliaEntry.id)} - - 0} - can_edit={$can_edit} - {dbOperations} /> - - {/each} - {:else} - - {/if} - - - - diff --git a/packages/site/src/routes/[dictionaryId]/entries/list/List.svelte b/packages/site/src/routes/[dictionaryId]/entries/list/List.svelte deleted file mode 100644 index 52fcacc5b..000000000 --- a/packages/site/src/routes/[dictionaryId]/entries/list/List.svelte +++ /dev/null @@ -1,16 +0,0 @@ - - -{#each entries as entry (entry.id)} - -{/each} diff --git a/packages/site/src/routes/[dictionaryId]/entries/list/List.variants.ts b/packages/site/src/routes/[dictionaryId]/entries/list/List.variants.ts index e2f3e00be..a7e322de5 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/list/List.variants.ts +++ b/packages/site/src/routes/[dictionaryId]/entries/list/List.variants.ts @@ -1,68 +1,68 @@ -import type { Variant, VariantMeta } from 'kitbook' -import type Component from './List.svelte' -import { basic_mock_dictionary } from '$lib/mocks/dictionaries' -import { logDbOperations } from '$lib/mocks/db' +// import type { Variant, VariantMeta } from 'kitbook' +// import type Component from './List.svelte' +// import { basic_mock_dictionary } from '$lib/mocks/dictionaries' +// import { logDbOperations } from '$lib/mocks/db' -export const shared_meta: VariantMeta = { - viewports: [ - { width: 300, height: 150 }, - { width: 800, height: 150 }, - ], -} +// export const shared_meta: VariantMeta = { +// viewports: [ +// { width: 300, height: 150 }, +// { width: 800, height: 150 }, +// ], +// } -const shared = { - dbOperations: logDbOperations, - can_edit: true, - dictionary: basic_mock_dictionary, -} satisfies Partial> +// const shared = { +// dbOperations: logDbOperations, +// can_edit: true, +// dictionary: basic_mock_dictionary, +// } satisfies Partial> -export const Entry_With_Audio_Vs_Entry_Without_Audio: Variant = { - ...shared, - entries: [ - { - id: '1', - lx: 'hi - I have audio', - sfs: [ - { - path: '', - }, - ], - }, - { - id: '2', - lx: 'hi, I am here too', - }, - ], +// export const Entry_With_Audio_Vs_Entry_Without_Audio: Variant = { +// ...shared, +// entries: [ +// { +// id: '1', +// lx: 'hi - I have audio', +// sfs: [ +// { +// path: '', +// }, +// ], +// }, +// { +// id: '2', +// lx: 'hi, I am here too', +// }, +// ], -} +// } -export const Entry_With_Big_Amount_Of_Data_Vs_Entry_With_Small_Amount: Variant = { - ...shared, - dbOperations: logDbOperations, - entries: [ - { - id: '1', - lx: 'hi - I have audio', - gl: { - es: 'Hola, tengo audio´', - no: 'hei, jeg har lyd', - }, - ps: ['adj', 'v'], - sfs: [ - { - path: '', - }, - ], - sdn: ['1', '1.3', '2'], - }, - { - id: '2', - lx: 'hi, I am here too', - sfs: [ - { - path: '', - }, - ], - }, - ], -} +// export const Entry_With_Big_Amount_Of_Data_Vs_Entry_With_Small_Amount: Variant = { +// ...shared, +// dbOperations: logDbOperations, +// entries: [ +// { +// id: '1', +// lx: 'hi - I have audio', +// gl: { +// es: 'Hola, tengo audio´', +// no: 'hei, jeg har lyd', +// }, +// ps: ['adj', 'v'], +// sfs: [ +// { +// path: '', +// }, +// ], +// sdn: ['1', '1.3', '2'], +// }, +// { +// id: '2', +// lx: 'hi, I am here too', +// sfs: [ +// { +// path: '', +// }, +// ], +// }, +// ], +// } diff --git a/packages/site/src/routes/[dictionaryId]/entries/list/ListEntry.svelte b/packages/site/src/routes/[dictionaryId]/entries/list/ListEntry.svelte index a420a699f..bfadad81e 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/list/ListEntry.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/list/ListEntry.svelte @@ -1,23 +1,25 @@
- {#if entry.sound_files?.[0] || can_edit} -
-
- - - -
-
- {#each entries as entry (entry.id)} - - {/each} -
- {#await Promise.all([load_partners(), load_citation()]) then [partners, citation]} -
- {build_citation({ t: $page.data.t, dictionary: $dictionary, custom_citation: truncateAuthors(citation?.citation), partners })} -
- {/await} -
- - -{:else} -

Print view is only available to dictionary managers and contributors

-{/if} - - - diff --git a/packages/site/src/routes/[dictionaryId]/entries/print/PrintEntry.svelte b/packages/site/src/routes/[dictionaryId]/entries/print/PrintEntry.svelte index 45057a384..ac5d45571 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/print/PrintEntry.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/print/PrintEntry.svelte @@ -1,5 +1,5 @@
- {entry.lexeme} + {entry.main.lexeme.default} {#if selectedFields.local_orthography} - {#each get_local_orthographies(entry) as orthography} - {orthography}, - {/each} + {get_local_orthographies(entry.main.lexeme).join(', ')} {/if} - {#if selectedFields.phonetic && entry.phonetic} - [{entry.phonetic}] + {#if selectedFields.phonetic && entry.main.phonetic} + [{entry.main.phonetic}] {/if} {#each entry.senses || [] as sense} - {#if selectedFields.parts_of_speech && sense.parts_of_speech_keys}{add_periods_and_comma_separate_parts_of_speech(sense.parts_of_speech_keys)}{/if} + {#if selectedFields.parts_of_speech && sense.parts_of_speech}{add_periods_and_comma_separate_parts_of_speech(sense.parts_of_speech)}{/if} {#if selectedFields.gloss && sense.glosses} @@ -43,19 +50,19 @@ glosses: sense.glosses, dictionary_gloss_languages: dictionary.glossLanguages, t: $page.data.t, - }).join(', '))}{selectedFields.example_sentence && sense.example_sentences?.length > 0 ? ';' : ''} + }).join(', '))}{selectedFields.example_sentence && sense.sentence_ids?.length > 0 ? ';' : ''} {/if} - {#if selectedFields.example_sentence} + {#if selectedFields.example_sentence && first_sentence} {order_example_sentences({ - example_sentences: sense.example_sentences?.[0], + sentence: first_sentence, dictionary_gloss_languages: dictionary.glossLanguages, }).join(' / ')} {/if} {#if selectedFields.semantic_domains} - {@const semantic_domains = [...sense.translated_ld_semantic_domains || [], ...sense.write_in_semantic_domains || []]} + {@const semantic_domains = [...sense.semantic_domains || [], ...sense.write_in_semantic_domains || []]} {#if semantic_domains.length}
{#if showLabels} @@ -63,65 +70,101 @@ {$page.data.t('entry_field.semantic_domains')}: {/if} - {semantic_domains.join(', ')} + {semantic_domains.map(domain => $page.data.t({ dynamicKey: `sd.${domain}`, fallback: domain })).join(', ')}
{/if} {/if} {#if selectedFields.noun_class && sense.noun_class} -

+

{#if showLabels} {$page.data.t('entry_field.noun_class')}: {/if} {sense.noun_class} -

+
{/if} - {/each} -
- {#each selectedPrintFields as key} -

+ {#if selectedFields.plural_form && sense.plural_form} +

{#if showLabels} - {$page.data.t(`entry_field.${key}`)}: + {$page.data.t('entry_field.plural_form')}: {/if} - {#if key === 'notes'} - {@html sanitize(entry[key])} - {:else if key === 'dialects'} - {entry[key].join(', ')} - {:else} - {entry[key]} + {sense.plural_form?.default} +
+ {/if} + + {#if selectedFields.variant && sense.variant} +
+ {#if showLabels} + {$page.data.t('entry_field.variant')}: {/if} -

- {/each} -
+ {sense.variant?.default} +
+ {/if} + {/each} + + {#if selectedFields.notes && entry.main.notes} +
+ {#if showLabels} + {$page.data.t('entry_field.notes')}: + {/if} + {@html sanitize(entry.main.notes.default)} +
+ {/if} + + {#if selectedFields.dialects && entry.dialect_ids?.length} +
+ {#if showLabels} + {$page.data.t(`entry_field.dialects`)}: + {/if} + {$dialects.filter(dialect => entry.dialect_ids.includes(dialect.id)).map(dialect => dialect.name.default).join(', ')} +
+ {/if} + + {#if selectedFields.interlinearization && entry.main.interlinearization} +
+ {#if showLabels} + {$page.data.t(`entry_field.interlinearization`)}: + {/if} + {entry.main.interlinearization} +
+ {/if} + + {#if selectedFields.morphology && entry.main.morphology} +
+ {#if showLabels} + {$page.data.t(`entry_field.morphology`)}: + {/if} + {entry.main.morphology} +
+ {/if} - {#if selectedFields.sources && entry.sources} + {#if selectedFields.sources && entry.main.sources}
{#if showLabels} {$page.data.t('entry_field.sources')}: {/if} - {entry.sources.join(', ')} + {entry.main.sources.join(', ')}
{/if} - - {#if selectedFields.speaker && entry.sound_files?.[0].speakerName} + {#if selectedFields.speaker && speaker_name}
{#if showLabels} {$page.data.t('entry_field.speaker')}: {/if} - {entry.sound_files?.[0].speakerName} + {speaker_name}
{/if}
-{#if selectedFields.photo && entry.senses?.[0]?.photo_files?.[0]} +{#if selectedFields.photo && first_photo} {entry.lexeme} + src="https://lh3.googleusercontent.com/{first_photo.serving_url}" + alt={entry.main.lexeme.default} /> {/if} {#if showQrCode} diff --git a/packages/site/src/routes/[dictionaryId]/entries/print/PrintEntry.variants.ts b/packages/site/src/routes/[dictionaryId]/entries/print/PrintEntry.variants.ts index b4c63ebf0..5567983cf 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/print/PrintEntry.variants.ts +++ b/packages/site/src/routes/[dictionaryId]/entries/print/PrintEntry.variants.ts @@ -1,87 +1,87 @@ -import type { Variant } from 'kitbook' -import type { IPrintFields } from '@living-dictionaries/types' -import type Component from './PrintEntry.svelte' -import { defaultPrintFields } from './printFields' -import { complex, hebrew, simple } from '$lib/mocks/entries' -import { basic_mock_dictionary } from '$lib/mocks/dictionaries' +// import type { Variant } from 'kitbook' +// import type { IPrintFields } from '@living-dictionaries/types' +// import type Component from './PrintEntry.svelte' +// import { defaultPrintFields } from './printFields' +// import { complex, hebrew, simple } from '$lib/mocks/entries' +// import { basic_mock_dictionary } from '$lib/mocks/dictionaries' -const selectedFields: IPrintFields = { - ...defaultPrintFields, - semantic_domains: true, - noun_class: true, - interlinearization: true, - morphology: true, - plural_form: true, - variant: true, - dialects: true, - notes: true, - photo: true, - speaker: true, - sources: true, - example_sentence: true, -} +// const selectedFields: IPrintFields = { +// ...defaultPrintFields, +// semantic_domains: true, +// noun_class: true, +// interlinearization: true, +// morphology: true, +// plural_form: true, +// variant: true, +// dialects: true, +// notes: true, +// photo: true, +// speaker: true, +// sources: true, +// example_sentence: true, +// } -export const Example_Sentences: Variant = { - dictionary: basic_mock_dictionary, - selectedFields, - entry: { - lexeme: '(h)æg-ko gag=tǝnǝ nlaʔ-pog', - senses: [{ - example_sentences: [{ - vn: 'test', - es: 'Esta es una oración de ejemplo', - en: 'This is an example sentence', - }], - }], - }, - headwordSize: 20, - _meta: { - viewports: [{ width: 400, height: 200 }], - }, -} +// export const Example_Sentences: Variant = { +// dictionary: basic_mock_dictionary, +// selectedFields, +// entry: { +// lexeme: '(h)æg-ko gag=tǝnǝ nlaʔ-pog', +// senses: [{ +// example_sentences: [{ +// vn: 'test', +// es: 'Esta es una oración de ejemplo', +// en: 'This is an example sentence', +// }], +// }], +// }, +// headwordSize: 20, +// _meta: { +// viewports: [{ width: 400, height: 200 }], +// }, +// } -export const Complex: Variant = { - dictionary: basic_mock_dictionary, - selectedFields, - entry: complex, - showQrCode: true, - headwordSize: 20, - showLabels: true, - _meta: { - viewports: [{ width: 400, height: 700 }], - }, -} +// export const Complex: Variant = { +// dictionary: basic_mock_dictionary, +// selectedFields, +// entry: complex, +// showQrCode: true, +// headwordSize: 20, +// showLabels: true, +// _meta: { +// viewports: [{ width: 400, height: 700 }], +// }, +// } -export const Complex_Without_Labels: Variant = { - dictionary: basic_mock_dictionary, - selectedFields, - entry: complex, - showQrCode: true, - headwordSize: 20, - showLabels: false, - _meta: { - viewports: [{ width: 400, height: 700 }], - }, -} +// export const Complex_Without_Labels: Variant = { +// dictionary: basic_mock_dictionary, +// selectedFields, +// entry: complex, +// showQrCode: true, +// headwordSize: 20, +// showLabels: false, +// _meta: { +// viewports: [{ width: 400, height: 700 }], +// }, +// } -export const Example_With_Hebrew_Text: Variant = { - dictionary: basic_mock_dictionary, - selectedFields, - entry: hebrew, - headwordSize: 20, - _meta: { - description: 'This is an example where non-hebrew characters are mixed with hebrew characters in the same line.', - viewports: [{ width: 400, height: 100 }], - languages: [{ name: 'english', code: 'en' }, { name: 'hebrew', code: 'he' }], - }, -} +// export const Example_With_Hebrew_Text: Variant = { +// dictionary: basic_mock_dictionary, +// selectedFields, +// entry: hebrew, +// headwordSize: 20, +// _meta: { +// description: 'This is an example where non-hebrew characters are mixed with hebrew characters in the same line.', +// viewports: [{ width: 400, height: 100 }], +// languages: [{ name: 'english', code: 'en' }, { name: 'hebrew', code: 'he' }], +// }, +// } -export const Simple: Variant = { - dictionary: basic_mock_dictionary, - selectedFields, - entry: simple, - headwordSize: 20, - _meta: { - viewports: [{ width: 400, height: 100 }], - }, -} +// export const Simple: Variant = { +// dictionary: basic_mock_dictionary, +// selectedFields, +// entry: simple, +// headwordSize: 20, +// _meta: { +// viewports: [{ width: 400, height: 100 }], +// }, +// } diff --git a/packages/site/src/routes/[dictionaryId]/entries/print/PrintFieldCheckboxes.svelte b/packages/site/src/routes/[dictionaryId]/entries/print/PrintFieldCheckboxes.svelte index b62bac7c2..f10393918 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/print/PrintFieldCheckboxes.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/print/PrintFieldCheckboxes.svelte @@ -1,33 +1,36 @@ {#each fieldsThatExist as field} diff --git a/packages/site/src/routes/[dictionaryId]/entries/print/QrCode.svelte b/packages/site/src/routes/[dictionaryId]/entries/print/QrCode.svelte index c18dd95f7..e5e90d4cc 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/print/QrCode.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/print/QrCode.svelte @@ -1,28 +1,29 @@ diff --git a/packages/site/src/routes/[dictionaryId]/entries/print/mock-data.ts b/packages/site/src/routes/[dictionaryId]/entries/print/mock-data.ts index 39e1b35e6..f4deb3364 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/print/mock-data.ts +++ b/packages/site/src/routes/[dictionaryId]/entries/print/mock-data.ts @@ -1,384 +1,382 @@ -import type { ActualDatabaseEntry, ISpeaker } from '@living-dictionaries/types'; +// const gender: 'm' | 'f' | 'o' = 'f' -const gender: 'm' | 'f' | 'o' = 'f'; +// export const speakers: ISpeaker[] = [ +// { +// birthplace: 'russia', +// contributingTo: ['bezhta'], +// decade: 4, +// displayName: 'zaira', +// gender, +// uid: 'uwNgSHCEeRaJAUPsmZok1uMRXzO2', +// }, +// ] -export const speakers: ISpeaker[] = [ - { - birthplace: 'russia', - contributingTo: ['bezhta'], - decade: 4, - displayName: 'zaira', - gender, - uid: 'uwNgSHCEeRaJAUPsmZok1uMRXzO2', - }, -]; +// export const entries: ActualDatabaseEntry[] = [ +// { +// id: '12345qwerty', +// lx: 'xiangjiao', +// gl: { es: 'platano', ar: ``, en: 'banana' }, +// lo: 'کیلا', +// lo2: 'یaلا', +// lo3: 'check_lo3', +// in: 'n', +// mr: 'bar', +// nc: '5', +// ph: 'xiangjiao', +// ps: 'n', +// pl: 'shuang xiangjiao', +// sd: ['Plants'], +// sdn: ['2.1', '2.2', '2.3'], +// di: 'West Zimbizi', +// nt: `This is an example of a note, here we can write whatever we want. `, // will be sanitized +// sr: ['A book', 'www.mybook.com'], +// xs: { en: 'This is a banana', vn: '我很喜歡吃香蕉' }, +// sf: { path: 'https://database.com/sound.mp3', speakerName: 'Bob Smith' }, +// pf: { +// gcs: 'Ktt_Jvk55Mp1cHJ6_zXeHU6dEJOjh8p5bk3rvK5kzXVgwB8GDXCSOPipNTveouELfx9_Rh4IllVvS3BLFBTc', +// }, +// xv: '', +// }, +// { +// id: '34qw', +// lx: 'tree', +// gl: { es: 'arbol' }, +// pf: { +// gcs: 'Ktt_Jvk55Mp1cHJ6_zXeHU6dEJOjh8p5bk3rvK5kzXVgwB8GDXCSOPipNTveouELfx9_Rh4IllVvS3BLFBTc', +// source: 'local_import', +// }, +// }, +// { +// ph: 'tato', +// di: '', +// lo: '', -export const entries: ActualDatabaseEntry[] = [ - { - id: '12345qwerty', - lx: 'xiangjiao', - gl: { es: 'platano', ar: ``, en: 'banana' }, - lo: 'کیلا', - lo2: 'یaلا', - lo3: 'check_lo3', - in: 'n', - mr: 'bar', - nc: '5', - ph: 'xiangjiao', - ps: 'n', - pl: 'shuang xiangjiao', - sd: ['Plants'], - sdn: ['2.1', '2.2', '2.3'], - di: 'West Zimbizi', - nt: `This is an example of a note, here we can write whatever we want. `, // will be sanitized - sr: ['A book', 'www.mybook.com'], - xs: { en: 'This is a banana', vn: '我很喜歡吃香蕉' }, - sf: { path: 'https://database.com/sound.mp3', speakerName: 'Bob Smith' }, - pf: { - gcs: 'Ktt_Jvk55Mp1cHJ6_zXeHU6dEJOjh8p5bk3rvK5kzXVgwB8GDXCSOPipNTveouELfx9_Rh4IllVvS3BLFBTc', - }, - xv: '', - }, - { - id: '34qw', - lx: 'tree', - gl: { es: 'arbol' }, - pf: { - gcs: 'Ktt_Jvk55Mp1cHJ6_zXeHU6dEJOjh8p5bk3rvK5kzXVgwB8GDXCSOPipNTveouELfx9_Rh4IllVvS3BLFBTc', - source: 'local_import', - }, - }, - { - ph: 'tato', - di: '', - lo: '', +// nt: '', +// xv: '', +// ps: 'n', +// sdn: ['1.2'], +// lx: 'тато', +// sf: { +// path: 'audio/bezhta/0860Y6h3Nnl63tiD6UWX_1591201519424.wav', +// ab: 'uwNgSHCEeRaJAUPsmZok1uMRXzO2', +// sp: 'uwNgSHCEeRaJAUPsmZok1uMRXzO2', +// ts: 1580860148537, +// }, +// updatedBy: 'uwNgSHCEeRaJAUPsmZok1uMRXzO2', +// gl: { +// en: 'mud', +// ru: 'грязь', +// }, +// id: '0860Y6h3Nnl63tiD6UWX', +// createdBy: 'uwNgSHCEeRaJAUPsmZok1uMRXzO2', +// in: '', +// }, +// { +// nt: 'akateko_Juan-Diego-Mat-as_07Aug2014-1349_mother-8217-s-mother.wav recorded directly on 07Aug2014-1349 by Juan Diego Matías; ', +// sdn: ['2.6'], +// ps: 'inal.n', +// xs: { +// vernacular: 'abuela materna', +// }, +// lx: 'chikay', +// gl: { +// en: 'mother\'s mother', +// }, +// di: 'término de parentesco', +// ub: '9yznFRnjuNOcdZf8ZGW16xDLkFh1', +// pf: { +// source: 'local_import', +// gcs: 'lwNfI3yEZ2ZOLwFXl_zxW8DPcjpbUvAGZL0aacvYRbw8JpMsFVlq5-y63CwDYd_cSwrFlYX2_O6I7jqwPGxV4A\n', +// }, +// createdBy: 'OTD', +// ph: 'ʧ͡i.kaj', +// sf: { +// path: 'akateko/audio/local_import/akateko-Juan-Diego-Mat-as-07Aug2014-1349-mother-8217-s-mother-1581896570161.mp3', +// speakerName: 'Juan Diego Matías', +// source: 'local_import', +// ts: 1580860148537, +// }, +// id: 'A9L0NWFc7xiLrWWqrmNh', +// }, +// { +// di: 'Hill', +// lx: '(h)ozartũã', +// createdBy: 'OTD', +// sdn: ['7.1'], +// sd: null, +// gl: { +// en: 'thousand', +// }, +// sf: { +// source: 'local_import', +// path: 'gta/audio/local_import/Gta-BR-Tkrpr-11-11-thousand-1580859670382.mp3', +// ts: 1580860148537, +// speakerName: 'Budra Raspeda', +// }, +// nt: '2011 Tikorapoda', +// id: '2tND9w3BROP4c3kauN03', +// }, +// { +// gl: { +// en: 'swing (vb.), shake (tr. vb.); hang up, unfurl; suspend[ed]', +// }, +// di: 'Hill', +// nt: '2011 Tikorapoda', +// sf: { +// path: 'gta/audio/local_import/Gta-BR-Tkrpr-11-11-hang-up-swing-1580859669274.mp3', +// source: 'local_import', +// speakerName: 'Budra Raspeda', +// ts: 1580860148537, +// }, +// sdn: ['6'], +// createdBy: 'OTD', +// lx: '(b)aʔdʒur', +// ub: 'T4qikh1eTafizvpmHNcG29uRQ2j1', +// ps: '', +// id: 'j8iVvJkiFBT7JcvLvNdk', +// }, +// { +// lx: '(ɖ)nejʔpar', +// createdBy: 'OTD', +// gl: { +// en: 'urinal, latrine', +// }, +// nt: '2011 Tikorapoda', +// di: 'Hill', +// sf: { +// speakerName: 'Budra Raspeda', +// path: 'gta/audio/local_import/Gta-BR-Tkrpr-11-11-latrine-2-1580859676385.mp3', +// ts: 1580860148537, +// source: 'local_import', +// }, +// sdn: ['5.1', '5.5'], +// sd: null, +// id: 'wAcMha8FGpnOL13MsyfT', +// }, +// { +// lx: 'surdaənsoloso\'ji', +// sf: { +// sc: 'local_import', +// speakerName: 'Somari Sabar', +// path: 'sora/audio/local_import/Sora_big_dog_female_pl_PSI_160-1589122747233.wav', +// }, +// lo2: '𑃐𑃥𑃝𑃢 𑃢𑃙𑃐𑃦𑃘𑃦𑃐𑃦-𑃠𑃤', +// gl: { +// or: 'ବଡ ମାଇ କୁକୁର ଗୁଡିକ', +// hi: 'बड़ी कुत्तीयां', +// as: 'ডাঙৰ মাইকী কুকুৰ কেইজনী', +// en: 'big female dogs', +// }, +// lo: 'চুড়া আ্নচ\'ল\'চঃজি', +// di: 'West Bengal Sabar', +// ph: 'suɽa ənsolosoʔdʒi', +// sdn: ['1', '1.5', '7.2'], +// in: 'big female dog-PL', +// ps: 'ap', +// mr: 'suɽa ənsolo soʔ-dʒi', +// ii: 'v3-1589122736839', +// id: 'qd0HhcZKxqPX1x1MXKvw', +// }, +// { +// lx: 'aben bar hoɽ kʰatir', +// ph: 'aben bar hoɽ kʰatir', +// sdn: [], +// lo: 'अबेन बार होड़ खातिर', +// gl: { +// hi: 'तुमदोनों के लिए', +// en: 'for you both', +// }, +// sf: { +// speakerName: 'Kaushila Birhor', +// path: 'birhor/audio/NExkGez4TRBhxuv7rMzX_1646843775362.wav', +// }, +// ub: 'T4qikh1eTafizvpmHNcG29uRQ2j1', +// ii: 'v4-1646842787283', +// id: 'NExkGez4TRBhxuv7rMzX', +// nc: '6/12', +// pl: 'aben bar hoɽ kʰatu', +// }, +// { +// gl: { +// or: 'Mankada', +// en: 'Rhesus monkey', +// }, +// nt: 'Parlakhemundi: Animals 232 to 258 #', +// sf: { +// ts: 1580860148537, +// speakerName: 'Budura Raspeda', +// source: 'local_import', +// path: 'gta/audio/local_import/Gta-Pkd-Dec13-An-rhesus-monkey-1580860134632.mp3', +// }, +// pf: { +// source: 'local_import', +// gcs: 'RFMsChWMpLTc-0Oo8srvCtHr40UTMQz-mcuqNkcVanRagRQLd_s7iZqTbTE74EHdjh1TGTjDo8YvcVkePgmN8Q', +// }, +// sdn: ['1.5'], +// lx: 'geseʔ', +// sd: null, +// createdBy: 'OTD', +// xs: { +// vernacular: +// 'Photo by John Connell, September 9 2007 CC BY-NC-SA 2.0 https://www.flickr.com/photos/soutra/1351155387', +// }, +// id: 'cY1McfcmkJyv6EqHeynb', +// }, +// ] - nt: '', - xv: '', - ps: 'n', - sdn: ['1.2'], - lx: 'тато', - sf: { - path: 'audio/bezhta/0860Y6h3Nnl63tiD6UWX_1591201519424.wav', - ab: 'uwNgSHCEeRaJAUPsmZok1uMRXzO2', - sp: 'uwNgSHCEeRaJAUPsmZok1uMRXzO2', - ts: 1580860148537, - }, - updatedBy: 'uwNgSHCEeRaJAUPsmZok1uMRXzO2', - gl: { - en: 'mud', - ru: 'грязь', - }, - id: '0860Y6h3Nnl63tiD6UWX', - createdBy: 'uwNgSHCEeRaJAUPsmZok1uMRXzO2', - in: '', - }, - { - nt: 'akateko_Juan-Diego-Mat-as_07Aug2014-1349_mother-8217-s-mother.wav recorded directly on 07Aug2014-1349 by Juan Diego Matías; ', - sdn: ['2.6'], - ps: 'inal.n', - xs: { - vernacular: 'abuela materna', - }, - lx: 'chikay', - gl: { - en: 'mother\'s mother', - }, - di: 'término de parentesco', - ub: '9yznFRnjuNOcdZf8ZGW16xDLkFh1', - pf: { - source: 'local_import', - gcs: 'lwNfI3yEZ2ZOLwFXl_zxW8DPcjpbUvAGZL0aacvYRbw8JpMsFVlq5-y63CwDYd_cSwrFlYX2_O6I7jqwPGxV4A\n', - }, - createdBy: 'OTD', - ph: 'ʧ͡i.kaj', - sf: { - path: 'akateko/audio/local_import/akateko-Juan-Diego-Mat-as-07Aug2014-1349-mother-8217-s-mother-1581896570161.mp3', - speakerName: 'Juan Diego Matías', - source: 'local_import', - ts: 1580860148537, - }, - id: 'A9L0NWFc7xiLrWWqrmNh', - }, - { - di: 'Hill', - lx: '(h)ozartũã', - createdBy: 'OTD', - sdn: ['7.1'], - sd: null, - gl: { - en: 'thousand', - }, - sf: { - source: 'local_import', - path: 'gta/audio/local_import/Gta-BR-Tkrpr-11-11-thousand-1580859670382.mp3', - ts: 1580860148537, - speakerName: 'Budra Raspeda', - }, - nt: '2011 Tikorapoda', - id: '2tND9w3BROP4c3kauN03', - }, - { - gl: { - en: 'swing (vb.), shake (tr. vb.); hang up, unfurl; suspend[ed]', - }, - di: 'Hill', - nt: '2011 Tikorapoda', - sf: { - path: 'gta/audio/local_import/Gta-BR-Tkrpr-11-11-hang-up-swing-1580859669274.mp3', - source: 'local_import', - speakerName: 'Budra Raspeda', - ts: 1580860148537, - }, - sdn: ['6'], - createdBy: 'OTD', - lx: '(b)aʔdʒur', - ub: 'T4qikh1eTafizvpmHNcG29uRQ2j1', - ps: '', - id: 'j8iVvJkiFBT7JcvLvNdk', - }, - { - lx: '(ɖ)nejʔpar', - createdBy: 'OTD', - gl: { - en: 'urinal, latrine', - }, - nt: '2011 Tikorapoda', - di: 'Hill', - sf: { - speakerName: 'Budra Raspeda', - path: 'gta/audio/local_import/Gta-BR-Tkrpr-11-11-latrine-2-1580859676385.mp3', - ts: 1580860148537, - source: 'local_import', - }, - sdn: ['5.1', '5.5'], - sd: null, - id: 'wAcMha8FGpnOL13MsyfT', - }, - { - lx: 'surdaənsoloso\'ji', - sf: { - sc: 'local_import', - speakerName: 'Somari Sabar', - path: 'sora/audio/local_import/Sora_big_dog_female_pl_PSI_160-1589122747233.wav', - }, - lo2: '𑃐𑃥𑃝𑃢 𑃢𑃙𑃐𑃦𑃘𑃦𑃐𑃦-𑃠𑃤', - gl: { - or: 'ବଡ ମାଇ କୁକୁର ଗୁଡିକ', - hi: 'बड़ी कुत्तीयां', - as: 'ডাঙৰ মাইকী কুকুৰ কেইজনী', - en: 'big female dogs', - }, - lo: 'চুড়া আ্নচ\'ল\'চঃজি', - di: 'West Bengal Sabar', - ph: 'suɽa ənsolosoʔdʒi', - sdn: ['1', '1.5', '7.2'], - in: 'big female dog-PL', - ps: 'ap', - mr: 'suɽa ənsolo soʔ-dʒi', - ii: 'v3-1589122736839', - id: 'qd0HhcZKxqPX1x1MXKvw', - }, - { - lx: 'aben bar hoɽ kʰatir', - ph: 'aben bar hoɽ kʰatir', - sdn: [], - lo: 'अबेन बार होड़ खातिर', - gl: { - hi: 'तुमदोनों के लिए', - en: 'for you both', - }, - sf: { - speakerName: 'Kaushila Birhor', - path: 'birhor/audio/NExkGez4TRBhxuv7rMzX_1646843775362.wav', - }, - ub: 'T4qikh1eTafizvpmHNcG29uRQ2j1', - ii: 'v4-1646842787283', - id: 'NExkGez4TRBhxuv7rMzX', - nc: '6/12', - pl: 'aben bar hoɽ kʰatu', - }, - { - gl: { - or: 'Mankada', - en: 'Rhesus monkey', - }, - nt: 'Parlakhemundi: Animals 232 to 258 #', - sf: { - ts: 1580860148537, - speakerName: 'Budura Raspeda', - source: 'local_import', - path: 'gta/audio/local_import/Gta-Pkd-Dec13-An-rhesus-monkey-1580860134632.mp3', - }, - pf: { - source: 'local_import', - gcs: 'RFMsChWMpLTc-0Oo8srvCtHr40UTMQz-mcuqNkcVanRagRQLd_s7iZqTbTE74EHdjh1TGTjDo8YvcVkePgmN8Q', - }, - sdn: ['1.5'], - lx: 'geseʔ', - sd: null, - createdBy: 'OTD', - xs: { - vernacular: - 'Photo by John Connell, September 9 2007 CC BY-NC-SA 2.0 https://www.flickr.com/photos/soutra/1351155387', - }, - id: 'cY1McfcmkJyv6EqHeynb', - }, -]; +// export const entriesWithSemanticDomains: ActualDatabaseEntry[] = [ +// { +// id: '1', +// lx: 'One semantic domain', +// gl: null, +// sdn: ['4'], +// }, +// { +// id: '2', +// lx: 'Five semantic domains', +// gl: null, +// sdn: ['1', '1.5', '2.1', '2.2', '2.3'], +// }, +// { +// id: '3', +// lx: 'Many semantic domains', +// gl: null, +// sdn: [ +// '1.3', +// '1.7', +// '2.2', +// '2.6', +// '2.8', +// '3', +// '4', +// '5', +// '5.17', +// '6', +// '7', +// '8', +// '9', +// '10', +// '10.1', +// '10.3', +// '10.6', +// '10.8', +// '10.9', +// ], +// }, +// { +// id: '4', +// lx: 'None semantic domains', +// gl: null, +// sdn: [], +// }, +// ] -export const entriesWithSemanticDomains: ActualDatabaseEntry[] = [ - { - id: '1', - lx: 'One semantic domain', - gl: null, - sdn: ['4'], - }, - { - id: '2', - lx: 'Five semantic domains', - gl: null, - sdn: ['1', '1.5', '2.1', '2.2', '2.3'], - }, - { - id: '3', - lx: 'Many semantic domains', - gl: null, - sdn: [ - '1.3', - '1.7', - '2.2', - '2.6', - '2.8', - '3', - '4', - '5', - '5.17', - '6', - '7', - '8', - '9', - '10', - '10.1', - '10.3', - '10.6', - '10.8', - '10.9', - ], - }, - { - id: '4', - lx: 'None semantic domains', - gl: null, - sdn: [], - }, -]; +// export const entriesWithAlternateOrthographies: ActualDatabaseEntry[] = [ +// { +// id: 'altOrth5', +// lx: 'Hello', +// gl: null, +// lo: 'Nnọọ', +// lo2: 'Привет', +// lo3: 'سلام', +// lo4: 'नमस्ते', +// lo5: 'שלום', +// }, +// { +// id: 'altOrth3', +// lx: 'Bye', +// gl: null, +// lo: 'さよなら', +// lo2: '안녕', +// lo3: 'αντίο', +// }, +// ] -export const entriesWithAlternateOrthographies: ActualDatabaseEntry[] = [ - { - id: 'altOrth5', - lx: 'Hello', - gl: null, - lo: 'Nnọọ', - lo2: 'Привет', - lo3: 'سلام', - lo4: 'नमस्ते', - lo5: 'שלום', - }, - { - id: 'altOrth3', - lx: 'Bye', - gl: null, - lo: 'さよなら', - lo2: '안녕', - lo3: 'αντίο', - }, -]; +// export const entriesWithPhonetics: ActualDatabaseEntry[] = [ +// { +// id: 'phonetics', +// lx: 'Giraffe', +// gl: null, +// ph: 'dʒɚˈɹæf', +// }, +// { +// id: 'noPhonetics', +// lx: 'Quiet', +// gl: null, +// }, +// ] -export const entriesWithPhonetics: ActualDatabaseEntry[] = [ - { - id: 'phonetics', - lx: 'Giraffe', - gl: null, - ph: 'dʒɚˈɹæf', - }, - { - id: 'noPhonetics', - lx: 'Quiet', - gl: null, - }, -]; +// export const entriesWithPartsOfSpeech: ActualDatabaseEntry[] = [ +// { +// id: 'PoS', +// lx: 'Parts of speech', +// gl: null, +// ps: 'np', +// }, +// { +// id: 'PoSpref', +// lx: 'un-', +// gl: null, +// ps: 'pref', +// }, +// ] -export const entriesWithPartsOfSpeech: ActualDatabaseEntry[] = [ - { - id: 'PoS', - lx: 'Parts of speech', - gl: null, - ps: 'np', - }, - { - id: 'PoSpref', - lx: 'un-', - gl: null, - ps: 'pref', - }, -]; +// export const entriesWithGlosses: ActualDatabaseEntry[] = [ +// { +// id: 'multipleGlosses', +// lx: 'Hello World', +// gl: { +// es: 'Hola mundo', +// fr: 'Bonjour le monde', +// it: 'Ciao mondo', +// pt: 'Olá Mundo', +// de: 'Hallo Welt', +// }, +// }, +// { +// id: 'fewGlosses', +// lx: 'Excuse me', +// gl: { sv: 'Ursäkta mig', no: 'unnskyld meg', da: 'undskyld mig' }, +// }, +// { +// id: 'oneGloss', +// lx: 'Happy', +// gl: { fi: 'Onnellinen' }, +// }, +// ] -export const entriesWithGlosses: ActualDatabaseEntry[] = [ - { - id: 'multipleGlosses', - lx: 'Hello World', - gl: { - es: 'Hola mundo', - fr: 'Bonjour le monde', - it: 'Ciao mondo', - pt: 'Olá Mundo', - de: 'Hallo Welt', - }, - }, - { - id: 'fewGlosses', - lx: 'Excuse me', - gl: { sv: 'Ursäkta mig', no: 'unnskyld meg', da: 'undskyld mig' }, - }, - { - id: 'oneGloss', - lx: 'Happy', - gl: { fi: 'Onnellinen' }, - }, -]; - -export const entriesWithExampleSentences: ActualDatabaseEntry[] = [ - { - id: 'multipleExampleSentences', - lx: 'Fear', - gl: null, - xs: { - es: 'Un hombre que huye de su miedo puede encontrar que solamente ha tomado un atajo para encontrarlo.', - fr: 'Un homme qui fuit sa peur peut s\'apercevoir qu\'il n\'a pris qu\'un raccourci pour y faire face.', - it: 'Un uomo che fugge dalla sua paura può scoprire di aver preso solo una scorciatoia per affrontarla.', - pt: 'Um homem que foge de seu medo pode descobrir que apenas tomou um atalho para enfrentá-lo.', - de: 'Ein Mann, der vor seiner Angst flieht, kann feststellen, dass er nur eine Abkürzung genommen hat, um ihr zu begegnen.', - vn: 'A man that flies from his fear may find that he has only taken a short cut to meet it.', - }, - }, - { - id: 'fewExampleSentences', - lx: 'Life', - gl: null, - xs: { - sv: 'Ditt livs form ligger i dina händer att bryta.', - no: 'Formen i livet ditt er i dine hender for å bryte.', - da: 'Dit livs form er i dine hænder for at bryde.', - vn: 'The mold of your life is in your hands to break.', - }, - }, - { - id: 'oneExampleSentence', - lx: 'Gratitude', - gl: null, - xs: { - fi: 'todistaa, että vaikka mieli ja voima olivat menneet, kiitollisuus ja molemminpuolinen hellyys elivät edelleen ihmisten sydämessä.', - vn: 'to witness that even when mind and strength had gone, gratitude and a mutual tenderness still lived on in the heart of men.', - }, - }, -]; +// export const entriesWithExampleSentences: ActualDatabaseEntry[] = [ +// { +// id: 'multipleExampleSentences', +// lx: 'Fear', +// gl: null, +// xs: { +// es: 'Un hombre que huye de su miedo puede encontrar que solamente ha tomado un atajo para encontrarlo.', +// fr: 'Un homme qui fuit sa peur peut s\'apercevoir qu\'il n\'a pris qu\'un raccourci pour y faire face.', +// it: 'Un uomo che fugge dalla sua paura può scoprire di aver preso solo una scorciatoia per affrontarla.', +// pt: 'Um homem que foge de seu medo pode descobrir que apenas tomou um atalho para enfrentá-lo.', +// de: 'Ein Mann, der vor seiner Angst flieht, kann feststellen, dass er nur eine Abkürzung genommen hat, um ihr zu begegnen.', +// vn: 'A man that flies from his fear may find that he has only taken a short cut to meet it.', +// }, +// }, +// { +// id: 'fewExampleSentences', +// lx: 'Life', +// gl: null, +// xs: { +// sv: 'Ditt livs form ligger i dina händer att bryta.', +// no: 'Formen i livet ditt er i dine hender for å bryte.', +// da: 'Dit livs form er i dine hænder for at bryde.', +// vn: 'The mold of your life is in your hands to break.', +// }, +// }, +// { +// id: 'oneExampleSentence', +// lx: 'Gratitude', +// gl: null, +// xs: { +// fi: 'todistaa, että vaikka mieli ja voima olivat menneet, kiitollisuus ja molemminpuolinen hellyys elivät edelleen ihmisten sydämessä.', +// vn: 'to witness that even when mind and strength had gone, gratitude and a mutual tenderness still lived on in the heart of men.', +// }, +// }, +// ] diff --git a/packages/site/src/routes/[dictionaryId]/entries/print/printFields.ts b/packages/site/src/routes/[dictionaryId]/entries/print/printFields.ts index 62b23e0e5..0a5fbf41f 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/print/printFields.ts +++ b/packages/site/src/routes/[dictionaryId]/entries/print/printFields.ts @@ -1,4 +1,4 @@ -import type { IPrintFields } from '@living-dictionaries/types'; +import type { IPrintFields } from '@living-dictionaries/types' export const defaultPrintFields: IPrintFields = { gloss: true, @@ -17,4 +17,4 @@ export const defaultPrintFields: IPrintFields = { photo: false, speaker: false, sources: false, -}; +} diff --git a/packages/site/src/routes/[dictionaryId]/entries/print/qrcodegen.ts b/packages/site/src/routes/[dictionaryId]/entries/print/qrcodegen.ts index d7fb7a086..6993e3afe 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/print/qrcodegen.ts +++ b/packages/site/src/routes/[dictionaryId]/entries/print/qrcodegen.ts @@ -21,11 +21,11 @@ * Software. */ -type bit = number; -type byte = number; -type int = number; +type bit = number +type byte = number +type int = number -/*---- QR Code symbol class ----*/ +/* ---- QR Code symbol class ---- */ /* * A QR Code symbol, which is a type of two-dimension barcode. @@ -44,7 +44,7 @@ type int = number; * (Note that all ways require supplying the desired error correction level.) */ export class QrCode { - /*-- Static factory functions (high level) --*/ + /* -- Static factory functions (high level) -- */ // Returns a QR Code representing the given Unicode text string at the given error correction level. // As a conservative upper bound, this function is guaranteed to succeed for strings that have 738 or fewer @@ -52,20 +52,20 @@ export class QrCode { // QR Code version is automatically chosen for the output. The ECC level of the result may be higher than the // ecl argument if it can be done without increasing the version. public static encodeText(text: string, ecl: QrCodeEcc): QrCode { - const segs: QrSegment[] = QrSegment.makeSegments(text); - return QrCode.encodeSegments(segs, ecl); + const segs: QrSegment[] = QrSegment.makeSegments(text) + return QrCode.encodeSegments(segs, ecl) } // Returns a QR Code representing the given binary data at the given error correction level. // This function always encodes using the binary segment mode, not any text mode. The maximum number of // bytes allowed is 2953. The smallest possible QR Code version is automatically chosen for the output. // The ECC level of the result may be higher than the ecl argument if it can be done without increasing the version. - public static encodeBinary(data: Readonly, ecl: QrCodeEcc): QrCode { - const seg: QrSegment = QrSegment.makeBytes(data); - return QrCode.encodeSegments([seg], ecl); + public static encodeBinary(data: readonly byte[], ecl: QrCodeEcc): QrCode { + const seg: QrSegment = QrSegment.makeBytes(data) + return QrCode.encodeSegments([seg], ecl) } - /*-- Static factory functions (mid level) --*/ + /* -- Static factory functions (mid level) -- */ // Returns a QR Code representing the given segments with the given encoding parameters. // The smallest possible QR Code version within the given range is automatically @@ -77,93 +77,94 @@ export class QrCode { // between modes (such as alphanumeric and byte) to encode text in less space. // This is a mid-level API; the high-level API is encodeText() and encodeBinary(). public static encodeSegments( - segs: Readonly, + segs: readonly QrSegment[], ecl: QrCodeEcc, minVersion: int = 1, maxVersion: int = 40, mask: int = -1, - boostEcl = true + boostEcl = true, ): QrCode { if ( !( - QrCode.MIN_VERSION <= minVersion && - minVersion <= maxVersion && - maxVersion <= QrCode.MAX_VERSION - ) || - mask < -1 || - mask > 7 - ) - throw new RangeError('Invalid value'); + QrCode.MIN_VERSION <= minVersion + && minVersion <= maxVersion + && maxVersion <= QrCode.MAX_VERSION + ) + || mask < -1 + || mask > 7 + ) { + throw new RangeError('Invalid value') + } // Find the minimal version number to use - let version: int; - let dataUsedBits: int; + let version: int + let dataUsedBits: int for (version = minVersion; ; version++) { - const dataCapacityBits: int = QrCode.getNumDataCodewords(version, ecl) * 8; // Number of data bits available - const usedBits: number = QrSegment.getTotalBits(segs, version); + const dataCapacityBits: int = QrCode.getNumDataCodewords(version, ecl) * 8 // Number of data bits available + const usedBits: number = QrSegment.getTotalBits(segs, version) if (usedBits <= dataCapacityBits) { - dataUsedBits = usedBits; - break; // This version number is found to be suitable + dataUsedBits = usedBits + break // This version number is found to be suitable } if (version >= maxVersion) // All versions in the range could not fit the given data - throw new RangeError('Data too long'); + throw new RangeError('Data too long') } // Increase the error correction level while the data still fits in the current version number for (const newEcl of [QrCodeEcc.MEDIUM, QrCodeEcc.QUARTILE, QrCodeEcc.HIGH]) { // From low to high - if (boostEcl && dataUsedBits <= QrCode.getNumDataCodewords(version, newEcl) * 8) ecl = newEcl; + if (boostEcl && dataUsedBits <= QrCode.getNumDataCodewords(version, newEcl) * 8) ecl = newEcl } // Concatenate all segments to create the data bit string - const bb: bit[] = []; + const bb: bit[] = [] for (const seg of segs) { - appendBits(seg.mode.modeBits, 4, bb); - appendBits(seg.numChars, seg.mode.numCharCountBits(version), bb); - for (const b of seg.getData()) bb.push(b); + appendBits(seg.mode.modeBits, 4, bb) + appendBits(seg.numChars, seg.mode.numCharCountBits(version), bb) + for (const b of seg.getData()) bb.push(b) } - assert(bb.length == dataUsedBits); + assert(bb.length == dataUsedBits) // Add terminator and pad up to a byte if applicable - const dataCapacityBits: int = QrCode.getNumDataCodewords(version, ecl) * 8; - assert(bb.length <= dataCapacityBits); - appendBits(0, Math.min(4, dataCapacityBits - bb.length), bb); - appendBits(0, (8 - (bb.length % 8)) % 8, bb); - assert(bb.length % 8 == 0); + const dataCapacityBits: int = QrCode.getNumDataCodewords(version, ecl) * 8 + assert(bb.length <= dataCapacityBits) + appendBits(0, Math.min(4, dataCapacityBits - bb.length), bb) + appendBits(0, (8 - (bb.length % 8)) % 8, bb) + assert(bb.length % 8 == 0) // Pad with alternating bytes until data capacity is reached - for (let padByte = 0xec; bb.length < dataCapacityBits; padByte ^= 0xec ^ 0x11) - appendBits(padByte, 8, bb); + for (let padByte = 0xEC; bb.length < dataCapacityBits; padByte ^= 0xEC ^ 0x11) + appendBits(padByte, 8, bb) // Pack bits into bytes in big endian - const dataCodewords: byte[] = []; - while (dataCodewords.length * 8 < bb.length) dataCodewords.push(0); - bb.forEach((b: bit, i: int) => (dataCodewords[i >>> 3] |= b << (7 - (i & 7)))); + const dataCodewords: byte[] = [] + while (dataCodewords.length * 8 < bb.length) dataCodewords.push(0) + bb.forEach((b: bit, i: int) => (dataCodewords[i >>> 3] |= b << (7 - (i & 7)))) // Create the QR Code object - return new QrCode(version, ecl, dataCodewords, mask); + return new QrCode(version, ecl, dataCodewords, mask) } - /*-- Fields --*/ + /* -- Fields -- */ // The width and height of this QR Code, measured in modules, between // 21 and 177 (inclusive). This is equal to version * 4 + 17. - public readonly size: int; + public readonly size: int // The index of the mask pattern used in this QR Code, which is between 0 and 7 (inclusive). // Even if a QR Code is created with automatic masking requested (mask = -1), // the resulting object still has a mask value between 0 and 7. - public readonly mask: int; + public readonly mask: int // The modules of this QR Code (false = light, true = dark). // Immutable after constructor finishes. Accessed through getModule(). - private readonly modules: boolean[][] = []; + private readonly modules: boolean[][] = [] // Indicates function modules that are not subjected to masking. Discarded when constructor finishes. - private readonly isFunction: boolean[][] = []; + private readonly isFunction: boolean[][] = [] - /*-- Constructor (low level) and fields --*/ + /* -- Constructor (low level) and fields -- */ // Creates a new QR Code with the given version number, // error correction level, data codeword bytes, and mask number. @@ -177,133 +178,133 @@ export class QrCode { // The error correction level used in this QR Code. public readonly errorCorrectionLevel: QrCodeEcc, - dataCodewords: Readonly, + dataCodewords: readonly byte[], - msk: int + msk: int, ) { // Check scalar arguments if (version < QrCode.MIN_VERSION || version > QrCode.MAX_VERSION) - throw new RangeError('Version value out of range'); - if (msk < -1 || msk > 7) throw new RangeError('Mask value out of range'); - this.size = version * 4 + 17; + throw new RangeError('Version value out of range') + if (msk < -1 || msk > 7) throw new RangeError('Mask value out of range') + this.size = version * 4 + 17 // Initialize both grids to be size*size arrays of Boolean false - const row: boolean[] = []; - for (let i = 0; i < this.size; i++) row.push(false); + const row: boolean[] = [] + for (let i = 0; i < this.size; i++) row.push(false) for (let i = 0; i < this.size; i++) { - this.modules.push(row.slice()); // Initially all light - this.isFunction.push(row.slice()); + this.modules.push(row.slice()) // Initially all light + this.isFunction.push(row.slice()) } // Compute ECC, draw modules - this.drawFunctionPatterns(); - const allCodewords: byte[] = this.addEccAndInterleave(dataCodewords); - this.drawCodewords(allCodewords); + this.drawFunctionPatterns() + const allCodewords: byte[] = this.addEccAndInterleave(dataCodewords) + this.drawCodewords(allCodewords) // Do masking if (msk == -1) { // Automatically choose best mask - let minPenalty: int = 1000000000; + let minPenalty: int = 1000000000 for (let i = 0; i < 8; i++) { - this.applyMask(i); - this.drawFormatBits(i); - const penalty: int = this.getPenaltyScore(); + this.applyMask(i) + this.drawFormatBits(i) + const penalty: int = this.getPenaltyScore() if (penalty < minPenalty) { - msk = i; - minPenalty = penalty; + msk = i + minPenalty = penalty } - this.applyMask(i); // Undoes the mask due to XOR + this.applyMask(i) // Undoes the mask due to XOR } } - assert(0 <= msk && msk <= 7); - this.mask = msk; - this.applyMask(msk); // Apply the final choice of mask - this.drawFormatBits(msk); // Overwrite old format bits + assert(msk >= 0 && msk <= 7) + this.mask = msk + this.applyMask(msk) // Apply the final choice of mask + this.drawFormatBits(msk) // Overwrite old format bits - this.isFunction = []; + this.isFunction = [] } - /*-- Accessor methods --*/ + /* -- Accessor methods -- */ // Returns the color of the module (pixel) at the given coordinates, which is false // for light or true for dark. The top left corner has the coordinates (x=0, y=0). // If the given coordinates are out of bounds, then false (light) is returned. public getModule(x: int, y: int): boolean { - return 0 <= x && x < this.size && 0 <= y && y < this.size && this.modules[y][x]; + return x >= 0 && x < this.size && y >= 0 && y < this.size && this.modules[y][x] } - /*-- Private helper methods for constructor: Drawing function modules --*/ + /* -- Private helper methods for constructor: Drawing function modules -- */ // Reads this object's version field, and draws and marks all function modules. private drawFunctionPatterns(): void { // Draw horizontal and vertical timing patterns for (let i = 0; i < this.size; i++) { - this.setFunctionModule(6, i, i % 2 == 0); - this.setFunctionModule(i, 6, i % 2 == 0); + this.setFunctionModule(6, i, i % 2 == 0) + this.setFunctionModule(i, 6, i % 2 == 0) } // Draw 3 finder patterns (all corners except bottom right; overwrites some timing modules) - this.drawFinderPattern(3, 3); - this.drawFinderPattern(this.size - 4, 3); - this.drawFinderPattern(3, this.size - 4); + this.drawFinderPattern(3, 3) + this.drawFinderPattern(this.size - 4, 3) + this.drawFinderPattern(3, this.size - 4) // Draw numerous alignment patterns - const alignPatPos: int[] = this.getAlignmentPatternPositions(); - const numAlign: int = alignPatPos.length; + const alignPatPos: int[] = this.getAlignmentPatternPositions() + const numAlign: int = alignPatPos.length for (let i = 0; i < numAlign; i++) { for (let j = 0; j < numAlign; j++) { // Don't draw on the three finder corners if (!((i == 0 && j == 0) || (i == 0 && j == numAlign - 1) || (i == numAlign - 1 && j == 0))) - this.drawAlignmentPattern(alignPatPos[i], alignPatPos[j]); + this.drawAlignmentPattern(alignPatPos[i], alignPatPos[j]) } } // Draw configuration data - this.drawFormatBits(0); // Dummy mask value; overwritten later in the constructor - this.drawVersion(); + this.drawFormatBits(0) // Dummy mask value; overwritten later in the constructor + this.drawVersion() } // Draws two copies of the format bits (with its own error correction code) // based on the given mask and this object's error correction level field. private drawFormatBits(mask: int): void { // Calculate error correction code and pack bits - const data: int = (this.errorCorrectionLevel.formatBits << 3) | mask; // errCorrLvl is uint2, mask is uint3 - let rem: int = data; - for (let i = 0; i < 10; i++) rem = (rem << 1) ^ ((rem >>> 9) * 0x537); - const bits = ((data << 10) | rem) ^ 0x5412; // uint15 - assert(bits >>> 15 == 0); + const data: int = (this.errorCorrectionLevel.formatBits << 3) | mask // errCorrLvl is uint2, mask is uint3 + let rem: int = data + for (let i = 0; i < 10; i++) rem = (rem << 1) ^ ((rem >>> 9) * 0x537) + const bits = ((data << 10) | rem) ^ 0x5412 // uint15 + assert(bits >>> 15 == 0) // Draw first copy - for (let i = 0; i <= 5; i++) this.setFunctionModule(8, i, getBit(bits, i)); - this.setFunctionModule(8, 7, getBit(bits, 6)); - this.setFunctionModule(8, 8, getBit(bits, 7)); - this.setFunctionModule(7, 8, getBit(bits, 8)); - for (let i = 9; i < 15; i++) this.setFunctionModule(14 - i, 8, getBit(bits, i)); + for (let i = 0; i <= 5; i++) this.setFunctionModule(8, i, getBit(bits, i)) + this.setFunctionModule(8, 7, getBit(bits, 6)) + this.setFunctionModule(8, 8, getBit(bits, 7)) + this.setFunctionModule(7, 8, getBit(bits, 8)) + for (let i = 9; i < 15; i++) this.setFunctionModule(14 - i, 8, getBit(bits, i)) // Draw second copy - for (let i = 0; i < 8; i++) this.setFunctionModule(this.size - 1 - i, 8, getBit(bits, i)); - for (let i = 8; i < 15; i++) this.setFunctionModule(8, this.size - 15 + i, getBit(bits, i)); - this.setFunctionModule(8, this.size - 8, true); // Always dark + for (let i = 0; i < 8; i++) this.setFunctionModule(this.size - 1 - i, 8, getBit(bits, i)) + for (let i = 8; i < 15; i++) this.setFunctionModule(8, this.size - 15 + i, getBit(bits, i)) + this.setFunctionModule(8, this.size - 8, true) // Always dark } // Draws two copies of the version bits (with its own error correction code), // based on this object's version field, iff 7 <= version <= 40. private drawVersion(): void { - if (this.version < 7) return; + if (this.version < 7) return // Calculate error correction code and pack bits - let rem: int = this.version; // version is uint6, in the range [7, 40] - for (let i = 0; i < 12; i++) rem = (rem << 1) ^ ((rem >>> 11) * 0x1f25); - const bits: int = (this.version << 12) | rem; // uint18 - assert(bits >>> 18 == 0); + let rem: int = this.version // version is uint6, in the range [7, 40] + for (let i = 0; i < 12; i++) rem = (rem << 1) ^ ((rem >>> 11) * 0x1F25) + const bits: int = (this.version << 12) | rem // uint18 + assert(bits >>> 18 == 0) // Draw two copies for (let i = 0; i < 18; i++) { - const color: boolean = getBit(bits, i); - const a: int = this.size - 11 + (i % 3); - const b: int = Math.floor(i / 3); - this.setFunctionModule(a, b, color); - this.setFunctionModule(b, a, color); + const color: boolean = getBit(bits, i) + const a: int = this.size - 11 + (i % 3) + const b: int = Math.floor(i / 3) + this.setFunctionModule(a, b, color) + this.setFunctionModule(b, a, color) } } @@ -312,11 +313,11 @@ export class QrCode { private drawFinderPattern(x: int, y: int): void { for (let dy = -4; dy <= 4; dy++) { for (let dx = -4; dx <= 4; dx++) { - const dist: int = Math.max(Math.abs(dx), Math.abs(dy)); // Chebyshev/infinity norm - const xx: int = x + dx; - const yy: int = y + dy; - if (0 <= xx && xx < this.size && 0 <= yy && yy < this.size) - this.setFunctionModule(xx, yy, dist != 2 && dist != 4); + const dist: int = Math.max(Math.abs(dx), Math.abs(dy)) // Chebyshev/infinity norm + const xx: int = x + dx + const yy: int = y + dy + if (xx >= 0 && xx < this.size && yy >= 0 && yy < this.size) + this.setFunctionModule(xx, yy, dist != 2 && dist != 4) } } } @@ -326,86 +327,86 @@ export class QrCode { private drawAlignmentPattern(x: int, y: int): void { for (let dy = -2; dy <= 2; dy++) { for (let dx = -2; dx <= 2; dx++) - this.setFunctionModule(x + dx, y + dy, Math.max(Math.abs(dx), Math.abs(dy)) != 1); + this.setFunctionModule(x + dx, y + dy, Math.max(Math.abs(dx), Math.abs(dy)) != 1) } } // Sets the color of a module and marks it as a function module. // Only used by the constructor. Coordinates must be in bounds. private setFunctionModule(x: int, y: int, isDark: boolean): void { - this.modules[y][x] = isDark; - this.isFunction[y][x] = true; + this.modules[y][x] = isDark + this.isFunction[y][x] = true } - /*-- Private helper methods for constructor: Codewords and masking --*/ + /* -- Private helper methods for constructor: Codewords and masking -- */ // Returns a new byte string representing the given data with the appropriate error correction // codewords appended to it, based on this object's version and error correction level. - private addEccAndInterleave(data: Readonly): byte[] { - const ver: int = this.version; - const ecl: QrCodeEcc = this.errorCorrectionLevel; + private addEccAndInterleave(data: readonly byte[]): byte[] { + const ver: int = this.version + const ecl: QrCodeEcc = this.errorCorrectionLevel if (data.length != QrCode.getNumDataCodewords(ver, ecl)) - throw new RangeError('Invalid argument'); + throw new RangeError('Invalid argument') // Calculate parameter numbers - const numBlocks: int = QrCode.NUM_ERROR_CORRECTION_BLOCKS[ecl.ordinal][ver]; - const blockEccLen: int = QrCode.ECC_CODEWORDS_PER_BLOCK[ecl.ordinal][ver]; - const rawCodewords: int = Math.floor(QrCode.getNumRawDataModules(ver) / 8); - const numShortBlocks: int = numBlocks - (rawCodewords % numBlocks); - const shortBlockLen: int = Math.floor(rawCodewords / numBlocks); + const numBlocks: int = QrCode.NUM_ERROR_CORRECTION_BLOCKS[ecl.ordinal][ver] + const blockEccLen: int = QrCode.ECC_CODEWORDS_PER_BLOCK[ecl.ordinal][ver] + const rawCodewords: int = Math.floor(QrCode.getNumRawDataModules(ver) / 8) + const numShortBlocks: int = numBlocks - (rawCodewords % numBlocks) + const shortBlockLen: int = Math.floor(rawCodewords / numBlocks) // Split data into blocks and append ECC to each block - const blocks: byte[][] = []; - const rsDiv: byte[] = QrCode.reedSolomonComputeDivisor(blockEccLen); + const blocks: byte[][] = [] + const rsDiv: byte[] = QrCode.reedSolomonComputeDivisor(blockEccLen) for (let i = 0, k = 0; i < numBlocks; i++) { const dat: byte[] = data.slice( k, - k + shortBlockLen - blockEccLen + (i < numShortBlocks ? 0 : 1) - ); - k += dat.length; - const ecc: byte[] = QrCode.reedSolomonComputeRemainder(dat, rsDiv); - if (i < numShortBlocks) dat.push(0); - blocks.push(dat.concat(ecc)); + k + shortBlockLen - blockEccLen + (i < numShortBlocks ? 0 : 1), + ) + k += dat.length + const ecc: byte[] = QrCode.reedSolomonComputeRemainder(dat, rsDiv) + if (i < numShortBlocks) dat.push(0) + blocks.push(dat.concat(ecc)) } // Interleave (not concatenate) the bytes from every block into a single sequence - const result: byte[] = []; + const result: byte[] = [] for (let i = 0; i < blocks[0].length; i++) { blocks.forEach((block, j) => { // Skip the padding byte in short blocks - if (i != shortBlockLen - blockEccLen || j >= numShortBlocks) result.push(block[i]); - }); + if (i != shortBlockLen - blockEccLen || j >= numShortBlocks) result.push(block[i]) + }) } - assert(result.length == rawCodewords); - return result; + assert(result.length == rawCodewords) + return result } // Draws the given sequence of 8-bit codewords (data and error correction) onto the entire // data area of this QR Code. Function modules need to be marked off before this is called. - private drawCodewords(data: Readonly): void { + private drawCodewords(data: readonly byte[]): void { if (data.length != Math.floor(QrCode.getNumRawDataModules(this.version) / 8)) - throw new RangeError('Invalid argument'); - let i: int = 0; // Bit index into the data + throw new RangeError('Invalid argument') + let i: int = 0 // Bit index into the data // Do the funny zigzag scan for (let right = this.size - 1; right >= 1; right -= 2) { // Index of right column in each column pair - if (right == 6) right = 5; + if (right == 6) right = 5 for (let vert = 0; vert < this.size; vert++) { // Vertical counter for (let j = 0; j < 2; j++) { - const x: int = right - j; // Actual x coordinate - const upward: boolean = ((right + 1) & 2) == 0; - const y: int = upward ? this.size - 1 - vert : vert; // Actual y coordinate + const x: int = right - j // Actual x coordinate + const upward: boolean = ((right + 1) & 2) == 0 + const y: int = upward ? this.size - 1 - vert : vert // Actual y coordinate if (!this.isFunction[y][x] && i < data.length * 8) { - this.modules[y][x] = getBit(data[i >>> 3], 7 - (i & 7)); - i++; + this.modules[y][x] = getBit(data[i >>> 3], 7 - (i & 7)) + i++ } // If this QR Code has any remainder bits (0 to 7), they were assigned as // 0/false/light by the constructor and are left unchanged by this method } } } - assert(i == data.length * 8); + assert(i == data.length * 8) } // XORs the codeword modules in this QR Code with the given mask pattern. @@ -414,39 +415,39 @@ export class QrCode { // the same mask value a second time will undo the mask. A final well-formed // QR Code needs exactly one (not zero, two, etc.) mask applied. private applyMask(mask: int): void { - if (mask < 0 || mask > 7) throw new RangeError('Mask value out of range'); + if (mask < 0 || mask > 7) throw new RangeError('Mask value out of range') for (let y = 0; y < this.size; y++) { for (let x = 0; x < this.size; x++) { - let invert: boolean; + let invert: boolean switch (mask) { - case 0: - invert = (x + y) % 2 == 0; - break; - case 1: - invert = y % 2 == 0; - break; - case 2: - invert = x % 3 == 0; - break; - case 3: - invert = (x + y) % 3 == 0; - break; - case 4: - invert = (Math.floor(x / 3) + Math.floor(y / 2)) % 2 == 0; - break; - case 5: - invert = ((x * y) % 2) + ((x * y) % 3) == 0; - break; - case 6: - invert = (((x * y) % 2) + ((x * y) % 3)) % 2 == 0; - break; - case 7: - invert = (((x + y) % 2) + ((x * y) % 3)) % 2 == 0; - break; - default: - throw new Error('Unreachable'); + case 0: + invert = (x + y) % 2 == 0 + break + case 1: + invert = y % 2 == 0 + break + case 2: + invert = x % 3 == 0 + break + case 3: + invert = (x + y) % 3 == 0 + break + case 4: + invert = (Math.floor(x / 3) + Math.floor(y / 2)) % 2 == 0 + break + case 5: + invert = ((x * y) % 2) + ((x * y) % 3) == 0 + break + case 6: + invert = (((x * y) % 2) + ((x * y) % 3)) % 2 == 0 + break + case 7: + invert = (((x + y) % 2) + ((x * y) % 3)) % 2 == 0 + break + default: + throw new Error('Unreachable') } - if (!this.isFunction[y][x] && invert) this.modules[y][x] = !this.modules[y][x]; + if (!this.isFunction[y][x] && invert) this.modules[y][x] = !this.modules[y][x] } } } @@ -454,87 +455,87 @@ export class QrCode { // Calculates and returns the penalty score based on state of this QR Code's current modules. // This is used by the automatic mask choice algorithm to find the mask pattern that yields the lowest score. private getPenaltyScore(): int { - let result: int = 0; + let result: int = 0 // Adjacent modules in row having same color, and finder-like patterns for (let y = 0; y < this.size; y++) { - let runColor = false; - let runX = 0; - const runHistory = [0, 0, 0, 0, 0, 0, 0]; + let runColor = false + let runX = 0 + const runHistory = [0, 0, 0, 0, 0, 0, 0] for (let x = 0; x < this.size; x++) { if (this.modules[y][x] == runColor) { - runX++; - if (runX == 5) result += QrCode.PENALTY_N1; - else if (runX > 5) result++; + runX++ + if (runX == 5) result += QrCode.PENALTY_N1 + else if (runX > 5) result++ } else { - this.finderPenaltyAddHistory(runX, runHistory); - if (!runColor) result += this.finderPenaltyCountPatterns(runHistory) * QrCode.PENALTY_N3; - runColor = this.modules[y][x]; - runX = 1; + this.finderPenaltyAddHistory(runX, runHistory) + if (!runColor) result += this.finderPenaltyCountPatterns(runHistory) * QrCode.PENALTY_N3 + runColor = this.modules[y][x] + runX = 1 } } - result += this.finderPenaltyTerminateAndCount(runColor, runX, runHistory) * QrCode.PENALTY_N3; + result += this.finderPenaltyTerminateAndCount(runColor, runX, runHistory) * QrCode.PENALTY_N3 } // Adjacent modules in column having same color, and finder-like patterns for (let x = 0; x < this.size; x++) { - let runColor = false; - let runY = 0; - const runHistory = [0, 0, 0, 0, 0, 0, 0]; + let runColor = false + let runY = 0 + const runHistory = [0, 0, 0, 0, 0, 0, 0] for (let y = 0; y < this.size; y++) { if (this.modules[y][x] == runColor) { - runY++; - if (runY == 5) result += QrCode.PENALTY_N1; - else if (runY > 5) result++; + runY++ + if (runY == 5) result += QrCode.PENALTY_N1 + else if (runY > 5) result++ } else { - this.finderPenaltyAddHistory(runY, runHistory); - if (!runColor) result += this.finderPenaltyCountPatterns(runHistory) * QrCode.PENALTY_N3; - runColor = this.modules[y][x]; - runY = 1; + this.finderPenaltyAddHistory(runY, runHistory) + if (!runColor) result += this.finderPenaltyCountPatterns(runHistory) * QrCode.PENALTY_N3 + runColor = this.modules[y][x] + runY = 1 } } - result += this.finderPenaltyTerminateAndCount(runColor, runY, runHistory) * QrCode.PENALTY_N3; + result += this.finderPenaltyTerminateAndCount(runColor, runY, runHistory) * QrCode.PENALTY_N3 } // 2*2 blocks of modules having same color for (let y = 0; y < this.size - 1; y++) { for (let x = 0; x < this.size - 1; x++) { - const color: boolean = this.modules[y][x]; + const color: boolean = this.modules[y][x] if ( - color == this.modules[y][x + 1] && - color == this.modules[y + 1][x] && - color == this.modules[y + 1][x + 1] - ) - result += QrCode.PENALTY_N2; + color == this.modules[y][x + 1] + && color == this.modules[y + 1][x] + && color == this.modules[y + 1][x + 1] + ) { + result += QrCode.PENALTY_N2 + } } } // Balance of dark and light modules - let dark: int = 0; - for (const row of this.modules) dark = row.reduce((sum, color) => sum + (color ? 1 : 0), dark); - const total: int = this.size * this.size; // Note that size is odd, so dark/total != 1/2 + let dark: int = 0 + for (const row of this.modules) dark = row.reduce((sum, color) => sum + (color ? 1 : 0), dark) + const total: int = this.size * this.size // Note that size is odd, so dark/total != 1/2 // Compute the smallest integer k >= 0 such that (45-5k)% <= dark/total <= (55+5k)% - const k: int = Math.ceil(Math.abs(dark * 20 - total * 10) / total) - 1; - assert(0 <= k && k <= 9); - result += k * QrCode.PENALTY_N4; - assert(0 <= result && result <= 2568888); // Non-tight upper bound based on default values of PENALTY_N1, ..., N4 - return result; + const k: int = Math.ceil(Math.abs(dark * 20 - total * 10) / total) - 1 + assert(k >= 0 && k <= 9) + result += k * QrCode.PENALTY_N4 + assert(result >= 0 && result <= 2568888) // Non-tight upper bound based on default values of PENALTY_N1, ..., N4 + return result } - /*-- Private helper functions --*/ + /* -- Private helper functions -- */ // Returns an ascending list of positions of alignment patterns for this version number. // Each position is in the range [0,177), and are used on both the x and y axes. // This could be implemented as lookup table of 40 variable-length lists of integers. private getAlignmentPatternPositions(): int[] { - if (this.version == 1) return []; - - const numAlign: int = Math.floor(this.version / 7) + 2; - const step: int = - this.version == 32 ? 26 : Math.ceil((this.version * 4 + 4) / (numAlign * 2 - 2)) * 2; - const result: int[] = [6]; - for (let pos = this.size - 7; result.length < numAlign; pos -= step) result.splice(1, 0, pos); - return result; - + if (this.version == 1) return [] + + const numAlign: int = Math.floor(this.version / 7) + 2 + const step: int + = this.version == 32 ? 26 : Math.ceil((this.version * 4 + 4) / (numAlign * 2 - 2)) * 2 + const result: int[] = [6] + for (let pos = this.size - 7; result.length < numAlign; pos -= step) result.splice(1, 0, pos) + return result } // Returns the number of data bits that can be stored in a QR Code of the given version number, after @@ -542,15 +543,15 @@ export class QrCode { // The result is in the range [208, 29648]. This could be implemented as a 40-entry lookup table. private static getNumRawDataModules(ver: int): int { if (ver < QrCode.MIN_VERSION || ver > QrCode.MAX_VERSION) - throw new RangeError('Version number out of range'); - let result: int = (16 * ver + 128) * ver + 64; + throw new RangeError('Version number out of range') + let result: int = (16 * ver + 128) * ver + 64 if (ver >= 2) { - const numAlign: int = Math.floor(ver / 7) + 2; - result -= (25 * numAlign - 10) * numAlign - 55; - if (ver >= 7) result -= 36; + const numAlign: int = Math.floor(ver / 7) + 2 + result -= (25 * numAlign - 10) * numAlign - 55 + if (ver >= 7) result -= 36 } - assert(208 <= result && result <= 29648); - return result; + assert(result >= 208 && result <= 29648) + return result } // Returns the number of 8-bit data (i.e. not error correction) codewords contained in any @@ -558,185 +559,498 @@ export class QrCode { // This stateless pure function could be implemented as a (40*4)-cell lookup table. private static getNumDataCodewords(ver: int, ecl: QrCodeEcc): int { return ( - Math.floor(QrCode.getNumRawDataModules(ver) / 8) - - QrCode.ECC_CODEWORDS_PER_BLOCK[ecl.ordinal][ver] * - QrCode.NUM_ERROR_CORRECTION_BLOCKS[ecl.ordinal][ver] - ); + Math.floor(QrCode.getNumRawDataModules(ver) / 8) + - QrCode.ECC_CODEWORDS_PER_BLOCK[ecl.ordinal][ver] + * QrCode.NUM_ERROR_CORRECTION_BLOCKS[ecl.ordinal][ver] + ) } // Returns a Reed-Solomon ECC generator polynomial for the given degree. This could be // implemented as a lookup table over all possible parameter values, instead of as an algorithm. private static reedSolomonComputeDivisor(degree: int): byte[] { - if (degree < 1 || degree > 255) throw new RangeError('Degree out of range'); + if (degree < 1 || degree > 255) throw new RangeError('Degree out of range') // Polynomial coefficients are stored from highest to lowest power, excluding the leading term which is always 1. // For example the polynomial x^3 + 255x^2 + 8x + 93 is stored as the uint8 array [255, 8, 93]. - const result: byte[] = []; - for (let i = 0; i < degree - 1; i++) result.push(0); - result.push(1); // Start off with the monomial x^0 + const result: byte[] = [] + for (let i = 0; i < degree - 1; i++) result.push(0) + result.push(1) // Start off with the monomial x^0 // Compute the product polynomial (x - r^0) * (x - r^1) * (x - r^2) * ... * (x - r^{degree-1}), // and drop the highest monomial term which is always 1x^degree. // Note that r = 0x02, which is a generator element of this field GF(2^8/0x11D). - let root = 1; + let root = 1 for (let i = 0; i < degree; i++) { // Multiply the current product by (x - r^i) for (let j = 0; j < result.length; j++) { - result[j] = QrCode.reedSolomonMultiply(result[j], root); - if (j + 1 < result.length) result[j] ^= result[j + 1]; + result[j] = QrCode.reedSolomonMultiply(result[j], root) + if (j + 1 < result.length) result[j] ^= result[j + 1] } - root = QrCode.reedSolomonMultiply(root, 0x02); + root = QrCode.reedSolomonMultiply(root, 0x02) } - return result; + return result } // Returns the Reed-Solomon error correction codeword for the given data and divisor polynomials. private static reedSolomonComputeRemainder( - data: Readonly, - divisor: Readonly + data: readonly byte[], + divisor: readonly byte[], ): byte[] { - const result: byte[] = divisor.map((_) => 0); + const result: byte[] = divisor.map(_ => 0) for (const b of data) { // Polynomial division - const factor: byte = b ^ (result.shift() as byte); - result.push(0); - divisor.forEach((coef, i) => (result[i] ^= QrCode.reedSolomonMultiply(coef, factor))); + const factor: byte = b ^ (result.shift() as byte) + result.push(0) + divisor.forEach((coef, i) => (result[i] ^= QrCode.reedSolomonMultiply(coef, factor))) } - return result; + return result } // Returns the product of the two given field elements modulo GF(2^8/0x11D). The arguments and result // are unsigned 8-bit integers. This could be implemented as a lookup table of 256*256 entries of uint8. private static reedSolomonMultiply(x: byte, y: byte): byte { - if (x >>> 8 != 0 || y >>> 8 != 0) throw new RangeError('Byte out of range'); + if (x >>> 8 != 0 || y >>> 8 != 0) throw new RangeError('Byte out of range') // Russian peasant multiplication - let z: int = 0; + let z: int = 0 for (let i = 7; i >= 0; i--) { - z = (z << 1) ^ ((z >>> 7) * 0x11d); - z ^= ((y >>> i) & 1) * x; + z = (z << 1) ^ ((z >>> 7) * 0x11D) + z ^= ((y >>> i) & 1) * x } - assert(z >>> 8 == 0); - return z as byte; + assert(z >>> 8 == 0) + return z as byte } // Can only be called immediately after a light run is added, and // returns either 0, 1, or 2. A helper function for getPenaltyScore(). - private finderPenaltyCountPatterns(runHistory: Readonly): int { - const n: int = runHistory[1]; - assert(n <= this.size * 3); - const core: boolean = - n > 0 && - runHistory[2] == n && - runHistory[3] == n * 3 && - runHistory[4] == n && - runHistory[5] == n; + private finderPenaltyCountPatterns(runHistory: readonly int[]): int { + // eslint-disable-next-line prefer-destructuring + const n: int = runHistory[1] + assert(n <= this.size * 3) + const core: boolean + = n > 0 + && runHistory[2] == n + && runHistory[3] == n * 3 + && runHistory[4] == n + && runHistory[5] == n return ( - (core && runHistory[0] >= n * 4 && runHistory[6] >= n ? 1 : 0) + - (core && runHistory[6] >= n * 4 && runHistory[0] >= n ? 1 : 0) - ); + (core && runHistory[0] >= n * 4 && runHistory[6] >= n ? 1 : 0) + + (core && runHistory[6] >= n * 4 && runHistory[0] >= n ? 1 : 0) + ) } // Must be called at the end of a line (row or column) of modules. A helper function for getPenaltyScore(). private finderPenaltyTerminateAndCount( currentRunColor: boolean, currentRunLength: int, - runHistory: int[] + runHistory: int[], ): int { if (currentRunColor) { // Terminate dark run - this.finderPenaltyAddHistory(currentRunLength, runHistory); - currentRunLength = 0; + this.finderPenaltyAddHistory(currentRunLength, runHistory) + currentRunLength = 0 } - currentRunLength += this.size; // Add light border to final run - this.finderPenaltyAddHistory(currentRunLength, runHistory); - return this.finderPenaltyCountPatterns(runHistory); + currentRunLength += this.size // Add light border to final run + this.finderPenaltyAddHistory(currentRunLength, runHistory) + return this.finderPenaltyCountPatterns(runHistory) } // Pushes the given value to the front and drops the last value. A helper function for getPenaltyScore(). private finderPenaltyAddHistory(currentRunLength: int, runHistory: int[]): void { - if (runHistory[0] == 0) currentRunLength += this.size; // Add light border to initial run - runHistory.pop(); - runHistory.unshift(currentRunLength); + if (runHistory[0] == 0) currentRunLength += this.size // Add light border to initial run + runHistory.pop() + runHistory.unshift(currentRunLength) } - /*-- Constants and tables --*/ + /* -- Constants and tables -- */ // The minimum version number supported in the QR Code Model 2 standard. - public static readonly MIN_VERSION: int = 1; + public static readonly MIN_VERSION: int = 1 // The maximum version number supported in the QR Code Model 2 standard. - public static readonly MAX_VERSION: int = 40; + public static readonly MAX_VERSION: int = 40 // For use in getPenaltyScore(), when evaluating which mask is best. - private static readonly PENALTY_N1: int = 3; - private static readonly PENALTY_N2: int = 3; - private static readonly PENALTY_N3: int = 40; - private static readonly PENALTY_N4: int = 10; + private static readonly PENALTY_N1: int = 3 + private static readonly PENALTY_N2: int = 3 + private static readonly PENALTY_N3: int = 40 + private static readonly PENALTY_N4: int = 10 private static readonly ECC_CODEWORDS_PER_BLOCK: int[][] = [ // Version: (note that index 0 is for padding, and is set to an illegal value) - //0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level + // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level [ - -1, 7, 10, 15, 20, 26, 18, 20, 24, 30, 18, 20, 24, 26, 30, 22, 24, 28, 30, 28, 28, 28, 28, 30, - 30, 26, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, + -1, + 7, + 10, + 15, + 20, + 26, + 18, + 20, + 24, + 30, + 18, + 20, + 24, + 26, + 30, + 22, + 24, + 28, + 30, + 28, + 28, + 28, + 28, + 30, + 30, + 26, + 28, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, ], // Low [ - -1, 10, 16, 26, 18, 24, 16, 18, 22, 22, 26, 30, 22, 22, 24, 24, 28, 28, 26, 26, 26, 26, 28, - 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, + -1, + 10, + 16, + 26, + 18, + 24, + 16, + 18, + 22, + 22, + 26, + 30, + 22, + 22, + 24, + 24, + 28, + 28, + 26, + 26, + 26, + 26, + 28, + 28, + 28, + 28, + 28, + 28, + 28, + 28, + 28, + 28, + 28, + 28, + 28, + 28, + 28, + 28, + 28, + 28, + 28, ], // Medium [ - -1, 13, 22, 18, 26, 18, 24, 18, 22, 20, 24, 28, 26, 24, 20, 30, 24, 28, 28, 26, 30, 28, 30, - 30, 30, 30, 28, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, + -1, + 13, + 22, + 18, + 26, + 18, + 24, + 18, + 22, + 20, + 24, + 28, + 26, + 24, + 20, + 30, + 24, + 28, + 28, + 26, + 30, + 28, + 30, + 30, + 30, + 30, + 28, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, ], // Quartile [ - -1, 17, 28, 22, 16, 22, 28, 26, 26, 24, 28, 24, 28, 22, 24, 24, 30, 28, 28, 26, 28, 30, 24, - 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, + -1, + 17, + 28, + 22, + 16, + 22, + 28, + 26, + 26, + 24, + 28, + 24, + 28, + 22, + 24, + 24, + 30, + 28, + 28, + 26, + 28, + 30, + 24, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, + 30, ], // High - ]; + ] private static readonly NUM_ERROR_CORRECTION_BLOCKS: int[][] = [ // Version: (note that index 0 is for padding, and is set to an illegal value) - //0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level + // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40 Error correction level [ - -1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 4, 4, 6, 6, 6, 6, 7, 8, 8, 9, 9, 10, 12, 12, 12, 13, - 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25, + -1, + 1, + 1, + 1, + 1, + 1, + 2, + 2, + 2, + 2, + 4, + 4, + 4, + 4, + 4, + 6, + 6, + 6, + 6, + 7, + 8, + 8, + 9, + 9, + 10, + 12, + 12, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 19, + 20, + 21, + 22, + 24, + 25, ], // Low [ - -1, 1, 1, 1, 2, 2, 4, 4, 4, 5, 5, 5, 8, 9, 9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, - 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49, + -1, + 1, + 1, + 1, + 2, + 2, + 4, + 4, + 4, + 5, + 5, + 5, + 8, + 9, + 9, + 10, + 10, + 11, + 13, + 14, + 16, + 17, + 17, + 18, + 20, + 21, + 23, + 25, + 26, + 28, + 29, + 31, + 33, + 35, + 37, + 38, + 40, + 43, + 45, + 47, + 49, ], // Medium [ - -1, 1, 1, 2, 2, 4, 4, 6, 6, 8, 8, 8, 10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, - 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68, + -1, + 1, + 1, + 2, + 2, + 4, + 4, + 6, + 6, + 8, + 8, + 8, + 10, + 12, + 16, + 12, + 17, + 16, + 18, + 21, + 20, + 23, + 23, + 25, + 27, + 29, + 34, + 34, + 35, + 38, + 40, + 43, + 45, + 48, + 51, + 53, + 56, + 59, + 62, + 65, + 68, ], // Quartile [ - -1, 1, 1, 2, 4, 4, 4, 5, 6, 8, 8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, - 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81, + -1, + 1, + 1, + 2, + 4, + 4, + 4, + 5, + 6, + 8, + 8, + 11, + 11, + 16, + 16, + 18, + 16, + 19, + 21, + 25, + 25, + 25, + 34, + 30, + 32, + 35, + 37, + 40, + 42, + 45, + 48, + 51, + 54, + 57, + 60, + 63, + 66, + 70, + 74, + 77, + 81, ], // High - ]; + ] } // Appends the given number of low-order bits of the given value // to the given buffer. Requires 0 <= len <= 31 and 0 <= val < 2^len. function appendBits(val: int, len: int, bb: bit[]): void { - if (len < 0 || len > 31 || val >>> len != 0) throw new RangeError('Value out of range'); + if (len < 0 || len > 31 || val >>> len != 0) throw new RangeError('Value out of range') for ( let i = len - 1; i >= 0; i-- // Append bit by bit ) - bb.push((val >>> i) & 1); + bb.push((val >>> i) & 1) } // Returns true iff the i'th bit of x is set to 1. function getBit(x: int, i: int): boolean { - return ((x >>> i) & 1) != 0; + return ((x >>> i) & 1) != 0 } // Throws an exception if the given condition is false. function assert(cond: boolean): void { - if (!cond) throw new Error('Assertion error'); + if (!cond) throw new Error('Assertion error') } -/*---- Data segment class ----*/ +/* ---- Data segment class ---- */ /* * A segment of character/binary/control data in a QR Code symbol. @@ -750,29 +1064,29 @@ function assert(cond: boolean): void { * Any segment longer than this is meaningless for the purpose of generating QR Codes. */ export class QrSegment { - /*-- Static factory functions (mid level) --*/ + /* -- Static factory functions (mid level) -- */ // Returns a segment representing the given binary data encoded in // byte mode. All input byte arrays are acceptable. Any text string // can be converted to UTF-8 bytes and encoded as a byte mode segment. - public static makeBytes(data: Readonly): QrSegment { - const bb: bit[] = []; - for (const b of data) appendBits(b, 8, bb); - return new QrSegment(QrSegmentMode.BYTE, data.length, bb); + public static makeBytes(data: readonly byte[]): QrSegment { + const bb: bit[] = [] + for (const b of data) appendBits(b, 8, bb) + return new QrSegment(QrSegmentMode.BYTE, data.length, bb) } // Returns a segment representing the given string of decimal digits encoded in numeric mode. public static makeNumeric(digits: string): QrSegment { if (!QrSegment.isNumeric(digits)) - throw new RangeError('String contains non-numeric characters'); - const bb: bit[] = []; - for (let i = 0; i < digits.length; ) { + throw new RangeError('String contains non-numeric characters') + const bb: bit[] = [] + for (let i = 0; i < digits.length;) { // Consume up to 3 digits per iteration - const n: int = Math.min(digits.length - i, 3); - appendBits(parseInt(digits.substr(i, n), 10), n * 3 + 1, bb); - i += n; + const n: int = Math.min(digits.length - i, 3) + appendBits(Number.parseInt(digits.substr(i, n), 10), n * 3 + 1, bb) + i += n } - return new QrSegment(QrSegmentMode.NUMERIC, digits.length, bb); + return new QrSegment(QrSegmentMode.NUMERIC, digits.length, bb) } // Returns a segment representing the given text string encoded in alphanumeric mode. @@ -780,61 +1094,63 @@ export class QrSegment { // dollar, percent, asterisk, plus, hyphen, period, slash, colon. public static makeAlphanumeric(text: string): QrSegment { if (!QrSegment.isAlphanumeric(text)) - throw new RangeError('String contains unencodable characters in alphanumeric mode'); - const bb: bit[] = []; - let i: int; + throw new RangeError('String contains unencodable characters in alphanumeric mode') + const bb: bit[] = [] + let i: int for (i = 0; i + 2 <= text.length; i += 2) { // Process groups of 2 - let temp: int = QrSegment.ALPHANUMERIC_CHARSET.indexOf(text.charAt(i)) * 45; - temp += QrSegment.ALPHANUMERIC_CHARSET.indexOf(text.charAt(i + 1)); - appendBits(temp, 11, bb); + let temp: int = QrSegment.ALPHANUMERIC_CHARSET.indexOf(text.charAt(i)) * 45 + temp += QrSegment.ALPHANUMERIC_CHARSET.indexOf(text.charAt(i + 1)) + appendBits(temp, 11, bb) } if (i < text.length) // 1 character remaining - appendBits(QrSegment.ALPHANUMERIC_CHARSET.indexOf(text.charAt(i)), 6, bb); - return new QrSegment(QrSegmentMode.ALPHANUMERIC, text.length, bb); + appendBits(QrSegment.ALPHANUMERIC_CHARSET.indexOf(text.charAt(i)), 6, bb) + return new QrSegment(QrSegmentMode.ALPHANUMERIC, text.length, bb) } // Returns a new mutable list of zero or more segments to represent the given Unicode text string. // The result may use various segment modes and switch modes to optimize the length of the bit stream. public static makeSegments(text: string): QrSegment[] { // Select the most efficient segment encoding automatically - if (text == '') return []; - else if (QrSegment.isNumeric(text)) return [QrSegment.makeNumeric(text)]; - else if (QrSegment.isAlphanumeric(text)) return [QrSegment.makeAlphanumeric(text)]; - return [QrSegment.makeBytes(QrSegment.toUtf8ByteArray(text))]; + if (text == '') return [] + else if (QrSegment.isNumeric(text)) return [QrSegment.makeNumeric(text)] + else if (QrSegment.isAlphanumeric(text)) return [QrSegment.makeAlphanumeric(text)] + return [QrSegment.makeBytes(QrSegment.toUtf8ByteArray(text))] } // Returns a segment representing an Extended Channel Interpretation // (ECI) designator with the given assignment value. public static makeEci(assignVal: int): QrSegment { - const bb: bit[] = []; - if (assignVal < 0) {throw new RangeError('ECI assignment value out of range');} - else if (assignVal < 1 << 7) {appendBits(assignVal, 8, bb);} - else if (assignVal < 1 << 14) { - appendBits(0b10, 2, bb); - appendBits(assignVal, 14, bb); + const bb: bit[] = [] + if (assignVal < 0) { + throw new RangeError('ECI assignment value out of range') + } else if (assignVal < 1 << 7) { + appendBits(assignVal, 8, bb) + } else if (assignVal < 1 << 14) { + appendBits(0b10, 2, bb) + appendBits(assignVal, 14, bb) } else if (assignVal < 1000000) { - appendBits(0b110, 3, bb); - appendBits(assignVal, 21, bb); - } else {throw new RangeError('ECI assignment value out of range');} - return new QrSegment(QrSegmentMode.ECI, 0, bb); + appendBits(0b110, 3, bb) + appendBits(assignVal, 21, bb) + } else { throw new RangeError('ECI assignment value out of range') } + return new QrSegment(QrSegmentMode.ECI, 0, bb) } // Tests whether the given string can be encoded as a segment in numeric mode. // A string is encodable iff each character is in the range 0 to 9. public static isNumeric(text: string): boolean { - return QrSegment.NUMERIC_REGEX.test(text); + return QrSegment.NUMERIC_REGEX.test(text) } // Tests whether the given string can be encoded as a segment in alphanumeric mode. // A string is encodable iff each character is in the following set: 0 to 9, A to Z // (uppercase only), space, dollar, percent, asterisk, plus, hyphen, period, slash, colon. public static isAlphanumeric(text: string): boolean { - return QrSegment.ALPHANUMERIC_REGEX.test(text); + return QrSegment.ALPHANUMERIC_REGEX.test(text) } - /*-- Constructor (low level) and fields --*/ + /* -- Constructor (low level) and fields -- */ // Creates a new QR Code segment with the given attributes and data. // The character count (numChars) must agree with the mode and the bit buffer length, @@ -849,79 +1165,80 @@ export class QrSegment { public readonly numChars: int, // The data bits of this segment. Accessed through getData(). - private readonly bitData: bit[] + private readonly bitData: bit[], ) { - if (numChars < 0) throw new RangeError('Invalid argument'); - this.bitData = bitData.slice(); // Make defensive copy + if (numChars < 0) throw new RangeError('Invalid argument') + this.bitData = bitData.slice() // Make defensive copy } - /*-- Methods --*/ + /* -- Methods -- */ // Returns a new copy of the data bits of this segment. public getData(): bit[] { - return this.bitData.slice(); // Make defensive copy + return this.bitData.slice() // Make defensive copy } // (Package-private) Calculates and returns the number of bits needed to encode the given segments at // the given version. The result is infinity if a segment has too many characters to fit its length field. - public static getTotalBits(segs: Readonly, version: int): number { - let result = 0; + public static getTotalBits(segs: readonly QrSegment[], version: int): number { + let result = 0 for (const seg of segs) { - const ccbits: int = seg.mode.numCharCountBits(version); - if (seg.numChars >= 1 << ccbits) return Infinity; // The segment's length doesn't fit the field's bit width - result += 4 + ccbits + seg.bitData.length; + const ccbits: int = seg.mode.numCharCountBits(version) + if (seg.numChars >= 1 << ccbits) return Infinity // The segment's length doesn't fit the field's bit width + result += 4 + ccbits + seg.bitData.length } - return result; + return result } // Returns a new array of bytes representing the given string encoded in UTF-8. private static toUtf8ByteArray(str: string): byte[] { - str = encodeURI(str); - const result: byte[] = []; + str = encodeURI(str) + const result: byte[] = [] for (let i = 0; i < str.length; i++) { - if (str.charAt(i) != '%') {result.push(str.charCodeAt(i));} - else { - result.push(parseInt(str.substr(i + 1, 2), 16)); - i += 2; + if (str.charAt(i) != '%') { + result.push(str.charCodeAt(i)) + } else { + result.push(Number.parseInt(str.substr(i + 1, 2), 16)) + i += 2 } } - return result; + return result } - /*-- Constants --*/ + /* -- Constants -- */ // Describes precisely all strings that are encodable in numeric mode. - private static readonly NUMERIC_REGEX: RegExp = /^[0-9]*$/; + private static readonly NUMERIC_REGEX: RegExp = /^\d*$/ // Describes precisely all strings that are encodable in alphanumeric mode. - private static readonly ALPHANUMERIC_REGEX: RegExp = /^[A-Z0-9 $%*+./:-]*$/; + private static readonly ALPHANUMERIC_REGEX: RegExp = /^[A-Z0-9 $%*+./:-]*$/ // The set of all legal characters in alphanumeric mode, // where each character value maps to the index in the string. - private static readonly ALPHANUMERIC_CHARSET: string = - '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:'; + private static readonly ALPHANUMERIC_CHARSET: string + = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:' } -/*---- Public helper enumeration ----*/ +/* ---- Public helper enumeration ---- */ /* * The error correction level in a QR Code symbol. Immutable. */ export class QrCodeEcc { - /*-- Constants --*/ + /* -- Constants -- */ - public static readonly LOW = new QrCodeEcc(0, 1); // The QR Code can tolerate about 7% erroneous codewords - public static readonly MEDIUM = new QrCodeEcc(1, 0); // The QR Code can tolerate about 15% erroneous codewords - public static readonly QUARTILE = new QrCodeEcc(2, 3); // The QR Code can tolerate about 25% erroneous codewords - public static readonly HIGH = new QrCodeEcc(3, 2); // The QR Code can tolerate about 30% erroneous codewords + public static readonly LOW = new QrCodeEcc(0, 1) // The QR Code can tolerate about 7% erroneous codewords + public static readonly MEDIUM = new QrCodeEcc(1, 0) // The QR Code can tolerate about 15% erroneous codewords + public static readonly QUARTILE = new QrCodeEcc(2, 3) // The QR Code can tolerate about 25% erroneous codewords + public static readonly HIGH = new QrCodeEcc(3, 2) // The QR Code can tolerate about 30% erroneous codewords - /*-- Constructor and fields --*/ + /* -- Constructor and fields -- */ private constructor( // In the range 0 to 3 (unsigned 2-bit integer). public readonly ordinal: int, // (Package-private) In the range 0 to 3 (unsigned 2-bit integer). - public readonly formatBits: int + public readonly formatBits: int, ) {} } @@ -929,28 +1246,28 @@ export class QrCodeEcc { * Describes how a segment's data bits are interpreted. Immutable. */ export class QrSegmentMode { - /*-- Constants --*/ + /* -- Constants -- */ - public static readonly NUMERIC = new QrSegmentMode(0x1, [10, 12, 14]); - public static readonly ALPHANUMERIC = new QrSegmentMode(0x2, [9, 11, 13]); - public static readonly BYTE = new QrSegmentMode(0x4, [8, 16, 16]); - public static readonly KANJI = new QrSegmentMode(0x8, [8, 10, 12]); - public static readonly ECI = new QrSegmentMode(0x7, [0, 0, 0]); + public static readonly NUMERIC = new QrSegmentMode(0x1, [10, 12, 14]) + public static readonly ALPHANUMERIC = new QrSegmentMode(0x2, [9, 11, 13]) + public static readonly BYTE = new QrSegmentMode(0x4, [8, 16, 16]) + public static readonly KANJI = new QrSegmentMode(0x8, [8, 10, 12]) + public static readonly ECI = new QrSegmentMode(0x7, [0, 0, 0]) - /*-- Constructor and fields --*/ + /* -- Constructor and fields -- */ private constructor( // The mode indicator bits, which is a uint4 value (range 0 to 15). public readonly modeBits: int, // Number of character count bits for three different version ranges. - private readonly numBitsCharCount: [int, int, int] + private readonly numBitsCharCount: [int, int, int], ) {} - /*-- Method --*/ + /* -- Method -- */ // (Package-private) Returns the bit width of the character count field for a segment in // this mode in a QR Code at the given version number. The result is in the range [0, 16]. public numCharCountBits(ver: int): int { - return this.numBitsCharCount[Math.floor((ver + 7) / 17)]; + return this.numBitsCharCount[Math.floor((ver + 7) / 17)] } } diff --git a/packages/site/src/routes/[dictionaryId]/entries/table/+page.svelte b/packages/site/src/routes/[dictionaryId]/entries/table/+page.svelte deleted file mode 100644 index ed52a602f..000000000 --- a/packages/site/src/routes/[dictionaryId]/entries/table/+page.svelte +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - convert_and_expand_entry(entry, $page.data.t))} - preferred_table_columns={$preferred_table_columns} - dictionary={$dictionary} - can_edit={$can_edit} - {dbOperations} /> - - {#if $can_edit} - {#each algoliaEntries as algoliaEntry (algoliaEntry.id)} - { - const index = $entries.findIndex(({id}) => id === entry.id); - if (index > -1) $entries[index] = entry; - }} /> - {/each} - {/if} - - - - diff --git a/packages/site/src/routes/[dictionaryId]/entries/table/Cell.svelte b/packages/site/src/routes/[dictionaryId]/entries/table/Cell.svelte index b09addc2d..93893fd31 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/table/Cell.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/table/Cell.svelte @@ -1,6 +1,11 @@ @@ -31,87 +44,184 @@ class:sompeng={column.display === 'Sompeng'} class="h-full w-full flex cell"> {#if column.field === 'audio'} -
@@ -126,7 +236,7 @@ } */ :global(.cell > *) { - flex: 1 + flex: 1; } div :global(button) { diff --git a/packages/site/src/routes/[dictionaryId]/entries/table/ColumnAdjustSlideover.svelte b/packages/site/src/routes/[dictionaryId]/entries/table/ColumnAdjustSlideover.svelte index 1c3a17263..db4736a09 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/table/ColumnAdjustSlideover.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/table/ColumnAdjustSlideover.svelte @@ -1,41 +1,41 @@ diff --git a/packages/site/src/routes/[dictionaryId]/entries/table/EntriesTable.svelte b/packages/site/src/routes/[dictionaryId]/entries/table/EntriesTable.svelte index f37dc144f..8c77ecc44 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/table/EntriesTable.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/table/EntriesTable.svelte @@ -1,13 +1,13 @@ {#if browser} diff --git a/packages/site/src/routes/[dictionaryId]/entries/table/cells/SelectSpeakerCell.svelte b/packages/site/src/routes/[dictionaryId]/entries/table/cells/SelectSpeakerCell.svelte index 3275b28be..7ac3e9aec 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/table/cells/SelectSpeakerCell.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/table/cells/SelectSpeakerCell.svelte @@ -1,37 +1,30 @@ -
{ - if (can_edit) { - if (first_sound_file?.speaker_ids?.length) { - alert( - 'Please edit the speaker by from the edit audio modal accessed by clicking on the ear.', - ) - } else { - alert('Edit speaker feature is still in progress') - } - } - }}> - {displayed_speaker_name || ''} -   -
+ +
set(can_edit)}> + {speaker_name} +   +
+ + {#if show} + {#await import('$lib/components/audio/EditAudio.svelte') then { default: EditAudio }} + + {/await} + {/if} + diff --git a/packages/site/src/routes/[dictionaryId]/entries/table/cells/SelectSpeakerCell.variants.ts b/packages/site/src/routes/[dictionaryId]/entries/table/cells/SelectSpeakerCell.variants.ts index 912bad4ea..6546b828f 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/table/cells/SelectSpeakerCell.variants.ts +++ b/packages/site/src/routes/[dictionaryId]/entries/table/cells/SelectSpeakerCell.variants.ts @@ -1,65 +1,65 @@ -import type { Variant, VariantMeta } from 'kitbook' -import type Component from './SelectSpeakerCell.svelte' +// import type { Variant, VariantMeta } from 'kitbook' +// import type Component from './SelectSpeakerCell.svelte' -export const shared_meta: VariantMeta = { - viewports: [ - { width: 160, height: 70 }, - ], -} +// export const shared_meta: VariantMeta = { +// viewports: [ +// { width: 160, height: 70 }, +// ], +// } -const shared = { - speakers: [ - { - displayName: 'Anatoli', - id: '123', - }, - ], -} satisfies Partial> +// const shared = { +// speakers: [ +// { +// displayName: 'Anatoli', +// id: '123', +// }, +// ], +// } satisfies Partial> -export const Normal: Variant = { - ...shared, - entry: { - lexeme: 'test', - sound_files: [ - { fb_storage_path: '', storage_url: '', speaker_ids: ['123'], - }, - ], - }, - can_edit: false, -} +// export const Normal: Variant = { +// ...shared, +// entry: { +// lexeme: 'test', +// sound_files: [ +// { fb_storage_path: '', storage_url: '', speaker_ids: ['123'], +// }, +// ], +// }, +// can_edit: false, +// } -export const Missing_Id: Variant = { - ...shared, - entry: { - lexeme: 'test', - sound_files: [ - { fb_storage_path: '', storage_url: '', speaker_ids: ['456'], - }, - ], - }, - can_edit: false, -} +// export const Missing_Id: Variant = { +// ...shared, +// entry: { +// lexeme: 'test', +// sound_files: [ +// { fb_storage_path: '', storage_url: '', speaker_ids: ['456'], +// }, +// ], +// }, +// can_edit: false, +// } -export const Speaker_Name: Variant = { - ...shared, - entry: { - lexeme: 'test', - sound_files: [ - { fb_storage_path: '', storage_url: '', speakerName: 'María', - }, - ], - }, - can_edit: false, -} +// export const Speaker_Name: Variant = { +// ...shared, +// entry: { +// lexeme: 'test', +// sound_files: [ +// { fb_storage_path: '', storage_url: '', speakerName: 'María', +// }, +// ], +// }, +// can_edit: false, +// } -export const Speaker_Name_And_Speaker_Id: Variant = { - ...shared, - entry: { - lexeme: 'test', - sound_files: [ - { fb_storage_path: '', storage_url: '', speakerName: 'Diego', speaker_ids: ['123'], - }, - ], - }, - can_edit: false, -} +// export const Speaker_Name_And_Speaker_Id: Variant = { +// ...shared, +// entry: { +// lexeme: 'test', +// sound_files: [ +// { fb_storage_path: '', storage_url: '', speakerName: 'Diego', speaker_ids: ['123'], +// }, +// ], +// }, +// can_edit: false, +// } diff --git a/packages/site/src/routes/[dictionaryId]/entries/table/cells/Textbox.svelte b/packages/site/src/routes/[dictionaryId]/entries/table/cells/Textbox.svelte index cf11fe227..87cb972e5 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/table/cells/Textbox.svelte +++ b/packages/site/src/routes/[dictionaryId]/entries/table/cells/Textbox.svelte @@ -1,26 +1,27 @@
')} class="h-full" style="padding: 0.1em 0.25em" - on:click={() => set(can_edit)}> + on:click={() => set($can_edit)}> {@html sanitizedHtml}  
diff --git a/packages/site/src/routes/[dictionaryId]/entries/table/setUpColumns.ts b/packages/site/src/routes/[dictionaryId]/entries/table/setUpColumns.ts index 4319669f3..1eded203c 100644 --- a/packages/site/src/routes/[dictionaryId]/entries/table/setUpColumns.ts +++ b/packages/site/src/routes/[dictionaryId]/entries/table/setUpColumns.ts @@ -1,31 +1,31 @@ -import type { IColumn, IDictionary } from '@living-dictionaries/types'; -import { get } from 'svelte/store'; -import { page } from '$app/stores'; -import { vernacularName } from '$lib/helpers/vernacularName'; -import { DICTIONARIES_WITH_VARIANTS } from '$lib/constants'; -import { browser } from '$app/environment'; +import type { IColumn, IDictionary } from '@living-dictionaries/types' +import { get } from 'svelte/store' +import { page } from '$app/stores' +import { vernacularName } from '$lib/helpers/vernacularName' +import { DICTIONARIES_WITH_VARIANTS } from '$lib/constants' +import { browser } from '$app/environment' export function setUpColumns(columns: IColumn[], dictionary: IDictionary): IColumn[] { - const cols = columns.filter((column) => !column.hidden); + const cols = columns.filter(column => !column.hidden) - const glossIndex = cols.findIndex((col) => col.field === 'gloss'); + const glossIndex = cols.findIndex(col => col.field === 'gloss') if (browser && glossIndex >= 0) { const { data } = get(page) - const glossColumns: IColumn[] = []; + const glossColumns: IColumn[] = [] dictionary.glossLanguages.forEach((bcp) => { glossColumns.push({ field: 'gloss', bcp, width: cols[glossIndex].width, sticky: cols[glossIndex].sticky || false, - display: data?.t({dynamicKey: 'gl.' + bcp, fallback: bcp}), + display: data?.t({ dynamicKey: `gl.${bcp}`, fallback: bcp }), explanation: vernacularName(bcp), - }); - }); - cols.splice(glossIndex, 1, ...glossColumns); + }) + }) + cols.splice(glossIndex, 1, ...glossColumns) } - const exampleSentenceIndex = cols.findIndex((col) => col.field === 'example_sentence'); + const exampleSentenceIndex = cols.findIndex(col => col.field === 'example_sentence') if (browser && exampleSentenceIndex >= 0) { const { data } = get(page) const exampleSentenceColumns: IColumn[] = [ @@ -36,22 +36,22 @@ export function setUpColumns(columns: IColumn[], dictionary: IDictionary): IColu sticky: cols[exampleSentenceIndex].sticky || false, display: data?.t('entry_field.example_sentence'), }, - ]; + ] dictionary.glossLanguages.forEach((bcp) => { exampleSentenceColumns.push({ field: 'example_sentence', bcp, width: cols[exampleSentenceIndex].width, sticky: cols[exampleSentenceIndex].sticky || false, - display: `${data?.t({ dynamicKey: `gl.${bcp}`, fallback: bcp})} ${data?.t('entry_field.example_sentence')}`, - }); - }); - cols.splice(exampleSentenceIndex, 1, ...exampleSentenceColumns); + display: `${data?.t({ dynamicKey: `gl.${bcp}`, fallback: bcp })} ${data?.t('entry_field.example_sentence')}`, + }) + }) + cols.splice(exampleSentenceIndex, 1, ...exampleSentenceColumns) } - const orthographyIndex = cols.findIndex(({field}) => field === 'local_orthography'); + const orthographyIndex = cols.findIndex(({ field }) => field === 'local_orthography') if (orthographyIndex >= 0) { - const alternateOrthographyColumns: IColumn[] = []; + const alternateOrthographyColumns: IColumn[] = [] if (dictionary.alternateOrthographies) { for (const [index, orthography] of dictionary.alternateOrthographies.entries()) { alternateOrthographyColumns.push({ @@ -59,14 +59,14 @@ export function setUpColumns(columns: IColumn[], dictionary: IDictionary): IColu width: 170, display: orthography, orthography_index: index + 1, - }); + }) } } - cols.splice(orthographyIndex, 1, ...alternateOrthographyColumns); + cols.splice(orthographyIndex, 1, ...alternateOrthographyColumns) } if (DICTIONARIES_WITH_VARIANTS.includes(dictionary.id)) - cols.push({ field: 'variant', width: 150 }); + cols.push({ field: 'variant', width: 150 }) - return cols; + return cols } diff --git a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/+page.svelte b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/+page.svelte index 52153b1db..39e26cb5e 100644 --- a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/+page.svelte +++ b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/+page.svelte @@ -4,60 +4,57 @@ import { seo_description } from './seo_description' import { share } from '$lib/helpers/share' import SeoMetaTags from '$lib/components/SeoMetaTags.svelte' - import { goto } from '$app/navigation' - import { algoliaQueryParams, lastEntriesUrl } from '$lib/stores/algolia' import { page } from '$app/stores' - import type { SupaEntry } from '$lib/supabase/database.types' - import { browser } from '$app/environment' + import { dev } from '$app/environment' export let data $: ({ entry, - supa_entry: supa_entry_promise, + photos, + dialects, shallow, dictionary, admin, can_edit, - is_contributor, - is_manager, - user, dbOperations, } = data) - let supaEntry: SupaEntry - $: if (browser) { - supa_entry_promise?.then(({ data: _data }) => { - supaEntry = _data - }).catch((supa_err) => { - console.info({ supa_err }) - }) - } - - // saved algoliaQueryParams will be overwritten by the gallery view as it turns on the images only facet - function backToEntries() { - if (!shallow && $lastEntriesUrl) - goto($lastEntriesUrl) - else - history.back() - } + $: first_photo_id = entry?.senses?.[0].photo_ids?.[0] + $: first_photo = (first_photo_id && $photos.length) ? $photos.find(photo => photo.id === first_photo_id) : null -
-
- {#if $admin > 1} - + {#if dev || $admin > 1} + {/if} - {#if $is_manager || ($is_contributor && $entry.cb === $user.uid)} + {#if $can_edit} {/if} {#if !shallow} -
0} can_edit={$can_edit} {dbOperations} /> diff --git a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/+page.ts b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/+page.ts index 5998d5806..b03b2a999 100644 --- a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/+page.ts +++ b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/+page.ts @@ -1,45 +1,42 @@ import { error, redirect } from '@sveltejs/kit' -import type { ActualDatabaseEntry } from '@living-dictionaries/types' -import { awaitableDocStore } from 'sveltefirets' -import { derived } from 'svelte/store' -import type { PostgrestError } from '@supabase/supabase-js' +import { get } from 'svelte/store' import { ResponseCodes } from '$lib/constants' import { ENTRY_UPDATED_LOAD_TRIGGER } from '$lib/dbOperations' -import { getSupabase } from '$lib/supabase' -import type { SupaEntry } from '$lib/supabase/database.types.js' -import { convert_and_expand_entry } from '$lib/transformers/convert_and_expand_entry' +import { browser } from '$app/environment' export async function load({ params, depends, parent }) { depends(ENTRY_UPDATED_LOAD_TRIGGER) - const entryPath = `dictionaries/${params.dictionaryId}/words/${params.entryId}` - const entry = await awaitableDocStore(entryPath) - const { error: firestore_error, initial_doc } = entry - if (firestore_error) - error(ResponseCodes.INTERNAL_SERVER_ERROR, firestore_error) + if (browser) { + const { entries } = await parent() + if (!get(entries.loading)) { + const entry = get(entries).find(entry => entry.id === params.entryId) - if (!initial_doc) - redirect(ResponseCodes.MOVED_PERMANENTLY, `/${params.dictionaryId}`) + if (entry) { + return { + entry, + shallow: false, + } + } + } + } + + const { supabase } = await parent() + const { data: entries, error: load_error } = await supabase + .from('materialized_entries_view') + .select() + .eq('id', params.entryId) + + if (load_error) + error(ResponseCodes.INTERNAL_SERVER_ERROR, load_error) - const { t } = await parent() - const entry_expanded = derived(entry, $entry => convert_and_expand_entry($entry, t)) + const [entry] = entries + + if (!entry || entry.deleted) + redirect(ResponseCodes.MOVED_PERMANENTLY, `/${params.dictionaryId}`) return { - entry: entry_expanded, - supa_entry: load_supa_entry(params.entryId), + entry, shallow: false, } } - -async function load_supa_entry(entry_id: string): Promise<{ data?: SupaEntry, error?: PostgrestError }> { - const supabase = getSupabase() - const { data, error: supaError } = await supabase - .from('entries_view') - .select() - .eq('id', entry_id) - .returns() - - const supaEntry = data?.[0] - console.info({ supaEntry, supaError }) - return { data: supaEntry, error: supaError } -} diff --git a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryDisplay.svelte b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryDisplay.svelte index 093aba231..823510e67 100644 --- a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryDisplay.svelte +++ b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryDisplay.svelte @@ -1,46 +1,40 @@
updateEntry({ [EntryFields.lexeme]: new_value })} /> + on_update={(new_value) => { + if (new_value) { + entry.main.lexeme.default = new_value + update_entry({ lexeme: entry.main.lexeme }) + } + }} />
@@ -49,102 +43,105 @@
{#each dictionary.alternateOrthographies || [] as orthography, index} - {@const orthographyIndex = index + 1} + {@const orthography_field = `lo${index + 1}`} updateEntry({ [`lo${orthographyIndex}`]: new_value })} /> + on_update={(new_value) => { + entry.main.lexeme[orthography_field] = new_value + update_entry({ lexeme: entry.main.lexeme }) + }} /> {/each} - updateEntry({ [EntryFields.phonetic]: new_value })} /> - - {#if !supaEntry?.senses?.length} - - - {#if can_edit} - - {/if} - {:else} -
-
-
- {$page.data.t('sense.sense')} 1 -
-
-
- -
-
- - {#each supaEntry.senses as sense, index} + { + entry.main.phonetic = new_value + update_entry({ phonetic: new_value }) + }} /> + + {#each entry.senses || [] as sense, index} + {#if entry.senses.length === 1} + + + {#if can_edit} + + {/if} + {:else}
- {$page.data.t('sense.sense')} {index + 2} + {$page.data.t('sense.sense')} {index + 1}
{#if can_edit} - - - + + {/if}
- +
- {/each} - {/if} + {/if} + {/each} - {#if entry.dialects?.length || can_edit} -
+ {#if entry.dialect_ids?.length || can_edit} +
{$page.data.t('entry_field.dialects')}
- updateEntry({ [EntryFields.dialects]: new_value })} /> +
{/if} - updateEntry({ [EntryFields.scientific_names]: [new_value] })} /> + on_update={(new_value) => { + entry.main.scientific_names = [new_value] + update_entry({ scientific_names: entry.main.scientific_names }) + }} /> - {#if DICTIONARIES_WITH_VARIANTS.includes(dictionary.id)} + {#each text_fields as field} updateEntry({ [EntryFields.variant]: new_value })} /> - {/if} - - {#each regularFields as field} - updateEntry({ [EntryFields[field]]: new_value })} /> + on_update={(new_value) => { + entry.main[field] = new_value + update_entry({ [field]: new_value }) + }} /> {/each} - {#if entry.sources?.length || can_edit} -
+ { + entry.main.notes = { default: new_value } + update_entry({ notes: entry.main.notes }) + }} /> + + {#if entry.main.sources?.length || can_edit} +
{$page.data.t('entry_field.sources')}
updateEntry({ [EntryFields.sources]: new_value })} /> + value={entry.main.sources} + on_update={(new_value) => { + entry.main.sources = new_value + update_entry({ sources: new_value }) + }} />
{/if} diff --git a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryDisplay.variants.ts b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryDisplay.variants.ts index 46de0724c..692cddf68 100644 --- a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryDisplay.variants.ts +++ b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryDisplay.variants.ts @@ -1,212 +1,212 @@ -import type { DeepPartial, DeprecatedVariant, Viewport } from 'kitbook' -import type { IDictionary } from '@living-dictionaries/types' -import type Component from './EntryDisplay.svelte' -import { logDbOperations } from '$lib/mocks/db' +// import type { DeepPartial, DeprecatedVariant, Viewport } from 'kitbook' +// import type { IDictionary } from '@living-dictionaries/types' +// import type Component from './EntryDisplay.svelte' +// import { logDbOperations } from '$lib/mocks/db' -export const viewports: Viewport[] = [ - { - name: 'Desktop', - width: 1024, - height: 768, - }, - { - name: 'Mobile', - width: 375, - height: 667, - }, -] +// export const viewports: Viewport[] = [ +// { +// name: 'Desktop', +// width: 1024, +// height: 768, +// }, +// { +// name: 'Mobile', +// width: 375, +// height: 667, +// }, +// ] -const defaultDictionary: IDictionary = { - name: 'Banange', - glossLanguages: ['en', 'es'], -} - -const defaultEntry = { - lexeme: 'foo', - senses: [ - { - glosses: {}, - }, - ], -} +// const defaultDictionary: IDictionary = { +// name: 'Banange', +// glossLanguages: ['en', 'es'], +// } -// const indiaBox: IRegion = { -// 'coordinates': [ +// const defaultEntry = { +// lexeme: 'foo', +// senses: [ // { -// 'longitude': 76.53807812500065, -// 'latitude': 25.598062849584352 +// glosses: {}, // }, -// { -// 'longitude': 91.12792187500162, -// 'latitude': 25.598062849584352 -// }, -// { -// 'longitude': 82.60253125000094, -// 'latitude': 30.93627270844425 -// }, -// { -// 'latitude': 18.933437473181115, -// 'longitude': 83.04198437500133 -// } -// ] +// ], // } -const partialVariants: DeepPartial[]> = [ - { - name: '2 senses', - props: { - can_edit: true, - videoAccess: true, - entry: { - id: 'entryId123', - lexeme: 'shoot', - phonetic: 'ʃut', - sound_files: [{ - fb_storage_path: 'sora/audio/local_import/2011-9-15-Sora-7-26-ZR-bolya-tree-bst-1580869801459.mp3', - speakerName: 'Zasina Roita', - }], - senses: [ - { - glosses: { - en: 'a young branch or sucker springing from the main stock of a tree or other plant', - }, - translated_parts_of_speech: ['noun'], - translated_ld_semantic_domains: ['botany'], - example_sentences: [ - { - vn: '请把这个嫩枝剪下来放进炖菜里。', - en: 'Please cut this shoot and put it in the stew.', - es: 'Por favor, corta este brote y ponlo en el guiso.', - }, - ], - }, - ], - local_orthography_1: 'संस्कृतम्', - sources: ['someone'], - coordinates: { - // 'regions': [indiaBox], - }, - }, - supaEntry: { - senses: [ - { - id: '1', - glosses: { - en: 'to fire a rocket', - }, - parts_of_speech: ['v'], - semantic_domains: ['1.1'], - }, - ], - }, - dictionary: { - alternateOrthographies: [ - 'Old Sanskrit', - ], - }, - }, - tests: { - clientSideRendered: true, - }, - }, - { - name: 'Custom imported semantic domain', - props: { - can_edit: true, - entry: { - senses: [ - { - photo_files: [{ specifiable_image_url: 'LGuBKhg7vuv5-aJcOdnb_ucOXLSCIR1Kjxrh70xRlaIHqWo-mWqfWUcH3Xznz63QsFZmkeVmoNN0PEXzSc0Jh4g' }], - write_in_semantic_domains: ['something-random-from-1992'], - ld_semantic_domains_keys: ['1'], - translated_ld_semantic_domains: ['Universe and the natural world'], - }, - ], - }, - }, - }, - { - name: 'Local orthographies', - languages: [], - viewports: [{ width: 400, height: 300 }], - props: { - entry: { - lexeme: 'Hello', - local_orthography_1: 'special writing system', - local_orthography_2: 'another writing system', - }, - dictionary: { - alternateOrthographies: [ - 'foobey', - 'foobar', - ], - }, - }, - }, - { - name: 'Scientific Name', - languages: [], - viewports: [{ width: 400, height: 200 }], - props: { - entry: { - lexeme: 'Old world swallowtail', - scientific_names: ['Papilio machaon'], - }, - }, - }, - { - name: 'Scientific Name - Partial italics', - description: 'can edit', - languages: [], - props: { - entry: { - lexeme: 'Old world swallowtail', - scientific_names: ['Papilio machaon, Dr. G.'], - }, - can_edit: true, - }, - }, - { - name: 'No details, can edit', - description: 'temporarily using admin is true until edit senses is no longer behind a flag', - languages: [], - props: { - can_edit: true, - }, - }, - { - name: 'cannot edit, two additional senses', - languages: [], - props: { - entry: { - lexeme: 'apple', - phonetic: 'æpl', - senses: [ - { glosses: { en: 'a fruit' } }, - ], - }, - supaEntry: { - senses: [ - { glosses: { en: 'a company' } }, - { glosses: { en: 'a color' }, semantic_domains: ['1.6'] }, - ], - }, - }, - }, -] +// // const indiaBox: IRegion = { +// // 'coordinates': [ +// // { +// // 'longitude': 76.53807812500065, +// // 'latitude': 25.598062849584352 +// // }, +// // { +// // 'longitude': 91.12792187500162, +// // 'latitude': 25.598062849584352 +// // }, +// // { +// // 'longitude': 82.60253125000094, +// // 'latitude': 30.93627270844425 +// // }, +// // { +// // 'latitude': 18.933437473181115, +// // 'longitude': 83.04198437500133 +// // } +// // ] +// // } + +// const partialVariants: DeepPartial[]> = [ +// { +// name: '2 senses', +// props: { +// can_edit: true, +// videoAccess: true, +// entry: { +// id: 'entryId123', +// lexeme: 'shoot', +// phonetic: 'ʃut', +// sound_files: [{ +// fb_storage_path: 'sora/audio/local_import/2011-9-15-Sora-7-26-ZR-bolya-tree-bst-1580869801459.mp3', +// speakerName: 'Zasina Roita', +// }], +// senses: [ +// { +// glosses: { +// en: 'a young branch or sucker springing from the main stock of a tree or other plant', +// }, +// translated_parts_of_speech: ['noun'], +// translated_ld_semantic_domains: ['botany'], +// example_sentences: [ +// { +// vn: '请把这个嫩枝剪下来放进炖菜里。', +// en: 'Please cut this shoot and put it in the stew.', +// es: 'Por favor, corta este brote y ponlo en el guiso.', +// }, +// ], +// }, +// ], +// local_orthography_1: 'संस्कृतम्', +// sources: ['someone'], +// coordinates: { +// // 'regions': [indiaBox], +// }, +// }, +// supaEntry: { +// senses: [ +// { +// id: '1', +// glosses: { +// en: 'to fire a rocket', +// }, +// parts_of_speech: ['v'], +// semantic_domains: ['1.1'], +// }, +// ], +// }, +// dictionary: { +// alternateOrthographies: [ +// 'Old Sanskrit', +// ], +// }, +// }, +// tests: { +// clientSideRendered: true, +// }, +// }, +// { +// name: 'Custom imported semantic domain', +// props: { +// can_edit: true, +// entry: { +// senses: [ +// { +// photo_files: [{ specifiable_image_url: 'LGuBKhg7vuv5-aJcOdnb_ucOXLSCIR1Kjxrh70xRlaIHqWo-mWqfWUcH3Xznz63QsFZmkeVmoNN0PEXzSc0Jh4g' }], +// write_in_semantic_domains: ['something-random-from-1992'], +// ld_semantic_domains_keys: ['1'], +// translated_ld_semantic_domains: ['Universe and the natural world'], +// }, +// ], +// }, +// }, +// }, +// { +// name: 'Local orthographies', +// languages: [], +// viewports: [{ width: 400, height: 300 }], +// props: { +// entry: { +// lexeme: 'Hello', +// local_orthography_1: 'special writing system', +// local_orthography_2: 'another writing system', +// }, +// dictionary: { +// alternateOrthographies: [ +// 'foobey', +// 'foobar', +// ], +// }, +// }, +// }, +// { +// name: 'Scientific Name', +// languages: [], +// viewports: [{ width: 400, height: 200 }], +// props: { +// entry: { +// lexeme: 'Old world swallowtail', +// scientific_names: ['Papilio machaon'], +// }, +// }, +// }, +// { +// name: 'Scientific Name - Partial italics', +// description: 'can edit', +// languages: [], +// props: { +// entry: { +// lexeme: 'Old world swallowtail', +// scientific_names: ['Papilio machaon, Dr. G.'], +// }, +// can_edit: true, +// }, +// }, +// { +// name: 'No details, can edit', +// description: 'temporarily using admin is true until edit senses is no longer behind a flag', +// languages: [], +// props: { +// can_edit: true, +// }, +// }, +// { +// name: 'cannot edit, two additional senses', +// languages: [], +// props: { +// entry: { +// lexeme: 'apple', +// phonetic: 'æpl', +// senses: [ +// { glosses: { en: 'a fruit' } }, +// ], +// }, +// supaEntry: { +// senses: [ +// { glosses: { en: 'a company' } }, +// { glosses: { en: 'a color' }, semantic_domains: ['1.6'] }, +// ], +// }, +// }, +// }, +// ] -export const variants: DeprecatedVariant[] = (partialVariants as DeprecatedVariant[]).map(variant => ({ - ...variant, - props: { - ...variant.props, - dictionary: { - ...defaultDictionary, - ...variant.props?.dictionary, - }, - entry: { - ...defaultEntry, - ...variant.props?.entry, - }, - dbOperations: logDbOperations, - }, -})) +// export const variants: DeprecatedVariant[] = (partialVariants as DeprecatedVariant[]).map(variant => ({ +// ...variant, +// props: { +// ...variant.props, +// dictionary: { +// ...defaultDictionary, +// ...variant.props?.dictionary, +// }, +// entry: { +// ...defaultEntry, +// ...variant.props?.entry, +// }, +// dbOperations: logDbOperations, +// }, +// })) diff --git a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryMedia.svelte b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryMedia.svelte index 39a3ff350..834cf1b4f 100644 --- a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryMedia.svelte +++ b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryMedia.svelte @@ -1,7 +1,7 @@
{#if first_sound_file || can_edit} - {#await import('../../entries/Audio.svelte') then { default: Audio }} -
{:else if can_edit}
- dbOperations.addImage(entry.id, file)}> + dbOperations.addImage({ file, sense_id: entry.senses[0].id })}>
{$page.data.t('entry.upload_photo')}
@@ -53,10 +57,9 @@
{:else if videoAccess && can_edit} @@ -79,13 +82,13 @@ {/if} - {#if entry?.coordinates?.points?.length || entry?.coordinates?.regions?.length} + {#if entry?.main.coordinates?.points?.length || entry?.main.coordinates?.regions?.length}
set(can_edit)}> + points={entry.main.coordinates.points} + regions={entry.main.coordinates.regions} />
{:else if can_edit}
diff --git a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryMedia.variants.ts b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryMedia.variants.ts index 16b673f3a..78230888e 100644 --- a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryMedia.variants.ts +++ b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntryMedia.variants.ts @@ -1,19 +1,19 @@ -import type { DeprecatedVariant, Viewport } from 'kitbook' -import type Component from './EntryMedia.svelte' -import { logDbOperations } from '$lib/mocks/db' +// import type { DeprecatedVariant, Viewport } from 'kitbook' +// import type Component from './EntryMedia.svelte' +// import { logDbOperations } from '$lib/mocks/db' -export const viewports: Viewport[] = [ - { width: 400, height: 500 }, -] +// export const viewports: Viewport[] = [ +// { width: 400, height: 500 }, +// ] -export const variants: DeprecatedVariant[] = [ - { - props: { - can_edit: true, - videoAccess: true, - dbOperations: logDbOperations, - entry: {}, - dictionary: null, - }, - }, -] +// export const variants: DeprecatedVariant[] = [ +// { +// props: { +// can_edit: true, +// videoAccess: true, +// dbOperations: logDbOperations, +// entry: {}, +// dictionary: null, +// }, +// }, +// ] diff --git a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntrySentence.svelte b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntrySentence.svelte new file mode 100644 index 000000000..7e8f98cb7 --- /dev/null +++ b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/EntrySentence.svelte @@ -0,0 +1,59 @@ + + +
+ {#each writing_systems as orthography} + { + sentence.text[orthography] = new_value + if (!sentence.id) { + dbOperations.insert_sentence({ + sentence: { text: { [orthography]: new_value } }, + sense_id, + }) + } else { + dbOperations.update_sentence({ + sentence: { text: { [orthography]: new_value } }, + sentence_id: sentence.id, + }) + } + }} /> + {/each} + + {#if sentence.id} + {#each glossingLanguages as bcp} + { + sentence.translation = { + ...sentence.translation, + [bcp]: new_value, + } + dbOperations.update_sentence({ + sentence: { translation: sentence.translation }, + sentence_id: sentence.id, + }) + }} /> + {/each} + {/if} +
diff --git a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/GeoTaggingModal.svelte b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/GeoTaggingModal.svelte index 435bac9de..0ee046958 100644 --- a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/GeoTaggingModal.svelte +++ b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/GeoTaggingModal.svelte @@ -1,7 +1,7 @@ - +
@@ -168,7 +165,7 @@
-
diff --git a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/GeoTaggingModal.variants.ts b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/GeoTaggingModal.variants.ts index 440b0abae..89f7322b5 100644 --- a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/GeoTaggingModal.variants.ts +++ b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/GeoTaggingModal.variants.ts @@ -1,60 +1,60 @@ -import type { DeprecatedVariant } from 'kitbook' -import type { IRegion } from '@living-dictionaries/types' -import type Component from './GeoTaggingModal.svelte' +// import type { DeprecatedVariant } from 'kitbook' +// import type { IRegion } from '@living-dictionaries/types' +// import type Component from './GeoTaggingModal.svelte' -export const languages = [] +// export const languages = [] -const tw_region: IRegion = { coordinates: [ - { latitude: 23.2, longitude: 121 }, - { latitude: 24, longitude: 121.1 }, - { latitude: 23.4, longitude: 121.5 }, - { latitude: 23.0, longitude: 121.3 }, -] } -const bangladesh = { latitude: 23.2, longitude: 90 } +// const tw_region: IRegion = { coordinates: [ +// { latitude: 23.2, longitude: 121 }, +// { latitude: 24, longitude: 121.1 }, +// { latitude: 23.4, longitude: 121.5 }, +// { latitude: 23.0, longitude: 121.3 }, +// ] } +// const bangladesh = { latitude: 23.2, longitude: 90 } -export const variants: DeprecatedVariant[] = [ - { - name: 'points and region', - props: { - initialCenter: bangladesh, - coordinates: { - points: [ - { coordinates: { latitude: 23.2, longitude: 121.1 } }, - { coordinates: { latitude: 23.6978, longitude: 120.9605 } }, - ], - regions: [ - tw_region, - ], - }, - on_update: null, - }, - }, - { - name: 'region only', - props: { - initialCenter: null, - coordinates: { - regions: [ - tw_region, - ], - }, - on_update: null, - }, - }, - { - name: 'no points, initial dictionary center', - props: { - initialCenter: bangladesh, - coordinates: null, - on_update: null, - }, - }, - { - name: 'nothing', - props: { - initialCenter: null, - coordinates: null, - on_update: null, - }, - }, -] +// export const variants: DeprecatedVariant[] = [ +// { +// name: 'points and region', +// props: { +// initialCenter: bangladesh, +// coordinates: { +// points: [ +// { coordinates: { latitude: 23.2, longitude: 121.1 } }, +// { coordinates: { latitude: 23.6978, longitude: 120.9605 } }, +// ], +// regions: [ +// tw_region, +// ], +// }, +// on_update: null, +// }, +// }, +// { +// name: 'region only', +// props: { +// initialCenter: null, +// coordinates: { +// regions: [ +// tw_region, +// ], +// }, +// on_update: null, +// }, +// }, +// { +// name: 'no points, initial dictionary center', +// props: { +// initialCenter: bangladesh, +// coordinates: null, +// on_update: null, +// }, +// }, +// { +// name: 'nothing', +// props: { +// initialCenter: null, +// coordinates: null, +// on_update: null, +// }, +// }, +// ] diff --git a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/Sense.svelte b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/Sense.svelte deleted file mode 100644 index 434e9cafa..000000000 --- a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/Sense.svelte +++ /dev/null @@ -1,90 +0,0 @@ - - -{#each glossingLanguages as bcp} - updateEntry({ [`gl.${bcp}`]: new_value })} /> -{/each} - - -{#if sense.definition_english} - updateEntry({ [EntryFields.definition_english]: new_value })} /> -{/if} - -{#if sense.translated_parts_of_speech?.length || can_edit} -
-
{$page.data.t('entry_field.parts_of_speech')}
- updateEntry({ [EntryFields.parts_of_speech]: new_value })} /> -
-
-{/if} - -{#if hasSemanticDomain || can_edit} -
-
{$page.data.t('entry_field.semantic_domains')}
- updateEntry({ [EntryFields.semantic_domains]: new_value })} - on_update_write_in={new_value => updateEntry({ sd: new_value })} /> -
-
-{/if} - - updateEntry({ [EntryFields.noun_class]: new_value })} /> - -{#each sense.example_sentences || [{}] as sentence} -
- updateEntry({ 'xs.vn': new_value })} /> - - {#if sentence.vn} - {#each glossingLanguages as bcp} - updateEntry({ [`xs.${bcp}`]: new_value })} /> - {/each} - {/if} -
-{/each} diff --git a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/Sense.variants.ts b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/Sense.variants.ts deleted file mode 100644 index c3526021f..000000000 --- a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/Sense.variants.ts +++ /dev/null @@ -1,43 +0,0 @@ -import type { DeprecatedVariant, Viewport } from 'kitbook' -import type Component from './Sense.svelte' - -export const viewports: Viewport[] = [ - { width: 800, height: 500 }, - { width: 320, height: 580 }, -] - -export const languages = [] - -export const variants: DeprecatedVariant[] = [ - { - props: { - sense: { - glosses: { - en: 'a young branch or sucker springing from the main stock of a tree or other plant', - }, - translated_parts_of_speech: ['noun'], - translated_ld_semantic_domains: ['botany'], - example_sentences: [ - { - vn: '请把这个嫩枝剪下来放进炖菜里。', - en: 'Please cut this shoot and put it in the stew.', - es: 'Por favor, corta este brote y ponlo en el guiso.', - }, - ], - }, - can_edit: true, - glossLanguages: ['en', 'es'], - updateEntry: null, - }, - }, - { - name: 'empty', - description: 'translation fields for example sentence do not show when there is no vernacular sentence', - props: { - sense: {}, - can_edit: true, - glossLanguages: ['en', 'es'], - updateEntry: null, - }, - }, -] diff --git a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/SupaSense.svelte b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/SupaSense.svelte index 3765e229b..8d96a83f7 100644 --- a/packages/site/src/routes/[dictionaryId]/entry/[entryId]/SupaSense.svelte +++ b/packages/site/src/routes/[dictionaryId]/entry/[entryId]/SupaSense.svelte @@ -1,21 +1,22 @@ + +

{$page.data.t('misc.export')}

+{#if $is_manager} +
+
+ + {$page.data.t('export.csv_data')}) +
+
+ + +
+ {#if !mounted} +

+ {$page.data.t('export.checking_images')} +

+ {:else if !entriesWithImages.length} +

+ {$page.data.t('export.no_images')} +

+ {/if} + +
+ + +
+ {#if !mounted} +

+ {$page.data.t('export.checking_audios')} +

+ {:else if !entriesWithAudio.length} +

+ {$page.data.t('export.no_audios')} +

+ {/if} +
+ + {#if includeImages || includeAudio} + + {#if !show} + + {:else} + + + {#if progress < 1} + + {:else} + + {/if} + + {/if} + + {:else} + + {/if} +{:else} +

{$page.data.t('export.availability')}

+{/if} + +{#if $admin} +
+ +
+{/if} + + diff --git a/packages/site/src/routes/[dictionaryId]/export/+page.svelte b/packages/site/src/routes/[dictionaryId]/export/+page.svelte index e165dc283..099259d5e 100644 --- a/packages/site/src/routes/[dictionaryId]/export/+page.svelte +++ b/packages/site/src/routes/[dictionaryId]/export/+page.svelte @@ -1,142 +1,23 @@

{$page.data.t('misc.export')}

{#if $is_manager} -
-
- - {$page.data.t('export.csv_data')}) -
-
- - -
- {#if !mounted} -

- {$page.data.t('export.checking_images')} -

- {:else if !entriesWithImages.length} -

- {$page.data.t('export.no_images')} -

- {/if} - -
- - -
- {#if !mounted} -

- {$page.data.t('export.checking_audios')} -

- {:else if !entriesWithAudio.length} -

- {$page.data.t('export.no_audios')} -

- {/if} -
- - {#if includeImages || includeAudio} - - {#if !show} - - {:else} - - - {#if progress < 1} - - {:else} - - {/if} - - {/if} - - {:else} - - {/if} + The export feature is temporarily disabled while we make some database improvements. Please check back later. {:else}

{$page.data.t('export.availability')}

{/if} -{#if $admin} + { const global_parts_of_speech = [ { @@ -74,36 +76,36 @@ describe(display_speaker_gender, () => { }) }) -describe('format arrays into objects', () => { - test(format_semantic_domains, () => { - const entry: ExpandedEntry = { - senses: [{ translated_ld_semantic_domains: ['Colors', 'Birds'] }], - } - const expected = { - semantic_domain_1: 'Colors', - semantic_domain_2: 'Birds', - } - expect(format_semantic_domains(entry)).toEqual(expected) - }) +// describe('format arrays into objects', () => { +// test(format_semantic_domains, () => { +// const entry: ExpandedEntry = { +// senses: [{ translated_ld_semantic_domains: ['Colors', 'Birds'] }], +// } +// const expected = { +// semantic_domain_1: 'Colors', +// semantic_domain_2: 'Birds', +// } +// expect(format_semantic_domains(entry)).toEqual(expected) +// }) - test(format_gloss_languages, () => { - const entry: ExpandedEntry = { - senses: [{ glosses: { es: 'oso' } }], - } - const expected = { - es_gloss_language: 'oso', - } - expect(format_gloss_languages(entry)).toEqual(expected) - }) +// test(format_gloss_languages, () => { +// const entry: ExpandedEntry = { +// senses: [{ glosses: { es: 'oso' } }], +// } +// const expected = { +// es_gloss_language: 'oso', +// } +// expect(format_gloss_languages(entry)).toEqual(expected) +// }) - test(format_example_sentences, () => { - const entry: ExpandedEntry = { - senses: [{ example_sentences: [{ es: 'el oso es enorme', vn: 'native example' }] }], - } - const expected = { - es_example_sentence: 'el oso es enorme', - vernacular_example_sentence: 'native example', - } - expect(format_example_sentences(entry)).toEqual(expected) - }) -}) +// test(format_example_sentences, () => { +// const entry: ExpandedEntry = { +// senses: [{ example_sentences: [{ es: 'el oso es enorme', vn: 'native example' }] }], +// } +// const expected = { +// es_example_sentence: 'el oso es enorme', +// vernacular_example_sentence: 'native example', +// } +// expect(format_example_sentences(entry)).toEqual(expected) +// }) +// }) diff --git a/packages/site/src/routes/[dictionaryId]/export/assignFormattedEntryValuesForCsv.ts b/packages/site/src/routes/[dictionaryId]/export/assignFormattedEntryValuesForCsv.ts index 471ac408d..80618e123 100644 --- a/packages/site/src/routes/[dictionaryId]/export/assignFormattedEntryValuesForCsv.ts +++ b/packages/site/src/routes/[dictionaryId]/export/assignFormattedEntryValuesForCsv.ts @@ -1,51 +1,53 @@ -import type { ExpandedEntry, ISpeaker, IPartOfSpeech } from '@living-dictionaries/types'; -import type { EntryForCSV } from './prepareEntriesForCsv'; +import type { IPartOfSpeech } from '@living-dictionaries/types' + +type ISpeaker = any +type ExpandedEntry = any export function find_part_of_speech_abbreviation( global_parts_of_speech: IPartOfSpeech[], - part_of_speech: string + part_of_speech: string, ): string { - return global_parts_of_speech.find(({ enName }) => enName === part_of_speech)?.enAbbrev; + return global_parts_of_speech.find(({ enName }) => enName === part_of_speech)?.enAbbrev } export function get_first_speaker_from_first_sound_file( entry: ExpandedEntry, - speakers: ISpeaker[] + speakers: ISpeaker[], ): ISpeaker { - return speakers.find((speaker) => speaker?.id === entry.sound_files?.[0].speaker_ids?.[0]); + return speakers.find(speaker => speaker?.id === entry.sound_files?.[0].speaker_ids?.[0]) } export function display_speaker_gender(speaker_gender: string): string { - if (speaker_gender) return speaker_gender === 'f' ? 'female' : 'male'; + if (speaker_gender) return speaker_gender === 'f' ? 'female' : 'male' } -export function format_semantic_domains( - entry: ExpandedEntry, -): EntryForCSV { - const domains = {}; - for (const [index, domain] of (entry.senses?.[0].translated_ld_semantic_domains || []).entries()) - domains[`semantic_domain_${index + 1}`] = domain; - return domains; -} +// export function format_semantic_domains( +// entry: ExpandedEntry, +// ): EntryForCSV { +// const domains = {} +// for (const [index, domain] of (entry.senses?.[0].translated_ld_semantic_domains || []).entries()) +// domains[`semantic_domain_${index + 1}`] = domain +// return domains +// } -export function format_gloss_languages( - entry: ExpandedEntry, -): EntryForCSV { - const gloss_languages = {}; - for (const [bcp, value] of Object.entries(entry.senses?.[0].glosses || {})) - gloss_languages[`${bcp}_gloss_language`] = value - return gloss_languages; -} +// export function format_gloss_languages( +// entry: ExpandedEntry, +// ): EntryForCSV { +// const gloss_languages = {} +// for (const [bcp, value] of Object.entries(entry.senses?.[0].glosses || {})) +// gloss_languages[`${bcp}_gloss_language`] = value +// return gloss_languages +// } -export function format_example_sentences( - entry: ExpandedEntry, -): EntryForCSV { - const example_sentences: EntryForCSV = {}; - for (const [bcp, value] of Object.entries(entry.senses?.[0].example_sentences?.[0] || {})) { - if (bcp === 'vn') - example_sentences.vernacular_example_sentence = value; - else - example_sentences[`${bcp}_example_sentence`] = value; - } - return example_sentences; -} +// export function format_example_sentences( +// entry: ExpandedEntry, +// ): EntryForCSV { +// const example_sentences: EntryForCSV = {} +// for (const [bcp, value] of Object.entries(entry.senses?.[0].example_sentences?.[0] || {})) { +// if (bcp === 'vn') +// example_sentences.vernacular_example_sentence = value +// else +// example_sentences[`${bcp}_example_sentence`] = value +// } +// return example_sentences +// } diff --git a/packages/site/src/routes/[dictionaryId]/export/assignHeadersForCsv.test.ts b/packages/site/src/routes/[dictionaryId]/export/assignHeadersForCsv.test.ts index a1e0f4622..11ea9b3a4 100644 --- a/packages/site/src/routes/[dictionaryId]/export/assignHeadersForCsv.test.ts +++ b/packages/site/src/routes/[dictionaryId]/export/assignHeadersForCsv.test.ts @@ -1,103 +1,103 @@ -import type { ExpandedEntry } from '@living-dictionaries/types' -import { - get_example_sentence_headers, - get_gloss_language_headers, - get_local_orthography_headers, - get_semantic_domain_headers, -} from './assignHeadersForCsv' +// import type { ExpandedEntry } from '@living-dictionaries/types' +// import { +// get_example_sentence_headers, +// get_gloss_language_headers, +// get_local_orthography_headers, +// get_semantic_domain_headers, +// } from './assignHeadersForCsv' -describe(get_local_orthography_headers, () => { - test('assigns alternate_orthographies if any exists', () => { - const alternate_orthographies = ['native-1', 'native-2'] - expect(get_local_orthography_headers(alternate_orthographies)).toEqual({ - local_orthography_1: 'native-1', - local_orthography_2: 'native-2', - }) - }) - test('doesn\'t assign alternate_orthographies if empty array', () => { - const alternate_orthographies = [] - expect(get_local_orthography_headers(alternate_orthographies)).toEqual({}) - }) - test('doesn\'t assign alternate_orthographies if null', () => { - const alternate_orthographies = null - expect(get_local_orthography_headers(alternate_orthographies)).toEqual({}) - }) -}) +// describe(get_local_orthography_headers, () => { +// test('assigns alternate_orthographies if any exists', () => { +// const alternate_orthographies = ['native-1', 'native-2'] +// expect(get_local_orthography_headers(alternate_orthographies)).toEqual({ +// local_orthography_1: 'native-1', +// local_orthography_2: 'native-2', +// }) +// }) +// test('doesn\'t assign alternate_orthographies if empty array', () => { +// const alternate_orthographies = [] +// expect(get_local_orthography_headers(alternate_orthographies)).toEqual({}) +// }) +// test('doesn\'t assign alternate_orthographies if null', () => { +// const alternate_orthographies = null +// expect(get_local_orthography_headers(alternate_orthographies)).toEqual({}) +// }) +// }) -describe(get_semantic_domain_headers, () => { - test('adds semantic domain headers if any exists', () => { - const entries: ExpandedEntry[] = [ - { - lexeme: 'foo', - senses: [{ translated_ld_semantic_domains: ['NA'] }], - }, - { - lexeme: 'bar', - senses: [{ translated_ld_semantic_domains: ['NA', 'NA', 'NA'] }], - }, - ] - expect(get_semantic_domain_headers(entries)).toEqual({ - semantic_domain_1: 'Semantic domain 1', - semantic_domain_2: 'Semantic domain 2', - semantic_domain_3: 'Semantic domain 3', - }) - }) +// describe(get_semantic_domain_headers, () => { +// test('adds semantic domain headers if any exists', () => { +// const entries: ExpandedEntry[] = [ +// { +// lexeme: 'foo', +// senses: [{ translated_ld_semantic_domains: ['NA'] }], +// }, +// { +// lexeme: 'bar', +// senses: [{ translated_ld_semantic_domains: ['NA', 'NA', 'NA'] }], +// }, +// ] +// expect(get_semantic_domain_headers(entries)).toEqual({ +// semantic_domain_1: 'Semantic domain 1', +// semantic_domain_2: 'Semantic domain 2', +// semantic_domain_3: 'Semantic domain 3', +// }) +// }) - test('does not add semantic domain headers if none exist', () => { - const entries = [ - { - lexeme: 'foo', - senses: [], - }, - { - lexeme: 'bar', - }, - ] - expect(get_semantic_domain_headers(entries)).toEqual({}) - }) -}) +// test('does not add semantic domain headers if none exist', () => { +// const entries = [ +// { +// lexeme: 'foo', +// senses: [], +// }, +// { +// lexeme: 'bar', +// }, +// ] +// expect(get_semantic_domain_headers(entries)).toEqual({}) +// }) +// }) -describe(get_gloss_language_headers, () => { - test('uses full name or bcp if it no name exists', () => { - const gloss_languages = ['en', 'es', 'af'] - expect(get_gloss_language_headers(gloss_languages)).toEqual({ - en_gloss_language: 'English Gloss', - es_gloss_language: 'español Gloss', - af_gloss_language: 'Afrikaans Gloss', - }) - }) - test('doesn\'t assign gloss languages if empty array', () => { - const gloss_languages = [] - expect(get_gloss_language_headers(gloss_languages)).toEqual({}) - }) - test('doesn\'t assign gloss languages if null', () => { - const gloss_languages = null - expect(get_gloss_language_headers(gloss_languages)).toEqual({}) - }) -}) +// describe(get_gloss_language_headers, () => { +// test('uses full name or bcp if it no name exists', () => { +// const gloss_languages = ['en', 'es', 'af'] +// expect(get_gloss_language_headers(gloss_languages)).toEqual({ +// en_gloss_language: 'English Gloss', +// es_gloss_language: 'español Gloss', +// af_gloss_language: 'Afrikaans Gloss', +// }) +// }) +// test('doesn\'t assign gloss languages if empty array', () => { +// const gloss_languages = [] +// expect(get_gloss_language_headers(gloss_languages)).toEqual({}) +// }) +// test('doesn\'t assign gloss languages if null', () => { +// const gloss_languages = null +// expect(get_gloss_language_headers(gloss_languages)).toEqual({}) +// }) +// }) -describe(get_example_sentence_headers, () => { - test('assigns vernacular and other example sentences if any exists or bcp if it doesn\'t', () => { - const gloss_languages = ['it', 'af'] - const dictionary_name = 'Foo' - expect(get_example_sentence_headers(gloss_languages, dictionary_name)).toEqual({ - vernacular_example_sentence: 'Example sentence in Foo', - it_example_sentence: 'Example sentence in Italiano', - af_example_sentence: 'Example sentence in Afrikaans', - }) - }) - test('assigns only verncaular if empty array', () => { - const gloss_languages = [] - const dictionary_name = 'Baz' - expect(get_example_sentence_headers(gloss_languages, dictionary_name)).toEqual({ - vernacular_example_sentence: 'Example sentence in Baz', - }) - }) - test('doesn\'t assign gloss languages if null', () => { - const gloss_languages = null - const dictionary_name = 'Boo' - expect(get_example_sentence_headers(gloss_languages, dictionary_name)).toEqual({ - vernacular_example_sentence: 'Example sentence in Boo', - }) - }) -}) +// describe(get_example_sentence_headers, () => { +// test('assigns vernacular and other example sentences if any exists or bcp if it doesn\'t', () => { +// const gloss_languages = ['it', 'af'] +// const dictionary_name = 'Foo' +// expect(get_example_sentence_headers(gloss_languages, dictionary_name)).toEqual({ +// vernacular_example_sentence: 'Example sentence in Foo', +// it_example_sentence: 'Example sentence in Italiano', +// af_example_sentence: 'Example sentence in Afrikaans', +// }) +// }) +// test('assigns only verncaular if empty array', () => { +// const gloss_languages = [] +// const dictionary_name = 'Baz' +// expect(get_example_sentence_headers(gloss_languages, dictionary_name)).toEqual({ +// vernacular_example_sentence: 'Example sentence in Baz', +// }) +// }) +// test('doesn\'t assign gloss languages if null', () => { +// const gloss_languages = null +// const dictionary_name = 'Boo' +// expect(get_example_sentence_headers(gloss_languages, dictionary_name)).toEqual({ +// vernacular_example_sentence: 'Example sentence in Boo', +// }) +// }) +// }) diff --git a/packages/site/src/routes/[dictionaryId]/export/assignHeadersForCsv.ts b/packages/site/src/routes/[dictionaryId]/export/assignHeadersForCsv.ts index a4bfd4fb4..51e920832 100644 --- a/packages/site/src/routes/[dictionaryId]/export/assignHeadersForCsv.ts +++ b/packages/site/src/routes/[dictionaryId]/export/assignHeadersForCsv.ts @@ -1,55 +1,55 @@ -import type { ExpandedEntry } from '@living-dictionaries/types'; -import { glossingLanguages } from '$lib/glosses/glossing-languages'; -import type { EntryForCSV } from './prepareEntriesForCsv'; +// import type { ExpandedEntry } from '@living-dictionaries/types'; +// import { glossingLanguages } from '$lib/glosses/glossing-languages'; +// import type { EntryForCSV } from './prepareEntriesForCsv'; -export function get_local_orthography_headers( - alternate_orthographies: string[] -): EntryForCSV { - const headers: EntryForCSV = {}; - if (alternate_orthographies) { - alternate_orthographies.forEach((lo, index) => { - headers[`local_orthography_${index + 1}`] = lo; - }); - } - return headers; -} +// export function get_local_orthography_headers( +// alternate_orthographies: string[] +// ): EntryForCSV { +// const headers: EntryForCSV = {}; +// if (alternate_orthographies) { +// alternate_orthographies.forEach((lo, index) => { +// headers[`local_orthography_${index + 1}`] = lo; +// }); +// } +// return headers; +// } -export function get_semantic_domain_headers(entries: ExpandedEntry[]): EntryForCSV { - const headers = {}; +// export function get_semantic_domain_headers(entries: ExpandedEntry[]): EntryForCSV { +// const headers = {}; - const max_semantic_domains = Math.max( - ...entries.map((entry) => entry.senses?.[0]?.translated_ld_semantic_domains?.length || 0) - ); +// const max_semantic_domains = Math.max( +// ...entries.map((entry) => entry.senses?.[0]?.translated_ld_semantic_domains?.length || 0) +// ); - if (max_semantic_domains > 0) { - for (let index = 0; index < max_semantic_domains; index++) - headers[`semantic_domain_${index + 1}`] = `Semantic domain ${index + 1}`; - } - return headers; -} +// if (max_semantic_domains > 0) { +// for (let index = 0; index < max_semantic_domains; index++) +// headers[`semantic_domain_${index + 1}`] = `Semantic domain ${index + 1}`; +// } +// return headers; +// } -export function get_gloss_language_headers(gloss_languages: string[]): EntryForCSV { - const headers = {}; - if (gloss_languages) { - gloss_languages.forEach((bcp) => { - headers[`${bcp}_gloss_language`] = `${glossingLanguages[bcp].vernacularName || bcp} Gloss`; - }); - } - return headers; -} +// export function get_gloss_language_headers(gloss_languages: string[]): EntryForCSV { +// const headers = {}; +// if (gloss_languages) { +// gloss_languages.forEach((bcp) => { +// headers[`${bcp}_gloss_language`] = `${glossingLanguages[bcp].vernacularName || bcp} Gloss`; +// }); +// } +// return headers; +// } -export function get_example_sentence_headers( - gloss_languages: string[], - dictionary_name: string -): EntryForCSV { - const headers: EntryForCSV = {}; - headers.vernacular_example_sentence = `Example sentence in ${dictionary_name}`; - if (gloss_languages) { - gloss_languages.forEach((bcp) => { - headers[`${bcp}_example_sentence`] = `Example sentence in ${ - glossingLanguages[bcp].vernacularName || bcp - }`; - }); - } - return headers; -} +// export function get_example_sentence_headers( +// gloss_languages: string[], +// dictionary_name: string +// ): EntryForCSV { +// const headers: EntryForCSV = {}; +// headers.vernacular_example_sentence = `Example sentence in ${dictionary_name}`; +// if (gloss_languages) { +// gloss_languages.forEach((bcp) => { +// headers[`${bcp}_example_sentence`] = `Example sentence in ${ +// glossingLanguages[bcp].vernacularName || bcp +// }`; +// }); +// } +// return headers; +// } diff --git a/packages/site/src/routes/[dictionaryId]/export/fetchSpeakers.ts b/packages/site/src/routes/[dictionaryId]/export/fetchSpeakers.ts index ee465e8de..4ef97eb63 100644 --- a/packages/site/src/routes/[dictionaryId]/export/fetchSpeakers.ts +++ b/packages/site/src/routes/[dictionaryId]/export/fetchSpeakers.ts @@ -1,13 +1,13 @@ -import { getDocument } from 'sveltefirets'; -import type { ISpeaker, ExpandedEntry } from '@living-dictionaries/types'; +// import { getDocument } from 'sveltefirets'; +// import type { ISpeaker, ExpandedEntry } from '@living-dictionaries/types'; -export async function fetchSpeakers(entries: ExpandedEntry[]): Promise { - let speaker_ids: string[] = []; - for (const { sound_files } of entries) { - const ids = sound_files?.[0]?.speaker_ids || []; - speaker_ids = speaker_ids.concat(ids); - } +// export async function fetchSpeakers(entries: ExpandedEntry[]): Promise { +// let speaker_ids: string[] = []; +// for (const { sound_files } of entries) { +// const ids = sound_files?.[0]?.speaker_ids || []; +// speaker_ids = speaker_ids.concat(ids); +// } - const speakers = await Promise.all(speaker_ids.map(async (id) => await getDocument(`speakers/${id}`))); - return speakers; -} +// const speakers = await Promise.all(speaker_ids.map(async (id) => await getDocument(`speakers/${id}`))); +// return speakers; +// } diff --git a/packages/site/src/routes/[dictionaryId]/export/friendlyName.test.ts b/packages/site/src/routes/[dictionaryId]/export/friendlyName.test.ts index 22d44dfcf..b5a0d2eaa 100644 --- a/packages/site/src/routes/[dictionaryId]/export/friendlyName.test.ts +++ b/packages/site/src/routes/[dictionaryId]/export/friendlyName.test.ts @@ -1,26 +1,26 @@ -import { friendlyName } from './friendlyName'; +// import { friendlyName } from './friendlyName'; -test('friendlyName returns filename with proper file extensions', () => { - expect(friendlyName({ id: '1234', senses: [{ glosses: { en: 'food' } }] }, 'e3j3jsi.jpg')).toBe( - '1234_food.jpg' - ); - expect(friendlyName({ id: '1234', senses: [{ glosses: { en: 'food' } }] }, 'e3j3jsi.wav')).toBe( - '1234_food.wav' - ); -}); +// test('friendlyName returns filename with proper file extensions', () => { +// expect(friendlyName({ id: '1234', senses: [{ glosses: { en: 'food' } }] }, 'e3j3jsi.jpg')).toBe( +// '1234_food.jpg' +// ); +// expect(friendlyName({ id: '1234', senses: [{ glosses: { en: 'food' } }] }, 'e3j3jsi.wav')).toBe( +// '1234_food.wav' +// ); +// }); -test('friendlyName returns second gloss or no gloss if first gloss or gloss object does not exist', () => { - expect( - friendlyName({ id: '1234', senses: [{ glosses: { en: '', es: 'comida' } }] }, 'e3j3jsi.jpg') - ).toBe('1234_comida.jpg'); - expect(friendlyName({ id: '1234', senses: [{ glosses: { en: '' } }] }, 'e3j3jsi.wav')).toBe( - '1234_.wav' - ); - expect(friendlyName({ id: '1234' }, 'e3j3jsi.wav')).toBe('1234_.wav'); -}); +// test('friendlyName returns second gloss or no gloss if first gloss or gloss object does not exist', () => { +// expect( +// friendlyName({ id: '1234', senses: [{ glosses: { en: '', es: 'comida' } }] }, 'e3j3jsi.jpg') +// ).toBe('1234_comida.jpg'); +// expect(friendlyName({ id: '1234', senses: [{ glosses: { en: '' } }] }, 'e3j3jsi.wav')).toBe( +// '1234_.wav' +// ); +// expect(friendlyName({ id: '1234' }, 'e3j3jsi.wav')).toBe('1234_.wav'); +// }); -test('friendlyName simplifies complicated glosses and strips out non a-z characters', () => { - expect( - friendlyName({ id: '1234', senses: [{ glosses: { en: 'How was your day?' } }] }, 'e3j3jsi.jpg') - ).toBe('1234_How_was_your_day.jpg'); -}); +// test('friendlyName simplifies complicated glosses and strips out non a-z characters', () => { +// expect( +// friendlyName({ id: '1234', senses: [{ glosses: { en: 'How was your day?' } }] }, 'e3j3jsi.jpg') +// ).toBe('1234_How_was_your_day.jpg'); +// }); diff --git a/packages/site/src/routes/[dictionaryId]/export/friendlyName.ts b/packages/site/src/routes/[dictionaryId]/export/friendlyName.ts index 622c9e45d..cd31148f4 100644 --- a/packages/site/src/routes/[dictionaryId]/export/friendlyName.ts +++ b/packages/site/src/routes/[dictionaryId]/export/friendlyName.ts @@ -1,17 +1,17 @@ -import type { ExpandedEntry } from '@living-dictionaries/types'; +// import type { ExpandedEntry } from '@living-dictionaries/types'; -export function friendlyName(entry: Partial, path: string) { - if (path) { - const fileTypeSuffix = path.split('.').pop(); - let gloss = entry.senses?.[0].glosses - ? Object.values(entry.senses?.[0].glosses)[0] || - Object.values(entry.senses?.[0].glosses)[1] || - '' - : ''; - gloss = gloss.replace(/\s+/g, '_').replace(/[^a-zA-Z0-9_]+/g, ''); - // non-ASCII characters: /[^\x20-\x7E]/g +// export function friendlyName(entry: Partial, path: string) { +// if (path) { +// const fileTypeSuffix = path.split('.').pop(); +// let gloss = entry.senses?.[0].glosses +// ? Object.values(entry.senses?.[0].glosses)[0] || +// Object.values(entry.senses?.[0].glosses)[1] || +// '' +// : ''; +// gloss = gloss.replace(/\s+/g, '_').replace(/[^a-zA-Z0-9_]+/g, ''); +// // non-ASCII characters: /[^\x20-\x7E]/g - return `${entry.id}_${gloss}.${fileTypeSuffix}`; - } - return ''; -} +// return `${entry.id}_${gloss}.${fileTypeSuffix}`; +// } +// return ''; +// } diff --git a/packages/site/src/routes/[dictionaryId]/export/prepareEntriesForCsv.test.ts b/packages/site/src/routes/[dictionaryId]/export/prepareEntriesForCsv.test.ts index b4fbb70ae..2996f5824 100644 --- a/packages/site/src/routes/[dictionaryId]/export/prepareEntriesForCsv.test.ts +++ b/packages/site/src/routes/[dictionaryId]/export/prepareEntriesForCsv.test.ts @@ -1,122 +1,122 @@ -import type { - ExpandedEntry, - IDictionary, - IPartOfSpeech, - ISpeaker, -} from '@living-dictionaries/types' -import { StandardEntryCSVFields, formatCsvEntries, getCsvHeaders } from './prepareEntriesForCsv' -import { objectsToCsvByHeaders } from '$lib/export/csv' +// import type { +// ExpandedEntry, +// IDictionary, +// IPartOfSpeech, +// ISpeaker, +// } from '@living-dictionaries/types' +// import { StandardEntryCSVFields, formatCsvEntries, getCsvHeaders } from './prepareEntriesForCsv' +// import { objectsToCsvByHeaders } from '$lib/export/csv' -describe('prepareEntriesForCsv', () => { - const speakers: ISpeaker[] = [ - { - displayName: 'John Smith', - id: '123', - birthplace: 'Whoville', - decade: 4, - gender: 'm', - }, - ] - const partsOfSpeech: IPartOfSpeech[] = [{ enAbbrev: 'n', enName: 'noun' }] // TODO: after updated expanded entries to include abbreviations, this will no longer be needed in prepareEntriesForCsv +// describe('prepareEntriesForCsv', () => { +// const speakers: ISpeaker[] = [ +// { +// displayName: 'John Smith', +// id: '123', +// birthplace: 'Whoville', +// decade: 4, +// gender: 'm', +// }, +// ] +// const partsOfSpeech: IPartOfSpeech[] = [{ enAbbrev: 'n', enName: 'noun' }] // TODO: after updated expanded entries to include abbreviations, this will no longer be needed in prepareEntriesForCsv - test('everything', () => { - const dictionary: IDictionary = { - name: 'TestLang', - id: 'testDictionary', - glossLanguages: ['ar', 'en', 'es'], - alternateOrthographies: ['native_script_1', 'native_script_2'], - } - const entries: ExpandedEntry[] = [ - { - id: '12345qwerty', - lexeme: 'xiangjiao', - local_orthography_2: 'کیلا', - senses: [ - { - glosses: { ar: 'foo', en: 'banana' }, - translated_parts_of_speech: ['noun', 'adjective'], - translated_ld_semantic_domains: ['Body parts', 'Body functions'], - example_sentences: [{ en: 'This is a banana', vn: '我很喜歡吃香蕉' }], - photo_files: [ - { - fb_storage_path: 'https://database.com/image.png', - storage_url: 'https://database.com/image.png', - uid_added_by: 'Diego', - }, - ], - }, - ], - phonetic: 'xiangjiao', - dialects: ['dialect x'], - notes: 'This is an example of a note, here we can write whatever we want.', - sources: ['A book', 'www.mybook.com'], - sound_files: [{ - fb_storage_path: 'https://database.com/sound.mp3', - storage_url: 'https://database.com/sound.mp3', - speaker_ids: ['123'], - }], - }, - { - id: '34qw', - lexeme: 'tree', - local_orthography_1: '𑃐𑃥𑃝𑃢 𑃒𑃦𑃗𑃠𑃤', - local_orthography_2: 'চুড়া বংজি', - senses: [{ glosses: { es: 'árbol' } }], - variant: 'bananer', - }, - ] +// test('everything', () => { +// const dictionary: IDictionary = { +// name: 'TestLang', +// id: 'testDictionary', +// glossLanguages: ['ar', 'en', 'es'], +// alternateOrthographies: ['native_script_1', 'native_script_2'], +// } +// const entries: ExpandedEntry[] = [ +// { +// id: '12345qwerty', +// lexeme: 'xiangjiao', +// local_orthography_2: 'کیلا', +// senses: [ +// { +// glosses: { ar: 'foo', en: 'banana' }, +// translated_parts_of_speech: ['noun', 'adjective'], +// translated_ld_semantic_domains: ['Body parts', 'Body functions'], +// example_sentences: [{ en: 'This is a banana', vn: '我很喜歡吃香蕉' }], +// photo_files: [ +// { +// fb_storage_path: 'https://database.com/image.png', +// storage_url: 'https://database.com/image.png', +// uid_added_by: 'Diego', +// }, +// ], +// }, +// ], +// phonetic: 'xiangjiao', +// dialects: ['dialect x'], +// notes: 'This is an example of a note, here we can write whatever we want.', +// sources: ['A book', 'www.mybook.com'], +// sound_files: [{ +// fb_storage_path: 'https://database.com/sound.mp3', +// storage_url: 'https://database.com/sound.mp3', +// speaker_ids: ['123'], +// }], +// }, +// { +// id: '34qw', +// lexeme: 'tree', +// local_orthography_1: '𑃐𑃥𑃝𑃢 𑃒𑃦𑃗𑃠𑃤', +// local_orthography_2: 'চুড়া বংজি', +// senses: [{ glosses: { es: 'árbol' } }], +// variant: 'bananer', +// }, +// ] - const headers = getCsvHeaders(entries, dictionary) - const formattedEntries = formatCsvEntries(entries, speakers, partsOfSpeech) +// const headers = getCsvHeaders(entries, dictionary) +// const formattedEntries = formatCsvEntries(entries, speakers, partsOfSpeech) - const expectedHeaders_PlusDynamic_ArEnEs_TwoLocalOrthographies = { - ...StandardEntryCSVFields, - local_orthography_1: 'native_script_1', - local_orthography_2: 'native_script_2', - ar_gloss_language: 'العَرَبِيَّة‎ Gloss', - en_gloss_language: 'English Gloss', - es_gloss_language: 'español Gloss', - ar_example_sentence: 'Example sentence in العَرَبِيَّة‎', - en_example_sentence: 'Example sentence in English', - es_example_sentence: 'Example sentence in español', - vernacular_example_sentence: 'Example sentence in TestLang', - semantic_domain_1: 'Semantic domain 1', - semantic_domain_2: 'Semantic domain 2', - } +// const expectedHeaders_PlusDynamic_ArEnEs_TwoLocalOrthographies = { +// ...StandardEntryCSVFields, +// local_orthography_1: 'native_script_1', +// local_orthography_2: 'native_script_2', +// ar_gloss_language: 'العَرَبِيَّة‎ Gloss', +// en_gloss_language: 'English Gloss', +// es_gloss_language: 'español Gloss', +// ar_example_sentence: 'Example sentence in العَرَبِيَّة‎', +// en_example_sentence: 'Example sentence in English', +// es_example_sentence: 'Example sentence in español', +// vernacular_example_sentence: 'Example sentence in TestLang', +// semantic_domain_1: 'Semantic domain 1', +// semantic_domain_2: 'Semantic domain 2', +// } - expect(headers).toMatchObject(expectedHeaders_PlusDynamic_ArEnEs_TwoLocalOrthographies) - expect(formattedEntries).toMatchFileSnapshot('./test-output/prepareEntriesForCsv_noHeaders.txt') - expect(objectsToCsvByHeaders(headers, formattedEntries)).toMatchFileSnapshot('./test-output/prepareEntriesForCsv.csv') - }) +// expect(headers).toMatchObject(expectedHeaders_PlusDynamic_ArEnEs_TwoLocalOrthographies) +// expect(formattedEntries).toMatchFileSnapshot('./test-output/prepareEntriesForCsv_noHeaders.txt') +// expect(objectsToCsvByHeaders(headers, formattedEntries)).toMatchFileSnapshot('./test-output/prepareEntriesForCsv.csv') +// }) - // TODO: allow multiple parts of speech +// // TODO: allow multiple parts of speech - describe('variant column', () => { - test('added when entries have variants', () => { - const dictionary = {} as IDictionary - const entries: ExpandedEntry[] = [ - { - lexeme: 'foo', - variant: 'fooey', - }, - { - lexeme: 'baz', - }, - ] +// describe('variant column', () => { +// test('added when entries have variants', () => { +// const dictionary = {} as IDictionary +// const entries: ExpandedEntry[] = [ +// { +// lexeme: 'foo', +// variant: 'fooey', +// }, +// { +// lexeme: 'baz', +// }, +// ] - const headers = getCsvHeaders(entries, dictionary) - const [firstEntry, secondEntry] = formatCsvEntries(entries, speakers, partsOfSpeech) +// const headers = getCsvHeaders(entries, dictionary) +// const [firstEntry, secondEntry] = formatCsvEntries(entries, speakers, partsOfSpeech) - expect(headers.variant).toEqual('Variant') - expect(firstEntry.variant).toEqual('fooey') - expect(secondEntry.variant).toBeFalsy() - }) +// expect(headers.variant).toEqual('Variant') +// expect(firstEntry.variant).toEqual('fooey') +// expect(secondEntry.variant).toBeFalsy() +// }) - test('not added when entries do not have variants', () => { - const dictionary = {} as IDictionary - const entries: ExpandedEntry[] = [{ lexeme: 'foo' }] - const { variant } = getCsvHeaders(entries, dictionary) - expect(variant).toBeFalsy() - }) - }) -}) +// test('not added when entries do not have variants', () => { +// const dictionary = {} as IDictionary +// const entries: ExpandedEntry[] = [{ lexeme: 'foo' }] +// const { variant } = getCsvHeaders(entries, dictionary) +// expect(variant).toBeFalsy() +// }) +// }) +// }) diff --git a/packages/site/src/routes/[dictionaryId]/export/prepareEntriesForCsv.ts b/packages/site/src/routes/[dictionaryId]/export/prepareEntriesForCsv.ts index b7d7caf2d..e4cd0ddbf 100644 --- a/packages/site/src/routes/[dictionaryId]/export/prepareEntriesForCsv.ts +++ b/packages/site/src/routes/[dictionaryId]/export/prepareEntriesForCsv.ts @@ -1,26 +1,13 @@ import type { - ExpandedEntry, - IDictionary, - IPartOfSpeech, - ISpeaker, + EntryView, } from '@living-dictionaries/types' -import { stripHTMLTags } from './stripHTMLTags' -import { friendlyName } from './friendlyName' -import { - get_example_sentence_headers, - get_gloss_language_headers, - get_local_orthography_headers, - get_semantic_domain_headers, -} from './assignHeadersForCsv' -import { - display_speaker_gender, - find_part_of_speech_abbreviation, - format_example_sentences, - format_gloss_languages, - format_semantic_domains, - get_first_speaker_from_first_sound_file, -} from './assignFormattedEntryValuesForCsv' -import { decades } from '$lib/components/media/ages' +// import { friendlyName } from './friendlyName' +// import { +// get_example_sentence_headers, +// get_gloss_language_headers, +// get_local_orthography_headers, +// get_semantic_domain_headers, +// } from './assignHeadersForCsv' export enum StandardEntryCSVFields { id = 'Entry Id', @@ -47,59 +34,59 @@ type StandardEntryForCSV = { [key in EntryForCSVKeys]?: string; } -export type EntryForCSV = StandardEntryForCSV & Omit & { +export type EntryForCSV = StandardEntryForCSV & Omit & { vernacular_example_sentence?: string variant?: string // for DICTIONARIES_WITH_VARIANTS } -export function getCsvHeaders(expanded_entries: ExpandedEntry[], { alternateOrthographies, glossLanguages, name: dictionaryName }: IDictionary): EntryForCSV { - const headers: EntryForCSV = { ...StandardEntryCSVFields } +// export function getCsvHeaders(expanded_entries: EntryView[], { alternateOrthographies, glossLanguages, name: dictionaryName }: IDictionary): EntryForCSV { +// const headers: EntryForCSV = { ...StandardEntryCSVFields } - const has_variants = expanded_entries.some(entry => entry.variant) - if (has_variants) - headers.variant = 'Variant' +// const has_variants = expanded_entries.some(entry => entry.variant) +// if (has_variants) +// headers.variant = 'Variant' - return { - ...headers, - ...get_local_orthography_headers(alternateOrthographies), - ...get_semantic_domain_headers(expanded_entries), - ...get_gloss_language_headers(glossLanguages), - ...get_example_sentence_headers(glossLanguages, dictionaryName), - } -} +// return { +// ...headers, +// ...get_local_orthography_headers(alternateOrthographies), +// ...get_semantic_domain_headers(expanded_entries), +// ...get_gloss_language_headers(glossLanguages), +// ...get_example_sentence_headers(glossLanguages, dictionaryName), +// } +// } -export function formatCsvEntries( - expanded_entries: ExpandedEntry[], - speakers: ISpeaker[], - global_parts_of_speech: IPartOfSpeech[], -): EntryForCSV[] { - return expanded_entries.map((entry) => { - const speaker = get_first_speaker_from_first_sound_file(entry, speakers) +// export function formatCsvEntries( +// entries: EntryView[], +// speakers: Tables<'speakers'>[], +// global_parts_of_speech: IPartOfSpeech[], +// ): EntryForCSV[] { +// return entries.map((entry) => { +// const speaker = get_first_speaker_from_first_sound_file(entry, speakers) - const formatted_entry = { - ...entry, - noun_class: entry.senses?.[0]?.noun_class, - dialects: entry.dialects?.[0], - notes: stripHTMLTags(entry.notes), - sources: entry.sources?.join(' | '), - parts_of_speech_abbreviation: find_part_of_speech_abbreviation( - global_parts_of_speech, - entry.senses?.[0]?.translated_parts_of_speech?.[0], - ), - parts_of_speech: entry.senses?.[0]?.translated_parts_of_speech?.[0], - image_filename: friendlyName(entry, entry.senses?.[0].photo_files?.[0]?.fb_storage_path), - sound_filename: friendlyName(entry, entry.sound_files?.[0]?.fb_storage_path), - speaker_name: speaker?.displayName, - speaker_birthplace: speaker?.birthplace, - speaker_decade: decades[speaker?.decade], - speaker_gender: display_speaker_gender(speaker?.gender), - } satisfies EntryForCSV +// const formatted_entry = { +// ...entry, +// noun_class: entry.senses?.[0]?.noun_class, +// dialects: entry.dialects?.[0], +// notes: stripHTMLTags(entry.notes), +// sources: entry.sources?.join(' | '), +// parts_of_speech_abbreviation: find_part_of_speech_abbreviation( +// global_parts_of_speech, +// entry.senses?.[0]?.translated_parts_of_speech?.[0], +// ), +// parts_of_speech: entry.senses?.[0]?.translated_parts_of_speech?.[0], +// image_filename: friendlyName(entry, entry.senses?.[0].photo_files?.[0]?.fb_storage_path), +// sound_filename: friendlyName(entry, entry.sound_files?.[0]?.fb_storage_path), +// speaker_name: speaker?.displayName, +// speaker_birthplace: speaker?.birthplace, +// speaker_decade: decades[speaker?.decade], +// speaker_gender: display_speaker_gender(speaker?.gender), +// } satisfies EntryForCSV - return { - ...formatted_entry, - ...format_semantic_domains(entry), - ...format_gloss_languages(entry), - ...format_example_sentences(entry), - } - }) -} +// return { +// ...formatted_entry, +// ...format_semantic_domains(entry), +// ...format_gloss_languages(entry), +// ...format_example_sentences(entry), +// } +// }) +// } diff --git a/packages/site/src/routes/[dictionaryId]/invite/[inviteId]/+page.svelte b/packages/site/src/routes/[dictionaryId]/invite/[inviteId]/+page.svelte index 032883cf0..0135a3f6f 100644 --- a/packages/site/src/routes/[dictionaryId]/invite/[inviteId]/+page.svelte +++ b/packages/site/src/routes/[dictionaryId]/invite/[inviteId]/+page.svelte @@ -19,7 +19,7 @@

You are already a manager.

- @@ -27,7 +27,7 @@

You are already a contributor.

- @@ -67,7 +67,7 @@ })}

- diff --git a/packages/site/src/routes/[dictionaryId]/load-entries.ts b/packages/site/src/routes/[dictionaryId]/load-entries.ts deleted file mode 100644 index a6edcebd8..000000000 --- a/packages/site/src/routes/[dictionaryId]/load-entries.ts +++ /dev/null @@ -1,100 +0,0 @@ -import type { CollectionReference, FirestoreError, QueryConstraint } from 'firebase/firestore' -import { Timestamp, getDocs, getDocsFromCache, limit, orderBy, query, startAt, where } from 'firebase/firestore' -import type { ActualDatabaseEntry, ExpandedEntry, IDictionary } from '@living-dictionaries/types' -import { writable } from 'svelte/store' -import { colRef, collectionStore } from 'sveltefirets' -import { convert_and_expand_entry } from '$lib/transformers/convert_and_expand_entry' -import type { TranslateFunction } from '$lib/i18n/types' -import { create_index } from '$lib/search' -import { browser } from '$app/environment' - -async function getCollectionOrError( - path: string | CollectionReference, - queryConstraints: QueryConstraint[] = [], - { fromCache } = { fromCache: false }, -): Promise<{ data?: T[], ref?: CollectionReference, error?: FirestoreError }> { - try { - const _ref = typeof path === 'string' ? colRef(path) : path - const q = query(_ref, ...queryConstraints) - const collectionSnap = fromCache ? await getDocsFromCache(q) : await getDocs(q) - return { - data: collectionSnap.docs.map(docSnap => ({ - ...docSnap.data(), - id: docSnap.id, - })), - ref: _ref, - } - } catch (error) { - return { error } - } -} - -export function create_entries_store({ dictionary, show_local_search, t, entries_per_page }: { dictionary: IDictionary, show_local_search: boolean, t: TranslateFunction, entries_per_page: number }) { - const _entries = new Map() - const entries = writable(_entries) - - const load_entries_locally = browser && show_local_search - if (!load_entries_locally) - return { entries } - - function add(db_entries: ActualDatabaseEntry[]) { - for (const entry of db_entries) { - const expanded = convert_and_expand_entry(entry, t) - _entries.set(entry.id, expanded) - } - entries.set(_entries) - console.info({ added_entries: db_entries.length, total_entries: _entries.size }) - } - - const status = writable('initing') - - const path = `dictionaries/${dictionary.id}/words` - async function incrementally_get_entries() { - const order_by_lexeme = orderBy('lx', 'desc') - - // first get as many documents from cache as exist - const { data: from_cache, ref, error } = await getCollectionOrError(path, [order_by_lexeme], { fromCache: true }) - if (error) { - status.set(`Error getting initial cache: ${error.message}`) - return { status } - } - if (from_cache) { - add(from_cache) - if (from_cache.length > 100 || from_cache.length > (dictionary.entryCount * 0.9)) { - create_index(_entries).then(() => { - status.set('Cache search index created') - }) - } - status.set(`Entries loaded: initial cache check found ${from_cache.length}`) - } - - // then get all entries from the server starting with the first page size and then growing in bigger steps (this will also update the cache to the current moment) - async function get_page_from_server(page_size: number, start_at_lexeme?: string) { - const queryConstraints: QueryConstraint[] = [limit(page_size), order_by_lexeme] - if (start_at_lexeme) - queryConstraints.push(startAt(start_at_lexeme)) // https://firebase.google.com/docs/firestore/query-data/query-cursors#paginate_a_query - - const { data: page_from_server, error } = await getCollectionOrError(ref, queryConstraints) - if (error) - status.set(`Error fetching collection from server: ${error.message}`) - if (start_at_lexeme ? page_from_server?.length > 1 : page_from_server?.length) { - add(page_from_server) - status.set(`Entries loaded: went to server to fill page (${page_size}) and received ${page_from_server.length}`) - const last_received_lexeme = page_from_server[page_from_server.length - 1].lx - const additional_step_size = 1000 - await get_page_from_server(additional_step_size, last_received_lexeme) // recursively repeat until all pages loaded - } else { - status.set(`Creating index ${_entries.size} entries`) - await create_index(_entries) - status.set('Search index created') - } - } - await get_page_from_server(entries_per_page) - } - incrementally_get_entries() - - const entries_loaded_at = Timestamp.fromMillis(Date.now()) - const edited_entries = collectionStore(path, [where('ua', '>', entries_loaded_at)]) - - return { entries, status, edited_entries } -} diff --git a/packages/site/src/routes/api/db/build-search-indexes/+server.ts b/packages/site/src/routes/api/db/build-search-indexes/+server.ts new file mode 100644 index 000000000..6a2d7a669 --- /dev/null +++ b/packages/site/src/routes/api/db/build-search-indexes/+server.ts @@ -0,0 +1,84 @@ +import path from 'node:path' +import { fileURLToPath } from 'node:url' +import { error, json } from '@sveltejs/kit' +import { persistToFile } from '@orama/plugin-data-persistence/server' +import type { EntryView } from '@living-dictionaries/types' +import { create, insertMultiple } from '@orama/orama' +import type { RequestHandler } from './$types' +import { ResponseCodes } from '$lib/constants' +import { dev } from '$app/environment' +import { getAdminSupabaseClient } from '$lib/supabase/admin' +import { augment_entry_for_search } from '$lib/search/augment-entry-for-search' +// import { entries_index_schema } from '$lib/search/orama.worker' +// import { persist } from '@orama/plugin-data-persistence' + +// Open to build: http://localhost:3041/api/db/build-search-indexes + +const __dirname = path.dirname(fileURLToPath(import.meta.url)) +const order_field = 'updated_at' + +export const GET: RequestHandler = async () => { + if (!dev) + error(ResponseCodes.INTERNAL_SERVER_ERROR, { message: 'Not allowed' }) + + try { + const admin_supabase = getAdminSupabaseClient() + const { data: dictionary_ids } = await admin_supabase.from('dictionaries').select('id') + + for (const { id: dictionary_id } of dictionary_ids) { + const entries: EntryView[] = [] + let timestamp_from_which_to_fetch_data = '1971-01-01T00:00:00Z' + + while (true) { + if (entries.length) + timestamp_from_which_to_fetch_data = entries[entries.length - 1][order_field] as string + + const { data: batch, error: batch_error } = await admin_supabase + .from('materialized_entries_view') + .select() + .eq('dictionary_id', dictionary_id) + .is('deleted', null) + .limit(1000) + .order(order_field, { ascending: true }) + .gt(order_field, timestamp_from_which_to_fetch_data) + + if (batch_error) + console.info({ batch_error }) + if (batch?.length) { + entries.push(...batch) + if (batch.length < 1000) { + break + } + } else { + break + } + } + + if (entries.length <= 1000) + continue + + const search_index = await create_index(entries, dictionary_id) + const folder = '../../../../../static/search-indexes' + const filename = `${dictionary_id}.json` + const filepath = path.join(__dirname, folder, filename) + const filePath = await persistToFile(search_index, 'json', filepath) + console.info({ filePath }) + } + + return json({ result: 'success' }) + } catch (err) { + console.error(`Error with build: ${err.message}`) + error(ResponseCodes.INTERNAL_SERVER_ERROR, `Error with build: ${err.message}`) + } +} + +async function create_index(entries: EntryView[], dictionary_id: string) { + console.info({ [dictionary_id]: entries.length }) + console.time(dictionary_id) + const entries_augmented_for_search = entries.map(augment_entry_for_search) + const new_index = await create({ schema: null }) + // const new_index = await create({ schema: entries_index_schema }) + await insertMultiple(new_index, entries_augmented_for_search) + console.timeEnd(dictionary_id) + return new_index +} diff --git a/packages/site/src/routes/api/db/content-update/+server.ts b/packages/site/src/routes/api/db/content-update/+server.ts index 748edb656..8bfc2f3a5 100644 --- a/packages/site/src/routes/api/db/content-update/+server.ts +++ b/packages/site/src/routes/api/db/content-update/+server.ts @@ -1,45 +1,38 @@ -import { error, json } from '@sveltejs/kit' -import type { ContentUpdateRequestBody } from '@living-dictionaries/types/supabase/content-update.interface' +import { randomUUID } from 'node:crypto' +import { json, error as kit_error } from '@sveltejs/kit' +import type { ContentUpdateRequestBody, TablesInsert } from '@living-dictionaries/types' import type { RequestHandler } from './$types' import { checkForPermission } from './check-dictionary-permission' import { decodeToken } from '$lib/server/firebase-admin' import { getAdminSupabaseClient } from '$lib/supabase/admin' import { ResponseCodes } from '$lib/constants' -import type { TablesInsert } from '$lib/supabase/generated.types' import { dev } from '$app/environment' -export type { ContentUpdateRequestBody } export type ContentUpdateResponseBody = TablesInsert<'content_updates'> export const POST: RequestHandler = async ({ request }) => { try { - const { id, user_id_from_local, auth_token, table, dictionary_id, audio_id, entry_id, photo_id, speaker_id, text_id, video_id, sentence_id, sense_id, change, import_id, timestamp } = await request.json() as ContentUpdateRequestBody - - if (audio_id) - throw new Error('audio_id change not implemented') - if (speaker_id) - throw new Error('speaker_id change not implemented') - if (photo_id) - throw new Error('photo_id change not implemented') - if (video_id) - throw new Error('video_id change not implemented') - if (text_id) - throw new Error('text_id change not implemented') - - const adminSupabase = getAdminSupabaseClient() - - let user_id = user_id_from_local - const is_deployed = !dev - if (is_deployed || auth_token) { - const decodedToken = await decodeToken(auth_token) - if (!decodedToken?.uid) + const body = await request.json() as ContentUpdateRequestBody + const { update_id, import_meta, auth_token, dictionary_id, import_id, type, data } = body + + const admin_supabase = getAdminSupabaseClient() + + let user_id: string + + if (dev) + // @ts-expect-error + user_id = import_meta?.user_id || data?.updated_by || data?.created_by + + if (auth_token) { + const decoded_token = await decodeToken(auth_token) + if (!decoded_token?.uid) throw new Error('No user id found in token') - await checkForPermission(decodedToken.uid, dictionary_id) - user_id = decodedToken.uid - const { data } = await adminSupabase.from('user_emails') + await checkForPermission(decoded_token.uid, dictionary_id) + user_id = decoded_token.uid + const { data } = await admin_supabase.from('user_emails') .select('id') - .eq('email', decodedToken.email) + .eq('email', decoded_token.email!) .single() if (!data?.id) throw new Error('No user id found in database') @@ -49,130 +42,355 @@ export const POST: RequestHandler = async ({ request }) => { if (!user_id) throw new Error('No user id found. Pass it into the user_id_from_local field or use a valid auth_token.') - const { data: dictionary } = await adminSupabase.from('dictionaries').select().eq('id', dictionary_id).single() + const timestamp = dev + // @ts-expect-error + ? import_meta?.timestamp || data?.updated_at || data?.created_at || new Date().toISOString() + : new Date().toISOString() + + const c_u_meta = { + created_by: user_id, + updated_by: user_id, + created_at: timestamp, + updated_at: timestamp, + } + + const c_meta = { + created_by: user_id, + created_at: timestamp, + } + + const u_meta = { + updated_by: user_id, + updated_at: timestamp, + } + + if (data?.deleted) { + data.deleted = timestamp + } + + const { data: dictionary } = await admin_supabase.from('dictionaries').select().eq('id', dictionary_id).single() if (!dictionary) { - const { error: add_dictionary_error } = await adminSupabase.from('dictionaries').insert({ + const { error } = await admin_supabase.from('dictionaries').insert({ + ...c_u_meta, id: dictionary_id, name: 'CHANGE', - created_by: user_id, - updated_by: user_id, }) - if (add_dictionary_error) - throw new Error(add_dictionary_error.message) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + } + + if (type === 'insert_entry') { + const { error } = await admin_supabase.from('entries').insert({ + ...c_u_meta, + ...data, + dictionary_id, + id: body.entry_id, + }) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + + if (!import_id) { + const { data: sense_data, error: sense_error } = await admin_supabase.from('senses') + .insert({ + ...c_u_meta, + id: randomUUID(), + entry_id: body.entry_id, + }) + if (sense_error) { + console.info({ body }) + throw new Error(sense_error.message) + } + // @ts-expect-error + body.sense_id = sense_data?.id + } + } + + if (type === 'update_entry') { + const { error } = await admin_supabase.from('entries').update({ + ...u_meta, + ...data, + }).eq('id', body.entry_id) + if (error) { + console.info({ body }) + throw new Error(error.message) + } } - if (entry_id) { - const { data: entry } = await adminSupabase.from('entries').select().eq('id', entry_id).single() - if (!entry) { - const { error: add_entry_error } = await adminSupabase.from('entries').insert({ - id: entry_id, + if (type === 'insert_sense') { + const { error } = await admin_supabase.from('senses') + .insert({ + ...c_u_meta, + ...data, + id: body.sense_id || randomUUID(), + entry_id: body.entry_id, + }) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + } + + if (type === 'update_sense') { + const { error } = await admin_supabase.from('senses').update({ + ...u_meta, + ...data, + }).eq('id', body.sense_id) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + } + + if (type === 'insert_dialect') { + const { error } = await admin_supabase.from('dialects') + .insert({ + ...c_u_meta, + ...data, dictionary_id, - lexeme: {}, - created_by: user_id, - updated_by: user_id, + id: body.dialect_id, }) - if (add_entry_error) - throw new Error(add_entry_error.message) - } - } - - if (table === 'senses') { - const sense: TablesInsert<'senses'> = { - id: sense_id, - entry_id, - created_by: user_id, // Postgres trigger will keep this from being changed on update operations - updated_by: user_id, - } - - if (change.sense.glosses) - sense.glosses = change.sense.glosses.new - if (change.sense.noun_class) - sense.noun_class = change.sense.noun_class.new - if (change.sense.parts_of_speech) - sense.parts_of_speech = change.sense.parts_of_speech.new - if (change.sense.semantic_domains) - sense.semantic_domains = change.sense.semantic_domains.new - if (change.sense.write_in_semantic_domains) - sense.write_in_semantic_domains = change.sense.write_in_semantic_domains.new - if (change.sense.definition) - sense.definition = change.sense.definition.new - if (change.sense.deleted) - sense.deleted = timestamp - - const { error: update_error } = await adminSupabase.from('senses') - .upsert(sense) - if (update_error) - throw new Error(update_error.message) - } - - if (table === 'sentences') { - const sentence: TablesInsert<'sentences'> = { - id: sentence_id, - dictionary_id, - created_by: user_id, // Postgres trigger will keep this from being changed on update operations - updated_by: user_id, + if (error) { + console.info({ body }) + throw new Error(error.message) } + } - const editing_sentence_in_sense = sentence_id && sense_id - if (change.sentence.text) - sentence.text = change.sentence.text.new - if (change.sentence.translation) - sentence.translation = change.sentence.translation.new + if (type === 'assign_dialect') { + const { error } = await admin_supabase.from('entry_dialects') + .upsert({ + ...c_meta, + dialect_id: body.dialect_id, + entry_id: body.entry_id, + deleted: data?.deleted ? timestamp : null, + }) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + } - const { error: update_error } = await adminSupabase.from('sentences') - .upsert(sentence) - if (update_error) - throw new Error(update_error.message) + if (type === 'upsert_speaker') { + const { error } = await admin_supabase.from('speakers') + .upsert({ + ...c_u_meta, + ...data, + dictionary_id, + id: body.speaker_id, + } as TablesInsert<'speakers'>) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + } - if (editing_sentence_in_sense) { - await adminSupabase.from('senses_in_sentences') - .insert({ - sentence_id, - sense_id, - created_by: user_id, - }) + if (type === 'assign_speaker' && body.audio_id) { + const { error } = await admin_supabase.from('audio_speakers') + .upsert({ + ...c_meta, + speaker_id: body.speaker_id, + audio_id: body.audio_id, + deleted: data?.deleted ? timestamp : null, + }) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + } + + if (type === 'assign_speaker' && body.video_id) { + const { error } = await admin_supabase.from('video_speakers') + .upsert({ + ...c_meta, + speaker_id: body.speaker_id, + video_id: body.video_id, + deleted: data?.deleted ? timestamp : null, + }) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + } + + if (type === 'insert_sentence') { + const { error } = await admin_supabase.from('sentences') + .insert({ + ...c_u_meta, + ...data, + dictionary_id, + id: body.sentence_id, + }) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + + const { error: connect_error } = await admin_supabase.from('senses_in_sentences') + .insert({ + ...c_meta, + sentence_id: body.sentence_id, + sense_id: body.sense_id, + }) + if (connect_error) { + console.info({ body }) + throw new Error(connect_error.message) + } + } + + if (type === 'update_sentence') { + const { error } = await admin_supabase.from('sentences') + .update({ + ...u_meta, + ...data, + }) + .eq('id', body.sentence_id) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + } + + if (type === 'upsert_audio') { + if (body.entry_id) { + const { error } = await admin_supabase.from('audio').upsert({ + ...c_u_meta, + ...data, + dictionary_id, + id: body.audio_id, + entry_id: body.entry_id, + } as TablesInsert<'audio'>) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + } else { + const { error } = await admin_supabase.from('audio').update({ + ...u_meta, + ...data, + }) + .eq('id', body.audio_id) + if (error) { + console.info({ body }) + throw new Error(error.message) + } } + } - if (change.sentence.removed_from_sense) { - if (!editing_sentence_in_sense) - throw new Error('sentence_id and sense_id are required when removing a sentence from a sense') - const { error: delete_error } = await adminSupabase.from('senses_in_sentences') - .update({ deleted: timestamp }) - .eq('sentence_id', sentence_id) - .eq('sense_id', sense_id) - if (delete_error) - throw new Error(delete_error.message) + if (type === 'insert_photo') { + const { error } = await admin_supabase.from('photos') + .insert({ + ...c_u_meta, + ...data, + dictionary_id, + id: body.photo_id, + }) + if (error) { + console.info({ body }) + throw new Error(error.message) + } - const { error: update_error } = await adminSupabase.from('sentences') - .update({ deleted: timestamp }) - .eq('id', sentence_id) - if (update_error) - throw new Error(update_error.message) + const { error: connect_error } = await admin_supabase.from('sense_photos') + .insert({ + ...c_meta, + photo_id: body.photo_id, + sense_id: body.sense_id, + }) + if (connect_error) + throw new Error(connect_error.message) + } + + if (type === 'update_photo') { + const { error } = await admin_supabase.from('photos') + .update({ + ...u_meta, + ...data, + }) + .eq('id', body.photo_id) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + } + + if (type === 'insert_video') { + const { error } = await admin_supabase.from('videos') + .insert({ + ...c_u_meta, + ...data, + dictionary_id, + id: body.video_id, + }) + if (error) { + console.info({ body }) + throw new Error(error.message) + } + + const { error: connect_error } = await admin_supabase.from('sense_videos') + .insert({ + ...c_meta, + video_id: body.video_id, + sense_id: body.sense_id, + }) + if (connect_error) + throw new Error(connect_error.message) + } + + if (type === 'update_video') { + const { error } = await admin_supabase.from('videos') + .update({ + ...u_meta, + ...data, + }) + .eq('id', body.video_id) + if (error) { + console.info({ body }) + throw new Error(error.message) } } - // Save the history state - const { data: content_update, error: history_error } = await adminSupabase.from('content_updates').insert({ - id, + const { data: content_update, error } = await admin_supabase.from('content_updates').insert({ + id: update_id, user_id, - entry_id, dictionary_id, - sentence_id, - sense_id, timestamp, - table, import_id, - change, + change: { + type, + data, + }, + // @ts-expect-error - avoiding verbosity but requires manual type checking + ...(body.audio_id && { audio_id: body.audio_id }), + // @ts-expect-error + ...(body.dialect_id && { dialect_id: body.dialect_id }), + // @ts-expect-error + ...(body.entry_id && { entry_id: body.entry_id }), + // @ts-expect-error + ...(body.photo_id && { photo_id: body.photo_id }), + // @ts-expect-error + ...(body.sense_id && { sense_id: body.sense_id }), + // @ts-expect-error + ...(body.sentence_id && { sentence_id: body.sentence_id }), + // @ts-expect-error + ...(body.speaker_id && { speaker_id: body.speaker_id }), + // @ts-expect-error + ...(body.text_id && { text_id: body.text_id }), + // @ts-expect-error + ...(body.video_id && { video_id: body.video_id }), + // This is the properly typed version but much more verbose as requires one for each change type + // ...(type === 'insert_sense' && { sense_id: body.sense_id, entry_id: body.entry_id }), }) .select() .single() - if (history_error) - throw new Error(history_error.message) + if (error) + throw new Error(error.message) return json(content_update satisfies ContentUpdateResponseBody) } catch (err) { - console.error(`Error saving sentence: ${err.message}`) - error(ResponseCodes.INTERNAL_SERVER_ERROR, `Error saving sentence: ${err.message}`) + console.error(`Error saving change: ${err.message}`) + kit_error(ResponseCodes.INTERNAL_SERVER_ERROR, `Error saving change: ${err.message}`) } } diff --git a/packages/site/src/routes/api/db/content-update/_call.ts b/packages/site/src/routes/api/db/content-update/_call.ts new file mode 100644 index 000000000..e3d04ab1b --- /dev/null +++ b/packages/site/src/routes/api/db/content-update/_call.ts @@ -0,0 +1,7 @@ +import type { ContentUpdateRequestBody } from '@living-dictionaries/types' +import type { ContentUpdateResponseBody } from './+server' +import { post_request } from '$lib/helpers/get-post-requests' + +export async function content_update(body: ContentUpdateRequestBody) { + return await post_request(`/api/db/content-update`, body) +} diff --git a/packages/site/src/routes/api/email/new_user/save-user-to-supabase.ts b/packages/site/src/routes/api/email/new_user/save-user-to-supabase.ts index ed35c484f..c0bd4bc0a 100644 --- a/packages/site/src/routes/api/email/new_user/save-user-to-supabase.ts +++ b/packages/site/src/routes/api/email/new_user/save-user-to-supabase.ts @@ -1,25 +1,24 @@ -import { getAdminSupabaseClient } from '$lib/supabase/admin'; -import type { GoogleAuthUserMetaData } from '$lib/supabase/database.types'; -import type { IUser } from '@living-dictionaries/types'; +import type { GoogleAuthUserMetaData, IUser } from '@living-dictionaries/types' +import { getAdminSupabaseClient } from '$lib/supabase/admin' export async function save_user_to_supabase(user: IUser): Promise { - console.info({user}) - const adminSupabase = getAdminSupabaseClient(); + console.info({ user }) + const adminSupabase = getAdminSupabaseClient() const { data, error } = await adminSupabase.auth.admin.createUser({ email: user.email, email_confirm: true, app_metadata: { fb_uid: user.uid }, user_metadata: get_firebase_user_meta_data(user), - }); - console.info({data, error}) + }) + console.info({ data, error }) return data?.user?.id } -function get_firebase_user_meta_data({displayName, photoURL}: IUser) { +function get_firebase_user_meta_data({ displayName, photoURL }: IUser) { const metadata: GoogleAuthUserMetaData = {} if (displayName) - metadata.full_name = displayName; + metadata.full_name = displayName if (photoURL) - metadata.avatar_url = photoURL; - return metadata; + metadata.avatar_url = photoURL + return metadata } diff --git a/packages/site/src/routes/create-dictionary/+page.ts b/packages/site/src/routes/create-dictionary/+page.ts index 8548d9fa1..bb7682fa4 100644 --- a/packages/site/src/routes/create-dictionary/+page.ts +++ b/packages/site/src/routes/create-dictionary/+page.ts @@ -27,12 +27,9 @@ export const load = (({ parent }) => { const prunedDictionary = pruneObject(dictionary) if (firebaseConfig.projectId === 'talking-dictionaries-dev') { console.info(prunedDictionary) - if ( - !confirm( - 'Dictionary value logged to console because in dev mode. Do you still want to create this dictionary?', - ) - ) + if (!confirm('Dictionary value logged to console because in dev mode. Do you still want to create this dictionary?')) { return + } } await setOnline(`dictionaries/${url}`, prunedDictionary) @@ -52,7 +49,7 @@ export const load = (({ parent }) => { dictionary: { ...prunedDictionary, id: url }, }) - window.location.replace(`/${url}/entries/list`) + window.location.replace(`/${url}/entries`) } catch (err) { alert(`${t('misc.error')}: ${err}`) } diff --git a/packages/site/src/routes/og/+server.ts b/packages/site/src/routes/og/+server.ts index 9f1f5f108..180ad2652 100644 --- a/packages/site/src/routes/og/+server.ts +++ b/packages/site/src/routes/og/+server.ts @@ -1,13 +1,12 @@ -import type { RequestHandler } from './$types'; -import { component_to_png } from './component-to-png'; -import OpenGraphImage from './OpenGraphImage.svelte'; -import LZString from 'lz-string'; -const { decompressFromEncodedURIComponent: decode } = LZString; +import { decompressFromEncodedURIComponent as decode } from 'kitbook' +import type { RequestHandler } from './$types' +import { component_to_png } from './component-to-png' +import OpenGraphImage from './OpenGraphImage.svelte' -const HEIGHT = 630; -const WIDTH = 1200; +const HEIGHT = 630 +const WIDTH = 1200 export const GET: RequestHandler = ({ url }) => { - const props = JSON.parse(decode(url.searchParams.get('props'))); - return component_to_png(OpenGraphImage, props, props.height || HEIGHT, props.width || WIDTH); -}; + const props = JSON.parse(decode(url.searchParams.get('props'))) + return component_to_png(OpenGraphImage, props, props.height || HEIGHT, props.width || WIDTH) +} diff --git a/packages/site/src/routes/og/LoadOgImage.svelte b/packages/site/src/routes/og/LoadOgImage.svelte index e0c34dc99..c9014bdf0 100644 --- a/packages/site/src/routes/og/LoadOgImage.svelte +++ b/packages/site/src/routes/og/LoadOgImage.svelte @@ -1,30 +1,29 @@ diff --git a/packages/site/static/images/search-by-algolia-light-background.svg b/packages/site/static/images/search-by-algolia-light-background.svg deleted file mode 100644 index f1c841e7f..000000000 --- a/packages/site/static/images/search-by-algolia-light-background.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/site/tsconfig.json b/packages/site/tsconfig.json index 47c5e9d2b..6f2f661ff 100644 --- a/packages/site/tsconfig.json +++ b/packages/site/tsconfig.json @@ -12,17 +12,17 @@ "moduleResolution": "bundler", // defining paths here and adding baseUrl for Playwright to work "paths": { - "$api": [ - "./src/routes/api" - ], - "$api/*": [ - "./src/routes/api/*" - ], "$lib": [ "./src/lib" ], "$lib/*": [ "./src/lib/*" + ], + "$api": [ + "./src/routes/api" + ], + "$api/*": [ + "./src/routes/api/*" ] }, "resolveJsonModule": true, diff --git a/packages/site/vite.config.ts b/packages/site/vite.config.ts index f05da902d..d6811cb85 100644 --- a/packages/site/vite.config.ts +++ b/packages/site/vite.config.ts @@ -24,21 +24,22 @@ export default defineConfig({ define: getReplacements(), optimizeDeps: { include: [ // if the dependency is large with many internal modules or is CommonJS then include it - // 'firebase/functions', - // 'xss', + 'xss', + 'typescript', // bc kitbook uses it // 'kitbook', // 'kitbook/viewer/load-viewer', - // 'firebase/firestore', - // 'firebase/app', - // 'firebase/firestore/lite', - // 'firebase/auth', - // 'firebase/performance', // '@turf/turf', - // 'instantsearch.js/es/widgets/index.js', 'instantsearch.js/es/connectors', - // 'algoliasearch', - // 'instantsearch.js', + 'wavesurfer.js', + 'recordrtc', + '@supabase/supabase-js', ], exclude: [ // if the dependency is small, ESM, no CJS imports, then exclude and let the browser load directly - https://vitejs.dev/guide/dep-pre-bundling.html + 'idb-keyval', + 'comlink', + '@orama/orama', + '@turf/helpers', + '@turf/center', + '@turf/turf', 'sveltefirets', 'svelte-pieces', '@sentry/browser', diff --git a/packages/site/vitest.config.db.ts b/packages/site/vitest.config.db.ts index 0db4515ff..fda86ba2a 100644 --- a/packages/site/vitest.config.db.ts +++ b/packages/site/vitest.config.db.ts @@ -11,8 +11,9 @@ export default defineConfig({ poolOptions: { threads: { singleThread: true, - } + }, }, + fileParallelism: false, include: ['src/db-tests/**/*.test.ts'], }, }) diff --git a/packages/site/vitest.config.ts b/packages/site/vitest.config.ts index 0db824213..1028117a9 100644 --- a/packages/site/vitest.config.ts +++ b/packages/site/vitest.config.ts @@ -9,5 +9,6 @@ export default defineProject({ globals: true, includeSource: ['src/**/*.ts'], exclude: [...defaultExclude, 'e2e/**', 'src/db-tests/**'], + passWithNoTests: true, }, }) diff --git a/packages/types/entry.algolia.interface.ts b/packages/types/entry.algolia.interface.ts deleted file mode 100644 index 09bf6590e..000000000 --- a/packages/types/entry.algolia.interface.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { ActualDatabaseEntry } from './entry.interface'; - -export type AlgoliaEntry = Omit & LDAlgoliaFields; - -export interface LDAlgoliaFields { - objectID?: string; // Algolia object id = entry id - dictId?: string; // dictionary Id entry belongs to, to filter search results by dictionary - _highlightResult?: any; - - hasImage?: boolean; - hasAudio?: boolean; - hasVideo?: boolean; - hasSpeaker?: boolean; - hasSemanticDomain?: boolean; - hasPartOfSpeech?: boolean; - hasNounClass?: boolean; - hasPluralForm?: boolean; - - ua?: number; // in seconds - ca?: number; // in seconds -} - -// media timestamps needs converted to a timestamp usable by Algolia -// only need gcs value of photos -// need path and speakerName value for audio - pull from speakerId on import to Algolia diff --git a/packages/types/entry.interface.ts b/packages/types/entry.interface.ts index 914cbd49a..b4b442c28 100644 --- a/packages/types/entry.interface.ts +++ b/packages/types/entry.interface.ts @@ -1,116 +1,113 @@ -import type { Timestamp } from 'firebase/firestore'; -import type { IFirestoreMetaDataAbbreviated } from 'sveltefirets'; -import type { MultiString } from './gloss.interface'; -import type { IExampleSentence } from './exampe-sentence.interface'; -import type { GoalDatabaseAudio, ActualDatabaseAudio, ExpandedAudio } from './audio.interface'; -import type { GoalDatabasePhoto, ActualDatabasePhoto, ExpandedPhoto } from './photo.interface'; -import type { GoalDatabaseVideo, ActualDatabaseVideo, ExpandedVideo } from './video.interface'; -import type { LDAlgoliaFields } from './entry.algolia.interface'; -import type { Coordinates } from '.'; - -export type LDAlgoliaHit = ActualDatabaseEntry & LDAlgoliaFields; +import type { Timestamp } from 'firebase/firestore' +import type { IFirestoreMetaDataAbbreviated } from 'sveltefirets' +import type { MultiString } from './gloss.interface' +import type { IExampleSentence } from './exampe-sentence.interface' +import type { ActualDatabaseAudio, ExpandedAudio, GoalDatabaseAudio } from './audio.interface' +import type { ActualDatabasePhoto, ExpandedPhoto, GoalDatabasePhoto } from './photo.interface' +import type { ActualDatabaseVideo, ExpandedVideo, GoalDatabaseVideo } from './video.interface' +import type { Coordinates } from '.' export interface ExpandedEntry extends IFirestoreMetaDataAbbreviated { - lexeme?: string; - local_orthography_1?: string; - local_orthography_2?: string; - local_orthography_3?: string; - local_orthography_4?: string; - local_orthography_5?: string; - phonetic?: string; - sound_files?: ExpandedAudio[]; - senses?: ExpandedSense[]; - interlinearization?: string; - morphology?: string; - plural_form?: string; - variant?: string; - dialects?: string[]; - notes?: string; - sources?: string[]; - elicitation_id?: string; - deletedAt?: Timestamp; - importId?: string; // TODO: expand this also - scientific_names?: string[]; // italic by default but they can use and to define where italics show - coordinates?: Coordinates; + lexeme?: string + local_orthography_1?: string + local_orthography_2?: string + local_orthography_3?: string + local_orthography_4?: string + local_orthography_5?: string + phonetic?: string + sound_files?: ExpandedAudio[] + senses?: ExpandedSense[] + interlinearization?: string + morphology?: string + plural_form?: string + variant?: string + dialects?: string[] + notes?: string + sources?: string[] + elicitation_id?: string + deletedAt?: Timestamp + importId?: string // TODO: expand this also + scientific_names?: string[] // italic by default but they can use and to define where italics show + coordinates?: Coordinates } export interface ExpandedSense { - glosses?: MultiString; - parts_of_speech_keys?: string[]; - translated_parts_of_speech?: string[]; - ld_semantic_domains_keys?: string[]; - translated_ld_semantic_domains?: string[]; - write_in_semantic_domains?: string[]; - example_sentences?: IExampleSentence[]; - photo_files?: ExpandedPhoto[]; - video_files?: ExpandedVideo[]; - noun_class?: string; - definition_english?: string; + glosses?: MultiString + parts_of_speech_keys?: string[] + translated_parts_of_speech?: string[] + ld_semantic_domains_keys?: string[] + translated_ld_semantic_domains?: string[] + write_in_semantic_domains?: string[] + example_sentences?: IExampleSentence[] + photo_files?: ExpandedPhoto[] + video_files?: ExpandedVideo[] + noun_class?: string + definition_english?: string } export interface DatabaseSense { - gl?: MultiString; - ps?: string[]; // parts_of_speech - sdn?: string[]; // semantic domain number, simplified system modeled after SemDom (eg. 2.1.2.3) - sd?: string[]; // semantic domain strings, only using for custom semantic domains brought in from imports - xs?: IExampleSentence[]; - pfs?: GoalDatabasePhoto[]; - deletedPfs?: GoalDatabasePhoto[]; - vfs?: GoalDatabaseVideo[]; - deletedVfs?: GoalDatabaseVideo[]; - nc?: string; // noun_class - de?: string; // definition_english, only in Bahasa Lani (jaRhn6MAZim4Blvr1iEv) deprecated by Greg + gl?: MultiString + ps?: string[] // parts_of_speech + sdn?: string[] // semantic domain number, simplified system modeled after SemDom (eg. 2.1.2.3) + sd?: string[] // semantic domain strings, only using for custom semantic domains brought in from imports + xs?: IExampleSentence[] + pfs?: GoalDatabasePhoto[] + deletedPfs?: GoalDatabasePhoto[] + vfs?: GoalDatabaseVideo[] + deletedVfs?: GoalDatabaseVideo[] + nc?: string // noun_class + de?: string // definition_english, only in Bahasa Lani (jaRhn6MAZim4Blvr1iEv) deprecated by Greg } -export type ActualDatabaseEntry = Omit & DeprecatedEntry; +export type ActualDatabaseEntry = Omit & DeprecatedEntry export interface GoalDatabaseEntry extends IFirestoreMetaDataAbbreviated { - lx?: string; // lexeme - lo1?: string; // local_orthography_1 - lo2?: string; // local_orthography_2 - lo3?: string; // local_orthography_3 - lo4?: string; // local_orthography_4 - lo5?: string; // local_orthography_5 - ph?: string; // phonetic - sfs?: GoalDatabaseAudio[]; - deletedSfs?: GoalDatabaseAudio[]; // TODO sound files into here of subcollection when deleted - sn?: DatabaseSense[]; - in?: string; // interlinearization - mr?: string; // morphology - pl?: string; // plural_form - va?: string; // variant (currently DICTIONARIES_WITH_VARIANTS only) - di?: string[]; // dialects - nt?: string; // notes - sr?: string[]; // sources - ei?: string; // Elicitation Id for Munda languages or Swadesh Composite number list from Comparalex - deletedAt?: Timestamp; - ii?: string; // importId which can be used to show all entries from a particular import - scn?: string[]; // scientific_names - co?: Coordinates; + lx?: string // lexeme + lo1?: string // local_orthography_1 + lo2?: string // local_orthography_2 + lo3?: string // local_orthography_3 + lo4?: string // local_orthography_4 + lo5?: string // local_orthography_5 + ph?: string // phonetic + sfs?: GoalDatabaseAudio[] + deletedSfs?: GoalDatabaseAudio[] // TODO sound files into here of subcollection when deleted + sn?: DatabaseSense[] + in?: string // interlinearization + mr?: string // morphology + pl?: string // plural_form + va?: string // variant (currently DICTIONARIES_WITH_VARIANTS only) + di?: string[] // dialects + nt?: string // notes + sr?: string[] // sources + ei?: string // Elicitation Id for Munda languages or Swadesh Composite number list from Comparalex + deletedAt?: Timestamp + ii?: string // importId which can be used to show all entries from a particular import + scn?: string[] // scientific_names + co?: Coordinates } interface DeprecatedEntry extends Omit { // as deprecated fields are removed from the database we can continue to Omit them here until nothing more from DatabaseSense is left - lo?: string; // local_orthography_1 - sf?: ActualDatabaseAudio; // turned into array at sfs - di?: string | string[]; // turned into array + lo?: string // local_orthography_1 + sf?: ActualDatabaseAudio // turned into array at sfs + di?: string | string[] // turned into array sr?: string | string[] // some dictionaries, e.g. Kalanga, have just a string - scn?: string | string[]; // scientific_names - sd?: string | string[]; // old semantic domains from talking dictionaries site + scn?: string | string[] // scientific_names + sd?: string | string[] // old semantic domains from talking dictionaries site // placed into first sense - ps?: string | string[]; // parts_of_speech - pf?: ActualDatabasePhoto; // photo file - vfs?: ActualDatabaseVideo[]; // video files - xs?: IExampleSentence; - xv?: string; // example vernacular - used for old dictionary imports (deprecated) + ps?: string | string[] // parts_of_speech + pf?: ActualDatabasePhoto // photo file + vfs?: ActualDatabaseVideo[] // video files + xs?: IExampleSentence + xv?: string // example vernacular - used for old dictionary imports (deprecated) // old metadata - ab?: string; // addedBy - createdBy?: string; - updatedBy?: string; - createdAt?: Timestamp; - updatedAt?: Timestamp; + ab?: string // addedBy + createdBy?: string + updatedBy?: string + createdAt?: Timestamp + updatedAt?: Timestamp } // we can set up a nightly function to batch convert 1000 entries with deprecated fields in the database to the current format and then as fields get weeded out they can be removed from here // Note: entry.cb is "OTD" for entries that came from the Old Talking Dictionaries platform diff --git a/packages/types/index.ts b/packages/types/index.ts index d666d4231..390daf19e 100644 --- a/packages/types/index.ts +++ b/packages/types/index.ts @@ -1,24 +1,21 @@ -export type { ExpandedAudio, GoalDatabaseAudio, IAudio } from './audio.interface' -export type { ExpandedVideo, GoalDatabaseVideo, IVideo, IVideoCustomMetadata, HostedVideo } from './video.interface' -export type { IDialect } from './dialect.interface' +export type { EntryView, SenseWithSentences, AudioWithSpeakerIds } from './supabase/entry.interface' +export type { IVideoCustomMetadata, HostedVideo } from './video.interface' export type { IAbout, IDictionary, IGrammar, Citation, Partner } from './dictionary.interface' export type { Coordinates, IPoint, IRegion } from './coordinates.interface' -export type { ActualDatabaseEntry, ExpandedEntry, GoalDatabaseEntry, DatabaseSense, ExpandedSense, LDAlgoliaHit } from './entry.interface' export type { IGlossLanguages, IGlossLanguage } from './gloss-language.interface' export type { MultiString } from './gloss.interface' export type { IExampleSentence } from './exampe-sentence.interface' export type { IImport } from './import.interface' -export type { ExpandedPhoto, GoalDatabasePhoto, IPhoto, DictionaryPhoto, PartnerPhoto } from './photo.interface' +export type { DictionaryPhoto, PartnerPhoto } from './photo.interface' export type { ISemanticDomain } from './semantic-domain.interface' -export type { ISpeaker } from './speaker.interface' -export type { IUser } from './user.interface' +export type { IUser, GoogleAuthUserMetaData } from './user.interface' export type { IInvite } from './invite.interface' export type { IDictionarySettings } from './dictionary-settings.interface' export type { IPartOfSpeech } from './part-of-speech.interface' export type { IColumn } from './column.interface' export type { HelperRoles, IHelper } from './helper.interface' -export type { AlgoliaEntry } from './entry.algolia.interface' export { type IPrintFields, StandardPrintFields } from './print-entry.interface' export { EntryFields, type EntryFieldValue, type i18nEntryFieldKey } from './entry-fields.enum' export type { ContentUpdateRequestBody } from './supabase/content-update.interface' export type { UnsupportedFields } from './supabase/unsupported.interface' +export type { Database, Tables, TablesInsert, TablesUpdate } from './supabase/combined.types' diff --git a/packages/types/package.json b/packages/types/package.json index 0e1bdf100..9a9d496a3 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,20 +1,22 @@ { "name": "@living-dictionaries/types", + "type": "module", "version": "1.0.0", "description": "Types for Living Dictionaries", - "type": "module", - "main": "index.ts", - "devDependencies": { - "firebase": "^10.9.0", - "sveltefirets": "0.0.42" - }, + "author": "Living Tongues Institute for Endangered Languages", + "homepage": "https://github.com/livingtongues/living-dictionaries#readme", "repository": { "type": "git", "url": "git+https://github.com/livingtongues/living-dictionaries.git" }, - "author": "Living Tongues Institute for Endangered Languages", "bugs": { "url": "https://github.com/livingtongues/living-dictionaries/issues" }, - "homepage": "https://github.com/livingtongues/living-dictionaries#readme" -} \ No newline at end of file + "main": "index.ts", + "devDependencies": { + "firebase": "^10.9.0", + "sveltefirets": "0.0.42", + "typescript": "^5.6.2", + "vitest": "^2.1.3" + } +} diff --git a/packages/types/print-entry.interface.ts b/packages/types/print-entry.interface.ts index 5a8006739..c3dd74a19 100644 --- a/packages/types/print-entry.interface.ts +++ b/packages/types/print-entry.interface.ts @@ -1,6 +1,6 @@ // these values are never used - this could be simplified to not use enums -enum CustomPrintFields { +enum _CustomPrintFields { // lexeme always shows gloss = 'Glosses', local_orthography = 'Alternate Orthographies', // lo, lo2, lo3, lo4, lo5 @@ -15,7 +15,7 @@ enum CustomPrintFields { // displayed with labels, no custom logic export enum StandardPrintFields { - semantic_domains = 'Semantic Domains', // sdn || sd + semantic_domains = 'Semantic Domains', interlinearization = 'Interlinearization', morphology = 'Morphology', plural_form = 'Plural Form', @@ -25,8 +25,8 @@ export enum StandardPrintFields { notes = 'Notes', } -type PrintFieldKeys = keyof typeof CustomPrintFields | keyof typeof StandardPrintFields; +type PrintFieldKeys = keyof typeof _CustomPrintFields | keyof typeof StandardPrintFields export type IPrintFields = { [key in PrintFieldKeys]?: boolean; -}; +} diff --git a/packages/types/speaker.interface.ts b/packages/types/speaker.interface.ts index 9767d4847..2472da9da 100644 --- a/packages/types/speaker.interface.ts +++ b/packages/types/speaker.interface.ts @@ -1,11 +1,11 @@ -import type { IFirestoreMetaData } from 'sveltefirets'; +import type { IFirestoreMetaData } from 'sveltefirets' export interface ISpeaker extends IFirestoreMetaData { - displayName: string; - uid?: string; // matches uid of signed-up user if they also have an account - decade?: number; // used to be a string - refactor in database - gender?: 'm' | 'f' | 'o'; - birthplace?: string; - contributingTo?: string[]; // array of dictionaryIDs - photoURL?: string; + displayName: string + uid?: string // matches uid of signed-up user if they also have an account + decade?: string | number // used to be a string - refactor in database + gender?: 'm' | 'f' | 'o' + birthplace?: string + contributingTo?: string[] // array of dictionaryIDs + // photoURL?: string; } diff --git a/packages/types/supabase/augments.types.ts b/packages/types/supabase/augments.types.ts new file mode 100644 index 000000000..aed372781 --- /dev/null +++ b/packages/types/supabase/augments.types.ts @@ -0,0 +1,175 @@ +import type { MultiString } from '../gloss.interface' +import type { Coordinates } from '../coordinates.interface' +import type { DictionaryPhoto } from '../photo.interface' +import type { HostedVideo, UnsupportedFields } from '../.' +import type { Change } from './content-update.interface' +import type { AudioWithSpeakerIds, EntryMainFields, SenseWithSentences } from './entry.interface' + +export interface DatabaseAugments { + public: { + Tables: { + content_updates: { + Row: { + change: Change + table: string | null + } + Insert: { + change: Change + table?: string | null + } + Update: { + change?: Change + table?: string | null + } + } + dialects: { + Row: { + name: MultiString + } + Insert: { + name: MultiString + } + Update: { + name: MultiString + } + } + dictionaries: { + Row: { + coordinates: Coordinates | null + featured_image: DictionaryPhoto | null + metadata: Record | null + orthographies: any[] | null + } + Insert: { + coordinates?: Coordinates | null + featured_image?: DictionaryPhoto | null + metadata?: Record | null + orthographies?: any[] | null + } + Update: { + coordinates?: Coordinates | null + featured_image?: DictionaryPhoto | null + metadata?: Record | null + orthographies?: any[] | null + } + } + entries: { + Row: { + coordinates: Coordinates | null + lexeme: MultiString + notes: MultiString | null + unsupported_fields: UnsupportedFields | null + } + Insert: { + coordinates?: Coordinates | null + lexeme: MultiString + notes?: MultiString | null + unsupported_fields?: UnsupportedFields | null + } + Update: { + coordinates?: Coordinates | null + lexeme?: MultiString + notes?: MultiString | null + unsupported_fields?: UnsupportedFields | null + } + } + senses: { + Row: { + definition: MultiString | null + glosses: MultiString | null + plural_form: MultiString | null + variant: MultiString | null + } + Insert: { + definition?: MultiString | null + glosses?: MultiString | null + plural_form?: MultiString | null + variant?: MultiString | null + } + Update: { + definition?: MultiString | null + glosses?: MultiString | null + plural_form?: MultiString | null + variant?: MultiString | null + } + } + sentences: { + Row: { + text: MultiString | null + translation: MultiString | null + } + Insert: { + text?: MultiString | null + translation?: MultiString | null + } + Update: { + text?: MultiString | null + translation?: MultiString | null + } + } + texts: { + Row: { + sentences: MultiString + title: MultiString + } + Insert: { + sentences: MultiString + title: MultiString + } + Update: { + sentences?: MultiString + title?: MultiString + } + } + videos: { + Row: { + hosted_elsewhere: HostedVideo | null + } + Insert: { + hosted_elsewhere?: HostedVideo | null + } + Update: { + hosted_elsewhere?: HostedVideo | null + } + } + } + Views: { + entries_view: { + Row: { + main: EntryMainFields + senses: SenseWithSentences[] | null + audios: AudioWithSpeakerIds[] | null + dialect_ids: string[] | null + } + } + materialized_entries_view: { + Row: { + main: EntryMainFields + senses: SenseWithSentences[] | null + audios: AudioWithSpeakerIds[] | null + dialect_ids: string[] | null + } + } + videos_view: { + Row: { + hosted_elsewhere: HostedVideo | null + speaker_ids: string[] | null + } + } + } + Functions: { + entries_from_timestamp: { + Args: { + get_newer_than: string + dict_id: string + } + Returns: { + main: EntryMainFields + senses: SenseWithSentences[] | null + audios: AudioWithSpeakerIds[] | null + dialect_ids: string[] | null + } + } + } + } +} diff --git a/packages/types/supabase/combined.types.ts b/packages/types/supabase/combined.types.ts new file mode 100644 index 000000000..caa0be9c5 --- /dev/null +++ b/packages/types/supabase/combined.types.ts @@ -0,0 +1,2199 @@ +import type { MultiString } from '../gloss.interface' +import type { Coordinates } from '../coordinates.interface' +import type { DictionaryPhoto } from '../photo.interface' +import type { HostedVideo, UnsupportedFields } from '../.' +import type { Change } from './content-update.interface' +import type { AudioWithSpeakerIds, EntryMainFields, SenseWithSentences } from './entry.interface' + +export interface Database { + public: { + Tables: { + audio: { + Row: { + created_at: string + created_by: string + deleted: string | null + dictionary_id: string + entry_id: string | null + id: string + sentence_id: string | null + source: string | null + storage_path: string + text_id: string | null + updated_at: string + updated_by: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + dictionary_id: string + entry_id?: string | null + id?: string + sentence_id?: string | null + source?: string | null + storage_path: string + text_id?: string | null + updated_at?: string + updated_by: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + dictionary_id?: string + entry_id?: string | null + id?: string + sentence_id?: string | null + source?: string | null + storage_path?: string + text_id?: string | null + updated_at?: string + updated_by?: string + } + Relationships: [ + { + foreignKeyName: 'audio_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'audio_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'audio_dictionary_id_fkey' + columns: [ + 'dictionary_id', + ] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'audio_entry_id_fkey' + columns: [ + 'entry_id', + ] + isOneToOne: false + referencedRelation: 'entries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'audio_entry_id_fkey' + columns: [ + 'entry_id', + ] + isOneToOne: false + referencedRelation: 'entries_view' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'audio_sentence_id_fkey' + columns: [ + 'sentence_id', + ] + isOneToOne: false + referencedRelation: 'sentences' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'audio_text_id_fkey' + columns: [ + 'text_id', + ] + isOneToOne: false + referencedRelation: 'texts' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'audio_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'audio_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + ] + } + audio_speakers: { + Row: { + audio_id: string + created_at: string + created_by: string + deleted: string | null + speaker_id: string + } + Insert: { + audio_id: string + created_at?: string + created_by: string + deleted?: string | null + speaker_id: string + } + Update: { + audio_id?: string + created_at?: string + created_by?: string + deleted?: string | null + speaker_id?: string + } + Relationships: [ + { + foreignKeyName: 'audio_speakers_audio_id_fkey' + columns: [ + 'audio_id', + ] + isOneToOne: false + referencedRelation: 'audio' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'audio_speakers_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'audio_speakers_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'audio_speakers_speaker_id_fkey' + columns: [ + 'speaker_id', + ] + isOneToOne: false + referencedRelation: 'speakers' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'audio_speakers_speaker_id_fkey' + columns: [ + 'speaker_id', + ] + isOneToOne: false + referencedRelation: 'speakers_view' + referencedColumns: [ + 'id', + ] + }, + ] + } + content_updates: { + Row: { + audio_id: string | null + change: Change + dialect_id: string | null + dictionary_id: string + entry_id: string | null + id: string + import_id: string | null + photo_id: string | null + sense_id: string | null + sentence_id: string | null + speaker_id: string | null + table: string | null + text_id: string | null + timestamp: string + user_id: string + video_id: string | null + } + Insert: { + audio_id?: string | null + change: Change + dialect_id?: string | null + dictionary_id: string + entry_id?: string | null + id: string + import_id?: string | null + photo_id?: string | null + sense_id?: string | null + sentence_id?: string | null + speaker_id?: string | null + table?: string | null + text_id?: string | null + timestamp?: string + user_id?: string + video_id?: string | null + } + Update: { + audio_id?: string | null + change?: Change + dialect_id?: string | null + dictionary_id?: string + entry_id?: string | null + id?: string + import_id?: string | null + photo_id?: string | null + sense_id?: string | null + sentence_id?: string | null + speaker_id?: string | null + table?: string | null + text_id?: string | null + timestamp?: string + user_id?: string + video_id?: string | null + } + Relationships: [ + { + foreignKeyName: 'content_updates_audio_id_fkey' + columns: [ + 'audio_id', + ] + isOneToOne: false + referencedRelation: 'audio' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_dialect_id_fkey' + columns: [ + 'dialect_id', + ] + isOneToOne: false + referencedRelation: 'dialects' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_dictionary_id_fkey' + columns: [ + 'dictionary_id', + ] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_entry_id_fkey' + columns: [ + 'entry_id', + ] + isOneToOne: false + referencedRelation: 'entries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_entry_id_fkey' + columns: [ + 'entry_id', + ] + isOneToOne: false + referencedRelation: 'entries_view' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_photo_id_fkey' + columns: [ + 'photo_id', + ] + isOneToOne: false + referencedRelation: 'photos' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_sense_id_fkey' + columns: [ + 'sense_id', + ] + isOneToOne: false + referencedRelation: 'senses' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_sentence_id_fkey' + columns: [ + 'sentence_id', + ] + isOneToOne: false + referencedRelation: 'sentences' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_speaker_id_fkey' + columns: [ + 'speaker_id', + ] + isOneToOne: false + referencedRelation: 'speakers' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_speaker_id_fkey' + columns: [ + 'speaker_id', + ] + isOneToOne: false + referencedRelation: 'speakers_view' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_text_id_fkey' + columns: [ + 'text_id', + ] + isOneToOne: false + referencedRelation: 'texts' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_user_id_fkey' + columns: [ + 'user_id', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_user_id_fkey' + columns: [ + 'user_id', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_video_id_fkey' + columns: [ + 'video_id', + ] + isOneToOne: false + referencedRelation: 'videos' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'content_updates_video_id_fkey' + columns: [ + 'video_id', + ] + isOneToOne: false + referencedRelation: 'videos_view' + referencedColumns: [ + 'id', + ] + }, + ] + } + dialects: { + Row: { + created_at: string + created_by: string + deleted: string | null + dictionary_id: string + id: string + name: MultiString + updated_at: string + updated_by: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + dictionary_id: string + id: string + name: MultiString + updated_at?: string + updated_by: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + dictionary_id?: string + id?: string + name?: MultiString + updated_at?: string + updated_by?: string + } + Relationships: [ + { + foreignKeyName: 'dialects_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'dialects_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'dialects_dictionary_id_fkey' + columns: [ + 'dictionary_id', + ] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'dialects_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'dialects_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + ] + } + dictionaries: { + Row: { + alternate_names: string[] | null + author_connection: string | null + community_permission: Database['public']['Enums']['certainty'] | null + con_language_description: string | null + coordinates: Coordinates | null + copyright: string | null + created_at: string + created_by: string + deleted: string | null + featured_image: DictionaryPhoto | null + gloss_languages: string[] | null + glottocode: string | null + hide_living_tongues_logo: boolean | null + id: string + iso_639_3: string | null + language_used_by_community: boolean | null + location: string | null + metadata: Record | null + name: string + orthographies: any[] | null + print_access: boolean | null + public: boolean + updated_at: string + updated_by: string + } + Insert: { + alternate_names?: string[] | null + author_connection?: string | null + community_permission?: Database['public']['Enums']['certainty'] | null + con_language_description?: string | null + coordinates?: Coordinates | null + copyright?: string | null + created_at?: string + created_by: string + deleted?: string | null + featured_image?: DictionaryPhoto | null + gloss_languages?: string[] | null + glottocode?: string | null + hide_living_tongues_logo?: boolean | null + id: string + iso_639_3?: string | null + language_used_by_community?: boolean | null + location?: string | null + metadata?: Record | null + name: string + orthographies?: any[] | null + print_access?: boolean | null + public?: boolean + updated_at?: string + updated_by: string + } + Update: { + alternate_names?: string[] | null + author_connection?: string | null + community_permission?: Database['public']['Enums']['certainty'] | null + con_language_description?: string | null + coordinates?: Coordinates | null + copyright?: string | null + created_at?: string + created_by?: string + deleted?: string | null + featured_image?: DictionaryPhoto | null + gloss_languages?: string[] | null + glottocode?: string | null + hide_living_tongues_logo?: boolean | null + id?: string + iso_639_3?: string | null + language_used_by_community?: boolean | null + location?: string | null + metadata?: Record | null + name?: string + orthographies?: any[] | null + print_access?: boolean | null + public?: boolean + updated_at?: string + updated_by?: string + } + Relationships: [ + { + foreignKeyName: 'dictionaries_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'dictionaries_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'dictionaries_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'dictionaries_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + ] + } + entries: { + Row: { + coordinates: Coordinates | null + created_at: string + created_by: string + deleted: string | null + dictionary_id: string + elicitation_id: string | null + id: string + interlinearization: string | null + lexeme: MultiString + morphology: string | null + notes: MultiString | null + phonetic: string | null + scientific_names: string[] | null + sources: string[] | null + unsupported_fields: UnsupportedFields | null + updated_at: string + updated_by: string + } + Insert: { + coordinates?: Coordinates | null + created_at?: string + created_by: string + deleted?: string | null + dictionary_id: string + elicitation_id?: string | null + id: string + interlinearization?: string | null + lexeme: MultiString + morphology?: string | null + notes?: MultiString | null + phonetic?: string | null + scientific_names?: string[] | null + sources?: string[] | null + unsupported_fields?: UnsupportedFields | null + updated_at?: string + updated_by: string + } + Update: { + coordinates?: Coordinates | null + created_at?: string + created_by?: string + deleted?: string | null + dictionary_id?: string + elicitation_id?: string | null + id?: string + interlinearization?: string | null + lexeme?: MultiString + morphology?: string | null + notes?: MultiString | null + phonetic?: string | null + scientific_names?: string[] | null + sources?: string[] | null + unsupported_fields?: UnsupportedFields | null + updated_at?: string + updated_by?: string + } + Relationships: [ + { + foreignKeyName: 'entries_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'entries_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'entries_dictionary_id_fkey' + columns: [ + 'dictionary_id', + ] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'entries_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'entries_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + ] + } + entry_dialects: { + Row: { + created_at: string + created_by: string + deleted: string | null + dialect_id: string + entry_id: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + dialect_id: string + entry_id: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + dialect_id?: string + entry_id?: string + } + Relationships: [ + { + foreignKeyName: 'entry_dialects_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'entry_dialects_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'entry_dialects_dialect_id_fkey' + columns: [ + 'dialect_id', + ] + isOneToOne: false + referencedRelation: 'dialects' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'entry_dialects_entry_id_fkey' + columns: [ + 'entry_id', + ] + isOneToOne: false + referencedRelation: 'entries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'entry_dialects_entry_id_fkey' + columns: [ + 'entry_id', + ] + isOneToOne: false + referencedRelation: 'entries_view' + referencedColumns: [ + 'id', + ] + }, + ] + } + entry_updates: { + Row: { + column: Database['public']['Enums']['entry_columns'] + dictionary_id: string + entry_id: string + id: string + new_value: string | null + old_value: string | null + row: string + table: Database['public']['Enums']['entry_tables'] + timestamp: string + user_id: string + } + Insert: { + column: Database['public']['Enums']['entry_columns'] + dictionary_id: string + entry_id: string + id: string + new_value?: string | null + old_value?: string | null + row: string + table: Database['public']['Enums']['entry_tables'] + timestamp?: string + user_id: string + } + Update: { + column?: Database['public']['Enums']['entry_columns'] + dictionary_id?: string + entry_id?: string + id?: string + new_value?: string | null + old_value?: string | null + row?: string + table?: Database['public']['Enums']['entry_tables'] + timestamp?: string + user_id?: string + } + Relationships: [ + ] + } + photos: { + Row: { + created_at: string + created_by: string + deleted: string | null + dictionary_id: string + id: string + photographer: string | null + serving_url: string + source: string | null + storage_path: string + updated_at: string + updated_by: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + dictionary_id: string + id?: string + photographer?: string | null + serving_url: string + source?: string | null + storage_path: string + updated_at?: string + updated_by: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + dictionary_id?: string + id?: string + photographer?: string | null + serving_url?: string + source?: string | null + storage_path?: string + updated_at?: string + updated_by?: string + } + Relationships: [ + { + foreignKeyName: 'photos_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'photos_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'photos_dictionary_id_fkey' + columns: [ + 'dictionary_id', + ] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'photos_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'photos_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + ] + } + sense_photos: { + Row: { + created_at: string + created_by: string + deleted: string | null + photo_id: string + sense_id: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + photo_id: string + sense_id: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + photo_id?: string + sense_id?: string + } + Relationships: [ + { + foreignKeyName: 'sense_photos_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sense_photos_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sense_photos_photo_id_fkey' + columns: [ + 'photo_id', + ] + isOneToOne: false + referencedRelation: 'photos' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sense_photos_sense_id_fkey' + columns: [ + 'sense_id', + ] + isOneToOne: false + referencedRelation: 'senses' + referencedColumns: [ + 'id', + ] + }, + ] + } + sense_videos: { + Row: { + created_at: string + created_by: string + deleted: string | null + sense_id: string + video_id: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + sense_id: string + video_id: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + sense_id?: string + video_id?: string + } + Relationships: [ + { + foreignKeyName: 'sense_videos_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sense_videos_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sense_videos_sense_id_fkey' + columns: [ + 'sense_id', + ] + isOneToOne: false + referencedRelation: 'senses' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sense_videos_video_id_fkey' + columns: [ + 'video_id', + ] + isOneToOne: false + referencedRelation: 'videos' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sense_videos_video_id_fkey' + columns: [ + 'video_id', + ] + isOneToOne: false + referencedRelation: 'videos_view' + referencedColumns: [ + 'id', + ] + }, + ] + } + senses: { + Row: { + created_at: string + created_by: string + definition: MultiString | null + deleted: string | null + entry_id: string + glosses: MultiString | null + id: string + noun_class: string | null + parts_of_speech: string[] | null + plural_form: MultiString | null + semantic_domains: string[] | null + updated_at: string + updated_by: string + variant: MultiString | null + write_in_semantic_domains: string[] | null + } + Insert: { + created_at?: string + created_by: string + definition?: MultiString | null + deleted?: string | null + entry_id: string + glosses?: MultiString | null + id: string + noun_class?: string | null + parts_of_speech?: string[] | null + plural_form?: MultiString | null + semantic_domains?: string[] | null + updated_at?: string + updated_by: string + variant?: MultiString | null + write_in_semantic_domains?: string[] | null + } + Update: { + created_at?: string + created_by?: string + definition?: MultiString | null + deleted?: string | null + entry_id?: string + glosses?: MultiString | null + id?: string + noun_class?: string | null + parts_of_speech?: string[] | null + plural_form?: MultiString | null + semantic_domains?: string[] | null + updated_at?: string + updated_by?: string + variant?: MultiString | null + write_in_semantic_domains?: string[] | null + } + Relationships: [ + { + foreignKeyName: 'foreign_key_entries' + columns: [ + 'entry_id', + ] + isOneToOne: false + referencedRelation: 'entries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'foreign_key_entries' + columns: [ + 'entry_id', + ] + isOneToOne: false + referencedRelation: 'entries_view' + referencedColumns: [ + 'id', + ] + }, + ] + } + senses_in_sentences: { + Row: { + created_at: string + created_by: string + deleted: string | null + sense_id: string + sentence_id: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + sense_id: string + sentence_id: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + sense_id?: string + sentence_id?: string + } + Relationships: [ + { + foreignKeyName: 'senses_in_sentences_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'senses_in_sentences_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'senses_in_sentences_sense_id_fkey' + columns: [ + 'sense_id', + ] + isOneToOne: false + referencedRelation: 'senses' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'senses_in_sentences_sentence_id_fkey' + columns: [ + 'sentence_id', + ] + isOneToOne: false + referencedRelation: 'sentences' + referencedColumns: [ + 'id', + ] + }, + ] + } + sentence_photos: { + Row: { + created_at: string + created_by: string + deleted: string | null + photo_id: string + sentence_id: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + photo_id: string + sentence_id: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + photo_id?: string + sentence_id?: string + } + Relationships: [ + { + foreignKeyName: 'sentence_photos_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sentence_photos_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sentence_photos_photo_id_fkey' + columns: [ + 'photo_id', + ] + isOneToOne: false + referencedRelation: 'photos' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sentence_photos_sentence_id_fkey' + columns: [ + 'sentence_id', + ] + isOneToOne: false + referencedRelation: 'sentences' + referencedColumns: [ + 'id', + ] + }, + ] + } + sentence_videos: { + Row: { + created_at: string + created_by: string + deleted: string | null + sentence_id: string + video_id: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + sentence_id: string + video_id: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + sentence_id?: string + video_id?: string + } + Relationships: [ + { + foreignKeyName: 'sentence_videos_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sentence_videos_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sentence_videos_sentence_id_fkey' + columns: [ + 'sentence_id', + ] + isOneToOne: false + referencedRelation: 'sentences' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sentence_videos_video_id_fkey' + columns: [ + 'video_id', + ] + isOneToOne: false + referencedRelation: 'videos' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sentence_videos_video_id_fkey' + columns: [ + 'video_id', + ] + isOneToOne: false + referencedRelation: 'videos_view' + referencedColumns: [ + 'id', + ] + }, + ] + } + sentences: { + Row: { + created_at: string + created_by: string + deleted: string | null + dictionary_id: string + id: string + text: MultiString | null + text_id: string | null + translation: MultiString | null + updated_at: string + updated_by: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + dictionary_id: string + id: string + text?: MultiString | null + text_id?: string | null + translation?: MultiString | null + updated_at?: string + updated_by: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + dictionary_id?: string + id?: string + text?: MultiString | null + text_id?: string | null + translation?: MultiString | null + updated_at?: string + updated_by?: string + } + Relationships: [ + { + foreignKeyName: 'sentences_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sentences_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sentences_dictionary_id_fkey' + columns: [ + 'dictionary_id', + ] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sentences_text_id_fkey' + columns: [ + 'text_id', + ] + isOneToOne: false + referencedRelation: 'texts' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sentences_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'sentences_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + ] + } + speakers: { + Row: { + birthplace: string | null + created_at: string + created_by: string + decade: number | null + deleted: string | null + dictionary_id: string + gender: Database['public']['Enums']['gender'] | null + id: string + name: string + updated_at: string + updated_by: string + user_id: string | null + } + Insert: { + birthplace?: string | null + created_at?: string + created_by: string + decade?: number | null + deleted?: string | null + dictionary_id: string + gender?: Database['public']['Enums']['gender'] | null + id?: string + name: string + updated_at?: string + updated_by: string + user_id?: string | null + } + Update: { + birthplace?: string | null + created_at?: string + created_by?: string + decade?: number | null + deleted?: string | null + dictionary_id?: string + gender?: Database['public']['Enums']['gender'] | null + id?: string + name?: string + updated_at?: string + updated_by?: string + user_id?: string | null + } + Relationships: [ + { + foreignKeyName: 'speakers_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'speakers_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'speakers_dictionary_id_fkey' + columns: [ + 'dictionary_id', + ] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'speakers_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'speakers_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'speakers_user_id_fkey' + columns: [ + 'user_id', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'speakers_user_id_fkey' + columns: [ + 'user_id', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + ] + } + texts: { + Row: { + created_at: string + created_by: string + deleted: string | null + dictionary_id: string + id: string + sentences: MultiString + title: MultiString + updated_at: string + updated_by: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + dictionary_id: string + id: string + sentences: MultiString + title: MultiString + updated_at?: string + updated_by: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + dictionary_id?: string + id?: string + sentences?: MultiString + title?: MultiString + updated_at?: string + updated_by?: string + } + Relationships: [ + { + foreignKeyName: 'texts_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'texts_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'texts_dictionary_id_fkey' + columns: [ + 'dictionary_id', + ] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'texts_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'texts_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + ] + } + video_speakers: { + Row: { + created_at: string + created_by: string + deleted: string | null + speaker_id: string + video_id: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + speaker_id: string + video_id: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + speaker_id?: string + video_id?: string + } + Relationships: [ + { + foreignKeyName: 'video_speakers_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'video_speakers_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'video_speakers_speaker_id_fkey' + columns: [ + 'speaker_id', + ] + isOneToOne: false + referencedRelation: 'speakers' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'video_speakers_speaker_id_fkey' + columns: [ + 'speaker_id', + ] + isOneToOne: false + referencedRelation: 'speakers_view' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'video_speakers_video_id_fkey' + columns: [ + 'video_id', + ] + isOneToOne: false + referencedRelation: 'videos' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'video_speakers_video_id_fkey' + columns: [ + 'video_id', + ] + isOneToOne: false + referencedRelation: 'videos_view' + referencedColumns: [ + 'id', + ] + }, + ] + } + videos: { + Row: { + created_at: string + created_by: string + deleted: string | null + dictionary_id: string + hosted_elsewhere: HostedVideo | null + id: string + source: string | null + storage_path: string | null + text_id: string | null + updated_at: string + updated_by: string + videographer: string | null + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + dictionary_id: string + hosted_elsewhere?: HostedVideo | null + id?: string + source?: string | null + storage_path?: string | null + text_id?: string | null + updated_at?: string + updated_by: string + videographer?: string | null + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + dictionary_id?: string + hosted_elsewhere?: HostedVideo | null + id?: string + source?: string | null + storage_path?: string | null + text_id?: string | null + updated_at?: string + updated_by?: string + videographer?: string | null + } + Relationships: [ + { + foreignKeyName: 'videos_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'videos_created_by_fkey' + columns: [ + 'created_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'videos_dictionary_id_fkey' + columns: [ + 'dictionary_id', + ] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'videos_text_id_fkey' + columns: [ + 'text_id', + ] + isOneToOne: false + referencedRelation: 'texts' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'videos_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'videos_updated_by_fkey' + columns: [ + 'updated_by', + ] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: [ + 'id', + ] + }, + ] + } + } + Views: { + entries_view: { + Row: { + audios: AudioWithSpeakerIds[] | null + created_at: string | null + deleted: string | null + dialect_ids: string[] | null + dictionary_id: string | null + id: string | null + main: EntryMainFields + senses: SenseWithSentences[] | null + updated_at: string | null + } + Relationships: [ + { + foreignKeyName: 'entries_dictionary_id_fkey' + columns: [ + 'dictionary_id', + ] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: [ + 'id', + ] + }, + ] + } + materialized_entries_view: { + Row: { + audios: AudioWithSpeakerIds[] | null + created_at: string | null + deleted: string | null + dialect_ids: string[] | null + dictionary_id: string | null + id: string | null + main: EntryMainFields + senses: SenseWithSentences[] | null + updated_at: string | null + } + Relationships: [ + ] + } + speakers_view: { + Row: { + birthplace: string | null + created_at: string | null + decade: number | null + deleted: string | null + dictionary_id: string | null + gender: Database['public']['Enums']['gender'] | null + id: string | null + name: string | null + updated_at: string | null + } + Insert: { + birthplace?: string | null + created_at?: string | null + decade?: number | null + deleted?: string | null + dictionary_id?: string | null + gender?: Database['public']['Enums']['gender'] | null + id?: string | null + name?: string | null + updated_at?: string | null + } + Update: { + birthplace?: string | null + created_at?: string | null + decade?: number | null + deleted?: string | null + dictionary_id?: string | null + gender?: Database['public']['Enums']['gender'] | null + id?: string | null + name?: string | null + updated_at?: string | null + } + Relationships: [ + { + foreignKeyName: 'speakers_dictionary_id_fkey' + columns: [ + 'dictionary_id', + ] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: [ + 'id', + ] + }, + ] + } + user_emails: { + Row: { + created_at: string | null + email: string | null + id: string | null + last_sign_in_at: string | null + } + Insert: { + created_at?: string | null + email?: string | null + id?: string | null + last_sign_in_at?: string | null + } + Update: { + created_at?: string | null + email?: string | null + id?: string | null + last_sign_in_at?: string | null + } + Relationships: [ + ] + } + videos_view: { + Row: { + created_at: string | null + deleted: string | null + dictionary_id: string | null + hosted_elsewhere: HostedVideo | null + id: string | null + source: string | null + speaker_ids: string[] | null + storage_path: string | null + text_id: string | null + updated_at: string | null + videographer: string | null + } + Relationships: [ + { + foreignKeyName: 'videos_dictionary_id_fkey' + columns: [ + 'dictionary_id', + ] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: [ + 'id', + ] + }, + { + foreignKeyName: 'videos_text_id_fkey' + columns: [ + 'text_id', + ] + isOneToOne: false + referencedRelation: 'texts' + referencedColumns: [ + 'id', + ] + }, + ] + } + } + Functions: { + entries_from_timestamp: { + Args: { + get_newer_than: string + dict_id: string + } + Returns: { + id: string + dictionary_id: string + created_at: string + updated_at: string + deleted: string + main: EntryMainFields + senses: SenseWithSentences[] | null + audios: AudioWithSpeakerIds[] | null + dialect_ids: string[] | null + }[] + } + } + Enums: { + certainty: 'yes' | 'no' | 'unknown' + content_tables: 'entries' | 'senses' | 'sentences' | 'senses_in_sentences' | 'texts' | 'audio' | 'video' | 'photo' | 'speakers' | 'audio_speakers' | 'video_speakers' | 'sense_videos' | 'sentence_videos' | 'sense_photos' | 'sentence_photos' + entry_columns: 'deleted' | 'glosses' | 'parts_of_speech' | 'semantic_domains' | 'write_in_semantic_domains' | 'noun_class' | 'definition' + entry_tables: 'senses' + gender: 'm' | 'f' | 'o' + } + CompositeTypes: { + [_ in never]: never; + } + } +} +export type Tables = PublicTableNameOrOptions extends { + schema: keyof Database + } ? (Database[PublicTableNameOrOptions['schema']]['Tables'] & Database[PublicTableNameOrOptions['schema']]['Views'])[TableName] extends { + Row: infer R + } ? R : never : PublicTableNameOrOptions extends keyof (Database['public']['Tables'] & Database['public']['Views']) ? (Database['public']['Tables'] & Database['public']['Views'])[PublicTableNameOrOptions] extends { + Row: infer R + } ? R : never : never +export type TablesInsert = PublicTableNameOrOptions extends { + schema: keyof Database + } ? Database[PublicTableNameOrOptions['schema']]['Tables'][TableName] extends { + Insert: infer I + } ? I : never : PublicTableNameOrOptions extends keyof Database['public']['Tables'] ? Database['public']['Tables'][PublicTableNameOrOptions] extends { + Insert: infer I + } ? I : never : never +export type TablesUpdate = PublicTableNameOrOptions extends { + schema: keyof Database + } ? Database[PublicTableNameOrOptions['schema']]['Tables'][TableName] extends { + Update: infer U + } ? U : never : PublicTableNameOrOptions extends keyof Database['public']['Tables'] ? Database['public']['Tables'][PublicTableNameOrOptions] extends { + Update: infer U + } ? U : never : never +export type Enums = PublicEnumNameOrOptions extends { + schema: keyof Database + } ? Database[PublicEnumNameOrOptions['schema']]['Enums'][EnumName] : PublicEnumNameOrOptions extends keyof Database['public']['Enums'] ? Database['public']['Enums'][PublicEnumNameOrOptions] : never diff --git a/packages/types/supabase/content-import.interface.ts b/packages/types/supabase/content-import.interface.ts new file mode 100644 index 000000000..dbceb6753 --- /dev/null +++ b/packages/types/supabase/content-import.interface.ts @@ -0,0 +1,103 @@ +import type { TablesInsert } from './combined.types' + +export interface Change { + type: string + data: Record +} + +export type ContentImportBody = + | Insert_Entry + | Insert_Sense + | Upsert_Audio + | Insert_Photo + | Insert_Video + | Upsert_Speaker + | Assign_Speaker + | Insert_Dialect + | Assign_Dialect + | Insert_Sentence + +interface ContentUpdateBase { + update_id: string // id of the change, a uuidv4 created on client to make things idempotent + auth_token: string + dictionary_id: string + import_id: string +} + +interface Insert_Entry extends ContentUpdateBase { + type: 'insert_entry' + data: Omit, 'dictionary_id' | 'id'> + entry_id: string +} + +interface Insert_Dialect extends ContentUpdateBase { + type: 'insert_dialect' + data: Omit, 'updated_by' | 'dictionary_id' | 'id'> + dialect_id: string +} + +interface Assign_Dialect extends ContentUpdateBase { + type: 'assign_dialect' + data: { created_by: string, created_at: string } + dialect_id: string + entry_id: string +} + +interface Upsert_Speaker extends ContentUpdateBase { + type: 'upsert_speaker' + data: Omit, 'updated_by' | 'dictionary_id' | 'id'> + speaker_id: string +} + +interface Assign_Speaker_Base extends ContentUpdateBase { + type: 'assign_speaker' + data: { created_by: string, created_at: string } + speaker_id: string +} + +interface Assign_Speaker_With_Audio extends Assign_Speaker_Base { + audio_id: string + video_id?: never +} + +interface Assign_Speaker_With_Video extends Assign_Speaker_Base { + video_id: string + audio_id?: never +} + +type Assign_Speaker = Assign_Speaker_With_Audio | Assign_Speaker_With_Video + +interface Insert_Sense extends ContentUpdateBase { + type: 'insert_sense' + data: Omit, 'dictionary_id' | 'id' | 'entry_id'> + sense_id: string | null + entry_id: string +} + +interface Insert_Sentence extends ContentUpdateBase { + type: 'insert_sentence' + data: Omit, 'created_by' | 'updated_by' | 'dictionary_id' | 'id'> + sentence_id: string + sense_id: string +} + +interface Insert_Photo extends ContentUpdateBase { + type: 'insert_photo' + data: Omit, 'created_by' | 'updated_by' | 'dictionary_id' | 'id'> + photo_id: string + sense_id: string +} + +interface Upsert_Audio extends ContentUpdateBase { + type: 'upsert_audio' + data: Omit, 'updated_by' | 'dictionary_id' | 'id'> + audio_id: string + entry_id: string +} + +interface Insert_Video extends ContentUpdateBase { + type: 'insert_video' + data: Omit, 'created_by' | 'updated_by' | 'dictionary_id' | 'id'> + video_id: string + sense_id: string +} diff --git a/packages/types/supabase/content-update.interface.ts b/packages/types/supabase/content-update.interface.ts index 908d05af5..3445db086 100644 --- a/packages/types/supabase/content-update.interface.ts +++ b/packages/types/supabase/content-update.interface.ts @@ -1,60 +1,150 @@ -import type { MultiString } from '../.' +import type { TablesInsert, TablesUpdate } from './combined.types' -export interface ContentUpdateRequestBody { - id: string // id of the change, a uuidv4 created on client to make things idempotent - user_id_from_local?: string +export interface Change { + type: string + data: Record +} + +export type ContentUpdateRequestBody = + | Insert_Entry + | Update_Entry + + | Insert_Sense + | Update_Sense + + | Upsert_Audio + + | Insert_Photo + | Update_Photo + + | Insert_Video + | Update_Video + + | Upsert_Speaker + | Assign_Speaker + + | Insert_Dialect + | Assign_Dialect + + | Insert_Sentence + | Update_Sentence + +interface ContentUpdateBase { + update_id: string // id of the change, a uuidv4 created on client to make things idempotent auth_token: string dictionary_id: string - entry_id?: string - sense_id?: string + import_id?: string + + import_meta?: { + user_id?: string + timestamp?: string + } +} + +interface Insert_Entry extends ContentUpdateBase { + type: 'insert_entry' + data: Omit, 'created_by' | 'updated_by' | 'dictionary_id' | 'id'> + entry_id: string +} + +interface Update_Entry extends ContentUpdateBase { + type: 'update_entry' + data: TablesUpdate<'entries'> + entry_id: string +} + +interface Insert_Dialect extends ContentUpdateBase { + type: 'insert_dialect' + data: Omit, 'created_by' | 'updated_by' | 'dictionary_id' | 'id'> + dialect_id?: string +} + +interface Assign_Dialect extends ContentUpdateBase { + type: 'assign_dialect' + data?: null | { deleted: string } + dialect_id: string + entry_id: string +} + +interface Upsert_Speaker extends ContentUpdateBase { + type: 'upsert_speaker' + data: TablesUpdate<'speakers'> + speaker_id: string +} + +interface Assign_Speaker_Base extends ContentUpdateBase { + type: 'assign_speaker' + data?: null | { deleted: string } + speaker_id: string +} + +interface Assign_Speaker_With_Audio extends Assign_Speaker_Base { + audio_id: string + video_id?: never +} + +interface Assign_Speaker_With_Video extends Assign_Speaker_Base { + video_id: string + audio_id?: never +} + +type Assign_Speaker = Assign_Speaker_With_Audio | Assign_Speaker_With_Video + +interface Insert_Sense extends ContentUpdateBase { + type: 'insert_sense' + data: Omit, 'created_by' | 'updated_by' | 'dictionary_id' | 'id' | 'entry_id'> + sense_id: string | null + entry_id: string +} + +interface Update_Sense extends ContentUpdateBase { + type: 'update_sense' + data: TablesUpdate<'senses'> + sense_id: string +} + +interface Insert_Sentence extends ContentUpdateBase { + type: 'insert_sentence' + data: Omit, 'created_by' | 'updated_by' | 'dictionary_id' | 'id'> sentence_id?: string - text_id?: string + sense_id: string +} + +interface Update_Sentence extends ContentUpdateBase { + type: 'update_sentence' + data: TablesUpdate<'sentences'> + sentence_id: string +} + +interface Insert_Photo extends ContentUpdateBase { + type: 'insert_photo' + data: Omit, 'created_by' | 'updated_by' | 'dictionary_id' | 'id'> + photo_id?: string + sense_id: string +} + +interface Update_Photo extends ContentUpdateBase { + type: 'update_photo' + data: TablesUpdate<'photos'> + photo_id: string +} + +interface Upsert_Audio extends ContentUpdateBase { + type: 'upsert_audio' + data: TablesUpdate<'audio'> audio_id?: string + entry_id: string +} + +interface Insert_Video extends ContentUpdateBase { + type: 'insert_video' + data: Omit, 'created_by' | 'updated_by' | 'dictionary_id' | 'id'> video_id?: string - photo_id?: string - speaker_id?: string - table: 'entries' | 'senses' | 'sentences' | 'senses_in_sentences' | 'texts' | 'audio' | 'video' | 'photo' | 'speakers' | 'audio_speakers' | 'video_speakers' | 'sense_videos' | 'sentence_videos' | 'sense_photos' | 'sentence_photos' // handcopied from Database['public']['Enums']['content_tables'] so Supabase types may need brought into @livingdictionaries/types - change: { - sense?: { - glosses?: { - new: MultiString - old?: MultiString - } - definition?: { - new: MultiString - old?: MultiString - } - noun_class?: { - new: string - old?: string - } - parts_of_speech?: { - new: string[] - old?: string[] - } - semantic_domains?: { - new: string[] - old?: string[] - } - write_in_semantic_domains?: { - new: string[] - old?: string[] - } - deleted?: boolean - } - sentence?: { - text?: { - new: MultiString - old?: MultiString - } - translation?: { - new: MultiString - old?: MultiString - } - removed_from_sense?: boolean // currently also deletes the sentence - later when a sentence can be connected to multiple sentences, use a deleted field to indicate the sentence is deleted everywhere - // deleted?: boolean; - } - } - import_id?: string - timestamp: string + sense_id: string +} + +interface Update_Video extends ContentUpdateBase { + type: 'update_video' + data: TablesUpdate<'videos'> + video_id: string } diff --git a/packages/types/supabase/entry.interface.ts b/packages/types/supabase/entry.interface.ts new file mode 100644 index 000000000..28fe6303a --- /dev/null +++ b/packages/types/supabase/entry.interface.ts @@ -0,0 +1,18 @@ +import type { Tables } from './combined.types' + +type DeepPartial = { + [P in keyof T]?: T[P] extends object ? DeepPartial : T[P]; +} + +export type EntryView = Tables<'entries_view'> +export type PartialEntryView = DeepPartial> + +export type SenseWithSentences = Pick, 'id' | 'glosses' | 'parts_of_speech' | 'semantic_domains' | 'write_in_semantic_domains' | 'noun_class' | 'definition' | 'plural_form' | 'variant'> & { + sentence_ids: string[] + photo_ids: string[] + video_ids: string[] +} + +export type AudioWithSpeakerIds = Tables<'audio'> & { speaker_ids: string[] } + +export type EntryMainFields = Pick, 'coordinates' | 'elicitation_id' | 'lexeme' | 'interlinearization' | 'morphology' | 'notes' | 'phonetic' | 'scientific_names' | 'sources' | 'unsupported_fields'> diff --git a/packages/site/src/lib/supabase/generated.types.ts b/packages/types/supabase/generated.types.ts similarity index 77% rename from packages/site/src/lib/supabase/generated.types.ts rename to packages/types/supabase/generated.types.ts index 58b31c87f..5ab12cbd2 100644 --- a/packages/site/src/lib/supabase/generated.types.ts +++ b/packages/types/supabase/generated.types.ts @@ -1,5 +1,3 @@ -import type { HostedVideo, UnsupportedFields } from '@living-dictionaries/types' - export type Json = | string | number @@ -16,6 +14,7 @@ export interface Database { created_at: string created_by: string deleted: string | null + dictionary_id: string entry_id: string | null id: string sentence_id: string | null @@ -29,6 +28,7 @@ export interface Database { created_at?: string created_by: string deleted?: string | null + dictionary_id: string entry_id?: string | null id?: string sentence_id?: string | null @@ -42,6 +42,7 @@ export interface Database { created_at?: string created_by?: string deleted?: string | null + dictionary_id?: string entry_id?: string | null id?: string sentence_id?: string | null @@ -66,6 +67,13 @@ export interface Database { referencedRelation: 'users' referencedColumns: ['id'] }, + { + foreignKeyName: 'audio_dictionary_id_fkey' + columns: ['dictionary_id'] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: ['id'] + }, { foreignKeyName: 'audio_entry_id_fkey' columns: ['entry_id'] @@ -73,6 +81,13 @@ export interface Database { referencedRelation: 'entries' referencedColumns: ['id'] }, + { + foreignKeyName: 'audio_entry_id_fkey' + columns: ['entry_id'] + isOneToOne: false + referencedRelation: 'entries_view' + referencedColumns: ['id'] + }, { foreignKeyName: 'audio_sentence_id_fkey' columns: ['sentence_id'] @@ -154,12 +169,20 @@ export interface Database { referencedRelation: 'speakers' referencedColumns: ['id'] }, + { + foreignKeyName: 'audio_speakers_speaker_id_fkey' + columns: ['speaker_id'] + isOneToOne: false + referencedRelation: 'speakers_view' + referencedColumns: ['id'] + }, ] } content_updates: { Row: { audio_id: string | null change: Json + dialect_id: string | null dictionary_id: string entry_id: string | null id: string @@ -168,7 +191,7 @@ export interface Database { sense_id: string | null sentence_id: string | null speaker_id: string | null - table: Database['public']['Enums']['content_tables'] + table: Database['public']['Enums']['content_tables'] | null text_id: string | null timestamp: string user_id: string @@ -177,6 +200,7 @@ export interface Database { Insert: { audio_id?: string | null change: Json + dialect_id?: string | null dictionary_id: string entry_id?: string | null id: string @@ -185,7 +209,7 @@ export interface Database { sense_id?: string | null sentence_id?: string | null speaker_id?: string | null - table: Database['public']['Enums']['content_tables'] + table?: Database['public']['Enums']['content_tables'] | null text_id?: string | null timestamp?: string user_id?: string @@ -194,6 +218,7 @@ export interface Database { Update: { audio_id?: string | null change?: Json + dialect_id?: string | null dictionary_id?: string entry_id?: string | null id?: string @@ -202,7 +227,7 @@ export interface Database { sense_id?: string | null sentence_id?: string | null speaker_id?: string | null - table?: Database['public']['Enums']['content_tables'] + table?: Database['public']['Enums']['content_tables'] | null text_id?: string | null timestamp?: string user_id?: string @@ -216,6 +241,13 @@ export interface Database { referencedRelation: 'audio' referencedColumns: ['id'] }, + { + foreignKeyName: 'content_updates_dialect_id_fkey' + columns: ['dialect_id'] + isOneToOne: false + referencedRelation: 'dialects' + referencedColumns: ['id'] + }, { foreignKeyName: 'content_updates_dictionary_id_fkey' columns: ['dictionary_id'] @@ -230,6 +262,13 @@ export interface Database { referencedRelation: 'entries' referencedColumns: ['id'] }, + { + foreignKeyName: 'content_updates_entry_id_fkey' + columns: ['entry_id'] + isOneToOne: false + referencedRelation: 'entries_view' + referencedColumns: ['id'] + }, { foreignKeyName: 'content_updates_photo_id_fkey' columns: ['photo_id'] @@ -258,6 +297,13 @@ export interface Database { referencedRelation: 'speakers' referencedColumns: ['id'] }, + { + foreignKeyName: 'content_updates_speaker_id_fkey' + columns: ['speaker_id'] + isOneToOne: false + referencedRelation: 'speakers_view' + referencedColumns: ['id'] + }, { foreignKeyName: 'content_updates_text_id_fkey' columns: ['text_id'] @@ -286,6 +332,82 @@ export interface Database { referencedRelation: 'videos' referencedColumns: ['id'] }, + { + foreignKeyName: 'content_updates_video_id_fkey' + columns: ['video_id'] + isOneToOne: false + referencedRelation: 'videos_view' + referencedColumns: ['id'] + }, + ] + } + dialects: { + Row: { + created_at: string + created_by: string + deleted: string | null + dictionary_id: string + id: string + name: Json + updated_at: string + updated_by: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + dictionary_id: string + id: string + name: Json + updated_at?: string + updated_by: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + dictionary_id?: string + id?: string + name?: Json + updated_at?: string + updated_by?: string + } + Relationships: [ + { + foreignKeyName: 'dialects_created_by_fkey' + columns: ['created_by'] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: ['id'] + }, + { + foreignKeyName: 'dialects_created_by_fkey' + columns: ['created_by'] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: ['id'] + }, + { + foreignKeyName: 'dialects_dictionary_id_fkey' + columns: ['dictionary_id'] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: ['id'] + }, + { + foreignKeyName: 'dialects_updated_by_fkey' + columns: ['updated_by'] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: ['id'] + }, + { + foreignKeyName: 'dialects_updated_by_fkey' + columns: ['updated_by'] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: ['id'] + }, ] } dictionaries: { @@ -404,7 +526,6 @@ export interface Database { created_at: string created_by: string deleted: string | null - dialects: string[] | null dictionary_id: string elicitation_id: string | null id: string @@ -413,20 +534,17 @@ export interface Database { morphology: string | null notes: Json | null phonetic: string | null - plural_form: string | null scientific_names: string[] | null sources: string[] | null - unsupported_fields: UnsupportedFields | null + unsupported_fields: Json | null updated_at: string updated_by: string - variant: string | null } Insert: { coordinates?: Json | null created_at?: string created_by: string deleted?: string | null - dialects?: string[] | null dictionary_id: string elicitation_id?: string | null id: string @@ -435,20 +553,17 @@ export interface Database { morphology?: string | null notes?: Json | null phonetic?: string | null - plural_form?: string | null scientific_names?: string[] | null sources?: string[] | null - unsupported_fields?: UnsupportedFields | null + unsupported_fields?: Json | null updated_at?: string updated_by: string - variant?: string | null } Update: { coordinates?: Json | null created_at?: string created_by?: string deleted?: string | null - dialects?: string[] | null dictionary_id?: string elicitation_id?: string | null id?: string @@ -457,13 +572,11 @@ export interface Database { morphology?: string | null notes?: Json | null phonetic?: string | null - plural_form?: string | null scientific_names?: string[] | null sources?: string[] | null - unsupported_fields?: UnsupportedFields | null + unsupported_fields?: Json | null updated_at?: string updated_by?: string - variant?: string | null } Relationships: [ { @@ -503,6 +616,66 @@ export interface Database { }, ] } + entry_dialects: { + Row: { + created_at: string + created_by: string + deleted: string | null + dialect_id: string + entry_id: string + } + Insert: { + created_at?: string + created_by: string + deleted?: string | null + dialect_id: string + entry_id: string + } + Update: { + created_at?: string + created_by?: string + deleted?: string | null + dialect_id?: string + entry_id?: string + } + Relationships: [ + { + foreignKeyName: 'entry_dialects_created_by_fkey' + columns: ['created_by'] + isOneToOne: false + referencedRelation: 'user_emails' + referencedColumns: ['id'] + }, + { + foreignKeyName: 'entry_dialects_created_by_fkey' + columns: ['created_by'] + isOneToOne: false + referencedRelation: 'users' + referencedColumns: ['id'] + }, + { + foreignKeyName: 'entry_dialects_dialect_id_fkey' + columns: ['dialect_id'] + isOneToOne: false + referencedRelation: 'dialects' + referencedColumns: ['id'] + }, + { + foreignKeyName: 'entry_dialects_entry_id_fkey' + columns: ['entry_id'] + isOneToOne: false + referencedRelation: 'entries' + referencedColumns: ['id'] + }, + { + foreignKeyName: 'entry_dialects_entry_id_fkey' + columns: ['entry_id'] + isOneToOne: false + referencedRelation: 'entries_view' + referencedColumns: ['id'] + }, + ] + } entry_updates: { Row: { column: Database['public']['Enums']['entry_columns'] @@ -547,6 +720,7 @@ export interface Database { created_at: string created_by: string deleted: string | null + dictionary_id: string id: string photographer: string | null serving_url: string @@ -559,6 +733,7 @@ export interface Database { created_at?: string created_by: string deleted?: string | null + dictionary_id: string id?: string photographer?: string | null serving_url: string @@ -571,6 +746,7 @@ export interface Database { created_at?: string created_by?: string deleted?: string | null + dictionary_id?: string id?: string photographer?: string | null serving_url?: string @@ -594,6 +770,13 @@ export interface Database { referencedRelation: 'users' referencedColumns: ['id'] }, + { + foreignKeyName: 'photos_dictionary_id_fkey' + columns: ['dictionary_id'] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: ['id'] + }, { foreignKeyName: 'photos_updated_by_fkey' columns: ['updated_by'] @@ -714,6 +897,13 @@ export interface Database { referencedRelation: 'videos' referencedColumns: ['id'] }, + { + foreignKeyName: 'sense_videos_video_id_fkey' + columns: ['video_id'] + isOneToOne: false + referencedRelation: 'videos_view' + referencedColumns: ['id'] + }, ] } senses: { @@ -727,9 +917,11 @@ export interface Database { id: string noun_class: string | null parts_of_speech: string[] | null + plural_form: Json | null semantic_domains: string[] | null updated_at: string updated_by: string + variant: Json | null write_in_semantic_domains: string[] | null } Insert: { @@ -742,9 +934,11 @@ export interface Database { id: string noun_class?: string | null parts_of_speech?: string[] | null + plural_form?: Json | null semantic_domains?: string[] | null updated_at?: string updated_by: string + variant?: Json | null write_in_semantic_domains?: string[] | null } Update: { @@ -757,12 +951,29 @@ export interface Database { id?: string noun_class?: string | null parts_of_speech?: string[] | null + plural_form?: Json | null semantic_domains?: string[] | null updated_at?: string updated_by?: string + variant?: Json | null write_in_semantic_domains?: string[] | null } - Relationships: [] + Relationships: [ + { + foreignKeyName: 'foreign_key_entries' + columns: ['entry_id'] + isOneToOne: false + referencedRelation: 'entries' + referencedColumns: ['id'] + }, + { + foreignKeyName: 'foreign_key_entries' + columns: ['entry_id'] + isOneToOne: false + referencedRelation: 'entries_view' + referencedColumns: ['id'] + }, + ] } senses_in_sentences: { Row: { @@ -921,6 +1132,13 @@ export interface Database { referencedRelation: 'videos' referencedColumns: ['id'] }, + { + foreignKeyName: 'sentence_videos_video_id_fkey' + columns: ['video_id'] + isOneToOne: false + referencedRelation: 'videos_view' + referencedColumns: ['id'] + }, ] } sentences: { @@ -1012,6 +1230,7 @@ export interface Database { created_by: string decade: number | null deleted: string | null + dictionary_id: string gender: Database['public']['Enums']['gender'] | null id: string name: string @@ -1025,6 +1244,7 @@ export interface Database { created_by: string decade?: number | null deleted?: string | null + dictionary_id: string gender?: Database['public']['Enums']['gender'] | null id?: string name: string @@ -1038,6 +1258,7 @@ export interface Database { created_by?: string decade?: number | null deleted?: string | null + dictionary_id?: string gender?: Database['public']['Enums']['gender'] | null id?: string name?: string @@ -1060,6 +1281,13 @@ export interface Database { referencedRelation: 'users' referencedColumns: ['id'] }, + { + foreignKeyName: 'speakers_dictionary_id_fkey' + columns: ['dictionary_id'] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: ['id'] + }, { foreignKeyName: 'speakers_updated_by_fkey' columns: ['updated_by'] @@ -1206,6 +1434,13 @@ export interface Database { referencedRelation: 'speakers' referencedColumns: ['id'] }, + { + foreignKeyName: 'video_speakers_speaker_id_fkey' + columns: ['speaker_id'] + isOneToOne: false + referencedRelation: 'speakers_view' + referencedColumns: ['id'] + }, { foreignKeyName: 'video_speakers_video_id_fkey' columns: ['video_id'] @@ -1213,6 +1448,13 @@ export interface Database { referencedRelation: 'videos' referencedColumns: ['id'] }, + { + foreignKeyName: 'video_speakers_video_id_fkey' + columns: ['video_id'] + isOneToOne: false + referencedRelation: 'videos_view' + referencedColumns: ['id'] + }, ] } videos: { @@ -1220,7 +1462,8 @@ export interface Database { created_at: string created_by: string deleted: string | null - hosted_elsewhere: HostedVideo | null + dictionary_id: string + hosted_elsewhere: Json | null id: string source: string | null storage_path: string | null @@ -1233,7 +1476,8 @@ export interface Database { created_at?: string created_by: string deleted?: string | null - hosted_elsewhere?: HostedVideo | null + dictionary_id: string + hosted_elsewhere?: Json | null id?: string source?: string | null storage_path?: string | null @@ -1246,7 +1490,8 @@ export interface Database { created_at?: string created_by?: string deleted?: string | null - hosted_elsewhere?: HostedVideo | null + dictionary_id?: string + hosted_elsewhere?: Json | null id?: string source?: string | null storage_path?: string | null @@ -1270,6 +1515,13 @@ export interface Database { referencedRelation: 'users' referencedColumns: ['id'] }, + { + foreignKeyName: 'videos_dictionary_id_fkey' + columns: ['dictionary_id'] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: ['id'] + }, { foreignKeyName: 'videos_text_id_fkey' columns: ['text_id'] @@ -1297,11 +1549,84 @@ export interface Database { Views: { entries_view: { Row: { + audios: Json | null + created_at: string | null + deleted: string | null + dialect_ids: Json | null + dictionary_id: string | null + id: string | null + main: Json | null + senses: Json | null + updated_at: string | null + } + Relationships: [ + { + foreignKeyName: 'entries_dictionary_id_fkey' + columns: ['dictionary_id'] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: ['id'] + }, + ] + } + materialized_entries_view: { + Row: { + audios: Json | null + created_at: string | null + deleted: string | null + dialect_ids: Json | null + dictionary_id: string | null id: string | null + main: Json | null senses: Json | null + updated_at: string | null } Relationships: [] } + speakers_view: { + Row: { + birthplace: string | null + created_at: string | null + decade: number | null + deleted: string | null + dictionary_id: string | null + gender: Database['public']['Enums']['gender'] | null + id: string | null + name: string | null + updated_at: string | null + } + Insert: { + birthplace?: string | null + created_at?: string | null + decade?: number | null + deleted?: string | null + dictionary_id?: string | null + gender?: Database['public']['Enums']['gender'] | null + id?: string | null + name?: string | null + updated_at?: string | null + } + Update: { + birthplace?: string | null + created_at?: string | null + decade?: number | null + deleted?: string | null + dictionary_id?: string | null + gender?: Database['public']['Enums']['gender'] | null + id?: string | null + name?: string | null + updated_at?: string | null + } + Relationships: [ + { + foreignKeyName: 'speakers_dictionary_id_fkey' + columns: ['dictionary_id'] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: ['id'] + }, + ] + } user_emails: { Row: { created_at: string | null @@ -1323,9 +1648,56 @@ export interface Database { } Relationships: [] } + videos_view: { + Row: { + created_at: string | null + deleted: string | null + dictionary_id: string | null + hosted_elsewhere: Json | null + id: string | null + source: string | null + speaker_ids: Json | null + storage_path: string | null + text_id: string | null + updated_at: string | null + videographer: string | null + } + Relationships: [ + { + foreignKeyName: 'videos_dictionary_id_fkey' + columns: ['dictionary_id'] + isOneToOne: false + referencedRelation: 'dictionaries' + referencedColumns: ['id'] + }, + { + foreignKeyName: 'videos_text_id_fkey' + columns: ['text_id'] + isOneToOne: false + referencedRelation: 'texts' + referencedColumns: ['id'] + }, + ] + } } Functions: { - [_ in never]: never + entries_from_timestamp: { + Args: { + get_newer_than: string + dict_id: string + } + Returns: { + id: string + dictionary_id: string + created_at: string + updated_at: string + deleted: string + main: Json + senses: Json + audios: Json + dialect_ids: Json + }[] + } } Enums: { certainty: 'yes' | 'no' | 'unknown' diff --git a/packages/types/supabase/merge-types.test.ts b/packages/types/supabase/merge-types.test.ts new file mode 100644 index 000000000..0bcae6c4f --- /dev/null +++ b/packages/types/supabase/merge-types.test.ts @@ -0,0 +1,206 @@ +import fs from 'node:fs' +import * as ts from 'typescript' + +const generated_file_path = 'packages/types/supabase/generated.types.ts' +const augments_file_path = 'packages/types/supabase/augments.types.ts' + +function read_file(file_path: string): string { + return fs.readFileSync(file_path, 'utf8') +} + +function parse_file_to_ast(file_name: string, file_content: string): ts.SourceFile { + return ts.createSourceFile( + file_name, + file_content, + ts.ScriptTarget.ESNext, + true, + ) +} + +function get_interface(source_file: ts.SourceFile, interface_name: string): ts.InterfaceDeclaration { + let type_interface: ts.InterfaceDeclaration + + function visit(node: ts.Node) { + if (type_interface) return + + if (!type_interface && ts.isInterfaceDeclaration(node) && node.name.text === interface_name) { + type_interface = node + return + } + ts.forEachChild(node, visit) + } + + visit(source_file) + + return type_interface +} + +function merge_interfaces( + original_interface: ts.InterfaceDeclaration, + augments_interface: ts.InterfaceDeclaration, +): ts.InterfaceDeclaration { + function visit(node: ts.Node, parents_names: string[]) { + if (ts.isPropertySignature(node)) { + const property_name = node.name.getText() + const property_type = node.type?.getText() + const hasChildren = property_type.includes('{') + if (!hasChildren) { + updateOriginalInterface(original_interface, parents_names, property_name, property_type) + } + } + + ts.forEachChild(node, (child) => { + const new_parents_names = ts.isPropertySignature(node) && node.name ? [...parents_names, node.name.getText()] : parents_names + visit(child, new_parents_names) + }) + } + + function updateOriginalInterface( + original_interface: ts.InterfaceDeclaration, + parents_names: string[], + property_name: string, + property_type: string, + ) { + function findAndModify(node: ts.Node, parents_names: string[], property_name: string, property_type: string) { + if (ts.isPropertySignature(node)) { + const current_property_name = node.name.getText() + if (parents_names.length === 0 && current_property_name === property_name) { + // @ts-expect-error + node.type = ts.factory.createTypeReferenceNode(property_type, []) + } else if (parents_names.length > 0 && current_property_name === parents_names[0]) { + ts.forEachChild(node, (child) => { + findAndModify(child, parents_names.slice(1), property_name, property_type) + }) + } + } else { + ts.forEachChild(node, (child) => { + findAndModify(child, parents_names, property_name, property_type) + }) + } + } + + findAndModify(original_interface, parents_names, property_name, property_type) + } + + visit(augments_interface, []) + + return original_interface +} + +function print_ast(ast: ts.SourceFile, modified_interface: ts.InterfaceDeclaration, interface_name: string): string { + const printer = ts.createPrinter() + let result = '' + + ts.forEachChild(ast, (node) => { + if (ts.isInterfaceDeclaration(node) && node.name.text === interface_name) { + result += `${printer.printNode(ts.EmitHint.Unspecified, modified_interface, ast)}\n` + } else if (ts.isTypeAliasDeclaration(node) && node.name.text !== 'Json') { + result += `${printer.printNode(ts.EmitHint.Unspecified, node, ast)}\n` + } + }) + + return result +} + +function merge_content(generated_content: string, augments_content: string): string { + const generated_ast = parse_file_to_ast(generated_file_path, generated_content) + const augments_ast = parse_file_to_ast(augments_file_path, augments_content) + + const generated_interface = get_interface(generated_ast, 'Database') + const augments_interface = get_interface(augments_ast, 'DatabaseAugments') + + const modified_interface = merge_interfaces(generated_interface, augments_interface) + return print_ast(generated_ast, modified_interface, 'Database') +} + +describe(merge_content, () => { + test('merges types and keeps string literals', () => { + const generated_content = ` +export interface Database { + public: { + Tables: { + entries: { + Row: { + bar: Json + foo: string + bee: Json + } + } + updates: { + Row: { + date: string + foreignKeyName: 'videos_created_by_fkey' + columns: ['created_by'] + } + } + } + } +}` + + const augments_content = ` +export interface DatabaseAugments { + public: { + Tables: { + entries: { + Row: { + bar: Bajinga + bee: Hiya + } + } + } + } +}` + + expect(merge_content(generated_content, augments_content)).toMatchInlineSnapshot(` + "export interface Database { + public: { + Tables: { + entries: { + Row: { + bar: Bajinga; + foo: string; + bee: Hiya; + }; + }; + updates: { + Row: { + date: string; + foreignKeyName: 'videos_created_by_fkey'; + columns: [ + 'created_by' + ]; + }; + }; + }; + }; + } + " + `) + }) + + test('strips out Json type', () => { + const generated_content = ` +export type Json = string | number +export interface Database {}` + + const augments_content = `export interface DatabaseAugments {}` + + expect(merge_content(generated_content, augments_content)).toMatchInlineSnapshot(` + "export interface Database { + } + " + `) + }) + + // TODO: turn this into a CLI + test.todo('update actual types', () => { + const generated_content = read_file(generated_file_path) + const augments_content = read_file(augments_file_path) + const output = merge_content(generated_content, augments_content) + + const imports_regex = /^(import type.+)/gm + const import_blocks = augments_content.match(imports_regex) + const augmented_import_blocks = import_blocks!.join('\n') + expect(`${augmented_import_blocks}\n\n${output}`).toMatchFileSnapshot(`combined.types.ts`) + }) +}) diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json new file mode 100644 index 000000000..c1c987b7e --- /dev/null +++ b/packages/types/tsconfig.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "target": "ESNext", + "module": "esnext", + "moduleResolution": "bundler", + "resolveJsonModule": true, + "types": [ + "vitest/globals" + ], + "strict": true, + "strictNullChecks": false, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "skipLibCheck": true + }, + "include": [ + "supabase/**/*", + "index.ts", + "**.interface.ts" + ], + "exclude": ["node_modules"] +} +// Only added for vitest/globals - can remove if removing vitest diff --git a/packages/types/user.interface.ts b/packages/types/user.interface.ts index 2be98dfd9..e6af4ad96 100644 --- a/packages/types/user.interface.ts +++ b/packages/types/user.interface.ts @@ -1,16 +1,29 @@ -import type { Timestamp } from 'firebase/firestore'; -import type { IBaseUser } from 'sveltefirets'; +import type { Timestamp } from 'firebase/firestore' +import type { IBaseUser } from 'sveltefirets' export interface IUser extends IBaseUser { - roles?: IRoles; - managing?: string[]; // dictionary Ids - can be deprected because using a collectionGroup query of 'managers' instead - contributing?: string[]; // dictionary Ids - can be deprected because using a collectionGroup query 'contributors' instead + roles?: IRoles + managing?: string[] // dictionary Ids - can be deprected because using a collectionGroup query of 'managers' instead + contributing?: string[] // dictionary Ids - can be deprected because using a collectionGroup query 'contributors' instead // starred?: string[]; // in future save dictionary Ids to user that they star, to allow them quick access back to those dictionaries - termsAgreement?: Timestamp; - unsubscribe?: Timestamp; + termsAgreement?: Timestamp + unsubscribe?: Timestamp } export interface IRoles { // editor?: boolean; // can edit and delete any content - admin?: number; // 1 controls content; 2 controls user roles also (both can turn off admin role to view as normal user until page refresh) + admin?: number // 1 controls content; 2 controls user roles also (both can turn off admin role to view as normal user until page refresh) +} + +export interface GoogleAuthUserMetaData { + // "iss": string, + // "sub": string, + // "name": string, + // "email": string, + // "picture": string, // duplicate of avatar_url + full_name?: string + avatar_url?: string + // "provider_id": string, + // "email_verified": boolean, + // "phone_verified": boolean } diff --git a/packages/types/vitest.config.ts b/packages/types/vitest.config.ts new file mode 100644 index 000000000..70cf6c977 --- /dev/null +++ b/packages/types/vitest.config.ts @@ -0,0 +1,8 @@ +import { defineProject } from 'vitest/config' + +export default defineProject({ + test: { + name: 'types:unit', + globals: true, + }, +}) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7a26afba2..9146d7a91 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,29 +9,29 @@ importers: .: devDependencies: '@antfu/eslint-config': - specifier: ^2.12.1 - version: 2.12.1(@vue/compiler-sfc@3.4.21)(eslint-plugin-svelte@2.33.2(eslint@8.56.0)(svelte@4.2.12))(eslint@8.56.0)(svelte@4.2.12)(typescript@5.1.6)(vitest@1.4.0(@types/node@20.11.0)(@vitest/ui@1.4.0)) + specifier: ^2.27.3 + version: 2.27.3(@typescript-eslint/utils@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6))(@vue/compiler-sfc@3.4.38)(eslint-plugin-svelte@2.43.0(eslint@9.9.1(jiti@1.21.6))(svelte@4.2.12))(eslint@9.9.1(jiti@1.21.6))(svelte-eslint-parser@0.41.0(svelte@4.2.12))(svelte@4.2.12)(typescript@5.1.6)(vitest@2.1.3) '@typescript-eslint/eslint-plugin': - specifier: 6.21.0 - version: 6.21.0(@typescript-eslint/parser@7.5.0(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0)(typescript@5.1.6) + specifier: 8.3.0 + version: 8.3.0(@typescript-eslint/parser@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6))(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) eslint: - specifier: ^8.56.0 - version: 8.56.0 + specifier: ^9.9.1 + version: 9.9.1(jiti@1.21.6) eslint-plugin-svelte: - specifier: ^2.33.2 - version: 2.33.2(eslint@8.56.0)(svelte@4.2.12) + specifier: ^2.43.0 + version: 2.43.0(eslint@9.9.1(jiti@1.21.6))(svelte@4.2.12) eslint-plugin-svelte-stylistic: specifier: ^0.0.4 - version: 0.0.4(eslint@8.56.0)(typescript@5.1.6) + version: 0.0.4(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) lint-staged: - specifier: ^13.2.2 - version: 13.2.2 + specifier: ^15.2.9 + version: 15.2.9 simple-git-hooks: - specifier: ^2.11.0 - version: 2.11.0 + specifier: ^2.11.1 + version: 2.11.1 start-server-and-test: - specifier: ^2.0.3 - version: 2.0.3 + specifier: ^2.0.5 + version: 2.0.5 supabase: specifier: ^1.145.4 version: 1.145.4 @@ -42,51 +42,17 @@ importers: specifier: ~5.1.6 version: 5.1.6 vitest: - specifier: ^1.4.0 - version: 1.4.0(@types/node@20.11.0)(@vitest/ui@1.4.0) - - packages/functions: - dependencies: - algoliasearch: - specifier: ^4.13.0 - version: 4.13.0 - firebase-admin: - specifier: ^12.0.0 - version: 12.0.0(encoding@0.1.13) - firebase-functions: - specifier: ^4.3.1 - version: 4.3.1(encoding@0.1.13)(firebase-admin@12.0.0(encoding@0.1.13)) - firebase-tools: - specifier: ^12.3.0 - version: 12.3.0(encoding@0.1.13) - devDependencies: - '@living-dictionaries/types': - specifier: ^1.0.0 - version: 1.0.0 - '@types/node': - specifier: ^18.11.18 - version: 18.11.18 - node-fetch: - specifier: ^2.6.7 - version: 2.6.7(encoding@0.1.13) - typescript: - specifier: ^5.1.6 - version: 5.1.6 - vitest: - specifier: ^1.4.0 - version: 1.4.0(@types/node@18.11.18)(@vitest/ui@1.4.0) + specifier: ^2.1.3 + version: 2.1.3(@types/node@22.5.1)(@vitest/ui@2.1.3) packages/scripts: devDependencies: - '@living-dictionaries/functions': - specifier: workspace:^0.0.1 - version: link:../functions '@living-dictionaries/site': specifier: workspace:^0.0.1 version: link:../site '@living-dictionaries/types': - specifier: ^1.0.0 - version: 1.0.0 + specifier: workspace:^1.0.0 + version: link:../types '@supabase/supabase-js': specifier: ^2.38.4 version: 2.39.7 @@ -94,8 +60,8 @@ importers: specifier: ^18.11.18 version: 18.11.18 '@types/pg': - specifier: ^8.10.9 - version: 8.10.9 + specifier: ^8.11.8 + version: 8.11.8 '@types/stream-chain': specifier: ^2.1.0 version: 2.1.0 @@ -139,29 +105,32 @@ importers: specifier: ^1.8.0 version: 1.8.0 tsx: - specifier: ^4.7.1 - version: 4.7.1 + specifier: ^4.19.0 + version: 4.19.0 typescript: specifier: ~5.1.6 version: 5.1.6 vitest: - specifier: ^1.4.0 - version: 1.4.0(@types/node@18.11.18)(@vitest/ui@1.4.0) + specifier: ^2.1.3 + version: 2.1.3(@types/node@18.11.18)(@vitest/ui@2.1.3) packages/site: devDependencies: '@iconify/json': - specifier: ^2.2.192 - version: 2.2.192 + specifier: ^2.2.242 + version: 2.2.242 '@julr/unocss-preset-forms': specifier: ^0.0.5 - version: 0.0.5(unocss@0.58.5(postcss@8.4.37)(rollup@4.13.0)(vite@5.1.4(@types/node@20.11.0))) + version: 0.0.5(unocss@0.58.5(postcss@8.4.47)(rollup@4.24.0)(vite@5.4.2(@types/node@22.5.1))) '@living-dictionaries/types': specifier: workspace:^1.0.0 version: link:../types '@orama/orama': - specifier: ^2.0.11 - version: 2.0.11 + specifier: 2.0.23 + version: 2.0.23 + '@orama/plugin-data-persistence': + specifier: 2.0.23 + version: 2.0.23 '@playwright/test': specifier: 1.41.2 version: 1.41.2 @@ -176,13 +145,13 @@ importers: version: 2.39.7 '@sveltejs/adapter-auto': specifier: ^3.0.0 - version: 3.1.1(@sveltejs/kit@2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0))) + version: 3.1.1(@sveltejs/kit@2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1))) '@sveltejs/kit': specifier: ^2.5.4 - version: 2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)) + version: 2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)) '@sveltejs/vite-plugin-svelte': specifier: ^3.0.0 - version: 3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)) + version: 3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)) '@turf/center': specifier: ^6.5.0 version: 6.5.0 @@ -214,8 +183,8 @@ importers: specifier: ^4.7.3 version: 4.7.3 '@types/pg': - specifier: ^8.10.9 - version: 8.10.9 + specifier: ^8.11.8 + version: 8.11.8 '@types/recordrtc': specifier: ^5.6.10 version: 5.6.10 @@ -226,11 +195,8 @@ importers: specifier: ^0.58.5 version: 0.58.5 '@vitest/ui': - specifier: ^1.4.0 - version: 1.4.0(vitest@1.4.0) - algoliasearch: - specifier: ^4.11.0 - version: 4.13.0 + specifier: ^2.1.3 + version: 2.1.3(vitest@2.1.3) ckeditor5-build-classic-with-alignment-underline-smallcaps: specifier: ^1.0.0 version: 1.0.0 @@ -255,21 +221,18 @@ importers: firebase-admin: specifier: ^12.0.0 version: 12.0.0(encoding@0.1.13) - instantsearch.js: - specifier: ^4.33.2 - version: 4.40.2(algoliasearch@4.13.0) + idb-keyval: + specifier: ^6.2.1 + version: 6.2.1 jszip: specifier: ^3.7.1 version: 3.8.0 kitbook: specifier: 1.0.0-beta.31 - version: 1.0.0-beta.31(@lezer/common@1.2.1)(@sveltejs/kit@2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))(svelte@4.2.12)(typescript@5.1.6) + version: 1.0.0-beta.31(@lezer/common@1.2.1)(@sveltejs/kit@2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))(svelte@4.2.12)(typescript@5.1.6) logrocket: specifier: ^2.1.2 version: 2.2.1 - lz-string: - specifier: ^1.4.4 - version: 1.4.4 pg: specifier: ^8.11.3 version: 8.11.3 @@ -287,10 +250,10 @@ importers: version: 4.2.12 svelte-check: specifier: ^3.6.8 - version: 3.6.8(@babel/core@7.23.9)(postcss-load-config@3.1.4(postcss@8.4.37))(postcss@8.4.37)(svelte@4.2.12) + version: 3.6.8(@babel/core@7.23.9)(postcss-load-config@3.1.4(postcss@8.4.47))(postcss@8.4.47)(svelte@4.2.12) svelte-pieces: - specifier: 2.0.0-next.14 - version: 2.0.0-next.14(svelte@4.2.12) + specifier: 2.0.0-next.16 + version: 2.0.0-next.16(svelte@4.2.12) sveltefirets: specifier: 0.0.42 version: 0.0.42(firebase@10.9.0)(svelte@4.2.12) @@ -300,21 +263,18 @@ importers: tslib: specifier: ^2.6.1 version: 2.6.1 - type-fest: - specifier: ^4.13.0 - version: 4.13.0 typescript: specifier: ^5.1.6 version: 5.1.6 unocss: specifier: ^0.58.5 - version: 0.58.5(postcss@8.4.37)(rollup@4.13.0)(vite@5.1.4(@types/node@20.11.0)) + version: 0.58.5(postcss@8.4.47)(rollup@4.24.0)(vite@5.4.2(@types/node@22.5.1)) vite: - specifier: ^5.1.4 - version: 5.1.4(@types/node@20.11.0) + specifier: ^5.4.2 + version: 5.4.2(@types/node@22.5.1) vitest: - specifier: ^1.4.0 - version: 1.4.0(@types/node@20.11.0)(@vitest/ui@1.4.0) + specifier: ^2.1.3 + version: 2.1.3(@types/node@22.5.1)(@vitest/ui@2.1.3) wavesurfer.js: specifier: ^5.2.0 version: 5.2.0 @@ -332,7 +292,13 @@ importers: version: 10.9.0 sveltefirets: specifier: 0.0.42 - version: 0.0.42(firebase@10.9.0)(svelte@4.2.12) + version: 0.0.42(firebase@10.9.0)(svelte@4.2.19) + typescript: + specifier: ^5.6.2 + version: 5.6.2 + vitest: + specifier: ^2.1.3 + version: 2.1.3(@types/node@22.5.1)(@vitest/ui@2.1.3) packages: @@ -364,9 +330,6 @@ packages: '@algolia/client-search@4.13.0': resolution: {integrity: sha512-blgCKYbZh1NgJWzeGf+caKE32mo3j54NprOf0LZVCubQb3Kx37tk1Hc8SDs9bCAE8hUvf3cazMPIg7wscSxspA==} - '@algolia/events@4.0.1': - resolution: {integrity: sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ==} - '@algolia/logger-common@4.13.0': resolution: {integrity: sha512-8yqXk7rMtmQJ9wZiHOt/6d4/JDEg5VCk83gJ39I+X/pwUPzIsbKy9QiK4uJ3aJELKyoIiDT1hpYVt+5ia+94IA==} @@ -389,23 +352,33 @@ packages: resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} engines: {node: '>=6.0.0'} - '@antfu/eslint-config@2.12.1': - resolution: {integrity: sha512-o0tTokP/qk7Hwsv14N+sr1DsF3bylZrJH9yWdY73A0wSHlomqy7W+v9lXjN23q3cwjLftNzujd6SXmWBgcpCLg==} + '@ampproject/remapping@2.3.0': + resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} + engines: {node: '>=6.0.0'} + + '@antfu/eslint-config@2.27.3': + resolution: {integrity: sha512-Y2Vh/LvPAaYoyLwCiZHJ7p76LEIGg6debeUA4Qs+KOrlGuXLQWRmdZlC6SB33UDNzXqkFeaXAlEcYUqvYoiMKA==} hasBin: true peerDependencies: + '@eslint-react/eslint-plugin': ^1.5.8 + '@prettier/plugin-xml': ^3.4.1 '@unocss/eslint-plugin': '>=0.50.0' - astro-eslint-parser: ^0.16.3 + astro-eslint-parser: ^1.0.2 eslint: '>=8.40.0' - eslint-plugin-astro: ^0.31.4 + eslint-plugin-astro: ^1.2.0 eslint-plugin-format: '>=0.1.0' - eslint-plugin-react: ^7.33.2 eslint-plugin-react-hooks: ^4.6.0 eslint-plugin-react-refresh: ^0.4.4 - eslint-plugin-svelte: ^2.35.1 + eslint-plugin-solid: ^0.13.2 + eslint-plugin-svelte: '>=2.35.1' prettier-plugin-astro: ^0.13.0 prettier-plugin-slidev: ^1.0.5 - svelte-eslint-parser: ^0.33.1 + svelte-eslint-parser: '>=0.37.0' peerDependenciesMeta: + '@eslint-react/eslint-plugin': + optional: true + '@prettier/plugin-xml': + optional: true '@unocss/eslint-plugin': optional: true astro-eslint-parser: @@ -414,12 +387,12 @@ packages: optional: true eslint-plugin-format: optional: true - eslint-plugin-react: - optional: true eslint-plugin-react-hooks: optional: true eslint-plugin-react-refresh: optional: true + eslint-plugin-solid: + optional: true eslint-plugin-svelte: optional: true prettier-plugin-astro: @@ -432,15 +405,15 @@ packages: '@antfu/install-pkg@0.1.1': resolution: {integrity: sha512-LyB/8+bSfa0DFGC06zpCEfs89/XoWZwws5ygEa5D+Xsm3OfI+aXQ86VgVG7Acyef+rSZ5HE7J8rrxzrQeM3PjQ==} - '@antfu/install-pkg@0.3.2': - resolution: {integrity: sha512-FFYqME8+UHlPnRlX/vn+8cTD4Wo/nG/lzRxpABs3XANBmdJdNImVz3QvjNAE/W3PSCNbG387FOz8o5WelnWOlg==} + '@antfu/install-pkg@0.4.1': + resolution: {integrity: sha512-T7yB5QNG29afhWVkVq7XeIMBa5U/vs9mX69YqayXypPRmYzUmzwnYltplHmPtZ4HPCn+sQKeXW8I47wCbuBOjw==} + + '@antfu/utils@0.7.10': + resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==} '@antfu/utils@0.7.7': resolution: {integrity: sha512-gFPqTG7otEJ8uP6wrhDv6mqwGWYZKNvAcCq6u9hOj0c+IKCEsY4L1oC9trPq2SaWIzAfHvqfBDxF591JkMf+kg==} - '@apidevtools/json-schema-ref-parser@9.0.9': - resolution: {integrity: sha512-GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w==} - '@babel/code-frame@7.23.5': resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==} engines: {node: '>=6.9.0'} @@ -527,10 +500,22 @@ packages: resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==} engines: {node: '>=6.9.0'} + '@babel/helper-string-parser@7.25.7': + resolution: {integrity: sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==} + engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.22.20': resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.24.7': + resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==} + engines: {node: '>=6.9.0'} + + '@babel/helper-validator-identifier@7.25.7': + resolution: {integrity: sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==} + engines: {node: '>=6.9.0'} + '@babel/helper-validator-option@7.23.5': resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==} engines: {node: '>=6.9.0'} @@ -543,13 +528,13 @@ packages: resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==} engines: {node: '>=6.9.0'} - '@babel/parser@7.23.6': - resolution: {integrity: sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==} + '@babel/parser@7.23.9': + resolution: {integrity: sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==} engines: {node: '>=6.0.0'} hasBin: true - '@babel/parser@7.23.9': - resolution: {integrity: sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==} + '@babel/parser@7.25.8': + resolution: {integrity: sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==} engines: {node: '>=6.0.0'} hasBin: true @@ -595,14 +580,14 @@ packages: resolution: {integrity: sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==} engines: {node: '>=6.9.0'} - '@babel/types@7.23.6': - resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==} - engines: {node: '>=6.9.0'} - '@babel/types@7.23.9': resolution: {integrity: sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==} engines: {node: '>=6.9.0'} + '@babel/types@7.25.8': + resolution: {integrity: sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==} + engines: {node: '>=6.9.0'} + '@ckeditor/ckeditor-cloud-services-collaboration@50.0.0': resolution: {integrity: sha512-C99HTskj3+Y3O14iZb08YeeWNJ3vl70T+2+YP+pvgw1+CYbxUtwSQxTgVImlNHtHDfZIP8BDKoUdOWp0vY88mg==} @@ -799,155 +784,302 @@ packages: '@codemirror/view@6.26.3': resolution: {integrity: sha512-gmqxkPALZjkgSxIeeweY/wGQXBfwTUaLs8h7OKtSwfbj9Ct3L11lD+u1sS7XHppxFQoMDiMDp07P9f3I2jWOHw==} - '@colors/colors@1.5.0': - resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} - engines: {node: '>=0.1.90'} - - '@dabh/diagnostics@2.0.3': - resolution: {integrity: sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==} + '@es-joy/jsdoccomment@0.43.1': + resolution: {integrity: sha512-I238eDtOolvCuvtxrnqtlBaw0BwdQuYqK7eA6XIonicMdOOOb75mqdIzkGDUbS04+1Di007rgm9snFRNeVrOog==} + engines: {node: '>=16'} - '@es-joy/jsdoccomment@0.42.0': - resolution: {integrity: sha512-R1w57YlVA6+YE01wch3GPYn6bCsrOV3YW/5oGGE2tmX6JcL9Nr+b5IikrjMPF+v9CV3ay+obImEdsDhovhJrzw==} + '@es-joy/jsdoccomment@0.48.0': + resolution: {integrity: sha512-G6QUWIcC+KvSwXNsJyDTHvqUdNoAVJPPgkc3+Uk4WBKqZvoXhlvazOgm9aL0HwihJLQf0l+tOE2UFzXBqCqgDw==} engines: {node: '>=16'} - '@esbuild/aix-ppc64@0.19.12': - resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} + '@esbuild/aix-ppc64@0.21.5': + resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==} engines: {node: '>=12'} cpu: [ppc64] os: [aix] - '@esbuild/android-arm64@0.19.12': - resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} + '@esbuild/aix-ppc64@0.23.1': + resolution: {integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [aix] + + '@esbuild/android-arm64@0.21.5': + resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==} engines: {node: '>=12'} cpu: [arm64] os: [android] - '@esbuild/android-arm@0.19.12': - resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} + '@esbuild/android-arm64@0.23.1': + resolution: {integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==} + engines: {node: '>=18'} + cpu: [arm64] + os: [android] + + '@esbuild/android-arm@0.21.5': + resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==} engines: {node: '>=12'} cpu: [arm] os: [android] - '@esbuild/android-x64@0.19.12': - resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} + '@esbuild/android-arm@0.23.1': + resolution: {integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==} + engines: {node: '>=18'} + cpu: [arm] + os: [android] + + '@esbuild/android-x64@0.21.5': + resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==} engines: {node: '>=12'} cpu: [x64] os: [android] - '@esbuild/darwin-arm64@0.19.12': - resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} + '@esbuild/android-x64@0.23.1': + resolution: {integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==} + engines: {node: '>=18'} + cpu: [x64] + os: [android] + + '@esbuild/darwin-arm64@0.21.5': + resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-x64@0.19.12': - resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} + '@esbuild/darwin-arm64@0.23.1': + resolution: {integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==} + engines: {node: '>=18'} + cpu: [arm64] + os: [darwin] + + '@esbuild/darwin-x64@0.21.5': + resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==} engines: {node: '>=12'} cpu: [x64] os: [darwin] - '@esbuild/freebsd-arm64@0.19.12': - resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} + '@esbuild/darwin-x64@0.23.1': + resolution: {integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==} + engines: {node: '>=18'} + cpu: [x64] + os: [darwin] + + '@esbuild/freebsd-arm64@0.21.5': + resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-x64@0.19.12': - resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} + '@esbuild/freebsd-arm64@0.23.1': + resolution: {integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==} + engines: {node: '>=18'} + cpu: [arm64] + os: [freebsd] + + '@esbuild/freebsd-x64@0.21.5': + resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] - '@esbuild/linux-arm64@0.19.12': - resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} + '@esbuild/freebsd-x64@0.23.1': + resolution: {integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==} + engines: {node: '>=18'} + cpu: [x64] + os: [freebsd] + + '@esbuild/linux-arm64@0.21.5': + resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==} engines: {node: '>=12'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm@0.19.12': - resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} + '@esbuild/linux-arm64@0.23.1': + resolution: {integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==} + engines: {node: '>=18'} + cpu: [arm64] + os: [linux] + + '@esbuild/linux-arm@0.21.5': + resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==} engines: {node: '>=12'} cpu: [arm] os: [linux] - '@esbuild/linux-ia32@0.19.12': - resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} + '@esbuild/linux-arm@0.23.1': + resolution: {integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==} + engines: {node: '>=18'} + cpu: [arm] + os: [linux] + + '@esbuild/linux-ia32@0.21.5': + resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==} engines: {node: '>=12'} cpu: [ia32] os: [linux] - '@esbuild/linux-loong64@0.19.12': - resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} + '@esbuild/linux-ia32@0.23.1': + resolution: {integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==} + engines: {node: '>=18'} + cpu: [ia32] + os: [linux] + + '@esbuild/linux-loong64@0.21.5': + resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==} engines: {node: '>=12'} cpu: [loong64] os: [linux] - '@esbuild/linux-mips64el@0.19.12': - resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} + '@esbuild/linux-loong64@0.23.1': + resolution: {integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==} + engines: {node: '>=18'} + cpu: [loong64] + os: [linux] + + '@esbuild/linux-mips64el@0.21.5': + resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] - '@esbuild/linux-ppc64@0.19.12': - resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} + '@esbuild/linux-mips64el@0.23.1': + resolution: {integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==} + engines: {node: '>=18'} + cpu: [mips64el] + os: [linux] + + '@esbuild/linux-ppc64@0.21.5': + resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] - '@esbuild/linux-riscv64@0.19.12': - resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} + '@esbuild/linux-ppc64@0.23.1': + resolution: {integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [linux] + + '@esbuild/linux-riscv64@0.21.5': + resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] - '@esbuild/linux-s390x@0.19.12': - resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} + '@esbuild/linux-riscv64@0.23.1': + resolution: {integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==} + engines: {node: '>=18'} + cpu: [riscv64] + os: [linux] + + '@esbuild/linux-s390x@0.21.5': + resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==} engines: {node: '>=12'} cpu: [s390x] os: [linux] - '@esbuild/linux-x64@0.19.12': - resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} + '@esbuild/linux-s390x@0.23.1': + resolution: {integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==} + engines: {node: '>=18'} + cpu: [s390x] + os: [linux] + + '@esbuild/linux-x64@0.21.5': + resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==} engines: {node: '>=12'} cpu: [x64] os: [linux] - '@esbuild/netbsd-x64@0.19.12': - resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} + '@esbuild/linux-x64@0.23.1': + resolution: {integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==} + engines: {node: '>=18'} + cpu: [x64] + os: [linux] + + '@esbuild/netbsd-x64@0.21.5': + resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] - '@esbuild/openbsd-x64@0.19.12': - resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} + '@esbuild/netbsd-x64@0.23.1': + resolution: {integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==} + engines: {node: '>=18'} + cpu: [x64] + os: [netbsd] + + '@esbuild/openbsd-arm64@0.23.1': + resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openbsd] + + '@esbuild/openbsd-x64@0.21.5': + resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] - '@esbuild/sunos-x64@0.19.12': - resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} + '@esbuild/openbsd-x64@0.23.1': + resolution: {integrity: sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==} + engines: {node: '>=18'} + cpu: [x64] + os: [openbsd] + + '@esbuild/sunos-x64@0.21.5': + resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==} engines: {node: '>=12'} cpu: [x64] os: [sunos] - '@esbuild/win32-arm64@0.19.12': - resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} + '@esbuild/sunos-x64@0.23.1': + resolution: {integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==} + engines: {node: '>=18'} + cpu: [x64] + os: [sunos] + + '@esbuild/win32-arm64@0.21.5': + resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==} engines: {node: '>=12'} cpu: [arm64] os: [win32] - '@esbuild/win32-ia32@0.19.12': - resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} + '@esbuild/win32-arm64@0.23.1': + resolution: {integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==} + engines: {node: '>=18'} + cpu: [arm64] + os: [win32] + + '@esbuild/win32-ia32@0.21.5': + resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==} engines: {node: '>=12'} cpu: [ia32] os: [win32] - '@esbuild/win32-x64@0.19.12': - resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} + '@esbuild/win32-ia32@0.23.1': + resolution: {integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==} + engines: {node: '>=18'} + cpu: [ia32] + os: [win32] + + '@esbuild/win32-x64@0.21.5': + resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==} engines: {node: '>=12'} cpu: [x64] os: [win32] + '@esbuild/win32-x64@0.23.1': + resolution: {integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==} + engines: {node: '>=18'} + cpu: [x64] + os: [win32] + + '@eslint-community/eslint-plugin-eslint-comments@4.4.0': + resolution: {integrity: sha512-yljsWl5Qv3IkIRmJ38h3NrHXFCm4EUl55M8doGTF6hvzvFF8kRpextgSrg2dwHev9lzBZyafCr9RelGIyQm6fw==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 + '@eslint-community/eslint-utils@4.4.0': resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -958,13 +1090,25 @@ packages: resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint/eslintrc@2.1.4': - resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + '@eslint-community/regexpp@4.11.0': + resolution: {integrity: sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint/js@8.56.0': - resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + '@eslint/config-array@0.18.0': + resolution: {integrity: sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/eslintrc@3.1.0': + resolution: {integrity: sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/js@9.9.1': + resolution: {integrity: sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/object-schema@2.1.4': + resolution: {integrity: sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@fastify/busboy@1.2.1': resolution: {integrity: sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==} @@ -1175,46 +1319,22 @@ packages: resolution: {integrity: sha512-PRukAUgeBOZu/4pK9NXkAs8ur6QUpG6bBiwcnSO1qsh0FlR93gqU+VtkCx3EJM46S10jzMhHqpA0NoVbnUs5TQ==} engines: {node: '>=14.0.0'} - '@google-cloud/paginator@4.0.1': - resolution: {integrity: sha512-6G1ui6bWhNyHjmbYwavdN7mpVPRBtyDg/bfqBTAlwr413On2TnFNfDxc9UhTJctkgoCDgQXEKiRPLPR9USlkbQ==} - engines: {node: '>=12.0.0'} - '@google-cloud/paginator@5.0.0': resolution: {integrity: sha512-87aeg6QQcEPxGCOthnpUjvw4xAZ57G7pL8FS0C4e/81fr3FjkpUpibf1s2v5XGyGhUVGF4Jfg7yEcxqn2iUw1w==} engines: {node: '>=14.0.0'} - '@google-cloud/precise-date@3.0.1': - resolution: {integrity: sha512-crK2rgNFfvLoSgcKJY7ZBOLW91IimVNmPfi1CL+kMTf78pTJYd29XqEVedAeBu4DwCJc0EDIp1MpctLgoPq+Uw==} - engines: {node: '>=12.0.0'} - - '@google-cloud/projectify@3.0.0': - resolution: {integrity: sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA==} - engines: {node: '>=12.0.0'} - '@google-cloud/projectify@4.0.0': resolution: {integrity: sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==} engines: {node: '>=14.0.0'} - '@google-cloud/promisify@2.0.4': - resolution: {integrity: sha512-j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA==} - engines: {node: '>=10'} - '@google-cloud/promisify@4.0.0': resolution: {integrity: sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==} engines: {node: '>=14'} - '@google-cloud/pubsub@3.7.0': - resolution: {integrity: sha512-PYgYM/bPMgzKzzKJwvHL8lupVVXIoS7sBppdJWDfK5BVA6tLqBF57P20YEy9V8gi1/v1bZ9YCa1Ag58oYfGItA==} - engines: {node: '>=12.0.0'} - '@google-cloud/storage@7.9.0': resolution: {integrity: sha512-PlFl7g3r91NmXtZHXsSEfTZES5ysD3SSBWmX4iBdQ2TFH7tN/Vn/IhnVELCHtgh1vc+uYPZ7XvRYaqtDCdghIA==} engines: {node: '>=14'} - '@grpc/grpc-js@1.8.14': - resolution: {integrity: sha512-w84maJ6CKl5aApCMzFll0hxtFNT6or9WwMslobKaqWUEf1K+zhlL43bSQhFreyYWIWR+Z0xnVFC1KtLm4ZpM/A==} - engines: {node: ^8.13.0 || >=10.10.0} - '@grpc/grpc-js@1.9.13': resolution: {integrity: sha512-OEZZu9v9AA+7/tghMDE8o5DAMD5THVnwSqDWuh7PPYO5287rTyqy0xEHT6/e4pbqSrhyLPdQFsam4TwFQVVIIw==} engines: {node: ^8.13.0 || >=10.10.0} @@ -1224,30 +1344,22 @@ packages: engines: {node: '>=6'} hasBin: true - '@grpc/proto-loader@0.7.7': - resolution: {integrity: sha512-1TIeXOi8TuSCQprPItwoMymZXxWT0CPxUhkrkeCUH+D8U7QDwQ6b7SUz2MaLuWM2llT+J/TVFLmQI5KtML3BhQ==} - engines: {node: '>=6'} - hasBin: true - '@hapi/hoek@9.3.0': resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==} '@hapi/topo@5.1.0': resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==} - '@humanwhocodes/config-array@0.11.14': - resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} - engines: {node: '>=10.10.0'} - '@humanwhocodes/module-importer@1.0.1': resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} engines: {node: '>=12.22'} - '@humanwhocodes/object-schema@2.0.2': - resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==} + '@humanwhocodes/retry@0.3.0': + resolution: {integrity: sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==} + engines: {node: '>=18.18'} - '@iconify/json@2.2.192': - resolution: {integrity: sha512-q03tWoVKoMRaTEUDOPWc8geSsKkMe+3D/kK4UZ7F7P3NYwr4h+GN/yT3+5Z68lnD0ajDmTuswfMKOi1DbVnEnw==} + '@iconify/json@2.2.242': + resolution: {integrity: sha512-cS6eYdx1C1GhqaZm25ztH5yoghCaTXGJBeseUkS259GxxX9obtGLLk0yy+twxpNCD5/F9gjbgxh46BjNWsHtwg==} '@iconify/types@2.0.0': resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} @@ -1255,18 +1367,14 @@ packages: '@iconify/utils@2.1.22': resolution: {integrity: sha512-6UHVzTVXmvO8uS6xFF+L/QTSpTzA/JZxtgU+KYGFyDYMEObZ1bu/b5l+zNJjHy+0leWjHI+C0pXlzGvv3oXZMA==} - '@isaacs/cliui@8.0.2': - resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} - engines: {node: '>=12'} - - '@jest/schemas@29.6.3': - resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - '@jridgewell/gen-mapping@0.3.4': resolution: {integrity: sha512-Oud2QPM5dHviZNn4y/WhhYKSXksv+1xLEIsNrAbGcFzUN3ubqWRFT5gwPchNc5NuzILOU4tPBDTZ4VwhL8Y7cw==} engines: {node: '>=6.0.0'} + '@jridgewell/gen-mapping@0.3.5': + resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} + engines: {node: '>=6.0.0'} + '@jridgewell/resolve-uri@3.1.2': resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} engines: {node: '>=6.0.0'} @@ -1275,22 +1383,22 @@ packages: resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} engines: {node: '>=6.0.0'} + '@jridgewell/set-array@1.2.1': + resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} + engines: {node: '>=6.0.0'} + '@jridgewell/sourcemap-codec@1.4.15': resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + '@jridgewell/sourcemap-codec@1.5.0': + resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} + '@jridgewell/trace-mapping@0.3.23': resolution: {integrity: sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg==} '@jridgewell/trace-mapping@0.3.25': resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} - '@jsdevtools/ono@7.1.3': - resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==} - - '@jsdoc/salty@0.2.5': - resolution: {integrity: sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==} - engines: {node: '>=v12.0.0'} - '@julr/unocss-preset-forms@0.0.5': resolution: {integrity: sha512-lUMhKc8KooObDWIs0wyqh903ix5a6PRHtq1RAszhyEoDR2aqbnfSXnv0QiG2lDp2AWafioNbgquFGiUyyJCDVg==} engines: {node: '>=16'} @@ -1315,8 +1423,9 @@ packages: '@lezer/lr@1.4.0': resolution: {integrity: sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==} - '@living-dictionaries/types@1.0.0': - resolution: {integrity: sha512-jQf45bL8z/CLal6fTQNECE4fpmp68Wc9yxiMQjDAtjWerCp1Lro1W7GvRWnnj7QeFWle4GrBBVjNxzZC87wIeg==} + '@msgpack/msgpack@2.8.0': + resolution: {integrity: sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==} + engines: {node: '>= 10'} '@nodelib/fs.scandir@2.1.5': resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} @@ -1330,49 +1439,24 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} - '@npmcli/agent@2.2.0': - resolution: {integrity: sha512-2yThA1Es98orMkpSLVqlDZAMPK3jHJhifP2gnNUdk1754uZ8yI5c+ulCoVG+WlntQA6MzhrURMXjSd9Z7dJ2/Q==} - engines: {node: ^16.14.0 || >=18.0.0} - - '@npmcli/fs@3.1.0': - resolution: {integrity: sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - '@opentelemetry/api@1.1.0': - resolution: {integrity: sha512-hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ==} - engines: {node: '>=8.0.0'} - - '@opentelemetry/semantic-conventions@1.3.1': - resolution: {integrity: sha512-wU5J8rUoo32oSef/rFpOT1HIjLjAv3qIDHkw1QIhODV3OpAVHi5oVzlouozg9obUmZKtbZ0qUe/m7FP0y0yBzA==} - engines: {node: '>=8.12.0'} - - '@orama/orama@2.0.11': - resolution: {integrity: sha512-CUoXg7lHehzquU+oJR5NoQiFN5ZvaRVz7SSuWnCAsn8if889XumQQ4SJRu083d16X1M2p9YSAfxaxdl6+7e2LQ==} + '@orama/orama@2.0.23': + resolution: {integrity: sha512-hb99eZAKW0KBaTyf8f7iV1yFIniQtkcs3sV5pooQ7mh33DCjTyeB39qUW8IHyBDFSs2rjLoePjW0CROvhb3rkw==} engines: {node: '>= 16.0.0'} - '@pkgjs/parseargs@0.11.0': - resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} - engines: {node: '>=14'} + '@orama/plugin-data-persistence@2.0.23': + resolution: {integrity: sha512-xKEZMgHuyKSIWJzOfXWnpkr4Mx97U5bEqUmWRG1jX4WESry2cszHjp2e2KCLbZaZFHgqJZgESzp0yPcMesiAqQ==} + + '@pkgr/core@0.1.1': + resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==} + engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} '@playwright/test@1.41.2': resolution: {integrity: sha512-qQB9h7KbibJzrDpkXkYvsmiDJK14FULCCZgEcoe2AvFAS64oCirWTwzTlAYEbKaRxWs5TFesE1Na6izMv3HfGg==} engines: {node: '>=16'} hasBin: true - '@pnpm/config.env-replace@1.1.0': - resolution: {integrity: sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==} - engines: {node: '>=12.22.0'} - - '@pnpm/network.ca-file@1.0.2': - resolution: {integrity: sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==} - engines: {node: '>=12.22.0'} - - '@pnpm/npm-conf@2.2.0': - resolution: {integrity: sha512-roLI1ul/GwzwcfcVpZYPdrgW2W/drLriObl1h+yLF5syc8/5ULWw2ALbCHUWF+4YltIqA3xFSbG4IwyJz37e9g==} - engines: {node: '>=12'} - - '@polka/url@1.0.0-next.24': - resolution: {integrity: sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==} + '@polka/url@1.0.0-next.28': + resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==} '@protobufjs/aspromise@1.1.2': resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==} @@ -1489,133 +1573,163 @@ packages: rollup: optional: true - '@rollup/rollup-android-arm-eabi@4.12.0': - resolution: {integrity: sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==} + '@rollup/rollup-android-arm-eabi@4.21.1': + resolution: {integrity: sha512-2thheikVEuU7ZxFXubPDOtspKn1x0yqaYQwvALVtEcvFhMifPADBrgRPyHV0TF3b+9BgvgjgagVyvA/UqPZHmg==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm-eabi@4.13.0': - resolution: {integrity: sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==} + '@rollup/rollup-android-arm-eabi@4.24.0': + resolution: {integrity: sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.12.0': - resolution: {integrity: sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==} + '@rollup/rollup-android-arm64@4.21.1': + resolution: {integrity: sha512-t1lLYn4V9WgnIFHXy1d2Di/7gyzBWS8G5pQSXdZqfrdCGTwi1VasRMSS81DTYb+avDs/Zz4A6dzERki5oRYz1g==} cpu: [arm64] os: [android] - '@rollup/rollup-android-arm64@4.13.0': - resolution: {integrity: sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==} + '@rollup/rollup-android-arm64@4.24.0': + resolution: {integrity: sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.12.0': - resolution: {integrity: sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==} + '@rollup/rollup-darwin-arm64@4.21.1': + resolution: {integrity: sha512-AH/wNWSEEHvs6t4iJ3RANxW5ZCK3fUnmf0gyMxWCesY1AlUj8jY7GC+rQE4wd3gwmZ9XDOpL0kcFnCjtN7FXlA==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-arm64@4.13.0': - resolution: {integrity: sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==} + '@rollup/rollup-darwin-arm64@4.24.0': + resolution: {integrity: sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.12.0': - resolution: {integrity: sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==} + '@rollup/rollup-darwin-x64@4.21.1': + resolution: {integrity: sha512-dO0BIz/+5ZdkLZrVgQrDdW7m2RkrLwYTh2YMFG9IpBtlC1x1NPNSXkfczhZieOlOLEqgXOFH3wYHB7PmBtf+Bg==} cpu: [x64] os: [darwin] - '@rollup/rollup-darwin-x64@4.13.0': - resolution: {integrity: sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==} + '@rollup/rollup-darwin-x64@4.24.0': + resolution: {integrity: sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==} cpu: [x64] os: [darwin] - '@rollup/rollup-linux-arm-gnueabihf@4.12.0': - resolution: {integrity: sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==} + '@rollup/rollup-linux-arm-gnueabihf@4.21.1': + resolution: {integrity: sha512-sWWgdQ1fq+XKrlda8PsMCfut8caFwZBmhYeoehJ05FdI0YZXk6ZyUjWLrIgbR/VgiGycrFKMMgp7eJ69HOF2pQ==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-gnueabihf@4.13.0': - resolution: {integrity: sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==} + '@rollup/rollup-linux-arm-gnueabihf@4.24.0': + resolution: {integrity: sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.12.0': - resolution: {integrity: sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==} + '@rollup/rollup-linux-arm-musleabihf@4.21.1': + resolution: {integrity: sha512-9OIiSuj5EsYQlmwhmFRA0LRO0dRRjdCVZA3hnmZe1rEwRk11Jy3ECGGq3a7RrVEZ0/pCsYWx8jG3IvcrJ6RCew==} + cpu: [arm] + os: [linux] + + '@rollup/rollup-linux-arm-musleabihf@4.24.0': + resolution: {integrity: sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==} + cpu: [arm] + os: [linux] + + '@rollup/rollup-linux-arm64-gnu@4.21.1': + resolution: {integrity: sha512-0kuAkRK4MeIUbzQYu63NrJmfoUVicajoRAL1bpwdYIYRcs57iyIV9NLcuyDyDXE2GiZCL4uhKSYAnyWpjZkWow==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.13.0': - resolution: {integrity: sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==} + '@rollup/rollup-linux-arm64-gnu@4.24.0': + resolution: {integrity: sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.12.0': - resolution: {integrity: sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==} + '@rollup/rollup-linux-arm64-musl@4.21.1': + resolution: {integrity: sha512-/6dYC9fZtfEY0vozpc5bx1RP4VrtEOhNQGb0HwvYNwXD1BBbwQ5cKIbUVVU7G2d5WRE90NfB922elN8ASXAJEA==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.13.0': - resolution: {integrity: sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==} + '@rollup/rollup-linux-arm64-musl@4.24.0': + resolution: {integrity: sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.12.0': - resolution: {integrity: sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==} + '@rollup/rollup-linux-powerpc64le-gnu@4.21.1': + resolution: {integrity: sha512-ltUWy+sHeAh3YZ91NUsV4Xg3uBXAlscQe8ZOXRCVAKLsivGuJsrkawYPUEyCV3DYa9urgJugMLn8Z3Z/6CeyRQ==} + cpu: [ppc64] + os: [linux] + + '@rollup/rollup-linux-powerpc64le-gnu@4.24.0': + resolution: {integrity: sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==} + cpu: [ppc64] + os: [linux] + + '@rollup/rollup-linux-riscv64-gnu@4.21.1': + resolution: {integrity: sha512-BggMndzI7Tlv4/abrgLwa/dxNEMn2gC61DCLrTzw8LkpSKel4o+O+gtjbnkevZ18SKkeN3ihRGPuBxjaetWzWg==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.13.0': - resolution: {integrity: sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==} + '@rollup/rollup-linux-riscv64-gnu@4.24.0': + resolution: {integrity: sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.12.0': - resolution: {integrity: sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==} + '@rollup/rollup-linux-s390x-gnu@4.21.1': + resolution: {integrity: sha512-z/9rtlGd/OMv+gb1mNSjElasMf9yXusAxnRDrBaYB+eS1shFm6/4/xDH1SAISO5729fFKUkJ88TkGPRUh8WSAA==} + cpu: [s390x] + os: [linux] + + '@rollup/rollup-linux-s390x-gnu@4.24.0': + resolution: {integrity: sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==} + cpu: [s390x] + os: [linux] + + '@rollup/rollup-linux-x64-gnu@4.21.1': + resolution: {integrity: sha512-kXQVcWqDcDKw0S2E0TmhlTLlUgAmMVqPrJZR+KpH/1ZaZhLSl23GZpQVmawBQGVhyP5WXIsIQ/zqbDBBYmxm5w==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.13.0': - resolution: {integrity: sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==} + '@rollup/rollup-linux-x64-gnu@4.24.0': + resolution: {integrity: sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.12.0': - resolution: {integrity: sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==} + '@rollup/rollup-linux-x64-musl@4.21.1': + resolution: {integrity: sha512-CbFv/WMQsSdl+bpX6rVbzR4kAjSSBuDgCqb1l4J68UYsQNalz5wOqLGYj4ZI0thGpyX5kc+LLZ9CL+kpqDovZA==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.13.0': - resolution: {integrity: sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==} + '@rollup/rollup-linux-x64-musl@4.24.0': + resolution: {integrity: sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.12.0': - resolution: {integrity: sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==} + '@rollup/rollup-win32-arm64-msvc@4.21.1': + resolution: {integrity: sha512-3Q3brDgA86gHXWHklrwdREKIrIbxC0ZgU8lwpj0eEKGBQH+31uPqr0P2v11pn0tSIxHvcdOWxa4j+YvLNx1i6g==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-arm64-msvc@4.13.0': - resolution: {integrity: sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==} + '@rollup/rollup-win32-arm64-msvc@4.24.0': + resolution: {integrity: sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.12.0': - resolution: {integrity: sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==} + '@rollup/rollup-win32-ia32-msvc@4.21.1': + resolution: {integrity: sha512-tNg+jJcKR3Uwe4L0/wY3Ro0H+u3nrb04+tcq1GSYzBEmKLeOQF2emk1whxlzNqb6MMrQ2JOcQEpuuiPLyRcSIw==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.13.0': - resolution: {integrity: sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==} + '@rollup/rollup-win32-ia32-msvc@4.24.0': + resolution: {integrity: sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.12.0': - resolution: {integrity: sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==} + '@rollup/rollup-win32-x64-msvc@4.21.1': + resolution: {integrity: sha512-xGiIH95H1zU7naUyTKEyOA/I0aexNMUdO9qRv0bLKN3qu25bBdrxZHqA3PTJ24YNN/GdMzG4xkDcd/GvjuhfLg==} cpu: [x64] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.13.0': - resolution: {integrity: sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==} + '@rollup/rollup-win32-x64-msvc@4.24.0': + resolution: {integrity: sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==} cpu: [x64] os: [win32] @@ -1657,38 +1771,35 @@ packages: '@sideway/pinpoint@2.0.0': resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==} - '@sinclair/typebox@0.27.8': - resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} - '@socket.io/component-emitter@3.1.0': resolution: {integrity: sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==} - '@stylistic/eslint-plugin-js@1.7.0': - resolution: {integrity: sha512-PN6On/+or63FGnhhMKSQfYcWutRlzOiYlVdLM6yN7lquoBTqUJHYnl4TA4MHwiAt46X5gRxDr1+xPZ1lOLcL+Q==} - engines: {node: ^16.0.0 || >=18.0.0} + '@stylistic/eslint-plugin-js@2.6.4': + resolution: {integrity: sha512-kx1hS3xTvzxZLdr/DCU/dLBE++vcP97sHeEFX2QXhk1Ipa4K1rzPOLw1HCbf4mU3s+7kHP5eYpDe+QteEOFLug==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: '>=8.40.0' - '@stylistic/eslint-plugin-jsx@1.7.0': - resolution: {integrity: sha512-BACdBwXakQvjYIST5N2WWhRbvhRsIxa/F59BiZol+0IH4FSmDXhie7v/yaxDIIA9CbfElzOmIA5nWNYTVXcnwQ==} - engines: {node: ^16.0.0 || >=18.0.0} + '@stylistic/eslint-plugin-jsx@2.6.4': + resolution: {integrity: sha512-bIvVhdtjmyu3S10V7QRIuawtCZSq9gRmzAX23ucjCOdSFzEwlq+di0IM0riBAvvQerrJL4SM6G3xgyPs8BSXIA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: '>=8.40.0' - '@stylistic/eslint-plugin-plus@1.7.0': - resolution: {integrity: sha512-AabDw8sXsc70Ydx3qnbeTlRHZnIwY6UKEenBPURPhY3bfYWX+/pDpZH40HkOu94v8D0DUrocPkeeEUxl4e0JDg==} + '@stylistic/eslint-plugin-plus@2.6.4': + resolution: {integrity: sha512-EuRvtxhf7Hv8OoMIePulP/6rBJIgPTu1l5GAm1780WcF1Cl8bOZXIn84Pdac5pNv6lVlzCOFm8MD3VE+2YROuA==} peerDependencies: eslint: '*' - '@stylistic/eslint-plugin-ts@1.7.0': - resolution: {integrity: sha512-QsHv98mmW1xaucVYQTyLDgEpybPJ/6jPPxVBrIchntWWwj74xCWKUiw79hu+TpYj/Pbhd9rkqJYLNq3pQGYuyA==} - engines: {node: ^16.0.0 || >=18.0.0} + '@stylistic/eslint-plugin-ts@2.6.4': + resolution: {integrity: sha512-yxL8Hj6WkObw1jfiLpBzKy5yfxY6vwlwO4miq34ySErUjUecPV5jxfVbOe4q1QDPKemQGPq93v7sAQS5PzM8lA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: '>=8.40.0' - '@stylistic/eslint-plugin@1.7.0': - resolution: {integrity: sha512-ThMUjGIi/jeWYNvOdjZkoLw1EOVs0tEuKXDgWvTn8uWaEz55HuPlajKxjKLpv19C+qRDbKczJfzUODfCdME53A==} - engines: {node: ^16.0.0 || >=18.0.0} + '@stylistic/eslint-plugin@2.6.4': + resolution: {integrity: sha512-euUGnjzH8EOqEYTGk9dB2OBINp0FX1nuO7/k4fO82zNRBIKZgJoDwTLM4Ce+Om6W1Qmh1PrZjCr4jh4tMEXGPQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: '>=8.40.0' @@ -1743,10 +1854,6 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 - '@tootallnate/once@1.1.2': - resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==} - engines: {node: '>= 6'} - '@tootallnate/once@2.0.0': resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==} engines: {node: '>= 10'} @@ -2093,9 +2200,6 @@ packages: '@turf/voronoi@7.0.0-alpha.1': resolution: {integrity: sha512-CYnsXLiMvc/jUi4fIHm5c43nmBt/J3jZgwDbe/2nJqUxfVY3YHOKRzPwweskMMij/1IWkBJcWSK+7Qp0yUZ0Tg==} - '@types/body-parser@1.19.2': - resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} - '@types/body-parser@1.19.5': resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==} @@ -2217,18 +2321,12 @@ packages: resolution: {integrity: sha512-jnvvLJVkfSf3XYEO2PpWMisaofbS+c8bqJV/G66oHcBO2Y2AsuLmJErU0mZSwtBV9cYpiraLA13e6TWWhjqJ+Q==} deprecated: This is a stub types definition. @ckeditor/ckeditor5-word-count provides its own type definitions, so you do not need this installed. - '@types/connect@3.4.35': - resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} - '@types/connect@3.4.38': resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==} '@types/cookie@0.6.0': resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} - '@types/cors@2.8.13': - resolution: {integrity: sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==} - '@types/d3-dsv@3.0.0': resolution: {integrity: sha512-o0/7RlMl9p5n6FQDptuJVMxDf/7EDEv2SYEO/CwdG2tr1hTfUVi0Iavkk2ax+VpaQ/1jVhpnj5rq1nj8vwhn2A==} @@ -2238,17 +2336,17 @@ packages: '@types/debug@4.1.12': resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==} - '@types/duplexify@3.6.1': - resolution: {integrity: sha512-n0zoEj/fMdMOvqbHxmqnza/kXyoGgJmEpsXjpP+gEqE1Ye4yNqc7xWipKnUoMpWhMuzJQSfK2gMrwlElly7OGQ==} - '@types/eslint@8.56.7': resolution: {integrity: sha512-SjDvI/x3zsZnOkYZ3lCt9lOZWZLB2jIlNKz+LBgCtDurK0JZcwucxYHn1w2BJkD34dgX9Tjnak0txtq4WTggEA==} + '@types/eslint@9.6.1': + resolution: {integrity: sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==} + '@types/estree@1.0.5': resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} - '@types/express-serve-static-core@4.17.33': - resolution: {integrity: sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==} + '@types/estree@1.0.6': + resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} '@types/express-serve-static-core@4.17.41': resolution: {integrity: sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==} @@ -2256,9 +2354,6 @@ packages: '@types/express@4.17.21': resolution: {integrity: sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==} - '@types/express@4.17.3': - resolution: {integrity: sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==} - '@types/extend@3.0.4': resolution: {integrity: sha512-ArMouDUTJEz1SQRpFsT2rIw7DeqICFv5aaVzLSIYMYQSLcwcGOfT3VyglQs/p7K3F7fT4zxr0NWxYZIdifD6dA==} @@ -2271,24 +2366,12 @@ packages: '@types/geojson@7946.0.8': resolution: {integrity: sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==} - '@types/glob@8.1.0': - resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==} - - '@types/google.maps@3.48.3': - resolution: {integrity: sha512-JQuLWAEXDorNfarQy22WbIezbPKhLnsTBnDw25vyg61USZLTK8KqE1glNyASKn2v2mUOcEIWFMNHX5hNzjuw/g==} - '@types/hast@2.3.10': resolution: {integrity: sha512-McWspRw8xx8J9HurkVBfYj0xKoE25tOFlHGdx4MJ5xORQrMGZNqJhVQWaIbm6Oyla5kYOXtDiopzKRJzEOkwJw==} - '@types/hogan.js@3.0.1': - resolution: {integrity: sha512-D03i/2OY7kGyMq9wdQ7oD8roE49z/ZCZThe/nbahtvuqCNZY9T2MfedOWyeBdbEpY2W8Gnh/dyJLdFtUCOkYbg==} - '@types/http-errors@2.0.4': resolution: {integrity: sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==} - '@types/json-schema@7.0.11': - resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} - '@types/json-schema@7.0.13': resolution: {integrity: sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==} @@ -2298,9 +2381,6 @@ packages: '@types/jsonwebtoken@9.0.5': resolution: {integrity: sha512-VRLSGzik+Unrup6BsouBeHsf4d1hOEgYWTm/7Nmw1sXoN1+tRly/Gy/po3yeahnP4jfnQWWAhQAqcNfH7ngOkA==} - '@types/linkify-it@3.0.2': - resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==} - '@types/long@4.0.2': resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==} @@ -2310,27 +2390,15 @@ packages: '@types/mapbox__mapbox-gl-geocoder@4.7.3': resolution: {integrity: sha512-zGVxbyEnJnVc37KpgCDRh1nTvVwVNTcqIDFgE5aETD2iOGDVVZpVDJRE3TUrTjdHxaq89767U8kxGcc8Pnv/ag==} - '@types/markdown-it@12.2.3': - resolution: {integrity: sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==} - '@types/mdast@3.0.15': resolution: {integrity: sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==} - '@types/mdurl@1.0.2': - resolution: {integrity: sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==} - '@types/mime@1.3.5': resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==} - '@types/mime@3.0.1': - resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==} - '@types/mime@3.0.4': resolution: {integrity: sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==} - '@types/minimatch@5.1.2': - resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} - '@types/ms@0.7.34': resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} @@ -2343,14 +2411,17 @@ packages: '@types/node@20.11.0': resolution: {integrity: sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==} + '@types/node@22.5.1': + resolution: {integrity: sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==} + '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} '@types/parse5@6.0.3': resolution: {integrity: sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==} - '@types/pg@8.10.9': - resolution: {integrity: sha512-UksbANNE/f8w0wOMxVKKIrLCbEMV+oM1uKejmwXr39olg4xqcfBDbXxObJAt6XxHbDa4XTKOlUEcEltXDX+XLQ==} + '@types/pg@8.11.8': + resolution: {integrity: sha512-IqpCf8/569txXN/HoP5i1LjXfKZWL76Yr2R77xgeIICUbAYHeoaEZFhYHo2uDftecLWrTJUq63JvQu8q3lnDyA==} '@types/phoenix@1.6.4': resolution: {integrity: sha512-B34A7uot1Cv0XtaHRYDATltAdKx0BvVKNgYNqE4WjtPUa4VQJM7kxeXcVKaH+KS+kCmZ+6w+QaUdcljiheiBJA==} @@ -2361,12 +2432,6 @@ packages: '@types/qs@6.9.11': resolution: {integrity: sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==} - '@types/qs@6.9.7': - resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==} - - '@types/range-parser@1.2.4': - resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==} - '@types/range-parser@1.2.7': resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==} @@ -2376,21 +2441,12 @@ packages: '@types/request@2.48.12': resolution: {integrity: sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==} - '@types/rimraf@3.0.2': - resolution: {integrity: sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==} - '@types/semver@7.5.3': resolution: {integrity: sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==} - '@types/semver@7.5.7': - resolution: {integrity: sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==} - '@types/send@0.17.4': resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==} - '@types/serve-static@1.15.1': - resolution: {integrity: sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==} - '@types/serve-static@1.15.5': resolution: {integrity: sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==} @@ -2412,74 +2468,44 @@ packages: '@types/yoga-layout@1.9.2': resolution: {integrity: sha512-S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==} - '@typescript-eslint/eslint-plugin@6.21.0': - resolution: {integrity: sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha - eslint: ^7.0.0 || ^8.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - - '@typescript-eslint/eslint-plugin@7.5.0': - resolution: {integrity: sha512-HpqNTH8Du34nLxbKgVMGljZMG0rJd2O9ecvr2QLYp+7512ty1j42KnsFwspPXg1Vh8an9YImf6CokUBltisZFQ==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/eslint-plugin@8.3.0': + resolution: {integrity: sha512-FLAIn63G5KH+adZosDYiutqkOkYEx0nvcwNNfJAf+c7Ae/H35qWwTYvPZUKFj5AS+WfHG/WJJfWnDnyNUlp8UA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - '@typescript-eslint/parser': ^7.0.0 - eslint: ^8.56.0 + '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 + eslint: ^8.57.0 || ^9.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true - '@typescript-eslint/parser@7.5.0': - resolution: {integrity: sha512-cj+XGhNujfD2/wzR1tabNsidnYRaFfEkcULdcIyVBYcXjBvBKOes+mpMBP7hMpOyk+gBcfXsrg4NBGAStQyxjQ==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/parser@8.3.0': + resolution: {integrity: sha512-h53RhVyLu6AtpUzVCYLPhZGL5jzTD9fZL+SYf/+hYOx2bDkyQXztXSc4tbvKYHzfMXExMLiL9CWqJmVz6+78IQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.56.0 + eslint: ^8.57.0 || ^9.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true - '@typescript-eslint/scope-manager@6.21.0': - resolution: {integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==} - engines: {node: ^16.0.0 || >=18.0.0} - '@typescript-eslint/scope-manager@6.7.3': resolution: {integrity: sha512-wOlo0QnEou9cHO2TdkJmzF7DFGvAKEnB82PuPNHpT8ZKKaZu6Bm63ugOTn9fXNJtvuDPanBc78lGUGGytJoVzQ==} engines: {node: ^16.0.0 || >=18.0.0} - '@typescript-eslint/scope-manager@7.5.0': - resolution: {integrity: sha512-Z1r7uJY0MDeUlql9XJ6kRVgk/sP11sr3HKXn268HZyqL7i4cEfrdFuSSY/0tUqT37l5zT0tJOsuDP16kio85iA==} - engines: {node: ^18.18.0 || >=20.0.0} - - '@typescript-eslint/type-utils@6.21.0': - resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - eslint: ^7.0.0 || ^8.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true + '@typescript-eslint/scope-manager@8.3.0': + resolution: {integrity: sha512-mz2X8WcN2nVu5Hodku+IR8GgCOl4C0G/Z1ruaWN4dgec64kDBabuXyPAr+/RgJtumv8EEkqIzf3X2U5DUKB2eg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@7.5.0': - resolution: {integrity: sha512-A021Rj33+G8mx2Dqh0nMO9GyjjIBK3MqgVgZ2qlKf6CJy51wY/lkkFqq3TqqnH34XyAHUkq27IjlUkWlQRpLHw==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/type-utils@8.3.0': + resolution: {integrity: sha512-wrV6qh//nLbfXZQoj32EXKmwHf4b7L+xXLrP3FZ0GOUU72gSvLjeWUl5J5Ue5IwRxIV1TfF73j/eaBapxx99Lg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.56.0 typescript: '*' peerDependenciesMeta: typescript: optional: true - '@typescript-eslint/types@6.21.0': - resolution: {integrity: sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==} - engines: {node: ^16.0.0 || >=18.0.0} - '@typescript-eslint/types@6.7.3': resolution: {integrity: sha512-4g+de6roB2NFcfkZb439tigpAMnvEIg3rIjWQ+EM7IBaYt/CdJt6em9BJ4h4UpdgaBWdmx2iWsafHTrqmgIPNw==} engines: {node: ^16.0.0 || >=18.0.0} @@ -2488,14 +2514,9 @@ packages: resolution: {integrity: sha512-tv5B4IHeAdhR7uS4+bf8Ov3k793VEVHd45viRRkehIUZxm0WF82VPiLgHzA/Xl4TGPg1ZD49vfxBKFPecD5/mg==} engines: {node: ^18.18.0 || >=20.0.0} - '@typescript-eslint/typescript-estree@6.21.0': - resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true + '@typescript-eslint/types@8.3.0': + resolution: {integrity: sha512-y6sSEeK+facMaAyixM36dQ5NVXTnKWunfD1Ft4xraYqxP0lC0POJmIaL/mw72CUMqjY9qfyVfXafMeaUj0noWw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@typescript-eslint/typescript-estree@6.7.3': resolution: {integrity: sha512-YLQ3tJoS4VxLFYHTw21oe1/vIZPRqAO91z6Uv0Ss2BKm/Ag7/RVQBcXTGcXhgJMdA4U+HrKuY5gWlJlvoaKZ5g==} @@ -2506,44 +2527,34 @@ packages: typescript: optional: true - '@typescript-eslint/typescript-estree@7.5.0': - resolution: {integrity: sha512-YklQQfe0Rv2PZEueLTUffiQGKQneiIEKKnfIqPIOxgM9lKSZFCjT5Ad4VqRKj/U4+kQE3fa8YQpskViL7WjdPQ==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/typescript-estree@8.3.0': + resolution: {integrity: sha512-Mq7FTHl0R36EmWlCJWojIC1qn/ZWo2YiWYc1XVtasJ7FIgjo0MVv9rZWXEE7IK2CGrtwe1dVOxWwqXUdNgfRCA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true - '@typescript-eslint/utils@6.21.0': - resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - eslint: ^7.0.0 || ^8.0.0 - '@typescript-eslint/utils@6.7.3': resolution: {integrity: sha512-vzLkVder21GpWRrmSR9JxGZ5+ibIUSudXlW52qeKpzUEQhRSmyZiVDDj3crAth7+5tmN1ulvgKaCU2f/bPRCzg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 - '@typescript-eslint/utils@7.5.0': - resolution: {integrity: sha512-3vZl9u0R+/FLQcpy2EHyRGNqAS/ofJ3Ji8aebilfJe+fobK8+LbIFmrHciLVDxjDoONmufDcnVSF38KwMEOjzw==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/utils@8.3.0': + resolution: {integrity: sha512-F77WwqxIi/qGkIGOGXNBLV7nykwfjLsdauRB/DOFPdv6LTF3BHHkBpq81/b5iMPSF055oO2BiivDJV4ChvNtXA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.56.0 - - '@typescript-eslint/visitor-keys@6.21.0': - resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==} - engines: {node: ^16.0.0 || >=18.0.0} + eslint: ^8.57.0 || ^9.0.0 '@typescript-eslint/visitor-keys@6.7.3': resolution: {integrity: sha512-HEVXkU9IB+nk9o63CeICMHxFWbHWr3E1mpilIQBe9+7L/lH97rleFLVtYsfnWB+JVMaiFnEaxvknvmIzX+CqVg==} engines: {node: ^16.0.0 || >=18.0.0} - '@typescript-eslint/visitor-keys@7.5.0': - resolution: {integrity: sha512-mcuHM/QircmA6O7fy6nn2w/3ditQkj+SgtOc8DW3uQ10Yfj42amm2i+6F2K4YAOPNNTmE6iM1ynM6lrSwdendA==} - engines: {node: ^18.18.0 || >=20.0.0} + '@typescript-eslint/visitor-keys@8.3.0': + resolution: {integrity: sha512-RmZwrTbQ9QveF15m/Cl28n0LXD6ea2CjkhH5rQ55ewz3H24w+AMCJHPVYaZ8/0HoG8Z3cLLFFycRXxeO2tz9FA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@typescript/twoslash@3.1.0': resolution: {integrity: sha512-kTwMUQ8xtAZaC4wb2XuLkPqFVBj2dNBueMQ89NWEuw87k2nLBbuafeG5cob/QEr6YduxIdTVUjix0MtC7mPlmg==} @@ -2557,9 +2568,6 @@ packages: '@typescript/vfs@1.5.0': resolution: {integrity: sha512-AJS307bPgbsZZ9ggCT3wwpg3VbTKMFNHfaY/uF0ahSkYYrPF2dSSKDNIDIQAHm9qJqbLvCsSJH7yN4Vs/CsMMg==} - '@ungap/structured-clone@1.2.0': - resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} - '@unocss/astro@0.58.5': resolution: {integrity: sha512-LtuVnj8oFAK9663OVhQO8KpdJFiOyyPsYfnOZlDCOFK3gHb/2WMrzdBwr1w8LoQF3bDedkFMKirVF7gWjyZiaw==} peerDependencies: @@ -2649,72 +2657,92 @@ packages: peerDependencies: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 - '@vitest/expect@1.4.0': - resolution: {integrity: sha512-Jths0sWCJZ8BxjKe+p+eKsoqev1/T8lYcrjavEaz8auEJ4jAVY0GwW3JKmdVU4mmNPLPHixh4GNXP7GFtAiDHA==} + '@vitest/eslint-plugin@1.1.0': + resolution: {integrity: sha512-Ur80Y27Wbw8gFHJ3cv6vypcjXmrx6QHfw+q435h6Q2L+tf+h4Xf5pJTCL4YU/Jps9EVeggQxS85OcUZU7sdXRw==} + peerDependencies: + '@typescript-eslint/utils': '>= 8.0' + eslint: '>= 8.57.0' + typescript: '>= 5.0.0' + vitest: '*' + peerDependenciesMeta: + '@typescript-eslint/utils': + optional: true + typescript: + optional: true + vitest: + optional: true + + '@vitest/expect@2.1.3': + resolution: {integrity: sha512-SNBoPubeCJhZ48agjXruCI57DvxcsivVDdWz+SSsmjTT4QN/DfHk3zB/xKsJqMs26bLZ/pNRLnCf0j679i0uWQ==} - '@vitest/runner@1.4.0': - resolution: {integrity: sha512-EDYVSmesqlQ4RD2VvWo3hQgTJ7ZrFQ2VSJdfiJiArkCerDAGeyF1i6dHkmySqk573jLp6d/cfqCN+7wUB5tLgg==} + '@vitest/mocker@2.1.3': + resolution: {integrity: sha512-eSpdY/eJDuOvuTA3ASzCjdithHa+GIF1L4PqtEELl6Qa3XafdMLBpBlZCIUCX2J+Q6sNmjmxtosAG62fK4BlqQ==} + peerDependencies: + '@vitest/spy': 2.1.3 + msw: ^2.3.5 + vite: ^5.0.0 + peerDependenciesMeta: + msw: + optional: true + vite: + optional: true - '@vitest/snapshot@1.4.0': - resolution: {integrity: sha512-saAFnt5pPIA5qDGxOHxJ/XxhMFKkUSBJmVt5VgDsAqPTX6JP326r5C/c9UuCMPoXNzuudTPsYDZCoJ5ilpqG2A==} + '@vitest/pretty-format@2.1.3': + resolution: {integrity: sha512-XH1XdtoLZCpqV59KRbPrIhFCOO0hErxrQCMcvnQete3Vibb9UeIOX02uFPfVn3Z9ZXsq78etlfyhnkmIZSzIwQ==} - '@vitest/spy@1.4.0': - resolution: {integrity: sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==} + '@vitest/runner@2.1.3': + resolution: {integrity: sha512-JGzpWqmFJ4fq5ZKHtVO3Xuy1iF2rHGV4d/pdzgkYHm1+gOzNZtqjvyiaDGJytRyMU54qkxpNzCx+PErzJ1/JqQ==} - '@vitest/ui@1.4.0': - resolution: {integrity: sha512-XC6CMhN1gzYcGbpn6/Oanj4Au2EXwQEX6vpcOeLlZv8dy7g11Ukx8zwtYQbwxs9duK2s9j2o5rbQiCP5DPAcmw==} - peerDependencies: - vitest: 1.4.0 + '@vitest/snapshot@2.1.3': + resolution: {integrity: sha512-qWC2mWc7VAXmjAkEKxrScWHWFyCQx/cmiZtuGqMi+WwqQJ2iURsVY4ZfAK6dVo6K2smKRU6l3BPwqEBvhnpQGg==} - '@vitest/utils@1.4.0': - resolution: {integrity: sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==} + '@vitest/spy@2.1.3': + resolution: {integrity: sha512-Nb2UzbcUswzeSP7JksMDaqsI43Sj5+Kry6ry6jQJT4b5gAK+NS9NED6mDb8FlMRCX8m5guaHCDZmqYMMWRy5nQ==} - '@vue/compiler-core@3.4.21': - resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==} + '@vitest/ui@2.1.3': + resolution: {integrity: sha512-2XwTrHVJw3t9NYES26LQUYy51ZB8W4bRPgqUH2Eyda3kIuOlYw1ZdPNU22qcVlUVx4WKgECFQOSXuopsczuVjQ==} + peerDependencies: + vitest: 2.1.3 - '@vue/compiler-dom@3.4.21': - resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==} + '@vitest/utils@2.1.3': + resolution: {integrity: sha512-xpiVfDSg1RrYT0tX6czgerkpcKFmFOF/gCr30+Mve5V2kewCy4Prn1/NDMSRwaSmT7PRaOF83wu+bEtsY1wrvA==} - '@vue/compiler-sfc@3.4.21': - resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==} + '@vue/compiler-core@3.4.38': + resolution: {integrity: sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A==} - '@vue/compiler-ssr@3.4.21': - resolution: {integrity: sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==} + '@vue/compiler-dom@3.4.38': + resolution: {integrity: sha512-Osc/c7ABsHXTsETLgykcOwIxFktHfGSUDkb05V61rocEfsFDcjDLH/IHJSNJP+/Sv9KeN2Lx1V6McZzlSb9EhQ==} - '@vue/shared@3.4.21': - resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==} + '@vue/compiler-sfc@3.4.38': + resolution: {integrity: sha512-s5QfZ+9PzPh3T5H4hsQDJtI8x7zdJaew/dCGgqZ2630XdzaZ3AD8xGZfBqpT8oaD/p2eedd+pL8tD5vvt5ZYJQ==} - abbrev@1.1.1: - resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} + '@vue/compiler-ssr@3.4.38': + resolution: {integrity: sha512-YXznKFQ8dxYpAz9zLuVvfcXhc31FSPFDcqr0kyujbOwNhlmaNvL2QfIy+RZeJgSn5Fk54CWoEUeW+NVBAogGaw==} - abbrev@2.0.0: - resolution: {integrity: sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + '@vue/shared@3.4.38': + resolution: {integrity: sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==} abort-controller@3.0.0: resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==} engines: {node: '>=6.5'} - accepts@1.3.8: - resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} - engines: {node: '>= 0.6'} - acorn-jsx@5.3.2: resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 - acorn-walk@8.3.2: - resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==} + acorn@8.11.3: + resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} engines: {node: '>=0.4.0'} + hasBin: true - acorn@8.10.0: - resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} + acorn@8.12.1: + resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==} engines: {node: '>=0.4.0'} hasBin: true - acorn@8.11.3: - resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} + acorn@8.13.0: + resolution: {integrity: sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==} engines: {node: '>=0.4.0'} hasBin: true @@ -2730,43 +2758,15 @@ packages: resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==} engines: {node: '>= 14'} - aggregate-error@3.1.0: - resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==} - engines: {node: '>=8'} - - ajv-formats@2.1.1: - resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==} - peerDependencies: - ajv: ^8.0.0 - peerDependenciesMeta: - ajv: - optional: true - ajv@6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} - ajv@8.11.0: - resolution: {integrity: sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==} - - algoliasearch-helper@3.7.4: - resolution: {integrity: sha512-KmJrsHVm5TmxZ9Oj53XdXuM4CQeu7eVFnB15tpSFt+7is1d1yVCv3hxCLMqYSw/rH42ccv013miQpRr268P8vw==} - deprecated: 3.7.3 - peerDependencies: - algoliasearch: '>= 3.1 < 5' - algoliasearch@4.13.0: resolution: {integrity: sha512-oHv4faI1Vl2s+YC0YquwkK/TsaJs79g2JFg5FDm2rKN12VItPTAeQ7hyJMHarOPPYuCnNC5kixbtcqvb21wchw==} - ansi-align@3.0.1: - resolution: {integrity: sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==} - - ansi-escapes@4.3.2: - resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==} - engines: {node: '>=8'} - - ansi-escapes@6.2.0: - resolution: {integrity: sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==} - engines: {node: '>=14.16'} + ansi-escapes@7.0.0: + resolution: {integrity: sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==} + engines: {node: '>=18'} ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} @@ -2784,29 +2784,14 @@ packages: resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} - ansi-styles@5.2.0: - resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} - engines: {node: '>=10'} - ansi-styles@6.2.1: resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} engines: {node: '>=12'} - ansicolors@0.3.2: - resolution: {integrity: sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==} - anymatch@3.1.3: resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} engines: {node: '>= 8'} - archiver-utils@2.1.0: - resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==} - engines: {node: '>= 6'} - - archiver@5.3.1: - resolution: {integrity: sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==} - engines: {node: '>= 10'} - are-docs-informative@0.0.2: resolution: {integrity: sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==} engines: {node: '>=14'} @@ -2814,20 +2799,15 @@ packages: arg@5.0.2: resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} - argparse@1.0.10: - resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} - argparse@2.0.1: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} aria-query@5.3.0: resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==} - array-flatten@1.1.1: - resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==} - - array-flatten@3.0.0: - resolution: {integrity: sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA==} + aria-query@5.3.2: + resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==} + engines: {node: '>= 0.4'} array-union@2.1.0: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} @@ -2837,54 +2817,26 @@ packages: resolution: {integrity: sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==} engines: {node: '>=8'} - as-array@2.0.0: - resolution: {integrity: sha512-1Sd1LrodN0XYxYeZcN1J4xYZvmvTwD5tDWaPUGPIzH1mFsmzsPnVtd2exWhecMjtZk/wYWjNZJiD3b1SLCeJqg==} - - asn1@0.2.6: - resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==} - - assert-plus@1.0.0: - resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==} - engines: {node: '>=0.8'} - - assertion-error@1.1.0: - resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==} - - ast-types@0.13.4: - resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==} - engines: {node: '>=4'} - - astral-regex@2.0.0: - resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==} - engines: {node: '>=8'} - - async-lock@1.3.2: - resolution: {integrity: sha512-phnXdS3RP7PPcmP6NWWzWMU0sLTeyvtZCxBPpZdkYE3seGLKSQZs9FrmVO/qwypq98FUtWWUEYxziLkdGk5nnA==} + assertion-error@2.0.1: + resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==} + engines: {node: '>=12'} async-retry@1.3.3: resolution: {integrity: sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==} - async@2.6.4: - resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} - - async@3.2.3: - resolution: {integrity: sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==} - asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} - aws-sign2@0.7.0: - resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==} - - aws4@1.11.0: - resolution: {integrity: sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==} - axios@1.6.7: resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==} axobject-query@4.0.0: resolution: {integrity: sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==} + axobject-query@4.1.0: + resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==} + engines: {node: '>= 0.4'} + bail@2.0.2: resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==} @@ -2894,16 +2846,6 @@ packages: base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} - basic-auth-connect@1.0.0: - resolution: {integrity: sha512-kiV+/DTgVro4aZifY/hwRwALBISViL5NP4aReaR2EVJEObpbUBHIkdJh/YpcoEiYt7nBodZ6U2ajZeZvSxUCCg==} - - basic-auth@2.0.1: - resolution: {integrity: sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==} - engines: {node: '>= 0.8'} - - bcrypt-pbkdf@1.0.2: - resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==} - bignumber.js@9.0.2: resolution: {integrity: sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==} @@ -2915,23 +2857,12 @@ packages: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} - bl@4.1.0: - resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==} - bluebird@3.7.2: resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==} - body-parser@1.20.1: - resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==} - engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} - boolbase@1.0.0: resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} - boxen@5.1.2: - resolution: {integrity: sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==} - engines: {node: '>=10'} - brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} @@ -2942,11 +2873,20 @@ packages: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} engines: {node: '>=8'} + braces@3.0.3: + resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} + engines: {node: '>=8'} + browserslist@4.23.0: resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true + browserslist@4.23.3: + resolution: {integrity: sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + buffer-crc32@0.2.13: resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} @@ -2957,69 +2897,36 @@ packages: resolution: {integrity: sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==} engines: {node: '>=4'} - buffer@5.7.1: - resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} - builtin-modules@3.3.0: resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} engines: {node: '>=6'} - builtins@5.0.1: - resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} - - bytes@3.0.0: - resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==} - engines: {node: '>= 0.8'} - - bytes@3.1.2: - resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} - engines: {node: '>= 0.8'} - cac@6.7.14: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} engines: {node: '>=8'} - cacache@18.0.2: - resolution: {integrity: sha512-r3NU8h/P+4lVUHfeRw1dtgQYar3DZMm4/cm2bZgOvrFC/su7budSOeqh52VJIC4U4iG1WWwV6vRW0znqBvxNuw==} - engines: {node: ^16.14.0 || >=18.0.0} - call-bind@1.0.2: resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} - call-me-maybe@1.0.1: - resolution: {integrity: sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==} - callsites@3.1.0: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} - camelcase@6.3.0: - resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} - engines: {node: '>=10'} - camelize@1.0.1: resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==} caniuse-lite@1.0.30001589: resolution: {integrity: sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg==} - cardinal@2.1.1: - resolution: {integrity: sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==} - hasBin: true - - caseless@0.12.0: - resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} - - catharsis@0.9.0: - resolution: {integrity: sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==} - engines: {node: '>= 10'} + caniuse-lite@1.0.30001653: + resolution: {integrity: sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw==} ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} - chai@4.4.1: - resolution: {integrity: sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==} - engines: {node: '>=4'} + chai@5.1.1: + resolution: {integrity: sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==} + engines: {node: '>=12'} chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -3029,8 +2936,8 @@ packages: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} engines: {node: '>=10'} - chalk@5.2.0: - resolution: {integrity: sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==} + chalk@5.3.0: + resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} character-entities-html4@2.1.0: @@ -3051,20 +2958,14 @@ packages: character-reference-invalid@1.1.4: resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==} - chardet@0.7.0: - resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} - - check-error@1.0.3: - resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==} + check-error@2.1.1: + resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} + engines: {node: '>= 16'} check-more-types@2.24.0: resolution: {integrity: sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==} engines: {node: '>= 0.8.0'} - chokidar@3.5.3: - resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} - engines: {node: '>= 8.10.0'} - chokidar@3.6.0: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} engines: {node: '>= 8.10.0'} @@ -3073,17 +2974,10 @@ packages: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} - ci-info@2.0.0: - resolution: {integrity: sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==} - ci-info@4.0.0: resolution: {integrity: sha512-TdHqgGf9odd8SXNuxtUBVx8Nv+qZOejE6qyqiy5NtbYYQOeFa6zmHkxlPzmaLxWWHsU6nJmB7AETdVPi+2NBUg==} engines: {node: '>=8'} - cjson@0.3.3: - resolution: {integrity: sha512-yKNcXi/Mvi5kb1uK0sahubYiyfUO2EUgOp4NcY9+8NX5Xmc+4yeNogZuLFkpLBBj7/QI9MjRUIuXrV9XOw5kVg==} - engines: {node: '>= 0.3.0'} - ckeditor5-build-classic-with-alignment-underline-smallcaps@1.0.0: resolution: {integrity: sha512-25alYsrhgTsg51MkgGjfFk+aFbBVVEEA2dDOfoAc9rv4r30bNVN0DbKCLyRLiNJnEZrLIEASf7VOq8JmNa4TZg==} engines: {node: '>=6.9.0', npm: '>=3.0.0'} @@ -3096,57 +2990,22 @@ packages: resolution: {integrity: sha512-KE6H2WGLlhlI4F//AZn+fv52DhbwAeVv+ZeSIsa5gC81/3ZCzuYc3+IMur/70IBE9Gze8gKwFP9elh/TIaQ5Hw==} engines: {node: '>=16.0.0', npm: '>=5.7.1'} - classnames@2.3.1: - resolution: {integrity: sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==} - clean-regexp@1.0.0: resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==} engines: {node: '>=4'} - clean-stack@2.2.0: - resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==} - engines: {node: '>=6'} - - cli-boxes@2.2.1: - resolution: {integrity: sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==} - engines: {node: '>=6'} - - cli-cursor@3.1.0: - resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==} - engines: {node: '>=8'} - - cli-spinners@2.6.1: - resolution: {integrity: sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==} - engines: {node: '>=6'} - - cli-table3@0.6.3: - resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==} - engines: {node: 10.* || >= 12.*} - - cli-table@0.3.11: - resolution: {integrity: sha512-IqLQi4lO0nIB4tcdTpN4LCB9FI3uqrJZK7RC515EnhZ6qBaglkIgICb1wjeAqpdoOabm1+SuQtkXIPdYC93jhQ==} - engines: {node: '>= 0.2.0'} - - cli-truncate@2.1.0: - resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==} - engines: {node: '>=8'} - - cli-truncate@3.1.0: - resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + cli-cursor@5.0.0: + resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==} + engines: {node: '>=18'} - cli-width@3.0.0: - resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==} - engines: {node: '>= 10'} + cli-truncate@4.0.0: + resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==} + engines: {node: '>=18'} cliui@8.0.1: resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} engines: {node: '>=12'} - clone@1.0.4: - resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==} - engines: {node: '>=0.8'} - cmd-shim@6.0.2: resolution: {integrity: sha512-+FFYbB0YLaAkhkcrjkyNLYDiOsFSfRjwjY19LXk/psmMx1z00xlCv7hhQoTGXXIKi+YXHL/iiFo8NqMVQX9nOw==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -3173,25 +3032,9 @@ packages: color-parse@1.4.2: resolution: {integrity: sha512-RI7s49/8yqDj3fECFZjUI1Yi0z/Gq1py43oNJivAIIDSyJiOZLfYCRQEgn8HEVAj++PcRe8AnL2XF0fRJ3BTnA==} - color-string@1.9.1: - resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==} - - color@3.2.1: - resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==} - - colorette@2.0.19: - resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==} - colorette@2.0.20: resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} - colors@1.0.3: - resolution: {integrity: sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw==} - engines: {node: '>=0.1.90'} - - colorspace@1.1.4: - resolution: {integrity: sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==} - combined-stream@1.0.8: resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==} engines: {node: '>= 0.8'} @@ -3202,17 +3045,13 @@ packages: comma-separated-tokens@2.0.3: resolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==} - commander@10.0.1: - resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==} - engines: {node: '>=14'} + commander@12.1.0: + resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==} + engines: {node: '>=18'} commander@2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} - commander@4.1.1: - resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} - engines: {node: '>= 6'} - commander@7.2.0: resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==} engines: {node: '>= 10'} @@ -3225,103 +3064,40 @@ packages: resolution: {integrity: sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==} engines: {node: '>= 12.0.0'} - compress-commons@4.1.1: - resolution: {integrity: sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==} - engines: {node: '>= 10'} - compressible@2.0.18: resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==} engines: {node: '>= 0.6'} - compression@1.7.4: - resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==} - engines: {node: '>= 0.8.0'} - concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} concaveman@1.2.1: resolution: {integrity: sha512-PwZYKaM/ckQSa8peP5JpVr7IMJ4Nn/MHIaWUjP4be+KoZ7Botgs8seAZGpmaOM+UZXawcdYRao/px9ycrCihHw==} - config-chain@1.1.13: - resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} - - configstore@5.0.1: - resolution: {integrity: sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==} - engines: {node: '>=8'} - - connect@3.7.0: - resolution: {integrity: sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==} - engines: {node: '>= 0.10.0'} - consola@3.2.3: resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} engines: {node: ^14.18.0 || >=16.10.0} - content-disposition@0.5.4: - resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==} - engines: {node: '>= 0.6'} - - content-type@1.0.5: - resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} - engines: {node: '>= 0.6'} - convert-source-map@2.0.0: resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - cookie-signature@1.0.6: - resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==} - - cookie@0.5.0: - resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==} - engines: {node: '>= 0.6'} - cookie@0.6.0: resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} engines: {node: '>= 0.6'} - core-js-compat@3.36.1: - resolution: {integrity: sha512-Dk997v9ZCt3X/npqzyGdTlq6t7lDBhZwGvV94PKzDArjp7BTRm7WlDAXYd/OWdeFHO8OChQYRJNJvUCqCbrtKA==} - - core-util-is@1.0.2: - resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==} + core-js-compat@3.38.1: + resolution: {integrity: sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==} core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} - cors@2.8.5: - resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==} - engines: {node: '>= 0.10'} - - crc-32@1.2.2: - resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==} - engines: {node: '>=0.8'} - hasBin: true - - crc32-stream@4.0.2: - resolution: {integrity: sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==} - engines: {node: '>= 10'} - crelt@1.0.6: resolution: {integrity: sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==} - cross-env@5.2.1: - resolution: {integrity: sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==} - engines: {node: '>=4.0'} - hasBin: true - - cross-spawn@6.0.5: - resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==} - engines: {node: '>=4.8'} - cross-spawn@7.0.3: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} - crypto-random-string@2.0.0: - resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} - engines: {node: '>=8'} - css-background-parser@0.1.0: resolution: {integrity: sha512-2EZLisiZQ+7m4wwur/qiYJRniHX4K5Tc9w93MT3AS0WS1u5kaZ4FKXlOTBhOjc+CgEgPiGY+fX1yWD8UwpEqUA==} @@ -3377,14 +3153,6 @@ packages: d3-voronoi@1.1.2: resolution: {integrity: sha512-RhGS1u2vavcO7ay7ZNAPo4xeDh/VYeGof3x5ZLJBQgYhLegxr3s5IykvWmJ94FTU6mcbtp4sloqZ54mP6R4Utw==} - dashdash@1.14.1: - resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==} - engines: {node: '>=0.10'} - - data-uri-to-buffer@3.0.1: - resolution: {integrity: sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==} - engines: {node: '>= 6'} - data-uri-to-buffer@4.0.0: resolution: {integrity: sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==} engines: {node: '>= 12'} @@ -3397,24 +3165,25 @@ packages: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} - debug@2.6.9: - resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} + debug@3.2.7: + resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} peerDependencies: supports-color: '*' peerDependenciesMeta: supports-color: optional: true - debug@3.2.7: - resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} + debug@4.3.4: + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} peerDependencies: supports-color: '*' peerDependenciesMeta: supports-color: optional: true - debug@4.3.1: - resolution: {integrity: sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==} + debug@4.3.6: + resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==} engines: {node: '>=6.0'} peerDependencies: supports-color: '*' @@ -3422,8 +3191,8 @@ packages: supports-color: optional: true - debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + debug@4.3.7: + resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} engines: {node: '>=6.0'} peerDependencies: supports-color: '*' @@ -3437,20 +3206,13 @@ packages: dedent-js@1.0.1: resolution: {integrity: sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ==} - deep-eql@4.1.3: - resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==} + deep-eql@5.0.2: + resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==} engines: {node: '>=6'} deep-equal@1.1.1: resolution: {integrity: sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==} - deep-extend@0.6.0: - resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==} - engines: {node: '>=4.0.0'} - - deep-freeze@0.0.1: - resolution: {integrity: sha512-Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg==} - deep-is@0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} @@ -3458,9 +3220,6 @@ packages: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} - defaults@1.0.3: - resolution: {integrity: sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==} - define-properties@1.1.4: resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==} engines: {node: '>= 0.4'} @@ -3468,10 +3227,6 @@ packages: defu@6.1.4: resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==} - degenerator@3.0.2: - resolution: {integrity: sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ==} - engines: {node: '>= 6'} - delayed-stream@1.0.0: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} @@ -3479,10 +3234,6 @@ packages: density-clustering@1.3.0: resolution: {integrity: sha512-icpmBubVTwLnsaor9qH/4tG5+7+f61VcqMN3V3pm9sxxSCt2Jcs0zWOgwZW9ARJYaKD3FumIgHiMOcIMRRAzFQ==} - depd@2.0.0: - resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==} - engines: {node: '>= 0.8'} - dequal@2.0.3: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} @@ -3490,10 +3241,6 @@ packages: destr@2.0.3: resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==} - destroy@1.2.0: - resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} - engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16} - detect-indent@6.1.0: resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} engines: {node: '>=8'} @@ -3506,10 +3253,6 @@ packages: devalue@4.3.2: resolution: {integrity: sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==} - diff-sequences@29.6.3: - resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - diff@5.2.0: resolution: {integrity: sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==} engines: {node: '>=0.3.1'} @@ -3522,14 +3265,13 @@ packages: resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} engines: {node: '>=6.0.0'} - dot-prop@5.3.0: - resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==} - engines: {node: '>=8'} - dotenv@16.0.2: resolution: {integrity: sha512-JvpYKUmzQhYoIFgK2MOnF3bciIZoItIIoryihy0rIA+H4Jy0FmgyKYAHCTN98P5ybGSJcIFbh6QKeJdtZd1qhA==} engines: {node: '>=12'} + dpack@0.6.22: + resolution: {integrity: sha512-WGPNlW2OAE7Bj0eODMpAHUcEqxrlg01e9OFZDxQodminIgC194/cRHT7K04Z1j7AUEWTeeplYGrIv/xRdwU9Hg==} + duplexer@0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} @@ -3542,37 +3284,24 @@ packages: earcut@2.2.4: resolution: {integrity: sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==} - eastasianwidth@0.2.0: - resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} - - ecc-jsbn@0.1.2: - resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==} - ecdsa-sig-formatter@1.0.11: resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==} - ee-first@1.1.1: - resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - electron-to-chromium@1.4.681: resolution: {integrity: sha512-1PpuqJUFWoXZ1E54m8bsLPVYwIVCRzvaL+n5cjigGga4z854abDnFRc+cTa2th4S79kyGqya/1xoR7h+Y5G5lg==} + electron-to-chromium@1.5.13: + resolution: {integrity: sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==} + emoji-regex@10.2.1: resolution: {integrity: sha512-97g6QgOk8zlDRdgq1WxwgTMgEWGVAQvB5Fdpgc1MkNy56la5SKP9GsMXKDOdqwn90/41a8yPwIGk1Y6WVbeMQA==} + emoji-regex@10.4.0: + resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==} + emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} - emoji-regex@9.2.2: - resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} - - enabled@2.0.0: - resolution: {integrity: sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==} - - encodeurl@1.0.2: - resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} - engines: {node: '>= 0.8'} - encoding@0.1.13: resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==} @@ -3586,57 +3315,48 @@ packages: resolution: {integrity: sha512-P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ==} engines: {node: '>=10.0.0'} + enhanced-resolve@5.17.1: + resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==} + engines: {node: '>=10.13.0'} + ent@2.2.0: resolution: {integrity: sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==} - entities@2.1.0: - resolution: {integrity: sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==} - entities@4.5.0: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} - env-paths@2.2.1: - resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} - engines: {node: '>=6'} - - err-code@2.0.3: - resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==} + environment@1.1.0: + resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==} + engines: {node: '>=18'} error-ex@1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} + es-module-lexer@1.5.4: + resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==} + es6-promise@3.3.1: resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==} - esbuild@0.19.12: - resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} + esbuild@0.21.5: + resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==} engines: {node: '>=12'} hasBin: true - escalade@3.1.1: - resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} - engines: {node: '>=6'} + esbuild@0.23.1: + resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==} + engines: {node: '>=18'} + hasBin: true escalade@3.1.2: resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} engines: {node: '>=6'} - escape-goat@2.1.1: - resolution: {integrity: sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==} - engines: {node: '>=8'} - - escape-html@1.0.3: - resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==} - escape-string-regexp@1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} - escape-string-regexp@2.0.0: - resolution: {integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==} - engines: {node: '>=8'} - escape-string-regexp@4.0.0: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} @@ -3645,22 +3365,23 @@ packages: resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==} engines: {node: '>=12'} - escodegen@1.14.3: - resolution: {integrity: sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==} - engines: {node: '>=4.0'} - hasBin: true - eslint-compat-utils@0.5.0: resolution: {integrity: sha512-dc6Y8tzEcSYZMHa+CMPLi/hyo1FzNeonbhJL7Ol0ccuKQkwopJcJBA9YL/xmMTLU1eKigXo9vj9nALElWYSowg==} engines: {node: '>=12'} peerDependencies: eslint: '>=6.0.0' - eslint-config-flat-gitignore@0.1.5: - resolution: {integrity: sha512-hEZLwuZjDBGDERA49c2q7vxc8sCGv8EdBp6PQYzGOMcHIgrfG9YOM6s/4jx24zhD+wnK9AI8mgN5RxSss5nClQ==} + eslint-compat-utils@0.5.1: + resolution: {integrity: sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==} + engines: {node: '>=12'} + peerDependencies: + eslint: '>=6.0.0' + + eslint-config-flat-gitignore@0.1.8: + resolution: {integrity: sha512-OEUbS2wzzYtUfshjOqzFo4Bl4lHykXUdM08TCnYNl7ki+niW4Q1R0j0FDFDr0vjVsI5ZFOz5LvluxOP+Ew+dYw==} - eslint-flat-config-utils@0.2.0: - resolution: {integrity: sha512-8jLkFKKBAzWPBEjygdH/P9Y/c+K9AcuMAig9u/4/x7mtsDRHj8EdgEJHX1IEvOTAbZiWXEUoZqiKZUIx/1FWKg==} + eslint-flat-config-utils@0.3.1: + resolution: {integrity: sha512-eFT3EaoJN1hlN97xw4FIEX//h0TiFUobgl2l5uLkIwhVN9ahGq95Pbs+i1/B5UACA78LO3rco3JzuvxLdTUOPA==} eslint-import-resolver-node@0.3.9: resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} @@ -3670,8 +3391,13 @@ packages: peerDependencies: eslint: '*' - eslint-plugin-antfu@2.1.2: - resolution: {integrity: sha512-s7ZTOM3uq0iqpp6gF0UEotnvup7f2PHBUftCytLZX0+6C9j9KadKZQh6bVVngAyFgsmeD9+gcBopOYLClb2oDg==} + eslint-plugin-antfu@2.3.6: + resolution: {integrity: sha512-31VwbU1Yd4BFNUUPQEazKyP79f3c+ohJtq5iZIuw38JjkRQdQAcF/31Kjr0DOKZXVDkeeNPrttKidrr3xhnhOA==} + peerDependencies: + eslint: '*' + + eslint-plugin-command@0.2.3: + resolution: {integrity: sha512-1bBYNfjZg60N2ZpLV5ATYSYyueIJ+zl5yKrTs0UFDdnyu07dNSZ7Xplnc+Wb6SXTdc1sIaoIrnuyhvztcltX6A==} peerDependencies: eslint: '*' @@ -3681,53 +3407,48 @@ packages: peerDependencies: eslint: '>=8' - eslint-plugin-eslint-comments@3.2.0: - resolution: {integrity: sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==} - engines: {node: '>=6.5.0'} - peerDependencies: - eslint: '>=4.19.1' - - eslint-plugin-import-x@0.5.0: - resolution: {integrity: sha512-C7R8Z4IzxmsoOPMtSzwuOBW5FH6iRlxHR6iTks+MzVlrk3r3TUxokkWTx3ypdj9nGOEP+CG/5e6ebZzHbxgbbQ==} - engines: {node: '>=16'} + eslint-plugin-import-x@4.1.0: + resolution: {integrity: sha512-1BYJU0C5NBJLY4qukmwDbFrf2w8fLGEU9zZV3viWa7gNnbn4o4meQy5O4LVXn56eFh9Y4fQxu3udhIqQuVITvw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: ^8.56.0 || ^9.0.0-0 + eslint: ^8.57.0 || ^9.0.0 - eslint-plugin-jsdoc@48.2.2: - resolution: {integrity: sha512-S0Gk+rpT5w/ephKCncUY7kUsix9uE4B9XI8D/fS1/26d8okE+vZsuG1IvIt4B6sJUdQqsnzi+YXfmh+HJG11CA==} + eslint-plugin-jsdoc@50.2.2: + resolution: {integrity: sha512-i0ZMWA199DG7sjxlzXn5AeYZxpRfMJjDPUl7lL9eJJX8TPRoIaxJU4ys/joP5faM5AXE1eqW/dslCj3uj4Nqpg==} engines: {node: '>=18'} peerDependencies: eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 - eslint-plugin-jsonc@2.15.0: - resolution: {integrity: sha512-wAphMVgTQPAKAYV8d/QEkEYDg8uer9nMQ85N17IUiJcAWLxJs83/Exe59dEH9yKUpvpLf46H+wR7/U7lZ3/NpQ==} + eslint-plugin-jsonc@2.16.0: + resolution: {integrity: sha512-Af/ZL5mgfb8FFNleH6KlO4/VdmDuTqmM+SPnWcdoWywTetv7kq+vQe99UyQb9XO3b0OWLVuTH7H0d/PXYCMdSg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '>=6.0.0' - eslint-plugin-markdown@4.0.1: - resolution: {integrity: sha512-5/MnGvYU0i8MbHH5cg8S+Vl3DL+bqRNYshk1xUO86DilNBaxtTkhH+5FD0/yO03AmlI6+lfNFdk2yOw72EPzpA==} + eslint-plugin-markdown@5.1.0: + resolution: {integrity: sha512-SJeyKko1K6GwI0AN6xeCDToXDkfKZfXcexA6B+O2Wr2btUS9GrC+YgwSyVli5DJnctUHjFXcQ2cqTaAmVoLi2A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: '>=8' - eslint-plugin-n@16.6.2: - resolution: {integrity: sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==} - engines: {node: '>=16.0.0'} + eslint-plugin-n@17.10.2: + resolution: {integrity: sha512-e+s4eAf5NtJaxPhTNu3qMO0Iz40WANS93w9LQgYcvuljgvDmWi/a3rh+OrNyMHeng6aOWGJO0rCg5lH4zi8yTw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - eslint: '>=7.0.0' + eslint: '>=8.23.0' - eslint-plugin-no-only-tests@3.1.0: - resolution: {integrity: sha512-Lf4YW/bL6Un1R6A76pRZyE1dl1vr31G/ev8UzIc/geCgFWyrKil8hVjYqWVKGB/UIGmb6Slzs9T0wNezdSVegw==} + eslint-plugin-no-only-tests@3.3.0: + resolution: {integrity: sha512-brcKcxGnISN2CcVhXJ/kEQlNa0MEfGRtwKtWA16SkqXHKitaKIMrfemJKLKX1YqDU5C/5JY3PvZXd5jEW04e0Q==} engines: {node: '>=5.0.0'} - eslint-plugin-perfectionist@2.7.0: - resolution: {integrity: sha512-RpSMc0T0DT9DlOj4APzwlAjCqQMxFdsIYlupe73eDkKLn1mMK7fVw2z3nj2y822szKOpvHA7bDa56ySOlr4GXw==} + eslint-plugin-perfectionist@3.3.0: + resolution: {integrity: sha512-sGgShkEqDBqIZ3WlenGHwLe1cl3vHKTfeh9b1XXAamaxSC7AY4Os0jdNCXnGJW4l0TlpismT5t2r7CXY7sfKlw==} + engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: - astro-eslint-parser: ^0.16.0 + astro-eslint-parser: ^1.0.2 eslint: '>=8.0.0' svelte: '>=3.0.0' - svelte-eslint-parser: ^0.33.0 + svelte-eslint-parser: ^0.41.0 vue-eslint-parser: '>=9.0.0' peerDependenciesMeta: astro-eslint-parser: @@ -3739,59 +3460,51 @@ packages: vue-eslint-parser: optional: true + eslint-plugin-regexp@2.6.0: + resolution: {integrity: sha512-FCL851+kislsTEQEMioAlpDuK5+E5vs0hi1bF8cFlPlHcEjeRhuAzEsGikXRreE+0j4WhW2uO54MqTjXtYOi3A==} + engines: {node: ^18 || >=20} + peerDependencies: + eslint: '>=8.44.0' + eslint-plugin-svelte-stylistic@0.0.4: resolution: {integrity: sha512-4QxTiUQBR6dRt/bBx5NXRpHvt1Sw3r1ED4Iyvi/f3/RqUVUTG/Ke02JFGbWt1QS1Fw1JD75jbyp67yBWkFcI0g==} - eslint-plugin-svelte@2.33.2: - resolution: {integrity: sha512-knWmauax+E/jvQ9CmuX5dAhQKP9P4eGQZxWa5RMutEJVCcy0wFmiUvOeDND2jR4vUkbDlX4khKjaceY7QzbkYw==} + eslint-plugin-svelte@2.43.0: + resolution: {integrity: sha512-REkxQWvg2pp7QVLxQNa+dJ97xUqRe7Y2JJbSWkHSuszu0VcblZtXkPBPckkivk99y5CdLw4slqfPylL2d/X4jQ==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: - eslint: ^7.0.0 || ^8.0.0-0 - svelte: ^3.37.0 || ^4.0.0 + eslint: ^7.0.0 || ^8.0.0-0 || ^9.0.0-0 + svelte: ^3.37.0 || ^4.0.0 || ^5.0.0-next.191 peerDependenciesMeta: svelte: optional: true - eslint-plugin-toml@0.11.0: - resolution: {integrity: sha512-sau+YvPU4fWTjB+qtBt3n8WS87aoDCs+BVbSUAemGaIsRNbvR9uEk+Tt892iLHTGvp/DPWYoCX4/8DoyAbB+sQ==} + eslint-plugin-toml@0.11.1: + resolution: {integrity: sha512-Y1WuMSzfZpeMIrmlP1nUh3kT8p96mThIq4NnHrYUhg10IKQgGfBZjAWnrg9fBqguiX4iFps/x/3Hb5TxBisfdw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '>=6.0.0' - eslint-plugin-unicorn@51.0.1: - resolution: {integrity: sha512-MuR/+9VuB0fydoI0nIn2RDA5WISRn4AsJyNSaNKLVwie9/ONvQhxOBbkfSICBPnzKrB77Fh6CZZXjgTt/4Latw==} - engines: {node: '>=16'} + eslint-plugin-unicorn@55.0.0: + resolution: {integrity: sha512-n3AKiVpY2/uDcGrS3+QsYDkjPfaOrNrsfQxU9nt5nitd9KuvVXrfAvgCO9DYPSfap+Gqjw9EOrXIsBp5tlHZjA==} + engines: {node: '>=18.18'} peerDependencies: eslint: '>=8.56.0' - eslint-plugin-unused-imports@3.1.0: - resolution: {integrity: sha512-9l1YFCzXKkw1qtAru1RWUtG2EVDZY0a0eChKXcL+EZ5jitG7qxdctu4RnvhOJHv4xfmUf7h+JJPINlVpGhZMrw==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - '@typescript-eslint/eslint-plugin': 6 - 7 - eslint: '8' - peerDependenciesMeta: - '@typescript-eslint/eslint-plugin': - optional: true - - eslint-plugin-vitest@0.4.1: - resolution: {integrity: sha512-+PnZ2u/BS+f5FiuHXz4zKsHPcMKHie+K+1Uvu/x91ovkCMEOJqEI8E9Tw1Wzx2QRz4MHOBHYf1ypO8N1K0aNAA==} - engines: {node: ^18.0.0 || >= 20.0.0} + eslint-plugin-unused-imports@4.1.3: + resolution: {integrity: sha512-lqrNZIZjFMUr7P06eoKtQLwyVRibvG7N+LtfKtObYGizAAGrcqLkc3tDx+iAik2z7q0j/XI3ihjupIqxhFabFA==} peerDependencies: - '@typescript-eslint/eslint-plugin': '*' - eslint: '>=8.0.0' - vitest: '*' + '@typescript-eslint/eslint-plugin': ^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0 + eslint: ^9.0.0 || ^8.0.0 peerDependenciesMeta: '@typescript-eslint/eslint-plugin': optional: true - vitest: - optional: true - eslint-plugin-vue@9.24.0: - resolution: {integrity: sha512-9SkJMvF8NGMT9aQCwFc5rj8Wo1XWSMSHk36i7ZwdI614BU7sIOR28ZjuFPKp8YGymZN12BSEbiSwa7qikp+PBw==} + eslint-plugin-vue@9.27.0: + resolution: {integrity: sha512-5Dw3yxEyuBSXTzT5/Ge1X5kIkRTQ3nvBn/VwPwInNiZBSJOO/timWMUaflONnFBzU6NhB68lxnCda7ULV5N7LA==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: - eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 + eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 eslint-plugin-yml@1.14.0: resolution: {integrity: sha512-ESUpgYPOcAYQO9czugcX5OqRvn/ydDVwGCPXY4YjPqc09rHaUVUA6IE6HLQys4rXk/S+qx3EwTd1wHCwam/OWQ==} @@ -3799,53 +3512,61 @@ packages: peerDependencies: eslint: '>=6.0.0' - eslint-processor-vue-blocks@0.1.1: - resolution: {integrity: sha512-9+dU5lU881log570oBwpelaJmOfOzSniben7IWEDRYQPPWwlvaV7NhOtsTuUWDqpYT+dtKKWPsgz4OkOi+aZnA==} + eslint-processor-vue-blocks@0.1.2: + resolution: {integrity: sha512-PfpJ4uKHnqeL/fXUnzYkOax3aIenlwewXRX8jFinA1a2yCFnLgMuiH3xvCgvHHUlV2xJWQHbCTdiJWGwb3NqpQ==} peerDependencies: '@vue/compiler-sfc': ^3.3.0 - eslint: ^8.50.0 - - eslint-rule-composer@0.3.0: - resolution: {integrity: sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==} - engines: {node: '>=4.0.0'} + eslint: ^8.50.0 || ^9.0.0 eslint-scope@7.2.2: resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + eslint-scope@8.0.2: + resolution: {integrity: sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + eslint-visitor-keys@3.4.3: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - eslint@8.56.0: - resolution: {integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + eslint-visitor-keys@4.0.0: + resolution: {integrity: sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + eslint@9.9.1: + resolution: {integrity: sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} hasBin: true + peerDependencies: + jiti: '*' + peerDependenciesMeta: + jiti: + optional: true esm-env@1.0.0: resolution: {integrity: sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA==} + espree@10.1.0: + resolution: {integrity: sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + espree@9.6.1: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - esprima@4.0.1: - resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==} - engines: {node: '>=4'} - hasBin: true - esquery@1.5.0: resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==} engines: {node: '>=0.10'} + esquery@1.6.0: + resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==} + engines: {node: '>=0.10'} + esrecurse@4.3.0: resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} engines: {node: '>=4.0'} - estraverse@4.3.0: - resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==} - engines: {node: '>=4.0'} - estraverse@5.3.0: resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} engines: {node: '>=4.0'} @@ -3860,10 +3581,6 @@ packages: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} - etag@1.8.1: - resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==} - engines: {node: '>= 0.6'} - event-stream@3.3.4: resolution: {integrity: sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==} @@ -3871,47 +3588,20 @@ packages: resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==} engines: {node: '>=6'} - events-listener@1.1.0: - resolution: {integrity: sha512-Kd3EgYfODHueq6GzVfs/VUolh2EgJsS8hkO3KpnDrxVjU3eq63eXM2ujXkhPP+OkeUOhL8CxdfZbQXzryb5C4g==} + eventemitter3@5.0.1: + resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==} execa@5.1.1: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} engines: {node: '>=10'} - execa@7.1.1: - resolution: {integrity: sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==} - engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0} - execa@8.0.1: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} - exegesis-express@4.0.0: - resolution: {integrity: sha512-V2hqwTtYRj0bj43K4MCtm0caD97YWkqOUHFMRCBW5L1x9IjyqOEc7Xa4oQjjiFbeFOSQzzwPV+BzXsQjSz08fw==} - engines: {node: '>=6.0.0', npm: '>5.0.0'} - - exegesis@4.1.0: - resolution: {integrity: sha512-iqc55n+hmv8d1KYNMjq7bCcp4u74oRY6MBcj6Vsux7Wd4mRvlgahKqrBTyLIWwscNjEF3qvPmeJ0RPTj8ORMNg==} - engines: {node: '>=6.0.0', npm: '>5.0.0'} - - exponential-backoff@3.1.1: - resolution: {integrity: sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==} - - express@4.18.2: - resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==} - engines: {node: '>= 0.10.0'} - extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} - external-editor@3.1.0: - resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==} - engines: {node: '>=4'} - - extsprintf@1.3.0: - resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==} - engines: {'0': node >=0.6.0} - fast-deep-equal@3.1.3: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} @@ -3929,12 +3619,6 @@ packages: fast-levenshtein@2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} - fast-text-encoding@1.0.6: - resolution: {integrity: sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==} - - fast-url-parser@1.1.3: - resolution: {integrity: sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==} - fast-xml-parser@3.21.1: resolution: {integrity: sha512-FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg==} hasBin: true @@ -3950,8 +3634,13 @@ packages: resolution: {integrity: sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==} engines: {node: '>=0.8.0'} - fecha@4.2.3: - resolution: {integrity: sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==} + fdir@6.4.2: + resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==} + peerDependencies: + picomatch: ^3 || ^4 + peerDependenciesMeta: + picomatch: + optional: true fenceparser@1.1.1: resolution: {integrity: sha512-VdkTsK7GWLT0VWMK5S5WTAPn61wJ98WPFwJiRHumhg4ESNUO/tnkU8bzzzc62o6Uk1SVhuZFLnakmDA4SGV7wA==} @@ -3974,36 +3663,24 @@ packages: fflate@0.8.2: resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==} - figures@3.2.0: - resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==} - engines: {node: '>=8'} - - file-entry-cache@6.0.1: - resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} - engines: {node: ^10.12.0 || >=12.0.0} + file-entry-cache@8.0.0: + resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} + engines: {node: '>=16.0.0'} file-saver@2.0.5: resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==} - file-uri-to-path@2.0.0: - resolution: {integrity: sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==} - engines: {node: '>= 6'} - - filesize@6.4.0: - resolution: {integrity: sha512-mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ==} - engines: {node: '>= 0.4.0'} - fill-range@7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} - finalhandler@1.1.2: - resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==} - engines: {node: '>= 0.8'} + fill-range@7.1.1: + resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} + engines: {node: '>=8'} - finalhandler@1.2.0: - resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} - engines: {node: '>= 0.8'} + find-up-simple@1.0.0: + resolution: {integrity: sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==} + engines: {node: '>=18'} find-up@4.1.0: resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} @@ -4013,42 +3690,20 @@ packages: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} engines: {node: '>=10'} - find-up@7.0.0: - resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==} - engines: {node: '>=18'} - firebase-admin@12.0.0: resolution: {integrity: sha512-wBrrSSsKV++/+O8E7O/C7/wL0nbG/x4Xv4yatz/+sohaZ+LsnWtYUcrd3gZutO86hLpDex7xgyrkKbgulmtVyQ==} engines: {node: '>=14'} - firebase-functions@4.3.1: - resolution: {integrity: sha512-sbitfzHcuWsLD03/EgeIRIfkVGeyGjNo3IEA2z+mDIkK1++LhKLCWwVQXrMqeeATOG04CAp30guAagsNElVlng==} - engines: {node: '>=14.10.0'} - hasBin: true - peerDependencies: - firebase-admin: ^10.0.0 || ^11.0.0 - - firebase-tools@12.3.0: - resolution: {integrity: sha512-Z6Pl3Vp1wMKEroqCvT8Fm9UDXhWK+Bdq5zQjfTngTBqLL2FlL0/C4aG+D69aCLg5Q9Xyq8mc2pWnaEge40GqFw==} - engines: {node: '>=16.13.0 || >=18.0.0'} - hasBin: true - firebase@10.9.0: resolution: {integrity: sha512-R8rDU3mg2dq0uPOoZ5Nc3BeZTbXxBPJS8HcZLtnV0f5/YrmpNsHngzmMHRVB+91T+ViJGVL/42dV23gS9w9ccw==} - flat-cache@3.2.0: - resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} - engines: {node: ^10.12.0 || >=12.0.0} - - flatted@3.2.9: - resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==} + flat-cache@4.0.1: + resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} + engines: {node: '>=16'} flatted@3.3.1: resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} - fn.name@1.1.0: - resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==} - follow-redirects@1.15.6: resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==} engines: {node: '>=4.0'} @@ -4058,17 +3713,6 @@ packages: debug: optional: true - foreground-child@3.1.1: - resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} - engines: {node: '>=14'} - - forever-agent@0.6.1: - resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==} - - form-data@2.3.3: - resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==} - engines: {node: '>= 0.12'} - form-data@2.5.1: resolution: {integrity: sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==} engines: {node: '>= 0.12'} @@ -4081,36 +3725,13 @@ packages: resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==} engines: {node: '>=12.20.0'} - forwarded@0.2.0: - resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} - engines: {node: '>= 0.6'} - - fresh@0.5.2: - resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} - engines: {node: '>= 0.6'} - from@0.1.7: resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==} - fs-constants@1.0.0: - resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} - - fs-extra@10.1.0: - resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} - engines: {node: '>=12'} - - fs-extra@8.1.0: - resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} - engines: {node: '>=6 <7 || >=8'} - fs-minipass@2.1.0: resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} engines: {node: '>= 8'} - fs-minipass@3.0.3: - resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -4124,10 +3745,6 @@ packages: engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] - ftp@0.3.10: - resolution: {integrity: sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ==} - engines: {node: '>=0.8.0'} - function-bind@1.1.1: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} @@ -4140,26 +3757,10 @@ packages: functions-have-names@1.2.3: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} - gaxios@4.3.3: - resolution: {integrity: sha512-gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA==} - engines: {node: '>=10'} - - gaxios@5.1.3: - resolution: {integrity: sha512-95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA==} - engines: {node: '>=12'} - gaxios@6.1.1: resolution: {integrity: sha512-bw8smrX+XlAoo9o1JAksBwX+hi/RG15J+NTSxmNPIclKC3ZVK6C2afwY8OSdRvOK0+ZLecUJYtj2MmjOt3Dm0w==} engines: {node: '>=14'} - gcp-metadata@4.3.1: - resolution: {integrity: sha512-x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A==} - engines: {node: '>=10'} - - gcp-metadata@5.3.0: - resolution: {integrity: sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==} - engines: {node: '>=12'} - gcp-metadata@6.1.0: resolution: {integrity: sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg==} engines: {node: '>=14'} @@ -4175,8 +3776,9 @@ packages: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} - get-func-name@2.0.2: - resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} + get-east-asian-width@1.2.0: + resolution: {integrity: sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==} + engines: {node: '>=18'} get-intrinsic@1.2.1: resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==} @@ -4189,18 +3791,11 @@ packages: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} - get-tsconfig@4.7.2: - resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==} - get-tsconfig@4.7.3: resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==} - get-uri@3.0.2: - resolution: {integrity: sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==} - engines: {node: '>= 6'} - - getpass@0.1.7: - resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==} + get-tsconfig@4.7.6: + resolution: {integrity: sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==} github-slugger@2.0.0: resolution: {integrity: sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==} @@ -4213,44 +3808,24 @@ packages: resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} engines: {node: '>=10.13.0'} - glob-slash@1.0.0: - resolution: {integrity: sha512-ZwFh34WZhZX28ntCMAP1mwyAJkn8+Omagvt/GvA+JQM/qgT0+MR2NPF3vhvgdshfdvDyGZXs8fPXW84K32Wjuw==} - - glob-slasher@1.0.1: - resolution: {integrity: sha512-5MUzqFiycIKLMD1B0dYOE4hGgLLUZUNGGYO4BExdwT32wUwW3DBOE7lMQars7vB1q43Fb3Tyt+HmgLKsJhDYdg==} - - glob@10.3.10: - resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==} - engines: {node: '>=16 || 14 >=14.17'} - hasBin: true - glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} deprecated: Glob versions prior to v9 are no longer supported - glob@8.1.0: - resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} - engines: {node: '>=12'} - deprecated: Glob versions prior to v9 are no longer supported - - global-dirs@3.0.0: - resolution: {integrity: sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==} - engines: {node: '>=10'} - globals@11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} engines: {node: '>=4'} - globals@13.20.0: - resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==} - engines: {node: '>=8'} - globals@13.24.0: resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==} engines: {node: '>=8'} - globals@15.0.0: - resolution: {integrity: sha512-m/C/yR4mjO6pXDTm9/R/SpYTAIyaUB4EOzcaaMEl7mds7Mshct9GfejiJNQGjHHbdMPey13Kpu4TMbYi9ex1pw==} + globals@14.0.0: + resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} + engines: {node: '>=18'} + + globals@15.9.0: + resolution: {integrity: sha512-SmSKyLLKFbSr6rptvP8izbyxJL4ILwqO9Jg23UA0sDlGlu58V59D1//I3vlc0KJphVdUR7vMjHIplYnzBxorQA==} engines: {node: '>=18'} globalyzer@0.1.0: @@ -4263,14 +3838,6 @@ packages: globrex@0.1.2: resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==} - google-auth-library@7.14.1: - resolution: {integrity: sha512-5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA==} - engines: {node: '>=10'} - - google-auth-library@8.9.0: - resolution: {integrity: sha512-f7aQCJODJFmYWN6PeNKzgvy9LI2tYmXnzpNDHEjG5sDNPgGb2FXQyTBnXeSH+PAtpKESFD+LmHw3Ox3mN7e1Fg==} - engines: {node: '>=12'} - google-auth-library@9.4.2: resolution: {integrity: sha512-rTLO4gjhqqo3WvYKL5IdtlCvRqeQ4hxUx/p4lObobY2xotFW3bCQC+Qf1N51CYOfiqfMecdMwW9RIo7dFWYjqw==} engines: {node: '>=14'} @@ -4279,42 +3846,16 @@ packages: resolution: {integrity: sha512-I/AvzBiUXDzLOy4iIZ2W+Zq33W4lcukQv1nl7C8WUA6SQwyQwUwu3waNmWNAvzds//FG8SZ+DnKnW/2k6mQS8A==} engines: {node: '>=14'} - google-gax@3.6.0: - resolution: {integrity: sha512-2fyb61vWxUonHiArRNJQmE4tx5oY1ni8VPo08fzII409vDSCWG7apDX4qNOQ2GXXT82gLBn3d3P1Dydh7pWjyw==} - engines: {node: '>=12'} - hasBin: true - google-gax@4.1.0: resolution: {integrity: sha512-VP5MYsIXEoXmdeHZl1Qsjv89PvE+LT8fw/2jxpFQtFed22YYAHgiTUuMfj2RWlGJUmRaYEMxBRBDWj+q/hOGQg==} engines: {node: '>=14'} - google-p12-pem@3.1.4: - resolution: {integrity: sha512-HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg==} - engines: {node: '>=10'} - hasBin: true - - google-p12-pem@4.0.1: - resolution: {integrity: sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==} - engines: {node: '>=12.0.0'} - hasBin: true - - graceful-fs@4.2.10: - resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==} - graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} - gtoken@5.3.2: - resolution: {integrity: sha512-gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ==} - engines: {node: '>=10'} - - gtoken@6.1.2: - resolution: {integrity: sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==} - engines: {node: '>=12.0.0'} - gtoken@7.0.1: resolution: {integrity: sha512-KcFVtoP1CVFtQu0aSk3AyAt2og66PFhZAlkUOuWKwzMLoulHXG5W5wE5xAnHb+yl3/wEFoqGW7/cDGMU8igDZQ==} engines: {node: '>=14.0.0'} @@ -4327,15 +3868,6 @@ packages: resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==} engines: {node: '>=10'} - har-schema@2.0.0: - resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==} - engines: {node: '>=4'} - - har-validator@5.1.5: - resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==} - engines: {node: '>=6'} - deprecated: this library is no longer supported - has-flag@3.0.0: resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} engines: {node: '>=4'} @@ -4359,10 +3891,6 @@ packages: resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==} engines: {node: '>= 0.4'} - has-yarn@2.1.0: - resolution: {integrity: sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==} - engines: {node: '>=8'} - has@1.0.3: resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} engines: {node: '>= 0.4.0'} @@ -4420,14 +3948,6 @@ packages: resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} hasBin: true - heap-js@2.3.0: - resolution: {integrity: sha512-E5303mzwQ+4j/n2J0rDvEPBN7GKjhis10oHiYOgjxsmxYgqG++hz9NyLLOXttzH8as/DyiBHYpUrJTZWYaMo8Q==} - engines: {node: '>=10.0.0'} - - hogan.js@3.0.2: - resolution: {integrity: sha512-RqGs4wavGYJWE07t35JQccByczmNUXQT0E12ZYV1VKYu5UiAU9lsos/yBAcf840+zrUQQxgVduCR5/B8nNtibg==} - hasBin: true - hosted-git-info@2.8.9: resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==} @@ -4437,32 +3957,13 @@ packages: html-whitespace-sensitive-tag-names@2.0.0: resolution: {integrity: sha512-SQdIvTTtnHAx72xGUIUudvVOCjeWvV1U7rvSFnNGxTGRw3ZC7RES4Gw6dm1nMYD60TXvm6zjk/bWqgNc5pjQaw==} - http-cache-semantics@4.1.1: - resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==} - - http-errors@2.0.0: - resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==} - engines: {node: '>= 0.8'} - http-parser-js@0.5.8: resolution: {integrity: sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==} - http-proxy-agent@4.0.1: - resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==} - engines: {node: '>= 6'} - http-proxy-agent@5.0.0: resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==} engines: {node: '>= 6'} - http-proxy-agent@7.0.0: - resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==} - engines: {node: '>= 14'} - - http-signature@1.2.0: - resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==} - engines: {node: '>=0.8', npm: '>=1.3.7'} - https-proxy-agent@5.0.1: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} @@ -4475,32 +3976,20 @@ packages: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} - human-signals@4.3.1: - resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==} - engines: {node: '>=14.18.0'} - human-signals@5.0.0: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} - iconv-lite@0.4.24: - resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} - engines: {node: '>=0.10.0'} - iconv-lite@0.6.3: resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} engines: {node: '>=0.10.0'} + idb-keyval@6.2.1: + resolution: {integrity: sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg==} + idb@7.1.1: resolution: {integrity: sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==} - ieee754@1.2.1: - resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} - - ignore@5.2.4: - resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} - engines: {node: '>= 4'} - ignore@5.3.1: resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==} engines: {node: '>= 4'} @@ -4512,10 +4001,6 @@ packages: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} engines: {node: '>=6'} - import-lazy@2.1.0: - resolution: {integrity: sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==} - engines: {node: '>=4'} - import-meta-resolve@4.0.0: resolution: {integrity: sha512-okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA==} @@ -4534,44 +4019,10 @@ packages: inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - ini@1.3.8: - resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} - - ini@2.0.0: - resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==} - engines: {node: '>=10'} - - inquirer@8.2.4: - resolution: {integrity: sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==} - engines: {node: '>=12.0.0'} - - install-artifact-from-github@1.3.5: - resolution: {integrity: sha512-gZHC7f/cJgXz7MXlHFBxPVMsvIbev1OQN1uKQYKVJDydGNm9oYf9JstbU4Atnh/eSvk41WtEovoRm+8IF686xg==} - hasBin: true - - instantsearch.js@4.40.2: - resolution: {integrity: sha512-XK4vXBbYJYVeXHNKtio9dbE1vp4WfyV4NME+PwBrKt/RDdk44GDRUcz+cTx2A9XQeA6+AeskSyZFk9KEJpviZw==} - peerDependencies: - algoliasearch: '>= 3.1 < 5' - internmap@2.0.3: resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==} engines: {node: '>=12'} - ip-regex@4.3.0: - resolution: {integrity: sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==} - engines: {node: '>=8'} - - ip@1.1.5: - resolution: {integrity: sha512-rBtCAQAJm8A110nbwn6YdveUnuZH3WrC36IwkRXxDnq53JvXA2NVQvB7IHyKomxK1MJ4VDNw3UtFDdXQ+AvLYA==} - - ip@2.0.0: - resolution: {integrity: sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==} - - ipaddr.js@1.9.1: - resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==} - engines: {node: '>= 0.10'} - is-alphabetical@1.0.4: resolution: {integrity: sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==} @@ -4600,10 +4051,6 @@ packages: resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==} engines: {node: '>=6'} - is-ci@2.0.0: - resolution: {integrity: sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==} - hasBin: true - is-core-module@2.13.1: resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} @@ -4626,6 +4073,10 @@ packages: resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==} engines: {node: '>=12'} + is-fullwidth-code-point@5.0.0: + resolution: {integrity: sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==} + engines: {node: '>=18'} + is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} @@ -4633,29 +4084,10 @@ packages: is-hexadecimal@1.0.4: resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==} - is-installed-globally@0.4.0: - resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==} - engines: {node: '>=10'} - - is-interactive@1.0.0: - resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==} - engines: {node: '>=8'} - - is-lambda@1.0.1: - resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==} - - is-npm@5.0.0: - resolution: {integrity: sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==} - engines: {node: '>=10'} - is-number@7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - is-obj@2.0.0: - resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==} - engines: {node: '>=8'} - is-path-inside@3.0.3: resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} engines: {node: '>=8'} @@ -4671,9 +4103,6 @@ packages: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} - is-stream-ended@0.1.4: - resolution: {integrity: sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==} - is-stream@2.0.1: resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} engines: {node: '>=8'} @@ -4682,97 +4111,43 @@ packages: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - is-typedarray@1.0.0: - resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==} - - is-unicode-supported@0.1.0: - resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==} - engines: {node: '>=10'} - - is-url@1.2.4: - resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==} - is-utf8@0.2.1: resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==} - is-wsl@1.1.0: - resolution: {integrity: sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==} - engines: {node: '>=4'} - - is-yarn-global@0.3.0: - resolution: {integrity: sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==} - - is2@2.0.7: - resolution: {integrity: sha512-4vBQoURAXC6hnLFxD4VW7uc04XiwTTl/8ydYJxKvPwkWQrSjInkuM5VZVg6BGr1/natq69zDuvO9lGpLClJqvA==} - engines: {node: '>=v0.10.0'} - - isarray@0.0.1: - resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==} - isarray@1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - isexe@3.1.1: - resolution: {integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==} - engines: {node: '>=16'} - - isomorphic-fetch@3.0.0: - resolution: {integrity: sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==} - - isstream@0.1.2: - resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==} - - jackspeak@2.3.6: - resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} - engines: {node: '>=14'} - jiti@1.21.0: resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} hasBin: true - jju@1.4.0: - resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==} + jiti@1.21.6: + resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} + hasBin: true joi@17.12.2: resolution: {integrity: sha512-RonXAIzCiHLc8ss3Ibuz45u28GOsWE1UpfDXLbN/9NKbL4tCJf8TWYVKsoYuuh+sAUt7fsSNpA+r2+TBA6Wjmw==} - join-path@1.1.1: - resolution: {integrity: sha512-jnt9OC34sLXMLJ6YfPQ2ZEKrR9mB5ZbSnQb4LPaOx1c5rTzxpR33L18jjp0r75mGGTJmsil3qwN1B5IBeTnSSA==} - jose@4.15.4: resolution: {integrity: sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==} js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - js-tokens@8.0.3: - resolution: {integrity: sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==} - - js-yaml@3.14.1: - resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} - hasBin: true - js-yaml@4.1.0: resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} hasBin: true - js2xmlparser@4.0.2: - resolution: {integrity: sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==} - - jsbn@0.1.1: - resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==} - jsdoc-type-pratt-parser@4.0.0: resolution: {integrity: sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==} engines: {node: '>=12.0.0'} - jsdoc@4.0.2: - resolution: {integrity: sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==} + jsdoc-type-pratt-parser@4.1.0: + resolution: {integrity: sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==} engines: {node: '>=12.0.0'} - hasBin: true jsesc@0.5.0: resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==} @@ -4797,27 +4172,12 @@ packages: json-parse-even-better-errors@2.3.1: resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} - json-parse-helpfulerror@1.0.3: - resolution: {integrity: sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==} - - json-ptr@3.1.0: - resolution: {integrity: sha512-KMsG905wFbHHTnvd66MHCNo0E43UPalKt2zQUbBtWrDYKk/3vE/4u8lfWDdIyPEoMXxOFJO1lsBs6xPBXKxeVw==} - json-schema-traverse@0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - json-schema-traverse@1.0.0: - resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==} - - json-schema@0.4.0: - resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==} - json-stable-stringify-without-jsonify@1.0.1: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} - json-stringify-safe@5.0.1: - resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==} - json5@2.2.3: resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} engines: {node: '>=6'} @@ -4830,24 +4190,10 @@ packages: jsonc-parser@3.2.1: resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==} - jsonfile@4.0.0: - resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} - - jsonfile@6.1.0: - resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==} - - jsonwebtoken@9.0.0: - resolution: {integrity: sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==} - engines: {node: '>=12', npm: '>=6'} - jsonwebtoken@9.0.2: resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==} engines: {node: '>=12', npm: '>=6'} - jsprim@1.4.2: - resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==} - engines: {node: '>=0.6.0'} - jsts@2.7.1: resolution: {integrity: sha512-x2wSZHEBK20CY+Wy+BPE7MrFQHW6sIsdaGUMEqmGAio+3gFzQaBYPwLRonUfQf9Ak8pBieqj9tUofX1+WtAEIg==} engines: {node: '>= 12'} @@ -4881,48 +4227,24 @@ packages: svelte: ^3.55.0 || ^4.0.0 typescript: ^5.0.0 - klaw@3.0.0: - resolution: {integrity: sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==} - kleur@4.1.5: resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} engines: {node: '>=6'} - known-css-properties@0.28.0: - resolution: {integrity: sha512-9pSL5XB4J+ifHP0e0jmmC98OGC1nL8/JjS+fi6mnTlIf//yt/MfVLtKg7S6nCtj/8KTcWX7nRlY0XywoYY1ISQ==} + known-css-properties@0.34.0: + resolution: {integrity: sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==} kolorist@1.8.0: resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==} - kuler@2.0.0: - resolution: {integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==} - lazy-ass@1.6.0: resolution: {integrity: sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==} engines: {node: '> 0.8'} - lazystream@1.0.1: - resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==} - engines: {node: '>= 0.6.3'} - - leven@3.1.0: - resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==} - engines: {node: '>=6'} - - levn@0.3.0: - resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==} - engines: {node: '>= 0.8.0'} - levn@0.4.1: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} - libsodium-wrappers@0.7.11: - resolution: {integrity: sha512-SrcLtXj7BM19vUKtQuyQKiQCRJPgbpauzl3s0rSwD+60wtHqSUuqcoawlMDheCJga85nKOQwxNYQxf/CKAvs6Q==} - - libsodium@0.7.11: - resolution: {integrity: sha512-WPfJ7sS53I2s4iM58QxY3Inb83/6mjlYgcmZs7DJsvDlnmVUwNinBCi5vBT43P6bHRy01O4zsMU2CoVR6xJ40A==} - lie@3.3.0: resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==} @@ -4930,28 +4252,24 @@ packages: resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} engines: {node: '>=10'} + lilconfig@3.1.2: + resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==} + engines: {node: '>=14'} + limiter@1.1.5: resolution: {integrity: sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==} lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} - linkify-it@3.0.3: - resolution: {integrity: sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==} - - lint-staged@13.2.2: - resolution: {integrity: sha512-71gSwXKy649VrSU09s10uAT0rWCcY3aewhMaHyl2N84oBk4Xs9HgxvUp3AYu+bNsK4NrOYYxvSgg7FyGJ+jGcA==} - engines: {node: ^14.13.1 || >=16.0.0} + lint-staged@15.2.9: + resolution: {integrity: sha512-BZAt8Lk3sEnxw7tfxM7jeZlPRuT4M68O0/CwZhhaw6eeWu0Lz5eERE3m386InivXB64fp/mDID452h48tvKlRQ==} + engines: {node: '>=18.12.0'} hasBin: true - listr2@5.0.8: - resolution: {integrity: sha512-mC73LitKHj9w6v30nLNGPetZIlfpUniNSsxxrbaPcWOjDb92SHPzJPi/t+v1YC/lxKz/AJ9egOjww0qUuFxBpA==} - engines: {node: ^14.13.1 || >=16.0.0} - peerDependencies: - enquirer: '>= 2.3.0 < 3' - peerDependenciesMeta: - enquirer: - optional: true + listr2@8.2.4: + resolution: {integrity: sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==} + engines: {node: '>=18.0.0'} local-pkg@0.5.0: resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==} @@ -4968,31 +4286,15 @@ packages: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} - locate-path@7.2.0: - resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - lodash-es@4.17.21: resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==} - lodash._objecttypes@2.4.1: - resolution: {integrity: sha512-XpqGh1e7hhkOzftBfWE7zt+Yn9mVHFkDhicVttvKLsoCMLVVL+xTQjfjB4X4vtznauxv0QZ5ZAeqjvat0dh62Q==} - lodash.camelcase@4.3.0: resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==} lodash.clonedeep@4.5.0: resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==} - lodash.defaults@4.2.0: - resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==} - - lodash.difference@4.5.0: - resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==} - - lodash.flatten@4.4.0: - resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==} - lodash.includes@4.3.0: resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==} @@ -5005,9 +4307,6 @@ packages: lodash.isnumber@3.0.3: resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==} - lodash.isobject@2.4.1: - resolution: {integrity: sha512-sTebg2a1PoicYEZXD5PBdQcTlIJ6hUslrlWr7iV0O7n+i4596s2NQ9I5CaZ5FbXSfya/9WQsrYLANUJv9paYVA==} - lodash.isplainobject@4.0.6: resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==} @@ -5020,48 +4319,28 @@ packages: lodash.once@4.1.1: resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==} - lodash.snakecase@4.1.1: - resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==} - - lodash.union@4.6.0: - resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==} - lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - log-symbols@4.1.0: - resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==} - engines: {node: '>=10'} - - log-update@4.0.0: - resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==} - engines: {node: '>=10'} - - logform@2.4.0: - resolution: {integrity: sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==} + log-update@6.1.0: + resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==} + engines: {node: '>=18'} logrocket@2.2.1: resolution: {integrity: sha512-yf+iaZNuB13RjNFHzEWvj76G5nVzpl1u6p0wOnWOyLbOJflJJEIMBO81VEOtDUawFYeus8Xprsdfofb+KRqoCQ==} - long@4.0.0: - resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==} - long@5.2.3: resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==} longest-streak@3.1.0: resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==} - loupe@2.3.7: - resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==} + loupe@3.1.2: + resolution: {integrity: sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==} lower-case@2.0.2: resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==} - lru-cache@10.1.0: - resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} - engines: {node: 14 || >=16.14} - lru-cache@4.0.2: resolution: {integrity: sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==} @@ -5079,6 +4358,9 @@ packages: resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==} hasBin: true + magic-string@0.30.12: + resolution: {integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==} + magic-string@0.30.7: resolution: {integrity: sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==} engines: {node: '>=12'} @@ -5087,41 +4369,12 @@ packages: resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} engines: {node: '>=12'} - make-dir@3.1.0: - resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} - engines: {node: '>=8'} - - make-fetch-happen@13.0.0: - resolution: {integrity: sha512-7ThobcL8brtGo9CavByQrQi+23aIfgYU++wg4B87AIS8Rb2ZBt/MEaDqzA00Xwv/jUjAjYkLHjVolYuTLKda2A==} - engines: {node: ^16.14.0 || >=18.0.0} - map-stream@0.1.0: resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==} - markdown-it-anchor@8.6.7: - resolution: {integrity: sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==} - peerDependencies: - '@types/markdown-it': '*' - markdown-it: '*' - - markdown-it@12.3.2: - resolution: {integrity: sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==} - hasBin: true - markdown-table@3.0.3: resolution: {integrity: sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==} - marked-terminal@5.2.0: - resolution: {integrity: sha512-Piv6yNwAQXGFjZSaiNljyNFw7jKDdGrw70FSbtxEyldLsyeuV5ZHm/1wW++kWbrOF1VPnUgYOhB2oLL0ZpnekA==} - engines: {node: '>=14.13.1 || >=16.0.0'} - peerDependencies: - marked: ^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 - - marked@4.0.15: - resolution: {integrity: sha512-esX5lPdTfG4p8LDkv+obbRCyOKzB+820ZZyMOXJZygZBHrH9b3xXR64X4kT3sPe9Nx8qQXbmcz6kFSMt4Nfk6Q==} - engines: {node: '>= 12'} - hasBin: true - mdast-util-definitions@5.1.2: resolution: {integrity: sha512-8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA==} @@ -5178,16 +4431,6 @@ packages: peerDependencies: svelte: '>=3 <5' - mdurl@1.0.1: - resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==} - - media-typer@0.3.0: - resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} - engines: {node: '>= 0.6'} - - merge-descriptors@1.0.1: - resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==} - merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} @@ -5195,10 +4438,6 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} - methods@1.1.2: - resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} - engines: {node: '>= 0.6'} - micromark-core-commonmark@1.1.0: resolution: {integrity: sha512-BgHO1aRbolh2hcrzL2d1La37V0Aoz73ymF8rAcKnohLy93titmv62E0gP8Hrx9PKcKrqCZ1BbLGbP3bEhoXYlw==} @@ -5286,8 +4525,8 @@ packages: micromark@3.2.0: resolution: {integrity: sha512-uD66tJj54JLYq0De10AhWycZWGQNUvDI55xPgk2sQM5kn1JYlhbCMTtEeT27+vAhW2FBQxLlOmS3pmA7/2z4aA==} - micromatch@4.0.5: - resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} + micromatch@4.0.8: + resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} mime-db@1.52.0: @@ -5298,16 +4537,6 @@ packages: resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} engines: {node: '>= 0.6'} - mime@1.6.0: - resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==} - engines: {node: '>=4'} - hasBin: true - - mime@2.6.0: - resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==} - engines: {node: '>=4.0.0'} - hasBin: true - mime@3.0.0: resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==} engines: {node: '>=10.0.0'} @@ -5321,6 +4550,10 @@ packages: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} engines: {node: '>=12'} + mimic-function@5.0.1: + resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==} + engines: {node: '>=18'} + min-indent@1.0.1: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} engines: {node: '>=4'} @@ -5329,43 +4562,23 @@ packages: resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==} hasBin: true + minimatch@10.0.1: + resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==} + engines: {node: 20 || >=22} + minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} - minimatch@5.1.6: - resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} - engines: {node: '>=10'} - - minimatch@6.2.0: - resolution: {integrity: sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==} - engines: {node: '>=10'} - minimatch@9.0.3: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} - minimist@1.2.8: - resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - - minipass-collect@2.0.1: - resolution: {integrity: sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==} + minimatch@9.0.5: + resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==} engines: {node: '>=16 || 14 >=14.17'} - minipass-fetch@3.0.4: - resolution: {integrity: sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - minipass-flush@1.0.5: - resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==} - engines: {node: '>= 8'} - - minipass-pipeline@1.2.4: - resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==} - engines: {node: '>=8'} - - minipass-sized@1.0.3: - resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==} - engines: {node: '>=8'} + minimist@1.2.8: + resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} minipass@3.3.6: resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} @@ -5375,18 +4588,10 @@ packages: resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} engines: {node: '>=8'} - minipass@7.0.4: - resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} - engines: {node: '>=16 || 14 >=14.17'} - minizlib@2.1.2: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} - mkdirp@0.3.0: - resolution: {integrity: sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==} - deprecated: Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.) - mkdirp@0.5.6: resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} hasBin: true @@ -5402,10 +4607,6 @@ packages: mlly@1.6.1: resolution: {integrity: sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==} - morgan@1.10.0: - resolution: {integrity: sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==} - engines: {node: '>= 0.8.0'} - mri@1.2.0: resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} engines: {node: '>=4'} @@ -5414,26 +4615,12 @@ packages: resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==} engines: {node: '>=10'} - ms@2.0.0: - resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} - ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - mute-stream@0.0.8: - resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==} - - nan@2.18.0: - resolution: {integrity: sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==} - - nanoid@3.3.6: - resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} - engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true - nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} @@ -5445,17 +4632,6 @@ packages: natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} - negotiator@0.6.3: - resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} - engines: {node: '>= 0.6'} - - netmask@2.0.2: - resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==} - engines: {node: '>= 0.4.0'} - - nice-try@1.0.5: - resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==} - no-case@3.0.4: resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} @@ -5463,21 +4639,9 @@ packages: resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==} engines: {node: '>=10.5.0'} - node-emoji@1.11.0: - resolution: {integrity: sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==} - node-fetch-native@1.6.2: resolution: {integrity: sha512-69mtXOFZ6hSkYiXAVB5SqaRvrbITC/NPyqv7yuu/qw0nmgPyYbIMYYNIDhNtwPrzk0ptrimrLz/hhjvm4w5Z+w==} - node-fetch@2.6.12: - resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==} - engines: {node: 4.x || >=6.0.0} - peerDependencies: - encoding: ^0.1.0 - peerDependenciesMeta: - encoding: - optional: true - node-fetch@2.6.7: resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==} engines: {node: 4.x || >=6.0.0} @@ -5487,15 +4651,6 @@ packages: encoding: optional: true - node-fetch@2.6.9: - resolution: {integrity: sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==} - engines: {node: 4.x || >=6.0.0} - peerDependencies: - encoding: ^0.1.0 - peerDependenciesMeta: - encoding: - optional: true - node-fetch@2.7.0: resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==} engines: {node: 4.x || >=6.0.0} @@ -5517,22 +4672,11 @@ packages: resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} engines: {node: '>= 6.13.0'} - node-gyp@10.0.1: - resolution: {integrity: sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==} - engines: {node: ^16.14.0 || >=18.0.0} - hasBin: true - node-releases@2.0.14: resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==} - nopt@1.0.10: - resolution: {integrity: sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==} - hasBin: true - - nopt@7.2.0: - resolution: {integrity: sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - hasBin: true + node-releases@2.0.18: + resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==} normalize-package-data@2.5.0: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} @@ -5549,10 +4693,6 @@ packages: resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} engines: {node: '>=8'} - npm-run-path@5.1.0: - resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - npm-run-path@5.3.0: resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -5560,20 +4700,10 @@ packages: nth-check@2.1.1: resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} - oauth-sign@0.9.0: - resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==} - - object-assign@4.1.1: - resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} - engines: {node: '>=0.10.0'} - object-hash@3.0.0: resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} engines: {node: '>= 6'} - object-inspect@1.12.3: - resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==} - object-is@1.1.5: resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==} engines: {node: '>= 0.4'} @@ -5588,24 +4718,9 @@ packages: ofetch@1.3.3: resolution: {integrity: sha512-s1ZCMmQWXy4b5K/TW9i/DtiN8Ku+xCiHcjQ6/J/nDdssirrQNOoB165Zu8EqLMA2lln1JUth9a0aW9Ap2ctrUg==} - on-finished@2.3.0: - resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==} - engines: {node: '>= 0.8'} - - on-finished@2.4.1: - resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==} - engines: {node: '>= 0.8'} - - on-headers@1.0.2: - resolution: {integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==} - engines: {node: '>= 0.8'} - once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} - one-time@1.0.0: - resolution: {integrity: sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==} - onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} engines: {node: '>=6'} @@ -5614,33 +4729,14 @@ packages: resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} engines: {node: '>=12'} - open@6.4.0: - resolution: {integrity: sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==} - engines: {node: '>=8'} - - openapi3-ts@2.0.2: - resolution: {integrity: sha512-TxhYBMoqx9frXyOgnRHufjQfPXomTIHYKhSKJ6jHfj13kS8OEIhvmE8CTuQyKtjjWttAjX5DPxM1vmalEpo8Qw==} - - optionator@0.8.3: - resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==} - engines: {node: '>= 0.8.0'} + onetime@7.0.0: + resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==} + engines: {node: '>=18'} optionator@0.9.3: resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} engines: {node: '>= 0.8.0'} - ora@5.4.1: - resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==} - engines: {node: '>=10'} - - os-tmpdir@1.0.2: - resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} - engines: {node: '>=0.10.0'} - - p-defer@3.0.0: - resolution: {integrity: sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==} - engines: {node: '>=8'} - p-limit@2.3.0: resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} engines: {node: '>=6'} @@ -5649,14 +4745,6 @@ packages: resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} engines: {node: '>=10'} - p-limit@4.0.0: - resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - p-limit@5.0.0: - resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==} - engines: {node: '>=18'} - p-locate@4.1.0: resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} engines: {node: '>=8'} @@ -5665,25 +4753,12 @@ packages: resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} engines: {node: '>=10'} - p-locate@6.0.0: - resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - - p-map@4.0.0: - resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==} - engines: {node: '>=10'} - p-try@2.2.0: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} - pac-proxy-agent@5.0.0: - resolution: {integrity: sha512-CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ==} - engines: {node: '>= 8'} - - pac-resolver@5.0.0: - resolution: {integrity: sha512-H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA==} - engines: {node: '>= 8'} + package-manager-detector@0.2.0: + resolution: {integrity: sha512-E385OSk9qDcXhcM9LNSe4sdhx8a9mAPrZ4sMLW+tmxl5ZuGtPUcdFu+MPP2jbgiWAZ6Pfe5soGFMd+0Db5Vrog==} packet-reader@1.0.0: resolution: {integrity: sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==} @@ -5702,6 +4777,10 @@ packages: resolution: {integrity: sha512-RmVuCHWsfu0QPNW+mraxh/xjQVw/lhUCUru8Zni3Ctq3AoMhpDTq0OVdKS6iesd6Kqb7viCV3isAL43dciOSog==} engines: {node: '>=14'} + parse-imports@2.1.1: + resolution: {integrity: sha512-TDT4HqzUiTMO1wJRwg/t/hYk8Wdp3iF/ToMIlAoVQfL1Xs/sTxq1dKWSMjMbQmIarfWKymOyly40+zmPHXMqCA==} + engines: {node: '>= 18'} + parse-json@5.2.0: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} @@ -5709,10 +4788,6 @@ packages: parse5@6.0.1: resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==} - parseurl@1.3.3: - resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==} - engines: {node: '>= 0.8'} - pascal-case@3.1.2: resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==} @@ -5720,18 +4795,10 @@ packages: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} - path-exists@5.0.0: - resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - path-is-absolute@1.0.1: resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} engines: {node: '>=0.10.0'} - path-key@2.0.1: - resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==} - engines: {node: '>=4'} - path-key@3.1.1: resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} engines: {node: '>=8'} @@ -5743,16 +4810,6 @@ packages: path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} - path-scurry@1.10.1: - resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} - engines: {node: '>=16 || 14 >=14.17'} - - path-to-regexp@0.1.7: - resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==} - - path-to-regexp@1.8.0: - resolution: {integrity: sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==} - path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} @@ -5760,8 +4817,9 @@ packages: pathe@1.1.2: resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} - pathval@1.1.1: - resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==} + pathval@2.0.0: + resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==} + engines: {node: '>= 14.16'} pause-stream@0.0.11: resolution: {integrity: sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==} @@ -5769,9 +4827,6 @@ packages: perfect-debounce@1.0.0: resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==} - performance-now@2.1.0: - resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==} - periscopic@3.1.0: resolution: {integrity: sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==} @@ -5820,6 +4875,12 @@ packages: picocolors@1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} + picocolors@1.0.1: + resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==} + + picocolors@1.1.1: + resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} + picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} @@ -5859,10 +4920,6 @@ packages: polygon-clipping@0.15.3: resolution: {integrity: sha512-ho0Xx5DLkgxRx/+n4O74XyJ67DcyN3Tu9bGYKsnTukGAW6ssnuak6Mwcyb1wHy9MZc9xsUWqIoiazkZB5weECg==} - portfinder@1.0.32: - resolution: {integrity: sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==} - engines: {node: '>= 0.12.0'} - postcss-load-config@3.1.4: resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} engines: {node: '>= 10'} @@ -5881,37 +4938,29 @@ packages: peerDependencies: postcss: ^8.3.3 - postcss-scss@4.0.8: - resolution: {integrity: sha512-Cr0X8Eu7xMhE96PJck6ses/uVVXDtE5ghUTKNUYgm8ozgP2TkgV3LWs3WgLV1xaSSLq8ZFiXaUrj0LVgG1fGEA==} + postcss-scss@4.0.9: + resolution: {integrity: sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==} engines: {node: '>=12.0'} peerDependencies: postcss: ^8.4.29 - postcss-selector-parser@6.0.13: - resolution: {integrity: sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==} - engines: {node: '>=4'} - postcss-selector-parser@6.0.16: resolution: {integrity: sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==} engines: {node: '>=4'} + postcss-selector-parser@6.1.2: + resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==} + engines: {node: '>=4'} + postcss-value-parser@4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} - postcss@8.4.30: - resolution: {integrity: sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==} - engines: {node: ^10 || ^12 || >=14} - - postcss@8.4.35: - resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==} - engines: {node: ^10 || ^12 || >=14} - - postcss@8.4.36: - resolution: {integrity: sha512-/n7eumA6ZjFHAsbX30yhHup/IMkOmlmvtEi7P+6RMYf+bGJSUHc3geH4a0NSZxAz/RJfiS9tooCTs9LAVYUZKw==} + postcss@8.4.41: + resolution: {integrity: sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==} engines: {node: ^10 || ^12 || >=14} - postcss@8.4.37: - resolution: {integrity: sha512-7iB/v/r7Woof0glKLH8b1SPHrsX7uhdO+Geb41QpF/+mWZHU3uxxSlN+UXGVit1PawOYDToO+AbZzhBzWRDwbQ==} + postcss@8.4.47: + resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==} engines: {node: ^10 || ^12 || >=14} postgres-array@2.0.0: @@ -5949,21 +4998,10 @@ packages: postgres-range@1.1.3: resolution: {integrity: sha512-VdlZoocy5lCP0c/t66xAfclglEapXPCIVhqqJRncYpvbCgImF0w67aPKfbqUMr72tO2k5q0TdTZwCLjPTI6C9g==} - preact@10.7.0: - resolution: {integrity: sha512-9MEURwzNMKpAil/t6+wabDIJI6oG6GnwypYxiJDvQnW+fHDTt51PYuLZ1QUM31hFr7sDaj9qTaShAF9VIxuxGQ==} - - prelude-ls@1.1.2: - resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==} - engines: {node: '>= 0.8.0'} - prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - pretty-format@29.7.0: - resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - prism-svelte@0.4.7: resolution: {integrity: sha512-yABh19CYbM24V7aS7TuPYRNMqthxwbvx6FF/Rw920YbyBWO3tnyPIqRMgHuSVsLmuHkkBS1Akyof463FVdkeDQ==} @@ -5971,49 +5009,16 @@ packages: resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==} engines: {node: '>=6'} - proc-log@3.0.0: - resolution: {integrity: sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - process-nextick-args@2.0.1: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} - progress@2.0.3: - resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==} - engines: {node: '>=0.4.0'} - - promise-breaker@5.0.0: - resolution: {integrity: sha512-mgsWQuG4kJ1dtO6e/QlNDLFtMkMzzecsC69aI5hlLEjGHFNpHrvGhFi4LiK5jg2SMQj74/diH+wZliL9LpGsyA==} - - promise-retry@2.0.1: - resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==} - engines: {node: '>=10'} - property-information@6.5.0: resolution: {integrity: sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==} - proto-list@1.2.4: - resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==} - - proto3-json-serializer@1.1.1: - resolution: {integrity: sha512-AwAuY4g9nxx0u52DnSMkqqgyLHaW/XaPLtaAo3y/ZCfeaQB/g4YDH4kb8Wc/mWzWvu0YjOznVnfn373MVZZrgw==} - engines: {node: '>=12.0.0'} - proto3-json-serializer@2.0.0: resolution: {integrity: sha512-FB/YaNrpiPkyQNSNPilpn8qn0KdEfkgmJ9JP93PQyF/U4bAiXY5BiUdDhiDO4S48uSQ6AesklgVlrKiqZPzegw==} engines: {node: '>=14.0.0'} - protobufjs-cli@1.1.1: - resolution: {integrity: sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==} - engines: {node: '>=12.0.0'} - hasBin: true - peerDependencies: - protobufjs: ^7.0.0 - - protobufjs@7.2.3: - resolution: {integrity: sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==} - engines: {node: '>=12.0.0'} - protobufjs@7.2.4: resolution: {integrity: sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==} engines: {node: '>=12.0.0'} @@ -6022,14 +5027,6 @@ packages: resolution: {integrity: sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==} engines: {node: '>=12.0.0'} - proxy-addr@2.0.7: - resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} - engines: {node: '>= 0.10'} - - proxy-agent@5.0.0: - resolution: {integrity: sha512-gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g==} - engines: {node: '>= 8'} - proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} @@ -6041,39 +5038,10 @@ packages: pseudomap@1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} - psl@1.8.0: - resolution: {integrity: sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==} - - pump@3.0.0: - resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==} - - punycode@1.4.1: - resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==} - - punycode@2.1.1: - resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} - engines: {node: '>=6'} - punycode@2.3.0: resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} engines: {node: '>=6'} - pupa@2.1.1: - resolution: {integrity: sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==} - engines: {node: '>=8'} - - qs@6.11.0: - resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} - engines: {node: '>=0.6'} - - qs@6.5.3: - resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==} - engines: {node: '>=0.6'} - - qs@6.9.7: - resolution: {integrity: sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==} - engines: {node: '>=0.6'} - querystringify@2.2.0: resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} @@ -6083,27 +5051,9 @@ packages: quickselect@2.0.0: resolution: {integrity: sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==} - range-parser@1.2.1: - resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==} - engines: {node: '>= 0.6'} - - raw-body@2.5.1: - resolution: {integrity: sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==} - engines: {node: '>= 0.8'} - rbush@3.0.1: resolution: {integrity: sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==} - rc@1.2.8: - resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} - hasBin: true - - re2@1.20.10: - resolution: {integrity: sha512-/5JjSPXobSDaKFL6rD5Gb4qD4CVBITQb7NAxfQ/NA7o0HER3SJAPV3lPO2kvzw0/PN1pVJNVATEUk4y9j7oIIA==} - - react-is@18.2.0: - resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} - read-cmd-shim@4.0.0: resolution: {integrity: sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -6116,23 +5066,13 @@ packages: resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==} engines: {node: '>=8'} - readable-stream@1.1.14: - resolution: {integrity: sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==} - readable-stream@2.3.7: resolution: {integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==} - readable-stream@3.6.0: - resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==} - engines: {node: '>= 6'} - readable-stream@3.6.2: resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} engines: {node: '>= 6'} - readdir-glob@1.1.1: - resolution: {integrity: sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==} - readdirp@3.6.0: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} @@ -6140,12 +5080,17 @@ packages: recordrtc@5.6.2: resolution: {integrity: sha512-1QNKKNtl7+KcwD1lyOgP3ZlbiJ1d0HtXnypUy7yq49xEERxk31PHvE9RCciDrulPCY7WJ+oz0R9hpNxgsIurGQ==} - redeyed@2.1.1: - resolution: {integrity: sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==} + refa@0.12.1: + resolution: {integrity: sha512-J8rn6v4DBb2nnFqkqwy6/NnTYMcgLA+sLr0iIO41qpv0n+ngb7ksag2tMRl0inb1bbO/esUwzW1vbJi7K0sI0g==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} regenerator-runtime@0.13.11: resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} + regexp-ast-analysis@0.7.1: + resolution: {integrity: sha512-sZuz1dYW/ZsfG17WSAG7eS85r5a0dDsvg+7BiiYR5o6lKCAtUrEwdmRmaGF6rwVj3LcmAeYkOWKEPlbPzN3Y3A==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + regexp-tree@0.1.27: resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==} hasBin: true @@ -6154,14 +5099,6 @@ packages: resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==} engines: {node: '>= 0.4'} - registry-auth-token@5.0.2: - resolution: {integrity: sha512-o/3ikDxtXaA59BmZuZrJZDJv8NMDGSj+6j6XaeBmHw8eY1i1qd9+6H+LjVvQXx3HN6aRCGa1cUdJ9RaJZUugnQ==} - engines: {node: '>=14'} - - registry-url@5.1.0: - resolution: {integrity: sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==} - engines: {node: '>=8'} - regjsparser@0.10.0: resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==} hasBin: true @@ -6196,25 +5133,13 @@ packages: remark-toc@8.0.1: resolution: {integrity: sha512-7he2VOm/cy13zilnOTZcyAoyoolV26ULlon6XyCFU+vG54Z/LWJnwphj/xKIDLOt66QmJUgTyUvLVHi2aAElyg==} - request@2.88.2: - resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==} - engines: {node: '>= 6'} - deprecated: request has been deprecated, see https://github.com/request/request/issues/3142 - require-directory@2.1.1: resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} engines: {node: '>=0.10.0'} - require-from-string@2.0.2: - resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} - engines: {node: '>=0.10.0'} - requires-port@1.0.0: resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} - requizzle@0.2.4: - resolution: {integrity: sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==} - resolve-from@4.0.0: resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} engines: {node: '>=4'} @@ -6226,22 +5151,14 @@ packages: resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} hasBin: true - restore-cursor@3.1.0: - resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==} - engines: {node: '>=8'} - - retry-request@5.0.2: - resolution: {integrity: sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==} - engines: {node: '>=12'} + restore-cursor@5.1.0: + resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==} + engines: {node: '>=18'} retry-request@7.0.1: resolution: {integrity: sha512-ZI6vJp9rfB71mrZpw+n9p/B6HCsd7QJlSEQftZ+xfJzr3cQ9EPGKw1FF0BnViJ0fYREX6FhymBD2CARpmsFciQ==} engines: {node: '>=14'} - retry@0.12.0: - resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==} - engines: {node: '>= 4'} - retry@0.13.1: resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==} engines: {node: '>= 4'} @@ -6250,40 +5167,27 @@ packages: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - rfdc@1.3.0: - resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==} + rfdc@1.4.1: + resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==} rimraf@2.7.1: resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} deprecated: Rimraf versions prior to v4 are no longer supported hasBin: true - rimraf@3.0.2: - resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} - deprecated: Rimraf versions prior to v4 are no longer supported - hasBin: true - robust-predicates@2.0.4: resolution: {integrity: sha512-l4NwboJM74Ilm4VKfbAtFeGq7aEjWL+5kVFcmgFA2MrdnQWx9iE/tUGvxY5HyMI7o/WpSIUFLbC5fbeaHgSCYg==} - rollup@4.12.0: - resolution: {integrity: sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==} + rollup@4.21.1: + resolution: {integrity: sha512-ZnYyKvscThhgd3M5+Qt3pmhO4jIRR5RGzaSovB6Q7rGNrK5cUncrtLmcTTJVSdcKXyZjW8X8MB0JMSuH9bcAJg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true - rollup@4.13.0: - resolution: {integrity: sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==} + rollup@4.24.0: + resolution: {integrity: sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true - router@1.3.7: - resolution: {integrity: sha512-bYnD9Vv2287+g3AIll2kHITLtHV5+fldq6hVzaul9RbdGme77mvBY/1cO+ahsgstA2RI6DSg/j4W1TYHm4Lz4g==} - engines: {node: '>= 0.8'} - - run-async@2.4.1: - resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==} - engines: {node: '>=0.12.0'} - run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -6303,10 +5207,6 @@ packages: safe-buffer@5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} - safe-stable-stringify@2.3.1: - resolution: {integrity: sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg==} - engines: {node: '>=10'} - safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} @@ -6320,22 +5220,14 @@ packages: resolution: {integrity: sha512-WKUxXC2qeyno6J3ucwwLozPL6j1HXOZiN5wIUf7iqAhlx1RUC/6ePIKHi7iPc3Cy6DYuZcJriZXxXkSdo2FQHg==} engines: {node: '>=16'} - search-insights@2.2.1: - resolution: {integrity: sha512-JDfVGZbKqTtiKVZjAVbkNw9C9f0ib80yx6Ea17M3z4RvPmuD0GYWXuFwA9++dpbreBEMH4TC3lQ29Zq7O4b5oA==} - engines: {node: '>=8.16.0'} - - semver-diff@3.1.1: - resolution: {integrity: sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==} - engines: {node: '>=8'} + scslre@0.3.0: + resolution: {integrity: sha512-3A6sD0WYP7+QrjbfNA2FN3FsOaGGFoekCVgTyypy53gPxhbkCIjtO6YWgdrfM+n/8sI8JeXZOIxsHjMTNxQ4nQ==} + engines: {node: ^14.0.0 || >=16.0.0} semver@5.7.1: resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==} hasBin: true - semver@6.3.0: - resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} - hasBin: true - semver@6.3.1: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} hasBin: true @@ -6350,13 +5242,10 @@ packages: engines: {node: '>=10'} hasBin: true - send@0.18.0: - resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} - engines: {node: '>= 0.8.0'} - - serve-static@1.15.0: - resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==} - engines: {node: '>= 0.8.0'} + semver@7.6.3: + resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==} + engines: {node: '>=10'} + hasBin: true set-cookie-parser@2.6.0: resolution: {integrity: sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==} @@ -6365,21 +5254,10 @@ packages: resolution: {integrity: sha512-Li5AOqrZWCVA2n5kryzEmqai6bKSIvpz5oUJHPVj6+dsbD3X1ixtsY5tEnsaNpH3pFAHmG8eIHUrtEtohrg+UQ==} engines: {node: '>=0.10.0'} - setprototypeof@1.2.0: - resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} - - shebang-command@1.2.0: - resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==} - engines: {node: '>=0.10.0'} - shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} - shebang-regex@1.0.0: - resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==} - engines: {node: '>=0.10.0'} - shebang-regex@3.0.0: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} @@ -6392,9 +5270,6 @@ packages: shiki@0.10.1: resolution: {integrity: sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==} - side-channel@1.0.4: - resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} - siginfo@2.0.0: resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} @@ -6405,13 +5280,10 @@ packages: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} - simple-git-hooks@2.11.0: - resolution: {integrity: sha512-Wab2uzjGJEL8Kx+2UY8waUSfkiolt2RbaAJWvPCjaAEXrrKoS7JqPk4STiIVl/yt3asZRUzFoK2ryhwvgh5rYw==} + simple-git-hooks@2.11.1: + resolution: {integrity: sha512-tgqwPUMDcNDhuf1Xf6KTUsyeqGdgKMhzaH4PAZZuzguOgTl5uuyeYe/8mWgAr6IBxB5V06uqEf6Dy37gIWDtDg==} hasBin: true - simple-swizzle@0.2.2: - resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==} - sirv@2.0.4: resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==} engines: {node: '>= 10'} @@ -6426,21 +5298,16 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} - slice-ansi@3.0.0: - resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==} - engines: {node: '>=8'} - - slice-ansi@4.0.0: - resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==} - engines: {node: '>=10'} + slashes@3.0.12: + resolution: {integrity: sha512-Q9VME8WyGkc7pJf6QEkj3wE+2CnvZMI+XJhwdTPR8Z/kWQRXi7boAWLDibRPyHRTUTPx5FaU7MsyrjI3yLB4HA==} slice-ansi@5.0.0: resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==} engines: {node: '>=12'} - smart-buffer@4.2.0: - resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} - engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} + slice-ansi@7.1.0: + resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==} + engines: {node: '>=18'} socket.io-client@4.6.1: resolution: {integrity: sha512-5UswCV6hpaRsNg5kkEHVcbBIXEYoVbMQaHJBXJCyEQ+CiFPV1NIOY0XOFWG4XR4GZcB8Kn6AsRs/9cy9TbqVMQ==} @@ -6450,18 +5317,6 @@ packages: resolution: {integrity: sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==} engines: {node: '>=10.0.0'} - socks-proxy-agent@5.0.1: - resolution: {integrity: sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==} - engines: {node: '>= 6'} - - socks-proxy-agent@8.0.2: - resolution: {integrity: sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==} - engines: {node: '>= 14'} - - socks@2.7.1: - resolution: {integrity: sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==} - engines: {node: '>= 10.13.0', npm: '>= 3.0.0'} - sorcery@0.11.0: resolution: {integrity: sha512-J69LQ22xrQB1cIFJhPfgtLuI6BpWRiWu1Y3vSsIwK/eAScqJxd/+CJlUuHQRdX2C9NGFamq+KqNywGgaThwfHw==} hasBin: true @@ -6470,16 +5325,12 @@ packages: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} engines: {node: '>=0.10.0'} - source-map-js@1.1.0: - resolution: {integrity: sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw==} - engines: {node: '>=0.10.0'} - source-map-js@1.2.0: resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} engines: {node: '>=0.10.0'} - source-map@0.6.1: - resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} + source-map-js@1.2.1: + resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} space-separated-tokens@2.0.2: @@ -6510,37 +5361,17 @@ packages: split@0.3.3: resolution: {integrity: sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==} - sprintf-js@1.0.3: - resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} - - sshpk@1.17.0: - resolution: {integrity: sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==} - engines: {node: '>=0.10.0'} - hasBin: true - - ssri@10.0.5: - resolution: {integrity: sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - stack-trace@0.0.10: - resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==} + stable-hash@0.0.4: + resolution: {integrity: sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==} stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} - start-server-and-test@2.0.3: - resolution: {integrity: sha512-QsVObjfjFZKJE6CS6bSKNwWZCKBG6975/jKRPPGFfFh+yOQglSeGXiNWjzgQNXdphcBI9nXbyso9tPfX4YAUhg==} + start-server-and-test@2.0.5: + resolution: {integrity: sha512-2CV4pz69NJVJKQmJeSr+O+SPtOreu0yxvhPmSXclzmAKkPREuMabyMh+Txpzemjx0RDzXOcG2XkhiUuxjztSQw==} engines: {node: '>=16'} hasBin: true - statuses@1.5.0: - resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==} - engines: {node: '>= 0.6'} - - statuses@2.0.1: - resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==} - engines: {node: '>= 0.8'} - std-env@3.7.0: resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==} @@ -6556,9 +5387,6 @@ packages: stream-events@1.0.5: resolution: {integrity: sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==} - stream-json@1.7.4: - resolution: {integrity: sha512-ja2dde1v7dOlx5/vmavn8kLrxvNfs7r2oNc5DYmNJzayDDdudyCSuTB1gFjH4XBVTIwxiMxL4i059HX+ZiouXg==} - stream-json@1.8.0: resolution: {integrity: sha512-HZfXngYHUAr1exT4fxlbc1IOce1RYxp2ldeaf97LYCOPSoOqY/1Psp7iGvpb+6JIOgkra9zDYnPX01hGAHzEPw==} @@ -6576,16 +5404,13 @@ packages: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} engines: {node: '>=8'} - string-width@5.1.2: - resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} - engines: {node: '>=12'} + string-width@7.2.0: + resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==} + engines: {node: '>=18'} string.prototype.codepointat@0.2.1: resolution: {integrity: sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==} - string_decoder@0.10.31: - resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==} - string_decoder@1.1.1: resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} @@ -6619,17 +5444,10 @@ packages: resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==} engines: {node: '>=8'} - strip-json-comments@2.0.1: - resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==} - engines: {node: '>=0.10.0'} - strip-json-comments@3.1.1: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} - strip-literal@2.0.0: - resolution: {integrity: sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==} - strnum@1.0.5: resolution: {integrity: sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==} @@ -6644,11 +5462,6 @@ packages: engines: {npm: '>=8'} hasBin: true - superstatic@9.0.3: - resolution: {integrity: sha512-e/tmW0bsnQ/33ivK6y3CapJT0Ovy4pk/ohNPGhIAGU2oasoNLRQ1cv6enua09NU9w6Y0H/fBu07cjzuiWvLXxw==} - engines: {node: ^14.18.0 || >=16.4.0} - hasBin: true - supports-color@5.5.0: resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} engines: {node: '>=4'} @@ -6657,10 +5470,6 @@ packages: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} - supports-hyperlinks@2.3.0: - resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==} - engines: {node: '>=8'} - supports-preserve-symlinks-flag@1.0.0: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} @@ -6671,11 +5480,11 @@ packages: peerDependencies: svelte: ^3.55.0 || ^4.0.0-next.0 || ^4.0.0 || ^5.0.0-next.0 - svelte-eslint-parser@0.33.0: - resolution: {integrity: sha512-5awZ6Bs+Tb/zQwa41PSdcLynAVQTwW0HGyCBjtbAQ59taLZqDgQSMzRlDmapjZdDtzERm0oXDZNE0E+PKJ6ryg==} + svelte-eslint-parser@0.41.0: + resolution: {integrity: sha512-L6f4hOL+AbgfBIB52Z310pg1d2QjRqm7wy3kI1W6hhdhX5bvu7+f0R6w4ykp5HoDdzq+vGhIJmsisaiJDGmVfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: - svelte: ^3.37.0 || ^4.0.0 + svelte: ^3.37.0 || ^4.0.0 || ^5.0.0-next.191 peerDependenciesMeta: svelte: optional: true @@ -6686,8 +5495,8 @@ packages: peerDependencies: svelte: ^3.19.0 || ^4.0.0 - svelte-pieces@2.0.0-next.14: - resolution: {integrity: sha512-GPE9Qwo+dMyULMicvzAqaF1yrgzAljCgSphdJ6R9QDNrHbTadUJlF80t+P9T9EV8A025yu0G4hyMoPsMFA7IxQ==} + svelte-pieces@2.0.0-next.16: + resolution: {integrity: sha512-ch3BhXAJ3PjX9TbF3pxWaPeP7ajIVtQ1Vwg8KBC1npItYCYUDrvbiD1iJyPOpmVevE2xIHO5BggZQT/5cXlGGQ==} peerDependencies: svelte: ^3.55.0 || ^4.0.0 || ^5.0.0 @@ -6743,6 +5552,10 @@ packages: resolution: {integrity: sha512-d8+wsh5TfPwqVzbm4/HCXC783/KPHV60NvwitJnyTA5lWn1elhXMNWhXGCJ7PwPa8qFUnyJNIyuIRt2mT0WMug==} engines: {node: '>=16'} + svelte@4.2.19: + resolution: {integrity: sha512-IY1rnGr6izd10B0A8LqsBfmlT5OILVuZ7XsI0vdGPEvuonFV7NYEUK4dAkm9Zg2q0Um92kYjTpS1CAP3Nh/KWw==} + engines: {node: '>=16'} + sveltefirets@0.0.42: resolution: {integrity: sha512-xmyOCYFa8x+CaeM/8YvZHRPv+M82fYHmXKZG9BGdwje/2bGUSho+RHepbJL+eZLj5IgXhMhaC3BoRRMqREEZiw==} peerDependencies: @@ -6756,21 +5569,18 @@ packages: resolution: {integrity: sha512-Vhf+bUa//YSTYKseDiiEuQmhGCoIF3CVBhunm3r/DQnYiGT4JssmnKQc44BIyOZRK2pKjXXAgbhfmbeoC9CJpA==} engines: {node: '>=12.20'} - tar-stream@2.2.0: - resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==} - engines: {node: '>=6'} + synckit@0.9.1: + resolution: {integrity: sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==} + engines: {node: ^14.18.0 || >=16.0.0} - tar@6.1.11: - resolution: {integrity: sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==} - engines: {node: '>= 10'} + tapable@2.2.1: + resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} + engines: {node: '>=6'} tar@6.2.0: resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==} engines: {node: '>=10'} - tcp-port-used@1.0.2: - resolution: {integrity: sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==} - teeny-request@9.0.0: resolution: {integrity: sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==} engines: {node: '>=14'} @@ -6778,9 +5588,6 @@ packages: text-decoding@1.0.0: resolution: {integrity: sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==} - text-hex@1.0.0: - resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==} - text-table@0.2.0: resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} @@ -6790,27 +5597,33 @@ packages: tiny-glob@0.2.9: resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==} - tinybench@2.6.0: - resolution: {integrity: sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==} + tinybench@2.9.0: + resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} - tinypool@0.8.2: - resolution: {integrity: sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==} - engines: {node: '>=14.0.0'} + tinyexec@0.3.0: + resolution: {integrity: sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==} + + tinyexec@0.3.1: + resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==} + + tinyglobby@0.2.9: + resolution: {integrity: sha512-8or1+BGEdk1Zkkw2ii16qSS7uVrQJPre5A9o/XkWPATkk23FZh/15BKFxPnlTy6vkljZxLqYCzzBMj30ZrSvjw==} + engines: {node: '>=12.0.0'} + + tinypool@1.0.1: + resolution: {integrity: sha512-URZYihUbRPcGv95En+sz6MfghfIc2OJ1sv/RmhWZLouPY0/8Vo80viwPvg3dlaS9fuq7fQMEfgRRK7BBZThBEA==} + engines: {node: ^18.0.0 || >=20.0.0} tinyqueue@2.0.3: resolution: {integrity: sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==} - tinyspy@2.2.1: - resolution: {integrity: sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==} + tinyrainbow@1.2.0: + resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==} engines: {node: '>=14.0.0'} - tmp@0.0.33: - resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} - engines: {node: '>=0.6.0'} - - tmp@0.2.1: - resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==} - engines: {node: '>=8.17.0'} + tinyspy@3.0.2: + resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==} + engines: {node: '>=14.0.0'} to-fast-properties@2.0.0: resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} @@ -6820,12 +5633,8 @@ packages: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} - toidentifier@1.0.1: - resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} - engines: {node: '>=0.6'} - - toml-eslint-parser@0.9.3: - resolution: {integrity: sha512-moYoCvkNUAPCxSW9jmHmRElhm4tVJpHL8ItC/+uYD0EpPSFXbck7yREz9tNdJVTSpHVod8+HoipcpbQ0oE6gsw==} + toml-eslint-parser@0.10.0: + resolution: {integrity: sha512-khrZo4buq4qVmsGzS5yQjKe/WsFvV8fGfOjDQN0q4iy9FjRfPWRgTFrU8u1R2iu/SfWLhY9WnCi4Jhdrcbtg+g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} topojson-client@3.1.0: @@ -6840,33 +5649,23 @@ packages: resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==} engines: {node: '>=6'} - tough-cookie@2.5.0: - resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==} - engines: {node: '>=0.8'} - - toxic@1.0.1: - resolution: {integrity: sha512-WI3rIGdcaKULYg7KVoB0zcjikqvcYYvcuT6D89bFPz2rVR0Rl0PK6x8/X62rtdLtBKIE985NzVf/auTtGegIIg==} - tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} trim-lines@3.0.1: resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==} - triple-beam@1.3.0: - resolution: {integrity: sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==} - trough@2.2.0: resolution: {integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==} - ts-api-utils@1.0.3: - resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==} - engines: {node: '>=16.13.0'} + ts-api-utils@1.2.1: + resolution: {integrity: sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==} + engines: {node: '>=16'} peerDependencies: typescript: '>=4.2.0' - ts-api-utils@1.2.1: - resolution: {integrity: sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==} + ts-api-utils@1.3.0: + resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} engines: {node: '>=16'} peerDependencies: typescript: '>=4.2.0' @@ -6880,37 +5679,22 @@ packages: tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} - tsx@4.7.1: - resolution: {integrity: sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==} + tslib@2.7.0: + resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==} + + tsx@4.19.0: + resolution: {integrity: sha512-bV30kM7bsLZKZIOCHeMNVMJ32/LuJzLVajkQI/qf92J2Qr08ueLQvW00PUZGiuLPP760UINwupgUj8qrSCPUKg==} engines: {node: '>=18.0.0'} hasBin: true - tunnel-agent@0.6.0: - resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} - - tweetnacl@0.14.5: - resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==} - - type-check@0.3.2: - resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==} - engines: {node: '>= 0.8.0'} - type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} - type-detect@4.0.8: - resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} - engines: {node: '>=4'} - type-fest@0.20.2: resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} engines: {node: '>=10'} - type-fest@0.21.3: - resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==} - engines: {node: '>=10'} - type-fest@0.6.0: resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} engines: {node: '>=8'} @@ -6919,72 +5703,38 @@ packages: resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==} engines: {node: '>=8'} - type-fest@3.13.1: - resolution: {integrity: sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==} - engines: {node: '>=14.16'} - - type-fest@4.13.0: - resolution: {integrity: sha512-nKO1N9IFeTec3jnNe/3nZlX+RzwZsvT3c4akWC3IlhYGQbRSPFMBe87vmoaymS3hW2l/rs+4ptDDTxzcbqAcmA==} - engines: {node: '>=16'} - - type-is@1.6.18: - resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} - engines: {node: '>= 0.6'} - - typedarray-to-buffer@3.1.5: - resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==} - typescript@5.1.6: resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} engines: {node: '>=14.17'} hasBin: true - uc.micro@1.0.6: - resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} + typescript@5.6.2: + resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} + engines: {node: '>=14.17'} + hasBin: true ufo@1.4.0: resolution: {integrity: sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ==} - uglify-js@3.17.4: - resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==} - engines: {node: '>=0.8.0'} - hasBin: true - ultrahtml@1.0.0: resolution: {integrity: sha512-BOtReLegZ/OlSTVOSt4aH+wrUPwxoXvapUHXjwhDE4k4kMISWdfUR4PH5wvt/vgKjFcAcEUPFEZQiPiB87XO3Q==} unconfig@0.3.11: resolution: {integrity: sha512-bV/nqePAKv71v3HdVUn6UefbsDKQWRX+bJIkiSm0+twIds6WiD2bJLWWT3i214+J/B4edufZpG2w7Y63Vbwxow==} - underscore@1.13.6: - resolution: {integrity: sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==} - undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + undici-types@6.19.8: + resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + undici@5.28.3: resolution: {integrity: sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==} engines: {node: '>=14.0'} - unicorn-magic@0.1.0: - resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} - engines: {node: '>=18'} - unified@10.1.2: resolution: {integrity: sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==} - unique-filename@3.0.0: - resolution: {integrity: sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - unique-slug@4.0.0: - resolution: {integrity: sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - - unique-string@2.0.0: - resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==} - engines: {node: '>=8'} - unist-util-generated@2.0.1: resolution: {integrity: sha512-qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A==} @@ -7015,18 +5765,6 @@ packages: unist-util-visit@4.1.2: resolution: {integrity: sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==} - universal-analytics@0.5.3: - resolution: {integrity: sha512-HXSMyIcf2XTvwZ6ZZQLfxfViRm/yTGoRgDeTbojtq6rezeyKB0sTBcKH2fhddnteAHRcHiKgr/ACpbgjGOC6RQ==} - engines: {node: '>=12.18.2'} - - universalify@0.1.2: - resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} - engines: {node: '>= 4.0.0'} - - universalify@2.0.0: - resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==} - engines: {node: '>= 10.0.0'} - unocss@0.58.5: resolution: {integrity: sha512-0g4P6jLgRRNnhscxw7nQ9RHGrKJ1UPPiHPet+YT3TXUcmy4mTiYgo9+kGQf5bjyrzsELJ10cT6Qz2y6g9Tls4g==} engines: {node: '>=14'} @@ -7039,41 +5777,27 @@ packages: vite: optional: true - unpipe@1.0.0: - resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} - engines: {node: '>= 0.8'} - update-browserslist-db@1.0.13: resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} hasBin: true peerDependencies: browserslist: '>= 4.21.0' - update-notifier-cjs@5.1.6: - resolution: {integrity: sha512-wgxdSBWv3x/YpMzsWz5G4p4ec7JWD0HCl8W6bmNB6E5Gwo+1ym5oN4hiXpLf0mPySVEJEIsYlkshnplkg2OP9A==} - engines: {node: '>=14'} + update-browserslist-db@1.1.0: + resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==} + hasBin: true + peerDependencies: + browserslist: '>= 4.21.0' uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} - url-join@0.0.1: - resolution: {integrity: sha512-H6dnQ/yPAAVzMQRvEvyz01hhfQL5qRWSEt7BX8t9DqnPw9BjMb64fjIRq76Uvf1hkHp+mTZvEVJ5guXOT0Xqaw==} - url-parse@1.5.10: resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - utils-merge@1.0.1: - resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==} - engines: {node: '>= 0.4.0'} - - uuid@3.4.0: - resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==} - deprecated: Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details. - hasBin: true - uuid@8.3.2: resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} hasBin: true @@ -7087,23 +5811,12 @@ packages: engines: {node: '>=8'} hasBin: true - valid-url@1.0.9: - resolution: {integrity: sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA==} - validate-npm-package-license@3.0.4: resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} vanilla-colorful@0.7.2: resolution: {integrity: sha512-z2YZusTFC6KnLERx1cgoIRX2CjPRP0W75N+3CC6gbvdX5Ch47rZkEMGO2Xnf+IEmi3RiFLxS18gayMA27iU7Kg==} - vary@1.1.2: - resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} - engines: {node: '>= 0.8'} - - verror@1.10.0: - resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==} - engines: {'0': node >=0.6.0} - vfile-location@4.1.0: resolution: {integrity: sha512-YF23YMyASIIJXpktBa4vIGLJ5Gs88UB/XePgqPmTa7cDA+JeO3yclbpheQYCHjVHBn/yePzrXuygIL+xbvRYHw==} @@ -7116,13 +5829,13 @@ packages: vfile@5.3.7: resolution: {integrity: sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==} - vite-node@1.4.0: - resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==} + vite-node@2.1.3: + resolution: {integrity: sha512-I1JadzO+xYX887S39Do+paRePCKoiDrWRRjp9kkG5he0t7RXNvPAJPCQSJqbGN4uCrFFeS3Kj3sLqY8NMYBEdA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true - vite@5.1.4: - resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} + vite@5.4.2: + resolution: {integrity: sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -7130,6 +5843,7 @@ packages: less: '*' lightningcss: ^1.21.0 sass: '*' + sass-embedded: '*' stylus: '*' sugarss: '*' terser: ^5.4.0 @@ -7142,6 +5856,8 @@ packages: optional: true sass: optional: true + sass-embedded: + optional: true stylus: optional: true sugarss: @@ -7149,8 +5865,8 @@ packages: terser: optional: true - vite@5.1.6: - resolution: {integrity: sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==} + vite@5.4.9: + resolution: {integrity: sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -7158,6 +5874,7 @@ packages: less: '*' lightningcss: ^1.21.0 sass: '*' + sass-embedded: '*' stylus: '*' sugarss: '*' terser: ^5.4.0 @@ -7170,6 +5887,8 @@ packages: optional: true sass: optional: true + sass-embedded: + optional: true stylus: optional: true sugarss: @@ -7185,15 +5904,15 @@ packages: vite: optional: true - vitest@1.4.0: - resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} + vitest@2.1.3: + resolution: {integrity: sha512-Zrxbg/WiIvUP2uEzelDNTXmEMJXuzJ1kCpbDvaKByFA9MNeO95V+7r/3ti0qzJzrxdyuUw5VduN7k+D3VmVOSA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 1.4.0 - '@vitest/ui': 1.4.0 + '@vitest/browser': 2.1.3 + '@vitest/ui': 2.1.3 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -7210,20 +5929,14 @@ packages: jsdom: optional: true - vm2@3.9.9: - resolution: {integrity: sha512-xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw==} - engines: {node: '>=6.0'} - deprecated: The library contains critical security issues and should not be used for production! The maintenance of the project has been discontinued. Consider migrating your code to isolated-vm. - hasBin: true - vscode-oniguruma@1.7.0: resolution: {integrity: sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==} vscode-textmate@5.2.0: resolution: {integrity: sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==} - vue-eslint-parser@9.4.2: - resolution: {integrity: sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==} + vue-eslint-parser@9.4.3: + resolution: {integrity: sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: eslint: '>=6.0.0' @@ -7239,9 +5952,6 @@ packages: wavesurfer.js@5.2.0: resolution: {integrity: sha512-SkPlTXfvKy+ZnEA7f7g7jn6iQg5/8mAvWpVV5vRbIS/FF9TB2ak9J7VayQfzfshOLW/CqccTiN6DDR/fZA902g==} - wcwidth@1.0.1: - resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} - web-namespaces@2.0.1: resolution: {integrity: sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==} @@ -7263,81 +5973,34 @@ packages: resolution: {integrity: sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==} engines: {node: '>=0.8.0'} - whatwg-fetch@3.6.2: - resolution: {integrity: sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==} - whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} - which@1.3.1: - resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} - hasBin: true - which@2.0.2: resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} hasBin: true - which@4.0.0: - resolution: {integrity: sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==} - engines: {node: ^16.13.0 || >=18.0.0} - hasBin: true - - why-is-node-running@2.2.2: - resolution: {integrity: sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==} + why-is-node-running@2.3.0: + resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==} engines: {node: '>=8'} hasBin: true - widest-line@3.1.0: - resolution: {integrity: sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==} - engines: {node: '>=8'} - - winston-transport@4.5.0: - resolution: {integrity: sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==} - engines: {node: '>= 6.4.0'} - - winston@3.7.2: - resolution: {integrity: sha512-QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng==} - engines: {node: '>= 12.0.0'} - - word-wrap@1.2.3: - resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==} - engines: {node: '>=0.10.0'} - - wrap-ansi@6.2.0: - resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} - engines: {node: '>=8'} - wrap-ansi@7.0.0: resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} engines: {node: '>=10'} - wrap-ansi@8.1.0: - resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} - engines: {node: '>=12'} + wrap-ansi@9.0.0: + resolution: {integrity: sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==} + engines: {node: '>=18'} wrappy@1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - write-file-atomic@3.0.3: - resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==} - write-file-atomic@5.0.1: resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - ws@7.5.7: - resolution: {integrity: sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==} - engines: {node: '>=8.3.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - ws@8.11.0: resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==} engines: {node: '>=10.0.0'} @@ -7362,24 +6025,14 @@ packages: utf-8-validate: optional: true - xdg-basedir@4.0.0: - resolution: {integrity: sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==} - engines: {node: '>=8'} - xml-name-validator@4.0.0: resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==} engines: {node: '>=12'} - xmlcreate@2.0.4: - resolution: {integrity: sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==} - xmlhttprequest-ssl@2.0.0: resolution: {integrity: sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==} engines: {node: '>=0.4.0'} - xregexp@2.0.0: - resolution: {integrity: sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==} - xss@1.0.14: resolution: {integrity: sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw==} engines: {node: '>= 0.10.0'} @@ -7402,8 +6055,8 @@ packages: yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - yaml-eslint-parser@1.2.2: - resolution: {integrity: sha512-pEwzfsKbTrB8G3xc/sN7aw1v6A6c/pKxLAkjclnAyo5g5qOh6eL9WGu0o3cSDQZKrTNk4KL4lQSwZW+nBkANEg==} + yaml-eslint-parser@1.2.3: + resolution: {integrity: sha512-4wZWvE398hCP7O8n3nXKu/vdq1HcH01ixYlCREaJL5NUMwQ0g3MaGFUBNSlmBtKmhbtVG/Cm6lyYmSVTEVil8A==} engines: {node: ^14.17.0 || >=16.0.0} yaml@1.10.2: @@ -7414,6 +6067,11 @@ packages: resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==} engines: {node: '>= 14'} + yaml@2.5.0: + resolution: {integrity: sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==} + engines: {node: '>= 14'} + hasBin: true + yargs-parser@21.1.1: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} @@ -7426,18 +6084,10 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} - yocto-queue@1.0.0: - resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} - engines: {node: '>=12.20'} - yoga-layout-prebuilt@1.10.0: resolution: {integrity: sha512-YnOmtSbv4MTf7RGJMK0FvZ+KD8OEe/J5BNnR0GHhD8J/XcG/Qvxgszm0Un6FTHWW4uHlTgP0IztiXQnGyIR45g==} engines: {node: '>=8'} - zip-stream@4.1.0: - resolution: {integrity: sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==} - engines: {node: '>= 10'} - zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} @@ -7485,8 +6135,6 @@ snapshots: '@algolia/requester-common': 4.13.0 '@algolia/transporter': 4.13.0 - '@algolia/events@4.0.1': {} - '@algolia/logger-common@4.13.0': {} '@algolia/logger-console@4.13.0': @@ -7514,45 +6162,54 @@ snapshots: '@jridgewell/gen-mapping': 0.3.4 '@jridgewell/trace-mapping': 0.3.23 - '@antfu/eslint-config@2.12.1(@vue/compiler-sfc@3.4.21)(eslint-plugin-svelte@2.33.2(eslint@8.56.0)(svelte@4.2.12))(eslint@8.56.0)(svelte@4.2.12)(typescript@5.1.6)(vitest@1.4.0(@types/node@20.11.0)(@vitest/ui@1.4.0))': + '@ampproject/remapping@2.3.0': + dependencies: + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 + + '@antfu/eslint-config@2.27.3(@typescript-eslint/utils@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6))(@vue/compiler-sfc@3.4.38)(eslint-plugin-svelte@2.43.0(eslint@9.9.1(jiti@1.21.6))(svelte@4.2.12))(eslint@9.9.1(jiti@1.21.6))(svelte-eslint-parser@0.41.0(svelte@4.2.12))(svelte@4.2.12)(typescript@5.1.6)(vitest@2.1.3)': dependencies: - '@antfu/install-pkg': 0.3.2 + '@antfu/install-pkg': 0.4.1 '@clack/prompts': 0.7.0 - '@stylistic/eslint-plugin': 1.7.0(eslint@8.56.0)(typescript@5.1.6) - '@typescript-eslint/eslint-plugin': 7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0)(typescript@5.1.6) - '@typescript-eslint/parser': 7.5.0(eslint@8.56.0)(typescript@5.1.6) - eslint: 8.56.0 - eslint-config-flat-gitignore: 0.1.5 - eslint-flat-config-utils: 0.2.0 - eslint-merge-processors: 0.1.0(eslint@8.56.0) - eslint-plugin-antfu: 2.1.2(eslint@8.56.0) - eslint-plugin-eslint-comments: 3.2.0(eslint@8.56.0) - eslint-plugin-import-x: 0.5.0(eslint@8.56.0)(typescript@5.1.6) - eslint-plugin-jsdoc: 48.2.2(eslint@8.56.0) - eslint-plugin-jsonc: 2.15.0(eslint@8.56.0) - eslint-plugin-markdown: 4.0.1(eslint@8.56.0) - eslint-plugin-n: 16.6.2(eslint@8.56.0) - eslint-plugin-no-only-tests: 3.1.0 - eslint-plugin-perfectionist: 2.7.0(eslint@8.56.0)(svelte@4.2.12)(typescript@5.1.6)(vue-eslint-parser@9.4.2(eslint@8.56.0)) - eslint-plugin-toml: 0.11.0(eslint@8.56.0) - eslint-plugin-unicorn: 51.0.1(eslint@8.56.0) - eslint-plugin-unused-imports: 3.1.0(@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0) - eslint-plugin-vitest: 0.4.1(@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0)(typescript@5.1.6)(vitest@1.4.0(@types/node@20.11.0)(@vitest/ui@1.4.0)) - eslint-plugin-vue: 9.24.0(eslint@8.56.0) - eslint-plugin-yml: 1.14.0(eslint@8.56.0) - eslint-processor-vue-blocks: 0.1.1(@vue/compiler-sfc@3.4.21)(eslint@8.56.0) - globals: 15.0.0 + '@eslint-community/eslint-plugin-eslint-comments': 4.4.0(eslint@9.9.1(jiti@1.21.6)) + '@stylistic/eslint-plugin': 2.6.4(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) + '@typescript-eslint/eslint-plugin': 8.3.0(@typescript-eslint/parser@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6))(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) + '@typescript-eslint/parser': 8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) + '@vitest/eslint-plugin': 1.1.0(@typescript-eslint/utils@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6))(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6)(vitest@2.1.3) + eslint: 9.9.1(jiti@1.21.6) + eslint-config-flat-gitignore: 0.1.8 + eslint-flat-config-utils: 0.3.1 + eslint-merge-processors: 0.1.0(eslint@9.9.1(jiti@1.21.6)) + eslint-plugin-antfu: 2.3.6(eslint@9.9.1(jiti@1.21.6)) + eslint-plugin-command: 0.2.3(eslint@9.9.1(jiti@1.21.6)) + eslint-plugin-import-x: 4.1.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) + eslint-plugin-jsdoc: 50.2.2(eslint@9.9.1(jiti@1.21.6)) + eslint-plugin-jsonc: 2.16.0(eslint@9.9.1(jiti@1.21.6)) + eslint-plugin-markdown: 5.1.0(eslint@9.9.1(jiti@1.21.6)) + eslint-plugin-n: 17.10.2(eslint@9.9.1(jiti@1.21.6)) + eslint-plugin-no-only-tests: 3.3.0 + eslint-plugin-perfectionist: 3.3.0(eslint@9.9.1(jiti@1.21.6))(svelte-eslint-parser@0.41.0(svelte@4.2.12))(svelte@4.2.12)(typescript@5.1.6)(vue-eslint-parser@9.4.3(eslint@9.9.1(jiti@1.21.6))) + eslint-plugin-regexp: 2.6.0(eslint@9.9.1(jiti@1.21.6)) + eslint-plugin-toml: 0.11.1(eslint@9.9.1(jiti@1.21.6)) + eslint-plugin-unicorn: 55.0.0(eslint@9.9.1(jiti@1.21.6)) + eslint-plugin-unused-imports: 4.1.3(@typescript-eslint/eslint-plugin@8.3.0(@typescript-eslint/parser@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6))(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6))(eslint@9.9.1(jiti@1.21.6)) + eslint-plugin-vue: 9.27.0(eslint@9.9.1(jiti@1.21.6)) + eslint-plugin-yml: 1.14.0(eslint@9.9.1(jiti@1.21.6)) + eslint-processor-vue-blocks: 0.1.2(@vue/compiler-sfc@3.4.38)(eslint@9.9.1(jiti@1.21.6)) + globals: 15.9.0 jsonc-eslint-parser: 2.4.0 local-pkg: 0.5.0 parse-gitignore: 2.0.0 - picocolors: 1.0.0 - toml-eslint-parser: 0.9.3 - vue-eslint-parser: 9.4.2(eslint@8.56.0) - yaml-eslint-parser: 1.2.2 + picocolors: 1.0.1 + toml-eslint-parser: 0.10.0 + vue-eslint-parser: 9.4.3(eslint@9.9.1(jiti@1.21.6)) + yaml-eslint-parser: 1.2.3 yargs: 17.7.2 optionalDependencies: - eslint-plugin-svelte: 2.33.2(eslint@8.56.0)(svelte@4.2.12) + eslint-plugin-svelte: 2.43.0(eslint@9.9.1(jiti@1.21.6))(svelte@4.2.12) + svelte-eslint-parser: 0.41.0(svelte@4.2.12) transitivePeerDependencies: + - '@typescript-eslint/utils' - '@vue/compiler-sfc' - supports-color - svelte @@ -7564,18 +6221,14 @@ snapshots: execa: 5.1.1 find-up: 5.0.0 - '@antfu/install-pkg@0.3.2': + '@antfu/install-pkg@0.4.1': dependencies: - execa: 8.0.1 + package-manager-detector: 0.2.0 + tinyexec: 0.3.0 - '@antfu/utils@0.7.7': {} + '@antfu/utils@0.7.10': {} - '@apidevtools/json-schema-ref-parser@9.0.9': - dependencies: - '@jsdevtools/ono': 7.1.3 - '@types/json-schema': 7.0.11 - call-me-maybe: 1.0.1 - js-yaml: 4.1.0 + '@antfu/utils@0.7.7': {} '@babel/code-frame@7.23.5': dependencies: @@ -7691,8 +6344,14 @@ snapshots: '@babel/helper-string-parser@7.23.4': {} + '@babel/helper-string-parser@7.25.7': {} + '@babel/helper-validator-identifier@7.22.20': {} + '@babel/helper-validator-identifier@7.24.7': {} + + '@babel/helper-validator-identifier@7.25.7': {} + '@babel/helper-validator-option@7.23.5': {} '@babel/helpers@7.23.9': @@ -7709,14 +6368,14 @@ snapshots: chalk: 2.4.2 js-tokens: 4.0.0 - '@babel/parser@7.23.6': - dependencies: - '@babel/types': 7.23.6 - '@babel/parser@7.23.9': dependencies: '@babel/types': 7.23.9 + '@babel/parser@7.25.8': + dependencies: + '@babel/types': 7.25.8 + '@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.9)': dependencies: '@babel/core': 7.23.9 @@ -7776,16 +6435,16 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/types@7.23.6': + '@babel/types@7.23.9': dependencies: '@babel/helper-string-parser': 7.23.4 '@babel/helper-validator-identifier': 7.22.20 to-fast-properties: 2.0.0 - '@babel/types@7.23.9': + '@babel/types@7.25.8': dependencies: - '@babel/helper-string-parser': 7.23.4 - '@babel/helper-validator-identifier': 7.22.20 + '@babel/helper-string-parser': 7.25.7 + '@babel/helper-validator-identifier': 7.25.7 to-fast-properties: 2.0.0 '@ckeditor/ckeditor-cloud-services-collaboration@50.0.0': @@ -8017,13 +6676,13 @@ snapshots: '@clack/core@0.3.4': dependencies: - picocolors: 1.0.0 + picocolors: 1.0.1 sisteransi: 1.0.5 '@clack/prompts@0.7.0': dependencies: '@clack/core': 0.3.4 - picocolors: 1.0.0 + picocolors: 1.0.1 sisteransi: 1.0.5 '@codemirror/autocomplete@6.16.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)(@lezer/common@1.2.1)': @@ -8079,102 +6738,191 @@ snapshots: style-mod: 4.1.2 w3c-keyname: 2.2.8 - '@colors/colors@1.5.0': {} - - '@dabh/diagnostics@2.0.3': - dependencies: - colorspace: 1.1.4 - enabled: 2.0.0 - kuler: 2.0.0 - - '@es-joy/jsdoccomment@0.42.0': + '@es-joy/jsdoccomment@0.43.1': dependencies: + '@types/eslint': 8.56.7 + '@types/estree': 1.0.5 + '@typescript-eslint/types': 7.5.0 comment-parser: 1.4.1 esquery: 1.5.0 jsdoc-type-pratt-parser: 4.0.0 - '@esbuild/aix-ppc64@0.19.12': + '@es-joy/jsdoccomment@0.48.0': + dependencies: + comment-parser: 1.4.1 + esquery: 1.6.0 + jsdoc-type-pratt-parser: 4.1.0 + + '@esbuild/aix-ppc64@0.21.5': + optional: true + + '@esbuild/aix-ppc64@0.23.1': + optional: true + + '@esbuild/android-arm64@0.21.5': + optional: true + + '@esbuild/android-arm64@0.23.1': + optional: true + + '@esbuild/android-arm@0.21.5': + optional: true + + '@esbuild/android-arm@0.23.1': + optional: true + + '@esbuild/android-x64@0.21.5': + optional: true + + '@esbuild/android-x64@0.23.1': + optional: true + + '@esbuild/darwin-arm64@0.21.5': + optional: true + + '@esbuild/darwin-arm64@0.23.1': + optional: true + + '@esbuild/darwin-x64@0.21.5': + optional: true + + '@esbuild/darwin-x64@0.23.1': + optional: true + + '@esbuild/freebsd-arm64@0.21.5': + optional: true + + '@esbuild/freebsd-arm64@0.23.1': + optional: true + + '@esbuild/freebsd-x64@0.21.5': optional: true - '@esbuild/android-arm64@0.19.12': + '@esbuild/freebsd-x64@0.23.1': optional: true - '@esbuild/android-arm@0.19.12': + '@esbuild/linux-arm64@0.21.5': optional: true - '@esbuild/android-x64@0.19.12': + '@esbuild/linux-arm64@0.23.1': optional: true - '@esbuild/darwin-arm64@0.19.12': + '@esbuild/linux-arm@0.21.5': optional: true - '@esbuild/darwin-x64@0.19.12': + '@esbuild/linux-arm@0.23.1': optional: true - '@esbuild/freebsd-arm64@0.19.12': + '@esbuild/linux-ia32@0.21.5': optional: true - '@esbuild/freebsd-x64@0.19.12': + '@esbuild/linux-ia32@0.23.1': optional: true - '@esbuild/linux-arm64@0.19.12': + '@esbuild/linux-loong64@0.21.5': optional: true - '@esbuild/linux-arm@0.19.12': + '@esbuild/linux-loong64@0.23.1': optional: true - '@esbuild/linux-ia32@0.19.12': + '@esbuild/linux-mips64el@0.21.5': optional: true - '@esbuild/linux-loong64@0.19.12': + '@esbuild/linux-mips64el@0.23.1': optional: true - '@esbuild/linux-mips64el@0.19.12': + '@esbuild/linux-ppc64@0.21.5': optional: true - '@esbuild/linux-ppc64@0.19.12': + '@esbuild/linux-ppc64@0.23.1': optional: true - '@esbuild/linux-riscv64@0.19.12': + '@esbuild/linux-riscv64@0.21.5': optional: true - '@esbuild/linux-s390x@0.19.12': + '@esbuild/linux-riscv64@0.23.1': optional: true - '@esbuild/linux-x64@0.19.12': + '@esbuild/linux-s390x@0.21.5': optional: true - '@esbuild/netbsd-x64@0.19.12': + '@esbuild/linux-s390x@0.23.1': optional: true - '@esbuild/openbsd-x64@0.19.12': + '@esbuild/linux-x64@0.21.5': optional: true - '@esbuild/sunos-x64@0.19.12': + '@esbuild/linux-x64@0.23.1': optional: true - '@esbuild/win32-arm64@0.19.12': + '@esbuild/netbsd-x64@0.21.5': optional: true - '@esbuild/win32-ia32@0.19.12': + '@esbuild/netbsd-x64@0.23.1': optional: true - '@esbuild/win32-x64@0.19.12': + '@esbuild/openbsd-arm64@0.23.1': optional: true - '@eslint-community/eslint-utils@4.4.0(eslint@8.56.0)': + '@esbuild/openbsd-x64@0.21.5': + optional: true + + '@esbuild/openbsd-x64@0.23.1': + optional: true + + '@esbuild/sunos-x64@0.21.5': + optional: true + + '@esbuild/sunos-x64@0.23.1': + optional: true + + '@esbuild/win32-arm64@0.21.5': + optional: true + + '@esbuild/win32-arm64@0.23.1': + optional: true + + '@esbuild/win32-ia32@0.21.5': + optional: true + + '@esbuild/win32-ia32@0.23.1': + optional: true + + '@esbuild/win32-x64@0.21.5': + optional: true + + '@esbuild/win32-x64@0.23.1': + optional: true + + '@eslint-community/eslint-plugin-eslint-comments@4.4.0(eslint@9.9.1(jiti@1.21.6))': + dependencies: + escape-string-regexp: 4.0.0 + eslint: 9.9.1(jiti@1.21.6) + ignore: 5.3.1 + + '@eslint-community/eslint-utils@4.4.0(eslint@9.9.1(jiti@1.21.6))': dependencies: - eslint: 8.56.0 + eslint: 9.9.1(jiti@1.21.6) eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.10.0': {} - '@eslint/eslintrc@2.1.4': + '@eslint-community/regexpp@4.11.0': {} + + '@eslint/config-array@0.18.0': + dependencies: + '@eslint/object-schema': 2.1.4 + debug: 4.3.4 + minimatch: 3.1.2 + transitivePeerDependencies: + - supports-color + + '@eslint/eslintrc@3.1.0': dependencies: ajv: 6.12.6 debug: 4.3.4 - espree: 9.6.1 - globals: 13.20.0 + espree: 10.1.0 + globals: 14.0.0 ignore: 5.3.1 import-fresh: 3.3.0 js-yaml: 4.1.0 @@ -8183,7 +6931,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@eslint/js@8.56.0': {} + '@eslint/js@9.9.1': {} + + '@eslint/object-schema@2.1.4': {} '@fastify/busboy@1.2.1': dependencies: @@ -8538,51 +7288,18 @@ snapshots: - supports-color optional: true - '@google-cloud/paginator@4.0.1': - dependencies: - arrify: 2.0.1 - extend: 3.0.2 - '@google-cloud/paginator@5.0.0': dependencies: arrify: 2.0.1 extend: 3.0.2 optional: true - '@google-cloud/precise-date@3.0.1': {} - - '@google-cloud/projectify@3.0.0': {} - '@google-cloud/projectify@4.0.0': optional: true - '@google-cloud/promisify@2.0.4': {} - '@google-cloud/promisify@4.0.0': optional: true - '@google-cloud/pubsub@3.7.0(encoding@0.1.13)': - dependencies: - '@google-cloud/paginator': 4.0.1 - '@google-cloud/precise-date': 3.0.1 - '@google-cloud/projectify': 3.0.0 - '@google-cloud/promisify': 2.0.4 - '@opentelemetry/api': 1.1.0 - '@opentelemetry/semantic-conventions': 1.3.1 - '@types/duplexify': 3.6.1 - '@types/long': 4.0.2 - arrify: 2.0.1 - extend: 3.0.2 - google-auth-library: 8.9.0(encoding@0.1.13) - google-gax: 3.6.0(encoding@0.1.13) - heap-js: 2.3.0 - is-stream-ended: 0.1.4 - lodash.snakecase: 4.1.1 - p-defer: 3.0.0 - transitivePeerDependencies: - - encoding - - supports-color - '@google-cloud/storage@7.9.0(encoding@0.1.13)': dependencies: '@google-cloud/paginator': 5.0.0 @@ -8607,11 +7324,6 @@ snapshots: - supports-color optional: true - '@grpc/grpc-js@1.8.14': - dependencies: - '@grpc/proto-loader': 0.7.7 - '@types/node': 18.18.0 - '@grpc/grpc-js@1.9.13': dependencies: '@grpc/proto-loader': 0.7.10 @@ -8624,33 +7336,17 @@ snapshots: protobufjs: 7.2.5 yargs: 17.7.2 - '@grpc/proto-loader@0.7.7': - dependencies: - '@types/long': 4.0.2 - lodash.camelcase: 4.3.0 - long: 4.0.0 - protobufjs: 7.2.3 - yargs: 17.7.2 - '@hapi/hoek@9.3.0': {} '@hapi/topo@5.1.0': dependencies: '@hapi/hoek': 9.3.0 - '@humanwhocodes/config-array@0.11.14': - dependencies: - '@humanwhocodes/object-schema': 2.0.2 - debug: 4.3.4 - minimatch: 3.1.2 - transitivePeerDependencies: - - supports-color - '@humanwhocodes/module-importer@1.0.1': {} - '@humanwhocodes/object-schema@2.0.2': {} + '@humanwhocodes/retry@0.3.0': {} - '@iconify/json@2.2.192': + '@iconify/json@2.2.242': dependencies: '@iconify/types': 2.0.0 pathe: 1.1.2 @@ -8669,32 +7365,28 @@ snapshots: transitivePeerDependencies: - supports-color - '@isaacs/cliui@8.0.2': - dependencies: - string-width: 5.1.2 - string-width-cjs: string-width@4.2.3 - strip-ansi: 7.1.0 - strip-ansi-cjs: strip-ansi@6.0.1 - wrap-ansi: 8.1.0 - wrap-ansi-cjs: wrap-ansi@7.0.0 - optional: true - - '@jest/schemas@29.6.3': - dependencies: - '@sinclair/typebox': 0.27.8 - - '@jridgewell/gen-mapping@0.3.4': + '@jridgewell/gen-mapping@0.3.4': dependencies: '@jridgewell/set-array': 1.1.2 '@jridgewell/sourcemap-codec': 1.4.15 '@jridgewell/trace-mapping': 0.3.23 + '@jridgewell/gen-mapping@0.3.5': + dependencies: + '@jridgewell/set-array': 1.2.1 + '@jridgewell/sourcemap-codec': 1.5.0 + '@jridgewell/trace-mapping': 0.3.25 + '@jridgewell/resolve-uri@3.1.2': {} '@jridgewell/set-array@1.1.2': {} + '@jridgewell/set-array@1.2.1': {} + '@jridgewell/sourcemap-codec@1.4.15': {} + '@jridgewell/sourcemap-codec@1.5.0': {} + '@jridgewell/trace-mapping@0.3.23': dependencies: '@jridgewell/resolve-uri': 3.1.2 @@ -8705,16 +7397,10 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.4.15 - '@jsdevtools/ono@7.1.3': {} - - '@jsdoc/salty@0.2.5': - dependencies: - lodash: 4.17.21 - - '@julr/unocss-preset-forms@0.0.5(unocss@0.58.5(postcss@8.4.37)(rollup@4.13.0)(vite@5.1.4(@types/node@20.11.0)))': + '@julr/unocss-preset-forms@0.0.5(unocss@0.58.5(postcss@8.4.47)(rollup@4.24.0)(vite@5.4.2(@types/node@22.5.1)))': dependencies: mini-svg-data-uri: 1.4.4 - unocss: 0.58.5(postcss@8.4.37)(rollup@4.13.0)(vite@5.1.4(@types/node@20.11.0)) + unocss: 0.58.5(postcss@8.4.47)(rollup@4.24.0)(vite@5.4.2(@types/node@22.5.1)) '@kitbook/mdsvex-shiki-twoslash@1.0.0-beta.31(svelte@4.2.12)(typescript@5.1.6)': dependencies: @@ -8748,7 +7434,7 @@ snapshots: dependencies: '@lezer/common': 1.2.1 - '@living-dictionaries/types@1.0.0': {} + '@msgpack/msgpack@2.8.0': {} '@nodelib/fs.scandir@2.1.5': dependencies: @@ -8762,48 +7448,21 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 - '@npmcli/agent@2.2.0': - dependencies: - agent-base: 7.1.0 - http-proxy-agent: 7.0.0 - https-proxy-agent: 7.0.4 - lru-cache: 10.1.0 - socks-proxy-agent: 8.0.2 - transitivePeerDependencies: - - supports-color - optional: true + '@orama/orama@2.0.23': {} - '@npmcli/fs@3.1.0': + '@orama/plugin-data-persistence@2.0.23': dependencies: - semver: 7.5.4 - optional: true - - '@opentelemetry/api@1.1.0': {} + '@msgpack/msgpack': 2.8.0 + '@orama/orama': 2.0.23 + dpack: 0.6.22 - '@opentelemetry/semantic-conventions@1.3.1': {} - - '@orama/orama@2.0.11': {} - - '@pkgjs/parseargs@0.11.0': - optional: true + '@pkgr/core@0.1.1': {} '@playwright/test@1.41.2': dependencies: playwright: 1.41.2 - '@pnpm/config.env-replace@1.1.0': {} - - '@pnpm/network.ca-file@1.0.2': - dependencies: - graceful-fs: 4.2.10 - - '@pnpm/npm-conf@2.2.0': - dependencies: - '@pnpm/config.env-replace': 1.1.0 - '@pnpm/network.ca-file': 1.0.2 - config-chain: 1.1.13 - - '@polka/url@1.0.0-next.24': {} + '@polka/url@1.0.0-next.28': {} '@protobufjs/aspromise@1.1.2': {} @@ -8879,90 +7538,108 @@ snapshots: '@resvg/resvg-js-win32-ia32-msvc': 2.2.0 '@resvg/resvg-js-win32-x64-msvc': 2.2.0 - '@rollup/pluginutils@5.1.0(rollup@4.13.0)': + '@rollup/pluginutils@5.1.0(rollup@4.24.0)': dependencies: '@types/estree': 1.0.5 estree-walker: 2.0.2 picomatch: 2.3.1 optionalDependencies: - rollup: 4.13.0 + rollup: 4.24.0 - '@rollup/rollup-android-arm-eabi@4.12.0': + '@rollup/rollup-android-arm-eabi@4.21.1': optional: true - '@rollup/rollup-android-arm-eabi@4.13.0': + '@rollup/rollup-android-arm-eabi@4.24.0': optional: true - '@rollup/rollup-android-arm64@4.12.0': + '@rollup/rollup-android-arm64@4.21.1': optional: true - '@rollup/rollup-android-arm64@4.13.0': + '@rollup/rollup-android-arm64@4.24.0': optional: true - '@rollup/rollup-darwin-arm64@4.12.0': + '@rollup/rollup-darwin-arm64@4.21.1': optional: true - '@rollup/rollup-darwin-arm64@4.13.0': + '@rollup/rollup-darwin-arm64@4.24.0': optional: true - '@rollup/rollup-darwin-x64@4.12.0': + '@rollup/rollup-darwin-x64@4.21.1': optional: true - '@rollup/rollup-darwin-x64@4.13.0': + '@rollup/rollup-darwin-x64@4.24.0': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.12.0': + '@rollup/rollup-linux-arm-gnueabihf@4.21.1': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.13.0': + '@rollup/rollup-linux-arm-gnueabihf@4.24.0': optional: true - '@rollup/rollup-linux-arm64-gnu@4.12.0': + '@rollup/rollup-linux-arm-musleabihf@4.21.1': optional: true - '@rollup/rollup-linux-arm64-gnu@4.13.0': + '@rollup/rollup-linux-arm-musleabihf@4.24.0': optional: true - '@rollup/rollup-linux-arm64-musl@4.12.0': + '@rollup/rollup-linux-arm64-gnu@4.21.1': optional: true - '@rollup/rollup-linux-arm64-musl@4.13.0': + '@rollup/rollup-linux-arm64-gnu@4.24.0': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.12.0': + '@rollup/rollup-linux-arm64-musl@4.21.1': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.13.0': + '@rollup/rollup-linux-arm64-musl@4.24.0': optional: true - '@rollup/rollup-linux-x64-gnu@4.12.0': + '@rollup/rollup-linux-powerpc64le-gnu@4.21.1': optional: true - '@rollup/rollup-linux-x64-gnu@4.13.0': + '@rollup/rollup-linux-powerpc64le-gnu@4.24.0': optional: true - '@rollup/rollup-linux-x64-musl@4.12.0': + '@rollup/rollup-linux-riscv64-gnu@4.21.1': optional: true - '@rollup/rollup-linux-x64-musl@4.13.0': + '@rollup/rollup-linux-riscv64-gnu@4.24.0': optional: true - '@rollup/rollup-win32-arm64-msvc@4.12.0': + '@rollup/rollup-linux-s390x-gnu@4.21.1': optional: true - '@rollup/rollup-win32-arm64-msvc@4.13.0': + '@rollup/rollup-linux-s390x-gnu@4.24.0': optional: true - '@rollup/rollup-win32-ia32-msvc@4.12.0': + '@rollup/rollup-linux-x64-gnu@4.21.1': optional: true - '@rollup/rollup-win32-ia32-msvc@4.13.0': + '@rollup/rollup-linux-x64-gnu@4.24.0': optional: true - '@rollup/rollup-win32-x64-msvc@4.12.0': + '@rollup/rollup-linux-x64-musl@4.21.1': optional: true - '@rollup/rollup-win32-x64-msvc@4.13.0': + '@rollup/rollup-linux-x64-musl@4.24.0': + optional: true + + '@rollup/rollup-win32-arm64-msvc@4.21.1': + optional: true + + '@rollup/rollup-win32-arm64-msvc@4.24.0': + optional: true + + '@rollup/rollup-win32-ia32-msvc@4.21.1': + optional: true + + '@rollup/rollup-win32-ia32-msvc@4.24.0': + optional: true + + '@rollup/rollup-win32-x64-msvc@4.21.1': + optional: true + + '@rollup/rollup-win32-x64-msvc@4.24.0': optional: true '@sentry/browser@6.19.3': @@ -9012,54 +7689,49 @@ snapshots: '@sideway/pinpoint@2.0.0': {} - '@sinclair/typebox@0.27.8': {} - '@socket.io/component-emitter@3.1.0': {} - '@stylistic/eslint-plugin-js@1.7.0(eslint@8.56.0)': + '@stylistic/eslint-plugin-js@2.6.4(eslint@9.9.1(jiti@1.21.6))': dependencies: - '@types/eslint': 8.56.7 - acorn: 8.11.3 - escape-string-regexp: 4.0.0 - eslint: 8.56.0 - eslint-visitor-keys: 3.4.3 - espree: 9.6.1 + '@types/eslint': 9.6.1 + acorn: 8.12.1 + eslint: 9.9.1(jiti@1.21.6) + eslint-visitor-keys: 4.0.0 + espree: 10.1.0 - '@stylistic/eslint-plugin-jsx@1.7.0(eslint@8.56.0)': + '@stylistic/eslint-plugin-jsx@2.6.4(eslint@9.9.1(jiti@1.21.6))': dependencies: - '@stylistic/eslint-plugin-js': 1.7.0(eslint@8.56.0) - '@types/eslint': 8.56.7 - eslint: 8.56.0 + '@stylistic/eslint-plugin-js': 2.6.4(eslint@9.9.1(jiti@1.21.6)) + '@types/eslint': 9.6.1 + eslint: 9.9.1(jiti@1.21.6) + eslint-visitor-keys: 4.0.0 + espree: 10.1.0 estraverse: 5.3.0 picomatch: 4.0.2 - '@stylistic/eslint-plugin-plus@1.7.0(eslint@8.56.0)(typescript@5.1.6)': + '@stylistic/eslint-plugin-plus@2.6.4(eslint@9.9.1(jiti@1.21.6))': dependencies: - '@types/eslint': 8.56.7 - '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.1.6) - eslint: 8.56.0 - transitivePeerDependencies: - - supports-color - - typescript + '@types/eslint': 9.6.1 + eslint: 9.9.1(jiti@1.21.6) - '@stylistic/eslint-plugin-ts@1.7.0(eslint@8.56.0)(typescript@5.1.6)': + '@stylistic/eslint-plugin-ts@2.6.4(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6)': dependencies: - '@stylistic/eslint-plugin-js': 1.7.0(eslint@8.56.0) - '@types/eslint': 8.56.7 - '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.1.6) - eslint: 8.56.0 + '@stylistic/eslint-plugin-js': 2.6.4(eslint@9.9.1(jiti@1.21.6)) + '@types/eslint': 9.6.1 + '@typescript-eslint/utils': 8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) + eslint: 9.9.1(jiti@1.21.6) transitivePeerDependencies: - supports-color - typescript - '@stylistic/eslint-plugin@1.7.0(eslint@8.56.0)(typescript@5.1.6)': + '@stylistic/eslint-plugin@2.6.4(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6)': dependencies: - '@stylistic/eslint-plugin-js': 1.7.0(eslint@8.56.0) - '@stylistic/eslint-plugin-jsx': 1.7.0(eslint@8.56.0) - '@stylistic/eslint-plugin-plus': 1.7.0(eslint@8.56.0)(typescript@5.1.6) - '@stylistic/eslint-plugin-ts': 1.7.0(eslint@8.56.0)(typescript@5.1.6) - '@types/eslint': 8.56.7 - eslint: 8.56.0 + '@stylistic/eslint-plugin-js': 2.6.4(eslint@9.9.1(jiti@1.21.6)) + '@stylistic/eslint-plugin-jsx': 2.6.4(eslint@9.9.1(jiti@1.21.6)) + '@stylistic/eslint-plugin-plus': 2.6.4(eslint@9.9.1(jiti@1.21.6)) + '@stylistic/eslint-plugin-ts': 2.6.4(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) + '@types/eslint': 9.6.1 + eslint: 9.9.1(jiti@1.21.6) transitivePeerDependencies: - supports-color - typescript @@ -9106,14 +7778,14 @@ snapshots: - bufferutil - utf-8-validate - '@sveltejs/adapter-auto@3.1.1(@sveltejs/kit@2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))': + '@sveltejs/adapter-auto@3.1.1(@sveltejs/kit@2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))': dependencies: - '@sveltejs/kit': 2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)) + '@sveltejs/kit': 2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)) import-meta-resolve: 4.0.0 - '@sveltejs/kit@2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0))': + '@sveltejs/kit@2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1))': dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)) + '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)) '@types/cookie': 0.6.0 cookie: 0.6.0 devalue: 4.3.2 @@ -9127,33 +7799,31 @@ snapshots: sirv: 2.0.4 svelte: 4.2.12 tiny-glob: 0.2.9 - vite: 5.1.4(@types/node@20.11.0) + vite: 5.4.2(@types/node@22.5.1) - '@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0))': + '@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1))': dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)) + '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)) debug: 4.3.4 svelte: 4.2.12 - vite: 5.1.4(@types/node@20.11.0) + vite: 5.4.2(@types/node@22.5.1) transitivePeerDependencies: - supports-color - '@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0))': + '@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1))': dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)) + '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)) debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.7 svelte: 4.2.12 svelte-hmr: 0.15.3(svelte@4.2.12) - vite: 5.1.4(@types/node@20.11.0) - vitefu: 0.2.5(vite@5.1.4(@types/node@20.11.0)) + vite: 5.4.2(@types/node@22.5.1) + vitefu: 0.2.5(vite@5.4.2(@types/node@22.5.1)) transitivePeerDependencies: - supports-color - '@tootallnate/once@1.1.2': {} - '@tootallnate/once@2.0.0': optional: true @@ -10077,11 +8747,6 @@ snapshots: '@turf/invariant': 7.0.0-alpha.1 d3-voronoi: 1.1.2 - '@types/body-parser@1.19.2': - dependencies: - '@types/connect': 3.4.35 - '@types/node': 18.18.0 - '@types/body-parser@1.19.5': dependencies: '@types/connect': 3.4.38 @@ -10241,20 +8906,12 @@ snapshots: dependencies: '@ckeditor/ckeditor5-word-count': 38.1.1 - '@types/connect@3.4.35': - dependencies: - '@types/node': 18.18.0 - '@types/connect@3.4.38': dependencies: '@types/node': 18.18.0 '@types/cookie@0.6.0': {} - '@types/cors@2.8.13': - dependencies: - '@types/node': 18.18.0 - '@types/d3-dsv@3.0.0': {} '@types/d3-geo@3.1.0': @@ -10265,22 +8922,19 @@ snapshots: dependencies: '@types/ms': 0.7.34 - '@types/duplexify@3.6.1': + '@types/eslint@8.56.7': dependencies: - '@types/node': 18.18.0 + '@types/estree': 1.0.5 + '@types/json-schema': 7.0.15 - '@types/eslint@8.56.7': + '@types/eslint@9.6.1': dependencies: '@types/estree': 1.0.5 '@types/json-schema': 7.0.15 '@types/estree@1.0.5': {} - '@types/express-serve-static-core@4.17.33': - dependencies: - '@types/node': 18.18.0 - '@types/qs': 6.9.7 - '@types/range-parser': 1.2.4 + '@types/estree@1.0.6': {} '@types/express-serve-static-core@4.17.41': dependencies: @@ -10296,12 +8950,6 @@ snapshots: '@types/qs': 6.9.11 '@types/serve-static': 1.15.5 - '@types/express@4.17.3': - dependencies: - '@types/body-parser': 1.19.2 - '@types/express-serve-static-core': 4.17.33 - '@types/serve-static': 1.15.1 - '@types/extend@3.0.4': {} '@types/file-saver@2.0.5': {} @@ -10310,23 +8958,12 @@ snapshots: '@types/geojson@7946.0.8': {} - '@types/glob@8.1.0': - dependencies: - '@types/minimatch': 5.1.2 - '@types/node': 18.18.0 - - '@types/google.maps@3.48.3': {} - '@types/hast@2.3.10': dependencies: '@types/unist': 2.0.10 - '@types/hogan.js@3.0.1': {} - '@types/http-errors@2.0.4': {} - '@types/json-schema@7.0.11': {} - '@types/json-schema@7.0.13': {} '@types/json-schema@7.0.15': {} @@ -10335,9 +8972,8 @@ snapshots: dependencies: '@types/node': 18.18.0 - '@types/linkify-it@3.0.2': {} - - '@types/long@4.0.2': {} + '@types/long@4.0.2': + optional: true '@types/mapbox-gl@2.7.6': dependencies: @@ -10348,25 +8984,14 @@ snapshots: '@types/geojson': 7946.0.10 '@types/mapbox-gl': 2.7.6 - '@types/markdown-it@12.2.3': - dependencies: - '@types/linkify-it': 3.0.2 - '@types/mdurl': 1.0.2 - '@types/mdast@3.0.15': dependencies: '@types/unist': 2.0.10 - '@types/mdurl@1.0.2': {} - '@types/mime@1.3.5': {} - '@types/mime@3.0.1': {} - '@types/mime@3.0.4': {} - '@types/minimatch@5.1.2': {} - '@types/ms@0.7.34': {} '@types/node@18.11.18': {} @@ -10377,11 +9002,16 @@ snapshots: dependencies: undici-types: 5.26.5 + '@types/node@22.5.1': + dependencies: + undici-types: 6.19.8 + optional: true + '@types/normalize-package-data@2.4.4': {} '@types/parse5@6.0.3': {} - '@types/pg@8.10.9': + '@types/pg@8.11.8': dependencies: '@types/node': 18.18.0 pg-protocol: 1.6.0 @@ -10393,10 +9023,6 @@ snapshots: '@types/qs@6.9.11': {} - '@types/qs@6.9.7': {} - - '@types/range-parser@1.2.4': {} - '@types/range-parser@1.2.7': {} '@types/recordrtc@5.6.10': {} @@ -10409,25 +9035,13 @@ snapshots: form-data: 2.5.1 optional: true - '@types/rimraf@3.0.2': - dependencies: - '@types/glob': 8.1.0 - '@types/node': 18.18.0 - '@types/semver@7.5.3': {} - '@types/semver@7.5.7': {} - '@types/send@0.17.4': dependencies: '@types/mime': 1.3.5 '@types/node': 18.18.0 - '@types/serve-static@1.15.1': - dependencies: - '@types/mime': 3.0.1 - '@types/node': 18.18.0 - '@types/serve-static@1.15.5': dependencies: '@types/http-errors': 2.0.4 @@ -10454,118 +9068,64 @@ snapshots: '@types/yoga-layout@1.9.2': {} - '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@7.5.0(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0)(typescript@5.1.6)': - dependencies: - '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 7.5.0(eslint@8.56.0)(typescript@5.1.6) - '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/type-utils': 6.21.0(eslint@8.56.0)(typescript@5.1.6) - '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.1.6) - '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.4 - eslint: 8.56.0 - graphemer: 1.4.0 - ignore: 5.3.1 - natural-compare: 1.4.0 - semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.1.6) - optionalDependencies: - typescript: 5.1.6 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0)(typescript@5.1.6)': + '@typescript-eslint/eslint-plugin@8.3.0(@typescript-eslint/parser@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6))(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6)': dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 7.5.0(eslint@8.56.0)(typescript@5.1.6) - '@typescript-eslint/scope-manager': 7.5.0 - '@typescript-eslint/type-utils': 7.5.0(eslint@8.56.0)(typescript@5.1.6) - '@typescript-eslint/utils': 7.5.0(eslint@8.56.0)(typescript@5.1.6) - '@typescript-eslint/visitor-keys': 7.5.0 - debug: 4.3.4 - eslint: 8.56.0 + '@typescript-eslint/parser': 8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) + '@typescript-eslint/scope-manager': 8.3.0 + '@typescript-eslint/type-utils': 8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) + '@typescript-eslint/utils': 8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) + '@typescript-eslint/visitor-keys': 8.3.0 + eslint: 9.9.1(jiti@1.21.6) graphemer: 1.4.0 ignore: 5.3.1 natural-compare: 1.4.0 - semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.1.6) + ts-api-utils: 1.3.0(typescript@5.1.6) optionalDependencies: typescript: 5.1.6 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@7.5.0(eslint@8.56.0)(typescript@5.1.6)': + '@typescript-eslint/parser@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6)': dependencies: - '@typescript-eslint/scope-manager': 7.5.0 - '@typescript-eslint/types': 7.5.0 - '@typescript-eslint/typescript-estree': 7.5.0(typescript@5.1.6) - '@typescript-eslint/visitor-keys': 7.5.0 + '@typescript-eslint/scope-manager': 8.3.0 + '@typescript-eslint/types': 8.3.0 + '@typescript-eslint/typescript-estree': 8.3.0(typescript@5.1.6) + '@typescript-eslint/visitor-keys': 8.3.0 debug: 4.3.4 - eslint: 8.56.0 + eslint: 9.9.1(jiti@1.21.6) optionalDependencies: typescript: 5.1.6 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@6.21.0': - dependencies: - '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/visitor-keys': 6.21.0 - '@typescript-eslint/scope-manager@6.7.3': dependencies: '@typescript-eslint/types': 6.7.3 '@typescript-eslint/visitor-keys': 6.7.3 - '@typescript-eslint/scope-manager@7.5.0': - dependencies: - '@typescript-eslint/types': 7.5.0 - '@typescript-eslint/visitor-keys': 7.5.0 - - '@typescript-eslint/type-utils@6.21.0(eslint@8.56.0)(typescript@5.1.6)': + '@typescript-eslint/scope-manager@8.3.0': dependencies: - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.1.6) - '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.1.6) - debug: 4.3.4 - eslint: 8.56.0 - ts-api-utils: 1.2.1(typescript@5.1.6) - optionalDependencies: - typescript: 5.1.6 - transitivePeerDependencies: - - supports-color + '@typescript-eslint/types': 8.3.0 + '@typescript-eslint/visitor-keys': 8.3.0 - '@typescript-eslint/type-utils@7.5.0(eslint@8.56.0)(typescript@5.1.6)': + '@typescript-eslint/type-utils@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6)': dependencies: - '@typescript-eslint/typescript-estree': 7.5.0(typescript@5.1.6) - '@typescript-eslint/utils': 7.5.0(eslint@8.56.0)(typescript@5.1.6) + '@typescript-eslint/typescript-estree': 8.3.0(typescript@5.1.6) + '@typescript-eslint/utils': 8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) debug: 4.3.4 - eslint: 8.56.0 - ts-api-utils: 1.2.1(typescript@5.1.6) + ts-api-utils: 1.3.0(typescript@5.1.6) optionalDependencies: typescript: 5.1.6 transitivePeerDependencies: + - eslint - supports-color - '@typescript-eslint/types@6.21.0': {} - '@typescript-eslint/types@6.7.3': {} '@typescript-eslint/types@7.5.0': {} - '@typescript-eslint/typescript-estree@6.21.0(typescript@5.1.6)': - dependencies: - '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.4 - globby: 11.1.0 - is-glob: 4.0.3 - minimatch: 9.0.3 - semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.1.6) - optionalDependencies: - typescript: 5.1.6 - transitivePeerDependencies: - - supports-color + '@typescript-eslint/types@8.3.0': {} '@typescript-eslint/typescript-estree@6.7.3(typescript@5.1.6)': dependencies: @@ -10575,101 +9135,79 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 - ts-api-utils: 1.0.3(typescript@5.1.6) + ts-api-utils: 1.2.1(typescript@5.1.6) optionalDependencies: typescript: 5.1.6 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@7.5.0(typescript@5.1.6)': + '@typescript-eslint/typescript-estree@8.3.0(typescript@5.1.6)': dependencies: - '@typescript-eslint/types': 7.5.0 - '@typescript-eslint/visitor-keys': 7.5.0 + '@typescript-eslint/types': 8.3.0 + '@typescript-eslint/visitor-keys': 8.3.0 debug: 4.3.4 - globby: 11.1.0 + fast-glob: 3.3.2 is-glob: 4.0.3 - minimatch: 9.0.3 + minimatch: 9.0.5 semver: 7.6.0 - ts-api-utils: 1.2.1(typescript@5.1.6) + ts-api-utils: 1.3.0(typescript@5.1.6) optionalDependencies: typescript: 5.1.6 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@6.21.0(eslint@8.56.0)(typescript@5.1.6)': - dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) - '@types/json-schema': 7.0.15 - '@types/semver': 7.5.7 - '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.1.6) - eslint: 8.56.0 - semver: 7.6.0 - transitivePeerDependencies: - - supports-color - - typescript - - '@typescript-eslint/utils@6.7.3(eslint@8.56.0)(typescript@5.1.6)': + '@typescript-eslint/utils@6.7.3(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1(jiti@1.21.6)) '@types/json-schema': 7.0.13 '@types/semver': 7.5.3 '@typescript-eslint/scope-manager': 6.7.3 '@typescript-eslint/types': 6.7.3 '@typescript-eslint/typescript-estree': 6.7.3(typescript@5.1.6) - eslint: 8.56.0 + eslint: 9.9.1(jiti@1.21.6) semver: 7.5.4 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/utils@7.5.0(eslint@8.56.0)(typescript@5.1.6)': + '@typescript-eslint/utils@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) - '@types/json-schema': 7.0.15 - '@types/semver': 7.5.7 - '@typescript-eslint/scope-manager': 7.5.0 - '@typescript-eslint/types': 7.5.0 - '@typescript-eslint/typescript-estree': 7.5.0(typescript@5.1.6) - eslint: 8.56.0 - semver: 7.6.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1(jiti@1.21.6)) + '@typescript-eslint/scope-manager': 8.3.0 + '@typescript-eslint/types': 8.3.0 + '@typescript-eslint/typescript-estree': 8.3.0(typescript@5.1.6) + eslint: 9.9.1(jiti@1.21.6) transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/visitor-keys@6.21.0': - dependencies: - '@typescript-eslint/types': 6.21.0 - eslint-visitor-keys: 3.4.3 - '@typescript-eslint/visitor-keys@6.7.3': dependencies: '@typescript-eslint/types': 6.7.3 eslint-visitor-keys: 3.4.3 - '@typescript-eslint/visitor-keys@7.5.0': + '@typescript-eslint/visitor-keys@8.3.0': dependencies: - '@typescript-eslint/types': 7.5.0 + '@typescript-eslint/types': 8.3.0 eslint-visitor-keys: 3.4.3 '@typescript/twoslash@3.1.0': dependencies: '@typescript/vfs': 1.3.5 - debug: 4.3.4 + debug: 4.3.6 lz-string: 1.4.4 transitivePeerDependencies: - supports-color '@typescript/vfs@1.3.4': dependencies: - debug: 4.3.4 + debug: 4.3.6 transitivePeerDependencies: - supports-color '@typescript/vfs@1.3.5': dependencies: - debug: 4.3.4 + debug: 4.3.6 transitivePeerDependencies: - supports-color @@ -10679,22 +9217,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@ungap/structured-clone@1.2.0': {} - - '@unocss/astro@0.58.5(rollup@4.13.0)(vite@5.1.4(@types/node@20.11.0))': + '@unocss/astro@0.58.5(rollup@4.24.0)(vite@5.4.2(@types/node@22.5.1))': dependencies: '@unocss/core': 0.58.5 '@unocss/reset': 0.58.5 - '@unocss/vite': 0.58.5(rollup@4.13.0)(vite@5.1.4(@types/node@20.11.0)) + '@unocss/vite': 0.58.5(rollup@4.24.0)(vite@5.4.2(@types/node@22.5.1)) optionalDependencies: - vite: 5.1.4(@types/node@20.11.0) + vite: 5.4.2(@types/node@22.5.1) transitivePeerDependencies: - rollup - '@unocss/cli@0.58.5(rollup@4.13.0)': + '@unocss/cli@0.58.5(rollup@4.24.0)': dependencies: '@ampproject/remapping': 2.2.1 - '@rollup/pluginutils': 5.1.0(rollup@4.13.0) + '@rollup/pluginutils': 5.1.0(rollup@4.24.0) '@unocss/config': 0.58.5 '@unocss/core': 0.58.5 '@unocss/preset-uno': 0.58.5 @@ -10727,7 +9263,7 @@ snapshots: gzip-size: 6.0.0 sirv: 2.0.4 - '@unocss/postcss@0.58.5(postcss@8.4.37)': + '@unocss/postcss@0.58.5(postcss@8.4.47)': dependencies: '@unocss/config': 0.58.5 '@unocss/core': 0.58.5 @@ -10735,7 +9271,7 @@ snapshots: css-tree: 2.3.1 fast-glob: 3.3.2 magic-string: 0.30.7 - postcss: 8.4.37 + postcss: 8.4.47 '@unocss/preset-attributify@0.58.5': dependencies: @@ -10825,10 +9361,10 @@ snapshots: dependencies: '@unocss/core': 0.58.5 - '@unocss/vite@0.58.5(rollup@4.13.0)(vite@5.1.4(@types/node@20.11.0))': + '@unocss/vite@0.58.5(rollup@4.24.0)(vite@5.4.2(@types/node@22.5.1))': dependencies: '@ampproject/remapping': 2.2.1 - '@rollup/pluginutils': 5.1.0(rollup@4.13.0) + '@rollup/pluginutils': 5.1.0(rollup@4.24.0) '@unocss/config': 0.58.5 '@unocss/core': 0.58.5 '@unocss/inspector': 0.58.5 @@ -10837,105 +9373,127 @@ snapshots: chokidar: 3.6.0 fast-glob: 3.3.2 magic-string: 0.30.7 - vite: 5.1.4(@types/node@20.11.0) + vite: 5.4.2(@types/node@22.5.1) transitivePeerDependencies: - rollup - '@vitest/expect@1.4.0': + '@vitest/eslint-plugin@1.1.0(@typescript-eslint/utils@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6))(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6)(vitest@2.1.3)': + dependencies: + eslint: 9.9.1(jiti@1.21.6) + optionalDependencies: + '@typescript-eslint/utils': 8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) + typescript: 5.1.6 + vitest: 2.1.3(@types/node@22.5.1)(@vitest/ui@2.1.3) + + '@vitest/expect@2.1.3': + dependencies: + '@vitest/spy': 2.1.3 + '@vitest/utils': 2.1.3 + chai: 5.1.1 + tinyrainbow: 1.2.0 + + '@vitest/mocker@2.1.3(@vitest/spy@2.1.3)(vite@5.4.9(@types/node@18.11.18))': + dependencies: + '@vitest/spy': 2.1.3 + estree-walker: 3.0.3 + magic-string: 0.30.12 + optionalDependencies: + vite: 5.4.9(@types/node@18.11.18) + + '@vitest/mocker@2.1.3(@vitest/spy@2.1.3)(vite@5.4.9(@types/node@22.5.1))': + dependencies: + '@vitest/spy': 2.1.3 + estree-walker: 3.0.3 + magic-string: 0.30.12 + optionalDependencies: + vite: 5.4.9(@types/node@22.5.1) + + '@vitest/pretty-format@2.1.3': dependencies: - '@vitest/spy': 1.4.0 - '@vitest/utils': 1.4.0 - chai: 4.4.1 + tinyrainbow: 1.2.0 - '@vitest/runner@1.4.0': + '@vitest/runner@2.1.3': dependencies: - '@vitest/utils': 1.4.0 - p-limit: 5.0.0 + '@vitest/utils': 2.1.3 pathe: 1.1.2 - '@vitest/snapshot@1.4.0': + '@vitest/snapshot@2.1.3': dependencies: - magic-string: 0.30.8 + '@vitest/pretty-format': 2.1.3 + magic-string: 0.30.12 pathe: 1.1.2 - pretty-format: 29.7.0 - '@vitest/spy@1.4.0': + '@vitest/spy@2.1.3': dependencies: - tinyspy: 2.2.1 + tinyspy: 3.0.2 - '@vitest/ui@1.4.0(vitest@1.4.0)': + '@vitest/ui@2.1.3(vitest@2.1.3)': dependencies: - '@vitest/utils': 1.4.0 - fast-glob: 3.3.2 + '@vitest/utils': 2.1.3 fflate: 0.8.2 flatted: 3.3.1 pathe: 1.1.2 - picocolors: 1.0.0 sirv: 2.0.4 - vitest: 1.4.0(@types/node@18.11.18)(@vitest/ui@1.4.0) + tinyglobby: 0.2.9 + tinyrainbow: 1.2.0 + vitest: 2.1.3(@types/node@18.11.18)(@vitest/ui@2.1.3) - '@vitest/utils@1.4.0': + '@vitest/utils@2.1.3': dependencies: - diff-sequences: 29.6.3 - estree-walker: 3.0.3 - loupe: 2.3.7 - pretty-format: 29.7.0 + '@vitest/pretty-format': 2.1.3 + loupe: 3.1.2 + tinyrainbow: 1.2.0 - '@vue/compiler-core@3.4.21': + '@vue/compiler-core@3.4.38': dependencies: - '@babel/parser': 7.23.9 - '@vue/shared': 3.4.21 + '@babel/parser': 7.25.8 + '@vue/shared': 3.4.38 entities: 4.5.0 estree-walker: 2.0.2 - source-map-js: 1.2.0 + source-map-js: 1.2.1 - '@vue/compiler-dom@3.4.21': + '@vue/compiler-dom@3.4.38': dependencies: - '@vue/compiler-core': 3.4.21 - '@vue/shared': 3.4.21 + '@vue/compiler-core': 3.4.38 + '@vue/shared': 3.4.38 - '@vue/compiler-sfc@3.4.21': + '@vue/compiler-sfc@3.4.38': dependencies: - '@babel/parser': 7.23.9 - '@vue/compiler-core': 3.4.21 - '@vue/compiler-dom': 3.4.21 - '@vue/compiler-ssr': 3.4.21 - '@vue/shared': 3.4.21 + '@babel/parser': 7.25.8 + '@vue/compiler-core': 3.4.38 + '@vue/compiler-dom': 3.4.38 + '@vue/compiler-ssr': 3.4.38 + '@vue/shared': 3.4.38 estree-walker: 2.0.2 - magic-string: 0.30.8 - postcss: 8.4.37 - source-map-js: 1.2.0 + magic-string: 0.30.12 + postcss: 8.4.47 + source-map-js: 1.2.1 - '@vue/compiler-ssr@3.4.21': + '@vue/compiler-ssr@3.4.38': dependencies: - '@vue/compiler-dom': 3.4.21 - '@vue/shared': 3.4.21 - - '@vue/shared@3.4.21': {} + '@vue/compiler-dom': 3.4.38 + '@vue/shared': 3.4.38 - abbrev@1.1.1: {} - - abbrev@2.0.0: - optional: true + '@vue/shared@3.4.38': {} abort-controller@3.0.0: dependencies: event-target-shim: 5.0.1 + optional: true - accepts@1.3.8: + acorn-jsx@5.3.2(acorn@8.11.3): dependencies: - mime-types: 2.1.35 - negotiator: 0.6.3 + acorn: 8.11.3 - acorn-jsx@5.3.2(acorn@8.10.0): + acorn-jsx@5.3.2(acorn@8.12.1): dependencies: - acorn: 8.10.0 + acorn: 8.12.1 - acorn-walk@8.3.2: {} + acorn@8.11.3: {} - acorn@8.10.0: {} + acorn@8.12.1: {} - acorn@8.11.3: {} + acorn@8.13.0: {} address@1.2.2: {} @@ -10944,6 +9502,7 @@ snapshots: debug: 4.3.4 transitivePeerDependencies: - supports-color + optional: true agent-base@7.1.0: dependencies: @@ -10951,15 +9510,6 @@ snapshots: transitivePeerDependencies: - supports-color - aggregate-error@3.1.0: - dependencies: - clean-stack: 2.2.0 - indent-string: 4.0.0 - - ajv-formats@2.1.1(ajv@8.11.0): - optionalDependencies: - ajv: 8.11.0 - ajv@6.12.6: dependencies: fast-deep-equal: 3.1.3 @@ -10967,18 +9517,6 @@ snapshots: json-schema-traverse: 0.4.1 uri-js: 4.4.1 - ajv@8.11.0: - dependencies: - fast-deep-equal: 3.1.3 - json-schema-traverse: 1.0.0 - require-from-string: 2.0.2 - uri-js: 4.4.1 - - algoliasearch-helper@3.7.4(algoliasearch@4.13.0): - dependencies: - '@algolia/events': 4.0.1 - algoliasearch: 4.13.0 - algoliasearch@4.13.0: dependencies: '@algolia/cache-browser-local-storage': 4.13.0 @@ -10996,17 +9534,9 @@ snapshots: '@algolia/requester-node-http': 4.13.0 '@algolia/transporter': 4.13.0 - ansi-align@3.0.1: - dependencies: - string-width: 4.2.3 - - ansi-escapes@4.3.2: - dependencies: - type-fest: 0.21.3 - - ansi-escapes@6.2.0: + ansi-escapes@7.0.0: dependencies: - type-fest: 3.13.1 + environment: 1.1.0 ansi-regex@5.0.1: {} @@ -11020,100 +9550,42 @@ snapshots: dependencies: color-convert: 2.0.1 - ansi-styles@5.2.0: {} - ansi-styles@6.2.1: {} - ansicolors@0.3.2: {} - anymatch@3.1.3: dependencies: normalize-path: 3.0.0 picomatch: 2.3.1 - archiver-utils@2.1.0: - dependencies: - glob: 7.2.3 - graceful-fs: 4.2.11 - lazystream: 1.0.1 - lodash.defaults: 4.2.0 - lodash.difference: 4.5.0 - lodash.flatten: 4.4.0 - lodash.isplainobject: 4.0.6 - lodash.union: 4.6.0 - normalize-path: 3.0.0 - readable-stream: 2.3.7 - - archiver@5.3.1: - dependencies: - archiver-utils: 2.1.0 - async: 3.2.3 - buffer-crc32: 0.2.13 - readable-stream: 3.6.0 - readdir-glob: 1.1.1 - tar-stream: 2.2.0 - zip-stream: 4.1.0 - are-docs-informative@0.0.2: {} arg@5.0.2: {} - argparse@1.0.10: - dependencies: - sprintf-js: 1.0.3 - argparse@2.0.1: {} aria-query@5.3.0: dependencies: dequal: 2.0.3 - array-flatten@1.1.1: {} - - array-flatten@3.0.0: {} + aria-query@5.3.2: {} array-union@2.1.0: {} - arrify@2.0.1: {} - - as-array@2.0.0: {} - - asn1@0.2.6: - dependencies: - safer-buffer: 2.1.2 - - assert-plus@1.0.0: {} - - assertion-error@1.1.0: {} - - ast-types@0.13.4: - dependencies: - tslib: 2.6.2 - - astral-regex@2.0.0: {} + arrify@2.0.1: + optional: true - async-lock@1.3.2: {} + assertion-error@2.0.1: {} async-retry@1.3.3: dependencies: retry: 0.13.1 optional: true - async@2.6.4: - dependencies: - lodash: 4.17.21 - - async@3.2.3: {} - asynckit@0.4.0: {} - aws-sign2@0.7.0: {} - - aws4@1.11.0: {} - - axios@1.6.7(debug@4.3.4): + axios@1.6.7(debug@4.3.6): dependencies: - follow-redirects: 1.15.6(debug@4.3.4) + follow-redirects: 1.15.6(debug@4.3.6) form-data: 4.0.0 proxy-from-env: 1.1.0 transitivePeerDependencies: @@ -11123,25 +9595,19 @@ snapshots: dependencies: dequal: 2.0.3 + axobject-query@4.1.0: {} + bail@2.0.2: {} balanced-match@1.0.2: {} - base64-js@1.5.1: {} + base64-js@1.5.1: + optional: true - basic-auth-connect@1.0.0: {} + bignumber.js@9.0.2: + optional: true - basic-auth@2.0.1: - dependencies: - safe-buffer: 5.1.2 - - bcrypt-pbkdf@1.0.2: - dependencies: - tweetnacl: 0.14.5 - - bignumber.js@9.0.2: {} - - bin-links@4.0.3: + bin-links@4.0.3: dependencies: cmd-shim: 6.0.2 npm-normalize-package-bin: 3.0.1 @@ -11150,44 +9616,10 @@ snapshots: binary-extensions@2.2.0: {} - bl@4.1.0: - dependencies: - buffer: 5.7.1 - inherits: 2.0.4 - readable-stream: 3.6.0 - bluebird@3.7.2: {} - body-parser@1.20.1: - dependencies: - bytes: 3.1.2 - content-type: 1.0.5 - debug: 2.6.9 - depd: 2.0.0 - destroy: 1.2.0 - http-errors: 2.0.0 - iconv-lite: 0.4.24 - on-finished: 2.4.1 - qs: 6.11.0 - raw-body: 2.5.1 - type-is: 1.6.18 - unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color - boolbase@1.0.0: {} - boxen@5.1.2: - dependencies: - ansi-align: 3.0.1 - camelcase: 6.3.0 - chalk: 4.1.2 - cli-boxes: 2.2.1 - string-width: 4.2.3 - type-fest: 0.20.2 - widest-line: 3.1.0 - wrap-ansi: 7.0.0 - brace-expansion@1.1.11: dependencies: balanced-match: 1.0.2 @@ -11201,6 +9633,10 @@ snapshots: dependencies: fill-range: 7.0.1 + braces@3.0.3: + dependencies: + fill-range: 7.1.1 + browserslist@4.23.0: dependencies: caniuse-lite: 1.0.30001589 @@ -11208,82 +9644,45 @@ snapshots: node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) + browserslist@4.23.3: + dependencies: + caniuse-lite: 1.0.30001653 + electron-to-chromium: 1.5.13 + node-releases: 2.0.18 + update-browserslist-db: 1.1.0(browserslist@4.23.3) + buffer-crc32@0.2.13: {} buffer-equal-constant-time@1.0.1: {} buffer-writer@2.0.0: {} - buffer@5.7.1: - dependencies: - base64-js: 1.5.1 - ieee754: 1.2.1 - builtin-modules@3.3.0: {} - builtins@5.0.1: - dependencies: - semver: 7.6.0 - - bytes@3.0.0: {} - - bytes@3.1.2: {} - cac@6.7.14: {} - cacache@18.0.2: - dependencies: - '@npmcli/fs': 3.1.0 - fs-minipass: 3.0.3 - glob: 10.3.10 - lru-cache: 10.1.0 - minipass: 7.0.4 - minipass-collect: 2.0.1 - minipass-flush: 1.0.5 - minipass-pipeline: 1.2.4 - p-map: 4.0.0 - ssri: 10.0.5 - tar: 6.1.11 - unique-filename: 3.0.0 - optional: true - call-bind@1.0.2: dependencies: function-bind: 1.1.1 get-intrinsic: 1.2.1 - call-me-maybe@1.0.1: {} - callsites@3.1.0: {} - camelcase@6.3.0: {} - camelize@1.0.1: {} caniuse-lite@1.0.30001589: {} - cardinal@2.1.1: - dependencies: - ansicolors: 0.3.2 - redeyed: 2.1.1 - - caseless@0.12.0: {} - - catharsis@0.9.0: - dependencies: - lodash: 4.17.21 + caniuse-lite@1.0.30001653: {} ccount@2.0.1: {} - chai@4.4.1: + chai@5.1.1: dependencies: - assertion-error: 1.1.0 - check-error: 1.0.3 - deep-eql: 4.1.3 - get-func-name: 2.0.2 - loupe: 2.3.7 - pathval: 1.1.1 - type-detect: 4.0.8 + assertion-error: 2.0.1 + check-error: 2.1.1 + deep-eql: 5.0.2 + loupe: 3.1.2 + pathval: 2.0.0 chalk@2.4.2: dependencies: @@ -11296,7 +9695,7 @@ snapshots: ansi-styles: 4.3.0 supports-color: 7.2.0 - chalk@5.2.0: {} + chalk@5.3.0: {} character-entities-html4@2.1.0: {} @@ -11310,26 +9709,10 @@ snapshots: character-reference-invalid@1.1.4: {} - chardet@0.7.0: {} - - check-error@1.0.3: - dependencies: - get-func-name: 2.0.2 + check-error@2.1.1: {} check-more-types@2.24.0: {} - chokidar@3.5.3: - dependencies: - anymatch: 3.1.3 - braces: 3.0.2 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 - chokidar@3.6.0: dependencies: anymatch: 3.1.3 @@ -11344,14 +9727,8 @@ snapshots: chownr@2.0.0: {} - ci-info@2.0.0: {} - ci-info@4.0.0: {} - cjson@0.3.3: - dependencies: - json-parse-helpfulerror: 1.0.3 - ckeditor5-build-classic-with-alignment-underline-smallcaps@1.0.0: {} ckeditor5-collaboration@38.1.1: @@ -11374,43 +9751,18 @@ snapshots: '@ckeditor/ckeditor5-watchdog': 38.1.1 '@ckeditor/ckeditor5-widget': 38.1.1 - classnames@2.3.1: {} - clean-regexp@1.0.0: dependencies: escape-string-regexp: 1.0.5 - clean-stack@2.2.0: {} - - cli-boxes@2.2.1: {} - - cli-cursor@3.1.0: - dependencies: - restore-cursor: 3.1.0 - - cli-spinners@2.6.1: {} - - cli-table3@0.6.3: - dependencies: - string-width: 4.2.3 - optionalDependencies: - '@colors/colors': 1.5.0 - - cli-table@0.3.11: - dependencies: - colors: 1.0.3 - - cli-truncate@2.1.0: + cli-cursor@5.0.0: dependencies: - slice-ansi: 3.0.0 - string-width: 4.2.3 + restore-cursor: 5.1.0 - cli-truncate@3.1.0: + cli-truncate@4.0.0: dependencies: slice-ansi: 5.0.0 - string-width: 5.1.2 - - cli-width@3.0.0: {} + string-width: 7.2.0 cliui@8.0.1: dependencies: @@ -11418,8 +9770,6 @@ snapshots: strip-ansi: 6.0.1 wrap-ansi: 7.0.0 - clone@1.0.4: {} - cmd-shim@6.0.2: {} code-red@1.0.4: @@ -11458,27 +9808,8 @@ snapshots: dependencies: color-name: 1.1.4 - color-string@1.9.1: - dependencies: - color-name: 1.1.4 - simple-swizzle: 0.2.2 - - color@3.2.1: - dependencies: - color-convert: 1.9.3 - color-string: 1.9.1 - - colorette@2.0.19: {} - colorette@2.0.20: {} - colors@1.0.3: {} - - colorspace@1.1.4: - dependencies: - color: 3.2.1 - text-hex: 1.0.0 - combined-stream@1.0.8: dependencies: delayed-stream: 1.0.0 @@ -11487,40 +9818,20 @@ snapshots: comma-separated-tokens@2.0.3: {} - commander@10.0.1: {} + commander@12.1.0: {} commander@2.20.3: {} - commander@4.1.1: {} - commander@7.2.0: {} commander@9.4.1: {} comment-parser@1.4.1: {} - compress-commons@4.1.1: - dependencies: - buffer-crc32: 0.2.13 - crc32-stream: 4.0.2 - normalize-path: 3.0.0 - readable-stream: 3.6.2 - compressible@2.0.18: dependencies: mime-db: 1.52.0 - - compression@1.7.4: - dependencies: - accepts: 1.3.8 - bytes: 3.0.0 - compressible: 2.0.18 - debug: 2.6.9 - on-headers: 1.0.2 - safe-buffer: 5.1.2 - vary: 1.1.2 - transitivePeerDependencies: - - supports-color + optional: true concat-map@0.0.1: {} @@ -11531,87 +9842,26 @@ snapshots: robust-predicates: 2.0.4 tinyqueue: 2.0.3 - config-chain@1.1.13: - dependencies: - ini: 1.3.8 - proto-list: 1.2.4 - - configstore@5.0.1: - dependencies: - dot-prop: 5.3.0 - graceful-fs: 4.2.11 - make-dir: 3.1.0 - unique-string: 2.0.0 - write-file-atomic: 3.0.3 - xdg-basedir: 4.0.0 - - connect@3.7.0: - dependencies: - debug: 2.6.9 - finalhandler: 1.1.2 - parseurl: 1.3.3 - utils-merge: 1.0.1 - transitivePeerDependencies: - - supports-color - consola@3.2.3: {} - content-disposition@0.5.4: - dependencies: - safe-buffer: 5.2.1 - - content-type@1.0.5: {} - convert-source-map@2.0.0: {} - cookie-signature@1.0.6: {} - - cookie@0.5.0: {} - cookie@0.6.0: {} - core-js-compat@3.36.1: + core-js-compat@3.38.1: dependencies: - browserslist: 4.23.0 - - core-util-is@1.0.2: {} + browserslist: 4.23.3 core-util-is@1.0.3: {} - cors@2.8.5: - dependencies: - object-assign: 4.1.1 - vary: 1.1.2 - - crc-32@1.2.2: {} - - crc32-stream@4.0.2: - dependencies: - crc-32: 1.2.2 - readable-stream: 3.6.2 - crelt@1.0.6: {} - cross-env@5.2.1: - dependencies: - cross-spawn: 6.0.5 - - cross-spawn@6.0.5: - dependencies: - nice-try: 1.0.5 - path-key: 2.0.1 - semver: 5.7.1 - shebang-command: 1.2.0 - which: 1.3.1 - cross-spawn@7.0.3: dependencies: path-key: 3.1.1 shebang-command: 2.0.0 which: 2.0.2 - crypto-random-string@2.0.0: {} - css-background-parser@0.1.0: {} css-box-shadow@1.0.0-3: {} @@ -11663,12 +9913,6 @@ snapshots: d3-voronoi@1.1.2: {} - dashdash@1.14.1: - dependencies: - assert-plus: 1.0.0 - - data-uri-to-buffer@3.0.1: {} - data-uri-to-buffer@4.0.0: {} data-uri-to-buffer@4.0.1: {} @@ -11677,31 +9921,29 @@ snapshots: dependencies: '@babel/runtime': 7.22.6 - debug@2.6.9: - dependencies: - ms: 2.0.0 - debug@3.2.7: dependencies: ms: 2.1.3 - debug@4.3.1: + debug@4.3.4: dependencies: ms: 2.1.2 - debug@4.3.4: + debug@4.3.6: dependencies: ms: 2.1.2 + debug@4.3.7: + dependencies: + ms: 2.1.3 + decode-named-character-reference@1.0.2: dependencies: character-entities: 2.0.2 dedent-js@1.0.1: {} - deep-eql@4.1.3: - dependencies: - type-detect: 4.0.8 + deep-eql@5.0.2: {} deep-equal@1.1.1: dependencies: @@ -11712,18 +9954,10 @@ snapshots: object-keys: 1.1.1 regexp.prototype.flags: 1.4.3 - deep-extend@0.6.0: {} - - deep-freeze@0.0.1: {} - deep-is@0.1.4: {} deepmerge@4.3.1: {} - defaults@1.0.3: - dependencies: - clone: 1.0.4 - define-properties@1.1.4: dependencies: has-property-descriptors: 1.0.0 @@ -11731,25 +9965,14 @@ snapshots: defu@6.1.4: {} - degenerator@3.0.2: - dependencies: - ast-types: 0.13.4 - escodegen: 1.14.3 - esprima: 4.0.1 - vm2: 3.9.9 - delayed-stream@1.0.0: {} density-clustering@1.3.0: {} - depd@2.0.0: {} - dequal@2.0.3: {} destr@2.0.3: {} - destroy@1.2.0: {} - detect-indent@6.1.0: {} detect-port@1.6.1: @@ -11761,8 +9984,6 @@ snapshots: devalue@4.3.2: {} - diff-sequences@29.6.3: {} - diff@5.2.0: {} dir-glob@3.0.1: @@ -11773,12 +9994,10 @@ snapshots: dependencies: esutils: 2.0.3 - dot-prop@5.3.0: - dependencies: - is-obj: 2.0.0 - dotenv@16.0.2: {} + dpack@0.6.22: {} + duplexer@0.1.2: {} duplexify@4.1.2: @@ -11787,6 +10006,7 @@ snapshots: inherits: 2.0.4 readable-stream: 3.6.2 stream-shift: 1.0.2 + optional: true duplexify@4.1.3: dependencies: @@ -11798,30 +10018,19 @@ snapshots: earcut@2.2.4: {} - eastasianwidth@0.2.0: {} - - ecc-jsbn@0.1.2: - dependencies: - jsbn: 0.1.1 - safer-buffer: 2.1.2 - ecdsa-sig-formatter@1.0.11: dependencies: safe-buffer: 5.2.1 - ee-first@1.1.1: {} - electron-to-chromium@1.4.681: {} - emoji-regex@10.2.1: {} - - emoji-regex@8.0.0: {} + electron-to-chromium@1.5.13: {} - emoji-regex@9.2.2: {} + emoji-regex@10.2.1: {} - enabled@2.0.0: {} + emoji-regex@10.4.0: {} - encodeurl@1.0.2: {} + emoji-regex@8.0.0: {} encoding@0.1.13: dependencies: @@ -11831,11 +10040,12 @@ snapshots: end-of-stream@1.4.4: dependencies: once: 1.4.0 + optional: true engine.io-client@6.4.0: dependencies: '@socket.io/component-emitter': 3.1.0 - debug: 4.3.4 + debug: 4.3.7 engine.io-parser: 5.0.7 ws: 8.11.0 xmlhttprequest-ssl: 2.0.0 @@ -11846,89 +10056,105 @@ snapshots: engine.io-parser@5.0.7: {} + enhanced-resolve@5.17.1: + dependencies: + graceful-fs: 4.2.11 + tapable: 2.2.1 + ent@2.2.0: optional: true - entities@2.1.0: {} - entities@4.5.0: {} - env-paths@2.2.1: - optional: true - - err-code@2.0.3: - optional: true + environment@1.1.0: {} error-ex@1.3.2: dependencies: is-arrayish: 0.2.1 + es-module-lexer@1.5.4: {} + es6-promise@3.3.1: {} - esbuild@0.19.12: + esbuild@0.21.5: optionalDependencies: - '@esbuild/aix-ppc64': 0.19.12 - '@esbuild/android-arm': 0.19.12 - '@esbuild/android-arm64': 0.19.12 - '@esbuild/android-x64': 0.19.12 - '@esbuild/darwin-arm64': 0.19.12 - '@esbuild/darwin-x64': 0.19.12 - '@esbuild/freebsd-arm64': 0.19.12 - '@esbuild/freebsd-x64': 0.19.12 - '@esbuild/linux-arm': 0.19.12 - '@esbuild/linux-arm64': 0.19.12 - '@esbuild/linux-ia32': 0.19.12 - '@esbuild/linux-loong64': 0.19.12 - '@esbuild/linux-mips64el': 0.19.12 - '@esbuild/linux-ppc64': 0.19.12 - '@esbuild/linux-riscv64': 0.19.12 - '@esbuild/linux-s390x': 0.19.12 - '@esbuild/linux-x64': 0.19.12 - '@esbuild/netbsd-x64': 0.19.12 - '@esbuild/openbsd-x64': 0.19.12 - '@esbuild/sunos-x64': 0.19.12 - '@esbuild/win32-arm64': 0.19.12 - '@esbuild/win32-ia32': 0.19.12 - '@esbuild/win32-x64': 0.19.12 - - escalade@3.1.1: {} + '@esbuild/aix-ppc64': 0.21.5 + '@esbuild/android-arm': 0.21.5 + '@esbuild/android-arm64': 0.21.5 + '@esbuild/android-x64': 0.21.5 + '@esbuild/darwin-arm64': 0.21.5 + '@esbuild/darwin-x64': 0.21.5 + '@esbuild/freebsd-arm64': 0.21.5 + '@esbuild/freebsd-x64': 0.21.5 + '@esbuild/linux-arm': 0.21.5 + '@esbuild/linux-arm64': 0.21.5 + '@esbuild/linux-ia32': 0.21.5 + '@esbuild/linux-loong64': 0.21.5 + '@esbuild/linux-mips64el': 0.21.5 + '@esbuild/linux-ppc64': 0.21.5 + '@esbuild/linux-riscv64': 0.21.5 + '@esbuild/linux-s390x': 0.21.5 + '@esbuild/linux-x64': 0.21.5 + '@esbuild/netbsd-x64': 0.21.5 + '@esbuild/openbsd-x64': 0.21.5 + '@esbuild/sunos-x64': 0.21.5 + '@esbuild/win32-arm64': 0.21.5 + '@esbuild/win32-ia32': 0.21.5 + '@esbuild/win32-x64': 0.21.5 + + esbuild@0.23.1: + optionalDependencies: + '@esbuild/aix-ppc64': 0.23.1 + '@esbuild/android-arm': 0.23.1 + '@esbuild/android-arm64': 0.23.1 + '@esbuild/android-x64': 0.23.1 + '@esbuild/darwin-arm64': 0.23.1 + '@esbuild/darwin-x64': 0.23.1 + '@esbuild/freebsd-arm64': 0.23.1 + '@esbuild/freebsd-x64': 0.23.1 + '@esbuild/linux-arm': 0.23.1 + '@esbuild/linux-arm64': 0.23.1 + '@esbuild/linux-ia32': 0.23.1 + '@esbuild/linux-loong64': 0.23.1 + '@esbuild/linux-mips64el': 0.23.1 + '@esbuild/linux-ppc64': 0.23.1 + '@esbuild/linux-riscv64': 0.23.1 + '@esbuild/linux-s390x': 0.23.1 + '@esbuild/linux-x64': 0.23.1 + '@esbuild/netbsd-x64': 0.23.1 + '@esbuild/openbsd-arm64': 0.23.1 + '@esbuild/openbsd-x64': 0.23.1 + '@esbuild/sunos-x64': 0.23.1 + '@esbuild/win32-arm64': 0.23.1 + '@esbuild/win32-ia32': 0.23.1 + '@esbuild/win32-x64': 0.23.1 escalade@3.1.2: {} - escape-goat@2.1.1: {} - - escape-html@1.0.3: {} - escape-string-regexp@1.0.5: {} - escape-string-regexp@2.0.0: {} - escape-string-regexp@4.0.0: {} escape-string-regexp@5.0.0: {} - escodegen@1.14.3: + eslint-compat-utils@0.5.0(eslint@9.9.1(jiti@1.21.6)): dependencies: - esprima: 4.0.1 - estraverse: 4.3.0 - esutils: 2.0.3 - optionator: 0.8.3 - optionalDependencies: - source-map: 0.6.1 + eslint: 9.9.1(jiti@1.21.6) + semver: 7.6.0 - eslint-compat-utils@0.5.0(eslint@8.56.0): + eslint-compat-utils@0.5.1(eslint@9.9.1(jiti@1.21.6)): dependencies: - eslint: 8.56.0 - semver: 7.6.0 + eslint: 9.9.1(jiti@1.21.6) + semver: 7.6.3 - eslint-config-flat-gitignore@0.1.5: + eslint-config-flat-gitignore@0.1.8: dependencies: - find-up: 7.0.0 + find-up-simple: 1.0.0 parse-gitignore: 2.0.0 - eslint-flat-config-utils@0.2.0: + eslint-flat-config-utils@0.3.1: dependencies: - '@types/eslint': 8.56.7 + '@types/eslint': 9.6.1 pathe: 1.1.2 eslint-import-resolver-node@0.3.9: @@ -11939,153 +10165,167 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-merge-processors@0.1.0(eslint@8.56.0): + eslint-merge-processors@0.1.0(eslint@9.9.1(jiti@1.21.6)): dependencies: - eslint: 8.56.0 + eslint: 9.9.1(jiti@1.21.6) - eslint-plugin-antfu@2.1.2(eslint@8.56.0): + eslint-plugin-antfu@2.3.6(eslint@9.9.1(jiti@1.21.6)): dependencies: - eslint: 8.56.0 + '@antfu/utils': 0.7.10 + eslint: 9.9.1(jiti@1.21.6) - eslint-plugin-es-x@7.6.0(eslint@8.56.0): + eslint-plugin-command@0.2.3(eslint@9.9.1(jiti@1.21.6)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) - '@eslint-community/regexpp': 4.10.0 - eslint: 8.56.0 - eslint-compat-utils: 0.5.0(eslint@8.56.0) + '@es-joy/jsdoccomment': 0.43.1 + eslint: 9.9.1(jiti@1.21.6) - eslint-plugin-eslint-comments@3.2.0(eslint@8.56.0): + eslint-plugin-es-x@7.6.0(eslint@9.9.1(jiti@1.21.6)): dependencies: - escape-string-regexp: 1.0.5 - eslint: 8.56.0 - ignore: 5.3.1 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1(jiti@1.21.6)) + '@eslint-community/regexpp': 4.10.0 + eslint: 9.9.1(jiti@1.21.6) + eslint-compat-utils: 0.5.0(eslint@9.9.1(jiti@1.21.6)) - eslint-plugin-import-x@0.5.0(eslint@8.56.0)(typescript@5.1.6): + eslint-plugin-import-x@4.1.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6): dependencies: - '@typescript-eslint/utils': 7.5.0(eslint@8.56.0)(typescript@5.1.6) + '@typescript-eslint/typescript-estree': 8.3.0(typescript@5.1.6) + '@typescript-eslint/utils': 8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) debug: 4.3.4 doctrine: 3.0.0 - eslint: 8.56.0 + eslint: 9.9.1(jiti@1.21.6) eslint-import-resolver-node: 0.3.9 get-tsconfig: 4.7.3 is-glob: 4.0.3 minimatch: 9.0.3 - semver: 7.6.0 + semver: 7.6.3 + stable-hash: 0.0.4 + tslib: 2.7.0 transitivePeerDependencies: - supports-color - typescript - eslint-plugin-jsdoc@48.2.2(eslint@8.56.0): + eslint-plugin-jsdoc@50.2.2(eslint@9.9.1(jiti@1.21.6)): dependencies: - '@es-joy/jsdoccomment': 0.42.0 + '@es-joy/jsdoccomment': 0.48.0 are-docs-informative: 0.0.2 comment-parser: 1.4.1 - debug: 4.3.4 + debug: 4.3.6 escape-string-regexp: 4.0.0 - eslint: 8.56.0 - esquery: 1.5.0 - is-builtin-module: 3.2.1 - semver: 7.6.0 + eslint: 9.9.1(jiti@1.21.6) + espree: 10.1.0 + esquery: 1.6.0 + parse-imports: 2.1.1 + semver: 7.6.3 spdx-expression-parse: 4.0.0 + synckit: 0.9.1 transitivePeerDependencies: - supports-color - eslint-plugin-jsonc@2.15.0(eslint@8.56.0): + eslint-plugin-jsonc@2.16.0(eslint@9.9.1(jiti@1.21.6)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) - eslint: 8.56.0 - eslint-compat-utils: 0.5.0(eslint@8.56.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1(jiti@1.21.6)) + eslint: 9.9.1(jiti@1.21.6) + eslint-compat-utils: 0.5.0(eslint@9.9.1(jiti@1.21.6)) espree: 9.6.1 graphemer: 1.4.0 jsonc-eslint-parser: 2.4.0 natural-compare: 1.4.0 synckit: 0.6.2 - eslint-plugin-markdown@4.0.1(eslint@8.56.0): + eslint-plugin-markdown@5.1.0(eslint@9.9.1(jiti@1.21.6)): dependencies: - eslint: 8.56.0 + eslint: 9.9.1(jiti@1.21.6) mdast-util-from-markdown: 0.8.5 transitivePeerDependencies: - supports-color - eslint-plugin-n@16.6.2(eslint@8.56.0): + eslint-plugin-n@17.10.2(eslint@9.9.1(jiti@1.21.6)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) - builtins: 5.0.1 - eslint: 8.56.0 - eslint-plugin-es-x: 7.6.0(eslint@8.56.0) - get-tsconfig: 4.7.2 - globals: 13.24.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1(jiti@1.21.6)) + enhanced-resolve: 5.17.1 + eslint: 9.9.1(jiti@1.21.6) + eslint-plugin-es-x: 7.6.0(eslint@9.9.1(jiti@1.21.6)) + get-tsconfig: 4.7.3 + globals: 15.9.0 ignore: 5.3.1 - is-builtin-module: 3.2.1 - is-core-module: 2.13.1 - minimatch: 3.1.2 - resolve: 1.22.8 + minimatch: 9.0.5 semver: 7.6.0 - eslint-plugin-no-only-tests@3.1.0: {} + eslint-plugin-no-only-tests@3.3.0: {} - eslint-plugin-perfectionist@2.7.0(eslint@8.56.0)(svelte@4.2.12)(typescript@5.1.6)(vue-eslint-parser@9.4.2(eslint@8.56.0)): + eslint-plugin-perfectionist@3.3.0(eslint@9.9.1(jiti@1.21.6))(svelte-eslint-parser@0.41.0(svelte@4.2.12))(svelte@4.2.12)(typescript@5.1.6)(vue-eslint-parser@9.4.3(eslint@9.9.1(jiti@1.21.6))): dependencies: - '@typescript-eslint/utils': 6.21.0(eslint@8.56.0)(typescript@5.1.6) - eslint: 8.56.0 - minimatch: 9.0.3 + '@typescript-eslint/types': 8.3.0 + '@typescript-eslint/utils': 8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) + eslint: 9.9.1(jiti@1.21.6) + minimatch: 10.0.1 natural-compare-lite: 1.4.0 optionalDependencies: svelte: 4.2.12 - vue-eslint-parser: 9.4.2(eslint@8.56.0) + svelte-eslint-parser: 0.41.0(svelte@4.2.12) + vue-eslint-parser: 9.4.3(eslint@9.9.1(jiti@1.21.6)) transitivePeerDependencies: - supports-color - typescript - eslint-plugin-svelte-stylistic@0.0.4(eslint@8.56.0)(typescript@5.1.6): + eslint-plugin-regexp@2.6.0(eslint@9.9.1(jiti@1.21.6)): + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1(jiti@1.21.6)) + '@eslint-community/regexpp': 4.10.0 + comment-parser: 1.4.1 + eslint: 9.9.1(jiti@1.21.6) + jsdoc-type-pratt-parser: 4.0.0 + refa: 0.12.1 + regexp-ast-analysis: 0.7.1 + scslre: 0.3.0 + + eslint-plugin-svelte-stylistic@0.0.4(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6): dependencies: - '@typescript-eslint/utils': 6.7.3(eslint@8.56.0)(typescript@5.1.6) + '@typescript-eslint/utils': 6.7.3(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) transitivePeerDependencies: - eslint - supports-color - typescript - eslint-plugin-svelte@2.33.2(eslint@8.56.0)(svelte@4.2.12): + eslint-plugin-svelte@2.43.0(eslint@9.9.1(jiti@1.21.6))(svelte@4.2.12): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1(jiti@1.21.6)) '@jridgewell/sourcemap-codec': 1.4.15 - debug: 4.3.4 - eslint: 8.56.0 + eslint: 9.9.1(jiti@1.21.6) + eslint-compat-utils: 0.5.1(eslint@9.9.1(jiti@1.21.6)) esutils: 2.0.3 - known-css-properties: 0.28.0 - postcss: 8.4.30 - postcss-load-config: 3.1.4(postcss@8.4.30) - postcss-safe-parser: 6.0.0(postcss@8.4.30) - postcss-selector-parser: 6.0.13 - semver: 7.5.4 - svelte-eslint-parser: 0.33.0(svelte@4.2.12) + known-css-properties: 0.34.0 + postcss: 8.4.41 + postcss-load-config: 3.1.4(postcss@8.4.41) + postcss-safe-parser: 6.0.0(postcss@8.4.41) + postcss-selector-parser: 6.1.2 + semver: 7.6.3 + svelte-eslint-parser: 0.41.0(svelte@4.2.12) optionalDependencies: svelte: 4.2.12 transitivePeerDependencies: - - supports-color - ts-node - eslint-plugin-toml@0.11.0(eslint@8.56.0): + eslint-plugin-toml@0.11.1(eslint@9.9.1(jiti@1.21.6)): dependencies: debug: 4.3.4 - eslint: 8.56.0 - eslint-compat-utils: 0.5.0(eslint@8.56.0) + eslint: 9.9.1(jiti@1.21.6) + eslint-compat-utils: 0.5.0(eslint@9.9.1(jiti@1.21.6)) lodash: 4.17.21 - toml-eslint-parser: 0.9.3 + toml-eslint-parser: 0.10.0 transitivePeerDependencies: - supports-color - eslint-plugin-unicorn@51.0.1(eslint@8.56.0): + eslint-plugin-unicorn@55.0.0(eslint@9.9.1(jiti@1.21.6)): dependencies: - '@babel/helper-validator-identifier': 7.22.20 - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) - '@eslint/eslintrc': 2.1.4 + '@babel/helper-validator-identifier': 7.24.7 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1(jiti@1.21.6)) ci-info: 4.0.0 clean-regexp: 1.0.0 - core-js-compat: 3.36.1 - eslint: 8.56.0 + core-js-compat: 3.38.1 + eslint: 9.9.1(jiti@1.21.6) esquery: 1.5.0 + globals: 15.9.0 indent-string: 4.0.0 is-builtin-module: 3.2.1 jsesc: 3.0.2 @@ -12093,100 +10333,87 @@ snapshots: read-pkg-up: 7.0.1 regexp-tree: 0.1.27 regjsparser: 0.10.0 - semver: 7.6.0 + semver: 7.6.3 strip-indent: 3.0.0 - transitivePeerDependencies: - - supports-color - - eslint-plugin-unused-imports@3.1.0(@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0): - dependencies: - eslint: 8.56.0 - eslint-rule-composer: 0.3.0 - optionalDependencies: - '@typescript-eslint/eslint-plugin': 7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0)(typescript@5.1.6) - eslint-plugin-vitest@0.4.1(@typescript-eslint/eslint-plugin@7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0)(typescript@5.1.6)(vitest@1.4.0(@types/node@20.11.0)(@vitest/ui@1.4.0)): + eslint-plugin-unused-imports@4.1.3(@typescript-eslint/eslint-plugin@8.3.0(@typescript-eslint/parser@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6))(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6))(eslint@9.9.1(jiti@1.21.6)): dependencies: - '@typescript-eslint/utils': 7.5.0(eslint@8.56.0)(typescript@5.1.6) - eslint: 8.56.0 + eslint: 9.9.1(jiti@1.21.6) optionalDependencies: - '@typescript-eslint/eslint-plugin': 7.5.0(@typescript-eslint/parser@7.5.0(eslint@8.56.0)(typescript@5.1.6))(eslint@8.56.0)(typescript@5.1.6) - vitest: 1.4.0(@types/node@20.11.0)(@vitest/ui@1.4.0) - transitivePeerDependencies: - - supports-color - - typescript + '@typescript-eslint/eslint-plugin': 8.3.0(@typescript-eslint/parser@8.3.0(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6))(eslint@9.9.1(jiti@1.21.6))(typescript@5.1.6) - eslint-plugin-vue@9.24.0(eslint@8.56.0): + eslint-plugin-vue@9.27.0(eslint@9.9.1(jiti@1.21.6)): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) - eslint: 8.56.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1(jiti@1.21.6)) + eslint: 9.9.1(jiti@1.21.6) globals: 13.24.0 natural-compare: 1.4.0 nth-check: 2.1.1 postcss-selector-parser: 6.0.16 semver: 7.6.0 - vue-eslint-parser: 9.4.2(eslint@8.56.0) + vue-eslint-parser: 9.4.3(eslint@9.9.1(jiti@1.21.6)) xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color - eslint-plugin-yml@1.14.0(eslint@8.56.0): + eslint-plugin-yml@1.14.0(eslint@9.9.1(jiti@1.21.6)): dependencies: debug: 4.3.4 - eslint: 8.56.0 - eslint-compat-utils: 0.5.0(eslint@8.56.0) + eslint: 9.9.1(jiti@1.21.6) + eslint-compat-utils: 0.5.0(eslint@9.9.1(jiti@1.21.6)) lodash: 4.17.21 natural-compare: 1.4.0 - yaml-eslint-parser: 1.2.2 + yaml-eslint-parser: 1.2.3 transitivePeerDependencies: - supports-color - eslint-processor-vue-blocks@0.1.1(@vue/compiler-sfc@3.4.21)(eslint@8.56.0): + eslint-processor-vue-blocks@0.1.2(@vue/compiler-sfc@3.4.38)(eslint@9.9.1(jiti@1.21.6)): dependencies: - '@vue/compiler-sfc': 3.4.21 - eslint: 8.56.0 - - eslint-rule-composer@0.3.0: {} + '@vue/compiler-sfc': 3.4.38 + eslint: 9.9.1(jiti@1.21.6) eslint-scope@7.2.2: dependencies: esrecurse: 4.3.0 estraverse: 5.3.0 + eslint-scope@8.0.2: + dependencies: + esrecurse: 4.3.0 + estraverse: 5.3.0 + eslint-visitor-keys@3.4.3: {} - eslint@8.56.0: + eslint-visitor-keys@4.0.0: {} + + eslint@9.9.1(jiti@1.21.6): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) - '@eslint-community/regexpp': 4.10.0 - '@eslint/eslintrc': 2.1.4 - '@eslint/js': 8.56.0 - '@humanwhocodes/config-array': 0.11.14 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.9.1(jiti@1.21.6)) + '@eslint-community/regexpp': 4.11.0 + '@eslint/config-array': 0.18.0 + '@eslint/eslintrc': 3.1.0 + '@eslint/js': 9.9.1 '@humanwhocodes/module-importer': 1.0.1 + '@humanwhocodes/retry': 0.3.0 '@nodelib/fs.walk': 1.2.8 - '@ungap/structured-clone': 1.2.0 ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 debug: 4.3.4 - doctrine: 3.0.0 escape-string-regexp: 4.0.0 - eslint-scope: 7.2.2 - eslint-visitor-keys: 3.4.3 - espree: 9.6.1 + eslint-scope: 8.0.2 + eslint-visitor-keys: 4.0.0 + espree: 10.1.0 esquery: 1.5.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 - file-entry-cache: 6.0.1 + file-entry-cache: 8.0.0 find-up: 5.0.0 glob-parent: 6.0.2 - globals: 13.20.0 - graphemer: 1.4.0 ignore: 5.3.1 imurmurhash: 0.1.4 is-glob: 4.0.3 is-path-inside: 3.0.3 - js-yaml: 4.1.0 json-stable-stringify-without-jsonify: 1.0.1 levn: 0.4.1 lodash.merge: 4.6.2 @@ -12195,28 +10422,36 @@ snapshots: optionator: 0.9.3 strip-ansi: 6.0.1 text-table: 0.2.0 + optionalDependencies: + jiti: 1.21.6 transitivePeerDependencies: - supports-color esm-env@1.0.0: {} + espree@10.1.0: + dependencies: + acorn: 8.12.1 + acorn-jsx: 5.3.2(acorn@8.12.1) + eslint-visitor-keys: 4.0.0 + espree@9.6.1: dependencies: - acorn: 8.10.0 - acorn-jsx: 5.3.2(acorn@8.10.0) + acorn: 8.11.3 + acorn-jsx: 5.3.2(acorn@8.11.3) eslint-visitor-keys: 3.4.3 - esprima@4.0.1: {} - esquery@1.5.0: dependencies: estraverse: 5.3.0 - esrecurse@4.3.0: + esquery@1.6.0: dependencies: estraverse: 5.3.0 - estraverse@4.3.0: {} + esrecurse@4.3.0: + dependencies: + estraverse: 5.3.0 estraverse@5.3.0: {} @@ -12228,8 +10463,6 @@ snapshots: esutils@2.0.3: {} - etag@1.8.1: {} - event-stream@3.3.4: dependencies: duplexer: 0.1.2 @@ -12240,9 +10473,10 @@ snapshots: stream-combiner: 0.0.4 through: 2.3.8 - event-target-shim@5.0.1: {} + event-target-shim@5.0.1: + optional: true - events-listener@1.1.0: {} + eventemitter3@5.0.1: {} execa@5.1.1: dependencies: @@ -12256,18 +10490,6 @@ snapshots: signal-exit: 3.0.7 strip-final-newline: 2.0.0 - execa@7.1.1: - dependencies: - cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 4.3.1 - is-stream: 3.0.0 - merge-stream: 2.0.0 - npm-run-path: 5.1.0 - onetime: 6.0.0 - signal-exit: 3.0.7 - strip-final-newline: 3.0.0 - execa@8.0.1: dependencies: cross-spawn: 7.0.3 @@ -12280,111 +10502,30 @@ snapshots: signal-exit: 4.1.0 strip-final-newline: 3.0.0 - exegesis-express@4.0.0: + extend@3.0.2: {} + + fast-deep-equal@3.1.3: {} + + fast-glob@3.3.1: dependencies: - exegesis: 4.1.0 - transitivePeerDependencies: - - supports-color + '@nodelib/fs.stat': 2.0.5 + '@nodelib/fs.walk': 1.2.8 + glob-parent: 5.1.2 + merge2: 1.4.1 + micromatch: 4.0.8 - exegesis@4.1.0: - dependencies: - '@apidevtools/json-schema-ref-parser': 9.0.9 - ajv: 8.11.0 - ajv-formats: 2.1.1(ajv@8.11.0) - body-parser: 1.20.1 - content-type: 1.0.5 - deep-freeze: 0.0.1 - events-listener: 1.1.0 - glob: 7.2.3 - json-ptr: 3.1.0 - json-schema-traverse: 1.0.0 - lodash: 4.17.21 - openapi3-ts: 2.0.2 - promise-breaker: 5.0.0 - pump: 3.0.0 - qs: 6.11.0 - raw-body: 2.5.1 - semver: 7.5.4 - transitivePeerDependencies: - - supports-color - - exponential-backoff@3.1.1: - optional: true - - express@4.18.2: - dependencies: - accepts: 1.3.8 - array-flatten: 1.1.1 - body-parser: 1.20.1 - content-disposition: 0.5.4 - content-type: 1.0.5 - cookie: 0.5.0 - cookie-signature: 1.0.6 - debug: 2.6.9 - depd: 2.0.0 - encodeurl: 1.0.2 - escape-html: 1.0.3 - etag: 1.8.1 - finalhandler: 1.2.0 - fresh: 0.5.2 - http-errors: 2.0.0 - merge-descriptors: 1.0.1 - methods: 1.1.2 - on-finished: 2.4.1 - parseurl: 1.3.3 - path-to-regexp: 0.1.7 - proxy-addr: 2.0.7 - qs: 6.11.0 - range-parser: 1.2.1 - safe-buffer: 5.2.1 - send: 0.18.0 - serve-static: 1.15.0 - setprototypeof: 1.2.0 - statuses: 2.0.1 - type-is: 1.6.18 - utils-merge: 1.0.1 - vary: 1.1.2 - transitivePeerDependencies: - - supports-color - - extend@3.0.2: {} - - external-editor@3.1.0: - dependencies: - chardet: 0.7.0 - iconv-lite: 0.4.24 - tmp: 0.0.33 - - extsprintf@1.3.0: {} - - fast-deep-equal@3.1.3: {} - - fast-glob@3.3.1: + fast-glob@3.3.2: dependencies: '@nodelib/fs.stat': 2.0.5 '@nodelib/fs.walk': 1.2.8 glob-parent: 5.1.2 merge2: 1.4.1 - micromatch: 4.0.5 - - fast-glob@3.3.2: - dependencies: - '@nodelib/fs.stat': 2.0.5 - '@nodelib/fs.walk': 1.2.8 - glob-parent: 5.1.2 - merge2: 1.4.1 - micromatch: 4.0.5 + micromatch: 4.0.8 fast-json-stable-stringify@2.1.0: {} fast-levenshtein@2.0.6: {} - fast-text-encoding@1.0.6: {} - - fast-url-parser@1.1.3: - dependencies: - punycode: 1.4.1 - fast-xml-parser@3.21.1: dependencies: strnum: 1.0.5 @@ -12402,7 +10543,9 @@ snapshots: dependencies: websocket-driver: 0.7.4 - fecha@4.2.3: {} + fdir@6.4.2(picomatch@4.0.2): + optionalDependencies: + picomatch: 4.0.2 fenceparser@1.1.1: {} @@ -12422,47 +10565,21 @@ snapshots: fflate@0.8.2: {} - figures@3.2.0: + file-entry-cache@8.0.0: dependencies: - escape-string-regexp: 1.0.5 - - file-entry-cache@6.0.1: - dependencies: - flat-cache: 3.2.0 + flat-cache: 4.0.1 file-saver@2.0.5: {} - file-uri-to-path@2.0.0: {} - - filesize@6.4.0: {} - fill-range@7.0.1: dependencies: to-regex-range: 5.0.1 - finalhandler@1.1.2: + fill-range@7.1.1: dependencies: - debug: 2.6.9 - encodeurl: 1.0.2 - escape-html: 1.0.3 - on-finished: 2.3.0 - parseurl: 1.3.3 - statuses: 1.5.0 - unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color + to-regex-range: 5.0.1 - finalhandler@1.2.0: - dependencies: - debug: 2.6.9 - encodeurl: 1.0.2 - escape-html: 1.0.3 - on-finished: 2.4.1 - parseurl: 1.3.3 - statuses: 2.0.1 - unpipe: 1.0.0 - transitivePeerDependencies: - - supports-color + find-up-simple@1.0.0: {} find-up@4.1.0: dependencies: @@ -12474,12 +10591,6 @@ snapshots: locate-path: 6.0.0 path-exists: 4.0.0 - find-up@7.0.0: - dependencies: - locate-path: 7.2.0 - path-exists: 5.0.0 - unicorn-magic: 0.1.0 - firebase-admin@12.0.0(encoding@0.1.13): dependencies: '@fastify/busboy': 1.2.1 @@ -12497,87 +10608,6 @@ snapshots: - encoding - supports-color - firebase-functions@4.3.1(encoding@0.1.13)(firebase-admin@12.0.0(encoding@0.1.13)): - dependencies: - '@types/cors': 2.8.13 - '@types/express': 4.17.3 - cors: 2.8.5 - express: 4.18.2 - firebase-admin: 12.0.0(encoding@0.1.13) - node-fetch: 2.6.9(encoding@0.1.13) - protobufjs: 7.2.3 - transitivePeerDependencies: - - encoding - - supports-color - - firebase-tools@12.3.0(encoding@0.1.13): - dependencies: - '@google-cloud/pubsub': 3.7.0(encoding@0.1.13) - abort-controller: 3.0.0 - ajv: 6.12.6 - archiver: 5.3.1 - async-lock: 1.3.2 - body-parser: 1.20.1 - chokidar: 3.5.3 - cjson: 0.3.3 - cli-table: 0.3.11 - colorette: 2.0.19 - commander: 4.1.1 - configstore: 5.0.1 - cors: 2.8.5 - cross-env: 5.2.1 - cross-spawn: 7.0.3 - csv-parse: 5.3.0 - exegesis: 4.1.0 - exegesis-express: 4.0.0 - express: 4.18.2 - filesize: 6.4.0 - form-data: 4.0.0 - fs-extra: 10.1.0 - glob: 7.2.3 - google-auth-library: 7.14.1(encoding@0.1.13) - inquirer: 8.2.4 - js-yaml: 3.14.1 - jsonwebtoken: 9.0.0 - leven: 3.1.0 - libsodium-wrappers: 0.7.11 - lodash: 4.17.21 - marked: 4.0.15 - marked-terminal: 5.2.0(marked@4.0.15) - mime: 2.6.0 - minimatch: 3.1.2 - morgan: 1.10.0 - node-fetch: 2.6.9(encoding@0.1.13) - open: 6.4.0 - ora: 5.4.1 - p-limit: 3.1.0 - portfinder: 1.0.32 - progress: 2.0.3 - proxy-agent: 5.0.0 - request: 2.88.2 - retry: 0.13.1 - rimraf: 3.0.2 - semver: 5.7.1 - stream-chain: 2.2.5 - stream-json: 1.7.4 - strip-ansi: 6.0.1 - superstatic: 9.0.3(encoding@0.1.13) - tar: 6.1.11 - tcp-port-used: 1.0.2 - tmp: 0.2.1 - triple-beam: 1.3.0 - universal-analytics: 0.5.3 - update-notifier-cjs: 5.1.6(encoding@0.1.13) - uuid: 8.3.2 - winston: 3.7.2 - winston-transport: 4.5.0 - ws: 7.5.7 - transitivePeerDependencies: - - bufferutil - - encoding - - supports-color - - utf-8-validate - firebase@10.9.0: dependencies: '@firebase/analytics': 0.10.1(@firebase/app@0.9.29) @@ -12609,35 +10639,16 @@ snapshots: transitivePeerDependencies: - '@react-native-async-storage/async-storage' - flat-cache@3.2.0: + flat-cache@4.0.1: dependencies: - flatted: 3.2.9 + flatted: 3.3.1 keyv: 4.5.4 - rimraf: 3.0.2 - - flatted@3.2.9: {} flatted@3.3.1: {} - fn.name@1.1.0: {} - - follow-redirects@1.15.6(debug@4.3.4): + follow-redirects@1.15.6(debug@4.3.6): optionalDependencies: - debug: 4.3.4 - - foreground-child@3.1.1: - dependencies: - cross-spawn: 7.0.3 - signal-exit: 4.1.0 - optional: true - - forever-agent@0.6.1: {} - - form-data@2.3.3: - dependencies: - asynckit: 0.4.0 - combined-stream: 1.0.8 - mime-types: 2.1.35 + debug: 4.3.6 form-data@2.5.1: dependencies: @@ -12656,35 +10667,12 @@ snapshots: dependencies: fetch-blob: 3.2.0 - forwarded@0.2.0: {} - - fresh@0.5.2: {} - from@0.1.7: {} - fs-constants@1.0.0: {} - - fs-extra@10.1.0: - dependencies: - graceful-fs: 4.2.11 - jsonfile: 6.1.0 - universalify: 2.0.0 - - fs-extra@8.1.0: - dependencies: - graceful-fs: 4.2.11 - jsonfile: 4.0.0 - universalify: 0.1.2 - fs-minipass@2.1.0: dependencies: minipass: 3.3.6 - fs-minipass@3.0.3: - dependencies: - minipass: 7.0.4 - optional: true - fs.realpath@1.0.0: {} fsevents@2.3.2: @@ -12693,11 +10681,6 @@ snapshots: fsevents@2.3.3: optional: true - ftp@0.3.10: - dependencies: - readable-stream: 1.1.14 - xregexp: 2.0.0 - function-bind@1.1.1: {} function-bind@1.1.2: {} @@ -12707,27 +10690,6 @@ snapshots: functions-have-names@1.2.3: {} - gaxios@4.3.3(encoding@0.1.13): - dependencies: - abort-controller: 3.0.0 - extend: 3.0.2 - https-proxy-agent: 5.0.1 - is-stream: 2.0.1 - node-fetch: 2.6.12(encoding@0.1.13) - transitivePeerDependencies: - - encoding - - supports-color - - gaxios@5.1.3(encoding@0.1.13): - dependencies: - extend: 3.0.2 - https-proxy-agent: 5.0.1 - is-stream: 2.0.1 - node-fetch: 2.6.12(encoding@0.1.13) - transitivePeerDependencies: - - encoding - - supports-color - gaxios@6.1.1(encoding@0.1.13): dependencies: extend: 3.0.2 @@ -12739,22 +10701,6 @@ snapshots: - supports-color optional: true - gcp-metadata@4.3.1(encoding@0.1.13): - dependencies: - gaxios: 4.3.3(encoding@0.1.13) - json-bigint: 1.0.0 - transitivePeerDependencies: - - encoding - - supports-color - - gcp-metadata@5.3.0(encoding@0.1.13): - dependencies: - gaxios: 5.1.3(encoding@0.1.13) - json-bigint: 1.0.0 - transitivePeerDependencies: - - encoding - - supports-color - gcp-metadata@6.1.0(encoding@0.1.13): dependencies: gaxios: 6.1.1(encoding@0.1.13) @@ -12772,7 +10718,7 @@ snapshots: get-caller-file@2.0.5: {} - get-func-name@2.0.2: {} + get-east-asian-width@1.2.0: {} get-intrinsic@1.2.1: dependencies: @@ -12785,28 +10731,13 @@ snapshots: get-stream@8.0.1: {} - get-tsconfig@4.7.2: - dependencies: - resolve-pkg-maps: 1.0.0 - get-tsconfig@4.7.3: dependencies: resolve-pkg-maps: 1.0.0 - get-uri@3.0.2: + get-tsconfig@4.7.6: dependencies: - '@tootallnate/once': 1.1.2 - data-uri-to-buffer: 3.0.1 - debug: 4.3.4 - file-uri-to-path: 2.0.0 - fs-extra: 8.1.0 - ftp: 0.3.10 - transitivePeerDependencies: - - supports-color - - getpass@0.1.7: - dependencies: - assert-plus: 1.0.0 + resolve-pkg-maps: 1.0.0 github-slugger@2.0.0: {} @@ -12818,23 +10749,6 @@ snapshots: dependencies: is-glob: 4.0.3 - glob-slash@1.0.0: {} - - glob-slasher@1.0.1: - dependencies: - glob-slash: 1.0.0 - lodash.isobject: 2.4.1 - toxic: 1.0.1 - - glob@10.3.10: - dependencies: - foreground-child: 3.1.1 - jackspeak: 2.3.6 - minimatch: 9.0.3 - minipass: 7.0.4 - path-scurry: 1.10.1 - optional: true - glob@7.2.3: dependencies: fs.realpath: 1.0.0 @@ -12844,29 +10758,15 @@ snapshots: once: 1.4.0 path-is-absolute: 1.0.1 - glob@8.1.0: - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 5.1.6 - once: 1.4.0 - - global-dirs@3.0.0: - dependencies: - ini: 2.0.0 - globals@11.12.0: {} - globals@13.20.0: - dependencies: - type-fest: 0.20.2 - globals@13.24.0: dependencies: type-fest: 0.20.2 - globals@15.0.0: {} + globals@14.0.0: {} + + globals@15.9.0: {} globalyzer@0.1.0: {} @@ -12875,42 +10775,12 @@ snapshots: array-union: 2.1.0 dir-glob: 3.0.1 fast-glob: 3.3.1 - ignore: 5.2.4 + ignore: 5.3.1 merge2: 1.4.1 slash: 3.0.0 globrex@0.1.2: {} - google-auth-library@7.14.1(encoding@0.1.13): - dependencies: - arrify: 2.0.1 - base64-js: 1.5.1 - ecdsa-sig-formatter: 1.0.11 - fast-text-encoding: 1.0.6 - gaxios: 4.3.3(encoding@0.1.13) - gcp-metadata: 4.3.1(encoding@0.1.13) - gtoken: 5.3.2(encoding@0.1.13) - jws: 4.0.0 - lru-cache: 6.0.0 - transitivePeerDependencies: - - encoding - - supports-color - - google-auth-library@8.9.0(encoding@0.1.13): - dependencies: - arrify: 2.0.1 - base64-js: 1.5.1 - ecdsa-sig-formatter: 1.0.11 - fast-text-encoding: 1.0.6 - gaxios: 5.1.3(encoding@0.1.13) - gcp-metadata: 5.3.0(encoding@0.1.13) - gtoken: 6.1.2(encoding@0.1.13) - jws: 4.0.0 - lru-cache: 6.0.0 - transitivePeerDependencies: - - encoding - - supports-color - google-auth-library@9.4.2(encoding@0.1.13): dependencies: base64-js: 1.5.1 @@ -12937,27 +10807,6 @@ snapshots: - supports-color optional: true - google-gax@3.6.0(encoding@0.1.13): - dependencies: - '@grpc/grpc-js': 1.8.14 - '@grpc/proto-loader': 0.7.7 - '@types/long': 4.0.2 - '@types/rimraf': 3.0.2 - abort-controller: 3.0.0 - duplexify: 4.1.2 - fast-text-encoding: 1.0.6 - google-auth-library: 8.9.0(encoding@0.1.13) - is-stream-ended: 0.1.4 - node-fetch: 2.6.12(encoding@0.1.13) - object-hash: 3.0.0 - proto3-json-serializer: 1.1.1 - protobufjs: 7.2.3 - protobufjs-cli: 1.1.1(protobufjs@7.2.3) - retry-request: 5.0.2 - transitivePeerDependencies: - - encoding - - supports-color - google-gax@4.1.0(encoding@0.1.13): dependencies: '@grpc/grpc-js': 1.9.13 @@ -12976,38 +10825,10 @@ snapshots: - supports-color optional: true - google-p12-pem@3.1.4: - dependencies: - node-forge: 1.3.1 - - google-p12-pem@4.0.1: - dependencies: - node-forge: 1.3.1 - - graceful-fs@4.2.10: {} - graceful-fs@4.2.11: {} graphemer@1.4.0: {} - gtoken@5.3.2(encoding@0.1.13): - dependencies: - gaxios: 4.3.3(encoding@0.1.13) - google-p12-pem: 3.1.4 - jws: 4.0.0 - transitivePeerDependencies: - - encoding - - supports-color - - gtoken@6.1.2(encoding@0.1.13): - dependencies: - gaxios: 5.1.3(encoding@0.1.13) - google-p12-pem: 4.0.1 - jws: 4.0.0 - transitivePeerDependencies: - - encoding - - supports-color - gtoken@7.0.1(encoding@0.1.13): dependencies: gaxios: 6.1.1(encoding@0.1.13) @@ -13030,13 +10851,6 @@ snapshots: dependencies: duplexer: 0.1.2 - har-schema@2.0.0: {} - - har-validator@5.1.5: - dependencies: - ajv: 6.12.6 - har-schema: 2.0.0 - has-flag@3.0.0: {} has-flag@4.0.0: {} @@ -13053,8 +10867,6 @@ snapshots: dependencies: has-symbols: 1.0.3 - has-yarn@2.1.0: {} - has@1.0.3: dependencies: function-bind: 1.1.1 @@ -13161,40 +10973,14 @@ snapshots: he@1.2.0: {} - heap-js@2.3.0: {} - - hogan.js@3.0.2: - dependencies: - mkdirp: 0.3.0 - nopt: 1.0.10 - hosted-git-info@2.8.9: {} html-void-elements@2.0.1: {} html-whitespace-sensitive-tag-names@2.0.0: {} - http-cache-semantics@4.1.1: - optional: true - - http-errors@2.0.0: - dependencies: - depd: 2.0.0 - inherits: 2.0.4 - setprototypeof: 1.2.0 - statuses: 2.0.1 - toidentifier: 1.0.1 - http-parser-js@0.5.8: {} - http-proxy-agent@4.0.1: - dependencies: - '@tootallnate/once': 1.1.2 - agent-base: 6.0.2 - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - http-proxy-agent@5.0.0: dependencies: '@tootallnate/once': 2.0.0 @@ -13204,26 +10990,13 @@ snapshots: - supports-color optional: true - http-proxy-agent@7.0.0: - dependencies: - agent-base: 7.1.0 - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - optional: true - - http-signature@1.2.0: - dependencies: - assert-plus: 1.0.0 - jsprim: 1.4.2 - sshpk: 1.17.0 - https-proxy-agent@5.0.1: dependencies: agent-base: 6.0.2 debug: 4.3.4 transitivePeerDependencies: - supports-color + optional: true https-proxy-agent@7.0.4: dependencies: @@ -13234,23 +11007,15 @@ snapshots: human-signals@2.1.0: {} - human-signals@4.3.1: {} - human-signals@5.0.0: {} - iconv-lite@0.4.24: - dependencies: - safer-buffer: 2.1.2 - iconv-lite@0.6.3: dependencies: safer-buffer: 2.1.2 - idb@7.1.1: {} - - ieee754@1.2.1: {} + idb-keyval@6.2.1: {} - ignore@5.2.4: {} + idb@7.1.1: {} ignore@5.3.1: {} @@ -13261,8 +11026,6 @@ snapshots: parent-module: 1.0.1 resolve-from: 4.0.0 - import-lazy@2.1.0: {} - import-meta-resolve@4.0.0: {} imurmurhash@0.1.4: {} @@ -13276,55 +11039,8 @@ snapshots: inherits@2.0.4: {} - ini@1.3.8: {} - - ini@2.0.0: {} - - inquirer@8.2.4: - dependencies: - ansi-escapes: 4.3.2 - chalk: 4.1.2 - cli-cursor: 3.1.0 - cli-width: 3.0.0 - external-editor: 3.1.0 - figures: 3.2.0 - lodash: 4.17.21 - mute-stream: 0.0.8 - ora: 5.4.1 - run-async: 2.4.1 - rxjs: 7.8.1 - string-width: 4.2.3 - strip-ansi: 6.0.1 - through: 2.3.8 - wrap-ansi: 7.0.0 - - install-artifact-from-github@1.3.5: - optional: true - - instantsearch.js@4.40.2(algoliasearch@4.13.0): - dependencies: - '@algolia/events': 4.0.1 - '@types/google.maps': 3.48.3 - '@types/hogan.js': 3.0.1 - '@types/qs': 6.9.7 - algoliasearch: 4.13.0 - algoliasearch-helper: 3.7.4(algoliasearch@4.13.0) - classnames: 2.3.1 - hogan.js: 3.0.2 - preact: 10.7.0 - qs: 6.9.7 - search-insights: 2.2.1 - internmap@2.0.3: {} - ip-regex@4.3.0: {} - - ip@1.1.5: {} - - ip@2.0.0: {} - - ipaddr.js@1.9.1: {} - is-alphabetical@1.0.4: {} is-alphanumerical@1.0.4: @@ -13351,10 +11067,6 @@ snapshots: dependencies: builtin-modules: 3.3.0 - is-ci@2.0.0: - dependencies: - ci-info: 2.0.0 - is-core-module@2.13.1: dependencies: hasown: 2.0.2 @@ -13371,28 +11083,18 @@ snapshots: is-fullwidth-code-point@4.0.0: {} + is-fullwidth-code-point@5.0.0: + dependencies: + get-east-asian-width: 1.2.0 + is-glob@4.0.3: dependencies: is-extglob: 2.1.1 is-hexadecimal@1.0.4: {} - is-installed-globally@0.4.0: - dependencies: - global-dirs: 3.0.0 - is-path-inside: 3.0.3 - - is-interactive@1.0.0: {} - - is-lambda@1.0.1: - optional: true - - is-npm@5.0.0: {} - is-number@7.0.0: {} - is-obj@2.0.0: {} - is-path-inside@3.0.3: {} is-plain-obj@4.1.0: {} @@ -13406,58 +11108,20 @@ snapshots: call-bind: 1.0.2 has-tostringtag: 1.0.0 - is-stream-ended@0.1.4: {} - is-stream@2.0.1: {} is-stream@3.0.0: {} - is-typedarray@1.0.0: {} - - is-unicode-supported@0.1.0: {} - - is-url@1.2.4: {} - is-utf8@0.2.1: {} - is-wsl@1.1.0: {} - - is-yarn-global@0.3.0: {} - - is2@2.0.7: - dependencies: - deep-is: 0.1.4 - ip-regex: 4.3.0 - is-url: 1.2.4 - - isarray@0.0.1: {} - isarray@1.0.0: {} isexe@2.0.0: {} - isexe@3.1.1: - optional: true - - isomorphic-fetch@3.0.0(encoding@0.1.13): - dependencies: - node-fetch: 2.6.12(encoding@0.1.13) - whatwg-fetch: 3.6.2 - transitivePeerDependencies: - - encoding - - isstream@0.1.2: {} - - jackspeak@2.3.6: - dependencies: - '@isaacs/cliui': 8.0.2 - optionalDependencies: - '@pkgjs/parseargs': 0.11.0 - optional: true - jiti@1.21.0: {} - jju@1.4.0: {} + jiti@1.21.6: + optional: true joi@17.12.2: dependencies: @@ -13467,52 +11131,17 @@ snapshots: '@sideway/formula': 3.0.1 '@sideway/pinpoint': 2.0.0 - join-path@1.1.1: - dependencies: - as-array: 2.0.0 - url-join: 0.0.1 - valid-url: 1.0.9 - jose@4.15.4: {} js-tokens@4.0.0: {} - js-tokens@8.0.3: {} - - js-yaml@3.14.1: - dependencies: - argparse: 1.0.10 - esprima: 4.0.1 - js-yaml@4.1.0: dependencies: argparse: 2.0.1 - js2xmlparser@4.0.2: - dependencies: - xmlcreate: 2.0.4 - - jsbn@0.1.1: {} - jsdoc-type-pratt-parser@4.0.0: {} - jsdoc@4.0.2: - dependencies: - '@babel/parser': 7.23.6 - '@jsdoc/salty': 0.2.5 - '@types/markdown-it': 12.2.3 - bluebird: 3.7.2 - catharsis: 0.9.0 - escape-string-regexp: 2.0.0 - js2xmlparser: 4.0.2 - klaw: 3.0.0 - markdown-it: 12.3.2 - markdown-it-anchor: 8.6.7(@types/markdown-it@12.2.3)(markdown-it@12.3.2) - marked: 4.0.15 - mkdirp: 1.0.4 - requizzle: 0.2.4 - strip-json-comments: 3.1.1 - underscore: 1.13.6 + jsdoc-type-pratt-parser@4.1.0: {} jsesc@0.5.0: {} @@ -13523,27 +11152,16 @@ snapshots: json-bigint@1.0.0: dependencies: bignumber.js: 9.0.2 + optional: true json-buffer@3.0.1: {} json-parse-even-better-errors@2.3.1: {} - json-parse-helpfulerror@1.0.3: - dependencies: - jju: 1.4.0 - - json-ptr@3.1.0: {} - json-schema-traverse@0.4.1: {} - json-schema-traverse@1.0.0: {} - - json-schema@0.4.0: {} - json-stable-stringify-without-jsonify@1.0.1: {} - json-stringify-safe@5.0.1: {} - json5@2.2.3: {} jsonc-eslint-parser@2.4.0: @@ -13555,23 +11173,6 @@ snapshots: jsonc-parser@3.2.1: {} - jsonfile@4.0.0: - optionalDependencies: - graceful-fs: 4.2.11 - - jsonfile@6.1.0: - dependencies: - universalify: 2.0.0 - optionalDependencies: - graceful-fs: 4.2.11 - - jsonwebtoken@9.0.0: - dependencies: - jws: 3.2.2 - lodash: 4.17.21 - ms: 2.1.3 - semver: 7.5.4 - jsonwebtoken@9.0.2: dependencies: jws: 3.2.2 @@ -13585,13 +11186,6 @@ snapshots: ms: 2.1.3 semver: 7.5.4 - jsprim@1.4.2: - dependencies: - assert-plus: 1.0.0 - extsprintf: 1.3.0 - json-schema: 0.4.0 - verror: 1.10.0 - jsts@2.7.1: {} jszip@3.8.0: @@ -13612,6 +11206,7 @@ snapshots: buffer-equal-constant-time: 1.0.1 ecdsa-sig-formatter: 1.0.11 safe-buffer: 5.2.1 + optional: true jwks-rsa@3.1.0: dependencies: @@ -13633,12 +11228,13 @@ snapshots: dependencies: jwa: 2.0.0 safe-buffer: 5.2.1 + optional: true keyv@4.5.4: dependencies: json-buffer: 3.0.1 - kitbook@1.0.0-beta.31(@lezer/common@1.2.1)(@sveltejs/kit@2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))(svelte@4.2.12)(typescript@5.1.6): + kitbook@1.0.0-beta.31(@lezer/common@1.2.1)(@sveltejs/kit@2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))(svelte@4.2.12)(typescript@5.1.6): dependencies: '@codemirror/autocomplete': 6.16.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)(@lezer/common@1.2.1) '@codemirror/commands': 6.5.0 @@ -13650,7 +11246,7 @@ snapshots: '@kitbook/mdsvex-shiki-twoslash': 1.0.0-beta.31(svelte@4.2.12)(typescript@5.1.6) '@kitbook/rehype-display-link-titles': 1.0.0-beta.31 '@lezer/highlight': 1.2.0 - '@sveltejs/kit': 2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)))(svelte@4.2.12)(vite@5.1.4(@types/node@20.11.0)) + '@sveltejs/kit': 2.5.4(@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)))(svelte@4.2.12)(vite@5.4.2(@types/node@22.5.1)) '@typescript/vfs': 1.5.0 codemirror: 6.0.1(@lezer/common@1.2.1) rehype-autolink-headings: 6.1.1 @@ -13672,85 +11268,54 @@ snapshots: - '@lezer/common' - supports-color - klaw@3.0.0: - dependencies: - graceful-fs: 4.2.11 - kleur@4.1.5: {} - known-css-properties@0.28.0: {} + known-css-properties@0.34.0: {} kolorist@1.8.0: {} - kuler@2.0.0: {} - lazy-ass@1.6.0: {} - lazystream@1.0.1: - dependencies: - readable-stream: 2.3.7 - - leven@3.1.0: {} - - levn@0.3.0: - dependencies: - prelude-ls: 1.1.2 - type-check: 0.3.2 - levn@0.4.1: dependencies: prelude-ls: 1.2.1 type-check: 0.4.0 - libsodium-wrappers@0.7.11: - dependencies: - libsodium: 0.7.11 - - libsodium@0.7.11: {} - lie@3.3.0: dependencies: immediate: 3.0.6 lilconfig@2.1.0: {} + lilconfig@3.1.2: {} + limiter@1.1.5: {} lines-and-columns@1.2.4: {} - linkify-it@3.0.3: + lint-staged@15.2.9: dependencies: - uc.micro: 1.0.6 - - lint-staged@13.2.2: - dependencies: - chalk: 5.2.0 - cli-truncate: 3.1.0 - commander: 10.0.1 - debug: 4.3.4 - execa: 7.1.1 - lilconfig: 2.1.0 - listr2: 5.0.8 - micromatch: 4.0.5 - normalize-path: 3.0.0 - object-inspect: 1.12.3 + chalk: 5.3.0 + commander: 12.1.0 + debug: 4.3.6 + execa: 8.0.1 + lilconfig: 3.1.2 + listr2: 8.2.4 + micromatch: 4.0.8 pidtree: 0.6.0 string-argv: 0.3.2 - yaml: 2.3.1 + yaml: 2.5.0 transitivePeerDependencies: - - enquirer - supports-color - listr2@5.0.8: + listr2@8.2.4: dependencies: - cli-truncate: 2.1.0 + cli-truncate: 4.0.0 colorette: 2.0.20 - log-update: 4.0.0 - p-map: 4.0.0 - rfdc: 1.3.0 - rxjs: 7.8.1 - through: 2.3.8 - wrap-ansi: 7.0.0 + eventemitter3: 5.0.1 + log-update: 6.1.0 + rfdc: 1.4.1 + wrap-ansi: 9.0.0 local-pkg@0.5.0: dependencies: @@ -13767,24 +11332,12 @@ snapshots: dependencies: p-locate: 5.0.0 - locate-path@7.2.0: - dependencies: - p-locate: 6.0.0 - lodash-es@4.17.21: {} - lodash._objecttypes@2.4.1: {} - lodash.camelcase@4.3.0: {} lodash.clonedeep@4.5.0: {} - lodash.defaults@4.2.0: {} - - lodash.difference@4.5.0: {} - - lodash.flatten@4.4.0: {} - lodash.includes@4.3.0: {} lodash.isboolean@3.0.3: {} @@ -13793,10 +11346,6 @@ snapshots: lodash.isnumber@3.0.3: {} - lodash.isobject@2.4.1: - dependencies: - lodash._objecttypes: 2.4.1 - lodash.isplainobject@4.0.6: {} lodash.isstring@4.0.1: {} @@ -13805,51 +11354,28 @@ snapshots: lodash.once@4.1.1: {} - lodash.snakecase@4.1.1: {} - - lodash.union@4.6.0: {} - lodash@4.17.21: {} - log-symbols@4.1.0: - dependencies: - chalk: 4.1.2 - is-unicode-supported: 0.1.0 - - log-update@4.0.0: - dependencies: - ansi-escapes: 4.3.2 - cli-cursor: 3.1.0 - slice-ansi: 4.0.0 - wrap-ansi: 6.2.0 - - logform@2.4.0: + log-update@6.1.0: dependencies: - '@colors/colors': 1.5.0 - fecha: 4.2.3 - ms: 2.1.3 - safe-stable-stringify: 2.3.1 - triple-beam: 1.3.0 + ansi-escapes: 7.0.0 + cli-cursor: 5.0.0 + slice-ansi: 7.1.0 + strip-ansi: 7.1.0 + wrap-ansi: 9.0.0 logrocket@2.2.1: {} - long@4.0.0: {} - long@5.2.3: {} longest-streak@3.1.0: {} - loupe@2.3.7: - dependencies: - get-func-name: 2.0.2 + loupe@3.1.2: {} lower-case@2.0.2: dependencies: tslib: 2.6.2 - lru-cache@10.1.0: - optional: true - lru-cache@4.0.2: dependencies: pseudomap: 1.0.2 @@ -13870,6 +11396,10 @@ snapshots: lz-string@1.4.4: {} + magic-string@0.30.12: + dependencies: + '@jridgewell/sourcemap-codec': 1.5.0 + magic-string@0.30.7: dependencies: '@jridgewell/sourcemap-codec': 1.4.15 @@ -13878,56 +11408,10 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.4.15 - make-dir@3.1.0: - dependencies: - semver: 6.3.0 - - make-fetch-happen@13.0.0: - dependencies: - '@npmcli/agent': 2.2.0 - cacache: 18.0.2 - http-cache-semantics: 4.1.1 - is-lambda: 1.0.1 - minipass: 7.0.4 - minipass-fetch: 3.0.4 - minipass-flush: 1.0.5 - minipass-pipeline: 1.2.4 - negotiator: 0.6.3 - promise-retry: 2.0.1 - ssri: 10.0.5 - transitivePeerDependencies: - - supports-color - optional: true - map-stream@0.1.0: {} - markdown-it-anchor@8.6.7(@types/markdown-it@12.2.3)(markdown-it@12.3.2): - dependencies: - '@types/markdown-it': 12.2.3 - markdown-it: 12.3.2 - - markdown-it@12.3.2: - dependencies: - argparse: 2.0.1 - entities: 2.1.0 - linkify-it: 3.0.3 - mdurl: 1.0.1 - uc.micro: 1.0.6 - markdown-table@3.0.3: {} - marked-terminal@5.2.0(marked@4.0.15): - dependencies: - ansi-escapes: 6.2.0 - cardinal: 2.1.1 - chalk: 5.2.0 - cli-table3: 0.6.3 - marked: 4.0.15 - node-emoji: 1.11.0 - supports-hyperlinks: 2.3.0 - - marked@4.0.15: {} - mdast-util-definitions@5.1.2: dependencies: '@types/mdast': 3.0.15 @@ -14065,18 +11549,10 @@ snapshots: svelte: 4.2.12 vfile-message: 2.0.4 - mdurl@1.0.1: {} - - media-typer@0.3.0: {} - - merge-descriptors@1.0.1: {} - merge-stream@2.0.0: {} merge2@1.4.1: {} - methods@1.1.2: {} - micromark-core-commonmark@1.1.0: dependencies: decode-named-character-reference: 1.0.2 @@ -14248,7 +11724,7 @@ snapshots: micromark@2.11.4: dependencies: - debug: 4.3.4 + debug: 4.3.6 parse-entities: 2.0.0 transitivePeerDependencies: - supports-color @@ -14256,7 +11732,7 @@ snapshots: micromark@3.2.0: dependencies: '@types/debug': 4.1.12 - debug: 4.3.4 + debug: 4.3.6 decode-named-character-reference: 1.0.2 micromark-core-commonmark: 1.1.0 micromark-factory-space: 1.1.0 @@ -14275,9 +11751,9 @@ snapshots: transitivePeerDependencies: - supports-color - micromatch@4.0.5: + micromatch@4.0.8: dependencies: - braces: 3.0.2 + braces: 3.0.3 picomatch: 2.3.1 mime-db@1.52.0: {} @@ -14286,10 +11762,6 @@ snapshots: dependencies: mime-db: 1.52.0 - mime@1.6.0: {} - - mime@2.6.0: {} - mime@3.0.0: optional: true @@ -14297,56 +11769,29 @@ snapshots: mimic-fn@4.0.0: {} - min-indent@1.0.1: {} + mimic-function@5.0.1: {} - mini-svg-data-uri@1.4.4: {} + min-indent@1.0.1: {} - minimatch@3.1.2: - dependencies: - brace-expansion: 1.1.11 + mini-svg-data-uri@1.4.4: {} - minimatch@5.1.6: + minimatch@10.0.1: dependencies: brace-expansion: 2.0.1 - minimatch@6.2.0: + minimatch@3.1.2: dependencies: - brace-expansion: 2.0.1 + brace-expansion: 1.1.11 minimatch@9.0.3: dependencies: brace-expansion: 2.0.1 - minimist@1.2.8: {} - - minipass-collect@2.0.1: - dependencies: - minipass: 7.0.4 - optional: true - - minipass-fetch@3.0.4: - dependencies: - minipass: 7.0.4 - minipass-sized: 1.0.3 - minizlib: 2.1.2 - optionalDependencies: - encoding: 0.1.13 - optional: true - - minipass-flush@1.0.5: - dependencies: - minipass: 3.3.6 - optional: true - - minipass-pipeline@1.2.4: + minimatch@9.0.5: dependencies: - minipass: 3.3.6 - optional: true + brace-expansion: 2.0.1 - minipass-sized@1.0.3: - dependencies: - minipass: 3.3.6 - optional: true + minimist@1.2.8: {} minipass@3.3.6: dependencies: @@ -14354,16 +11799,11 @@ snapshots: minipass@5.0.0: {} - minipass@7.0.4: - optional: true - minizlib@2.1.2: dependencies: minipass: 3.3.6 yallist: 4.0.0 - mkdirp@0.3.0: {} - mkdirp@0.5.6: dependencies: minimist: 1.2.8 @@ -14384,45 +11824,20 @@ snapshots: pkg-types: 1.0.3 ufo: 1.4.0 - morgan@1.10.0: - dependencies: - basic-auth: 2.0.1 - debug: 2.6.9 - depd: 2.0.0 - on-finished: 2.3.0 - on-headers: 1.0.2 - transitivePeerDependencies: - - supports-color - mri@1.2.0: {} mrmime@2.0.0: {} - ms@2.0.0: {} - ms@2.1.2: {} ms@2.1.3: {} - mute-stream@0.0.8: {} - - nan@2.18.0: - optional: true - - nanoid@3.3.6: {} - nanoid@3.3.7: {} natural-compare-lite@1.4.0: {} natural-compare@1.4.0: {} - negotiator@0.6.3: {} - - netmask@2.0.2: {} - - nice-try@1.0.5: {} - no-case@3.0.4: dependencies: lower-case: 2.0.2 @@ -14430,29 +11845,14 @@ snapshots: node-domexception@1.0.0: {} - node-emoji@1.11.0: - dependencies: - lodash: 4.17.21 - node-fetch-native@1.6.2: {} - node-fetch@2.6.12(encoding@0.1.13): - dependencies: - whatwg-url: 5.0.0 - optionalDependencies: - encoding: 0.1.13 - node-fetch@2.6.7(encoding@0.1.13): dependencies: whatwg-url: 5.0.0 optionalDependencies: encoding: 0.1.13 - - node-fetch@2.6.9(encoding@0.1.13): - dependencies: - whatwg-url: 5.0.0 - optionalDependencies: - encoding: 0.1.13 + optional: true node-fetch@2.7.0(encoding@0.1.13): dependencies: @@ -14475,32 +11875,9 @@ snapshots: node-forge@1.3.1: {} - node-gyp@10.0.1: - dependencies: - env-paths: 2.2.1 - exponential-backoff: 3.1.1 - glob: 10.3.10 - graceful-fs: 4.2.11 - make-fetch-happen: 13.0.0 - nopt: 7.2.0 - proc-log: 3.0.0 - semver: 7.5.4 - tar: 6.1.11 - which: 4.0.0 - transitivePeerDependencies: - - supports-color - optional: true - node-releases@2.0.14: {} - nopt@1.0.10: - dependencies: - abbrev: 1.1.1 - - nopt@7.2.0: - dependencies: - abbrev: 2.0.0 - optional: true + node-releases@2.0.18: {} normalize-package-data@2.5.0: dependencies: @@ -14517,10 +11894,6 @@ snapshots: dependencies: path-key: 3.1.1 - npm-run-path@5.1.0: - dependencies: - path-key: 4.0.0 - npm-run-path@5.3.0: dependencies: path-key: 4.0.0 @@ -14529,13 +11902,8 @@ snapshots: dependencies: boolbase: 1.0.0 - oauth-sign@0.9.0: {} - - object-assign@4.1.1: {} - - object-hash@3.0.0: {} - - object-inspect@1.12.3: {} + object-hash@3.0.0: + optional: true object-is@1.1.5: dependencies: @@ -14552,24 +11920,10 @@ snapshots: node-fetch-native: 1.6.2 ufo: 1.4.0 - on-finished@2.3.0: - dependencies: - ee-first: 1.1.1 - - on-finished@2.4.1: - dependencies: - ee-first: 1.1.1 - - on-headers@1.0.2: {} - once@1.4.0: dependencies: wrappy: 1.0.2 - one-time@1.0.0: - dependencies: - fn.name: 1.1.0 - onetime@5.1.2: dependencies: mimic-fn: 2.1.0 @@ -14578,22 +11932,9 @@ snapshots: dependencies: mimic-fn: 4.0.0 - open@6.4.0: - dependencies: - is-wsl: 1.1.0 - - openapi3-ts@2.0.2: - dependencies: - yaml: 1.10.2 - - optionator@0.8.3: + onetime@7.0.0: dependencies: - deep-is: 0.1.4 - fast-levenshtein: 2.0.6 - levn: 0.3.0 - prelude-ls: 1.1.2 - type-check: 0.3.2 - word-wrap: 1.2.3 + mimic-function: 5.0.1 optionator@0.9.3: dependencies: @@ -14604,22 +11945,6 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 - ora@5.4.1: - dependencies: - bl: 4.1.0 - chalk: 4.1.2 - cli-cursor: 3.1.0 - cli-spinners: 2.6.1 - is-interactive: 1.0.0 - is-unicode-supported: 0.1.0 - log-symbols: 4.1.0 - strip-ansi: 6.0.1 - wcwidth: 1.0.1 - - os-tmpdir@1.0.2: {} - - p-defer@3.0.0: {} - p-limit@2.3.0: dependencies: p-try: 2.2.0 @@ -14628,14 +11953,6 @@ snapshots: dependencies: yocto-queue: 0.1.0 - p-limit@4.0.0: - dependencies: - yocto-queue: 1.0.0 - - p-limit@5.0.0: - dependencies: - yocto-queue: 1.0.0 - p-locate@4.1.0: dependencies: p-limit: 2.3.0 @@ -14644,35 +11961,9 @@ snapshots: dependencies: p-limit: 3.1.0 - p-locate@6.0.0: - dependencies: - p-limit: 4.0.0 - - p-map@4.0.0: - dependencies: - aggregate-error: 3.1.0 - p-try@2.2.0: {} - pac-proxy-agent@5.0.0: - dependencies: - '@tootallnate/once': 1.1.2 - agent-base: 6.0.2 - debug: 4.3.4 - get-uri: 3.0.2 - http-proxy-agent: 4.0.1 - https-proxy-agent: 5.0.1 - pac-resolver: 5.0.0 - raw-body: 2.5.1 - socks-proxy-agent: 5.0.1 - transitivePeerDependencies: - - supports-color - - pac-resolver@5.0.0: - dependencies: - degenerator: 3.0.2 - ip: 1.1.5 - netmask: 2.0.2 + package-manager-detector@0.2.0: {} packet-reader@1.0.0: {} @@ -14693,6 +11984,11 @@ snapshots: parse-gitignore@2.0.0: {} + parse-imports@2.1.1: + dependencies: + es-module-lexer: 1.5.4 + slashes: 3.0.12 + parse-json@5.2.0: dependencies: '@babel/code-frame': 7.23.5 @@ -14702,8 +11998,6 @@ snapshots: parse5@6.0.1: {} - parseurl@1.3.3: {} - pascal-case@3.1.2: dependencies: no-case: 3.0.4 @@ -14711,35 +12005,19 @@ snapshots: path-exists@4.0.0: {} - path-exists@5.0.0: {} - path-is-absolute@1.0.1: {} - path-key@2.0.1: {} - path-key@3.1.1: {} path-key@4.0.0: {} path-parse@1.0.7: {} - path-scurry@1.10.1: - dependencies: - lru-cache: 10.1.0 - minipass: 7.0.4 - optional: true - - path-to-regexp@0.1.7: {} - - path-to-regexp@1.8.0: - dependencies: - isarray: 0.0.1 - path-type@4.0.0: {} pathe@1.1.2: {} - pathval@1.1.1: {} + pathval@2.0.0: {} pause-stream@0.0.11: dependencies: @@ -14747,8 +12025,6 @@ snapshots: perfect-debounce@1.0.0: {} - performance-now@2.1.0: {} - periscopic@3.1.0: dependencies: '@types/estree': 1.0.5 @@ -14806,6 +12082,10 @@ snapshots: picocolors@1.0.0: {} + picocolors@1.0.1: {} + + picocolors@1.1.1: {} + picomatch@2.3.1: {} picomatch@4.0.2: {} @@ -14836,72 +12116,52 @@ snapshots: dependencies: splaytree: 3.1.2 - portfinder@1.0.32: - dependencies: - async: 2.6.4 - debug: 3.2.7 - mkdirp: 0.5.6 - transitivePeerDependencies: - - supports-color - - postcss-load-config@3.1.4(postcss@8.4.30): + postcss-load-config@3.1.4(postcss@8.4.41): dependencies: lilconfig: 2.1.0 yaml: 1.10.2 optionalDependencies: - postcss: 8.4.30 + postcss: 8.4.41 - postcss-load-config@3.1.4(postcss@8.4.37): + postcss-load-config@3.1.4(postcss@8.4.47): dependencies: lilconfig: 2.1.0 yaml: 1.10.2 optionalDependencies: - postcss: 8.4.37 + postcss: 8.4.47 optional: true - postcss-safe-parser@6.0.0(postcss@8.4.30): + postcss-safe-parser@6.0.0(postcss@8.4.41): dependencies: - postcss: 8.4.30 + postcss: 8.4.41 - postcss-scss@4.0.8(postcss@8.4.30): + postcss-scss@4.0.9(postcss@8.4.41): dependencies: - postcss: 8.4.30 + postcss: 8.4.41 - postcss-selector-parser@6.0.13: + postcss-selector-parser@6.0.16: dependencies: cssesc: 3.0.0 util-deprecate: 1.0.2 - postcss-selector-parser@6.0.16: + postcss-selector-parser@6.1.2: dependencies: cssesc: 3.0.0 util-deprecate: 1.0.2 postcss-value-parser@4.2.0: {} - postcss@8.4.30: - dependencies: - nanoid: 3.3.6 - picocolors: 1.0.0 - source-map-js: 1.0.2 - - postcss@8.4.35: + postcss@8.4.41: dependencies: nanoid: 3.3.7 - picocolors: 1.0.0 - source-map-js: 1.0.2 - - postcss@8.4.36: - dependencies: - nanoid: 3.3.7 - picocolors: 1.0.0 - source-map-js: 1.1.0 + picocolors: 1.0.1 + source-map-js: 1.2.0 - postcss@8.4.37: + postcss@8.4.47: dependencies: nanoid: 3.3.7 - picocolors: 1.0.0 - source-map-js: 1.2.0 + picocolors: 1.1.1 + source-map-js: 1.2.1 postgres-array@2.0.0: {} @@ -14925,79 +12185,21 @@ snapshots: postgres-range@1.1.3: {} - preact@10.7.0: {} - - prelude-ls@1.1.2: {} - prelude-ls@1.2.1: {} - pretty-format@29.7.0: - dependencies: - '@jest/schemas': 29.6.3 - ansi-styles: 5.2.0 - react-is: 18.2.0 - prism-svelte@0.4.7: {} prismjs@1.29.0: {} - proc-log@3.0.0: - optional: true - process-nextick-args@2.0.1: {} - progress@2.0.3: {} - - promise-breaker@5.0.0: {} - - promise-retry@2.0.1: - dependencies: - err-code: 2.0.3 - retry: 0.12.0 - optional: true - property-information@6.5.0: {} - proto-list@1.2.4: {} - - proto3-json-serializer@1.1.1: - dependencies: - protobufjs: 7.2.3 - proto3-json-serializer@2.0.0: dependencies: protobufjs: 7.2.5 optional: true - protobufjs-cli@1.1.1(protobufjs@7.2.3): - dependencies: - chalk: 4.1.2 - escodegen: 1.14.3 - espree: 9.6.1 - estraverse: 5.3.0 - glob: 8.1.0 - jsdoc: 4.0.2 - minimist: 1.2.8 - protobufjs: 7.2.3 - semver: 7.5.4 - tmp: 0.2.1 - uglify-js: 3.17.4 - - protobufjs@7.2.3: - dependencies: - '@protobufjs/aspromise': 1.1.2 - '@protobufjs/base64': 1.1.2 - '@protobufjs/codegen': 2.0.4 - '@protobufjs/eventemitter': 1.1.0 - '@protobufjs/fetch': 1.1.0 - '@protobufjs/float': 1.0.2 - '@protobufjs/inquire': 1.1.0 - '@protobufjs/path': 1.1.2 - '@protobufjs/pool': 1.1.0 - '@protobufjs/utf8': 1.1.0 - '@types/node': 18.18.0 - long: 5.2.3 - protobufjs@7.2.4: dependencies: '@protobufjs/aspromise': 1.1.2 @@ -15028,24 +12230,6 @@ snapshots: '@types/node': 18.18.0 long: 5.2.3 - proxy-addr@2.0.7: - dependencies: - forwarded: 0.2.0 - ipaddr.js: 1.9.1 - - proxy-agent@5.0.0: - dependencies: - agent-base: 6.0.2 - debug: 4.3.4 - http-proxy-agent: 4.0.1 - https-proxy-agent: 5.0.1 - lru-cache: 5.1.1 - pac-proxy-agent: 5.0.0 - proxy-from-env: 1.1.0 - socks-proxy-agent: 5.0.1 - transitivePeerDependencies: - - supports-color - proxy-from-env@1.1.0: {} ps-tree@1.2.0: @@ -15054,68 +12238,18 @@ snapshots: pseudomap@1.0.2: {} - psl@1.8.0: {} - - pump@3.0.0: - dependencies: - end-of-stream: 1.4.4 - once: 1.4.0 - - punycode@1.4.1: {} - - punycode@2.1.1: {} - punycode@2.3.0: {} - pupa@2.1.1: - dependencies: - escape-goat: 2.1.1 - - qs@6.11.0: - dependencies: - side-channel: 1.0.4 - - qs@6.5.3: {} - - qs@6.9.7: {} - querystringify@2.2.0: {} queue-microtask@1.2.3: {} quickselect@2.0.0: {} - range-parser@1.2.1: {} - - raw-body@2.5.1: - dependencies: - bytes: 3.1.2 - http-errors: 2.0.0 - iconv-lite: 0.4.24 - unpipe: 1.0.0 - rbush@3.0.1: dependencies: quickselect: 2.0.0 - rc@1.2.8: - dependencies: - deep-extend: 0.6.0 - ini: 1.3.8 - minimist: 1.2.8 - strip-json-comments: 2.0.1 - - re2@1.20.10: - dependencies: - install-artifact-from-github: 1.3.5 - nan: 2.18.0 - node-gyp: 10.0.1 - transitivePeerDependencies: - - supports-color - optional: true - - react-is@18.2.0: {} - read-cmd-shim@4.0.0: {} read-pkg-up@7.0.1: @@ -15131,13 +12265,6 @@ snapshots: parse-json: 5.2.0 type-fest: 0.6.0 - readable-stream@1.1.14: - dependencies: - core-util-is: 1.0.3 - inherits: 2.0.4 - isarray: 0.0.1 - string_decoder: 0.10.31 - readable-stream@2.3.7: dependencies: core-util-is: 1.0.3 @@ -15148,21 +12275,12 @@ snapshots: string_decoder: 1.1.1 util-deprecate: 1.0.2 - readable-stream@3.6.0: - dependencies: - inherits: 2.0.4 - string_decoder: 1.3.0 - util-deprecate: 1.0.2 - readable-stream@3.6.2: dependencies: inherits: 2.0.4 string_decoder: 1.3.0 util-deprecate: 1.0.2 - - readdir-glob@1.1.1: - dependencies: - minimatch: 3.1.2 + optional: true readdirp@3.6.0: dependencies: @@ -15170,12 +12288,17 @@ snapshots: recordrtc@5.6.2: {} - redeyed@2.1.1: + refa@0.12.1: dependencies: - esprima: 4.0.1 + '@eslint-community/regexpp': 4.10.0 regenerator-runtime@0.13.11: {} + regexp-ast-analysis@0.7.1: + dependencies: + '@eslint-community/regexpp': 4.10.0 + refa: 0.12.1 + regexp-tree@0.1.27: {} regexp.prototype.flags@1.4.3: @@ -15184,14 +12307,6 @@ snapshots: define-properties: 1.1.4 functions-have-names: 1.2.3 - registry-auth-token@5.0.2: - dependencies: - '@pnpm/npm-conf': 2.2.0 - - registry-url@5.1.0: - dependencies: - rc: 1.2.8 - regjsparser@0.10.0: dependencies: jsesc: 0.5.0 @@ -15279,39 +12394,10 @@ snapshots: mdast-util-toc: 6.1.1 unified: 10.1.2 - request@2.88.2: - dependencies: - aws-sign2: 0.7.0 - aws4: 1.11.0 - caseless: 0.12.0 - combined-stream: 1.0.8 - extend: 3.0.2 - forever-agent: 0.6.1 - form-data: 2.3.3 - har-validator: 5.1.5 - http-signature: 1.2.0 - is-typedarray: 1.0.0 - isstream: 0.1.2 - json-stringify-safe: 5.0.1 - mime-types: 2.1.35 - oauth-sign: 0.9.0 - performance-now: 2.1.0 - qs: 6.5.3 - safe-buffer: 5.2.1 - tough-cookie: 2.5.0 - tunnel-agent: 0.6.0 - uuid: 3.4.0 - require-directory@2.1.1: {} - require-from-string@2.0.2: {} - requires-port@1.0.0: {} - requizzle@0.2.4: - dependencies: - lodash: 4.17.21 - resolve-from@4.0.0: {} resolve-pkg-maps@1.0.0: {} @@ -15322,17 +12408,10 @@ snapshots: path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 - restore-cursor@3.1.0: - dependencies: - onetime: 5.1.2 - signal-exit: 3.0.7 - - retry-request@5.0.2: - dependencies: - debug: 4.3.4 - extend: 3.0.2 - transitivePeerDependencies: - - supports-color + restore-cursor@5.1.0: + dependencies: + onetime: 7.0.0 + signal-exit: 4.1.0 retry-request@7.0.1(encoding@0.1.13): dependencies: @@ -15345,77 +12424,63 @@ snapshots: - supports-color optional: true - retry@0.12.0: + retry@0.13.1: optional: true - retry@0.13.1: {} - reusify@1.0.4: {} - rfdc@1.3.0: {} + rfdc@1.4.1: {} rimraf@2.7.1: dependencies: glob: 7.2.3 - rimraf@3.0.2: - dependencies: - glob: 7.2.3 - robust-predicates@2.0.4: {} - rollup@4.12.0: + rollup@4.21.1: dependencies: '@types/estree': 1.0.5 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.12.0 - '@rollup/rollup-android-arm64': 4.12.0 - '@rollup/rollup-darwin-arm64': 4.12.0 - '@rollup/rollup-darwin-x64': 4.12.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.12.0 - '@rollup/rollup-linux-arm64-gnu': 4.12.0 - '@rollup/rollup-linux-arm64-musl': 4.12.0 - '@rollup/rollup-linux-riscv64-gnu': 4.12.0 - '@rollup/rollup-linux-x64-gnu': 4.12.0 - '@rollup/rollup-linux-x64-musl': 4.12.0 - '@rollup/rollup-win32-arm64-msvc': 4.12.0 - '@rollup/rollup-win32-ia32-msvc': 4.12.0 - '@rollup/rollup-win32-x64-msvc': 4.12.0 + '@rollup/rollup-android-arm-eabi': 4.21.1 + '@rollup/rollup-android-arm64': 4.21.1 + '@rollup/rollup-darwin-arm64': 4.21.1 + '@rollup/rollup-darwin-x64': 4.21.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.21.1 + '@rollup/rollup-linux-arm-musleabihf': 4.21.1 + '@rollup/rollup-linux-arm64-gnu': 4.21.1 + '@rollup/rollup-linux-arm64-musl': 4.21.1 + '@rollup/rollup-linux-powerpc64le-gnu': 4.21.1 + '@rollup/rollup-linux-riscv64-gnu': 4.21.1 + '@rollup/rollup-linux-s390x-gnu': 4.21.1 + '@rollup/rollup-linux-x64-gnu': 4.21.1 + '@rollup/rollup-linux-x64-musl': 4.21.1 + '@rollup/rollup-win32-arm64-msvc': 4.21.1 + '@rollup/rollup-win32-ia32-msvc': 4.21.1 + '@rollup/rollup-win32-x64-msvc': 4.21.1 fsevents: 2.3.3 - rollup@4.13.0: + rollup@4.24.0: dependencies: - '@types/estree': 1.0.5 + '@types/estree': 1.0.6 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.13.0 - '@rollup/rollup-android-arm64': 4.13.0 - '@rollup/rollup-darwin-arm64': 4.13.0 - '@rollup/rollup-darwin-x64': 4.13.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.13.0 - '@rollup/rollup-linux-arm64-gnu': 4.13.0 - '@rollup/rollup-linux-arm64-musl': 4.13.0 - '@rollup/rollup-linux-riscv64-gnu': 4.13.0 - '@rollup/rollup-linux-x64-gnu': 4.13.0 - '@rollup/rollup-linux-x64-musl': 4.13.0 - '@rollup/rollup-win32-arm64-msvc': 4.13.0 - '@rollup/rollup-win32-ia32-msvc': 4.13.0 - '@rollup/rollup-win32-x64-msvc': 4.13.0 + '@rollup/rollup-android-arm-eabi': 4.24.0 + '@rollup/rollup-android-arm64': 4.24.0 + '@rollup/rollup-darwin-arm64': 4.24.0 + '@rollup/rollup-darwin-x64': 4.24.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.24.0 + '@rollup/rollup-linux-arm-musleabihf': 4.24.0 + '@rollup/rollup-linux-arm64-gnu': 4.24.0 + '@rollup/rollup-linux-arm64-musl': 4.24.0 + '@rollup/rollup-linux-powerpc64le-gnu': 4.24.0 + '@rollup/rollup-linux-riscv64-gnu': 4.24.0 + '@rollup/rollup-linux-s390x-gnu': 4.24.0 + '@rollup/rollup-linux-x64-gnu': 4.24.0 + '@rollup/rollup-linux-x64-musl': 4.24.0 + '@rollup/rollup-win32-arm64-msvc': 4.24.0 + '@rollup/rollup-win32-ia32-msvc': 4.24.0 + '@rollup/rollup-win32-x64-msvc': 4.24.0 fsevents: 2.3.3 - router@1.3.7: - dependencies: - array-flatten: 3.0.0 - debug: 2.6.9 - methods: 1.1.2 - parseurl: 1.3.3 - path-to-regexp: 0.1.7 - setprototypeof: 1.2.0 - utils-merge: 1.0.1 - transitivePeerDependencies: - - supports-color - - run-async@2.4.1: {} - run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 @@ -15434,8 +12499,6 @@ snapshots: safe-buffer@5.2.1: {} - safe-stable-stringify@2.3.1: {} - safer-buffer@2.1.2: {} sander@0.5.1: @@ -15459,16 +12522,14 @@ snapshots: postcss-value-parser: 4.2.0 yoga-layout-prebuilt: 1.10.0 - search-insights@2.2.1: {} - - semver-diff@3.1.1: + scslre@0.3.0: dependencies: - semver: 6.3.1 + '@eslint-community/regexpp': 4.10.0 + refa: 0.12.1 + regexp-ast-analysis: 0.7.1 semver@5.7.1: {} - semver@6.3.0: {} - semver@6.3.1: {} semver@7.5.4: @@ -15479,49 +12540,16 @@ snapshots: dependencies: lru-cache: 6.0.0 - send@0.18.0: - dependencies: - debug: 2.6.9 - depd: 2.0.0 - destroy: 1.2.0 - encodeurl: 1.0.2 - escape-html: 1.0.3 - etag: 1.8.1 - fresh: 0.5.2 - http-errors: 2.0.0 - mime: 1.6.0 - ms: 2.1.3 - on-finished: 2.4.1 - range-parser: 1.2.1 - statuses: 2.0.1 - transitivePeerDependencies: - - supports-color - - serve-static@1.15.0: - dependencies: - encodeurl: 1.0.2 - escape-html: 1.0.3 - parseurl: 1.3.3 - send: 0.18.0 - transitivePeerDependencies: - - supports-color + semver@7.6.3: {} set-cookie-parser@2.6.0: {} set-immediate-shim@1.0.1: {} - setprototypeof@1.2.0: {} - - shebang-command@1.2.0: - dependencies: - shebang-regex: 1.0.0 - shebang-command@2.0.0: dependencies: shebang-regex: 3.0.0 - shebang-regex@1.0.0: {} - shebang-regex@3.0.0: {} shiki-twoslash@3.1.2(typescript@5.1.6): @@ -15540,27 +12568,17 @@ snapshots: vscode-oniguruma: 1.7.0 vscode-textmate: 5.2.0 - side-channel@1.0.4: - dependencies: - call-bind: 1.0.2 - get-intrinsic: 1.2.1 - object-inspect: 1.12.3 - siginfo@2.0.0: {} signal-exit@3.0.7: {} signal-exit@4.1.0: {} - simple-git-hooks@2.11.0: {} - - simple-swizzle@0.2.2: - dependencies: - is-arrayish: 0.3.2 + simple-git-hooks@2.11.1: {} sirv@2.0.4: dependencies: - '@polka/url': 1.0.0-next.24 + '@polka/url': 1.0.0-next.28 mrmime: 2.0.0 totalist: 3.0.1 @@ -15570,29 +12588,22 @@ snapshots: slash@3.0.0: {} - slice-ansi@3.0.0: - dependencies: - ansi-styles: 4.3.0 - astral-regex: 2.0.0 - is-fullwidth-code-point: 3.0.0 - - slice-ansi@4.0.0: - dependencies: - ansi-styles: 4.3.0 - astral-regex: 2.0.0 - is-fullwidth-code-point: 3.0.0 + slashes@3.0.12: {} slice-ansi@5.0.0: dependencies: ansi-styles: 6.2.1 is-fullwidth-code-point: 4.0.0 - smart-buffer@4.2.0: {} + slice-ansi@7.1.0: + dependencies: + ansi-styles: 6.2.1 + is-fullwidth-code-point: 5.0.0 socket.io-client@4.6.1: dependencies: '@socket.io/component-emitter': 3.1.0 - debug: 4.3.4 + debug: 4.3.7 engine.io-client: 6.4.0 socket.io-parser: 4.2.3 transitivePeerDependencies: @@ -15603,31 +12614,9 @@ snapshots: socket.io-parser@4.2.3: dependencies: '@socket.io/component-emitter': 3.1.0 - debug: 4.3.4 - transitivePeerDependencies: - - supports-color - - socks-proxy-agent@5.0.1: - dependencies: - agent-base: 6.0.2 - debug: 4.3.4 - socks: 2.7.1 - transitivePeerDependencies: - - supports-color - - socks-proxy-agent@8.0.2: - dependencies: - agent-base: 7.1.0 - debug: 4.3.4 - socks: 2.7.1 + debug: 4.3.7 transitivePeerDependencies: - supports-color - optional: true - - socks@2.7.1: - dependencies: - ip: 2.0.0 - smart-buffer: 4.2.0 sorcery@0.11.0: dependencies: @@ -15638,12 +12627,9 @@ snapshots: source-map-js@1.0.2: {} - source-map-js@1.1.0: {} - source-map-js@1.2.0: {} - source-map@0.6.1: - optional: true + source-map-js@1.2.1: {} space-separated-tokens@2.0.2: {} @@ -15674,46 +12660,23 @@ snapshots: dependencies: through: 2.3.8 - sprintf-js@1.0.3: {} - - sshpk@1.17.0: - dependencies: - asn1: 0.2.6 - assert-plus: 1.0.0 - bcrypt-pbkdf: 1.0.2 - dashdash: 1.14.1 - ecc-jsbn: 0.1.2 - getpass: 0.1.7 - jsbn: 0.1.1 - safer-buffer: 2.1.2 - tweetnacl: 0.14.5 - - ssri@10.0.5: - dependencies: - minipass: 7.0.4 - optional: true - - stack-trace@0.0.10: {} + stable-hash@0.0.4: {} stackback@0.0.2: {} - start-server-and-test@2.0.3: + start-server-and-test@2.0.5: dependencies: arg: 5.0.2 bluebird: 3.7.2 check-more-types: 2.24.0 - debug: 4.3.4 + debug: 4.3.6 execa: 5.1.1 lazy-ass: 1.6.0 ps-tree: 1.2.0 - wait-on: 7.2.0(debug@4.3.4) + wait-on: 7.2.0(debug@4.3.6) transitivePeerDependencies: - supports-color - statuses@1.5.0: {} - - statuses@2.0.1: {} - std-env@3.7.0: {} stdopt@2.2.0: @@ -15731,15 +12694,12 @@ snapshots: stubs: 3.0.0 optional: true - stream-json@1.7.4: - dependencies: - stream-chain: 2.2.5 - stream-json@1.8.0: dependencies: stream-chain: 2.2.5 - stream-shift@1.0.2: {} + stream-shift@1.0.2: + optional: true stream-shift@1.0.3: optional: true @@ -15752,16 +12712,14 @@ snapshots: is-fullwidth-code-point: 3.0.0 strip-ansi: 6.0.1 - string-width@5.1.2: + string-width@7.2.0: dependencies: - eastasianwidth: 0.2.0 - emoji-regex: 9.2.2 + emoji-regex: 10.4.0 + get-east-asian-width: 1.2.0 strip-ansi: 7.1.0 string.prototype.codepointat@0.2.1: {} - string_decoder@0.10.31: {} - string_decoder@1.1.1: dependencies: safe-buffer: 5.1.2 @@ -15769,6 +12727,7 @@ snapshots: string_decoder@1.3.0: dependencies: safe-buffer: 5.2.1 + optional: true stringify-entities@4.0.4: dependencies: @@ -15795,14 +12754,8 @@ snapshots: dependencies: min-indent: 1.0.1 - strip-json-comments@2.0.1: {} - strip-json-comments@3.1.1: {} - strip-literal@2.0.0: - dependencies: - js-tokens: 8.0.3 - strnum@1.0.5: {} stubs@3.0.0: @@ -15819,32 +12772,6 @@ snapshots: transitivePeerDependencies: - supports-color - superstatic@9.0.3(encoding@0.1.13): - dependencies: - basic-auth-connect: 1.0.0 - commander: 10.0.1 - compression: 1.7.4 - connect: 3.7.0 - destroy: 1.2.0 - fast-url-parser: 1.1.3 - glob-slasher: 1.0.1 - is-url: 1.2.4 - join-path: 1.1.1 - lodash: 4.17.21 - mime-types: 2.1.35 - minimatch: 6.2.0 - morgan: 1.10.0 - on-finished: 2.4.1 - on-headers: 1.0.2 - path-to-regexp: 1.8.0 - router: 1.3.7 - update-notifier-cjs: 5.1.6(encoding@0.1.13) - optionalDependencies: - re2: 1.20.10 - transitivePeerDependencies: - - encoding - - supports-color - supports-color@5.5.0: dependencies: has-flag: 3.0.0 @@ -15853,14 +12780,9 @@ snapshots: dependencies: has-flag: 4.0.0 - supports-hyperlinks@2.3.0: - dependencies: - has-flag: 4.0.0 - supports-color: 7.2.0 - supports-preserve-symlinks-flag@1.0.0: {} - svelte-check@3.6.8(@babel/core@7.23.9)(postcss-load-config@3.1.4(postcss@8.4.37))(postcss@8.4.37)(svelte@4.2.12): + svelte-check@3.6.8(@babel/core@7.23.9)(postcss-load-config@3.1.4(postcss@8.4.47))(postcss@8.4.47)(svelte@4.2.12): dependencies: '@jridgewell/trace-mapping': 0.3.25 chokidar: 3.6.0 @@ -15869,7 +12791,7 @@ snapshots: picocolors: 1.0.0 sade: 1.8.1 svelte: 4.2.12 - svelte-preprocess: 5.1.3(@babel/core@7.23.9)(postcss-load-config@3.1.4(postcss@8.4.37))(postcss@8.4.37)(svelte@4.2.12)(typescript@5.1.6) + svelte-preprocess: 5.1.3(@babel/core@7.23.9)(postcss-load-config@3.1.4(postcss@8.4.47))(postcss@8.4.47)(svelte@4.2.12)(typescript@5.1.6) typescript: 5.1.6 transitivePeerDependencies: - '@babel/core' @@ -15882,13 +12804,13 @@ snapshots: - stylus - sugarss - svelte-eslint-parser@0.33.0(svelte@4.2.12): + svelte-eslint-parser@0.41.0(svelte@4.2.12): dependencies: eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 - postcss: 8.4.30 - postcss-scss: 4.0.8(postcss@8.4.30) + postcss: 8.4.41 + postcss-scss: 4.0.9(postcss@8.4.41) optionalDependencies: svelte: 4.2.12 @@ -15896,7 +12818,7 @@ snapshots: dependencies: svelte: 4.2.12 - svelte-pieces@2.0.0-next.14(svelte@4.2.12): + svelte-pieces@2.0.0-next.16(svelte@4.2.12): dependencies: svelte: 4.2.12 @@ -15906,7 +12828,7 @@ snapshots: he: 1.2.0 svelte: 4.2.12 - svelte-preprocess@5.1.3(@babel/core@7.23.9)(postcss-load-config@3.1.4(postcss@8.4.37))(postcss@8.4.37)(svelte@4.2.12)(typescript@5.1.6): + svelte-preprocess@5.1.3(@babel/core@7.23.9)(postcss-load-config@3.1.4(postcss@8.4.47))(postcss@8.4.47)(svelte@4.2.12)(typescript@5.1.6): dependencies: '@types/pug': 2.0.10 detect-indent: 6.1.0 @@ -15916,8 +12838,8 @@ snapshots: svelte: 4.2.12 optionalDependencies: '@babel/core': 7.23.9 - postcss: 8.4.37 - postcss-load-config: 3.1.4(postcss@8.4.37) + postcss: 8.4.47 + postcss-load-config: 3.1.4(postcss@8.4.47) typescript: 5.1.6 svelte2tsx@0.6.27(svelte@4.2.12)(typescript@5.1.6): @@ -15944,11 +12866,33 @@ snapshots: magic-string: 0.30.7 periscopic: 3.1.0 + svelte@4.2.19: + dependencies: + '@ampproject/remapping': 2.3.0 + '@jridgewell/sourcemap-codec': 1.5.0 + '@jridgewell/trace-mapping': 0.3.25 + '@types/estree': 1.0.6 + acorn: 8.13.0 + aria-query: 5.3.2 + axobject-query: 4.1.0 + code-red: 1.0.4 + css-tree: 2.3.1 + estree-walker: 3.0.3 + is-reference: 3.0.2 + locate-character: 3.0.0 + magic-string: 0.30.12 + periscopic: 3.1.0 + sveltefirets@0.0.42(firebase@10.9.0)(svelte@4.2.12): dependencies: firebase: 10.9.0 svelte: 4.2.12 + sveltefirets@0.0.42(firebase@10.9.0)(svelte@4.2.19): + dependencies: + firebase: 10.9.0 + svelte: 4.2.19 + sweepline-intersections@1.5.0: dependencies: tinyqueue: 2.0.3 @@ -15957,22 +12901,12 @@ snapshots: dependencies: tslib: 2.6.2 - tar-stream@2.2.0: + synckit@0.9.1: dependencies: - bl: 4.1.0 - end-of-stream: 1.4.4 - fs-constants: 1.0.0 - inherits: 2.0.4 - readable-stream: 3.6.2 + '@pkgr/core': 0.1.1 + tslib: 2.6.2 - tar@6.1.11: - dependencies: - chownr: 2.0.0 - fs-minipass: 2.1.0 - minipass: 3.3.6 - minizlib: 2.1.2 - mkdirp: 1.0.4 - yallist: 4.0.0 + tapable@2.2.1: {} tar@6.2.0: dependencies: @@ -15983,13 +12917,6 @@ snapshots: mkdirp: 1.0.4 yallist: 4.0.0 - tcp-port-used@1.0.2: - dependencies: - debug: 4.3.1 - is2: 2.0.7 - transitivePeerDependencies: - - supports-color - teeny-request@9.0.0(encoding@0.1.13): dependencies: http-proxy-agent: 5.0.0 @@ -16004,8 +12931,6 @@ snapshots: text-decoding@1.0.0: {} - text-hex@1.0.0: {} - text-table@0.2.0: {} through@2.3.8: {} @@ -16015,21 +12940,24 @@ snapshots: globalyzer: 0.1.0 globrex: 0.1.2 - tinybench@2.6.0: {} - - tinypool@0.8.2: {} + tinybench@2.9.0: {} - tinyqueue@2.0.3: {} + tinyexec@0.3.0: {} - tinyspy@2.2.1: {} + tinyexec@0.3.1: {} - tmp@0.0.33: + tinyglobby@0.2.9: dependencies: - os-tmpdir: 1.0.2 + fdir: 6.4.2(picomatch@4.0.2) + picomatch: 4.0.2 - tmp@0.2.1: - dependencies: - rimraf: 3.0.2 + tinypool@1.0.1: {} + + tinyqueue@2.0.3: {} + + tinyrainbow@1.2.0: {} + + tinyspy@3.0.2: {} to-fast-properties@2.0.0: {} @@ -16037,9 +12965,7 @@ snapshots: dependencies: is-number: 7.0.0 - toidentifier@1.0.1: {} - - toml-eslint-parser@0.9.3: + toml-eslint-parser@0.10.0: dependencies: eslint-visitor-keys: 3.4.3 @@ -16053,28 +12979,17 @@ snapshots: totalist@3.0.1: {} - tough-cookie@2.5.0: - dependencies: - psl: 1.8.0 - punycode: 2.1.1 - - toxic@1.0.1: - dependencies: - lodash: 4.17.21 - tr46@0.0.3: {} trim-lines@3.0.1: {} - triple-beam@1.3.0: {} - trough@2.2.0: {} - ts-api-utils@1.0.3(typescript@5.1.6): + ts-api-utils@1.2.1(typescript@5.1.6): dependencies: typescript: 5.1.6 - ts-api-utils@1.2.1(typescript@5.1.6): + ts-api-utils@1.3.0(typescript@5.1.6): dependencies: typescript: 5.1.6 @@ -16084,58 +12999,31 @@ snapshots: tslib@2.6.2: {} - tsx@4.7.1: + tslib@2.7.0: {} + + tsx@4.19.0: dependencies: - esbuild: 0.19.12 - get-tsconfig: 4.7.2 + esbuild: 0.23.1 + get-tsconfig: 4.7.6 optionalDependencies: fsevents: 2.3.3 - tunnel-agent@0.6.0: - dependencies: - safe-buffer: 5.2.1 - - tweetnacl@0.14.5: {} - - type-check@0.3.2: - dependencies: - prelude-ls: 1.1.2 - type-check@0.4.0: dependencies: prelude-ls: 1.2.1 - type-detect@4.0.8: {} - type-fest@0.20.2: {} - type-fest@0.21.3: {} - type-fest@0.6.0: {} type-fest@0.8.1: {} - type-fest@3.13.1: {} - - type-fest@4.13.0: {} - - type-is@1.6.18: - dependencies: - media-typer: 0.3.0 - mime-types: 2.1.35 - - typedarray-to-buffer@3.1.5: - dependencies: - is-typedarray: 1.0.0 - typescript@5.1.6: {} - uc.micro@1.0.6: {} + typescript@5.6.2: {} ufo@1.4.0: {} - uglify-js@3.17.4: {} - ultrahtml@1.0.0: {} unconfig@0.3.11: @@ -16145,16 +13033,15 @@ snapshots: jiti: 1.21.0 mlly: 1.6.1 - underscore@1.13.6: {} - undici-types@5.26.5: {} + undici-types@6.19.8: + optional: true + undici@5.28.3: dependencies: '@fastify/busboy': 2.1.0 - unicorn-magic@0.1.0: {} - unified@10.1.2: dependencies: '@types/unist': 2.0.10 @@ -16165,20 +13052,6 @@ snapshots: trough: 2.2.0 vfile: 5.3.7 - unique-filename@3.0.0: - dependencies: - unique-slug: 4.0.0 - optional: true - - unique-slug@4.0.0: - dependencies: - imurmurhash: 0.1.4 - optional: true - - unique-string@2.0.0: - dependencies: - crypto-random-string: 2.0.0 - unist-util-generated@2.0.1: {} unist-util-is@3.0.0: {} @@ -16218,24 +13091,13 @@ snapshots: unist-util-is: 5.2.1 unist-util-visit-parents: 5.1.3 - universal-analytics@0.5.3: - dependencies: - debug: 4.3.4 - uuid: 8.3.2 - transitivePeerDependencies: - - supports-color - - universalify@0.1.2: {} - - universalify@2.0.0: {} - - unocss@0.58.5(postcss@8.4.37)(rollup@4.13.0)(vite@5.1.4(@types/node@20.11.0)): + unocss@0.58.5(postcss@8.4.47)(rollup@4.24.0)(vite@5.4.2(@types/node@22.5.1)): dependencies: - '@unocss/astro': 0.58.5(rollup@4.13.0)(vite@5.1.4(@types/node@20.11.0)) - '@unocss/cli': 0.58.5(rollup@4.13.0) + '@unocss/astro': 0.58.5(rollup@4.24.0)(vite@5.4.2(@types/node@22.5.1)) + '@unocss/cli': 0.58.5(rollup@4.24.0) '@unocss/core': 0.58.5 '@unocss/extractor-arbitrary-variants': 0.58.5 - '@unocss/postcss': 0.58.5(postcss@8.4.37) + '@unocss/postcss': 0.58.5(postcss@8.4.47) '@unocss/preset-attributify': 0.58.5 '@unocss/preset-icons': 0.58.5 '@unocss/preset-mini': 0.58.5 @@ -16250,49 +13112,30 @@ snapshots: '@unocss/transformer-compile-class': 0.58.5 '@unocss/transformer-directives': 0.58.5 '@unocss/transformer-variant-group': 0.58.5 - '@unocss/vite': 0.58.5(rollup@4.13.0)(vite@5.1.4(@types/node@20.11.0)) + '@unocss/vite': 0.58.5(rollup@4.24.0)(vite@5.4.2(@types/node@22.5.1)) optionalDependencies: - vite: 5.1.4(@types/node@20.11.0) + vite: 5.4.2(@types/node@22.5.1) transitivePeerDependencies: - postcss - rollup - supports-color - unpipe@1.0.0: {} - update-browserslist-db@1.0.13(browserslist@4.23.0): dependencies: browserslist: 4.23.0 escalade: 3.1.2 picocolors: 1.0.0 - update-notifier-cjs@5.1.6(encoding@0.1.13): + update-browserslist-db@1.1.0(browserslist@4.23.3): dependencies: - boxen: 5.1.2 - chalk: 4.1.2 - configstore: 5.0.1 - has-yarn: 2.1.0 - import-lazy: 2.1.0 - is-ci: 2.0.0 - is-installed-globally: 0.4.0 - is-npm: 5.0.0 - is-yarn-global: 0.3.0 - isomorphic-fetch: 3.0.0(encoding@0.1.13) - pupa: 2.1.1 - registry-auth-token: 5.0.2 - registry-url: 5.1.0 - semver: 7.5.4 - semver-diff: 3.1.1 - xdg-basedir: 4.0.0 - transitivePeerDependencies: - - encoding + browserslist: 4.23.3 + escalade: 3.1.2 + picocolors: 1.0.1 uri-js@4.4.1: dependencies: punycode: 2.3.0 - url-join@0.0.1: {} - url-parse@1.5.10: dependencies: querystringify: 2.2.0 @@ -16300,10 +13143,6 @@ snapshots: util-deprecate@1.0.2: {} - utils-merge@1.0.1: {} - - uuid@3.4.0: {} - uuid@8.3.2: {} uuid@9.0.1: {} @@ -16315,8 +13154,6 @@ snapshots: kleur: 4.1.5 sade: 1.8.1 - valid-url@1.0.9: {} - validate-npm-package-license@3.0.4: dependencies: spdx-correct: 3.2.0 @@ -16324,14 +13161,6 @@ snapshots: vanilla-colorful@0.7.2: {} - vary@1.1.2: {} - - verror@1.10.0: - dependencies: - assert-plus: 1.0.0 - core-util-is: 1.0.2 - extsprintf: 1.3.0 - vfile-location@4.1.0: dependencies: '@types/unist': 2.0.10 @@ -16354,161 +13183,149 @@ snapshots: unist-util-stringify-position: 3.0.3 vfile-message: 3.1.4 - vite-node@1.4.0(@types/node@18.11.18): + vite-node@2.1.3(@types/node@18.11.18): dependencies: cac: 6.7.14 - debug: 4.3.4 + debug: 4.3.7 pathe: 1.1.2 - picocolors: 1.0.0 - vite: 5.1.4(@types/node@18.11.18) + vite: 5.4.9(@types/node@18.11.18) transitivePeerDependencies: - '@types/node' - less - lightningcss - sass + - sass-embedded - stylus - sugarss - supports-color - terser - vite-node@1.4.0(@types/node@20.11.0): + vite-node@2.1.3(@types/node@22.5.1): dependencies: cac: 6.7.14 - debug: 4.3.4 + debug: 4.3.7 pathe: 1.1.2 - picocolors: 1.0.0 - vite: 5.1.4(@types/node@20.11.0) + vite: 5.4.9(@types/node@22.5.1) transitivePeerDependencies: - '@types/node' - less - lightningcss - sass + - sass-embedded - stylus - sugarss - supports-color - terser - vite@5.1.4(@types/node@18.11.18): - dependencies: - esbuild: 0.19.12 - postcss: 8.4.35 - rollup: 4.12.0 - optionalDependencies: - '@types/node': 18.11.18 - fsevents: 2.3.3 - - vite@5.1.4(@types/node@20.11.0): + vite@5.4.2(@types/node@22.5.1): dependencies: - esbuild: 0.19.12 - postcss: 8.4.35 - rollup: 4.12.0 + esbuild: 0.21.5 + postcss: 8.4.41 + rollup: 4.21.1 optionalDependencies: - '@types/node': 20.11.0 + '@types/node': 22.5.1 fsevents: 2.3.3 - vite@5.1.6(@types/node@18.11.18): + vite@5.4.9(@types/node@18.11.18): dependencies: - esbuild: 0.19.12 - postcss: 8.4.36 - rollup: 4.13.0 + esbuild: 0.21.5 + postcss: 8.4.47 + rollup: 4.24.0 optionalDependencies: '@types/node': 18.11.18 fsevents: 2.3.3 - vite@5.1.6(@types/node@20.11.0): + vite@5.4.9(@types/node@22.5.1): dependencies: - esbuild: 0.19.12 - postcss: 8.4.36 - rollup: 4.13.0 + esbuild: 0.21.5 + postcss: 8.4.47 + rollup: 4.24.0 optionalDependencies: - '@types/node': 20.11.0 + '@types/node': 22.5.1 fsevents: 2.3.3 - vitefu@0.2.5(vite@5.1.4(@types/node@20.11.0)): + vitefu@0.2.5(vite@5.4.2(@types/node@22.5.1)): optionalDependencies: - vite: 5.1.4(@types/node@20.11.0) - - vitest@1.4.0(@types/node@18.11.18)(@vitest/ui@1.4.0): - dependencies: - '@vitest/expect': 1.4.0 - '@vitest/runner': 1.4.0 - '@vitest/snapshot': 1.4.0 - '@vitest/spy': 1.4.0 - '@vitest/utils': 1.4.0 - acorn-walk: 8.3.2 - chai: 4.4.1 - debug: 4.3.4 - execa: 8.0.1 - local-pkg: 0.5.0 - magic-string: 0.30.8 + vite: 5.4.2(@types/node@22.5.1) + + vitest@2.1.3(@types/node@18.11.18)(@vitest/ui@2.1.3): + dependencies: + '@vitest/expect': 2.1.3 + '@vitest/mocker': 2.1.3(@vitest/spy@2.1.3)(vite@5.4.9(@types/node@18.11.18)) + '@vitest/pretty-format': 2.1.3 + '@vitest/runner': 2.1.3 + '@vitest/snapshot': 2.1.3 + '@vitest/spy': 2.1.3 + '@vitest/utils': 2.1.3 + chai: 5.1.1 + debug: 4.3.7 + magic-string: 0.30.12 pathe: 1.1.2 - picocolors: 1.0.0 std-env: 3.7.0 - strip-literal: 2.0.0 - tinybench: 2.6.0 - tinypool: 0.8.2 - vite: 5.1.6(@types/node@18.11.18) - vite-node: 1.4.0(@types/node@18.11.18) - why-is-node-running: 2.2.2 + tinybench: 2.9.0 + tinyexec: 0.3.1 + tinypool: 1.0.1 + tinyrainbow: 1.2.0 + vite: 5.4.9(@types/node@18.11.18) + vite-node: 2.1.3(@types/node@18.11.18) + why-is-node-running: 2.3.0 optionalDependencies: '@types/node': 18.11.18 - '@vitest/ui': 1.4.0(vitest@1.4.0) + '@vitest/ui': 2.1.3(vitest@2.1.3) transitivePeerDependencies: - less - lightningcss + - msw - sass + - sass-embedded - stylus - sugarss - supports-color - terser - vitest@1.4.0(@types/node@20.11.0)(@vitest/ui@1.4.0): - dependencies: - '@vitest/expect': 1.4.0 - '@vitest/runner': 1.4.0 - '@vitest/snapshot': 1.4.0 - '@vitest/spy': 1.4.0 - '@vitest/utils': 1.4.0 - acorn-walk: 8.3.2 - chai: 4.4.1 - debug: 4.3.4 - execa: 8.0.1 - local-pkg: 0.5.0 - magic-string: 0.30.8 + vitest@2.1.3(@types/node@22.5.1)(@vitest/ui@2.1.3): + dependencies: + '@vitest/expect': 2.1.3 + '@vitest/mocker': 2.1.3(@vitest/spy@2.1.3)(vite@5.4.9(@types/node@22.5.1)) + '@vitest/pretty-format': 2.1.3 + '@vitest/runner': 2.1.3 + '@vitest/snapshot': 2.1.3 + '@vitest/spy': 2.1.3 + '@vitest/utils': 2.1.3 + chai: 5.1.1 + debug: 4.3.7 + magic-string: 0.30.12 pathe: 1.1.2 - picocolors: 1.0.0 std-env: 3.7.0 - strip-literal: 2.0.0 - tinybench: 2.6.0 - tinypool: 0.8.2 - vite: 5.1.6(@types/node@20.11.0) - vite-node: 1.4.0(@types/node@20.11.0) - why-is-node-running: 2.2.2 + tinybench: 2.9.0 + tinyexec: 0.3.1 + tinypool: 1.0.1 + tinyrainbow: 1.2.0 + vite: 5.4.9(@types/node@22.5.1) + vite-node: 2.1.3(@types/node@22.5.1) + why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 20.11.0 - '@vitest/ui': 1.4.0(vitest@1.4.0) + '@types/node': 22.5.1 + '@vitest/ui': 2.1.3(vitest@2.1.3) transitivePeerDependencies: - less - lightningcss + - msw - sass + - sass-embedded - stylus - sugarss - supports-color - terser - vm2@3.9.9: - dependencies: - acorn: 8.10.0 - acorn-walk: 8.3.2 - vscode-oniguruma@1.7.0: {} vscode-textmate@5.2.0: {} - vue-eslint-parser@9.4.2(eslint@8.56.0): + vue-eslint-parser@9.4.3(eslint@9.9.1(jiti@1.21.6)): dependencies: debug: 4.3.4 - eslint: 8.56.0 + eslint: 9.9.1(jiti@1.21.6) eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 @@ -16520,9 +13337,9 @@ snapshots: w3c-keyname@2.2.8: {} - wait-on@7.2.0(debug@4.3.4): + wait-on@7.2.0(debug@4.3.6): dependencies: - axios: 1.6.7(debug@4.3.4) + axios: 1.6.7(debug@4.3.6) joi: 17.12.2 lodash: 4.17.21 minimist: 1.2.8 @@ -16532,10 +13349,6 @@ snapshots: wavesurfer.js@5.2.0: {} - wcwidth@1.0.1: - dependencies: - defaults: 1.0.3 - web-namespaces@2.0.1: {} web-streams-polyfill@3.2.1: {} @@ -16552,105 +13365,47 @@ snapshots: websocket-extensions@0.1.4: {} - whatwg-fetch@3.6.2: {} - whatwg-url@5.0.0: dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 - which@1.3.1: - dependencies: - isexe: 2.0.0 - which@2.0.2: dependencies: isexe: 2.0.0 - which@4.0.0: - dependencies: - isexe: 3.1.1 - optional: true - - why-is-node-running@2.2.2: + why-is-node-running@2.3.0: dependencies: siginfo: 2.0.0 stackback: 0.0.2 - widest-line@3.1.0: - dependencies: - string-width: 4.2.3 - - winston-transport@4.5.0: - dependencies: - logform: 2.4.0 - readable-stream: 3.6.0 - triple-beam: 1.3.0 - - winston@3.7.2: - dependencies: - '@dabh/diagnostics': 2.0.3 - async: 3.2.3 - is-stream: 2.0.1 - logform: 2.4.0 - one-time: 1.0.0 - readable-stream: 3.6.0 - safe-stable-stringify: 2.3.1 - stack-trace: 0.0.10 - triple-beam: 1.3.0 - winston-transport: 4.5.0 - - word-wrap@1.2.3: {} - - wrap-ansi@6.2.0: - dependencies: - ansi-styles: 4.3.0 - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi@7.0.0: dependencies: ansi-styles: 4.3.0 string-width: 4.2.3 strip-ansi: 6.0.1 - wrap-ansi@8.1.0: + wrap-ansi@9.0.0: dependencies: ansi-styles: 6.2.1 - string-width: 5.1.2 + string-width: 7.2.0 strip-ansi: 7.1.0 - optional: true wrappy@1.0.2: {} - write-file-atomic@3.0.3: - dependencies: - imurmurhash: 0.1.4 - is-typedarray: 1.0.0 - signal-exit: 3.0.7 - typedarray-to-buffer: 3.1.5 - write-file-atomic@5.0.1: dependencies: imurmurhash: 0.1.4 signal-exit: 4.1.0 - ws@7.5.7: {} - ws@8.11.0: {} ws@8.16.0: {} - xdg-basedir@4.0.0: {} - xml-name-validator@4.0.0: {} - xmlcreate@2.0.4: {} - xmlhttprequest-ssl@2.0.0: {} - xregexp@2.0.0: {} - xss@1.0.14: dependencies: commander: 2.20.3 @@ -16666,7 +13421,7 @@ snapshots: yallist@4.0.0: {} - yaml-eslint-parser@1.2.2: + yaml-eslint-parser@1.2.3: dependencies: eslint-visitor-keys: 3.4.3 lodash: 4.17.21 @@ -16676,12 +13431,14 @@ snapshots: yaml@2.3.1: {} + yaml@2.5.0: {} + yargs-parser@21.1.1: {} yargs@17.7.2: dependencies: cliui: 8.0.1 - escalade: 3.1.1 + escalade: 3.1.2 get-caller-file: 2.0.5 require-directory: 2.1.1 string-width: 4.2.3 @@ -16690,16 +13447,8 @@ snapshots: yocto-queue@0.1.0: {} - yocto-queue@1.0.0: {} - yoga-layout-prebuilt@1.10.0: dependencies: '@types/yoga-layout': 1.9.2 - zip-stream@4.1.0: - dependencies: - archiver-utils: 2.1.0 - compress-commons: 4.1.1 - readable-stream: 3.6.2 - zwitch@2.0.4: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 292fffde9..f343599e7 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,4 +1,5 @@ packages: - - "packages/*" - - "e2e" - - "!packages/ids-import" \ No newline at end of file + - 'packages/*' + - e2e + - '!packages/ids-import' + - '!packages/functions' diff --git a/supabase/clear-db-data.sql b/supabase/clear-db-data.sql deleted file mode 100644 index fcf0f829b..000000000 --- a/supabase/clear-db-data.sql +++ /dev/null @@ -1 +0,0 @@ -TRUNCATE TABLE auth.users cascade; diff --git a/supabase/config.toml b/supabase/config.toml index 59190ad5d..7dc6d17bb 100644 --- a/supabase/config.toml +++ b/supabase/config.toml @@ -6,9 +6,16 @@ enabled = true # Port to use for the API URL. port = 54321 # Schemas to expose in your API. Tables, views and stored procedures in this schema will get API endpoints. public and storage are always included. -schemas = ["public", "storage", "graphql_public"] +schemas = [ + "public", + "storage", + "graphql_public" +] # Extra schemas to add to the search_path of every request. public is always included. -extra_search_path = ["public", "extensions"] +extra_search_path = [ + "public", + "extensions" +] # The maximum number of rows returns from a view, table, or stored procedure. Limits payload size for accidental or malicious requests. max_rows = 1000 @@ -32,10 +39,21 @@ default_pool_size = 20 # Maximum number of client connections allowed. max_client_conn = 100 +[db.seed] +# If enabled, seeds the database after migrations during a db reset. +enabled = true +# Specifies an ordered list of seed files to load during db reset. +# Supports glob patterns relative to supabase directory. For example: +# sql_paths = ['./seeds/*.sql', '../project-src/seeds/*-load-testing.sql'] +sql_paths = [ './seed.sql' ] +# sql_paths = [ './seeds/*.sql' ] + [realtime] enabled = true # Bind realtime via either IPv4 or IPv6. (default: IPv6) # ip_version = "IPv6" +# The maximum length in bytes of HTTP request headers. (default: 4096) +# max_header_length = 4096 [studio] enabled = true @@ -43,10 +61,12 @@ enabled = true port = 54323 # External URL of the API server that frontend connects to. api_url = "http://127.0.0.1" +# OpenAI API Key to use for Supabase AI in the Supabase Studio. +openai_api_key = "env(OPENAI_API_KEY)" # Email testing server. Emails sent with the local dev setup are not actually sent - rather, they are monitored, and you can view the emails that would have been sent from the web interface. [inbucket] -enabled = true +enabled = false # Port to use for the email testing server web interface. port = 54324 # Uncomment to expose additional ports for testing user applications that send emails. @@ -54,16 +74,26 @@ port = 54324 # pop3_port = 54326 [storage] -enabled = true +enabled = false # The maximum file size allowed (e.g. "5MB", "500KB"). file_size_limit = "50MiB" +[storage.image_transformation] +enabled = false + +# Uncomment to configure local storage buckets +# [storage.buckets.images] +# public = false +# file_size_limit = "50MiB" +# allowed_mime_types = ["image/png", "image/jpeg"] +# objects_path = "./images" + [auth] enabled = true # The base URL of your website. Used as an allow-list for redirects and for constructing URLs used in emails. site_url = "http://127.0.0.1:3000" # A list of *exact* URLs that auth providers are permitted to redirect to post authentication. -additional_redirect_urls = ["https://127.0.0.1:3000"] +additional_redirect_urls = [ "https://127.0.0.1:3000" ] # How long tokens are valid for, in seconds. Defaults to 3600 (1 hour), maximum 604,800 (1 week). jwt_expiry = 3600 # If disabled, the refresh token will never expire. @@ -73,6 +103,10 @@ enable_refresh_token_rotation = true refresh_token_reuse_interval = 10 # Allow/disallow new user signups to your project. enable_signup = true +# Allow/disallow anonymous sign-ins to your project. +enable_anonymous_sign_ins = false +# Allow/disallow testing manual linking of accounts +enable_manual_linking = false [auth.email] # Allow/disallow new user signups via email to your project. @@ -81,6 +115,19 @@ enable_signup = true double_confirm_changes = true # If enabled, users need to confirm their email address before signing in. enable_confirmations = false +# If enabled, users will need to reauthenticate or have logged in recently to change their password. +secure_password_change = false +# Controls the minimum amount of time that must pass before sending another signup confirmation or password reset email. +max_frequency = "1s" + +# Use a production-ready SMTP server +# [auth.email.smtp] +# host = "smtp.sendgrid.net" +# port = 587 +# user = "apikey" +# pass = "env(SENDGRID_API_KEY)" +# admin_email = "admin@email.com" +# sender_name = "Admin" # Uncomment to customize email template # [auth.email.template.invite] @@ -89,14 +136,30 @@ enable_confirmations = false [auth.sms] # Allow/disallow new user signups via SMS to your project. -enable_signup = true +enable_signup = false # If enabled, users need to confirm their phone number before signing in. enable_confirmations = false +# Template for sending OTP to users +template = "Your code is {{ .Code }} ." +# Controls the minimum amount of time that must pass before sending another sms otp. +max_frequency = "5s" # Use pre-defined map of phone number to OTP for testing. [auth.sms.test_otp] # 4152127777 = "123456" +# Configure logged in session timeouts. +# [auth.sessions] +# Force log out after the specified duration. +# timebox = "24h" +# Force log out if the user has been inactive longer than the specified duration. +# inactivity_timeout = "8h" + +# This hook runs before a token is issued and allows you to add additional claims based on the authentication method used. +# [auth.hook.custom_access_token] +# enabled = true +# uri = "pg-functions:////" + # Configure one of the supported SMS providers: `twilio`, `twilio_verify`, `messagebird`, `textlocal`, `vonage`. [auth.sms.twilio] enabled = false @@ -105,8 +168,25 @@ message_service_sid = "" # DO NOT commit your Twilio auth token to git. Use environment variable substitution instead: auth_token = "env(SUPABASE_AUTH_SMS_TWILIO_AUTH_TOKEN)" +[auth.mfa] +# Control how many MFA factors can be enrolled at once per user. +max_enrolled_factors = 10 + +# Control use of MFA via App Authenticator (TOTP) +[auth.mfa.totp] +enroll_enabled = false +verify_enabled = false + +# Configure Multi-factor-authentication via Phone Messaging +# [auth.mfa.phone] +# enroll_enabled = true +# verify_enabled = true +# otp_length = 6 +# template = "Your code is {{ .Code }} ." +# max_frequency = "10s" + # Use an external OAuth provider. The full list of providers are: `apple`, `azure`, `bitbucket`, -# `discord`, `facebook`, `github`, `gitlab`, `google`, `keycloak`, `linkedin`, `notion`, `twitch`, +# `discord`, `facebook`, `github`, `gitlab`, `google`, `keycloak`, `linkedin_oidc`, `notion`, `twitch`, # `twitter`, `slack`, `spotify`, `workos`, `zoom`. [auth.external.apple] enabled = false @@ -118,10 +198,48 @@ redirect_uri = "" # Overrides the default auth provider URL. Used to support self-hosted gitlab, single-tenant Azure, # or any other third-party OIDC providers. url = "" +# If enabled, the nonce check will be skipped. Required for local sign in with Google auth. +skip_nonce_check = false + +# Use Firebase Auth as a third-party provider alongside Supabase Auth. +[auth.third_party.firebase] +enabled = false +# project_id = "my-firebase-project" + +# Use Auth0 as a third-party provider alongside Supabase Auth. +[auth.third_party.auth0] +enabled = false +# tenant = "my-auth0-tenant" +# tenant_region = "us" + +# Use AWS Cognito (Amplify) as a third-party provider alongside Supabase Auth. +[auth.third_party.aws_cognito] +enabled = false +# user_pool_id = "my-user-pool-id" +# user_pool_region = "us-east-1" + +[edge_runtime] +enabled = false +# Configure one of the supported request policies: `oneshot`, `per_worker`. +# Use `oneshot` for hot reload, or `per_worker` for load testing. +policy = "oneshot" +inspector_port = 8083 [analytics] enabled = false port = 54327 -vector_port = 54328 # Configure one of the supported backends: `postgres`, `bigquery`. backend = "postgres" + +# Experimental features may be deprecated any time +[experimental] +# Configures Postgres storage engine to use OrioleDB (S3) +orioledb_version = "" +# Configures S3 bucket URL, eg. .s3-.amazonaws.com +# s3_host = "env(S3_HOST)" +# Configures S3 bucket region, eg. us-east-1 +# s3_region = "env(S3_REGION)" +# Configures AWS_ACCESS_KEY_ID for S3 bucket +# s3_access_key = "env(S3_ACCESS_KEY)" +# Configures AWS_SECRET_ACCESS_KEY for S3 bucket +# s3_secret_key = "env(S3_SECRET_KEY)" diff --git a/supabase/ideas/construct-view.sql b/supabase/ideas/construct-view.sql new file mode 100644 index 000000000..b0e4a14eb --- /dev/null +++ b/supabase/ideas/construct-view.sql @@ -0,0 +1,281 @@ +CREATE TABLE dictionaries ( + id text unique primary key NOT NULL +); + +CREATE TABLE entries ( + id text unique primary key NOT NULL, + dictionary_id text NOT NULL REFERENCES dictionaries, + lexeme jsonb NOT NULL, + phonetic text, + interlinearization text, + morphology text, + notes jsonb, + sources text[], + scientific_names text[], + coordinates jsonb, + unsupported_fields jsonb, + elicitation_id text, + created_at timestamp with time zone DEFAULT now() NOT NULL, + updated_at timestamp with time zone DEFAULT now() NOT NULL, + deleted timestamp with time zone +); + +CREATE TABLE senses ( + id uuid unique primary key NOT NULL, + entry_id text NOT NULL REFERENCES entries, + "definition" jsonb, + glosses jsonb, + parts_of_speech text[], + semantic_domains text[], + write_in_semantic_domains text[], + noun_class character varying, + plural_form jsonb, + variant jsonb, + created_at timestamp with time zone DEFAULT now() NOT NULL, + updated_at timestamp with time zone DEFAULT now() NOT NULL, + deleted timestamp with time zone +); + +CREATE TABLE sentences ( + id uuid unique primary key NOT NULL, + dictionary_id text NOT NULL REFERENCES dictionaries, + "text" jsonb, + translation jsonb, + created_at timestamp with time zone DEFAULT now() NOT NULL, + updated_at timestamp with time zone DEFAULT now() NOT NULL, + deleted timestamp with time zone +); + +CREATE TABLE senses_in_sentences ( + sense_id uuid NOT NULL REFERENCES senses ON DELETE CASCADE, + sentence_id uuid NOT NULL REFERENCES sentences ON DELETE CASCADE, + created_at timestamp with time zone NOT NULL DEFAULT now(), + deleted timestamp with time zone, + PRIMARY KEY (sense_id, sentence_id) +); + +CREATE OR REPLACE VIEW entries_view AS +SELECT + entries.id AS id, + entries.dictionary_id AS dictionary_id, + entries.created_at, + entries.updated_at, + jsonb_strip_nulls( + jsonb_build_object( + 'lexeme', entries.lexeme, + 'phonetic', entries.phonetic, + 'interlinearization', entries.interlinearization, + 'morphology', entries.morphology, + 'notes', entries.notes, + 'sources', entries.sources, + 'scientific_names', entries.scientific_names, + 'coordinates', entries.coordinates, + 'unsupported_fields', entries.unsupported_fields, + 'elicitation_id', entries.elicitation_id + ) + ) AS main, + CASE + WHEN COUNT(senses.id) > 0 THEN jsonb_agg( + jsonb_strip_nulls( + jsonb_build_object( + 'id', senses.id, + 'glosses', senses.glosses, + 'parts_of_speech', senses.parts_of_speech, + 'semantic_domains', senses.semantic_domains, + 'write_in_semantic_domains', senses.write_in_semantic_domains, + 'noun_class', senses.noun_class, + 'definition', senses.definition, + 'plural_form', senses.plural_form, + 'variant', senses.variant, + 'sentences', aggregated_sentences.sentences, + 'photos', aggregated_photos.photos, + 'videos', aggregated_videos.videos + ) + ) + ORDER BY senses.created_at + ) + ELSE NULL + END AS senses, + CASE + WHEN COUNT(audio.id) > 0 THEN jsonb_agg( + jsonb_strip_nulls( + jsonb_build_object( + 'id', audio.id, + 'storage_path', audio.storage_path, + 'source', audio.source, + 'speaker_ids', audio_speakers.speaker_ids + ) + ) + ORDER BY audio.created_at + ) + ELSE NULL + END AS audios, + CASE + WHEN COUNT(entry_dialects.dialect_id) > 0 THEN jsonb_agg(entry_dialects.dialect_id) + ELSE NULL + END AS dialect_ids +FROM entries +LEFT JOIN senses ON senses.entry_id = entries.id AND senses.deleted IS NULL +LEFT JOIN audio ON audio.entry_id = entries.id AND audio.deleted IS NULL +LEFT JOIN ( + SELECT + audio_id, + jsonb_agg(speaker_id) AS speaker_ids + FROM audio_speakers + WHERE deleted IS NULL + GROUP BY audio_id +) AS audio_speakers ON audio_speakers.audio_id = audio.id +LEFT JOIN entry_dialects ON entry_dialects.entry_id = entries.id AND entry_dialects.deleted IS NULL +LEFT JOIN ( + SELECT + senses_in_sentences.sense_id, + jsonb_agg( + jsonb_strip_nulls( + jsonb_build_object( + 'id', sentences.id, + 'text', sentences.text, + 'translation', sentences.translation + ) + ) + ) AS sentences + FROM senses_in_sentences + JOIN sentences ON sentences.id = senses_in_sentences.sentence_id + WHERE sentences.deleted IS NULL AND senses_in_sentences.deleted IS NULL + GROUP BY senses_in_sentences.sense_id +) AS aggregated_sentences ON aggregated_sentences.sense_id = senses.id +LEFT JOIN ( + SELECT + sense_photos.sense_id, + jsonb_agg( + jsonb_strip_nulls( + jsonb_build_object( + 'id', photos.id, + 'serving_url', photos.serving_url, + 'source', photos.source, + 'photographer', photos.photographer + ) + ) + ) AS photos + FROM sense_photos + JOIN photos ON photos.id = sense_photos.photo_id + WHERE photos.deleted IS NULL AND sense_photos.deleted IS NULL + GROUP BY sense_photos.sense_id +) AS aggregated_photos ON aggregated_photos.sense_id = senses.id +LEFT JOIN ( + SELECT + sense_videos.sense_id, + jsonb_agg( + jsonb_strip_nulls( + jsonb_build_object( + 'id', videos.id, + 'storage_path', videos.storage_path, + 'source', videos.source, + 'videographer', videos.videographer, + 'hosted_elsewhere', videos.hosted_elsewhere, + 'speaker_ids', video_speakers.speaker_ids + ) + ) + ) AS videos + FROM sense_videos + JOIN videos ON videos.id = sense_videos.video_id + LEFT JOIN ( + SELECT + video_id, + jsonb_agg(speaker_id) AS speaker_ids + FROM video_speakers + WHERE deleted IS NULL + GROUP BY video_id + ) AS video_speakers ON video_speakers.video_id = videos.id + WHERE videos.deleted IS NULL AND sense_videos.deleted IS NULL + GROUP BY sense_videos.sense_id +) AS aggregated_videos ON aggregated_videos.sense_id = senses.id +WHERE entries.deleted IS NULL +GROUP BY entries.id; + + + +insert into + dictionaries (id) +values + ('dict1') +on conflict do nothing; + +insert into + entries ( + id, + dictionary_id, + lexeme, + phonetic, + interlinearization, + morphology, + notes, + sources, + scientific_names, + coordinates, + unsupported_fields, + elicitation_id + ) +values + ( + 'entry1', + 'dict1', + '{"word": "example"}', + 'ɪɡˈzæmpəl', + 'example', + 'noun', + '{"note": "Sample note"}', + array['source1', 'source2'], + array['Homo sapiens'], + '{"lat": 40.7128, "long": -74.0060}', + '{"field": "value"}', + 'elic1' + ) +on conflict do nothing; + +insert into + senses ( + id, + entry_id, + definition, + glosses, + parts_of_speech, + semantic_domains, + write_in_semantic_domains, + noun_class, + plural_form, + variant + ) +values + ( + '550e8400-e29b-41d4-a716-446655440000', + 'entry1', + '{"en": "A representative form or pattern"}', + '{"en": "example"}', + array['noun'], + array['education'], + array['learning'], + 'class1', + '{"plural": "examples"}', + '{"variant": "example"}' + ) +on conflict do nothing; + +insert into + sentences (id, dictionary_id, text, translation) +values + ( + '550e8400-e29b-41d4-a716-446655440001', + 'dict1', + '{"en": "This is an example sentence."}', + '{"es": "Esta es una oración de ejemplo."}' + ) +on conflict do nothing; + +insert into + senses_in_sentences (sense_id, sentence_id) +values + ( + '550e8400-e29b-41d4-a716-446655440000', + '550e8400-e29b-41d4-a716-446655440001' + ) +on conflict do nothing; \ No newline at end of file diff --git a/supabase/ideas/entry-relationships.sql b/supabase/ideas/entry-relationships.sql new file mode 100644 index 000000000..3b45519ee --- /dev/null +++ b/supabase/ideas/entry-relationships.sql @@ -0,0 +1,14 @@ +CREATE TYPE entry_relationships AS ENUM ('singular_plural', 'variant'); -- 'antonym', 'synonym' + +CREATE TABLE entry_entry ( + entry1_id text NOT NULL REFERENCES entries, + entry2_id text NOT NULL REFERENCES entries, + nature_of_relationship entry_relationships NOT NULL, + created_at timestamp with time zone DEFAULT now() NOT NULL, + created_by uuid NOT NULL REFERENCES auth.users, + deleted timestamp with time zone, + PRIMARY KEY (entry1_id, entry2_id) +); + +-- color (American) colour (British) (spelling variant) +-- aluminium, aluminium (2 audio files) (speaking variant) diff --git a/supabase/notes.md b/supabase/ideas/misc.md similarity index 100% rename from supabase/notes.md rename to supabase/ideas/misc.md diff --git a/supabase/ideas/sentence-updates.sql b/supabase/ideas/sentence-updates.sql deleted file mode 100644 index 0f6d8e204..000000000 --- a/supabase/ideas/sentence-updates.sql +++ /dev/null @@ -1,116 +0,0 @@ -CREATE TYPE sentence_tables AS ENUM ('sentences', 'senses_in_sentences'); -CREATE TYPE sentence_columns AS ENUM ('deleted', 'text', 'translation'); - -CREATE TABLE sentence_updates ( - id uuid unique primary key NOT NULL, -- generated by client via uuidv4 so it can be idempotent and they can send it multiple times without repeated effect in case of network issues - user_id uuid NOT NULL REFERENCES auth.users, - firebase_email text, -- temporary until migration complete - dictionary_id text NOT NULL REFERENCES dictionaries, - sentence_id uuid NOT NULL REFERENCES sentences, - sense_id uuid REFERENCES senses, -- could be null, but if included the apply_sentence_updates trigger will create a sense-sentence relationship - "timestamp" timestamp with time zone NOT NULL DEFAULT now(), - "table" sentence_tables NOT NULL, - -- all following could be null if just adding a new sense-sentence relationship using senses_in_sentences table - "column" sentence_columns, - new_value text, - old_value text -); - -ALTER TABLE sentence_updates ENABLE ROW LEVEL SECURITY; - -CREATE OR REPLACE FUNCTION ensure_dictionary_before_apply_sentence_updates() -RETURNS TRIGGER AS $$ -BEGIN - INSERT INTO dictionaries (id) VALUES (NEW.dictionary_id) ON CONFLICT DO NOTHING; - RETURN NEW; -END; -$$ LANGUAGE plpgsql SECURITY DEFINER; - -CREATE TRIGGER before_on_sentence_updates_temp1 -- will fire before the next trigger because postgres executes triggers in alphabetical order -BEFORE INSERT ON sentence_updates -FOR EACH ROW -EXECUTE FUNCTION ensure_dictionary_before_apply_sentence_updates(); - --- After migrating dictionaries we can run: --- DROP TRIGGER if exists before_on_sentence_updates_temp1 ON sentence_updates; --- DROP FUNCTION if exists ensure_dictionary_before_apply_sentence_updates(); - -CREATE OR REPLACE FUNCTION convert_firebase_email_to_supabase_user_id_using_field() -RETURNS TRIGGER AS $$ -DECLARE - fetched_user_id UUID; -BEGIN - SELECT id INTO fetched_user_id - FROM auth.users - WHERE email = NEW.firebase_email; - - IF fetched_user_id IS NOT NULL THEN - NEW.user_id := fetched_user_id; - END IF; - - RETURN NEW; -END; -$$ LANGUAGE plpgsql SECURITY DEFINER; - -CREATE TRIGGER before_on_sentence_updates_temp2 -BEFORE INSERT ON sentence_updates -FOR EACH ROW -EXECUTE FUNCTION convert_firebase_email_to_supabase_user_id_using_field(); - -CREATE OR REPLACE FUNCTION apply_sentence_updates() -RETURNS TRIGGER AS $$ -DECLARE - column_data_type regtype; -BEGIN - IF NEW.table = 'sentences' THEN - - SELECT atttypid::regtype INTO column_data_type - FROM pg_attribute - WHERE attrelid = (SELECT oid FROM pg_class WHERE relname = 'sentences') - AND attname = NEW.column::text; - - EXECUTE format( - 'INSERT INTO sentences - (id, %I, created_by, updated_by, created_at, updated_at) - VALUES ($1::uuid, $2::%s, $3, $3, now(), now()) - ON CONFLICT (id) DO UPDATE - SET %I = $2::%s, updated_by = $3, updated_at = now()', - NEW.column, - column_data_type, - NEW.column, - column_data_type - ) USING NEW.sentence_id, NEW.new_value, NEW.user_id; - - IF NEW.sense_id IS NOT NULL THEN - INSERT INTO senses_in_sentences -- ensure sense-sentence relationship exists - (sense_id, sentence_id, created_by, created_at) - VALUES (NEW.sense_id, NEW.sentence_id, NEW.user_id, now()) - ON CONFLICT (sense_id, sentence_id) DO NOTHING; - END IF; - - ELSIF NEW.table = 'senses_in_sentences' THEN -- sentence_updates only target this table if they are removing a sentence from a sense or adding sentence to additional senses - - IF NEW.column = 'deleted' THEN - UPDATE senses_in_sentences - SET deleted = now() - WHERE sense_id = NEW.sense_id AND sentence_id = NEW.sentence_id; - ELSE - INSERT INTO senses_in_sentences -- add this sense to existing sentence - (sense_id, sentence_id, created_by, created_at) - VALUES (NEW.sense_id, NEW.sentence_id, NEW.user_id, now()) - ON CONFLICT (sense_id, sentence_id) DO NOTHING; - END IF; - - END IF; - RETURN NEW; -END; -$$ LANGUAGE plpgsql SECURITY DEFINER; - -CREATE TRIGGER on_sentence_updates -BEFORE INSERT ON sentence_updates -FOR EACH ROW -EXECUTE FUNCTION apply_sentence_updates(); - --- Regarding Sentence deletions: --- 1. Can delete the sentence which will remove it from all senses (the entries_view will only pull in sentences where deleted is null) --- 2. Can delete the relationship between a sense and a sentence which will only remove it from being shown on a sense but it still exists as a sentence in the dictionary \ No newline at end of file diff --git a/supabase/migrations/20231113055922_senses-and-entry-updates-tables.sql b/supabase/migrations/20231113055922_senses-and-entry-updates-tables.sql index 04a3d99a0..d56241d60 100644 --- a/supabase/migrations/20231113055922_senses-and-entry-updates-tables.sql +++ b/supabase/migrations/20231113055922_senses-and-entry-updates-tables.sql @@ -1,8 +1,8 @@ CREATE TABLE senses ( id uuid unique primary key NOT NULL, -- generated on client so users can create a sense offline and keep editing it - entry_id text NOT NULL, -- TODO: add trigger that adds entry placeholder if not existing, deploy, then add entry_id placeholders for all existing senses, then add REFERENCES entries - glosses jsonb, -- MultiString + entry_id text NOT NULL,-- added REFERENCES entries "definition" jsonb, -- MultiString + glosses jsonb, -- MultiString parts_of_speech text[], semantic_domains text[], write_in_semantic_domains text[], @@ -12,11 +12,13 @@ CREATE TABLE senses ( updated_at timestamp with time zone DEFAULT now() NOT NULL, updated_by text NOT NULL, -- TODO: go through existing senses and connect to user_id, then change to uuid and add REFERENCES auth.users deleted timestamp with time zone + -- added plural_form jsonb, -- MultiString + -- added variant jsonb -- MultiString ); ALTER TABLE senses ENABLE ROW LEVEL SECURITY; -CREATE VIEW entries_view AS +CREATE VIEW entries_view AS -- out of date SELECT entry_id as id, jsonb_agg( @@ -37,25 +39,25 @@ FROM senses WHERE deleted IS NULL GROUP BY entry_id; -CREATE TYPE entry_tables AS ENUM ('senses'); -- future: 'entry', 'audio', 'videos', 'photos', -CREATE TYPE entry_columns AS ENUM ('deleted', 'glosses', 'parts_of_speech', 'semantic_domains', 'write_in_semantic_domains', 'noun_class', 'definition'); +CREATE TYPE entry_tables AS ENUM ('senses'); -- not using +CREATE TYPE entry_columns AS ENUM ('deleted', 'glosses', 'parts_of_speech', 'semantic_domains', 'write_in_semantic_domains', 'noun_class', 'definition'); -- not using -CREATE TABLE entry_updates ( - id uuid unique primary key NOT NULL, -- generated by client via uuidv4 so it can be idempotent and they can send it multiple times without repeated effect in case of network issues - user_id text NOT NULL, -- TODO: change to uuid, add REFERENCES auth.users, set this in a trigger - dictionary_id text NOT NULL, -- TODO: add REFERENCES dictionaries once Firestore data migrated - entry_id text NOT NULL, -- TODO: add REFERENCES entries once Firestore data migrated +CREATE TABLE entry_updates ( -- TODO: drop this table + id uuid unique primary key NOT NULL, + user_id text NOT NULL, + dictionary_id text NOT NULL, + entry_id text NOT NULL, "timestamp" timestamp with time zone DEFAULT now() NOT NULL, "table" entry_tables NOT NULL, - "row" text NOT NULL, -- initially just the sense id, but later also entry id, photo id, etc. - "column" entry_columns NOT NULL, -- in future could be null if using an update to simply add a new relationship between already existing data and media, ie - a video that contains many entries + "row" text NOT NULL, + "column" entry_columns NOT NULL, new_value text, old_value text ); ALTER TABLE entry_updates ENABLE ROW LEVEL SECURITY; -CREATE OR REPLACE FUNCTION apply_entry_updates() +CREATE OR REPLACE FUNCTION apply_entry_updates() -- removed RETURNS TRIGGER AS $$ DECLARE column_data_type regtype; @@ -81,7 +83,7 @@ BEGIN END; $$ LANGUAGE plpgsql SECURITY DEFINER; -CREATE TRIGGER on_entry_updates +CREATE TRIGGER on_entry_updates -- removed AFTER INSERT ON entry_updates FOR EACH ROW EXECUTE FUNCTION apply_entry_updates(); \ No newline at end of file diff --git a/supabase/migrations/20240115031759_fb-email-to-supabase-user-id.sql b/supabase/migrations/20240115031759_fb-email-to-supabase-user-id.sql index 8c0a67b15..0b6500c2e 100644 --- a/supabase/migrations/20240115031759_fb-email-to-supabase-user-id.sql +++ b/supabase/migrations/20240115031759_fb-email-to-supabase-user-id.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE FUNCTION convert_firebase_email_to_supabase_user_id() +CREATE OR REPLACE FUNCTION convert_firebase_email_to_supabase_user_id() -- removed RETURNS TRIGGER AS $$ DECLARE fetched_user_id UUID; @@ -15,7 +15,7 @@ BEGIN END; $$ LANGUAGE plpgsql SECURITY DEFINER; -CREATE TRIGGER convert_email_to_id_before_insert +CREATE TRIGGER convert_email_to_id_before_insert -- removed BEFORE INSERT ON entry_updates FOR EACH ROW EXECUTE FUNCTION convert_firebase_email_to_supabase_user_id(); diff --git a/supabase/migrations/20240221012557_dictionaries-entries-sentences-texts-tables.sql b/supabase/migrations/20240221012557_dictionaries-entries-sentences-texts-tables.sql index ae0f21657..ef710747e 100644 --- a/supabase/migrations/20240221012557_dictionaries-entries-sentences-texts-tables.sql +++ b/supabase/migrations/20240221012557_dictionaries-entries-sentences-texts-tables.sql @@ -32,17 +32,17 @@ CREATE TABLE dictionaries ( -- TODO: migrate from Firestore ALTER TABLE dictionaries ENABLE ROW LEVEL SECURITY; -CREATE TABLE entries ( -- TODO: migrate from Firestore +CREATE TABLE entries ( id text unique primary key NOT NULL, -- generated on client so users can create an entry offline and keep editing it dictionary_id text NOT NULL REFERENCES dictionaries, lexeme jsonb NOT NULL, -- MultiString phonetic text, interlinearization text, morphology text, - plural_form text, - variant text, - dialects text[], -- TODO: remove this field by creating a dialects table and many-many table - notes text, -- changed to jsonb for a MultiString + plural_form text, -- moved to senses table + variant text, -- moved to senses table + dialects text[], -- removed in favor of dialects table and entry_dialects many-many join + notes text, -- changed to jsonb MultiString sources text[], scientific_names text[], coordinates jsonb, -- Coordinates diff --git a/supabase/migrations/20240222001122_media-tables.sql b/supabase/migrations/20240222001122_media-tables.sql index 2535a102a..56f09991a 100644 --- a/supabase/migrations/20240222001122_media-tables.sql +++ b/supabase/migrations/20240222001122_media-tables.sql @@ -1,5 +1,6 @@ CREATE TABLE photos ( id uuid primary key default uuid_generate_v4(), + -- added dictionary_id text NOT NULL REFERENCES dictionaries ON DELETE CASCADE, storage_path text NOT NULL, serving_url text NOT NULL, source text, @@ -15,6 +16,7 @@ ALTER TABLE photos ENABLE ROW LEVEL SECURITY; CREATE TABLE videos ( id uuid primary key default uuid_generate_v4(), + -- added dictionary_id text NOT NULL REFERENCES dictionaries ON DELETE CASCADE, storage_path text NOT NULL, -- made nullable and added hosted_elsewhere column source text, videographer text, @@ -29,6 +31,7 @@ ALTER TABLE videos ENABLE ROW LEVEL SECURITY; CREATE TABLE audio ( id uuid primary key default uuid_generate_v4(), + -- added dictionary_id text NOT NULL REFERENCES dictionaries ON DELETE CASCADE, storage_path text NOT NULL, source text, created_at timestamp with time zone DEFAULT now() NOT NULL, @@ -41,8 +44,10 @@ CREATE TABLE audio ( ALTER TABLE audio ENABLE ROW LEVEL SECURITY; CREATE TYPE gender AS ENUM ('m', 'f', 'o'); + CREATE TABLE speakers ( id uuid primary key default uuid_generate_v4(), + -- added dictionary_id text NOT NULL REFERENCES dictionaries ON DELETE CASCADE, user_id uuid REFERENCES auth.users, -- only if speaker has an account name text NOT NULL, decade integer, diff --git a/supabase/migrations/20240223012557_include-sentences-in-entries-view.sql b/supabase/migrations/20240223012557_include-sentences-in-entries-view.sql index afef43f52..79e8ba71b 100644 --- a/supabase/migrations/20240223012557_include-sentences-in-entries-view.sql +++ b/supabase/migrations/20240223012557_include-sentences-in-entries-view.sql @@ -1,4 +1,4 @@ -CREATE OR REPLACE VIEW entries_view AS +CREATE OR REPLACE VIEW entries_view AS -- out of date SELECT senses.entry_id AS id, jsonb_agg( @@ -34,12 +34,5 @@ LEFT JOIN ( WHERE sentences.deleted IS NULL AND senses_in_sentences.deleted IS NULL GROUP BY senses_in_sentences.sense_id ) AS sentence_agg ON sentence_agg.sense_id = senses.id -WHERE senses.deleted IS NULL -- need to remove this and do client side in future as explained below +WHERE senses.deleted IS NULL GROUP BY senses.entry_id; - --- Future plan: --- Jim has viewed (and cached) 20 entries from yesterday and older --- Bob deletes 1 today --- Jim will have 20 cached entries and then loads fresh entries (including deleted) when he comes today so that he gets Bob's deleted today - we want that deleted to come down to Jim so that his browser knows to pull that deleted entry from the cache --- Jim's entries are now updated in his cache as of today, so he will never again pull that deleted. --- If we have new Jill tomorrow, in her fetch of the entire dictionary, don't pull down anything deleted because it's irrelevant - she has nothing in her cache to delete. \ No newline at end of file diff --git a/supabase/migrations/20240225012557_updates.sql b/supabase/migrations/20240225012557_updates.sql index fbccafe28..e0e0598a5 100644 --- a/supabase/migrations/20240225012557_updates.sql +++ b/supabase/migrations/20240225012557_updates.sql @@ -12,7 +12,8 @@ CREATE TABLE content_updates ( video_id uuid REFERENCES videos, photo_id uuid REFERENCES photos, speaker_id uuid REFERENCES speakers, - "table" content_tables NOT NULL, + -- dialect_id uuid REFERENCES dialects, -- added later + "table" content_tables NOT NULL, -- made nullable later as no longer using - will drop down the road change jsonb NOT NULL, "timestamp" timestamp with time zone NOT NULL DEFAULT now() -- import_id uuid -- added later diff --git a/supabase/migrations/20240824035215_fb-sb-migration-needs-connect-audio-video--pl-variant-dialects-ei-field-plus-meta.sql b/supabase/migrations/20240824035215_fb-sb-migration-needs-connect-audio-video--pl-variant-dialects-ei-field-plus-meta.sql new file mode 100644 index 000000000..e293e08e5 --- /dev/null +++ b/supabase/migrations/20240824035215_fb-sb-migration-needs-connect-audio-video--pl-variant-dialects-ei-field-plus-meta.sql @@ -0,0 +1,383 @@ +ALTER TABLE senses +ADD COLUMN plural_form jsonb, -- MultiString +ADD COLUMN variant jsonb; -- MultiString + +ALTER TABLE entries +DROP COLUMN plural_form, +DROP COLUMN variant, +DROP COLUMN dialects; + +CREATE TABLE dialects ( + id uuid unique primary key NOT NULL, + dictionary_id text NOT NULL REFERENCES dictionaries ON DELETE CASCADE, + name jsonb NOT NULL, -- MultiString + created_at timestamp with time zone DEFAULT now() NOT NULL, + created_by uuid NOT NULL REFERENCES auth.users, + updated_at timestamp with time zone DEFAULT now() NOT NULL, + updated_by uuid NOT NULL REFERENCES auth.users, + deleted timestamp with time zone +); + +ALTER TABLE dialects ENABLE ROW LEVEL SECURITY; + +CREATE POLICY "Anyone can view dialects" +ON dialects +FOR SELECT USING (true); + +CREATE TABLE entry_dialects ( + entry_id text NOT NULL REFERENCES entries ON DELETE CASCADE, + dialect_id uuid NOT NULL REFERENCES dialects ON DELETE CASCADE, + created_by uuid NOT NULL REFERENCES auth.users, + created_at timestamp with time zone DEFAULT now() NOT NULL, + deleted timestamp with time zone, + PRIMARY KEY (entry_id, dialect_id) +); + +ALTER TABLE entry_dialects ENABLE ROW LEVEL SECURITY; + +CREATE TRIGGER set_created_by_trigger_dialects +BEFORE UPDATE ON dialects +FOR EACH ROW +EXECUTE FUNCTION set_created_by(); + +ALTER TABLE content_updates +ALTER COLUMN "table" DROP NOT NULL, +ADD COLUMN dialect_id uuid REFERENCES dialects; + +------------------ + +ALTER TABLE entries +ALTER COLUMN notes TYPE jsonb USING notes::jsonb, -- MultiString (was text previously) +ADD COLUMN unsupported_fields jsonb, -- to place fields from imports like FLEx that don't fit into the current fields +ADD COLUMN elicitation_id text; -- Elicitation Id for Munda languages or Swadesh Composite number list from Comparalex, used for Onondaga custom sort + +ALTER TABLE photos +ADD COLUMN dictionary_id text NOT NULL REFERENCES dictionaries ON DELETE CASCADE; + +ALTER TABLE audio +ADD COLUMN dictionary_id text NOT NULL REFERENCES dictionaries ON DELETE CASCADE, +ADD COLUMN entry_id text REFERENCES entries, +ADD COLUMN sentence_id uuid REFERENCES sentences, +ADD COLUMN text_id uuid REFERENCES texts; + +ALTER TABLE videos +ALTER COLUMN storage_path DROP NOT NULL, +ADD COLUMN dictionary_id text NOT NULL REFERENCES dictionaries ON DELETE CASCADE, +ADD COLUMN hosted_elsewhere jsonb, -- Hosted elsewhere (e.g. YouTube, Vimeo, etc.) +ADD COLUMN text_id uuid REFERENCES texts; + +ALTER TABLE senses +ADD CONSTRAINT foreign_key_entries +FOREIGN KEY (entry_id) REFERENCES entries(id); + +ALTER TABLE speakers +ADD COLUMN dictionary_id text NOT NULL REFERENCES dictionaries ON DELETE CASCADE; + +CREATE OR REPLACE VIEW speakers_view AS +SELECT + id, + dictionary_id, + name, + decade, + gender, + birthplace, + created_at, + updated_at, + deleted +FROM speakers; + +CREATE POLICY "Anyone can view sentences" +ON sentences +FOR SELECT USING (true); + +CREATE POLICY "Anyone can view photos" +ON photos +FOR SELECT USING (true); + +CREATE OR REPLACE VIEW videos_view AS +SELECT + videos.id AS id, + videos.dictionary_id AS dictionary_id, + videos.storage_path AS storage_path, + videos.source AS source, + videos.videographer AS videographer, + videos.hosted_elsewhere AS hosted_elsewhere, + videos.text_id AS text_id, + video_speakers.speaker_ids AS speaker_ids, + videos.created_at AS created_at, + videos.updated_at AS updated_at, + videos.deleted AS deleted +FROM videos +LEFT JOIN ( + SELECT + video_id, + jsonb_agg(speaker_id) AS speaker_ids + FROM video_speakers + WHERE deleted IS NULL + GROUP BY video_id +) AS video_speakers ON video_speakers.video_id = videos.id; + +DROP VIEW IF EXISTS entries_view; + +CREATE OR REPLACE VIEW entries_view AS +SELECT + entries.id AS id, + entries.dictionary_id AS dictionary_id, + entries.created_at, + entries.updated_at, + entries.deleted, + jsonb_strip_nulls( + jsonb_build_object( + 'lexeme', entries.lexeme, + 'phonetic', entries.phonetic, + 'interlinearization', entries.interlinearization, + 'morphology', entries.morphology, + 'notes', entries.notes, + 'sources', entries.sources, + 'scientific_names', entries.scientific_names, + 'coordinates', entries.coordinates, + 'unsupported_fields', entries.unsupported_fields, + 'elicitation_id', entries.elicitation_id + ) + ) AS main, + CASE + WHEN COUNT(senses.id) > 0 THEN jsonb_agg( + jsonb_strip_nulls( + jsonb_build_object( + 'id', senses.id, + 'glosses', senses.glosses, + 'parts_of_speech', senses.parts_of_speech, + 'semantic_domains', senses.semantic_domains, + 'write_in_semantic_domains', senses.write_in_semantic_domains, + 'noun_class', senses.noun_class, + 'definition', senses.definition, + 'plural_form', senses.plural_form, + 'variant', senses.variant, + 'sentence_ids', sentence_ids, + 'photo_ids', photo_ids, + 'video_ids', video_ids + ) + ) + ORDER BY senses.created_at + ) + ELSE NULL + END AS senses, + CASE + WHEN COUNT(audio.id) > 0 THEN jsonb_agg( + jsonb_strip_nulls( + jsonb_build_object( + 'id', audio.id, + 'storage_path', audio.storage_path, + 'source', audio.source, + 'speaker_ids', audio_speakers.speaker_ids + ) + ) + ORDER BY audio.created_at + ) + ELSE NULL + END AS audios, + dialect_ids.dialect_ids +FROM entries +LEFT JOIN senses ON senses.entry_id = entries.id AND senses.deleted IS NULL +LEFT JOIN audio ON audio.entry_id = entries.id AND audio.deleted IS NULL +LEFT JOIN ( + SELECT + audio_id, + jsonb_agg(speaker_id) AS speaker_ids + FROM audio_speakers + WHERE deleted IS NULL + GROUP BY audio_id +) AS audio_speakers ON audio_speakers.audio_id = audio.id +LEFT JOIN ( + SELECT + entry_id, + jsonb_agg(dialect_id) AS dialect_ids + FROM entry_dialects + WHERE deleted IS NULL + GROUP BY entry_id +) AS dialect_ids ON dialect_ids.entry_id = entries.id +LEFT JOIN ( + SELECT + senses_in_sentences.sense_id, + jsonb_agg(senses_in_sentences.sentence_id) AS sentence_ids + FROM senses_in_sentences + JOIN sentences ON sentences.id = senses_in_sentences.sentence_id + WHERE sentences.deleted IS NULL AND senses_in_sentences.deleted IS NULL + GROUP BY senses_in_sentences.sense_id +) AS sense_sentences ON sense_sentences.sense_id = senses.id +LEFT JOIN ( + SELECT + sense_photos.sense_id, + jsonb_agg(sense_photos.photo_id) AS photo_ids + FROM sense_photos + JOIN photos ON photos.id = sense_photos.photo_id + WHERE photos.deleted IS NULL AND sense_photos.deleted IS NULL + GROUP BY sense_photos.sense_id +) AS aggregated_photo_ids ON aggregated_photo_ids.sense_id = senses.id +LEFT JOIN ( + SELECT + sense_videos.sense_id, + jsonb_agg(sense_videos.video_id) AS video_ids + FROM sense_videos + JOIN videos ON videos.id = sense_videos.video_id + WHERE videos.deleted IS NULL AND sense_videos.deleted IS NULL + GROUP BY sense_videos.sense_id +) AS aggregated_video_ids ON aggregated_video_ids.sense_id = senses.id +GROUP BY entries.id, dialect_ids.dialect_ids; + +-- Entries loading plan: +-- When Jim loads entries for the first time on client, the client and NOT the view needs to check WHERE entries.deleted IS NULL. Then in the future if Bob deletes 1 entry, and Jim visits again, Jim will have 20 cached entries. He then loads fresh entries without the WHERE entries.deleted IS NULL when he comes today so that he gets Bob's deleted change. Then Jim's knows to remove that deleted entry from the cache + +CREATE MATERIALIZED VIEW materialized_entries_view AS +SELECT * FROM entries_view; -- DROP MATERIALIZED VIEW materialized_entries_view; + +CREATE UNIQUE INDEX idx_materialized_entries_view_id ON materialized_entries_view (id); -- When you refresh data for a materialized view, PostgreSQL locks the underlying tables. To avoid this, use the CONCURRENTLY option so that PostgreSQL creates a temporary updated version of the materialized view, compares two versions, and performs INSERT and UPDATE on only the differences. To use CONCURRENTLY the materialized view must have a UNIQUE index: + +CREATE EXTENSION IF NOT EXISTS pg_cron WITH SCHEMA extensions; +GRANT USAGE ON SCHEMA cron TO postgres; +GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA cron TO postgres; + +SELECT cron.schedule ( + 'refresh-materialized_entries_view', -- Job name + '0 * * * *', -- Every hour, you can re-run this SQL with a new time amount to change the frequency + $$ REFRESH MATERIALIZED VIEW CONCURRENTLY materialized_entries_view $$ +); -- SELECT cron.unschedule('refresh-materialized_entries_view'); + +CREATE OR REPLACE FUNCTION update_entry_updated_at() +RETURNS TRIGGER AS $$ +DECLARE + entry_id_to_use text; + new_updated_at timestamp with time zone; +BEGIN + entry_id_to_use := COALESCE(NEW.entry_id, OLD.entry_id); + + BEGIN + new_updated_at := NEW.updated_at; + EXCEPTION + WHEN others THEN + new_updated_at := NULL; + END; + + UPDATE entries + SET updated_at = COALESCE(new_updated_at, NEW.created_at, NOW()) + WHERE id = entry_id_to_use; + + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +CREATE TRIGGER update_entry_updated_at_senses +AFTER INSERT OR UPDATE ON senses +FOR EACH ROW +EXECUTE FUNCTION update_entry_updated_at(); + +CREATE TRIGGER update_entry_updated_at_audio +AFTER INSERT OR UPDATE ON audio +FOR EACH ROW +EXECUTE FUNCTION update_entry_updated_at(); + +CREATE TRIGGER update_entry_updated_at_entry_dialects +AFTER INSERT OR UPDATE ON entry_dialects +FOR EACH ROW +EXECUTE FUNCTION update_entry_updated_at(); + +CREATE OR REPLACE FUNCTION update_sense_updated_at() +RETURNS TRIGGER AS $$ +BEGIN + UPDATE senses + SET updated_at = COALESCE(NEW.deleted, NEW.created_at, NOW()) + WHERE id = NEW.sense_id; + + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +CREATE TRIGGER update_sense_updated_at_senses_in_sentences +AFTER INSERT OR UPDATE ON senses_in_sentences +FOR EACH ROW +EXECUTE FUNCTION update_sense_updated_at(); + +CREATE TRIGGER update_sense_updated_at_sense_photos +AFTER INSERT OR UPDATE ON sense_photos +FOR EACH ROW +EXECUTE FUNCTION update_sense_updated_at(); + +CREATE TRIGGER update_sense_updated_at_sense_videos +AFTER INSERT OR UPDATE ON sense_videos +FOR EACH ROW +EXECUTE FUNCTION update_sense_updated_at(); + +CREATE OR REPLACE FUNCTION update_sense_sentences_when_sentence_deleted() +RETURNS TRIGGER AS $$ +BEGIN + IF NEW.deleted IS NOT NULL THEN + UPDATE sense_sentences + SET deleted = NEW.deleted + WHERE sentence_id = NEW.id; + END IF; + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +CREATE TRIGGER update_sense_updated_at_sense_sentences +AFTER UPDATE ON sentences +FOR EACH ROW +EXECUTE FUNCTION update_sense_sentences_when_sentence_deleted(); + +CREATE OR REPLACE FUNCTION update_sense_photos_when_photo_deleted() +RETURNS TRIGGER AS $$ +BEGIN + IF NEW.deleted IS NOT NULL THEN + UPDATE sense_photos + SET deleted = NEW.deleted + WHERE photo_id = NEW.id; + END IF; + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +CREATE TRIGGER update_sense_updated_at_sense_photos +AFTER UPDATE ON photos +FOR EACH ROW +EXECUTE FUNCTION update_sense_photos_when_photo_deleted(); + +CREATE OR REPLACE FUNCTION update_sense_videos_when_video_deleted() +RETURNS TRIGGER AS $$ +BEGIN + IF NEW.deleted IS NOT NULL THEN + UPDATE sense_videos + SET deleted = NEW.deleted + WHERE video_id = NEW.id; + END IF; + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +CREATE TRIGGER update_sense_updated_at_sense_videos +AFTER UPDATE ON videos +FOR EACH ROW +EXECUTE FUNCTION update_sense_videos_when_video_deleted(); + +CREATE OR REPLACE FUNCTION update_audio_updated_at() +RETURNS TRIGGER AS $$ +BEGIN + UPDATE audio + SET updated_at = COALESCE(NEW.created_at, NOW()) + WHERE id = NEW.audio_id; + + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +CREATE TRIGGER update_audio_updated_at_audio_speakers +AFTER INSERT OR UPDATE ON audio_speakers +FOR EACH ROW +EXECUTE FUNCTION update_audio_updated_at(); + +------------------ + +DROP TRIGGER IF EXISTS on_entry_updates ON entry_updates; +DROP FUNCTION IF EXISTS apply_entry_updates(); + +DROP TRIGGER IF EXISTS convert_email_to_id_before_insert ON entry_updates; +DROP FUNCTION IF EXISTS convert_firebase_email_to_supabase_user_id(); \ No newline at end of file diff --git a/supabase/migrations/20240824035215_notes-multistring-ei-field-plus-meta.sql b/supabase/migrations/20240824035215_notes-multistring-ei-field-plus-meta.sql deleted file mode 100644 index 0602fbf08..000000000 --- a/supabase/migrations/20240824035215_notes-multistring-ei-field-plus-meta.sql +++ /dev/null @@ -1,4 +0,0 @@ -ALTER TABLE entries -ALTER COLUMN notes TYPE jsonb USING notes::jsonb, -- MultiString (was text previously) -ADD COLUMN unsupported_fields jsonb, -- to place fields from imports like FLEx that don't fit into the current fields -ADD COLUMN elicitation_id text; -- Elicitation Id for Munda languages or Swadesh Composite number list from Comparalex, used for Onondaga custom sort diff --git a/supabase/migrations/20240825052204_connect-audio-video.sql b/supabase/migrations/20240825052204_connect-audio-video.sql deleted file mode 100644 index bc67b5a65..000000000 --- a/supabase/migrations/20240825052204_connect-audio-video.sql +++ /dev/null @@ -1,9 +0,0 @@ -ALTER TABLE audio -ADD COLUMN entry_id text REFERENCES entries, -ADD COLUMN sentence_id uuid REFERENCES sentences, -ADD COLUMN text_id uuid REFERENCES texts; - -ALTER TABLE videos -ALTER COLUMN storage_path DROP NOT NULL, -ADD COLUMN hosted_elsewhere jsonb, -- Hosted elsewhere (e.g. YouTube, Vimeo, etc.) -ADD COLUMN text_id uuid REFERENCES texts; \ No newline at end of file diff --git a/supabase/migrations/20241024024631_faster_entries_view.sql b/supabase/migrations/20241024024631_faster_entries_view.sql new file mode 100644 index 000000000..d7c2906fe --- /dev/null +++ b/supabase/migrations/20241024024631_faster_entries_view.sql @@ -0,0 +1,135 @@ +-- '2024-03-09 16:35:50+00', birhor should get a bit more than 1000 entries +CREATE INDEX ON entries USING btree ("updated_at", "dictionary_id"); + +-- DROP FUNCTION entries_from_timestamp(timestamp with time zone, text) CASCADE; +CREATE OR REPLACE FUNCTION entries_from_timestamp( + get_newer_than timestamp with time zone, + dict_id text +) RETURNS TABLE( + id text, + dictionary_id text, + created_at timestamp with time zone, + updated_at timestamp with time zone, + deleted timestamp with time zone, + main jsonb, + senses jsonb, + audios jsonb, + dialect_ids jsonb +) AS $$ + SELECT + entries.id AS id, + entries.dictionary_id AS dictionary_id, + entries.created_at, + entries.updated_at, + entries.deleted, + jsonb_strip_nulls( + jsonb_build_object( + 'lexeme', entries.lexeme, + 'phonetic', entries.phonetic, + 'interlinearization', entries.interlinearization, + 'morphology', entries.morphology, + 'notes', entries.notes, + 'sources', entries.sources, + 'scientific_names', entries.scientific_names, + 'coordinates', entries.coordinates, + 'unsupported_fields', entries.unsupported_fields, + 'elicitation_id', entries.elicitation_id + ) + ) AS main, + CASE + WHEN COUNT(senses.id) > 0 THEN jsonb_agg( + jsonb_strip_nulls( + jsonb_build_object( + 'id', senses.id, + 'glosses', senses.glosses, + 'parts_of_speech', senses.parts_of_speech, + 'semantic_domains', senses.semantic_domains, + 'write_in_semantic_domains', senses.write_in_semantic_domains, + 'noun_class', senses.noun_class, + 'definition', senses.definition, + 'plural_form', senses.plural_form, + 'variant', senses.variant, + 'sentence_ids', sentence_ids, + 'photo_ids', photo_ids, + 'video_ids', video_ids + ) + ) + ORDER BY senses.created_at + ) + ELSE NULL + END AS senses, + CASE + WHEN COUNT(audio.id) > 0 THEN jsonb_agg( + jsonb_strip_nulls( + jsonb_build_object( + 'id', audio.id, + 'storage_path', audio.storage_path, + 'source', audio.source, + 'speaker_ids', audio_speakers.speaker_ids + ) + ) + ORDER BY audio.created_at + ) + ELSE NULL + END AS audios, + dialect_ids.dialect_ids + FROM entries + LEFT JOIN senses ON senses.entry_id = entries.id AND senses.deleted IS NULL + LEFT JOIN audio ON audio.entry_id = entries.id AND audio.deleted IS NULL + LEFT JOIN ( + SELECT + audio_id, + jsonb_agg(speaker_id) AS speaker_ids + FROM audio_speakers + WHERE deleted IS NULL + GROUP BY audio_id + ) AS audio_speakers ON audio_speakers.audio_id = audio.id + LEFT JOIN ( + SELECT + entry_id, + jsonb_agg(dialect_id) AS dialect_ids + FROM entry_dialects + WHERE deleted IS NULL + GROUP BY entry_id + ) AS dialect_ids ON dialect_ids.entry_id = entries.id + LEFT JOIN ( + SELECT + senses_in_sentences.sense_id, + jsonb_agg(senses_in_sentences.sentence_id) AS sentence_ids + FROM senses_in_sentences + JOIN sentences ON sentences.id = senses_in_sentences.sentence_id + WHERE sentences.deleted IS NULL AND senses_in_sentences.deleted IS NULL + GROUP BY senses_in_sentences.sense_id + ) AS sense_sentences ON sense_sentences.sense_id = senses.id + LEFT JOIN ( + SELECT + sense_photos.sense_id, + jsonb_agg(sense_photos.photo_id) AS photo_ids + FROM sense_photos + JOIN photos ON photos.id = sense_photos.photo_id + WHERE photos.deleted IS NULL AND sense_photos.deleted IS NULL + GROUP BY sense_photos.sense_id + ) AS aggregated_photo_ids ON aggregated_photo_ids.sense_id = senses.id + LEFT JOIN ( + SELECT + sense_videos.sense_id, + jsonb_agg(sense_videos.video_id) AS video_ids + FROM sense_videos + JOIN videos ON videos.id = sense_videos.video_id + WHERE videos.deleted IS NULL AND sense_videos.deleted IS NULL + GROUP BY sense_videos.sense_id + ) AS aggregated_video_ids ON aggregated_video_ids.sense_id = senses.id + WHERE entries.updated_at > get_newer_than AND (dict_id = '' OR entries.dictionary_id = dict_id) + GROUP BY entries.id, dialect_ids.dialect_ids + ORDER BY entries.updated_at ASC; +$$ LANGUAGE SQL SECURITY DEFINER; + +DROP MATERIALIZED VIEW IF EXISTS materialized_entries_view CASCADE; +CREATE MATERIALIZED VIEW materialized_entries_view AS +SELECT * FROM entries_from_timestamp('1970-01-01 01:00:00+00', ''); + +CREATE UNIQUE INDEX idx_materialized_entries_view_id ON materialized_entries_view (id); +REFRESH MATERIALIZED VIEW CONCURRENTLY materialized_entries_view; + +CREATE INDEX idx_materialized_entries_view_updated_at_dictionary_id +ON materialized_entries_view (updated_at, dictionary_id); \ No newline at end of file diff --git a/supabase/migrations/20241024024888_entries_view_indexes.sql b/supabase/migrations/20241024024888_entries_view_indexes.sql new file mode 100644 index 000000000..823d8f87f --- /dev/null +++ b/supabase/migrations/20241024024888_entries_view_indexes.sql @@ -0,0 +1,24 @@ +CREATE INDEX idx_entries_updated_at ON entries (updated_at); +CREATE INDEX idx_entries_dictionary_id ON entries (dictionary_id); + +-- Foreign Key Columns +CREATE INDEX idx_senses_entry_id ON senses (entry_id); +CREATE INDEX idx_audio_entry_id ON audio (entry_id); +CREATE INDEX idx_audio_speakers_audio_id ON audio_speakers (audio_id); +CREATE INDEX idx_entry_dialects_entry_id ON entry_dialects (entry_id); +CREATE INDEX idx_senses_in_sentences_sense_id ON senses_in_sentences (sense_id); +CREATE INDEX idx_sense_photos_sense_id ON sense_photos (sense_id); +CREATE INDEX idx_sense_videos_sense_id ON sense_videos (sense_id); + +-- Deleted Columns +CREATE INDEX idx_senses_non_deleted ON senses (entry_id) WHERE deleted IS NULL; +CREATE INDEX idx_audio_non_deleted ON audio (entry_id) WHERE deleted IS NULL; +CREATE INDEX idx_audio_speakers_non_deleted ON audio_speakers (audio_id) WHERE deleted IS NULL; +CREATE INDEX idx_entry_dialects_non_deleted ON entry_dialects (entry_id) WHERE deleted IS NULL; +CREATE INDEX idx_senses_in_sentences_non_deleted ON senses_in_sentences (sense_id) WHERE deleted IS NULL; +CREATE INDEX idx_sense_photos_non_deleted ON sense_photos (sense_id) WHERE deleted IS NULL; +CREATE INDEX idx_sense_videos_non_deleted ON sense_videos (sense_id) WHERE deleted IS NULL; + +-- Indexes helping with the ordering of items within each entry +-- CREATE INDEX idx_senses_created_at ON senses (created_at); +-- CREATE INDEX idx_audio_created_at ON audio (created_at); \ No newline at end of file diff --git a/vitest.workspace.ts b/vitest.workspace.ts index a14aa2365..62c81eff8 100644 --- a/vitest.workspace.ts +++ b/vitest.workspace.ts @@ -2,6 +2,7 @@ import { defineWorkspace } from 'vitest/config' export default defineWorkspace([ 'packages/site/vitest.config.ts', + 'packages/types/vitest.config.ts', 'packages/scripts/vitest.config.ts', 'packages/functions/vitest.config.ts', 'packages/ids-import/vitest.config.ts',