@webstudio-is/css-engine 0.56.0 → 0.57.0

package/package.json

@@ -1,30 +1,29 @@
 {
   "name": "@webstudio-is/css-engine",
-  "version": "0.56.0",
+  "version": "0.57.0",
   "description": "CSS Renderer for Webstudio",
   "author": "Webstudio <github@webstudio.is>",
   "homepage": "https://webstudio.is",
   "type": "module",
   "dependencies": {
     "hyphenate-style-name": "^1.0.4",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "@webstudio-is/fonts": "^0.56.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "@webstudio-is/css-data": "^0.57.0",
+    "@webstudio-is/fonts": "^0.57.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.3.1",
     "@storybook/react": "^6.5.16",
     "@types/hyphenate-style-name": "^1.0.0",
-    "@types/react": "^17.0.24",
-    "@types/react-dom": "^17.0.9",
+    "@types/react": "^18.0.35",
+    "@types/react-dom": "^18.0.11",
     "jest": "^29.3.1",
     "typescript": "5.0.3",
-    "@webstudio-is/asset-uploader": "^0.56.0",
-    "@webstudio-is/css-data": "^0.56.0",
-    "@webstudio-is/jest-config": "^1.0.2",
+    "@webstudio-is/jest-config": "^1.0.4",
     "@webstudio-is/scripts": "^0.0.0",
     "@webstudio-is/storybook-config": "^0.0.0",
-    "@webstudio-is/tsconfig": "^1.0.3"
+    "@webstudio-is/tsconfig": "^1.0.4"
   },
   "exports": {
     "source": "./src/index.ts",
@@ -40,11 +39,11 @@
   "private": false,
   "sideEffects": false,
   "scripts": {
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc --noEmit --emitDeclarationOnly false",
     "checks": "pnpm typecheck && pnpm lint && pnpm test",
     "dev": "build-package --watch",
     "build": "build-package",
-    "dts": "tsc --emitDeclarationOnly --declaration --declarationDir lib/types",
+    "dts": "tsc",
     "test": "NODE_OPTIONS=--experimental-vm-modules jest",
     "lint": "eslint ./src --ext .ts,.tsx --max-warnings 0",
     "storybook:run": "start-storybook -p 6006",

package/src/core/css-engine.stories.tsx

@@ -34,7 +34,7 @@ export const Basic = () => {
         onClick={() => {
           engine.addStyleRule(".test", {
             style: {
-              background: { type: "keyword", value: "yellow" },
+              backgroundColor: { type: "keyword", value: "yellow" },
             },
             breakpoint: "0",
           });

package/src/core/css-engine.test.ts

@@ -1,5 +1,4 @@
 import { describe, beforeEach, test, expect } from "@jest/globals";
-import type { Assets } from "@webstudio-is/asset-uploader";
 import { CssEngine } from "./css-engine";
 
 const style0 = {
@@ -352,23 +351,8 @@ describe("CssEngine", () => {
   });
 
   test("render images with injected asset url", () => {
-    const assets: Assets = new Map([
-      [
-        "1234",
-        {
-          type: "image",
-          path: "foo.png",
-          id: "1234567890",
-          projectId: "",
-          format: "",
-          size: 1212,
-          name: "img",
-          description: "",
-          location: "REMOTE",
-          createdAt: "",
-          meta: { width: 1, height: 2 },
-        },
-      ],
+    const assets = new Map<string, { path: string }>([
+      ["1234", { path: "foo.png" }],
     ]);
     const rule = engine.addStyleRule(
       ".c",

package/src/core/css-engine.ts

@@ -1,4 +1,4 @@
-import type { CssRule } from "@webstudio-is/css-data";
+import type { Style } from "@webstudio-is/css-data";
 import {
   FontFaceRule,
   MediaRule,
@@ -14,6 +14,11 @@ import type { TransformValue } from "./to-value";
 
 const defaultMediaRuleId = "__default-media-rule__";
 
+type CssRule = {
+  style: Style;
+  breakpoint?: string;
+};
+
 export type CssEngineOptions = { name?: string };
 
 export class CssEngine {

package/src/core/to-value.test.ts

@@ -1,5 +1,4 @@
 import { describe, test, expect } from "@jest/globals";
-import type { Assets } from "@webstudio-is/asset-uploader";
 import { toValue } from "./to-value";
 
 describe("Convert WS CSS Values to native CSS strings", () => {
@@ -74,24 +73,8 @@ describe("Convert WS CSS Values to native CSS strings", () => {
   });
 
   test("array", () => {
-    const assets: Assets = new Map([
-      [
-        "1234567890",
-        {
-          type: "image",
-          path: "foo.png",
-
-          id: "1234567890",
-          projectId: "",
-          format: "",
-          size: 1212,
-          name: "img",
-          description: "",
-          location: "REMOTE",
-          createdAt: "",
-          meta: { width: 1, height: 2 },
-        },
-      ],
+    const assets = new Map<string, { path: string }>([
+      ["1234567890", { path: "foo.png" }],
     ]);
 
     const value = toValue(

package/lib/types/core/compare-media.d.ts

@@ -1,6 +0,0 @@
-import type { MediaRuleOptions } from "./rules";
-/**
- * Sort by minWidth descending or maxWidth ascending
- * We want media querries with bigger minWidth to override the smaller once, but the smaller maxWidth to override the bigger once.
- */
-export declare const compareMedia: (optionA: MediaRuleOptions, optionB: MediaRuleOptions) => number;

package/lib/types/core/compare-media.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/types/core/create-css-engine.d.ts

@@ -1,2 +0,0 @@
-import { CssEngine, type CssEngineOptions } from "./css-engine";
-export declare const createCssEngine: (options?: CssEngineOptions) => CssEngine;

package/lib/types/core/css-engine.d.ts

@@ -1,20 +0,0 @@
-import type { CssRule } from "@webstudio-is/css-data";
-import { MediaRule, PlaintextRule, StyleRule, type FontFaceOptions, type MediaRuleOptions } from "./rules";
-import type { TransformValue } from "./to-value";
-export type CssEngineOptions = {
-    name?: string;
-};
-export declare class CssEngine {
-    #private;
-    constructor({ name }: CssEngineOptions);
-    addMediaRule(id: string, options?: MediaRuleOptions): MediaRule;
-    addStyleRule(selectorText: string, rule: CssRule, transformValue?: TransformValue): StyleRule;
-    addPlaintextRule(cssText: string): PlaintextRule | Map<string, PlaintextRule>;
-    addFontFaceRule(options: FontFaceOptions): number;
-    clear(): void;
-    render(): void;
-    unmount(): void;
-    setAttribute(name: string, value: string): void;
-    getAttribute(name: string): string | null | undefined;
-    get cssText(): string;
-}

package/lib/types/core/css-engine.stories.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="react" />
-declare const _default: {
-    component: string;
-};
-export default _default;
-export declare const Basic: () => JSX.Element;

package/lib/types/core/css-engine.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/types/core/equal-media.d.ts

@@ -1,2 +0,0 @@
-import type { MediaRuleOptions } from "./rules";
-export declare const equalMedia: (left: MediaRuleOptions, right: MediaRuleOptions) => boolean;

package/lib/types/core/equal-media.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/types/core/find-applicable-media.d.ts

@@ -1,2 +0,0 @@
-import type { MediaRuleOptions } from "./rules";
-export declare const findApplicableMedia: <Media extends MediaRuleOptions>(media: Media[], width: number) => Media | undefined;

package/lib/types/core/find-applicable-media.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/types/core/index.d.ts

@@ -1,8 +0,0 @@
-export { CssEngine } from "./css-engine";
-export type { AnyRule, StyleRule, MediaRule, PlaintextRule, FontFaceRule, } from "./rules";
-export * from "./create-css-engine";
-export * from "./to-value";
-export * from "./match-media";
-export * from "./equal-media";
-export * from "./compare-media";
-export * from "./find-applicable-media";

package/lib/types/core/match-media.d.ts

@@ -1,2 +0,0 @@
-import type { MediaRuleOptions } from "./rules";
-export declare const matchMedia: (options: MediaRuleOptions, width: number) => boolean;

package/lib/types/core/match-media.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/types/core/rules.d.ts

@@ -1,53 +0,0 @@
-import type { Style, StyleProperty, StyleValue } from "@webstudio-is/css-data";
-import { type TransformValue } from "./to-value";
-declare class StylePropertyMap {
-    #private;
-    onChange?: () => void;
-    constructor(transformValue?: TransformValue);
-    set(property: StyleProperty, value?: StyleValue): void;
-    has(property: StyleProperty): boolean;
-    keys(): IterableIterator<"color" | "left" | "right" | "top" | "bottom" | "contain" | "clip" | "content" | `--${string}` | "accentColor" | "alignContent" | "alignItems" | "alignSelf" | "alignTracks" | "animationComposition" | "animationDelay" | "animationDirection" | "animationDuration" | "animationFillMode" | "animationIterationCount" | "animationName" | "animationPlayState" | "animationTimingFunction" | "animationTimeline" | "appearance" | "aspectRatio" | "backdropFilter" | "backfaceVisibility" | "backgroundAttachment" | "backgroundBlendMode" | "backgroundClip" | "backgroundColor" | "backgroundImage" | "backgroundOrigin" | "backgroundPosition" | "backgroundPositionX" | "backgroundPositionY" | "backgroundRepeat" | "backgroundSize" | "blockOverflow" | "blockSize" | "borderBlockColor" | "borderBlockStyle" | "borderBlockWidth" | "borderBlockEndColor" | "borderBlockEndStyle" | "borderBlockEndWidth" | "borderBlockStartColor" | "borderBlockStartStyle" | "borderBlockStartWidth" | "borderBottomColor" | "borderBottomLeftRadius" | "borderBottomRightRadius" | "borderBottomStyle" | "borderBottomWidth" | "borderCollapse" | "borderEndEndRadius" | "borderEndStartRadius" | "borderImageOutset" | "borderImageRepeat" | "borderImageSlice" | "borderImageSource" | "borderImageWidth" | "borderInlineColor" | "borderInlineStyle" | "borderInlineWidth" | "borderInlineEndColor" | "borderInlineEndStyle" | "borderInlineEndWidth" | "borderInlineStartColor" | "borderInlineStartStyle" | "borderInlineStartWidth" | "borderLeftColor" | "borderLeftStyle" | "borderLeftWidth" | "borderRightColor" | "borderRightStyle" | "borderRightWidth" | "borderSpacing" | "borderStartEndRadius" | "borderStartStartRadius" | "borderTopColor" | "borderTopLeftRadius" | "borderTopRightRadius" | "borderTopStyle" | "borderTopWidth" | "boxDecorationBreak" | "boxShadow" | "boxSizing" | "breakAfter" | "breakBefore" | "breakInside" | "captionSide" | "caretColor" | "caretShape" | "clear" | "clipPath" | "printColorAdjust" | "colorScheme" | "columnCount" | "columnFill" | "columnGap" | "columnRuleColor" | "columnRuleStyle" | "columnRuleWidth" | "columnSpan" | "columnWidth" | "containIntrinsicBlockSize" | "containIntrinsicHeight" | "containIntrinsicInlineSize" | "containIntrinsicWidth" | "contentVisibility" | "counterIncrement" | "counterReset" | "counterSet" | "cursor" | "direction" | "display" | "emptyCells" | "filter" | "flexBasis" | "flexDirection" | "flexGrow" | "flexShrink" | "flexWrap" | "float" | "fontFamily" | "fontFeatureSettings" | "fontKerning" | "fontLanguageOverride" | "fontOpticalSizing" | "fontVariationSettings" | "fontSize" | "fontSizeAdjust" | "fontStretch" | "fontStyle" | "fontSynthesis" | "fontVariant" | "fontVariantAlternates" | "fontVariantCaps" | "fontVariantEastAsian" | "fontVariantLigatures" | "fontVariantNumeric" | "fontVariantPosition" | "fontWeight" | "forcedColorAdjust" | "gridAutoColumns" | "gridAutoFlow" | "gridAutoRows" | "gridColumnEnd" | "gridColumnStart" | "gridRowEnd" | "gridRowStart" | "gridTemplateAreas" | "gridTemplateColumns" | "gridTemplateRows" | "hangingPunctuation" | "height" | "hyphenateCharacter" | "hyphens" | "imageOrientation" | "imageRendering" | "imageResolution" | "initialLetter" | "initialLetterAlign" | "inlineSize" | "inputSecurity" | "insetBlockEnd" | "insetBlockStart" | "insetInlineEnd" | "insetInlineStart" | "isolation" | "justifyContent" | "justifyItems" | "justifySelf" | "justifyTracks" | "letterSpacing" | "lineBreak" | "lineClamp" | "lineHeight" | "lineHeightStep" | "listStyleImage" | "listStylePosition" | "listStyleType" | "marginBlockEnd" | "marginBlockStart" | "marginBottom" | "marginInlineEnd" | "marginInlineStart" | "marginLeft" | "marginRight" | "marginTop" | "marginTrim" | "maskBorderMode" | "maskBorderOutset" | "maskBorderRepeat" | "maskBorderSlice" | "maskBorderSource" | "maskBorderWidth" | "maskClip" | "maskComposite" | "maskImage" | "maskMode" | "maskOrigin" | "maskPosition" | "maskRepeat" | "maskSize" | "maskType" | "masonryAutoFlow" | "mathDepth" | "mathShift" | "mathStyle" | "maxBlockSize" | "maxHeight" | "maxInlineSize" | "maxLines" | "maxWidth" | "minBlockSize" | "minHeight" | "minInlineSize" | "minWidth" | "mixBlendMode" | "objectFit" | "objectPosition" | "offsetAnchor" | "offsetDistance" | "offsetPath" | "offsetPosition" | "offsetRotate" | "opacity" | "order" | "orphans" | "outlineColor" | "outlineOffset" | "outlineStyle" | "outlineWidth" | "overflow" | "overflowAnchor" | "overflowBlock" | "overflowClipMargin" | "overflowInline" | "overflowWrap" | "overflowX" | "overflowY" | "overscrollBehavior" | "overscrollBehaviorBlock" | "overscrollBehaviorInline" | "overscrollBehaviorX" | "overscrollBehaviorY" | "paddingBlockEnd" | "paddingBlockStart" | "paddingBottom" | "paddingInlineEnd" | "paddingInlineStart" | "paddingLeft" | "paddingRight" | "paddingTop" | "pageBreakAfter" | "pageBreakBefore" | "pageBreakInside" | "paintOrder" | "perspective" | "perspectiveOrigin" | "pointerEvents" | "position" | "quotes" | "resize" | "rotate" | "rowGap" | "rubyAlign" | "rubyMerge" | "rubyPosition" | "scale" | "scrollbarColor" | "scrollbarGutter" | "scrollbarWidth" | "scrollBehavior" | "scrollMarginBlockStart" | "scrollMarginBlockEnd" | "scrollMarginBottom" | "scrollMarginInlineStart" | "scrollMarginInlineEnd" | "scrollMarginLeft" | "scrollMarginRight" | "scrollMarginTop" | "scrollPaddingBlockStart" | "scrollPaddingBlockEnd" | "scrollPaddingBottom" | "scrollPaddingInlineStart" | "scrollPaddingInlineEnd" | "scrollPaddingLeft" | "scrollPaddingRight" | "scrollPaddingTop" | "scrollSnapAlign" | "scrollSnapStop" | "scrollSnapType" | "scrollTimelineAxis" | "scrollTimelineName" | "shapeImageThreshold" | "shapeMargin" | "shapeOutside" | "tabSize" | "tableLayout" | "textAlign" | "textAlignLast" | "textCombineUpright" | "textDecorationColor" | "textDecorationLine" | "textDecorationSkip" | "textDecorationSkipInk" | "textDecorationStyle" | "textDecorationThickness" | "textEmphasisColor" | "textEmphasisPosition" | "textEmphasisStyle" | "textIndent" | "textJustify" | "textOrientation" | "textOverflow" | "textRendering" | "textShadow" | "textSizeAdjust" | "textTransform" | "textUnderlineOffset" | "textUnderlinePosition" | "touchAction" | "transform" | "transformBox" | "transformOrigin" | "transformStyle" | "transitionDelay" | "transitionDuration" | "transitionProperty" | "transitionTimingFunction" | "translate" | "unicodeBidi" | "userSelect" | "verticalAlign" | "visibility" | "whiteSpace" | "widows" | "width" | "willChange" | "wordBreak" | "wordSpacing" | "wordWrap" | "writingMode" | "zIndex">;
-    delete(property: StyleProperty): void;
-    clear(): void;
-    toString(): string;
-}
-export declare class StyleRule {
-    #private;
-    styleMap: StylePropertyMap;
-    selectorText: string;
-    onChange?: () => void;
-    constructor(selectorText: string, style: Style, transformValue?: TransformValue);
-    get cssText(): string;
-}
-export type MediaRuleOptions = {
-    minWidth?: number;
-    maxWidth?: number;
-    mediaType?: "all" | "screen" | "print";
-};
-export declare class MediaRule {
-    #private;
-    options: MediaRuleOptions;
-    rules: Array<StyleRule | PlaintextRule>;
-    constructor(options?: MediaRuleOptions);
-    insertRule(rule: StyleRule | PlaintextRule): StyleRule | PlaintextRule;
-    get cssText(): string;
-}
-export declare class PlaintextRule {
-    cssText: string;
-    styleMap: StylePropertyMap;
-    constructor(cssText: string);
-}
-export type FontFaceOptions = {
-    fontFamily: string;
-    fontStyle?: "normal" | "italic" | "oblique";
-    fontWeight?: number | string;
-    fontDisplay: "swap" | "auto" | "block" | "fallback" | "optional";
-    src: string;
-};
-export declare class FontFaceRule {
-    options: FontFaceOptions;
-    constructor(options: FontFaceOptions);
-    get cssText(): string;
-}
-export type AnyRule = StyleRule | MediaRule | PlaintextRule | FontFaceRule;
-export {};

package/lib/types/core/style-element.d.ts

@@ -1,10 +0,0 @@
-export declare class StyleElement {
-    #private;
-    constructor(name?: string);
-    get isMounted(): boolean;
-    mount(): void;
-    unmount(): void;
-    render(cssText: string): void;
-    setAttribute(name: string, value: string): void;
-    getAttribute(name: string): string | null | undefined;
-}

package/lib/types/core/style-sheet.d.ts

@@ -1,6 +0,0 @@
-import type { StyleElement } from "./style-element";
-export declare class StyleSheet {
-    #private;
-    constructor(element: StyleElement);
-    replaceSync(cssText: string): void;
-}

package/lib/types/core/to-property.d.ts

@@ -1,2 +0,0 @@
-import type { StyleProperty } from "@webstudio-is/css-data";
-export declare const toProperty: (property: StyleProperty) => string;

package/lib/types/core/to-property.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/types/core/to-value.d.ts

@@ -1,3 +0,0 @@
-import type { StyleValue } from "@webstudio-is/css-data";
-export type TransformValue = (styleValue: StyleValue) => undefined | StyleValue;
-export declare const toValue: (styleValue: undefined | StyleValue, transformValue?: TransformValue) => string;

package/lib/types/core/to-value.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/types/index.d.ts

@@ -1 +0,0 @@
-export * from "./core";