@contractspec/lib.contracts-transformers 3.7.6 → 3.7.7

package/dist/browser/index.js

@@ -71,306 +71,395 @@ function normalizePath(path) {
   normalized = normalized.replace(/\/+/g, "/");
   return "/" + normalized;
 }
-// src/openapi/parser/utils.ts
-import { parse as parseYaml } from "yaml";
-var HTTP_METHODS = [
-  "get",
-  "post",
-  "put",
-  "delete",
-  "patch",
-  "head",
-  "options",
-  "trace"
-];
-function parseOpenApiString(content, format = "json") {
-  if (format === "yaml") {
-    return parseYaml(content);
-  }
-  return JSON.parse(content);
-}
-function detectFormat(content) {
-  const trimmed = content.trim();
-  if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
-    return "json";
+// src/openapi/differ.ts
+function compareValues(path, oldValue, newValue, description) {
+  if (deepEqual(oldValue, newValue)) {
+    return null;
   }
-  return "yaml";
-}
-function detectVersion(doc) {
-  const version = doc.openapi;
-  if (version.startsWith("3.1")) {
-    return "3.1";
+  let changeType = "modified";
+  if (oldValue === undefined || oldValue === null) {
+    changeType = "added";
+  } else if (newValue === undefined || newValue === null) {
+    changeType = "removed";
+  } else if (typeof oldValue !== typeof newValue) {
+    changeType = "type_changed";
   }
-  return "3.0";
-}
-function generateOperationId(method, path) {
-  const pathParts = path.split("/").filter(Boolean).map((part) => {
-    if (part.startsWith("{") && part.endsWith("}")) {
-      return "By" + part.slice(1, -1).charAt(0).toUpperCase() + part.slice(2, -1);
-    }
-    return part.charAt(0).toUpperCase() + part.slice(1);
-  });
-  return method + pathParts.join("");
-}
-// src/openapi/parser/resolvers.ts
-function isReference(obj) {
-  return typeof obj === "object" && obj !== null && "$ref" in obj;
+  return {
+    path,
+    type: changeType,
+    oldValue,
+    newValue,
+    description
+  };
 }
-function resolveRef(doc, ref) {
-  if (!ref.startsWith("#/")) {
-    return;
+function diffObjects(path, oldObj, newObj, options) {
+  const changes = [];
+  if (!oldObj && !newObj)
+    return changes;
+  if (!oldObj) {
+    changes.push({
+      path,
+      type: "added",
+      newValue: newObj,
+      description: `Added ${path}`
+    });
+    return changes;
   }
-  const path = ref.slice(2).split("/");
-  let current = doc;
-  for (const part of path) {
-    if (current === null || current === undefined)
-      return;
-    if (typeof current !== "object")
-      return;
-    current = current[part];
+  if (!newObj) {
+    changes.push({
+      path,
+      type: "removed",
+      oldValue: oldObj,
+      description: `Removed ${path}`
+    });
+    return changes;
   }
-  return current;
-}
-function dereferenceSchema(doc, schema, seen = new Set) {
-  if (!schema)
-    return;
-  if (isReference(schema)) {
-    if (seen.has(schema.$ref)) {
-      return schema;
+  const allKeys = new Set([...Object.keys(oldObj), ...Object.keys(newObj)]);
+  for (const key of allKeys) {
+    const keyPath = path ? `${path}.${key}` : key;
+    if (options.ignorePaths?.some((p) => keyPath.startsWith(p))) {
+      continue;
     }
-    const newSeen = new Set(seen);
-    newSeen.add(schema.$ref);
-    const resolved = resolveRef(doc, schema.$ref);
-    if (!resolved)
-      return schema;
-    const dereferenced = dereferenceSchema(doc, resolved, newSeen);
-    if (!dereferenced)
-      return schema;
-    const refParts = schema.$ref.split("/");
-    const typeName = refParts[refParts.length - 1];
-    return {
-      ...dereferenced,
-      _originalRef: schema.$ref,
-      _originalTypeName: typeName
-    };
-  }
-  const schemaObj = { ...schema };
-  if (schemaObj.properties) {
-    const props = schemaObj.properties;
-    const newProps = {};
-    for (const [key, prop] of Object.entries(props)) {
-      newProps[key] = dereferenceSchema(doc, prop, seen) ?? prop;
+    const oldVal = oldObj[key];
+    const newVal = newObj[key];
+    if (typeof oldVal === "object" && typeof newVal === "object") {
+      changes.push(...diffObjects(keyPath, oldVal, newVal, options));
+    } else {
+      const change = compareValues(keyPath, oldVal, newVal, `Changed ${keyPath}`);
+      if (change) {
+        changes.push(change);
+      }
     }
-    schemaObj.properties = newProps;
   }
-  if (schemaObj.items) {
-    schemaObj.items = dereferenceSchema(doc, schemaObj.items, seen);
+  return changes;
+}
+function diffSpecVsOperation(spec, operation, options = {}) {
+  const changes = [];
+  if (!options.ignoreDescriptions) {
+    const descChange = compareValues("meta.description", spec.meta.description, operation.summary ?? operation.description, "Description changed");
+    if (descChange)
+      changes.push(descChange);
   }
-  const combinators = ["allOf", "anyOf", "oneOf"];
-  for (const comb of combinators) {
-    if (Array.isArray(schemaObj[comb])) {
-      schemaObj[comb] = schemaObj[comb].map((s) => dereferenceSchema(doc, s, seen) ?? s);
+  if (!options.ignoreTags) {
+    const oldTags = [...spec.meta.tags ?? []].sort();
+    const newTags = [...operation.tags].sort();
+    if (!deepEqual(oldTags, newTags)) {
+      changes.push({
+        path: "meta.tags",
+        type: "modified",
+        oldValue: oldTags,
+        newValue: newTags,
+        description: "Tags changed"
+      });
     }
   }
-  return schemaObj;
-}
-// src/openapi/parser/parameters.ts
-function parseParameters(doc, params) {
-  const result = {
-    path: [],
-    query: [],
-    header: [],
-    cookie: []
-  };
-  if (!params)
-    return result;
-  for (const param of params) {
-    let resolved;
-    if (isReference(param)) {
-      const ref = resolveRef(doc, param.$ref);
-      if (!ref)
-        continue;
-      resolved = ref;
-    } else {
-      resolved = param;
+  if (!options.ignoreTransport) {
+    const specMethod = spec.transport?.rest?.method ?? (spec.meta.kind === "query" ? "GET" : "POST");
+    const opMethod = operation.method.toUpperCase();
+    if (specMethod !== opMethod) {
+      changes.push({
+        path: "transport.rest.method",
+        type: "modified",
+        oldValue: specMethod,
+        newValue: opMethod,
+        description: "HTTP method changed"
+      });
     }
-    const parsed = {
-      name: resolved.name,
-      in: resolved.in,
-      required: resolved.required ?? resolved.in === "path",
-      description: resolved.description,
-      schema: dereferenceSchema(doc, resolved.schema),
-      deprecated: resolved.deprecated ?? false
-    };
-    result[resolved.in]?.push(parsed);
-  }
-  return result;
-}
-// src/openapi/parser/operation.ts
-function parseOperation(doc, method, path, operation, pathParams) {
-  const allParams = [...pathParams ?? [], ...operation.parameters ?? []];
-  const params = parseParameters(doc, allParams);
-  let requestBody;
-  if (operation.requestBody) {
-    const body = isReference(operation.requestBody) ? resolveRef(doc, operation.requestBody.$ref) : operation.requestBody;
-    if (body) {
-      const contentType = Object.keys(body.content ?? {})[0] ?? "application/json";
-      const content = body.content?.[contentType];
-      if (content?.schema) {
-        requestBody = {
-          required: body.required ?? false,
-          schema: dereferenceSchema(doc, content.schema) ?? {},
-          contentType
-        };
-      }
+    const specPath = spec.transport?.rest?.path;
+    if (specPath && specPath !== operation.path) {
+      changes.push({
+        path: "transport.rest.path",
+        type: "modified",
+        oldValue: specPath,
+        newValue: operation.path,
+        description: "Path changed"
+      });
     }
   }
-  const responses = {};
-  for (const [status, response] of Object.entries(operation.responses ?? {})) {
-    const resolved = isReference(response) ? resolveRef(doc, response.$ref) : response;
-    if (resolved) {
-      const contentType = Object.keys(resolved.content ?? {})[0];
-      const content = contentType ? resolved.content?.[contentType] : undefined;
-      responses[status] = {
-        description: resolved.description,
-        schema: content?.schema ? dereferenceSchema(doc, content.schema) : undefined,
-        contentType
-      };
-    }
+  const specDeprecated = spec.meta.stability === "deprecated";
+  if (specDeprecated !== operation.deprecated) {
+    changes.push({
+      path: "meta.stability",
+      type: "modified",
+      oldValue: spec.meta.stability,
+      newValue: operation.deprecated ? "deprecated" : "stable",
+      description: "Deprecation status changed"
+    });
   }
-  const contractSpecMeta = operation?.["x-contractspec"];
-  return {
-    operationId: operation.operationId ?? generateOperationId(method, path),
-    method,
-    path,
-    summary: operation.summary,
-    description: operation.description,
-    tags: operation.tags ?? [],
-    pathParams: params.path,
-    queryParams: params.query,
-    headerParams: params.header,
-    cookieParams: params.cookie,
-    requestBody,
-    responses,
-    deprecated: operation.deprecated ?? false,
-    security: operation.security,
-    contractSpecMeta
+  return changes;
+}
+function diffSpecs(oldSpec, newSpec, options = {}) {
+  const changes = [];
+  const metaChanges = diffObjects("meta", oldSpec.meta, newSpec.meta, {
+    ...options,
+    ignorePaths: [
+      ...options.ignorePaths ?? [],
+      ...options.ignoreDescriptions ? ["meta.description", "meta.goal", "meta.context"] : [],
+      ...options.ignoreTags ? ["meta.tags"] : []
+    ]
+  });
+  changes.push(...metaChanges);
+  if (!options.ignoreTransport) {
+    const transportChanges = diffObjects("transport", oldSpec.transport, newSpec.transport, options);
+    changes.push(...transportChanges);
+  }
+  const policyChanges = diffObjects("policy", oldSpec.policy, newSpec.policy, options);
+  changes.push(...policyChanges);
+  return changes;
+}
+function createSpecDiff(operationId, existing, incoming, options = {}) {
+  let changes = [];
+  let isEquivalent = false;
+  if (existing && incoming.operationSpec) {
+    changes = diffSpecs(existing, incoming.operationSpec, options);
+    isEquivalent = changes.length === 0;
+  } else if (existing && !incoming.operationSpec) {
+    changes = [
+      {
+        path: "",
+        type: "modified",
+        oldValue: existing,
+        newValue: incoming.code,
+        description: "Spec code imported from OpenAPI (runtime comparison not available)"
+      }
+    ];
+  } else {
+    changes = [
+      {
+        path: "",
+        type: "added",
+        newValue: incoming.operationSpec ?? incoming.code,
+        description: "New spec imported from OpenAPI"
+      }
+    ];
+  }
+  return {
+    operationId,
+    existing,
+    incoming,
+    changes,
+    isEquivalent
   };
 }
-// src/openapi/parser/document.ts
-function parseOpenApiDocument(doc, _options = {}) {
-  const version = detectVersion(doc);
-  const warnings = [];
-  const operations = [];
-  for (const [path, pathItem] of Object.entries(doc.paths ?? {})) {
-    if (!pathItem)
-      continue;
-    const pathParams = pathItem.parameters;
-    for (const method of HTTP_METHODS) {
-      const operation = pathItem[method];
-      if (operation) {
-        try {
-          operations.push(parseOperation(doc, method, path, operation, pathParams));
-        } catch (error) {
-          warnings.push(`Failed to parse ${method.toUpperCase()} ${path}: ${error}`);
-        }
+function diffAll(existingSpecs, importedSpecs, options = {}) {
+  const diffs = [];
+  const matchedExisting = new Set;
+  for (const imported of importedSpecs) {
+    const operationId = imported.source.sourceId;
+    let existing;
+    for (const [key, spec] of existingSpecs) {
+      const specName = spec.meta.key;
+      if (key === operationId || specName.includes(operationId)) {
+        existing = spec;
+        matchedExisting.add(key);
+        break;
       }
     }
+    diffs.push(createSpecDiff(operationId, existing, imported, options));
   }
-  const schemas = {};
-  const components = doc.components;
-  if (components?.schemas) {
-    for (const [name, schema] of Object.entries(components.schemas)) {
-      schemas[name] = schema;
+  for (const [key, spec] of existingSpecs) {
+    if (!matchedExisting.has(key)) {
+      diffs.push({
+        operationId: key,
+        existing: spec,
+        incoming: undefined,
+        changes: [
+          {
+            path: "",
+            type: "removed",
+            oldValue: spec,
+            description: "Spec no longer exists in OpenAPI source"
+          }
+        ],
+        isEquivalent: false
+      });
     }
   }
-  const servers = (doc.servers ?? []).map((s) => ({
-    url: s.url,
-    description: s.description,
-    variables: s.variables
-  }));
-  const events = [];
-  if ("webhooks" in doc && doc.webhooks) {
-    for (const [name, pathItem] of Object.entries(doc.webhooks)) {
-      if (typeof pathItem !== "object" || !pathItem)
-        continue;
-      const operation = pathItem["post"];
-      if (operation && operation.requestBody) {
-        if ("$ref" in operation.requestBody) {
-          throw new Error(`'$ref' isn't supported`);
-        }
-        const content = operation.requestBody.content?.["application/json"];
-        if (content?.schema) {
-          events.push({
-            name,
-            description: operation.summary || operation.description,
-            payload: content.schema
-          });
-        }
-      }
+  return diffs;
+}
+function formatDiffChanges(changes) {
+  if (changes.length === 0) {
+    return "No changes detected";
+  }
+  const lines = [];
+  for (const change of changes) {
+    const prefix = {
+      added: "+",
+      removed: "-",
+      modified: "~",
+      type_changed: "!",
+      required_changed: "?"
+    }[change.type];
+    lines.push(`${prefix} ${change.path}: ${change.description}`);
+    if (change.type === "modified" || change.type === "type_changed") {
+      lines.push(`    old: ${JSON.stringify(change.oldValue)}`);
+      lines.push(`    new: ${JSON.stringify(change.newValue)}`);
+    } else if (change.type === "added") {
+      lines.push(`    value: ${JSON.stringify(change.newValue)}`);
+    } else if (change.type === "removed") {
+      lines.push(`    was: ${JSON.stringify(change.oldValue)}`);
     }
   }
+  return lines.join(`
+`);
+}
+// src/openapi/exporter/data-views.ts
+function exportDataViews(registry) {
+  return registry.list().map((dv) => ({
+    name: dv.meta.key,
+    version: dv.meta.version,
+    description: dv.meta.description,
+    stability: dv.meta.stability,
+    entity: dv.meta.entity,
+    kind: dv.view.kind,
+    source: dv.source,
+    fields: dv.view.fields
+  }));
+}
+function generateDataViewsRegistry(registry) {
+  const dataViews = registry.list();
+  const imports = new Set;
+  const registrations = [];
+  for (const dv of dataViews) {
+    const dvVarName = dv.meta.key.replace(/\./g, "_") + `_v${dv.meta.version}`;
+    imports.add(`import { ${dvVarName} } from './${dv.meta.key.split(".")[0]}';`);
+    registrations.push(`  .register(${dvVarName})`);
+  }
+  const code = `/**
+ * Auto-generated data views registry.
+ * DO NOT EDIT - This file is generated by ContractSpec exporter.
+ */
+import { DataViewRegistry } from '@contractspec/lib.contracts-spec/data-views';
+
+${Array.from(imports).join(`
+`)}
+
+export const dataViewsRegistry = new DataViewRegistry()
+${registrations.join(`
+`)};
+`;
   return {
-    document: doc,
-    version,
-    info: {
-      title: doc.info.title,
-      version: doc.info.version,
-      description: doc.info.description
-    },
-    operations,
-    schemas,
-    servers,
-    warnings,
-    events
+    code,
+    fileName: "dataviews-registry.ts"
   };
 }
-async function parseOpenApi(source, options = {}) {
-  const {
-    fetch: fetchFn = globalThis.fetch,
-    readFile,
-    timeout = 30000
-  } = options;
-  let content;
-  let format;
-  if (source.startsWith("http://") || source.startsWith("https://")) {
-    const controller = new AbortController;
-    const timeoutId = setTimeout(() => controller.abort(), timeout);
-    try {
-      const response = await fetchFn(source, { signal: controller.signal });
-      if (!response.ok) {
-        throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-      }
-      content = await response.text();
-    } finally {
-      clearTimeout(timeoutId);
-    }
-    if (source.endsWith(".yaml") || source.endsWith(".yml")) {
-      format = "yaml";
-    } else if (source.endsWith(".json")) {
-      format = "json";
-    } else {
-      format = detectFormat(content);
-    }
-  } else {
-    if (!readFile) {
-      throw new Error("readFile adapter required for file paths");
-    }
-    content = await readFile(source);
-    if (source.endsWith(".yaml") || source.endsWith(".yml")) {
-      format = "yaml";
-    } else if (source.endsWith(".json")) {
-      format = "json";
-    } else {
-      format = detectFormat(content);
-    }
+
+// src/openapi/exporter/events.ts
+import { z } from "zod";
+function exportEvents(events) {
+  return events.map((event) => ({
+    name: event.meta.key,
+    version: event.meta.version,
+    description: event.meta.description,
+    payload: event.payload ? z.toJSONSchema(event.payload.getZod()) : null,
+    pii: event.pii
+  }));
+}
+function generateEventsExports(events) {
+  const eventExports = [];
+  for (const event of events) {
+    const eventVarName = event.meta.key.replace(/\./g, "_") + `_v${event.meta.version}`;
+    eventExports.push(`export { ${eventVarName} } from './${event.meta.key.split(".")[0]}';`);
+  }
+  const code = `/**
+ * Auto-generated events exports.
+ * DO NOT EDIT - This file is generated by ContractSpec exporter.
+ */
+
+${eventExports.join(`
+`)}
+`;
+  return {
+    code,
+    fileName: "events-exports.ts"
+  };
+}
+
+// src/openapi/exporter/features.ts
+function exportFeatures(registry) {
+  return registry.list().map((feature) => ({
+    key: feature.meta.key,
+    description: feature.meta.description,
+    owners: feature.meta.owners,
+    stability: feature.meta.stability,
+    operations: feature.operations,
+    events: feature.events,
+    presentations: feature.presentations
+  }));
+}
+function generateFeaturesRegistry(registry) {
+  const features = registry.list();
+  const imports = new Set;
+  const registrations = [];
+  for (const feature of features) {
+    const featureVarName = feature.meta.key.replace(/-/g, "_");
+    imports.add(`import { ${featureVarName} } from './${feature.meta.key}';`);
+    registrations.push(`  .register(${featureVarName})`);
+  }
+  const code = `/**
+ * Auto-generated features registry.
+ * DO NOT EDIT - This file is generated by ContractSpec exporter.
+ */
+import { FeatureRegistry } from '@contractspec/lib.contracts-spec';
+
+${Array.from(imports).join(`
+`)}
+
+export const featuresRegistry = new FeatureRegistry()
+${registrations.join(`
+`)};
+`;
+  return {
+    code,
+    fileName: "features-registry.ts"
+  };
+}
+
+// src/openapi/exporter/forms.ts
+import { z as z2 } from "zod";
+function exportForms(registry) {
+  return registry.list().map((form) => ({
+    key: form.meta.key,
+    version: form.meta.version,
+    description: form.meta.description,
+    stability: form.meta.stability,
+    owners: form.meta.owners,
+    fields: form.fields,
+    model: form.model ? z2.toJSONSchema(form.model.getZod()) : null,
+    actions: form.actions
+  }));
+}
+function generateFormsRegistry(registry) {
+  const forms = registry.list();
+  const imports = new Set;
+  const registrations = [];
+  for (const form of forms) {
+    const formVarName = form.meta.key.replace(/-/g, "_") + `_v${form.meta.version}`;
+    imports.add(`import { ${formVarName} } from './${form.meta.key}';`);
+    registrations.push(`  .register(${formVarName})`);
   }
-  const doc = parseOpenApiString(content, format);
-  return parseOpenApiDocument(doc, options);
+  const code = `/**
+ * Auto-generated forms registry.
+ * DO NOT EDIT - This file is generated by ContractSpec exporter.
+ */
+import { FormRegistry } from '@contractspec/lib.contracts-spec';
+
+${Array.from(imports).join(`
+`)}
+
+export const formsRegistry = new FormRegistry()
+${registrations.join(`
+`)};
+`;
+  return {
+    code,
+    fileName: "forms-registry.ts"
+  };
 }
+
 // src/openapi/exporter/operations.ts
-import { z } from "zod";
 import { compareVersions } from "compare-versions";
+import { z as z3 } from "zod";
 function toOperationId(name, version) {
   return `${name.replace(/\./g, "_")}_v${version.replace(/\./g, "_")}`;
 }
@@ -391,7 +480,7 @@ function toRestPath(spec) {
 function schemaModelToJsonSchema(schema) {
   if (!schema)
     return null;
-  return z.toJSONSchema(schema.getZod());
+  return z3.toJSONSchema(schema.getZod());
 }
 function jsonSchemaForSpec(spec) {
   return {
@@ -492,77 +581,6 @@ ${registrations.join(`
   };
 }
 
-// src/openapi/exporter/events.ts
-import { z as z2 } from "zod";
-function exportEvents(events) {
-  return events.map((event) => ({
-    name: event.meta.key,
-    version: event.meta.version,
-    description: event.meta.description,
-    payload: event.payload ? z2.toJSONSchema(event.payload.getZod()) : null,
-    pii: event.pii
-  }));
-}
-function generateEventsExports(events) {
-  const eventExports = [];
-  for (const event of events) {
-    const eventVarName = event.meta.key.replace(/\./g, "_") + `_v${event.meta.version}`;
-    eventExports.push(`export { ${eventVarName} } from './${event.meta.key.split(".")[0]}';`);
-  }
-  const code = `/**
- * Auto-generated events exports.
- * DO NOT EDIT - This file is generated by ContractSpec exporter.
- */
-
-${eventExports.join(`
-`)}
-`;
-  return {
-    code,
-    fileName: "events-exports.ts"
-  };
-}
-
-// src/openapi/exporter/features.ts
-function exportFeatures(registry) {
-  return registry.list().map((feature) => ({
-    key: feature.meta.key,
-    description: feature.meta.description,
-    owners: feature.meta.owners,
-    stability: feature.meta.stability,
-    operations: feature.operations,
-    events: feature.events,
-    presentations: feature.presentations
-  }));
-}
-function generateFeaturesRegistry(registry) {
-  const features = registry.list();
-  const imports = new Set;
-  const registrations = [];
-  for (const feature of features) {
-    const featureVarName = feature.meta.key.replace(/-/g, "_");
-    imports.add(`import { ${featureVarName} } from './${feature.meta.key}';`);
-    registrations.push(`  .register(${featureVarName})`);
-  }
-  const code = `/**
- * Auto-generated features registry.
- * DO NOT EDIT - This file is generated by ContractSpec exporter.
- */
-import { FeatureRegistry } from '@contractspec/lib.contracts-spec';
-
-${Array.from(imports).join(`
-`)}
-
-export const featuresRegistry = new FeatureRegistry()
-${registrations.join(`
-`)};
-`;
-  return {
-    code,
-    fileName: "features-registry.ts"
-  };
-}
-
 // src/openapi/exporter/presentations.ts
 function exportPresentations(registry) {
   return registry.list().map((pres) => ({
@@ -614,137 +632,6 @@ ${registrations.join(`
   };
 }
 
-// src/openapi/exporter/forms.ts
-import { z as z3 } from "zod";
-function exportForms(registry) {
-  return registry.list().map((form) => ({
-    key: form.meta.key,
-    version: form.meta.version,
-    description: form.meta.description,
-    stability: form.meta.stability,
-    owners: form.meta.owners,
-    fields: form.fields,
-    model: form.model ? z3.toJSONSchema(form.model.getZod()) : null,
-    actions: form.actions
-  }));
-}
-function generateFormsRegistry(registry) {
-  const forms = registry.list();
-  const imports = new Set;
-  const registrations = [];
-  for (const form of forms) {
-    const formVarName = form.meta.key.replace(/-/g, "_") + `_v${form.meta.version}`;
-    imports.add(`import { ${formVarName} } from './${form.meta.key}';`);
-    registrations.push(`  .register(${formVarName})`);
-  }
-  const code = `/**
- * Auto-generated forms registry.
- * DO NOT EDIT - This file is generated by ContractSpec exporter.
- */
-import { FormRegistry } from '@contractspec/lib.contracts-spec';
-
-${Array.from(imports).join(`
-`)}
-
-export const formsRegistry = new FormRegistry()
-${registrations.join(`
-`)};
-`;
-  return {
-    code,
-    fileName: "forms-registry.ts"
-  };
-}
-
-// src/openapi/exporter/data-views.ts
-function exportDataViews(registry) {
-  return registry.list().map((dv) => ({
-    name: dv.meta.key,
-    version: dv.meta.version,
-    description: dv.meta.description,
-    stability: dv.meta.stability,
-    entity: dv.meta.entity,
-    kind: dv.view.kind,
-    source: dv.source,
-    fields: dv.view.fields
-  }));
-}
-function generateDataViewsRegistry(registry) {
-  const dataViews = registry.list();
-  const imports = new Set;
-  const registrations = [];
-  for (const dv of dataViews) {
-    const dvVarName = dv.meta.key.replace(/\./g, "_") + `_v${dv.meta.version}`;
-    imports.add(`import { ${dvVarName} } from './${dv.meta.key.split(".")[0]}';`);
-    registrations.push(`  .register(${dvVarName})`);
-  }
-  const code = `/**
- * Auto-generated data views registry.
- * DO NOT EDIT - This file is generated by ContractSpec exporter.
- */
-import { DataViewRegistry } from '@contractspec/lib.contracts-spec/data-views';
-
-${Array.from(imports).join(`
-`)}
-
-export const dataViewsRegistry = new DataViewRegistry()
-${registrations.join(`
-`)};
-`;
-  return {
-    code,
-    fileName: "dataviews-registry.ts"
-  };
-}
-
-// src/openapi/exporter/workflows.ts
-function exportWorkflows(registry) {
-  return registry.list().map((wf) => ({
-    name: wf.meta.key,
-    version: wf.meta.version,
-    description: wf.meta.description,
-    stability: wf.meta.stability,
-    owners: wf.meta.owners,
-    steps: wf.definition.steps.map((s) => ({
-      id: s.id,
-      type: s.type,
-      label: s.label
-    })),
-    transitions: wf.definition.transitions.map((t) => ({
-      from: t.from,
-      to: t.to,
-      label: t.label
-    }))
-  }));
-}
-function generateWorkflowsRegistry(registry) {
-  const workflows = registry.list();
-  const imports = new Set;
-  const registrations = [];
-  for (const wf of workflows) {
-    const wfVarName = wf.meta.key.replace(/\./g, "_") + `_v${wf.meta.version}`;
-    imports.add(`import { ${wfVarName} } from './${wf.meta.key.split(".")[0]}';`);
-    registrations.push(`  .register(${wfVarName})`);
-  }
-  const code = `/**
- * Auto-generated workflows registry.
- * DO NOT EDIT - This file is generated by ContractSpec exporter.
- */
-import { WorkflowRegistry } from '@contractspec/lib.contracts-spec/workflow';
-
-${Array.from(imports).join(`
-`)}
-
-export const workflowsRegistry = new WorkflowRegistry()
-${registrations.join(`
-`)};
-`;
-  return {
-    code,
-    fileName: "workflows-registry.ts"
-  };
-}
-
 // src/openapi/exporter/registries.ts
 function generateRegistryIndex(options = {}) {
   const {
@@ -779,16 +666,64 @@ function generateRegistryIndex(options = {}) {
     exports.push("export * from './workflows-registry';");
   }
   const code = `/**
- * Auto-generated registry index.
+ * Auto-generated registry index.
+ * DO NOT EDIT - This file is generated by ContractSpec exporter.
+ */
+
+${exports.join(`
+`)}
+`;
+  return {
+    code,
+    fileName: "index.ts"
+  };
+}
+
+// src/openapi/exporter/workflows.ts
+function exportWorkflows(registry) {
+  return registry.list().map((wf) => ({
+    name: wf.meta.key,
+    version: wf.meta.version,
+    description: wf.meta.description,
+    stability: wf.meta.stability,
+    owners: wf.meta.owners,
+    steps: wf.definition.steps.map((s) => ({
+      id: s.id,
+      type: s.type,
+      label: s.label
+    })),
+    transitions: wf.definition.transitions.map((t) => ({
+      from: t.from,
+      to: t.to,
+      label: t.label
+    }))
+  }));
+}
+function generateWorkflowsRegistry(registry) {
+  const workflows = registry.list();
+  const imports = new Set;
+  const registrations = [];
+  for (const wf of workflows) {
+    const wfVarName = wf.meta.key.replace(/\./g, "_") + `_v${wf.meta.version}`;
+    imports.add(`import { ${wfVarName} } from './${wf.meta.key.split(".")[0]}';`);
+    registrations.push(`  .register(${wfVarName})`);
+  }
+  const code = `/**
+ * Auto-generated workflows registry.
  * DO NOT EDIT - This file is generated by ContractSpec exporter.
  */
+import { WorkflowRegistry } from '@contractspec/lib.contracts-spec/workflow';
 
-${exports.join(`
+${Array.from(imports).join(`
 `)}
+
+export const workflowsRegistry = new WorkflowRegistry()
+${registrations.join(`
+`)};
 `;
   return {
     code,
-    fileName: "index.ts"
+    fileName: "workflows-registry.ts"
   };
 }
 
@@ -949,7 +884,7 @@ var JSON_SCHEMA_TO_SCALAR = {
   "string:uri": "ScalarTypeEnum.URL",
   "string:uuid": "ScalarTypeEnum.ID"
 };
-function isReference2(schema) {
+function isReference(schema) {
   return typeof schema === "object" && schema !== null && "$ref" in schema;
 }
 function typeNameFromRef(ref) {
@@ -1004,7 +939,7 @@ class ContractSpecSchemaGenerator {
   generateContractSpecSchema(schema, modelName, indent = 0) {
     const spaces = "  ".repeat(indent);
     const fields = [];
-    if (isReference2(schema)) {
+    if (isReference(schema)) {
       return {
         name: toPascalCase(typeNameFromRef(schema.$ref)),
         fields: [],
@@ -1140,7 +1075,7 @@ class ContractSpecSchemaGenerator {
     const scalarType = getScalarType(schema);
     let enumValues;
     let nestedModel;
-    if (!isReference2(schema)) {
+    if (!isReference(schema)) {
       const schemaObj = schema;
       const enumArr = schemaObj["enum"];
       if (enumArr) {
@@ -1158,7 +1093,7 @@ class ContractSpecSchemaGenerator {
       type: {
         ...type,
         optional: !required || type.optional,
-        description: !isReference2(schema) ? schema["description"] : undefined
+        description: !isReference(schema) ? schema["description"] : undefined
       },
       scalarType,
       enumValues,
@@ -1501,7 +1436,7 @@ var JSON_SCHEMA_TO_SCALAR2 = {
   "string:uri": "ScalarTypeEnum.URL",
   "string:uuid": "ScalarTypeEnum.ID"
 };
-function isReference3(schema) {
+function isReference2(schema) {
   return typeof schema === "object" && schema !== null && "$ref" in schema;
 }
 function typeNameFromRef2(ref) {
@@ -1509,7 +1444,7 @@ function typeNameFromRef2(ref) {
   return parts[parts.length - 1] ?? "Unknown";
 }
 function jsonSchemaToType(schema, name) {
-  if (isReference3(schema)) {
+  if (isReference2(schema)) {
     return {
       type: toPascalCase(typeNameFromRef2(schema.$ref)),
       optional: false,
@@ -1602,7 +1537,7 @@ function jsonSchemaToType(schema, name) {
   };
 }
 function getScalarType(schema) {
-  if (isReference3(schema)) {
+  if (isReference2(schema)) {
     return;
   }
   const schemaObj = schema;
@@ -1648,65 +1583,42 @@ function generateImports(fields, options, sameDirectory = true) {
 `);
 }
 
-// src/openapi/importer/schemas.ts
-function buildInputSchemas(operation2) {
-  const result = {};
-  if (operation2.pathParams.length > 0) {
-    result.params = {
-      type: "object",
-      properties: operation2.pathParams.reduce((acc, p) => {
-        acc[p.name] = p.schema;
-        return acc;
-      }, {}),
-      required: operation2.pathParams.map((p) => p.name)
-    };
-  }
-  if (operation2.queryParams.length > 0) {
-    result.query = {
-      type: "object",
-      properties: operation2.queryParams.reduce((acc, p) => {
-        acc[p.name] = p.schema;
-        return acc;
-      }, {}),
-      required: operation2.queryParams.filter((p) => p.required).map((p) => p.name)
-    };
-  }
-  const excludedHeaders = [
-    "authorization",
-    "content-type",
-    "accept",
-    "user-agent"
-  ];
-  const actualHeaders = operation2.headerParams.filter((p) => !excludedHeaders.includes(p.name.toLowerCase()));
-  if (actualHeaders.length > 0) {
-    result.headers = {
-      type: "object",
-      properties: actualHeaders.reduce((acc, p) => {
-        acc[p.name] = p.schema;
-        return acc;
-      }, {}),
-      required: actualHeaders.filter((p) => p.required).map((p) => p.name)
-    };
-  }
-  if (operation2.requestBody?.schema) {
-    result.body = operation2.requestBody.schema;
-  }
-  return result;
-}
-function getOutputSchema(operation2) {
-  const successCodes = ["200", "201", "202", "204"];
-  for (const code of successCodes) {
-    const response = operation2.responses[code];
-    if (response?.schema) {
-      return response.schema;
-    }
+// src/openapi/importer/events.ts
+function generateEventCode(event, options) {
+  const eventName = toValidIdentifier(event.name);
+  const modelName = toPascalCase(eventName) + "Payload";
+  const schemaFormat = options.schemaFormat || "contractspec";
+  const payloadModel = generateSchemaModelCode(event.payload, modelName, schemaFormat, options);
+  const imports = new Set;
+  imports.add("import { defineEvent, type EventSpec } from '@contractspec/lib.contracts-spec';");
+  if (payloadModel.imports && payloadModel.imports.length > 0) {
+    payloadModel.imports.forEach((i) => imports.add(i));
+  } else if (payloadModel.fields && payloadModel.fields.length > 0) {
+    const modelImports = generateImports(payloadModel.fields, options);
+    modelImports.split(`
+`).filter(Boolean).forEach((i) => imports.add(i));
   }
-  for (const [code, response] of Object.entries(operation2.responses)) {
-    if (code.startsWith("2") && response.schema) {
-      return response.schema;
-    }
+  if (payloadModel.name !== modelName) {
+    const modelsDir = `../${options.conventions.models}`;
+    const kebabName = payloadModel.name.replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase();
+    imports.add(`import { ${payloadModel.name} } from '${modelsDir}/${kebabName}';`);
   }
-  return null;
+  const allImports = Array.from(imports).join(`
+`);
+  return `
+${allImports}
+
+${payloadModel.code}
+
+export const ${eventName} = defineEvent({
+  meta: {
+    key: '${event.name}',
+    version: '1.0.0',
+    description: ${JSON.stringify(event.description ?? "")},
+  },
+  payload: ${payloadModel.name},
+});
+`.trim();
 }
 
 // src/openapi/importer/analyzer.ts
@@ -1714,11 +1626,11 @@ var COMMAND_METHODS = ["post", "put", "delete", "patch"];
 function inferOpKind(method) {
   return COMMAND_METHODS.includes(method.toLowerCase()) ? "command" : "query";
 }
-function inferAuthLevel(operation2, defaultAuth) {
-  if (!operation2.security || operation2.security.length === 0) {
+function inferAuthLevel(operation, defaultAuth) {
+  if (!operation.security || operation.security.length === 0) {
     return defaultAuth;
   }
-  for (const sec of operation2.security) {
+  for (const sec of operation.security) {
     if (Object.keys(sec).length === 0) {
       return "anonymous";
     }
@@ -1727,10 +1639,10 @@ function inferAuthLevel(operation2, defaultAuth) {
 }
 
 // src/openapi/importer/generator.ts
-function generateSpecCode(operation2, contractspecConfig, options = {}, inputModel, outputModel, queryModel = null, paramsModel = null, headersModel = null) {
-  const specKey = toSpecKey(operation2.operationId, options.prefix);
-  const kind = inferOpKind(operation2.method);
-  const auth = inferAuthLevel(operation2, options.defaultAuth ?? "user");
+function generateSpecCode(operation, contractspecConfig, options = {}, inputModel, outputModel, queryModel = null, paramsModel = null, headersModel = null) {
+  const specKey = toSpecKey(operation.operationId, options.prefix);
+  const kind = inferOpKind(operation.method);
+  const auth = inferAuthLevel(operation, options.defaultAuth ?? "user");
   const lines = [];
   lines.push("import { defineCommand, defineQuery } from '@contractspec/lib.contracts-spec';");
   if (inputModel || outputModel || queryModel || paramsModel || headersModel) {
@@ -1775,15 +1687,15 @@ function generateSpecCode(operation2, contractspecConfig, options = {}, inputMod
     }
   }
   const defineFunc = kind === "command" ? "defineCommand" : "defineQuery";
-  const safeName = toValidIdentifier(toPascalCase(operation2.operationId));
+  const safeName = toValidIdentifier(toPascalCase(operation.operationId));
   lines.push(`/**`);
-  lines.push(` * ${operation2.summary ?? operation2.operationId}`);
-  if (operation2.description) {
+  lines.push(` * ${operation.summary ?? operation.operationId}`);
+  if (operation.description) {
     lines.push(` *`);
-    lines.push(` * ${operation2.description}`);
+    lines.push(` * ${operation.description}`);
   }
   lines.push(` *`);
-  lines.push(` * @source OpenAPI: ${operation2.method.toUpperCase()} ${operation2.path}`);
+  lines.push(` * @source OpenAPI: ${operation.method.toUpperCase()} ${operation.path}`);
   lines.push(` */`);
   lines.push(`export const ${safeName}Spec = ${defineFunc}({`);
   lines.push("  meta: {");
@@ -1791,10 +1703,10 @@ function generateSpecCode(operation2, contractspecConfig, options = {}, inputMod
   lines.push("    version: '1.0.0',");
   lines.push(`    stability: '${options.defaultStability ?? "stable"}',`);
   lines.push(`    owners: [${(options.defaultOwners ?? []).map((o) => `'${o}'`).join(", ")}],`);
-  lines.push(`    tags: [${operation2.tags.map((t) => `'${t}'`).join(", ")}],`);
-  lines.push(`    description: ${JSON.stringify(operation2.summary ?? operation2.operationId)},`);
-  lines.push(`    goal: ${JSON.stringify(operation2.description ?? "Imported from OpenAPI")},`);
-  lines.push(`    context: 'Imported from OpenAPI: ${operation2.method.toUpperCase()} ${operation2.path}',`);
+  lines.push(`    tags: [${operation.tags.map((t) => `'${t}'`).join(", ")}],`);
+  lines.push(`    description: ${JSON.stringify(operation.summary ?? operation.operationId)},`);
+  lines.push(`    goal: ${JSON.stringify(operation.description ?? "Imported from OpenAPI")},`);
+  lines.push(`    context: 'Imported from OpenAPI: ${operation.method.toUpperCase()} ${operation.path}',`);
   lines.push("  },");
   lines.push("  io: {");
   lines.push(`    input: ${inputModel?.name ?? "null"},`);
@@ -1813,12 +1725,12 @@ function generateSpecCode(operation2, contractspecConfig, options = {}, inputMod
   lines.push("  policy: {");
   lines.push(`    auth: '${auth}',`);
   lines.push("  },");
-  const httpMethod = operation2.method.toUpperCase();
+  const httpMethod = operation.method.toUpperCase();
   const restMethod = httpMethod === "GET" ? "GET" : "POST";
   lines.push("  transport: {");
   lines.push("    rest: {");
   lines.push(`      method: '${restMethod}',`);
-  lines.push(`      path: '${operation2.path}',`);
+  lines.push(`      path: '${operation.path}',`);
   lines.push("    },");
   lines.push("  },");
   lines.push("});");
@@ -1826,73 +1738,16 @@ function generateSpecCode(operation2, contractspecConfig, options = {}, inputMod
 `);
 }
 
-// src/openapi/importer/models.ts
-function generateModelCode(name, schema, options) {
-  const modelName = toPascalCase(toValidIdentifier(name));
-  const schemaFormat = options.schemaFormat || "contractspec";
-  const model = generateSchemaModelCode(schema, modelName, schemaFormat, options);
-  let imports = "";
-  if (model.imports && model.imports.length > 0) {
-    imports = model.imports.join(`
-`);
-  } else if (model.fields.length > 0) {
-    imports = generateImports(model.fields, options);
-  }
-  return `
-${imports}
-
-${model.code}
-`.trim();
-}
-
-// src/openapi/importer/events.ts
-function generateEventCode(event, options) {
-  const eventName = toValidIdentifier(event.name);
-  const modelName = toPascalCase(eventName) + "Payload";
-  const schemaFormat = options.schemaFormat || "contractspec";
-  const payloadModel = generateSchemaModelCode(event.payload, modelName, schemaFormat, options);
-  const imports = new Set;
-  imports.add("import { defineEvent, type EventSpec } from '@contractspec/lib.contracts-spec';");
-  if (payloadModel.imports && payloadModel.imports.length > 0) {
-    payloadModel.imports.forEach((i) => imports.add(i));
-  } else if (payloadModel.fields && payloadModel.fields.length > 0) {
-    const modelImports = generateImports(payloadModel.fields, options);
-    modelImports.split(`
-`).filter(Boolean).forEach((i) => imports.add(i));
-  }
-  if (payloadModel.name !== modelName) {
-    const modelsDir = `../${options.conventions.models}`;
-    const kebabName = payloadModel.name.replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase();
-    imports.add(`import { ${payloadModel.name} } from '${modelsDir}/${kebabName}';`);
-  }
-  const allImports = Array.from(imports).join(`
-`);
-  return `
-${allImports}
-
-${payloadModel.code}
-
-export const ${eventName} = defineEvent({
-  meta: {
-    key: '${event.name}',
-    version: '1.0.0',
-    description: ${JSON.stringify(event.description ?? "")},
-  },
-  payload: ${payloadModel.name},
-});
-`.trim();
-}
-
 // src/openapi/importer/grouping.ts
-function resolveOperationGroupFolder(operation2, conventions) {
+function resolveOperationGroupFolder(operation, conventions) {
   const groupingRule = conventions.operationsGrouping;
   if (!groupingRule || groupingRule.strategy === "none") {
     return "";
   }
   return applyGroupingStrategy(groupingRule, {
-    name: operation2.operationId,
-    tags: operation2.tags,
-    path: operation2.path
+    name: operation.operationId,
+    tags: operation.tags,
+    path: operation.path
   });
 }
 function resolveModelGroupFolder(modelName, conventions, relatedPath, relatedTags) {
@@ -1911,48 +1766,128 @@ function resolveEventGroupFolder(eventName, conventions, relatedTags) {
   if (!groupingRule || groupingRule.strategy === "none") {
     return "";
   }
-  return applyGroupingStrategy(groupingRule, {
-    name: eventName,
-    tags: relatedTags ?? []
-  });
-}
-function applyGroupingStrategy(rule, context) {
-  switch (rule.strategy) {
-    case "by-tag":
-      return context.tags?.[0] ?? "untagged";
-    case "by-owner":
-      return context.owners?.[0] ?? "unowned";
-    case "by-domain":
-      return extractDomain(context.name);
-    case "by-url-path-single":
-      return extractUrlPathLevel(context.path, 1);
-    case "by-url-path-multi":
-      return extractUrlPathLevel(context.path, rule.urlPathLevel ?? 2);
-    case "by-feature":
-      return extractDomain(context.name);
-    case "none":
-    default:
-      return "";
+  return applyGroupingStrategy(groupingRule, {
+    name: eventName,
+    tags: relatedTags ?? []
+  });
+}
+function applyGroupingStrategy(rule, context) {
+  switch (rule.strategy) {
+    case "by-tag":
+      return context.tags?.[0] ?? "untagged";
+    case "by-owner":
+      return context.owners?.[0] ?? "unowned";
+    case "by-domain":
+      return extractDomain(context.name);
+    case "by-url-path-single":
+      return extractUrlPathLevel(context.path, 1);
+    case "by-url-path-multi":
+      return extractUrlPathLevel(context.path, rule.urlPathLevel ?? 2);
+    case "by-feature":
+      return extractDomain(context.name);
+    case "none":
+    default:
+      return "";
+  }
+}
+function extractDomain(name) {
+  if (name.includes(".")) {
+    return name.split(".")[0] ?? "default";
+  }
+  if (name.includes("_")) {
+    return name.split("_")[0] ?? "default";
+  }
+  const match = name.match(/^([a-z]+)/i);
+  return match?.[1]?.toLowerCase() ?? "default";
+}
+function extractUrlPathLevel(path, level) {
+  if (!path)
+    return "root";
+  const segments = path.split("/").filter(Boolean);
+  const nonParamSegments = segments.filter((s) => !s.startsWith("{"));
+  if (nonParamSegments.length === 0)
+    return "root";
+  return nonParamSegments.slice(0, level).join("/");
+}
+
+// src/openapi/importer/models.ts
+function generateModelCode(name, schema, options) {
+  const modelName = toPascalCase(toValidIdentifier(name));
+  const schemaFormat = options.schemaFormat || "contractspec";
+  const model = generateSchemaModelCode(schema, modelName, schemaFormat, options);
+  let imports = "";
+  if (model.imports && model.imports.length > 0) {
+    imports = model.imports.join(`
+`);
+  } else if (model.fields.length > 0) {
+    imports = generateImports(model.fields, options);
+  }
+  return `
+${imports}
+
+${model.code}
+`.trim();
+}
+
+// src/openapi/importer/schemas.ts
+function buildInputSchemas(operation) {
+  const result = {};
+  if (operation.pathParams.length > 0) {
+    result.params = {
+      type: "object",
+      properties: operation.pathParams.reduce((acc, p) => {
+        acc[p.name] = p.schema;
+        return acc;
+      }, {}),
+      required: operation.pathParams.map((p) => p.name)
+    };
+  }
+  if (operation.queryParams.length > 0) {
+    result.query = {
+      type: "object",
+      properties: operation.queryParams.reduce((acc, p) => {
+        acc[p.name] = p.schema;
+        return acc;
+      }, {}),
+      required: operation.queryParams.filter((p) => p.required).map((p) => p.name)
+    };
+  }
+  const excludedHeaders = [
+    "authorization",
+    "content-type",
+    "accept",
+    "user-agent"
+  ];
+  const actualHeaders = operation.headerParams.filter((p) => !excludedHeaders.includes(p.name.toLowerCase()));
+  if (actualHeaders.length > 0) {
+    result.headers = {
+      type: "object",
+      properties: actualHeaders.reduce((acc, p) => {
+        acc[p.name] = p.schema;
+        return acc;
+      }, {}),
+      required: actualHeaders.filter((p) => p.required).map((p) => p.name)
+    };
+  }
+  if (operation.requestBody?.schema) {
+    result.body = operation.requestBody.schema;
   }
+  return result;
 }
-function extractDomain(name) {
-  if (name.includes(".")) {
-    return name.split(".")[0] ?? "default";
+function getOutputSchema(operation) {
+  const successCodes = ["200", "201", "202", "204"];
+  for (const code of successCodes) {
+    const response = operation.responses[code];
+    if (response?.schema) {
+      return response.schema;
+    }
   }
-  if (name.includes("_")) {
-    return name.split("_")[0] ?? "default";
+  for (const [code, response] of Object.entries(operation.responses)) {
+    if (code.startsWith("2") && response.schema) {
+      return response.schema;
+    }
   }
-  const match = name.match(/^([a-z]+)/i);
-  return match?.[1]?.toLowerCase() ?? "default";
-}
-function extractUrlPathLevel(path, level) {
-  if (!path)
-    return "root";
-  const segments = path.split("/").filter(Boolean);
-  const nonParamSegments = segments.filter((s) => !s.startsWith("{"));
-  if (nonParamSegments.length === 0)
-    return "root";
-  return nonParamSegments.slice(0, level).join("/");
+  return null;
 }
 
 // src/openapi/importer/index.ts
@@ -1961,74 +1896,74 @@ var importFromOpenApi = (parseResult, contractspecOptions, importOptions = {}) =
   const specs = [];
   const skipped = [];
   const errors = [];
-  for (const operation2 of parseResult.operations) {
+  for (const operation of parseResult.operations) {
     if (tags && tags.length > 0) {
-      const hasMatchingTag = operation2.tags.some((t) => tags.includes(t));
+      const hasMatchingTag = operation.tags.some((t) => tags.includes(t));
       if (!hasMatchingTag) {
         skipped.push({
-          sourceId: operation2.operationId,
-          reason: `No matching tags (has: ${operation2.tags.join(", ")})`
+          sourceId: operation.operationId,
+          reason: `No matching tags (has: ${operation.tags.join(", ")})`
         });
         continue;
       }
     }
     if (include && include.length > 0) {
-      if (!include.includes(operation2.operationId)) {
+      if (!include.includes(operation.operationId)) {
         skipped.push({
-          sourceId: operation2.operationId,
+          sourceId: operation.operationId,
           reason: "Not in include list"
         });
         continue;
       }
-    } else if (exclude.includes(operation2.operationId)) {
+    } else if (exclude.includes(operation.operationId)) {
       skipped.push({
-        sourceId: operation2.operationId,
+        sourceId: operation.operationId,
         reason: "In exclude list"
       });
       continue;
     }
-    if (operation2.deprecated && importOptions.defaultStability !== "deprecated") {
+    if (operation.deprecated && importOptions.defaultStability !== "deprecated") {
       skipped.push({
-        sourceId: operation2.operationId,
+        sourceId: operation.operationId,
         reason: "Deprecated operation"
       });
       continue;
     }
     try {
-      const inputSchemas = buildInputSchemas(operation2);
+      const inputSchemas = buildInputSchemas(operation);
       const schemaFormat = importOptions.schemaFormat || contractspecOptions.schemaFormat || "contractspec";
-      const inputModel = inputSchemas.body ? generateSchemaModelCode(inputSchemas.body, `${operation2.operationId}Input`, schemaFormat, contractspecOptions) : null;
-      const queryModel = inputSchemas.query ? generateSchemaModelCode(inputSchemas.query, `${operation2.operationId}Query`, schemaFormat, contractspecOptions) : null;
-      const paramsModel = inputSchemas.params ? generateSchemaModelCode(inputSchemas.params, `${operation2.operationId}Params`, schemaFormat, contractspecOptions) : null;
-      const headersModel = inputSchemas.headers ? generateSchemaModelCode(inputSchemas.headers, `${operation2.operationId}Headers`, schemaFormat, contractspecOptions) : null;
-      const outputSchema = getOutputSchema(operation2);
-      let outputModel = outputSchema ? generateSchemaModelCode(outputSchema, `${operation2.operationId}Output`, schemaFormat, contractspecOptions) : null;
+      const inputModel = inputSchemas.body ? generateSchemaModelCode(inputSchemas.body, `${operation.operationId}Input`, schemaFormat, contractspecOptions) : null;
+      const queryModel = inputSchemas.query ? generateSchemaModelCode(inputSchemas.query, `${operation.operationId}Query`, schemaFormat, contractspecOptions) : null;
+      const paramsModel = inputSchemas.params ? generateSchemaModelCode(inputSchemas.params, `${operation.operationId}Params`, schemaFormat, contractspecOptions) : null;
+      const headersModel = inputSchemas.headers ? generateSchemaModelCode(inputSchemas.headers, `${operation.operationId}Headers`, schemaFormat, contractspecOptions) : null;
+      const outputSchema = getOutputSchema(operation);
+      let outputModel = outputSchema ? generateSchemaModelCode(outputSchema, `${operation.operationId}Output`, schemaFormat, contractspecOptions) : null;
       if (outputModel && schemaFormat === "contractspec" && !outputModel.code.includes("defineSchemaModel")) {
         outputModel = null;
       }
-      const code = generateSpecCode(operation2, contractspecOptions, importOptions, inputModel, outputModel, queryModel, paramsModel, headersModel);
-      const specName = toSpecKey(operation2.operationId, importOptions.prefix);
+      const code = generateSpecCode(operation, contractspecOptions, importOptions, inputModel, outputModel, queryModel, paramsModel, headersModel);
+      const specName = toSpecKey(operation.operationId, importOptions.prefix);
       const fileName = toFileName(specName);
       const transportHints = {
         rest: {
-          method: operation2.method.toUpperCase(),
-          path: operation2.path,
+          method: operation.method.toUpperCase(),
+          path: operation.path,
           params: {
-            path: operation2.pathParams.map((p) => p.name),
-            query: operation2.queryParams.map((p) => p.name),
-            header: operation2.headerParams.map((p) => p.name),
-            cookie: operation2.cookieParams.map((p) => p.name)
+            path: operation.pathParams.map((p) => p.name),
+            query: operation.queryParams.map((p) => p.name),
+            header: operation.headerParams.map((p) => p.name),
+            cookie: operation.cookieParams.map((p) => p.name)
           }
         }
       };
       const source = {
         type: "openapi",
-        sourceId: operation2.operationId,
-        operationId: operation2.operationId,
+        sourceId: operation.operationId,
+        operationId: operation.operationId,
         openApiVersion: parseResult.version,
         importedAt: new Date
       };
-      const groupFolder = resolveOperationGroupFolder(operation2, contractspecOptions.conventions);
+      const groupFolder = resolveOperationGroupFolder(operation, contractspecOptions.conventions);
       specs.push({
         code,
         fileName,
@@ -2038,7 +1973,7 @@ var importFromOpenApi = (parseResult, contractspecOptions, importOptions = {}) =
       });
     } catch (error) {
       errors.push({
-        sourceId: operation2.operationId,
+        sourceId: operation.operationId,
         error: error instanceof Error ? error.message : String(error)
       });
     }
@@ -2111,248 +2046,317 @@ var importFromOpenApi = (parseResult, contractspecOptions, importOptions = {}) =
     }
   };
 };
-function importOperation(operation2, options = {}, contractspecOptions) {
-  const inputSchemas = buildInputSchemas(operation2);
+function importOperation(operation, options = {}, contractspecOptions) {
+  const inputSchemas = buildInputSchemas(operation);
   const schemaFormat = options.schemaFormat || contractspecOptions.schemaFormat || "contractspec";
-  const inputModel = inputSchemas.body ? generateSchemaModelCode(inputSchemas.body, `${operation2.operationId}Input`, schemaFormat, contractspecOptions) : null;
-  const queryModel = inputSchemas.query ? generateSchemaModelCode(inputSchemas.query, `${operation2.operationId}Query`, schemaFormat, contractspecOptions) : null;
-  const paramsModel = inputSchemas.params ? generateSchemaModelCode(inputSchemas.params, `${operation2.operationId}Params`, schemaFormat, contractspecOptions) : null;
-  const headersModel = inputSchemas.headers ? generateSchemaModelCode(inputSchemas.headers, `${operation2.operationId}Headers`, schemaFormat, contractspecOptions) : null;
-  const outputSchema = getOutputSchema(operation2);
-  const outputModel = outputSchema ? generateSchemaModelCode(outputSchema, `${operation2.operationId}Output`, schemaFormat, contractspecOptions) : null;
-  return generateSpecCode(operation2, contractspecOptions, options, inputModel, outputModel, queryModel, paramsModel, headersModel);
+  const inputModel = inputSchemas.body ? generateSchemaModelCode(inputSchemas.body, `${operation.operationId}Input`, schemaFormat, contractspecOptions) : null;
+  const queryModel = inputSchemas.query ? generateSchemaModelCode(inputSchemas.query, `${operation.operationId}Query`, schemaFormat, contractspecOptions) : null;
+  const paramsModel = inputSchemas.params ? generateSchemaModelCode(inputSchemas.params, `${operation.operationId}Params`, schemaFormat, contractspecOptions) : null;
+  const headersModel = inputSchemas.headers ? generateSchemaModelCode(inputSchemas.headers, `${operation.operationId}Headers`, schemaFormat, contractspecOptions) : null;
+  const outputSchema = getOutputSchema(operation);
+  const outputModel = outputSchema ? generateSchemaModelCode(outputSchema, `${operation.operationId}Output`, schemaFormat, contractspecOptions) : null;
+  return generateSpecCode(operation, contractspecOptions, options, inputModel, outputModel, queryModel, paramsModel, headersModel);
 }
-// src/openapi/differ.ts
-function compareValues(path, oldValue, newValue, description) {
-  if (deepEqual(oldValue, newValue)) {
-    return null;
+// src/openapi/parser/resolvers.ts
+function isReference3(obj) {
+  return typeof obj === "object" && obj !== null && "$ref" in obj;
+}
+function resolveRef(doc, ref) {
+  if (!ref.startsWith("#/")) {
+    return;
   }
-  let changeType = "modified";
-  if (oldValue === undefined || oldValue === null) {
-    changeType = "added";
-  } else if (newValue === undefined || newValue === null) {
-    changeType = "removed";
-  } else if (typeof oldValue !== typeof newValue) {
-    changeType = "type_changed";
+  const path = ref.slice(2).split("/");
+  let current = doc;
+  for (const part of path) {
+    if (current === null || current === undefined)
+      return;
+    if (typeof current !== "object")
+      return;
+    current = current[part];
   }
-  return {
-    path,
-    type: changeType,
-    oldValue,
-    newValue,
-    description
-  };
+  return current;
 }
-function diffObjects(path, oldObj, newObj, options) {
-  const changes = [];
-  if (!oldObj && !newObj)
-    return changes;
-  if (!oldObj) {
-    changes.push({
-      path,
-      type: "added",
-      newValue: newObj,
-      description: `Added ${path}`
-    });
-    return changes;
+function dereferenceSchema(doc, schema, seen = new Set) {
+  if (!schema)
+    return;
+  if (isReference3(schema)) {
+    if (seen.has(schema.$ref)) {
+      return schema;
+    }
+    const newSeen = new Set(seen);
+    newSeen.add(schema.$ref);
+    const resolved = resolveRef(doc, schema.$ref);
+    if (!resolved)
+      return schema;
+    const dereferenced = dereferenceSchema(doc, resolved, newSeen);
+    if (!dereferenced)
+      return schema;
+    const refParts = schema.$ref.split("/");
+    const typeName = refParts[refParts.length - 1];
+    return {
+      ...dereferenced,
+      _originalRef: schema.$ref,
+      _originalTypeName: typeName
+    };
   }
-  if (!newObj) {
-    changes.push({
-      path,
-      type: "removed",
-      oldValue: oldObj,
-      description: `Removed ${path}`
-    });
-    return changes;
+  const schemaObj = { ...schema };
+  if (schemaObj.properties) {
+    const props = schemaObj.properties;
+    const newProps = {};
+    for (const [key, prop] of Object.entries(props)) {
+      newProps[key] = dereferenceSchema(doc, prop, seen) ?? prop;
+    }
+    schemaObj.properties = newProps;
   }
-  const allKeys = new Set([...Object.keys(oldObj), ...Object.keys(newObj)]);
-  for (const key of allKeys) {
-    const keyPath = path ? `${path}.${key}` : key;
-    if (options.ignorePaths?.some((p) => keyPath.startsWith(p))) {
-      continue;
+  if (schemaObj.items) {
+    schemaObj.items = dereferenceSchema(doc, schemaObj.items, seen);
+  }
+  const combinators = ["allOf", "anyOf", "oneOf"];
+  for (const comb of combinators) {
+    if (Array.isArray(schemaObj[comb])) {
+      schemaObj[comb] = schemaObj[comb].map((s) => dereferenceSchema(doc, s, seen) ?? s);
     }
-    const oldVal = oldObj[key];
-    const newVal = newObj[key];
-    if (typeof oldVal === "object" && typeof newVal === "object") {
-      changes.push(...diffObjects(keyPath, oldVal, newVal, options));
+  }
+  return schemaObj;
+}
+
+// src/openapi/parser/parameters.ts
+function parseParameters(doc, params) {
+  const result = {
+    path: [],
+    query: [],
+    header: [],
+    cookie: []
+  };
+  if (!params)
+    return result;
+  for (const param of params) {
+    let resolved;
+    if (isReference3(param)) {
+      const ref = resolveRef(doc, param.$ref);
+      if (!ref)
+        continue;
+      resolved = ref;
     } else {
-      const change = compareValues(keyPath, oldVal, newVal, `Changed ${keyPath}`);
-      if (change) {
-        changes.push(change);
-      }
+      resolved = param;
     }
+    const parsed = {
+      name: resolved.name,
+      in: resolved.in,
+      required: resolved.required ?? resolved.in === "path",
+      description: resolved.description,
+      schema: dereferenceSchema(doc, resolved.schema),
+      deprecated: resolved.deprecated ?? false
+    };
+    result[resolved.in]?.push(parsed);
   }
-  return changes;
+  return result;
 }
-function diffSpecVsOperation(spec, operation2, options = {}) {
-  const changes = [];
-  if (!options.ignoreDescriptions) {
-    const descChange = compareValues("meta.description", spec.meta.description, operation2.summary ?? operation2.description, "Description changed");
-    if (descChange)
-      changes.push(descChange);
-  }
-  if (!options.ignoreTags) {
-    const oldTags = [...spec.meta.tags ?? []].sort();
-    const newTags = [...operation2.tags].sort();
-    if (!deepEqual(oldTags, newTags)) {
-      changes.push({
-        path: "meta.tags",
-        type: "modified",
-        oldValue: oldTags,
-        newValue: newTags,
-        description: "Tags changed"
-      });
-    }
+
+// src/openapi/parser/utils.ts
+import { parse as parseYaml } from "yaml";
+var HTTP_METHODS = [
+  "get",
+  "post",
+  "put",
+  "delete",
+  "patch",
+  "head",
+  "options",
+  "trace"
+];
+function parseOpenApiString(content, format = "json") {
+  if (format === "yaml") {
+    return parseYaml(content);
   }
-  if (!options.ignoreTransport) {
-    const specMethod = spec.transport?.rest?.method ?? (spec.meta.kind === "query" ? "GET" : "POST");
-    const opMethod = operation2.method.toUpperCase();
-    if (specMethod !== opMethod) {
-      changes.push({
-        path: "transport.rest.method",
-        type: "modified",
-        oldValue: specMethod,
-        newValue: opMethod,
-        description: "HTTP method changed"
-      });
-    }
-    const specPath = spec.transport?.rest?.path;
-    if (specPath && specPath !== operation2.path) {
-      changes.push({
-        path: "transport.rest.path",
-        type: "modified",
-        oldValue: specPath,
-        newValue: operation2.path,
-        description: "Path changed"
-      });
-    }
+  return JSON.parse(content);
+}
+function detectFormat(content) {
+  const trimmed = content.trim();
+  if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+    return "json";
   }
-  const specDeprecated = spec.meta.stability === "deprecated";
-  if (specDeprecated !== operation2.deprecated) {
-    changes.push({
-      path: "meta.stability",
-      type: "modified",
-      oldValue: spec.meta.stability,
-      newValue: operation2.deprecated ? "deprecated" : "stable",
-      description: "Deprecation status changed"
-    });
+  return "yaml";
+}
+function detectVersion(doc) {
+  const version = doc.openapi;
+  if (version.startsWith("3.1")) {
+    return "3.1";
   }
-  return changes;
+  return "3.0";
 }
-function diffSpecs(oldSpec, newSpec, options = {}) {
-  const changes = [];
-  const metaChanges = diffObjects("meta", oldSpec.meta, newSpec.meta, {
-    ...options,
-    ignorePaths: [
-      ...options.ignorePaths ?? [],
-      ...options.ignoreDescriptions ? ["meta.description", "meta.goal", "meta.context"] : [],
-      ...options.ignoreTags ? ["meta.tags"] : []
-    ]
+function generateOperationId(method, path) {
+  const pathParts = path.split("/").filter(Boolean).map((part) => {
+    if (part.startsWith("{") && part.endsWith("}")) {
+      return "By" + part.slice(1, -1).charAt(0).toUpperCase() + part.slice(2, -1);
+    }
+    return part.charAt(0).toUpperCase() + part.slice(1);
   });
-  changes.push(...metaChanges);
-  if (!options.ignoreTransport) {
-    const transportChanges = diffObjects("transport", oldSpec.transport, newSpec.transport, options);
-    changes.push(...transportChanges);
-  }
-  const policyChanges = diffObjects("policy", oldSpec.policy, newSpec.policy, options);
-  changes.push(...policyChanges);
-  return changes;
+  return method + pathParts.join("");
 }
-function createSpecDiff(operationId, existing, incoming, options = {}) {
-  let changes = [];
-  let isEquivalent = false;
-  if (existing && incoming.operationSpec) {
-    changes = diffSpecs(existing, incoming.operationSpec, options);
-    isEquivalent = changes.length === 0;
-  } else if (existing && !incoming.operationSpec) {
-    changes = [
-      {
-        path: "",
-        type: "modified",
-        oldValue: existing,
-        newValue: incoming.code,
-        description: "Spec code imported from OpenAPI (runtime comparison not available)"
-      }
-    ];
-  } else {
-    changes = [
-      {
-        path: "",
-        type: "added",
-        newValue: incoming.operationSpec ?? incoming.code,
-        description: "New spec imported from OpenAPI"
+
+// src/openapi/parser/operation.ts
+function parseOperation(doc, method, path, operation, pathParams) {
+  const allParams = [...pathParams ?? [], ...operation.parameters ?? []];
+  const params = parseParameters(doc, allParams);
+  let requestBody;
+  if (operation.requestBody) {
+    const body = isReference3(operation.requestBody) ? resolveRef(doc, operation.requestBody.$ref) : operation.requestBody;
+    if (body) {
+      const contentType = Object.keys(body.content ?? {})[0] ?? "application/json";
+      const content = body.content?.[contentType];
+      if (content?.schema) {
+        requestBody = {
+          required: body.required ?? false,
+          schema: dereferenceSchema(doc, content.schema) ?? {},
+          contentType
+        };
       }
-    ];
+    }
+  }
+  const responses = {};
+  for (const [status, response] of Object.entries(operation.responses ?? {})) {
+    const resolved = isReference3(response) ? resolveRef(doc, response.$ref) : response;
+    if (resolved) {
+      const contentType = Object.keys(resolved.content ?? {})[0];
+      const content = contentType ? resolved.content?.[contentType] : undefined;
+      responses[status] = {
+        description: resolved.description,
+        schema: content?.schema ? dereferenceSchema(doc, content.schema) : undefined,
+        contentType
+      };
+    }
   }
+  const contractSpecMeta = operation?.["x-contractspec"];
   return {
-    operationId,
-    existing,
-    incoming,
-    changes,
-    isEquivalent
+    operationId: operation.operationId ?? generateOperationId(method, path),
+    method,
+    path,
+    summary: operation.summary,
+    description: operation.description,
+    tags: operation.tags ?? [],
+    pathParams: params.path,
+    queryParams: params.query,
+    headerParams: params.header,
+    cookieParams: params.cookie,
+    requestBody,
+    responses,
+    deprecated: operation.deprecated ?? false,
+    security: operation.security,
+    contractSpecMeta
   };
 }
-function diffAll(existingSpecs, importedSpecs, options = {}) {
-  const diffs = [];
-  const matchedExisting = new Set;
-  for (const imported of importedSpecs) {
-    const operationId = imported.source.sourceId;
-    let existing;
-    for (const [key, spec] of existingSpecs) {
-      const specName = spec.meta.key;
-      if (key === operationId || specName.includes(operationId)) {
-        existing = spec;
-        matchedExisting.add(key);
-        break;
+
+// src/openapi/parser/document.ts
+function parseOpenApiDocument(doc, _options = {}) {
+  const version = detectVersion(doc);
+  const warnings = [];
+  const operations = [];
+  for (const [path, pathItem] of Object.entries(doc.paths ?? {})) {
+    if (!pathItem)
+      continue;
+    const pathParams = pathItem.parameters;
+    for (const method of HTTP_METHODS) {
+      const operation = pathItem[method];
+      if (operation) {
+        try {
+          operations.push(parseOperation(doc, method, path, operation, pathParams));
+        } catch (error) {
+          warnings.push(`Failed to parse ${method.toUpperCase()} ${path}: ${error}`);
+        }
       }
     }
-    diffs.push(createSpecDiff(operationId, existing, imported, options));
   }
-  for (const [key, spec] of existingSpecs) {
-    if (!matchedExisting.has(key)) {
-      diffs.push({
-        operationId: key,
-        existing: spec,
-        incoming: undefined,
-        changes: [
-          {
-            path: "",
-            type: "removed",
-            oldValue: spec,
-            description: "Spec no longer exists in OpenAPI source"
-          }
-        ],
-        isEquivalent: false
-      });
+  const schemas2 = {};
+  const components = doc.components;
+  if (components?.schemas) {
+    for (const [name, schema] of Object.entries(components.schemas)) {
+      schemas2[name] = schema;
     }
   }
-  return diffs;
-}
-function formatDiffChanges(changes) {
-  if (changes.length === 0) {
-    return "No changes detected";
+  const servers = (doc.servers ?? []).map((s) => ({
+    url: s.url,
+    description: s.description,
+    variables: s.variables
+  }));
+  const events2 = [];
+  if ("webhooks" in doc && doc.webhooks) {
+    for (const [name, pathItem] of Object.entries(doc.webhooks)) {
+      if (typeof pathItem !== "object" || !pathItem)
+        continue;
+      const operation = pathItem["post"];
+      if (operation && operation.requestBody) {
+        if ("$ref" in operation.requestBody) {
+          throw new Error(`'$ref' isn't supported`);
+        }
+        const content = operation.requestBody.content?.["application/json"];
+        if (content?.schema) {
+          events2.push({
+            name,
+            description: operation.summary || operation.description,
+            payload: content.schema
+          });
+        }
+      }
+    }
   }
-  const lines = [];
-  for (const change of changes) {
-    const prefix = {
-      added: "+",
-      removed: "-",
-      modified: "~",
-      type_changed: "!",
-      required_changed: "?"
-    }[change.type];
-    lines.push(`${prefix} ${change.path}: ${change.description}`);
-    if (change.type === "modified" || change.type === "type_changed") {
-      lines.push(`    old: ${JSON.stringify(change.oldValue)}`);
-      lines.push(`    new: ${JSON.stringify(change.newValue)}`);
-    } else if (change.type === "added") {
-      lines.push(`    value: ${JSON.stringify(change.newValue)}`);
-    } else if (change.type === "removed") {
-      lines.push(`    was: ${JSON.stringify(change.oldValue)}`);
+  return {
+    document: doc,
+    version,
+    info: {
+      title: doc.info.title,
+      version: doc.info.version,
+      description: doc.info.description
+    },
+    operations,
+    schemas: schemas2,
+    servers,
+    warnings,
+    events: events2
+  };
+}
+async function parseOpenApi(source, options = {}) {
+  const {
+    fetch: fetchFn = globalThis.fetch,
+    readFile,
+    timeout = 30000
+  } = options;
+  let content;
+  let format;
+  if (source.startsWith("http://") || source.startsWith("https://")) {
+    const controller = new AbortController;
+    const timeoutId = setTimeout(() => controller.abort(), timeout);
+    try {
+      const response = await fetchFn(source, { signal: controller.signal });
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+      }
+      content = await response.text();
+    } finally {
+      clearTimeout(timeoutId);
+    }
+    if (source.endsWith(".yaml") || source.endsWith(".yml")) {
+      format = "yaml";
+    } else if (source.endsWith(".json")) {
+      format = "json";
+    } else {
+      format = detectFormat(content);
+    }
+  } else {
+    if (!readFile) {
+      throw new Error("readFile adapter required for file paths");
+    }
+    content = await readFile(source);
+    if (source.endsWith(".yaml") || source.endsWith(".yml")) {
+      format = "yaml";
+    } else if (source.endsWith(".json")) {
+      format = "json";
+    } else {
+      format = detectFormat(content);
     }
   }
-  return lines.join(`
-`);
+  const doc = parseOpenApiString(content, format);
+  return parseOpenApiDocument(doc, options);
 }
 export {
   toValidIdentifier,