erudit 4.0.0-dev.4 → 4.0.0-dev.5

package/server/erudit/prose/repository/get.ts

@@ -1,54 +1,54 @@
-import { eq } from 'drizzle-orm';
-import type { AnySchema, ProseElement } from '@jsprose/core';
-import type { ContentProseType } from '@erudit-js/core/content/prose';
-import { isTopicPart } from '@erudit-js/core/content/topic';
-
-export async function getContentProse(
-    contentType: ContentProseType,
-    contentId: string,
-): Promise<ProseElement<AnySchema>> {
-    const navNode = ERUDIT.contentNav.getNodeOrThrow(contentId);
-    const fullContentId = navNode.fullId;
-
-    if (isTopicPart(contentType)) {
-        const dbTopic = (await ERUDIT.db.query.topics.findFirst({
-            columns: {
-                [contentType]: true,
-            },
-            where: eq(ERUDIT.db.schema.topics.fullId, fullContentId),
-        }))!;
-
-        // @ts-expect-error we know that contentType is a valid key here
-        return dbTopic[contentType]!;
-    }
-
-    if (contentType === 'page') {
-        const dbPage = (await ERUDIT.db.query.pages.findFirst({
-            columns: {
-                prose: true,
-            },
-            where: eq(ERUDIT.db.schema.pages.fullId, fullContentId),
-        }))!;
-        return dbPage.prose;
-    }
-
-    throw createError({
-        statusCode: 400,
-        statusMessage: `Unable to get prose for content ${contentType} "${contentId}"!`,
-    });
-}
-
-export async function getContributorProse(
-    contributorId: string,
-): Promise<ProseElement<AnySchema> | undefined> {
-    const dbContributor = await ERUDIT.db.query.contributors.findFirst({
-        columns: {
-            description: true,
-        },
-        where: eq(ERUDIT.db.schema.contributors.contributorId, contributorId),
-    });
-
-    return dbContributor?.description || undefined;
-}
-
-// @TODO: Get news item prose
+import { eq } from 'drizzle-orm';
+import type { AnySchema, ProseElement } from '@jsprose/core';
+import type { ContentProseType } from '@erudit-js/core/content/prose';
+import { isTopicPart } from '@erudit-js/core/content/topic';
+
+export async function getContentProse(
+  contentType: ContentProseType,
+  contentId: string,
+): Promise<ProseElement<AnySchema>> {
+  const navNode = ERUDIT.contentNav.getNodeOrThrow(contentId);
+  const fullContentId = navNode.fullId;
+
+  if (isTopicPart(contentType)) {
+    const dbTopic = (await ERUDIT.db.query.topics.findFirst({
+      columns: {
+        [contentType]: true,
+      },
+      where: eq(ERUDIT.db.schema.topics.fullId, fullContentId),
+    }))!;
+
+    // @ts-expect-error we know that contentType is a valid key here
+    return dbTopic[contentType]!;
+  }
+
+  if (contentType === 'page') {
+    const dbPage = (await ERUDIT.db.query.pages.findFirst({
+      columns: {
+        prose: true,
+      },
+      where: eq(ERUDIT.db.schema.pages.fullId, fullContentId),
+    }))!;
+    return dbPage.prose;
+  }
+
+  throw createError({
+    statusCode: 400,
+    statusMessage: `Unable to get prose for content ${contentType} "${contentId}"!`,
+  });
+}
+
+export async function getContributorProse(
+  contributorId: string,
+): Promise<ProseElement<AnySchema> | undefined> {
+  const dbContributor = await ERUDIT.db.query.contributors.findFirst({
+    columns: {
+      description: true,
+    },
+    where: eq(ERUDIT.db.schema.contributors.contributorId, contributorId),
+  });
+
+  return dbContributor?.description || undefined;
+}
+
+// @TODO: Get news item prose

package/server/erudit/prose/repository/resolve.ts

@@ -1,17 +1,17 @@
-import type { AnySchema, RawElement } from '@jsprose/core';
-import { resolveEruditRawElement, type ResolveStep } from '@erudit-js/prose';
-
-export async function resolveEruditProse(
-    rawElement: RawElement<AnySchema>,
-    linkable: boolean,
-    step?: ResolveStep,
-) {
-    return await resolveEruditRawElement({
-        context: {
-            language: ERUDIT.config.public.project.language.current,
-            linkable,
-        },
-        rawElement,
-        step,
-    });
-}
+import type { AnySchema, RawElement } from '@jsprose/core';
+import { resolveEruditRawElement, type ResolveStep } from '@erudit-js/prose';
+
+export async function resolveEruditProse(
+  rawElement: RawElement<AnySchema>,
+  linkable: boolean,
+  step?: ResolveStep,
+) {
+  return await resolveEruditRawElement({
+    context: {
+      language: ERUDIT.config.public.language.current,
+      linkable,
+    },
+    rawElement,
+    step,
+  });
+}

package/server/erudit/prose/storage/callout.ts

@@ -1,14 +1,16 @@
-import type { ProseElement, GenericStorage } from '@jsprose/core';
-import type { calloutSchema } from '@erudit-js/prose/elements/callout/core';
-import { createCalloutStorage as _createCalloutStorage } from '@erudit-js/prose/elements/callout/storage';
-
-export async function createCalloutStorage(
-    element: ProseElement<typeof calloutSchema>,
-    storage: GenericStorage,
-) {
-    storage[element.storageKey!] = _createCalloutStorage(
-        ERUDIT.config.paths.project,
-        ERUDIT.config.public.project.baseUrl,
-        element.data.iconSrc,
-    );
-}
+import type { ProseElement, GenericStorage } from '@jsprose/core';
+import type { calloutSchema } from '@erudit-js/prose/elements/callout/core';
+import { createCalloutStorage as _createCalloutStorage } from '@erudit-js/prose/elements/callout/storage';
+
+export async function createCalloutStorage(
+  element: ProseElement<typeof calloutSchema>,
+  storage: GenericStorage,
+) {
+  const runtimeConfig = useRuntimeConfig();
+
+  storage[element.storageKey!] = _createCalloutStorage(
+    ERUDIT.paths.project(),
+    runtimeConfig.app.baseURL,
+    element.data.iconSrc,
+  );
+}

package/server/erudit/prose/storage/image.ts

@@ -1,20 +1,22 @@
-import type { GenericStorage, ProseElement } from '@jsprose/core';
-import type {
-    imageSchema,
-    ImageStorage,
-} from '@erudit-js/prose/elements/image/core';
-import { createImageStorage as _createImageStorage } from '@erudit-js/prose/elements/image/storage';
-
-export async function createImageStorage(
-    element: ProseElement<typeof imageSchema>,
-    storage: GenericStorage,
-) {
-    const imageAbsPath = element.data.src;
-    const imageStorage = await _createImageStorage(
-        ERUDIT.config.paths.project,
-        ERUDIT.config.public.project.baseUrl,
-        imageAbsPath,
-    );
-
-    storage[element.storageKey!] = imageStorage satisfies ImageStorage;
-}
+import type { GenericStorage, ProseElement } from '@jsprose/core';
+import type {
+  imageSchema,
+  ImageStorage,
+} from '@erudit-js/prose/elements/image/core';
+import { createImageStorage as _createImageStorage } from '@erudit-js/prose/elements/image/storage';
+
+export async function createImageStorage(
+  element: ProseElement<typeof imageSchema>,
+  storage: GenericStorage,
+) {
+  const runtimeConfig = useRuntimeConfig();
+
+  const imageAbsPath = element.data.src;
+  const imageStorage = await _createImageStorage(
+    ERUDIT.paths.project(),
+    runtimeConfig.app.baseURL,
+    imageAbsPath,
+  );
+
+  storage[element.storageKey!] = imageStorage satisfies ImageStorage;
+}