refactor: simplify package structure by consolidating lib packages

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
     name: Run CI Pipeline
     uses: SocketDev/socket-registry/.github/workflows/ci.yml@1a96ced97aaa85d61543351b90d6f463b983c46c # main
     with:
-      test-setup-script: 'pnpm --filter @socketsecurity/cli run build'
+      test-setup-script: 'pnpm --filter @socketsecurity/cli... run build'
       lint-script: 'pnpm --filter @socketsecurity/cli run check'
       type-check-script: 'pnpm --filter @socketsecurity/cli run type'
       run-test: false  # Tests run in separate sharded job below.
@@ -64,9 +64,8 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Build CLI
-        working-directory: packages/cli
-        run: pnpm run build
+      - name: Build dependencies and CLI
+        run: pnpm --filter @socketsecurity/cli... run build
 
       - name: Run unit tests (shard ${{ matrix.shard }})
         working-directory: packages/cli
@@ -88,9 +87,8 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Build CLI
-        working-directory: packages/cli
-        run: pnpm run build
+      - name: Build dependencies and CLI
+        run: pnpm --filter @socketsecurity/cli... run build
 
       - name: Generate cache keys for binary distributions
         id: cache-keys
@@ -220,9 +218,8 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Build CLI
-        working-directory: packages/cli
-        run: pnpm run build
+      - name: Build dependencies and CLI
+        run: pnpm --filter @socketsecurity/cli... run build
 
       - name: Run e2e tests
         working-directory: packages/cli

package.json

@@ -35,6 +35,8 @@
     "@socketregistry/packageurl-js": "catalog:",
     "@socketregistry/yocto-spinner": "catalog:",
     "@socketsecurity/config": "catalog:",
+    "@socketsecurity/lib": "3.2.8",
+    "@socketsecurity/lib-external": "npm:@socketsecurity/lib@3.2.8",
     "@socketsecurity/registry": "catalog:",
     "@types/cmd-shim": "catalog:",
     "@types/ink": "catalog:",

packages/bootstrap/package.json

@@ -7,7 +7,6 @@
     ".": "./dist/index.js",
     "./bootstrap-npm.js": "./dist/bootstrap-npm.js",
     "./bootstrap-sea.js": "./dist/bootstrap-sea.js",
-    "./bootstrap-smol.js": "./dist/bootstrap-smol.js",
     "./node-version.json": "./node-version.json"
   },
   "scripts": {
@@ -22,7 +21,7 @@
     "@babel/types": "catalog:",
     "@socketsecurity/build-infra": "workspace:*",
     "@socketsecurity/cli": "workspace:*",
-    "@socketsecurity/lib": "workspace:*",
+    "@socketsecurity/lib-internal": "workspace:*",
     "del-cli": "catalog:",
     "esbuild": "catalog:",
     "magic-string": "catalog:",

packages/bootstrap/src/index.mts

@@ -56,16 +56,6 @@ module.exports = {
     return loadBootstrap('bootstrap-sea.js')
   },
 
-  /**
-   * Load smol bootstrap (for smol Node.js binary - also available compressed).
-   * Note: This is also embedded in base64 in the Node.js binary via
-   * packages/node-smol-builder, but providing compressed version for consistency.
-   * @returns {any} Bootstrap exports
-   */
-  loadSmolBootstrap() {
-    return loadBootstrap('bootstrap-smol.js')
-  },
-
   // Re-export the loader function for custom usage.
   loadBootstrap,
 }

packages/build-infra/lib/build-helpers.mjs

@@ -8,9 +8,9 @@
 import { promises as fs } from 'node:fs'
 import path from 'node:path'
 
-import binPkg from '@socketsecurity/lib/bin'
-import platformPkg from '@socketsecurity/lib/constants/platform'
-import spawnPkg from '@socketsecurity/lib/spawn'
+import binPkg from '@socketsecurity/lib-external/bin'
+import platformPkg from '@socketsecurity/lib-external/constants/platform'
+import spawnPkg from '@socketsecurity/lib-external/spawn'
 
 const { whichBinSync } = binPkg
 const { WIN32 } = platformPkg

packages/build-infra/lib/build-output.mjs

@@ -4,7 +4,7 @@
  * Provides consistent, pretty logging for build processes.
  */
 
-import loggerPkg from '@socketsecurity/lib/logger'
+import loggerPkg from '@socketsecurity/lib-external/logger'
 
 const logger = loggerPkg.getDefaultLogger()
 

packages/build-infra/lib/cmake-builder.mjs

@@ -6,8 +6,8 @@
 
 import { cpus } from 'node:os'
 
-import platformPkg from '@socketsecurity/lib/constants/platform'
-import spawnPkg from '@socketsecurity/lib/spawn'
+import platformPkg from '@socketsecurity/lib-external/constants/platform'
+import spawnPkg from '@socketsecurity/lib-external/spawn'
 
 const { WIN32 } = platformPkg
 const { spawn } = spawnPkg

packages/build-infra/lib/emscripten-builder.mjs

@@ -7,8 +7,8 @@
 import { cpus } from 'node:os'
 import path from 'node:path'
 
-import platformPkg from '@socketsecurity/lib/constants/platform'
-import spawnPkg from '@socketsecurity/lib/spawn'
+import platformPkg from '@socketsecurity/lib-external/constants/platform'
+import spawnPkg from '@socketsecurity/lib-external/spawn'
 
 const { WIN32 } = platformPkg
 const { spawn } = spawnPkg

packages/build-infra/lib/extraction-cache.mjs

@@ -11,7 +11,7 @@ import { createHash } from 'node:crypto'
 import { existsSync, mkdirSync, readFileSync } from 'node:fs'
 import path from 'node:path'
 
-import loggerPkg from '@socketsecurity/lib/logger'
+import loggerPkg from '@socketsecurity/lib-external/logger'
 const { getDefaultLogger } = loggerPkg
 
 /**

packages/build-infra/lib/fetch-with-retry.mjs

@@ -3,7 +3,7 @@
  * Automatically retries on network errors and 5xx server errors.
  */
 
-import loggerPkg from '@socketsecurity/lib/logger'
+import loggerPkg from '@socketsecurity/lib-external/logger'
 const { getDefaultLogger } = loggerPkg
 
 /**

packages/build-infra/lib/patch-validator.mjs

@@ -7,8 +7,8 @@
 import { promises as fs } from 'node:fs'
 import path from 'node:path'
 
-import platformPkg from '@socketsecurity/lib/constants/platform'
-import spawnPkg from '@socketsecurity/lib/spawn'
+import platformPkg from '@socketsecurity/lib-external/constants/platform'
+import spawnPkg from '@socketsecurity/lib-external/spawn'
 
 const { WIN32 } = platformPkg
 const { spawn } = spawnPkg

packages/build-infra/lib/preflight-checks.mjs

@@ -3,7 +3,7 @@
  * Provides a DRY way to run common pre-build validation checks.
  */
 
-import loggerPkg from '@socketsecurity/lib/logger'
+import loggerPkg from '@socketsecurity/lib-external/logger'
 const { getDefaultLogger } = loggerPkg
 
 import { printError, printSuccess } from './build-output.mjs'

packages/build-infra/lib/rust-builder.mjs

@@ -7,8 +7,8 @@
 import { cpus } from 'node:os'
 import path from 'node:path'
 
-import platformPkg from '@socketsecurity/lib/constants/platform'
-import spawnPkg from '@socketsecurity/lib/spawn'
+import platformPkg from '@socketsecurity/lib-external/constants/platform'
+import spawnPkg from '@socketsecurity/lib-external/spawn'
 
 const { WIN32 } = platformPkg
 const { spawn } = spawnPkg

packages/build-infra/lib/script-runner.mjs

@@ -3,9 +3,9 @@
  * Provides DRY helpers for running pnpm scripts, commands, and sequences.
  */
 
-import platformPkg from '@socketsecurity/lib/constants/platform'
-import loggerPkg from '@socketsecurity/lib/logger'
-import spawnPkg from '@socketsecurity/lib/spawn'
+import platformPkg from '@socketsecurity/lib-external/constants/platform'
+import loggerPkg from '@socketsecurity/lib-external/logger'
+import spawnPkg from '@socketsecurity/lib-external/spawn'
 
 const { WIN32 } = platformPkg
 const { getDefaultLogger } = loggerPkg

packages/build-infra/lib/tool-installer.mjs

@@ -5,9 +5,9 @@
  * using platform-specific package managers (brew, apt, choco, etc.).
  */
 
-import binPkg from '@socketsecurity/lib/bin'
-import platformPkg from '@socketsecurity/lib/constants/platform'
-import spawnPkg from '@socketsecurity/lib/spawn'
+import binPkg from '@socketsecurity/lib-external/bin'
+import platformPkg from '@socketsecurity/lib-external/constants/platform'
+import spawnPkg from '@socketsecurity/lib-external/spawn'
 
 const { whichBinSync } = binPkg
 const { WIN32 } = platformPkg

packages/build-infra/package.json

@@ -25,7 +25,7 @@
   "dependencies": {
     "@babel/parser": "catalog:",
     "@babel/traverse": "catalog:",
-    "@socketsecurity/lib": "workspace:*",
+    "@socketsecurity/lib-internal": "workspace:*",
     "magic-string": "catalog:"
   }
 }

packages/cli/package.json

@@ -75,7 +75,7 @@
     "@coana-tech/cli": "catalog:",
     "@gitbeaker/rest": "catalog:",
     "@socketsecurity/build-infra": "workspace:*",
-    "@socketsecurity/lib": "workspace:*",
+    "@socketsecurity/lib-internal": "workspace:*",
     "@socketsecurity/sdk": "workspace:*",
     "ajv-dist": "catalog:",
     "compromise": "catalog:",

packages/cli/scripts/build.mjs

@@ -16,9 +16,9 @@ import { promises as fs } from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 
-import { WIN32 } from '@socketsecurity/lib/constants/platform'
-import { getDefaultLogger } from '@socketsecurity/lib/logger'
-import { spawn } from '@socketsecurity/lib/spawn'
+import { WIN32 } from '@socketsecurity/lib-external/constants/platform'
+import { getDefaultLogger } from '@socketsecurity/lib-external/logger'
+import { spawn } from '@socketsecurity/lib-external/spawn'
 
 const logger = getDefaultLogger()
 

packages/cli/scripts/check.mjs

@@ -3,11 +3,11 @@
  * Runs code quality checks: ESLint and TypeScript type checking.
  */
 
-import { parseArgs } from '@socketsecurity/lib/argv/parse'
-import { WIN32 } from '@socketsecurity/lib/constants/platform'
-import { getDefaultLogger } from '@socketsecurity/lib/logger'
-import { spawn } from '@socketsecurity/lib/spawn'
-import { printFooter, printHeader } from '@socketsecurity/lib/stdio/header'
+import { parseArgs } from '@socketsecurity/lib-external/argv/parse'
+import { WIN32 } from '@socketsecurity/lib-external/constants/platform'
+import { getDefaultLogger } from '@socketsecurity/lib-external/logger'
+import { spawn } from '@socketsecurity/lib-external/spawn'
+import { printFooter, printHeader } from '@socketsecurity/lib-external/stdio/header'
 
 const logger = getDefaultLogger()
 

packages/cli/scripts/claude.mjs

@@ -18,9 +18,9 @@ import { fileURLToPath } from 'node:url'
 
 import colors from 'yoctocolors-cjs'
 
-import { parseArgs } from '@socketsecurity/lib/argv/parse'
-import { safeDelete } from '@socketsecurity/lib/fs'
-import { getDefaultLogger } from '@socketsecurity/lib/logger'
+import { parseArgs } from '@socketsecurity/lib-external/argv/parse'
+import { safeDelete } from '@socketsecurity/lib-external/fs'
+import { getDefaultLogger } from '@socketsecurity/lib-external/logger'
 
 const logger = getDefaultLogger()