simpler-forms 0.1.0 → 0.2.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.
Files changed (51) hide show
  1. package/README.md +79 -0
  2. package/dist/src/decorators/mapping.d.ts +7 -1
  3. package/dist/src/decorators/mapping.js +103 -3
  4. package/dist/src/decorators/mapping.js.map +1 -1
  5. package/dist/src/decorators/meta.d.ts +3 -3
  6. package/dist/src/decorators/meta.js.map +1 -1
  7. package/dist/src/decorators/shared.d.ts +2 -2
  8. package/dist/src/decorators/shared.js.map +1 -1
  9. package/dist/src/emitter.js +7 -3
  10. package/dist/src/emitter.js.map +1 -1
  11. package/dist/src/emitters/overlay.d.ts +7 -2
  12. package/dist/src/emitters/overlay.js +27 -19
  13. package/dist/src/emitters/overlay.js.map +1 -1
  14. package/dist/src/index.d.ts +8 -3
  15. package/dist/src/index.js +5 -0
  16. package/dist/src/index.js.map +1 -1
  17. package/dist/src/lib.d.ts +104 -4
  18. package/dist/src/lib.js +43 -0
  19. package/dist/src/lib.js.map +1 -1
  20. package/dist/src/linter.js +6 -2
  21. package/dist/src/linter.js.map +1 -1
  22. package/dist/src/mapping-from.d.ts +2 -1
  23. package/dist/src/mapping-from.js +30 -10
  24. package/dist/src/mapping-from.js.map +1 -1
  25. package/dist/src/mapping.d.ts +7 -0
  26. package/dist/src/mapping.js.map +1 -1
  27. package/dist/src/model.d.ts +76 -8
  28. package/dist/src/model.js +43 -2
  29. package/dist/src/model.js.map +1 -1
  30. package/dist/src/public.d.ts +1 -1
  31. package/dist/src/public.js +1 -1
  32. package/dist/src/public.js.map +1 -1
  33. package/dist/src/validate.js +29 -1
  34. package/dist/src/validate.js.map +1 -1
  35. package/lib/mapping.tsp +102 -0
  36. package/lib/meta.tsp +3 -3
  37. package/lib/types.tsp +13 -0
  38. package/package.json +11 -11
  39. package/src/decorators/mapping.ts +152 -9
  40. package/src/decorators/meta.ts +7 -3
  41. package/src/decorators/shared.ts +6 -1
  42. package/src/emitter.ts +17 -3
  43. package/src/emitters/overlay.ts +40 -13
  44. package/src/index.ts +5 -0
  45. package/src/lib.ts +43 -0
  46. package/src/linter.ts +16 -7
  47. package/src/mapping-from.ts +33 -10
  48. package/src/mapping.ts +7 -0
  49. package/src/model.ts +119 -11
  50. package/src/public.ts +10 -0
  51. package/src/validate.ts +33 -1
package/README.md CHANGED
@@ -105,6 +105,11 @@ published under `question-bank/<id>/`, and a form that composes it refers to its
105
105
  - Its doc comment is its description; `@UI.label` and `@UI.helpText` are how it reads in a form.
106
106
  - A property whose type is a question takes the question's label unless it sets its own.
107
107
 
108
+ A question can be an object (a model), a single value (a scalar) or a code list (an enum). A
109
+ code list published as a question, such as a list of states, is written once, and the
110
+ questions that use it refer to it. An enum without `@Meta.question` is copied into each
111
+ schema that uses it, as before.
112
+
108
113
  ## Forms
109
114
 
110
115
  `@Meta.form` goes on the model holding the data an applicant submits, and publishes it under
@@ -197,6 +202,80 @@ model Root {
197
202
  }
198
203
  ```
199
204
 
205
+ A target can be filled from some of a list field's items. Name the field with `Mapping.Item`
206
+ for one item, counting from 0 (`-1` is the last), or `Mapping.Slice` for a range, its end
207
+ excluded. That fits a target that numbers its elements instead of repeating one:
208
+
209
+ ```tsp
210
+ model Root {
211
+ @Mapping.from(Mappings.Target.xml, Mapping.Item<Forms.Application.types, 0>) typeCode1: string;
212
+ @Mapping.from(Mappings.Target.xml, Mapping.Item<Forms.Application.types, 1>) typeCode2?: string;
213
+ @Mapping.from(Mappings.Target.xml, Mapping.Item<Forms.Application.sites, 0>) primarySite: Site;
214
+ @Mapping.from(Mappings.Target.xml, Mapping.Slice<Forms.Application.sites, 1>) otherSites?: Site[];
215
+ }
216
+ ```
217
+
218
+ ### Changing a value on its way through
219
+
220
+ A target property can change the value it reads. `@Mapping.transform` names a transformation
221
+ the target emitter's runtime implements. The program declares the ones it uses in an enum, as
222
+ it does its mappings, with the name the runtime implements each under as its value:
223
+
224
+ ```tsp
225
+ @Mapping.transforms(Transformation)
226
+ namespace Transforms {
227
+ enum Transformation { yesNo: "boolean_to_yes_no", truncate: "truncate_string" }
228
+ }
229
+
230
+ model Root {
231
+ @Mapping.from(Mappings.Target.xml, Forms.Application.title)
232
+ @Mapping.transform(Transforms.Transformation.truncate, #{ max_length: 60 })
233
+ title: string;
234
+ }
235
+ ```
236
+
237
+ A lookup can be spelled out instead, with `@Mapping.match`, so every emitter applies it the
238
+ same way. A value it doesn't list is written as the default: a fixed value, or a field.
239
+ Naming the field the property is filled from passes other values through unchanged:
240
+
241
+ ```tsp
242
+ model Root {
243
+ @Mapping.from(Mappings.Target.xml, Forms.Application.agrees)
244
+ @Mapping.match(#{ `true`: "Y: Yes", `false`: "N: No" })
245
+ agrees: string;
246
+
247
+ @Mapping.from(Mappings.Target.xml, Forms.Application.review)
248
+ @Mapping.match(#{ `b. … by the state`: "b. … by the State" }, Forms.Application.review)
249
+ stateReview: string;
250
+ }
251
+ ```
252
+
253
+ An empty value is left out of the target. `@Mapping.required` writes it anyway, as an empty
254
+ element, for one the target requires but the form may leave unanswered:
255
+
256
+ ```tsp
257
+ model Root {
258
+ @Mapping.from(Mappings.Target.xml, Forms.Application.dateReceived)
259
+ @Mapping.required
260
+ dateReceived: plainDate;
261
+ }
262
+ ```
263
+
264
+ `@Mapping.when` writes a target property only while a condition holds, so an answer the
265
+ form keeps after it stops applying, such as an explanation for an option the applicant has
266
+ since changed, isn't written. It compares the answer at a field with a value, using an
267
+ `Operator`: `equals`, `notEquals`, `in` (a list of values), `contains` (for a list answer) or
268
+ `exists` (no value). Every condition on a property must hold:
269
+
270
+ ```tsp
271
+ model Root {
272
+ @Mapping.from(Mappings.Target.xml, Forms.Application.revisionExplanation)
273
+ @Mapping.when(Forms.Application.applicationType, Operator.equals, "Revision")
274
+ @Mapping.when(Forms.Application.revisionCodes, Operator.contains, "E")
275
+ revisionOtherExplanation?: string;
276
+ }
277
+ ```
278
+
200
279
  The same links can be declared from the form's side with `@Mapping.to`, plus `@Mapping.path`
201
280
  for nested paths. Every link is checked as it resolves, against the target's type and
202
281
  cardinality.
@@ -1,6 +1,8 @@
1
- import type { Enum, EnumMember, Model, ModelProperty, Namespace } from "@typespec/compiler";
1
+ import { type Enum, type EnumMember, type Model, type ModelProperty, type Namespace } from "@typespec/compiler";
2
2
  import { type Ctx } from "./shared.js";
3
3
  export declare const $targets: (ctx: Ctx, target: Namespace, targets: Enum) => void;
4
+ export declare const $transforms: (ctx: Ctx, target: Namespace, transforms: Enum) => void;
5
+ export declare const $transform: (ctx: Ctx, target: ModelProperty, transform: EnumMember, params?: Record<string, unknown>) => void;
4
6
  /**
5
7
  * Accumulated rather than overwritten: one model or property carries a link per mapping.
6
8
  * Two links for the same mapping are reported by `$onValidate`, not here, so the check sees
@@ -8,4 +10,8 @@ export declare const $targets: (ctx: Ctx, target: Namespace, targets: Enum) => v
8
10
  */
9
11
  export declare const $to: (ctx: Ctx, target: Model | ModelProperty, mapping: EnumMember, mappedTo: Model | ModelProperty) => void;
10
12
  export declare const $path: (ctx: Ctx, target: Model, mapping: EnumMember, sourcePath: string, mappedTo: ModelProperty) => void;
13
+ export declare const $match: (ctx: Ctx, target: ModelProperty, cases: Record<string, string | number | boolean>, fallback?: ModelProperty | string | number | boolean) => void;
14
+ export declare const $required: (ctx: Ctx, target: ModelProperty) => Set<import("@typespec/compiler").Type>;
15
+ export declare const $when: (ctx: Ctx, target: ModelProperty, source: ModelProperty | Model, operator: unknown, value?: unknown) => void;
16
+ /** A source named with `Mapping.Item` or `Mapping.Slice` is stored as its field and selection. */
11
17
  export declare const $from: (ctx: Ctx, target: Model | ModelProperty, mapping: EnumMember, source: Model | ModelProperty) => void;
@@ -1,6 +1,12 @@
1
- import { stateKeys } from "../lib.js";
2
- import { push, set } from "./shared.js";
1
+ import { getNamespaceFullName, } from "@typespec/compiler";
2
+ import { reportDiagnostic, stateKeys } from "../lib.js";
3
+ import { enumName, push, set } from "./shared.js";
3
4
  export const $targets = (ctx, target, targets) => set(ctx, stateKeys.mappingTargets, target, targets);
5
+ export const $transforms = (ctx, target, transforms) => set(ctx, stateKeys.mappingTransformSets, target, transforms);
6
+ export const $transform = (ctx, target, transform, params) => set(ctx, stateKeys.mappingTransform, target, {
7
+ member: transform,
8
+ ...(params ? { params } : {}),
9
+ });
4
10
  /**
5
11
  * Accumulated rather than overwritten: one model or property carries a link per mapping.
6
12
  * Two links for the same mapping are reported by `$onValidate`, not here, so the check sees
@@ -15,8 +21,102 @@ export const $path = (ctx, target, mapping, sourcePath, mappedTo) => push(ctx, s
15
21
  sourcePath,
16
22
  mappedTo,
17
23
  });
24
+ export const $match = (ctx, target, cases, fallback) => set(ctx, stateKeys.mappingMatch, target, {
25
+ cases: Object.fromEntries(Object.entries(cases).map(([key, value]) => [key, literal(value)])),
26
+ ...(fallback === undefined
27
+ ? {}
28
+ : {
29
+ default: isField(fallback)
30
+ ? { field: fallback }
31
+ : { value: literal(fallback) },
32
+ }),
33
+ });
34
+ /** A `valueof numeric` arrives as TypeSpec's arbitrary-precision `Numeric`: as a JS number. */
35
+ const literal = (value) => typeof value === "object" && value !== null && "asNumber" in value
36
+ ? (value.asNumber() ?? Number.NaN)
37
+ : value;
38
+ export const $required = (ctx, target) => ctx.program.stateSet(stateKeys.mappingRequired).add(target);
39
+ export const $when = (ctx, target, source, operator, value) => {
40
+ const name = enumName(operator);
41
+ const picked = source.kind === "ModelProperty" ? { source } : selection(source);
42
+ if (!picked) {
43
+ reportDiagnostic(ctx.program, {
44
+ code: "mapping-when-source",
45
+ target: ctx.getArgumentTarget(0) ?? target,
46
+ format: { name: target.name },
47
+ });
48
+ return;
49
+ }
50
+ const given = value !== undefined;
51
+ const fail = name === "exists"
52
+ ? given && "exists"
53
+ : name === "in"
54
+ ? !Array.isArray(value) && "in"
55
+ : !given && "default";
56
+ if (fail) {
57
+ reportDiagnostic(ctx.program, {
58
+ code: "mapping-when-value",
59
+ messageId: fail,
60
+ target: ctx.getArgumentTarget(given ? 2 : 1) ?? target,
61
+ format: { name: target.name, source: picked.source.name, operator: name },
62
+ });
63
+ return;
64
+ }
65
+ push(ctx, stateKeys.mappingWhen, target, {
66
+ ...picked,
67
+ operator: name,
68
+ ...(given ? { value: plainValue(value) } : {}),
69
+ });
70
+ };
71
+ /** A condition's value as plain JSON: lists entry by entry, numbers as JS numbers, enum members as their value. */
72
+ function plainValue(value) {
73
+ if (Array.isArray(value))
74
+ return value.map(plainValue);
75
+ if (typeof value === "object" && value !== null) {
76
+ const v = value;
77
+ if (v.kind === "EnumMember")
78
+ return v.value ?? v.name;
79
+ if ("asNumber" in value)
80
+ return literal(value);
81
+ }
82
+ return value;
83
+ }
84
+ const isField = (value) => typeof value === "object" &&
85
+ value !== null &&
86
+ value.kind === "ModelProperty";
87
+ /** A source named with `Mapping.Item` or `Mapping.Slice` is stored as its field and selection. */
18
88
  export const $from = (ctx, target, mapping, source) => push(ctx, stateKeys.mappedFrom, target, {
19
89
  mapping,
20
- source,
90
+ ...(selection(source) ?? { source }),
21
91
  });
92
+ /** The field and selection `Mapping.Item<…>` or `Mapping.Slice<…>` names, or undefined for any other source. */
93
+ function selection(source) {
94
+ if (source.kind !== "Model" || !source.templateMapper || !source.namespace)
95
+ return undefined;
96
+ if (getNamespaceFullName(source.namespace) !== "SimplerForms.Mapping")
97
+ return undefined;
98
+ const [field, ...bounds] = source.templateMapper.args;
99
+ if (field?.entityKind !== "Type" || field.kind !== "ModelProperty")
100
+ return undefined;
101
+ const [first, second] = bounds.map(numberOf);
102
+ if (source.name === "Item" && first !== undefined)
103
+ return { source: field, select: { index: first } };
104
+ if (source.name === "Slice" && first !== undefined)
105
+ return {
106
+ source: field,
107
+ select: second === undefined
108
+ ? { start: first }
109
+ : { start: first, stop: second },
110
+ };
111
+ return undefined;
112
+ }
113
+ /** The number a template's `valueof int32` argument holds, or undefined (as for `null`). */
114
+ function numberOf(arg) {
115
+ const entity = arg;
116
+ if (entity.entityKind === "Value" && entity.valueKind === "NumericValue")
117
+ return entity.value?.asNumber() ?? undefined;
118
+ if (entity.type?.kind === "Number")
119
+ return entity.type.value;
120
+ return undefined;
121
+ }
22
122
  //# sourceMappingURL=mapping.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"mapping.js","sourceRoot":"","sources":["../../../src/decorators/mapping.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAMtC,OAAO,EAAY,IAAI,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAQ,EAAE,MAAiB,EAAE,OAAa,EAAE,EAAE,CACrE,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAEtD;;;;GAIG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CACjB,GAAQ,EACR,MAA6B,EAC7B,OAAmB,EACnB,QAA+B,EAC/B,EAAE,CACF,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE;IACpC,OAAO;IACP,QAAQ;CACa,CAAC,CAAC;AAE3B,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,GAAQ,EACR,MAAa,EACb,OAAmB,EACnB,UAAkB,EAClB,QAAuB,EACvB,EAAE,CACF,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE;IACxC,OAAO;IACP,UAAU;IACV,QAAQ;CACiB,CAAC,CAAC;AAE/B,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,GAAQ,EACR,MAA6B,EAC7B,OAAmB,EACnB,MAA6B,EAC7B,EAAE,CACF,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE;IACtC,OAAO;IACP,MAAM;CACmB,CAAC,CAAC"}
1
+ {"version":3,"file":"mapping.js","sourceRoot":"","sources":["../../../src/decorators/mapping.ts"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@ import { type Ctx } from "./shared.js";
8
8
  * The entity is recorded as its name now and as the member itself for `$onValidate`, which
9
9
  * checks it against the declared sets once every `@Meta.entities` has run.
10
10
  */
11
- export declare const $question: (ctx: Ctx, target: Model | Scalar, meta: unknown) => void;
11
+ export declare const $question: (ctx: Ctx, target: Model | Scalar | Enum, meta: unknown) => void;
12
12
  /** `@Meta.tags`: the tags the program catalogues its questions by. */
13
13
  export declare const $tags: (ctx: Ctx, target: Namespace, tags: Enum) => void;
14
14
  /** `@Meta.entities`: the entities the program's questions are asked about. */
@@ -23,10 +23,10 @@ export declare const $form: (ctx: Ctx, target: Model, meta: unknown) => void;
23
23
  * constrained scalar with no question identity, so it stays a decorator of its own
24
24
  * rather than a field of the question meta.
25
25
  */
26
- export declare const $tag: (ctx: Ctx, target: Model | Scalar, ...tags: EnumMember[]) => void;
26
+ export declare const $tag: (ctx: Ctx, target: Model | Scalar | Enum, ...tags: EnumMember[]) => void;
27
27
  /**
28
28
  * `@Meta.role`: why a field exists in a response -- applicant input, calculated output,
29
29
  * a value a platform supplies, a technical field, an attestation, or static content.
30
30
  * Resolved by inheritance at emission, so a form can override a shared question's role.
31
31
  */
32
- export declare const $role: (ctx: Ctx, target: Model | Scalar | ModelProperty, role: unknown) => void;
32
+ export declare const $role: (ctx: Ctx, target: Model | Scalar | Enum | ModelProperty, role: unknown) => void;
@@ -1 +1 @@
1
- {"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/decorators/meta.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"meta.js","sourceRoot":"","sources":["../../../src/decorators/meta.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import type { DecoratorContext, Model, ModelProperty, Scalar, Type } from "@typespec/compiler";
1
+ import type { DecoratorContext, Enum, Model, ModelProperty, Scalar, Type } from "@typespec/compiler";
2
2
  export type Ctx = DecoratorContext;
3
3
  /**
4
4
  * `valueof <Model>` arrives as a TypeSpec ObjectValue with parent back-references,
@@ -20,7 +20,7 @@ export declare const blockSchemaRef: (id: string) => string;
20
20
  * Delegate to the stock JSON Schema library, which resolves this relative id
21
21
  * against the namespace base and uses it for both `$id` and every `$ref` target.
22
22
  */
23
- export declare function publishAs(ctx: Ctx, target: Model | Scalar, id: string): void;
23
+ export declare function publishAs(ctx: Ctx, target: Model | Scalar | Enum, id: string): void;
24
24
  /** Peel one layer of TypeSpec value wrapping. */
25
25
  export declare function unwrap(v: unknown): unknown;
26
26
  /** An enum member argument arrives as the member; take its name. */
@@ -1 +1 @@
1
- {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/decorators/shared.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EAAE,GAAG,IAAI,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAI3D;;;GAGG;AACH,MAAM,UAAU,KAAK,CAAC,GAAqB,EAAE,KAAc;IACzD,MAAM,CAAC,GAAG,KAAc,CAAC;IACzB,IACE,CAAC;QACD,OAAO,CAAC,KAAK,QAAQ;QACrB,YAAY,IAAI,CAAC;QAChB,CAAS,CAAC,UAAU,KAAK,OAAO,EACjC,CAAC;QACD,OAAO,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,EAAG,CAAS,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,GAAQ,EACR,KAAa;IAEb,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAC5C,IAAI,CAAC,MAAM,IAAK,MAAc,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC;IAC5D,MAAM,IAAI,GAAG,MAET,CAAC;IACL,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC1D,OAAO,QAAQ,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;AAClE,CAAC;AAED,4CAA4C;AAC5C,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAE,GAAW,EAAE,MAAY,EAAE,KAAc;IACrE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAC/C,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,IAAI,CAClB,GAAQ,EACR,GAAW,EACX,MAAY,EACZ,KAAc;IAEd,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAA2B,IAAI,EAAE,CAAC;IAClE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC5B,CAAC;AAED,6EAA6E;AAE7E;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC;AAElE;;;GAGG;AACH,MAAM,UAAU,SAAS,CAAC,GAAQ,EAAE,MAAsB,EAAE,EAAU;IACpE,aAAa,CAAC,GAAU,EAAE,MAAa,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED,6EAA6E;AAE7E,iDAAiD;AACjD,MAAM,UAAU,MAAM,CAAC,CAAU;IAC/B,MAAM,CAAC,GAAG,CAAQ,CAAC;IACnB,IACE,CAAC;QACD,OAAO,CAAC,KAAK,QAAQ;QACrB,YAAY,IAAI,CAAC;QACjB,CAAC,CAAC,UAAU,KAAK,OAAO;QACxB,OAAO,IAAI,CAAC,EACZ,CAAC;QACD,OAAO,CAAC,CAAC,KAAK,CAAC;IACjB,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC;AAED,oEAAoE;AACpE,MAAM,UAAU,QAAQ,CAAC,CAAU;IACjC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACpB,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,MAAM,IAAK,CAAS;QACpD,OAAO,MAAM,CAAE,CAAS,CAAC,IAAI,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,CAAU;IAChC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAQ,CAAC;IAC3B,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAC/C,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,CAAC,CAAC;IACpC,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE,CAAC;QAC5D,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAoB,CAAC;IAChD,CAAC;IACD,IAAI,OAAO,IAAI,CAAC;QAAE,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC1C,IAAI,MAAM,IAAI,CAAC;QAAE,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACvC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC;AAED,6EAA6E;AAC7E,uEAAuE;AACvE,mEAAmE;AAEnE;;;GAGG;AACH,MAAM,UAAU,SAAS,CAAC,MAAqB,EAAE,MAAe;IAC9D,MAAM,CAAC,GAAG,MAAM,CAAC,IAAW,CAAC;IAC7B,OAAO;QACL,QAAQ,EAAE,QAAiB;QAC3B,UAAU,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;QACzB,aAAa,EAAE,CAAC,EAAE,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO;QACjD,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC;KACvB,CAAC;AACJ,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,gBAAgB,CAC9B,MAAqB,EACrB,MAAe,EACf,EAAE,cAAc,GAAG,KAAK,KAAmC,EAAE;IAE7D,OAAO;QACL,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;QAC5B,QAAQ,EAAE,WAAoB;QAC9B,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,GAAQ,EACR,MAAqB,EACrB,MAAqB,EACrB,OAAe;IAEf,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,MAAM,cAAc,GAAG,wBAAwB,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC;IAClE,IACE,cAAc,CAAC,KAAK;QACpB,MAAM,CAAC,KAAK;QACZ,cAAc,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,EACrC,CAAC;QACD,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;YAC5B,IAAI,EAAE,8BAA8B;YACpC,MAAM;YACN,MAAM,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;SAC7D,CAAC,CAAC;QACH,KAAK,GAAG,KAAK,CAAC;IAChB,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QACnE,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;YAC5B,IAAI,EAAE,kCAAkC;YACxC,MAAM;YACN,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;SAChC,CAAC,CAAC;QACH,KAAK,GAAG,KAAK,CAAC;IAChB,CAAC;IACD,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACnD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,iBAAiB,IAAI,CAAC,EAAE,CAAC;QACnE,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;YAC5B,IAAI,EAAE,iCAAiC;YACvC,MAAM;YACN,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,iBAAiB,CAAC,EAAE;SAC/C,CAAC,CAAC;QACH,KAAK,GAAG,KAAK,CAAC;IAChB,CAAC;IACD,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,MAAM,GAAG;QACb,QAAQ,EAAE,cAAuB;QACjC,UAAU,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;QACzB,aAAa,EAAE,IAAI;QACnB,OAAO,EAAE,iBAAiB;KAC3B,CAAC;IACF,4BAA4B,CAAC,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;IAC3D,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/decorators/shared.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ import { allBlocks } from "./model.js";
4
4
  import { resolveForms } from "./forms.js";
5
5
  import { reportDiagnostic } from "./lib.js";
6
6
  import { blockSchemaRef } from "./decorators/index.js";
7
- import { emitModelOverlay, emitSchemaOverlay } from "./emitters/overlay.js";
7
+ import { emitModelOverlay, emitSchemaOverlay, } from "./emitters/overlay.js";
8
8
  import { emitBlockUi } from "./emitters/block-ui.js";
9
9
  import { emitLayoutUi } from "./emitters/layout-ui.js";
10
10
  import { resolveLayout } from "./layout.js";
@@ -50,6 +50,9 @@ export async function $onEmit(context) {
50
50
  const blocks = allBlocks(program);
51
51
  const { forms } = resolveForms(program);
52
52
  const modelsByName = indexModels(program.getGlobalNamespaceType());
53
+ // A local model with a staged schema of its own is inlined into `$defs` with its overlay
54
+ // (see `resolveRefs`), so the overlays of models that use it don't repeat it.
55
+ const ownsDefinition = (model) => modelsByName.get(model.name) === model && byFile.has(`${model.name}.json`);
53
56
  const refToDir = new Map(blocks.map((b) => [
54
57
  blockSchemaRef(b.id),
55
58
  b.kind === "question" ? `question-bank/${b.id}` : `forms/${b.id}`,
@@ -83,11 +86,12 @@ export async function $onEmit(context) {
83
86
  from: dir,
84
87
  program,
85
88
  modelsByName,
89
+ ownsDefinition,
86
90
  });
87
91
  if (Object.keys(defs).length)
88
92
  schema = { ...schema, $defs: defs };
89
93
  // 4. Fold in the conditional requiredness only we can know about.
90
- const overlay = emitSchemaOverlay(program, block);
94
+ const overlay = emitSchemaOverlay(program, block, ownsDefinition);
91
95
  if (overlay)
92
96
  schema = mergeSchema(schema, overlay);
93
97
  const index = emitBlockIndex(program, block);
@@ -174,7 +178,7 @@ function resolveRefs(node, ctx, seen = new Set()) {
174
178
  seen.add(name);
175
179
  const { $schema, $id, ...body } = target;
176
180
  const overlay = ctx.modelsByName.has(name)
177
- ? emitModelOverlay(ctx.program, ctx.modelsByName.get(name))
181
+ ? emitModelOverlay(ctx.program, ctx.modelsByName.get(name), ctx.ownsDefinition)
178
182
  : undefined;
179
183
  ctx.defs[name] = resolveRefs(overlay ? mergeSchema(body, overlay) : body, ctx, seen);
180
184
  }
@@ -1 +1 @@
1
- {"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../src/emitter.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,10 @@
1
1
  import type { Model, Program } from "@typespec/compiler";
2
2
  import { Block } from "../model.js";
3
+ /**
4
+ * Whether a model's schema has a definition of its own in `$defs`, written with its own
5
+ * overlay, so what it requires shouldn't be repeated beside each `$ref` to it.
6
+ */
7
+ export type OwnsDefinition = (model: Model) => boolean;
3
8
  /**
4
9
  * The parts of a block's JSON Schema that `@typespec/json-schema` cannot produce: what the
5
10
  * `@Validation.*` decorators require, and the help text, read-only status and choice
@@ -8,6 +13,6 @@ import { Block } from "../model.js";
8
13
  * Everything else -- types, constraints, enums, arrays, `required`, `$ref` composition,
9
14
  * `extends` as `allOf` -- comes from the stock emitter. The build merges this over it.
10
15
  */
11
- export declare function emitSchemaOverlay(program: Program, block: Block): Record<string, unknown> | undefined;
16
+ export declare function emitSchemaOverlay(program: Program, block: Block, ownsDefinition?: OwnsDefinition): Record<string, unknown> | undefined;
12
17
  /** Decorator-derived JSON Schema for an unpublished model embedded under `$defs`. */
13
- export declare function emitModelOverlay(program: Program, model: Model): Record<string, unknown> | undefined;
18
+ export declare function emitModelOverlay(program: Program, model: Model, ownsDefinition?: OwnsDefinition): Record<string, unknown> | undefined;
@@ -7,7 +7,7 @@ import { cardinalityAtLeastOnePathWhenPresent, cardinalityPositiveDecimalStringW
7
7
  * Everything else -- types, constraints, enums, arrays, `required`, `$ref` composition,
8
8
  * `extends` as `allOf` -- comes from the stock emitter. The build merges this over it.
9
9
  */
10
- export function emitSchemaOverlay(program, block) {
10
+ export function emitSchemaOverlay(program, block, ownsDefinition = () => false) {
11
11
  if (block.model.kind !== "Model")
12
12
  return undefined;
13
13
  const model = block.model;
@@ -15,9 +15,9 @@ export function emitSchemaOverlay(program, block) {
15
15
  const readOnly = readOnlyAnnotations(program, model);
16
16
  const helpText = helpTextAnnotations(program, model);
17
17
  const constraints = constraintAnnotations(program, model);
18
- const cardinality = cardinalityAnnotations(program, model);
18
+ const cardinality = cardinalityAnnotations(program, model, ownsDefinition);
19
19
  const encodedCheckboxes = encodedCheckboxAnnotations(program, model);
20
- const exclusiveValues = exclusiveValueAnnotations(program, model);
20
+ const exclusiveValues = exclusiveValueAnnotations(program, model, ownsDefinition);
21
21
  const alternatives = atLeastOneAnnotations(program, model);
22
22
  const parts = [
23
23
  conditionals,
@@ -34,15 +34,15 @@ export function emitSchemaOverlay(program, block) {
34
34
  return parts.reduce(merge, {});
35
35
  }
36
36
  /** Decorator-derived JSON Schema for an unpublished model embedded under `$defs`. */
37
- export function emitModelOverlay(program, model) {
37
+ export function emitModelOverlay(program, model, ownsDefinition = () => false) {
38
38
  const parts = [
39
39
  conditionalValidation(program, [...model.properties.values()]),
40
40
  readOnlyAnnotations(program, model),
41
41
  helpTextAnnotations(program, model),
42
42
  constraintAnnotations(program, model),
43
- cardinalityAnnotations(program, model),
43
+ cardinalityAnnotations(program, model, ownsDefinition),
44
44
  encodedCheckboxAnnotations(program, model),
45
- exclusiveValueAnnotations(program, model),
45
+ exclusiveValueAnnotations(program, model, ownsDefinition),
46
46
  atLeastOneAnnotations(program, model),
47
47
  ].filter(Boolean);
48
48
  return parts.length ? parts.reduce(merge, {}) : undefined;
@@ -52,7 +52,7 @@ export function emitModelOverlay(program, model) {
52
52
  * Consumers may use the metadata for immediate interaction; every validator still rejects a
53
53
  * response where one of the named values appears beside another selection.
54
54
  */
55
- function exclusiveValueAnnotations(program, model, seen = new Set()) {
55
+ function exclusiveValueAnnotations(program, model, ownsDefinition, seen = new Set()) {
56
56
  if (seen.has(model))
57
57
  return undefined;
58
58
  seen.add(model);
@@ -70,11 +70,13 @@ function exclusiveValueAnnotations(program, model, seen = new Set()) {
70
70
  };
71
71
  }
72
72
  const child = childModel(property.type);
73
- // Published questions own intrinsic exclusivity in their own schema. Do not repeat the
74
- // same constraint beside each form occurrence's $ref; only local unpublished capture
75
- // models need recursive projection.
76
- if (child && !readBlock(program, child.model)) {
77
- const nested = exclusiveValueAnnotations(program, child.model, new Set(seen));
73
+ // Published questions, and local models with a `$defs` definition of their own, carry
74
+ // their exclusivity in that schema. Don't repeat it beside each `$ref`; only a model
75
+ // inlined where it's used needs it projected.
76
+ if (child &&
77
+ !readBlock(program, child.model) &&
78
+ !ownsDefinition(child.model)) {
79
+ const nested = exclusiveValueAnnotations(program, child.model, ownsDefinition, new Set(seen));
78
80
  if (nested)
79
81
  patch = merge(patch, child.repeated ? { items: nested } : nested);
80
82
  }
@@ -101,7 +103,7 @@ function atLeastOneAnnotations(program, model) {
101
103
  * blocks therefore carry their least-restrictive source-backed cardinality, and a form that
102
104
  * requires more narrows that occurrence with this overlay.
103
105
  */
104
- function cardinalityAnnotations(program, model, seen = new Set()) {
106
+ function cardinalityAnnotations(program, model, ownsDefinition, seen = new Set()) {
105
107
  if (seen.has(model))
106
108
  return undefined;
107
109
  seen.add(model);
@@ -116,12 +118,18 @@ function cardinalityAnnotations(program, model, seen = new Set()) {
116
118
  patch = merge(patch, conditionalAtLeastOnePathPatch(cardinalityAtLeastOnePathWhenPresent(program, property)));
117
119
  patch = merge(patch, positiveDecimalStringPathPatch(cardinalityRequiredPathWhenPositiveDecimalString(program, property), cardinalityPositiveDecimalStringWhenPathPresent(program, property)));
118
120
  const child = childModel(property.type);
119
- // A published question owns its intrinsic cardinality in its own schema. Crossing
120
- // that reference boundary would copy the same constraints beside every occurrence
121
- // `$ref`, causing validators to report each missing path twice. Local unpublished
122
- // models still need recursive projection because they have no standalone artifact.
123
- if (child && !readBlock(program, child.model)) {
124
- const nested = cardinalityAnnotations(program, child.model, new Set(seen));
121
+ // The paths of a list's own decorators name fields of its items, so its patch
122
+ // constrains each item, as its nested patch below does.
123
+ if (child?.repeated && Object.keys(patch).length)
124
+ patch = { items: patch };
125
+ // A published question, or a local model with a `$defs` definition of its own, owns its
126
+ // cardinality in that schema. Crossing that reference boundary would copy the same
127
+ // constraints beside every `$ref`, causing validators to report each missing path
128
+ // twice. Only a model inlined where it's used needs them projected.
129
+ if (child &&
130
+ !readBlock(program, child.model) &&
131
+ !ownsDefinition(child.model)) {
132
+ const nested = cardinalityAnnotations(program, child.model, ownsDefinition, new Set(seen));
125
133
  if (nested)
126
134
  patch = merge(patch, child.repeated ? { items: nested } : nested);
127
135
  }
@@ -1 +1 @@
1
- {"version":3,"file":"overlay.js","sourceRoot":"","sources":["../../../src/emitters/overlay.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"overlay.js","sourceRoot":"","sources":["../../../src/emitters/overlay.ts"],"names":[],"mappings":"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"}