@digdir/designsystemet 1.4.0 → 1.5.1

package/dist/src/tokens/process/output/theme.js

@@ -1,11 +1,11 @@
 // src/tokens/process/output/theme.ts
 import pc from "picocolors";
-import * as R from "ramda";
+import * as R2 from "ramda";
 
 // package.json
 var package_default = {
   name: "@digdir/designsystemet",
-  version: "1.4.0",
+  version: "1.5.1",
   description: "CLI for Designsystemet",
   author: "Designsystemet team",
   engines: {
@@ -88,9 +88,9 @@ var package_default = {
     "@types/apca-w3": "^0.1.3",
     "@types/chroma-js": "^3.1.1",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.18.0",
+    "@types/node": "^22.18.1",
     "@types/object-hash": "^3.0.6",
-    "@types/ramda": "^0.31.0",
+    "@types/ramda": "^0.31.1",
     "fs-extra": "^11.3.1",
     tslib: "^2.8.1",
     tsup: "^8.5.0",
@@ -99,8 +99,50 @@ var package_default = {
   }
 };
 
+// src/tokens/utils.ts
+import * as R from "ramda";
+var mapToLowerCase = R.map(R.toLower);
+var hasAnyTruth = R.any(R.equals(true));
+var getType = (token) => (token.$type ?? token.type) || "";
+var typeEquals = R.curry(
+  (types, token) => {
+    if (R.isNil(token)) {
+      return false;
+    }
+    return R.includes(R.toLower(getType(token)), R.map(R.toLower, Array.isArray(types) ? types : [types]));
+  }
+);
+var pathStartsWithOneOf = R.curry(
+  (paths, token) => {
+    if (R.isNil(token)) {
+      return false;
+    }
+    const tokenPath = mapToLowerCase(token.path);
+    const matchPathsStartingWith = R.map((pathOrString) => {
+      const path = typeof pathOrString === "string" ? [pathOrString] : pathOrString;
+      return R.startsWith(mapToLowerCase(path), tokenPath);
+    }, paths);
+    return hasAnyTruth(matchPathsStartingWith);
+  }
+);
+var sizeMap = {
+  xsmall: "xs",
+  small: "sm",
+  medium: "md",
+  large: "lg",
+  xlarge: "xl"
+};
+var sizeComparator = (size) => {
+  const sortIndex = Object.entries(sizeMap).findIndex(([key, val]) => key === size || val === size);
+  return sortIndex ?? 0;
+};
+
 // src/tokens/process/output/theme.ts
 var defaultFileHeader = `build: v${package_default.version}`;
+var getFileNameWithoutExtension = (path) => {
+  const pathSegments = path.split("/");
+  return pathSegments[pathSegments.length - 1].split(".").slice(0, -1).join(".");
+};
 var createThemeCSSFiles = ({
   processedBuilds,
   fileHeader = defaultFileHeader
@@ -110,22 +152,25 @@ var createThemeCSSFiles = ({
     for (const buildResult of buildResults) {
       const themeName = buildResult.permutation.theme;
       const newOutputs = buildResult.formatted;
-      if (R.isNotEmpty(newOutputs)) {
+      if (R2.isNotEmpty(newOutputs)) {
         const currentOutputs = groupedByTheme[themeName] ?? [];
-        groupedByTheme[themeName] = R.concat(currentOutputs, newOutputs);
+        groupedByTheme[themeName] = R2.concat(currentOutputs, newOutputs);
       }
     }
   }
   const sortOrder = [
+    "size-mode/",
+    "type-scale",
     "color-scheme/light",
     "typography/secondary",
+    "size",
     "semantic",
     "color-scheme/dark",
     "color-scheme/contrast",
     "typography/primary",
     "color/"
   ];
-  const sortByDefinedOrder = R.sortBy((file) => {
+  const sortByDefinedOrder = R2.sortBy((file) => {
     const filePath = file.destination || "";
     const sortIndex = sortOrder.findIndex((sortElement) => {
       if (sortElement.endsWith("/")) {
@@ -154,13 +199,17 @@ ${fileHeader}
 */
 
 `;
-  const sortAlphabetically = R.sort(R.ascend((x) => x.destination || ""));
-  const pickOutputs = R.map(R.view(R.lensProp("output")));
-  const themeCSSFile = R.pipe(
+  const sortAlphabetically = R2.sort(R2.ascend((x) => x.destination || ""));
+  const sortBySize = R2.sortBy(
+    R2.pipe((s) => getFileNameWithoutExtension(s.destination ?? ""), sizeComparator)
+  );
+  const pickOutputs = R2.map(R2.view(R2.lensProp("output")));
+  const themeCSSFile = R2.pipe(
     sortAlphabetically,
+    sortBySize,
     sortByDefinedOrder,
     pickOutputs,
-    R.join("\n"),
+    R2.join("\n"),
     (content) => header + content
   );
   const themeCSSFiles = Object.entries(groupedByTheme).map(([theme, files]) => ({

package/dist/src/tokens/process/platform.d.ts

@@ -7,6 +7,10 @@ type SharedOptions = {
     verbose: boolean;
     /** Set the default color for ":root" */
     defaultColor?: string;
+    /** Set the default size mode */
+    defaultSize?: string;
+    /** Set the available size modes */
+    sizeModes?: string[];
     /** Dry run, no files will be written */
     dry?: boolean;
     /** Token Studio `$themes.json` content */
@@ -47,6 +51,18 @@ declare const buildConfigs: {
         getConfig: import("./configs/shared.js").GetStyleDictionaryConfig;
         dimensions: "typography"[];
     };
+    sizeMode: {
+        getConfig: import("./configs/shared.js").GetStyleDictionaryConfig;
+        dimensions: "size"[];
+    };
+    size: {
+        getConfig: import("./configs/shared.js").GetStyleDictionaryConfig;
+        dimensions: "semantic"[];
+    };
+    typeScale: {
+        getConfig: import("./configs/shared.js").GetStyleDictionaryConfig;
+        dimensions: "semantic"[];
+    };
     'color-scheme': {
         getConfig: import("./configs/shared.js").GetStyleDictionaryConfig;
         dimensions: "color-scheme"[];

package/dist/src/tokens/process/platform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../../../../src/tokens/process/platform.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAqC,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEvF,OAAO,EAAmB,KAAK,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAElG,KAAK,aAAa,GAAG;IACnB,4BAA4B;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,wCAAwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,wCAAwC;IACxC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,0CAA0C;IAC1C,gBAAgB,EAAE,oBAAoB,EAAE,CAAC;IACzC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,6BAA6B;IAC7B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,gBAAgB,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC;CACrF,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,yBAAyB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,iCAAiC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG,aAAa,CAAC;AAElB,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,gBAAgB;IAChB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CAClC,GAAG,aAAa,CAAC;AAElB,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,aAAa,CAAC;AAE1D,KAAK,qBAAqB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,OAAO,YAAY,EAAE,CAAC,CAAC,CAAC;AAErE,MAAM,MAAM,aAAa,GAAG,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC;AAEjE,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,gBAAgB,CAAC;IAC9B,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B,CAAC;AAgBF,eAAO,IAAI,YAAY,EAAE,aAIxB,CAAC;AAOF,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BqB,CAAC;AAExC,wBAAsB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAuIrF"}
+{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../../../../src/tokens/process/platform.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAqC,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEvF,OAAO,EAAmB,KAAK,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAElG,KAAK,aAAa,GAAG;IACnB,4BAA4B;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,wCAAwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gCAAgC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mCAAmC;IACnC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,wCAAwC;IACxC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,0CAA0C;IAC1C,gBAAgB,EAAE,oBAAoB,EAAE,CAAC;IACzC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,6BAA6B;IAC7B,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,gBAAgB,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC;CACrF,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,yBAAyB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,iCAAiC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG,aAAa,CAAC;AAElB,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,gBAAgB;IAChB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CAClC,GAAG,aAAa,CAAC;AAElB,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,aAAa,CAAC;AAE1D,KAAK,qBAAqB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,OAAO,YAAY,EAAE,CAAC,CAAC,CAAC;AAErE,MAAM,MAAM,aAAa,GAAG,qBAAqB,CAAC,WAAW,EAAE,CAAC,CAAC;AAEjE,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,gBAAgB,CAAC;IAC9B,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,MAAM,EAAE,gBAAgB,EAAE,CAAC;CAC5B,CAAC;AAgBF,eAAO,IAAI,YAAY,EAAE,aAIxB,CAAC;AAOF,QAAA,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkCqB,CAAC;AAExC,wBAAsB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CA2IrF"}