@@ -19,6 +19,14 @@ import { ObjectExpressionExtractor } from '../../enums/node-transformers/convert
1919
2020@injectable ( )
2121export class ObjectExpressionKeysTransformer extends AbstractNodeTransformer {
22+ /**
23+ * @type {ObjectExpressionExtractor[] }
24+ */
25+ private static readonly objectExpressionExtractorNames : ObjectExpressionExtractor [ ] = [
26+ ObjectExpressionExtractor . ObjectExpressionToVariableDeclarationExtractor ,
27+ ObjectExpressionExtractor . BasePropertiesExtractor
28+ ] ;
29+
2230 /**
2331 * @type {TObjectExpressionExtractorFactory }
2432 */
@@ -208,18 +216,45 @@ export class ObjectExpressionKeysTransformer extends AbstractNodeTransformer {
208216 return objectExpressionNode ;
209217 }
210218
219+ return this . applyObjectExpressionKeysExtractorsRecursive (
220+ ObjectExpressionKeysTransformer . objectExpressionExtractorNames ,
221+ objectExpressionNode ,
222+ hostStatement
223+ ) ;
224+ }
225+
226+ /**
227+ * @param {ObjectExpressionExtractor[] } objectExpressionExtractorNames
228+ * @param {ObjectExpression } objectExpressionNode
229+ * @param {Statement } hostStatement
230+ * @returns {Node }
231+ */
232+ private applyObjectExpressionKeysExtractorsRecursive (
233+ objectExpressionExtractorNames : ObjectExpressionExtractor [ ] ,
234+ objectExpressionNode : ESTree . ObjectExpression ,
235+ hostStatement : ESTree . Statement
236+ ) : ESTree . Node {
237+ const newObjectExpressionExtractorNames : ObjectExpressionExtractor [ ] = [ ...objectExpressionExtractorNames ] ;
238+ const objectExpressionExtractor : ObjectExpressionExtractor | undefined =
239+<
D2BC
/span> newObjectExpressionExtractorNames . shift ( ) ;
240+
241+ if ( ! objectExpressionExtractor ) {
242+ return objectExpressionNode ;
243+ }
244+
211245 const {
212- nodeToReplace : newObjectExpressionIdentifierReference ,
246+ nodeToReplace,
213247 objectExpressionHostStatement : newObjectExpressionHostStatement ,
214248 objectExpressionNode : newObjectExpressionNode
215- } = this
216- . objectExpressionExtractorFactory ( ObjectExpressionExtractor . ObjectExpressionToVariableDeclarationExtractor )
249+ } = this . objectExpressionExtractorFactory ( objectExpressionExtractor )
217250 . extract ( objectExpressionNode , hostStatement ) ;
218251
219- this
220- . objectExpressionExtractorFactory ( ObjectExpressionExtractor . BasePropertiesExtractor )
221- . extract ( newObjectExpressionNode , newObjectExpressionHostStatement ) ;
252+ this . applyObjectExpressionKeysExtractorsRecursive (
253+ newObjectExpressionExtractorNames ,
254+ newObjectExpressionNode ,
255+ newObjectExpressionHostStatement
256+ ) ;
222257
223- return newObjectExpressionIdentifierReference ;
258+ return nodeToReplace ;
224259 }
225260}
0 commit comments