Skip to content

Commit

Permalink
docs: fix page title in reference pagesnot showing + refactor workflo…
Browse files Browse the repository at this point in the history
…ws reference (#10537)

* docs: fix references title + refactor workflow reference generation

* update references sidebar
  • Loading branch information
shahednasser authored Dec 10, 2024
1 parent 4ad9ac1 commit 482929f
Show file tree
Hide file tree
Showing 11 changed files with 159 additions and 53 deletions.
70 changes: 58 additions & 12 deletions www/apps/resources/app/references/[...slug]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import MDXComponents from "@/components/MDXComponents"
import mdxOptions from "../../../mdx-options.mjs"
import { slugChanges } from "../../../generated/slug-changes.mjs"
import { filesMap } from "../../../generated/files-map.mjs"
import { Metadata } from "next"
import { cache } from "react"

type PageProps = {
params: Promise<{
Expand All @@ -23,28 +25,20 @@ export default async function ReferencesPage(props: PageProps) {
const params = await props.params
const { slug } = params

// ensure that Vercel loads references files
path.join(process.cwd(), "references")
const monoRepoPath = path.resolve("..", "..", "..")
const fileData = await loadFile(slug)

const pathname = `/references/${slug.join("/")}`
const fileDetails =
slugChanges.find((f) => f.newSlug === pathname) ||
filesMap.find((f) => f.pathname === pathname)
if (!fileDetails) {
if (!fileData) {
return notFound()
}
const fullPath = path.join(monoRepoPath, fileDetails.filePath)
const fileContent = await fs.readFile(fullPath, "utf-8")

const pluginOptions = {
filePath: fullPath,
filePath: fileData.path,
basePath: process.cwd(),
}

return (
<MDXRemote
source={fileContent}
source={fileData.content}
components={MDXComponents}
options={{
mdxOptions: {
Expand Down Expand Up @@ -79,3 +73,55 @@ export default async function ReferencesPage(props: PageProps) {
/>
)
}

export async function generateMetadata({
params,
}: PageProps): Promise<Metadata> {
// read route params
const slug = (await params).slug
const metadata: Metadata = {}

const fileData = await loadFile(slug)

if (!fileData) {
return metadata
}

const pageTitleMatch = /#(?<title>[\w -]+)/.exec(fileData.content)

if (!pageTitleMatch?.groups?.title) {
return metadata
}

metadata.title = pageTitleMatch.groups.title

return metadata
}

const loadFile = cache(
async (
slug: string[]
): Promise<
| {
content: string
path: string
}
| undefined
> => {
path.join(process.cwd(), "references")
const monoRepoPath = path.resolve("..", "..", "..")

const pathname = `/references/${slug.join("/")}`
const fileDetails =
slugChanges.find((f) => f.newSlug === pathname) ||
filesMap.find((f) => f.pathname === pathname)
if (!fileDetails) {
return undefined
}
const fullPath = path.join(monoRepoPath, fileDetails.filePath)
return {
content: await fs.readFile(fullPath, "utf-8"),
path: fullPath,
}
}
)
8 changes: 4 additions & 4 deletions www/apps/resources/generated/sidebar.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -9802,7 +9802,7 @@ export const generatedSidebar = [
"isPathHref": true,
"type": "link",
"path": "/service-factory-reference",
"title": "Service Factory Reference",
"title": "Service Factory",
"isChildSidebar": true,
"children": [
{
Expand Down Expand Up @@ -9902,7 +9902,7 @@ export const generatedSidebar = [
"isPathHref": true,
"type": "link",
"path": "/references/helper-steps",
"title": "Helper Steps Reference",
"title": "Helper Steps",
"isChildSidebar": true,
"autogenerate_path": "/references/helper_steps/functions",
"children": [
Expand Down Expand Up @@ -9976,7 +9976,7 @@ export const generatedSidebar = [
"loaded": true,
"isPathHref": true,
"type": "link",
"title": "Core Workflows Reference",
"title": "Core Workflows",
"path": "/medusa-workflows-reference",
"isChildSidebar": true,
"custom_autogenerate": "core-flows",
Expand Down Expand Up @@ -15114,7 +15114,7 @@ export const generatedSidebar = [
"loaded": true,
"isPathHref": true,
"type": "link",
"title": "Testing Framework Reference",
"title": "Testing Framework",
"path": "/test-tools-reference",
"isChildSidebar": true,
"children": [
Expand Down
8 changes: 4 additions & 4 deletions www/apps/resources/sidebar.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2404,7 +2404,7 @@ export const sidebar = sidebarAttachHrefCommonOptions([
{
type: "link",
path: "/service-factory-reference",
title: "Service Factory Reference",
title: "Service Factory",
isChildSidebar: true,
children: [
{
Expand All @@ -2422,20 +2422,20 @@ export const sidebar = sidebarAttachHrefCommonOptions([
{
type: "link",
path: "/references/helper-steps",
title: "Helper Steps Reference",
title: "Helper Steps",
isChildSidebar: true,
autogenerate_path: "/references/helper_steps/functions",
},
{
type: "link",
title: "Core Workflows Reference",
title: "Core Workflows",
path: "/medusa-workflows-reference",
isChildSidebar: true,
custom_autogenerate: "core-flows",
},
{
type: "link",
title: "Testing Framework Reference",
title: "Testing Framework",
path: "/test-tools-reference",
isChildSidebar: true,
children: [
Expand Down
3 changes: 2 additions & 1 deletion www/apps/resources/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"../../node_modules/@types",
"./node_modules/@types",
"./types"
]
],
"target": "es2018"
},
"include": [
"next-env.d.ts",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ const allowedProjectDocuments: AllowedProjectDocumentsOption = {
[ReflectionKind.Method]: true,
[ReflectionKind.Property]: true,
},
"core-flows": {
[ReflectionKind.Function]: true,
},
}

modules.forEach((module) => {
Expand All @@ -47,7 +44,11 @@ dmlModules.forEach((module) => {
}
})

getNamespaceNames(getCoreFlowNamespaces()).forEach((namespace) => {
const { mainNamespaces: mainCoreFlowNamespaces } = getNamespaceNames(
getCoreFlowNamespaces()
)

mainCoreFlowNamespaces.forEach((namespace) => {
allowedProjectDocuments[namespace] = {
...commonAllowedDocuments,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,23 @@ export function getCoreFlowNamespaces(): NamespaceGenerateDetails[] {
return namespaces
}

export function getNamespaceNames(
namespaces: NamespaceGenerateDetails[]
): string[] {
return namespaces.map((namespace) => namespace.name)
export function getNamespaceNames(namespaces: NamespaceGenerateDetails[]): {
mainNamespaces: string[]
childNamespaces: string[]
} {
const mainNamespaces: string[] = []
const childNamespaces: string[] = []

namespaces.map((namespace) => {
mainNamespaces.push(namespace.name)
childNamespaces.push(
...(namespace.children?.map((childNamespace) => childNamespace.name) ||
[])
)
})

return {
mainNamespaces,
childNamespaces,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { minimatch } from "minimatch"
import {
Application,
Comment,
Context,
Converter,
DeclarationReflection,
ParameterType,
ProjectReflection,
ReflectionKind,
} from "typedoc"
import { NamespaceGenerateDetails } from "types"
Expand Down Expand Up @@ -35,17 +35,18 @@ export function load(app: Application) {
"generatePathNamespaces"
) as unknown as NamespaceGenerateDetails[]

const generatePathNamespaces = (ns: NamespaceGenerateDetails[]) => {
const generatePathNamespaces = (
ns: NamespaceGenerateDetails[],
parent: ProjectReflection | DeclarationReflection = context.project
) => {
const createdNamespaces: DeclarationReflection[] = []
ns.forEach((namespace) => {
const genNamespace = createNamespace(context, namespace)
const genNamespace = createNamespace(parent, namespace)

generatedNamespaces.set(namespace.pathPattern, genNamespace)

if (namespace.children) {
generatePathNamespaces(namespace.children).forEach((child) =>
genNamespace.addChild(child)
)
generatePathNamespaces(namespace.children, genNamespace)
}

createdNamespaces.push(genNamespace)
Expand Down Expand Up @@ -102,30 +103,33 @@ export function load(app: Application) {

const namespace = findNamespace(namespaces)

namespace?.addChild(reflection)
if (namespace) {
context.project.removeChild(reflection)
namespace?.addChild(reflection)
}
}
)
}

function createNamespace(
context: Context,
parent: DeclarationReflection | ProjectReflection,
namespace: NamespaceGenerateDetails
): DeclarationReflection {
const genNamespace = context.createDeclarationReflection(
const reflection = new DeclarationReflection(
namespace.name,
ReflectionKind.Namespace,
void 0,
void 0,
namespace.name
parent
)
parent.addChild(reflection)

if (namespace.description) {
genNamespace.comment = new Comment([
reflection.comment = new Comment([
{
kind: "text",
text: namespace.description,
},
])
}

return genNamespace
return reflection
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { MarkdownTheme } from "../../theme"
import * as Handlebars from "handlebars"
import { DocumentReflection, SignatureReflection } from "typedoc"
import {
DocumentReflection,
ReflectionKind,
SignatureReflection,
} from "typedoc"
import { formatWorkflowDiagramComponent } from "../../utils/format-workflow-diagram-component"
import { getProjectChild } from "utils"
import { getWorkflowReflectionFromNamespace } from "../../utils/workflow-utils"
import { findReflectionInNamespaces, getProjectChild } from "utils"

export default function (theme: MarkdownTheme) {
Handlebars.registerHelper(
Expand Down Expand Up @@ -81,7 +84,13 @@ function getStep({
: "step"

const namespaceRefl = theme.project
? getWorkflowReflectionFromNamespace(theme.project, document.name)
? findReflectionInNamespaces(
theme.project
.getChildrenByKind(ReflectionKind.Module)
.find((moduleRef) => moduleRef.name === "core-flows") ||
theme.project,
document.name
)
: undefined

const associatedReflection =
Expand Down
8 changes: 5 additions & 3 deletions www/utils/packages/typedoc-plugin-workflows/src/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
import ts, { SyntaxKind, VariableStatement } from "typescript"
import { WorkflowManager, WorkflowDefinition } from "@medusajs/orchestration"
import Helper from "./utils/helper"
import { isWorkflow, isWorkflowStep } from "utils"
import { findReflectionInNamespaces, isWorkflow, isWorkflowStep } from "utils"
import { StepType } from "./types"

type ParsedStep = {
Expand Down Expand Up @@ -253,8 +253,10 @@ class WorkflowsPlugin {
workflowName: workflowVarName,
})
} else {
const initializerReflection =
context.project.getChildByName(initializerName)
const initializerReflection = findReflectionInNamespaces(
context.project,
initializerName
)

if (
!initializerReflection ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from "typedoc"
import ts from "typescript"
import { StepModifier, StepType } from "../types"
import { capitalize } from "utils"
import { capitalize, findReflectionInNamespaces } from "utils"

/**
* A class of helper methods.
Expand Down Expand Up @@ -173,7 +173,9 @@ export default class Helper {
project: ProjectReflection
): string | undefined {
// load it from the project
const idVarReflection = project.getChildByName(refName)
const idVarReflection =
project.getChildByName(refName) ||
findReflectionInNamespaces(project, refName)

if (
!idVarReflection ||
Expand Down
Loading

0 comments on commit 482929f

Please sign in to comment.