@kokimoki/app 0.4.4 → 0.5.1

package/dist/fields.d.ts

@@ -1,6 +1,5 @@
 export interface FieldOptions {
     label?: string;
-    optional: boolean;
 }
 export declare abstract class Field<T> {
     readonly options: FieldOptions;
@@ -44,7 +43,7 @@ export declare class EnumField<T extends Record<string, string>> extends Field<k
     value: keyof T;
     constructor(enumValues: T, value: keyof T, options?: FieldOptions);
     get schema(): {
-        enum: T;
+        enum: string[];
     };
 }
 export declare class IntegerField extends Field<number> {
@@ -55,17 +54,23 @@ export declare class IntegerField extends Field<number> {
         default: number;
     };
 }
-export declare class FormGroup<T extends Record<string, Field<any>>> extends Field<{
-    [key in keyof T]: Field<T>["value"];
-}> {
-    fields: T;
-    constructor(fields: T, options?: FieldOptions);
+export declare class FormGroup<T extends Record<string, Field<any>>, O extends Record<string, Field<any>>> extends Field<{
+    [key in keyof T]: T[key]["value"];
+} & Partial<{
+    [key in keyof O]: O[key]["value"];
+}>> {
+    requiredFields: T;
+    optionalFields: O;
+    constructor(requiredFields: T, optionalFields?: O, options?: FieldOptions);
     get value(): {
         [key in keyof T]: T[key]["value"];
-    };
+    } & Partial<{
+        [key in keyof O]: O[key]["value"];
+    }>;
     get schema(): {
         type: string;
         properties: any;
+        required: string[];
     };
 }
 export declare class FormArray<T> extends Field<T[]> {
@@ -78,5 +83,5 @@ export declare class FormArray<T> extends Field<T[]> {
         default: T[];
     };
 }
-export declare class Form<T extends Record<string, Field<any>>> extends FormGroup<T> {
+export declare class Form<R extends Record<string, Field<any>>, O extends Record<string, Field<any>>> extends FormGroup<R, O> {
 }

package/dist/fields.js

@@ -1,6 +1,4 @@
-const defaultFieldOptions = {
-    optional: false,
-};
+const defaultFieldOptions = {};
 export class Field {
     options;
     constructor(options) {
@@ -68,7 +66,7 @@ export class EnumField extends Field {
     }
     get schema() {
         return {
-            enum: this.enumValues,
+            enum: Object.keys(this.enumValues),
         };
     }
 }
@@ -86,24 +84,37 @@ export class IntegerField extends Field {
     }
 }
 export class FormGroup extends Field {
-    fields;
-    constructor(fields, options = defaultFieldOptions) {
+    requiredFields;
+    optionalFields;
+    constructor(requiredFields, optionalFields = {}, options = defaultFieldOptions) {
         super(options);
-        this.fields = fields;
+        this.requiredFields = requiredFields;
+        this.optionalFields = optionalFields;
     }
     get value() {
-        return Object.entries(this.fields).reduce((acc, [key, field]) => {
+        const value = Object.entries(this.requiredFields).reduce((acc, [key, field]) => {
             acc[key] = field.value;
             return acc;
         }, {});
+        Object.entries(this.optionalFields).forEach(([key, field]) => {
+            if (field.value !== undefined) {
+                value[key] = field.value;
+            }
+        });
+        return value;
     }
     get schema() {
+        const properties = {};
+        Object.entries(this.requiredFields).forEach(([key, field]) => {
+            properties[key] = field.schema;
+        });
+        Object.entries(this.optionalFields).forEach(([key, field]) => {
+            properties[key] = field.schema;
+        });
         return {
             type: "object",
-            properties: Object.entries(this.fields).reduce((acc, [key, field]) => {
-                acc[key] = field.schema;
-                return acc;
-            }, {}),
+            properties,
+            required: Object.keys(this.requiredFields),
         };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kokimoki/app",
-  "version": "0.4.4",
+  "version": "0.5.1",
   "type": "module",
   "description": "Kokimoki app",
   "main": "dist/index.js",