lism-css 0.11.0 → 0.13.0

package/dist/lib/getLismProps.js

@@ -1,121 +1,133 @@
-import { STATES as b, PROPS as g } from "../config/index.js";
-import E from "./getLayoutProps.js";
-import C from "./isPresetValue.js";
-import V from "./isTokenValue.js";
-import U from "./getUtilKey.js";
-import S from "./getMaybeCssVar.js";
-import _ from "./getBpData.js";
-import A from "./helper/atts.js";
-import x from "./helper/isEmptyObj.js";
-import O from "./helper/filterEmptyObj.js";
+import { TRAITS as P, PROPS as y } from "../config/index.js";
+import p from "./getLayoutProps.js";
+import S from "./isPresetValue.js";
+import E from "./isTokenValue.js";
+import C from "./getUtilKey.js";
+import c from "./getMaybeCssVar.js";
+import V from "./getBpData.js";
+import x from "./helper/atts.js";
+import w from "./helper/isEmptyObj.js";
+import U from "./helper/filterEmptyObj.js";
+import O from "./helper/mergeSet.js";
 import j from "./helper/splitWithComma.js";
-const z = (a) => {
-  const s = g[a];
-  return s && s?.token || "";
+const _ = (n) => {
+  const i = y[n];
+  return i && i?.token || "";
 };
-class w {
-  // propList = {};
+function z(n, i) {
+  if (!n) return "";
+  if (!i) return n;
+  const t = n.split(" "), s = t[0];
+  return [s, `${s}--${i}`, ...t.slice(1)].join(" ");
+}
+class L {
+  // 最終出力 className
   className = "";
+  // 出力順のためのクラスバケット: [lismClass] [lismTrait] [uClasses]
+  // - lismClass : コンポーネント基底クラス + variant + l--{layout}（getLayoutProps 側で付与済み）
+  // - lismTrait : is--* 等の trait クラス
+  // - uClasses  : set--* → u--* → -property の順で push される utility クラス
+  lismClass = "";
+  lismTrait = [];
   uClasses = [];
-  lismState = [];
   styles = {};
   attrs = {};
   _propConfig;
-  constructor(s) {
-    const { forwardedRef: t, class: i, className: e, lismClass: l, variant: r, style: f = {}, _propConfig: o = {}, ...u } = s;
-    this.styles = { ...f }, this._propConfig = { ...o };
-    let h = l || "";
-    if (r && l) {
-      const y = l.split(" "), n = y[0], m = `${n}--${r}`;
-      h = [n, m, ...y.slice(1)].join(" ");
-    }
-    x(u) || (this.attrs = { ...u }, this.analyzeProps()), t && (this.attrs.ref = t), this.className = A(e || i, h, this.lismState, this.uClasses);
+  constructor(i) {
+    const { forwardedRef: t, class: s, className: e, lismClass: l, variant: r, style: o = {}, _propConfig: d = {}, ...u } = i;
+    this.styles = { ...o }, this._propConfig = { ...d }, this.lismClass = z(l, r), w(u) || (this.attrs = { ...u }, this.analyzeProps()), t && (this.attrs.ref = t), this.className = this.buildClassName(e, s);
+  }
+  // 最終クラス文字列の組み立て（出力順の唯一の確定地点）
+  // 出力順: [user/astro className] [lismClass] [lismTrait] [uClasses]
+  buildClassName(i, t) {
+    return x(i || t, this.lismClass, this.lismTrait, this.uClasses);
   }
-  analyzeState(s, t) {
-    const { className: i, preset: e, presetClass: l, customVar: r, tokenKey: f, setStyles: o } = s;
-    t === !0 ? this.lismState.push(i) : e && C(e, t) ? this.lismState.push(`${i} ${l}:${String(t)}`) : t && (this.lismState.push(i), f && r ? this.addStyle(r, S(t, f)) : o && typeof t == "string" && this.addStyles(o(t)));
+  analyzeTrait(i, t) {
+    const { className: s, preset: e, presetClass: l, customVar: r, tokenKey: o } = i;
+    t === !0 ? this.lismTrait.push(s) : e && S(e, t) ? this.lismTrait.push(`${s} ${l}:${String(t)}`) : t && (this.lismTrait.push(s), o && r && this.addStyle(r, c(t, o)));
   }
   // prop解析
   analyzeProps() {
-    Object.keys(this.attrs).forEach((s) => {
-      if (Object.hasOwn(b, s)) {
-        const t = this.extractProp(s), i = b[s];
-        typeof i == "string" ? t && this.lismState.push(i) : this.analyzeState(i, t);
-      } else if (Object.hasOwn(g, s)) {
-        const t = this.attrs[s];
-        delete this.attrs[s], this.analyzeLismProp(s, t);
+    const i = this.extractProp("set"), t = this.extractProp("util");
+    O(void 0, i).forEach((s) => this.addUtil(`set--${s}`)), O(void 0, t).forEach((s) => this.addUtil(`u--${s}`)), Object.keys(this.attrs).forEach((s) => {
+      if (Object.hasOwn(P, s)) {
+        const e = this.extractProp(s), l = P[s];
+        typeof l == "string" ? e && this.lismTrait.push(l) : this.analyzeTrait(l, e);
+      } else if (Object.hasOwn(y, s)) {
+        const e = this.attrs[s];
+        delete this.attrs[s], this.analyzeLismProp(s, e);
       } else if (s === "hov") {
-        const t = this.extractProp(s);
-        this.setHovProps(t);
+        const e = this.extractProp(s);
+        this.setHovProps(e);
       } else if (s === "css") {
-        const t = this.extractProp("css");
-        this.addStyles(t);
+        const e = this.extractProp("css");
+        this.addStyles(e);
       }
     });
   }
   // Lism Prop 解析
-  analyzeLismProp(s, t) {
+  analyzeLismProp(i, t) {
     if (t == null) return;
-    let i = g[s] || null;
-    if (i === null) return;
-    this._propConfig?.[s] && (i = Object.assign({}, i, this._propConfig[s]));
-    const { base: e, ...l } = _(t);
-    this.setAttrs(s, e, i), Object.keys(l).forEach((r) => {
-      i && this.setAttrs(s, l[r], i, r);
+    let s = y[i] || null;
+    if (s === null) return;
+    this._propConfig?.[i] && (s = Object.assign({}, s, this._propConfig[i]));
+    const { base: e, ...l } = V(t);
+    this.setAttrs(i, e, s), Object.keys(l).forEach((r) => {
+      s && this.setAttrs(i, l[r], s, r);
     });
   }
-  addUtil(s) {
-    this.uClasses.push(s);
+  addUtil(i) {
+    this.uClasses.push(i);
   }
-  addUtils(s) {
-    this.uClasses.push(...s);
+  addUtils(i) {
+    this.uClasses.push(...i);
   }
   // addState(state) {
   // 	this.stateClasses.push(state);
   // }
-  addStyle(s, t) {
-    this.styles[s] = t;
+  addStyle(i, t) {
+    this.styles[i] = t;
   }
-  addStyles(s) {
-    this.styles = { ...this.styles, ...s };
+  addStyles(i) {
+    this.styles = { ...this.styles, ...i };
   }
-  addAttrs(s) {
-    this.addStyles(s.styles || {}), this.addUtils(s.utils || []);
+  addAttrs(i) {
+    this.addStyles(i.styles || {}), this.addUtils(i.utils || []);
   }
-  extractProp(s) {
-    const t = this.attrs[s];
-    return this.attrs[s] === void 0 ? null : (delete this.attrs[s], t);
+  extractProp(i) {
+    const t = this.attrs[i];
+    return this.attrs[i] === void 0 ? null : (delete this.attrs[i], t);
   }
-  extractProps(s) {
+  extractProps(i) {
     const t = {};
-    return s.forEach((i) => {
-      this.attrs[i] !== void 0 && (t[i] = this.attrs[i], delete this.attrs[i]);
+    return i.forEach((s) => {
+      this.attrs[s] !== void 0 && (t[s] = this.attrs[s], delete this.attrs[s]);
     }), t;
   }
   // utilクラスを追加するか、styleにセットするかの分岐処理 @base
   // 値が null, undefined, '', false の時はスキップ
-  setAttrs(s, t, i = {}, e = "") {
+  setAttrs(i, t, s = {}, e = "") {
     if (t == null || t === "" || t === !1) return;
-    let l = `--${s}`, r = `-${String(i.utilKey || s)}`;
-    if (e && (l = `--${s}_${e}`, r += `_${e}`), typeof t == "string" && t.startsWith(":")) {
+    let l = `--${i}`, r = `-${String(s.utilKey || i)}`;
+    if (e && (l = `--${i}_${e}`, r += `_${e}`), typeof t == "string" && t.startsWith(":")) {
       this.addUtil(`${r}:${t.replace(":", "")}`);
       return;
     }
     if (!e) {
-      const { presets: m, tokenClass: k, utils: $, shorthands: P } = i;
-      if (m && C(m, t)) {
-        const d = typeof t == "string" || typeof t == "number" ? String(t) : "";
-        d && this.addUtil(`${r}:${d}`);
+      const { presets: g, tokenClass: T, utils: $, shorthands: b } = s;
+      if (g && S(g, t)) {
+        const h = typeof t == "string" || typeof t == "number" ? String(t) : "";
+        h && this.addUtil(`${r}:${h}`);
         return;
       }
-      if (k && i.token && V(i.token, t)) {
-        const d = typeof t == "string" || typeof t == "number" ? String(t) : "";
-        d && this.addUtil(`${r}:${d}`);
+      if (T && s.token && E(s.token, t)) {
+        const h = typeof t == "string" || typeof t == "number" ? String(t) : "";
+        h && this.addUtil(`${r}:${h}`);
         return;
       }
-      let c = "";
-      if ($ && typeof t == "string" && (c = U($, t)), !c && P && typeof t == "string" && (c = U(P, t, !0)), c) {
-        this.addUtil(`${r}:${c}`);
+      let a = "";
+      if ($ && typeof t == "string" && (a = C($, t)), !a && b && typeof t == "string" && (a = C(b, t, !0)), a) {
+        this.addUtil(`${r}:${a}`);
         return;
       }
     }
@@ -123,18 +135,18 @@ class w {
       this.addUtil(r);
       return;
     }
-    const { prop: f, isVar: o, alwaysVar: u, token: h, bp: y } = i;
-    let n;
-    if (h && (typeof t == "string" || typeof t == "number") ? n = S(t, h) : typeof t == "string" || typeof t == "number" ? n = t : n = JSON.stringify(t), !e) {
-      if (o) {
-        this.addStyle(`--${s}`, n);
+    const { prop: o, isVar: d, alwaysVar: u, token: m, bp: k } = s;
+    let f;
+    if (m && (typeof t == "string" || typeof t == "number") ? f = c(t, m) : typeof t == "string" || typeof t == "number" ? f = t : f = JSON.stringify(t), !e) {
+      if (d) {
+        this.addStyle(`--${i}`, f);
         return;
-      } else if (!y && !u) {
-        this.addStyle(f, n);
+      } else if (!k && !u) {
+        this.addStyle(o, f);
         return;
       }
     }
-    this.addUtil(r), this.addStyle(l, n);
+    this.addUtil(r), this.addStyle(l, f);
   }
   // setPassProps(passVars) {
   // 	let dataList = [];
@@ -149,40 +161,40 @@ class w {
   // 		this.addStyle(`--pass_${propName}`, value);
   // 	});
   // }
-  setHovProps(s) {
-    s && (s === "-" || s === !0 ? this.addUtil("-hov") : typeof s == "string" ? j(s).forEach((t) => {
+  setHovProps(i) {
+    i && (i === "-" || i === !0 ? this.addUtil("-hov") : typeof i == "string" ? j(i).forEach((t) => {
       this.addUtil(`-hov:${t}`);
-    }) : typeof s == "object" && Object.keys(s).forEach((t) => {
-      const i = s[t];
-      if (!(i == null || i === "" || i === !1)) {
-        if (i === "-" || i === !0)
+    }) : typeof i == "object" && Object.keys(i).forEach((t) => {
+      const s = i[t];
+      if (!(s == null || s === "" || s === !1)) {
+        if (s === "-" || s === !0)
           this.addUtil(`-hov:${t}`);
         else if (t === "class")
-          j(i).forEach((e) => {
+          j(s).forEach((e) => {
             this.addUtil(`-hov:${e}`);
           });
-        else if (typeof i == "string" || typeof i == "number") {
-          const e = S(i, z(t));
+        else if (typeof s == "string" || typeof s == "number") {
+          const e = c(s, _(t));
           this.addUtil(`-hov:${t}`), this.addStyle(`--hov-${t}`, e);
         }
       }
     }));
   }
 }
-function G(a) {
-  if (Object.keys(a).length === 0)
+function X(n) {
+  if (Object.keys(n).length === 0)
     return {};
-  const { layout: s, ...t } = a, i = new w(E(s, t));
+  const { layout: i, ...t } = n, s = new L(p(i, t));
   return {
-    ...O({
-      className: i.className,
-      style: O(i.styles)
+    ...U({
+      className: s.className,
+      style: U(s.styles)
     }),
-    ...i.attrs
+    ...s.attrs
     // data-* などHTMLの標準属性はそのまま渡す
   };
 }
 export {
-  w as LismPropsData,
-  G as default
+  L as LismPropsData,
+  X as default
 };

package/dist/lib/helper/mergeSet.d.ts

@@ -0,0 +1,10 @@
+/**
+ * base / value を合成し、最終的なクラス識別子の配列を返す。
+ * 値内の `-` prefix は除外マーカーとして扱われ、その識別子は base + value から除外される。
+ *
+ * `set` / `util` のいずれの prop でも共用できる汎用処理。
+ *
+ * 入力は空白区切りを基本とし、カンマ区切りも互換のため受け付ける。
+ * 内部 API 用途として文字列配列も受け付けるが、配列形式はユーザー向けドキュメントでは紹介していない。
+ */
+export default function mergeSet(base: unknown, value: unknown): string[];

package/dist/lib/helper/mergeSet.js

@@ -0,0 +1,14 @@
+function i(t) {
+  return t ? Array.isArray(t) ? t.flatMap((e) => i(e)) : typeof t != "string" ? [] : t.split(/[,\s]+/).map((e) => e.trim()).filter(Boolean) : [];
+}
+function o(t, e) {
+  const s = [...i(t), ...i(e)];
+  if (s.length === 0) return [];
+  const n = [], f = /* @__PURE__ */ new Set();
+  for (const r of s)
+    r.startsWith("-") ? f.add(r.slice(1)) : n.includes(r) || n.push(r);
+  return n.filter((r) => !f.has(r));
+}
+export {
+  o as default
+};

package/dist/lib/types/LayoutProps.d.ts

@@ -26,6 +26,9 @@ export interface StackProps {
 export interface ColumnsProps {
     layout: 'columns';
 }
+export interface TileGridProps {
+    layout: 'tileGrid';
+}
 export interface FlowLayoutProps {
     layout: 'flow';
     flow?: CssValue;
@@ -43,7 +46,7 @@ export interface SwitchColsProps {
     layout: 'switchCols';
     breakSize?: CssValue;
 }
-export type LayoutSpecificProps = NoLayoutProps | BoxProps | CenterProps | ClusterProps | ColumnsProps | FlexProps | FlowLayoutProps | FluidColsProps | FrameProps | GridLayoutProps | StackProps | SideMainProps | SwitchColsProps;
+export type LayoutSpecificProps = NoLayoutProps | BoxProps | CenterProps | ClusterProps | ColumnsProps | FlexProps | FlowLayoutProps | FluidColsProps | FrameProps | GridLayoutProps | StackProps | SideMainProps | SwitchColsProps | TileGridProps;
 export type LayoutType = Exclude<LayoutSpecificProps, NoLayoutProps>['layout'];
 export interface LayoutProps {
     layout?: LayoutType;

package/dist/lib/types/TraitProps.d.ts

@@ -0,0 +1,47 @@
+import { TRAITS } from '../../../config/index';
+import { WithArbitraryString, ArrayElement } from './utils';
+/**
+ * config/index.ts から TRAITS の型を取得
+ * objDeepMerge の DeepMergeResult 型により literal types が保持される
+ */
+type TraitsConfig = typeof TRAITS;
+/** preset を持つ Trait の値の型を抽出 */
+type PresetElement<T> = T extends {
+    preset: readonly unknown[];
+} ? ArrayElement<T['preset']> : never;
+/**
+ * Trait 設定から Props の値の型を抽出するユーティリティ型
+ */
+type ExtractTraitValue<T> = T extends string ? boolean : T extends {
+    preset: readonly unknown[];
+} ? WithArbitraryString<PresetElement<T>> | boolean : never;
+/**
+ * config/index.ts の TRAITS から自動生成される Trait Props の型
+ * config/index.ts の TRAITS に新しいトレイトを追加すると自動的に反映される
+ */
+export type TraitProps = {
+    [K in keyof TraitsConfig]?: ExtractTraitValue<TraitsConfig[K]>;
+};
+/** set prop で使われるプリセット値（エディタ補完用） */
+type SetPreset = 'gutter' | 'shadow' | 'hov' | 'transition' | 'mask' | 'plain' | 'innerRs' | 'bp';
+/**
+ * set prop の値の型。プリセット値がサジェストされつつ、任意の文字列も受け付ける。
+ *
+ * - 値はスペース区切りで複数指定可能
+ * - 先頭に `-` を付けると、その識別子を除外する（例: `set="card -bd"`）
+ * - 文字列配列も受け付けるが、これは内部 API 用途（lism-ui など）であり、
+ *   ユーザー向けドキュメントでは紹介していない
+ */
+export type SetPropValue = WithArbitraryString<SetPreset> | WithArbitraryString<SetPreset>[];
+/** util prop で使われるプリセット値（既知の `u--` クラス名・エディタ補完用） */
+type UtilPreset = 'cbox' | 'trim' | 'trimChildren' | 'srOnly' | 'clipText' | 'collapseGrid' | 'snap';
+/**
+ * util prop の値の型。既知の `u--` クラス名がサジェストされつつ、任意の文字列も受け付ける。
+ *
+ * - 値はスペース区切りで複数指定可能
+ * - 先頭に `-` を付けると、その識別子を除外する（例: `util="cbox -trim"`）
+ * - 文字列配列も受け付けるが、これは内部 API 用途であり、
+ *   ユーザー向けドキュメントでは紹介していない
+ */
+export type UtilPropValue = WithArbitraryString<UtilPreset> | WithArbitraryString<UtilPreset>[];
+export {};

package/dist/lib/types/TraitProps.spec-d.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lism-css",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "description": "Lism CSS is a layout-first CSS framework for websites.",
   "author": {
     "name": "ddryo",

package/packages/astro/{Decorator → atomic/Decorator}/Decorator.astro

@@ -1,7 +1,7 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
 import type { DecoratorProps } from 'lism-css/react/atomic/Decorator/getProps';
-import { Lism } from '../Lism';
+import { Lism } from '../../Lism';
 import getProps from 'lism-css/react/atomic/Decorator/getProps';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> &

package/packages/astro/{Divider → atomic/Divider}/Divider.astro

@@ -1,7 +1,7 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismBaseProps } from '../types';
-import { Lism } from '../Lism';
+import type { AstroLismBaseProps } from '../../types';
+import { Lism } from '../../Lism';
 import { getDividerProps } from 'lism-css/react/atomic/Divider/getProps';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismBaseProps;

package/packages/astro/{Icon → atomic/Icon}/Icon.astro

@@ -2,7 +2,7 @@
 import type { HTMLTag, Polymorphic } from 'astro/types';
 import type { ElementType } from 'react';
 import type { IconProps, IconOwnProps } from 'lism-css/react/atomic/Icon/getProps';
-import type { AstroLismBaseProps } from '../types';
+import type { AstroLismBaseProps } from '../../types';
 import getLismProps from 'lism-css/lib/getLismProps';
 import getProps from 'lism-css/react/atomic/Icon/getProps';
 import SVG from './SVG.astro';

package/packages/astro/{Spacer → atomic/Spacer}/Spacer.astro

@@ -1,7 +1,7 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismBaseProps } from '../types';
-import { Lism } from '../Lism';
+import type { AstroLismBaseProps } from '../../types';
+import { Lism } from '../../Lism';
 import getProps from 'lism-css/react/atomic/Spacer/getProps';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismBaseProps;

package/packages/astro/index.ts

@@ -3,7 +3,6 @@
  */
 
 export * from './Lism';
-export { default as HTML } from './HTML';
 /** @deprecated DummyText / DummyImage (@lism-css/ui) を使用してください */
 export * from './Dummy';
 
@@ -14,26 +13,31 @@ export * from './Group';
 export * from './Heading';
 export * from './Link';
 export * from './List';
-export * from './Box';
-export * from './Flow';
-export * from './Flex';
-export * from './Cluster';
-export * from './Stack';
-export * from './Grid';
-export * from './FluidCols';
-export * from './SwitchCols';
-export * from './Columns';
-export * from './Center';
-export * from './SideMain';
-export * from './Frame';
+export * from './Media';
 
-export * from './Container';
-export * from './Wrapper';
-export * from './Layer';
-export * from './LinkBox';
+// layout (l--)
+export * from './layout/Box';
+export * from './layout/Center';
+export * from './layout/Cluster';
+export * from './layout/Columns';
+export * from './layout/Flex';
+export * from './layout/Flow';
+export * from './layout/FluidCols';
+export * from './layout/Frame';
+export * from './layout/Grid';
+export * from './layout/SideMain';
+export * from './layout/Stack';
+export * from './layout/SwitchCols';
+export * from './layout/TileGrid';
 
-export * from './Decorator';
-export * from './Divider';
-export * from './Icon';
-export * from './Media';
-export * from './Spacer';
+// state (is--)
+export * from './state/Container';
+export * from './state/Layer';
+export * from './state/BoxLink';
+export * from './state/Wrapper';
+
+// atomic (a--)
+export * from './atomic/Decorator';
+export * from './atomic/Divider';
+export * from './atomic/Icon';
+export * from './atomic/Spacer';

package/packages/astro/{Box → layout/Box}/Box.astro

@@ -1,7 +1,7 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismFixedLayoutProps } from '../types';
-import { Lism } from '../Lism';
+import type { AstroLismFixedLayoutProps } from '../../types';
+import { Lism } from '../../Lism';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismFixedLayoutProps;
 

package/packages/astro/{Center → layout/Center}/Center.astro

@@ -1,7 +1,7 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismFixedLayoutProps } from '../types';
-import { Lism } from '../Lism';
+import type { AstroLismFixedLayoutProps } from '../../types';
+import { Lism } from '../../Lism';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismFixedLayoutProps;
 

package/packages/astro/{Cluster → layout/Cluster}/Cluster.astro

@@ -1,7 +1,7 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismFixedLayoutProps } from '../types';
-import { Lism } from '../Lism';
+import type { AstroLismFixedLayoutProps } from '../../types';
+import { Lism } from '../../Lism';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismFixedLayoutProps;
 

package/packages/astro/{Columns → layout/Columns}/Columns.astro

@@ -1,7 +1,7 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismFixedLayoutProps } from '../types';
-import { Lism } from '../Lism';
+import type { AstroLismFixedLayoutProps } from '../../types';
+import { Lism } from '../../Lism';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismFixedLayoutProps;
 

package/packages/astro/{Flex → layout/Flex}/Flex.astro

@@ -1,7 +1,7 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismFixedLayoutProps } from '../types';
-import { Lism } from '../Lism';
+import type { AstroLismFixedLayoutProps } from '../../types';
+import { Lism } from '../../Lism';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismFixedLayoutProps;
 

package/packages/astro/{Flow → layout/Flow}/Flow.astro

@@ -1,8 +1,8 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismFixedLayoutProps } from '../types';
+import type { AstroLismFixedLayoutProps } from '../../types';
 import type { FlowLayoutProps } from 'lism-css/lib/types/LayoutProps';
-import { Lism } from '../Lism';
+import { Lism } from '../../Lism';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismFixedLayoutProps & Omit<FlowLayoutProps, 'layout'>;
 

package/packages/astro/{FluidCols → layout/FluidCols}/FluidCols.astro

@@ -1,8 +1,8 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismFixedLayoutProps } from '../types';
+import type { AstroLismFixedLayoutProps } from '../../types';
 import type { FluidColsProps } from 'lism-css/lib/types/LayoutProps';
-import { Lism } from '../Lism';
+import { Lism } from '../../Lism';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismFixedLayoutProps & Omit<FluidColsProps, 'layout'>;
 

package/packages/astro/{Frame → layout/Frame}/Frame.astro

@@ -1,7 +1,7 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismFixedLayoutProps } from '../types';
-import { Lism } from '../Lism';
+import type { AstroLismFixedLayoutProps } from '../../types';
+import { Lism } from '../../Lism';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismFixedLayoutProps;
 

package/packages/astro/{Grid → layout/Grid}/Grid.astro

@@ -1,7 +1,7 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismFixedLayoutProps } from '../types';
-import { Lism } from '../Lism';
+import type { AstroLismFixedLayoutProps } from '../../types';
+import { Lism } from '../../Lism';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismFixedLayoutProps;
 

package/packages/astro/{SideMain → layout/SideMain}/SideMain.astro

@@ -1,8 +1,8 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismFixedLayoutProps } from '../types';
+import type { AstroLismFixedLayoutProps } from '../../types';
 import type { SideMainProps } from 'lism-css/lib/types/LayoutProps';
-import { Lism } from '../Lism';
+import { Lism } from '../../Lism';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismFixedLayoutProps & Omit<SideMainProps, 'layout'>;
 

package/packages/astro/{Stack → layout/Stack}/Stack.astro

@@ -1,7 +1,7 @@
 ---
 import type { HTMLTag, Polymorphic } from 'astro/types';
-import type { AstroLismFixedLayoutProps } from '../types';
-import { Lism } from '../Lism';
+import type { AstroLismFixedLayoutProps } from '../../types';
+import { Lism } from '../../Lism';
 
 type Props<Tag extends HTMLTag = 'div'> = Polymorphic<{ as: Tag }> & AstroLismFixedLayoutProps;