@weapp-tailwindcss/runtime 0.1.1 → 0.1.3

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/index.cjs CHANGED
@@ -46,31 +46,116 @@ function resolveTransformers(options) {
46
46
 
47
47
  //#endregion
48
48
  //#region src/create-runtime.ts
49
- function wrapClassAggregator(fn, transformers) {
49
+ const CACHE_LIMIT = 256;
50
+ function shouldUnescape(value) {
51
+ return value.includes("_") || /u[0-9a-f]{3,}/i.test(value);
52
+ }
53
+ function wrapClassAggregator(fn, transformers, prepareValue, restoreValue) {
54
+ const cache = /* @__PURE__ */ new Map();
50
55
  return (...inputs) => {
51
- const normalized = transformers.unescape((0, clsx.clsx)(...inputs));
52
- return transformers.escape(fn(normalized));
56
+ let rawInput;
57
+ if (inputs.length === 1 && typeof inputs[0] === "string") rawInput = inputs[0];
58
+ else rawInput = (0, clsx.clsx)(...inputs);
59
+ if (!rawInput) return rawInput;
60
+ const cached = cache.get(rawInput);
61
+ if (cached !== void 0) return cached;
62
+ const normalized = shouldUnescape(rawInput) ? transformers.unescape(rawInput) : rawInput;
63
+ let metadata;
64
+ let preparedValue = normalized;
65
+ if (prepareValue) {
66
+ const result = prepareValue(normalized);
67
+ if (typeof result === "string") preparedValue = result;
68
+ else {
69
+ preparedValue = result.value;
70
+ metadata = result.metadata;
71
+ }
72
+ }
73
+ const merged = fn(preparedValue);
74
+ const restored = restoreValue ? restoreValue(merged, metadata) : merged;
75
+ const escaped = transformers.escape(restored);
76
+ if (cache.size >= CACHE_LIMIT) {
77
+ const firstEntry = cache.keys().next();
78
+ if (!firstEntry.done) cache.delete(firstEntry.value);
79
+ }
80
+ cache.set(rawInput, escaped);
81
+ return escaped;
53
82
  };
54
83
  }
55
- function wrapFactory(factory, transformers) {
84
+ function wrapFactory(factory, transformers, prepareValue, restoreValue) {
56
85
  return (...args) => {
57
- return wrapClassAggregator(factory(...args), transformers);
86
+ return wrapClassAggregator(factory(...args), transformers, prepareValue, restoreValue);
58
87
  };
59
88
  }
60
89
  function createRuntimeFactory(options) {
61
- const { version, twMerge: twMergeImpl, twJoin: twJoinImpl, extendTailwindMerge: extendFactory, createTailwindMerge: createFactory } = options;
90
+ const { version, twMerge: twMergeImpl, twJoin: twJoinImpl, extendTailwindMerge: extendFactory, createTailwindMerge: createFactory, prepareValue, restoreValue } = options;
62
91
  return function createRuntime(createOptions) {
63
92
  const transformers = resolveTransformers(createOptions);
64
93
  return {
65
94
  version,
66
- twMerge: wrapClassAggregator(twMergeImpl, transformers),
67
- twJoin: wrapClassAggregator(twJoinImpl, transformers),
68
- extendTailwindMerge: wrapFactory(extendFactory, transformers),
69
- createTailwindMerge: wrapFactory(createFactory, transformers)
95
+ twMerge: wrapClassAggregator(twMergeImpl, transformers, prepareValue, restoreValue),
96
+ twJoin: wrapClassAggregator(twJoinImpl, transformers, prepareValue, restoreValue),
97
+ extendTailwindMerge: wrapFactory(extendFactory, transformers, prepareValue, restoreValue),
98
+ createTailwindMerge: wrapFactory(createFactory, transformers, prepareValue, restoreValue)
70
99
  };
71
100
  };
72
101
  }
73
102
 
103
+ //#endregion
104
+ //#region src/rpx-length.ts
105
+ const DEFAULT_PREFIXES = [
106
+ "text",
107
+ "border",
108
+ "bg",
109
+ "outline",
110
+ "ring"
111
+ ];
112
+ function escapeRegexp(value) {
113
+ return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
114
+ }
115
+ function createRpxLengthTransform(prefixes = DEFAULT_PREFIXES) {
116
+ const arbitraryRegexps = prefixes.map((prefix) => new RegExp(`${prefix}-\\[(\\d+(?:\\.\\d+)?)rpx\\]`, "g"));
117
+ function prepareValue(value) {
118
+ if (!value || !value.includes("rpx")) return value;
119
+ let hasReplacements = false;
120
+ const replacements = {};
121
+ const transformed = arbitraryRegexps.reduce((acc, regex, index) => {
122
+ const prefix = prefixes[index];
123
+ return acc.replace(regex, (_match, amount) => {
124
+ const placeholder = `${prefix}-[length:${amount}rpx]`;
125
+ replacements[placeholder] = (replacements[placeholder] ?? 0) + 1;
126
+ hasReplacements = true;
127
+ return placeholder;
128
+ });
129
+ }, value);
130
+ if (!hasReplacements) return value;
131
+ return {
132
+ value: transformed,
133
+ metadata: { replacements }
134
+ };
135
+ }
136
+ function restoreValue(value, metadata) {
137
+ if (!metadata || typeof metadata !== "object" || !("replacements" in metadata)) return value;
138
+ const { replacements } = metadata;
139
+ if (!replacements || typeof replacements !== "object") return value;
140
+ let restored = value;
141
+ for (const [placeholder, occurrences] of Object.entries(replacements)) {
142
+ let remaining = occurrences;
143
+ if (!remaining) continue;
144
+ const original = placeholder.replace("[length:", "[");
145
+ const regex = new RegExp(escapeRegexp(placeholder));
146
+ while (remaining > 0 && regex.test(restored)) {
147
+ restored = restored.replace(regex, original);
148
+ remaining--;
149
+ }
150
+ }
151
+ return restored;
152
+ }
153
+ return {
154
+ prepareValue,
155
+ restoreValue
156
+ };
157
+ }
158
+
74
159
  //#endregion
75
160
  //#region src/index.ts
76
161
  const weappTwIgnoreImpl = String.raw;
@@ -78,6 +163,7 @@ const weappTwIgnore = weappTwIgnoreImpl;
78
163
 
79
164
  //#endregion
80
165
  exports.clsx = clsx.clsx;
166
+ exports.createRpxLengthTransform = createRpxLengthTransform;
81
167
  exports.createRuntimeFactory = createRuntimeFactory;
82
168
  exports.identity = identity;
83
169
  exports.resolveTransformers = resolveTransformers;
package/dist/index.d.cts CHANGED
@@ -19,12 +19,24 @@ type TailwindMergeVersion = 2 | 3;
19
19
  //#endregion
20
20
  //#region src/create-runtime.d.ts
21
21
  type TailwindMergeFactoryFn = (...args: any[]) => TailwindMergeLibraryFn;
22
+ interface TransformResult {
23
+ value: string;
24
+ metadata?: unknown;
25
+ }
22
26
  interface CreateRuntimeFactoryOptions<TTwMerge extends TailwindMergeLibraryFn, TTwJoin extends TailwindMergeLibraryFn, TExtendFactory extends TailwindMergeFactoryFn, TCreateFactory extends TailwindMergeFactoryFn> {
23
27
  version: TailwindMergeVersion;
24
28
  twMerge: TTwMerge;
25
29
  twJoin: TTwJoin;
26
30
  extendTailwindMerge: TExtendFactory;
27
31
  createTailwindMerge: TCreateFactory;
32
+ /**
33
+ * Optional hook to normalize class lists before running tailwind-merge.
34
+ */
35
+ prepareValue?: (value: string) => string | TransformResult;
36
+ /**
37
+ * Optional hook to restore/denormalize class lists after tailwind-merge.
38
+ */
39
+ restoreValue?: (value: string, metadata?: unknown) => string;
28
40
  }
29
41
  declare function createRuntimeFactory<TTwMerge extends TailwindMergeLibraryFn, TTwJoin extends TailwindMergeLibraryFn, TExtendFactory extends TailwindMergeFactoryFn, TCreateFactory extends TailwindMergeFactoryFn>(options: CreateRuntimeFactoryOptions<TTwMerge, TTwJoin, TExtendFactory, TCreateFactory>): (createOptions?: CreateOptions) => {
30
42
  version: TailwindMergeVersion;
@@ -34,6 +46,18 @@ declare function createRuntimeFactory<TTwMerge extends TailwindMergeLibraryFn, T
34
46
  createTailwindMerge: TailwindMergeFactory<TCreateFactory>;
35
47
  };
36
48
  //#endregion
49
+ //#region src/rpx-length.d.ts
50
+ type ReplacementCounters = Record<string, number>;
51
+ declare function createRpxLengthTransform(prefixes?: readonly ["text", "border", "bg", "outline", "ring"]): {
52
+ prepareValue: (value: string) => string | {
53
+ value: string;
54
+ metadata: {
55
+ replacements: ReplacementCounters;
56
+ };
57
+ };
58
+ restoreValue: (value: string, metadata?: unknown) => string;
59
+ };
60
+ //#endregion
37
61
  //#region src/transformers.d.ts
38
62
  declare const identity: (value: string) => string;
39
63
  declare function resolveTransformers(options?: CreateOptions): Transformers;
@@ -44,4 +68,4 @@ declare const weappTwIgnore: (template: {
44
68
  }, ...substitutions: any[]) => string;
45
69
  type ClsxFn = typeof clsxFn;
46
70
  //#endregion
47
- export { type ClassValue, ClsxFn, type CreateOptions, type EscapeConfig, type TailwindMergeFactory, type TailwindMergeLibraryFn, type TailwindMergeRuntime, type TailwindMergeVersion, type Transformers, type UnescapeConfig, clsxFn as clsx, createRuntimeFactory, identity, resolveTransformers, weappTwIgnore };
71
+ export { type ClassValue, ClsxFn, type CreateOptions, type EscapeConfig, type TailwindMergeFactory, type TailwindMergeLibraryFn, type TailwindMergeRuntime, type TailwindMergeVersion, type Transformers, type UnescapeConfig, clsxFn as clsx, createRpxLengthTransform, createRuntimeFactory, identity, resolveTransformers, weappTwIgnore };
package/dist/index.d.mts CHANGED
@@ -19,12 +19,24 @@ type TailwindMergeVersion = 2 | 3;
19
19
  //#endregion
20
20
  //#region src/create-runtime.d.ts
21
21
  type TailwindMergeFactoryFn = (...args: any[]) => TailwindMergeLibraryFn;
22
+ interface TransformResult {
23
+ value: string;
24
+ metadata?: unknown;
25
+ }
22
26
  interface CreateRuntimeFactoryOptions<TTwMerge extends TailwindMergeLibraryFn, TTwJoin extends TailwindMergeLibraryFn, TExtendFactory extends TailwindMergeFactoryFn, TCreateFactory extends TailwindMergeFactoryFn> {
23
27
  version: TailwindMergeVersion;
24
28
  twMerge: TTwMerge;
25
29
  twJoin: TTwJoin;
26
30
  extendTailwindMerge: TExtendFactory;
27
31
  createTailwindMerge: TCreateFactory;
32
+ /**
33
+ * Optional hook to normalize class lists before running tailwind-merge.
34
+ */
35
+ prepareValue?: (value: string) => string | TransformResult;
36
+ /**
37
+ * Optional hook to restore/denormalize class lists after tailwind-merge.
38
+ */
39
+ restoreValue?: (value: string, metadata?: unknown) => string;
28
40
  }
29
41
  declare function createRuntimeFactory<TTwMerge extends TailwindMergeLibraryFn, TTwJoin extends TailwindMergeLibraryFn, TExtendFactory extends TailwindMergeFactoryFn, TCreateFactory extends TailwindMergeFactoryFn>(options: CreateRuntimeFactoryOptions<TTwMerge, TTwJoin, TExtendFactory, TCreateFactory>): (createOptions?: CreateOptions) => {
30
42
  version: TailwindMergeVersion;
@@ -34,6 +46,18 @@ declare function createRuntimeFactory<TTwMerge extends TailwindMergeLibraryFn, T
34
46
  createTailwindMerge: TailwindMergeFactory<TCreateFactory>;
35
47
  };
36
48
  //#endregion
49
+ //#region src/rpx-length.d.ts
50
+ type ReplacementCounters = Record<string, number>;
51
+ declare function createRpxLengthTransform(prefixes?: readonly ["text", "border", "bg", "outline", "ring"]): {
52
+ prepareValue: (value: string) => string | {
53
+ value: string;
54
+ metadata: {
55
+ replacements: ReplacementCounters;
56
+ };
57
+ };
58
+ restoreValue: (value: string, metadata?: unknown) => string;
59
+ };
60
+ //#endregion
37
61
  //#region src/transformers.d.ts
38
62
  declare const identity: (value: string) => string;
39
63
  declare function resolveTransformers(options?: CreateOptions): Transformers;
@@ -44,4 +68,4 @@ declare const weappTwIgnore: (template: {
44
68
  }, ...substitutions: any[]) => string;
45
69
  type ClsxFn = typeof clsxFn;
46
70
  //#endregion
47
- export { type ClassValue, ClsxFn, type CreateOptions, type EscapeConfig, type TailwindMergeFactory, type TailwindMergeLibraryFn, type TailwindMergeRuntime, type TailwindMergeVersion, type Transformers, type UnescapeConfig, clsxFn as clsx, createRuntimeFactory, identity, resolveTransformers, weappTwIgnore };
71
+ export { type ClassValue, ClsxFn, type CreateOptions, type EscapeConfig, type TailwindMergeFactory, type TailwindMergeLibraryFn, type TailwindMergeRuntime, type TailwindMergeVersion, type Transformers, type UnescapeConfig, clsxFn as clsx, createRpxLengthTransform, createRuntimeFactory, identity, resolveTransformers, weappTwIgnore };
package/dist/index.mjs CHANGED
@@ -46,35 +46,120 @@ function resolveTransformers(options) {
46
46
 
47
47
  //#endregion
48
48
  //#region src/create-runtime.ts
49
- function wrapClassAggregator(fn, transformers) {
49
+ const CACHE_LIMIT = 256;
50
+ function shouldUnescape(value) {
51
+ return value.includes("_") || /u[0-9a-f]{3,}/i.test(value);
52
+ }
53
+ function wrapClassAggregator(fn, transformers, prepareValue, restoreValue) {
54
+ const cache = /* @__PURE__ */ new Map();
50
55
  return (...inputs) => {
51
- const normalized = transformers.unescape(clsx(...inputs));
52
- return transformers.escape(fn(normalized));
56
+ let rawInput;
57
+ if (inputs.length === 1 && typeof inputs[0] === "string") rawInput = inputs[0];
58
+ else rawInput = clsx(...inputs);
59
+ if (!rawInput) return rawInput;
60
+ const cached = cache.get(rawInput);
61
+ if (cached !== void 0) return cached;
62
+ const normalized = shouldUnescape(rawInput) ? transformers.unescape(rawInput) : rawInput;
63
+ let metadata;
64
+ let preparedValue = normalized;
65
+ if (prepareValue) {
66
+ const result = prepareValue(normalized);
67
+ if (typeof result === "string") preparedValue = result;
68
+ else {
69
+ preparedValue = result.value;
70
+ metadata = result.metadata;
71
+ }
72
+ }
73
+ const merged = fn(preparedValue);
74
+ const restored = restoreValue ? restoreValue(merged, metadata) : merged;
75
+ const escaped = transformers.escape(restored);
76
+ if (cache.size >= CACHE_LIMIT) {
77
+ const firstEntry = cache.keys().next();
78
+ if (!firstEntry.done) cache.delete(firstEntry.value);
79
+ }
80
+ cache.set(rawInput, escaped);
81
+ return escaped;
53
82
  };
54
83
  }
55
- function wrapFactory(factory, transformers) {
84
+ function wrapFactory(factory, transformers, prepareValue, restoreValue) {
56
85
  return (...args) => {
57
- return wrapClassAggregator(factory(...args), transformers);
86
+ return wrapClassAggregator(factory(...args), transformers, prepareValue, restoreValue);
58
87
  };
59
88
  }
60
89
  function createRuntimeFactory(options) {
61
- const { version, twMerge: twMergeImpl, twJoin: twJoinImpl, extendTailwindMerge: extendFactory, createTailwindMerge: createFactory } = options;
90
+ const { version, twMerge: twMergeImpl, twJoin: twJoinImpl, extendTailwindMerge: extendFactory, createTailwindMerge: createFactory, prepareValue, restoreValue } = options;
62
91
  return function createRuntime(createOptions) {
63
92
  const transformers = resolveTransformers(createOptions);
64
93
  return {
65
94
  version,
66
- twMerge: wrapClassAggregator(twMergeImpl, transformers),
67
- twJoin: wrapClassAggregator(twJoinImpl, transformers),
68
- extendTailwindMerge: wrapFactory(extendFactory, transformers),
69
- createTailwindMerge: wrapFactory(createFactory, transformers)
95
+ twMerge: wrapClassAggregator(twMergeImpl, transformers, prepareValue, restoreValue),
96
+ twJoin: wrapClassAggregator(twJoinImpl, transformers, prepareValue, restoreValue),
97
+ extendTailwindMerge: wrapFactory(extendFactory, transformers, prepareValue, restoreValue),
98
+ createTailwindMerge: wrapFactory(createFactory, transformers, prepareValue, restoreValue)
70
99
  };
71
100
  };
72
101
  }
73
102
 
103
+ //#endregion
104
+ //#region src/rpx-length.ts
105
+ const DEFAULT_PREFIXES = [
106
+ "text",
107
+ "border",
108
+ "bg",
109
+ "outline",
110
+ "ring"
111
+ ];
112
+ function escapeRegexp(value) {
113
+ return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
114
+ }
115
+ function createRpxLengthTransform(prefixes = DEFAULT_PREFIXES) {
116
+ const arbitraryRegexps = prefixes.map((prefix) => new RegExp(`${prefix}-\\[(\\d+(?:\\.\\d+)?)rpx\\]`, "g"));
117
+ function prepareValue(value) {
118
+ if (!value || !value.includes("rpx")) return value;
119
+ let hasReplacements = false;
120
+ const replacements = {};
121
+ const transformed = arbitraryRegexps.reduce((acc, regex, index) => {
122
+ const prefix = prefixes[index];
123
+ return acc.replace(regex, (_match, amount) => {
124
+ const placeholder = `${prefix}-[length:${amount}rpx]`;
125
+ replacements[placeholder] = (replacements[placeholder] ?? 0) + 1;
126
+ hasReplacements = true;
127
+ return placeholder;
128
+ });
129
+ }, value);
130
+ if (!hasReplacements) return value;
131
+ return {
132
+ value: transformed,
133
+ metadata: { replacements }
134
+ };
135
+ }
136
+ function restoreValue(value, metadata) {
137
+ if (!metadata || typeof metadata !== "object" || !("replacements" in metadata)) return value;
138
+ const { replacements } = metadata;
139
+ if (!replacements || typeof replacements !== "object") return value;
140
+ let restored = value;
141
+ for (const [placeholder, occurrences] of Object.entries(replacements)) {
142
+ let remaining = occurrences;
143
+ if (!remaining) continue;
144
+ const original = placeholder.replace("[length:", "[");
145
+ const regex = new RegExp(escapeRegexp(placeholder));
146
+ while (remaining > 0 && regex.test(restored)) {
147
+ restored = restored.replace(regex, original);
148
+ remaining--;
149
+ }
150
+ }
151
+ return restored;
152
+ }
153
+ return {
154
+ prepareValue,
155
+ restoreValue
156
+ };
157
+ }
158
+
74
159
  //#endregion
75
160
  //#region src/index.ts
76
161
  const weappTwIgnoreImpl = String.raw;
77
162
  const weappTwIgnore = weappTwIgnoreImpl;
78
163
 
79
164
  //#endregion
80
- export { clsxFn as clsx, createRuntimeFactory, identity, resolveTransformers, weappTwIgnore };
165
+ export { clsxFn as clsx, createRpxLengthTransform, createRuntimeFactory, identity, resolveTransformers, weappTwIgnore };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@weapp-tailwindcss/runtime",
3
3
  "type": "module",
4
- "version": "0.1.1",
4
+ "version": "0.1.3",
5
5
  "description": "Shared runtime helpers (transformers, clsx wrappers, metadata) for weapp-tailwindcss 在小程序运行时的适配层。",
6
6
  "author": "ice breaker <1324318532@qq.com>",
7
7
  "license": "MIT",
@@ -43,7 +43,7 @@
43
43
  "access": "public"
44
44
  },
45
45
  "dependencies": {
46
- "@weapp-core/escape": "^5.0.1",
46
+ "@weapp-core/escape": "^6.0.1",
47
47
  "clsx": "^2.1.1"
48
48
  },
49
49
  "scripts": {