@effect-app/vue-components 4.0.0-beta.2 → 4.0.0-beta.200

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (233) hide show
  1. package/README.md +36 -8
  2. package/dist/reset.css +52 -0
  3. package/dist/types/components/CommandButton.vue.d.ts +6 -4
  4. package/dist/types/components/OmegaForm/OmegaArray.vue.d.ts +1 -1
  5. package/dist/types/components/OmegaForm/OmegaAutoGen.vue.d.ts +2 -2
  6. package/dist/types/components/OmegaForm/OmegaErrorsInternal.vue.d.ts +1 -1
  7. package/dist/types/components/OmegaForm/OmegaFormInput.vue.d.ts +1 -1
  8. package/dist/types/components/OmegaForm/OmegaInput.vue.d.ts +1 -1
  9. package/dist/types/components/OmegaForm/OmegaInternalInput.vue.d.ts +2 -1
  10. package/dist/types/components/OmegaForm/OmegaWrapper.vue.d.ts +1 -1
  11. package/dist/types/components/OmegaForm/createUseFormWithCustomInput.d.ts +2 -2
  12. package/dist/types/components/OmegaForm/errors.d.ts +33 -0
  13. package/dist/types/components/OmegaForm/getOmegaStore.d.ts +1 -1
  14. package/dist/types/components/OmegaForm/hocs.d.ts +3 -0
  15. package/dist/types/components/OmegaForm/index.d.ts +13 -3
  16. package/dist/types/components/OmegaForm/inputs.d.ts +4 -0
  17. package/dist/types/components/OmegaForm/meta/checks.d.ts +4 -0
  18. package/dist/types/components/OmegaForm/meta/createMeta.d.ts +32 -0
  19. package/dist/types/components/OmegaForm/meta/defaults.d.ts +2 -0
  20. package/dist/types/components/OmegaForm/meta/redacted.d.ts +2 -0
  21. package/dist/types/components/OmegaForm/meta/types.d.ts +56 -0
  22. package/dist/types/components/OmegaForm/meta/walker.d.ts +18 -0
  23. package/dist/types/components/OmegaForm/persistency.d.ts +58 -0
  24. package/dist/types/components/OmegaForm/submit.d.ts +60 -0
  25. package/dist/types/components/OmegaForm/types.d.ts +281 -0
  26. package/dist/types/components/OmegaForm/useOmegaForm.d.ts +7 -215
  27. package/dist/types/components/OmegaForm/validation/localized.d.ts +10 -0
  28. package/dist/types/index.d.ts +0 -1
  29. package/dist/types/utils/index.d.ts +6 -7
  30. package/dist/vue-components.es.js +29 -44
  31. package/dist/vue-components10.es.js +5 -0
  32. package/dist/vue-components11.es.js +20 -0
  33. package/dist/vue-components12.es.js +49 -0
  34. package/dist/vue-components13.es.js +128 -0
  35. package/dist/vue-components14.es.js +65 -0
  36. package/dist/vue-components15.es.js +60 -0
  37. package/dist/vue-components16.es.js +22 -0
  38. package/dist/vue-components17.es.js +5 -0
  39. package/dist/vue-components18.es.js +80 -0
  40. package/dist/vue-components19.es.js +92 -0
  41. package/dist/vue-components2.es.js +11 -0
  42. package/dist/vue-components20.es.js +73 -0
  43. package/dist/vue-components21.es.js +12 -0
  44. package/dist/vue-components22.es.js +56 -0
  45. package/dist/vue-components23.es.js +5 -0
  46. package/dist/vue-components24.es.js +44 -0
  47. package/dist/vue-components25.es.js +5 -0
  48. package/dist/vue-components26.es.js +84 -0
  49. package/dist/vue-components28.es.js +8 -0
  50. package/dist/vue-components29.es.js +9 -0
  51. package/dist/vue-components3.es.js +86 -0
  52. package/dist/vue-components30.es.js +269 -0
  53. package/dist/vue-components32.es.js +8 -0
  54. package/dist/vue-components33.es.js +73 -0
  55. package/dist/vue-components34.es.js +5 -0
  56. package/dist/vue-components35.es.js +52 -0
  57. package/dist/vue-components36.es.js +5 -0
  58. package/dist/vue-components37.es.js +24 -0
  59. package/dist/vue-components38.es.js +5 -0
  60. package/dist/vue-components39.es.js +59 -0
  61. package/dist/vue-components4.es.js +5 -0
  62. package/dist/vue-components40.es.js +5 -0
  63. package/dist/vue-components41.es.js +12 -0
  64. package/dist/vue-components42.es.js +22 -0
  65. package/dist/vue-components44.es.js +9 -0
  66. package/dist/vue-components45.es.js +4 -0
  67. package/dist/vue-components46.es.js +38 -0
  68. package/dist/vue-components47.es.js +27 -0
  69. package/dist/vue-components48.es.js +28 -0
  70. package/dist/vue-components49.es.js +7 -0
  71. package/dist/vue-components5.es.js +24 -0
  72. package/dist/vue-components50.es.js +18 -0
  73. package/dist/vue-components51.es.js +36 -0
  74. package/dist/vue-components52.es.js +18 -0
  75. package/dist/vue-components53.es.js +21 -0
  76. package/dist/vue-components54.es.js +30 -0
  77. package/dist/vue-components55.es.js +7 -0
  78. package/dist/vue-components56.es.js +9 -0
  79. package/dist/vue-components57.es.js +38 -0
  80. package/dist/vue-components58.es.js +25 -0
  81. package/dist/vue-components59.es.js +128 -0
  82. package/dist/vue-components6.es.js +13 -0
  83. package/dist/vue-components60.es.js +24 -0
  84. package/dist/vue-components61.es.js +21 -0
  85. package/dist/vue-components62.es.js +9 -0
  86. package/dist/vue-components63.es.js +19 -0
  87. package/dist/vue-components64.es.js +5 -0
  88. package/dist/vue-components65.es.js +29 -0
  89. package/dist/vue-components66.es.js +5 -0
  90. package/dist/vue-components67.es.js +29 -0
  91. package/dist/vue-components68.es.js +6 -0
  92. package/dist/vue-components69.es.js +18 -0
  93. package/dist/vue-components7.es.js +13 -0
  94. package/dist/vue-components70.es.js +40 -0
  95. package/dist/vue-components71.es.js +81 -0
  96. package/dist/vue-components72.es.js +33 -0
  97. package/dist/vue-components73.es.js +19 -0
  98. package/dist/vue-components74.es.js +48 -0
  99. package/dist/vue-components8.es.js +35 -0
  100. package/dist/vue-components9.es.js +47 -0
  101. package/package.json +35 -31
  102. package/src/components/CommandButton.vue +55 -7
  103. package/src/components/OmegaForm/OmegaArray.vue +2 -4
  104. package/src/components/OmegaForm/OmegaAutoGen.vue +27 -31
  105. package/src/components/OmegaForm/OmegaErrorsInternal.vue +3 -4
  106. package/src/components/OmegaForm/OmegaFormInput.vue +1 -1
  107. package/src/components/OmegaForm/OmegaInput.vue +7 -36
  108. package/src/components/OmegaForm/OmegaInputVuetify.vue +5 -2
  109. package/src/components/OmegaForm/OmegaInternalInput.vue +21 -11
  110. package/src/components/OmegaForm/OmegaTaggedUnion.vue +2 -1
  111. package/src/components/OmegaForm/OmegaTaggedUnionInternal.vue +1 -1
  112. package/src/components/OmegaForm/OmegaWrapper.vue +1 -1
  113. package/src/components/OmegaForm/blockDialog.ts +18 -6
  114. package/src/components/OmegaForm/createUseFormWithCustomInput.ts +2 -1
  115. package/src/components/OmegaForm/errors.ts +136 -0
  116. package/src/components/OmegaForm/getOmegaStore.ts +1 -1
  117. package/src/components/OmegaForm/hocs.ts +19 -0
  118. package/src/components/OmegaForm/index.ts +16 -4
  119. package/src/components/OmegaForm/inputs.ts +22 -0
  120. package/src/components/OmegaForm/meta/checks.ts +81 -0
  121. package/src/components/OmegaForm/meta/createMeta.ts +138 -0
  122. package/src/components/OmegaForm/meta/defaults.ts +132 -0
  123. package/src/components/OmegaForm/meta/redacted.ts +66 -0
  124. package/src/components/OmegaForm/meta/types.ts +78 -0
  125. package/src/components/OmegaForm/meta/walker.ts +248 -0
  126. package/src/components/OmegaForm/persistency.ts +247 -0
  127. package/src/components/OmegaForm/submit.ts +128 -0
  128. package/src/components/OmegaForm/types.ts +751 -0
  129. package/src/components/OmegaForm/useOmegaForm.ts +58 -895
  130. package/src/components/OmegaForm/validation/localized.ts +202 -0
  131. package/src/index.ts +0 -1
  132. package/src/reset.css +52 -0
  133. package/src/utils/index.ts +9 -10
  134. package/dist/types/components/OmegaForm/OmegaFormStuff.d.ts +0 -157
  135. package/dist/types/constants/index.d.ts +0 -1
  136. package/dist/vue-components.es10.js +0 -237
  137. package/dist/vue-components.es100.js +0 -4
  138. package/dist/vue-components.es11.js +0 -32
  139. package/dist/vue-components.es12.js +0 -439
  140. package/dist/vue-components.es13.js +0 -49
  141. package/dist/vue-components.es14.js +0 -4
  142. package/dist/vue-components.es15.js +0 -4
  143. package/dist/vue-components.es16.js +0 -725
  144. package/dist/vue-components.es17.js +0 -143
  145. package/dist/vue-components.es18.js +0 -6
  146. package/dist/vue-components.es19.js +0 -13
  147. package/dist/vue-components.es2.js +0 -30
  148. package/dist/vue-components.es20.js +0 -5
  149. package/dist/vue-components.es21.js +0 -26
  150. package/dist/vue-components.es22.js +0 -6
  151. package/dist/vue-components.es23.js +0 -10
  152. package/dist/vue-components.es24.js +0 -57
  153. package/dist/vue-components.es25.js +0 -71
  154. package/dist/vue-components.es26.js +0 -8
  155. package/dist/vue-components.es27.js +0 -8
  156. package/dist/vue-components.es28.js +0 -5
  157. package/dist/vue-components.es29.js +0 -5
  158. package/dist/vue-components.es3.js +0 -16
  159. package/dist/vue-components.es30.js +0 -4
  160. package/dist/vue-components.es31.js +0 -4
  161. package/dist/vue-components.es32.js +0 -4
  162. package/dist/vue-components.es33.js +0 -4
  163. package/dist/vue-components.es34.js +0 -19
  164. package/dist/vue-components.es35.js +0 -13
  165. package/dist/vue-components.es36.js +0 -320
  166. package/dist/vue-components.es37.js +0 -563
  167. package/dist/vue-components.es38.js +0 -29
  168. package/dist/vue-components.es39.js +0 -54
  169. package/dist/vue-components.es4.js +0 -52
  170. package/dist/vue-components.es40.js +0 -66
  171. package/dist/vue-components.es41.js +0 -6
  172. package/dist/vue-components.es42.js +0 -6
  173. package/dist/vue-components.es43.js +0 -26
  174. package/dist/vue-components.es44.js +0 -77
  175. package/dist/vue-components.es45.js +0 -42
  176. package/dist/vue-components.es46.js +0 -316
  177. package/dist/vue-components.es47.js +0 -101
  178. package/dist/vue-components.es48.js +0 -33
  179. package/dist/vue-components.es49.js +0 -4
  180. package/dist/vue-components.es5.js +0 -52
  181. package/dist/vue-components.es50.js +0 -4
  182. package/dist/vue-components.es51.js +0 -4
  183. package/dist/vue-components.es52.js +0 -113
  184. package/dist/vue-components.es54.js +0 -9
  185. package/dist/vue-components.es55.js +0 -34
  186. package/dist/vue-components.es57.js +0 -194
  187. package/dist/vue-components.es59.js +0 -40
  188. package/dist/vue-components.es6.js +0 -69
  189. package/dist/vue-components.es60.js +0 -85
  190. package/dist/vue-components.es61.js +0 -43
  191. package/dist/vue-components.es62.js +0 -7
  192. package/dist/vue-components.es63.js +0 -6
  193. package/dist/vue-components.es64.js +0 -25
  194. package/dist/vue-components.es65.js +0 -7
  195. package/dist/vue-components.es66.js +0 -23
  196. package/dist/vue-components.es67.js +0 -32
  197. package/dist/vue-components.es68.js +0 -24
  198. package/dist/vue-components.es69.js +0 -14
  199. package/dist/vue-components.es7.js +0 -83
  200. package/dist/vue-components.es70.js +0 -7
  201. package/dist/vue-components.es71.js +0 -21
  202. package/dist/vue-components.es72.js +0 -11
  203. package/dist/vue-components.es73.js +0 -33
  204. package/dist/vue-components.es74.js +0 -50
  205. package/dist/vue-components.es75.js +0 -28
  206. package/dist/vue-components.es76.js +0 -103
  207. package/dist/vue-components.es77.js +0 -84
  208. package/dist/vue-components.es78.js +0 -23
  209. package/dist/vue-components.es79.js +0 -14
  210. package/dist/vue-components.es8.js +0 -63
  211. package/dist/vue-components.es80.js +0 -115
  212. package/dist/vue-components.es81.js +0 -5
  213. package/dist/vue-components.es82.js +0 -34
  214. package/dist/vue-components.es83.js +0 -4
  215. package/dist/vue-components.es84.js +0 -4
  216. package/dist/vue-components.es85.js +0 -18
  217. package/dist/vue-components.es86.js +0 -17
  218. package/dist/vue-components.es87.js +0 -72
  219. package/dist/vue-components.es88.js +0 -10
  220. package/dist/vue-components.es89.js +0 -4
  221. package/dist/vue-components.es9.js +0 -21
  222. package/dist/vue-components.es90.js +0 -17
  223. package/dist/vue-components.es91.js +0 -13
  224. package/dist/vue-components.es92.js +0 -67
  225. package/dist/vue-components.es93.js +0 -58
  226. package/dist/vue-components.es94.js +0 -19
  227. package/dist/vue-components.es95.js +0 -35
  228. package/dist/vue-components.es96.js +0 -31
  229. package/dist/vue-components.es97.js +0 -44
  230. package/dist/vue-components.es98.js +0 -4
  231. package/dist/vue-components.es99.js +0 -46
  232. package/src/components/OmegaForm/OmegaFormStuff.ts +0 -1174
  233. package/src/constants/index.ts +0 -1
package/package.json CHANGED
@@ -1,39 +1,39 @@
1
1
  {
2
2
  "name": "@effect-app/vue-components",
3
- "version": "4.0.0-beta.2",
3
+ "version": "4.0.0-beta.200",
4
4
  "peerDependencies": {
5
5
  "@mdi/js": "^7.4.47",
6
- "effect": "^4.0.0-beta.25",
7
- "intl-messageformat": "^11.1.2",
6
+ "effect": "^4.0.0-beta.60",
7
+ "intl-messageformat": "^11.2.3",
8
8
  "mdi-js": "^1.0.1",
9
9
  "primeflex": "^4.0.0",
10
10
  "primeicons": "^7.0.0",
11
- "primevue": "^4.5.4",
12
- "vue": "^3.5.29",
13
- "vuetify": "^4.0.0"
11
+ "primevue": "^4.5.5",
12
+ "vue": "^3.5.33",
13
+ "vuetify": "^4.0.6"
14
14
  },
15
15
  "devDependencies": {
16
- "@storybook/vue3": "^10.2.13",
17
- "@storybook/vue3-vite": "^10.2.13",
18
- "@types/node": "^25.3.3",
19
- "@vitejs/plugin-vue": "^6.0.4",
20
- "@vue/test-utils": "^2.4.6",
21
- "@vueuse/core": "^14.2.1",
22
- "dprint": "^0.52.0",
23
- "jsdom": "^28.1.0",
16
+ "@storybook/vue3": "^10.3.6",
17
+ "@storybook/vue3-vite": "^10.3.6",
18
+ "@types/node": "^25.6.0",
19
+ "@vitejs/plugin-vue": "^6.0.6",
20
+ "@vue/test-utils": "^2.4.10",
21
+ "@vueuse/core": "^14.3.0",
22
+ "jsdom": "^29.1.1",
24
23
  "rimraf": "^6.1.3",
25
- "sass": "^1.97.3",
26
- "storybook": "^10.2.13",
27
- "typescript": "~5.9.3",
28
- "vite": "^7.3.1",
29
- "vite-plugin-css-injected-by-js": "^4.0.1",
24
+ "sass": "^1.99.0",
25
+ "storybook": "^10.3.6",
26
+ "storybook-vue3-router": "^7.0.0",
27
+ "typescript": "~6.0.3",
28
+ "vite": "^8.0.10",
29
+ "vite-plugin-css-injected-by-js": "^5.0.1",
30
30
  "vitepress": "^1.6.4",
31
- "vitest": "^4.0.18",
32
- "vue-router": "^5.0.3",
31
+ "vitest": "^4.1.5",
32
+ "vue-router": "^5.0.6",
33
33
  "vue-toastification": "^2.0.0-rc.5",
34
- "vue-tsc": "^3.2.5",
35
- "vuetify": "^4.0.0",
36
- "@effect-app/eslint-shared-config": "0.5.7-beta.1"
34
+ "vue-tsc": "^3.2.7",
35
+ "vuetify": "^4.0.6",
36
+ "@effect-app/eslint-shared-config": "0.6.0-beta.23"
37
37
  },
38
38
  "files": [
39
39
  "src",
@@ -45,28 +45,32 @@
45
45
  "types": "./dist/types/index.d.ts",
46
46
  "import": "./dist/vue-components.es.js"
47
47
  },
48
- "./dist/vue-components.css": "./dist/vue-components.css"
48
+ "./dist/vue-components.css": "./dist/vue-components.css",
49
+ "./reset.css": {
50
+ "development": "./src/reset.css",
51
+ "default": "./dist/reset.css"
52
+ }
49
53
  },
50
54
  "dependencies": {
51
- "@opentelemetry/api": "^1.9.0",
55
+ "@opentelemetry/api": "^1.9.1",
52
56
  "@tanstack/vue-form": "^1.23.5",
53
57
  "highlight.js": "^11.11.1",
54
58
  "mitt": "^3.0.1",
55
59
  "vue3-highlightjs": "^1.0.5",
56
- "@effect-app/vue": "4.0.0-beta.2",
57
- "effect-app": "4.0.0-beta.2"
60
+ "@effect-app/vue": "4.0.0-beta.200",
61
+ "effect-app": "4.0.0-beta.200"
58
62
  },
59
63
  "scripts": {
60
64
  "check": "vue-tsc",
61
65
  "build": "pnpm build:run",
62
- "build:run": "rimraf dist && vue-tsc && vite build",
66
+ "build:run": "rimraf dist && vue-tsc && vite build && cp src/reset.css dist/reset.css",
63
67
  "docs:dev": "vitepress dev docs",
64
68
  "docs:build": "vitepress build docs",
65
69
  "docs:serve": "vitepress serve docs",
66
- "lint": "NODE_OPTIONS=--max-old-space-size=8192 eslint src stories .storybook",
70
+ "lint": "oxlint --quiet --type-aware src stories && NODE_OPTIONS=--max-old-space-size=8192 ESLINT_TS=1 eslint --quiet src stories .storybook && pnpm exec dprint check --config ../../dprint.jsonc .",
67
71
  "ncu": "ncu",
68
72
  "clean": "rm -rf dist",
69
- "lint-fix": "pnpm lint --fix",
73
+ "lint-fix": "oxlint --quiet --type-aware --fix src stories && NODE_OPTIONS=--max-old-space-size=8192 ESLINT_TS=1 eslint --quiet --fix src stories .storybook && pnpm exec dprint fmt --config ../../dprint.jsonc .",
70
74
  "storybook": "storybook dev -p 6006",
71
75
  "build-storybook": "storybook build",
72
76
  "test": "vitest",
@@ -1,9 +1,10 @@
1
1
  <script
2
2
  setup
3
3
  lang="ts"
4
- generic="I = never"
4
+ generic="I = never, RA = unknown, RE = unknown"
5
5
  >
6
- import type { CommandBase } from "@effect-app/vue"
6
+ import type { CommandBase, Progress } from "@effect-app/vue"
7
+ import type * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
7
8
  import { computed } from "vue"
8
9
  import type { VBtn } from "vuetify/components"
9
10
 
@@ -14,11 +15,11 @@ const props = defineProps<
14
15
  & (
15
16
  | {
16
17
  input: NoInfer<I>
17
- command: CommandBase<I>
18
+ command: CommandBase<I, any, RA, RE>
18
19
  empty?: boolean
19
20
  }
20
21
  | {
21
- command: CommandBase
22
+ command: CommandBase<any, any, RA, RE>
22
23
  input?: undefined
23
24
  empty?: boolean
24
25
  }
@@ -26,12 +27,32 @@ const props = defineProps<
26
27
  & {
27
28
  disabled?: ButtonProps["disabled"]
28
29
  title?: string // why isn't it part of VBtnProps??
30
+ mapProgress?: (result: AsyncResult.AsyncResult<RA, RE>) => Progress | undefined
29
31
  }
30
32
  & ButtonProps
31
33
  >()
32
34
 
33
35
  const isDisabled = computed(() => props.command.blocked || props.disabled)
34
36
 
37
+ const resolvedProgress = computed(() => {
38
+ if (props.mapProgress) {
39
+ const result = props.command.result
40
+ return result !== undefined ? props.mapProgress(result) : undefined
41
+ }
42
+ return props.command.progress
43
+ })
44
+
45
+ const progressText = computed(() => {
46
+ const p = resolvedProgress.value
47
+ if (p === undefined) return undefined
48
+ return typeof p === "string" ? p : p.text
49
+ })
50
+
51
+ const progressPercentage = computed(() => {
52
+ const p = resolvedProgress.value
53
+ return typeof p === "object" && p !== null ? p.percentage : undefined
54
+ })
55
+
35
56
  const handleClick = () => {
36
57
  // Block execution if button is disabled
37
58
  if (isDisabled.value) {
@@ -41,7 +62,9 @@ const handleClick = () => {
41
62
  const input = ("input" in props && props.input
42
63
  ? props.input
43
64
  : undefined) as unknown as I
44
- ;(props.command.handle as any)(input)
65
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any -- command.handle has a generic signature mismatched by erased input type
66
+ const handle = props.command.handle as any
67
+ handle(input)
45
68
  }
46
69
  </script>
47
70
  <script lang="ts">
@@ -60,13 +83,25 @@ export default {
60
83
  :class="{ 'v-btn--disabled': isDisabled }"
61
84
  @click="handleClick"
62
85
  >
86
+ <template
87
+ v-if="progressText !== undefined"
88
+ #loader
89
+ >
90
+ <v-progress-circular
91
+ :indeterminate="progressPercentage === undefined"
92
+ :model-value="progressPercentage"
93
+ size="20"
94
+ width="2"
95
+ />
96
+ <span class="ml-2">{{ progressText }}</span>
97
+ </template>
63
98
  <slot
64
99
  :loading="command.waiting"
65
100
  :disabled="isDisabled"
66
101
  :label="command.label"
67
102
  :title="title ?? command.action"
68
103
  >
69
- <span>{{ command.label }}</span>
104
+ {{ command.label }}
70
105
  </slot>
71
106
  </v-btn>
72
107
  <v-btn
@@ -77,5 +112,18 @@ export default {
77
112
  :title="title ?? command.action"
78
113
  :class="{ 'v-btn--disabled': isDisabled }"
79
114
  @click="handleClick"
80
- />
115
+ >
116
+ <template
117
+ v-if="progressText !== undefined"
118
+ #loader
119
+ >
120
+ <v-progress-circular
121
+ :indeterminate="progressPercentage === undefined"
122
+ :model-value="progressPercentage"
123
+ size="20"
124
+ width="2"
125
+ />
126
+ <span class="ml-2">{{ progressText }}</span>
127
+ </template>
128
+ </v-btn>
81
129
  </template>
@@ -12,9 +12,7 @@
12
12
  :is="form.Field"
13
13
  v-for="(_, i) of items"
14
14
  :key="`${name}[${Number(i)}]`"
15
- :name="// eslint-disable-next-line
16
- `${name}[${Number(i)}]` as DeepKeys<From>
17
- "
15
+ :name="`${name}[${Number(i)}]` as DeepKeys<From>"
18
16
  >
19
17
  <template #default="{ field: subField, state: subState }">
20
18
  <slot
@@ -46,7 +44,7 @@
46
44
  >
47
45
  import { type DeepKeys } from "@tanstack/vue-form"
48
46
  import { computed, onMounted, provide } from "vue"
49
- import { type OmegaArrayProps } from "./OmegaFormStuff"
47
+ import { type OmegaArrayProps } from "./types"
50
48
 
51
49
  const props = defineProps<OmegaArrayProps<From, To, Name>>()
52
50
 
@@ -20,10 +20,10 @@
20
20
  Name extends DeepKeys<From>"
21
21
  >
22
22
  import { type DeepKeys } from "@tanstack/vue-form"
23
- import { pipe } from "effect/Function"
24
- import * as Order from "effect/Order"
23
+ import { Order } from "effect-app"
25
24
  import { computed } from "vue"
26
- import { type FieldMeta, type FieldPath, type OmegaAutoGenMeta, type OmegaInputProps } from "./OmegaFormStuff"
25
+ import { type FieldMeta } from "./meta/types"
26
+ import { type FieldPath, type OmegaAutoGenMeta, type OmegaInputProps } from "./types"
27
27
 
28
28
  type NewMeta = OmegaAutoGenMeta<From, To, Name>
29
29
 
@@ -71,37 +71,33 @@ const orderBy: Order.Order<NewMeta> = Order.mapInput(
71
71
  (x: NewMeta) => namePosition(x.name, props.order || [])
72
72
  )
73
73
 
74
- const children = computed<NewMeta[]>(() =>
75
- pipe(
76
- props.form.meta as Record<DeepKeys<From>, FieldMeta | undefined>,
77
- // include / exclude
78
- filterRecord((_, metaKey) =>
74
+ const children = computed<NewMeta[]>(() => {
75
+ const included = filterRecord((value, metaKey) =>
76
+ Boolean(value)
77
+ && (
79
78
  props.pick
80
79
  ? props.pick.includes(metaKey) && !props.omit?.includes(metaKey)
81
80
  : !props.omit?.includes(metaKey)
82
- ),
83
- (x: Record<DeepKeys<From>, FieldMeta | undefined>) => x,
84
- // labelMap and adding name
85
- mapObject((metaValue, metaKey) => ({
86
- name: metaKey as Name,
87
- label: props.labelMap?.(metaKey) || metaKey,
88
- ...(metaValue ?? {})
89
- })),
90
- // filterMap
91
- props.filterMap
92
- ? filterMapRecord((m: NewMeta) => {
93
- const result = props.filterMap?.(m.name!, m as NewMeta)
94
- return result === undefined || result === true ? m : result
95
- })
96
- : (x: Record<DeepKeys<From>, NewMeta>) => x,
97
- // transform to array
98
- (obj: Record<DeepKeys<From>, NewMeta>) => Object.values(obj) as NewMeta[],
99
- // order
100
- (items: NewMeta[]) => [...items].sort((a, b) => orderBy(a, b)),
101
- // sort
102
- props.sort ? (items: NewMeta[]) => [...items].sort((a, b) => props.sort!(a, b)) : (x: NewMeta[]) => x
103
- )
104
- )
81
+ )
82
+ )(props.form.meta as Record<DeepKeys<From>, FieldMeta | undefined>) as Record<DeepKeys<From>, FieldMeta>
83
+
84
+ const withLabels = mapObject((metaValue: FieldMeta, metaKey) => ({
85
+ name: metaKey,
86
+ label: props.labelMap?.(metaKey) || metaKey,
87
+ ...metaValue
88
+ }))(included) as unknown as Record<DeepKeys<From>, NewMeta>
89
+
90
+ const filtered = props.filterMap
91
+ ? filterMapRecord((m: NewMeta) => {
92
+ const result = props.filterMap?.(m.name, m)
93
+ return result === undefined || result === true ? m : result
94
+ })(withLabels) as Record<DeepKeys<From>, NewMeta>
95
+ : withLabels
96
+
97
+ const sorted = [...Object.values(filtered) as NewMeta[]].sort(orderBy)
98
+
99
+ return props.sort ? sorted.sort(props.sort) : sorted
100
+ })
105
101
 
106
102
  defineSlots<{
107
103
  default(props: { child: NewMeta }): void
@@ -102,7 +102,7 @@
102
102
  import type { StandardSchemaV1Issue } from "@tanstack/vue-form"
103
103
  import { computed, getCurrentInstance } from "vue"
104
104
  import { useIntl } from "../../utils"
105
- import { type OmegaError } from "./OmegaFormStuff"
105
+ import { type OmegaError } from "./types"
106
106
 
107
107
  const instance = getCurrentInstance()
108
108
  const vuetified = instance?.appContext.components["VAlert"]
@@ -130,10 +130,9 @@ const showedGeneralErrors = computed(() => {
130
130
  .flatMap((issues) =>
131
131
  issues
132
132
  .filter(
133
- (issue): issue is StandardSchemaV1Issue & { message: string } =>
134
- typeof (issue as { message?: unknown })?.message === "string"
133
+ (issue): issue is StandardSchemaV1Issue & { message: string } => Boolean(issue?.message)
135
134
  )
136
- .map((issue) => (issue as StandardSchemaV1Issue & { message: string }).message)
135
+ .map((issue) => issue.message)
137
136
  )
138
137
  )
139
138
  })
@@ -17,8 +17,8 @@
17
17
  import { type DeepKeys } from "@tanstack/vue-form"
18
18
  import { inject } from "vue"
19
19
  import type { MergedInputProps } from "./InputProps"
20
- import type { BaseProps, DefaultTypeProps, OmegaInputProps } from "./OmegaFormStuff"
21
20
  import OmegaInput from "./OmegaInput.vue"
21
+ import type { BaseProps, DefaultTypeProps, OmegaInputProps } from "./types"
22
22
  import { OmegaFormKey } from "./useOmegaForm"
23
23
 
24
24
  const form = inject(OmegaFormKey) as unknown as OmegaInputProps<
@@ -1,18 +1,14 @@
1
1
  <template>
2
2
  <component
3
3
  :is="form.Field"
4
- :key="fieldKey"
5
4
  :name="name"
6
- :validators="{
7
- onChange: schema,
8
- ...validators
9
- }"
5
+ :validators="validators"
10
6
  >
11
7
  <template #default="{ field, state }">
12
8
  <OmegaInternalInput
13
9
  v-if="meta"
14
10
  v-bind="{ ...$attrs, ...$props, inputClass: computedClass }"
15
- :field="field"
11
+ :field="field as any"
16
12
  :state="state"
17
13
  :register="form.registerField"
18
14
  :label="label ?? errori18n(propsName)"
@@ -40,12 +36,13 @@
40
36
  lang="ts"
41
37
  generic="From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, Name extends DeepKeys<From>"
42
38
  >
39
+ /* eslint-disable @typescript-eslint/no-explicit-any -- TanStack Form Field generic interop and slot prop typing */
43
40
  import { type DeepKeys } from "@tanstack/vue-form"
44
41
  import { computed, inject, type Ref, useAttrs } from "vue"
45
- import { useIntl } from "../../utils"
46
- import { type FieldMeta, generateInputStandardSchemaFromFieldMeta, type OmegaInputPropsBase } from "./OmegaFormStuff"
42
+ import { useErrorLabel } from "./errors"
43
+ import { type FieldMeta } from "./meta/types"
47
44
  import OmegaInternalInput from "./OmegaInternalInput.vue"
48
- import { useErrorLabel } from "./useOmegaForm"
45
+ import { type OmegaInputPropsBase } from "./types"
49
46
 
50
47
  const props = defineProps<OmegaInputPropsBase<From, To, Name>>()
51
48
 
@@ -57,13 +54,10 @@ defineSlots<{
57
54
  default?: (props: any) => any
58
55
  }>()
59
56
 
60
- defineOptions({
61
- inheritAttrs: false
62
- })
57
+ defineOptions({ inheritAttrs: false })
63
58
 
64
59
  const attrs = useAttrs()
65
60
 
66
- // Compute the class to use based on inputClass prop
67
61
  const computedClass = computed(() => {
68
62
  if (props.inputClass === null) return undefined
69
63
  if (props.inputClass !== undefined) return props.inputClass
@@ -82,28 +76,5 @@ const meta = computed(() => {
82
76
  return props.form.meta[propsName.value]
83
77
  })
84
78
 
85
- // Key to force Field re-mount when meta type changes (for TaggedUnion support)
86
- const fieldKey = computed(() => {
87
- const m = meta.value
88
- if (!m) return propsName.value
89
- // Include type and key constraints in the key so Field re-mounts when validation rules change
90
- // Cast to any since not all FieldMeta variants have these properties
91
- const fm = m as any
92
- return `${propsName.value}-${fm.type}-${fm.minLength ?? ""}-${fm.maxLength ?? ""}-${fm.minimum ?? ""}-${
93
- fm.maximum ?? ""
94
- }`
95
- })
96
-
97
- // Call useIntl during setup to avoid issues when computed re-evaluates
98
- const { trans } = useIntl()
99
-
100
- const schema = computed(() => {
101
- if (!meta.value) {
102
- console.log(props.name, Object.keys(props.form.meta), props.form.meta)
103
- throw new Error("Meta is undefined")
104
- }
105
- return generateInputStandardSchemaFromFieldMeta(meta.value, trans)
106
- })
107
-
108
79
  const errori18n = useErrorLabel(props.form)
109
80
  </script>
@@ -1,7 +1,10 @@
1
1
  <template>
2
2
  <div
3
3
  class="omega-input"
4
- @focusout="$emit('blur', $event)"
4
+ @focusout="(e) => {
5
+ $emit('blur', e)
6
+ field.handleBlur()
7
+ }"
5
8
  @focusin="$emit('focus', $event)"
6
9
  >
7
10
  <component
@@ -204,8 +207,8 @@
204
207
  generic="From extends Record<PropertyKey, any>, Name extends DeepKeys<From>"
205
208
  >
206
209
  import { type DeepKeys } from "@tanstack/vue-form"
207
- import { getInputType } from "../OmegaForm/OmegaFormStuff"
208
210
  import type { VuetifyInputProps } from "./InputProps"
211
+ import { getInputType } from "./inputs"
209
212
 
210
213
  defineProps<VuetifyInputProps<From, Name>>()
211
214
 
@@ -1,6 +1,6 @@
1
1
  <template>
2
2
  <slot v-bind="{ ...inputProps.inputProps, field: inputProps.field, state: inputProps.state }">
3
- <div :class="$attrs.class as any">
3
+ <div :class="rootClass">
4
4
  <OmegaInputVuetify
5
5
  v-if="vuetified"
6
6
  v-bind="{ ...attrsWithoutClass, ...inputProps, class: props.inputClass }"
@@ -24,11 +24,13 @@
24
24
  lang="ts"
25
25
  generic="From extends Record<PropertyKey, any>, Name extends DeepKeys<From>"
26
26
  >
27
+ /* eslint-disable @typescript-eslint/no-explicit-any -- TanStack Form / Vue attrs interop */
27
28
  import { type DeepKeys, useStore } from "@tanstack/vue-form"
28
29
  import { computed, type ComputedRef, getCurrentInstance, useAttrs, useId, useSlots } from "vue"
29
30
  import type { InputProps, OmegaFieldInternalApi } from "./InputProps"
30
- import type { FieldValidators, MetaRecord, NestedKeyOf, TypeOverride } from "./OmegaFormStuff"
31
+ import type { MetaRecord, NestedKeyOf } from "./meta/types"
31
32
  import OmegaInputVuetify from "./OmegaInputVuetify.vue"
33
+ import type { FieldValidators, TypeOverride } from "./types"
32
34
 
33
35
  defineOptions({
34
36
  inheritAttrs: false
@@ -78,11 +80,14 @@ const attrsWithoutClass = computed(() => {
78
80
  return rest
79
81
  })
80
82
 
83
+ const rootClass = computed(() => attrs.class as any)
84
+
81
85
  const id = useId()
82
86
 
83
87
  const fieldApi = props.field
84
88
 
85
- const fieldState = useStore(fieldApi.store, (state) => state)
89
+ // Subscribed for side-effect: keeps component reactive to fieldApi.store changes
90
+ const _fieldState = useStore(fieldApi.store, (state) => state)
86
91
 
87
92
  // Get errors from form-level fieldMeta (persists across Field re-mounts)
88
93
  const formFieldMeta = useStore(fieldApi.form.store, (state) => state.fieldMeta)
@@ -126,6 +131,13 @@ const handleChange: OmegaFieldInternalApi<From, Name>["handleChange"] = (value)
126
131
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
127
132
  : null as any
128
133
  )
134
+ } else if (props.meta?.isOptionalKey) {
135
+ // `S.optionalKey` expects the key to be ABSENT from the submitted
136
+ // object, not present-with-undefined. Remove it from form state
137
+ // rather than setting it to `undefined`. Note: this is distinct
138
+ // from `required: false`, which may also just mean "empty string
139
+ // is valid" for unconstrained `S.String` fields.
140
+ props.field.form.deleteField(props.field.name)
129
141
  } else {
130
142
  // Keep the actual value (e.g., empty string for S.String fields)
131
143
  props.field.handleChange(value)
@@ -133,10 +145,6 @@ const handleChange: OmegaFieldInternalApi<From, Name>["handleChange"] = (value)
133
145
  } else {
134
146
  props.field.handleChange(value)
135
147
  }
136
-
137
- // whenever we change the field, regardless if we set it to null, we should reset onSubmit.
138
- // not sure why this is not the case in tanstack form.
139
- props.field.setMeta((m) => ({ ...m, errorMap: { ...m.errorMap, onSubmit: undefined } }))
140
148
  }
141
149
 
142
150
  // Note: Default value normalization (converting empty strings to null/undefined for nullable fields)
@@ -163,11 +171,13 @@ const inputProps: ComputedRef<InputProps<From, Name>> = computed(() => ({
163
171
  minLength: props.meta?.type === "string" && props.meta?.minLength,
164
172
  maxLength: props.meta?.type === "string" && props.meta?.maxLength,
165
173
  max: (props.meta?.type === "number")
166
- && (props.meta?.maximum
167
- ?? (typeof props.meta?.exclusiveMaximum === "number" && props.meta.exclusiveMaximum - 1)),
174
+ ? (props.meta?.maximum
175
+ ?? (typeof props.meta?.exclusiveMaximum === "number" ? props.meta.exclusiveMaximum - 1 : undefined))
176
+ : undefined,
168
177
  min: (props.meta?.type === "number")
169
- && (props.meta?.minimum
170
- ?? (typeof props.meta?.exclusiveMinimum === "number" && props.meta.exclusiveMinimum + 1)),
178
+ ? (props.meta?.minimum
179
+ ?? (typeof props.meta?.exclusiveMinimum === "number" ? props.meta.exclusiveMinimum + 1 : undefined))
180
+ : undefined,
171
181
  errorMessages: errors.value,
172
182
  error: !!errors.value.length,
173
183
  type: fieldType.value,
@@ -8,8 +8,8 @@
8
8
  import { type DeepKeys } from "@tanstack/vue-form"
9
9
  import { computed, provide, ref, watch } from "vue"
10
10
  import { type TaggedUnionOption } from "./InputProps"
11
- import { type FieldPath } from "./OmegaFormStuff"
12
11
  import OmegaTaggedUnionInternal from "./OmegaTaggedUnionInternal.vue"
12
+ import { type FieldPath } from "./types"
13
13
  import { type useOmegaForm } from "./useOmegaForm"
14
14
 
15
15
  const props = defineProps<{
@@ -30,6 +30,7 @@ watch(
30
30
  () => {
31
31
  const path = tagPath.value
32
32
  // Navigate to the nested value
33
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any -- traversing arbitrary nested values
33
34
  return path.split(".").reduce((acc: any, key) => acc?.[key], formValues.value) as string | null
34
35
  },
35
36
  (newTag) => {
@@ -34,7 +34,7 @@ watch(() => props.state, (newTag, oldTag) => {
34
34
  if (newTag !== oldTag) {
35
35
  props.form.reset(values.value)
36
36
  setTimeout(() => {
37
- props.field.validate("change")
37
+ void props.field.validate("change")
38
38
  }, 0)
39
39
  }
40
40
  }, { immediate: true })
@@ -30,7 +30,7 @@
30
30
  import { useStore } from "@tanstack/vue-form"
31
31
  import { usePreventClose } from "./blockDialog"
32
32
  import { getOmegaStore } from "./getOmegaStore"
33
- import { type DefaultTypeProps, type OmegaFormApi, type OmegaFormState } from "./OmegaFormStuff"
33
+ import { type DefaultTypeProps, type OmegaFormApi, type OmegaFormState } from "./types"
34
34
  import { type OmegaFormReturn } from "./useOmegaForm"
35
35
 
36
36
  type OmegaWrapperProps = {
@@ -1,5 +1,6 @@
1
1
  import mitt from "mitt"
2
2
  import { inject, type InjectionKey, provide, type Ref } from "vue"
3
+ import { useIntl } from "../../utils"
3
4
  import { onMountedWithCleanup } from "./onMountedWithCleanup"
4
5
 
5
6
  export type DialogClosing = { prevent?: boolean | Promise<boolean> }
@@ -19,11 +20,19 @@ export const usePreventClose = (mkIsDirty: () => Ref<boolean>) => {
19
20
  if (!bus) {
20
21
  return
21
22
  }
23
+ const { formatMessage, trans } = useIntl()
22
24
  const isDirty = mkIsDirty()
25
+ const defaultMessage = "There are unsaved changes. Are you sure you want to close?"
23
26
  onMountedWithCleanup(() => {
24
27
  const onDialogClosing = (evt: DialogClosing) => {
25
28
  if (isDirty.value) {
26
- if (!confirm("Es sind ungespeicherte Änderungen vorhanden. Wirklich schließen?")) {
29
+ // Mirror the guard pattern in errors.ts: a custom `useIntl` mock may
30
+ // only provide `trans`, so fall back through trans → defaultMessage.
31
+ const message = formatMessage
32
+ ? formatMessage({ id: "form.unsaved_changes_confirm", defaultMessage })
33
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any -- key may not be registered in the locale catalog
34
+ : trans?.("form.unsaved_changes_confirm" as any) ?? defaultMessage
35
+ if (!confirm(message)) {
27
36
  evt.prevent = true
28
37
  }
29
38
  }
@@ -46,11 +55,14 @@ export const useOnClose = (close: () => void) => {
46
55
  bus.emit("dialog-closing", evt)
47
56
  if (evt.prevent) {
48
57
  if (typeof evt.prevent === "object" && "then" in evt.prevent) {
49
- evt.prevent.then((r) => {
50
- if (r !== false) {
51
- close()
52
- }
53
- })
58
+ evt
59
+ .prevent
60
+ .then((r) => {
61
+ if (r) {
62
+ close()
63
+ }
64
+ })
65
+ .catch(console.error)
54
66
  }
55
67
  } else {
56
68
  close()
@@ -1,8 +1,9 @@
1
+ /* eslint-disable @typescript-eslint/no-explicit-any -- TanStack Form / Vue render-fn slot interop */
1
2
  import type { DeepKeys } from "@tanstack/vue-form"
2
3
  import { type Component, h } from "vue"
3
4
  import type { MergedInputProps } from "./InputProps"
4
- import { type DefaultTypeProps } from "./OmegaFormStuff"
5
5
  import OmegaInput from "./OmegaInput.vue"
6
+ import { type DefaultTypeProps } from "./types"
6
7
  import { useOmegaForm } from "./useOmegaForm"
7
8
 
8
9
  export const createUseFormWithCustomInput = <