@generaltranslation/compiler 1.3.0 → 1.3.1
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/processing/collection/processCallExpression.js +11 -5
- package/dist/processing/collection/processCallExpression.js.map +1 -1
- package/dist/transform/registration/callbacks/registerUseGTCallback.js +2 -2
- package/dist/transform/registration/callbacks/registerUseGTCallback.js.map +1 -1
- package/dist/transform/validation/validateTranslationComponentArgs.d.ts +1 -0
- package/dist/transform/validation/validateTranslationComponentArgs.d.ts.map +1 -1
- package/dist/transform/validation/validateTranslationComponentArgs.js +19 -6
- package/dist/transform/validation/validateTranslationComponentArgs.js.map +1 -1
- package/dist/transform/validation/validateTranslationFunctionCallback.d.ts +7 -0
- package/dist/transform/validation/validateTranslationFunctionCallback.d.ts.map +1 -1
- package/dist/transform/validation/validateTranslationFunctionCallback.js +47 -13
- package/dist/transform/validation/validateTranslationFunctionCallback.js.map +1 -1
- package/package.json +1 -1
|
@@ -132,6 +132,10 @@ function handleUseGTCallback(callExpr, state, identifier) {
|
|
|
132
132
|
return;
|
|
133
133
|
}
|
|
134
134
|
// Track the function call
|
|
135
|
+
// When context contains derive(), skip hash calculation (CLI handles resolution)
|
|
136
|
+
const hash = useGTCallbackParams.hasDeriveContext
|
|
137
|
+
? ''
|
|
138
|
+
: useGTCallbackParams.hash;
|
|
135
139
|
(0, registerUseGTCallback_1.registerUseGTCallback)({
|
|
136
140
|
identifier,
|
|
137
141
|
state,
|
|
@@ -139,7 +143,7 @@ function handleUseGTCallback(callExpr, state, identifier) {
|
|
|
139
143
|
context: useGTCallbackParams.context,
|
|
140
144
|
id: useGTCallbackParams.id,
|
|
141
145
|
maxChars: useGTCallbackParams.maxChars,
|
|
142
|
-
hash
|
|
146
|
+
hash,
|
|
143
147
|
format: useGTCallbackParams.format,
|
|
144
148
|
});
|
|
145
149
|
}
|
|
@@ -212,14 +216,16 @@ function handleReactInvocation(callExpr, state) {
|
|
|
212
216
|
return;
|
|
213
217
|
}
|
|
214
218
|
// Validate the arguments
|
|
215
|
-
const { errors, _hash, id, context, children, maxChars } = (0, validateTranslationComponentArgs_1.validateTranslationComponentArgs)(callExpr, canonicalName, state);
|
|
219
|
+
const { errors, _hash, id, context, children, maxChars, hasDeriveContext } = (0, validateTranslationComponentArgs_1.validateTranslationComponentArgs)(callExpr, canonicalName, state);
|
|
216
220
|
if (errors.length > 0) {
|
|
217
221
|
state.errorTracker.addErrors(errors);
|
|
218
222
|
return;
|
|
219
223
|
}
|
|
220
|
-
// Calculate hash
|
|
221
|
-
const hash =
|
|
222
|
-
|
|
224
|
+
// Calculate hash (skip when context contains derive — CLI handles resolution)
|
|
225
|
+
const hash = hasDeriveContext
|
|
226
|
+
? ''
|
|
227
|
+
: _hash ||
|
|
228
|
+
(0, calculateHash_1.default)(Object.assign(Object.assign(Object.assign(Object.assign({ source: children }, (context && { context })), (id && { id })), (maxChars != null && { maxChars })), { dataFormat: 'JSX' }));
|
|
223
229
|
// Debug: record hash → children mapping
|
|
224
230
|
if (state.debugManifest) {
|
|
225
231
|
state.debugManifest.set(hash, children);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processCallExpression.js","sourceRoot":"","sources":["../../../src/processing/collection/processCallExpression.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"processCallExpression.js","sourceRoot":"","sources":["../../../src/processing/collection/processCallExpression.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,8 @@ const calculateHash_1 = __importDefault(require("../../../utils/calculateHash"))
|
|
|
10
10
|
* - Adds the translation content to the string collector
|
|
11
11
|
*/
|
|
12
12
|
function registerUseGTCallback({ identifier, state, content, context, id, maxChars, hash, format, }) {
|
|
13
|
-
// Calculate hash for the call expression
|
|
14
|
-
hash
|
|
13
|
+
// Calculate hash for the call expression (skip if already set, including empty string for derive context)
|
|
14
|
+
hash !== null && hash !== void 0 ? hash : (hash = (0, calculateHash_1.default)({
|
|
15
15
|
source: content,
|
|
16
16
|
id,
|
|
17
17
|
context,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registerUseGTCallback.js","sourceRoot":"","sources":["../../../../src/transform/registration/callbacks/registerUseGTCallback.ts"],"names":[],"mappings":";;;;;AAQA,sDA4CC;AAnDD,iFAAsD;AAGtD;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,EACpC,UAAU,EACV,KAAK,EACL,OAAO,EACP,OAAO,EACP,EAAE,EACF,QAAQ,EACR,IAAI,EACJ,MAAM,GAUP;IACC,
|
|
1
|
+
{"version":3,"file":"registerUseGTCallback.js","sourceRoot":"","sources":["../../../../src/transform/registration/callbacks/registerUseGTCallback.ts"],"names":[],"mappings":";;;;;AAQA,sDA4CC;AAnDD,iFAAsD;AAGtD;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,EACpC,UAAU,EACV,KAAK,EACL,OAAO,EACP,OAAO,EACP,EAAE,EACF,QAAQ,EACR,IAAI,EACJ,MAAM,GAUP;IACC,0GAA0G;IAC1G,IAAI,aAAJ,IAAI,cAAJ,IAAI,IAAJ,IAAI,GAAK,IAAA,uBAAU,EAAC;QAClB,MAAM,EAAE,OAAO;QACf,EAAE;QACF,OAAO;QACP,QAAQ;QACR,UAAU,EAAE,CAAC,MAAM,IAAI,KAAK,CAAe;KAC5C,CAAC,EAAC;IAEH,+FAA+F;IAC/F,KAAK,CAAC,eAAe,CAAC,sBAAsB,CAAC,UAAU,EAAE;QACvD,OAAO,EAAE,OAAO;QAChB,IAAI;QACJ,EAAE;QACF,OAAO;QACP,QAAQ;KACT,CAAC,CAAC;IAEH,0EAA0E;IAC1E,MAAM,SAAS,GAAG,KAAK,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;IAE3D,uCAAuC;IACvC,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,SAAS,EAAE;QAClD,IAAI;KACL,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateTranslationComponentArgs.d.ts","sourceRoot":"","sources":["../../../src/transform/validation/validateTranslationComponentArgs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAGlC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"validateTranslationComponentArgs.d.ts","sourceRoot":"","sources":["../../../src/transform/validation/validateTranslationComponentArgs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAGlC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvD;;GAEG;AACH,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,CAAC,CAAC,cAAc,EAC1B,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,cAAc,GACpB;IACD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CA6BA;AAiDD;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,CAAC,CAAC,gBAAgB,EACxB,KAAK,EAAE,cAAc,GACpB;IACD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,CAAC,EAAE,WAAW,CAAC;CACrB,CAqBA"}
|
|
@@ -42,6 +42,7 @@ const validateExpressionIsStringLiteral_1 = require("../../utils/validation/vali
|
|
|
42
42
|
const jsx_children_1 = require("../jsx-children");
|
|
43
43
|
const validateChildrenFromObjectExpression_1 = require("../../utils/validation/validateChildrenFromObjectExpression");
|
|
44
44
|
const validateExpressionIsNumericLiteral_1 = require("../../utils/validation/validateExpressionIsNumericLiteral");
|
|
45
|
+
const validateTranslationFunctionCallback_1 = require("./validateTranslationFunctionCallback");
|
|
45
46
|
/**
|
|
46
47
|
* Given a translation component, validate the arguments
|
|
47
48
|
*/
|
|
@@ -82,10 +83,11 @@ function validateTComponentArgs(args, state) {
|
|
|
82
83
|
const idValidation = validateStringProperty(args, 'id');
|
|
83
84
|
errors.push(...idValidation.errors);
|
|
84
85
|
const id = idValidation.value;
|
|
85
|
-
// Validate context
|
|
86
|
-
const contextValidation = validateStringProperty(args, 'context');
|
|
86
|
+
// Validate context (with derive fallback)
|
|
87
|
+
const contextValidation = validateStringProperty(args, 'context', state);
|
|
87
88
|
errors.push(...contextValidation.errors);
|
|
88
89
|
const context = contextValidation.value;
|
|
90
|
+
const hasDeriveContext = contextValidation.hasDeriveExpression;
|
|
89
91
|
// Validate maxChars
|
|
90
92
|
const maxCharsValidation = validateNumberProperty(args, 'maxChars');
|
|
91
93
|
errors.push(...maxCharsValidation.errors);
|
|
@@ -98,7 +100,7 @@ function validateTComponentArgs(args, state) {
|
|
|
98
100
|
const childrenValidation = validateChildrenProperty(args, state);
|
|
99
101
|
errors.push(...childrenValidation.errors);
|
|
100
102
|
const children = childrenValidation.value;
|
|
101
|
-
return { errors, id, context, _hash, maxChars, children };
|
|
103
|
+
return { errors, id, context, _hash, maxChars, children, hasDeriveContext };
|
|
102
104
|
}
|
|
103
105
|
/**
|
|
104
106
|
* Validate that the children property is a string literal
|
|
@@ -127,7 +129,7 @@ function validateChildrenProperty(args, state) {
|
|
|
127
129
|
* Will validate and retrieve property from object expression and also try prefixing with a $
|
|
128
130
|
*
|
|
129
131
|
*/
|
|
130
|
-
function validateStringProperty(args, name) {
|
|
132
|
+
function validateStringProperty(args, name, state) {
|
|
131
133
|
const errors = [];
|
|
132
134
|
// Get the property
|
|
133
135
|
const property = (0, getObjectPropertyFromObjectExpression_1.getObjectPropertyFromObjectExpression)(args, name) ||
|
|
@@ -137,9 +139,20 @@ function validateStringProperty(args, name) {
|
|
|
137
139
|
}
|
|
138
140
|
// Validate property
|
|
139
141
|
const validation = validateObjectPropertyIsStringLiteral(property, name);
|
|
142
|
+
if (validation.errors.length === 0) {
|
|
143
|
+
return { errors, value: validation.value };
|
|
144
|
+
}
|
|
145
|
+
// String validation failed — check if it's a valid derive() expression
|
|
146
|
+
if (state && t.isObjectProperty(property) && t.isExpression(property.value)) {
|
|
147
|
+
const deriveErrors = [];
|
|
148
|
+
(0, validateTranslationFunctionCallback_1.validateDerive)(property.value, state, deriveErrors);
|
|
149
|
+
if (deriveErrors.length === 0) {
|
|
150
|
+
return { errors, hasDeriveExpression: true };
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
// Neither string nor derive — return original errors
|
|
140
154
|
errors.push(...validation.errors);
|
|
141
|
-
|
|
142
|
-
return { errors, value };
|
|
155
|
+
return { errors };
|
|
143
156
|
}
|
|
144
157
|
/**
|
|
145
158
|
* Validate that an object property is a string literal
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateTranslationComponentArgs.js","sourceRoot":"","sources":["../../../src/transform/validation/validateTranslationComponentArgs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"validateTranslationComponentArgs.js","sourceRoot":"","sources":["../../../src/transform/validation/validateTranslationComponentArgs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaA,4EAyCC;AAoDD,4DA2BC;AApID,kEAAwE;AACxE,gDAAkC;AAClC,qHAAkH;AAClH,gHAA6G;AAE7G,kDAAuD;AACvD,sHAA2H;AAC3H,kHAA+G;AAC/G,+FAAuE;AACvE;;GAEG;AACH,SAAgB,gCAAgC,CAC9C,QAA0B,EAC1B,aAAqB,EACrB,KAAqB;IAUrB,+DAA+D;IAC/D,IAAI,QAAQ,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,MAAM,GAAG;YACb,yEAAyE;SAC1E,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,yBAAyB;IACzB,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACnC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG;YACb,6EAA6E;SAC9E,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,yCAAyC;IACzC,QAAQ,aAAa,EAAE,CAAC;QACtB,KAAK,8BAAkB,CAAC,CAAC,CAAC;QAC1B,KAAK,8BAAkB,CAAC,sBAAsB;YAC5C,OAAO,sBAAsB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7C;YACE,MAAM,MAAM,GAAG;gBACb,kCAAkC,aAAa,qFAAqF;aACrI,CAAC;YACF,OAAO,EAAE,MAAM,EAAE,CAAC;IACtB,CAAC;AACH,CAAC;AAED,qCAAqC;AACrC,sBAAsB;AACtB,qCAAqC;AAErC,SAAS,sBAAsB,CAC7B,IAAwB,EACxB,KAAqB;IAUrB,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,cAAc;IACd,MAAM,YAAY,GAAG,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxD,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACpC,MAAM,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC;IAE9B,0CAA0C;IAC1C,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IACzE,MAAM,CAAC,IAAI,CAAC,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,iBAAiB,CAAC,KAAK,CAAC;IACxC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC;IAE/D,oBAAoB;IACpB,MAAM,kBAAkB,GAAG,sBAAsB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACpE,MAAM,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,kBAAkB,CAAC,KAAK,CAAC;IAE1C,gBAAgB;IAChB,MAAM,cAAc,GAAG,sBAAsB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;IAEnC,oBAAoB;IACpB,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACjE,MAAM,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,kBAAkB,CAAC,KAAK,CAAC;IAE1C,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;AAC9E,CAAC;AAED;;GAEG;AACH,SAAgB,wBAAwB,CACtC,IAAwB,EACxB,KAAqB;IAKrB,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,4BAA4B;IAC5B,MAAM,kBAAkB,GAAG,IAAA,mFAA4C,EAAC,IAAI,CAAC,CAAC;IAC9E,IAAI,kBAAkB,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC1C,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IACD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,KAAK,CAAC;IAC1C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,QAAQ,8BAAkB,CAAC,CAAC,gCAAgC,CAAC,CAAC;QAC1E,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,0DAA0D;IAC1D,MAAM,UAAU,GAAG,IAAA,mCAAoB,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACzD,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;IAE/B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC3B,CAAC;AAED,2BAA2B;AAE3B;;;GAGG;AACH,SAAS,sBAAsB,CAC7B,IAAwB,EACxB,IAAY,EACZ,KAAsB;IAMtB,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,mBAAmB;IACnB,MAAM,QAAQ,GACZ,IAAA,6EAAqC,EAAC,IAAI,EAAE,IAAI,CAAC;QACjD,IAAA,6EAAqC,EAAC,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC;IAC1D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,oBAAoB;IACpB,MAAM,UAAU,GAAG,qCAAqC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACzE,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE,CAAC;IAC7C,CAAC;IAED,uEAAuE;IACvE,IAAI,KAAK,IAAI,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5E,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,IAAA,oDAAc,EAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;QACpD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,qDAAqD;IACrD,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO,EAAE,MAAM,EAAE,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,SAAS,qCAAqC,CAC5C,GAAwD,EACxD,IAAY;IAKZ,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,+DAA+D;IAC/D,IACE,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC;QACxB,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC;QAC1B,CAAC,IAAA,qEAAiC,EAAC,GAAG,CAAC,KAAK,CAAC,EAC7C,CAAC;QACD,MAAM,CAAC,IAAI,CACT,QAAQ,8BAAkB,CAAC,CAAC,iDAAiD,IAAI,QAAQ,CAC1F,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,yBAAyB;IACzB,MAAM,KAAK,GAAG,8BAA8B,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACxD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,SAAS,8BAA8B,CACrC,IAAkB;;IAElB,IAAI,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IACD,IAAI,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC,MAAM,KAAI,EAAE,CAAC;QAC5C,CAAC;IACH,CAAC;AACH,CAAC;AAED,2BAA2B;AAE3B;;GAEG;AACH,SAAS,sBAAsB,CAC7B,IAAwB,EACxB,IAAY;IAKZ,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,mBAAmB;IACnB,MAAM,QAAQ,GACZ,IAAA,6EAAqC,EAAC,IAAI,EAAE,IAAI,CAAC;QACjD,IAAA,6EAAqC,EAAC,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC;IAC1D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,oBAAoB;IACpB,MAAM,UAAU,GAAG,qCAAqC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACzE,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC;IAE/B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,SAAS,qCAAqC,CAC5C,GAAwD,EACxD,IAAY;IAKZ,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,+DAA+D;IAC/D,IACE,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC;QACxB,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC;QAC1B,CAAC,IAAA,uEAAkC,EAAC,GAAG,CAAC,KAAK,CAAC,EAC9C,CAAC;QACD,MAAM,CAAC,IAAI,CACT,QAAQ,8BAAkB,CAAC,CAAC,iDAAiD,IAAI,QAAQ,CAC1F,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,yBAAyB;IACzB,MAAM,KAAK,GAAG,8BAA8B,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAExD,4BAA4B;IAC5B,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC,EAAE,CAAC;QAClE,MAAM,CAAC,IAAI,CACT,QAAQ,8BAAkB,CAAC,CAAC,2CAA2C,IAAI,QAAQ,CACpF,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;AAC3B,CAAC;AAED;;GAEG;AACH,SAAS,8BAA8B,CACrC,IAAkB;IAElB,IAAI,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IACD,sCAAsC;IACtC,IAAI,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnE,qEAAqE;QACrE,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IAC7B,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,8BAA8B,CAAC,KAAa;IACnD,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC"}
|
|
@@ -14,6 +14,7 @@ export declare function validateUseGTCallback(callExpr: t.CallExpression, state:
|
|
|
14
14
|
id?: string;
|
|
15
15
|
maxChars?: number;
|
|
16
16
|
format?: string;
|
|
17
|
+
hasDeriveContext?: boolean;
|
|
17
18
|
};
|
|
18
19
|
/**
|
|
19
20
|
* Validate useTranslations_callback / getTranslations_callback
|
|
@@ -29,4 +30,10 @@ export declare function validateUseTranslationsCallback(_callExpr: t.CallExpress
|
|
|
29
30
|
export declare function validateUseMessagesCallback(_callExpr: t.CallExpression): {
|
|
30
31
|
errors: string[];
|
|
31
32
|
};
|
|
33
|
+
/**
|
|
34
|
+
* Validates if an expression uses the derive() function correctly
|
|
35
|
+
*/
|
|
36
|
+
export declare function validateDerive(expr: t.Expression, state: TransformState, errors: string[]): {
|
|
37
|
+
errors: string[];
|
|
38
|
+
};
|
|
32
39
|
//# sourceMappingURL=validateTranslationFunctionCallback.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateTranslationFunctionCallback.d.ts","sourceRoot":"","sources":["../../../src/transform/validation/validateTranslationFunctionCallback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAKlC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAInD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,CAAC,CAAC,cAAc,EAC1B,KAAK,EAAE,cAAc,GACpB;IACD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"validateTranslationFunctionCallback.d.ts","sourceRoot":"","sources":["../../../src/transform/validation/validateTranslationFunctionCallback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAKlC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAInD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,CAAC,CAAC,cAAc,EAC1B,KAAK,EAAE,cAAc,GACpB;IACD,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAgGA;AAED;;;GAGG;AAEH,wBAAgB,+BAA+B,CAAC,SAAS,EAAE,CAAC,CAAC,cAAc,GAAG;IAC5E,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAGA;AAED;;;GAGG;AAEH,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,CAAC,CAAC,cAAc,GAAG;IACxE,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAGA;AAoHD;;GAEG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,CAAC,CAAC,UAAU,EAClB,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,MAAM,EAAE,GACf;IAAE,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAqEtB"}
|
|
@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
exports.validateUseGTCallback = validateUseGTCallback;
|
|
37
37
|
exports.validateUseTranslationsCallback = validateUseTranslationsCallback;
|
|
38
38
|
exports.validateUseMessagesCallback = validateUseMessagesCallback;
|
|
39
|
+
exports.validateDerive = validateDerive;
|
|
39
40
|
const t = __importStar(require("@babel/types"));
|
|
40
41
|
const constants_1 = require("../../utils/constants/gt/constants");
|
|
41
42
|
const getCalleeNameFromExpression_1 = require("../../utils/parsing/getCalleeNameFromExpression");
|
|
@@ -63,7 +64,7 @@ function validateUseGTCallback(callExpr, state) {
|
|
|
63
64
|
const content = validatedContent.value;
|
|
64
65
|
if (content === undefined) {
|
|
65
66
|
// expression is not a string literal. Check if it contains a derive() function invocation
|
|
66
|
-
|
|
67
|
+
validateDerive(callExpr.arguments[0], state, errors);
|
|
67
68
|
if (errors.length > 0) {
|
|
68
69
|
errors.push(...validatedContent.errors);
|
|
69
70
|
errors.push('useGT_callback / getGT_callback must use a string literal or derive() call as the first argument. Variable content is not allowed.');
|
|
@@ -76,13 +77,15 @@ function validateUseGTCallback(callExpr, state) {
|
|
|
76
77
|
let hash;
|
|
77
78
|
let maxChars;
|
|
78
79
|
let format;
|
|
80
|
+
let hasDeriveContext;
|
|
79
81
|
if (callExpr.arguments.length === 1) {
|
|
80
82
|
return { errors, content };
|
|
81
83
|
}
|
|
82
84
|
if (t.isObjectExpression(callExpr.arguments[1])) {
|
|
83
|
-
const contextProperty = validatePropertyFromObjectExpression(callExpr.arguments[1], constants_1.USEGT_CALLBACK_OPTIONS.$context, 'string');
|
|
85
|
+
const contextProperty = validatePropertyFromObjectExpression(callExpr.arguments[1], constants_1.USEGT_CALLBACK_OPTIONS.$context, 'string-or-derive', state);
|
|
84
86
|
errors.push(...contextProperty.errors);
|
|
85
87
|
context = contextProperty.value;
|
|
88
|
+
hasDeriveContext = contextProperty.hasDeriveExpression;
|
|
86
89
|
const idProperty = validatePropertyFromObjectExpression(callExpr.arguments[1], constants_1.USEGT_CALLBACK_OPTIONS.$id, 'string');
|
|
87
90
|
errors.push(...idProperty.errors);
|
|
88
91
|
id = idProperty.value;
|
|
@@ -96,7 +99,16 @@ function validateUseGTCallback(callExpr, state) {
|
|
|
96
99
|
errors.push(...formatProperty.errors);
|
|
97
100
|
format = formatProperty.value;
|
|
98
101
|
}
|
|
99
|
-
return {
|
|
102
|
+
return {
|
|
103
|
+
errors,
|
|
104
|
+
content,
|
|
105
|
+
context,
|
|
106
|
+
id,
|
|
107
|
+
hash,
|
|
108
|
+
maxChars,
|
|
109
|
+
format,
|
|
110
|
+
hasDeriveContext,
|
|
111
|
+
};
|
|
100
112
|
}
|
|
101
113
|
/**
|
|
102
114
|
* Validate useTranslations_callback / getTranslations_callback
|
|
@@ -116,7 +128,7 @@ function validateUseMessagesCallback(_callExpr) {
|
|
|
116
128
|
const errors = [];
|
|
117
129
|
return { errors };
|
|
118
130
|
}
|
|
119
|
-
function validatePropertyFromObjectExpression(objExpr, name, type) {
|
|
131
|
+
function validatePropertyFromObjectExpression(objExpr, name, type, state) {
|
|
120
132
|
const result = { errors: [] };
|
|
121
133
|
let value;
|
|
122
134
|
for (const property of objExpr.properties) {
|
|
@@ -142,11 +154,33 @@ function validatePropertyFromObjectExpression(objExpr, name, type) {
|
|
|
142
154
|
return result;
|
|
143
155
|
}
|
|
144
156
|
// extract value
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
157
|
+
if (type === 'string-or-derive') {
|
|
158
|
+
const stringValidation = validateExpressionIsStringLiteral(value.value);
|
|
159
|
+
if (stringValidation.value !== undefined) {
|
|
160
|
+
result.value = stringValidation.value;
|
|
161
|
+
}
|
|
162
|
+
else if (state) {
|
|
163
|
+
// String validation failed — check if it's a valid derive() expression
|
|
164
|
+
const deriveErrors = [];
|
|
165
|
+
validateDerive(value.value, state, deriveErrors);
|
|
166
|
+
if (deriveErrors.length === 0) {
|
|
167
|
+
result.hasDeriveExpression = true;
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
result.errors.push(...stringValidation.errors);
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
else {
|
|
174
|
+
result.errors.push(...stringValidation.errors);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
else {
|
|
178
|
+
const validatedValue = type === 'string'
|
|
179
|
+
? validateExpressionIsStringLiteral(value.value)
|
|
180
|
+
: validateExpressionIsNumericLiteral(value.value);
|
|
181
|
+
result.errors.push(...validatedValue.errors);
|
|
182
|
+
result.value = validatedValue.value;
|
|
183
|
+
}
|
|
150
184
|
return result;
|
|
151
185
|
}
|
|
152
186
|
/**
|
|
@@ -165,7 +199,7 @@ function validateExpressionIsStringLiteral(expr) {
|
|
|
165
199
|
/**
|
|
166
200
|
* Validates if an expression uses the derive() function correctly
|
|
167
201
|
*/
|
|
168
|
-
function
|
|
202
|
+
function validateDerive(expr, state, errors) {
|
|
169
203
|
if (!expr) {
|
|
170
204
|
errors.push('Expression is empty');
|
|
171
205
|
return { errors };
|
|
@@ -197,14 +231,14 @@ function validateDeclareStatic(expr, state, errors) {
|
|
|
197
231
|
errors.push('Operands must be expressions');
|
|
198
232
|
return { errors };
|
|
199
233
|
}
|
|
200
|
-
|
|
201
|
-
|
|
234
|
+
validateDerive(expr.right, state, errors);
|
|
235
|
+
validateDerive(expr.left, state, errors);
|
|
202
236
|
return { errors };
|
|
203
237
|
}
|
|
204
238
|
// 3. Template literal: `Hello there ${derive(getName())}`
|
|
205
239
|
if (t.isTemplateLiteral(expr)) {
|
|
206
240
|
if (!expr.expressions.some((expression) => t.isExpression(expression) &&
|
|
207
|
-
|
|
241
|
+
validateDerive(expression, state, errors).errors.length === 0)) {
|
|
208
242
|
errors.push('Expression does not use an allowed call expression');
|
|
209
243
|
}
|
|
210
244
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateTranslationFunctionCallback.js","sourceRoot":"","sources":["../../../src/transform/validation/validateTranslationFunctionCallback.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeA,
|
|
1
|
+
{"version":3,"file":"validateTranslationFunctionCallback.js","sourceRoot":"","sources":["../../../src/transform/validation/validateTranslationFunctionCallback.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeA,sDA4GC;AAOD,0EAKC;AAOD,kEAKC;AAuHD,wCAyEC;AAnVD,gDAAkC;AAClC,kEAG4C;AAE5C,iGAA8F;AAC9F,8DAA2D;AAE3D;;;;;GAKG;AACH,SAAgB,qBAAqB,CACnC,QAA0B,EAC1B,KAAqB;IAWrB,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,qDAAqD;IACrD,IAAI,QAAQ,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,CAAC,IAAI,CACT,+DAA+D,CAChE,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,0BAA0B;IAC1B,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,MAAM,CAAC,IAAI,CACT,oIAAoI,CACrI,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,uDAAuD;IACvD,MAAM,gBAAgB,GAAG,iCAAiC,CACxD,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CACtB,CAAC;IACF,MAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC;IAEvC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,0FAA0F;QAC1F,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACrD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,CAAC,IAAI,CACT,oIAAoI,CACrI,CAAC;YACF,OAAO,EAAE,MAAM,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;IACD,2BAA2B;IAC3B,IAAI,OAA2B,CAAC;IAChC,IAAI,EAAsB,CAAC;IAC3B,IAAI,IAAwB,CAAC;IAC7B,IAAI,QAA4B,CAAC;IACjC,IAAI,MAA0B,CAAC;IAC/B,IAAI,gBAAqC,CAAC;IAC1C,IAAI,QAAQ,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IAC7B,CAAC;IACD,IAAI,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,MAAM,eAAe,GAAG,oCAAoC,CAC1D,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EACrB,kCAAsB,CAAC,QAAQ,EAC/B,kBAAkB,EAClB,KAAK,CACN,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACvC,OAAO,GAAG,eAAe,CAAC,KAA2B,CAAC;QACtD,gBAAgB,GAAG,eAAe,CAAC,mBAAmB,CAAC;QACvD,MAAM,UAAU,GAAG,oCAAoC,CACrD,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EACrB,kCAAsB,CAAC,GAAG,EAC1B,QAAQ,CACT,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;QAClC,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC;QACtB,MAAM,gBAAgB,GAAG,oCAAoC,CAC3D,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EACrB,kCAAsB,CAAC,SAAS,EAChC,QAAQ,CACT,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACxC,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC;QAClC,MAAM,YAAY,GAAG,oCAAoC,CACvD,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EACrB,kCAAsB,CAAC,MAAM,EAC7B,QAAQ,CACT,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC;QAC1B,MAAM,cAAc,GAAG,oCAAoC,CACzD,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,EACrB,kCAAsB,CAAC,OAAO,EAC9B,QAAQ,CACT,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC;IAChC,CAAC;IAED,OAAO;QACL,MAAM;QACN,OAAO;QACP,OAAO;QACP,EAAE;QACF,IAAI;QACJ,QAAQ;QACR,MAAM;QACN,gBAAgB;KACjB,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,0CAA0C;AAC1C,SAAgB,+BAA+B,CAAC,SAA2B;IAGzE,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;AACpB,CAAC;AAED;;;GAGG;AACH,0CAA0C;AAC1C,SAAgB,2BAA2B,CAAC,SAA2B;IAGrE,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;AACpB,CAAC;AA4BD,SAAS,oCAAoC,CAC3C,OAA2B,EAC3B,IAAY,EACZ,IAA8C,EAC9C,KAAsB;IAMtB,MAAM,MAAM,GAIR,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACnB,IAAI,KAAmC,CAAC;IACxC,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QAC1C,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClC,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YAC/D,KAAK,GAAG,QAAQ,CAAC;YACjB,MAAM;QACR,CAAC;QACD,IAAI,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACnE,KAAK,GAAG,QAAQ,CAAC;YACjB,MAAM;QACR,CAAC;IACH,CAAC;IAED,kCAAkC;IAClC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,iBAAiB;IACjB,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QACjC,MAAM,CAAC,MAAM,CAAC,IAAI,CAChB,qEAAqE,IAAI,0CAA0C,CACpH,CAAC;QACF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,gBAAgB;IAChB,IAAI,IAAI,KAAK,kBAAkB,EAAE,CAAC;QAChC,MAAM,gBAAgB,GAAG,iCAAiC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACxE,IAAI,gBAAgB,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACzC,MAAM,CAAC,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC;QACxC,CAAC;aAAM,IAAI,KAAK,EAAE,CAAC;YACjB,uEAAuE;YACvE,MAAM,YAAY,GAAa,EAAE,CAAC;YAClC,cAAc,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;YACjD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9B,MAAM,CAAC,mBAAmB,GAAG,IAAI,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,cAAc,GAClB,IAAI,KAAK,QAAQ;YACf,CAAC,CAAC,iCAAiC,CAAC,KAAK,CAAC,KAAK,CAAC;YAChD,CAAC,CAAC,kCAAkC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;IACtC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,SAAS,iCAAiC,CAAC,IAAkB;;IAI3D,IAAI,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;IAC3C,CAAC;IACD,IAAI,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/D,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAA,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,0CAAE,KAAK,CAAC,MAAM,EAAE,CAAC;IAC7D,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,CAAC,oCAAoC,CAAC,EAAE,CAAC;AAC5D,CAAC;AAED;;GAEG;AACH,SAAgB,cAAc,CAC5B,IAAkB,EAClB,KAAqB,EACrB,MAAgB;IAEhB,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACnC,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,+BAA+B;IAC/B,IAAI,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,mCAAmC;QACnC,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,IAAA,yDAA2B,EAAC,IAAI,CAAC,CAAC;QAC1E,kCAAkC;QAClC,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,IAAA,uCAAkB,EAChD,KAAK,CAAC,YAAY,EAClB,aAAa,EACb,YAAY,CACb,CAAC;QACF,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;YAClE,OAAO,EAAE,MAAM,EAAE,CAAC;QACpB,CAAC;QACD,2DAA2D;QAC3D,IACE,IAAI,KAAK,oBAAoB;YAC7B,CAAC,aAAa,KAAK,8BAAkB,CAAC,aAAa;gBACjD,aAAa,KAAK,8BAAkB,CAAC,MAAM,CAAC,EAC9C,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;YAClE,OAAO,EAAE,MAAM,EAAE,CAAC;QACpB,CAAC;QACD,mGAAmG;QACnG,+BAA+B,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9C,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,8DAA8D;IAC9D,IAAI,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9D,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;YAC5C,OAAO,EAAE,MAAM,EAAE,CAAC;QACpB,CAAC;QACD,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACzC,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,0DAA0D;IAC1D,IAAI,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,IACE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CACpB,CAAC,UAAU,EAAE,EAAE,CACb,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC;YAC1B,cAAc,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAChE,EACD,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;QACpE,CAAC;QACD,OAAO;YACL,MAAM;SACP,CAAC;IACJ,CAAC;IAED,qCAAqC;IACrC,IAAI,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,iFAAiF;IACjF,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IACzC,OAAO,EAAE,MAAM,EAAE,CAAC;AACpB,CAAC;AAED;;;;;GAKG;AACH,SAAS,+BAA+B,CACtC,IAAsB,EACtB,MAAgB;IAIhB,4CAA4C;IAC5C,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAC/C,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;IAEjC,sCAAsC;IACtC,IAAI,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;QACjC,4DAA4D;QAC5D,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1C,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;YACpE,OAAO,EAAE,MAAM,EAAE,CAAC;QACpB,CAAC;QACD,sCAAsC;QACtC,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,kDAAkD;IAClD,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;QACpE,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,SAAS,kCAAkC,CAAC,IAAkB;IAI5D,IAAI,cAAkC,CAAC;IACvC,IAAI,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC;IAC9B,CAAC;SAAM,IAAI,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1E,wDAAwD;QACxD,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;IACvC,CAAC;IAED,sBAAsB;IACtB,IAAI,cAAc,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC;QACtE,OAAO,EAAE,MAAM,EAAE,CAAC,8BAA8B,CAAC,EAAE,CAAC;IACtD,CAAC;IAED,iBAAiB;IACjB,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,EAAE,MAAM,EAAE,CAAC,oCAAoC,CAAC,EAAE,CAAC;IAC5D,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC;AAC/C,CAAC"}
|
package/package.json
CHANGED