@plume-press/cli 0.4.0 → 0.5.0

package/dist/cli.mjs

@@ -35490,6 +35490,16 @@ var init_markers = __esm({
   }
 });
 
+// packages/core/src/media-object-key.ts
+var identifier;
+var init_media_object_key = __esm({
+  "packages/core/src/media-object-key.ts"() {
+    "use strict";
+    init_zod();
+    identifier = external_exports.uuidv7();
+  }
+});
+
 // packages/core/src/permissions.ts
 var init_permissions = __esm({
   "packages/core/src/permissions.ts"() {
@@ -35513,6 +35523,7 @@ var init_src = __esm({
     init_delivered();
     init_image_size();
     init_markers();
+    init_media_object_key();
     init_permissions();
     init_reconcile();
     init_rich_text();
@@ -35522,7 +35533,7 @@ var init_src = __esm({
 });
 
 // packages/sdk/src/protocol.ts
-var MAX_CONTENT_DATA_BYTES, MAX_CONTENT_RESPONSE_BYTES, MAX_MEDIA_BYTES, contentBindingSchema, name, depth, contentQuerySchema, mediaPath, mediaQuerySchema, mediaRequestSchema, contentRequestSchema, timestamp, contentRecordSchema, contentAssetSchema, contentResponseSchema;
+var MAX_CONTENT_DATA_BYTES, MAX_CONTENT_RESPONSE_BYTES, MAX_MEDIA_BYTES, contentBindingSchema, latestPublicationSchema, name, depth, contentQuerySchema, mediaPath, mediaQuerySchema, mediaRequestSchema, contentRequestSchema, timestamp, contentRecordSchema, contentAssetSchema, contentResponseSchema;
 var init_protocol = __esm({
   "packages/sdk/src/protocol.ts"() {
     "use strict";
@@ -35535,6 +35546,12 @@ var init_protocol = __esm({
       contentVersionId: external_exports.uuidv7(),
       schemaHash: external_exports.string().regex(/^sha256:[a-f0-9]{64}$/)
     }).strict();
+    latestPublicationSchema = external_exports.object({
+      binding: contentBindingSchema,
+      commitSha: external_exports.string().min(1).max(64),
+      branch: external_exports.string().min(1).max(256),
+      acceptedAt: external_exports.iso.datetime({ offset: false, precision: 3 })
+    });
     name = external_exports.string().regex(/^[a-zA-Z][a-zA-Z0-9_-]*$/).max(100);
     depth = external_exports.union([external_exports.literal(0), external_exports.literal(1)]).optional();
     contentQuerySchema = external_exports.discriminatedUnion("kind", [
@@ -35573,6 +35590,11 @@ var init_protocol = __esm({
       updatedAt: timestamp
     });
     contentAssetSchema = external_exports.object({
+      /** Direct immutable public object URL when the service has a media origin. */
+      url: external_exports.url().refine((value) => {
+        const url2 = new URL(value);
+        return !url2.username && !url2.password && (url2.protocol === "https:" || url2.protocol === "http:" && ["localhost", "127.0.0.1", "[::1]"].includes(url2.hostname));
+      }, "Media URLs require HTTPS or a local development origin.").optional(),
       filename: external_exports.string().min(1).max(256),
       mediaType: external_exports.enum([
         "image/jpeg",
@@ -35602,7 +35624,7 @@ var init_protocol = __esm({
 
 // packages/cli/src/developer.ts
 import { execFile } from "node:child_process";
-import { realpath } from "node:fs/promises";
+import { readFile, realpath, stat } from "node:fs/promises";
 import { resolve } from "node:path";
 import { pathToFileURL } from "node:url";
 import { promisify } from "node:util";
@@ -35943,6 +35965,23 @@ async function readInput() {
     );
   }
 }
+async function unresolvedSchemaImport(error62, schemaPath) {
+  if (!(error62 instanceof Error) || error62.code !== "MODULE_NOT_FOUND")
+    return void 0;
+  let source;
+  try {
+    const file2 = await stat(schemaPath);
+    if (!file2.isFile() || file2.size > MAX_SCHEMA_SOURCE_BYTES) return void 0;
+    source = await readFile(schemaPath, "utf8");
+  } catch {
+    return void 0;
+  }
+  if (/(?:\bfrom|\bimport|\brequire)\s*\(?\s*["']@plume\/cli\/schema["']/.test(
+    source
+  ))
+    return "plume.schema.ts imports @plume/cli/schema, which is now @plume-press/cli/schema. Change the import, then install @plume-press/cli.";
+  return "An import in plume.schema.ts can't be found. Install the package or fix the import path.";
+}
 async function loadCheckoutSchema(cwd) {
   try {
     const jiti = createJiti(pathToFileURL(resolve(cwd, "package.json")).href, {
@@ -35959,10 +35998,10 @@ async function loadCheckoutSchema(cwd) {
     if (Buffer.byteLength(canonicalJson(schema3), "utf8") > MAX_SCHEMA_BYTES)
       throw new Error();
     return schema3;
-  } catch {
+  } catch (error62) {
     throw new PlumeToolError(
       "INVALID_SCHEMA",
-      "Export a valid declarative schema named schema from plume.schema.ts."
+      await unresolvedSchemaImport(error62, resolve(cwd, "plume.schema.ts")) ?? "Export a valid declarative schema named schema from plume.schema.ts."
     );
   }
 }
@@ -36026,7 +36065,7 @@ async function developerMain(args, env2 = process.env) {
     return 1;
   }
 }
-var execFileAsync, MAX_INPUT_BYTES, MAX_RESPONSE_BYTES, MAX_SCHEMA_BYTES, schemaIssues, remoteText, detailShapes, id, context, writer, revision, record2, sha, operation, prepareInput, inspectResult, preparedResult, schemas, developerActions, PlumeToolError, developerHelp;
+var execFileAsync, MAX_INPUT_BYTES, MAX_RESPONSE_BYTES, MAX_SCHEMA_BYTES, MAX_SCHEMA_SOURCE_BYTES, schemaIssues, remoteText, detailShapes, id, context, writer, revision, record2, sha, operation, prepareInput, inspectResult, preparedResult, schemas, developerActions, PlumeToolError, developerHelp;
 var init_developer = __esm({
   "packages/cli/src/developer.ts"() {
     "use strict";
@@ -36037,6 +36076,7 @@ var init_developer = __esm({
     MAX_INPUT_BYTES = 512 * 1024;
     MAX_RESPONSE_BYTES = 4 * 1024 * 1024;
     MAX_SCHEMA_BYTES = 256 * 1024;
+    MAX_SCHEMA_SOURCE_BYTES = 1024 * 1024;
     schemaIssues = external_exports.object({
       issues: external_exports.array(
         external_exports.object({
@@ -36691,7 +36731,7 @@ var init_package = __esm({
   "packages/sdk/package.json"() {
     package_default = {
       name: "@plume-press/sdk",
-      version: "0.1.0",
+      version: "0.2.0",
       private: true,
       license: "MIT",
       type: "module",
@@ -36718,7 +36758,7 @@ var init_package2 = __esm({
   "packages/cli/package.json"() {
     package_default2 = {
       name: "@plume-press/cli",
-      version: "0.4.0",
+      version: "0.5.0",
       private: true,
       license: "MIT",
       type: "module",
@@ -36768,9 +36808,9 @@ function assertRuntime() {
 }
 async function inspect(path) {
   try {
-    const stat = await lstat3(path);
-    if (stat.isFile()) return "file";
-    if (stat.isDirectory()) return "directory";
+    const stat2 = await lstat3(path);
+    if (stat2.isFile()) return "file";
+    if (stat2.isDirectory()) return "directory";
     throw new PlumeLocalError(
       "UNSAFE_PATH",
       `${path} must be a regular file or directory, not a symbolic link or special file.`
@@ -37146,7 +37186,7 @@ import { createHash, randomBytes } from "node:crypto";
 import {
   lstat,
   mkdir,
-  readFile,
+  readFile as readFile2,
   rename,
   rm,
   writeFile
@@ -37181,7 +37221,7 @@ var statusLabels = {
 };
 function updateLabel(id3) {
   const timestamp2 = Number.parseInt(id3.replaceAll("-", "").slice(0, 12), 16);
-  return Number.isFinite(timestamp2) ? `Update \xB7 ${new Intl.DateTimeFormat("en", { month: "short", day: "numeric", hour: "2-digit", minute: "2-digit" }).format(timestamp2)}` : "Update";
+  return Number.isFinite(timestamp2) ? `Update \xB7 ${new Intl.DateTimeFormat("en", { month: "short", day: "numeric", hour: "2-digit", minute: "2-digit", timeZone: "Europe/Prague" }).format(timestamp2)}` : "Update";
 }
 function clock(at) {
   const time3 = new Date(at);
@@ -37276,7 +37316,7 @@ var credentialHash = (token) => createHash("sha256").update(token).digest("hex")
 async function readSession(ctx) {
   try {
     const session = sessionShape.parse(
-      JSON.parse(await readFile(sessionFile(ctx), "utf8"))
+      JSON.parse(await readFile2(sessionFile(ctx), "utf8"))
     );
     return session.credential === credentialHash(ctx.token) ? session : null;
   } catch {
@@ -37546,7 +37586,7 @@ function assignments(fields, pairs) {
 }
 async function readData(ctx, path) {
   try {
-    const value = JSON.parse(await readFile(resolve2(ctx.io.cwd, path), "utf8"));
+    const value = JSON.parse(await readFile2(resolve2(ctx.io.cwd, path), "utf8"));
     if (!value || typeof value !== "object" || Array.isArray(value))
       throw new Error();
     return value;
@@ -38965,8 +39005,8 @@ async function existingLock(path) {
   try {
     const handle2 = await open3(path, constants2.O_RDONLY | constants2.O_NOFOLLOW);
     try {
-      const stat = await handle2.stat();
-      if (!stat.isFile() || stat.size > MAX_LOCK_BYTES) throw new Error();
+      const stat2 = await handle2.stat();
+      if (!stat2.isFile() || stat2.size > MAX_LOCK_BYTES) throw new Error();
       const value = JSON.parse(
         new TextDecoder("utf-8", { fatal: true }).decode(
           await handle2.readFile()
@@ -39208,10 +39248,10 @@ async function validateSchema(cwd, path, binding) {
     if (new TextEncoder().encode(canonicalJson(schema3)).byteLength > MAX_SCHEMA_BYTES2)
       throw new Error();
     hash2 = await schemaHash(schema3);
-  } catch {
+  } catch (error62) {
     throw new PlumeBuildError(
       "INVALID_SCHEMA",
-      "Export a valid declarative schema named schema from plume.schema.ts (maximum 256 KiB)."
+      await unresolvedSchemaImport(error62, resolve7(cwd, path)) ?? "Export a valid declarative schema named schema from plume.schema.ts (maximum 256 KiB)."
     );
   }
   if (hash2 !== binding.schemaHash)

package/dist/local.mjs

@@ -34120,7 +34120,7 @@ function deliverRecord(fields, data, context, prefix = []) {
     const asset = context.asset(entry.id);
     if (!asset || kind === "image" && !asset.mediaType.startsWith("image/"))
       throw new TypeError("Unknown media asset.");
-    const url2 = context.mediaUrl(path);
+    const url2 = context.preferAssetUrl && asset.url ? asset.url : context.mediaUrl(path);
     return kind === "image" ? {
       url: url2,
       width: asset.width,
@@ -34156,7 +34156,10 @@ function deliverRecord(fields, data, context, prefix = []) {
       case "richText":
         if (typeof value === "string")
           result[field.name] = renderRichText(value, {
-            imageUrl: (_image, index2) => context.mediaUrl([...path, index2])
+            imageUrl: (image, index2) => {
+              const asset = context.asset(image.id);
+              return context.preferAssetUrl && asset?.url ? asset.url : context.mediaUrl([...path, index2]);
+            }
           });
         break;
       case "reference":
@@ -34180,6 +34183,9 @@ function defaultMediaUrl(input2) {
 // packages/core/src/image-size.ts
 var MAX_HEADER_BYTES = 1024 * 1024;
 
+// packages/core/src/media-object-key.ts
+var identifier = external_exports.uuidv7();
+
 // packages/local/src/index.ts
 import { lstat, mkdir, open as openFile, rm } from "node:fs/promises";
 import { join, resolve } from "node:path";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plume-press/cli",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "The plume command: set up a website's Plume CMS and check its builds.",
   "homepage": "https://app.plume.press",
   "license": "MIT",