@headless-lms/core 0.7.0 → 0.8.0

package/dist/content/events.d.ts

@@ -58,7 +58,6 @@ declare const contentEvents: {
     updatedAt: z.ZodCoercedDate<unknown>;
     title: z.ZodString;
     description: z.ZodString;
-    category: z.ZodString;
     settings: z.ZodObject<{
       transcriptDownloads: z.ZodBoolean;
       comments: z.ZodOptional<z.ZodObject<{
@@ -69,6 +68,7 @@ declare const contentEvents: {
       }, z.core.$strict>>;
     }, z.core.$strict>;
     slug: z.ZodString;
+    category: z.ZodString;
     thumbnailAssetId: z.ZodNullable<z.ZodString>;
   }, z.core.$strip>>;
   courseUpdated: RuntimeEventDefinition<VersionedDomainEvent<{
@@ -125,7 +125,6 @@ declare const contentEvents: {
     updatedAt: z.ZodCoercedDate<unknown>;
     title: z.ZodString;
     description: z.ZodString;
-    category: z.ZodString;
     settings: z.ZodObject<{
       transcriptDownloads: z.ZodBoolean;
       comments: z.ZodOptional<z.ZodObject<{
@@ -136,6 +135,7 @@ declare const contentEvents: {
       }, z.core.$strict>>;
     }, z.core.$strict>;
     slug: z.ZodString;
+    category: z.ZodString;
     thumbnailAssetId: z.ZodNullable<z.ZodString>;
   }, z.core.$strip>>;
   courseDeleted: RuntimeEventDefinition<VersionedDomainEvent<{
@@ -192,7 +192,6 @@ declare const contentEvents: {
     updatedAt: z.ZodCoercedDate<unknown>;
     title: z.ZodString;
     description: z.ZodString;
-    category: z.ZodString;
     settings: z.ZodObject<{
       transcriptDownloads: z.ZodBoolean;
       comments: z.ZodOptional<z.ZodObject<{
@@ -203,6 +202,7 @@ declare const contentEvents: {
       }, z.core.$strict>>;
     }, z.core.$strict>;
     slug: z.ZodString;
+    category: z.ZodString;
     thumbnailAssetId: z.ZodNullable<z.ZodString>;
   }, z.core.$strip>>;
   moduleCreated: RuntimeEventDefinition<VersionedDomainEvent<{
@@ -328,9 +328,9 @@ declare const contentEvents: {
     id: z.ZodString;
     createdAt: z.ZodCoercedDate<unknown>;
     updatedAt: z.ZodCoercedDate<unknown>;
-    moduleId: z.ZodString;
     courseId: z.ZodString;
     seq: z.ZodNumber;
+    moduleId: z.ZodString;
   }, z.core.$strip>>;
   activityUpdated: RuntimeEventDefinition<VersionedDomainEvent<{
     orgId: string;
@@ -355,9 +355,9 @@ declare const contentEvents: {
     id: z.ZodString;
     createdAt: z.ZodCoercedDate<unknown>;
     updatedAt: z.ZodCoercedDate<unknown>;
-    moduleId: z.ZodString;
     courseId: z.ZodString;
     seq: z.ZodNumber;
+    moduleId: z.ZodString;
   }, z.core.$strip>>;
   activityDeleted: RuntimeEventDefinition<VersionedDomainEvent<{
     orgId: string;
@@ -382,9 +382,9 @@ declare const contentEvents: {
     id: z.ZodString;
     createdAt: z.ZodCoercedDate<unknown>;
     updatedAt: z.ZodCoercedDate<unknown>;
-    moduleId: z.ZodString;
     courseId: z.ZodString;
     seq: z.ZodNumber;
+    moduleId: z.ZodString;
   }, z.core.$strip>>;
   activityPublished: RuntimeEventDefinition<VersionedDomainEvent<{
     activityId: string;
@@ -460,8 +460,8 @@ declare const contentEvents: {
     updatedAt: z.ZodCoercedDate<unknown>;
     title: z.ZodString;
     description: z.ZodString;
-    category: z.ZodString;
     slug: z.ZodString;
+    category: z.ZodString;
     thumbnailAssetId: z.ZodNullable<z.ZodString>;
   }, z.core.$strip>>;
   downloadUpdated: RuntimeEventDefinition<VersionedDomainEvent<{
@@ -500,8 +500,8 @@ declare const contentEvents: {
     updatedAt: z.ZodCoercedDate<unknown>;
     title: z.ZodString;
     description: z.ZodString;
-    category: z.ZodString;
     slug: z.ZodString;
+    category: z.ZodString;
     thumbnailAssetId: z.ZodNullable<z.ZodString>;
   }, z.core.$strip>>;
   downloadDeleted: RuntimeEventDefinition<VersionedDomainEvent<{
@@ -540,8 +540,8 @@ declare const contentEvents: {
     updatedAt: z.ZodCoercedDate<unknown>;
     title: z.ZodString;
     description: z.ZodString;
-    category: z.ZodString;
     slug: z.ZodString;
+    category: z.ZodString;
     thumbnailAssetId: z.ZodNullable<z.ZodString>;
   }, z.core.$strip>>;
   downloadAssetAdded: RuntimeEventDefinition<VersionedDomainEvent<{
@@ -576,8 +576,8 @@ declare const contentEvents: {
       createdAt: z.ZodCoercedDate<unknown>;
       updatedAt: z.ZodCoercedDate<unknown>;
       seq: z.ZodNumber;
-      assetId: z.ZodString;
       downloadId: z.ZodString;
+      assetId: z.ZodString;
       displayName: z.ZodNullable<z.ZodString>;
     }, z.core.$strip>>;
   }, z.core.$strip>>;
@@ -613,8 +613,8 @@ declare const contentEvents: {
       createdAt: z.ZodCoercedDate<unknown>;
       updatedAt: z.ZodCoercedDate<unknown>;
       seq: z.ZodNumber;
-      assetId: z.ZodString;
       downloadId: z.ZodString;
+      assetId: z.ZodString;
       displayName: z.ZodNullable<z.ZodString>;
     }, z.core.$strip>>;
   }, z.core.$strip>>;
@@ -650,8 +650,8 @@ declare const contentEvents: {
       createdAt: z.ZodCoercedDate<unknown>;
       updatedAt: z.ZodCoercedDate<unknown>;
       seq: z.ZodNumber;
-      assetId: z.ZodString;
       downloadId: z.ZodString;
+      assetId: z.ZodString;
       displayName: z.ZodNullable<z.ZodString>;
     }, z.core.$strip>>;
   }, z.core.$strip>>;
@@ -687,8 +687,8 @@ declare const contentEvents: {
       createdAt: z.ZodCoercedDate<unknown>;
       updatedAt: z.ZodCoercedDate<unknown>;
       seq: z.ZodNumber;
-      assetId: z.ZodString;
       downloadId: z.ZodString;
+      assetId: z.ZodString;
       displayName: z.ZodNullable<z.ZodString>;
     }, z.core.$strip>>;
   }, z.core.$strip>>;

package/dist/content/service.d.ts

@@ -14,7 +14,7 @@ type ContentServiceParams = {
   repo: ContentRepository;
   uow: ContentUnitOfWork;
   libraryAssets: ContentAssetReader;
-  files: Pick<AssetFiles, 'readyFiles' | 'syncPublicImages'>;
+  files: Pick<AssetFiles, 'readyFiles' | 'fileLinks' | 'syncPublicImages'>;
   fileUrls: FileUrls;
   scheduler: Pick<Scheduler, 'at' | 'cancel'>;
   logger?: Logger;
@@ -32,15 +32,18 @@ declare class ContentService implements CourseManagementService, DownloadablesSe
   private requireAny;
   private visibleIds;
   private withThumbnail;
+  private withThumbnails;
   private syncThumbnail;
   private withdrawThumbnail;
   private spaceView;
+  private spaceViews;
   private communityPublished;
   private oneSpaceView;
   private syncSpaceImages;
   private pageWithThumbnails;
   private downloadFiles;
   private eventFiles;
+  private listedFiles;
   private assertAttachable;
   private courseAssetIds;
   private downloadAssetIds;

package/dist/content/service.js

@@ -93,11 +93,17 @@ var ContentService = class {
 		}
 		return ids;
 	}
-	withThumbnail(item) {
-		return {
+	async withThumbnail(item) {
+		const [view] = await this.withThumbnails([item]);
+		return view;
+	}
+	async withThumbnails(items) {
+		const gated = items.flatMap((item) => item.thumbnailAssetId && !shownPublicly(item) ? [{ assetId: item.thumbnailAssetId }] : []);
+		const links = gated.length > 0 ? await this.files.fileLinks(items[0].orgId, gated) : {};
+		return items.map((item) => ({
 			...item,
-			thumbnailUrl: !item.thumbnailAssetId ? null : shownPublicly(item) ? this.fileUrls.publicImage(item.orgId, item.id, item.thumbnailAssetId) : this.fileUrls.thumbnail(item.type, item.id)
-		};
+			thumbnailUrl: !item.thumbnailAssetId ? null : shownPublicly(item) ? this.fileUrls.publicImage(item.orgId, item.id, item.thumbnailAssetId) : links[item.thumbnailAssetId] ?? null
+		}));
 	}
 	syncThumbnail(item) {
 		return this.files.syncPublicImages(item.orgId, item.id, shownPublicly(item) && item.thumbnailAssetId ? [item.thumbnailAssetId] : []);
@@ -105,14 +111,22 @@ var ContentService = class {
 	withdrawThumbnail(orgId, id) {
 		return this.files.syncPublicImages(orgId, id, []);
 	}
-	spaceView(space, published) {
-		const url = (image, assetId) => !assetId ? null : published ? this.fileUrls.publicImage(space.orgId, space.id, assetId) : this.fileUrls.spaceImage(space.id, image);
-		return {
-			...space,
-			coverUrl: url("cover", space.coverAssetId),
-			backgroundUrl: url("background", space.backgroundAssetId),
-			iconUrl: url("icon", space.iconAssetId)
-		};
+	async spaceView(space, published) {
+		const [view] = await this.spaceViews([space], published);
+		return view;
+	}
+	async spaceViews(spaces, published) {
+		const gated = published ? [] : spaces.flatMap((space) => spaceImageIds(space));
+		const links = gated.length > 0 ? await this.files.fileLinks(spaces[0].orgId, gated.map((assetId) => ({ assetId }))) : {};
+		return spaces.map((space) => {
+			const url = (assetId) => !assetId ? null : published ? this.fileUrls.publicImage(space.orgId, space.id, assetId) : links[assetId] ?? null;
+			return {
+				...space,
+				coverUrl: url(space.coverAssetId),
+				backgroundUrl: url(space.backgroundAssetId),
+				iconUrl: url(space.iconAssetId)
+			};
+		});
 	}
 	async communityPublished(orgId, communityId) {
 		return (await this.repo.findCommunityById(orgId, communityId))?.status === "published";
@@ -123,31 +137,34 @@ var ContentService = class {
 	syncSpaceImages(space, published) {
 		return this.files.syncPublicImages(space.orgId, space.id, published ? spaceImageIds(space) : []);
 	}
-	pageWithThumbnails(page) {
+	async pageWithThumbnails(page) {
 		return {
 			...page,
-			rows: page.rows.map((row) => this.withThumbnail(row))
+			rows: await this.withThumbnails(page.rows)
 		};
 	}
-	async downloadFiles(orgId, links) {
+	downloadFiles(orgId, links) {
+		return this.listedFiles(orgId, links);
+	}
+	eventFiles(orgId, links) {
+		return this.listedFiles(orgId, links);
+	}
+	async listedFiles(orgId, links) {
 		const ready = await this.files.readyFiles(orgId, links.map((link) => link.assetId));
-		return links.flatMap((link) => {
+		const urls = await this.files.fileLinks(orgId, links.flatMap((link) => {
 			const file = ready[link.assetId];
 			return file ? [{
-				...link,
-				...file,
-				url: this.fileUrls.downloadFile(link.downloadId, link.assetId)
+				assetId: link.assetId,
+				saveAs: link.displayName ?? file.filename
 			}] : [];
-		});
-	}
-	async eventFiles(orgId, links) {
-		const ready = await this.files.readyFiles(orgId, links.map((link) => link.assetId));
+		}));
 		return links.flatMap((link) => {
 			const file = ready[link.assetId];
-			return file ? [{
+			const url = urls[link.assetId];
+			return file && url ? [{
 				...link,
 				...file,
-				url: this.fileUrls.eventFile(link.eventId, link.assetId)
+				url
 			}] : [];
 		});
 	}
@@ -321,9 +338,13 @@ var ContentService = class {
 	async listCourseActivityViews(courseId, actor) {
 		this.require(actor, "courses:read", courseId);
 		const [activities, links] = await Promise.all([this.repo.listActivitiesForCourse(actor.orgId, courseId), this.repo.listActivityAssetsForCourse(actor.orgId, courseId)]);
+		const urls = await this.files.fileLinks(actor.orgId, links.map((link) => ({ assetId: link.assetId })));
 		return activities.map((activity) => ({
 			...activity,
-			assetUrls: Object.fromEntries(links.filter((link) => link.activityId === activity.id).map((link) => [link.assetId, this.fileUrls.activityAsset(activity.id, link.assetId)]))
+			assetUrls: Object.fromEntries(links.flatMap((link) => {
+				const url = urls[link.assetId];
+				return link.activityId === activity.id && url ? [[link.assetId, url]] : [];
+			}))
 		}));
 	}
 	async listCourseActivityAssets(courseId, actor) {
@@ -763,7 +784,8 @@ var ContentService = class {
 	async findEvents(ids, actor) {
 		for (const id of ids) this.require(actor, "events:read", id);
 		if (ids.length === 0) return [];
-		return (await this.repo.findEventsByIds(actor.orgId, ids)).map((event) => this.withThumbnail(event));
+		const found = await this.repo.findEventsByIds(actor.orgId, ids);
+		return this.withThumbnails(found);
 	}
 	async createEvent(input, actor) {
 		this.require(actor, "events:write");
@@ -1269,7 +1291,8 @@ var ContentService = class {
 		this.requireAny(actor, COMMUNITY_READERS, communityId);
 		const community = await this.repo.findCommunityById(actor.orgId, communityId);
 		if (!community) throw new NotFoundError("Community", communityId);
-		return (await this.repo.listSpaces(actor.orgId, communityId)).map((space) => this.spaceView(space, community.status === "published"));
+		const spaces = await this.repo.listSpaces(actor.orgId, communityId);
+		return this.spaceViews(spaces, community.status === "published");
 	}
 	async getDmSettings(communityId, actor) {
 		this.require(actor, "communities:read", communityId);
@@ -1529,7 +1552,7 @@ var ContentService = class {
 			actorId: actor.id
 		});
 		const published = await this.communityPublished(orgId, communityId);
-		return spaces.map((space) => this.spaceView(space, published));
+		return this.spaceViews(spaces, published);
 	}
 	async setSpaceTopics(communityId, spaceId, input, actor) {
 		this.require(actor, "communities:write", communityId);