@arbor-css/preset 0.0.93 → 0.0.95

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.
package/dist/define.d.ts CHANGED
@@ -10,7 +10,7 @@ export type ExtendedConfigMixins<TExtends extends AnyArborPreset[]> = TExtends[n
10
10
  /**
11
11
  * Collected tokens of the entire preset.
12
12
  */
13
- export type PresetTokens<TModeSchema extends SimpleTokenSchema, TMixins extends PresetMixins, TExtends extends AnyArborPreset[] = []> = {
13
+ export type PresetTokens<TModeSchema extends SimpleTokenSchema, TMixins extends PresetMixins> = {
14
14
  mode: SimpleTokensAsTokenDefinitions<TModeSchema>;
15
15
  system: SystemTokens;
16
16
  mixins: MixinTokens<TMixins>;
@@ -36,7 +36,9 @@ export interface ArborPreset<TModeSchema extends SimpleTokenSchema = SimpleToken
36
36
  * Add a 'bundled' mode to this preset. Bundled modes are included in the
37
37
  * generated CSS stylesheet when this preset is passed to generateStylesheet.
38
38
  */
39
- bundleMode<TMode extends ModeInstance<TModeSchema>>(name: string, mode: DeepPartial<ModeValues<TModeSchema>>, options?: ModeInstanceOptions): TMode;
39
+ bundleMode<TMode extends ModeInstance<TModeSchema>>(name: string, mode: DeepPartial<ModeValues<TModeSchema>>, options?: ModeInstanceOptions & {
40
+ overwrite?: boolean;
41
+ }): TMode;
40
42
  /**
41
43
  * Create a free-standing mode from your mode schema with full typing
42
44
  * support. A mode created with this method isn't bundled into the
@@ -69,7 +71,7 @@ export declare function definePreset<TModeSchema extends SimpleTokenSchema, TFun
69
71
  mixins?: undefined;
70
72
  }): ArborPreset<ExtendedConfigModeSchema<TExtends> & TModeSchema, ExtendedConfigFunctions<TExtends> & TFunctions, ExtendedConfigMixins<TExtends>>;
71
73
  export interface PresetInternals {
72
- modes: ModeInstance<any>[];
74
+ modes: Record<string, ModeInstance<any>>;
73
75
  defaultScheme: string;
74
76
  }
75
77
  export declare function getInternals(preset: AnyArborPreset): PresetInternals;
@@ -1 +1 @@
1
- {"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../src/define.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../src/define.ts"],"names":[],"mappings":"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"}
package/dist/define.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { extractMixinTokens, } from '@arbor-css/functions';
2
2
  import { createGlobalContext, } from '@arbor-css/globals';
3
- import { createModeInstance, } from '@arbor-css/modes';
3
+ import { createModeInstance, mergeModes, } from '@arbor-css/modes';
4
4
  import { convertSimpleTokenSchema, } from '@arbor-css/tokens';
5
5
  import { deepMerge } from '@arbor-css/util';
6
6
  export const INTERNALS = Symbol('ARBOR_INTERNALS');
@@ -82,7 +82,7 @@ export function definePreset({ functions: createFunctions, mixins: createMixins,
82
82
  createFunctions(context.createFunction, $tokens)
83
83
  : {};
84
84
  const internals = {
85
- modes: [],
85
+ modes: {},
86
86
  defaultScheme: presetOptions.defaultScheme ?? 'light',
87
87
  };
88
88
  const modeSchema = deepMerge({}, composedPresets.modeSchema, presetOptions.modeSchema);
@@ -114,8 +114,18 @@ export function definePreset({ functions: createFunctions, mixins: createMixins,
114
114
  baseMode,
115
115
  bundleMode(name, mode, options) {
116
116
  const instance = createModeInstance(name, mode, options);
117
- internals.modes.push(instance);
118
- return instance;
117
+ if (options?.overwrite) {
118
+ internals.modes[name] = instance;
119
+ return instance;
120
+ }
121
+ const existing = internals.modes[name];
122
+ if (existing) {
123
+ internals.modes[name] = mergeModes(existing || {}, instance);
124
+ }
125
+ else {
126
+ internals.modes[name] = instance;
127
+ }
128
+ return internals.modes[name];
119
129
  },
120
130
  createMode(name, mode, options) {
121
131
  return createModeInstance(name, mode, options);
@@ -1 +1 @@
1
- {"version":3,"file":"define.js","sourceRoot":"","sources":["../src/define.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"define.js","sourceRoot":"","sources":["../src/define.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@arbor-css/preset",
3
- "version": "0.0.93",
3
+ "version": "0.0.95",
4
4
  "type": "module",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -31,12 +31,12 @@
31
31
  "vitest": "^4.1.7"
32
32
  },
33
33
  "dependencies": {
34
- "@arbor-css/modes": "0.0.93",
35
- "@arbor-css/tokens": "0.0.93",
36
- "@arbor-css/util": "0.0.93",
37
- "@arbor-css/globals": "0.0.93",
38
- "@arbor-css/functions": "0.0.93",
39
- "@arbor-css/calc": "0.0.93"
34
+ "@arbor-css/globals": "0.0.95",
35
+ "@arbor-css/util": "0.0.95",
36
+ "@arbor-css/modes": "0.0.95",
37
+ "@arbor-css/tokens": "0.0.95",
38
+ "@arbor-css/functions": "0.0.95",
39
+ "@arbor-css/calc": "0.0.95"
40
40
  },
41
41
  "scripts": {
42
42
  "build": "tsc",