- Updated dependencies (#448)

- moved common utilities to '#shared' folder
final-hill · Nov 5, 2024 · 8695997 · 8695997
1 parent eaf1875
commit 8695997
Show file tree

Hide file tree

Showing 41 changed files with 1,912 additions and 2,351 deletions.
diff --git a/components/TopNavigation.vue b/components/TopNavigation.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import deSlugify from '#shared/deSlugify.js';
+
 const { data, signIn, signOut } = useAuth(),
     router = useRouter()
 

diff --git a/components/XDataTable.vue b/components/XDataTable.vue
@@ -2,7 +2,7 @@
 import type Dialog from 'primevue/dialog'
 import type DataTable from 'primevue/datatable'
 import { FilterMatchMode } from 'primevue/api';
-import camelCaseToTitle from '~/utils/camelCaseToTitle.js';
+import camelCaseToTitle from '#shared/camelCaseToTitle.js';
 
 export type ViewFieldType = 'text' | 'textarea' | 'number' | 'date' | 'boolean' | 'hidden' | 'object'
 

diff --git a/domain/requirements/Organization.ts b/domain/requirements/Organization.ts
@@ -1,5 +1,5 @@
 import { Entity, Property } from "@mikro-orm/core";
-import slugify from "../../utils/slugify.js";
+import slugify from "../../shared/slugify.js";
 import { Requirement } from "./Requirement.js";
 import { type Properties } from "../types/index.js";
 import { ReqType } from "./ReqType.js";

diff --git a/domain/requirements/Solution.ts b/domain/requirements/Solution.ts
@@ -1,6 +1,6 @@
 import { Entity, Property } from '@mikro-orm/core';
 import { type Properties } from '../types/index.js';
-import slugify from '../../utils/slugify.js';
+import slugify from '../../shared/slugify.js';
 import { Requirement } from './Requirement.js';
 import { ReqType } from './ReqType.js';
 

diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -1,6 +1,6 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-    compatibilityDate: '2024-07-22',
+    compatibilityDate: '2024-11-05',
     devtools: {
         enabled: process.env.NODE_ENV === 'development'
     },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,20 +36,20 @@
     },
     "dependencies": {
         "@azure/monitor-opentelemetry": "^1.8.0",
-        "@azure/openai": "^2.0.0-beta.2",
+        "@azure/openai": "^2.0.0-beta.3",
         "@mikro-orm/core": "^6.3.13",
         "@mikro-orm/postgresql": "^6.3.13",
         "@mikro-orm/reflection": "^6.3.13",
         "@mikro-orm/seeder": "^6.3.13",
         "@sidebase/nuxt-auth": "^0.9.4",
         "@slack/web-api": "^7.7.0",
-        "@vite-pwa/nuxt": "^0.10.5",
-        "mermaid": "^11.3.0",
+        "@vite-pwa/nuxt": "^0.10.6",
+        "mermaid": "^11.4.0",
         "mitt": "^3.0.1",
-        "nuxt": "^3.13.2",
+        "nuxt": "^3.14.0",
         "nuxt-primevue": "^3.0.0",
         "nuxt-security": "^2.0.0",
-        "openai": "^4.68.4",
+        "openai": "^4.71.0",
         "pg": "^8.13.1",
         "primeflex": "^3.3.1",
         "primeicons": "^7.0.0",
@@ -64,17 +64,17 @@
         "@mikro-orm/migrations": "^6.3.13",
         "@nuxt/devtools": "^1.6.0",
         "@nuxt/test-utils": "^3.14.4",
-        "@types/node": "^22.8.1",
+        "@types/node": "^22.9.0",
         "@types/pg": "^8.11.10",
         "@types/uuid": "^10.0.0",
         "@vite-pwa/assets-generator": "^0.2.6",
         "@vue/test-utils": "^2.4.6",
-        "happy-dom": "^15.7.4",
+        "happy-dom": "^15.9.0",
         "playwright-core": "^1.48.2",
         "ts-node": "^10.9.2",
         "tsx": "^4.19.2",
         "typescript": "^5.6.3",
         "vitest": "^2.1.4",
-        "vue-tsc": "^2.1.8"
+        "vue-tsc": "^2.1.10"
     }
-}
+}
diff --git a/pages/new-organization.vue b/pages/new-organization.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import slugify from '#shared/slugify.js';
+
 useHead({ title: 'New Organization' })
 definePageMeta({ name: 'New Organization' })
 

diff --git a/pages/o/[organization-slug]/[solution-slug]/edit-entry.client.vue b/pages/o/[organization-slug]/[solution-slug]/edit-entry.client.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import slugify from '#shared/slugify.js';
+
 useHead({ title: 'Edit Solution' })
 definePageMeta({ name: 'Edit Solution' })
 

diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/context-and-objective.vue b/pages/o/[organization-slug]/[solution-slug]/goals/context-and-objective.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import debounce from '#shared/debounce';
+
 type OutcomeViewModel = {
     id: string;
     reqId: string;

diff --git a/pages/o/[organization-slug]/[solution-slug]/goals/situation.client.vue b/pages/o/[organization-slug]/[solution-slug]/goals/situation.client.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import debounce from '#shared/debounce';
+
 type ObstacleViewModel = {
     id: string;
     reqId: string;

diff --git a/pages/o/[organization-slug]/[solution-slug]/workbox.client.vue b/pages/o/[organization-slug]/[solution-slug]/workbox.client.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
-import snakeCaseToTitle from '~/utils/snakeCaseToTitle.js';
-import camelCaseToTitle from '~/utils/camelCaseToTitle.js';
+import snakeCaseToTitle from '#shared/snakeCaseToTitle.js';
+import camelCaseToTitle from '#shared/camelCaseToTitle.js';
+import snakeCaseToSlug from '#shared/snakeCaseToSlug.js';
 import type { DataTableRowExpandEvent, DataTableRowCollapseEvent, DataTableExpandedRows } from 'primevue/datatable';
 import type { ReqType } from '~/domain/requirements/ReqType.js';
 

diff --git a/pages/o/[organization-slug]/edit-entry.client.vue b/pages/o/[organization-slug]/edit-entry.client.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import slugify from '#shared/slugify.js';
+
 useHead({ title: 'Edit Organization' })
 definePageMeta({ name: 'Edit Organization' })
 

diff --git a/pages/o/[organization-slug]/new-solution.client.vue b/pages/o/[organization-slug]/new-solution.client.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import slugify from '#shared/slugify.js';
+
 useHead({ title: 'New Solution' })
 definePageMeta({ name: 'New Solution' })
 

diff --git a/server/api/organization/[id].put.ts b/server/api/organization/[id].put.ts
@@ -1,6 +1,6 @@
 import { z } from "zod"
 import { fork } from "~/server/data/orm.js"
-import slugify from "~/utils/slugify.js"
+import slugify from "~/shared/slugify.js"
 
 const paramSchema = z.object({
     id: z.string().uuid()

diff --git a/server/api/organization/index.post.ts b/server/api/organization/index.post.ts
@@ -3,7 +3,7 @@ import { fork } from "~/server/data/orm.js"
 import { AppRole, AppUserOrganizationRole, AppUser } from "~/domain/application/index.js"
 import { Organization } from "~/domain/requirements/index.js"
 import { getServerSession } from '#auth'
-import slugify from "~/utils/slugify"
+import slugify from "~/shared/slugify"
 
 const bodySchema = z.object({
     name: z.string().default("{Untitled Organization}"),

diff --git a/server/api/parse-requirement/follows.get.ts b/server/api/parse-requirement/follows.get.ts
@@ -2,6 +2,7 @@ import { z } from "zod"
 import { fork } from "~/server/data/orm.js"
 import { ParsedRequirement, Requirement } from "~/domain/requirements/index.js"
 import { Follows } from "~/domain/relations/index.js"
+import groupBy from "#shared/groupBy.js"
 
 const querySchema = z.object({
     solutionId: z.string().uuid(),

diff --git a/server/api/parse-requirement/index.post.ts b/server/api/parse-requirement/index.post.ts
@@ -13,6 +13,8 @@ import {
 } from "~/domain/requirements/index.js";
 import { Belongs } from "~/domain/relations/Belongs.js";
 import { Follows } from "~/domain/relations/Follows.js";
+import groupBy from "#shared/groupBy.js";
+import dedent from '#shared/dedent.js'
 
 const bodySchema = z.object({
     solutionId: z.string().uuid(),

diff --git a/server/api/solution/index.post.ts b/server/api/solution/index.post.ts
@@ -2,7 +2,7 @@ import { z } from "zod"
 import { fork } from "~/server/data/orm.js"
 import { Obstacle, Solution, Outcome } from "~/domain/requirements/index.js"
 import { Belongs } from "~/domain/relations"
-import slugify from "~/utils/slugify"
+import slugify from "~/shared/slugify"
 
 const bodySchema = z.object({
     name: z.string().min(1).max(100),

diff --git a/server/data/llm-zod-schemas/FunctionalBehaviorSchema.ts b/server/data/llm-zod-schemas/FunctionalBehaviorSchema.ts
@@ -1,4 +1,5 @@
 import { z } from "zod";
+import dedent from "#shared/dedent";
 
 export default z.object({
     type: z.literal('FunctionalBehavior'),

diff --git a/server/data/llm-zod-schemas/NonFunctionalBehaviorSchema.ts b/server/data/llm-zod-schemas/NonFunctionalBehaviorSchema.ts
@@ -1,4 +1,5 @@
 import { z } from "zod";
+import dedent from "#shared/dedent";
 
 export default z.object({
     type: z.literal('NonFunctionalBehavior'),

diff --git a/server/data/llm-zod-schemas/UseCaseSchema.ts b/server/data/llm-zod-schemas/UseCaseSchema.ts
@@ -1,4 +1,5 @@
 import { z } from "zod";
+import dedent from "#shared/dedent";
 
 export default z.object({
     type: z.literal('UseCase'),

diff --git a/server/data/llm-zod-schemas/UserStorySchema.ts b/server/data/llm-zod-schemas/UserStorySchema.ts
@@ -1,4 +1,5 @@
 import { z } from "zod";
+import dedent from "#shared/dedent";
 
 export default z.object({
     type: z.literal('UserStory'),

diff --git a/utils/camelCaseToSlug.test.ts → shared/camelCaseToSlug.test.ts b/utils/camelCaseToSlug.test.ts → shared/camelCaseToSlug.test.ts
diff --git a/utils/camelCaseToSlug.ts → shared/camelCaseToSlug.ts b/utils/camelCaseToSlug.ts → shared/camelCaseToSlug.ts
@@ -3,7 +3,6 @@
  * @example
  * camelCaseToSlug('camelCase') // 'camel-case'
  */
-
 export default (input: string): string =>
     input.trim()                                     // Remove leading and trailing whitespace
         .replace(/[^a-zA-Z0-9]+/g, '-')              // Replace non-alphanumeric characters with hyphens

diff --git a/utils/camelCaseToTitle.test.ts → shared/camelCaseToTitle.test.ts b/utils/camelCaseToTitle.test.ts → shared/camelCaseToTitle.test.ts
diff --git a/utils/camelCaseToTitle.ts → shared/camelCaseToTitle.ts b/utils/camelCaseToTitle.ts → shared/camelCaseToTitle.ts
diff --git a/utils/deSlugify.test.ts → shared/deSlugify.test.ts b/utils/deSlugify.test.ts → shared/deSlugify.test.ts
diff --git a/utils/deSlugify.ts → shared/deSlugify.ts b/utils/deSlugify.ts → shared/deSlugify.ts
diff --git a/utils/debounce.test.ts → shared/debounce.test.ts b/utils/debounce.test.ts → shared/debounce.test.ts
diff --git a/utils/debounce.ts → shared/debounce.ts b/utils/debounce.ts → shared/debounce.ts
diff --git a/server/utils/dedent.test.ts → shared/dedent.test.ts b/server/utils/dedent.test.ts → shared/dedent.test.ts
diff --git a/server/utils/dedent.ts → shared/dedent.ts b/server/utils/dedent.ts → shared/dedent.ts
diff --git a/server/utils/groupBy.test.ts → shared/groupBy.test.ts b/server/utils/groupBy.test.ts → shared/groupBy.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { groupBy } from './groupBy';
+import groupBy from '#shared/groupBy';
 
 describe('groupBy', () => {
     it('should group items by a string key', () => {

diff --git a/server/utils/groupBy.ts → shared/groupBy.ts b/server/utils/groupBy.ts → shared/groupBy.ts
@@ -1,6 +1,6 @@
 // The server is currently Node 20 which does not support Object.groupBy.
 // See: https://github.com/final-hill/cathedral/issues/371
-export const groupBy = function <K extends PropertyKey, T>(items: Iterable<T>, keySelector: (item: T, index: number) => K): Partial<Record<K, T[]>> {
+export default function <K extends PropertyKey, T>(items: Iterable<T>, keySelector: (item: T, index: number) => K): Partial<Record<K, T[]>> {
     return [...items].reduce((acc, item, index) => {
         const key = keySelector(item, index),
             group = (acc as any)[key as any] ?? ((acc as any)[key as any] = [])

diff --git a/utils/slugify.test.ts → shared/slugify.test.ts b/utils/slugify.test.ts → shared/slugify.test.ts
diff --git a/utils/slugify.ts → shared/slugify.ts b/utils/slugify.ts → shared/slugify.ts
diff --git a/utils/snakeCaseToSlug.test.ts → shared/snakeCaseToSlug.test.ts b/utils/snakeCaseToSlug.test.ts → shared/snakeCaseToSlug.test.ts
diff --git a/utils/snakeCaseToSlug.ts → shared/snakeCaseToSlug.ts b/utils/snakeCaseToSlug.ts → shared/snakeCaseToSlug.ts
diff --git a/utils/snakeCaseToTitle.test.ts → shared/snakeCaseToTitle.test.ts b/utils/snakeCaseToTitle.test.ts → shared/snakeCaseToTitle.test.ts
diff --git a/utils/snakeCaseToTitle.ts → shared/snakeCaseToTitle.ts b/utils/snakeCaseToTitle.ts → shared/snakeCaseToTitle.ts