ampless 0.2.0-alpha.6 → 0.2.0-alpha.8

package/dist/index.d.ts

@@ -484,6 +484,51 @@ declare function formatDate(input: Date | string | number, format?: DateFormat,
 
 declare function escapeXml(s: string): string;
 
+/**
+ * Encode / decode helpers for AppSync's AWSJSON scalar.
+ *
+ * Every `a.json()` field in the schema (Post.body, Post.metadata,
+ * Page.body, KvStore.value, ...) carries a *JSON-encoded string* on
+ * the GraphQL wire — regardless of whether the underlying value is a
+ * string, object, or array. That rule holds for both write paths:
+ *
+ *   1. Amplify-generated client (`generateClient<Schema>().models.X.
+ *      create({ body: ... })`) — Amplify does NOT auto-stringify, the
+ *      caller must JSON.stringify before passing the value in.
+ *   2. Raw GraphQL fetch (variables map, e.g. the MCP Lambda) — same
+ *      rule, the variable must be a JSON-encoded string.
+ *
+ * Skipping the stringify for raw string inputs (a common mistake when
+ * `format: 'markdown'`) trips AppSync's variable validator with
+ *
+ *     Variable 'body' has an invalid value.
+ *
+ * On the read side two wire shapes coexist:
+ *
+ *   - JSON-encoded string — what the auto-generated CRUD resolver and
+ *     custom resolvers usually return.
+ *   - Native object / Map — DynamoDBDocumentClient unmarshals
+ *     AWSJSON-stored maps straight into JS objects when read directly
+ *     from DynamoDB (the path used by the trusted processor and the
+ *     MCP Lambda).
+ *
+ * `decodeAwsJson` tolerates both: pass strings through `JSON.parse`,
+ * everything else as-is, fall back to the raw string on parse errors
+ * so legacy bare-string rows aren't lost.
+ */
+/**
+ * Serialise a value for an AWSJSON variable. `undefined` / `null` both
+ * collapse to the literal string `"null"` (valid JSON) so AppSync sees
+ * a well-formed AWSJSON payload either way.
+ */
+declare function encodeAwsJson(value: unknown): string;
+/**
+ * Deserialise an AWSJSON value from a GraphQL / DynamoDB read.
+ * Tolerates both the wire-string shape and the auto-unmarshalled
+ * native value. Returns the raw string when `JSON.parse` rejects it.
+ */
+declare function decodeAwsJson(value: unknown): unknown;
+
 /**
  * Build the public S3 URL for an object key, in the regional virtual-host
  * style: `https://{bucket}.s3.{region}.amazonaws.com/{key}`. The legacy
@@ -506,6 +551,94 @@ declare function formatPublicAssetUrl(bucket: string, region: string, key: strin
  */
 declare function extractFirstImageUrl(post: Post): string | null;
 
+/**
+ * Pure helpers for `format: 'static'` post bundles. Kept platform-free
+ * (no `File`, no Amplify Storage, no AWS SDK) so both the browser admin
+ * uploader and the MCP tools (running in stdio CLI + Lambda HTTP
+ * transport) can share the validation / picker / mime logic.
+ *
+ * The `extractZip(File)` / `uploadBundle` / `deleteBundle` browser
+ * helpers stay in `@ampless/admin/lib/static-bundle.js` — they pull in
+ * JSZip and `aws-amplify/storage`, neither of which we want in Lambda.
+ * The MCP Lambda implements its own zip extractor (`fflate`) on top of
+ * the helpers here.
+ */
+declare const DEFAULT_ENTRYPOINT = "index.html";
+/**
+ * Maximum bundle size (uncompressed) for the browser-side admin
+ * pipeline. Above this the in-tab extract / multi-PUT pipeline gets
+ * sluggish. The Lambda / MCP side enforces its own limit (Function URL
+ * payload cap, around 6 MB base64-inflated per call) — this constant
+ * is exported as a reasonable upper bound for any caller that wants
+ * a sanity check, not a hard contract for non-browser paths.
+ */
+declare const MAX_BUNDLE_BYTES: number;
+declare const TEXT_EXTENSIONS: ReadonlySet<string>;
+declare function mimeTypeFor(path: string): string;
+interface ValidationIssue {
+    path: string;
+    line?: number;
+    reason: string;
+}
+/**
+ * Reject paths that would either escape the bundle root (`..`), confuse
+ * S3 (`null bytes`), or carry OS-specific cruft from zip tools
+ * (`__MACOSX/`, `.DS_Store`). Returns `null` when the path is OK,
+ * otherwise the reason to surface to the user.
+ */
+declare function validateBundlePath(path: string): string | null;
+/**
+ * Scan text files for **absolute** path references. The static-bundle
+ * contract is that every reference resolves inside the bundle via
+ * relative paths, so any `href="/foo"` would either escape to the
+ * Next.js root or break under arbitrary URL prefixes. Protocol-prefixed
+ * URLs (`https://…`) and `mailto:` / `tel:` are fine.
+ *
+ * `data:` and `blob:` URIs also pass (they don't traverse the network).
+ * Hash-only (`#anchor`) and empty values pass too.
+ */
+declare function findAbsolutePathRefs(path: string, content: string): ValidationIssue[];
+interface ExtractedFile {
+    /** Relative path inside the bundle (slash-separated). */
+    path: string;
+    data: Uint8Array;
+}
+interface BundleExtractResult {
+    files: ExtractedFile[];
+    issues: ValidationIssue[];
+    totalBytes: number;
+}
+/**
+ * Scan every text file in the bundle for absolute URL refs. Returns
+ * the union of issues across files so the admin UI / MCP tool can
+ * render a single list of problems before saving.
+ */
+declare function validateBundle(files: ExtractedFile[]): ValidationIssue[];
+declare function bundlePrefix(siteId: string, slug: string): string;
+/**
+ * If every file shares the same top-level directory (e.g. macOS Finder
+ * zipping wraps the contents in a `MyBundle/` folder), strip that
+ * prefix so the bundle's logical root is the entrypoint's parent.
+ * Bundles already at root pass through unchanged.
+ */
+declare function stripCommonPrefix(files: ExtractedFile[]): ExtractedFile[];
+/**
+ * Heuristic for the default entrypoint when the caller didn't override:
+ *   1. exact `index.html` at root
+ *   2. exact `index.htm` at root
+ *   3. the first .html / .htm file at root (alphabetical)
+ *   4. the first .html / .htm anywhere
+ *   5. fall back to the literal 'index.html' so the validator surfaces
+ *      a meaningful error to the user ("entrypoint not in bundle")
+ *
+ * Accepts either extracted files (with `data`) or a plain list of
+ * relative paths — the MCP `commit_static_post` flow only has the
+ * S3 ListObjects result to work with, no bytes.
+ */
+declare function pickDefaultEntrypoint(files: readonly {
+    path: string;
+}[]): string;
+
 type ThemeFieldType = 'color' | 'text' | 'select' | 'image' | 'length' | 'fontFamily' | 'linkList';
 /**
  * Single entry in a `linkList` field. Stored as part of a JSON array
@@ -719,4 +852,4 @@ declare function resolveThemeValues(manifest: ThemeManifest, stored: Record<stri
 
 declare const VERSION = "0.0.1";
 
-export { type AmplessEvent, type AmplessPlugin, type AuthContext, type Config, type ContentEventPayload, type ContentEventType, type ContentFormat, type ContentTypeDefinition, type CreatePostInput, DEFAULT_SITE_ID, type DateFormat, type EventPayloadOf, type EventType, type FieldDefinition, type FieldType, type ImageDisplay, type KvItem, type KvStore, type LinkListItem, type ListOptions, type LocalizedString, type Media, type MediaEventPayload, type MediaEventType, type MediaProcessingDefaults, type OgImageConfig, type OgImageFont, type OgImageRenderContext, type Page, type PluginEventHandler, type PluginMetadata, type PluginRuntimeContext, type Post, type PostMetadata, type PostStatus, type PostsProvider, type Role, SITE_CONFIG_PK, type SiteConfig, type SiteSettingsEventPayload, type SiteSettingsEventType, type StaticPostBody, type StreamEventName, type ThemeColorField, type ThemeField, type ThemeFieldType, type ThemeFontFamilyField, type ThemeImageField, type ThemeLengthField, type ThemeLinkListField, type ThemeManifest, type ThemeModule, type ThemeRouteContext, type ThemeSelectField, type ThemeTextField, type TrustLevel, VERSION, composeSiteIdSlug, composeSiteIdStatus, createPost, defineConfig, definePlugin, defineSchema, defineTheme, defineThemeModule, deletePost, deleteSiteSetting, detectContentEvents, escapeXml, extractFirstImageUrl, flattenSettings, formatColorPair, formatDate, formatPublicAssetUrl, getKvStore, getPost, getPostById, getSiteSetting, hasKvStore, hasPostsProvider, isMultiSite, isTagListUrl, listPosts, listSiteSettings, parseColorPair, parseLinkList, resolveLocalized, resolveSiteId, resolveThemeValues, setKvStore, setPostsProvider, setSiteSetting, siteFor, stringifyLinkList, themeSettingKey, unflattenSettings, updatePost, validateThemeValue };
+export { type AmplessEvent, type AmplessPlugin, type AuthContext, type BundleExtractResult, type Config, type ContentEventPayload, type ContentEventType, type ContentFormat, type ContentTypeDefinition, type CreatePostInput, DEFAULT_ENTRYPOINT, DEFAULT_SITE_ID, type DateFormat, type EventPayloadOf, type EventType, type ExtractedFile, type FieldDefinition, type FieldType, type ImageDisplay, type KvItem, type KvStore, type LinkListItem, type ListOptions, type LocalizedString, MAX_BUNDLE_BYTES, type Media, type MediaEventPayload, type MediaEventType, type MediaProcessingDefaults, type OgImageConfig, type OgImageFont, type OgImageRenderContext, type Page, type PluginEventHandler, type PluginMetadata, type PluginRuntimeContext, type Post, type PostMetadata, type PostStatus, type PostsProvider, type Role, SITE_CONFIG_PK, type SiteConfig, type SiteSettingsEventPayload, type SiteSettingsEventType, type StaticPostBody, type StreamEventName, TEXT_EXTENSIONS, type ThemeColorField, type ThemeField, type ThemeFieldType, type ThemeFontFamilyField, type ThemeImageField, type ThemeLengthField, type ThemeLinkListField, type ThemeManifest, type ThemeModule, type ThemeRouteContext, type ThemeSelectField, type ThemeTextField, type TrustLevel, VERSION, type ValidationIssue, bundlePrefix, composeSiteIdSlug, composeSiteIdStatus, createPost, decodeAwsJson, defineConfig, definePlugin, defineSchema, defineTheme, defineThemeModule, deletePost, deleteSiteSetting, detectContentEvents, encodeAwsJson, escapeXml, extractFirstImageUrl, findAbsolutePathRefs, flattenSettings, formatColorPair, formatDate, formatPublicAssetUrl, getKvStore, getPost, getPostById, getSiteSetting, hasKvStore, hasPostsProvider, isMultiSite, isTagListUrl, listPosts, listSiteSettings, mimeTypeFor, parseColorPair, parseLinkList, pickDefaultEntrypoint, resolveLocalized, resolveSiteId, resolveThemeValues, setKvStore, setPostsProvider, setSiteSetting, siteFor, stringifyLinkList, stripCommonPrefix, themeSettingKey, unflattenSettings, updatePost, validateBundle, validateBundlePath, validateThemeValue };

package/dist/index.js

@@ -234,6 +234,19 @@ function escapeXml(s) {
   return s.replace(/[&<>"']/g, (c) => XML_ESCAPES[c]);
 }
 
+// src/awsjson.ts
+function encodeAwsJson(value) {
+  return JSON.stringify(value ?? null);
+}
+function decodeAwsJson(value) {
+  if (typeof value !== "string") return value;
+  try {
+    return JSON.parse(value);
+  } catch {
+    return value;
+  }
+}
+
 // src/storage.ts
 function formatPublicAssetUrl(bucket, region, key) {
   return `https://${bucket}.s3.${region}.amazonaws.com/${key}`;
@@ -283,6 +296,135 @@ function findHtmlImage(body) {
   return m ? m[1] : null;
 }
 
+// src/static-bundle.ts
+var DEFAULT_ENTRYPOINT = "index.html";
+var MAX_BUNDLE_BYTES = 50 * 1024 * 1024;
+var TEXT_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".html",
+  ".htm",
+  ".css",
+  ".svg"
+]);
+var MIME_TYPES = {
+  ".html": "text/html; charset=utf-8",
+  ".htm": "text/html; charset=utf-8",
+  ".css": "text/css; charset=utf-8",
+  ".js": "application/javascript; charset=utf-8",
+  ".mjs": "application/javascript; charset=utf-8",
+  ".json": "application/json; charset=utf-8",
+  ".svg": "image/svg+xml",
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp",
+  ".avif": "image/avif",
+  ".ico": "image/x-icon",
+  ".woff": "font/woff",
+  ".woff2": "font/woff2",
+  ".ttf": "font/ttf",
+  ".otf": "font/otf",
+  ".eot": "application/vnd.ms-fontobject",
+  ".txt": "text/plain; charset=utf-8",
+  ".xml": "application/xml; charset=utf-8",
+  ".map": "application/json; charset=utf-8",
+  ".pdf": "application/pdf"
+};
+function mimeTypeFor(path) {
+  const lower = path.toLowerCase();
+  const dot = lower.lastIndexOf(".");
+  if (dot < 0) return "application/octet-stream";
+  return MIME_TYPES[lower.slice(dot)] ?? "application/octet-stream";
+}
+function validateBundlePath(path) {
+  if (path === "" || path.endsWith("/")) return "directory entry";
+  if (path.includes("\0")) return "contains null byte";
+  if (path.startsWith("/") || path.startsWith("\\")) return "absolute path";
+  if (path.split(/[/\\]/).some((seg) => seg === "..")) return "parent-directory traversal";
+  if (path.startsWith("__MACOSX/") || /(^|\/)\._/.test(path)) return "macOS resource fork";
+  if (/(^|\/)\.DS_Store$/.test(path)) return ".DS_Store junk";
+  if (/(^|\/)Thumbs\.db$/i.test(path)) return "Thumbs.db junk";
+  return null;
+}
+var HTML_URL_ATTR_RE = /\b(?:href|src|action|data|poster|cite|formaction|manifest|srcset)\s*=\s*["']([^"']+)["']/gi;
+var CSS_URL_RE = /url\(\s*["']?([^"')\s]+)["']?\s*\)|@import\s+["']([^"']+)["']/gi;
+function findAbsolutePathRefs(path, content) {
+  const ext = path.toLowerCase().slice(path.lastIndexOf("."));
+  if (!TEXT_EXTENSIONS.has(ext)) return [];
+  const issues = [];
+  function check(url, lineHint) {
+    const trimmed = url.trim();
+    if (!trimmed) return;
+    if (trimmed.startsWith("#")) return;
+    if (/^[a-z][a-z0-9+.-]*:/i.test(trimmed)) return;
+    if (trimmed.startsWith("//")) {
+      issues.push({ path, reason: `protocol-relative URL: ${lineHint}` });
+      return;
+    }
+    if (trimmed.startsWith("/")) {
+      issues.push({ path, reason: `absolute path: ${lineHint}` });
+      return;
+    }
+  }
+  if (ext === ".html" || ext === ".htm" || ext === ".svg") {
+    HTML_URL_ATTR_RE.lastIndex = 0;
+    let m;
+    while ((m = HTML_URL_ATTR_RE.exec(content)) !== null) {
+      const val = m[1] ?? "";
+      if (/\bsrcset\s*=/i.test(m[0])) {
+        for (const candidate of val.split(",")) {
+          const urlPart = candidate.trim().split(/\s+/)[0];
+          if (urlPart) check(urlPart, candidate.trim());
+        }
+      } else {
+        check(val, m[0]);
+      }
+    }
+  }
+  if (ext === ".css" || ext === ".svg") {
+    CSS_URL_RE.lastIndex = 0;
+    let m;
+    while ((m = CSS_URL_RE.exec(content)) !== null) {
+      const val = (m[1] ?? m[2] ?? "").trim();
+      check(val, m[0]);
+    }
+  }
+  return issues;
+}
+function validateBundle(files) {
+  const issues = [];
+  const decoder = new TextDecoder("utf-8", { fatal: false });
+  for (const f of files) {
+    const ext = f.path.toLowerCase().slice(f.path.lastIndexOf("."));
+    if (!TEXT_EXTENSIONS.has(ext)) continue;
+    const text = decoder.decode(f.data);
+    issues.push(...findAbsolutePathRefs(f.path, text));
+  }
+  return issues;
+}
+function bundlePrefix(siteId, slug) {
+  return `public/static/${siteId}/${slug}/`;
+}
+function stripCommonPrefix(files) {
+  if (files.length === 0) return files;
+  const firstSlash = files[0].path.indexOf("/");
+  if (firstSlash < 0) return files;
+  const prefix = files[0].path.slice(0, firstSlash + 1);
+  if (!files.every((f) => f.path.startsWith(prefix))) return files;
+  return files.map((f) => ({ ...f, path: f.path.slice(prefix.length) }));
+}
+function pickDefaultEntrypoint(files) {
+  const exact = files.find((f) => f.path === DEFAULT_ENTRYPOINT);
+  if (exact) return exact.path;
+  const altRoot = files.find((f) => f.path === "index.htm");
+  if (altRoot) return altRoot.path;
+  const htmlRoot = files.filter((f) => /^[^/]+\.html?$/.test(f.path)).sort((a, b) => a.path.localeCompare(b.path));
+  if (htmlRoot.length > 0) return htmlRoot[0].path;
+  const htmlAny = files.filter((f) => /\.html?$/.test(f.path)).sort((a, b) => a.path.localeCompare(b.path));
+  if (htmlAny.length > 0) return htmlAny[0].path;
+  return DEFAULT_ENTRYPOINT;
+}
+
 // src/events.ts
 function detectContentEvents(input) {
   switch (input.eventName) {
@@ -458,12 +600,17 @@ function defaultValueAsString(field) {
 // src/index.ts
 var VERSION = "0.0.1";
 export {
+  DEFAULT_ENTRYPOINT,
   DEFAULT_SITE_ID,
+  MAX_BUNDLE_BYTES,
   SITE_CONFIG_PK,
+  TEXT_EXTENSIONS,
   VERSION,
+  bundlePrefix,
   composeSiteIdSlug,
   composeSiteIdStatus,
   createPost,
+  decodeAwsJson,
   defineConfig,
   definePlugin,
   defineSchema,
@@ -472,8 +619,10 @@ export {
   deletePost,
   deleteSiteSetting,
   detectContentEvents,
+  encodeAwsJson,
   escapeXml,
   extractFirstImageUrl,
+  findAbsolutePathRefs,
   flattenSettings,
   formatColorPair,
   formatDate,
@@ -488,8 +637,10 @@ export {
   isTagListUrl,
   listPosts,
   listSiteSettings,
+  mimeTypeFor,
   parseColorPair,
   parseLinkList,
+  pickDefaultEntrypoint,
   resolveLocalized,
   resolveSiteId,
   resolveThemeValues,
@@ -498,8 +649,11 @@ export {
   setSiteSetting,
   siteFor,
   stringifyLinkList,
+  stripCommonPrefix,
   themeSettingKey,
   unflattenSettings,
   updatePost,
+  validateBundle,
+  validateBundlePath,
   validateThemeValue
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ampless",
-  "version": "0.2.0-alpha.6",
+  "version": "0.2.0-alpha.8",
   "description": "Serverless CMS for AWS Amplify",
   "license": "MIT",
   "type": "module",