@narrative.io/jsonforms-provider-protocols 3.0.0-beta.2 → 3.0.0-beta.21

package/src/vue/primevue/index.ts

@@ -19,13 +19,38 @@ const injectLayoutStyles = () => {
   display: flex;
   flex-direction: column;
   align-items: flex-start;
-  gap: 1rem;
+  gap: 24px;
   width: 100%;
 }
 
 .vertical-layout-item {
   width: 100%;
 }
+
+/* Form control wrapper */
+.jf-control {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+/* Form control label typography */
+.jf-label {
+  font-weight: 600;
+  font-size: 14px;
+  line-height: 14px;
+  color: #031553;
+  text-align: left;
+}
+
+/* Form control description typography */
+.jf-description {
+  font-weight: 400;
+  font-size: 14px;
+  line-height: 14px;
+  color: #415290;
+  text-align: left;
+}
       `;
       document.head.appendChild(style);
     }
@@ -102,47 +127,103 @@ export function registerPrimevueRenderers(jsonformsCore: any): unknown[] {
 
   // Projection-aware schema check: when options.projection is set,
   // resolve the projected schema and test against it instead of the original
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const projectedSchemaMatches = (check: (schema: any) => boolean) =>
-    (uischema: unknown, schema: unknown): boolean => {
-      const ui = uischema as { type?: string; scope?: string; options?: { projection?: string } };
-      const projection = ui?.options?.projection;
-      if (!projection || ui?.type !== "Control" || !ui?.scope) return false;
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const propertySchema = resolveScopeSchema(ui.scope, schema as Record<string, any>);
-      if (!propertySchema) return false;
-
-      return check(getProjectedSchema(propertySchema, projection));
-    };
+
+  const projectedSchemaMatches =
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (check: (schema: any) => boolean) =>
+      (uischema: unknown, schema: unknown): boolean => {
+        const ui = uischema as {
+          type?: string;
+          scope?: string;
+          options?: { projection?: string };
+        };
+        const projection = ui?.options?.projection;
+        if (!projection || ui?.type !== "Control" || !ui?.scope) return false;
+
+        const propertySchema = resolveScopeSchema(
+          ui.scope,
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          schema as Record<string, any>,
+        );
+        if (!propertySchema) return false;
+
+        return check(getProjectedSchema(propertySchema, projection));
+      };
 
   const isMultilineProjection = (uischema: unknown, schema: unknown) => {
     const ui = uischema as { options?: { multi?: boolean } };
-    return ui?.options?.multi === true &&
-      projectedSchemaMatches((s) => s?.type === "string")(uischema, schema);
+    return (
+      ui?.options?.multi === true &&
+      projectedSchemaMatches((s) => s?.type === "string")(uischema, schema)
+    );
   };
 
   const renderers = [
     // Multiline text has higher priority than regular text
-    { tester: rankWith(PRIME + 4, or(isMultilineString, isMultilineProjection)), renderer: JfTextArea },
-    { tester: rankWith(PRIME + 3, or(isStringControl, projectedSchemaMatches((s) => s?.type === "string"))), renderer: JfText },
     {
-      tester: rankWith(PRIME + 6, or(isIntegerControl, projectedSchemaMatches((s) => s?.type === "integer"))),
+      tester: rankWith(PRIME + 4, or(isMultilineString, isMultilineProjection)),
+      renderer: JfTextArea,
+    },
+    {
+      tester: rankWith(
+        PRIME + 3,
+        or(
+          isStringControl,
+          projectedSchemaMatches((s) => s?.type === "string"),
+        ),
+      ),
+      renderer: JfText,
+    },
+    {
+      tester: rankWith(
+        PRIME + 6,
+        or(
+          isIntegerControl,
+          projectedSchemaMatches((s) => s?.type === "integer"),
+        ),
+      ),
       renderer: JfNumber,
     },
     {
-      tester: rankWith(PRIME + 4, or(isNumberControl, projectedSchemaMatches((s) => s?.type === "number"))),
+      tester: rankWith(
+        PRIME + 4,
+        or(
+          isNumberControl,
+          projectedSchemaMatches((s) => s?.type === "number"),
+        ),
+      ),
       renderer: JfNumber,
     },
     {
-      tester: rankWith(PRIME + 7, or(and(isControl, schemaMatches(isScalarEnum)), and(isControl, projectedSchemaMatches(isScalarEnum)))),
+      tester: rankWith(
+        PRIME + 7,
+        or(
+          and(isControl, schemaMatches(isScalarEnum)),
+          and(isControl, projectedSchemaMatches(isScalarEnum)),
+        ),
+      ),
       renderer: JfEnum,
     },
     {
-      tester: rankWith(PRIME + 8, or(and(isControl, schemaMatches(isEnumArray)), and(isControl, projectedSchemaMatches(isEnumArray)))),
+      tester: rankWith(
+        PRIME + 8,
+        or(
+          and(isControl, schemaMatches(isEnumArray)),
+          and(isControl, projectedSchemaMatches(isEnumArray)),
+        ),
+      ),
       renderer: JfEnumArray,
     },
-    { tester: rankWith(PRIME + 3, or(isBooleanControl, projectedSchemaMatches((s) => s?.type === "boolean"))), renderer: JfBoolean },
+    {
+      tester: rankWith(
+        PRIME + 3,
+        or(
+          isBooleanControl,
+          projectedSchemaMatches((s) => s?.type === "boolean"),
+        ),
+      ),
+      renderer: JfBoolean,
+    },
   ];
 
   // Update the exported array

package/src/vue/styles.css

@@ -5,7 +5,7 @@
   display: flex;
   flex-direction: column;
   align-items: flex-start;
-  gap: 1rem;
+  gap: 24px;
   width: 100%;
 }
 
@@ -14,6 +14,31 @@
   width: 100%;
 }
 
+/* Form control wrapper */
+.jf-control {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+/* Form control label typography */
+.jf-label {
+  font-weight: 600;
+  font-size: 14px;
+  line-height: 14px;
+  color: #031553;
+  text-align: left;
+}
+
+/* Form control description typography */
+.jf-description {
+  font-weight: 400;
+  font-size: 14px;
+  line-height: 14px;
+  color: #415290;
+  text-align: left;
+}
+
 /* PrimeVue dropdown text alignment fix */
 .p-dropdown-label {
   text-align: left !important;

package/src/vue/utils/autoSelect.ts

@@ -57,7 +57,7 @@ export interface AutoSelectMultiParams {
  * - Current value is empty array OR current selection is not in the current options
  */
 export function shouldAutoSelectMulti(
-  params: AutoSelectMultiParams
+  params: AutoSelectMultiParams,
 ): unknown[] | null {
   const { autoSelectSingle, isLoading, items, currentValue } = params;
 
@@ -73,7 +73,7 @@ export function shouldAutoSelectMulti(
   const currentArray = Array.isArray(currentValue) ? currentValue : [];
   const isValueEmpty = currentArray.length === 0;
   const hasValidSelection = currentArray.some((val) =>
-    items.some((item) => item.value === val)
+    items.some((item) => item.value === val),
   );
 
   if (isValueEmpty || !hasValidSelection) {

package/src/vue/utils/placeholder.ts

@@ -0,0 +1,42 @@
+/**
+ * Placeholder resolution for form controls.
+ *
+ * Precedence:
+ *   1. `uischema.options.placeholder` (explicit author intent — always wins)
+ *   2. `Select ${label}` or `Enter ${label}` when a label is resolvable
+ *   3. Kind-appropriate bare fallback
+ *
+ * Never falls back to `schema.description` — descriptions are rendered as
+ * prose above the field by our renderers, so re-using them as placeholder
+ * produces a duplicated, truncated string inside the input.
+ */
+
+export type PlaceholderKind = "select" | "input";
+
+/**
+ * Strip a trailing required-indicator asterisk (" *" or "*") that `resolveLabel`
+ * appends for required fields, so composed placeholders read naturally.
+ */
+function stripRequiredMarker(label: string): string {
+  return label.replace(/\s*\*\s*$/, "").trim();
+}
+
+export function resolvePlaceholder(
+  uischema: { options?: unknown } | undefined,
+  resolvedLabel: string | undefined,
+  kind: PlaceholderKind,
+): string | undefined {
+  const options = uischema?.options;
+  const explicit =
+    options && typeof options === "object"
+      ? (options as Record<string, unknown>).placeholder
+      : undefined;
+  if (typeof explicit === "string" && explicit.length > 0) return explicit;
+
+  const label = resolvedLabel ? stripRequiredMarker(resolvedLabel) : "";
+  if (label) {
+    return kind === "select" ? `Select ${label}` : `Enter ${label}`;
+  }
+
+  return kind === "select" ? "Select…" : undefined;
+}