@dmptool/types 1.2.6 → 2.0.0

package/dist/answers/tableAnswers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResearchOutputTableAnswerSchema = exports.TableAnswerSchema = exports.TableRowAnswerSchema = exports.AnyTableColumnAnswerSchema = void 0;
+exports.AnyTableColumnAnswerJSONSchema = exports.ResearchOutputTableAnswerJSONSchema = exports.TableAnswerJSONSchema = exports.DefaultResearchOutputTableAnswer = exports.ResearchOutputTableAnswerSchema = exports.DefaultTableAnswer = exports.TableAnswerSchema = exports.AnyTableColumnAnswerSchema = void 0;
 const zod_1 = require("zod");
 const answer_1 = require("./answer");
 const optionBasedAnswers_1 = require("./optionBasedAnswers");
@@ -30,76 +30,40 @@ exports.AnyTableColumnAnswerSchema = zod_1.z.discriminatedUnion('type', [
     textAnswers_1.TextAreaAnswerSchema,
     textAnswers_1.URLAnswerSchema
 ]);
-exports.TableRowAnswerSchema = zod_1.z.object({
+const TableRowAnswerSchema = zod_1.z.object({
     columns: zod_1.z.array(exports.AnyTableColumnAnswerSchema) // The answers for each column in the row
 });
+const DefaultTableRowAnswer = TableRowAnswerSchema.parse({
+    columns: [textAnswers_1.DefaultTextAreaAnswer]
+});
 // Answers to Table Question Types
-exports.TableAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
-    type: zod_1.z.literal('table'),
-    columnHeadings: zod_1.z.array(zod_1.z.string()).default(['Column A']),
-    answer: zod_1.z.array(exports.TableRowAnswerSchema).default([{
-            columns: [{
-                    type: 'textArea',
-                    answer: '',
-                    meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
-                }]
-        }])
-}));
-exports.ResearchOutputTableAnswerSchema = exports.TableAnswerSchema.merge(zod_1.z.object({
-    type: zod_1.z.literal('researchOutputTable'),
-    columnHeadings: zod_1.z.array(zod_1.z.string()).default(['Title', 'Output Type']),
-    answer: zod_1.z.array(exports.TableRowAnswerSchema).default([{
+exports.TableAnswerSchema = zod_1.z.object(Object.assign(Object.assign({}, answer_1.AnswerSchema.shape), { type: zod_1.z.literal('table'), columnHeadings: zod_1.z.array(zod_1.z.string()).default(['Column A']), answer: zod_1.z.array(TableRowAnswerSchema) }));
+exports.DefaultTableAnswer = exports.TableAnswerSchema.parse({
+    type: 'table',
+    columnHeadings: ['Column A'],
+    answer: [DefaultTableRowAnswer],
+    meta: questions_1.DefaultMeta
+});
+exports.ResearchOutputTableAnswerSchema = zod_1.z.object(Object.assign(Object.assign({}, exports.TableAnswerSchema.shape), { type: zod_1.z.literal('researchOutputTable'), columnHeadings: zod_1.z.array(zod_1.z.string()).default(['Title', 'Type']) }));
+exports.DefaultResearchOutputTableAnswer = exports.ResearchOutputTableAnswerSchema.parse({
+    type: 'researchOutputTable',
+    columnHeadings: ['Title', 'Type'],
+    answer: [{
             columns: [
                 {
                     type: 'text',
                     answer: '',
-                    meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
-                },
-                {
-                    type: 'textArea',
-                    answer: '',
-                    meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
-                },
-                {
-                    type: 'selectBox',
-                    answer: '',
-                    meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
-                },
-                {
-                    type: 'checkBoxes',
-                    answer: [],
-                    meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
+                    meta: questions_1.DefaultMeta
                 },
                 {
                     type: 'selectBox',
                     answer: '',
-                    meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
-                },
-                {
-                    type: 'date',
-                    answer: '',
-                    meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
-                },
-                {
-                    type: 'numberWithContext',
-                    answer: { value: undefined, context: '' },
-                    meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
-                },
-                {
-                    type: 'repositorySearch',
-                    answer: [],
-                    meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
-                },
-                {
-                    type: 'metadataStandardSearch',
-                    answer: [],
-                    meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
-                },
-                {
-                    type: 'licenseSearch',
-                    answer: [],
-                    meta: { schemaVersion: questions_1.CURRENT_SCHEMA_VERSION }
+                    meta: questions_1.DefaultMeta
                 }
             ]
-        }])
-}));
+        }],
+    meta: questions_1.DefaultMeta
+});
+exports.TableAnswerJSONSchema = zod_1.z.toJSONSchema(exports.TableAnswerSchema);
+exports.ResearchOutputTableAnswerJSONSchema = zod_1.z.toJSONSchema(exports.ResearchOutputTableAnswerSchema);
+exports.AnyTableColumnAnswerJSONSchema = zod_1.z.toJSONSchema(exports.AnyTableColumnAnswerSchema);

package/dist/answers/textAnswers.d.ts

@@ -1,101 +1,65 @@
 import { z } from 'zod';
 export declare const EmailAnswerSchema: z.ZodObject<{
-    meta: z.ZodDefault<z.ZodObject<{
-        schemaVersion: z.ZodDefault<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        schemaVersion: string;
-    }, {
-        schemaVersion?: string | undefined;
-    }>>;
-} & {
     type: z.ZodLiteral<"email">;
     answer: z.ZodDefault<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
+    meta: z.ZodObject<{
+        schemaVersion: z.ZodDefault<z.ZodString>;
+    }, z.core.$strip>;
+}, z.core.$strip>;
+export declare const DefaultEmailAnswer: {
     type: "email";
+    answer: string;
     meta: {
         schemaVersion: string;
     };
-    answer: string;
-}, {
-    type: "email";
-    meta?: {
-        schemaVersion?: string | undefined;
-    } | undefined;
-    answer?: string | undefined;
-}>;
+};
 export declare const TextAnswerSchema: z.ZodObject<{
-    meta: z.ZodDefault<z.ZodObject<{
-        schemaVersion: z.ZodDefault<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        schemaVersion: string;
-    }, {
-        schemaVersion?: string | undefined;
-    }>>;
-} & {
     type: z.ZodLiteral<"text">;
     answer: z.ZodDefault<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
+    meta: z.ZodObject<{
+        schemaVersion: z.ZodDefault<z.ZodString>;
+    }, z.core.$strip>;
+}, z.core.$strip>;
+export declare const DefaultTextAnswer: {
     type: "text";
+    answer: string;
     meta: {
         schemaVersion: string;
     };
-    answer: string;
-}, {
-    type: "text";
-    meta?: {
-        schemaVersion?: string | undefined;
-    } | undefined;
-    answer?: string | undefined;
-}>;
+};
 export declare const TextAreaAnswerSchema: z.ZodObject<{
-    meta: z.ZodDefault<z.ZodObject<{
-        schemaVersion: z.ZodDefault<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        schemaVersion: string;
-    }, {
-        schemaVersion?: string | undefined;
-    }>>;
-} & {
     type: z.ZodLiteral<"textArea">;
     answer: z.ZodDefault<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
+    meta: z.ZodObject<{
+        schemaVersion: z.ZodDefault<z.ZodString>;
+    }, z.core.$strip>;
+}, z.core.$strip>;
+export declare const DefaultTextAreaAnswer: {
     type: "textArea";
+    answer: string;
     meta: {
         schemaVersion: string;
     };
-    answer: string;
-}, {
-    type: "textArea";
-    meta?: {
-        schemaVersion?: string | undefined;
-    } | undefined;
-    answer?: string | undefined;
-}>;
+};
 export declare const URLAnswerSchema: z.ZodObject<{
-    meta: z.ZodDefault<z.ZodObject<{
-        schemaVersion: z.ZodDefault<z.ZodString>;
-    }, "strip", z.ZodTypeAny, {
-        schemaVersion: string;
-    }, {
-        schemaVersion?: string | undefined;
-    }>>;
-} & {
     type: z.ZodLiteral<"url">;
     answer: z.ZodDefault<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
+    meta: z.ZodObject<{
+        schemaVersion: z.ZodDefault<z.ZodString>;
+    }, z.core.$strip>;
+}, z.core.$strip>;
+export declare const DefaultURLAnswer: {
     type: "url";
+    answer: string;
     meta: {
         schemaVersion: string;
     };
-    answer: string;
-}, {
-    type: "url";
-    meta?: {
-        schemaVersion?: string | undefined;
-    } | undefined;
-    answer?: string | undefined;
-}>;
+};
 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>;
+export declare const EmailAnswerJSONSchema: z.core.JSONSchema.JSONSchema;
+export declare const TextAnswerJSONSchema: z.core.JSONSchema.JSONSchema;
+export declare const TextAreaAnswerJSONSchema: z.core.JSONSchema.JSONSchema;
+export declare const URLAnswerJSONSchema: z.core.JSONSchema.JSONSchema;

package/dist/answers/textAnswers.js

@@ -1,22 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.URLAnswerSchema = exports.TextAreaAnswerSchema = exports.TextAnswerSchema = exports.EmailAnswerSchema = void 0;
+exports.URLAnswerJSONSchema = exports.TextAreaAnswerJSONSchema = exports.TextAnswerJSONSchema = exports.EmailAnswerJSONSchema = exports.DefaultURLAnswer = exports.URLAnswerSchema = exports.DefaultTextAreaAnswer = exports.TextAreaAnswerSchema = exports.DefaultTextAnswer = exports.TextAnswerSchema = exports.DefaultEmailAnswer = exports.EmailAnswerSchema = void 0;
 const zod_1 = require("zod");
 const answer_1 = require("./answer");
+const questions_1 = require("../questions");
 // Answers to Text Based Question Types
-exports.EmailAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
-    type: zod_1.z.literal('email'),
-    answer: zod_1.z.string().default('')
-}));
-exports.TextAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
-    type: zod_1.z.literal('text'),
-    answer: zod_1.z.string().default('')
-}));
-exports.TextAreaAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
-    type: zod_1.z.literal('textArea'),
-    answer: zod_1.z.string().default('')
-}));
-exports.URLAnswerSchema = answer_1.AnswerSchema.merge(zod_1.z.object({
-    type: zod_1.z.literal('url'),
-    answer: zod_1.z.string().default('')
-}));
+exports.EmailAnswerSchema = zod_1.z.object(Object.assign(Object.assign({}, answer_1.AnswerSchema.shape), { type: zod_1.z.literal('email'), answer: zod_1.z.string().default('') }));
+exports.DefaultEmailAnswer = exports.EmailAnswerSchema.parse({
+    type: 'email',
+    answer: '',
+    meta: questions_1.DefaultMeta
+});
+exports.TextAnswerSchema = zod_1.z.object(Object.assign(Object.assign({}, answer_1.AnswerSchema.shape), { type: zod_1.z.literal('text'), answer: zod_1.z.string().default('') }));
+exports.DefaultTextAnswer = exports.TextAnswerSchema.parse({
+    type: 'text',
+    answer: '',
+    meta: questions_1.DefaultMeta
+});
+exports.TextAreaAnswerSchema = zod_1.z.object(Object.assign(Object.assign({}, answer_1.AnswerSchema.shape), { type: zod_1.z.literal('textArea'), answer: zod_1.z.string().default('') }));
+exports.DefaultTextAreaAnswer = exports.TextAreaAnswerSchema.parse({
+    type: 'textArea',
+    answer: '',
+    meta: questions_1.DefaultMeta
+});
+exports.URLAnswerSchema = zod_1.z.object(Object.assign(Object.assign({}, answer_1.AnswerSchema.shape), { type: zod_1.z.literal('url'), answer: zod_1.z.string().default('') }));
+exports.DefaultURLAnswer = exports.URLAnswerSchema.parse({
+    type: 'url',
+    answer: '',
+    meta: questions_1.DefaultMeta
+});
+exports.EmailAnswerJSONSchema = zod_1.z.toJSONSchema(exports.EmailAnswerSchema);
+exports.TextAnswerJSONSchema = zod_1.z.toJSONSchema(exports.TextAnswerSchema);
+exports.TextAreaAnswerJSONSchema = zod_1.z.toJSONSchema(exports.TextAreaAnswerSchema);
+exports.URLAnswerJSONSchema = zod_1.z.toJSONSchema(exports.URLAnswerSchema);

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

@@ -47,6 +47,9 @@ describe("DateRangeQuestion", () => {
     it("should validate a valid DateRangeQuestion object", () => {
         const validDateRange = {
             type: "dateRange",
+            attributes: {
+                label: "Date Range",
+            },
             columns: {
                 start: {
                     label: "Start Date",

package/dist/questions/__tests__/defaults.spec.d.ts

@@ -0,0 +1 @@
+export {};