pixelkiln 0.52.0 → 0.53.1

package/dist/cli.js

@@ -10755,7 +10755,19 @@ var NewAssetSchema = z5.object({
   size: z5.number().int().optional(),
   tags: z5.array(z5.string()).optional(),
   /** Restrict to these styles; empty or omitted means every style. */
-  styles: z5.array(z5.string().min(1)).optional()
+  styles: z5.array(z5.string().min(1)).optional(),
+  /**
+   * A controlled regeneration of another asset in the same manifest,
+   * instead of a fresh generation. `inpaint` needs a mask upload the
+   * gallery does not offer yet, so only `image-to-image` can be created
+   * here; hand-edit the manifest for the other modes.
+   */
+  revision: z5.object({
+    mode: z5.literal("image-to-image"),
+    /** Asset id of the parent this revises; must already exist. */
+    from: z5.string().min(1),
+    strength: z5.number().min(0).max(1).optional()
+  }).strict().optional()
 }).strict();
 var CANDIDATE_OPTION = {
   retrodiffusion: "numImages",
@@ -10921,6 +10933,9 @@ function applyEdit(raw, edit) {
       }
       asset2.styles = styles;
     }
+    if (edit.asset.revision && !Object.hasOwn(raw.assets, edit.asset.revision.from)) {
+      throw new ManifestEditError(`revision parent "${edit.asset.revision.from}" is not declared by the manifest`);
+    }
     raw.assets[edit.assetId] = asset2;
     return;
   }
@@ -15581,6 +15596,25 @@ function normalizeTileRules(raw) {
     raw
   };
 }
+function normalizeTerrainTiles(metadata) {
+  if (!isRecord2(metadata) || !Array.isArray(metadata.terrainTiles)) return null;
+  const terrains = Array.isArray(metadata.terrainTypes) ? metadata.terrainTypes.filter((item) => typeof item === "string") : [];
+  if (terrains.length < 2) return null;
+  const masks = {};
+  metadata.terrainTiles.forEach((tile, index) => {
+    if (!isRecord2(tile) || !isRecord2(tile.corners)) return;
+    const corners = tile.corners;
+    const bit = (corner) => corners[corner] === terrains[0] ? 1 : 0;
+    masks[index] = bit("NW") << 3 | bit("NE") << 2 | bit("SW") << 1 | bit("SE");
+  });
+  return {
+    ruleType: "corner",
+    arity: 4,
+    terrains,
+    masks,
+    raw: metadata
+  };
+}
 function exportTileset(entry, spec, options) {
   let outputs = resolveSpecEntryOutputs(entry, spec);
   if (!outputs.length) throw new Error(`${spec.styleId}/${spec.assetId} has no downloaded outputs`);
@@ -15601,14 +15635,16 @@ function exportTileset(entry, spec, options) {
   }
   const metadata = entry.providerMetadata?.[entry.provider];
   const rawRules = isRecord2(metadata) ? metadata.tileRules : void 0;
-  const rules = normalizeTileRules(rawRules);
+  const terrainRules = normalizeTerrainTiles(metadata);
+  const rules = normalizeTileRules(rawRules) ?? terrainRules;
+  const providerRules = isRecord2(rawRules) ? rawRules : terrainRules ? metadata : null;
   const frames = packed.atlas.frames;
   const generic = buildGeneric(
     spec,
     options.imageName,
     packed.atlas,
     frames,
-    isRecord2(rawRules) ? rawRules : null,
+    providerRules,
     rules
   );
   if (options.format === "generic") {
@@ -15621,7 +15657,7 @@ function exportTileset(entry, spec, options) {
     };
   }
   assertUniformTiles(generic);
-  if ((rawRules !== void 0 || entry.tileFeature) && !rules) {
+  if ((rawRules !== void 0 || entry.tileFeature || entry.generator === "terrain") && !rules) {
     throw new Error(
       `${options.format} export needs recognized adjacency rules; use --format generic to retain this provider rule object without guessing`
     );