@digdir/designsystemet 1.0.0-next.37 → 1.0.0-next.39

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -76,7 +76,7 @@ const colorSchemeVariables = ({ "color-scheme": colorScheme = "light", theme },
76
76
  const colorCategoryVariables = (category) => ({ "color-scheme": colorScheme, theme, [`${category}-color`]: color }, { outPath }) => {
77
77
  const layer = `ds.theme.color`;
78
78
  const isDefault = color === buildOptions?.accentColor;
79
- const selector = `${isDefault ? ":root, " : ""}[data-color="${color}"]`;
79
+ const selector = `${isDefault ? ":root, [data-color-scheme], " : ""}[data-color="${color}"]`;
80
80
  const config = {
81
81
  usesDtcg,
82
82
  preprocessors: ["tokens-studio"],
@@ -85,11 +85,11 @@ const createTokens = (opts) => {
85
85
  [name]: generateThemeTokens(name, "light", colors),
86
86
  global: generateGlobalTokens("light")
87
87
  },
88
- dark: { [name]: generateThemeTokens(name, "dark", colors), global: generateGlobalTokens("dark") },
89
- contrast: {
90
- [name]: generateThemeTokens(name, "contrast", colors),
91
- global: generateGlobalTokens("contrast")
92
- }
88
+ dark: { [name]: generateThemeTokens(name, "dark", colors), global: generateGlobalTokens("dark") }
89
+ // contrast: {
90
+ // [name]: generateThemeTokens(name, 'contrast', colors),
91
+ // global: generateGlobalTokens('contrast'),
92
+ // },
93
93
  },
94
94
  typography: {
95
95
  primary: generateTypographyTokens(name, typography)
@@ -16,7 +16,7 @@ export type Tokens = {
16
16
  colors: {
17
17
  light: ColorModeTokens;
18
18
  dark: ColorModeTokens;
19
- contrast: ColorModeTokens;
19
+ contrast?: ColorModeTokens;
20
20
  };
21
21
  typography: {
22
22
  primary: TokensSet;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/tokens/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAEhE,MAAM,MAAM,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AACtD,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAC/C,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AACpD,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;AACpE,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,CAAC;AAE7D,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B,CAAC;AAGF,MAAM,MAAM,gBAAgB,GAAG,SAAS,CAAC;AAGzC,MAAM,MAAM,MAAM,GAAG;IACnB,MAAM,EAAE;QACN,KAAK,EAAE,eAAe,CAAC;QACvB,IAAI,EAAE,eAAe,CAAC;QACtB,QAAQ,EAAE,eAAe,CAAC;KAC3B,CAAC;IACF,UAAU,EAAE;QACV,OAAO,EAAE,SAAS,CAAC;KACpB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAClC,OAAO,EAAE,QAAQ,CAAC;CACnB,CAAC;AACF,MAAM,MAAM,UAAU,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACjD,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,WAAW,CAAC;AAEtD,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/tokens/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAEhE,MAAM,MAAM,KAAK,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AACtD,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AAC/C,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AACpD,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;AACpE,MAAM,MAAM,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,CAAC;AAE7D,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B,CAAC;AAGF,MAAM,MAAM,gBAAgB,GAAG,SAAS,CAAC;AAGzC,MAAM,MAAM,MAAM,GAAG;IACnB,MAAM,EAAE;QACN,KAAK,EAAE,eAAe,CAAC;QACvB,IAAI,EAAE,eAAe,CAAC;QACtB,QAAQ,CAAC,EAAE,eAAe,CAAC;KAC5B,CAAC;IACF,UAAU,EAAE;QACV,OAAO,EAAE,SAAS,CAAC;KACpB,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAClC,OAAO,EAAE,QAAQ,CAAC;CACnB,CAAC;AACF,MAAM,MAAM,UAAU,GAAG;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AACjD,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,WAAW,CAAC;AAEtD,MAAM,MAAM,IAAI,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,QAAQ,CAAC"}
@@ -1,11 +1,11 @@
1
1
  import { type ThemeObject } from '@tokens-studio/types';
2
2
  import type { ColorMode } from '../../colors/types.js';
3
3
  import type { Colors } from '../types.js';
4
- type ColorModes = Array<ColorMode>;
4
+ type ColorSchemes = Array<ColorMode>;
5
5
  type ThemeObject_ = ThemeObject & {
6
6
  $figmaCollectionId?: string;
7
7
  $figmaModeId?: string;
8
8
  };
9
- export declare function generateThemesJson(modes: ColorModes, themes: string[], colors: Colors): ThemeObject_[];
9
+ export declare function generateThemesJson(colorSchemes: ColorSchemes, themes: string[], colors: Colors): ThemeObject_[];
10
10
  export {};
11
11
  //# sourceMappingURL=generate$themes.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"generate$themes.d.ts","sourceRoot":"","sources":["../../../../src/tokens/write/generate$themes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAkB,MAAM,sBAAsB,CAAC;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAM1C,KAAK,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAEnC,KAAK,YAAY,GAAG,WAAW,GAAG;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,CAUtG"}
1
+ {"version":3,"file":"generate$themes.d.ts","sourceRoot":"","sources":["../../../../src/tokens/write/generate$themes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAkB,MAAM,sBAAsB,CAAC;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAM1C,KAAK,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;AAErC,KAAK,YAAY,GAAG,WAAW,GAAG;IAChC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,CAU/G"}
@@ -2,12 +2,12 @@ import crypto from "node:crypto";
2
2
  import { TokenSetStatus } from "@tokens-studio/types";
3
3
  const capitalize = (word) => word.charAt(0).toUpperCase() + word.slice(1);
4
4
  const createHash = (text) => crypto.hash("sha1", text);
5
- function generateThemesJson(modes, themes, colors) {
5
+ function generateThemesJson(colorSchemes, themes, colors) {
6
6
  return [
7
7
  ...generateSizeGroup(),
8
8
  ...generateThemesGroup(themes),
9
9
  ...generateTypographyGroup(themes),
10
- ...generateModesGroup(modes, themes),
10
+ ...generateColorSchemesGroup(colorSchemes, themes),
11
11
  generateSemanticGroup(),
12
12
  ...generateColorGroup("main", colors),
13
13
  ...generateColorGroup("support", colors)
@@ -49,15 +49,15 @@ const colorSchemeDefaults = {
49
49
  $figmaModeId: "34811:2"
50
50
  }
51
51
  };
52
- function generateModesGroup(modes, themes) {
53
- return modes.map(
54
- (mode) => ({
55
- ...colorSchemeDefaults[mode],
52
+ function generateColorSchemesGroup(colorSchemes, themes) {
53
+ return colorSchemes.map(
54
+ (scheme) => ({
55
+ ...colorSchemeDefaults[scheme],
56
56
  selectedTokenSets: Object.fromEntries([
57
- [`primitives/modes/color-scheme/${mode}/global`, TokenSetStatus.ENABLED],
58
- ...themes.map((theme) => [`primitives/modes/color-scheme/${mode}/${theme}`, TokenSetStatus.ENABLED])
57
+ [`primitives/modes/color-scheme/${scheme}/global`, TokenSetStatus.ENABLED],
58
+ ...themes.map((theme) => [`primitives/modes/color-scheme/${scheme}/${theme}`, TokenSetStatus.ENABLED])
59
59
  ]),
60
- group: "Mode"
60
+ group: "Color scheme"
61
61
  })
62
62
  );
63
63
  }
@@ -48,8 +48,8 @@ const writeTokens = async (options) => {
48
48
  } catch (error) {
49
49
  }
50
50
  console.log(`Themes: ${chalk.blue(themes.join(", "))}`);
51
- const $theme = generateThemesJson(["light", "dark", "contrast"], themes, colors);
52
- const $metadata = generateMetadataJson(["light", "dark", "contrast"], themes, colors);
51
+ const $theme = generateThemesJson(["light", "dark"], themes, colors);
52
+ const $metadata = generateMetadataJson(["light", "dark"], themes, colors);
53
53
  await fs.writeFile($themesPath, stringify($theme));
54
54
  await fs.writeFile($metadataPath, stringify($metadata));
55
55
  await fs.cp(DEFAULT_FILES_PATH, targetDir, {
@@ -146,8 +146,8 @@ const writeTokens = async (options) => {
146
146
  generateColorSchemeFile("light", "global", tokens.colors.light.global, targetDir),
147
147
  generateColorSchemeFile("dark", themeName, tokens.colors.dark[themeName], targetDir),
148
148
  generateColorSchemeFile("dark", "global", tokens.colors.dark.global, targetDir),
149
- generateColorSchemeFile("contrast", themeName, tokens.colors.contrast[themeName], targetDir),
150
- generateColorSchemeFile("contrast", "global", tokens.colors.contrast.global, targetDir),
149
+ // generateColorSchemeFile('contrast', themeName, tokens.colors.contrast[themeName], targetDir),
150
+ // generateColorSchemeFile('contrast', 'global', tokens.colors.contrast.global, targetDir),
151
151
  generateTypographyFile("primary", themeName, tokens.typography.primary, targetDir),
152
152
  generateTypographyFile("secondary", themeName, tokens.typography.primary, targetDir)
153
153
  ];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@digdir/designsystemet",
3
- "version": "1.0.0-next.37",
3
+ "version": "1.0.0-next.39",
4
4
  "description": "CLI for Designsystemet",
5
5
  "author": "Designsystemet team",
6
6
  "repository": {