@hozu/validator 0.6.0 → 0.8.0
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.
- package/dist/contracts/lock.d.ts +14 -17
- package/dist/contracts/lock.d.ts.map +1 -1
- package/dist/contracts/lock.js +52 -50
- package/dist/contracts/lock.js.map +1 -1
- package/dist/contracts/mechanical.d.ts +8 -2
- package/dist/contracts/mechanical.d.ts.map +1 -1
- package/dist/contracts/mechanical.js +98 -32
- package/dist/contracts/mechanical.js.map +1 -1
- package/dist/contracts/record.d.ts +45 -0
- package/dist/contracts/record.d.ts.map +1 -0
- package/dist/contracts/record.js +79 -0
- package/dist/contracts/record.js.map +1 -0
- package/dist/contracts/run.d.ts +2 -1
- package/dist/contracts/run.d.ts.map +1 -1
- package/dist/contracts/run.js +32 -4
- package/dist/contracts/run.js.map +1 -1
- package/dist/contracts/verify.d.ts +2 -2
- package/dist/contracts/verify.d.ts.map +1 -1
- package/dist/contracts/verify.js +186 -29
- package/dist/contracts/verify.js.map +1 -1
- package/dist/env.d.ts.map +1 -1
- package/dist/env.js +2 -0
- package/dist/env.js.map +1 -1
- package/dist/index.d.ts +8 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +15 -5
- package/dist/index.js.map +1 -1
- package/dist/resolve.d.ts +2 -2
- package/dist/resolve.d.ts.map +1 -1
- package/dist/resolve.js +1 -0
- package/dist/resolve.js.map +1 -1
- package/dist/rules/data.d.ts +2 -0
- package/dist/rules/data.d.ts.map +1 -1
- package/dist/rules/data.js +39 -4
- package/dist/rules/data.js.map +1 -1
- package/dist/rules/endpoints.d.ts +1 -0
- package/dist/rules/endpoints.d.ts.map +1 -1
- package/dist/rules/endpoints.js +140 -4
- package/dist/rules/endpoints.js.map +1 -1
- package/dist/rules/form-model.d.ts +31 -0
- package/dist/rules/form-model.d.ts.map +1 -0
- package/dist/rules/form-model.js +114 -0
- package/dist/rules/form-model.js.map +1 -0
- package/dist/rules/forms.d.ts +5 -0
- package/dist/rules/forms.d.ts.map +1 -1
- package/dist/rules/forms.js +141 -4
- package/dist/rules/forms.js.map +1 -1
- package/dist/rules/http.d.ts.map +1 -1
- package/dist/rules/http.js +14 -4
- package/dist/rules/http.js.map +1 -1
- package/dist/rules/i18n.d.ts.map +1 -1
- package/dist/rules/i18n.js +15 -0
- package/dist/rules/i18n.js.map +1 -1
- package/dist/rules/links.d.ts.map +1 -1
- package/dist/rules/links.js +61 -6
- package/dist/rules/links.js.map +1 -1
- package/dist/rules/literals.d.ts.map +1 -1
- package/dist/rules/literals.js +2 -0
- package/dist/rules/literals.js.map +1 -1
- package/dist/rules/pages.d.ts +4 -0
- package/dist/rules/pages.d.ts.map +1 -0
- package/dist/rules/pages.js +97 -0
- package/dist/rules/pages.js.map +1 -0
- package/dist/rules/paths.d.ts.map +1 -1
- package/dist/rules/paths.js +25 -0
- package/dist/rules/paths.js.map +1 -1
- package/dist/rules/routes.d.ts +2 -0
- package/dist/rules/routes.d.ts.map +1 -1
- package/dist/rules/routes.js +5 -3
- package/dist/rules/routes.js.map +1 -1
- package/dist/rules/seed.d.ts +3 -0
- package/dist/rules/seed.d.ts.map +1 -0
- package/dist/rules/seed.js +29 -0
- package/dist/rules/seed.js.map +1 -0
- package/dist/rules/text.d.ts.map +1 -1
- package/dist/rules/text.js +100 -42
- package/dist/rules/text.js.map +1 -1
- package/dist/schema.d.ts.map +1 -1
- package/dist/schema.js +3 -1
- package/dist/schema.js.map +1 -1
- package/dist/sites.d.ts +4 -2
- package/dist/sites.d.ts.map +1 -1
- package/dist/sites.js +7 -2
- package/dist/sites.js.map +1 -1
- package/package.json +3 -3
- package/dist/truthiness-rule.d.ts +0 -3
- package/dist/truthiness-rule.d.ts.map +0 -1
- package/dist/truthiness-rule.js +0 -21
- package/dist/truthiness-rule.js.map +0 -1
- package/dist/truthiness.d.ts +0 -8
- package/dist/truthiness.d.ts.map +0 -1
- package/dist/truthiness.js +0 -268
- package/dist/truthiness.js.map +0 -1
package/dist/rules/data.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { Ctx } from '../context.ts';
|
|
2
2
|
export declare function invalidations(ctx: Ctx): void;
|
|
3
3
|
export declare function sessions(ctx: Ctx): void;
|
|
4
|
+
export declare function queryFreshness(ctx: Ctx): void;
|
|
5
|
+
export declare function getEndpointWrites(ctx: Ctx): void;
|
|
4
6
|
//# sourceMappingURL=data.d.ts.map
|
package/dist/rules/data.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/rules/data.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../src/rules/data.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAGxC,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,QAyBrC;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,QAkBhC;AAID,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,QAgCtC;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,QAkBzC"}
|
package/dist/rules/data.js
CHANGED
|
@@ -7,11 +7,14 @@ export function invalidations(ctx) {
|
|
|
7
7
|
for (const t of q.tags)
|
|
8
8
|
carried.add(t.tag);
|
|
9
9
|
for (const f of Object.values(ctx.ir.features))
|
|
10
|
-
for (const [sym,
|
|
11
|
-
|
|
10
|
+
for (const [kind, sym, list] of [
|
|
11
|
+
...Object.entries(f.mutations).map(([sym, m]) => ['mutations', sym, m.invalidates]),
|
|
12
|
+
...Object.entries(f.endpoints).map(([sym, e]) => ['endpoints', sym, e.invalidates ?? []]),
|
|
13
|
+
])
|
|
14
|
+
list.forEach((t, i) => {
|
|
12
15
|
if (t.tag === '?' || carried.has(t.tag))
|
|
13
16
|
return;
|
|
14
|
-
const p = featurePointer(f.id,
|
|
17
|
+
const p = featurePointer(f.id, kind, sym, 'invalidates', i);
|
|
15
18
|
ctx.report('HZ019', f.id, p, `${f.id}.${sym} invalidates ${t.tag}, but no query carries that tag`, 'The invalidation has no effect; either a query is missing the tag or the mutation names the wrong one.', {
|
|
16
19
|
summary: 'Tag the affected query, or remove this invalidation',
|
|
17
20
|
snippet: null,
|
|
@@ -25,10 +28,42 @@ export function sessions(ctx) {
|
|
|
25
28
|
for (const f of Object.values(ctx.ir.features))
|
|
26
29
|
for (const [sym, q] of Object.entries(f.queries))
|
|
27
30
|
if (q.scope === 'user')
|
|
28
|
-
ctx.report('HZ020', f.id, featurePointer(f.id, 'queries', sym, 'scope'), `${f.id}.${sym} is user-scoped but the project declares no session`, 'User-scoped data
|
|
31
|
+
ctx.report('HZ020', f.id, featurePointer(f.id, 'queries', sym, 'scope'), `${f.id}.${sym} is user-scoped but the project declares no session`, 'User-scoped data is read per request for the identity the session declares; public resolvers never see it (ADR 0005 D2).', {
|
|
29
32
|
summary: "Declare project({ session: schema }), or decide the data is public and change scope to 'public'",
|
|
30
33
|
snippet: 'session: z.object({ userId: z.string() })',
|
|
31
34
|
patch: null,
|
|
32
35
|
});
|
|
33
36
|
}
|
|
37
|
+
const REQUEST = { kind: 'request' };
|
|
38
|
+
export function queryFreshness(ctx) {
|
|
39
|
+
for (const f of Object.values(ctx.ir.features))
|
|
40
|
+
for (const [sym, q] of Object.entries(f.queries)) {
|
|
41
|
+
const p = featurePointer(f.id, 'queries', sym, 'freshness');
|
|
42
|
+
const kind = q.freshness.kind;
|
|
43
|
+
if (q.scope === 'user' && kind !== 'request' && kind !== 'live')
|
|
44
|
+
ctx.report('HZ049', f.id, p, `${f.id}.${sym} is user-scoped with freshness ${kind === 'static' ? "'static'" : `{ ${kind}: … }`}`, "User data is never cached across requests: 'request' reads it once per request, 'live' also pushes updates.", {
|
|
45
|
+
summary: "Use freshness: 'request'",
|
|
46
|
+
snippet: "freshness: 'request',",
|
|
47
|
+
patch: [{ op: 'replace', path: resolveAt(p), value: REQUEST }],
|
|
48
|
+
});
|
|
49
|
+
else if (kind === 'live' && q.tags.length === 0)
|
|
50
|
+
ctx.report('HZ050', f.id, p, `${f.id}.${sym} is 'live' but carries no tags`, "A live query refreshes when one of its tags is invalidated; without tags it behaves like 'request' (principle 1).", {
|
|
51
|
+
summary: "Add the tags its writers invalidate, or use freshness: 'request'",
|
|
52
|
+
snippet: 'tags: () => [itemsTag()],',
|
|
53
|
+
patch: [{ op: 'replace', path: resolveAt(p), value: REQUEST }],
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
export function getEndpointWrites(ctx) {
|
|
58
|
+
for (const f of Object.values(ctx.ir.features))
|
|
59
|
+
for (const [sym, e] of Object.entries(f.endpoints))
|
|
60
|
+
if (e.method === 'GET' && e.invalidates?.length) {
|
|
61
|
+
const p = featurePointer(f.id, 'endpoints', sym, 'method');
|
|
62
|
+
ctx.report('HZ062', f.id, p, `GET endpoint ${f.id}.${sym} invalidates tags`, 'A GET request can be prefetched, prerendered or replayed, so a write behind it may run without intent. E-mail confirmation links are a legitimate exception.', {
|
|
63
|
+
summary: "Use method: 'POST', or keep GET on purpose (e-mail links)",
|
|
64
|
+
snippet: "method: 'POST',",
|
|
65
|
+
patch: [{ op: 'replace', path: resolveAt(p), value: 'POST' }],
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
}
|
|
34
69
|
//# sourceMappingURL=data.js.map
|
package/dist/rules/data.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/rules/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,MAAM,UAAU,aAAa,CAAC,GAAQ;IACpC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;IACjC,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC;QAC5C,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;YAAE,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI;gBAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IACtF,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC;QAC5C,KAAK,MAAM,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/rules/data.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoints.d.ts","sourceRoot":"","sources":["../../src/rules/endpoints.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"endpoints.d.ts","sourceRoot":"","sources":["../../src/rules/endpoints.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAOxC,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,QAgFjC;AAwBD,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,QAkJrC"}
|
package/dist/rules/endpoints.js
CHANGED
|
@@ -1,11 +1,15 @@
|
|
|
1
|
-
import { resolveAt, routePattern } from '@hozu/core/ir';
|
|
2
|
-
import {
|
|
1
|
+
import { at, localePath, resolveAt, routePattern, } from '@hozu/core/ir';
|
|
2
|
+
import { closest, didYouMean } from '../suggest.js';
|
|
3
|
+
import { featurePointer, walkView } from '../walk.js';
|
|
4
|
+
import { scalar } from './routes.js';
|
|
3
5
|
const STATIC = /^\/$|^(\/[A-Za-z0-9._~-]+)+$/;
|
|
4
6
|
export function endpoints(ctx) {
|
|
5
7
|
const taken = new Map();
|
|
8
|
+
const locales = ctx.ir.site?.locales ?? [null];
|
|
6
9
|
const pages = Object.keys(ctx.ir.pages)
|
|
7
10
|
.map((r) => ctx.ir.routes[r]?.path)
|
|
8
|
-
.filter((p) => p !== undefined)
|
|
11
|
+
.filter((p) => p !== undefined)
|
|
12
|
+
.flatMap((p) => locales.map((l) => localePath(ctx.ir, p, l)));
|
|
9
13
|
for (const f of Object.values(ctx.ir.features))
|
|
10
14
|
for (const [sym, e] of Object.entries(f.endpoints ?? {})) {
|
|
11
15
|
const ref = `${f.id}.${sym}`;
|
|
@@ -24,7 +28,17 @@ export function endpoints(ctx) {
|
|
|
24
28
|
return ['/api', ...parts].join('/');
|
|
25
29
|
};
|
|
26
30
|
if (e.method !== 'GET' && e.method !== 'POST')
|
|
27
|
-
ctx.report('HZ046', f.id, featurePointer(f.id, 'endpoints', sym, 'method'), `Endpoint ${ref} has method "${e.method}"`, 'Endpoints answer GET or POST.', {
|
|
31
|
+
ctx.report('HZ046', f.id, featurePointer(f.id, 'endpoints', sym, 'method'), `Endpoint ${ref} has method "${e.method}"`, 'Endpoints answer GET or POST.', {
|
|
32
|
+
summary: "Use method: 'POST' for a write, or 'GET' for a read",
|
|
33
|
+
snippet: "method: 'POST',",
|
|
34
|
+
patch: [
|
|
35
|
+
{
|
|
36
|
+
op: 'replace',
|
|
37
|
+
path: resolveAt(featurePointer(f.id, 'endpoints', sym, 'method')),
|
|
38
|
+
value: 'POST',
|
|
39
|
+
},
|
|
40
|
+
],
|
|
41
|
+
});
|
|
28
42
|
if (!STATIC.test(e.path))
|
|
29
43
|
report(`Endpoint path "${e.path}" of ${ref} is not a static path`, 'An endpoint path starts with / and has no params, query string or trailing slash; its input comes from the query string (GET) or the body (POST).', 'Use a path such as "/api/orders" and move variable parts into input', api(e.path.split('?')[0]));
|
|
30
44
|
else if (e.path === '/_hozu' || e.path.startsWith('/_hozu/'))
|
|
@@ -41,4 +55,126 @@ export function endpoints(ctx) {
|
|
|
41
55
|
taken.set(key, ref);
|
|
42
56
|
}
|
|
43
57
|
}
|
|
58
|
+
const CONTROLS = new Set(['input', 'select', 'textarea', 'button']);
|
|
59
|
+
function fieldNames(node, out) {
|
|
60
|
+
const kids = node.kind === 'el' || node.kind === 'when' || node.kind === 'widget'
|
|
61
|
+
? node.children
|
|
62
|
+
: node.kind === 'if'
|
|
63
|
+
? [...node.ifTrue, ...node.ifFalse]
|
|
64
|
+
: node.kind === 'each'
|
|
65
|
+
? [node.item]
|
|
66
|
+
: node.kind === 'query'
|
|
67
|
+
? [node.ready, ...(node.pending ? [node.pending] : []), ...Object.values(node.failed)]
|
|
68
|
+
: [];
|
|
69
|
+
if (node.kind === 'el' && CONTROLS.has(node.tag)) {
|
|
70
|
+
const name = node.attrs.name;
|
|
71
|
+
if (name && 'literal' in name && typeof name.literal === 'string')
|
|
72
|
+
out.add(name.literal);
|
|
73
|
+
}
|
|
74
|
+
for (const k of kids)
|
|
75
|
+
fieldNames(k, out);
|
|
76
|
+
}
|
|
77
|
+
const literalOf = (v) => (v && 'literal' in v ? v.literal : undefined);
|
|
78
|
+
export function endpointLinks(ctx) {
|
|
79
|
+
const { ir } = ctx;
|
|
80
|
+
const flagged = new Set();
|
|
81
|
+
for (const f of Object.values(ir.features)) {
|
|
82
|
+
for (const [sym, e] of Object.entries(f.endpoints)) {
|
|
83
|
+
const ref = `${f.id}.${sym}`;
|
|
84
|
+
const declared = Object.keys(e.errors ?? {});
|
|
85
|
+
const failed = e.failed ?? {};
|
|
86
|
+
const at0 = featurePointer(f.id, 'endpoints', sym, 'failed');
|
|
87
|
+
const missing = declared.filter((n) => !(n in failed));
|
|
88
|
+
if (missing.length)
|
|
89
|
+
ctx.report('HZ046', f.id, at0, `Endpoint ${ref} does not map ${missing.map((n) => `"${n}"`).join(', ')} to a status`, 'Every declared endpoint error answers the status failed names; there is no default status.', {
|
|
90
|
+
summary: `Add ${missing.join(', ')} to failed`,
|
|
91
|
+
snippet: `failed: { ${declared.map((n) => `${n}: ${failed[n] ?? '400 | 401 | 403 | 404 | 409 | 410 | 422 | 429'}`).join(', ')} }`,
|
|
92
|
+
patch: null,
|
|
93
|
+
});
|
|
94
|
+
for (const n of Object.keys(failed).filter((k) => !declared.includes(k)))
|
|
95
|
+
ctx.report('HZ046', f.id, featurePointer(f.id, 'endpoints', sym, 'failed', n), `Endpoint ${ref} maps "${n}", which it does not declare in errors`, 'failed maps the declared errors; Invalid (400) and Unexpected (500) belong to the framework.', {
|
|
96
|
+
summary: `Remove "${n}" from failed`,
|
|
97
|
+
snippet: null,
|
|
98
|
+
patch: [{ op: 'remove', path: resolveAt(featurePointer(f.id, 'endpoints', sym, 'failed', n)) }],
|
|
99
|
+
});
|
|
100
|
+
if (e.raw && e.method === 'GET')
|
|
101
|
+
ctx.report('HZ046', f.id, featurePointer(f.id, 'endpoints', sym, 'method'), `Endpoint ${ref} reads a raw body on GET`, "input: 'raw' is the request body, and a GET request has none.", {
|
|
102
|
+
summary: "Use method: 'POST'",
|
|
103
|
+
snippet: null,
|
|
104
|
+
patch: [
|
|
105
|
+
{
|
|
106
|
+
op: 'replace',
|
|
107
|
+
path: resolveAt(featurePointer(f.id, 'endpoints', sym, 'method')),
|
|
108
|
+
value: 'POST',
|
|
109
|
+
},
|
|
110
|
+
],
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
for (const [vid, view] of Object.entries(f.views))
|
|
114
|
+
walkView(ir, f, vid, view, ({ node, pointer }) => {
|
|
115
|
+
if (node.kind !== 'el')
|
|
116
|
+
return;
|
|
117
|
+
for (const attr of ['href', 'action', 'formaction']) {
|
|
118
|
+
const v = node.attrs[attr];
|
|
119
|
+
if (!v || !('endpoint' in v))
|
|
120
|
+
continue;
|
|
121
|
+
const [fid, sym] = [
|
|
122
|
+
v.endpoint.slice(0, v.endpoint.indexOf('.')),
|
|
123
|
+
v.endpoint.slice(v.endpoint.indexOf('.') + 1),
|
|
124
|
+
];
|
|
125
|
+
const e = ir.features[fid]?.endpoints[sym];
|
|
126
|
+
if (!e)
|
|
127
|
+
continue;
|
|
128
|
+
const p = at(pointer, 'attrs', attr);
|
|
129
|
+
const schema = ir.features[fid].schemas[e.input];
|
|
130
|
+
if (e.method === 'GET') {
|
|
131
|
+
const props = (schema?.properties ?? {});
|
|
132
|
+
const flat = schema?.type === 'object' && Object.values(props).every(scalar);
|
|
133
|
+
if (!flat && !flagged.has(v.endpoint)) {
|
|
134
|
+
flagged.add(v.endpoint);
|
|
135
|
+
ctx.report('HZ035', fid, featurePointer(fid, 'endpoints', sym, 'input'), `Endpoint ${v.endpoint} is linked with ui.link, but its input is not a flat object of scalars`, 'A GET link carries its input in the query string, a flat list of named values.', {
|
|
136
|
+
summary: 'Make every input property a string, number, boolean or enum',
|
|
137
|
+
snippet: null,
|
|
138
|
+
patch: null,
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
continue;
|
|
142
|
+
}
|
|
143
|
+
if (attr === 'href') {
|
|
144
|
+
ctx.report('HZ046', f.id, p, `A link targets the POST endpoint ${v.endpoint}`, 'Following a link sends GET; a POST endpoint is the action of a native form.', {
|
|
145
|
+
summary: 'Put ui.link(endpoint) in form.action, or declare the endpoint with method GET',
|
|
146
|
+
snippet: `ui.form({ method: 'post', action: ui.link(${sym}) }, [...])`,
|
|
147
|
+
patch: null,
|
|
148
|
+
});
|
|
149
|
+
continue;
|
|
150
|
+
}
|
|
151
|
+
const method = literalOf(node.attrs[attr === 'action' ? 'method' : 'formmethod']);
|
|
152
|
+
if (attr === 'action' && String(method ?? 'get').toLowerCase() !== 'post')
|
|
153
|
+
ctx.report('HZ046', f.id, at(pointer, 'attrs', 'method'), `The form posts to ${v.endpoint} but its method is ${method ?? 'GET (the default)'}`, 'A POST endpoint answers only POST.', {
|
|
154
|
+
summary: "Set method: 'post'",
|
|
155
|
+
snippet: null,
|
|
156
|
+
patch: [
|
|
157
|
+
{ op: 'add', path: resolveAt(at(pointer, 'attrs', 'method')), value: { literal: 'post' } },
|
|
158
|
+
],
|
|
159
|
+
});
|
|
160
|
+
if (attr !== 'action' || e.raw)
|
|
161
|
+
continue;
|
|
162
|
+
const known = Object.keys((schema?.properties ?? {}));
|
|
163
|
+
const names = new Set();
|
|
164
|
+
fieldNames(node, names);
|
|
165
|
+
for (const name of names) {
|
|
166
|
+
const guess = closest(name, known);
|
|
167
|
+
if (!known.includes(name))
|
|
168
|
+
ctx.report('HZ046', f.id, p, `The form posting to ${v.endpoint} has a field "${name}" its input does not declare.${didYouMean(guess)}`, 'A native form sends every named control; the endpoint input schema decides which ones exist.', {
|
|
169
|
+
summary: known.length
|
|
170
|
+
? `Rename the field to one of ${known.join(', ')}, or add "${name}" to the input`
|
|
171
|
+
: `Declare "${name}" in the endpoint input: it has no named fields${schema?.additionalProperties ? ' (a record input cannot be filled by name)' : ''}`,
|
|
172
|
+
snippet: guess ? `name: '${guess}'` : `input: z.object({ ${name}: z.string() }),`,
|
|
173
|
+
patch: null,
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
});
|
|
178
|
+
}
|
|
179
|
+
}
|
|
44
180
|
//# sourceMappingURL=endpoints.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoints.js","sourceRoot":"","sources":["../../src/rules/endpoints.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"endpoints.js","sourceRoot":"","sources":["../../src/rules/endpoints.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { type At, type ElementNode, type FeatureIR, type ValueExpr } from '@hozu/core/ir';
|
|
2
|
+
export interface Control {
|
|
3
|
+
node: ElementNode;
|
|
4
|
+
pointer: At;
|
|
5
|
+
chain: string[];
|
|
6
|
+
name: string | null;
|
|
7
|
+
submit: boolean;
|
|
8
|
+
radio: boolean;
|
|
9
|
+
}
|
|
10
|
+
export interface FormModel {
|
|
11
|
+
node: ElementNode;
|
|
12
|
+
pointer: At;
|
|
13
|
+
view: string;
|
|
14
|
+
chain: string[];
|
|
15
|
+
controls: Control[];
|
|
16
|
+
opaque: string | null;
|
|
17
|
+
}
|
|
18
|
+
export interface FormRead {
|
|
19
|
+
kind: 'form' | 'formAll';
|
|
20
|
+
name: string;
|
|
21
|
+
field: string[] | null;
|
|
22
|
+
pointer: At;
|
|
23
|
+
}
|
|
24
|
+
export declare const isSubmit: (el: ElementNode) => boolean;
|
|
25
|
+
/** Every form of a feature with the controls that belong to it: descendants and formRef controls. */
|
|
26
|
+
export declare function formsOf(feature: FeatureIR): FormModel[];
|
|
27
|
+
/** The ui.dom.form / formAll reads of a submit payload, with the payload field each one feeds. */
|
|
28
|
+
export declare function formReads(payload: ValueExpr, pointer: At): FormRead[];
|
|
29
|
+
/** Whether a name can carry several values in one form instance (radio and submit groups excluded). */
|
|
30
|
+
export declare function multiValued(form: FormModel, name: string): boolean;
|
|
31
|
+
//# sourceMappingURL=form-model.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"form-model.d.ts","sourceRoot":"","sources":["../../src/rules/form-model.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAAE,EAEP,KAAK,WAAW,EAChB,KAAK,SAAS,EAEd,KAAK,SAAS,EAEf,MAAM,eAAe,CAAA;AAGtB,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,WAAW,CAAA;IACjB,OAAO,EAAE,EAAE,CAAA;IACX,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,MAAM,EAAE,OAAO,CAAA;IACf,KAAK,EAAE,OAAO,CAAA;CACf;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,WAAW,CAAA;IACjB,OAAO,EAAE,EAAE,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IACtB,OAAO,EAAE,EAAE,CAAA;CACZ;AAOD,eAAO,MAAM,QAAQ,OAAQ,WAAW,YAE4C,CAAA;AAapF,qGAAqG;AACrG,wBAAgB,OAAO,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,EAAE,CA6DvD;AAED,kGAAkG;AAClG,wBAAgB,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,GAAG,QAAQ,EAAE,CAcrE;AAKD,uGAAuG;AACvG,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAMlE"}
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import { at, formRefOf, } from '@hozu/core/ir';
|
|
2
|
+
import { featurePointer } from '../walk.js';
|
|
3
|
+
const literal = (v) => v && 'literal' in v && typeof v.literal === 'string' ? v.literal : null;
|
|
4
|
+
const controlTags = new Set(['input', 'select', 'textarea', 'button', 'fieldset', 'output', 'object']);
|
|
5
|
+
export const isSubmit = (el) => (el.tag === 'button' && (literal(el.attrs.type) ?? 'submit') === 'submit') ||
|
|
6
|
+
(el.tag === 'input' && ['submit', 'image'].includes(literal(el.attrs.type) ?? ''));
|
|
7
|
+
const control = (node, pointer, chain) => ({
|
|
8
|
+
node,
|
|
9
|
+
pointer,
|
|
10
|
+
chain,
|
|
11
|
+
name: node.attrs.name === undefined ? null : literal(node.attrs.name),
|
|
12
|
+
submit: isSubmit(node),
|
|
13
|
+
radio: node.tag === 'input' && literal(node.attrs.type) === 'radio',
|
|
14
|
+
});
|
|
15
|
+
const models = new WeakMap();
|
|
16
|
+
/** Every form of a feature with the controls that belong to it: descendants and formRef controls. */
|
|
17
|
+
export function formsOf(feature) {
|
|
18
|
+
const hit = models.get(feature);
|
|
19
|
+
if (hit)
|
|
20
|
+
return hit;
|
|
21
|
+
const forms = [];
|
|
22
|
+
const external = new Map();
|
|
23
|
+
for (const [view, v] of Object.entries(feature.views)) {
|
|
24
|
+
const walk = (n, pointer, chain, form) => {
|
|
25
|
+
switch (n.kind) {
|
|
26
|
+
case 'el': {
|
|
27
|
+
const owner = formRefOf(n.attrs.form);
|
|
28
|
+
if (n.tag === 'form' && !form) {
|
|
29
|
+
const model = { node: n, pointer, view, chain, controls: [], opaque: null };
|
|
30
|
+
forms.push(model);
|
|
31
|
+
n.children.forEach((c, i) => walk(c, at(pointer, 'children', i), chain, model));
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
if (controlTags.has(n.tag)) {
|
|
35
|
+
const c = control(n, pointer, chain);
|
|
36
|
+
if (owner !== null)
|
|
37
|
+
external.set(owner, [...(external.get(owner) ?? []), c]);
|
|
38
|
+
else if (n.attrs.form === undefined && form)
|
|
39
|
+
form.controls.push(c);
|
|
40
|
+
if (form && c.name === null && n.attrs.name !== undefined)
|
|
41
|
+
form.opaque ??= 'a control with a computed name';
|
|
42
|
+
}
|
|
43
|
+
n.children.forEach((c, i) => walk(c, at(pointer, 'children', i), chain, form));
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
case 'widget':
|
|
47
|
+
if (form)
|
|
48
|
+
form.opaque ??= 'a widget';
|
|
49
|
+
n.children.forEach((c, i) => walk(c, at(pointer, 'children', i), chain, form));
|
|
50
|
+
return;
|
|
51
|
+
case 'html':
|
|
52
|
+
if (form)
|
|
53
|
+
form.opaque ??= 'ui.html';
|
|
54
|
+
return;
|
|
55
|
+
case 'embed':
|
|
56
|
+
if (form)
|
|
57
|
+
form.opaque ??= 'another view';
|
|
58
|
+
return;
|
|
59
|
+
case 'when':
|
|
60
|
+
n.children.forEach((c, i) => walk(c, at(pointer, 'children', i), chain, form));
|
|
61
|
+
return;
|
|
62
|
+
case 'if':
|
|
63
|
+
n.ifTrue.forEach((c, i) => walk(c, at(pointer, 'ifTrue', i), chain, form));
|
|
64
|
+
n.ifFalse.forEach((c, i) => walk(c, at(pointer, 'ifFalse', i), chain, form));
|
|
65
|
+
return;
|
|
66
|
+
case 'each':
|
|
67
|
+
walk(n.item, at(pointer, 'item'), [...chain, n.id], form);
|
|
68
|
+
return;
|
|
69
|
+
case 'query':
|
|
70
|
+
walk(n.ready, at(pointer, 'ready'), chain, form);
|
|
71
|
+
if (n.pending)
|
|
72
|
+
walk(n.pending, at(pointer, 'pending'), chain, form);
|
|
73
|
+
for (const [name, child] of Object.entries(n.failed))
|
|
74
|
+
walk(child, at(pointer, 'failed', name), chain, form);
|
|
75
|
+
return;
|
|
76
|
+
default:
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
walk(v.root, featurePointer(feature.id, 'views', view, 'root'), [], null);
|
|
81
|
+
}
|
|
82
|
+
for (const f of forms)
|
|
83
|
+
if (f.node.ref)
|
|
84
|
+
f.controls.push(...(external.get(f.node.ref.formRef) ?? []));
|
|
85
|
+
models.set(feature, forms);
|
|
86
|
+
return forms;
|
|
87
|
+
}
|
|
88
|
+
/** The ui.dom.form / formAll reads of a submit payload, with the payload field each one feeds. */
|
|
89
|
+
export function formReads(payload, pointer) {
|
|
90
|
+
const out = [];
|
|
91
|
+
const visit = (v, field, p) => {
|
|
92
|
+
if ('ref' in v) {
|
|
93
|
+
const [kind, name] = v.path;
|
|
94
|
+
if (v.ref === 'dom' && (kind === 'form' || kind === 'formAll') && name !== undefined)
|
|
95
|
+
out.push({ kind, name, field, pointer: p });
|
|
96
|
+
}
|
|
97
|
+
else if ('object' in v) {
|
|
98
|
+
for (const [k, x] of Object.entries(v.object))
|
|
99
|
+
visit(x, field ? [...field, k] : null, at(p, 'object', k));
|
|
100
|
+
}
|
|
101
|
+
else if ('fn' in v)
|
|
102
|
+
visit(v.arg, null, at(p, 'arg'));
|
|
103
|
+
};
|
|
104
|
+
visit(payload, [], pointer);
|
|
105
|
+
return out;
|
|
106
|
+
}
|
|
107
|
+
const multiple = (v) => v !== undefined && !('literal' in v && (v.literal === false || v.literal === null));
|
|
108
|
+
/** Whether a name can carry several values in one form instance (radio and submit groups excluded). */
|
|
109
|
+
export function multiValued(form, name) {
|
|
110
|
+
const named = form.controls.filter((c) => c.name === name && !c.radio && !c.submit);
|
|
111
|
+
return (named.length > 1 ||
|
|
112
|
+
named.some((c) => c.chain.length > form.chain.length || multiple(c.node.attrs.multiple)));
|
|
113
|
+
}
|
|
114
|
+
//# sourceMappingURL=form-model.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"form-model.js","sourceRoot":"","sources":["../../src/rules/form-model.ts"],"names":[],"mappings":"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"}
|
package/dist/rules/forms.d.ts
CHANGED
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
import { type JsonSchema, type ProjectIR } from '@hozu/core/ir';
|
|
1
2
|
import type { Ctx } from '../context.ts';
|
|
2
3
|
export declare function progressiveForms(ctx: Ctx): void;
|
|
4
|
+
export declare const isList: (s: JsonSchema | null) => boolean;
|
|
5
|
+
/** The IR pointer of a schema inside an event payload, when no effect shares that payload schema. */
|
|
6
|
+
export declare function schemaPointer(ir: ProjectIR, event: string, target: JsonSchema): string | null;
|
|
7
|
+
export declare function formFields(ctx: Ctx): void;
|
|
3
8
|
//# sourceMappingURL=forms.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forms.d.ts","sourceRoot":"","sources":["../../src/rules/forms.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"forms.d.ts","sourceRoot":"","sources":["../../src/rules/forms.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,UAAU,EAEf,KAAK,SAAS,EAGf,MAAM,eAAe,CAAA;AACtB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAaxC,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,QAqBxC;AAKD,eAAO,MAAM,MAAM,MAAO,UAAU,GAAG,IAAI,KAAG,OAO7C,CAAA;AAyCD,qGAAqG;AACrG,wBAAgB,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAM7F;AAqBD,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,QAoDlC"}
|