Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "minor",
"comment": "AUI: Add import capability to component anatomy definitions",
"packageName": "@adaptive-web/adaptive-ui",
"email": "[email protected]",
"dependentChangeType": "patch"
}
15 changes: 15 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions packages/adaptive-ui/docs/api-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,12 @@ export interface SerializableAnatomy {
styleRules: SerializableStyleRule[];
}

// @beta (undocumented)
export interface SerializableAnatomyWithImports extends SerializableAnatomy {
// (undocumented)
imports?: string[];
}

// @beta (undocumented)
export type SerializableBooleanCondition = string;

Expand Down
1 change: 1 addition & 0 deletions packages/adaptive-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"@microsoft/fast-foundation": "3.0.0-alpha.31",
"commander": "^12.0.0",
"culori": "^3.2.0",
"deepmerge-ts": "^7.1.3",
"glob": "^10.3.10",
"matcher": "^5.0.0",
"postcss": "^8.4.39",
Expand Down
24 changes: 21 additions & 3 deletions packages/adaptive-ui/src/bin/aui.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import * as prettier from "prettier";
import { ComposableStyles, ElementStyles } from '@microsoft/fast-element';
import { CSSDesignToken } from "@microsoft/fast-foundation";
import { Command } from 'commander';
import { deepmerge } from "deepmerge-ts";
import { glob } from "glob";
import postcss, { type Processor} from "postcss";
import postcssMergeLonghand from "postcss-merge-longhand";
Expand All @@ -19,6 +20,7 @@ import {
ComponentConditions,
ComponentParts,
SerializableAnatomy,
SerializableAnatomyWithImports,
SerializableBooleanCondition,
SerializableStringCondition,
SerializableStyleRule,
Expand Down Expand Up @@ -84,11 +86,27 @@ program.command("compile-styles <glob>")

program.command("compile-json-anatomy <anatomyPath>")
.description("Compile a stylesheet from a JSON anatomy")
.action(async (path: string) => {
const data = (await fsp.readFile(path)).toString();
.action(async (jsonPath: string) => {
const data = (await fsp.readFile(jsonPath)).toString();
await import("../reference/index.js");

const jsonData = JSON.parse(data);
let jsonData = JSON.parse(data) as SerializableAnatomyWithImports;

if (jsonData.imports) {
for (const imp of jsonData.imports) {
const impWithExt = imp.toLowerCase().endsWith(".json") ? imp : `${imp}.json`;
const impFilePath = path.format({ ...path.parse(path.join(path.parse(jsonPath).dir, impWithExt)) });
const impData = (await fsp.readFile(impFilePath)).toString();
const impJsonData = JSON.parse(impData);
// If `parts` are in the import, they are for validation/consistency of that file, but we want to use the parts
// list from the main anatomy definition.
// Consider extending this so imports can add their own known parts.
delete impJsonData.parts;

jsonData = deepmerge(jsonData, impJsonData);
}
}

const compiler = new SheetCompilerImpl();
const sheet = jsonToAUIStyleSheet(jsonData);
const compiledSheet = compiler.compile(sheet);
Expand Down
23 changes: 15 additions & 8 deletions packages/adaptive-ui/src/core/modules/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { StyleRule } from "./styles.js";
*
* @public
*/
export type BooleanCondition = string;
export type BooleanCondition = string;

/**
* The state and selector for a multiple value condition.
Expand Down Expand Up @@ -152,7 +152,7 @@ export const Interactivity = {
*
* For instance, a form control.
*/
disabledAttribute: {
disabledAttribute: {
interactive: ":not([disabled])",
disabled: "[disabled]",
} as InteractivityDefinition,
Expand All @@ -162,7 +162,7 @@ export const Interactivity = {
*
* For instance, a form control.
*/
disabledClass: {
disabledClass: {
interactive: ":not(.disabled)",
disabled: ".disabled",
} as InteractivityDefinition,
Expand All @@ -172,7 +172,7 @@ export const Interactivity = {
*
* For instance, an `<a>` should style as plain text when it doesn't have an `href` attribute.
*/
hrefAttribute: {
hrefAttribute: {
interactive: "[href]",
} as InteractivityDefinition,

Expand All @@ -181,7 +181,7 @@ export const Interactivity = {
*
* For instance, cards or list items that are not able to be disabled.
*/
always: {
always: {
interactive: "",
} as InteractivityDefinition,

Expand All @@ -193,7 +193,7 @@ export const Interactivity = {
* @remarks
* This is an explicit value representing the default case.
*/
never: {
never: {
} as InteractivityDefinition,
} as const;

Expand Down Expand Up @@ -481,7 +481,7 @@ export type StyleRules = Array<StyleRule>;
/**
* @beta
*/
export type SerializableBooleanCondition = string;
export type SerializableBooleanCondition = string;

/**
* @beta
Expand All @@ -506,7 +506,7 @@ export interface SerializableStyleRule {
/**
* @beta
*/
export interface SerializableAnatomy{
export interface SerializableAnatomy {
name: string,
context: string,
conditions: Record<string, SerializableCondition>,
Expand All @@ -515,3 +515,10 @@ export interface SerializableAnatomy{
focus?: FocusDefinition<any>,
styleRules: SerializableStyleRule[]
}

/**
* @beta
*/
export interface SerializableAnatomyWithImports extends SerializableAnatomy {
imports?: string[]
}