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

package/dist/internals.cjs

@@ -275,7 +275,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 {
@@ -1632,30 +1634,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)) {
@@ -2768,6 +2810,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,
@@ -3712,7 +3762,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");
@@ -3735,7 +3785,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,
@@ -3745,7 +3796,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);
@@ -4039,7 +4091,7 @@ function makeFileProvenance(filePath) {
 }
 
 // src/generators/class-schema.ts
-var ts5 = __toESM(require("typescript"), 1);
+var ts6 = __toESM(require("typescript"), 1);
 
 // src/metadata/collision-guards.ts
 function assertUniqueSerializedNames(entries, scope) {
@@ -4886,8 +4938,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();
@@ -4911,6 +4965,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}`;
@@ -4980,7 +5048,10 @@ function createExtensionRegistry(extensions) {
             `Metadata tag "@${canonicalTagName}" conflicts with existing FormSpec tag "@${canonicalTagName}".`
           );
         }
-        if (Object.hasOwn(import_internals5.BUILTIN_CONSTRAINT_DEFINITIONS, (0, import_internals5.normalizeConstraintTagName)(canonicalTagName))) {
+        if (Object.hasOwn(
+          import_internals5.BUILTIN_CONSTRAINT_DEFINITIONS,
+          (0, import_internals5.normalizeConstraintTagName)(canonicalTagName)
+        )) {
           throw new Error(
             `Metadata tag "@${canonicalTagName}" conflicts with existing FormSpec tag "@${(0, import_internals5.normalizeConstraintTagName)(canonicalTagName)}".`
           );
@@ -5001,6 +5072,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((0, import_internal3.normalizeFormSpecTagName)(tagName)),
     findBuiltinConstraintBroadening: (typeId, tagName) => builtinBroadeningMap.get(`${typeId}:${tagName}`),
@@ -5008,6 +5084,10 @@ function createExtensionRegistry(extensions) {
   };
 }
 
+// src/extensions/symbol-registry.ts
+var ts5 = __toESM(require("typescript"), 1);
+var path2 = __toESM(require("path"), 1);
+
 // src/ui-schema/schema.ts
 var import_zod = require("zod");
 var jsonPointerSchema = import_zod.z.string();
@@ -5216,7 +5296,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);