@nodaro/prompts 1.26.1 → 1.28.0

package/src/catalog-sections.ts

@@ -0,0 +1,24 @@
+import { PERSON_DIMENSION_SECTIONS, PERSON_FIELD_BY_DIMENSION } from "./person.js"
+import { STYLING_DIMENSION_SECTIONS, STYLING_FIELD_BY_DIMENSION } from "./styling.js"
+
+/** One of the topics the editor groups a catalog's settings under, as node-data fields. */
+export interface CatalogTopic {
+  readonly label: string
+  readonly fields: ReadonlyArray<string>
+}
+
+/**
+ * The editor's topics for a catalog (Person, Styling), in order, with their
+ * settings as node-data fields — or undefined for every other catalog. Kept
+ * out of the picker-catalogs funnel on purpose: the topic lists are layout
+ * metadata, not catalog entries.
+ */
+export function catalogTopics(catalogId: string): ReadonlyArray<CatalogTopic> | undefined {
+  if (catalogId === "person") {
+    return PERSON_DIMENSION_SECTIONS.map((s) => ({ label: s.label, fields: s.dimensions.map((d) => PERSON_FIELD_BY_DIMENSION[d] as string) }))
+  }
+  if (catalogId === "styling") {
+    return STYLING_DIMENSION_SECTIONS.map((s) => ({ label: s.label, fields: s.dimensions.map((d) => STYLING_FIELD_BY_DIMENSION[d] as string) }))
+  }
+  return undefined
+}

package/src/hint-join.ts

@@ -13,7 +13,9 @@
  * approved, and a user's preText/postText is never rewritten.
  */
 
-const ENDS_SENTENCE = /[.!?]$/
+/** A piece that already closes a sentence: a Latin or CJK full stop, question
+ *  or exclamation mark, or an ellipsis. */
+const ENDS_SENTENCE = /[.!?…。！？]$/
 
 export function joinHintFragments(fragments: ReadonlyArray<string>): string {
   let out = ""
@@ -24,3 +26,33 @@ export function joinHintFragments(fragments: ReadonlyArray<string>): string {
   }
   return out
 }
+
+/**
+ * Join prompt pieces as sentences: `". "` between two pieces, or a single
+ * space when the piece before already ends a sentence. Without that check a
+ * prompt typed with a closing period came out as
+ * "no watermark.. butterfly portrait lighting". Blank pieces are dropped. The
+ * pieces are otherwise kept verbatim, except that trailing space before a join
+ * is not carried into it ("cat " + "hint" gives "cat. hint").
+ */
+export function joinSentences(pieces: ReadonlyArray<string | undefined>): string {
+  let out = ""
+  for (const piece of pieces) {
+    if (!piece || !piece.trim()) continue
+    if (!out) { out = piece; continue }
+    const head = out.trimEnd()
+    out = ENDS_SENTENCE.test(head) ? `${head} ${piece}` : `${head}. ${piece}`
+  }
+  return out
+}
+
+/**
+ * Append wired picker hints to a prompt, the way both DAG engines fold them:
+ * the hints join as clauses (`joinHintFragments`), then follow the prompt as a
+ * new sentence (`joinSentences`). No hints (or only blank ones) gives the
+ * prompt back unchanged.
+ */
+export function appendPromptHints(prompt: string | undefined, hints: ReadonlyArray<string>): string {
+  const joined = joinHintFragments(hints)
+  return joined.trim() ? joinSentences([prompt, joined]) : (prompt ?? "")
+}

package/src/index.ts

@@ -14,6 +14,7 @@ export * from "./identity-lock.js"
 export * from "./reference-rules.js"
 export * from "./term.js"
 export * from "./parameter-prompt-hint.js"
+export * from "./video-own-motion.js"
 export * from "./entity-prompts.js"
 export * from "./brand-tokens.js"
 export * from "./described-references.js"
@@ -99,3 +100,6 @@ export * from "./character-motion-diagnostics.js"
 
 // --- Per-ad creative analysis for the social scraper nodes ---
 export * from "./ad-creative-analysis.js"
+
+// --- Picker art: option pictures + topic icons (editor and API) ---
+export * from "./picker-art/index.js"

package/src/parameter-prompt-hint.ts

@@ -36,7 +36,7 @@ import { buildStylingHints } from "./styling.js"
 import { buildTemporalHints } from "./temporal.js"
 import { composeCameraMotionHintFromConnections } from "./camera-motions.js"
 import { joinHintFragments } from "./hint-join.js"
-import { composeTransitionHintFromConnections, type TransitionDuration, type TransitionIntensity, type TransitionPosition, type TransitionTiming } from "./transitions.js"
+import { composeTransitionHintFromConnections, readTransitionOptionValues, type TransitionDuration, type TransitionIntensity, type TransitionPosition, type TransitionTiming } from "./transitions.js"
 import { composeCharacterFxHintFromConnections, type CharacterFxDuration, type CharacterFxIntensity, type CharacterFxPosition, type CharacterFxTiming } from "./character-fx.js"
 import { composeCharacterMotionHintFromConnections, type CharacterMotionPace, type CharacterMotionPosition, type CharacterMotionTiming } from "./character-motion.js"
 import { containsMinorAgeHint, isMinorAge } from "./age-floor.js"
@@ -158,6 +158,14 @@ function byMode<T>(mode: PickerHintMode, full: T, compact: T): T {
   return mode === "compact" ? compact : full
 }
 
+/** How much a shot moves (the Motion node's three steps), as the clause it
+ *  adds to a video prompt; the compact form is the bare term. */
+const MOTION_INTENSITY_HINTS: Readonly<Record<string, { readonly full: string; readonly compact: string }>> = {
+  subtle: { full: "subtle, gentle motion with slow, minimal movement", compact: "subtle motion" },
+  moderate: { full: "moderate, natural motion at an even pace", compact: "moderate motion" },
+  dynamic: { full: "dynamic, energetic motion with fast, pronounced movement", compact: "dynamic motion" },
+}
+
 /**
  * Dispatch by parameter-node type to its prompt-hint string. For camera-motion,
  * pass `ctx` to include the composed start/end clauses; otherwise only the
@@ -227,8 +235,11 @@ function resolveParameterHint(
       duration:  asStr(data.duration)  as TransitionDuration  | undefined,
       intensity: asStr(data.intensity) as TransitionIntensity | undefined,
     }
+    // A picked row's own options (a wipe's `wipeDirection`), off the same node data.
+    const optionValues = readTransitionOptionValues(data)
+    const hintOptions = optionValues ? { optionValues } : undefined
     if (!ctx) {
-      return withCustomText(data, composeTransitionHintFromConnections(transitionId, [], [], timing, mode))
+      return withCustomText(data, composeTransitionHintFromConnections(transitionId, [], [], timing, mode, hintOptions))
     }
     const startHints: string[] = []
     const endHints: string[] = []
@@ -241,7 +252,7 @@ function resolveParameterHint(
       if      (edge.targetHandle === "startState") startHints.push(hint)
       else if (edge.targetHandle === "endState")   endHints.push(hint)
     }
-    return withCustomText(data, composeTransitionHintFromConnections(transitionId, startHints, endHints, timing, mode))
+    return withCustomText(data, composeTransitionHintFromConnections(transitionId, startHints, endHints, timing, mode, hintOptions))
   }
 
   if (node.type === "character-fx") {
@@ -409,6 +420,12 @@ function resolveBaseHint(
       return withCustomText(data, byMode(mode, getCompositionEffectPromptHint, getCompositionEffectTerm)(asStr(data.compositionEffect)))
     case "post-process-effects":
       return withCustomText(data, buildPostProcessHints(data.postProcess, mode).join(", "))
+    // Motion intensity: a Generation Settings node that a video node's
+    // Settings input takes as a prompt fragment (video only).
+    case "motion": {
+      const hint = MOTION_INTENSITY_HINTS[asStr(data.motion)]
+      return hint ? byMode(mode, hint.full, hint.compact) : ""
+    }
 
     // Free text authored by the user, not catalog copy — there is no shorter
     // professional form to swap in, so these are identical in both modes.

package/src/person.ts

@@ -1060,7 +1060,8 @@ export interface PersonValue {
   /** Specific age in years. Only consulted when `age === "age-custom"`. */
   customAge?: number
   /** Single id, or an array of up to 2 ids for mixed heritage (e.g.
-   *  ["slavic","mediterranean"] → "of mixed Slavic and Mediterranean heritage"). */
+   *  ["slavic","mediterranean"] → "of mixed Slavic Eastern European and
+   *  Mediterranean heritage"). */
   ethnicity?: string | ReadonlyArray<string>
   /** Regional / cultural aesthetic vibe (e.g. `"cali-beach"`, `"parisienne"`,
    *  `"kinshasa-sape"`). Composes with ethnicity, skin tone, hair, and
@@ -1238,16 +1239,31 @@ function normalizePickIds(value: unknown): string[] {
  */
 type PersonFragmentFor = (id: string | undefined | null) => string
 
+/**
+ * The heritage an ethnicity entry names, as a prompt-safe noun: its promptHint
+ * without the "of … descent" / "… heritage" wrapper ("of Mediterranean descent"
+ * → "Mediterranean"). NOT the short label — that is display copy for the
+ * picker grid ("Mediter.", "Pacific Isl.", "any", a bare "East"), which is what
+ * two picks used to put in the prompt ("of mixed Slavic and Mediter. heritage").
+ */
+function heritageNoun(id: string): string | undefined {
+  const noun = (getPerson(id)?.promptHint ?? "")
+    .trim()
+    .replace(/^of\s+/i, "")
+    .replace(/\s+(descent|heritage)$/i, "")
+    .trim()
+  return noun.length > 0 ? noun : undefined
+}
+
 function buildEthnicityFragment(value: unknown, fragmentFor: PersonFragmentFor): string {
-  const ids = normalizePickIds(value)
+  // "mixed" is itself the mixed-heritage pick; paired with a specific one it
+  // adds nothing, so the pair reads as that one.
+  const ids = normalizePickIds(value).filter((id, _, all) => all.length < 2 || id !== "mixed")
   if (ids.length === 0) return ""
   if (ids.length === 1) return fragmentFor(ids[0])
-  const labels = ids
-    .slice(0, 2)
-    .map((id) => getPerson(id)?.shortLabel ?? getPerson(id)?.label ?? "")
-    .filter((s): s is string => Boolean(s))
-  if (labels.length < 2) return fragmentFor(ids[0])
-  return `of mixed ${labels[0]} and ${labels[1]} heritage`
+  const nouns = ids.slice(0, 2).map(heritageNoun).filter((s): s is string => Boolean(s))
+  if (nouns.length < 2) return fragmentFor(ids[0])
+  return `of mixed ${nouns[0]} and ${nouns[1]} heritage`
 }
 
 /**