storybook-framework-cedarjs 1.0.1-next.0 → 1.1.0-rc.33

package/dist/plugins/docgen-handlers/actualNameHandler.d.ts

@@ -1,12 +1,13 @@
 /**
  * This is heavily based on the react-docgen `displayNameHandler`
  * (https://github.com/reactjs/react-docgen/blob/26c90c0dd105bf83499a83826f2a6ff7a724620d/src/handlers/displayNameHandler.ts)
- * but instead defines an `actualName` property on the generated docs that is taken first from the component's actual name.
- * This addresses an issue where the name that the generated docs are stored under is incorrectly named with the `displayName`
- * and not the component's actual name.
+ * but instead defines an `actualName` property on the generated docs that is taken first from the
+ * component's actual name. This addresses an issue where the name that the generated docs are
+ * stored under is incorrectly named with the `displayName` and not the component's actual name.
  *
- * This is inspired by `actualNameHandler` from https://github.com/storybookjs/babel-plugin-react-docgen, but is modified
- * directly from displayNameHandler, using the same approach as babel-plugin-react-docgen.
+ * This is inspired by `actualNameHandler` from
+ * https://github.com/storybookjs/babel-plugin-react-docgen, but is modified directly from
+ * displayNameHandler, using the same approach as babel-plugin-react-docgen.
  */
 import type { Handler } from 'react-docgen';
 declare const actualNameHandler: Handler;

package/dist/plugins/docgen-handlers/actualNameHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actualNameHandler.d.ts","sourceRoot":"","sources":["../../../src/plugins/docgen-handlers/actualNameHandler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,OAAO,EAA6B,MAAM,cAAc,CAAA;AAKtE,QAAA,MAAM,iBAAiB,EAAE,OA0CxB,CAAA;AAED,eAAe,iBAAiB,CAAA"}
+{"version":3,"file":"actualNameHandler.d.ts","sourceRoot":"","sources":["../../../src/plugins/docgen-handlers/actualNameHandler.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EAAE,OAAO,EAA6B,MAAM,cAAc,CAAA;AAKtE,QAAA,MAAM,iBAAiB,EAAE,OA4CxB,CAAA;AAED,eAAe,iBAAiB,CAAA"}

package/dist/plugins/docgen-handlers/actualNameHandler.js

@@ -1,6 +1,7 @@
 import { utils } from "react-docgen";
 const { getNameOrValue, isReactForwardRefCall } = utils;
 const actualNameHandler = function actualNameHandler2(documentation, componentDefinition) {
+  documentation.set("definedInFile", componentDefinition.hub.file.opts.filename);
   if ((componentDefinition.isClassDeclaration() || componentDefinition.isFunctionDeclaration()) && componentDefinition.has("id")) {
     documentation.set(
       "actualName",

package/dist/plugins/docgen-resolver.d.ts

@@ -0,0 +1,7 @@
+export declare class ReactDocgenResolveError extends Error {
+    readonly code = "MODULE_NOT_FOUND";
+    constructor(filename: string);
+}
+export declare const RESOLVE_EXTENSIONS: string[];
+export declare function defaultLookupModule(filename: string, basedir: string): string;
+//# sourceMappingURL=docgen-resolver.d.ts.map

package/dist/plugins/docgen-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"docgen-resolver.d.ts","sourceRoot":"","sources":["../../src/plugins/docgen-resolver.ts"],"names":[],"mappings":"AAQA,qBAAa,uBAAwB,SAAQ,KAAK;IAEhD,QAAQ,CAAC,IAAI,sBAAqB;gBAEtB,QAAQ,EAAE,MAAM;CAG7B;AASD,eAAO,MAAM,kBAAkB,UAa9B,CAAA;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAsC7E"}

package/dist/plugins/docgen-resolver.js

@@ -0,0 +1,59 @@
+import { extname } from "node:path";
+import resolve from "resolve";
+class ReactDocgenResolveError extends Error {
+  // the magic string that react-docgen uses to check if a module is ignored
+  code = "MODULE_NOT_FOUND";
+  constructor(filename) {
+    super(`'${filename}' was ignored by react-docgen.`);
+  }
+}
+const RESOLVE_EXTENSIONS = [
+  ".js",
+  ".cts",
+  ".mts",
+  ".ctsx",
+  ".mtsx",
+  ".ts",
+  ".tsx",
+  ".mjs",
+  ".cjs",
+  ".mts",
+  ".cts",
+  ".jsx"
+];
+function defaultLookupModule(filename, basedir) {
+  const resolveOptions = {
+    basedir,
+    extensions: RESOLVE_EXTENSIONS,
+    // we do not need to check core modules as we cannot import them anyway
+    includeCoreModules: false
+  };
+  try {
+    return resolve.sync(filename, resolveOptions);
+  } catch (error) {
+    const ext = extname(filename);
+    let newFilename;
+    switch (ext) {
+      case ".js":
+      case ".mjs":
+      case ".cjs":
+        newFilename = `${filename.slice(0, -2)}ts`;
+        break;
+      case ".jsx":
+        newFilename = `${filename.slice(0, -3)}tsx`;
+        break;
+      default:
+        throw error;
+    }
+    return resolve.sync(newFilename, {
+      ...resolveOptions,
+      // we already know that there is an extension at this point, so no need to check other extensions
+      extensions: []
+    });
+  }
+}
+export {
+  RESOLVE_EXTENSIONS,
+  ReactDocgenResolveError,
+  defaultLookupModule
+};

package/dist/plugins/react-docgen.d.ts

@@ -1,8 +1,10 @@
+import * as TsconfigPaths from 'tsconfig-paths';
 import type { PluginOption } from 'vite';
 type Options = {
     include?: string | RegExp | (string | RegExp)[];
     exclude?: string | RegExp | (string | RegExp)[];
 };
-export declare function reactDocgen({ include, exclude, }?: Options): PluginOption;
+export declare function reactDocgen({ include, exclude, }?: Options): Promise<PluginOption>;
+export declare function getReactDocgenImporter(matchPath: TsconfigPaths.MatchPath | undefined): import("react-docgen").Importer;
 export {};
 //# sourceMappingURL=react-docgen.d.ts.map

package/dist/plugins/react-docgen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"react-docgen.d.ts","sourceRoot":"","sources":["../../src/plugins/react-docgen.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAYxC,KAAK,OAAO,GAAG;IACb,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IAC/C,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAChD,CAAA;AAED,wBAAgB,WAAW,CAAC,EAC1B,OAA0B,EAC1B,OAA8B,GAC/B,GAAE,OAAY,GAAG,YAAY,CA2C7B"}
+{"version":3,"file":"react-docgen.d.ts","sourceRoot":"","sources":["../../src/plugins/react-docgen.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,aAAa,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAgBxC,KAAK,OAAO,GAAG;IACb,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IAC/C,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CAChD,CAAA;AAED,wBAAsB,WAAW,CAAC,EAChC,OAA8B,EAC9B,OAA8B,GAC/B,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAuDtC;AAED,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,aAAa,CAAC,SAAS,GAAG,SAAS,mCA+B/C"}

package/dist/plugins/react-docgen.js

@@ -1,50 +1,67 @@
-import path from "path";
+import { existsSync } from "node:fs";
+import { relative, sep } from "node:path";
 import { createFilter } from "@rollup/pluginutils";
+import { getProjectRoot } from "@storybook/core-common";
+import * as find from "empathic/find";
 import MagicString from "magic-string";
 import {
   ERROR_CODES,
-  parse,
   builtinHandlers as docgenHandlers,
   builtinResolvers as docgenResolver,
-  builtinImporters as docgenImporters
+  makeFsImporter,
+  parse
 } from "react-docgen";
+import * as TsconfigPaths from "tsconfig-paths";
 import actualNameHandler from "./docgen-handlers/actualNameHandler.js";
+import {
+  RESOLVE_EXTENSIONS,
+  ReactDocgenResolveError,
+  defaultLookupModule
+} from "./docgen-resolver.js";
 const defaultHandlers = Object.values(docgenHandlers).map((handler) => handler);
 const defaultResolver = new docgenResolver.FindExportedDefinitionsResolver();
-const defaultImporter = docgenImporters.fsImporter;
 const handlers = [...defaultHandlers, actualNameHandler];
-function reactDocgen({
-  include = /\.(tsx?|jsx?)$/,
+async function reactDocgen({
+  include = /\.(mjs|tsx?|jsx?)$/,
   exclude = [/node_modules\/.*/]
 } = {}) {
   const cwd = process.cwd();
   const filter = createFilter(include, exclude);
+  const tsconfigPath = find.up("tsconfig.json", { cwd, last: getProjectRoot() });
+  const tsconfig = TsconfigPaths.loadConfig(tsconfigPath);
+  let matchPath;
+  if (tsconfig.resultType === "success") {
+    matchPath = TsconfigPaths.createMatchPath(
+      tsconfig.absoluteBaseUrl,
+      tsconfig.paths,
+      ["browser", "module", "main"]
+    );
+  }
   return {
     name: "storybook:react-docgen-plugin",
     enforce: "pre",
     async transform(src, id) {
-      const relPath = path.relative(cwd, id);
-      if (!filter(relPath)) {
+      if (!filter(relative(cwd, id))) {
         return;
       }
       try {
         const docgenResults = parse(src, {
           resolver: defaultResolver,
           handlers,
-          importer: defaultImporter,
+          importer: getReactDocgenImporter(matchPath),
           filename: id
         });
         const s = new MagicString(src);
         docgenResults.forEach((info) => {
-          const { actualName, ...docgenInfo } = info;
-          if (actualName) {
+          const { actualName, definedInFile, ...docgenInfo } = info;
+          if (actualName && definedInFile == id) {
             const docNode = JSON.stringify(docgenInfo);
             s.append(`;${actualName}.__docgenInfo=${docNode}`);
           }
         });
         return {
           code: s.toString(),
-          map: s.generateMap()
+          map: s.generateMap({ hires: true, source: id })
         };
       } catch (e) {
         if (e.code === ERROR_CODES.MISSING_DEFINITION) {
@@ -55,6 +72,35 @@ function reactDocgen({
     }
   };
 }
+function getReactDocgenImporter(matchPath) {
+  return makeFsImporter((filename, basedir) => {
+    const mappedFilenameByPaths = (() => {
+      if (matchPath) {
+        const match = matchPath(filename);
+        return match || filename;
+      } else {
+        return filename;
+      }
+    })();
+    const result = defaultLookupModule(mappedFilenameByPaths, basedir);
+    if (result.includes(`${sep}react-native${sep}index.js`)) {
+      const replaced = result.replace(
+        `${sep}react-native${sep}index.js`,
+        `${sep}react-native-web${sep}dist${sep}index.js`
+      );
+      if (existsSync(replaced)) {
+        if (RESOLVE_EXTENSIONS.find((ext) => result.endsWith(ext))) {
+          return replaced;
+        }
+      }
+    }
+    if (RESOLVE_EXTENSIONS.find((ext) => result.endsWith(ext))) {
+      return result;
+    }
+    throw new ReactDocgenResolveError(filename);
+  });
+}
 export {
+  getReactDocgenImporter,
   reactDocgen
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storybook-framework-cedarjs",
-  "version": "1.0.1-next.0+5d18bf5dc",
+  "version": "1.1.0-rc.33",
   "description": "Storybook for CedarJS",
   "keywords": [
     "Storybook",
@@ -52,12 +52,13 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/testing": "1.0.1-next.0+5d18bf5dc",
+    "@cedarjs/testing": "1.1.0-rc.33",
     "@joshwooding/vite-plugin-react-docgen-typescript": "0.6.2",
     "@rollup/pluginutils": "5.1.4",
     "@storybook/addon-essentials": "7.6.20",
     "@storybook/builder-vite": "7.6.20",
     "@storybook/react": "7.6.20",
+    "empathic": "2.0.0",
     "magic-string": "0.30.18",
     "react-docgen": "7.0.3",
     "unplugin-auto-import": "19.3.0",
@@ -72,8 +73,8 @@
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@cedarjs/project-config": "1.0.0",
-    "@cedarjs/router": "1.0.0",
+    "@cedarjs/project-config": "1.1.0-rc.33",
+    "@cedarjs/router": "1.1.0-rc.33",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "storybook": "7.6.20"
@@ -91,5 +92,5 @@
     ],
     "platform": "node"
   },
-  "gitHead": "5d18bf5dc354ad0d1446e8cc45fcad3d08cad5e7"
+  "gitHead": "86cce410c6f5611663ebcdb11df912f35d0b17fb"
 }