@penpair/marwes-ui 0.2.0 → 0.3.0

package/dist/config.js

@@ -5,55 +5,90 @@ export const defaultSnapshotPath = "design/marwes-tokens.snapshot.json";
 export class MarwesConfigError extends Error {
 }
 const relative = (value, label) => {
-    if (typeof value !== "string" || value.length === 0 || path.isAbsolute(value) || value.split(/[\\/]/).includes(".."))
+    if (typeof value !== "string" ||
+        value.length === 0 ||
+        path.isAbsolute(value) ||
+        value.split(/[\\/]/).includes("..")) {
         throw new MarwesConfigError(`penpair.config.json: marwes.${label} must be a relative path that stays inside the project`);
+    }
     return value;
 };
 function themeReference(value, label) {
-    if (value === undefined)
+    if (value === undefined) {
         return undefined;
+    }
     const v = value;
-    if (typeof value !== "object" || value === null || typeof v.export !== "string" || v.export.length === 0)
+    if (typeof value !== "object" ||
+        value === null ||
+        typeof v.export !== "string" ||
+        v.export.length === 0) {
         throw new MarwesConfigError(`penpair.config.json: marwes.themes.${label} must be {"module": "<file>", "export": "<name>"}`);
-    return { module: relative(v.module, `themes.${label}.module`), export: v.export };
+    }
+    return {
+        module: relative(v.module, `themes.${label}.module`),
+        export: v.export,
+    };
 }
 const capitalise = (text) => text.charAt(0).toUpperCase() + text.slice(1);
 export function readMarwesSettings(rawConfig, instance) {
     const block = rawConfig.marwes;
     const v = (typeof block === "object" && block !== null ? block : {});
-    if (block !== undefined && (typeof block !== "object" || block === null))
+    if (block !== undefined && (typeof block !== "object" || block === null)) {
         throw new MarwesConfigError('penpair.config.json: "marwes" must be an object');
+    }
     const themes = (typeof v.themes === "object" && v.themes !== null ? v.themes : {});
     const name = v.name === undefined ? capitalise(instance) : String(v.name);
-    if (!/^[A-Za-z][A-Za-z0-9 _-]{0,40}$/.test(name))
+    if (!/^[A-Za-z][A-Za-z0-9 _-]{0,40}$/.test(name)) {
         throw new MarwesConfigError("penpair.config.json: marwes.name must be a short name (letters, digits, spaces, hyphens)");
+    }
     return {
         name,
         extras: readExtras(v.extras),
         themeLint: readThemeLint(v.themeLint),
         project: v.project === undefined ? "." : relative(v.project, "project"),
-        themes: { light: themeReference(themes.light, "light"), dark: themeReference(themes.dark, "dark") },
+        themes: {
+            light: themeReference(themes.light, "light"),
+            dark: themeReference(themes.dark, "dark"),
+        },
         snapshot: v.snapshot === undefined ? defaultSnapshotPath : relative(v.snapshot, "snapshot"),
     };
 }
 function readExtras(value) {
-    if (value === undefined)
+    if (value === undefined) {
         return [];
-    if (!Array.isArray(value) || value.length > 50)
+    }
+    if (!Array.isArray(value) || value.length > 50) {
         throw new MarwesConfigError("marwes.extras must be an array of at most 50 sets");
+    }
     const names = new Set();
     let count = 0;
-    return value.map(raw => {
-        if (!raw || typeof raw !== "object" || Array.isArray(raw) || Object.keys(raw).some(key => !["name", "tokens"].includes(key)))
+    return value.map((raw) => {
+        if (!raw ||
+            typeof raw !== "object" ||
+            Array.isArray(raw) ||
+            Object.keys(raw).some((key) => ![
+                "name",
+                "tokens",
+            ].includes(key))) {
             throw new MarwesConfigError("Invalid project extra set");
+        }
         const set = raw;
-        if (typeof set.name !== "string" || !set.name.trim() || set.name.length > 200 || /[\x00-\x1f]/.test(set.name) || names.has(set.name) || !Array.isArray(set.tokens))
+        if (typeof set.name !== "string" ||
+            !set.name.trim() ||
+            set.name.length > 200 ||
+            /[\x00-\x1f]/.test(set.name) ||
+            names.has(set.name) ||
+            !Array.isArray(set.tokens)) {
             throw new MarwesConfigError("Invalid or duplicate project extra set");
+        }
         names.add(set.name);
         const tokens = new Set();
-        return { name: set.name, tokens: set.tokens.map(rawToken => {
-                if (++count > 10000)
+        return {
+            name: set.name,
+            tokens: set.tokens.map((rawToken) => {
+                if (++count > 10000) {
                     throw new MarwesConfigError("Project extras exceed 10000 tokens");
+                }
                 let token;
                 try {
                     token = validateEditableToken(rawToken);
@@ -61,10 +96,12 @@ function readExtras(value) {
                 catch (error) {
                     throw new MarwesConfigError("marwes.extras: " + String(error));
                 }
-                if (tokens.has(token.name))
+                if (tokens.has(token.name)) {
                     throw new MarwesConfigError("Duplicate project extra token: " + token.name);
+                }
                 tokens.add(token.name);
                 return token;
-            }) };
+            }),
+        };
     });
 }

package/dist/index.js

@@ -3,10 +3,28 @@ import { marwesKit } from "./build-kit.js";
 import { checkSnapshotFor } from "./commands.js";
 import { marwesCommand } from "./commands.js";
 /** The adapter penpair loads when `@penpair/marwes-ui` is listed under "adapters" in penpair.config.json. */
-export default defineAdapter({ name: "@penpair/marwes-ui", commands: [marwesCommand], kits: [marwesKit], async status(context) {
+export default defineAdapter({
+    name: "@penpair/marwes-ui",
+    commands: [
+        marwesCommand,
+    ],
+    kits: [
+        marwesKit,
+    ],
+    async status(context) {
         const check = await checkSnapshotFor(context.root, context.rawConfig, context.config.instance);
-        return [{ id: "library-tokens", label: "Token snapshot", state: check.current ? "ok" : "warning", detail: check.current ? "Declarations match installed library/theme; live tokens not inspected" : "Missing/stale snapshot or mixed library versions" }];
-    } });
+        return [
+            {
+                id: "library-tokens",
+                label: "Token snapshot",
+                state: check.current ? "ok" : "warning",
+                detail: check.current
+                    ? "Declarations match installed library/theme; live tokens not inspected"
+                    : "Missing/stale snapshot or mixed library versions",
+            },
+        ];
+    },
+});
 export * from "./commands.js";
 export * from "./config.js";
 export * from "./marwes.js";

package/dist/marwes.js

@@ -4,13 +4,20 @@ import path from "node:path";
 import { pathToFileURL } from "node:url";
 export class MarwesError extends Error {
 }
-const familyNames = ["react", "vue", "svelte", "core", "presets"];
+const familyNames = [
+    "react",
+    "vue",
+    "svelte",
+    "core",
+    "presets",
+];
 function packageDirectory(entry) {
     let directory = path.dirname(entry);
     while (!existsSync(path.join(directory, "package.json"))) {
         const parent = path.dirname(directory);
-        if (parent === directory)
+        if (parent === directory) {
             throw new MarwesError(`no package.json above ${entry}`);
+        }
         directory = parent;
     }
     return directory;
@@ -24,7 +31,11 @@ export async function loadInstalledMarwes(projectDirectory) {
     const fromProject = createRequire(path.join(projectDirectory, "package.json"));
     let componentEntry;
     let componentPackage = "";
-    for (const candidate of ["react", "vue", "svelte"]) {
+    for (const candidate of [
+        "react",
+        "vue",
+        "svelte",
+    ]) {
         try {
             componentEntry = fromProject.resolve(`@marwes-ui/${candidate}`);
             componentPackage = candidate;
@@ -34,8 +45,9 @@ export async function loadInstalledMarwes(projectDirectory) {
             // try the next framework
         }
     }
-    if (!componentEntry)
+    if (!componentEntry) {
         throw new MarwesError(`No @marwes-ui/react, vue or svelte is installed for ${projectDirectory}. Set "marwes.project" in penpair.config.json to the folder of the package that uses Marwes.`);
+    }
     const fromComponent = createRequire(componentEntry);
     let coreEntry;
     try {
@@ -44,11 +56,14 @@ export async function loadInstalledMarwes(projectDirectory) {
     catch {
         throw new MarwesError(`@marwes-ui/${componentPackage} is installed but its @marwes-ui/core cannot be found; reinstall the dependencies.`);
     }
-    const versions = { [componentPackage]: versionOf(packageDirectory(componentEntry)) };
+    const versions = {
+        [componentPackage]: versionOf(packageDirectory(componentEntry)),
+    };
     versions.core = versionOf(packageDirectory(coreEntry));
     for (const name of familyNames) {
-        if (versions[name])
+        if (versions[name]) {
             continue;
+        }
         try {
             versions[name] = versionOf(packageDirectory(fromComponent.resolve(`@marwes-ui/${name}`)));
         }
@@ -57,16 +72,34 @@ export async function loadInstalledMarwes(projectDirectory) {
         }
     }
     const namespace = (await import(pathToFileURL(coreEntry).href));
-    const core = typeof namespace.resolveThemeInput === "function" ? namespace : namespace.default;
-    for (const name of ["resolveThemeInput", "themeToCSSVars"])
-        if (typeof core?.[name] !== "function")
+    const core = typeof namespace.resolveThemeInput === "function"
+        ? namespace
+        : namespace.default;
+    for (const name of [
+        "resolveThemeInput",
+        "themeToCSSVars",
+    ]) {
+        if (typeof core?.[name] !== "function") {
             throw new MarwesError(`@marwes-ui/core ${versions.core} does not export ${name}; this adapter needs a Marwes that does. Update @penpair/marwes-ui or check the Marwes version.`);
-    if (!core.mwThemeVars?.spacing)
+        }
+    }
+    if (!core.mwThemeVars?.spacing) {
         throw new MarwesError(`@marwes-ui/core ${versions.core} does not export mwThemeVars.spacing; this adapter needs a Marwes that does.`);
-    return { core, version: versions.core, versions };
+    }
+    return {
+        core,
+        version: versions.core,
+        versions,
+    };
 }
 /** Marwes releases core, presets and the framework packages together; a mix means a half-finished upgrade. */
 export function familyProblems(installed) {
     const distinct = new Set(Object.values(installed.versions));
-    return distinct.size > 1 ? [`the installed Marwes packages are at different versions (${Object.entries(installed.versions).map(([name, version]) => `${name} ${version}`).join(", ")}); Marwes releases them together, so finish the upgrade`] : [];
+    return distinct.size > 1
+        ? [
+            `the installed Marwes packages are at different versions (${Object.entries(installed.versions)
+                .map(([name, version]) => `${name} ${version}`)
+                .join(", ")}); Marwes releases them together, so finish the upgrade`,
+        ]
+        : [];
 }