primitive-admin 1.2.0-alpha.14 → 1.2.0-alpha.15
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/README.md +102 -78
- package/assets/skill/skills/primitive-platform/SKILL.md +87 -23
- package/dist/bin/primitive.js +11 -82
- package/dist/bin/primitive.js.map +1 -1
- package/dist/src/commands/admins.js +79 -17
- package/dist/src/commands/admins.js.map +1 -1
- package/dist/src/commands/agent-sessions.js +2 -0
- package/dist/src/commands/agent-sessions.js.map +1 -1
- package/dist/src/commands/analytics.js +183 -12
- package/dist/src/commands/analytics.js.map +1 -1
- package/dist/src/commands/apps-children.js +2 -0
- package/dist/src/commands/apps-children.js.map +1 -1
- package/dist/src/commands/apps.js +19 -2
- package/dist/src/commands/apps.js.map +1 -1
- package/dist/src/commands/auth.js +11 -1
- package/dist/src/commands/auth.js.map +1 -1
- package/dist/src/commands/collections.js +13 -0
- package/dist/src/commands/collections.js.map +1 -1
- package/dist/src/commands/config.d.ts +1 -1
- package/dist/src/commands/config.js +40 -9
- package/dist/src/commands/config.js.map +1 -1
- package/dist/src/commands/connections.js +2 -0
- package/dist/src/commands/connections.js.map +1 -1
- package/dist/src/commands/database-type-configs.js +5 -3
- package/dist/src/commands/database-type-configs.js.map +1 -1
- package/dist/src/commands/databases.js +6 -4
- package/dist/src/commands/databases.js.map +1 -1
- package/dist/src/commands/db3-types.js +2 -0
- package/dist/src/commands/db3-types.js.map +1 -1
- package/dist/src/commands/db3.d.ts +12 -0
- package/dist/src/commands/db3.js +343 -24
- package/dist/src/commands/db3.js.map +1 -1
- package/dist/src/commands/documents.d.ts +52 -12
- package/dist/src/commands/documents.js +120 -29
- package/dist/src/commands/documents.js.map +1 -1
- package/dist/src/commands/email-templates.js +72 -0
- package/dist/src/commands/email-templates.js.map +1 -1
- package/dist/src/commands/functions.js +47 -10
- package/dist/src/commands/functions.js.map +1 -1
- package/dist/src/commands/groups.js +18 -3
- package/dist/src/commands/groups.js.map +1 -1
- package/dist/src/commands/init.js +7 -1
- package/dist/src/commands/init.js.map +1 -1
- package/dist/src/commands/integrations.js +80 -47
- package/dist/src/commands/integrations.js.map +1 -1
- package/dist/src/commands/metadata-category-configs.js +2 -0
- package/dist/src/commands/metadata-category-configs.js.map +1 -1
- package/dist/src/commands/metadata.js +41 -0
- package/dist/src/commands/metadata.js.map +1 -1
- package/dist/src/commands/prompts.js +73 -47
- package/dist/src/commands/prompts.js.map +1 -1
- package/dist/src/commands/rule-sets.js +2 -0
- package/dist/src/commands/rule-sets.js.map +1 -1
- package/dist/src/commands/schemas.d.ts +15 -0
- package/dist/src/commands/schemas.js +122 -0
- package/dist/src/commands/schemas.js.map +1 -0
- package/dist/src/commands/secrets.js +45 -3
- package/dist/src/commands/secrets.js.map +1 -1
- package/dist/src/commands/sessions.js +2 -0
- package/dist/src/commands/sessions.js.map +1 -1
- package/dist/src/commands/sync-schemas.d.ts +202 -0
- package/dist/src/commands/sync-schemas.js +629 -0
- package/dist/src/commands/sync-schemas.js.map +1 -0
- package/dist/src/commands/sync-user-properties.d.ts +118 -0
- package/dist/src/commands/sync-user-properties.js +276 -0
- package/dist/src/commands/sync-user-properties.js.map +1 -0
- package/dist/src/commands/sync.d.ts +243 -12
- package/dist/src/commands/sync.js +1474 -314
- package/dist/src/commands/sync.js.map +1 -1
- package/dist/src/commands/user-properties.d.ts +14 -0
- package/dist/src/commands/user-properties.js +79 -0
- package/dist/src/commands/user-properties.js.map +1 -0
- package/dist/src/commands/users.js +879 -16
- package/dist/src/commands/users.js.map +1 -1
- package/dist/src/commands/waitlist.js +39 -4
- package/dist/src/commands/waitlist.js.map +1 -1
- package/dist/src/lib/analytics-query.d.ts +58 -0
- package/dist/src/lib/analytics-query.js +134 -0
- package/dist/src/lib/analytics-query.js.map +1 -0
- package/dist/src/lib/api-client.d.ts +748 -95
- package/dist/src/lib/api-client.js +356 -158
- package/dist/src/lib/api-client.js.map +1 -1
- package/dist/src/lib/block-selector.d.ts +9 -15
- package/dist/src/lib/block-selector.js +9 -20
- package/dist/src/lib/block-selector.js.map +1 -1
- package/dist/src/lib/cli-manifest.d.ts +8 -0
- package/dist/src/lib/cli-manifest.js +10 -1
- package/dist/src/lib/cli-manifest.js.map +1 -1
- package/dist/src/lib/cli-version.d.ts +14 -0
- package/dist/src/lib/cli-version.js +38 -0
- package/dist/src/lib/cli-version.js.map +1 -0
- package/dist/src/lib/codegen-shared/prettierStable.d.ts +41 -0
- package/dist/src/lib/codegen-shared/prettierStable.js +146 -24
- package/dist/src/lib/codegen-shared/prettierStable.js.map +1 -1
- package/dist/src/lib/command-status.d.ts +110 -0
- package/dist/src/lib/command-status.js +184 -0
- package/dist/src/lib/command-status.js.map +1 -0
- package/dist/src/lib/config-object-descriptor.d.ts +6 -0
- package/dist/src/lib/config-object-descriptor.js +71 -0
- package/dist/src/lib/config-object-descriptor.js.map +1 -1
- package/dist/src/lib/config-toml.d.ts +11 -2
- package/dist/src/lib/config-toml.js +25 -2
- package/dist/src/lib/config-toml.js.map +1 -1
- package/dist/src/lib/data-input.d.ts +1 -1
- package/dist/src/lib/data-input.js +1 -1
- package/dist/src/lib/db-codegen/dbTsTypes.d.ts +1 -1
- package/dist/src/lib/db-codegen/dbTsTypes.js +3 -0
- package/dist/src/lib/db-codegen/dbTsTypes.js.map +1 -1
- package/dist/src/lib/db-codegen/dbTypeIR.d.ts +11 -1
- package/dist/src/lib/db-codegen/dbTypeIR.js +11 -5
- package/dist/src/lib/db-codegen/dbTypeIR.js.map +1 -1
- package/dist/src/lib/db-type-records.d.ts +95 -0
- package/dist/src/lib/db-type-records.js +219 -0
- package/dist/src/lib/db-type-records.js.map +1 -0
- package/dist/src/lib/db3-export.d.ts +51 -14
- package/dist/src/lib/db3-export.js +135 -27
- package/dist/src/lib/db3-export.js.map +1 -1
- package/dist/src/lib/db3-index-output.d.ts +68 -3
- package/dist/src/lib/db3-index-output.js +139 -3
- package/dist/src/lib/db3-index-output.js.map +1 -1
- package/dist/src/lib/db3-type-models.d.ts +39 -7
- package/dist/src/lib/db3-type-models.js +138 -27
- package/dist/src/lib/db3-type-models.js.map +1 -1
- package/dist/src/lib/deprecation.d.ts +2 -2
- package/dist/src/lib/deprecation.js +2 -2
- package/dist/src/lib/experimental-apis.d.ts +36 -0
- package/dist/src/lib/experimental-apis.js +46 -0
- package/dist/src/lib/experimental-apis.js.map +1 -0
- package/dist/src/lib/file-attachment.d.ts +24 -0
- package/dist/src/lib/file-attachment.js +31 -0
- package/dist/src/lib/file-attachment.js.map +1 -0
- package/dist/src/lib/function-authorize-check.d.ts +1 -1
- package/dist/src/lib/function-authorize-check.js +2 -1
- package/dist/src/lib/function-authorize-check.js.map +1 -1
- package/dist/src/lib/function-authorize-view.js +4 -0
- package/dist/src/lib/function-authorize-view.js.map +1 -1
- package/dist/src/lib/function-bundle.d.ts +27 -5
- package/dist/src/lib/function-bundle.js +106 -7
- package/dist/src/lib/function-bundle.js.map +1 -1
- package/dist/src/lib/function-collect.d.ts +2 -0
- package/dist/src/lib/function-collect.js +36 -7
- package/dist/src/lib/function-collect.js.map +1 -1
- package/dist/src/lib/function-db-types.d.ts +57 -40
- package/dist/src/lib/function-db-types.js +246 -285
- package/dist/src/lib/function-db-types.js.map +1 -1
- package/dist/src/lib/function-document-types.d.ts +19 -7
- package/dist/src/lib/function-document-types.js +24 -12
- package/dist/src/lib/function-document-types.js.map +1 -1
- package/dist/src/lib/function-run.d.ts +1 -1
- package/dist/src/lib/function-run.js +1 -1
- package/dist/src/lib/function-run.js.map +1 -1
- package/dist/src/lib/function-schema-codegen.d.ts +58 -18
- package/dist/src/lib/function-schema-codegen.js +85 -74
- package/dist/src/lib/function-schema-codegen.js.map +1 -1
- package/dist/src/lib/function-schema-refs.d.ts +98 -0
- package/dist/src/lib/function-schema-refs.js +177 -0
- package/dist/src/lib/function-schema-refs.js.map +1 -0
- package/dist/src/lib/function-sync.d.ts +38 -4
- package/dist/src/lib/function-sync.js +83 -14
- package/dist/src/lib/function-sync.js.map +1 -1
- package/dist/src/lib/function-typecheck.d.ts +52 -0
- package/dist/src/lib/function-typecheck.js +171 -54
- package/dist/src/lib/function-typecheck.js.map +1 -1
- package/dist/src/lib/generated-build-flags.d.ts +13 -0
- package/dist/src/lib/generated-build-flags.js +14 -0
- package/dist/src/lib/generated-build-flags.js.map +1 -0
- package/dist/src/lib/generated-config-surfaces.d.ts +211 -11
- package/dist/src/lib/generated-config-surfaces.js +579 -69
- package/dist/src/lib/generated-config-surfaces.js.map +1 -1
- package/dist/src/lib/generated-sdk-types.d.ts +1 -1
- package/dist/src/lib/generated-sdk-types.js +1 -1
- package/dist/src/lib/generated-sdk-types.js.map +1 -1
- package/dist/src/lib/integration-test-request.d.ts +54 -0
- package/dist/src/lib/integration-test-request.js +207 -0
- package/dist/src/lib/integration-test-request.js.map +1 -0
- package/dist/src/lib/metadata-report.d.ts +85 -0
- package/dist/src/lib/metadata-report.js +81 -0
- package/dist/src/lib/metadata-report.js.map +1 -0
- package/dist/src/lib/output.d.ts +1 -1
- package/dist/src/lib/output.js +1 -1
- package/dist/src/lib/platform-owned.js +5 -0
- package/dist/src/lib/platform-owned.js.map +1 -1
- package/dist/src/lib/primitive-declaration-names.d.ts +21 -0
- package/dist/src/lib/primitive-declaration-names.js +22 -0
- package/dist/src/lib/primitive-declaration-names.js.map +1 -0
- package/dist/src/lib/primitive-declaration.d.ts +143 -0
- package/dist/src/lib/primitive-declaration.js +658 -0
- package/dist/src/lib/primitive-declaration.js.map +1 -0
- package/dist/src/lib/prompt-schema-codegen.d.ts +36 -12
- package/dist/src/lib/prompt-schema-codegen.js +82 -98
- package/dist/src/lib/prompt-schema-codegen.js.map +1 -1
- package/dist/src/lib/prompt-schema-document.d.ts +35 -0
- package/dist/src/lib/prompt-schema-document.js +92 -0
- package/dist/src/lib/prompt-schema-document.js.map +1 -0
- package/dist/src/lib/prompt-schema-refs.d.ts +164 -0
- package/dist/src/lib/prompt-schema-refs.js +452 -0
- package/dist/src/lib/prompt-schema-refs.js.map +1 -0
- package/dist/src/lib/records-verbs.d.ts +12 -2
- package/dist/src/lib/records-verbs.js +7 -2
- package/dist/src/lib/records-verbs.js.map +1 -1
- package/dist/src/lib/register-commands.d.ts +28 -0
- package/dist/src/lib/register-commands.js +101 -0
- package/dist/src/lib/register-commands.js.map +1 -0
- package/dist/src/lib/retired-imports.d.ts +53 -0
- package/dist/src/lib/retired-imports.js +120 -0
- package/dist/src/lib/retired-imports.js.map +1 -0
- package/dist/src/lib/schema-codegen/compiledSpace.d.ts +62 -0
- package/dist/src/lib/schema-codegen/compiledSpace.js +103 -0
- package/dist/src/lib/schema-codegen/compiledSpace.js.map +1 -0
- package/dist/src/lib/schema-codegen/generated-db3-bridge.d.ts +86 -0
- package/dist/src/lib/schema-codegen/generated-db3-bridge.js +221 -0
- package/dist/src/lib/schema-codegen/generated-db3-bridge.js.map +1 -0
- package/dist/src/lib/schema-codegen/generated-db3-query-capabilities.d.ts +85 -0
- package/dist/src/lib/schema-codegen/generated-db3-query-capabilities.js +86 -0
- package/dist/src/lib/schema-codegen/generated-db3-query-capabilities.js.map +1 -0
- package/dist/src/lib/schema-codegen/generated-field-grammar.d.ts +209 -0
- package/dist/src/lib/schema-codegen/generated-field-grammar.js +379 -0
- package/dist/src/lib/schema-codegen/generated-field-grammar.js.map +1 -0
- package/dist/src/lib/schema-codegen/generated-field-table.d.ts +80 -0
- package/dist/src/lib/schema-codegen/generated-field-table.js +542 -0
- package/dist/src/lib/schema-codegen/generated-field-table.js.map +1 -0
- package/dist/src/lib/schema-codegen/generated-prompt-schemas.d.ts +195 -0
- package/dist/src/lib/schema-codegen/generated-prompt-schemas.js +503 -0
- package/dist/src/lib/schema-codegen/generated-prompt-schemas.js.map +1 -0
- package/dist/src/lib/schema-codegen/generated-schema-descriptor.d.ts +129 -0
- package/dist/src/lib/schema-codegen/generated-schema-descriptor.js +154 -1
- package/dist/src/lib/schema-codegen/generated-schema-descriptor.js.map +1 -1
- package/dist/src/lib/schema-codegen/generated-schema-file.d.ts +129 -0
- package/dist/src/lib/schema-codegen/generated-schema-file.js +475 -0
- package/dist/src/lib/schema-codegen/generated-schema-file.js.map +1 -0
- package/dist/src/lib/schema-codegen/generated-schema-provenance.d.ts +115 -0
- package/dist/src/lib/schema-codegen/generated-schema-provenance.js +274 -0
- package/dist/src/lib/schema-codegen/generated-schema-provenance.js.map +1 -0
- package/dist/src/lib/schema-codegen/generated-schema-refs.d.ts +366 -0
- package/dist/src/lib/schema-codegen/generated-schema-refs.js +1789 -0
- package/dist/src/lib/schema-codegen/generated-schema-refs.js.map +1 -0
- package/dist/src/lib/schema-codegen/namedRefs.d.ts +56 -0
- package/dist/src/lib/schema-codegen/namedRefs.js +143 -0
- package/dist/src/lib/schema-codegen/namedRefs.js.map +1 -0
- package/dist/src/lib/schema-codegen/schemaChanges.d.ts +74 -0
- package/dist/src/lib/schema-codegen/schemaChanges.js +277 -0
- package/dist/src/lib/schema-codegen/schemaChanges.js.map +1 -0
- package/dist/src/lib/schema-codegen/schemaDocs.d.ts +69 -0
- package/dist/src/lib/schema-codegen/schemaDocs.js +219 -0
- package/dist/src/lib/schema-codegen/schemaDocs.js.map +1 -0
- package/dist/src/lib/schema-codegen/schemaIR.d.ts +158 -0
- package/dist/src/lib/schema-codegen/schemaIR.js +279 -0
- package/dist/src/lib/schema-codegen/schemaIR.js.map +1 -0
- package/dist/src/lib/schema-codegen/schemaToTs.d.ts +40 -13
- package/dist/src/lib/schema-codegen/schemaToTs.js +124 -160
- package/dist/src/lib/schema-codegen/schemaToTs.js.map +1 -1
- package/dist/src/lib/schema-codegen/valuesLists.d.ts +35 -0
- package/dist/src/lib/schema-codegen/valuesLists.js +128 -0
- package/dist/src/lib/schema-codegen/valuesLists.js.map +1 -0
- package/dist/src/lib/schema-family-index.d.ts +228 -0
- package/dist/src/lib/schema-family-index.js +813 -0
- package/dist/src/lib/schema-family-index.js.map +1 -0
- package/dist/src/lib/schema-pins.d.ts +82 -0
- package/dist/src/lib/schema-pins.js +198 -0
- package/dist/src/lib/schema-pins.js.map +1 -0
- package/dist/src/lib/schema-preview.d.ts +244 -0
- package/dist/src/lib/schema-preview.js +498 -0
- package/dist/src/lib/schema-preview.js.map +1 -0
- package/dist/src/lib/skill-installer.d.ts +2 -2
- package/dist/src/lib/skill-installer.js +2 -21
- package/dist/src/lib/skill-installer.js.map +1 -1
- package/dist/src/lib/step-run-table.d.ts +1 -2
- package/dist/src/lib/step-run-table.js +1 -2
- package/dist/src/lib/step-run-table.js.map +1 -1
- package/dist/src/lib/swift-codegen/agentGenerator.d.ts +2 -1
- package/dist/src/lib/swift-codegen/agentGenerator.js +24 -22
- package/dist/src/lib/swift-codegen/agentGenerator.js.map +1 -1
- package/dist/src/lib/swift-codegen/banners.d.ts +12 -0
- package/dist/src/lib/swift-codegen/banners.js +12 -0
- package/dist/src/lib/swift-codegen/banners.js.map +1 -1
- package/dist/src/lib/swift-codegen/functionGenerator.d.ts +36 -1
- package/dist/src/lib/swift-codegen/functionGenerator.js +167 -50
- package/dist/src/lib/swift-codegen/functionGenerator.js.map +1 -1
- package/dist/src/lib/swift-codegen/schemaToSwift.d.ts +31 -7
- package/dist/src/lib/swift-codegen/schemaToSwift.js +213 -177
- package/dist/src/lib/swift-codegen/schemaToSwift.js.map +1 -1
- package/dist/src/lib/swift-codegen/sharedGenerator.d.ts +45 -0
- package/dist/src/lib/swift-codegen/sharedGenerator.js +120 -0
- package/dist/src/lib/swift-codegen/sharedGenerator.js.map +1 -0
- package/dist/src/lib/swift-codegen/userPropertiesGenerator.d.ts +30 -0
- package/dist/src/lib/swift-codegen/userPropertiesGenerator.js +69 -0
- package/dist/src/lib/swift-codegen/userPropertiesGenerator.js.map +1 -0
- package/dist/src/lib/sync-resource-types.d.ts +37 -5
- package/dist/src/lib/sync-resource-types.js +53 -5
- package/dist/src/lib/sync-resource-types.js.map +1 -1
- package/dist/src/lib/sync-selectors.d.ts +7 -0
- package/dist/src/lib/sync-selectors.js +22 -2
- package/dist/src/lib/sync-selectors.js.map +1 -1
- package/dist/src/lib/test-runs.d.ts +45 -0
- package/dist/src/lib/test-runs.js +150 -0
- package/dist/src/lib/test-runs.js.map +1 -0
- package/dist/src/lib/toml-database-config.d.ts +2 -1
- package/dist/src/lib/toml-database-config.js +4 -3
- package/dist/src/lib/toml-database-config.js.map +1 -1
- package/dist/src/lib/toml-scalar-edit.js +6 -4
- package/dist/src/lib/toml-scalar-edit.js.map +1 -1
- package/dist/src/lib/user-index.d.ts +80 -0
- package/dist/src/lib/user-index.js +166 -0
- package/dist/src/lib/user-index.js.map +1 -0
- package/dist/src/lib/user-properties/generated-properties-schema.d.ts +159 -0
- package/dist/src/lib/user-properties/generated-properties-schema.js +471 -0
- package/dist/src/lib/user-properties/generated-properties-schema.js.map +1 -0
- package/dist/src/lib/user-properties/user-properties-codegen.d.ts +55 -0
- package/dist/src/lib/user-properties/user-properties-codegen.js +129 -0
- package/dist/src/lib/user-properties/user-properties-codegen.js.map +1 -0
- package/dist/src/lib/user-walk.d.ts +31 -0
- package/dist/src/lib/user-walk.js +102 -0
- package/dist/src/lib/user-walk.js.map +1 -0
- package/dist/src/lib/worker-perf-format.d.ts +22 -0
- package/dist/src/lib/worker-perf-format.js +27 -0
- package/dist/src/lib/worker-perf-format.js.map +1 -0
- package/dist/src/types/index.d.ts +13 -34
- package/package.json +5 -3
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The one shape both code generators render (#5542, project `unified-schemas`
|
|
3
|
+
* phase 9).
|
|
4
|
+
*
|
|
5
|
+
* `lowerSchema` reads a JSON-Schema node through the vendored descriptor — the
|
|
6
|
+
* same interpretation the server validator applies — and answers a
|
|
7
|
+
* `ShapeNode`. `schemaToTs.ts` and `swift-codegen/schemaToSwift.ts` render that
|
|
8
|
+
* node and never read the descriptor for a shape decision, so the two languages
|
|
9
|
+
* cannot decide a schema's shape differently. Where a language cannot express
|
|
10
|
+
* a node (Swift has no untagged union, TS has no integer), the renderer says so
|
|
11
|
+
* in its own syntax; the node is the same.
|
|
12
|
+
*
|
|
13
|
+
* The lowering order is the validator's wherever the order can matter:
|
|
14
|
+
* `nullable: true` admits `null` before anything else, then the type gate,
|
|
15
|
+
* then `enum` and `const` (intersected), then a `type` union, then a tagged
|
|
16
|
+
* `oneOf`, then the singular type; `anyOf` narrows whatever the node's own
|
|
17
|
+
* keywords say (#5544, phase 10, when `const`, `anyOf` and `nullable` became
|
|
18
|
+
* type shapes). A valid tagged union has no sibling `type` or `enum`, so only a
|
|
19
|
+
* defective one can meet them, and then the enum or the union wins.
|
|
20
|
+
*
|
|
21
|
+
* `lowerSchema` never throws. A defective tagged union is a `refused` node
|
|
22
|
+
* carrying the descriptor's reason; each renderer throws it with its own
|
|
23
|
+
* prefix.
|
|
24
|
+
*/
|
|
25
|
+
import { type SchemaDocs } from "./schemaDocs.js";
|
|
26
|
+
/** A JSON-Schema type name a scalar node can carry. */
|
|
27
|
+
export type ScalarType = "string" | "number" | "integer" | "boolean" | "null";
|
|
28
|
+
/** Any JSON value: an `enum` member or a `const`, which TS renders as a literal type. */
|
|
29
|
+
export type JsonValue = string | number | boolean | null | JsonValue[] | {
|
|
30
|
+
[key: string]: JsonValue;
|
|
31
|
+
};
|
|
32
|
+
/** One declared property of an object node. */
|
|
33
|
+
export interface ShapeMember {
|
|
34
|
+
/** The wire key. */
|
|
35
|
+
name: string;
|
|
36
|
+
required: boolean;
|
|
37
|
+
shape: ShapeNode;
|
|
38
|
+
/** `schemaDocs` of the property's schema (`schemaOwnDocs` where it is a named reference). */
|
|
39
|
+
docs: SchemaDocs;
|
|
40
|
+
}
|
|
41
|
+
/** An object with a `properties` table. */
|
|
42
|
+
export interface ObjectShape {
|
|
43
|
+
kind: "object";
|
|
44
|
+
/** The declared properties, in schema order. */
|
|
45
|
+
members: ShapeMember[];
|
|
46
|
+
/** Keys `required` names that `properties` does not declare, in `required` order. */
|
|
47
|
+
requiredUndeclared: string[];
|
|
48
|
+
/** False when `additionalProperties` is `false`. */
|
|
49
|
+
open: boolean;
|
|
50
|
+
}
|
|
51
|
+
/** One member of a tagged union: its discriminant value and its object, the discriminant required. */
|
|
52
|
+
export interface TaggedMember {
|
|
53
|
+
tag: string | number | boolean;
|
|
54
|
+
object: ObjectShape;
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* A schema node's shape, as both renderers read it.
|
|
58
|
+
*
|
|
59
|
+
* - `unknown`: nothing enforced, or a node the validator does not descend.
|
|
60
|
+
* `nullable` is true when `null` is admitted beside such a node (a `type`
|
|
61
|
+
* union with `null` and an object or array member, an empty `type` array,
|
|
62
|
+
* `nullable: true`).
|
|
63
|
+
* - `never`: an `enum` or `const` no value of which survives the type gate.
|
|
64
|
+
* - `scalar`, `union`: a single type, or a `type` array of scalars (deduped).
|
|
65
|
+
* - `literals`: the `enum` members (or the `const`) that survive the type
|
|
66
|
+
* gate, deduped by JSON equality; any JSON value. `nullable` is true when
|
|
67
|
+
* the raw `enum` has `null`, even one the gate drops.
|
|
68
|
+
* - `map`: `type: "object"` with no `properties` table.
|
|
69
|
+
* - `object`, `array`: the validator descends `properties` or `items`.
|
|
70
|
+
* - `tagged`: a valid discriminated `oneOf`.
|
|
71
|
+
* - `untagged`: an `anyOf`: a value matching some member, and `base` (the
|
|
72
|
+
* node without its `anyOf`) when that says anything.
|
|
73
|
+
* - `nullable`: `nullable: true` on a node that has no flag of its own.
|
|
74
|
+
* - `named`: a reference to a declaration emitted elsewhere (#5544), at a
|
|
75
|
+
* pointer the caller's `named` map names.
|
|
76
|
+
* - `refused`: a defective tagged union.
|
|
77
|
+
*/
|
|
78
|
+
export type ShapeNode = {
|
|
79
|
+
kind: "unknown";
|
|
80
|
+
nullable: boolean;
|
|
81
|
+
} | {
|
|
82
|
+
kind: "never";
|
|
83
|
+
} | {
|
|
84
|
+
kind: "scalar";
|
|
85
|
+
type: ScalarType;
|
|
86
|
+
} | {
|
|
87
|
+
kind: "union";
|
|
88
|
+
types: ScalarType[];
|
|
89
|
+
} | {
|
|
90
|
+
kind: "literals";
|
|
91
|
+
values: JsonValue[];
|
|
92
|
+
nullable: boolean;
|
|
93
|
+
} | {
|
|
94
|
+
kind: "map";
|
|
95
|
+
} | ObjectShape | {
|
|
96
|
+
kind: "array";
|
|
97
|
+
items: ShapeNode;
|
|
98
|
+
} | {
|
|
99
|
+
kind: "tagged";
|
|
100
|
+
discriminant: string;
|
|
101
|
+
members: TaggedMember[];
|
|
102
|
+
} | {
|
|
103
|
+
kind: "untagged";
|
|
104
|
+
members: ShapeNode[];
|
|
105
|
+
base: ShapeNode | null;
|
|
106
|
+
} | {
|
|
107
|
+
kind: "nullable";
|
|
108
|
+
inner: ShapeNode;
|
|
109
|
+
} | {
|
|
110
|
+
kind: "named";
|
|
111
|
+
name: string;
|
|
112
|
+
nullable: boolean;
|
|
113
|
+
targetNullable?: boolean;
|
|
114
|
+
} | {
|
|
115
|
+
kind: "refused";
|
|
116
|
+
reason: string;
|
|
117
|
+
};
|
|
118
|
+
/** A root schema lowered: its shape and its own doc comment. */
|
|
119
|
+
export interface LoweredSchema {
|
|
120
|
+
shape: ShapeNode;
|
|
121
|
+
docs: SchemaDocs;
|
|
122
|
+
}
|
|
123
|
+
/** A reference `lowerSchema` answers at a pointer instead of descending (#5544). */
|
|
124
|
+
export interface NamedReference {
|
|
125
|
+
/** The name a renderer writes: `Schemas.Money` in TypeScript, `Money` in Swift. */
|
|
126
|
+
name: string;
|
|
127
|
+
/** The reference adds `null` to a target that does not admit it. */
|
|
128
|
+
nullable: boolean;
|
|
129
|
+
/**
|
|
130
|
+
* The target's own declaration admits `null` (Swift declares it as an
|
|
131
|
+
* Optional alias), so the reference does too without adding it.
|
|
132
|
+
*/
|
|
133
|
+
targetNullable?: boolean;
|
|
134
|
+
/**
|
|
135
|
+
* What the site's doc comment reads: the node's keys the target does not
|
|
136
|
+
* already carry (the target's own docs sit on its declaration). Absent:
|
|
137
|
+
* the node itself.
|
|
138
|
+
*/
|
|
139
|
+
own?: unknown;
|
|
140
|
+
}
|
|
141
|
+
export interface LowerSchemaOptions {
|
|
142
|
+
/**
|
|
143
|
+
* JSON pointers (the compiler's spelling, rooted at the schema lowered) whose
|
|
144
|
+
* node is a reference to a declaration emitted elsewhere. Empty or absent:
|
|
145
|
+
* every node renders inline.
|
|
146
|
+
*/
|
|
147
|
+
named?: ReadonlyMap<string, NamedReference>;
|
|
148
|
+
}
|
|
149
|
+
/** The exhaustiveness check every renderer's `switch` on `kind` ends in. */
|
|
150
|
+
export declare function assertNever(value: never): never;
|
|
151
|
+
/** JSON text with object keys sorted: the identity `const` and dedupe compare by. */
|
|
152
|
+
export declare function canonicalJsonText(value: unknown): string;
|
|
153
|
+
/** A JSON-pointer segment for a property name. */
|
|
154
|
+
export declare function pointerSegment(name: string): string;
|
|
155
|
+
/** Lower a root schema node; see the module note. */
|
|
156
|
+
export declare function lowerSchema(schema: unknown, options?: LowerSchemaOptions): LoweredSchema;
|
|
157
|
+
/** Whether a lowered node admits `null`. */
|
|
158
|
+
export declare function admitsNull(node: ShapeNode): boolean;
|
|
@@ -0,0 +1,279 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The one shape both code generators render (#5542, project `unified-schemas`
|
|
3
|
+
* phase 9).
|
|
4
|
+
*
|
|
5
|
+
* `lowerSchema` reads a JSON-Schema node through the vendored descriptor — the
|
|
6
|
+
* same interpretation the server validator applies — and answers a
|
|
7
|
+
* `ShapeNode`. `schemaToTs.ts` and `swift-codegen/schemaToSwift.ts` render that
|
|
8
|
+
* node and never read the descriptor for a shape decision, so the two languages
|
|
9
|
+
* cannot decide a schema's shape differently. Where a language cannot express
|
|
10
|
+
* a node (Swift has no untagged union, TS has no integer), the renderer says so
|
|
11
|
+
* in its own syntax; the node is the same.
|
|
12
|
+
*
|
|
13
|
+
* The lowering order is the validator's wherever the order can matter:
|
|
14
|
+
* `nullable: true` admits `null` before anything else, then the type gate,
|
|
15
|
+
* then `enum` and `const` (intersected), then a `type` union, then a tagged
|
|
16
|
+
* `oneOf`, then the singular type; `anyOf` narrows whatever the node's own
|
|
17
|
+
* keywords say (#5544, phase 10, when `const`, `anyOf` and `nullable` became
|
|
18
|
+
* type shapes). A valid tagged union has no sibling `type` or `enum`, so only a
|
|
19
|
+
* defective one can meet them, and then the enum or the union wins.
|
|
20
|
+
*
|
|
21
|
+
* `lowerSchema` never throws. A defective tagged union is a `refused` node
|
|
22
|
+
* carrying the descriptor's reason; each renderer throws it with its own
|
|
23
|
+
* prefix.
|
|
24
|
+
*/
|
|
25
|
+
import { describeSchema, isType } from "./generated-schema-descriptor.js";
|
|
26
|
+
import { schemaDocs, schemaOwnDocs } from "./schemaDocs.js";
|
|
27
|
+
/** The exhaustiveness check every renderer's `switch` on `kind` ends in. */
|
|
28
|
+
export function assertNever(value) {
|
|
29
|
+
throw new Error(`schema codegen: unhandled shape ${JSON.stringify(value)}`);
|
|
30
|
+
}
|
|
31
|
+
const SCALAR_TYPES = new Set(["string", "number", "integer", "boolean", "null"]);
|
|
32
|
+
const isScalarType = (type) => typeof type === "string" && SCALAR_TYPES.has(type);
|
|
33
|
+
const isNode = (value) => !!value && typeof value === "object" && !Array.isArray(value);
|
|
34
|
+
const hasOwn = (node, key) => Object.prototype.hasOwnProperty.call(node, key);
|
|
35
|
+
/** Whether a value is JSON all the way down (an `enum` member JSON can spell). */
|
|
36
|
+
function isJsonValue(value) {
|
|
37
|
+
if (value === null || typeof value === "string" || typeof value === "boolean")
|
|
38
|
+
return true;
|
|
39
|
+
if (typeof value === "number")
|
|
40
|
+
return Number.isFinite(value);
|
|
41
|
+
if (Array.isArray(value))
|
|
42
|
+
return value.every(isJsonValue);
|
|
43
|
+
if (isNode(value))
|
|
44
|
+
return Object.values(value).every(isJsonValue);
|
|
45
|
+
return false;
|
|
46
|
+
}
|
|
47
|
+
/** JSON text with object keys sorted: the identity `const` and dedupe compare by. */
|
|
48
|
+
export function canonicalJsonText(value) {
|
|
49
|
+
if (Array.isArray(value))
|
|
50
|
+
return `[${value.map(canonicalJsonText).join(",")}]`;
|
|
51
|
+
if (isNode(value)) {
|
|
52
|
+
return `{${Object.keys(value)
|
|
53
|
+
.sort()
|
|
54
|
+
.map((key) => `${JSON.stringify(key)}:${canonicalJsonText(value[key])}`)
|
|
55
|
+
.join(",")}}`;
|
|
56
|
+
}
|
|
57
|
+
return JSON.stringify(value) ?? "undefined";
|
|
58
|
+
}
|
|
59
|
+
/** A JSON-pointer segment for a property name. */
|
|
60
|
+
export function pointerSegment(name) {
|
|
61
|
+
return name.replace(/~/g, "~0").replace(/\//g, "~1");
|
|
62
|
+
}
|
|
63
|
+
const UNKNOWN = { kind: "unknown", nullable: false };
|
|
64
|
+
/** Lower a root schema node; see the module note. */
|
|
65
|
+
export function lowerSchema(schema, options = {}) {
|
|
66
|
+
const ctx = { named: options.named ?? new Map() };
|
|
67
|
+
const shape = lowerNode(schema, "", ctx);
|
|
68
|
+
return { shape, docs: shape.kind === "named" ? schemaOwnDocs(ownOf(schema, "", ctx)) : schemaDocs(schema) };
|
|
69
|
+
}
|
|
70
|
+
/** The node a named site documents: the reference's `own`, else the node. */
|
|
71
|
+
function ownOf(schema, pointer, ctx) {
|
|
72
|
+
const reference = ctx.named.get(pointer);
|
|
73
|
+
return reference && reference.own !== undefined ? reference.own : schema;
|
|
74
|
+
}
|
|
75
|
+
function lowerNode(schema, pointer, ctx) {
|
|
76
|
+
const reference = ctx.named.get(pointer);
|
|
77
|
+
if (reference) {
|
|
78
|
+
return {
|
|
79
|
+
kind: "named",
|
|
80
|
+
name: reference.name,
|
|
81
|
+
nullable: reference.nullable,
|
|
82
|
+
...(reference.targetNullable ? { targetNullable: true } : {}),
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
const core = lowerCore(schema, pointer, ctx);
|
|
86
|
+
return isNode(schema) && schema.nullable === true ? withNull(core) : core;
|
|
87
|
+
}
|
|
88
|
+
/** `nullable: true` admits `null` before any other check: the node, or `null`. */
|
|
89
|
+
function withNull(node) {
|
|
90
|
+
switch (node.kind) {
|
|
91
|
+
case "unknown":
|
|
92
|
+
return { kind: "unknown", nullable: true };
|
|
93
|
+
case "never":
|
|
94
|
+
return { kind: "scalar", type: "null" };
|
|
95
|
+
case "scalar":
|
|
96
|
+
return node.type === "null" ? node : { kind: "union", types: [node.type, "null"] };
|
|
97
|
+
case "union":
|
|
98
|
+
return node.types.includes("null") ? node : { kind: "union", types: [...node.types, "null"] };
|
|
99
|
+
case "named":
|
|
100
|
+
return { ...node, nullable: true };
|
|
101
|
+
case "literals":
|
|
102
|
+
// The flag already says "the raw enum lists null", which Swift reads for
|
|
103
|
+
// its `JSONValue` fallback; a literal set without `null` is wrapped.
|
|
104
|
+
return node.values.includes(null) ? node : { kind: "nullable", inner: node };
|
|
105
|
+
case "nullable":
|
|
106
|
+
case "refused":
|
|
107
|
+
return node;
|
|
108
|
+
case "map":
|
|
109
|
+
case "object":
|
|
110
|
+
case "array":
|
|
111
|
+
case "tagged":
|
|
112
|
+
case "untagged":
|
|
113
|
+
return { kind: "nullable", inner: node };
|
|
114
|
+
default:
|
|
115
|
+
return assertNever(node);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
function lowerCore(schema, pointer, ctx) {
|
|
119
|
+
if (isNode(schema) && Array.isArray(schema.anyOf) && schema.anyOf.length > 0) {
|
|
120
|
+
return lowerAnyOf(schema, schema.anyOf, pointer, ctx);
|
|
121
|
+
}
|
|
122
|
+
return lowerOwn(schema, pointer, ctx);
|
|
123
|
+
}
|
|
124
|
+
/**
|
|
125
|
+
* `anyOf`: a value must match some member, each validated on its own, and the
|
|
126
|
+
* node's other keywords besides. A member that admits anything makes the union
|
|
127
|
+
* say nothing; a lone member with no base is that member.
|
|
128
|
+
*/
|
|
129
|
+
function lowerAnyOf(schema, anyOf, pointer, ctx) {
|
|
130
|
+
const members = anyOf.map((member, index) => lowerNode(member, `${pointer}/anyOf/${index}`, ctx));
|
|
131
|
+
const { anyOf: _anyOf, ...rest } = schema;
|
|
132
|
+
const own = lowerOwn(rest, pointer, ctx);
|
|
133
|
+
const base = own.kind === "unknown" && !own.nullable ? null : own;
|
|
134
|
+
if (members.some((member) => member.kind === "unknown"))
|
|
135
|
+
return base ?? UNKNOWN;
|
|
136
|
+
if (members.length === 1 && base === null)
|
|
137
|
+
return members[0];
|
|
138
|
+
return { kind: "untagged", members, base };
|
|
139
|
+
}
|
|
140
|
+
/** The node's own keywords, `anyOf` and `nullable` aside. */
|
|
141
|
+
function lowerOwn(schema, pointer, ctx) {
|
|
142
|
+
const d = describeSchema(schema);
|
|
143
|
+
// The validator checks `enum` and `const` after the type gate, so only the
|
|
144
|
+
// members that satisfy a declared type are reachable.
|
|
145
|
+
const hasConst = isNode(schema) && hasOwn(schema, "const");
|
|
146
|
+
let enumValues = d.enumValues;
|
|
147
|
+
if (hasConst) {
|
|
148
|
+
const value = schema.const;
|
|
149
|
+
enumValues = enumValues ? enumValues.filter((v) => canonicalJsonText(v) === canonicalJsonText(value)) : [value];
|
|
150
|
+
}
|
|
151
|
+
if (enumValues) {
|
|
152
|
+
const survivors = d.types.length > 0 ? enumValues.filter((v) => d.types.some((t) => isType(v, t))) : enumValues;
|
|
153
|
+
const nullable = enumValues.includes(null);
|
|
154
|
+
if (survivors.length === 0)
|
|
155
|
+
return { kind: "never" };
|
|
156
|
+
if (survivors.every(isJsonValue)) {
|
|
157
|
+
const seen = new Set();
|
|
158
|
+
const values = [];
|
|
159
|
+
for (const value of survivors) {
|
|
160
|
+
const key = canonicalJsonText(value);
|
|
161
|
+
if (seen.has(key))
|
|
162
|
+
continue;
|
|
163
|
+
seen.add(key);
|
|
164
|
+
values.push(value);
|
|
165
|
+
}
|
|
166
|
+
return { kind: "literals", values, nullable };
|
|
167
|
+
}
|
|
168
|
+
// A member JSON cannot spell (built in code, not parsed): the declared type
|
|
169
|
+
// is what can be said.
|
|
170
|
+
if (d.types.length === 0)
|
|
171
|
+
return { kind: "unknown", nullable };
|
|
172
|
+
}
|
|
173
|
+
if (d.isUnion)
|
|
174
|
+
return lowerUnion(d.types);
|
|
175
|
+
if (d.oneOf) {
|
|
176
|
+
if (d.oneOf.kind === "invalid")
|
|
177
|
+
return { kind: "refused", reason: d.oneOf.reason };
|
|
178
|
+
return lowerTagged(schema, d.oneOf, pointer, ctx);
|
|
179
|
+
}
|
|
180
|
+
switch (d.singularType) {
|
|
181
|
+
case null:
|
|
182
|
+
return UNKNOWN;
|
|
183
|
+
case "object":
|
|
184
|
+
return d.object ? lowerObject(d.object, [], pointer, ctx) : { kind: "map" };
|
|
185
|
+
case "array": {
|
|
186
|
+
const items = d.array?.items;
|
|
187
|
+
const descended = isNode(items);
|
|
188
|
+
return { kind: "array", items: descended ? lowerNode(items, `${pointer}/items`, ctx) : UNKNOWN };
|
|
189
|
+
}
|
|
190
|
+
default:
|
|
191
|
+
if (isScalarType(d.singularType))
|
|
192
|
+
return { kind: "scalar", type: d.singularType };
|
|
193
|
+
return UNKNOWN;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
/** A `type` array: a scalar union, or `unknown` when a member is not a scalar (the validator never descends a union). */
|
|
197
|
+
function lowerUnion(types) {
|
|
198
|
+
const hasNull = types.includes("null");
|
|
199
|
+
if (!types.every(isScalarType))
|
|
200
|
+
return { kind: "unknown", nullable: hasNull };
|
|
201
|
+
const deduped = [...new Set(types)];
|
|
202
|
+
if (deduped.length === 0)
|
|
203
|
+
return { kind: "unknown", nullable: true };
|
|
204
|
+
return { kind: "union", types: deduped };
|
|
205
|
+
}
|
|
206
|
+
function lowerObject(desc, forcedRequired, pointer, ctx) {
|
|
207
|
+
const { properties, required, additionalPropertiesClosed } = desc;
|
|
208
|
+
const requiredSet = new Set([
|
|
209
|
+
...(Array.isArray(required) ? required.filter((k) => typeof k === "string") : []),
|
|
210
|
+
...forcedRequired,
|
|
211
|
+
]);
|
|
212
|
+
return {
|
|
213
|
+
kind: "object",
|
|
214
|
+
members: Object.keys(properties).map((name) => {
|
|
215
|
+
const at = `${pointer}/properties/${pointerSegment(name)}`;
|
|
216
|
+
const shape = lowerNode(properties[name], at, ctx);
|
|
217
|
+
return {
|
|
218
|
+
name,
|
|
219
|
+
required: requiredSet.has(name),
|
|
220
|
+
shape,
|
|
221
|
+
docs: shape.kind === "named" ? schemaOwnDocs(ownOf(properties[name], at, ctx)) : schemaDocs(properties[name]),
|
|
222
|
+
};
|
|
223
|
+
}),
|
|
224
|
+
requiredUndeclared: [...requiredSet].filter((name) => !Object.prototype.hasOwnProperty.call(properties, name)),
|
|
225
|
+
open: !additionalPropertiesClosed,
|
|
226
|
+
};
|
|
227
|
+
}
|
|
228
|
+
/**
|
|
229
|
+
* A valid tagged union. The validator requires the discriminator before it can
|
|
230
|
+
* select a branch, so every member object lists it as required whatever its
|
|
231
|
+
* own `required` says. A member's own `enum` is not read: the union renders
|
|
232
|
+
* each member as its object.
|
|
233
|
+
*/
|
|
234
|
+
function lowerTagged(schema, oneOf, pointer, ctx) {
|
|
235
|
+
const raw = Array.isArray(schema.oneOf) ? schema.oneOf : [];
|
|
236
|
+
const members = [];
|
|
237
|
+
for (const member of oneOf.members) {
|
|
238
|
+
const md = describeSchema(member.schema);
|
|
239
|
+
// Every member of a valid tagged union is an object with properties.
|
|
240
|
+
if (!md.object) {
|
|
241
|
+
return {
|
|
242
|
+
kind: "refused",
|
|
243
|
+
reason: `oneOf branch for ${oneOf.discriminant}=${String(member.discriminantValue)} is not an object`,
|
|
244
|
+
};
|
|
245
|
+
}
|
|
246
|
+
const at = `${pointer}/oneOf/${raw.indexOf(member.schema)}`;
|
|
247
|
+
members.push({ tag: member.discriminantValue, object: lowerObject(md.object, [oneOf.discriminant], at, ctx) });
|
|
248
|
+
}
|
|
249
|
+
return { kind: "tagged", discriminant: oneOf.discriminant, members };
|
|
250
|
+
}
|
|
251
|
+
/** Whether a lowered node admits `null`. */
|
|
252
|
+
export function admitsNull(node) {
|
|
253
|
+
switch (node.kind) {
|
|
254
|
+
case "unknown":
|
|
255
|
+
return node.nullable;
|
|
256
|
+
case "named":
|
|
257
|
+
return node.nullable || node.targetNullable === true;
|
|
258
|
+
case "scalar":
|
|
259
|
+
return node.type === "null";
|
|
260
|
+
case "union":
|
|
261
|
+
return node.types.includes("null");
|
|
262
|
+
case "literals":
|
|
263
|
+
return node.values.includes(null);
|
|
264
|
+
case "nullable":
|
|
265
|
+
return true;
|
|
266
|
+
case "untagged":
|
|
267
|
+
return node.members.some(admitsNull) && (node.base === null || admitsNull(node.base));
|
|
268
|
+
case "never":
|
|
269
|
+
case "map":
|
|
270
|
+
case "object":
|
|
271
|
+
case "array":
|
|
272
|
+
case "tagged":
|
|
273
|
+
case "refused":
|
|
274
|
+
return false;
|
|
275
|
+
default:
|
|
276
|
+
return assertNever(node);
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
//# sourceMappingURL=schemaIR.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schemaIR.js","sourceRoot":"","sources":["../../../../src/lib/schema-codegen/schemaIR.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,11 @@
|
|
|
4
4
|
* retired).
|
|
5
5
|
*
|
|
6
6
|
* An `inputSchema`/`outputSchema` is real JSON Schema. This converter
|
|
7
|
-
* types only the subset the server's validator descends into
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
* `
|
|
7
|
+
* types only the subset the server's validator descends into. It renders the
|
|
8
|
+
* node `schemaIR.ts` lowers (#5542), the same node the Swift converter
|
|
9
|
+
* renders, and the lowering reads the SAME descriptor the server validator
|
|
10
|
+
* consumes, vendored into the CLI as `generated-schema-descriptor.ts` (a byte
|
|
11
|
+
* copy of `src/function-runs/schema-descriptor.ts`, kept fresh by
|
|
11
12
|
* `cli/scripts/gen-schema-descriptor.mjs` + its drift guard). So the
|
|
12
13
|
* generated type and the runtime validation can never disagree on:
|
|
13
14
|
*
|
|
@@ -18,8 +19,9 @@
|
|
|
18
19
|
* because the server only walks `properties`/`items` for the bare string
|
|
19
20
|
* `"object"`/`"array"` — a union is never descended, so a precise-looking
|
|
20
21
|
* type would over-promise.
|
|
21
|
-
* - `enum` → a
|
|
22
|
-
* first (the server gates on `type` before checking `enum`)
|
|
22
|
+
* - `enum` and `const` → a literal union, intersected with the declared
|
|
23
|
+
* `type` first (the server gates on `type` before checking `enum`); an
|
|
24
|
+
* object or array member renders as a literal object or tuple type (#5544).
|
|
23
25
|
* - `type: "object"` with `properties` → a nested object type; `required[]`
|
|
24
26
|
* drives `name:` vs `name?:`. An OPEN object (no `additionalProperties:
|
|
25
27
|
* false`) also emits `[key: string]: unknown` so extra keys the runtime
|
|
@@ -29,13 +31,16 @@
|
|
|
29
31
|
* - `oneOf` whose members are ALL `type: "object"` → a discriminated
|
|
30
32
|
* (tagged) union: the `|`-union of member object types, keyed by an
|
|
31
33
|
* auto-detected single-literal-`enum` discriminator (#1511). A defective
|
|
32
|
-
* all-object tagged union (no/ambiguous discriminator, <2 members)
|
|
33
|
-
*
|
|
34
|
-
*
|
|
34
|
+
* all-object tagged union (no/ambiguous discriminator, <2 members) is a
|
|
35
|
+
* STRICT codegen error, not a silent `unknown` (Fork 3, resolved by the
|
|
36
|
+
* maintainer).
|
|
37
|
+
* - `anyOf` → the union of its members, intersected with the node's own
|
|
38
|
+
* shape when it has one (#5544).
|
|
39
|
+
* - `nullable: true` → `T | null` (#5544).
|
|
35
40
|
*
|
|
36
41
|
* Everything else the server ignores (`$ref`, `allOf`, `format`,
|
|
37
|
-
* `patternProperties`, numeric constraints, tuple `items`, and a `oneOf
|
|
38
|
-
*
|
|
42
|
+
* `patternProperties`, numeric constraints, tuple `items`, and a `oneOf` whose
|
|
43
|
+
* members are NOT all objects) renders `unknown`.
|
|
39
44
|
*
|
|
40
45
|
* Errors are NOT swallowed here — a malformed schema fails upstream at parse
|
|
41
46
|
* time, and a defective tagged union throws — this walker otherwise returns
|
|
@@ -50,6 +55,7 @@
|
|
|
50
55
|
* shapes by hand — see that module's header.
|
|
51
56
|
*/
|
|
52
57
|
import { type TypeNode } from "../codegen-shared/prettierStable.js";
|
|
58
|
+
import { type LowerSchemaOptions, type ShapeNode } from "./schemaIR.js";
|
|
53
59
|
/**
|
|
54
60
|
* Convert a parsed JSON Schema node to a TypeScript type expression. Object
|
|
55
61
|
* types render multi-line (2-space indent per level); everything else renders
|
|
@@ -62,7 +68,25 @@ export declare function schemaToTsType(schema: any, indent?: number): string;
|
|
|
62
68
|
* it actually occupies so long unions/objects wrap exactly as Prettier would
|
|
63
69
|
* (#1565). See `codegen-shared/prettierStable.ts`.
|
|
64
70
|
*/
|
|
65
|
-
export declare function schemaToTypeNode(schema: any): TypeNode;
|
|
71
|
+
export declare function schemaToTypeNode(schema: any, options?: LowerSchemaOptions): TypeNode;
|
|
72
|
+
/**
|
|
73
|
+
* Render one lowered node (#5542, `schemaIR.ts`) as a TS type node.
|
|
74
|
+
*
|
|
75
|
+
* - `literals`: a string member is emitted via `tsStringLiteral` (Prettier's
|
|
76
|
+
* quote choice, #1565); a number, boolean, or `null` via `JSON.stringify`,
|
|
77
|
+
* already a Prettier fixed point for those; an object as a literal object
|
|
78
|
+
* type and an array as a tuple, recursively (#5544).
|
|
79
|
+
* - `union`: `integer` maps to `number`, so `["number", "integer"]` is one
|
|
80
|
+
* `number`.
|
|
81
|
+
* - `unknown` is `unknown` whatever its `nullable`.
|
|
82
|
+
* - `tagged`: the `|`-union of member objects, the discriminant required in
|
|
83
|
+
* each so a value without the tag cannot compile (#1511).
|
|
84
|
+
* - `untagged`: `m1 | m2`, or `base & (m1 | m2)` (#5544).
|
|
85
|
+
* - `nullable`: `T | null`; `named`: the reference, `| null` when it adds null.
|
|
86
|
+
* - `refused`: a defective all-object tagged union is a strict codegen error
|
|
87
|
+
* (Fork 3, resolved by the maintainer), not a silent `unknown`.
|
|
88
|
+
*/
|
|
89
|
+
export declare function renderTsShape(node: ShapeNode): TypeNode;
|
|
66
90
|
/**
|
|
67
91
|
* True when the schema REJECTS an empty object `{}` — i.e. the client's
|
|
68
92
|
* `rootInput: options.input ?? {}` fallback would fail validation, so `input`
|
|
@@ -74,7 +98,10 @@ export declare function schemaToTypeNode(schema: any): TypeNode;
|
|
|
74
98
|
* - a declared top-level `type` that `{}` does not satisfy (anything but
|
|
75
99
|
* `object`, e.g. `string`/`array`, or a union with no `object` arm);
|
|
76
100
|
* - a top-level `enum` (a fresh `{}` is never an enum member);
|
|
77
|
-
* - `type: "object"` with a non-empty `required[]` (a missing required key)
|
|
101
|
+
* - `type: "object"` with a non-empty `required[]` (a missing required key);
|
|
102
|
+
* - a top-level `const` that is not `{}` (compared by JSON equality, as the
|
|
103
|
+
* validator compares it), and an `anyOf` none of whose members admits `{}`
|
|
104
|
+
* (#5544).
|
|
78
105
|
*
|
|
79
106
|
* An all-optional object schema, or a schema with no top-level constraints,
|
|
80
107
|
* accepts `{}` → `input` is optional.
|