@likec4/core 1.5.0 → 1.6.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023-2024 Denis Davydkov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/colors/element.d.ts

@@ -57,7 +57,7 @@ export declare const ElementColors: {
         readonly fill: "#A35829";
         readonly stroke: "#7E451D";
         readonly hiContrast: "#FFE0C2";
-        readonly loContrast: "#FFA057";
+        readonly loContrast: "#f9b27c";
     };
     readonly indigo: {
         readonly fill: "#6366f1";

package/dist/colors/element.js

@@ -60,7 +60,7 @@ export const ElementColors = {
         fill: '#A35829',
         stroke: '#7E451D',
         hiContrast: '#FFE0C2',
-        loContrast: '#FFA057'
+        loContrast: '#f9b27c'
     },
     indigo: {
         // fill: colors.indigo[500],

package/dist/colors/index.d.ts

@@ -60,7 +60,7 @@ export declare const defaultTheme: {
             readonly fill: "#A35829";
             readonly stroke: "#7E451D";
             readonly hiContrast: "#FFE0C2";
-            readonly loContrast: "#FFA057";
+            readonly loContrast: "#f9b27c";
         };
         readonly indigo: {
             readonly fill: "#6366f1";
@@ -126,7 +126,7 @@ export declare const defaultTheme: {
             labelColor: "#cbd5e1";
         };
     };
-    font: "Helvetica";
+    font: "Arial";
     shadow: "#0a0a0a";
 };
 export { ElementColors, RelationshipColors };

package/dist/colors/index.js

@@ -3,7 +3,7 @@ import { RelationshipColors } from './relationships';
 export const defaultTheme = {
     elements: ElementColors,
     relationships: RelationshipColors,
-    font: 'Helvetica',
+    font: 'Arial',
     shadow: '#0a0a0a'
 };
 export { ElementColors, RelationshipColors };

package/dist/types/expression.d.ts

@@ -89,7 +89,8 @@ export interface CustomRelationExpr extends Omit<BaseExpr, 'customRelation'> {
     };
 }
 export declare function isCustomRelationExpr(expr: Expression): expr is CustomRelationExpr;
-export type RelationPredicateExpression = RelationExpr | InOutExpr | IncomingExpr | OutgoingExpr | CustomRelationExpr;
+export type RelationExpression = RelationExpr | InOutExpr | IncomingExpr | OutgoingExpr;
+export type RelationPredicateExpression = RelationExpression | CustomRelationExpr;
 export declare function isAnyRelation(expr: Expression): expr is RelationPredicateExpression;
 export type Expression = ElementPredicateExpression | RelationPredicateExpression;
 export {};

package/dist/types/theme.d.ts

@@ -19,7 +19,7 @@ export type RelationshipThemeColors = {
     [key in ThemeColor]: RelationshipThemeColorValues;
 };
 export interface LikeC4Theme {
-    font: 'Helvetica';
+    font: 'Arial';
     shadow: ColorLiteral;
     relationships: RelationshipThemeColors;
     elements: ElementThemeColors;

package/dist/types/view.d.ts

@@ -5,14 +5,14 @@ import type { Opaque } from './opaque';
 import type { RelationID, RelationshipArrowType, RelationshipLineType } from './relation';
 import type { ThemeColor } from './theme';
 export type ViewID = Opaque<string, 'ViewID'>;
-export type ViewRuleExpression = {
+export type ViewRulePredicate = {
     include: Expression[];
     exclude?: never;
 } | {
     include?: never;
     exclude: Expression[];
 };
-export declare function isViewRuleExpression(rule: ViewRule): rule is ViewRuleExpression;
+export declare function isViewRulePredicate(rule: ViewRule): rule is ViewRulePredicate;
 export interface ViewRuleStyle {
     targets: ElementExpression[];
     style: ElementStyle & {
@@ -27,7 +27,7 @@ export interface ViewRuleAutoLayout {
     autoLayout: AutoLayoutDirection;
 }
 export declare function isViewRuleAutoLayout(rule: ViewRule): rule is ViewRuleAutoLayout;
-export type ViewRule = ViewRuleExpression | ViewRuleStyle | ViewRuleAutoLayout;
+export type ViewRule = ViewRulePredicate | ViewRuleStyle | ViewRuleAutoLayout;
 export interface BasicView<ViewType extends 'element' | 'dynamic'> {
     readonly __?: ViewType;
     readonly id: ViewID;

package/dist/types/view.js

@@ -1,5 +1,5 @@
 import { isNullish } from 'remeda';
-export function isViewRuleExpression(rule) {
+export function isViewRulePredicate(rule) {
     return (('include' in rule && Array.isArray(rule.include))
         || ('exclude' in rule && Array.isArray(rule.exclude)));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/core",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "license": "MIT",
   "homepage": "https://likec4.dev",
   "author": "Denis Davydkov <denis@davydkov.com>",
@@ -71,11 +71,11 @@
     "type-fest": "^4.21.0"
   },
   "devDependencies": {
-    "@likec4/tsconfig": "1.5.0",
+    "@likec4/tsconfig": "1.6.0",
     "@total-typescript/ts-reset": "^0.5.1",
     "execa": "^9.3.0",
     "typescript": "^5.5.3",
-    "vitest": "~1.6.0"
+    "vitest": "~2.0.3"
   },
   "packageManager": "yarn@4.3.1"
 }

package/src/colors/element.ts

@@ -65,7 +65,7 @@ export const ElementColors = {
     fill: '#A35829',
     stroke: '#7E451D',
     hiContrast: '#FFE0C2',
-    loContrast: '#FFA057'
+    loContrast: '#f9b27c'
   },
   indigo: {
     // fill: colors.indigo[500],

package/src/colors/index.ts

@@ -5,7 +5,7 @@ import { RelationshipColors } from './relationships'
 export const defaultTheme = {
   elements: ElementColors,
   relationships: RelationshipColors,
-  font: 'Helvetica',
+  font: 'Arial',
   shadow: '#0a0a0a'
 } satisfies LikeC4Theme
 

package/src/types/expression.ts

@@ -136,7 +136,9 @@ export function isCustomRelationExpr(expr: Expression): expr is CustomRelationEx
   return 'customRelation' in expr
 }
 
-export type RelationPredicateExpression = RelationExpr | InOutExpr | IncomingExpr | OutgoingExpr | CustomRelationExpr
+export type RelationExpression = RelationExpr | InOutExpr | IncomingExpr | OutgoingExpr
+
+export type RelationPredicateExpression = RelationExpression | CustomRelationExpr
 
 export function isAnyRelation(expr: Expression): expr is RelationPredicateExpression {
   return isRelation(expr) || isInOut(expr) || isIncoming(expr) || isOutgoing(expr) || isCustomRelationExpr(expr)

package/src/types/theme.ts

@@ -39,7 +39,7 @@ export type RelationshipThemeColors = {
 }
 
 export interface LikeC4Theme {
-  font: 'Helvetica' // for now only support Helvetica
+  font: 'Arial'
   shadow: ColorLiteral
   relationships: RelationshipThemeColors
   elements: ElementThemeColors

package/src/types/view.ts

@@ -9,7 +9,7 @@ import type { ThemeColor } from './theme'
 // Full-qualified-name
 export type ViewID = Opaque<string, 'ViewID'>
 
-export type ViewRuleExpression =
+export type ViewRulePredicate =
   | {
     include: Expression[]
     exclude?: never
@@ -18,7 +18,7 @@ export type ViewRuleExpression =
     include?: never
     exclude: Expression[]
   }
-export function isViewRuleExpression(rule: ViewRule): rule is ViewRuleExpression {
+export function isViewRulePredicate(rule: ViewRule): rule is ViewRulePredicate {
   return (
     ('include' in rule && Array.isArray(rule.include))
     || ('exclude' in rule && Array.isArray(rule.exclude))
@@ -45,7 +45,7 @@ export function isViewRuleAutoLayout(rule: ViewRule): rule is ViewRuleAutoLayout
   return 'autoLayout' in rule
 }
 
-export type ViewRule = ViewRuleExpression | ViewRuleStyle | ViewRuleAutoLayout
+export type ViewRule = ViewRulePredicate | ViewRuleStyle | ViewRuleAutoLayout
 
 export interface BasicView<ViewType extends 'element' | 'dynamic'> {
   readonly __?: ViewType