@dmptool/types 1.0.8 → 1.1.0

package/dist/answers/__tests__/answers.spec.js

@@ -4,16 +4,17 @@ const globals_1 = require("@jest/globals");
 const dateAnswers_1 = require("../dateAnswers");
 const graphQLAnswers_1 = require("../graphQLAnswers");
 const optionBasedAnswers_1 = require("../optionBasedAnswers");
-const primitiveAnswers_1 = require("../primitiveAnswers");
+const numberAnswers_1 = require("../numberAnswers");
+const textAnswers_1 = require("../textAnswers");
 const tableAnswers_1 = require("../tableAnswers");
 const __1 = require("..");
 const questions_1 = require("../../questions");
 (0, globals_1.describe)('Answer Type Validations', () => {
     (0, globals_1.it)('should validate BooleanAnswer', () => {
         const validData = { type: 'boolean', answer: true, meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
-        (0, globals_1.expect)(() => primitiveAnswers_1.BooleanAnswerSchema.parse(validData)).not.toThrow();
+        (0, globals_1.expect)(() => numberAnswers_1.BooleanAnswerSchema.parse(validData)).not.toThrow();
         const invalidData = { type: 'boolean', answer: 'true' };
-        (0, globals_1.expect)(() => primitiveAnswers_1.BooleanAnswerSchema.parse(invalidData)).toThrow();
+        (0, globals_1.expect)(() => numberAnswers_1.BooleanAnswerSchema.parse(invalidData)).toThrow();
     });
     (0, globals_1.it)('should validate CheckboxesAnswer', () => {
         const validData = { type: 'checkBoxes', answer: ['option1', 'option2'], meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
@@ -23,9 +24,9 @@ const questions_1 = require("../../questions");
     });
     (0, globals_1.it)('should validate CurrencyAnswer', () => {
         const validData = { type: 'currency', answer: 100.5, meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
-        (0, globals_1.expect)(() => primitiveAnswers_1.CurrencyAnswerSchema.parse(validData)).not.toThrow();
+        (0, globals_1.expect)(() => numberAnswers_1.CurrencyAnswerSchema.parse(validData)).not.toThrow();
         const invalidData = { type: 'currency', answer: '100.5', meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
-        (0, globals_1.expect)(() => primitiveAnswers_1.CurrencyAnswerSchema.parse(invalidData)).toThrow();
+        (0, globals_1.expect)(() => numberAnswers_1.CurrencyAnswerSchema.parse(invalidData)).toThrow();
     });
     (0, globals_1.it)('should validate DateAnswer', () => {
         const validData = { type: 'date', answer: '2023-10-01', meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
@@ -49,9 +50,9 @@ const questions_1 = require("../../questions");
     });
     (0, globals_1.it)('should validate EmailAnswer', () => {
         const validData = { type: 'email', answer: 'test@example.com', meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
-        (0, globals_1.expect)(() => primitiveAnswers_1.EmailAnswerSchema.parse(validData)).not.toThrow();
+        (0, globals_1.expect)(() => textAnswers_1.EmailAnswerSchema.parse(validData)).not.toThrow();
         const invalidData = { type: 'email', answer: 12345 };
-        (0, globals_1.expect)(() => primitiveAnswers_1.EmailAnswerSchema.parse(invalidData)).toThrow();
+        (0, globals_1.expect)(() => textAnswers_1.EmailAnswerSchema.parse(invalidData)).toThrow();
     });
     (0, globals_1.it)('should validate FilteredSearchAnswer', () => {
         const validData = { type: 'filteredSearch', answer: ['item1', 'item2'], meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
@@ -61,9 +62,9 @@ const questions_1 = require("../../questions");
     });
     (0, globals_1.it)('should validate NumberAnswer', () => {
         const validData = { type: 'number', answer: 42, meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
-        (0, globals_1.expect)(() => primitiveAnswers_1.NumberAnswerSchema.parse(validData)).not.toThrow();
+        (0, globals_1.expect)(() => numberAnswers_1.NumberAnswerSchema.parse(validData)).not.toThrow();
         const invalidData = { type: 'number', answer: '42', meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
-        (0, globals_1.expect)(() => primitiveAnswers_1.NumberAnswerSchema.parse(invalidData)).toThrow();
+        (0, globals_1.expect)(() => numberAnswers_1.NumberAnswerSchema.parse(invalidData)).toThrow();
     });
     (0, globals_1.it)('should validate NumberRangeAnswer', () => {
         const validData = {
@@ -71,13 +72,13 @@ const questions_1 = require("../../questions");
             answer: { start: 1, end: 10 },
             meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
         };
-        (0, globals_1.expect)(() => primitiveAnswers_1.NumberRangeAnswerSchema.parse(validData)).not.toThrow();
+        (0, globals_1.expect)(() => numberAnswers_1.NumberRangeAnswerSchema.parse(validData)).not.toThrow();
         const invalidData = {
             type: 'numberRange',
             answer: { start: '1', end: 10 },
             meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
         };
-        (0, globals_1.expect)(() => primitiveAnswers_1.NumberRangeAnswerSchema.parse(invalidData)).toThrow();
+        (0, globals_1.expect)(() => numberAnswers_1.NumberRangeAnswerSchema.parse(invalidData)).toThrow();
     });
     (0, globals_1.it)('should validate RadioButtonsAnswer', () => {
         const validData = { type: 'radioButtons', answer: 'option1', meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
@@ -93,15 +94,15 @@ const questions_1 = require("../../questions");
     });
     (0, globals_1.it)('should validate TextAnswer', () => {
         const validData = { type: 'text', answer: 'Some text', meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
-        (0, globals_1.expect)(() => primitiveAnswers_1.TextAnswerSchema.parse(validData)).not.toThrow();
+        (0, globals_1.expect)(() => textAnswers_1.TextAnswerSchema.parse(validData)).not.toThrow();
         const invalidData = { type: 'text', answer: 12345, meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
-        (0, globals_1.expect)(() => primitiveAnswers_1.TextAnswerSchema.parse(invalidData)).toThrow();
+        (0, globals_1.expect)(() => textAnswers_1.TextAnswerSchema.parse(invalidData)).toThrow();
     });
     (0, globals_1.it)('should validate TextAreaAnswer', () => {
         const validData = { type: 'textArea', answer: 'Some long text', meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
-        (0, globals_1.expect)(() => primitiveAnswers_1.TextAreaAnswerSchema.parse(validData)).not.toThrow();
+        (0, globals_1.expect)(() => textAnswers_1.TextAreaAnswerSchema.parse(validData)).not.toThrow();
         const invalidData = { type: 'textArea', answer: 12345, meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
-        (0, globals_1.expect)(() => primitiveAnswers_1.TextAreaAnswerSchema.parse(invalidData)).toThrow();
+        (0, globals_1.expect)(() => textAnswers_1.TextAreaAnswerSchema.parse(invalidData)).toThrow();
     });
     (0, globals_1.it)('should validate TypeaheadSearchAnswer', () => {
         const validData = { type: 'typeaheadSearch', answer: 'Search term', meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
@@ -111,9 +112,9 @@ const questions_1 = require("../../questions");
     });
     (0, globals_1.it)('should validate URLAnswer', () => {
         const validData = { type: 'url', answer: 'https://example.com', meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
-        (0, globals_1.expect)(() => primitiveAnswers_1.URLAnswerSchema.parse(validData)).not.toThrow();
+        (0, globals_1.expect)(() => textAnswers_1.URLAnswerSchema.parse(validData)).not.toThrow();
         const invalidData = { type: 'url', answer: 12345, meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION } };
-        (0, globals_1.expect)(() => primitiveAnswers_1.URLAnswerSchema.parse(invalidData)).toThrow();
+        (0, globals_1.expect)(() => textAnswers_1.URLAnswerSchema.parse(invalidData)).toThrow();
     });
     (0, globals_1.it)('should validate TableAnswer', () => {
         const validData = {

package/dist/answers/index.d.ts

@@ -1,11 +1,18 @@
 import { z } from 'zod';
+import { DateAnswerType, DateRangeAnswerType } from './dateAnswers';
+import { FilteredSearchAnswerType, TypeaheadSearchAnswerType } from './graphQLAnswers';
+import { CheckboxesAnswerType, RadioButtonsAnswerType, SelectBoxAnswerType } from './optionBasedAnswers';
+import { BooleanAnswerType, CurrencyAnswerType, NumberAnswerType, NumberRangeAnswerType } from './numberAnswers';
+import { TableAnswerType } from './tableAnswers';
+import { EmailAnswerType, TextAnswerType, TextAreaAnswerType, URLAnswerType } from './textAnswers';
 import { QuestionTypesEnum } from '../questions';
 export * from './answer';
 export * from './dateAnswers';
 export * from './graphQLAnswers';
+export * from './numberAnswers';
 export * from './optionBasedAnswers';
-export * from './primitiveAnswers';
 export * from './tableAnswers';
+export * from './textAnswers';
 export declare const AnyAnswerSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     meta: z.ZodObject<{
         schemaVersion: z.ZodLiteral<"1.0">;
@@ -662,17 +669,17 @@ export declare const AnyAnswerSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObje
                 };
                 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: {
@@ -752,17 +759,17 @@ export declare const AnyAnswerSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObje
                 };
                 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: {
@@ -844,17 +851,17 @@ export declare const AnyAnswerSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObje
                 };
                 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: {
@@ -936,17 +943,17 @@ export declare const AnyAnswerSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObje
                 };
                 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: {
@@ -1034,17 +1041,17 @@ export declare const AnyAnswerSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObje
                 };
                 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: {
@@ -1132,17 +1139,17 @@ export declare const AnyAnswerSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObje
                 };
                 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,3 +1266,21 @@ export declare const AnyAnswerSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObje
 }>]>;
 export declare const AnswerSchemaMap: Record<z.infer<typeof QuestionTypesEnum>, z.ZodTypeAny>;
 export type AnyAnswerType = z.infer<typeof AnyAnswerSchema>;
+export interface AnswerTypeMap {
+    boolean: BooleanAnswerType;
+    checkBoxes: CheckboxesAnswerType;
+    currency: CurrencyAnswerType;
+    date: DateAnswerType;
+    dateRange: DateRangeAnswerType;
+    email: EmailAnswerType;
+    filteredSearch: FilteredSearchAnswerType;
+    number: NumberAnswerType;
+    numberRange: NumberRangeAnswerType;
+    radioButtons: RadioButtonsAnswerType;
+    selectBox: SelectBoxAnswerType;
+    table: TableAnswerType;
+    text: TextAnswerType;
+    textArea: TextAreaAnswerType;
+    typeaheadSearch: TypeaheadSearchAnswerType;
+    url: URLAnswerType;
+}

package/dist/answers/index.js

@@ -19,49 +19,51 @@ const zod_1 = require("zod");
 const dateAnswers_1 = require("./dateAnswers");
 const graphQLAnswers_1 = require("./graphQLAnswers");
 const optionBasedAnswers_1 = require("./optionBasedAnswers");
-const primitiveAnswers_1 = require("./primitiveAnswers");
+const numberAnswers_1 = require("./numberAnswers");
 const tableAnswers_1 = require("./tableAnswers");
+const textAnswers_1 = require("./textAnswers");
 // reexport everything
 __exportStar(require("./answer"), exports);
 __exportStar(require("./dateAnswers"), exports);
 __exportStar(require("./graphQLAnswers"), exports);
+__exportStar(require("./numberAnswers"), exports);
 __exportStar(require("./optionBasedAnswers"), exports);
-__exportStar(require("./primitiveAnswers"), exports);
 __exportStar(require("./tableAnswers"), exports);
+__exportStar(require("./textAnswers"), exports);
 // Union of all possible answers
 exports.AnyAnswerSchema = 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,
     tableAnswers_1.TableAnswerSchema,
-    primitiveAnswers_1.TextAnswerSchema,
-    primitiveAnswers_1.TextAreaAnswerSchema,
+    textAnswers_1.TextAnswerSchema,
+    textAnswers_1.TextAreaAnswerSchema,
     graphQLAnswers_1.TypeaheadSearchAnswerSchema,
-    primitiveAnswers_1.URLAnswerSchema
+    textAnswers_1.URLAnswerSchema
 ]);
 // Export a mapping between question types and their corresponding answer schemas
 exports.AnswerSchemaMap = {
-    boolean: primitiveAnswers_1.BooleanAnswerSchema,
+    boolean: numberAnswers_1.BooleanAnswerSchema,
     checkBoxes: optionBasedAnswers_1.CheckboxesAnswerSchema,
-    currency: primitiveAnswers_1.CurrencyAnswerSchema,
+    currency: numberAnswers_1.CurrencyAnswerSchema,
     date: dateAnswers_1.DateAnswerSchema,
     dateRange: dateAnswers_1.DateRangeAnswerSchema,
-    email: primitiveAnswers_1.EmailAnswerSchema,
+    email: textAnswers_1.EmailAnswerSchema,
     filteredSearch: graphQLAnswers_1.FilteredSearchAnswerSchema,
-    number: primitiveAnswers_1.NumberAnswerSchema,
-    numberRange: primitiveAnswers_1.NumberRangeAnswerSchema,
+    number: numberAnswers_1.NumberAnswerSchema,
+    numberRange: numberAnswers_1.NumberRangeAnswerSchema,
     radioButtons: optionBasedAnswers_1.RadioButtonsAnswerSchema,
     selectBox: optionBasedAnswers_1.SelectBoxAnswerSchema,
     table: tableAnswers_1.TableAnswerSchema,
-    text: primitiveAnswers_1.TextAnswerSchema,
-    textArea: primitiveAnswers_1.TextAreaAnswerSchema,
+    text: textAnswers_1.TextAnswerSchema,
+    textArea: textAnswers_1.TextAreaAnswerSchema,
     typeaheadSearch: graphQLAnswers_1.TypeaheadSearchAnswerSchema,
-    url: primitiveAnswers_1.URLAnswerSchema
+    url: textAnswers_1.URLAnswerSchema
 };

package/dist/answers/{primitiveAnswers.d.ts → numberAnswers.d.ts}

@@ -47,30 +47,6 @@ export declare const CurrencyAnswerSchema: z.ZodObject<{
     };
     answer: number;
 }>;
-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 NumberAnswerSchema: z.ZodObject<{
     meta: z.ZodObject<{
         schemaVersion: z.ZodLiteral<"1.0">;
@@ -134,83 +110,7 @@ export declare const NumberRangeAnswerSchema: z.ZodObject<{
         end: number;
     };
 }>;
-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 BooleanAnswerType = z.infer<typeof BooleanAnswerSchema>;
 export type CurrencyAnswerType = z.infer<typeof CurrencyAnswerSchema>;
-export type EmailAnswerType = z.infer<typeof EmailAnswerSchema>;
 export type NumberAnswerType = z.infer<typeof NumberAnswerSchema>;
 export type NumberRangeAnswerType = z.infer<typeof NumberRangeAnswerSchema>;
-export type TextAnswerType = z.infer<typeof TextAnswerSchema>;
-export type TextAreaAnswerType = z.infer<typeof TextAreaAnswerSchema>;
-export type URLAnswerType = z.infer<typeof URLAnswerSchema>;

package/dist/answers/numberAnswers.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NumberRangeAnswerSchema = exports.NumberAnswerSchema = exports.CurrencyAnswerSchema = exports.BooleanAnswerSchema = void 0;
+const zod_1 = require("zod");
+const answer_1 = require("./answer");
+// Answers to Number Question Types
+exports.BooleanAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
+    type: zod_1.z.literal('boolean'), // The type of answer
+    answer: zod_1.z.boolean() // The answer to the question (true/false)
+}));
+exports.CurrencyAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
+    type: zod_1.z.literal('currency'), // The type of answer
+    answer: zod_1.z.number() // The answer to the question (number)
+}));
+exports.NumberAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
+    type: zod_1.z.literal('number'), // The type of answer
+    answer: zod_1.z.number() // The answer to the question (number)
+}));
+exports.NumberRangeAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
+    type: zod_1.z.literal('numberRange'), // The type of answer
+    answer: zod_1.z.object({
+        start: zod_1.z.number(), // The start number (number)
+        end: zod_1.z.number() // The end number (number)
+    })
+}));