@likec4/generators 0.60.3 → 1.0.0-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/generators",
-  "version": "0.60.3",
+  "version": "1.0.0-next.1",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -34,19 +34,16 @@
     "test": "run -T vitest run"
   },
   "dependencies": {
-    "@likec4/core": "0.60.3",
+    "@likec4/core": "1.0.0-next.1",
     "json5": "^2.2.3",
     "langium": "^3.0.0",
-    "remeda": "^1.40.1"
+    "remeda": "^1.56.0"
   },
   "devDependencies": {
     "@types/node": "^20.11.25",
-    "typescript": "^5.4.2",
+    "typescript": "^5.4.3",
     "unbuild": "^2.0.0",
     "vitest": "^1.4.0"
   },
-  "packageManager": "yarn@4.1.1",
-  "volta": {
-    "extends": "../../package.json"
-  }
+  "packageManager": "yarn@4.1.1"
 }

package/src/d2/generate-d2.ts

@@ -1,6 +1,6 @@
 import type { ComputedEdge, ComputedNode, ComputedView, NodeId } from '@likec4/core'
 import { CompositeGeneratorNode, joinToNode, NL, toString } from 'langium/generate'
-import { isNil } from 'remeda'
+import { isNullish as isNil } from 'remeda'
 
 const capitalizeFirstLetter = (value: string) => value.charAt(0).toLocaleUpperCase() + value.slice(1)
 

package/src/index.ts

@@ -1,4 +1,4 @@
-export { generateReact } from './react/generate-react'
 export { generateD2 } from './d2/generate-d2'
 export { generateMermaid } from './mmd/generate-mmd'
-export { generateViewsDataTs, generateViewsDataJs } from './views-data-ts/generate-views-data'
+export { generateReact } from './react/generate-react'
+export { generateViewsDataDTs, generateViewsDataJs, generateViewsDataTs } from './views-data-ts/generate-views-data'

package/src/mmd/generate-mmd.ts

@@ -1,6 +1,6 @@
 import type { ComputedEdge, ComputedNode, ComputedView, NodeId } from '@likec4/core'
 import { CompositeGeneratorNode, expandToNode, joinToNode, NL, NLEmpty, toString } from 'langium/generate'
-import { isNil } from 'remeda'
+import { isNullish as isNil } from 'remeda'
 
 const capitalizeFirstLetter = (value: string) => value.charAt(0).toLocaleUpperCase() + value.slice(1)
 

package/src/react/generate-react.ts

@@ -10,7 +10,7 @@ const componentName = (value: string): string => {
   return value.charAt(0).toLocaleUpperCase() + value.slice(1)
 }
 
-export const generateViewId = (views: DiagramView[]) =>
+export const generateViewId = (views: Iterable<DiagramView>) =>
   joinToNode(views, view => expandToNode`'${view.id}'`, {
     separator: ' | '
   })
@@ -29,8 +29,12 @@ export function generateReact(views: DiagramView[]) {
        * This file was generated
        * DO NOT EDIT MANUALLY!
        ******************************************************************************/
+      /* prettier-ignore-start */
+
       /* eslint-disable */
 
+      // @ts-nocheck
+
       import type { DiagramView } from '@likec4/diagrams'
       import { LikeC4 } from '@likec4/diagrams'
     `.append(NL, NL)
@@ -107,6 +111,8 @@ export function generateReact(views: DiagramView[]) {
         DiagramLabel,
         DiagramView
       } from '@likec4/diagrams'
+
+      /* prettier-ignore-end */
     `.append(NL)
 
   return toString(out)

package/src/views-data-ts/generate-views-data.ts

@@ -3,13 +3,15 @@ import JSON5 from 'json5'
 import { CompositeGeneratorNode, expandToNode, joinToNode, NL, toString } from 'langium/generate'
 import { generateViewId } from '../react/generate-react'
 
-export function generateViewsDataJs(views: DiagramView[]) {
+export function generateViewsDataJs(diagrams: Iterable<DiagramView>) {
+  const views = Array.from(diagrams)
   const out = new CompositeGeneratorNode()
   out.appendTemplate`
     /******************************************************************************
      * This file was generated
      * DO NOT EDIT MANUALLY!
      ******************************************************************************/
+    /* prettier-ignore-start */
     /* eslint-disable */
 
     `.append(NL, NL)
@@ -43,26 +45,33 @@ export function generateViewsDataJs(views: DiagramView[]) {
       return (
         value != null &&
         typeof value === 'string' &&
-        Object.prototype.hasOwnProperty.call(LikeC4Views, value)
+        Object.hasOwn(LikeC4Views, value) &&
+        LikeC4Views[value] != null
       )
     }
-  `.append(NL, NL)
+
+    /* prettier-ignore-end */
+  `.append(NL)
   return toString(out)
 }
 
-export function generateViewsDataTs(views: DiagramView[]) {
+export function generateViewsDataTs(diagrams: Iterable<DiagramView>) {
+  const views = Array.from(diagrams)
   const out = new CompositeGeneratorNode()
   out.appendTemplate`
     /******************************************************************************
      * This file was generated
      * DO NOT EDIT MANUALLY!
      ******************************************************************************/
+    /* prettier-ignore-start */
     /* eslint-disable */
 
+    // @ts-nocheck
+
     import type { DiagramView } from '@likec4/core'
     `.append(NL, NL)
 
-  if (views.length == 0) {
+  if (views.length === 0) {
     out.append('export {}', NL)
     return toString(out)
   }
@@ -98,26 +107,43 @@ export function generateViewsDataTs(views: DiagramView[]) {
       return (
         value != null &&
         typeof value === 'string' &&
-        Object.prototype.hasOwnProperty.call(LikeC4Views, value)
+        Object.hasOwn(LikeC4Views, value) &&
+        LikeC4Views[value] != null
       )
     }
 
-    // Re-export types
-    export type {
-      Fqn,
-      Element,
-      RelationID,
-      Relation,
-      NodeId,
-      EdgeId,
-      ComputedNode,
-      ComputedEdge,
-      ComputedView,
-      DiagramView,
-      DiagramNode,
-      DiagramEdge,
-      DiagramLabel
-    } from '@likec4/core'
-  `.append(NL, NL)
+    /* prettier-ignore-end */
+  `.append(NL)
+  return toString(out)
+}
+
+export function generateViewsDataDTs(diagrams: Iterable<DiagramView>) {
+  const views = Array.from(diagrams)
+  const out = new CompositeGeneratorNode()
+  out.appendTemplate`
+    /******************************************************************************
+     * This file was generated
+     * DO NOT EDIT MANUALLY!
+     ******************************************************************************/
+    /* prettier-ignore-start */
+    /* eslint-disable */
+
+    import type { DiagramView } from '@likec4/core'
+    `.append(NL, NL)
+
+  if (views.length == 0) {
+    out.append('export {}', NL)
+    return toString(out)
+  }
+
+  out.appendTemplate`
+    export type LikeC4ViewId = ${generateViewId(views)};
+    export type LikeC4Views = Record<LikeC4ViewId, DiagramView>
+
+    export declare const LikeC4Views: LikeC4Views
+    export declare function isLikeC4ViewId(value: unknown): value is LikeC4ViewId
+
+    /* prettier-ignore-end */
+  `.append(NL)
   return toString(out)
 }