@phtngyn/cms 0.1.0-beta.5 → 0.2.0-beta.2

package/src/{S3MediaObjects-CpPSzJto.js → S3MediaObjects-D5Ns4FM6.js}

@@ -1,12 +1,12 @@
 import { c as RevisionId, d as SourcePath, f as nonNegativeInt, i as DocumentVersion, n as DocumentHistoryCursor, o as PublicPath, r as DocumentId, s as RelativeDocumentPath, t as DocumentGeneration, u as Slug } from "./scalars-B2lgGUnj.js";
-import { i as FormResult, o as FormSubmission } from "./Forms-CfcI3tPU.js";
-import { a as encodeCmsEditorComponentAttributes, d as createCmsComarkRenderData, m as toComarkDocument, p as mutableJsonObject, s as projectCmsEditorComponentAttributes } from "./Forms-Dj6NuW66.js";
-import { $ as StudioActor, B as SeoMediaUnavailable, C as PublishedDocumentLookup, D as RemoveDocumentInput, E as PublishedDocumentSurroundQuery, Et as RequestId, F as SaveSeoInput, G as SeoUrl, I as SeoCanonicalOrigin, J as AccessDenied, K as SeoVersionConflict, L as SeoCapabilities, N as GlobalSeoSettings, O as RestoreDocumentInput, P as PublishSeoInput, Q as Role, R as SeoConfiguration, S as PublishDocumentInput, T as PublishedDocumentQuery, U as SeoSnapshot, V as SeoMutationResult, W as SeoState, X as DOCUMENT_ACTIONS, Y as AuthenticationRequired, Z as MEDIA_ACTIONS, _ as DocumentSurround, _t as MediaReference, at as MediaCleanupReport, bt as MediaTooLarge, c as DocumentIssue, ct as MediaFolder, d as DocumentNavigationQuery, dt as MediaInvalid, et as StudioEntryDenied, f as DocumentQueryScalar, g as DocumentSummary, gt as MediaQuery, ht as MediaPage, i as CreateDocumentInput, it as MediaByteSize, j as UpdateDocumentInput, k as UndeleteDocumentInput, l as DocumentMutationResult, lt as MediaId, m as DocumentSource, mt as MediaObjectKey, n as CmsMarkdownDocument, nt as ImageMimeType, o as DeletedDocument, ot as MediaConflict, p as DocumentRevisionAction, pt as MediaNotFound, q as SitemapEntry, r as CompiledDocument, rt as MediaAsset, s as DocumentBrowseQuery, u as DocumentNavigationItem, ut as MediaIntegrityReport, v as DocumentValidationResult, vt as MediaReferenced, w as PublishedDocumentPage, x as MoveDocumentInput, xt as MediaUpload, y as DuplicateDocumentInput, z as SeoConfirmationRequired } from "./models-Bah5B3bT.js";
+import { $ as StudioActor, B as SeoMediaUnavailable, C as PublishedDocumentLookup, D as RemoveDocumentInput, E as PublishedDocumentSurroundQuery, Et as RequestId, F as SaveSeoInput, G as SeoUrl, I as SeoCanonicalOrigin, J as AccessDenied, K as SeoVersionConflict, L as SeoCapabilities, N as GlobalSeoSettings, O as RestoreDocumentInput, P as PublishSeoInput, Q as Role, R as SeoConfiguration, S as PublishDocumentInput, T as PublishedDocumentQuery, U as SeoSnapshot, V as SeoMutationResult, W as SeoState, X as DOCUMENT_ACTIONS, Y as AuthenticationRequired, Z as MEDIA_ACTIONS, _ as DocumentSurround, _t as MediaReference, at as MediaCleanupReport, bt as MediaTooLarge, c as DocumentIssue, ct as MediaFolder, d as DocumentNavigationQuery, dt as MediaInvalid, et as StudioEntryDenied, f as DocumentQueryScalar, g as DocumentSummary, gt as MediaQuery, ht as MediaPage, i as CreateDocumentInput, it as MediaByteSize, j as UpdateDocumentInput, k as UndeleteDocumentInput, l as DocumentMutationResult, lt as MediaId, m as DocumentSource, mt as MediaObjectKey, n as CmsMarkdownDocument, nt as ImageMimeType, o as DeletedDocument, ot as MediaConflict, p as DocumentRevisionAction, pt as MediaNotFound, q as SitemapEntry, r as CompiledDocument, rt as MediaAsset, s as DocumentBrowseQuery, u as DocumentNavigationItem, ut as MediaIntegrityReport, v as DocumentValidationResult, vt as MediaReferenced, w as PublishedDocumentPage, x as MoveDocumentInput, xt as MediaUpload, y as DuplicateDocumentInput, z as SeoConfirmationRequired } from "./models-ChRxBChy.js";
+import { i as ContentSnapshot, n as ContentApplyResult, o as ContentTransferConflict, r as ContentPlan, s as ContentTransferInput, t as ContentApplyInput } from "./ContentTransfer-BhF9G56s.js";
 import { u as STUDIO_API_PATH } from "./HttpPaths-c9nLZ9H2.js";
+import { c as FormSubmission, o as FormResult } from "./Forms-BbkE7QfC.js";
+import { a as encodeCmsEditorComponentAttributes, d as createCmsComarkRenderData, m as toComarkDocument, p as mutableJsonObject, s as projectCmsEditorComponentAttributes } from "./Forms-DoB56hfe.js";
 import { i as withoutEditorMetadata } from "./metadata-BEZPWh-3.js";
-import { d as EditorRenderFailed, i as MediaConfiguration, r as DocumentConfiguration } from "./Configuration-CDMYfTre.js";
-import { i as ContentSnapshot, n as ContentApplyResult, o as ContentTransferConflict, r as ContentPlan, s as ContentTransferInput, t as ContentApplyInput } from "./ContentTransfer-C3Av9sWz.js";
-import { a as normalizeDocumentRelativePath, c as resolveDocumentAddress, i as localizeDocumentPath, n as referenceTarget, o as normalizePublicPath, r as DocumentCompilationFailed, s as parseDocumentAddress, t as createDocumentEngine } from "./DocumentEngine-J7g-emdf.js";
+import { d as EditorRenderFailed, i as MediaConfiguration, r as DocumentConfiguration } from "./Configuration-BU-UyGoH.js";
+import { a as normalizeDocumentRelativePath, c as resolveDocumentAddress, i as localizeDocumentPath, n as referenceTarget, o as normalizePublicPath, r as DocumentCompilationFailed, s as parseDocumentAddress, t as createDocumentEngine } from "./DocumentEngine-ClhFXW9M.js";
 import { Context, Crypto, Data, DateTime, Effect, Encoding, Layer, Option, Predicate, PubSub, Redacted, Ref, Result, Schedule, Schema, Semaphore, Stream, flow } from "effect";
 import { NodeStream } from "@effect/platform-node-shared";
 import { Multipart } from "effect/unstable/http";
@@ -559,7 +559,8 @@ const StudioDocumentsApi = HttpApiGroup.make("documents").add(HttpApiEndpoint.ge
 	params: { documentId: DocumentId },
 	payload: Schema.Struct({
 		...MoveDocumentPayload.fields,
-		includeChildren: DuplicateDocumentInput.fields.includeChildren
+		includeChildren: DuplicateDocumentInput.fields.includeChildren,
+		locale: DuplicateDocumentInput.fields.locale
 	}),
 	success: DocumentMutationResult,
 	error: MutationErrors
@@ -1244,7 +1245,7 @@ const prepareTreeMutation = Effect.fn("Documents.prepareTreeMutation")(function*
 			sourcePath: root.sourcePath
 		}) ?? "";
 		const nextRelative = destination.kind === "home" ? "" : [destination.parent, destination.slug].filter(Boolean).join("/");
-		if (rootRelative && (nextRelative === rootRelative || nextRelative.startsWith(`${rootRelative}/`))) return yield* invalid("Choose a destination outside this page and its subpages.");
+		if (!(command.action === "document.duplicate" && command.input.locale !== void 0 && command.input.locale !== parent.locale) && rootRelative && (nextRelative === rootRelative || nextRelative.startsWith(`${rootRelative}/`))) return yield* invalid("Choose a destination outside this page and its subpages.");
 		const relative = documentRelativePath(collection, {
 			document: page,
 			sourcePath: source.sourcePath
@@ -1255,8 +1256,9 @@ const prepareTreeMutation = Effect.fn("Documents.prepareTreeMutation")(function*
 			kind: "entry",
 			slug: yield* decodeSlug(slug)
 		}, segments.length ? { parent: yield* decodeParent(segments.join("/")) } : void 0) : { kind: "home" };
-		const sourcePath = yield* Effect.fromResult(planDocumentMove(configuration, page, location));
-		const markdown = yield* relocateDocumentMarkdown(configuration, page, location, source.markdown).pipe(Effect.mapError(() => invalid("The page could not be copied to its new URL.")));
+		const destinationPage = command.action === "document.duplicate" && command.input.locale ? Object.assign({}, page, { locale: command.input.locale }) : page;
+		const sourcePath = yield* Effect.fromResult(planDocumentMove(configuration, destinationPage, location));
+		const markdown = yield* relocateDocumentMarkdown(configuration, destinationPage, location, source.markdown).pipe(Effect.mapError(() => invalid("The page could not be copied to its new URL.")));
 		if (command.action === "document.duplicate") {
 			const documentId = yield* command.nextDocumentId;
 			plans.push({
@@ -1694,7 +1696,7 @@ const commitDocumentMutation = Effect.fn("Documents.commitMutation")(function* (
 				resource: {
 					kind: "collection",
 					collection: source.collection,
-					locale: source.locale
+					locale: command.input.locale ?? source.locale
 				}
 			});
 		}
@@ -2191,6 +2193,7 @@ const makeDocuments = Effect.fn("Documents.make")(function* (configuration, opti
 		return ContentSnapshot.make({
 			version: 1,
 			sources: current.snapshot.active.map((source) => ({
+				documentId: source.documentId,
 				sourcePath: source.sourcePath,
 				markdown: source.markdown,
 				published: source.publishedVersion === source.version
@@ -2431,17 +2434,30 @@ const seoDeliveryLayer = Layer.effect(SeoDelivery, Effect.gen(function* () {
 	const previews = yield* PreviewSeo;
 	const published = yield* PublishedSeo;
 	const documents = yield* PublishedDocuments;
-	const resolveWith = (document, snapshot) => CompiledDocument.make(Object.assign({}, document, { resolvedSeo: resolveDocumentSeo({
-		capabilities: snapshot.capabilities,
-		document,
-		global: snapshot.revision.settings
-	}) }));
-	const publishedDocument = Effect.fn("SeoDelivery.publishedDocument")((document) => published.read.pipe(Effect.map((snapshot) => resolveWith(document, snapshot))));
-	const previewDocument = Effect.fn("SeoDelivery.previewDocument")((document) => previews.read.pipe(Effect.map((snapshot) => resolveWith(document, snapshot))));
+	const alternatives = (document) => documents.snapshot.pipe(Effect.map((snapshot) => snapshot.flatMap((candidate) => candidate.key === document.key && candidate.locale !== void 0 ? [{
+		locale: candidate.locale,
+		path: candidate.path
+	}] : [])));
+	const resolveWith = (document, snapshot, localized) => CompiledDocument.make(Object.assign({}, document, {
+		alternatives: localized,
+		resolvedSeo: resolveDocumentSeo({
+			capabilities: snapshot.capabilities,
+			document,
+			global: snapshot.revision.settings
+		})
+	}));
+	const publishedDocument = Effect.fn("SeoDelivery.publishedDocument")((document) => Effect.all({
+		snapshot: published.read,
+		alternatives: alternatives(document)
+	}).pipe(Effect.map(({ alternatives, snapshot }) => resolveWith(document, snapshot, alternatives))));
+	const previewDocument = Effect.fn("SeoDelivery.previewDocument")((document) => Effect.all({
+		snapshot: previews.read,
+		alternatives: alternatives(document)
+	}).pipe(Effect.map(({ alternatives, snapshot }) => resolveWith(document, snapshot, alternatives))));
 	const sitemap = Effect.gen(function* () {
 		const snapshot = yield* published.read;
 		const resolved = (yield* documents.snapshot).flatMap((document) => {
-			const resolvedDocument = resolveWith(document, snapshot);
+			const resolvedDocument = resolveWith(document, snapshot, []);
 			return resolvedDocument.resolvedSeo?.index === true && resolvedDocument.source.publishedAt !== void 0 ? [resolvedDocument] : [];
 		});
 		const localesByKey = /* @__PURE__ */ new Map();
@@ -2600,30 +2616,30 @@ function s3MediaObjectStoreLayer(options) {
 }
 function makeStore(options, client) {
 	return {
-		list: listObjects(options.bucket, client),
-		promote: (input) => promoteObject(options.bucket, input, client),
-		put: (input) => putObject(options.bucket, input, client),
+		list: listObjects(options.bucket, options.prefix, client),
+		promote: (input) => promoteObject(options.bucket, options.prefix, input, client),
+		put: (input) => putObject(options.bucket, options.prefix, input, client),
 		remove: (objectKey) => providerRequest("MediaObjectStore.S3.remove", client.deleteObject({
 			bucket: options.bucket,
-			key: objectKey
+			key: physicalKey(options.prefix, objectKey)
 		})),
-		stat: (objectKey) => statObject(options.bucket, objectKey, client)
+		stat: (objectKey) => statObject(options.bucket, options.prefix, objectKey, client)
 	};
 }
-function promoteObject(bucket, input, client) {
+function promoteObject(bucket, prefix, input, client) {
 	if (input.byteSize > 5e9) return Effect.fail(storageError("MediaObjectStore.S3.promote", "The object exceeds the S3 single-copy size limit."));
-	return statObject(bucket, input.sourceObjectKey, client).pipe(Effect.flatMap((source) => Option.isSome(source) && source.value.byteSize === input.byteSize && source.value.mimeType === input.mimeType ? Effect.void : Effect.fail(storageError("MediaObjectStore.S3.promote.source", "The staged object metadata does not match its intent."))), Effect.flatMap(() => providerRequest("MediaObjectStore.S3.promote.copy", client.copyObject({
+	return statObject(bucket, prefix, input.sourceObjectKey, client).pipe(Effect.flatMap((source) => Option.isSome(source) && source.value.byteSize === input.byteSize && source.value.mimeType === input.mimeType ? Effect.void : Effect.fail(storageError("MediaObjectStore.S3.promote.source", "The staged object metadata does not match its intent."))), Effect.flatMap(() => providerRequest("MediaObjectStore.S3.promote.copy", client.copyObject({
 		bucket,
 		cacheControl: replaceableMediaCacheControl,
 		contentType: input.mimeType,
-		copySource: copySource(bucket, input.sourceObjectKey),
-		key: input.destinationObjectKey
-	}))), Effect.flatMap(() => statObject(bucket, input.destinationObjectKey, client)), Effect.flatMap((destination) => Option.isSome(destination) && destination.value.byteSize === input.byteSize && destination.value.mimeType === input.mimeType ? Effect.succeed(destination.value) : Effect.fail(storageError("MediaObjectStore.S3.promote.verify", "The promoted object metadata does not match its intent."))));
+		copySource: copySource(bucket, physicalKey(prefix, input.sourceObjectKey)),
+		key: physicalKey(prefix, input.destinationObjectKey)
+	}))), Effect.flatMap(() => statObject(bucket, prefix, input.destinationObjectKey, client)), Effect.flatMap((destination) => Option.isSome(destination) && destination.value.byteSize === input.byteSize && destination.value.mimeType === input.mimeType ? Effect.succeed(destination.value) : Effect.fail(storageError("MediaObjectStore.S3.promote.verify", "The promoted object metadata does not match its intent."))));
 }
 function copySource(bucket, objectKey) {
 	return `/${encodeURIComponent(bucket)}/${objectKey.split("/").map(encodeURIComponent).join("/")}`;
 }
-function putObject(bucket, input, client) {
+function putObject(bucket, prefix, input, client) {
 	return Effect.gen(function* () {
 		const body = yield* validatedWriteBody(input);
 		yield* client.putObject({
@@ -2632,7 +2648,7 @@ function putObject(bucket, input, client) {
 			cacheControl: replaceableMediaCacheControl,
 			contentLength: input.byteSize,
 			contentType: input.mimeType,
-			key: input.objectKey
+			key: physicalKey(prefix, input.objectKey)
 		}).pipe(Effect.catch((failure) => isWriteBodyError(failure.cause) ? Effect.fail(failure.cause) : Effect.fail(providerError("MediaObjectStore.S3.put", failure))));
 		return {
 			byteSize: input.byteSize,
@@ -2648,27 +2664,27 @@ const validatedWriteBody = Effect.fn("MediaObjectStore.S3.validateWriteBody")(fu
 		return chunk;
 	})), Stream.concat(Stream.fromEffect(Ref.get(byteLength).pipe(Effect.flatMap((actual) => actual === input.byteSize ? Effect.void : Effect.fail(storageError("MediaObjectStore.S3.put.body", "The object body does not match its declared byte size."))))).pipe(Stream.drain)));
 });
-function statObject(bucket, objectKey, client) {
+function statObject(bucket, prefix, objectKey, client) {
 	return client.headObject({
 		bucket,
-		key: objectKey
+		key: physicalKey(prefix, objectKey)
 	}).pipe(Effect.matchEffect({
 		onFailure: (failure) => isMissingObject(failure.cause) ? Effect.succeed(Option.none()) : Effect.fail(providerError("MediaObjectStore.S3.stat", failure)),
 		onSuccess: (output) => decodeStoredObject("MediaObjectStore.S3.stat", objectKey, output.contentLength, output.contentType).pipe(Effect.asSome)
 	}));
 }
-function listObjects(bucket, client) {
+function listObjects(bucket, prefix, client) {
 	return Stream.paginate({ seenTokens: /* @__PURE__ */ new Set() }, (state) => providerRequest("MediaObjectStore.S3.list", client.listObjects({
 		bucket,
 		continuationToken: state.continuationToken,
-		prefix: mediaObjectPrefix
+		prefix: `${prefix}${mediaObjectPrefix}`
 	})).pipe(Effect.flatMap((page) => Effect.gen(function* () {
-		return [yield* Effect.forEach(page.objects, decodeListedObject), yield* nextListState(state, page)];
+		return [yield* Effect.forEach(page.objects, (object) => decodeListedObject(object, prefix)), yield* nextListState(state, page)];
 	}))));
 }
-function decodeListedObject(object) {
+function decodeListedObject(object, prefix) {
 	if (object.key === void 0) return Effect.fail(storageError("MediaObjectStore.S3.list", "The provider returned object metadata without a key."));
-	return decodeStoredObject("MediaObjectStore.S3.list", object.key, object.size);
+	return decodeStoredObject("MediaObjectStore.S3.list", object.key.slice(prefix.length), object.size);
 }
 function nextListState(state, page) {
 	if (!page.isTruncated) return Effect.succeedNone;
@@ -2742,7 +2758,8 @@ function resolveOptions(options) {
 	const bucket = options.bucket.trim();
 	const region = options.region.trim();
 	const endpoint = options.endpoint?.trim();
-	if (!bucket || !region || options.endpoint !== void 0 && !endpoint) return Effect.fail(storageError("MediaObjectStore.S3.configure", "The bucket, region, and configured endpoint must be non-empty."));
+	const prefix = options.prefix.trim();
+	if (!bucket || !region || options.endpoint !== void 0 && !endpoint || !prefix || prefix.startsWith("/") || !prefix.endsWith("/") || prefix.includes("..")) return Effect.fail(storageError("MediaObjectStore.S3.configure", "The bucket, region, configured endpoint, and relative object prefix must be valid."));
 	if (options.credentials) {
 		const secretAccessKey = Redacted.value(options.credentials.secretAccessKey);
 		const sessionToken = options.credentials.sessionToken && Redacted.value(options.credentials.sessionToken);
@@ -2757,10 +2774,14 @@ function resolveOptions(options) {
 		} : void 0,
 		endpoint,
 		forcePathStyle: options.forcePathStyle ?? false,
+		prefix,
 		provisionBucket: options.provisionBucket ?? false,
 		region
 	});
 }
+function physicalKey(prefix, objectKey) {
+	return `${prefix}${objectKey}`;
+}
 function storageError(operation, message) {
 	return new MediaStorageError({
 		cause: new Error(message),
@@ -2774,4 +2795,4 @@ const maxS3SingleCopyBytes = 5e9;
 
 //#endregion
 export { DocumentRevision as $, StudioBadRequest as A, User as B, DocumentStore as C, CurrentStudioRequest as D, defaultAccessControlLayer as E, studioInternalError as F, UserSelfRemovalDenied as G, UserAlreadyExists as H, InitializationAlreadyCompleted as I, CollaborationServerMessage as J, UserSelfRoleChangeDenied as K, InitializationProofInvalid as L, StudioRequestConflict as M, StudioSchemaError as N, StudioApi as O, StudioInternalError as P, DocumentHistoryInvalidCursor as Q, InitializationState as R, DocumentPersistenceError as S, AccessControl as T, UserNotFound as U, UserAdministrationDenied as V, UserPage as W, StateVector as X, CollaborationTicket as Y, DocumentHistoryComparisonTooLarge as Z, Documents as _, mediaObjectPrefix as a, ActivityEntry as at, cursorCodec as b, Seo as c, ActivityPage as ct, seoDeliveryLayer as d, DocumentMediaUnavailable as dt, ACTIVITY_ACTIONS as et, seoLayer as f, DocumentNotFound as ft, DocumentPreviews as g, PublishedDocumentNotFound as gt, DocumentMaintenance as h, DocumentVersionConflict as ht, MediaObjectStore as i, ActivityCursorInvalid as it, StudioBootstrap as j, StudioAuthentication as k, SeoDelivery as l, ActivityTarget as lt, SeoStore as m, DocumentValidationFailed as mt, s3MediaObjectStoreLayer as n, ActivityContext as nt, PreviewSeo as o, ActivityEntryDraft as ot, SeoPersistenceError as p, DocumentPathConflict as pt, CollaborationClientMessage as q, MediaPersistenceError as r, ActivityCursor as rt, PublishedSeo as s, ActivityId as st, maxS3SingleCopyBytes as t, ActivityAction as tt, makeDefaultSeoOptions as u, ActivityTargetKind as ut, PublishedDocuments as v, renderEditorMarkdown as w, DocumentGenerationConflict as x, documentsLayer as y, CreateUserInput as z };
-//# sourceMappingURL=S3MediaObjects-CpPSzJto.js.map
+//# sourceMappingURL=S3MediaObjects-D5Ns4FM6.js.map