@dmptool/types 1.1.2 → 1.2.0

package/dist/questions/dateQuestions.d.ts

@@ -1,21 +1,35 @@
 import { z } from "zod";
-export declare const DateQuestionSchema: z.ZodObject<{} & {
+export declare const DateQuestionSchema: z.ZodObject<{
+    meta: z.ZodDefault<z.ZodObject<{
+        schemaVersion: z.ZodDefault<z.ZodString>;
+        title: z.ZodOptional<z.ZodString>;
+        usageDescription: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        schemaVersion: string;
+        title?: string | undefined;
+        usageDescription?: string | undefined;
+    }, {
+        schemaVersion?: string | undefined;
+        title?: string | undefined;
+        usageDescription?: string | undefined;
+    }>>;
+} & {
     type: z.ZodLiteral<"date">;
-    attributes: z.ZodOptional<z.ZodObject<{
+    attributes: z.ZodDefault<z.ZodObject<{
         label: z.ZodOptional<z.ZodString>;
         help: z.ZodOptional<z.ZodString>;
         labelTranslationKey: z.ZodOptional<z.ZodString>;
     } & {
         max: z.ZodOptional<z.ZodString>;
         min: z.ZodOptional<z.ZodString>;
-        step: z.ZodOptional<z.ZodNumber>;
+        step: z.ZodDefault<z.ZodNumber>;
     }, "strip", z.ZodTypeAny, {
+        step: number;
         label?: string | undefined;
         help?: string | undefined;
         labelTranslationKey?: string | undefined;
         max?: string | undefined;
         min?: string | undefined;
-        step?: number | undefined;
     }, {
         label?: string | undefined;
         help?: string | undefined;
@@ -24,39 +38,21 @@ export declare const DateQuestionSchema: z.ZodObject<{} & {
         min?: string | undefined;
         step?: number | undefined;
     }>>;
-    meta: z.ZodOptional<z.ZodObject<{
-        schemaVersion: z.ZodLiteral<"1.0">;
-    } & {
-        title: z.ZodOptional<z.ZodLiteral<"Date Field">>;
-        usageDescription: z.ZodOptional<z.ZodLiteral<"For questions that require a date.">>;
-        defaultJSON: z.ZodOptional<z.ZodLiteral<string>>;
-    }, "strip", z.ZodTypeAny, {
-        schemaVersion: "1.0";
-        title?: "Date Field" | undefined;
-        usageDescription?: "For questions that require a date." | undefined;
-        defaultJSON?: string | undefined;
-    }, {
-        schemaVersion: "1.0";
-        title?: "Date Field" | undefined;
-        usageDescription?: "For questions that require a date." | undefined;
-        defaultJSON?: string | undefined;
-    }>>;
 }, "strip", z.ZodTypeAny, {
     type: "date";
-    attributes?: {
+    attributes: {
+        step: number;
         label?: string | undefined;
         help?: string | undefined;
         labelTranslationKey?: string | undefined;
         max?: string | undefined;
         min?: string | undefined;
-        step?: number | undefined;
-    } | undefined;
-    meta?: {
-        schemaVersion: "1.0";
-        title?: "Date Field" | undefined;
-        usageDescription?: "For questions that require a date." | undefined;
-        defaultJSON?: string | undefined;
-    } | undefined;
+    };
+    meta: {
+        schemaVersion: string;
+        title?: string | undefined;
+        usageDescription?: string | undefined;
+    };
 }, {
     type: "date";
     attributes?: {
@@ -68,14 +64,28 @@ export declare const DateQuestionSchema: z.ZodObject<{} & {
         step?: number | undefined;
     } | undefined;
     meta?: {
-        schemaVersion: "1.0";
-        title?: "Date Field" | undefined;
-        usageDescription?: "For questions that require a date." | undefined;
-        defaultJSON?: string | undefined;
+        schemaVersion?: string | undefined;
+        title?: string | undefined;
+        usageDescription?: string | undefined;
     } | undefined;
 }>;
 export declare const DateRangeQuestionSchema: z.ZodObject<{
-    attributes: z.ZodOptional<z.ZodObject<{
+    meta: z.ZodDefault<z.ZodObject<{
+        schemaVersion: z.ZodDefault<z.ZodString>;
+        title: z.ZodOptional<z.ZodString>;
+        usageDescription: z.ZodOptional<z.ZodString>;
+    }, "strip", z.ZodTypeAny, {
+        schemaVersion: string;
+        title?: string | undefined;
+        usageDescription?: string | undefined;
+    }, {
+        schemaVersion?: string | undefined;
+        title?: string | undefined;
+        usageDescription?: string | undefined;
+    }>>;
+} & {
+    type: z.ZodLiteral<"dateRange">;
+    attributes: z.ZodDefault<z.ZodObject<{
         label: z.ZodOptional<z.ZodString>;
         help: z.ZodOptional<z.ZodString>;
         labelTranslationKey: z.ZodOptional<z.ZodString>;
@@ -88,24 +98,22 @@ export declare const DateRangeQuestionSchema: z.ZodObject<{
         help?: string | undefined;
         labelTranslationKey?: string | undefined;
     }>>;
-} & {
-    type: z.ZodLiteral<"dateRange">;
-    columns: z.ZodObject<{
-        start: z.ZodOptional<z.ZodObject<{
-            label: z.ZodOptional<z.ZodString>;
+    columns: z.ZodDefault<z.ZodObject<{
+        start: z.ZodDefault<z.ZodObject<{
             help: z.ZodOptional<z.ZodString>;
             labelTranslationKey: z.ZodOptional<z.ZodString>;
-        } & {
             max: z.ZodOptional<z.ZodString>;
             min: z.ZodOptional<z.ZodString>;
-            step: z.ZodOptional<z.ZodNumber>;
+            step: z.ZodDefault<z.ZodNumber>;
+        } & {
+            label: z.ZodDefault<z.ZodString>;
         }, "strip", z.ZodTypeAny, {
-            label?: string | undefined;
+            label: string;
+            step: number;
             help?: string | undefined;
             labelTranslationKey?: string | undefined;
             max?: string | undefined;
             min?: string | undefined;
-            step?: number | undefined;
         }, {
             label?: string | undefined;
             help?: string | undefined;
@@ -114,21 +122,21 @@ export declare const DateRangeQuestionSchema: z.ZodObject<{
             min?: string | undefined;
             step?: number | undefined;
         }>>;
-        end: z.ZodOptional<z.ZodObject<{
-            label: z.ZodOptional<z.ZodString>;
+        end: z.ZodDefault<z.ZodObject<{
             help: z.ZodOptional<z.ZodString>;
             labelTranslationKey: z.ZodOptional<z.ZodString>;
-        } & {
             max: z.ZodOptional<z.ZodString>;
             min: z.ZodOptional<z.ZodString>;
-            step: z.ZodOptional<z.ZodNumber>;
+            step: z.ZodDefault<z.ZodNumber>;
+        } & {
+            label: z.ZodDefault<z.ZodString>;
         }, "strip", z.ZodTypeAny, {
-            label?: string | undefined;
+            label: string;
+            step: number;
             help?: string | undefined;
             labelTranslationKey?: string | undefined;
             max?: string | undefined;
             min?: string | undefined;
-            step?: number | undefined;
         }, {
             label?: string | undefined;
             help?: string | undefined;
@@ -138,22 +146,22 @@ export declare const DateRangeQuestionSchema: z.ZodObject<{
             step?: number | undefined;
         }>>;
     }, "strip", z.ZodTypeAny, {
-        start?: {
-            label?: string | undefined;
+        start: {
+            label: string;
+            step: number;
             help?: string | undefined;
             labelTranslationKey?: string | undefined;
             max?: string | undefined;
             min?: string | undefined;
-            step?: number | undefined;
-        } | undefined;
-        end?: {
-            label?: string | undefined;
+        };
+        end: {
+            label: string;
+            step: number;
             help?: string | undefined;
             labelTranslationKey?: string | undefined;
             max?: string | undefined;
             min?: string | undefined;
-            step?: number | undefined;
-        } | undefined;
+        };
     }, {
         start?: {
             label?: string | undefined;
@@ -171,58 +179,50 @@ export declare const DateRangeQuestionSchema: z.ZodObject<{
             min?: string | undefined;
             step?: number | undefined;
         } | undefined;
-    }>;
-    meta: z.ZodOptional<z.ZodObject<{
-        schemaVersion: z.ZodLiteral<"1.0">;
-    } & {
-        title: z.ZodOptional<z.ZodLiteral<"Date Range">>;
-        usageDescription: z.ZodOptional<z.ZodLiteral<"For questions that require a date range (e.g. From/To, Start/End)">>;
-        defaultJSON: z.ZodOptional<z.ZodLiteral<string>>;
-    }, "strip", z.ZodTypeAny, {
-        schemaVersion: "1.0";
-        title?: "Date Range" | undefined;
-        usageDescription?: "For questions that require a date range (e.g. From/To, Start/End)" | undefined;
-        defaultJSON?: string | undefined;
-    }, {
-        schemaVersion: "1.0";
-        title?: "Date Range" | undefined;
-        usageDescription?: "For questions that require a date range (e.g. From/To, Start/End)" | undefined;
-        defaultJSON?: string | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     type: "dateRange";
+    attributes: {
+        label?: string | undefined;
+        help?: string | undefined;
+        labelTranslationKey?: string | undefined;
+    };
+    meta: {
+        schemaVersion: string;
+        title?: string | undefined;
+        usageDescription?: string | undefined;
+    };
     columns: {
-        start?: {
-            label?: string | undefined;
+        start: {
+            label: string;
+            step: number;
             help?: string | undefined;
             labelTranslationKey?: string | undefined;
             max?: string | undefined;
             min?: string | undefined;
-            step?: number | undefined;
-        } | undefined;
-        end?: {
-            label?: string | undefined;
+        };
+        end: {
+            label: string;
+            step: number;
             help?: string | undefined;
             labelTranslationKey?: string | undefined;
             max?: string | undefined;
             min?: string | undefined;
-            step?: number | undefined;
-        } | undefined;
+        };
     };
+}, {
+    type: "dateRange";
     attributes?: {
         label?: string | undefined;
         help?: string | undefined;
         labelTranslationKey?: string | undefined;
     } | undefined;
     meta?: {
-        schemaVersion: "1.0";
-        title?: "Date Range" | undefined;
-        usageDescription?: "For questions that require a date range (e.g. From/To, Start/End)" | undefined;
-        defaultJSON?: string | undefined;
+        schemaVersion?: string | undefined;
+        title?: string | undefined;
+        usageDescription?: string | undefined;
     } | undefined;
-}, {
-    type: "dateRange";
-    columns: {
+    columns?: {
         start?: {
             label?: string | undefined;
             help?: string | undefined;
@@ -239,17 +239,6 @@ export declare const DateRangeQuestionSchema: z.ZodObject<{
             min?: string | undefined;
             step?: number | undefined;
         } | undefined;
-    };
-    attributes?: {
-        label?: string | undefined;
-        help?: string | undefined;
-        labelTranslationKey?: string | undefined;
-    } | undefined;
-    meta?: {
-        schemaVersion: "1.0";
-        title?: "Date Range" | undefined;
-        usageDescription?: "For questions that require a date range (e.g. From/To, Start/End)" | undefined;
-        defaultJSON?: string | undefined;
     } | undefined;
 }>;
 export type DateQuestionType = z.infer<typeof DateQuestionSchema>;

package/dist/questions/dateQuestions.js

@@ -4,45 +4,26 @@ exports.DateRangeQuestionSchema = exports.DateQuestionSchema = void 0;
 const zod_1 = require("zod");
 const question_1 = require("./question");
 const BaseAttributes = question_1.QuestionSchema.shape.attributes;
-const BaseMeta = question_1.QuestionSchema.shape.meta;
-const DateAttributesSchema = BaseAttributes.unwrap().merge(zod_1.z.object({
-    max: zod_1.z.string().optional(), // The maximum date (no default)
-    min: zod_1.z.string().optional(), // The minimum date (no default)
-    step: zod_1.z.number().optional() // The step value (default is 1 day)
+const DateAttributesSchema = BaseAttributes.merge(zod_1.z.object({
+    max: zod_1.z.string().optional(),
+    min: zod_1.z.string().optional(),
+    step: zod_1.z.number().default(1),
 }));
 // Date question and answer
-const defaultDateJSON = {
-    type: 'date',
-    attributes: Object.assign(Object.assign({}, question_1.defaultAttributes), { max: undefined, min: undefined, step: 1 }),
-    meta: Object.assign({}, question_1.defaultMeta)
-};
 exports.DateQuestionSchema = question_1.QuestionSchema.merge(zod_1.z.object({
-    type: zod_1.z.literal('date'), // The type of question
-    attributes: DateAttributesSchema.optional(),
-    meta: BaseMeta.unwrap().merge(zod_1.z.object({
-        title: zod_1.z.literal('Date Field').optional(),
-        usageDescription: zod_1.z.literal('For questions that require a date.').optional(),
-        defaultJSON: zod_1.z.literal(JSON.stringify(defaultDateJSON)).optional(),
-    })).optional(),
+    type: zod_1.z.literal('date'),
+    attributes: DateAttributesSchema.default({})
 }));
 // Date range question and answer
-const defaultDateRangeJSON = {
-    type: 'dateRange',
-    attributes: Object.assign({}, question_1.defaultAttributes),
-    columns: {
-        start: Object.assign(Object.assign({}, question_1.defaultAttributes), { label: 'Start', max: undefined, min: undefined, step: 1 }),
-        end: Object.assign(Object.assign({}, question_1.defaultAttributes), { label: 'End', max: undefined, min: undefined, step: 1 })
-    }
-};
 exports.DateRangeQuestionSchema = question_1.QuestionSchema.merge(zod_1.z.object({
-    type: zod_1.z.literal('dateRange'), // The type of question
+    type: zod_1.z.literal('dateRange'),
+    attributes: BaseAttributes.default({}),
     columns: zod_1.z.object({
-        start: DateAttributesSchema.optional(),
-        end: DateAttributesSchema.optional()
-    }),
-    meta: BaseMeta.unwrap().merge(zod_1.z.object({
-        title: zod_1.z.literal('Date Range').optional(),
-        usageDescription: zod_1.z.literal('For questions that require a date range (e.g. From/To, Start/End)').optional(),
-        defaultJSON: zod_1.z.literal(JSON.stringify(defaultDateRangeJSON)).optional(),
-    })).optional(),
+        start: DateAttributesSchema.merge(zod_1.z.object({
+            label: zod_1.z.string().default('From')
+        })).default({}),
+        end: DateAttributesSchema.merge(zod_1.z.object({
+            label: zod_1.z.string().default('To')
+        })).default({}),
+    }).default({})
 }));