@dmptool/types 1.0.7 → 1.1.0

package/dist/answers/tableAnswers.d.ts

@@ -737,17 +737,17 @@ export declare const TableColumnAnswerSchema: z.ZodObject<{
         };
         answer: number;
     } | {
-        type: "email";
+        type: "number";
         meta: {
             schemaVersion: "1.0";
         };
-        answer: string;
+        answer: number;
     } | {
-        type: "number";
+        type: "email";
         meta: {
             schemaVersion: "1.0";
         };
-        answer: number;
+        answer: string;
     } | {
         type: "text";
         meta: {
@@ -827,17 +827,17 @@ export declare const TableColumnAnswerSchema: z.ZodObject<{
         };
         answer: number;
     } | {
-        type: "email";
+        type: "number";
         meta: {
             schemaVersion: "1.0";
         };
-        answer: string;
+        answer: number;
     } | {
-        type: "number";
+        type: "email";
         meta: {
             schemaVersion: "1.0";
         };
-        answer: number;
+        answer: string;
     } | {
         type: "text";
         meta: {
@@ -1259,17 +1259,17 @@ export declare const TableRowAnswerSchema: z.ZodObject<{
             };
             answer: number;
         } | {
-            type: "email";
+            type: "number";
             meta: {
                 schemaVersion: "1.0";
             };
-            answer: string;
+            answer: number;
         } | {
-            type: "number";
+            type: "email";
             meta: {
                 schemaVersion: "1.0";
             };
-            answer: number;
+            answer: string;
         } | {
             type: "text";
             meta: {
@@ -1349,17 +1349,17 @@ export declare const TableRowAnswerSchema: z.ZodObject<{
             };
             answer: number;
         } | {
-            type: "email";
+            type: "number";
             meta: {
                 schemaVersion: "1.0";
             };
-            answer: string;
+            answer: number;
         } | {
-            type: "number";
+            type: "email";
             meta: {
                 schemaVersion: "1.0";
             };
-            answer: number;
+            answer: string;
         } | {
             type: "text";
             meta: {
@@ -1441,17 +1441,17 @@ export declare const TableRowAnswerSchema: z.ZodObject<{
             };
             answer: number;
         } | {
-            type: "email";
+            type: "number";
             meta: {
                 schemaVersion: "1.0";
             };
-            answer: string;
+            answer: number;
         } | {
-            type: "number";
+            type: "email";
             meta: {
                 schemaVersion: "1.0";
             };
-            answer: number;
+            answer: string;
         } | {
             type: "text";
             meta: {
@@ -1533,17 +1533,17 @@ export declare const TableRowAnswerSchema: z.ZodObject<{
             };
             answer: number;
         } | {
-            type: "email";
+            type: "number";
             meta: {
                 schemaVersion: "1.0";
             };
-            answer: string;
+            answer: number;
         } | {
-            type: "number";
+            type: "email";
             meta: {
                 schemaVersion: "1.0";
             };
-            answer: number;
+            answer: string;
         } | {
             type: "text";
             meta: {
@@ -1976,17 +1976,17 @@ export declare const TableAnswerSchema: z.ZodObject<{
                 };
                 answer: number;
             } | {
-                type: "email";
+                type: "number";
                 meta: {
                     schemaVersion: "1.0";
                 };
-                answer: string;
+                answer: number;
             } | {
-                type: "number";
+                type: "email";
                 meta: {
                     schemaVersion: "1.0";
                 };
-                answer: number;
+                answer: string;
             } | {
                 type: "text";
                 meta: {
@@ -2066,17 +2066,17 @@ export declare const TableAnswerSchema: z.ZodObject<{
                 };
                 answer: number;
             } | {
-                type: "email";
+                type: "number";
                 meta: {
                     schemaVersion: "1.0";
                 };
-                answer: string;
+                answer: number;
             } | {
-                type: "number";
+                type: "email";
                 meta: {
                     schemaVersion: "1.0";
                 };
-                answer: number;
+                answer: string;
             } | {
                 type: "text";
                 meta: {
@@ -2158,17 +2158,17 @@ export declare const TableAnswerSchema: z.ZodObject<{
                 };
                 answer: number;
             } | {
-                type: "email";
+                type: "number";
                 meta: {
                     schemaVersion: "1.0";
                 };
-                answer: string;
+                answer: number;
             } | {
-                type: "number";
+                type: "email";
                 meta: {
                     schemaVersion: "1.0";
                 };
-                answer: number;
+                answer: string;
             } | {
                 type: "text";
                 meta: {
@@ -2250,17 +2250,17 @@ export declare const TableAnswerSchema: z.ZodObject<{
                 };
                 answer: number;
             } | {
-                type: "email";
+                type: "number";
                 meta: {
                     schemaVersion: "1.0";
                 };
-                answer: string;
+                answer: number;
             } | {
-                type: "number";
+                type: "email";
                 meta: {
                     schemaVersion: "1.0";
                 };
-                answer: number;
+                answer: string;
             } | {
                 type: "text";
                 meta: {
@@ -2348,17 +2348,17 @@ export declare const TableAnswerSchema: z.ZodObject<{
                 };
                 answer: number;
             } | {
-                type: "email";
+                type: "number";
                 meta: {
                     schemaVersion: "1.0";
                 };
-                answer: string;
+                answer: number;
             } | {
-                type: "number";
+                type: "email";
                 meta: {
                     schemaVersion: "1.0";
                 };
-                answer: number;
+                answer: string;
             } | {
                 type: "text";
                 meta: {
@@ -2446,17 +2446,17 @@ export declare const TableAnswerSchema: z.ZodObject<{
                 };
                 answer: number;
             } | {
-                type: "email";
+                type: "number";
                 meta: {
                     schemaVersion: "1.0";
                 };
-                answer: string;
+                answer: number;
             } | {
-                type: "number";
+                type: "email";
                 meta: {
                     schemaVersion: "1.0";
                 };
-                answer: number;
+                answer: string;
             } | {
                 type: "text";
                 meta: {

package/dist/answers/tableAnswers.js

@@ -6,23 +6,24 @@ const answer_1 = require("./answer");
 const optionBasedAnswers_1 = require("./optionBasedAnswers");
 const dateAnswers_1 = require("./dateAnswers");
 const graphQLAnswers_1 = require("./graphQLAnswers");
-const primitiveAnswers_1 = require("./primitiveAnswers");
+const numberAnswers_1 = require("./numberAnswers");
+const textAnswers_1 = require("./textAnswers");
 // Answers to Table Column Question Types (note that TableAnswer is not included here because we don't allow nested tables)
 exports.AnyTableColumnAnswerSchema = zod_1.z.discriminatedUnion('type', [
-    primitiveAnswers_1.BooleanAnswerSchema,
+    numberAnswers_1.BooleanAnswerSchema,
     optionBasedAnswers_1.CheckboxesAnswerSchema,
-    primitiveAnswers_1.CurrencyAnswerSchema,
+    numberAnswers_1.CurrencyAnswerSchema,
     dateAnswers_1.DateAnswerSchema,
     dateAnswers_1.DateRangeAnswerSchema,
-    primitiveAnswers_1.EmailAnswerSchema,
+    textAnswers_1.EmailAnswerSchema,
     graphQLAnswers_1.FilteredSearchAnswerSchema,
-    primitiveAnswers_1.NumberAnswerSchema,
+    numberAnswers_1.NumberAnswerSchema,
     optionBasedAnswers_1.RadioButtonsAnswerSchema,
     optionBasedAnswers_1.SelectBoxAnswerSchema,
-    primitiveAnswers_1.TextAnswerSchema,
-    primitiveAnswers_1.TextAreaAnswerSchema,
+    textAnswers_1.TextAnswerSchema,
+    textAnswers_1.TextAreaAnswerSchema,
     graphQLAnswers_1.TypeaheadSearchAnswerSchema,
-    primitiveAnswers_1.URLAnswerSchema
+    textAnswers_1.URLAnswerSchema
 ]);
 exports.TableColumnAnswerSchema = zod_1.z.object({
     heading: zod_1.z.string(), // The heading of the column

package/dist/answers/textAnswers.d.ts

@@ -0,0 +1,101 @@
+import { z } from 'zod';
+export declare const EmailAnswerSchema: z.ZodObject<{
+    meta: z.ZodObject<{
+        schemaVersion: z.ZodLiteral<"1.0">;
+    }, "strip", z.ZodTypeAny, {
+        schemaVersion: "1.0";
+    }, {
+        schemaVersion: "1.0";
+    }>;
+} & {
+    type: z.ZodLiteral<"email">;
+    answer: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    type: "email";
+    meta: {
+        schemaVersion: "1.0";
+    };
+    answer: string;
+}, {
+    type: "email";
+    meta: {
+        schemaVersion: "1.0";
+    };
+    answer: string;
+}>;
+export declare const TextAnswerSchema: z.ZodObject<{
+    meta: z.ZodObject<{
+        schemaVersion: z.ZodLiteral<"1.0">;
+    }, "strip", z.ZodTypeAny, {
+        schemaVersion: "1.0";
+    }, {
+        schemaVersion: "1.0";
+    }>;
+} & {
+    type: z.ZodLiteral<"text">;
+    answer: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    type: "text";
+    meta: {
+        schemaVersion: "1.0";
+    };
+    answer: string;
+}, {
+    type: "text";
+    meta: {
+        schemaVersion: "1.0";
+    };
+    answer: string;
+}>;
+export declare const TextAreaAnswerSchema: z.ZodObject<{
+    meta: z.ZodObject<{
+        schemaVersion: z.ZodLiteral<"1.0">;
+    }, "strip", z.ZodTypeAny, {
+        schemaVersion: "1.0";
+    }, {
+        schemaVersion: "1.0";
+    }>;
+} & {
+    type: z.ZodLiteral<"textArea">;
+    answer: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    type: "textArea";
+    meta: {
+        schemaVersion: "1.0";
+    };
+    answer: string;
+}, {
+    type: "textArea";
+    meta: {
+        schemaVersion: "1.0";
+    };
+    answer: string;
+}>;
+export declare const URLAnswerSchema: z.ZodObject<{
+    meta: z.ZodObject<{
+        schemaVersion: z.ZodLiteral<"1.0">;
+    }, "strip", z.ZodTypeAny, {
+        schemaVersion: "1.0";
+    }, {
+        schemaVersion: "1.0";
+    }>;
+} & {
+    type: z.ZodLiteral<"url">;
+    answer: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    type: "url";
+    meta: {
+        schemaVersion: "1.0";
+    };
+    answer: string;
+}, {
+    type: "url";
+    meta: {
+        schemaVersion: "1.0";
+    };
+    answer: string;
+}>;
+export type EmailAnswerType = z.infer<typeof EmailAnswerSchema>;
+export type TextAnswerType = z.infer<typeof TextAnswerSchema>;
+export type TextAreaAnswerType = z.infer<typeof TextAreaAnswerSchema>;
+export type URLAnswerType = z.infer<typeof URLAnswerSchema>;

package/dist/answers/textAnswers.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.URLAnswerSchema = exports.TextAreaAnswerSchema = exports.TextAnswerSchema = exports.EmailAnswerSchema = void 0;
+const zod_1 = require("zod");
+const answer_1 = require("./answer");
+// Answers to Text Based Question Types
+exports.EmailAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
+    type: zod_1.z.literal('email'), // The type of question
+    answer: zod_1.z.string() // The answer to the question (string)
+}));
+exports.TextAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
+    type: zod_1.z.literal('text'), // The type of answer
+    answer: zod_1.z.string() // The answer to the question (string)
+}));
+exports.TextAreaAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
+    type: zod_1.z.literal('textArea'), // The type of answer
+    answer: zod_1.z.string() // The answer to the question (string)
+}));
+exports.URLAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
+    type: zod_1.z.literal('url'), // The type of answer
+    answer: zod_1.z.string() // The answer to the question (string)
+}));

package/dist/questions/__tests__/dateQuestions.spec.js

@@ -6,6 +6,8 @@ describe("DateQuestion", () => {
         const validDate = {
             type: "date",
             attributes: {
+                label: "Date",
+                help: "Enter a date",
                 max: "2023-12-31",
                 min: "2023-01-01",
                 step: 1,
@@ -47,28 +49,18 @@ describe("DateRangeQuestion", () => {
             type: "dateRange",
             columns: {
                 start: {
-                    type: "date",
-                    attributes: {
-                        label: "Start Date",
-                        max: "2023-12-31",
-                        min: "2023-01-01",
-                        step: 1,
-                    },
-                    meta: {
-                        schemaVersion: "1.0"
-                    }
+                    label: "Start Date",
+                    help: "Enter a date",
+                    max: "2023-12-31",
+                    min: "2023-01-01",
+                    step: 1,
                 },
                 end: {
-                    type: "date",
-                    attributes: {
-                        label: "End Date",
-                        max: "2023-12-31",
-                        min: "2023-01-01",
-                        step: 1,
-                    },
-                    meta: {
-                        schemaVersion: "1.0"
-                    }
+                    label: "End Date",
+                    help: "Enter a date",
+                    max: "2023-12-31",
+                    min: "2023-01-01",
+                    step: 1,
                 },
             },
             meta: {
@@ -82,62 +74,16 @@ describe("DateRangeQuestion", () => {
             type: "dateRange",
             columns: {
                 start: {
-                    type: "date",
-                    attributes: {
-                        label: "Start Date",
-                        max: "2023-12-31",
-                        min: "2023-01-01",
-                        step: 1,
-                    },
-                    meta: {
-                        schemaVersion: "1.0"
-                    }
+                    label: "Start Date",
+                    max: "2023-12-31",
+                    min: "2023-01-01",
+                    step: 1,
                 },
                 end: {
-                    type: "date",
-                    attributes: {
-                        label: 123, // Invalid type for label
-                        max: "2023-12-31",
-                        min: "2023-01-01",
-                        step: 1,
-                    },
-                    meta: {
-                        schemaVersion: "1.0"
-                    }
-                },
-            },
-            meta: {
-                schemaVersion: "1.0"
-            }
-        };
-        expect(() => dateQuestions_1.DateRangeQuestionSchema.parse(invalidDateRange)).toThrow();
-    });
-    it("should require labels for start and end dates", () => {
-        const invalidDateRange = {
-            type: "dateRange",
-            columns: {
-                start: {
-                    type: "date",
-                    attributes: {
-                        max: "2023-12-31",
-                        min: "2023-01-01",
-                        step: 1,
-                    },
-                    meta: {
-                        schemaVersion: "1.0"
-                    }
-                },
-                end: {
-                    type: "date",
-                    attributes: {
-                        label: "End Date",
-                        max: "2023-12-31",
-                        min: "2023-01-01",
-                        step: 1,
-                    },
-                    meta: {
-                        schemaVersion: "1.0"
-                    }
+                    label: 123, // Invalid type for label
+                    max: "2023-12-31",
+                    min: "2023-01-01",
+                    step: 1,
                 },
             },
             meta: {

package/dist/questions/__tests__/graphQLQuestions.spec.js

@@ -19,6 +19,8 @@ const graphQLQuestions_1 = require("../graphQLQuestions");
                 ],
             },
             attributes: {
+                label: "Search",
+                help: "Search for a user",
                 multiple: true,
             },
             meta: {
@@ -53,6 +55,10 @@ const graphQLQuestions_1 = require("../graphQLQuestions");
     (0, globals_1.it)("should validate a correct TypeaheadSearchQuestion object", () => {
         const validData = {
             type: "typeaheadSearch",
+            attributes: {
+                label: "Search",
+                help: "Search for a user",
+            },
             graphQL: {
                 displayFields: [
                     { propertyName: "title", label: "Title" },