@formspec/build 0.1.0-alpha.44 → 0.1.0-alpha.46

package/dist/internals.d.ts

@@ -18,7 +18,7 @@ export { createProgramContext, createProgramContextFromProgram, findClassByName,
 export { analyzeClassToIR, analyzeInterfaceToIR, analyzeTypeAliasToIR, } from "./analyzer/class-analyzer.js";
 export type { DiscriminatorResolutionOptions, IRClassAnalysis, FieldLayoutMetadata, AnalyzeTypeAliasToIRResult, } from "./analyzer/class-analyzer.js";
 export type { AnalyzeNamedTypeToIRDetailedResult } from "./analyzer/program.js";
-export { generateClassSchemas, generateClassSchemasDetailed } from "./generators/class-schema.js";
+export { generateClassSchemas, generateClassSchemasDetailed, resolveStaticOptions, } from "./generators/class-schema.js";
 export type { ClassSchemas, DetailedClassSchemasResult } from "./generators/class-schema.js";
 export { generateJsonSchemaFromIR } from "./json-schema/ir-generator.js";
 export type { GenerateJsonSchemaFromIROptions, JsonSchema2020, } from "./json-schema/ir-generator.js";
@@ -26,7 +26,7 @@ export { generateUiSchemaFromIR } from "./ui-schema/ir-generator.js";
 export { validateIR } from "./validate/index.js";
 export type { ValidationDiagnostic, ValidationResult, ValidateIROptions, } from "./validate/index.js";
 export { createExtensionRegistry } from "./extensions/index.js";
-export type { ExtensionRegistry } from "./extensions/index.js";
+export type { ExtensionRegistry, ExtensionTypeLookupResult, MutableExtensionRegistry, } from "./extensions/index.js";
 export { generateMethodSchemas, collectFormSpecReferences } from "./generators/method-schema.js";
 export type { LoadedFormSpecSchemas, MethodSchemas } from "./generators/method-schema.js";
 //# sourceMappingURL=internals.d.ts.map

package/dist/internals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internals.d.ts","sourceRoot":"","sources":["../src/internals.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,YAAY,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EACL,oBAAoB,EACpB,+BAA+B,EAC/B,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,8CAA8C,EAC9C,sCAAsC,GACvC,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,8BAA8B,CAAC;AACtC,YAAY,EACV,8BAA8B,EAC9B,eAAe,EACf,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AACtC,YAAY,EAAE,kCAAkC,EAAE,MAAM,uBAAuB,CAAC;AAGhF,OAAO,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAClG,YAAY,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAG7F,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,YAAY,EACV,+BAA+B,EAC/B,cAAc,GACf,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,YAAY,EACV,oBAAoB,EACpB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,YAAY,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG/D,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AACjG,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"internals.d.ts","sourceRoot":"","sources":["../src/internals.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAG/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,YAAY,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EACL,oBAAoB,EACpB,+BAA+B,EAC/B,eAAe,EACf,mBAAmB,EACnB,mBAAmB,EACnB,8CAA8C,EAC9C,sCAAsC,GACvC,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,8BAA8B,CAAC;AACtC,YAAY,EACV,8BAA8B,EAC9B,eAAe,EACf,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,8BAA8B,CAAC;AACtC,YAAY,EAAE,kCAAkC,EAAE,MAAM,uBAAuB,CAAC;AAGhF,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,oBAAoB,GACrB,MAAM,8BAA8B,CAAC;AACtC,YAAY,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAG7F,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,YAAY,EACV,+BAA+B,EAC/B,cAAc,GACf,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,YAAY,EACV,oBAAoB,EACpB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,YAAY,EACV,iBAAiB,EACjB,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AACjG,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC"}

package/dist/internals.js

@@ -220,7 +220,9 @@ function resolveTypeNodeMetadata(type, options) {
     case "object":
       return {
         ...type,
-        properties: type.properties.map((property) => resolveObjectPropertyMetadata(property, options))
+        properties: type.properties.map(
+          (property) => resolveObjectPropertyMetadata(property, options)
+        )
       };
     case "record":
       return {
@@ -1598,30 +1600,70 @@ function isObjectType(type) {
 function isIntersectionType(type) {
   return !!(type.flags & ts3.TypeFlags.Intersection);
 }
+function collectBrandIdentifiers(type) {
+  if (!type.isIntersection()) {
+    return [];
+  }
+  const brands = [];
+  for (const prop of type.getProperties()) {
+    const decl = prop.valueDeclaration ?? prop.declarations?.[0];
+    if (decl === void 0) continue;
+    if (!ts3.isPropertySignature(decl) && !ts3.isPropertyDeclaration(decl)) continue;
+    if (!ts3.isComputedPropertyName(decl.name)) continue;
+    if (!ts3.isIdentifier(decl.name.expression)) continue;
+    brands.push(decl.name.expression.text);
+  }
+  return brands;
+}
+function resolveCanonicalSymbol(type, checker) {
+  const raw = type.aliasSymbol ?? type.getSymbol();
+  if (raw === void 0) return void 0;
+  return raw.flags & ts3.SymbolFlags.Alias ? checker.getAliasedSymbol(raw) : raw;
+}
+function resolveSymbolBasedCustomType(type, extensionRegistry, checker) {
+  if (extensionRegistry === void 0) {
+    return null;
+  }
+  const canonical = resolveCanonicalSymbol(type, checker);
+  if (canonical === void 0) {
+    return null;
+  }
+  const registration = extensionRegistry.findTypeBySymbol(canonical);
+  if (registration === void 0) {
+    return null;
+  }
+  return {
+    kind: "custom",
+    typeId: `${registration.extensionId}/${registration.registration.typeName}`,
+    payload: null
+  };
+}
 function isIntegerBrandedType(type) {
   if (!type.isIntersection()) {
     return false;
   }
-  const hasNumberBase = type.types.some(
-    (member) => !!(member.flags & ts3.TypeFlags.Number)
-  );
+  const hasNumberBase = type.types.some((member) => !!(member.flags & ts3.TypeFlags.Number));
   if (!hasNumberBase) {
     return false;
   }
-  return type.getProperties().some((prop) => {
-    const declaration = prop.valueDeclaration ?? prop.declarations?.[0];
-    if (declaration === void 0) {
-      return false;
-    }
-    if (!ts3.isPropertySignature(declaration) && !ts3.isPropertyDeclaration(declaration)) {
-      return false;
-    }
-    const name = declaration.name;
-    if (!ts3.isComputedPropertyName(name)) {
-      return false;
+  return collectBrandIdentifiers(type).includes("__integerBrand");
+}
+function resolveBrandedCustomType(type, extensionRegistry) {
+  if (extensionRegistry === void 0) {
+    return null;
+  }
+  for (const brand of collectBrandIdentifiers(type)) {
+    const registration = extensionRegistry.findTypeByBrand(brand);
+    if (registration === void 0) {
+      continue;
     }
-    return ts3.isIdentifier(name.expression) && name.expression.text === "__integerBrand";
-  });
+    return {
+      kind: "custom",
+      typeId: `${registration.extensionId}/${registration.registration.typeName}`,
+      payload: null
+    };
+  }
+  return null;
 }
 function isResolvableObjectLikeAliasTypeNode(typeNode) {
   if (ts3.isParenthesizedTypeNode(typeNode)) {
@@ -2734,6 +2776,14 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode
   if (customType) {
     return customType;
   }
+  const symbolCustomType = resolveSymbolBasedCustomType(type, extensionRegistry, checker);
+  if (symbolCustomType) {
+    return symbolCustomType;
+  }
+  const brandedCustomType = resolveBrandedCustomType(type, extensionRegistry);
+  if (brandedCustomType) {
+    return brandedCustomType;
+  }
   const primitiveAlias = tryResolveNamedPrimitiveAlias(
     type,
     checker,
@@ -3678,7 +3728,7 @@ function createProgramContextFromProgram(program, filePath) {
     sourceFile
   };
 }
-function createProgramContext(filePath) {
+function createProgramContext(filePath, additionalFiles) {
   const absolutePath = path.resolve(filePath);
   const fileDir = path.dirname(absolutePath);
   const configPath = ts4.findConfigFile(fileDir, ts4.sys.fileExists.bind(ts4.sys), "tsconfig.json");
@@ -3701,7 +3751,8 @@ function createProgramContext(filePath) {
       throw new Error(`Error parsing tsconfig.json: ${errorMessages}`);
     }
     compilerOptions = parsed.options;
-    fileNames = parsed.fileNames.includes(absolutePath) ? parsed.fileNames : [...parsed.fileNames, absolutePath];
+    const normalizedAdditional = (additionalFiles ?? []).map((f) => path.resolve(f));
+    fileNames = [.../* @__PURE__ */ new Set([...parsed.fileNames, absolutePath, ...normalizedAdditional])];
   } else {
     compilerOptions = {
       target: ts4.ScriptTarget.ES2022,
@@ -3711,7 +3762,8 @@ function createProgramContext(filePath) {
       skipLibCheck: true,
       declaration: true
     };
-    fileNames = [absolutePath];
+    const normalizedAdditional = (additionalFiles ?? []).map((f) => path.resolve(f));
+    fileNames = [.../* @__PURE__ */ new Set([absolutePath, ...normalizedAdditional])];
   }
   const program = ts4.createProgram(fileNames, compilerOptions);
   const sourceFile = program.getSourceFile(absolutePath);
@@ -4005,7 +4057,7 @@ function makeFileProvenance(filePath) {
 }
 
 // src/generators/class-schema.ts
-import * as ts5 from "typescript";
+import * as ts6 from "typescript";
 
 // src/metadata/collision-guards.ts
 function assertUniqueSerializedNames(entries, scope) {
@@ -4858,8 +4910,10 @@ function buildConstraintTagSources(extensions) {
 }
 function createExtensionRegistry(extensions) {
   const reservedTagSources = buildConstraintTagSources(extensions);
+  let symbolMap = /* @__PURE__ */ new Map();
   const typeMap = /* @__PURE__ */ new Map();
   const typeNameMap = /* @__PURE__ */ new Map();
+  const brandMap = /* @__PURE__ */ new Map();
   const constraintMap = /* @__PURE__ */ new Map();
   const constraintTagMap = /* @__PURE__ */ new Map();
   const builtinBroadeningMap = /* @__PURE__ */ new Map();
@@ -4883,6 +4937,20 @@ function createExtensionRegistry(extensions) {
             registration: type
           });
         }
+        if (type.brand !== void 0) {
+          if (type.brand === "__integerBrand") {
+            throw new Error(
+              `Brand "__integerBrand" is reserved for the builtin Integer type and cannot be registered by extensions`
+            );
+          }
+          if (brandMap.has(type.brand)) {
+            throw new Error(`Duplicate custom type brand: "${type.brand}"`);
+          }
+          brandMap.set(type.brand, {
+            extensionId: ext.extensionId,
+            registration: type
+          });
+        }
         if (type.builtinConstraintBroadenings !== void 0) {
           for (const broadening of type.builtinConstraintBroadenings) {
             const key = `${qualifiedId}:${broadening.tagName}`;
@@ -4952,7 +5020,10 @@ function createExtensionRegistry(extensions) {
             `Metadata tag "@${canonicalTagName}" conflicts with existing FormSpec tag "@${canonicalTagName}".`
           );
         }
-        if (Object.hasOwn(BUILTIN_CONSTRAINT_DEFINITIONS2, normalizeConstraintTagName2(canonicalTagName))) {
+        if (Object.hasOwn(
+          BUILTIN_CONSTRAINT_DEFINITIONS2,
+          normalizeConstraintTagName2(canonicalTagName)
+        )) {
           throw new Error(
             `Metadata tag "@${canonicalTagName}" conflicts with existing FormSpec tag "@${normalizeConstraintTagName2(canonicalTagName)}".`
           );
@@ -4973,6 +5044,11 @@ function createExtensionRegistry(extensions) {
     extensions,
     findType: (typeId) => typeMap.get(typeId),
     findTypeByName: (typeName) => typeNameMap.get(typeName),
+    findTypeByBrand: (brand) => brandMap.get(brand),
+    findTypeBySymbol: (symbol) => symbolMap.get(symbol),
+    setSymbolMap: (map) => {
+      symbolMap = map;
+    },
     findConstraint: (constraintId) => constraintMap.get(constraintId),
     findConstraintTag: (tagName) => constraintTagMap.get(normalizeFormSpecTagName2(tagName)),
     findBuiltinConstraintBroadening: (typeId, tagName) => builtinBroadeningMap.get(`${typeId}:${tagName}`),
@@ -4980,6 +5056,10 @@ function createExtensionRegistry(extensions) {
   };
 }
 
+// src/extensions/symbol-registry.ts
+import * as ts5 from "typescript";
+import * as path2 from "path";
+
 // src/ui-schema/schema.ts
 import { z } from "zod";
 var jsonPointerSchema = z.string();
@@ -5188,7 +5268,10 @@ function irElementsToUiSchema(elements, fieldNameMap, parentRule) {
         break;
       }
       case "conditional": {
-        const newRule = createShowRule(fieldNameMap.get(element.fieldName) ?? element.fieldName, element.value);
+        const newRule = createShowRule(
+          fieldNameMap.get(element.fieldName) ?? element.fieldName,
+          element.value
+        );
         const combinedRule = parentRule !== void 0 ? combineRules(parentRule, newRule) : newRule;
         const childElements = irElementsToUiSchema(element.elements, fieldNameMap, combinedRule);
         result.push(...childElements);
@@ -5235,9 +5318,7 @@ function collectFieldNameMap(elements) {
 }
 
 // src/validate/constraint-validator.ts
-import {
-  analyzeConstraintTargets
-} from "@formspec/analysis/internal";
+import { analyzeConstraintTargets } from "@formspec/analysis/internal";
 function validateFieldNode(ctx, field) {
   const analysis = analyzeConstraintTargets(
     field.name,
@@ -5367,6 +5448,19 @@ ${lines.map((line) => `- ${line}`).join("\n")}`;
 function formatLocation(location) {
   return `${location.file}:${String(location.line)}:${String(location.column)}`;
 }
+function resolveStaticOptions(options) {
+  const legacyRegistry = options.extensionRegistry;
+  const configRegistry = legacyRegistry === void 0 && options.config?.extensions !== void 0 ? createExtensionRegistry(options.config.extensions) : void 0;
+  return {
+    extensionRegistry: legacyRegistry ?? configRegistry,
+    // eslint-disable-next-line @typescript-eslint/no-deprecated -- migration bridge reads deprecated fields
+    vendorPrefix: options.vendorPrefix ?? options.config?.vendorPrefix,
+    // eslint-disable-next-line @typescript-eslint/no-deprecated -- migration bridge reads deprecated fields
+    enumSerialization: options.enumSerialization ?? options.config?.enumSerialization,
+    // eslint-disable-next-line @typescript-eslint/no-deprecated -- migration bridge reads deprecated fields
+    metadata: options.metadata ?? options.config?.metadata
+  };
+}
 
 // src/generators/method-schema.ts
 import { IR_VERSION as IR_VERSION3 } from "@formspec/core/internals";
@@ -5510,6 +5604,7 @@ export {
   generateJsonSchemaFromIR,
   generateMethodSchemas,
   generateUiSchemaFromIR,
+  resolveStaticOptions,
   validateIR
 };
 //# sourceMappingURL=internals.js.map