Merge pull request #5476 from systeminit/clover/validation

feat(clover): Add vallidation for required fields
systeminit · Feb 14, 2025 · b5b4e4d · b5b4e4d
2 parents bf6e690 + 044c0ed
commit b5b4e4d
Show file tree

Hide file tree

Showing 4 changed files with 161 additions and 159 deletions.
diff --git a/bin/clover/src/cfDb.ts b/bin/clover/src/cfDb.ts
@@ -39,19 +39,19 @@ export type CfProperty =
     ];
   }>;
 
-type CfBooleanProperty = JSONSchema.Boolean;
+export type CfBooleanProperty = JSONSchema.Boolean;
 
-type CfStringProperty = JSONSchema.String;
+export type CfStringProperty = JSONSchema.String;
 
-type CfNumberProperty = JSONSchema.Number & {
+export type CfNumberProperty = JSONSchema.Number & {
   format?: string;
 };
 
-type CfIntegerProperty = JSONSchema.Integer & {
+export type CfIntegerProperty = JSONSchema.Integer & {
   format?: string;
 };
 
-type CfArrayProperty = Extend<JSONSchema.Array, {
+export type CfArrayProperty = Extend<JSONSchema.Array, {
   // For properties of type array, defines the data structure of each array item.
   // Contains a single schema. A list of schemas is not allowed.
   items: CfProperty;
@@ -60,7 +60,7 @@ type CfArrayProperty = Extend<JSONSchema.Array, {
   insertionOrder?: boolean;
 }>;
 
-type CfObjectProperty = Extend<JSONSchema.Object, {
+export type CfObjectProperty = Extend<JSONSchema.Object, {
   properties?: Record<string, CfProperty>;
   // e.g. patternProperties: { "^[a-z]+": { type: "string" } }
   patternProperties?: Record<string, CfProperty>;
@@ -261,7 +261,7 @@ function isCfObjectProperty(prop: CfProperty): prop is CfObjectProperty {
     "patternProperties" in prop;
 }
 
-export interface CfSchema extends JSONSchema.Interface {
+export type CfSchema = Extend<CfObjectProperty, {
   typeName: string;
   description: string;
   primaryIdentifier: JSONPointer[];
@@ -307,7 +307,7 @@ export interface CfSchema extends JSONSchema.Interface {
     mappings: Record<string, JSONPointer>;
   };
   propertyTransform?: Record<string, string>;
-}
+}>;
 
 type CfDb = Record<string, CfSchema>;
 const DB: CfDb = {};

diff --git a/bin/clover/src/spec/pkgs.ts b/bin/clover/src/spec/pkgs.ts
@@ -18,7 +18,7 @@ export type ExpandedSchemaVariantSpec = Extend<SchemaVariantSpec, {
   data: NonNullable<SchemaVariantSpecData>;
   sockets: ExpandedSocketSpec[];
   domain: ExpandedPropSpecFor["object"];
-  secrets: ExpandedPropSpec;
+  secrets: ExpandedPropSpecFor["object"];
   secretDefinition: ExpandedPropSpec | null;
   resourceValue: ExpandedPropSpecFor["object"];
 }>;