@suss/contract-storybook 0.34.1 → 0.35.0

package/dist/index.cjs

@@ -37,8 +37,8 @@ var import_node_path = __toESM(require("path"), 1);
 var import_ts_morph = require("ts-morph");
 var import_adapter_typescript = require("@suss/adapter-typescript");
 var import_behavioral_ir = require("@suss/behavioral-ir");
+var import_files = require("@suss/behavioral-ir/files");
 function generateSummariesFromStories(filePaths, options = {}) {
-  const projectRoot = options.projectRoot ?? process.cwd();
   const componentModules = options.componentModules ?? true;
   const byFile = /* @__PURE__ */ new Map();
   const groups = componentModules ? filesByTsconfig(filePaths) : /* @__PURE__ */ new Map([[null, filePaths]]);
@@ -46,7 +46,11 @@ function generateSummariesFromStories(filePaths, options = {}) {
     const project = projectFor(tsconfig);
     const resolution = new import_adapter_typescript.ResolutionStore();
     for (const sf of files.map((fp) => project.addSourceFileAtPath(fp))) {
-      const relPath = import_node_path.default.relative(projectRoot, sf.getFilePath());
+      const storyFile = sf.getFilePath();
+      const relPath = (0, import_files.pathInProject)(
+        storyFile,
+        options.projectRoot ?? (0, import_files.defaultProjectRoot)(storyFile)
+      );
       const meta = extractMeta(sf, resolution, componentModules);
       if (meta === null) {
         continue;
@@ -195,15 +199,10 @@ function declaredModuleOf(component) {
   if (declaration === void 0) {
     return void 0;
   }
-  const file = declaration.getSourceFile().getFilePath();
-  const tsconfig = (0, import_adapter_typescript.findNearestTsconfig)(import_node_path.default.dirname(file));
-  const root = (0, import_adapter_typescript.workspaceRootFor)(
-    tsconfig === null ? import_node_path.default.dirname(file) : import_node_path.default.dirname(tsconfig)
-  );
-  const workspace = (0, import_adapter_typescript.workspaceNameFor)(root);
+  const place = (0, import_adapter_typescript.projectPlaceOf)(declaration.getSourceFile().getFilePath());
   return {
-    ...workspace === null ? {} : { workspace },
-    file: import_node_path.default.relative(root, file).replace(/\\/g, "/"),
+    ...place.workspace === null ? {} : { workspace: place.workspace },
+    file: place.file,
     name: declaredNameOf(declaration) ?? component.getText()
   };
 }

package/dist/index.d.cts

@@ -15,7 +15,7 @@ import { BehavioralSummary } from '@suss/behavioral-ir';
 interface StorybookStubOptions {
     /**
      * Each summary's `location.file` is relative to this, so it is the same
-     * on every machine. Defaults to the working directory.
+     * on every machine. Defaults to the repository each story is in.
      */
     projectRoot?: string;
     /**

package/dist/index.d.ts

@@ -15,7 +15,7 @@ import { BehavioralSummary } from '@suss/behavioral-ir';
 interface StorybookStubOptions {
     /**
      * Each summary's `location.file` is relative to this, so it is the same
-     * on every machine. Defaults to the working directory.
+     * on every machine. Defaults to the repository each story is in.
      */
     projectRoot?: string;
     /**

package/dist/index.js

@@ -10,6 +10,7 @@ import {
   exportedDeclarationsOf,
   findNearestTsconfig,
   objectLiteralOf,
+  projectPlaceOf,
   propertiesOf,
   propertyFunctionOf,
   propertyNameOf,
@@ -18,13 +19,11 @@ import {
   ResolutionStore,
   specifierImportedAs,
   stringValueOf,
-  symbolBehind,
-  workspaceNameFor,
-  workspaceRootFor
+  symbolBehind
 } from "@suss/adapter-typescript";
 import { functionCallBinding } from "@suss/behavioral-ir";
+import { defaultProjectRoot, pathInProject } from "@suss/behavioral-ir/files";
 function generateSummariesFromStories(filePaths, options = {}) {
-  const projectRoot = options.projectRoot ?? process.cwd();
   const componentModules = options.componentModules ?? true;
   const byFile = /* @__PURE__ */ new Map();
   const groups = componentModules ? filesByTsconfig(filePaths) : /* @__PURE__ */ new Map([[null, filePaths]]);
@@ -32,7 +31,11 @@ function generateSummariesFromStories(filePaths, options = {}) {
     const project = projectFor(tsconfig);
     const resolution = new ResolutionStore();
     for (const sf of files.map((fp) => project.addSourceFileAtPath(fp))) {
-      const relPath = path.relative(projectRoot, sf.getFilePath());
+      const storyFile = sf.getFilePath();
+      const relPath = pathInProject(
+        storyFile,
+        options.projectRoot ?? defaultProjectRoot(storyFile)
+      );
       const meta = extractMeta(sf, resolution, componentModules);
       if (meta === null) {
         continue;
@@ -181,15 +184,10 @@ function declaredModuleOf(component) {
   if (declaration === void 0) {
     return void 0;
   }
-  const file = declaration.getSourceFile().getFilePath();
-  const tsconfig = findNearestTsconfig(path.dirname(file));
-  const root = workspaceRootFor(
-    tsconfig === null ? path.dirname(file) : path.dirname(tsconfig)
-  );
-  const workspace = workspaceNameFor(root);
+  const place = projectPlaceOf(declaration.getSourceFile().getFilePath());
   return {
-    ...workspace === null ? {} : { workspace },
-    file: path.relative(root, file).replace(/\\/g, "/"),
+    ...place.workspace === null ? {} : { workspace: place.workspace },
+    file: place.file,
     name: declaredNameOf(declaration) ?? component.getText()
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suss/contract-storybook",
-  "version": "0.34.1",
+  "version": "0.35.0",
   "type": "module",
   "description": "Turn Storybook CSF stories into a suss contract and check the props they pass against the React components that receive them.",
   "keywords": [
@@ -47,8 +47,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@suss/adapter-typescript": "0.34.1",
-    "@suss/behavioral-ir": "0.34.1"
+    "@suss/adapter-typescript": "0.35.0",
+    "@suss/behavioral-ir": "0.35.0"
   },
   "devDependencies": {
     "tsup": "*",