@weapp-tailwindcss/runtime 0.1.0 → 0.1.2
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 +75 -9
- package/dist/index.d.cts +25 -1
- package/dist/index.d.mts +25 -1
- package/dist/index.mjs +75 -10
- package/package.json +10 -5
package/dist/index.cjs
CHANGED
|
@@ -46,31 +46,96 @@ function resolveTransformers(options) {
|
|
|
46
46
|
|
|
47
47
|
//#endregion
|
|
48
48
|
//#region src/create-runtime.ts
|
|
49
|
-
function wrapClassAggregator(fn, transformers) {
|
|
49
|
+
function wrapClassAggregator(fn, transformers, prepareValue, restoreValue) {
|
|
50
50
|
return (...inputs) => {
|
|
51
51
|
const normalized = transformers.unescape((0, clsx.clsx)(...inputs));
|
|
52
|
-
|
|
52
|
+
let metadata;
|
|
53
|
+
let preparedValue = normalized;
|
|
54
|
+
if (prepareValue) {
|
|
55
|
+
const result = prepareValue(normalized);
|
|
56
|
+
if (typeof result === "string") preparedValue = result;
|
|
57
|
+
else {
|
|
58
|
+
preparedValue = result.value;
|
|
59
|
+
metadata = result.metadata;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
const merged = fn(preparedValue);
|
|
63
|
+
const restored = restoreValue ? restoreValue(merged, metadata) : merged;
|
|
64
|
+
return transformers.escape(restored);
|
|
53
65
|
};
|
|
54
66
|
}
|
|
55
|
-
function wrapFactory(factory, transformers) {
|
|
67
|
+
function wrapFactory(factory, transformers, prepareValue, restoreValue) {
|
|
56
68
|
return (...args) => {
|
|
57
|
-
return wrapClassAggregator(factory(...args), transformers);
|
|
69
|
+
return wrapClassAggregator(factory(...args), transformers, prepareValue, restoreValue);
|
|
58
70
|
};
|
|
59
71
|
}
|
|
60
72
|
function createRuntimeFactory(options) {
|
|
61
|
-
const { version, twMerge: twMergeImpl, twJoin: twJoinImpl, extendTailwindMerge: extendFactory, createTailwindMerge: createFactory } = options;
|
|
73
|
+
const { version, twMerge: twMergeImpl, twJoin: twJoinImpl, extendTailwindMerge: extendFactory, createTailwindMerge: createFactory, prepareValue, restoreValue } = options;
|
|
62
74
|
return function createRuntime(createOptions) {
|
|
63
75
|
const transformers = resolveTransformers(createOptions);
|
|
64
76
|
return {
|
|
65
77
|
version,
|
|
66
|
-
twMerge: wrapClassAggregator(twMergeImpl, transformers),
|
|
67
|
-
twJoin: wrapClassAggregator(twJoinImpl, transformers),
|
|
68
|
-
extendTailwindMerge: wrapFactory(extendFactory, transformers),
|
|
69
|
-
createTailwindMerge: wrapFactory(createFactory, transformers)
|
|
78
|
+
twMerge: wrapClassAggregator(twMergeImpl, transformers, prepareValue, restoreValue),
|
|
79
|
+
twJoin: wrapClassAggregator(twJoinImpl, transformers, prepareValue, restoreValue),
|
|
80
|
+
extendTailwindMerge: wrapFactory(extendFactory, transformers, prepareValue, restoreValue),
|
|
81
|
+
createTailwindMerge: wrapFactory(createFactory, transformers, prepareValue, restoreValue)
|
|
70
82
|
};
|
|
71
83
|
};
|
|
72
84
|
}
|
|
73
85
|
|
|
86
|
+
//#endregion
|
|
87
|
+
//#region src/rpx-length.ts
|
|
88
|
+
const DEFAULT_PREFIXES = [
|
|
89
|
+
"text",
|
|
90
|
+
"border",
|
|
91
|
+
"bg",
|
|
92
|
+
"outline",
|
|
93
|
+
"ring"
|
|
94
|
+
];
|
|
95
|
+
function escapeRegexp(value) {
|
|
96
|
+
return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
97
|
+
}
|
|
98
|
+
function createRpxLengthTransform(prefixes = DEFAULT_PREFIXES) {
|
|
99
|
+
const arbitraryRegexps = prefixes.map((prefix) => new RegExp(`${prefix}-\\[(\\d+(?:\\.\\d+)?)rpx\\]`, "g"));
|
|
100
|
+
function prepareValue(value) {
|
|
101
|
+
const replacements = {};
|
|
102
|
+
const transformed = arbitraryRegexps.reduce((acc, regex, index) => {
|
|
103
|
+
const prefix = prefixes[index];
|
|
104
|
+
return acc.replace(regex, (_match, amount) => {
|
|
105
|
+
const placeholder = `${prefix}-[length:${amount}rpx]`;
|
|
106
|
+
replacements[placeholder] = (replacements[placeholder] ?? 0) + 1;
|
|
107
|
+
return placeholder;
|
|
108
|
+
});
|
|
109
|
+
}, value);
|
|
110
|
+
if (Object.keys(replacements).length === 0) return transformed;
|
|
111
|
+
return {
|
|
112
|
+
value: transformed,
|
|
113
|
+
metadata: { replacements }
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
function restoreValue(value, metadata) {
|
|
117
|
+
if (!metadata || typeof metadata !== "object" || !("replacements" in metadata)) return value;
|
|
118
|
+
const { replacements } = metadata;
|
|
119
|
+
if (!replacements || typeof replacements !== "object") return value;
|
|
120
|
+
let restored = value;
|
|
121
|
+
for (const [placeholder, occurrences] of Object.entries(replacements)) {
|
|
122
|
+
let remaining = occurrences;
|
|
123
|
+
if (!remaining) continue;
|
|
124
|
+
const original = placeholder.replace("[length:", "[");
|
|
125
|
+
const regex = new RegExp(escapeRegexp(placeholder));
|
|
126
|
+
while (remaining > 0 && regex.test(restored)) {
|
|
127
|
+
restored = restored.replace(regex, original);
|
|
128
|
+
remaining--;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
return restored;
|
|
132
|
+
}
|
|
133
|
+
return {
|
|
134
|
+
prepareValue,
|
|
135
|
+
restoreValue
|
|
136
|
+
};
|
|
137
|
+
}
|
|
138
|
+
|
|
74
139
|
//#endregion
|
|
75
140
|
//#region src/index.ts
|
|
76
141
|
const weappTwIgnoreImpl = String.raw;
|
|
@@ -78,6 +143,7 @@ const weappTwIgnore = weappTwIgnoreImpl;
|
|
|
78
143
|
|
|
79
144
|
//#endregion
|
|
80
145
|
exports.clsx = clsx.clsx;
|
|
146
|
+
exports.createRpxLengthTransform = createRpxLengthTransform;
|
|
81
147
|
exports.createRuntimeFactory = createRuntimeFactory;
|
|
82
148
|
exports.identity = identity;
|
|
83
149
|
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,100 @@ function resolveTransformers(options) {
|
|
|
46
46
|
|
|
47
47
|
//#endregion
|
|
48
48
|
//#region src/create-runtime.ts
|
|
49
|
-
function wrapClassAggregator(fn, transformers) {
|
|
49
|
+
function wrapClassAggregator(fn, transformers, prepareValue, restoreValue) {
|
|
50
50
|
return (...inputs) => {
|
|
51
51
|
const normalized = transformers.unescape(clsx(...inputs));
|
|
52
|
-
|
|
52
|
+
let metadata;
|
|
53
|
+
let preparedValue = normalized;
|
|
54
|
+
if (prepareValue) {
|
|
55
|
+
const result = prepareValue(normalized);
|
|
56
|
+
if (typeof result === "string") preparedValue = result;
|
|
57
|
+
else {
|
|
58
|
+
preparedValue = result.value;
|
|
59
|
+
metadata = result.metadata;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
const merged = fn(preparedValue);
|
|
63
|
+
const restored = restoreValue ? restoreValue(merged, metadata) : merged;
|
|
64
|
+
return transformers.escape(restored);
|
|
53
65
|
};
|
|
54
66
|
}
|
|
55
|
-
function wrapFactory(factory, transformers) {
|
|
67
|
+
function wrapFactory(factory, transformers, prepareValue, restoreValue) {
|
|
56
68
|
return (...args) => {
|
|
57
|
-
return wrapClassAggregator(factory(...args), transformers);
|
|
69
|
+
return wrapClassAggregator(factory(...args), transformers, prepareValue, restoreValue);
|
|
58
70
|
};
|
|
59
71
|
}
|
|
60
72
|
function createRuntimeFactory(options) {
|
|
61
|
-
const { version, twMerge: twMergeImpl, twJoin: twJoinImpl, extendTailwindMerge: extendFactory, createTailwindMerge: createFactory } = options;
|
|
73
|
+
const { version, twMerge: twMergeImpl, twJoin: twJoinImpl, extendTailwindMerge: extendFactory, createTailwindMerge: createFactory, prepareValue, restoreValue } = options;
|
|
62
74
|
return function createRuntime(createOptions) {
|
|
63
75
|
const transformers = resolveTransformers(createOptions);
|
|
64
76
|
return {
|
|
65
77
|
version,
|
|
66
|
-
twMerge: wrapClassAggregator(twMergeImpl, transformers),
|
|
67
|
-
twJoin: wrapClassAggregator(twJoinImpl, transformers),
|
|
68
|
-
extendTailwindMerge: wrapFactory(extendFactory, transformers),
|
|
69
|
-
createTailwindMerge: wrapFactory(createFactory, transformers)
|
|
78
|
+
twMerge: wrapClassAggregator(twMergeImpl, transformers, prepareValue, restoreValue),
|
|
79
|
+
twJoin: wrapClassAggregator(twJoinImpl, transformers, prepareValue, restoreValue),
|
|
80
|
+
extendTailwindMerge: wrapFactory(extendFactory, transformers, prepareValue, restoreValue),
|
|
81
|
+
createTailwindMerge: wrapFactory(createFactory, transformers, prepareValue, restoreValue)
|
|
70
82
|
};
|
|
71
83
|
};
|
|
72
84
|
}
|
|
73
85
|
|
|
86
|
+
//#endregion
|
|
87
|
+
//#region src/rpx-length.ts
|
|
88
|
+
const DEFAULT_PREFIXES = [
|
|
89
|
+
"text",
|
|
90
|
+
"border",
|
|
91
|
+
"bg",
|
|
92
|
+
"outline",
|
|
93
|
+
"ring"
|
|
94
|
+
];
|
|
95
|
+
function escapeRegexp(value) {
|
|
96
|
+
return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
97
|
+
}
|
|
98
|
+
function createRpxLengthTransform(prefixes = DEFAULT_PREFIXES) {
|
|
99
|
+
const arbitraryRegexps = prefixes.map((prefix) => new RegExp(`${prefix}-\\[(\\d+(?:\\.\\d+)?)rpx\\]`, "g"));
|
|
100
|
+
function prepareValue(value) {
|
|
101
|
+
const replacements = {};
|
|
102
|
+
const transformed = arbitraryRegexps.reduce((acc, regex, index) => {
|
|
103
|
+
const prefix = prefixes[index];
|
|
104
|
+
return acc.replace(regex, (_match, amount) => {
|
|
105
|
+
const placeholder = `${prefix}-[length:${amount}rpx]`;
|
|
106
|
+
replacements[placeholder] = (replacements[placeholder] ?? 0) + 1;
|
|
107
|
+
return placeholder;
|
|
108
|
+
});
|
|
109
|
+
}, value);
|
|
110
|
+
if (Object.keys(replacements).length === 0) return transformed;
|
|
111
|
+
return {
|
|
112
|
+
value: transformed,
|
|
113
|
+
metadata: { replacements }
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
function restoreValue(value, metadata) {
|
|
117
|
+
if (!metadata || typeof metadata !== "object" || !("replacements" in metadata)) return value;
|
|
118
|
+
const { replacements } = metadata;
|
|
119
|
+
if (!replacements || typeof replacements !== "object") return value;
|
|
120
|
+
let restored = value;
|
|
121
|
+
for (const [placeholder, occurrences] of Object.entries(replacements)) {
|
|
122
|
+
let remaining = occurrences;
|
|
123
|
+
if (!remaining) continue;
|
|
124
|
+
const original = placeholder.replace("[length:", "[");
|
|
125
|
+
const regex = new RegExp(escapeRegexp(placeholder));
|
|
126
|
+
while (remaining > 0 && regex.test(restored)) {
|
|
127
|
+
restored = restored.replace(regex, original);
|
|
128
|
+
remaining--;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
return restored;
|
|
132
|
+
}
|
|
133
|
+
return {
|
|
134
|
+
prepareValue,
|
|
135
|
+
restoreValue
|
|
136
|
+
};
|
|
137
|
+
}
|
|
138
|
+
|
|
74
139
|
//#endregion
|
|
75
140
|
//#region src/index.ts
|
|
76
141
|
const weappTwIgnoreImpl = String.raw;
|
|
77
142
|
const weappTwIgnore = weappTwIgnoreImpl;
|
|
78
143
|
|
|
79
144
|
//#endregion
|
|
80
|
-
export { clsxFn as clsx, createRuntimeFactory, identity, resolveTransformers, weappTwIgnore };
|
|
145
|
+
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.
|
|
4
|
+
"version": "0.1.2",
|
|
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",
|
|
@@ -23,14 +23,19 @@
|
|
|
23
23
|
"sideEffects": false,
|
|
24
24
|
"exports": {
|
|
25
25
|
".": {
|
|
26
|
-
"
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
"import": {
|
|
27
|
+
"types": "./dist/index.d.mts",
|
|
28
|
+
"default": "./dist/index.mjs"
|
|
29
|
+
},
|
|
30
|
+
"require": {
|
|
31
|
+
"types": "./dist/index.d.cts",
|
|
32
|
+
"default": "./dist/index.cjs"
|
|
33
|
+
}
|
|
29
34
|
}
|
|
30
35
|
},
|
|
31
36
|
"main": "./dist/index.cjs",
|
|
32
37
|
"module": "./dist/index.mjs",
|
|
33
|
-
"types": "./dist/index.d.
|
|
38
|
+
"types": "./dist/index.d.mts",
|
|
34
39
|
"files": [
|
|
35
40
|
"dist"
|
|
36
41
|
],
|