@dxos/react-ui-form 0.8.4-main.8360d9e660 → 0.8.4-main.8baae0fced

package/src/util/properties.ts

@@ -3,16 +3,27 @@
 //
 
 import * as Option from 'effect/Option';
-import type * as SchemaAST from 'effect/SchemaAST';
+import * as SchemaAST from 'effect/SchemaAST';
 
 import { Annotation } from '@dxos/echo';
 import { type SchemaProperty, getProperties } from '@dxos/effect';
 
 /**
  * Get the property types of an AST and filter out properties that are not form inputs.
+ *
+ * The `FormInputAnnotation` is read from the raw property signature's AST (before
+ * `encodedBoundAST` is applied by `getProperties`), because `encodedBoundAST` strips
+ * annotations from non-keyword inner types (e.g., `Schema.Struct`, `Schema.Array`).
+ * Without this, fields like `Routine.input` (a JsonSchema struct) annotated
+ * `FormInputAnnotation.set(false)` would still render in the form.
  */
 export const getFormProperties = (ast: SchemaAST.AST): SchemaProperty[] => {
-  return getProperties(ast).filter((prop) =>
-    Annotation.FormInputAnnotation.getFromAst(prop.type).pipe(Option.getOrElse(() => true)),
+  const hidden = new Set(
+    SchemaAST.getPropertySignatures(ast)
+      .filter(
+        (prop) => Annotation.FormInputAnnotation.getFromAst(prop.type).pipe(Option.getOrElse(() => true)) === false,
+      )
+      .map((prop) => prop.name),
   );
+  return getProperties(ast).filter((prop) => !hidden.has(prop.name));
 };

package/src/util/refs.ts

@@ -5,11 +5,13 @@
 import type * as SchemaAST from 'effect/SchemaAST';
 
 import { Ref } from '@dxos/echo';
-import { getArrayElementType, isArrayType } from '@dxos/effect';
+import { type ReferenceAnnotationValue, ReferenceAnnotationId } from '@dxos/echo/internal';
+import { findAnnotation, getArrayElementType, isArrayType } from '@dxos/effect';
 
 type RefProps = {
   ast: SchemaAST.AST;
   isArray: boolean;
+  typename?: string;
 };
 
 export const getRefProps = (ast: SchemaAST.AST): RefProps | undefined => {
@@ -18,14 +20,16 @@ export const getRefProps = (ast: SchemaAST.AST): RefProps | undefined => {
     const elementType = getArrayElementType(ast);
     if (elementType) {
       if (Ref.isRefType(elementType)) {
-        return { ast: elementType, isArray: true };
+        const typename = findAnnotation<ReferenceAnnotationValue>(elementType, ReferenceAnnotationId)?.typename;
+        return { ast: elementType, isArray: true, typename };
       }
     }
   }
 
   // Direct reference.
   if (Ref.isRefType(ast)) {
-    return { ast, isArray: false };
+    const typename = findAnnotation<ReferenceAnnotationValue>(ast, ReferenceAnnotationId)?.typename;
+    return { ast, isArray: false, typename };
   }
 
   return undefined;