Merge pull request #1158 from joshunrau/fixes

joshunrau · web-flow · commit a43f0b3e6a78 · 2025-06-30T13:32:45.000-04:00
fix tests and refactor confusing code in vite-plugin-runtime
diff --git a/apps/api/src/instruments/__tests__/instruments.service.spec.ts b/apps/api/src/instruments/__tests__/instruments.service.spec.ts
@@ -15,6 +15,7 @@ describe('InstrumentsService', () => {
     const moduleRef = await Test.createTestingModule({
       providers: [
         InstrumentsService,
+        MockFactory.createForModelToken(getModelToken('Group')),
         MockFactory.createForModelToken(getModelToken('Instrument')),
         MockFactory.createForService(CryptoService),
         MockFactory.createForService(LoggingService),
diff --git a/apps/gateway/vite.config.ts b/apps/gateway/vite.config.ts
@@ -1,6 +1,6 @@
 import path from 'path';
 
-import { runtime } from '@opendatacapture/vite-plugin-runtime';
+import runtime from '@opendatacapture/vite-plugin-runtime';
 import tailwindcss from '@tailwindcss/vite';
 import react from '@vitejs/plugin-react-swc';
 import { defineConfig } from 'vite';
diff --git a/apps/playground/src/instruments/examples/form/Form-Reference/index.ts b/apps/playground/src/instruments/examples/form/Form-Reference/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable perfectionist/sort-objects */
 
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 export default defineInstrument({
   kind: 'FORM',
diff --git a/apps/playground/src/instruments/examples/form/Form-With-Computed-Measures/index.ts b/apps/playground/src/instruments/examples/form/Form-With-Computed-Measures/index.ts
@@ -2,7 +2,7 @@
 
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
 import { mean } from '/runtime/v1/lodash-es@4.x';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 const CURRENT_YEAR = new Date().getFullYear();
 const LAST_YEAR = CURRENT_YEAR - 1;
diff --git a/apps/playground/src/instruments/examples/form/Form-With-Groups/index.ts b/apps/playground/src/instruments/examples/form/Form-With-Groups/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable perfectionist/sort-objects */
 
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 export default defineInstrument({
   kind: 'FORM',
diff --git a/apps/playground/src/instruments/examples/form/Multilingual-Form-With-Dynamic-Field/index.ts b/apps/playground/src/instruments/examples/form/Multilingual-Form-With-Dynamic-Field/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable perfectionist/sort-objects */
 
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 export default defineInstrument({
   kind: 'FORM',
diff --git a/apps/playground/src/instruments/examples/interactive/Interactive-With-CSS/index.ts b/apps/playground/src/instruments/examples/interactive/Interactive-With-CSS/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable perfectionist/sort-objects */
 
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 import logoSrc from './logo.png';
 
diff --git a/apps/playground/src/instruments/examples/interactive/Interactive-With-Embedded-Media/Task.tsx b/apps/playground/src/instruments/examples/interactive/Interactive-With-Embedded-Media/Task.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from '/runtime/v1/react@19.x';
 import { match } from '/runtime/v1/ts-pattern@5.x';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 import { CatVideo } from './CatVideo.tsx';
 import { CowAudio } from './CowAudio.tsx';
diff --git a/apps/playground/src/instruments/examples/interactive/Interactive-With-JSPsych/index.ts b/apps/playground/src/instruments/examples/interactive/Interactive-With-JSPsych/index.ts
@@ -4,7 +4,7 @@ import PreloadPlugin from '/runtime/v1/@jspsych/plugin-preload@2.x';
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
 import { initJsPsych } from '/runtime/v1/jspsych@8.x';
 import type { TimelineArray } from '/runtime/v1/jspsych@8.x';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 import blue from './blue.png';
 import orange from './orange.png';
diff --git a/apps/playground/src/instruments/examples/interactive/Interactive-With-Legacy-Script/index.ts b/apps/playground/src/instruments/examples/interactive/Interactive-With-Legacy-Script/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable perfectionist/sort-objects */
 
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 import './legacy.js';
 
diff --git a/apps/playground/src/instruments/examples/interactive/Interactive-With-React/index.tsx b/apps/playground/src/instruments/examples/interactive/Interactive-With-React/index.tsx
@@ -1,6 +1,6 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
 import { createRoot } from '/runtime/v1/react-dom@19.x/client.js';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 import { App } from './App.tsx';
 
diff --git a/apps/playground/src/instruments/examples/interactive/Interactive-With-Vanilla/index.ts b/apps/playground/src/instruments/examples/interactive/Interactive-With-Vanilla/index.ts
@@ -1,5 +1,5 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 import './styles.css';
 
diff --git a/apps/playground/src/instruments/examples/interactive/Multilingual-Interactive/index.ts b/apps/playground/src/instruments/examples/interactive/Multilingual-Interactive/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable perfectionist/sort-objects */
 
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 import { translator } from './translator.ts';
 
diff --git a/apps/playground/src/instruments/templates/form/Multilingual-Form/index.ts b/apps/playground/src/instruments/templates/form/Multilingual-Form/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable perfectionist/sort-objects */
 
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 export default defineInstrument({
   kind: 'FORM',
diff --git a/apps/playground/src/instruments/templates/form/Unilingual-Form/index.ts b/apps/playground/src/instruments/templates/form/Unilingual-Form/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable perfectionist/sort-objects */
 
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 export default defineInstrument({
   kind: 'FORM',
diff --git a/apps/playground/src/instruments/templates/interactive/Interactive-Instrument/index.ts b/apps/playground/src/instruments/templates/interactive/Interactive-Instrument/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable perfectionist/sort-objects */
 
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 export default defineInstrument({
   kind: 'INTERACTIVE',
diff --git a/apps/playground/vite.config.ts b/apps/playground/vite.config.ts
@@ -1,6 +1,6 @@
 import path from 'path';
 
-import { runtime } from '@opendatacapture/vite-plugin-runtime';
+import runtime from '@opendatacapture/vite-plugin-runtime';
 import tailwindcss from '@tailwindcss/vite';
 import react from '@vitejs/plugin-react-swc';
 import { defineConfig } from 'vite';
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
@@ -2,7 +2,7 @@ import path from 'path';
 
 import importMetaEnv from '@import-meta-env/unplugin';
 import { getReleaseInfo } from '@opendatacapture/release-info';
-import { runtime } from '@opendatacapture/vite-plugin-runtime';
+import runtime from '@opendatacapture/vite-plugin-runtime';
 import tailwindcss from '@tailwindcss/vite';
 import react from '@vitejs/plugin-react-swc';
 import { defineConfig } from 'vite';
diff --git a/docs/en/4-concepts/4.3-runtime-execution-context.md b/docs/en/4-concepts/4.3-runtime-execution-context.md
@@ -15,7 +15,7 @@ In Open Data Capture, code runs on both the client and server. You should theref
 
 ```ts
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 const button = document.createElement('button');
 button.textContent = 'Submit Instrument';
@@ -46,7 +46,7 @@ To fix the instrument, there are two options:
 
 ```ts
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 function createButton() {
   const button = document.createElement('button');
diff --git a/docs/en/5-reference/5.0-form-instrument.md b/docs/en/5-reference/5.0-form-instrument.md
@@ -76,7 +76,7 @@ Always consider using \`group\`ing to structure sections
 
 ```js
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 export default defineInstrument({
   kind: 'FORM',
diff --git a/packages/instrument-library/src/forms/ADHD_ASRS_1.1/index.ts b/packages/instrument-library/src/forms/ADHD_ASRS_1.1/index.ts
@@ -1,6 +1,6 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
 import { sum } from '/runtime/v1/lodash-es@4.x';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 const likertScaleOptions = {
   en: {
diff --git a/packages/instrument-library/src/forms/AUDIT_C/index.ts b/packages/instrument-library/src/forms/AUDIT_C/index.ts
@@ -1,6 +1,6 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
 import { sum } from '/runtime/v1/lodash-es@4.x';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 export default defineInstrument({
   kind: 'FORM',
diff --git a/packages/instrument-library/src/forms/CUDIT_R/index.ts b/packages/instrument-library/src/forms/CUDIT_R/index.ts
@@ -1,5 +1,5 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 const $NumberRange = z.number().int().min(0).max(4);
 
diff --git a/packages/instrument-library/src/forms/DNP_ENHANCED_DEMOGRAPHICS_QUESTIONNAIRE/index.ts b/packages/instrument-library/src/forms/DNP_ENHANCED_DEMOGRAPHICS_QUESTIONNAIRE/index.ts
@@ -1,6 +1,6 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
 import type { Language } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 type MultilingualOptions = { [key: string]: { [L in Language]: string } };
 
diff --git a/packages/instrument-library/src/forms/DNP_GENERAL_CONSENT_FORM/index.ts b/packages/instrument-library/src/forms/DNP_GENERAL_CONSENT_FORM/index.ts
@@ -1,5 +1,5 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 export default defineInstrument({
   kind: 'FORM',
diff --git a/packages/instrument-library/src/forms/DNP_HAPPINESS_QUESTIONNAIRE/index.ts b/packages/instrument-library/src/forms/DNP_HAPPINESS_QUESTIONNAIRE/index.ts
@@ -1,6 +1,6 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
 import { pick, sum } from '/runtime/v1/lodash-es@4.x';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 export default defineInstrument({
   kind: 'FORM',
diff --git a/packages/instrument-library/src/forms/FAGERSTRÖM_NICOTINE_DEPENDENCE/index.ts b/packages/instrument-library/src/forms/FAGERSTRÖM_NICOTINE_DEPENDENCE/index.ts
@@ -1,6 +1,6 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
 import { sum } from '/runtime/v1/lodash-es@4.x';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 const yesNoOptions = {
   en: {
diff --git a/packages/instrument-library/src/forms/GAD_7/index.ts b/packages/instrument-library/src/forms/GAD_7/index.ts
@@ -1,5 +1,5 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 const likertOptions = {
   en: {
diff --git a/packages/instrument-library/src/forms/OLDER_AMERICANS_RESOURCES_AND_SERVICES/index.ts b/packages/instrument-library/src/forms/OLDER_AMERICANS_RESOURCES_AND_SERVICES/index.ts
@@ -1,5 +1,5 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 export default defineInstrument({
   kind: 'FORM',
diff --git a/packages/instrument-library/src/forms/PHQ_9/index.ts b/packages/instrument-library/src/forms/PHQ_9/index.ts
@@ -1,6 +1,6 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
 import { omit, sum } from '/runtime/v1/lodash-es@4.x';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 const $Response = z.number().int().min(0).max(3);
 
diff --git a/packages/instrument-library/src/forms/STARKSTEIN_APATHY_SCALE/index.ts b/packages/instrument-library/src/forms/STARKSTEIN_APATHY_SCALE/index.ts
@@ -1,5 +1,5 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 const $FieldOptionsValidation = z.number().int().gte(0).lte(3);
 const fieldOptionsLikertScale = {
diff --git a/packages/instrument-library/src/forms/TEN_ITEM_PERSONALITY_INVENTORY/index.ts b/packages/instrument-library/src/forms/TEN_ITEM_PERSONALITY_INVENTORY/index.ts
@@ -1,5 +1,5 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 const $IntScale = z.number().int().min(1).max(7);
 const $ContinuousScale = z.number().min(1).max(7);
diff --git a/packages/instrument-library/src/interactive/DNP_BREAKOUT_TASK/index.ts b/packages/instrument-library/src/interactive/DNP_BREAKOUT_TASK/index.ts
@@ -1,5 +1,5 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 import './styles.css';
 
diff --git a/packages/instrument-library/src/interactive/DNP_STROOP_TASK/index.tsx b/packages/instrument-library/src/interactive/DNP_STROOP_TASK/index.tsx
@@ -1,6 +1,6 @@
 import { defineInstrument } from '/runtime/v1/@opendatacapture/runtime-core';
 import { createRoot } from '/runtime/v1/react-dom@19.x/client.js';
-import { z } from '/runtime/v1/zod@3.23.x';
+import { z } from '/runtime/v1/zod@3.x';
 
 import { StroopTask } from './StroopTask.tsx';
 
diff --git a/packages/vite-plugin-runtime/package.json b/packages/vite-plugin-runtime/package.json
@@ -4,10 +4,7 @@
   "version": "0.0.0",
   "license": "Apache-2.0",
   "exports": {
-    ".": {
-      "types": "./src/index.d.ts",
-      "default": "./src/index.js"
-    }
+    ".": "./src/index.js"
   },
   "scripts": {
     "format": "prettier --write src",
diff --git a/packages/vite-plugin-runtime/src/__tests__/index.test.ts b/packages/vite-plugin-runtime/src/__tests__/index.test.ts
diff --git a/packages/vite-plugin-runtime/src/__tests__/load-resource.test.ts b/packages/vite-plugin-runtime/src/__tests__/load-resource.test.ts
diff --git a/packages/vite-plugin-runtime/src/__tests__/plugin.test.ts b/packages/vite-plugin-runtime/src/__tests__/plugin.test.ts
diff --git a/packages/vite-plugin-runtime/src/__tests__/resolve.test.ts b/packages/vite-plugin-runtime/src/__tests__/resolve.test.ts
diff --git a/packages/vite-plugin-runtime/src/__tests__/runtime-middleware.test.ts b/packages/vite-plugin-runtime/src/__tests__/runtime-middleware.test.ts
diff --git a/packages/vite-plugin-runtime/src/index.d.ts b/packages/vite-plugin-runtime/src/index.d.ts
diff --git a/packages/vite-plugin-runtime/src/index.js b/packages/vite-plugin-runtime/src/index.js
diff --git a/packages/vite-plugin-runtime/src/load-resource.js b/packages/vite-plugin-runtime/src/load-resource.js
diff --git a/packages/vite-plugin-runtime/src/plugin.js b/packages/vite-plugin-runtime/src/plugin.js
diff --git a/packages/vite-plugin-runtime/src/resolve.js b/packages/vite-plugin-runtime/src/resolve.js
diff --git a/packages/vite-plugin-runtime/src/runtime-middleware.js b/packages/vite-plugin-runtime/src/runtime-middleware.js
diff --git a/storybook/vite.config.js b/storybook/vite.config.js

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 import React, { useEffect, useState } from '/runtime/v1/[email protected]';
 import { match } from '/runtime/v1/[email protected]';
 -import { z } from '/runtime/v1/zod@3.23.x';
 +import { z } from '/runtime/v1/[email protected]';
 import { CatVideo } from './CatVideo.tsx';
 import { CowAudio } from './CowAudio.tsx';