remove headers from common; convert remaining

Author: transphorm

common/src/utils/attest.ts

@@ -1,5 +1,3 @@
-// SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
-
 import { fromBER } from 'asn1js';
 import { Buffer } from 'buffer';
 import { ec as ellipticEc } from 'elliptic';

common/src/utils/circuits/registerInputs.ts

@@ -1,5 +1,3 @@
-// SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
-
 import { poseidon2 } from 'poseidon-lite';
 
 import {

common/src/utils/cose.ts

@@ -1,5 +1,3 @@
-// SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
-
 import { Buffer } from 'buffer';
 import { ec as EC } from 'elliptic';
 import { sha384 } from 'js-sha512';

common/src/utils/proving.ts

@@ -1,5 +1,3 @@
-// SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
-
 import forge from 'node-forge';
 
 import { WS_DB_RELAYER, WS_DB_RELAYER_STAGING } from '../constants/index.js';

common/tests/coseVerify.test.ts

@@ -1,5 +1,3 @@
-// SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
-
 import { Buffer } from 'buffer';
 import { ec } from 'elliptic';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

scripts/check-duplicate-headers.cjs

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
-// SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
+// SPDX-FileCopyrightText: 2025 Social Connect Labs, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
 
 const fs = require('fs');
 const path = require('path');

scripts/check-license-headers.mjs

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
 
-// SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
+// SPDX-FileCopyrightText: 2025 Social Connect Labs, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
 
 /**
  * Script to check and fix license header formatting
@@ -10,9 +12,17 @@
 import fs from 'fs';
 import path from 'path';
 
-const LICENSE_HEADER =
+// Legacy composite format (being phased out)
+const LEGACY_HEADER =
   '// SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11';
 
+// Canonical multi-line format (preferred)
+const CANONICAL_HEADER_LINES = [
+  '// SPDX-FileCopyrightText: 2025 Social Connect Labs, Inc.',
+  '// SPDX-License-Identifier: BUSL-1.1',
+  '// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.',
+];
+
 function findFiles(
   dir,
   extensions = ['.ts', '.tsx', '.js', '.jsx', '.mjs', '.cjs'],
@@ -59,16 +69,52 @@ function findLicenseHeaderIndex(lines) {
   if (lines[i]?.startsWith('#!')) i++;
   // Skip leading blank lines
   while (i < lines.length && lines[i].trim() === '') i++;
-  return lines[i] === LICENSE_HEADER ? i : -1;
+
+  const currentLine = lines[i];
+
+  // Check for legacy composite format
+  if (currentLine === LEGACY_HEADER) {
+    return { index: i, type: 'legacy', valid: true, endIndex: i };
+  }
+
+  // Check for canonical multi-line format
+  if (currentLine === CANONICAL_HEADER_LINES[0]) {
+    const hasAllLines =
+      lines[i + 1] === CANONICAL_HEADER_LINES[1] &&
+      lines[i + 2] === CANONICAL_HEADER_LINES[2];
+    return {
+      index: i,
+      type: 'canonical',
+      valid: hasAllLines,
+      endIndex: hasAllLines ? i + 2 : i,
+    };
+  }
+
+  return { index: -1, type: 'none', valid: false };
+}
+
+function shouldRequireHeader(filePath, projectRoot) {
+  const relativePath = path.relative(projectRoot, filePath);
+  // Only require headers in app/ and packages/mobile-sdk-alpha/ directories
+  return (
+    relativePath.startsWith('app/') ||
+    relativePath.startsWith('packages/mobile-sdk-alpha/')
+  );
 }
 
-function checkLicenseHeader(filePath, { requireHeader = false } = {}) {
+function checkLicenseHeader(
+  filePath,
+  { requireHeader = false, projectRoot = process.cwd() } = {},
+) {
   const content = fs.readFileSync(filePath, 'utf8');
   const lines = content.split('\n');
-  const idx = findLicenseHeaderIndex(lines);
+  const headerInfo = findLicenseHeaderIndex(lines);
+
+  const shouldHaveHeader =
+    requireHeader || shouldRequireHeader(filePath, projectRoot);
 
-  if (idx === -1) {
-    if (requireHeader) {
+  if (headerInfo.index === -1) {
+    if (shouldHaveHeader) {
       return {
         file: filePath,
         issue: 'Missing or incorrect license header',
@@ -78,8 +124,17 @@ function checkLicenseHeader(filePath, { requireHeader = false } = {}) {
     return null;
   }
 
+  if (!headerInfo.valid) {
+    return {
+      file: filePath,
+      issue: 'Incomplete or malformed license header',
+      fixed: false,
+    };
+  }
+
   // Check if there's a newline after the license header
-  if (lines[idx + 1] !== '') {
+  const headerEndIndex = headerInfo.endIndex;
+  if (lines[headerEndIndex + 1] !== '') {
     return {
       file: filePath,
       issue: 'Missing newline after license header',
@@ -93,14 +148,17 @@ function checkLicenseHeader(filePath, { requireHeader = false } = {}) {
 function fixLicenseHeader(filePath) {
   const content = fs.readFileSync(filePath, 'utf8');
   const lines = content.split('\n');
-  const idx = findLicenseHeaderIndex(lines);
-
-  if (idx !== -1 && lines[idx + 1] !== '') {
-    // Insert empty line after license header
-    lines.splice(idx + 1, 0, '');
-    const fixedContent = lines.join('\n');
-    fs.writeFileSync(filePath, fixedContent, 'utf8');
-    return true;
+  const headerInfo = findLicenseHeaderIndex(lines);
+
+  if (headerInfo.index !== -1 && headerInfo.valid) {
+    const headerEndIndex = headerInfo.endIndex;
+    if (lines[headerEndIndex + 1] !== '') {
+      // Insert empty line after license header
+      lines.splice(headerEndIndex + 1, 0, '');
+      const fixedContent = lines.join('\n');
+      fs.writeFileSync(filePath, fixedContent, 'utf8');
+      return true;
+    }
   }
 
   return false;
@@ -118,7 +176,7 @@ function main() {
   const issues = [];
 
   for (const file of files) {
-    const issue = checkLicenseHeader(file, { requireHeader });
+    const issue = checkLicenseHeader(file, { requireHeader, projectRoot });
     if (issue) {
       issues.push(issue);
 
@@ -133,6 +191,10 @@ function main() {
   }
 
   if (isCheck) {
+    // Show which directories require headers
+    const requiredDirs = ['app/', 'packages/mobile-sdk-alpha/'];
+    console.log(`📋 License headers required in: ${requiredDirs.join(', ')}\n`);
+
     if (issues.length === 0) {
       console.log('✅ All license headers are properly formatted');
     } else {

scripts/migrate-license-headers.mjs

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
 
-// SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
+// SPDX-FileCopyrightText: 2025 Social Connect Labs, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
 
 /**
  * Migration tool to convert composite SPDX headers to canonical multi-line format
@@ -129,6 +131,50 @@ function migrateFile(filePath, dryRun = false) {
   return { success: false, reason: 'Unknown migration path' };
 }
 
+function removeHeaderFromFile(filePath, dryRun = false) {
+  const content = fs.readFileSync(filePath, 'utf8');
+  const lines = content.split('\n');
+  const analysis = analyzeFile(filePath);
+
+  if (analysis.headerIndex === -1) {
+    return { success: false, reason: 'No header found' };
+  }
+
+  if (analysis.type === 'composite') {
+    // Remove the composite header line
+    lines.splice(analysis.headerIndex, 1);
+
+    // Also remove the following empty line if it exists
+    if (lines[analysis.headerIndex] === '') {
+      lines.splice(analysis.headerIndex, 1);
+    }
+
+    if (!dryRun) {
+      const newContent = lines.join('\n');
+      fs.writeFileSync(filePath, newContent, 'utf8');
+    }
+
+    return { success: true, reason: 'Removed composite header' };
+  } else if (analysis.type === 'canonical') {
+    // Remove all 3 canonical header lines
+    lines.splice(analysis.headerIndex, 3);
+
+    // Also remove the following empty line if it exists
+    if (lines[analysis.headerIndex] === '') {
+      lines.splice(analysis.headerIndex, 1);
+    }
+
+    if (!dryRun) {
+      const newContent = lines.join('\n');
+      fs.writeFileSync(filePath, newContent, 'utf8');
+    }
+
+    return { success: true, reason: 'Removed canonical header' };
+  }
+
+  return { success: false, reason: 'Unknown header type' };
+}
+
 function generateReport(projectRoot) {
   const files = findFiles(projectRoot);
   const report = {
@@ -245,6 +291,48 @@ function main() {
       break;
     }
 
+    case 'remove': {
+      const files = findFiles(projectRoot);
+      const results = { removed: 0, skipped: 0, errors: 0 };
+
+      console.log(
+        `🗑️ ${isDryRun ? 'DRY RUN: ' : ''}Removing license headers...\n`,
+      );
+
+      for (const file of files) {
+        try {
+          const result = removeHeaderFromFile(file, isDryRun);
+          if (result.success) {
+            results.removed++;
+            console.log(
+              `✅ ${isDryRun ? '[DRY RUN] ' : ''}Removed: ${path.relative(projectRoot, file)}`,
+            );
+          } else {
+            results.skipped++;
+            if (isVerbose) {
+              console.log(
+                `⏭️  Skipped: ${path.relative(projectRoot, file)} (${result.reason})`,
+              );
+            }
+          }
+        } catch (error) {
+          results.errors++;
+          console.error(`❌ Error processing ${file}: ${error.message}`);
+        }
+      }
+
+      console.log(`\n📊 Removal Summary:`);
+      console.log(`   Removed: ${results.removed}`);
+      console.log(`   Skipped: ${results.skipped}`);
+      console.log(`   Errors: ${results.errors}`);
+
+      if (isDryRun && results.removed > 0) {
+        console.log('\n🚀 Run without --dry-run to apply changes');
+      }
+
+      break;
+    }
+
     case 'migrate-single': {
       const targetFile = args[1];
       if (!targetFile) {
@@ -272,6 +360,7 @@ function main() {
 Commands:
   analyze, report     Generate analysis report of current header formats
   migrate            Migrate all composite headers to canonical format
+  remove             Remove license headers from files
   migrate-single     Migrate a single file
 
 Options:
@@ -281,6 +370,7 @@ Options:
 Examples:
   node scripts/migrate-license-headers.mjs analyze --verbose
   node scripts/migrate-license-headers.mjs migrate --dry-run
+  node scripts/migrate-license-headers.mjs remove common --dry-run
   node scripts/migrate-license-headers.mjs migrate packages/mobile-sdk-alpha
   node scripts/migrate-license-headers.mjs migrate-single src/index.ts --dry-run
 `);

scripts/tests/check-license-headers.test.mjs

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
 
-// SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11
+// SPDX-FileCopyrightText: 2025 Social Connect Labs, Inc.
+// SPDX-License-Identifier: BUSL-1.1
+// NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
 
 /**
  * Tests for the license header checker script