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

package/dist/internals.cjs

@@ -50,7 +50,7 @@ __export(internals_exports, {
 module.exports = __toCommonJS(internals_exports);
 
 // src/canonicalize/chain-dsl-canonicalizer.ts
-var import_core = require("@formspec/core");
+var import_internals = require("@formspec/core/internals");
 var CHAIN_DSL_PROVENANCE = {
   surface: "chain-dsl",
   file: "",
@@ -69,7 +69,7 @@ function isField(el) {
 function canonicalizeChainDSL(form) {
   return {
     kind: "form-ir",
-    irVersion: import_core.IR_VERSION,
+    irVersion: import_internals.IR_VERSION,
     elements: canonicalizeElements(form.elements),
     rootAnnotations: [],
     typeRegistry: {},
@@ -362,7 +362,7 @@ function buildObjectProperties(elements, insideConditional = false) {
 }
 
 // src/canonicalize/tsdoc-canonicalizer.ts
-var import_core2 = require("@formspec/core");
+var import_internals2 = require("@formspec/core/internals");
 function canonicalizeTSDoc(analysis, source) {
   const file = source?.file ?? "";
   const provenance = {
@@ -374,7 +374,7 @@ function canonicalizeTSDoc(analysis, source) {
   const elements = assembleElements(analysis.fields, analysis.fieldLayouts, provenance);
   return {
     kind: "form-ir",
-    irVersion: import_core2.IR_VERSION,
+    irVersion: import_internals2.IR_VERSION,
     elements,
     typeRegistry: analysis.typeRegistry,
     ...analysis.annotations !== void 0 && analysis.annotations.length > 0 && { rootAnnotations: analysis.annotations },
@@ -451,11 +451,12 @@ var ts2 = __toESM(require("typescript"), 1);
 var ts = __toESM(require("typescript"), 1);
 var import_internal = require("@formspec/analysis/internal");
 var import_tsdoc = require("@microsoft/tsdoc");
-var import_core3 = require("@formspec/core");
+var import_internals3 = require("@formspec/core/internals");
+var import_internals4 = require("@formspec/core/internals");
 var TAGS_REQUIRING_RAW_TEXT = /* @__PURE__ */ new Set(["pattern", "enumOptions", "defaultValue"]);
 function createFormSpecTSDocConfig(extensionTagNames = []) {
   const config = new import_tsdoc.TSDocConfiguration();
-  for (const tagName of Object.keys(import_core3.BUILTIN_CONSTRAINT_DEFINITIONS)) {
+  for (const tagName of Object.keys(import_internals3.BUILTIN_CONSTRAINT_DEFINITIONS)) {
     config.addTagDefinition(
       new import_tsdoc.TSDocTagDefinition({
         tagName: "@" + tagName,
@@ -498,10 +499,71 @@ function sharedTagValueOptions(options) {
   };
 }
 var SYNTHETIC_TYPE_FORMAT_FLAGS = ts.TypeFormatFlags.NoTruncation | ts.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope;
+function collectImportedNames(sourceFile) {
+  const importedNames = /* @__PURE__ */ new Set();
+  for (const statement of sourceFile.statements) {
+    if (ts.isImportDeclaration(statement) && statement.importClause !== void 0) {
+      const clause = statement.importClause;
+      if (clause.name !== void 0) {
+        importedNames.add(clause.name.text);
+      }
+      if (clause.namedBindings !== void 0) {
+        if (ts.isNamedImports(clause.namedBindings)) {
+          for (const specifier of clause.namedBindings.elements) {
+            importedNames.add(specifier.name.text);
+          }
+        } else if (ts.isNamespaceImport(clause.namedBindings)) {
+          importedNames.add(clause.namedBindings.name.text);
+        }
+      }
+      continue;
+    }
+    if (ts.isImportEqualsDeclaration(statement)) {
+      importedNames.add(statement.name.text);
+    }
+  }
+  return importedNames;
+}
+function isNonReferenceIdentifier(node) {
+  const parent = node.parent;
+  if ((ts.isBindingElement(parent) || ts.isClassDeclaration(parent) || ts.isEnumDeclaration(parent) || ts.isEnumMember(parent) || ts.isFunctionDeclaration(parent) || ts.isFunctionExpression(parent) || ts.isImportClause(parent) || ts.isImportEqualsDeclaration(parent) || ts.isImportSpecifier(parent) || ts.isInterfaceDeclaration(parent) || ts.isMethodDeclaration(parent) || ts.isMethodSignature(parent) || ts.isModuleDeclaration(parent) || ts.isNamespaceExport(parent) || ts.isNamespaceImport(parent) || ts.isParameter(parent) || ts.isPropertyDeclaration(parent) || ts.isPropertySignature(parent) || ts.isSetAccessorDeclaration(parent) || ts.isGetAccessorDeclaration(parent) || ts.isTypeAliasDeclaration(parent) || ts.isTypeParameterDeclaration(parent) || ts.isVariableDeclaration(parent)) && parent.name === node) {
+    return true;
+  }
+  if ((ts.isPropertyAssignment(parent) || ts.isPropertyAccessExpression(parent)) && parent.name === node) {
+    return true;
+  }
+  if (ts.isQualifiedName(parent) && parent.right === node) {
+    return true;
+  }
+  return false;
+}
+function statementReferencesImportedName(statement, importedNames) {
+  let referencesImportedName = false;
+  const visit = (node) => {
+    if (referencesImportedName) {
+      return;
+    }
+    if (ts.isIdentifier(node) && importedNames.has(node.text) && !isNonReferenceIdentifier(node)) {
+      referencesImportedName = true;
+      return;
+    }
+    ts.forEachChild(node, visit);
+  };
+  visit(statement);
+  return referencesImportedName;
+}
 function buildSupportingDeclarations(sourceFile) {
-  return sourceFile.statements.filter(
-    (statement) => !ts.isImportDeclaration(statement) && !ts.isImportEqualsDeclaration(statement) && !(ts.isExportDeclaration(statement) && statement.moduleSpecifier !== void 0)
-  ).map((statement) => statement.getText(sourceFile));
+  const importedNames = collectImportedNames(sourceFile);
+  return sourceFile.statements.filter((statement) => {
+    if (ts.isImportDeclaration(statement)) return false;
+    if (ts.isImportEqualsDeclaration(statement)) return false;
+    if (ts.isExportDeclaration(statement) && statement.moduleSpecifier !== void 0)
+      return false;
+    if (importedNames.size > 0 && statementReferencesImportedName(statement, importedNames)) {
+      return false;
+    }
+    return true;
+  }).map((statement) => statement.getText(sourceFile));
 }
 function renderSyntheticArgumentExpression(valueKind, argumentText) {
   const trimmed = argumentText.trim();
@@ -638,7 +700,7 @@ function hasBuiltinConstraintBroadening(tagName, options) {
   return broadenedTypeId !== void 0 && options?.extensionRegistry?.findBuiltinConstraintBroadening(broadenedTypeId, tagName) !== void 0;
 }
 function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, parsedTag, provenance, supportingDeclarations, options) {
-  if (!(0, import_core3.isBuiltinConstraintName)(tagName)) {
+  if (!(0, import_internals3.isBuiltinConstraintName)(tagName)) {
     return [];
   }
   const checker = options?.checker;
@@ -868,7 +930,7 @@ function parseTSDocTags(node, file = "", options) {
         }
       }
       for (const block of docComment.customBlocks) {
-        const tagName = (0, import_core3.normalizeConstraintTagName)(block.blockTag.tagName.substring(1));
+        const tagName = (0, import_internals3.normalizeConstraintTagName)(block.blockTag.tagName.substring(1));
         const parsedTag = nextParsedTag(tagName);
         if (tagName === "displayName" || tagName === "format" || tagName === "placeholder") {
           const text2 = getBestBlockPayloadText(parsedTag, commentText, range.pos, block);
@@ -900,7 +962,7 @@ function parseTSDocTags(node, file = "", options) {
         }
         if (TAGS_REQUIRING_RAW_TEXT.has(tagName)) continue;
         const text = getBestBlockPayloadText(parsedTag, commentText, range.pos, block);
-        const expectedType = (0, import_core3.isBuiltinConstraintName)(tagName) ? import_core3.BUILTIN_CONSTRAINT_DEFINITIONS[tagName] : void 0;
+        const expectedType = (0, import_internals3.isBuiltinConstraintName)(tagName) ? import_internals3.BUILTIN_CONSTRAINT_DEFINITIONS[tagName] : void 0;
         if (text === "" && expectedType !== "boolean") continue;
         const provenance = parsedTag !== null ? provenanceForParsedTag(parsedTag, sourceFile, file) : provenanceForComment(range, sourceFile, file, tagName);
         const compilerDiagnostics = buildCompilerBackedConstraintDiagnostics(
@@ -1088,6 +1150,9 @@ function extractBlockText(block) {
 }
 function extractPlainText(node) {
   let result = "";
+  if (node instanceof import_tsdoc.DocExcerpt) {
+    return node.content.toString();
+  }
   if (node instanceof import_tsdoc.DocPlainText) {
     return node.text;
   }
@@ -1128,7 +1193,7 @@ function getBestBlockPayloadText(tag, commentText, commentOffset, block) {
 function collectRawTextFallbacks(node, file) {
   const fallbacks = /* @__PURE__ */ new Map();
   for (const tag of ts.getJSDocTags(node)) {
-    const tagName = (0, import_core3.normalizeConstraintTagName)(tag.tagName.text);
+    const tagName = (0, import_internals3.normalizeConstraintTagName)(tag.tagName.text);
     if (!TAGS_REQUIRING_RAW_TEXT.has(tagName)) continue;
     const commentText = getTagCommentText(tag)?.trim() ?? "";
     if (commentText === "") continue;
@@ -3245,7 +3310,7 @@ function createExtensionRegistry(extensions) {
 }
 
 // src/generators/method-schema.ts
-var import_core4 = require("@formspec/core");
+var import_internals5 = require("@formspec/core/internals");
 function typeToJsonSchema(type, checker) {
   const typeRegistry = {};
   const visiting = /* @__PURE__ */ new Set();
@@ -3253,7 +3318,7 @@ function typeToJsonSchema(type, checker) {
   const fieldProvenance = { surface: "tsdoc", file: "", line: 0, column: 0 };
   const ir = {
     kind: "form-ir",
-    irVersion: import_core4.IR_VERSION,
+    irVersion: import_internals5.IR_VERSION,
     elements: [
       {
         kind: "field",