@formspec/build 0.1.0-alpha.20 → 0.1.0-alpha.22

package/dist/extensions/registry.d.ts

@@ -14,6 +14,8 @@ import type { ExtensionDefinition, CustomTypeRegistration, CustomConstraintRegis
  * Type IDs follow the format: `<extensionId>/<typeName>`
  * Constraint IDs follow the format: `<extensionId>/<constraintName>`
  * Annotation IDs follow the format: `<extensionId>/<annotationName>`
+ *
+ * @public
  */
 export interface ExtensionRegistry {
     /** The extensions registered in this registry (in registration order). */
@@ -74,6 +76,8 @@ export interface ExtensionRegistry {
  * @param extensions - The extension definitions to register.
  * @returns An {@link ExtensionRegistry} instance.
  * @throws If duplicate type/constraint/annotation IDs are detected across extensions.
+ *
+ * @public
  */
 export declare function createExtensionRegistry(extensions: readonly ExtensionDefinition[]): ExtensionRegistry;
 //# sourceMappingURL=registry.d.ts.map

package/dist/extensions/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/extensions/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,mBAAmB,EACnB,sBAAsB,EACtB,4BAA4B,EAC5B,4BAA4B,EAC5B,yBAAyB,EACzB,uCAAuC,EACxC,MAAM,gBAAgB,CAAC;AAMxB;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAChC,0EAA0E;IAC1E,QAAQ,CAAC,UAAU,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAEpD;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAAC;IAC7D;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,MAAM,GACf;QAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAA;KAAE,GAAG,SAAS,CAAC;IAE/F;;;;;OAKG;IACH,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,4BAA4B,GAAG,SAAS,CAAC;IAC/E;;OAEG;IACH,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAC7B;QACE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAC7B,QAAQ,CAAC,YAAY,EAAE,yBAAyB,CAAC;KAClD,GACD,SAAS,CAAC;IACd;;OAEG;IACH,+BAA+B,CAC7B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GAEb;QACE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAC7B,QAAQ,CAAC,YAAY,EAAE,uCAAuC,CAAC;KAChE,GACD,SAAS,CAAC;IAEd;;;;;OAKG;IACH,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,4BAA4B,GAAG,SAAS,CAAC;CAChF;AAMD;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,SAAS,mBAAmB,EAAE,GACzC,iBAAiB,CA8FnB"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/extensions/registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EACV,mBAAmB,EACnB,sBAAsB,EACtB,4BAA4B,EAC5B,4BAA4B,EAC5B,yBAAyB,EACzB,uCAAuC,EACxC,MAAM,gBAAgB,CAAC;AAMxB;;;;;;;;GAQG;AACH,MAAM,WAAW,iBAAiB;IAChC,0EAA0E;IAC1E,QAAQ,CAAC,UAAU,EAAE,SAAS,mBAAmB,EAAE,CAAC;IAEpD;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAAC;IAC7D;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,MAAM,GACf;QAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAA;KAAE,GAAG,SAAS,CAAC;IAE/F;;;;;OAKG;IACH,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,4BAA4B,GAAG,SAAS,CAAC;IAC/E;;OAEG;IACH,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAC7B;QACE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAC7B,QAAQ,CAAC,YAAY,EAAE,yBAAyB,CAAC;KAClD,GACD,SAAS,CAAC;IACd;;OAEG;IACH,+BAA+B,CAC7B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GAEb;QACE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;QAC7B,QAAQ,CAAC,YAAY,EAAE,uCAAuC,CAAC;KAChE,GACD,SAAS,CAAC;IAEd;;;;;OAKG;IACH,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,4BAA4B,GAAG,SAAS,CAAC;CAChF;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,SAAS,mBAAmB,EAAE,GACzC,iBAAiB,CA8FnB"}

package/dist/generators/class-schema.d.ts

@@ -11,6 +11,8 @@ import { type TSDocSource } from "../canonicalize/index.js";
 import { type GenerateJsonSchemaFromIROptions, type JsonSchema2020 } from "../json-schema/ir-generator.js";
 /**
  * Generated schemas for a class.
+ *
+ * @public
  */
 export interface ClassSchemas {
     /** JSON Schema 2020-12 for validation */
@@ -31,6 +33,8 @@ export interface ClassSchemas {
 export declare function generateClassSchemas(analysis: IRClassAnalysis, source?: TSDocSource, options?: GenerateJsonSchemaFromIROptions): ClassSchemas;
 /**
  * Options for generating schemas from a decorated class.
+ *
+ * @public
  */
 export interface GenerateFromClassOptions extends GenerateJsonSchemaFromIROptions {
     /** Path to the TypeScript source file */
@@ -40,6 +44,8 @@ export interface GenerateFromClassOptions extends GenerateJsonSchemaFromIROption
 }
 /**
  * Result of generating schemas from a decorated class.
+ *
+ * @public
  */
 export interface GenerateFromClassResult {
     /** JSON Schema 2020-12 for validation */
@@ -65,10 +71,14 @@ export interface GenerateFromClassResult {
  *
  * @param options - File path, class name, and optional compiler options
  * @returns Generated JSON Schema and UI Schema
+ *
+ * @public
  */
 export declare function generateSchemasFromClass(options: GenerateFromClassOptions): GenerateFromClassResult;
 /**
  * Options for generating schemas from a named type (class, interface, or type alias).
+ *
+ * @public
  */
 export interface GenerateSchemasOptions extends GenerateJsonSchemaFromIROptions {
     /** Path to the TypeScript source file */
@@ -94,6 +104,8 @@ export interface GenerateSchemasOptions extends GenerateJsonSchemaFromIROptions
  *
  * @param options - File path and type name
  * @returns Generated JSON Schema and UI Schema
+ *
+ * @public
  */
 export declare function generateSchemas(options: GenerateSchemasOptions): GenerateFromClassResult;
 //# sourceMappingURL=class-schema.d.ts.map

package/dist/generators/class-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"class-schema.d.ts","sourceRoot":"","sources":["../../src/generators/class-schema.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAMtD,OAAO,EAAoB,KAAK,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAEL,KAAK,+BAA+B,EACpC,KAAK,cAAc,EACpB,MAAM,gCAAgC,CAAC;AAIxC;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,yCAAyC;IACzC,UAAU,EAAE,cAAc,CAAC;IAC3B,yCAAyC;IACzC,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,eAAe,EACzB,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE,+BAA+B,GACxC,YAAY,CAuBd;AAmBD;;GAEG;AACH,MAAM,WAAW,wBAAyB,SAAQ,+BAA+B;IAC/E,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,4BAA4B;IAC5B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,yCAAyC;IACzC,UAAU,EAAE,cAAc,CAAC;IAC3B,yCAAyC;IACzC,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,wBAAwB,GAChC,uBAAuB,CAsBzB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAuB,SAAQ,+BAA+B;IAC7E,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,sEAAsE;IACtE,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,uBAAuB,CAOxF"}
+{"version":3,"file":"class-schema.d.ts","sourceRoot":"","sources":["../../src/generators/class-schema.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAMtD,OAAO,EAAoB,KAAK,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAEL,KAAK,+BAA+B,EACpC,KAAK,cAAc,EACpB,MAAM,gCAAgC,CAAC;AAIxC;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,yCAAyC;IACzC,UAAU,EAAE,cAAc,CAAC;IAC3B,yCAAyC;IACzC,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,eAAe,EACzB,MAAM,CAAC,EAAE,WAAW,EACpB,OAAO,CAAC,EAAE,+BAA+B,GACxC,YAAY,CAuBd;AAmBD;;;;GAIG;AACH,MAAM,WAAW,wBAAyB,SAAQ,+BAA+B;IAC/E,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,4BAA4B;IAC5B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;GAIG;AACH,MAAM,WAAW,uBAAuB;IACtC,yCAAyC;IACzC,UAAU,EAAE,cAAc,CAAC;IAC3B,yCAAyC;IACzC,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,wBAAwB,GAChC,uBAAuB,CAsBzB;AAED;;;;GAIG;AACH,MAAM,WAAW,sBAAuB,SAAQ,+BAA+B;IAC7E,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,sEAAsE;IACtE,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,uBAAuB,CAOxF"}

package/dist/generators/mixed-authoring.d.ts

@@ -11,6 +11,8 @@ import type { GenerateJsonSchemaFromIROptions, JsonSchema2020 } from "../json-sc
 import type { UISchema } from "../ui-schema/types.js";
 /**
  * Result of generating schemas from a mixed-authoring composition.
+ *
+ * @public
  */
 export interface MixedAuthoringSchemas {
     /** JSON Schema 2020-12 for validation. */
@@ -23,6 +25,8 @@ export interface MixedAuthoringSchemas {
  *
  * The `typeName` can resolve to a class, interface, or object type alias, just
  * like `generateSchemas()`.
+ *
+ * @public
  */
 export interface BuildMixedAuthoringSchemasOptions extends GenerateJsonSchemaFromIROptions {
     /** Path to the TypeScript source file. */
@@ -40,6 +44,8 @@ export interface BuildMixedAuthoringSchemasOptions extends GenerateJsonSchemaFro
  * ordering, and constraints; ChainDSL overlays may contribute dynamic runtime
  * field metadata such as dynamic enum or dynamic schema keywords, and may fill
  * in missing annotations.
+ *
+ * @public
  */
 export declare function buildMixedAuthoringSchemas(options: BuildMixedAuthoringSchemasOptions): MixedAuthoringSchemas;
 //# sourceMappingURL=mixed-authoring.d.ts.map

package/dist/generators/mixed-authoring.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mixed-authoring.d.ts","sourceRoot":"","sources":["../../src/generators/mixed-authoring.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAGV,WAAW,EAEX,QAAQ,EAET,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,+BAA+B,EAC/B,cAAc,EACf,MAAM,gCAAgC,CAAC;AAGxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKtD;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,0CAA0C;IAC1C,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IACpC,0CAA0C;IAC1C,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;CAC7B;AAED;;;;;GAKG;AACH,MAAM,WAAW,iCAAkC,SAAQ,+BAA+B;IACxF,0CAA0C;IAC1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,8DAA8D;IAC9D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,2GAA2G;IAC3G,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,WAAW,EAAE,CAAC,CAAC;CACrD;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,iCAAiC,GACzC,qBAAqB,CAUvB"}
+{"version":3,"file":"mixed-authoring.d.ts","sourceRoot":"","sources":["../../src/generators/mixed-authoring.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAGV,WAAW,EAEX,QAAQ,EAET,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EACV,+BAA+B,EAC/B,cAAc,EACf,MAAM,gCAAgC,CAAC;AAGxC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAKtD;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,0CAA0C;IAC1C,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IACpC,0CAA0C;IAC1C,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;CAC7B;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,iCAAkC,SAAQ,+BAA+B;IACxF,0CAA0C;IAC1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,8DAA8D;IAC9D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,2GAA2G;IAC3G,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,SAAS,WAAW,EAAE,CAAC,CAAC;CACrD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,iCAAiC,GACzC,qBAAqB,CAUvB"}

package/dist/index.cjs

@@ -803,6 +803,9 @@ function applyAnnotations(schema, annotations, ctx) {
       case "description":
         schema.description = annotation.value;
         break;
+      case "remarks":
+        schema[`${ctx.vendorPrefix}-remarks`] = annotation.value;
+        break;
       case "defaultValue":
         schema.default = annotation.value;
         break;
@@ -1281,7 +1284,7 @@ var ts2 = __toESM(require("typescript"), 1);
 
 // src/analyzer/tsdoc-parser.ts
 var ts = __toESM(require("typescript"), 1);
-var import_analysis = require("@formspec/analysis");
+var import_internal = require("@formspec/analysis/internal");
 var import_tsdoc = require("@microsoft/tsdoc");
 var import_core3 = require("@formspec/core");
 var TAGS_REQUIRING_RAW_TEXT = /* @__PURE__ */ new Set(["pattern", "enumOptions", "defaultValue"]);
@@ -1296,7 +1299,7 @@ function createFormSpecTSDocConfig(extensionTagNames = []) {
       })
     );
   }
-  for (const tagName of ["displayName", "description", "format", "placeholder"]) {
+  for (const tagName of ["displayName", "format", "placeholder"]) {
     config.addTagDefinition(
       new import_tsdoc.TSDocTagDefinition({
         tagName: "@" + tagName,
@@ -1375,12 +1378,12 @@ function supportsConstraintCapability(type, checker, capability) {
   if (capability === void 0) {
     return true;
   }
-  if ((0, import_analysis.hasTypeSemanticCapability)(type, checker, capability)) {
+  if ((0, import_internal.hasTypeSemanticCapability)(type, checker, capability)) {
     return true;
   }
   if (capability === "string-like") {
     const itemType = getArrayElementType(type, checker);
-    return itemType !== null && (0, import_analysis.hasTypeSemanticCapability)(itemType, checker, capability);
+    return itemType !== null && (0, import_internal.hasTypeSemanticCapability)(itemType, checker, capability);
   }
   return false;
 }
@@ -1478,11 +1481,11 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
   if (checker === void 0 || subjectType === void 0) {
     return [];
   }
-  const placement = (0, import_analysis.resolveDeclarationPlacement)(node);
+  const placement = (0, import_internal.resolveDeclarationPlacement)(node);
   if (placement === null) {
     return [];
   }
-  const definition = (0, import_analysis.getTagDefinition)(tagName, options?.extensionRegistry?.extensions);
+  const definition = (0, import_internal.getTagDefinition)(tagName, options?.extensionRegistry?.extensions);
   if (definition === null) {
     return [];
   }
@@ -1516,7 +1519,7 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
         )
       ];
     }
-    const resolution = (0, import_analysis.resolvePathTargetType)(subjectType, checker, target.path.segments);
+    const resolution = (0, import_internal.resolvePathTargetType)(subjectType, checker, target.path.segments);
     if (resolution.kind === "missing-property") {
       return [
         makeDiagnostic(
@@ -1573,7 +1576,7 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
   const subjectTypeText = checker.typeToString(subjectType, node, SYNTHETIC_TYPE_FORMAT_FLAGS);
   const hostType = options?.hostType ?? subjectType;
   const hostTypeText = checker.typeToString(hostType, node, SYNTHETIC_TYPE_FORMAT_FLAGS);
-  const result = (0, import_analysis.checkSyntheticTagApplication)({
+  const result = (0, import_internal.checkSyntheticTagApplication)({
     tagName,
     placement,
     hostType: hostTypeText,
@@ -1656,10 +1659,8 @@ function parseTSDocTags(node, file = "", options) {
   const annotations = [];
   const diagnostics = [];
   let displayName;
-  let description;
   let placeholder;
   let displayNameProvenance;
-  let descriptionProvenance;
   let placeholderProvenance;
   const rawTextTags = [];
   const sourceFile = node.getSourceFile();
@@ -1681,7 +1682,7 @@ function parseTSDocTags(node, file = "", options) {
         import_tsdoc.TextRange.fromStringRange(sourceText, range.pos, range.end)
       );
       const docComment = parserContext.docComment;
-      const parsedComment = (0, import_analysis.parseCommentBlock)(
+      const parsedComment = (0, import_internal.parseCommentBlock)(
         commentText,
         sharedCommentSyntaxOptions(options, range.pos)
       );
@@ -1704,7 +1705,7 @@ function parseTSDocTags(node, file = "", options) {
       for (const block of docComment.customBlocks) {
         const tagName = (0, import_core3.normalizeConstraintTagName)(block.blockTag.tagName.substring(1));
         const parsedTag = nextParsedTag(tagName);
-        if (tagName === "displayName" || tagName === "description" || tagName === "format" || tagName === "placeholder") {
+        if (tagName === "displayName" || tagName === "format" || tagName === "placeholder") {
           const text2 = getBestBlockPayloadText(parsedTag, commentText, range.pos, block);
           if (text2 === "") continue;
           const provenance2 = parsedTag !== null ? provenanceForParsedTag(parsedTag, sourceFile, file) : provenanceForComment(range, sourceFile, file, tagName);
@@ -1723,10 +1724,6 @@ function parseTSDocTags(node, file = "", options) {
                 provenance: provenance2
               });
               break;
-            case "description":
-              description = text2;
-              descriptionProvenance = provenance2;
-              break;
             case "placeholder":
               if (placeholder === void 0) {
                 placeholder = text2;
@@ -1754,7 +1751,7 @@ function parseTSDocTags(node, file = "", options) {
           diagnostics.push(...compilerDiagnostics);
           continue;
         }
-        const constraintNode = (0, import_analysis.parseConstraintTagValue)(
+        const constraintNode = (0, import_internal.parseConstraintTagValue)(
           tagName,
           text,
           provenance,
@@ -1773,18 +1770,26 @@ function parseTSDocTags(node, file = "", options) {
           provenance: provenanceForComment(range, sourceFile, file, "deprecated")
         });
       }
-      if (description === void 0 && docComment.remarksBlock !== void 0) {
-        const remarks = extractBlockText(docComment.remarksBlock).trim();
-        if (remarks !== "") {
-          description = remarks;
-          descriptionProvenance = provenanceForComment(range, sourceFile, file, "remarks");
-        }
-      }
-      if (description === void 0) {
+      {
         const summary = extractPlainText(docComment.summarySection).trim();
         if (summary !== "") {
-          description = summary;
-          descriptionProvenance = provenanceForComment(range, sourceFile, file, "summary");
+          annotations.push({
+            kind: "annotation",
+            annotationKind: "description",
+            value: summary,
+            provenance: provenanceForComment(range, sourceFile, file, "summary")
+          });
+        }
+      }
+      if (docComment.remarksBlock !== void 0) {
+        const remarksText = extractBlockText(docComment.remarksBlock).trim();
+        if (remarksText !== "") {
+          annotations.push({
+            kind: "annotation",
+            annotationKind: "remarks",
+            value: remarksText,
+            provenance: provenanceForComment(range, sourceFile, file, "remarks")
+          });
         }
       }
     }
@@ -1797,14 +1802,6 @@ function parseTSDocTags(node, file = "", options) {
       provenance: displayNameProvenance
     });
   }
-  if (description !== void 0 && descriptionProvenance !== void 0) {
-    annotations.push({
-      kind: "annotation",
-      annotationKind: "description",
-      value: description,
-      provenance: descriptionProvenance
-    });
-  }
   if (placeholder !== void 0 && placeholderProvenance !== void 0) {
     annotations.push({
       kind: "annotation",
@@ -1824,7 +1821,7 @@ function parseTSDocTags(node, file = "", options) {
       if (text === "") continue;
       const provenance = provenanceForParsedTag(rawTextTag.tag, sourceFile, file);
       if (rawTextTag.tag.normalizedTagName === "defaultValue") {
-        const defaultValueNode = (0, import_analysis.parseDefaultValueTagValue)(text, provenance);
+        const defaultValueNode = (0, import_internal.parseDefaultValueTagValue)(text, provenance);
         annotations.push(defaultValueNode);
         continue;
       }
@@ -1841,7 +1838,7 @@ function parseTSDocTags(node, file = "", options) {
         diagnostics.push(...compilerDiagnostics);
         continue;
       }
-      const constraintNode = (0, import_analysis.parseConstraintTagValue)(
+      const constraintNode = (0, import_internal.parseConstraintTagValue)(
         rawTextTag.tag.normalizedTagName,
         text,
         provenance,
@@ -1858,7 +1855,7 @@ function parseTSDocTags(node, file = "", options) {
       if (text === "") continue;
       const provenance = fallback.provenance;
       if (tagName === "defaultValue") {
-        const defaultValueNode = (0, import_analysis.parseDefaultValueTagValue)(text, provenance);
+        const defaultValueNode = (0, import_internal.parseDefaultValueTagValue)(text, provenance);
         annotations.push(defaultValueNode);
         continue;
       }
@@ -1875,7 +1872,7 @@ function parseTSDocTags(node, file = "", options) {
         diagnostics.push(...compilerDiagnostics);
         continue;
       }
-      const constraintNode = (0, import_analysis.parseConstraintTagValue)(
+      const constraintNode = (0, import_internal.parseConstraintTagValue)(
         tagName,
         text,
         provenance,
@@ -1901,7 +1898,7 @@ function extractDisplayNameMetadata(node) {
       if (range.kind !== ts.SyntaxKind.MultiLineCommentTrivia) continue;
       const commentText = sourceText.substring(range.pos, range.end);
       if (!commentText.startsWith("/**")) continue;
-      const parsed = (0, import_analysis.parseCommentBlock)(commentText);
+      const parsed = (0, import_internal.parseCommentBlock)(commentText);
       for (const tag of parsed.tags) {
         if (tag.normalizedTagName !== "displayName") {
           continue;
@@ -1954,7 +1951,7 @@ function getSharedPayloadText(tag, commentText, commentOffset) {
   if (tag.payloadSpan === null) {
     return "";
   }
-  return (0, import_analysis.sliceCommentSpan)(commentText, tag.payloadSpan, {
+  return (0, import_internal.sliceCommentSpan)(commentText, tag.payloadSpan, {
     offset: commentOffset
   }).trim();
 }
@@ -1980,7 +1977,7 @@ function collectRawTextFallbacks(node, file) {
   return fallbacks;
 }
 function isMemberTargetDisplayName(text) {
-  return (0, import_analysis.parseTagSyntax)("displayName", text).target !== null;
+  return (0, import_internal.parseTagSyntax)("displayName", text).target !== null;
 }
 function provenanceForComment(range, sourceFile, file, tagName) {
   const { line, character } = sourceFile.getLineAndCharacterOfPosition(range.pos);
@@ -3258,9 +3255,9 @@ function analyzeNamedTypeToIR(filePath, typeName, extensionRegistry) {
 }
 
 // src/validate/constraint-validator.ts
-var import_analysis2 = require("@formspec/analysis");
+var import_internal2 = require("@formspec/analysis/internal");
 function validateFieldNode(ctx, field) {
-  const analysis = (0, import_analysis2.analyzeConstraintTargets)(
+  const analysis = (0, import_internal2.analyzeConstraintTargets)(
     field.name,
     field.type,
     field.constraints,
@@ -3278,7 +3275,7 @@ function validateFieldNode(ctx, field) {
 }
 function validateObjectProperty(ctx, parentName, property) {
   const qualifiedName = `${parentName}.${property.name}`;
-  const analysis = (0, import_analysis2.analyzeConstraintTargets)(
+  const analysis = (0, import_internal2.analyzeConstraintTargets)(
     qualifiedName,
     property.type,
     property.constraints,