@shapeshift-labs/frontier-lang-compiler 0.2.150 → 0.2.151

package/dist/native-region-scanner-js-commonjs.js

@@ -0,0 +1,155 @@
+import { nativeExportDeclaration } from './native-region-scanner-core.js';
+
+export function jsCommonJsExportDeclarations(input, lineNumber, trimmed) {
+  let match = trimmed.match(/^Object\.assign\(\s*(?:module\.)?exports\s*,\s*(\{.*\})\s*\)\s*;?$/);
+  if (match) return jsCommonJsObjectLiteralExportDeclarations(input, lineNumber, match[1]);
+  match = trimmed.match(/^Object\.defineProperties\(\s*(?:module\.)?exports\s*,\s*(\{.*\})\s*\)\s*;?$/);
+  if (match) return jsCommonJsDefinePropertiesExportDeclarations(input, lineNumber, match[1]);
+  match = trimmed.match(/^Object\.defineProperty\(\s*(?:module\.)?exports\s*,\s*(['"])([^'"]+)\1\s*,\s*(\{.*\})\s*\)\s*;?$/);
+  if (match) return jsCommonJsDescriptorExportDeclaration(input, lineNumber, match[2], match[3]);
+  match = trimmed.match(/^module\.exports\s*=\s*(.+?)\s*;?$/);
+  if (match) {
+    const localName = jsCommonJsExportLocalName(match[1]);
+    const assignment = nativeExportDeclaration(input, lineNumber, 'module.exports', 'CommonJsExportAssignment', {
+      exportKind: 'assignment',
+      ...(localName ? { localName } : {}),
+      commonJs: true
+    }, {
+      name: 'module.exports',
+      metadata: {
+        exportKind: 'assignment',
+        exportedName: 'module.exports',
+        ...(localName ? { localName } : {}),
+        commonJs: true,
+        publicContract: true
+      }
+    });
+    return [assignment, ...jsCommonJsObjectLiteralExportDeclarations(input, lineNumber, match[1])];
+  }
+  match = trimmed.match(/^(?:module\.)?exports(?:\.([A-Za-z_$][\w$]*)|\[\s*(['"])([^'"]+)\2\s*\])\s*=\s*(.+?)\s*;?$/);
+  if (!match) return [];
+  const exportedName = match[1] ?? match[3];
+  if (exportedName === '__esModule') return [];
+  const localName = jsCommonJsExportLocalName(match[4]);
+  return [nativeExportDeclaration(input, lineNumber, exportedName, 'CommonJsNamedExportAssignment', {
+    exportKind: 'commonjs-named',
+    ...(localName ? { localName } : {}),
+    commonJs: true
+  }, {
+    name: exportedName,
+    metadata: {
+      exportKind: 'commonjs-named',
+      exportedName,
+      ...(localName ? { localName } : {}),
+      commonJs: true,
+      publicContract: true
+    }
+  })];
+}
+
+function jsCommonJsDescriptorExportDeclaration(input, lineNumber, exportedName, descriptorSource) {
+  if (exportedName === '__esModule') return [];
+  const localName = jsCommonJsDescriptorLocalName(descriptorSource);
+  return [nativeExportDeclaration(input, lineNumber, exportedName, 'CommonJsDescriptorExportProperty', {
+    exportKind: 'commonjs-named',
+    ...(localName ? { localName } : {}),
+    commonJs: true
+  }, {
+    name: exportedName,
+    metadata: {
+      exportKind: 'commonjs-named',
+      exportedName,
+      ...(localName ? { localName } : {}),
+      commonJs: true,
+      publicContract: true
+    }
+  })];
+}
+
+function jsCommonJsDescriptorLocalName(source) {
+  const text = String(source ?? '');
+  return jsCommonJsExportLocalName(text.match(/\bvalue\s*:\s*([^,}]+)/)?.[1])
+    ?? jsCommonJsExportLocalName(text.match(/\bget\s*:\s*\(\)\s*=>\s*\{\s*return\s+([^;}]+)/)?.[1])
+    ?? jsCommonJsExportLocalName(text.match(/\bget\s*:\s*\(\)\s*=>\s*([^,}]+)/)?.[1])
+    ?? jsCommonJsExportLocalName(text.match(/\bget\s*:\s*function(?:\s+[A-Za-z_$][\w$]*)?\s*\(\)\s*\{\s*return\s+([^;}]+)/)?.[1])
+    ?? jsCommonJsExportLocalName(text.match(/\bget\s*\(\)\s*\{\s*return\s+([^;}]+)/)?.[1]);
+}
+
+function jsCommonJsObjectLiteralExportDeclarations(input, lineNumber, source) {
+  const text = String(source ?? '').trim();
+  if (!text.startsWith('{') || !text.endsWith('}')) return [];
+  return splitTopLevelObjectProperties(text.slice(1, -1))
+    .map((entry) => jsCommonJsObjectLiteralExport(input, lineNumber, entry))
+    .filter(Boolean);
+}
+
+function jsCommonJsObjectLiteralExport(input, lineNumber, entry) {
+  if (!entry || entry.startsWith('...') || entry.startsWith('[')) return undefined;
+  const match = entry.match(/^((?:[A-Za-z_$][\w$]*)|(?:"[^"]+"|'[^']+'))\s*(?::\s*(.+))?$/);
+  if (!match) return undefined;
+  const exportedName = unquote(match[1]);
+  if (exportedName === '__esModule') return undefined;
+  const localName = match[2] ? jsCommonJsExportLocalName(match[2]) : /^[A-Za-z_$]/.test(exportedName) ? exportedName : undefined;
+  return nativeExportDeclaration(input, lineNumber, exportedName, 'CommonJsObjectExportProperty', {
+    exportKind: 'commonjs-named',
+    ...(localName ? { localName } : {}),
+    commonJs: true
+  }, {
+    name: exportedName,
+    metadata: {
+      exportKind: 'commonjs-named',
+      exportedName,
+      ...(localName ? { localName } : {}),
+      commonJs: true,
+      publicContract: true
+    }
+  });
+}
+
+function jsCommonJsDefinePropertiesExportDeclarations(input, lineNumber, source) {
+  const text = String(source ?? '').trim();
+  if (!text.startsWith('{') || !text.endsWith('}')) return [];
+  return splitTopLevelObjectProperties(text.slice(1, -1))
+    .map((entry) => jsCommonJsDefinePropertiesExport(input, lineNumber, entry))
+    .filter(Boolean);
+}
+
+function jsCommonJsDefinePropertiesExport(input, lineNumber, entry) {
+  if (!entry || entry.startsWith('...') || entry.startsWith('[')) return undefined;
+  const match = entry.match(/^((?:[A-Za-z_$][\w$]*)|(?:"[^"]+"|'[^']+'))\s*:\s*(\{.*\})$/);
+  if (!match) return undefined;
+  return jsCommonJsDescriptorExportDeclaration(input, lineNumber, unquote(match[1]), match[2])[0];
+}
+
+function splitTopLevelObjectProperties(body) {
+  const entries = [];
+  let start = 0, depth = 0, quote;
+  for (let index = 0; index < body.length; index += 1) {
+    const char = body[index], previous = body[index - 1];
+    if (quote) {
+      if (char === quote && previous !== '\\') quote = undefined;
+    } else if (char === '"' || char === "'") quote = char;
+    else if (char === '{' || char === '[' || char === '(') depth += 1;
+    else if (char === '}' || char === ']' || char === ')') depth = Math.max(0, depth - 1);
+    else if (char === ',' && depth === 0) {
+      entries.push(body.slice(start, index).trim());
+      start = index + 1;
+    }
+  }
+  entries.push(body.slice(start).trim());
+  return entries;
+}
+
+function jsCommonJsExportLocalName(source) {
+  const text = String(source ?? '').trim();
+  return text.match(/^(?:async\s+)?function\*?\s+([A-Za-z_$][\w$]*)/)?.[1]
+    ?? text.match(/^(?:abstract\s+)?class\s+([A-Za-z_$][\w$]*)/)?.[1]
+    ?? text.match(/^([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)\b/)?.[1];
+}
+
+function unquote(value) {
+  const text = String(value ?? '');
+  return (text.startsWith('"') && text.endsWith('"')) || (text.startsWith("'") && text.endsWith("'"))
+    ? text.slice(1, -1)
+    : text;
+}

package/dist/native-region-scanner-js-imports.js

@@ -3,9 +3,17 @@ import {
   nativeImportBindingDeclaration,
   nativeImportDeclaration
 } from './native-region-scanner-core.js';
+import { jsCommonJsExportDeclarations } from './native-region-scanner-js-commonjs.js';
+import { jsCommonJsHelperImportDeclarations } from './native-region-scanner-js-ts-helpers.js';
+import { jsCommonJsReExportDeclarations } from './native-region-scanner-js-reexports.js';
 import { idFragment } from './native-import-utils.js';
+import { importAttributeMetadataFromSource } from './internal/index-impl/moduleImportAttributeMetadata.js';
 
 export function jsImportDeclarations(input, lineNumber, trimmed) {
+  const commonJsReExport = jsCommonJsReExportDeclarations(input, lineNumber, trimmed);
+  if (commonJsReExport.length) return commonJsReExport;
+  const commonJsHelperImport = jsCommonJsHelperImportDeclarations(input, lineNumber, trimmed);
+  if (commonJsHelperImport.length) return commonJsHelperImport;
   const importEquals = trimmed.match(/^import\s+(type\s+)?([A-Za-z_$][\w$]*)\s*=\s*require\s*\(\s*(['"])([^'"]+)\3\s*\)/);
   if (importEquals) return jsImportModuleDeclarations(input, lineNumber, importEquals[4], 'ImportEqualsDeclaration', [{
     localName: importEquals[2],
@@ -19,7 +27,7 @@ export function jsImportDeclarations(input, lineNumber, trimmed) {
     const importPath = importMatch[4];
     const clause = importMatch[2]?.trim();
     const bindings = clause ? jsImportBindingsFromClause(clause, { typeOnly }) : [];
-    return jsImportModuleDeclarations(input, lineNumber, importPath, 'ImportDeclaration', bindings, { typeOnly, sideEffectOnly: bindings.length === 0 });
+    return jsImportModuleDeclarations(input, lineNumber, importPath, 'ImportDeclaration', bindings, { typeOnly, sideEffectOnly: bindings.length === 0, importKind: bindings.length === 0 ? 'side-effect' : 'module', ...importAttributeMetadataFromSource(trimmed) });
   }
   const exportMatch = trimmed.match(/^export\s+(type\s+)?(?:(\*)\s+from|\*\s+as\s+([A-Za-z_$][\w$]*)\s+from|\{([^}]+)\}\s+from)\s+(['"])([^'"]+)\5/);
   if (exportMatch) {
@@ -31,24 +39,31 @@ export function jsImportDeclarations(input, lineNumber, trimmed) {
         ? jsNamedImportBindings(exportMatch[4], { typeOnly, reexport: true })
         : [];
     return [
-      ...jsImportModuleDeclarations(input, lineNumber, importPath, 'ExportFromDeclaration', bindings, { typeOnly, reexport: true, exportStar: Boolean(exportMatch[2]) }),
-      ...jsExportModuleDeclarations(input, lineNumber, importPath, bindings, { typeOnly, exportStar: Boolean(exportMatch[2]) })
+      ...jsImportModuleDeclarations(input, lineNumber, importPath, 'ExportFromDeclaration', bindings, { typeOnly, reexport: true, exportStar: Boolean(exportMatch[2]), ...importAttributeMetadataFromSource(trimmed) }),
+      ...jsExportModuleDeclarations(input, lineNumber, importPath, bindings, { typeOnly, exportStar: Boolean(exportMatch[2]), ...importAttributeMetadataFromSource(trimmed) })
     ];
   }
   const destructuredRequireMatch = trimmed.match(/^(?:const|let|var)\s+\{([^}]+)\}\s*=\s*(?:await\s+)?(require|import)\s*\(\s*(['"])([^'"]+)\3\s*\)/);
   if (destructuredRequireMatch) {
-    const importKind = destructuredRequireMatch[2] === 'import' ? 'dynamic-import-binding' : 'commonjs-require';
+    const dynamicImport = destructuredRequireMatch[2] === 'import';
+    const importKind = dynamicImport ? 'dynamic-import-binding' : 'commonjs-require';
     const bindings = jsDestructuredImportBindings(destructuredRequireMatch[1], importKind);
     if (bindings.length) {
-      return jsImportModuleDeclarations(input, lineNumber, destructuredRequireMatch[4], 'DestructuredRequireDeclaration', bindings, { destructured: true });
+      return jsImportModuleDeclarations(input, lineNumber, destructuredRequireMatch[4], 'DestructuredRequireDeclaration', bindings, {
+        destructured: true,
+        ...(dynamicImport ? jsDynamicImportMetadata() : {})
+      });
     }
   }
-  const requireMatch = trimmed.match(/^(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*(?:await\s+)?(?:require|import)\s*\(\s*(['"])([^'"]+)\2\s*\)/);
-  if (requireMatch) return jsImportModuleDeclarations(input, lineNumber, requireMatch[3], 'CommonJsRequireDeclaration', [{
-    localName: requireMatch[1],
-    importedName: 'default',
-    importKind: trimmed.includes('import') ? 'dynamic-import-binding' : 'commonjs-require'
-  }]);
+  const requireMatch = trimmed.match(/^(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*(?:await\s+)?(require|import)\s*\(\s*(['"])([^'"]+)\3\s*\)/);
+  if (requireMatch) {
+    const dynamicImport = requireMatch[2] === 'import';
+    return jsImportModuleDeclarations(input, lineNumber, requireMatch[4], dynamicImport ? 'DynamicImportBindingDeclaration' : 'CommonJsRequireDeclaration', [{
+      localName: requireMatch[1],
+      importedName: 'default',
+      importKind: dynamicImport ? 'dynamic-import-binding' : 'commonjs-require'
+    }], dynamicImport ? jsDynamicImportMetadata() : {});
+  }
   const sideEffectRequireMatch = trimmed.match(/^require\s*\(\s*(['"])([^'"]+)\1\s*\)\s*;?$/);
   if (sideEffectRequireMatch) {
     return jsImportModuleDeclarations(input, lineNumber, sideEffectRequireMatch[2], 'CommonJsSideEffectRequireDeclaration', [], {
@@ -56,10 +71,14 @@ export function jsImportDeclarations(input, lineNumber, trimmed) {
       importKind: 'commonjs-require'
     });
   }
+  const dynamicImportMatch = trimmed.match(/^import\s*\(\s*(['"])([^'"]+)\1\s*(?:,\s*(.+))?\)\s*;?$/);
+  if (dynamicImportMatch) return jsImportModuleDeclarations(input, lineNumber, dynamicImportMatch[2], 'DynamicImportExpression', [], jsDynamicImportMetadata(dynamicImportMatch[3]));
   return [];
 }
 
 export function jsExportDeclarations(input, lineNumber, trimmed) {
+  const commonJsExport = jsCommonJsExportDeclarations(input, lineNumber, trimmed);
+  if (commonJsExport.length) return commonJsExport;
   if (/^export\s+(?:type\s+)?(?:\*|\{[^}]+\}\s+from\b)/.test(trimmed)) return [];
   const named = trimmed.match(/^export\s+(type\s+)?\{([^}]+)\}\s*;?$/);
   if (named) return jsLocalExportDeclarations(input, lineNumber, named[2], { typeOnly: Boolean(named[1]) });
@@ -71,7 +90,15 @@ export function jsExportDeclarations(input, lineNumber, trimmed) {
   if (assignment) return [nativeExportDeclaration(input, lineNumber, 'module.exports', 'ExportAssignment', {
     exportKind: 'assignment',
     localName: assignment[1]
-  }, { name: 'module.exports' })];
+  }, {
+    name: 'module.exports',
+    metadata: {
+      exportKind: 'assignment',
+      exportedName: 'module.exports',
+      localName: assignment[1],
+      publicContract: true
+    }
+  })];
   if (!trimmed.startsWith('export ')) return [];
   const defaultMatch = trimmed.match(/^export\s+default\s+(.+)$/);
   if (defaultMatch) return [nativeExportDeclaration(input, lineNumber, 'default', 'ExportDefaultDeclaration', {
@@ -109,6 +136,7 @@ function jsImportModuleDeclarations(input, lineNumber, importPath, languageKind,
     localName: binding.localName,
     importedName: binding.importedName,
     importKind: binding.importKind,
+    ...(binding.namespace ? { namespace: binding.namespace } : {}),
     ...(binding.exportedName ? { exportedName: binding.exportedName } : {}),
     ...(binding.typeOnly ? { typeOnly: true } : {})
   }));
@@ -121,7 +149,9 @@ function jsImportModuleDeclarations(input, lineNumber, importPath, languageKind,
         ...(metadata.sideEffectOnly ? { sideEffectOnly: true } : {}),
         ...(metadata.reexport ? { reexport: true } : {}),
         ...(metadata.exportStar ? { exportStar: true } : {}),
-        ...(metadata.destructured ? { destructured: true } : {})
+        ...(metadata.destructured ? { destructured: true } : {}),
+        ...(metadata.dynamicImport ? { dynamicImport: true } : {}),
+        ...(metadata.hasImportAttributes ? { hasImportAttributes: true } : {})
       },
       metadata: {
         moduleOnly: true,
@@ -133,6 +163,14 @@ function jsImportModuleDeclarations(input, lineNumber, importPath, languageKind,
   ];
 }
 
+function jsDynamicImportMetadata(attributesSource) {
+  return {
+    importKind: 'dynamic-import',
+    dynamicImport: true,
+    ...importAttributeMetadataFromSource(attributesSource)
+  };
+}
+
 function jsExportModuleDeclarations(input, lineNumber, importPath, bindings = [], metadata = {}) {
   const exports = bindings.map((binding) => ({
     localName: binding.importedName,

package/dist/native-region-scanner-js-reexports.js

@@ -0,0 +1,79 @@
+import {
+  nativeExportDeclaration,
+  nativeImportBindingDeclaration,
+  nativeImportDeclaration
+} from './native-region-scanner-core.js';
+
+export function jsCommonJsReExportDeclarations(input, lineNumber, trimmed) {
+  const exportStar = trimmed.match(/^(?:[A-Za-z_$][\w$]*\s*\.\s*)?__exportStar\(\s*require\(\s*(['"])([^'"]+)\1\s*\)\s*,\s*(?:module\.)?exports\s*\)\s*;?$/);
+  if (exportStar) return commonJsExportStarDeclarations(input, lineNumber, exportStar[2]);
+  const binding = trimmed.match(/^(?:[A-Za-z_$][\w$]*\s*\.\s*)?__createBinding\(\s*(?:module\.)?exports\s*,\s*require\(\s*(['"])([^'"]+)\1\s*\)\s*,\s*(['"])([^'"]+)\3(?:\s*,\s*(['"])([^'"]+)\5)?\s*\)\s*;?$/);
+  if (binding) return commonJsCreateBindingDeclarations(input, lineNumber, binding[2], binding[4], binding[6] ?? binding[4]);
+  return [];
+}
+
+function commonJsExportStarDeclarations(input, lineNumber, importPath) {
+  const metadata = commonJsReExportMetadata({ exportStar: true, importKind: 'reexport' });
+  return [
+    ...importModuleDeclarations(input, lineNumber, importPath, 'CommonJsExportStarRequireDeclaration', [], metadata),
+    ...exportModuleDeclarations(input, lineNumber, importPath, [], { ...metadata, exportKind: 'export-star' })
+  ];
+}
+
+function commonJsCreateBindingDeclarations(input, lineNumber, importPath, importedName, exportedName) {
+  if (!importedName || !exportedName || exportedName === '__esModule') return [];
+  const binding = {
+    localName: exportedName,
+    importedName,
+    exportedName,
+    importKind: 'reexport',
+    exportKind: 'named',
+    commonJs: true
+  };
+  const metadata = commonJsReExportMetadata({ importKind: 'reexport', bindingCount: 1 });
+  return [
+    ...importModuleDeclarations(input, lineNumber, importPath, 'CommonJsCreateBindingRequireDeclaration', [binding], metadata),
+    ...exportModuleDeclarations(input, lineNumber, importPath, [binding], { ...metadata, exportKind: 'named' })
+  ];
+}
+
+function importModuleDeclarations(input, lineNumber, importPath, languageKind, bindings, metadata) {
+  return [
+    nativeImportDeclaration(input, lineNumber, importPath, languageKind, 'module', {
+      fields: { moduleOnly: true, importBindings: bindings, reexport: true, commonJs: true, ...(metadata.exportStar ? { exportStar: true } : {}) },
+      metadata: { moduleOnly: true, bindingCount: bindings.length, ...metadata }
+    }),
+    ...bindings.map((binding) => nativeImportBindingDeclaration(input, lineNumber, importPath, binding))
+  ];
+}
+
+function exportModuleDeclarations(input, lineNumber, importPath, bindings, metadata) {
+  const exports = bindings.map((binding) => ({
+    localName: binding.importedName,
+    importedName: binding.importedName,
+    exportedName: binding.exportedName ?? binding.localName,
+    exportKind: binding.exportKind ?? binding.importKind,
+    commonJs: true
+  }));
+  return [
+    nativeExportDeclaration(input, lineNumber, metadata.exportStar ? `* from ${importPath}` : `{${exports.map((binding) => binding.exportedName).join(',')}} from ${importPath}`, 'ExportFromDeclaration', {
+      importPath: String(importPath),
+      exportBindings: exports,
+      ...(metadata.exportStar ? { exportStar: true } : {})
+    }, { symbolKind: 'module', metadata }),
+    ...exports.map((binding) => nativeExportDeclaration(input, lineNumber, binding.exportedName, 'ExportBinding', {
+      ...binding,
+      importPath: String(importPath)
+    }, { metadata: { ...binding, importPath: String(importPath) } }))
+  ];
+}
+
+function commonJsReExportMetadata(extra = {}) {
+  return {
+    commonJs: true,
+    reexport: true,
+    reExport: true,
+    publicContract: true,
+    ...extra
+  };
+}

package/dist/native-region-scanner-js-ts-helpers.js

@@ -0,0 +1,23 @@
+import {
+  nativeImportBindingDeclaration,
+  nativeImportDeclaration
+} from './native-region-scanner-core.js';
+
+export function jsCommonJsHelperImportDeclarations(input, lineNumber, trimmed) {
+  const match = trimmed.match(/^(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*(?:[A-Za-z_$][\w$]*\s*\.\s*)?__(importStar|importDefault)\(\s*require\(\s*(['"])([^'"]+)\3\s*\)\s*\)\s*;?$/);
+  if (!match) return [];
+  const localName = match[1], helper = `__${match[2]}`, importPath = match[4];
+  const binding = helper === '__importStar'
+    ? { localName, importedName: '*', namespace: localName, importKind: 'namespace' }
+    : { localName, importedName: 'default', importKind: 'default' };
+  const metadata = { commonJs: true, interopHelper: helper, importKind: binding.importKind };
+  return [
+    nativeImportDeclaration(input, lineNumber, importPath, 'CommonJsInteropHelperRequireDeclaration', 'module', {
+      fields: { moduleOnly: true, importBindings: [binding], commonJs: true, interopHelper: helper },
+      metadata: { moduleOnly: true, bindingCount: 1, ...metadata }
+    }),
+    nativeImportBindingDeclaration(input, lineNumber, importPath, binding, {
+      metadata
+    })
+  ];
+}

package/dist/native-source-ledger-helpers.js

@@ -1,7 +1,7 @@
 const regexStartKeywords = new Set(['case', 'delete', 'else', 'in', 'instanceof', 'new', 'return', 'throw', 'typeof', 'void', 'yield']);
 
 export function isSourceMapComment(text) {
-  return /^(?:\/\/|\/\*)[#@]\s*sourceMappingURL=/.test(String(text).trim());
+  return /^(?:\/\/|\/\*)[#@]\s*source(?:Mapping)?URL=/.test(String(text).trim());
 }
 
 export function readToLineEnd(text, start) {

package/dist/native-source-ledger.js

@@ -81,9 +81,7 @@ export function scanJavaScriptTypeScriptSourceLedger(sourceText, input = {}) {
     const next = sourceText[offset + 1];
     if (offset === 0 && char === '#' && next === '!') {
       const part = consume(readToLineEnd(sourceText, offset));
-      push(ledger.trivia, 'shebang', 'trivia', part.text, part.start, part.end);
-      push(ledger.comments, 'shebang', 'comment', part.text, part.start, part.end);
-      ledger.shebangs.push(sourceLedgerSpan({
+      const entry = sourceLedgerSpan({
         index: ledger.spans.length,
         kind: 'shebang',
         role: 'directive',
@@ -91,9 +89,12 @@ export function scanJavaScriptTypeScriptSourceLedger(sourceText, input = {}) {
         start: part.start,
         end: part.end,
         sourceHash,
-        sourcePath: input.sourcePath
-      }));
-      ledger.spans.push(ledger.shebangs[ledger.shebangs.length - 1]);
+        sourcePath: input.sourcePath,
+        metadata: { language: input.language ?? 'javascript' }
+      });
+      ledger.spans.push(entry);
+      ledger.shebangs.push(entry);
+      ledger.directives.push(entry);
       previous = undefined;
       continue;
     }
@@ -110,8 +111,8 @@ export function scanJavaScriptTypeScriptSourceLedger(sourceText, input = {}) {
     }
     if (char === '/' && next === '/') {
       const part = consume(readToLineEnd(sourceText, offset));
-      const kind = isSourceMapComment(part.text) ? 'source-map-comment' : 'comment';
-      const metadata = kind === 'source-map-comment' ? { sourceMap: true } : {};
+      const kind = preservedCommentKind(part.text);
+      const metadata = commentMetadata(kind);
       push(ledger.trivia, kind, 'trivia', part.text, part.start, part.end, metadata);
       push(ledger.comments, kind, 'comment', part.text, part.start, part.end, metadata);
       previous = undefined;
@@ -119,8 +120,8 @@ export function scanJavaScriptTypeScriptSourceLedger(sourceText, input = {}) {
     }
     if (char === '/' && next === '*') {
       const part = consume(readBlockCommentEnd(sourceText, offset));
-      const kind = isSourceMapComment(part.text) ? 'source-map-comment' : 'comment';
-      const metadata = kind === 'source-map-comment' ? { sourceMap: true } : {};
+      const kind = preservedCommentKind(part.text);
+      const metadata = commentMetadata(kind);
       push(ledger.trivia, kind, 'trivia', part.text, part.start, part.end, metadata);
       push(ledger.comments, kind, 'comment', part.text, part.start, part.end, metadata);
       previous = undefined;
@@ -189,6 +190,7 @@ export function scanJavaScriptTypeScriptSourceLedger(sourceText, input = {}) {
   }
 
   for (const directive of sourceLedgerDirectives(sourceText, input, sourceHash)) {
+    if (directive.kind === 'shebang' && ledger.shebangs.some((entry) => entry.span.start === directive.span.start && entry.span.end === directive.span.end)) continue;
     if (ledger.spans.length >= maxSpans) {
       truncated = true;
       break;
@@ -304,3 +306,15 @@ function directiveKind(trimmed) {
   if (/^(?:import|export)\b/.test(trimmed)) return 'module-directive';
   return undefined;
 }
+
+function preservedCommentKind(text) {
+  const value = String(text ?? '');
+  if (isSourceMapComment(value)) return 'source-map-comment';
+  if (value.startsWith('/**') && value[3] !== '/') return 'jsdoc-comment';
+  if (value.startsWith('/*')) return 'block-comment';
+  return 'comment';
+}
+
+function commentMetadata(kind) {
+  return kind === 'source-map-comment' ? { sourceMap: true } : kind === 'jsdoc-comment' ? { jsdoc: true } : kind === 'block-comment' ? { blockComment: true } : {};
+}