@formspec/build 0.1.0-alpha.38 → 0.1.0-alpha.39

package/dist/cli.js

@@ -5264,29 +5264,35 @@ function analyzeNamedTypeToIR(filePath, typeName, extensionRegistry, metadataPol
     discriminatorOptions
   );
 }
-function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensionRegistry, metadataPolicy, discriminatorOptions) {
+function analyzeNamedTypeToIRFromProgramContextDetailed(ctx, filePath, typeName, extensionRegistry, metadataPolicy, discriminatorOptions) {
   const analysisFilePath = path.resolve(filePath);
   const classDecl = findClassByName(ctx.sourceFile, typeName);
   if (classDecl !== null) {
-    return analyzeClassToIR(
-      classDecl,
-      ctx.checker,
-      analysisFilePath,
-      extensionRegistry,
-      metadataPolicy,
-      discriminatorOptions
-    );
+    return {
+      ok: true,
+      analysis: analyzeClassToIR(
+        classDecl,
+        ctx.checker,
+        analysisFilePath,
+        extensionRegistry,
+        metadataPolicy,
+        discriminatorOptions
+      )
+    };
   }
   const interfaceDecl = findInterfaceByName(ctx.sourceFile, typeName);
   if (interfaceDecl !== null) {
-    return analyzeInterfaceToIR(
-      interfaceDecl,
-      ctx.checker,
-      analysisFilePath,
-      extensionRegistry,
-      metadataPolicy,
-      discriminatorOptions
-    );
+    return {
+      ok: true,
+      analysis: analyzeInterfaceToIR(
+        interfaceDecl,
+        ctx.checker,
+        analysisFilePath,
+        extensionRegistry,
+        metadataPolicy,
+        discriminatorOptions
+      )
+    };
   }
   const typeAlias = findTypeAliasByName(ctx.sourceFile, typeName);
   if (typeAlias !== null) {
@@ -5299,11 +5305,20 @@ function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensi
       discriminatorOptions
     );
     if (result.ok) {
-      return result.analysis;
+      return { ok: true, analysis: result.analysis };
     }
     const fallbackEligible = result.kind === "not-object-like" && isResolvableObjectLikeAliasTypeNode(typeAlias.type) && containsTypeReferenceInObjectLikeAlias(typeAlias.type);
     if (!fallbackEligible) {
-      throw new Error(result.error);
+      return {
+        ok: false,
+        diagnostics: [
+          makeProgramDiagnostic(
+            result.kind === "duplicate-properties" ? "DUPLICATE_ROOT_PROPERTIES" : "UNSUPPORTED_ROOT_TYPE",
+            result.error,
+            makeNodeProvenance(typeAlias, analysisFilePath)
+          )
+        ]
+      };
     }
     const duplicatePropertyNames = findFallbackAliasDuplicatePropertyNames(
       typeAlias.type,
@@ -5312,9 +5327,16 @@ function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensi
     if (duplicatePropertyNames.length > 0) {
       const sourceFile = typeAlias.getSourceFile();
       const { line } = sourceFile.getLineAndCharacterOfPosition(typeAlias.getStart());
-      throw new Error(
-        `Type alias "${typeAlias.name.text}" at line ${String(line + 1)} contains duplicate property names across object-like members: ${duplicatePropertyNames.join(", ")}`
-      );
+      return {
+        ok: false,
+        diagnostics: [
+          makeProgramDiagnostic(
+            "DUPLICATE_ROOT_PROPERTIES",
+            `Type alias "${typeAlias.name.text}" at line ${String(line + 1)} contains duplicate property names across object-like members: ${duplicatePropertyNames.join(", ")}`,
+            makeNodeProvenance(typeAlias, analysisFilePath)
+          )
+        ]
+      };
     }
     const rootInfo = analyzeDeclarationRootInfo(
       typeAlias,
@@ -5344,13 +5366,71 @@ function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensi
       diagnostics
     );
     if (fallbackAnalysis !== null) {
-      return fallbackAnalysis;
+      return { ok: true, analysis: fallbackAnalysis };
     }
-    throw new Error(result.error);
+    return {
+      ok: false,
+      diagnostics: [
+        makeProgramDiagnostic(
+          "UNSUPPORTED_ROOT_TYPE",
+          result.error,
+          makeNodeProvenance(typeAlias, analysisFilePath)
+        )
+      ]
+    };
   }
-  throw new Error(
-    `Type "${typeName}" not found as a class, interface, or type alias in ${analysisFilePath}`
+  return {
+    ok: false,
+    diagnostics: [
+      makeProgramDiagnostic(
+        "TYPE_NOT_FOUND",
+        `Type "${typeName}" not found as a class, interface, or type alias in ${analysisFilePath}`,
+        makeFileProvenance(analysisFilePath)
+      )
+    ]
+  };
+}
+function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensionRegistry, metadataPolicy, discriminatorOptions) {
+  const result = analyzeNamedTypeToIRFromProgramContextDetailed(
+    ctx,
+    filePath,
+    typeName,
+    extensionRegistry,
+    metadataPolicy,
+    discriminatorOptions
   );
+  if (result.ok) {
+    return result.analysis;
+  }
+  throw new Error(result.diagnostics.map((diagnostic) => diagnostic.message).join("\n"));
+}
+function makeProgramDiagnostic(code, message, primaryLocation) {
+  return {
+    code,
+    message,
+    severity: "error",
+    primaryLocation,
+    relatedLocations: []
+  };
+}
+function makeNodeProvenance(node, filePath) {
+  const sourceFile = node.getSourceFile();
+  const position = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+  return {
+    surface: "tsdoc",
+    file: filePath,
+    line: position.line + 1,
+    column: position.character,
+    length: node.getWidth()
+  };
+}
+function makeFileProvenance(filePath) {
+  return {
+    surface: "tsdoc",
+    file: filePath,
+    line: 1,
+    column: 0
+  };
 }
 var init_program = __esm({
   "src/analyzer/program.ts"() {
@@ -5448,13 +5528,27 @@ var init_validate = __esm({
 });
 
 // src/generators/class-schema.ts
-import "typescript";
+import * as ts5 from "typescript";
 function generateClassSchemas(analysis, source, options) {
-  const errorDiagnostics = analysis.diagnostics?.filter(
+  const result = generateClassSchemasDetailed(analysis, source, options);
+  if (!result.ok || result.jsonSchema === void 0 || result.uiSchema === void 0) {
+    throw new Error(formatValidationError(result.diagnostics));
+  }
+  return {
+    jsonSchema: result.jsonSchema,
+    uiSchema: result.uiSchema
+  };
+}
+function generateClassSchemasDetailed(analysis, source, options) {
+  const analysisDiagnostics = analysis.diagnostics ?? [];
+  const errorDiagnostics = analysisDiagnostics.filter(
     (diagnostic) => diagnostic.severity === "error"
   );
-  if (errorDiagnostics !== void 0 && errorDiagnostics.length > 0) {
-    throw new Error(formatValidationError(errorDiagnostics));
+  if (errorDiagnostics.length > 0) {
+    return {
+      ok: false,
+      diagnostics: analysisDiagnostics
+    };
   }
   const ir = canonicalizeTSDoc(
     analysis,
@@ -5468,9 +5562,14 @@ function generateClassSchemas(analysis, source, options) {
     ...options?.vendorPrefix !== void 0 && { vendorPrefix: options.vendorPrefix }
   });
   if (!validationResult.valid) {
-    throw new Error(formatValidationError(validationResult.diagnostics));
+    return {
+      ok: false,
+      diagnostics: [...analysisDiagnostics, ...validationResult.diagnostics]
+    };
   }
   return {
+    ok: true,
+    diagnostics: [...analysisDiagnostics, ...validationResult.diagnostics],
     jsonSchema: generateJsonSchemaFromIR(ir, options),
     uiSchema: generateUiSchemaFromIR(ir)
   };
@@ -5512,25 +5611,127 @@ function generateSchemasFromClass(options) {
   );
 }
 function generateSchemas(options) {
-  const ctx = createProgramContext(options.filePath);
+  const result = generateSchemasDetailedInternal(options);
+  if (options.errorReporting === "diagnostics") {
+    return result;
+  }
+  if (!result.ok || result.jsonSchema === void 0 || result.uiSchema === void 0) {
+    throw new Error(formatValidationError(result.diagnostics));
+  }
+  return {
+    jsonSchema: result.jsonSchema,
+    uiSchema: result.uiSchema
+  };
+}
+function generateSchemasFromProgram(options) {
+  const result = generateSchemasFromProgramDetailedInternal(options);
+  if (options.errorReporting === "diagnostics") {
+    return result;
+  }
+  if (!result.ok || result.jsonSchema === void 0 || result.uiSchema === void 0) {
+    throw new Error(formatValidationError(result.diagnostics));
+  }
+  return {
+    jsonSchema: result.jsonSchema,
+    uiSchema: result.uiSchema
+  };
+}
+function generateSchemasDetailed(options) {
+  return generateSchemas({
+    ...options,
+    errorReporting: "diagnostics"
+  });
+}
+function generateSchemasDetailedInternal(options) {
+  let ctx;
+  try {
+    ctx = createProgramContext(options.filePath);
+  } catch (error) {
+    return {
+      ok: false,
+      diagnostics: [createProgramContextFailureDiagnostic(options.filePath, error)]
+    };
+  }
+  return generateSchemasFromDetailedProgramContext(ctx, options.filePath, options.typeName, options);
+}
+function generateSchemasFromProgramDetailed(options) {
   return generateSchemasFromProgram({
     ...options,
-    program: ctx.program
+    errorReporting: "diagnostics"
   });
 }
-function generateSchemasFromProgram(options) {
-  const ctx = createProgramContextFromProgram(options.program, options.filePath);
-  const analysis = analyzeNamedTypeToIRFromProgramContext(
+function generateSchemasFromProgramDetailedInternal(options) {
+  let ctx;
+  try {
+    ctx = createProgramContextFromProgram(options.program, options.filePath);
+  } catch (error) {
+    return {
+      ok: false,
+      diagnostics: [createProgramContextFailureDiagnostic(options.filePath, error)]
+    };
+  }
+  return generateSchemasFromDetailedProgramContext(ctx, options.filePath, options.typeName, options);
+}
+function generateSchemasBatch(options) {
+  const contextCache = /* @__PURE__ */ new Map();
+  return options.targets.map((target) => {
+    let ctx;
+    try {
+      const cacheKey = ts5.sys.useCaseSensitiveFileNames ? target.filePath : target.filePath.toLowerCase();
+      const cachedContext = contextCache.get(cacheKey);
+      if (cachedContext === void 0) {
+        ctx = createProgramContext(target.filePath);
+        contextCache.set(cacheKey, ctx);
+      } else {
+        ctx = cachedContext;
+      }
+    } catch (error) {
+      return withTarget(target, {
+        ok: false,
+        diagnostics: [createProgramContextFailureDiagnostic(target.filePath, error)]
+      });
+    }
+    return withTarget(
+      target,
+      generateSchemasFromDetailedProgramContext(ctx, target.filePath, target.typeName, options)
+    );
+  });
+}
+function generateSchemasBatchFromProgram(options) {
+  return options.targets.map((target) => {
+    let ctx;
+    try {
+      ctx = createProgramContextFromProgram(options.program, target.filePath);
+    } catch (error) {
+      return withTarget(target, {
+        ok: false,
+        diagnostics: [createProgramContextFailureDiagnostic(target.filePath, error)]
+      });
+    }
+    return withTarget(
+      target,
+      generateSchemasFromDetailedProgramContext(ctx, target.filePath, target.typeName, options)
+    );
+  });
+}
+function generateSchemasFromDetailedProgramContext(ctx, filePath, typeName, options) {
+  const analysisResult = analyzeNamedTypeToIRFromProgramContextDetailed(
     ctx,
-    options.filePath,
-    options.typeName,
+    filePath,
+    typeName,
     options.extensionRegistry,
     options.metadata,
     options.discriminator
   );
-  return generateClassSchemas(
-    analysis,
-    { file: options.filePath },
+  if (!analysisResult.ok) {
+    return {
+      ok: false,
+      diagnostics: analysisResult.diagnostics
+    };
+  }
+  return generateClassSchemasDetailed(
+    analysisResult.analysis,
+    { file: filePath },
     {
       extensionRegistry: options.extensionRegistry,
       metadata: options.metadata,
@@ -5538,6 +5739,27 @@ function generateSchemasFromProgram(options) {
     }
   );
 }
+function withTarget(target, result) {
+  return {
+    filePath: target.filePath,
+    typeName: target.typeName,
+    ...result
+  };
+}
+function createProgramContextFailureDiagnostic(filePath, error) {
+  return {
+    code: "PROGRAM_CONTEXT_FAILURE",
+    message: error instanceof Error ? error.message : String(error),
+    severity: "error",
+    primaryLocation: {
+      surface: "tsdoc",
+      file: filePath,
+      line: 1,
+      column: 0
+    },
+    relatedLocations: []
+  };
+}
 var init_class_schema = __esm({
   "src/generators/class-schema.ts"() {
     "use strict";
@@ -5592,8 +5814,11 @@ var init_static_build = __esm({
 // src/generators/discovered-schema.ts
 import * as ts7 from "typescript";
 import { IR_VERSION as IR_VERSION3 } from "@formspec/core/internals";
-function toDiscoveredTypeSchemas(result) {
-  return result;
+function toDiscoveredTypeSchemas(result, resolvedMetadata) {
+  return {
+    ...result,
+    ...resolvedMetadata !== void 0 && { resolvedMetadata }
+  };
 }
 function isNamedTypeDeclaration(declaration) {
   return ts7.isClassDeclaration(declaration) || ts7.isInterfaceDeclaration(declaration) || ts7.isTypeAliasDeclaration(declaration);
@@ -5741,7 +5966,8 @@ function generateSchemasFromAnalysis(analysis, filePath, options) {
         metadata: options?.metadata,
         vendorPrefix: options?.vendorPrefix
       }
-    )
+    ),
+    analysis.metadata
   );
 }
 function generateSchemasFromResolvedType(options, skipNamedDeclaration = false, rootOverride) {
@@ -5799,7 +6025,8 @@ function generateSchemasFromResolvedType(options, skipNamedDeclaration = false,
   }
   return {
     jsonSchema: toStandaloneJsonSchema(root, typeRegistry, options),
-    uiSchema: null
+    uiSchema: null,
+    ...root.metadata !== void 0 && { resolvedMetadata: root.metadata }
   };
 }
 function generateSchemasFromDeclaration(options) {
@@ -6139,10 +6366,14 @@ __export(index_exports, {
   createStaticBuildContextFromProgram: () => createStaticBuildContextFromProgram,
   generateJsonSchema: () => generateJsonSchema,
   generateSchemas: () => generateSchemas,
+  generateSchemasBatch: () => generateSchemasBatch,
+  generateSchemasBatchFromProgram: () => generateSchemasBatchFromProgram,
+  generateSchemasDetailed: () => generateSchemasDetailed,
   generateSchemasFromClass: () => generateSchemasFromClass,
   generateSchemasFromDeclaration: () => generateSchemasFromDeclaration,
   generateSchemasFromParameter: () => generateSchemasFromParameter,
   generateSchemasFromProgram: () => generateSchemasFromProgram,
+  generateSchemasFromProgramDetailed: () => generateSchemasFromProgramDetailed,
   generateSchemasFromReturnType: () => generateSchemasFromReturnType,
   generateSchemasFromType: () => generateSchemasFromType,
   generateUiSchema: () => generateUiSchema,
@@ -6185,6 +6416,9 @@ var init_index = __esm({
     init_generator();
     init_generator2();
     init_class_schema();
+    init_class_schema();
+    init_class_schema();
+    init_class_schema();
     init_static_build();
     init_discovered_schema();
     init_mixed_authoring();