@likec4/core 1.18.0 → 1.19.0

package/src/builder/Builder-style2.test-d.ts

@@ -0,0 +1,175 @@
+import { expectTypeOf, test } from 'vitest'
+import type { LikeC4Model } from '../model/LikeC4Model'
+import type { ParsedLikeC4Model } from '../types'
+import { Builder } from './Builder'
+
+test('Builder types - style 2', () => {
+  const m = Builder
+    .specification({
+      elements: {
+        actor: {
+          style: {
+            shape: 'person',
+          },
+        },
+        system: {},
+        component: {},
+      },
+      deployments: {
+        env: {},
+        vm: {},
+      },
+      relationships: {
+        like: {},
+        dislike: {},
+      },
+      tags: ['tag1', 'tag2', 'tag1'],
+    })
+    .model(({ actor, system, component, relTo }, _) =>
+      _(
+        actor('alice'),
+        actor('bob'),
+        system('cloud').with(
+          component('backend').with(
+            component('api'),
+            component('db'),
+          ),
+          component('frontend').with(
+            // @ts-expect-error
+            relTo('non-existing'),
+          ),
+        ),
+      )
+    )
+    .deployment(({ env, vm, instanceOf }, _) =>
+      _(
+        env('prod').with(
+          vm('vm1'),
+          vm('vm2'),
+        ),
+        env('dev').with(
+          vm('vm1'),
+          instanceOf('cloud.backend.api'),
+          instanceOf(
+            'wrong',
+            // @ts-expect-error
+            'non-existing',
+          ),
+          vm('vm2'),
+        ),
+      )
+    )
+    // Test Element View
+    .views(({ view, $include, $style }, _) =>
+      _(
+        // rules inside
+        view(
+          'view',
+          // @ts-expect-error
+          $include('wrong'),
+          // @ts-expect-error #tag22 is not defined
+          $include('cloud.backend', {
+            where: 'tag is #tag22',
+          }),
+        ),
+        // using with
+        view('view').with(
+          // @ts-expect-error
+          $include('wrong'),
+          // @ts-expect-error
+          $style('wrong', { color: 'red' }),
+        ),
+      )
+    )
+    // Test Element View Of
+    .views(({ viewOf, $rules, $include }, _) =>
+      _(
+        viewOf('view-of', 'cloud.backend'),
+        // @ts-expect-error
+        viewOf('view-of', 'wrong'),
+        viewOf(
+          'view-of',
+          'cloud.backend.api',
+          $rules(
+            // @ts-expect-error
+            $include('wrong'),
+          ),
+        ),
+        viewOf(
+          'view-of',
+          'cloud.backend.api',
+          $rules(
+            // @ts-expect-error
+            $include('wrong'),
+          ),
+        ).with(
+          $include('* -> alice.*'),
+          // @ts-expect-error
+          $include('wrong'),
+        ),
+        viewOf(
+          'view-of',
+          // @ts-expect-error
+          'cloud.backensd.api',
+          'Title',
+        ).with(
+          $include('* -> alice.*'),
+          // @ts-expect-error
+          $include('wrong'),
+        ),
+      )
+    )
+    // Test Deployment View
+    .views(({ deploymentView, $rules, $include }, _) =>
+      _(
+        deploymentView(
+          'deployment',
+          $rules(
+            // @ts-expect-error
+            $include('pr'),
+          ),
+        ),
+        deploymentView(
+          'deployment',
+          'Title',
+          $rules(
+            // @ts-expect-error
+            $include('pr'),
+          ),
+        ),
+        deploymentView('deployment').with(
+          // @ts-expect-error
+          $include('pr'),
+        ),
+      )
+    )
+
+  expectTypeOf(m.Types.Fqn).toEqualTypeOf(
+    '' as 'alice' | 'bob' | 'cloud' | 'cloud.backend' | 'cloud.backend.api' | 'cloud.backend.db' | 'cloud.frontend',
+  )
+  expectTypeOf(m.Types.ViewId).toEqualTypeOf(
+    '' as 'view' | 'view-of' | 'deployment',
+  )
+  expectTypeOf(m.Types.DeploymentFqn).toEqualTypeOf(
+    '' as 'prod' | 'dev' | 'prod.vm1' | 'prod.vm2' | 'dev.vm1' | 'dev.vm2' | 'dev.api' | 'dev.wrong',
+  )
+
+  expectTypeOf(m.build()).toEqualTypeOf(
+    {} as ParsedLikeC4Model<
+      'actor' | 'system' | 'component',
+      'like' | 'dislike',
+      'tag1' | 'tag2',
+      'alice' | 'bob' | 'cloud' | 'cloud.backend' | 'cloud.backend.api' | 'cloud.backend.db' | 'cloud.frontend',
+      'view' | 'view-of' | 'deployment',
+      'prod' | 'dev' | 'prod.vm1' | 'prod.vm2' | 'dev.vm1' | 'dev.vm2' | 'dev.api' | 'dev.wrong'
+    >,
+  )
+
+  expectTypeOf(m.toLikeC4Model()).toEqualTypeOf(
+    {} as LikeC4Model.Computed<
+      'alice' | 'bob' | 'cloud' | 'cloud.backend' | 'cloud.backend.api' | 'cloud.backend.db' | 'cloud.frontend',
+      'prod' | 'dev' | 'prod.vm1' | 'prod.vm2' | 'dev.vm1' | 'dev.vm2' | 'dev.api' | 'dev.wrong',
+      'view' | 'view-of' | 'deployment'
+    >,
+  )
+})

package/src/builder/Builder.deployment.ts

@@ -1,5 +1,6 @@
 import type { AnyTypes, Types, TypesNested } from './_types'
 import type { DeploymentModelBuilder } from './Builder.deploymentModel'
+import type { ModelBuilder } from './Builder.model'
 
 type ToNested<T, Id extends string> = T extends TypesNested<infer P, any, any, any, any, any, any, any, infer F>
   ? TypesNested<
@@ -57,31 +58,35 @@ type FromNested<T extends AnyTypes, N> = N extends TypesNested<any, any, any, an
 export interface AddDeploymentNode<Id extends string> {
   <T extends AnyTypes>(builder: DeploymentModelBuilder<T>): DeploymentModelBuilder<Types.AddDeploymentFqn<T, Id>>
 
+  with<T extends AnyTypes>(): (
+    builder: DeploymentModelBuilder<T>,
+  ) => DeploymentModelBuilder<Types.AddDeploymentFqn<T, Id>>
+
   with<
     T extends AnyTypes,
-    A extends AnyTypes
+    A extends AnyTypes,
   >(
-    op1: (input: DeploymentModelBuilder<ToNested<T, Id>>) => DeploymentModelBuilder<A>
+    op1: (input: DeploymentModelBuilder<ToNested<T, Id>>) => DeploymentModelBuilder<A>,
   ): (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<FromNested<T, A>>
 
   with<
     T extends AnyTypes,
     A extends AnyTypes,
-    B extends AnyTypes
+    B extends AnyTypes,
   >(
     op1: (input: DeploymentModelBuilder<ToNested<T, Id>>) => DeploymentModelBuilder<A>,
-    op2: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>
+    op2: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   ): (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<FromNested<T, B>>
 
   with<
     T extends AnyTypes,
     A extends AnyTypes,
     B extends AnyTypes,
-    C extends AnyTypes
+    C extends AnyTypes,
   >(
     op1: (input: DeploymentModelBuilder<ToNested<T, Id>>) => DeploymentModelBuilder<A>,
     op2: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
-    op3: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>
+    op3: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
   ): (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<FromNested<T, C>>
 
   with<
@@ -89,12 +94,12 @@ export interface AddDeploymentNode<Id extends string> {
     A extends AnyTypes,
     B extends AnyTypes,
     C extends AnyTypes,
-    D extends AnyTypes
+    D extends AnyTypes,
   >(
     op1: (input: DeploymentModelBuilder<ToNested<T, Id>>) => DeploymentModelBuilder<A>,
     op2: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
     op3: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
-    op4: (input: DeploymentModelBuilder<C>) => DeploymentModelBuilder<D>
+    op4: (input: DeploymentModelBuilder<C>) => DeploymentModelBuilder<D>,
   ): (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<FromNested<T, D>>
 
   with<
@@ -103,13 +108,13 @@ export interface AddDeploymentNode<Id extends string> {
     B extends AnyTypes,
     C extends AnyTypes,
     D extends AnyTypes,
-    E extends AnyTypes
+    E extends AnyTypes,
   >(
     op1: (input: DeploymentModelBuilder<ToNested<T, Id>>) => DeploymentModelBuilder<A>,
     op2: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
     op3: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
     op4: (input: DeploymentModelBuilder<C>) => DeploymentModelBuilder<D>,
-    op5: (input: DeploymentModelBuilder<D>) => DeploymentModelBuilder<E>
+    op5: (input: DeploymentModelBuilder<D>) => DeploymentModelBuilder<E>,
   ): (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<FromNested<T, E>>
 
   with<
@@ -119,14 +124,14 @@ export interface AddDeploymentNode<Id extends string> {
     C extends AnyTypes,
     D extends AnyTypes,
     E extends AnyTypes,
-    F extends AnyTypes
+    F extends AnyTypes,
   >(
     op1: (input: DeploymentModelBuilder<ToNested<T, Id>>) => DeploymentModelBuilder<A>,
     op2: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
     op3: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
     op4: (input: DeploymentModelBuilder<C>) => DeploymentModelBuilder<D>,
     op5: (input: DeploymentModelBuilder<D>) => DeploymentModelBuilder<E>,
-    op6: (input: DeploymentModelBuilder<E>) => DeploymentModelBuilder<F>
+    op6: (input: DeploymentModelBuilder<E>) => DeploymentModelBuilder<F>,
   ): (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<FromNested<T, F>>
 
   with<
@@ -137,7 +142,7 @@ export interface AddDeploymentNode<Id extends string> {
     D extends AnyTypes,
     E extends AnyTypes,
     F extends AnyTypes,
-    G extends AnyTypes
+    G extends AnyTypes,
   >(
     op1: (input: DeploymentModelBuilder<ToNested<T, Id>>) => DeploymentModelBuilder<A>,
     op2: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
@@ -145,7 +150,7 @@ export interface AddDeploymentNode<Id extends string> {
     op4: (input: DeploymentModelBuilder<C>) => DeploymentModelBuilder<D>,
     op5: (input: DeploymentModelBuilder<D>) => DeploymentModelBuilder<E>,
     op6: (input: DeploymentModelBuilder<E>) => DeploymentModelBuilder<F>,
-    op7: (input: DeploymentModelBuilder<F>) => DeploymentModelBuilder<G>
+    op7: (input: DeploymentModelBuilder<F>) => DeploymentModelBuilder<G>,
   ): (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<FromNested<T, G>>
 
   with<
@@ -157,7 +162,7 @@ export interface AddDeploymentNode<Id extends string> {
     E extends AnyTypes,
     F extends AnyTypes,
     G extends AnyTypes,
-    H extends AnyTypes
+    H extends AnyTypes,
   >(
     op1: (input: DeploymentModelBuilder<ToNested<T, Id>>) => DeploymentModelBuilder<A>,
     op2: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
@@ -166,7 +171,7 @@ export interface AddDeploymentNode<Id extends string> {
     op5: (input: DeploymentModelBuilder<D>) => DeploymentModelBuilder<E>,
     op6: (input: DeploymentModelBuilder<E>) => DeploymentModelBuilder<F>,
     op7: (input: DeploymentModelBuilder<F>) => DeploymentModelBuilder<G>,
-    op8: (input: DeploymentModelBuilder<G>) => DeploymentModelBuilder<H>
+    op8: (input: DeploymentModelBuilder<G>) => DeploymentModelBuilder<H>,
   ): (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<FromNested<T, H>>
 
   with<
@@ -179,7 +184,7 @@ export interface AddDeploymentNode<Id extends string> {
     F extends AnyTypes,
     G extends AnyTypes,
     H extends AnyTypes,
-    I extends AnyTypes
+    I extends AnyTypes,
   >(
     op1: (input: DeploymentModelBuilder<ToNested<T, Id>>) => DeploymentModelBuilder<A>,
     op2: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
@@ -189,7 +194,7 @@ export interface AddDeploymentNode<Id extends string> {
     op6: (input: DeploymentModelBuilder<E>) => DeploymentModelBuilder<F>,
     op7: (input: DeploymentModelBuilder<F>) => DeploymentModelBuilder<G>,
     op8: (input: DeploymentModelBuilder<G>) => DeploymentModelBuilder<H>,
-    op9: (input: DeploymentModelBuilder<H>) => DeploymentModelBuilder<I>
+    op9: (input: DeploymentModelBuilder<H>) => DeploymentModelBuilder<I>,
   ): (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<FromNested<T, I>>
 
   with<
@@ -203,7 +208,7 @@ export interface AddDeploymentNode<Id extends string> {
     G extends AnyTypes,
     H extends AnyTypes,
     I extends AnyTypes,
-    J extends AnyTypes
+    J extends AnyTypes,
   >(
     op1: (input: DeploymentModelBuilder<ToNested<T, Id>>) => DeploymentModelBuilder<A>,
     op2: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
@@ -214,6 +219,6 @@ export interface AddDeploymentNode<Id extends string> {
     op7: (input: DeploymentModelBuilder<F>) => DeploymentModelBuilder<G>,
     op8: (input: DeploymentModelBuilder<G>) => DeploymentModelBuilder<H>,
     op9: (input: DeploymentModelBuilder<H>) => DeploymentModelBuilder<I>,
-    op10: (input: DeploymentModelBuilder<I>) => DeploymentModelBuilder<J>
+    op10: (input: DeploymentModelBuilder<I>) => DeploymentModelBuilder<J>,
   ): (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<FromNested<T, J>>
 }

package/src/builder/Builder.deploymentModel.ts

@@ -1,51 +1,54 @@
+import type { LastArrayElement, Split } from 'type-fest'
 import type { DeploymentElement, DeploymentRelation, Fqn } from '../types'
-import type { AnyTypes, Invalid, Types } from './_types'
+import type { AnyTypes, Invalid, Types, ValidId } from './_types'
 import type { Builder } from './Builder'
 import type { AddDeploymentNode } from './Builder.deployment'
 
-export interface DeploymentModelBuilder<T extends AnyTypes> {
-  addDeployment(node: DeploymentElement): Builder<T>
-  addDeploymentRelation(rel: Omit<DeploymentRelation, 'id'>): Builder<T>
+export interface DeploymentModelBuilder<T extends AnyTypes> extends Builder<T> {
+  __addDeployment(node: DeploymentElement): Builder<T>
+  __addDeploymentRelation(rel: Omit<DeploymentRelation, 'id'>): Builder<T>
   /**
    * Create a fully qualified name from an id (for nested models)
    */
-  fqn(id: string): Fqn
+  __fqn(id: string): Fqn
 }
+
+export function deployment<A extends AnyTypes>(): (input: Builder<A>) => Builder<A>
 export function deployment<
   A extends AnyTypes,
-  B extends AnyTypes
+  B extends AnyTypes,
 >(
-  op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>
+  op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
 ): (input: Builder<A>) => Builder<B>
 export function deployment<
   A extends AnyTypes,
   B extends AnyTypes,
-  C extends AnyTypes
+  C extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
-  op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>
+  op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
 ): (input: Builder<A>) => Builder<C>
 export function deployment<
   A extends AnyTypes,
   B extends AnyTypes,
   C extends AnyTypes,
-  D extends AnyTypes
+  D extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
-  op3: (input: DeploymentModelBuilder<C>) => DeploymentModelBuilder<D>
+  op3: (input: DeploymentModelBuilder<C>) => DeploymentModelBuilder<D>,
 ): (input: Builder<A>) => Builder<D>
 export function deployment<
   A extends AnyTypes,
   B extends AnyTypes,
   C extends AnyTypes,
   D extends AnyTypes,
-  E extends AnyTypes
+  E extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
   op3: (input: DeploymentModelBuilder<C>) => DeploymentModelBuilder<D>,
-  op4: (input: DeploymentModelBuilder<D>) => DeploymentModelBuilder<E>
+  op4: (input: DeploymentModelBuilder<D>) => DeploymentModelBuilder<E>,
 ): (input: Builder<A>) => Builder<E>
 export function deployment<
   A extends AnyTypes,
@@ -53,13 +56,13 @@ export function deployment<
   C extends AnyTypes,
   D extends AnyTypes,
   E extends AnyTypes,
-  F extends AnyTypes
+  F extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
   op3: (input: DeploymentModelBuilder<C>) => DeploymentModelBuilder<D>,
   op4: (input: DeploymentModelBuilder<D>) => DeploymentModelBuilder<E>,
-  op5: (input: DeploymentModelBuilder<E>) => DeploymentModelBuilder<F>
+  op5: (input: DeploymentModelBuilder<E>) => DeploymentModelBuilder<F>,
 ): (input: Builder<A>) => Builder<F>
 export function deployment<
   A extends AnyTypes,
@@ -68,14 +71,14 @@ export function deployment<
   D extends AnyTypes,
   E extends AnyTypes,
   F extends AnyTypes,
-  G extends AnyTypes
+  G extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
   op3: (input: DeploymentModelBuilder<C>) => DeploymentModelBuilder<D>,
   op4: (input: DeploymentModelBuilder<D>) => DeploymentModelBuilder<E>,
   op5: (input: DeploymentModelBuilder<E>) => DeploymentModelBuilder<F>,
-  op6: (input: DeploymentModelBuilder<F>) => DeploymentModelBuilder<G>
+  op6: (input: DeploymentModelBuilder<F>) => DeploymentModelBuilder<G>,
 ): (input: Builder<A>) => Builder<G>
 export function deployment<
   A extends AnyTypes,
@@ -85,7 +88,7 @@ export function deployment<
   E extends AnyTypes,
   F extends AnyTypes,
   G extends AnyTypes,
-  H extends AnyTypes
+  H extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
@@ -93,7 +96,7 @@ export function deployment<
   op4: (input: DeploymentModelBuilder<D>) => DeploymentModelBuilder<E>,
   op5: (input: DeploymentModelBuilder<E>) => DeploymentModelBuilder<F>,
   op6: (input: DeploymentModelBuilder<F>) => DeploymentModelBuilder<G>,
-  op7: (input: DeploymentModelBuilder<G>) => DeploymentModelBuilder<H>
+  op7: (input: DeploymentModelBuilder<G>) => DeploymentModelBuilder<H>,
 ): (input: Builder<A>) => Builder<H>
 export function deployment<
   A extends AnyTypes,
@@ -104,7 +107,7 @@ export function deployment<
   F extends AnyTypes,
   G extends AnyTypes,
   H extends AnyTypes,
-  I extends AnyTypes
+  I extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
@@ -113,7 +116,7 @@ export function deployment<
   op5: (input: DeploymentModelBuilder<E>) => DeploymentModelBuilder<F>,
   op6: (input: DeploymentModelBuilder<F>) => DeploymentModelBuilder<G>,
   op7: (input: DeploymentModelBuilder<G>) => DeploymentModelBuilder<H>,
-  op8: (input: DeploymentModelBuilder<H>) => DeploymentModelBuilder<I>
+  op8: (input: DeploymentModelBuilder<H>) => DeploymentModelBuilder<I>,
 ): (input: Builder<A>) => Builder<I>
 export function deployment<
   A extends AnyTypes,
@@ -125,7 +128,7 @@ export function deployment<
   G extends AnyTypes,
   H extends AnyTypes,
   I extends AnyTypes,
-  J extends AnyTypes
+  J extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
@@ -135,7 +138,7 @@ export function deployment<
   op6: (input: DeploymentModelBuilder<F>) => DeploymentModelBuilder<G>,
   op7: (input: DeploymentModelBuilder<G>) => DeploymentModelBuilder<H>,
   op8: (input: DeploymentModelBuilder<H>) => DeploymentModelBuilder<I>,
-  op9: (input: DeploymentModelBuilder<I>) => DeploymentModelBuilder<J>
+  op9: (input: DeploymentModelBuilder<I>) => DeploymentModelBuilder<J>,
 ): (input: Builder<A>) => Builder<J>
 export function deployment<
   A extends AnyTypes,
@@ -148,7 +151,7 @@ export function deployment<
   H extends AnyTypes,
   I extends AnyTypes,
   J extends AnyTypes,
-  K extends AnyTypes
+  K extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
@@ -159,7 +162,7 @@ export function deployment<
   op7: (input: DeploymentModelBuilder<G>) => DeploymentModelBuilder<H>,
   op8: (input: DeploymentModelBuilder<H>) => DeploymentModelBuilder<I>,
   op9: (input: DeploymentModelBuilder<I>) => DeploymentModelBuilder<J>,
-  op10: (input: DeploymentModelBuilder<J>) => DeploymentModelBuilder<K>
+  op10: (input: DeploymentModelBuilder<J>) => DeploymentModelBuilder<K>,
 ): (input: Builder<A>) => Builder<K>
 export function deployment<
   A extends AnyTypes,
@@ -173,7 +176,7 @@ export function deployment<
   I extends AnyTypes,
   J extends AnyTypes,
   K extends AnyTypes,
-  L extends AnyTypes
+  L extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
@@ -185,7 +188,7 @@ export function deployment<
   op8: (input: DeploymentModelBuilder<H>) => DeploymentModelBuilder<I>,
   op9: (input: DeploymentModelBuilder<I>) => DeploymentModelBuilder<J>,
   op10: (input: DeploymentModelBuilder<J>) => DeploymentModelBuilder<K>,
-  op11: (input: DeploymentModelBuilder<K>) => DeploymentModelBuilder<L>
+  op11: (input: DeploymentModelBuilder<K>) => DeploymentModelBuilder<L>,
 ): (input: Builder<A>) => Builder<L>
 export function deployment<
   A extends AnyTypes,
@@ -200,7 +203,7 @@ export function deployment<
   J extends AnyTypes,
   K extends AnyTypes,
   L extends AnyTypes,
-  M extends AnyTypes
+  M extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
@@ -213,7 +216,7 @@ export function deployment<
   op9: (input: DeploymentModelBuilder<I>) => DeploymentModelBuilder<J>,
   op10: (input: DeploymentModelBuilder<J>) => DeploymentModelBuilder<K>,
   op11: (input: DeploymentModelBuilder<K>) => DeploymentModelBuilder<L>,
-  op12: (input: DeploymentModelBuilder<L>) => DeploymentModelBuilder<M>
+  op12: (input: DeploymentModelBuilder<L>) => DeploymentModelBuilder<M>,
 ): (input: Builder<A>) => Builder<M>
 export function deployment<
   A extends AnyTypes,
@@ -229,7 +232,7 @@ export function deployment<
   K extends AnyTypes,
   L extends AnyTypes,
   M extends AnyTypes,
-  N extends AnyTypes
+  N extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
@@ -243,7 +246,7 @@ export function deployment<
   op10: (input: DeploymentModelBuilder<J>) => DeploymentModelBuilder<K>,
   op11: (input: DeploymentModelBuilder<K>) => DeploymentModelBuilder<L>,
   op12: (input: DeploymentModelBuilder<L>) => DeploymentModelBuilder<M>,
-  op13: (input: DeploymentModelBuilder<M>) => DeploymentModelBuilder<N>
+  op13: (input: DeploymentModelBuilder<M>) => DeploymentModelBuilder<N>,
 ): (input: Builder<A>) => Builder<N>
 export function deployment<
   A extends AnyTypes,
@@ -260,7 +263,7 @@ export function deployment<
   L extends AnyTypes,
   M extends AnyTypes,
   N extends AnyTypes,
-  O extends AnyTypes
+  O extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
@@ -275,7 +278,7 @@ export function deployment<
   op11: (input: DeploymentModelBuilder<K>) => DeploymentModelBuilder<L>,
   op12: (input: DeploymentModelBuilder<L>) => DeploymentModelBuilder<M>,
   op13: (input: DeploymentModelBuilder<M>) => DeploymentModelBuilder<N>,
-  op14: (input: DeploymentModelBuilder<N>) => DeploymentModelBuilder<O>
+  op14: (input: DeploymentModelBuilder<N>) => DeploymentModelBuilder<O>,
 ): (input: Builder<A>) => Builder<O>
 export function deployment<
   A extends AnyTypes,
@@ -293,7 +296,7 @@ export function deployment<
   M extends AnyTypes,
   N extends AnyTypes,
   O extends AnyTypes,
-  P extends AnyTypes
+  P extends AnyTypes,
 >(
   op1: (input: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>,
   op2: (input: DeploymentModelBuilder<B>) => DeploymentModelBuilder<C>,
@@ -309,7 +312,7 @@ export function deployment<
   op12: (input: DeploymentModelBuilder<L>) => DeploymentModelBuilder<M>,
   op13: (input: DeploymentModelBuilder<M>) => DeploymentModelBuilder<N>,
   op14: (input: DeploymentModelBuilder<N>) => DeploymentModelBuilder<O>,
-  op15: (input: DeploymentModelBuilder<O>) => DeploymentModelBuilder<P>
+  op15: (input: DeploymentModelBuilder<O>) => DeploymentModelBuilder<P>,
 ): (input: Builder<A>) => Builder<P>
 
 export function deployment(...ops: any[]) {
@@ -322,29 +325,32 @@ export function deployment(...ops: any[]) {
   }
 }
 
-export type AddDeploymentRelation<Props = unknown> = <
-  T extends AnyTypes,
-  Source extends string & T['DeploymentFqn'],
-  Target extends string & T['DeploymentFqn']
->(
-  source: Source,
-  target: Target,
-  titleOrProps?: string | Props
-) => (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<T>
+type NameFromFqn<FQN extends string> = LastArrayElement<Split<FQN, '.'>>
 
-export type AddDeployedInstance<Props = unknown> = <
-  const Id extends string,
-  T extends AnyTypes,
-  To extends string & T['Fqn']
->(
-  id: Id,
-  to: To,
-  titleOrProps?: string | Props | undefined
-) => (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<Types.AddDeploymentFqn<T, Id>>
+export type AddDeployedInstance<Props = unknown> = {
+  //  instanceOf(target, titleOrProps?)
+  <
+    const T extends AnyTypes,
+    Id extends string & T['Fqn'],
+  >(
+    target: Id,
+  ): (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<Types.AddDeploymentFqn<T, NameFromFqn<Id>>>
+
+  //  instanceOf(id, target, titleOrProps?)
+  <
+    const Id extends string,
+    T extends AnyTypes,
+    Target extends string & T['Fqn'],
+  >(
+    id: ValidId<Id>,
+    target: Target,
+    titleOrProps?: string | Props | undefined,
+  ): (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<Types.AddDeploymentFqn<T, Id>>
+}
 
 type AddDeploymentNodeHelper<T = unknown> = <const Id extends string>(
-  id: Id,
-  titleOrProps?: string | T
+  id: ValidId<Id>,
+  titleOrProps?: string | T,
 ) => AddDeploymentNode<Id>
 
 export type AddDeploymentNodeHelpers<T extends AnyTypes> = T extends
@@ -353,8 +359,27 @@ export type AddDeploymentNodeHelpers<T extends AnyTypes> = T extends
   }
   : Invalid<'No Deployment Kinds'>
 
+export type AddDeploymentRelation<Props = unknown> = <
+  T extends AnyTypes,
+  Source extends string & T['DeploymentFqn'],
+  Target extends string & T['DeploymentFqn'],
+>(
+  source: Source,
+  target: Target,
+  titleOrProps?: string | Props,
+) => (builder: DeploymentModelBuilder<T>) => DeploymentModelBuilder<T>
+
 export type DeloymentModelHelpers<T extends AnyTypes> = AddDeploymentNodeHelpers<T> & {
   instanceOf: AddDeployedInstance<T['NewDeploymentNodeProps']>
   rel: AddDeploymentRelation<T['NewRelationshipProps']>
   deployment: typeof deployment
 }
+
+export type DeloymentModelBuildFunction<A extends AnyTypes, B extends AnyTypes> = (
+  helpers: DeloymentModelHelpers<A> & {
+    _: DeloymentModelHelpers<A>['deployment']
+  },
+  add: DeloymentModelHelpers<A>['deployment'],
+) =>
+  | ((builder: DeploymentModelBuilder<A>) => DeploymentModelBuilder<B>)
+  | ((builder: Builder<A>) => Builder<B>)