@shapio/cms 0.4.0 → 0.5.0

package/dist/config.d.ts

@@ -1,2 +1,2 @@
-import { A as ServiceFactoryContext, C as HookEvent, D as MediaUsage, E as MediaReferenceService, F as defineConfig, I as isHookError, M as ShapioServices, N as ThemeDefinition, O as ModelHooks, P as ThemeTokens, S as HookError, T as JobHandlerContext, _ as ExtensionRoute, a as BeforeHookContext, b as ExtensionSite, c as ContentReadOptions, d as EXTENSION_CONTRACT_VERSION, f as EnqueueOptions, g as ExtensionJobService, h as ExtensionJobHandler, i as BeforeHook, j as ShapioConfig, k as ServiceFactory, l as ContentReadService, m as ExtensionHostConfig, n as AfterHookContext, o as BeforeHookEvent, p as EntryData, r as AfterHookEvent, s as ContentReadEntry, t as AfterHook, u as CustomServices, v as ExtensionRouteOptions, w as HookModel, x as HookEntry, y as ExtensionServices } from "./public-BSbOGbK-.js";
+import { A as ServiceFactoryContext, C as HookEvent, D as MediaUsage, E as MediaReferenceService, F as defineConfig, I as isHookError, M as ShapioServices, N as ThemeDefinition, O as ModelHooks, P as ThemeTokens, S as HookError, T as JobHandlerContext, _ as ExtensionRoute, a as BeforeHookContext, b as ExtensionSite, c as ContentReadOptions, d as EXTENSION_CONTRACT_VERSION, f as EnqueueOptions, g as ExtensionJobService, h as ExtensionJobHandler, i as BeforeHook, j as ShapioConfig, k as ServiceFactory, l as ContentReadService, m as ExtensionHostConfig, n as AfterHookContext, o as BeforeHookEvent, p as EntryData, r as AfterHookEvent, s as ContentReadEntry, t as AfterHook, u as CustomServices, v as ExtensionRouteOptions, w as HookModel, x as HookEntry, y as ExtensionServices } from "./public-DYR4mtVQ.js";
 export { AfterHook, AfterHookContext, AfterHookEvent, BeforeHook, BeforeHookContext, BeforeHookEvent, ContentReadEntry, ContentReadOptions, ContentReadService, CustomServices, EXTENSION_CONTRACT_VERSION, EnqueueOptions, EntryData, ExtensionHostConfig, ExtensionJobHandler, ExtensionJobService, ExtensionRoute, ExtensionRouteOptions, ExtensionServices, ExtensionSite, HookEntry, HookError, HookEvent, HookModel, JobHandlerContext, MediaReferenceService, MediaUsage, ModelHooks, ServiceFactory, ServiceFactoryContext, ShapioConfig, ShapioServices, ThemeDefinition, ThemeTokens, defineConfig, isHookError };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { A as ServiceFactoryContext, B as Principal, C as HookEvent, D as MediaUsage, E as MediaReferenceService, F as defineConfig, G as ComponentDefinition, H as DB, I as isHookError, J as ModelDefinition, K as DataType, L as KnownVersions, M as ShapioServices, N as ThemeDefinition, O as ModelHooks, P as ThemeTokens, R as PermissionEvaluator, S as HookError, T as JobHandlerContext, U as OutboxEvents, V as Database, W as ContentData, Y as SchemaChange, _ as ExtensionRoute, a as BeforeHookContext, b as ExtensionSite, c as ContentReadOptions, d as EXTENSION_CONTRACT_VERSION, f as EnqueueOptions, g as ExtensionJobService, h as ExtensionJobHandler, i as BeforeHook, j as ShapioConfig, k as ServiceFactory, l as ContentReadService, m as ExtensionHostConfig, n as AfterHookContext, o as BeforeHookEvent, p as EntryData, q as JsonValue, r as AfterHookEvent, s as ContentReadEntry, t as AfterHook, u as CustomServices, v as ExtensionRouteOptions, w as HookModel, x as HookEntry, y as ExtensionServices, z as PermissionExecutor } from "./public-BSbOGbK-.js";
+import { A as ServiceFactoryContext, B as Principal, C as HookEvent, D as MediaUsage, E as MediaReferenceService, F as defineConfig, G as ComponentDefinition, H as DB, I as isHookError, J as ModelDefinition, K as DataType, L as KnownVersions, M as ShapioServices, N as ThemeDefinition, O as ModelHooks, P as ThemeTokens, R as PermissionEvaluator, S as HookError, T as JobHandlerContext, U as OutboxEvents, V as Database, W as ContentData, Y as SchemaChange, _ as ExtensionRoute, a as BeforeHookContext, b as ExtensionSite, c as ContentReadOptions, d as EXTENSION_CONTRACT_VERSION, f as EnqueueOptions, g as ExtensionJobService, h as ExtensionJobHandler, i as BeforeHook, j as ShapioConfig, k as ServiceFactory, l as ContentReadService, m as ExtensionHostConfig, n as AfterHookContext, o as BeforeHookEvent, p as EntryData, q as JsonValue, r as AfterHookEvent, s as ContentReadEntry, t as AfterHook, u as CustomServices, v as ExtensionRouteOptions, w as HookModel, x as HookEntry, y as ExtensionServices, z as PermissionExecutor } from "./public-DYR4mtVQ.js";
 import { FastifyBaseLogger, FastifyInstance } from "fastify";
 import { Kysely, Selectable, Transaction } from "kysely";
 import { Static, Type } from "typebox";

package/dist/index.js

@@ -1,3 +1,3 @@
-import { a as loadConfig, n as startServer, s as buildApp, t as startDedicatedWorker, u as SHAPIO_VERSION } from "./worker-i1rY2TIZ.js";
+import { a as loadConfig, f as SHAPIO_VERSION, n as startServer, s as buildApp, t as startDedicatedWorker } from "./worker-jz_0yAmS.js";
 import { EXTENSION_CONTRACT_VERSION, HookError, defineConfig, isHookError } from "./config.js";
 export { EXTENSION_CONTRACT_VERSION, HookError, SHAPIO_VERSION, buildApp, defineConfig, isHookError, loadConfig, startDedicatedWorker, startServer };

package/dist/{public-BSbOGbK-.d.ts → public-DYR4mtVQ.d.ts}

@@ -585,6 +585,7 @@ interface EntryHeads {
   change_seq: Generated<Int8>;
   created_at: Generated<Timestamp>;
   data: ContentData;
+  entry_created_at: Timestamp | null;
   entry_id: string;
   locale: string;
   model_id: string;
@@ -905,6 +906,7 @@ interface SystemSettings {
 interface SystemVersions {
   id: Generated<boolean>;
   permissions_version: Generated<number>;
+  release: string | null;
   schema_version: Generated<number>;
   updated_at: Generated<Timestamp>;
 }
@@ -1444,4 +1446,4 @@ declare class HookError extends Error {
 declare const isHookError: (error: unknown) => error is HookError;
 //#endregion
 export { ServiceFactoryContext as A, Principal as B, HookEvent as C, MediaUsage as D, MediaReferenceService as E, defineConfig as F, ComponentDefinition as G, DB as H, isHookError as I, ModelDefinition as J, DataType as K, KnownVersions as L, ShapioServices as M, ThemeDefinition as N, ModelHooks as O, ThemeTokens as P, PermissionEvaluator as R, HookError as S, JobHandlerContext as T, OutboxEvents as U, Database as V, ContentData as W, SchemaChange as Y, ExtensionRoute as _, BeforeHookContext as a, ExtensionSite as b, ContentReadOptions as c, EXTENSION_CONTRACT_VERSION as d, EnqueueOptions as f, ExtensionJobService as g, ExtensionJobHandler as h, BeforeHook as i, ShapioConfig as j, ServiceFactory as k, ContentReadService as l, ExtensionHostConfig as m, AfterHookContext as n, BeforeHookEvent as o, EntryData as p, JsonValue$1 as q, AfterHookEvent as r, ContentReadEntry as s, AfterHook as t, CustomServices as u, ExtensionRouteOptions as v, HookModel as w, HookEntry as x, ExtensionServices as y, PermissionExecutor as z };
-//# sourceMappingURL=public-BSbOGbK-.d.ts.map
+//# sourceMappingURL=public-DYR4mtVQ.d.ts.map

package/dist/s3Adapter-C8AgFVYw.js

@@ -0,0 +1,125 @@
+import { M as isValidStorageKey, c as bucketContentDisposition, h as ObjectNotFoundError, j as encodeKeyPath, l as contentDisposition, m as InvalidStorageKeyError } from "./worker-jz_0yAmS.js";
+import { DeleteObjectCommand, GetObjectCommand, HeadObjectCommand, PutObjectCommand, S3Client, S3ServiceException } from "@aws-sdk/client-s3";
+import { createPresignedPost } from "@aws-sdk/s3-presigned-post";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+//#region src/media/s3Adapter.ts
+/** R2 accepts any region name ("auto" by convention); AWS needs the bucket's real region. */
+const DEFAULT_REGION = "us-east-1";
+const isNotFound = (error) => error instanceof S3ServiceException && (error.$metadata.httpStatusCode === 404 || error.name === "NotFound" || error.name === "NoSuchKey");
+const createS3Client = (config) => new S3Client({
+	region: config.region ?? DEFAULT_REGION,
+	...config.endpoint ? { endpoint: config.endpoint } : {},
+	forcePathStyle: config.forcePathStyle,
+	...config.accessKeyId && config.secretAccessKey ? { credentials: {
+		accessKeyId: config.accessKeyId,
+		secretAccessKey: config.secretAccessKey
+	} } : {},
+	requestChecksumCalculation: "WHEN_REQUIRED",
+	responseChecksumValidation: "WHEN_REQUIRED"
+});
+/**
+* Any S3-compatible service (AWS S3, Cloudflare R2, B2, Spaces, Wasabi, versitygw). Private objects are read
+* through presigned GET URLs; browsers upload straight to the bucket with a presigned POST whose policy
+* limits size and content type, so Shapio never streams upload bytes.
+*/
+const createS3Adapter = ({ config, publicBaseUrl, client }) => {
+	const s3 = client ?? createS3Client(config);
+	const Bucket = config.bucket;
+	const checkKey = (key) => {
+		if (!isValidStorageKey(key)) throw new InvalidStorageKeyError(key);
+		return key;
+	};
+	const head = async (key) => {
+		try {
+			const result = await s3.send(new HeadObjectCommand({
+				Bucket,
+				Key: checkKey(key)
+			}));
+			return {
+				size: result.ContentLength ?? 0,
+				contentType: result.ContentType
+			};
+		} catch (error) {
+			if (isNotFound(error)) return;
+			throw error;
+		}
+	};
+	return {
+		driver: "s3",
+		put: async (key, body, { contentType, contentLength }) => {
+			await s3.send(new PutObjectCommand({
+				Bucket,
+				Key: checkKey(key),
+				Body: body,
+				ContentType: contentType,
+				ContentLength: Buffer.isBuffer(body) ? body.length : contentLength,
+				ContentDisposition: bucketContentDisposition(contentType)
+			}));
+		},
+		getStream: async (key, range) => {
+			try {
+				const result = await s3.send(new GetObjectCommand({
+					Bucket,
+					Key: checkKey(key),
+					...range ? { Range: `bytes=${range.start}-${range.end}` } : {}
+				}));
+				if (!result.Body) throw new ObjectNotFoundError(key);
+				return result.Body;
+			} catch (error) {
+				throw isNotFound(error) ? new ObjectNotFoundError(key, { cause: error }) : error;
+			}
+		},
+		head,
+		exists: async (key) => await head(key) !== void 0,
+		delete: async (key) => {
+			await s3.send(new DeleteObjectCommand({
+				Bucket,
+				Key: checkKey(key)
+			}));
+		},
+		signedGetUrl: async (key, { expiresInSeconds, filename, contentType }) => getSignedUrl(s3, new GetObjectCommand({
+			Bucket,
+			Key: checkKey(key),
+			ResponseContentType: contentType,
+			ResponseContentDisposition: contentDisposition(filename)
+		}), { expiresIn: expiresInSeconds }),
+		publicUrl: (key) => publicBaseUrl ? `${publicBaseUrl}/${encodeKeyPath(checkKey(key))}` : void 0,
+		presignedUpload: async ({ key, contentType, maxSizeBytes, expiresInSeconds }) => {
+			const disposition = bucketContentDisposition(contentType);
+			const { url, fields } = await createPresignedPost(s3, {
+				Bucket,
+				Key: checkKey(key),
+				Conditions: [
+					[
+						"content-length-range",
+						1,
+						maxSizeBytes
+					],
+					[
+						"eq",
+						"$Content-Type",
+						contentType
+					],
+					...disposition ? [[
+						"eq",
+						"$Content-Disposition",
+						disposition
+					]] : []
+				],
+				Fields: {
+					"Content-Type": contentType,
+					...disposition ? { "Content-Disposition": disposition } : {}
+				},
+				Expires: expiresInSeconds
+			});
+			return {
+				url,
+				fields
+			};
+		}
+	};
+};
+//#endregion
+export { createS3Adapter };
+
+//# sourceMappingURL=s3Adapter-C8AgFVYw.js.map

package/dist/s3Adapter-C8AgFVYw.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"s3Adapter-C8AgFVYw.js","names":[],"sources":["../src/media/s3Adapter.ts"],"sourcesContent":["import type { Readable } from 'node:stream';\nimport {\n  DeleteObjectCommand,\n  GetObjectCommand,\n  HeadObjectCommand,\n  PutObjectCommand,\n  S3Client,\n  S3ServiceException,\n} from '@aws-sdk/client-s3';\nimport { createPresignedPost } from '@aws-sdk/s3-presigned-post';\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner';\nimport type { S3StorageConfig } from '../config/index.js';\nimport { bucketContentDisposition, contentDisposition } from './contentDisposition.js';\nimport { InvalidStorageKeyError, ObjectNotFoundError } from './errors.js';\nimport { encodeKeyPath, isValidStorageKey } from './keys.js';\nimport type { StorageAdapter } from './types.js';\n\n/** R2 accepts any region name (\"auto\" by convention); AWS needs the bucket's real region. */\nconst DEFAULT_REGION = 'us-east-1';\n\nconst isNotFound = (error: unknown): boolean =>\n  error instanceof S3ServiceException &&\n  (error.$metadata.httpStatusCode === 404 || error.name === 'NotFound' || error.name === 'NoSuchKey');\n\nexport const createS3Client = (config: S3StorageConfig): S3Client =>\n  new S3Client({\n    region: config.region ?? DEFAULT_REGION,\n    ...(config.endpoint ? { endpoint: config.endpoint } : {}),\n    forcePathStyle: config.forcePathStyle,\n    ...(config.accessKeyId && config.secretAccessKey\n      ? { credentials: { accessKeyId: config.accessKeyId, secretAccessKey: config.secretAccessKey } }\n      : {}),\n    // Only send/validate checksums when an operation requires them: several S3-compatible services\n    // (R2, B2 and other gateways) reject the SDK's default streaming CRC32 trailers.\n    requestChecksumCalculation: 'WHEN_REQUIRED',\n    responseChecksumValidation: 'WHEN_REQUIRED',\n  });\n\nexport type S3AdapterOptions = {\n  config: S3StorageConfig;\n  publicBaseUrl: string | undefined;\n  /** Injected in tests; created from `config` otherwise. */\n  client?: S3Client;\n};\n\n/**\n * Any S3-compatible service (AWS S3, Cloudflare R2, B2, Spaces, Wasabi, versitygw). Private objects are read\n * through presigned GET URLs; browsers upload straight to the bucket with a presigned POST whose policy\n * limits size and content type, so Shapio never streams upload bytes.\n */\nexport const createS3Adapter = ({ config, publicBaseUrl, client }: S3AdapterOptions): StorageAdapter => {\n  const s3 = client ?? createS3Client(config);\n  const Bucket = config.bucket;\n  const checkKey = (key: string) => {\n    if (!isValidStorageKey(key)) {\n      throw new InvalidStorageKeyError(key);\n    }\n    return key;\n  };\n\n  const head = async (key: string) => {\n    try {\n      const result = await s3.send(new HeadObjectCommand({ Bucket, Key: checkKey(key) }));\n      return { size: result.ContentLength ?? 0, contentType: result.ContentType };\n    } catch (error) {\n      if (isNotFound(error)) {\n        return undefined;\n      }\n      throw error;\n    }\n  };\n\n  return {\n    driver: 's3',\n    put: async (key, body, { contentType, contentLength }) => {\n      await s3.send(\n        new PutObjectCommand({\n          Bucket,\n          Key: checkKey(key),\n          Body: body,\n          ContentType: contentType,\n          ContentLength: Buffer.isBuffer(body) ? body.length : contentLength,\n          ContentDisposition: bucketContentDisposition(contentType),\n        }),\n      );\n    },\n    getStream: async (key, range) => {\n      try {\n        const result = await s3.send(\n          new GetObjectCommand({\n            Bucket,\n            Key: checkKey(key),\n            ...(range ? { Range: `bytes=${range.start}-${range.end}` } : {}),\n          }),\n        );\n        if (!result.Body) {\n          throw new ObjectNotFoundError(key);\n        }\n        return result.Body as Readable;\n      } catch (error) {\n        throw isNotFound(error) ? new ObjectNotFoundError(key, { cause: error }) : error;\n      }\n    },\n    head,\n    exists: async (key) => (await head(key)) !== undefined,\n    delete: async (key) => {\n      await s3.send(new DeleteObjectCommand({ Bucket, Key: checkKey(key) }));\n    },\n    signedGetUrl: async (key, { expiresInSeconds, filename, contentType }) =>\n      getSignedUrl(\n        s3,\n        new GetObjectCommand({\n          Bucket,\n          Key: checkKey(key),\n          ResponseContentType: contentType,\n          ResponseContentDisposition: contentDisposition(filename),\n        }),\n        { expiresIn: expiresInSeconds },\n      ),\n    publicUrl: (key) => (publicBaseUrl ? `${publicBaseUrl}/${encodeKeyPath(checkKey(key))}` : undefined),\n    presignedUpload: async ({ key, contentType, maxSizeBytes, expiresInSeconds }) => {\n      const disposition = bucketContentDisposition(contentType);\n      const { url, fields } = await createPresignedPost(s3, {\n        Bucket,\n        Key: checkKey(key),\n        Conditions: [\n          ['content-length-range', 1, maxSizeBytes],\n          ['eq', '$Content-Type', contentType],\n          ...(disposition ? [['eq', '$Content-Disposition', disposition] as ['eq', string, string]] : []),\n        ],\n        Fields: {\n          'Content-Type': contentType,\n          ...(disposition ? { 'Content-Disposition': disposition } : {}),\n        },\n        Expires: expiresInSeconds,\n      });\n      return { url, fields };\n    },\n  };\n};\n"],"mappings":"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"}