@likec4/generators 0.32.0 → 0.33.1

package/dist/react/generate-react.js

@@ -7,6 +7,9 @@ const componentName = (value) => {
     value = value.replaceAll('_', '');
     return value.charAt(0).toLocaleUpperCase() + value.slice(1);
 };
+const generateViewId = (views) => joinToNode(views, view => expandToNode `'${view.id}'`, {
+    separator: ' | '
+});
 export function generateReact(views) {
     const components = views.map(({ id }) => {
         return {
@@ -22,15 +25,18 @@ export function generateReact(views) {
        ******************************************************************************/
       /* eslint-disable */
 
-      import type { DiagramView, EmbeddedDiagramProps } from '@likec4/diagrams'
-      import { EmbeddedDiagram } from '@likec4/diagrams'
+      import type { DiagramView } from '@likec4/core'
+      import { LikeC4 } from '@likec4/diagrams'
     `.append(NL, NL);
     if (components.length == 0) {
         out.append('export {}', NL);
         return toString(out);
     }
-    out
-        .append('export const LikeC4ViewsData = {', NL)
+    out.appendTemplate `
+
+      export type LikeC4ViewId = ${generateViewId(views)};
+      export const LikeC4Views = {
+    `
         .indent({
         indentation: 2,
         indentedChildren: indent => {
@@ -40,39 +46,42 @@ export function generateReact(views) {
             }));
         }
     })
-        .append('} as const', NL, NL).appendTemplate `
-      export type LikeC4ViewsData = typeof LikeC4ViewsData
-      export type LikeC4ViewId = keyof LikeC4ViewsData
-      export function isLikeC4ViewId(value: unknown): value is LikeC4ViewId {
-        return typeof value === 'string' && value in LikeC4ViewsData
-      }
+        .append('}  as const satisfies Record<LikeC4ViewId, DiagramView>', NL, NL).appendTemplate `
+      export type LikeC4Views = typeof LikeC4Views
 
-      export type LikeC4ViewProps = Omit<EmbeddedDiagramProps<LikeC4ViewsData, LikeC4ViewId>, 'views'>;
-      export function LikeC4View(props: LikeC4ViewProps) {
-        return <EmbeddedDiagram views={LikeC4ViewsData} {...props}/>
-      }
+      export const {
+        isViewId,
+        Diagram,
+        Responsive,
+        Embedded,
+        Browser
+      } = LikeC4.create(LikeC4Views)
 
-      type LikeC4ViewsProps = Omit<EmbeddedDiagramProps<LikeC4ViewsData, LikeC4ViewId>, 'views' | 'viewId'>
-      export const LikeC4Views = {
-    `
-        .append(NL)
-        .indent({
-        indentation: 2,
-        indentedChildren: components.map(({ id, name }) => expandToNode `
-            ['${name}']: (props: LikeC4ViewsProps) => <LikeC4View viewId={'${id}'} {...props}/>,
-          `.append(NL))
-        // indentedChildren: [joinToNode(
-        //   components,
-        //   ({ id, name }) =>
-        //     expandToNode`
-        //       ['${name}']: (props: NamedViewProps) => <EmbeddedDiagram views={LikeC4ViewsData} viewId={'${id}'} {...props}/>
-        //     `,
-        //   {
-        //     separator: ',',
-        //     appendNewLineIfNotEmpty: true
-        //   }
-        // )],
-    })
-        .append('} as const', NL, NL);
+      export type DiagramProps = LikeC4.Props<LikeC4ViewId>
+      export type ResponsiveProps = LikeC4.ResponsiveProps<LikeC4ViewId>
+      export type EmbeddedProps = LikeC4.EmbeddedProps<LikeC4ViewId>
+      export type BrowserProps = LikeC4.BrowserProps<LikeC4ViewId>
+
+    `.append(NL, NL).appendTemplate `
+      export type {
+        DiagramApi
+      } from '@likec4/diagrams'
+
+      export type {
+        Fqn,
+        Element,
+        RelationID,
+        Relation,
+        NodeId,
+        EdgeId,
+        ComputedNode,
+        ComputedEdge,
+        ComputedView,
+        DiagramView,
+        DiagramNode,
+        DiagramEdge,
+        DiagramLabel
+      } from '@likec4/core'
+    `.append(NL, NL);
     return toString(out);
 }

package/dist/views-data-ts/generate-views-data.js

@@ -9,10 +9,10 @@ export function generateViewsDataTs(views) {
        ******************************************************************************/
       /* eslint-disable */
 
-      import type { DiagramView } from '@likec4/diagrams'
+      import type { DiagramView } from '@likec4/core'
     `.append(NL, NL);
     out
-        .append('export const LikeC4ViewsData = {', NL)
+        .append('export const LikeC4Views = {', NL)
         .indent({
         indentation: 2,
         indentedChildren: indent => {
@@ -23,11 +23,32 @@ export function generateViewsDataTs(views) {
         }
     })
         .append('} as const', NL, NL).appendTemplate `
-      export type LikeC4ViewsData = typeof LikeC4ViewsData
-      export type LikeC4ViewId = keyof LikeC4ViewsData
+      export type LikeC4Views = typeof LikeC4Views
+      export type LikeC4ViewId = keyof LikeC4Views
+
       export function isLikeC4ViewId(value: unknown): value is LikeC4ViewId {
-        return typeof value === 'string' && value in LikeC4ViewsData
+        return (
+          value != null &&
+          typeof value === 'string' &&
+          Object.prototype.hasOwnProperty.call(LikeC4Views, value)
+        )
       }
-    `.append(NL);
+    `.append(NL, NL).appendTemplate `
+      export type {
+        Fqn,
+        Element,
+        RelationID,
+        Relation,
+        NodeId,
+        EdgeId,
+        ComputedNode,
+        ComputedEdge,
+        ComputedView,
+        DiagramView,
+        DiagramNode,
+        DiagramEdge,
+        DiagramLabel
+      } from '@likec4/core'
+    `.append(NL, NL);
     return toString(out);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/generators",
-  "version": "0.32.0",
+  "version": "0.33.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -38,7 +38,7 @@
     "test:watch": "run -T vitest"
   },
   "dependencies": {
-    "@likec4/core": "0.32.0",
+    "@likec4/core": "0.33.1",
     "json5": "^2.2.3",
     "langium": "^1.2.1",
     "rambdax": "^9.1.1"