refactor: consolidate @driftdev/spec into @driftdev/sdk

ryanwaits · ryanwaits · commit 4c8e3f007a3a · 2026-02-14T05:51:50.000-06:00
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -4,7 +4,7 @@
   "commit": false,
   "fixed": [],
   "linked": [
-    ["@driftdev/sdk", "@driftdev/cli", "@driftdev/spec"]
+    ["@driftdev/sdk", "@driftdev/cli"]
   ],
   "access": "public",
   "baseBranch": "main",
diff --git a/.github/workflows/drift.yml b/.github/workflows/drift.yml
@@ -52,7 +52,6 @@ jobs:
 
       - name: Scan thresholds
         run: |
-          bun run packages/cli/src/drift.ts scan --cwd packages/spec --min 10
           bun run packages/cli/src/drift.ts scan --cwd packages/cli --min 60
           bun run packages/cli/src/drift.ts scan --cwd packages/sdk --min 80
 
diff --git a/bun.lock b/bun.lock
diff --git a/package.json b/package.json
@@ -7,12 +7,10 @@
     "apps/*"
   ],
   "scripts": {
-    "build": "bun run build:spec && bun run build:sdk && bun run build:cli",
-    "build:spec": "cd packages/spec && bun run build",
+    "build": "bun run build:sdk && bun run build:cli",
     "build:sdk": "cd packages/sdk && bun run build",
     "build:cli": "cd packages/cli && bun run build",
-    "dev": "bun run --parallel dev:spec dev:sdk dev:cli",
-    "dev:spec": "cd packages/spec && bun run dev",
+    "dev": "bun run --parallel dev:sdk dev:cli",
     "dev:sdk": "cd packages/sdk && bun run dev",
     "dev:cli": "cd packages/cli && bun run dev",
     "lint": "bunx biome check packages/ apps/",
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @doccov/cli
 
+## 0.41.0
+
+### Patch Changes
+
+- Consolidate @driftdev/spec into @driftdev/sdk. Spec types, constants, and JSON schema validation are now exported directly from the SDK. The @driftdev/spec package is removed.
+- Updated dependencies
+  - @driftdev/sdk@0.41.0
+
 ## 0.40.0
 
 ### Minor Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@driftdev/cli",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "description": "Drift CLI - Documentation coverage and drift detection for TypeScript",
   "keywords": [
     "typescript",
@@ -43,8 +43,7 @@
     "dist"
   ],
   "dependencies": {
-    "@driftdev/sdk": "^0.39.0",
-    "@driftdev/spec": "^0.36.0",
+    "@driftdev/sdk": "^0.41.0",
     "@openpkg-ts/sdk": "^0.37.0",
     "@openpkg-ts/spec": "^0.37.0",
     "chalk": "^5.4.1",
diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @doccov/sdk
 
+## 0.41.0
+
+### Minor Changes
+
+- Consolidate @driftdev/spec into @driftdev/sdk. Spec types, constants, and JSON schema validation are now exported directly from the SDK. The @driftdev/spec package is removed.
+
 ## 0.39.0
 
 ### Patch Changes
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@driftdev/sdk",
-  "version": "0.39.0",
+  "version": "0.41.0",
   "description": "Drift SDK - Documentation coverage and drift detection for TypeScript",
   "keywords": [
     "typescript",
@@ -47,7 +47,8 @@
     "dist"
   ],
   "dependencies": {
-    "@driftdev/spec": "^0.36.0",
+    "ajv": "^8.17.1",
+    "ajv-formats": "^3.0.1",
     "@openpkg-ts/sdk": "^0.37.0",
     "@openpkg-ts/spec": "^0.37.0",
     "@vercel/sandbox": "^1.0.3",
diff --git a/packages/sdk/schemas/v1.0.0/drift.schema.json b/packages/sdk/schemas/v1.0.0/drift.schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://unpkg.com/@driftdev/spec/schemas/v1.0.0/drift.schema.json",
+  "$id": "https://unpkg.com/@driftdev/sdk/schemas/v1.0.0/drift.schema.json",
   "title": "Drift Specification",
   "description": "Documentation coverage analysis specification",
   "type": "object",
diff --git a/packages/sdk/src/analysis/batch.ts b/packages/sdk/src/analysis/batch.ts
@@ -1,4 +1,4 @@
-import type { DriftSpec } from '@driftdev/spec';
+import type { DriftSpec } from '../spec';
 import type { OpenPkg } from '@openpkg-ts/spec';
 
 /**
diff --git a/packages/sdk/src/analysis/drift-builder.ts b/packages/sdk/src/analysis/drift-builder.ts
@@ -8,8 +8,8 @@ import type {
   ForgottenExport,
   MissingDocRule,
   TypeReferenceLocation,
-} from '@driftdev/spec';
-import { DRIFT_CATEGORIES } from '@driftdev/spec';
+} from '../spec';
+import { DRIFT_CATEGORIES } from '../spec';
 import type { SpecExport } from '@openpkg-ts/spec';
 import { isFixableDrift } from '../fix';
 import { buildExportRegistry, computeExportDrift } from './drift/compute';
diff --git a/packages/sdk/src/analysis/health.ts b/packages/sdk/src/analysis/health.ts
@@ -1,4 +1,4 @@
-import type { DocumentationHealth, DriftCategory, MissingDocRule } from '@driftdev/spec';
+import type { DocumentationHealth, DriftCategory, MissingDocRule } from '../spec';
 import type { SpecExport } from '@openpkg-ts/spec';
 
 /**
diff --git a/packages/sdk/src/analysis/incremental.ts b/packages/sdk/src/analysis/incremental.ts
@@ -10,7 +10,7 @@ import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
 
-import type { DriftIssue, ExportAnalysis, MissingDocRule } from '@driftdev/spec';
+import type { DriftIssue, ExportAnalysis, MissingDocRule } from '../spec';
 
 /**
  * Result from analyzing a single export incrementally.
diff --git a/packages/sdk/src/analysis/lookup.ts b/packages/sdk/src/analysis/lookup.ts
@@ -4,7 +4,7 @@
  * These utilities simplify accessing per-export coverage/drift data
  * when working with the composition pattern (OpenPkg + DriftSpec).
  */
-import type { DriftIssue, DriftSpec, ExportAnalysis, MissingDocRule } from '@driftdev/spec';
+import type { DriftIssue, DriftSpec, ExportAnalysis, MissingDocRule } from '../spec';
 import type { SpecExport } from '@openpkg-ts/spec';
 
 /**
diff --git a/packages/sdk/src/analysis/report.ts b/packages/sdk/src/analysis/report.ts
@@ -1,6 +1,6 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import type { DriftSpec } from '@driftdev/spec';
+import type { DriftSpec } from '../spec';
 import type { OpenPkg, SpecExport, SpecSignature, SpecType } from '@openpkg-ts/spec';
 import {
   type CoverageSummary,
diff --git a/packages/sdk/src/fix/forgotten-exports.ts b/packages/sdk/src/fix/forgotten-exports.ts
@@ -4,7 +4,7 @@
 
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import type { ApiSurfaceResult } from '@driftdev/spec';
+import type { ApiSurfaceResult } from '../spec';
 
 /** Fix for a forgotten export */
 export interface ForgottenExportFix {
diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
@@ -19,6 +19,35 @@
  * @module @driftdev/sdk
  */
 
+// ─────────────────────────────────────────────────────────────────────────────
+// Spec Types & Validation (from consolidated @driftdev/spec)
+// ─────────────────────────────────────────────────────────────────────────────
+
+export type {
+  ApiSurfaceResult,
+  DocumentationHealth,
+  DriftIssue,
+  DriftSpec,
+  DriftSpecVersion,
+  ExampleAnalysis,
+  ExampleRuntimeDrift,
+  ExampleTypecheckError,
+  ExportAnalysis,
+  ForgottenExport,
+  MissingDocRule,
+  TypeReferenceLocation,
+} from './spec';
+export type { DriftSchemaVersion, DriftSpecError } from './spec';
+export {
+  assertDriftSpec,
+  getAvailableDriftVersions,
+  getDriftValidationErrors,
+  LATEST_VERSION,
+  SCHEMA_URL,
+  SCHEMA_VERSION,
+  validateDriftSpec,
+} from './spec';
+
 // ─────────────────────────────────────────────────────────────────────────────
 // Core Analysis API
 // ─────────────────────────────────────────────────────────────────────────────
diff --git a/packages/sdk/src/scan/summary.ts b/packages/sdk/src/scan/summary.ts
@@ -2,7 +2,7 @@
  * Utilities for extracting summary statistics from OpenPkg specs.
  */
 
-import type { DriftSpec } from '@driftdev/spec';
+import type { DriftSpec } from '../spec';
 import type { OpenPkg } from '@openpkg-ts/spec';
 import { getExportAnalysis } from '../analysis/lookup';
 
diff --git a/packages/sdk/src/spec/constants.ts b/packages/sdk/src/spec/constants.ts
@@ -0,0 +1,2 @@
+export const SCHEMA_VERSION = '1.0.0';
+export const SCHEMA_URL = 'https://unpkg.com/@driftdev/sdk/schemas/v1.0.0/drift.schema.json';
diff --git a/packages/sdk/src/spec/index.ts b/packages/sdk/src/spec/index.ts
diff --git a/packages/sdk/src/spec/types.ts b/packages/sdk/src/spec/types.ts
@@ -111,7 +111,7 @@ export type DocumentationHealth = {
 
   /** Accuracy (drift) metrics */
   accuracy: {
-    /** Accuracy score (0-100) - penalized by drift issues */
+    /** Accuracy score (0-100) */
     score: number;
     /** Total drift issues found */
     issues: number;
diff --git a/packages/sdk/src/spec/validate.ts b/packages/sdk/src/spec/validate.ts
@@ -2,7 +2,7 @@ import type { ValidateFunction } from 'ajv';
 import Ajv from 'ajv/dist/2020.js';
 import addFormats from 'ajv-formats';
 
-import schemaV100 from '../schemas/v1.0.0/drift.schema.json';
+import schemaV100 from '../../schemas/v1.0.0/drift.schema.json';
 import type { DriftSpec } from './types';
 
 export type DriftSchemaVersion = '1.0.0' | 'latest';
diff --git a/packages/sdk/src/types/report.ts b/packages/sdk/src/types/report.ts
@@ -1,4 +1,4 @@
-import type { ApiSurfaceResult, DocumentationHealth } from '@driftdev/spec';
+import type { ApiSurfaceResult, DocumentationHealth } from '../spec';
 import type { CategorizedDrift, DriftCategory, SpecDocDrift } from '../analysis/drift/types';
 
 /**
diff --git a/packages/sdk/test/batch.test.ts b/packages/sdk/test/batch.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'bun:test';
-import type { DriftSpec } from '@driftdev/spec';
+import type { DriftSpec } from '../src/spec';
 import type { OpenPkg } from '@openpkg-ts/spec';
 import { aggregateResults, createPackageResult, type PackageResult } from '../src/analysis/batch';
 
diff --git a/packages/sdk/tsconfig.json b/packages/sdk/tsconfig.json
@@ -10,6 +10,7 @@
     "forceConsistentCasingInFileNames": true,
     "declaration": true,
     "declarationMap": true,
+    "resolveJsonModule": true,
     "outDir": "./dist",
     "rootDir": "./src"
   },
diff --git a/packages/spec/CHANGELOG.md b/packages/spec/CHANGELOG.md
diff --git a/packages/spec/package.json b/packages/spec/package.json
diff --git a/packages/spec/src/constants.ts b/packages/spec/src/constants.ts
diff --git a/packages/spec/tsconfig.json b/packages/spec/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://json-schema.org/draft/2020-12/schema",`
`3`		`- "$id": "https://unpkg.com/@driftdev/spec/schemas/v1.0.0/drift.schema.json",`
	`3`	`+ "$id": "https://unpkg.com/@driftdev/sdk/schemas/v1.0.0/drift.schema.json",`
`4`	`4`	`"title": "Drift Specification",`
`5`	`5`	`"description": "Documentation coverage analysis specification",`
`6`	`6`	`"type": "object",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { DriftSpec } from '@driftdev/spec';`
	`1`	`+import type { DriftSpec } from '../spec';`
`2`	`2`	`import type { OpenPkg } from '@openpkg-ts/spec';`
`3`	`3`
`4`	`4`	`/**`