canopycms-cdk 0.0.63 → 0.0.65

package/lambda/asset-transform/dist/handler.js

@@ -4279,7 +4279,12 @@ var init_field = __esm({
       collections: external_exports.array(external_exports.string().min(1)).min(1).optional(),
       entryTypes: external_exports.array(external_exports.string().min(1)).min(1).optional(),
       displayField: external_exports.string().min(1).optional(),
-      options: external_exports.array(referenceOptionSchema).optional()
+      options: external_exports.array(referenceOptionSchema).optional(),
+      // Must be listed here, not just on ReferenceFieldConfig: zod strips unknown keys by
+      // default, so a consumer that adopts this schema's parse output would silently delete a
+      // runtime-consumed flag and the feature would no-op with no error. (`resolvedSchema` is
+      // absent on purpose — it is type-inference-only and stripping it changes no behavior.)
+      includeBody: external_exports.boolean().optional()
     });
     fieldHolder = [external_exports.never()];
     blockSchema = external_exports.object({
@@ -4394,7 +4399,7 @@ var init_media = __esm({
 });
 
 // ../canopycms/src/config/schemas/config.ts
-var defaultBranchAccessSchema, defaultPathAccessLevelSchema, defaultPathAccessLevelsSchema, defaultPathAccessSchema, defaultBaseBranchSchema, defaultRemoteNameSchema, defaultRemoteUrlSchema, gitBotAuthorNameSchema, gitBotAuthorEmailSchema, githubTokenEnvVarSchema, operatingModeSchema, deployedAsSchema, contentRootSchema, sourceRootSchema, deploymentNameSchema, devContentSyncSchema, devConfigSchema, editorConfigSchema, CanopyConfigSchema;
+var defaultBranchAccessSchema, defaultPathAccessLevelSchema, defaultPathAccessLevelsSchema, defaultPathAccessSchema, defaultBaseBranchSchema, defaultRemoteNameSchema, defaultRemoteUrlSchema, gitBotAuthorNameSchema, gitBotAuthorEmailSchema, githubTokenEnvVarSchema, operatingModeSchema, deployedAsSchema, contentRootSchema, sourceRootSchema, basePathSchema, deploymentNameSchema, devContentSyncSchema, devConfigSchema, editorConfigSchema, CanopyConfigSchema;
 var init_config = __esm({
   "../canopycms/src/config/schemas/config.ts"() {
     "use strict";
@@ -4419,6 +4424,9 @@ var init_config = __esm({
     deployedAsSchema = external_exports.enum(["static", "server"]).default("server");
     contentRootSchema = relativePathSchema.default("content");
     sourceRootSchema = external_exports.string().min(1).optional();
+    basePathSchema = external_exports.string().transform((value) => value.trim()).refine((value) => value.length > 0, {
+      message: "basePath must not be empty or only whitespace"
+    }).optional();
     deploymentNameSchema = external_exports.string().default("prod");
     devContentSyncSchema = external_exports.enum(["off", "warn"]).default("warn");
     devConfigSchema = external_exports.object({
@@ -4481,6 +4489,7 @@ var init_config = __esm({
       deploymentName: deploymentNameSchema.optional(),
       contentRoot: contentRootSchema.default("content"),
       sourceRoot: sourceRootSchema.optional(),
+      basePath: basePathSchema,
       editor: editorConfigSchema.optional(),
       authPlugin: external_exports.custom().optional(),
       entryLinkUrl: external_exports.custom().optional(),
@@ -10649,10 +10658,10 @@ var require_stringify = __commonJS({
       data = Object.assign({}, file.data, data);
       const open = opts.delimiters[0];
       const close = opts.delimiters[1];
-      const matter3 = engine.stringify(data, options2).trim();
+      const matter4 = engine.stringify(data, options2).trim();
       let buf = "";
-      if (matter3 !== "{}") {
-        buf = newline(open) + newline(matter3) + newline(close);
+      if (matter4 !== "{}") {
+        buf = newline(open) + newline(matter4) + newline(close);
       }
       if (typeof file.excerpt === "string" && file.excerpt !== "") {
         if (str2.indexOf(file.excerpt.trim()) === -1) {
@@ -10758,19 +10767,19 @@ var require_gray_matter = __commonJS({
     var toFile = require_to_file();
     var parse3 = require_parse();
     var utils = require_utils();
-    function matter3(input, options2) {
+    function matter4(input, options2) {
       if (input === "") {
         return { data: {}, content: input, excerpt: "", orig: input };
       }
       let file = toFile(input);
-      const cached = matter3.cache[file.content];
+      const cached = matter4.cache[file.content];
       if (!options2) {
         if (cached) {
           file = Object.assign({}, cached);
           file.orig = cached.orig;
           return file;
         }
-        matter3.cache[file.content] = file;
+        matter4.cache[file.content] = file;
       }
       return parseMatter(file, options2);
     }
@@ -10792,7 +10801,7 @@ var require_gray_matter = __commonJS({
       }
       str2 = str2.slice(openLen);
       const len = str2.length;
-      const language = matter3.language(str2, opts);
+      const language = matter4.language(str2, opts);
       if (language.name) {
         file.language = language.name;
         str2 = str2.slice(language.raw.length);
@@ -10827,24 +10836,24 @@ var require_gray_matter = __commonJS({
       }
       return file;
     }
-    matter3.engines = engines2;
-    matter3.stringify = function(file, data, options2) {
-      if (typeof file === "string") file = matter3(file, options2);
+    matter4.engines = engines2;
+    matter4.stringify = function(file, data, options2) {
+      if (typeof file === "string") file = matter4(file, options2);
       return stringify(file, data, options2);
     };
-    matter3.read = function(filepath, options2) {
+    matter4.read = function(filepath, options2) {
       const str2 = fs.readFileSync(filepath, "utf8");
-      const file = matter3(str2, options2);
+      const file = matter4(str2, options2);
       file.path = filepath;
       return file;
     };
-    matter3.test = function(str2, options2) {
+    matter4.test = function(str2, options2) {
       return utils.startsWith(str2, defaults2(options2).delimiters[0]);
     };
-    matter3.language = function(str2, options2) {
+    matter4.language = function(str2, options2) {
       const opts = defaults2(options2);
       const open = opts.delimiters[0];
-      if (matter3.test(str2)) {
+      if (matter4.test(str2)) {
         str2 = str2.slice(open.length);
       }
       const language = str2.slice(0, str2.search(/\r?\n/));
@@ -10853,11 +10862,11 @@ var require_gray_matter = __commonJS({
         name: language ? language.trim() : ""
       };
     };
-    matter3.cache = {};
-    matter3.clearCache = function() {
-      matter3.cache = {};
+    matter4.cache = {};
+    matter4.clearCache = function() {
+      matter4.cache = {};
     };
-    module2.exports = matter3;
+    module2.exports = matter4;
   }
 });
 
@@ -10874,11 +10883,11 @@ var require_identity = __commonJS({
     var NODE_TYPE = Symbol.for("yaml.node.type");
     var isAlias = (node) => !!node && typeof node === "object" && node[NODE_TYPE] === ALIAS;
     var isDocument = (node) => !!node && typeof node === "object" && node[NODE_TYPE] === DOC;
-    var isMap = (node) => !!node && typeof node === "object" && node[NODE_TYPE] === MAP;
+    var isMap2 = (node) => !!node && typeof node === "object" && node[NODE_TYPE] === MAP;
     var isPair = (node) => !!node && typeof node === "object" && node[NODE_TYPE] === PAIR;
-    var isScalar = (node) => !!node && typeof node === "object" && node[NODE_TYPE] === SCALAR;
-    var isSeq = (node) => !!node && typeof node === "object" && node[NODE_TYPE] === SEQ;
-    function isCollection(node) {
+    var isScalar2 = (node) => !!node && typeof node === "object" && node[NODE_TYPE] === SCALAR;
+    var isSeq2 = (node) => !!node && typeof node === "object" && node[NODE_TYPE] === SEQ;
+    function isCollection2(node) {
       if (node && typeof node === "object")
         switch (node[NODE_TYPE]) {
           case MAP:
@@ -10887,7 +10896,7 @@ var require_identity = __commonJS({
         }
       return false;
     }
-    function isNode(node) {
+    function isNode2(node) {
       if (node && typeof node === "object")
         switch (node[NODE_TYPE]) {
           case ALIAS:
@@ -10898,7 +10907,7 @@ var require_identity = __commonJS({
         }
       return false;
     }
-    var hasAnchor = (node) => (isScalar(node) || isCollection(node)) && !!node.anchor;
+    var hasAnchor = (node) => (isScalar2(node) || isCollection2(node)) && !!node.anchor;
     exports2.ALIAS = ALIAS;
     exports2.DOC = DOC;
     exports2.MAP = MAP;
@@ -10908,13 +10917,13 @@ var require_identity = __commonJS({
     exports2.SEQ = SEQ;
     exports2.hasAnchor = hasAnchor;
     exports2.isAlias = isAlias;
-    exports2.isCollection = isCollection;
+    exports2.isCollection = isCollection2;
     exports2.isDocument = isDocument;
-    exports2.isMap = isMap;
-    exports2.isNode = isNode;
+    exports2.isMap = isMap2;
+    exports2.isNode = isNode2;
     exports2.isPair = isPair;
-    exports2.isScalar = isScalar;
-    exports2.isSeq = isSeq;
+    exports2.isScalar = isScalar2;
+    exports2.isSeq = isSeq2;
   }
 });
 
@@ -15015,9 +15024,9 @@ var require_resolve_flow_collection = __commonJS({
     var blockMsg = "Block collections are not allowed within flow collections";
     var isBlock = (token) => token && (token.type === "block-map" || token.type === "block-seq");
     function resolveFlowCollection({ composeNode, composeEmptyNode }, ctx, fc, onError2, tag) {
-      const isMap = fc.start.source === "{";
-      const fcName = isMap ? "flow map" : "flow sequence";
-      const NodeClass = tag?.nodeClass ?? (isMap ? YAMLMap.YAMLMap : YAMLSeq.YAMLSeq);
+      const isMap2 = fc.start.source === "{";
+      const fcName = isMap2 ? "flow map" : "flow sequence";
+      const NodeClass = tag?.nodeClass ?? (isMap2 ? YAMLMap.YAMLMap : YAMLSeq.YAMLSeq);
       const coll = new NodeClass(ctx.schema);
       coll.flow = true;
       const atRoot = ctx.atRoot;
@@ -15053,7 +15062,7 @@ var require_resolve_flow_collection = __commonJS({
             offset = props.end;
             continue;
           }
-          if (!isMap && ctx.options.strict && utilContainsNewline.containsNewline(key))
+          if (!isMap2 && ctx.options.strict && utilContainsNewline.containsNewline(key))
             onError2(
               key,
               // checked by containsNewline()
@@ -15093,7 +15102,7 @@ var require_resolve_flow_collection = __commonJS({
             }
           }
         }
-        if (!isMap && !sep3 && !props.found) {
+        if (!isMap2 && !sep3 && !props.found) {
           const valueNode = value ? composeNode(ctx, value, props, onError2) : composeEmptyNode(ctx, props.end, sep3, null, props, onError2);
           coll.items.push(valueNode);
           offset = valueNode.range[2];
@@ -15116,7 +15125,7 @@ var require_resolve_flow_collection = __commonJS({
             startOnNewline: false
           });
           if (valueProps.found) {
-            if (!isMap && !props.found && ctx.options.strict) {
+            if (!isMap2 && !props.found && ctx.options.strict) {
               if (sep3)
                 for (const st of sep3) {
                   if (st === valueProps.found)
@@ -15148,7 +15157,7 @@ var require_resolve_flow_collection = __commonJS({
           const pair = new Pair.Pair(keyNode, valueNode);
           if (ctx.options.keepSourceTokens)
             pair.srcToken = collItem;
-          if (isMap) {
+          if (isMap2) {
             const map = coll;
             if (utilMapIncludes.mapIncludes(ctx, map.items, keyNode))
               onError2(keyStart, "DUPLICATE_KEY", "Map keys must be unique");
@@ -15164,7 +15173,7 @@ var require_resolve_flow_collection = __commonJS({
           offset = valueNode ? valueNode.range[2] : valueProps.end;
         }
       }
-      const expectedEnd = isMap ? "}" : "]";
+      const expectedEnd = isMap2 ? "}" : "]";
       const [ce, ...ee] = fc.end;
       let cePos = offset;
       if (ce?.source === expectedEnd)
@@ -16446,8 +16455,8 @@ var require_cst = __commonJS({
     var DOCUMENT = "";
     var FLOW_END = "";
     var SCALAR = "";
-    var isCollection = (token) => !!token && "items" in token;
-    var isScalar = (token) => !!token && (token.type === "scalar" || token.type === "single-quoted-scalar" || token.type === "double-quoted-scalar" || token.type === "block-scalar");
+    var isCollection2 = (token) => !!token && "items" in token;
+    var isScalar2 = (token) => !!token && (token.type === "scalar" || token.type === "single-quoted-scalar" || token.type === "double-quoted-scalar" || token.type === "block-scalar");
     function prettyToken(token) {
       switch (token) {
         case BOM:
@@ -16530,8 +16539,8 @@ var require_cst = __commonJS({
     exports2.DOCUMENT = DOCUMENT;
     exports2.FLOW_END = FLOW_END;
     exports2.SCALAR = SCALAR;
-    exports2.isCollection = isCollection;
-    exports2.isScalar = isScalar;
+    exports2.isCollection = isCollection2;
+    exports2.isScalar = isScalar2;
     exports2.prettyToken = prettyToken;
     exports2.tokenType = tokenType;
   }
@@ -18044,7 +18053,7 @@ var require_public_api = __commonJS({
         return docs;
       return Object.assign([], { empty: true }, composer$1.streamInfo());
     }
-    function parseDocument(source, options2 = {}) {
+    function parseDocument2(source, options2 = {}) {
       const { lineCounter: lineCounter2, prettyErrors } = parseOptions(options2);
       const parser$1 = new parser4.Parser(lineCounter2?.addNewLine);
       const composer$1 = new composer.Composer(options2);
@@ -18070,7 +18079,7 @@ var require_public_api = __commonJS({
       } else if (options2 === void 0 && reviver && typeof reviver === "object") {
         options2 = reviver;
       }
-      const doc = parseDocument(src, options2);
+      const doc = parseDocument2(src, options2);
       if (!doc)
         return null;
       doc.warnings.forEach((warning) => log10.warn(doc.options.logLevel, warning));
@@ -18106,7 +18115,7 @@ var require_public_api = __commonJS({
     }
     exports2.parse = parse3;
     exports2.parseAllDocuments = parseAllDocuments;
-    exports2.parseDocument = parseDocument;
+    exports2.parseDocument = parseDocument2;
     exports2.stringify = stringify;
   }
 });
@@ -28330,6 +28339,8 @@ init_error();
 
 // ../canopycms/src/utils/provisioning-lock.ts
 var import_proper_lockfile2 = __toESM(require_proper_lockfile(), 1);
+init_error();
+init_logger();
 
 // ../canopycms/src/git-manager.ts
 var log4 = createDebugLogger({ prefix: "GitManager" });
@@ -28338,11 +28349,94 @@ var log4 = createDebugLogger({ prefix: "GitManager" });
 var log5 = createDebugLogger({ prefix: "BranchWorkspace" });
 
 // ../canopycms/src/content-store.ts
+var import_gray_matter2 = __toESM(require_gray_matter(), 1);
+var import_yaml2 = __toESM(require_dist4(), 1);
+
+// ../canopycms/src/utils/content-serialize.ts
 var import_gray_matter = __toESM(require_gray_matter(), 1);
 var import_yaml = __toESM(require_dist4(), 1);
 
+// ../canopycms/src/validation/block-structural-keys.ts
+var BLOCK_DISCRIMINATOR_KEYS = ["template", "_type"];
+var BLOCK_STRUCTURAL_KEYS = new Set(BLOCK_DISCRIMINATOR_KEYS);
+
 // ../canopycms/src/utils/content-write-lock.ts
 init_error();
+init_logger();
+
+// ../canopycms/src/static/seo.ts
+var DEFAULT_SEO_FIELD_NAMES = {
+  title: "metaTitle",
+  description: "metaDescription",
+  ogImage: "ogImage",
+  ogType: "ogType",
+  canonical: "canonical",
+  noindex: "noindex",
+  twitterCard: "twitterCard"
+};
+
+// ../canopycms/src/entry-schema.ts
+var SEO_GROUP_FIELDS = [
+  {
+    name: DEFAULT_SEO_FIELD_NAMES.title,
+    type: "string",
+    label: "Meta Title",
+    description: "Overrides the page title in search results and social cards.",
+    required: false
+  },
+  {
+    name: DEFAULT_SEO_FIELD_NAMES.description,
+    type: "string",
+    label: "Meta Description",
+    description: "Summary shown under the title in search results.",
+    required: false
+  },
+  {
+    name: DEFAULT_SEO_FIELD_NAMES.ogImage,
+    type: "string",
+    label: "Social Image URL",
+    description: "Image for social cards. Site-relative or absolute.",
+    required: false
+  },
+  {
+    name: DEFAULT_SEO_FIELD_NAMES.ogType,
+    type: "select",
+    label: "OpenGraph Type",
+    options: ["website", "article", "profile"],
+    required: false
+  },
+  {
+    name: DEFAULT_SEO_FIELD_NAMES.canonical,
+    type: "string",
+    label: "Canonical URL",
+    description: "Set only to point at a different canonical copy of this page.",
+    required: false
+  },
+  {
+    name: DEFAULT_SEO_FIELD_NAMES.noindex,
+    type: "boolean",
+    label: "Hide from search engines",
+    description: "Marks the page noindex AND drops it from the sitemap.",
+    required: false
+  },
+  {
+    name: DEFAULT_SEO_FIELD_NAMES.twitterCard,
+    type: "select",
+    label: "Twitter Card",
+    options: ["summary", "summary_large_image"],
+    required: false
+  }
+];
+
+// ../canopycms/src/utils/entry-url.ts
+init_normalize();
+
+// ../canopycms/src/url-collision.ts
+init_content_id_index();
+init_error();
+
+// ../canopycms/src/utils/typed-filename.ts
+init_id();
 
 // ../canopycms/src/content-store.ts
 init_content_id_index();
@@ -28359,9 +28453,6 @@ var STALE_LOOKUP = Symbol("stale-index-lookup");
 init_normalize();
 init_error();
 
-// ../canopycms/src/utils/entry-url.ts
-init_normalize();
-
 // ../canopycms/src/entry-link-resolver.ts
 var log6 = createDebugLogger({ prefix: "EntryLinks" });
 var BASE58_CHAR = "[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]";
@@ -30025,11 +30116,10 @@ init_config3();
 init_normalize();
 
 // ../canopycms/src/content-listing.ts
-var import_gray_matter2 = __toESM(require_gray_matter(), 1);
-var import_yaml2 = __toESM(require_dist4(), 1);
+var import_gray_matter3 = __toESM(require_gray_matter(), 1);
+var import_yaml3 = __toESM(require_dist4(), 1);
 init_content_id_index();
 init_error();
-init_id();
 var log8 = createDebugLogger({ prefix: "ContentListing" });
 
 // ../canopycms/src/context.ts
@@ -30486,6 +30576,9 @@ async function handleTransformRequest(event) {
   if (meta.kind !== "raster") {
     return errorResponse(400, "Not a raster asset - svg/pdf are served statically");
   }
+  if (parsed.slug !== meta.slug) {
+    return errorResponse(404, "Not found");
+  }
   const requestedFormat = parsed.directives.identity ? void 0 : parsed.directives.format;
   if (requestedFormat === void 0 && parsed.ext !== meta.ext) {
     return errorResponse(400, "Extension does not match the source format");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "canopycms-cdk",
-  "version": "0.0.63",
+  "version": "0.0.65",
   "description": "AWS CDK constructs and EC2 worker for CanopyCMS deployment",
   "license": "MIT",
   "repository": {
@@ -29,7 +29,8 @@
   },
   "peerDependencies": {
     "aws-cdk-lib": "^2.260.0",
-    "constructs": "^10.0.0"
+    "constructs": "^10.0.0",
+    "canopycms": "0.0.65"
   },
   "peerDependenciesMeta": {
     "aws-cdk-lib": {
@@ -53,11 +54,11 @@
     "tsx": "^4.19.0",
     "typescript": "^5.6.3",
     "vitest": "^4.1.0",
-    "canopycms": "0.0.63",
-    "canopycms-auth-clerk": "0.0.63"
+    "canopycms": "0.0.65",
+    "canopycms-auth-clerk": "0.0.65"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "rm -rf dist && tsc && node ../../scripts/add-js-extensions.mjs dist",
     "build:worker": "esbuild worker/index.ts --bundle --platform=node --target=node20 --format=esm --outfile=worker/dist/index.js --banner:js=\"import { createRequire } from 'module'; const require = createRequire(import.meta.url);\"",
     "build:lambda": "node lambda/asset-transform/build.mjs",
     "build:test-fixtures": "pnpm run build:worker && node lambda/asset-transform/build.mjs --skip-native",