@o3r/schematics 11.6.0-prerelease.4 → 11.6.0-prerelease.41

package/src/utility/sub-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"sub-entry.js","sourceRoot":"","sources":["../../../src/utility/sub-entry.ts"],"names":[],"mappings":";;AASA,0DAEC;AAQD,sEA2BC;AA5CD,kCAAkC;AAElC;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,IAAU,EAAE,WAAmB;IACrE,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAChE,CAAC;AACD;;;;;;GAMG;AACH,SAAgB,6BAA6B,CAAC,IAAU,EAAE,WAAmB,EAAE,UAAkB;IAC/F,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;QACzD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QACjE,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEvG,MAAM,YAAY,GAAG,aAAa,EAAE,GAAG,EAAE,YAAY,IAAI;YACvD,aAAa,EAAE,YAAY;YAC3B,eAAe,EAAE,cAAc;YAC/B,WAAW,EAAE,UAAU;YACvB,gBAAgB,EAAE,eAAe;YACjC,aAAa,EAAE,YAAY;YAC3B,eAAe,EAAE,cAAc;YAC/B,cAAc,EAAE,aAAa;YAC7B,oBAAoB,EAAE,mBAAmB;YACzC,mBAAmB,EAAE,kBAAkB;SACxC,CAAC;QACF,MAAM,WAAW,GAAG;YAClB,SAAS,EAAE;gBACT,IAAI,EAAE,IAAI;gBACV,GAAG,EAAE;oBACH,SAAS,EAAE,UAAU;oBACrB,YAAY;iBACb;aACF;SACF,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACxG,CAAC;AACH,CAAC"}
+{"version":3,"file":"sub-entry.js","sourceRoot":"","sources":["../../../src/utility/sub-entry.ts"],"names":[],"mappings":";;AAUA,0DAEC;AAQD,sEA2BC;AA/CD,kCAAkC;AAKlC;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,IAAU,EAAE,WAAmB;IACrE,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAChE,CAAC;AACD;;;;;;GAMG;AACH,SAAgB,6BAA6B,CAAC,IAAU,EAAE,WAAmB,EAAE,UAAkB;IAC/F,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;QACzD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;QACjE,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEvG,MAAM,YAAY,GAAG,aAAa,EAAE,GAAG,EAAE,YAAY,IAAI;YACvD,aAAa,EAAE,YAAY;YAC3B,eAAe,EAAE,cAAc;YAC/B,WAAW,EAAE,UAAU;YACvB,gBAAgB,EAAE,eAAe;YACjC,aAAa,EAAE,YAAY;YAC3B,eAAe,EAAE,cAAc;YAC/B,cAAc,EAAE,aAAa;YAC7B,oBAAoB,EAAE,mBAAmB;YACzC,mBAAmB,EAAE,kBAAkB;SACxC,CAAC;QACF,MAAM,WAAW,GAAG;YAClB,SAAS,EAAE;gBACT,IAAI,EAAE,IAAI;gBACV,GAAG,EAAE;oBACH,SAAS,EAAE,UAAU;oBACrB,YAAY;iBACb;aACF;SACF,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACxG,CAAC;AACH,CAAC"}

package/src/utility/template-property.helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-property.helper.d.ts","sourceRoot":"","sources":["../../../src/utility/template-property.helper.ts"],"names":[],"mappings":"AAUA;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAGnE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAGpE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,GAAG,MAAM,CAGjG;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,UAG7F;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAG1F;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAG7F;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAGpF;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,UAG1D;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,UAEtD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAG1F;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAG/F;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAG3F;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAG3F;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAGzF;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,iBAMrE"}
+{"version":3,"file":"template-property.helper.d.ts","sourceRoot":"","sources":["../../../src/utility/template-property.helper.ts"],"names":[],"mappings":"AAYA;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAGnE;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAGpE;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,GAAG,MAAM,CAGjG;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,UAG7F;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAG1F;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAG7F;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAGpF;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,UAG1D;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,UAEtD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAG1F;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAG/F;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAG3F;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAG3F;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,UAGzF;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,iBAMrE"}

package/src/utility/template-property.helper.js

@@ -29,7 +29,7 @@ function getComponentModuleItems(componentName) {
  */
 function getInputComponentName(componentName) {
     const componentModuleItems = getComponentModuleItems(componentName);
-    return componentModuleItems[componentModuleItems.length - 1];
+    return componentModuleItems.at(-1);
 }
 /**
  * returns the component folder name
@@ -152,7 +152,7 @@ function getLibraryNameFromPath(path) {
     if (!path) {
         return null;
     }
-    const libNameRes = /@[^@/]+\/[^/]+/.exec(path.replace(/\\/g, '/'));
+    const libNameRes = /@[^/@]+\/[^/]+/.exec(path.replace(/\\/g, '/'));
     return libNameRes && libNameRes[0];
 }
 //# sourceMappingURL=template-property.helper.js.map

package/src/utility/template-property.helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-property.helper.js","sourceRoot":"","sources":["../../../src/utility/template-property.helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"template-property.helper.js","sourceRoot":"","sources":["../../../src/utility/template-property.helper.ts"],"names":[],"mappings":";;AAgBA,sDAGC;AAMD,wDAGC;AAOD,oDAGC;AAOD,8EAGC;AAOD,wDAGC;AAOD,8DAGC;AAOD,4CAGC;AAMD,sDAGC;AAMD,sDAEC;AAOD,wDAGC;AAOD,kEAGC;AAOD,0DAGC;AAOD,0DAGC;AAOD,sDAGC;AAMD,wDAMC;AA7JD,+CAE8B;AAE9B;;;GAGG;AACH,SAAS,uBAAuB,CAAC,aAAqB;IACpD,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,aAAqB;IACzD,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,aAAa,CAAC,CAAC;IACpE,OAAO,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;AACtC,CAAC;AAED;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,aAAqB;IAC1D,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAChE,OAAO,cAAO,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAClE,CAAC;AAED;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,aAAqB,EAAE,qBAA6B;IACvF,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;IAClE,OAAO,qBAAqB,CAAC,CAAC,CAAC,GAAG,mBAAmB,IAAI,cAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC;AAC3H,CAAC;AAED;;;;GAIG;AACH,SAAgB,iCAAiC,CAAC,aAAqB,EAAE,MAAqB;IAC5F,MAAM,QAAQ,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;IACvD,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,4BAA4B;AAChG,CAAC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,aAAqB,EAAE,qBAA6B;IACzF,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAChE,OAAO,GAAG,cAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,cAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,QAAQ,CAAC;AACnG,CAAC;AAED;;;;GAIG;AACH,SAAgB,yBAAyB,CAAC,aAAqB,EAAE,qBAA6B;IAC5F,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAChE,OAAO,GAAG,cAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,cAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,WAAW,CAAC;AACtG,CAAC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,aAAqB,EAAE,qBAA6B;IACnF,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAChE,OAAO,GAAG,cAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,cAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,WAAW,CAAC;AACtG,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,aAAqB;IACzD,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAChE,OAAO,cAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;AAC9C,CAAC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,SAAiB;IACrD,OAAO,cAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AACtC,CAAC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,aAAqB,EAAE,qBAA6B;IACzF,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAChE,OAAO,GAAG,cAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,cAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,QAAQ,CAAC;AACnG,CAAC;AAED;;;;GAIG;AACH,SAAgB,2BAA2B,CAAC,aAAqB,EAAE,qBAA6B;IAC9F,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAChE,OAAO,GAAG,cAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,cAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,aAAa,CAAC;AACxG,CAAC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,aAAqB,EAAE,qBAA6B;IAC1F,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAChE,OAAO,GAAG,cAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,cAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,SAAS,CAAC;AACpG,CAAC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,aAAqB,EAAE,qBAA6B;IAC1F,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;IAChE,OAAO,GAAG,cAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,cAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC,SAAS,CAAC;AACpG,CAAC;AAED;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,aAAqB,EAAE,qBAA6B;IACxF,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC;IACrF,OAAO,GAAG,cAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;AAClE,CAAC;AAED;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,IAA+B;IACpE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IACnE,OAAO,UAAU,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;AACrC,CAAC"}

package/src/utility/update-imports.d.ts

@@ -1,6 +1,6 @@
-import * as ts from 'typescript';
 import { logging } from '@angular-devkit/core';
 import type { Tree } from '@angular-devkit/schematics';
+import * as ts from 'typescript';
 /** Map containing all import changes in otter packages */
 export interface ImportsMapping {
     [packageName: string]: {

package/src/utility/update-imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-imports.d.ts","sourceRoot":"","sources":["../../../src/utility/update-imports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAgBvD,0DAA0D;AAC1D,MAAM,WAAW,cAAc;IAC7B,CAAC,WAAW,EAAE,MAAM,GAAG;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CAC5F;AAGD;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,OAAO,CAAC,SAAS,EACzB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,aAAa,EAAE,MAAM,EACrB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,GAAE,cAAmB,EAC/B,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,UAoG7C"}
+{"version":3,"file":"update-imports.d.ts","sourceRoot":"","sources":["../../../src/utility/update-imports.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACR,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAgBjC,0DAA0D;AAC1D,MAAM,WAAW,cAAc;IAC7B,CAAC,WAAW,EAAE,MAAM,GAAG;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CAC5F;AAID;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,OAAO,CAAC,SAAS,EACzB,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,aAAa,EAAE,MAAM,EACrB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,GAAE,cAAmB,EAC/B,eAAe,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,UA8F7C"}

package/src/utility/update-imports.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateImportsInFile = updateImportsInFile;
-const ts = require("typescript");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
+const ts = require("typescript");
+const escapeRegExp = (str) => str.replace(/[$()*+./?[\\\]^{|}-]/g, '\\$&');
 /**
  * Update the imports of a given file according to replace mapping
  * @param logger Logger to report messages
@@ -20,7 +21,7 @@ function updateImportsInFile(logger, tree, sourceFile, importsRegexp, renamePack
     // First we look for all imports lines targeting an Otter package for which we know a mapping
     (0, ast_utils_1.findNodes)(sourceFile, ts.SyntaxKind.ImportDeclaration).map((nodeImp) => {
         const imp = nodeImp;
-        const importFrom = imp.moduleSpecifier.getText().replace(/['"]/g, '');
+        const importFrom = imp.moduleSpecifier.getText().replace(/["']/g, '');
         const renamePackageMatch = importFrom.match(renamePackagesRegexp);
         const otterPackage = renamePackageMatch?.[0] || importFrom.match(importsRegexp)?.[0];
         // If the import matched an Otter package
@@ -33,9 +34,9 @@ function updateImportsInFile(logger, tree, sourceFile, importsRegexp, renamePack
             // We retrieve all the symbols listed in the import statement
             const namedImport = imp.importClause?.namedBindings;
             const isTypeOnlyImport = !!imp.importClause && ts.isTypeOnlyImportDeclaration(imp.importClause);
-            const imports = namedImport && ts.isNamedImports(namedImport) ?
-                namedImport.elements.map((element) => ({ symbol: element.getText(), isTypeOnlyImport, location: importFrom })) :
-                [];
+            const imports = namedImport && ts.isNamedImports(namedImport)
+                ? namedImport.elements.map((element) => ({ symbol: element.getText(), isTypeOnlyImport, location: importFrom }))
+                : [];
             // And associate them to the Otter package
             oldImportedSymbolsPerPackage[otterPackage].push(...imports);
         }
@@ -48,13 +49,9 @@ function updateImportsInFile(logger, tree, sourceFile, importsRegexp, renamePack
     // If no mapping is found, we keep the original import location
     const resolvedImports = Object.entries(oldImportedSymbolsPerPackage).reduce((acc, [oldPackageName, importsFromOldPackage]) => {
         importsFromOldPackage.forEach((importSymbol) => {
-            let newPackageNameImport;
-            if (renamedPackages[oldPackageName]) {
-                newPackageNameImport = importSymbol.location.replace(oldPackageName, renamedPackages[oldPackageName]);
-            }
-            else {
-                newPackageNameImport = mapImports[oldPackageName]?.[importSymbol.symbol]?.newPackage;
-            }
+            const newPackageNameImport = renamedPackages[oldPackageName]
+                ? importSymbol.location.replace(oldPackageName, renamedPackages[oldPackageName])
+                : mapImports[oldPackageName]?.[importSymbol.symbol]?.newPackage;
             const importFrom = newPackageNameImport || importSymbol.location;
             if (!newPackageNameImport) {
                 unResolvedImports.push(importSymbol);
@@ -68,14 +65,13 @@ function updateImportsInFile(logger, tree, sourceFile, importsRegexp, renamePack
         return acc;
     }, {});
     let fileContent = tree.readText(sourceFile.fileName);
-    const escapeRegExp = (str) => str.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
     // Remove captured imports
     fileContent = fileContent.replace(new RegExp(`(${importNodes.map((node) => escapeRegExp(node.getText())).join('|')})[\\n\\r]*`, 'g'), '');
     // Replace imported values
     const valuesToReplace = Object.fromEntries(Object.values(mapImports).flatMap((mapImport) => Object.entries(mapImport)
         .filter(([_, value]) => value.newValue)
         .map(([key, value]) => [key, value.newValue])));
-    if (Object.keys(valuesToReplace).length) {
+    if (Object.keys(valuesToReplace).length > 0) {
         const matcher = new RegExp(Object.keys(valuesToReplace).map((oldValue) => `\\b${escapeRegExp(oldValue)}\\b`).join('|'), 'g');
         const replacer = (match) => valuesToReplace[match];
         fileContent = fileContent.replace(matcher, replacer);

package/src/utility/update-imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../src/utility/update-imports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../src/utility/update-imports.ts"],"names":[],"mappings":"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"}

package/src/utility/update-pipes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-pipes.d.ts","sourceRoot":"","sources":["../../../src/utility/update-pipes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAO1E,wCAAwC;AACxC,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAmD7G;;;GAGG;AACH,eAAO,MAAM,WAAW,wBAAyB,mBAAmB,KAAG,IAoDtE,CAAC"}
+{"version":3,"file":"update-pipes.d.ts","sourceRoot":"","sources":["../../../src/utility/update-pipes.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAepC,wCAAwC;AACxC,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAmD7G;;;GAGG;AACH,eAAO,MAAM,WAAW,wBAAyB,mBAAmB,KAAG,IAoDtE,CAAC"}

package/src/utility/update-pipes.js

@@ -44,7 +44,7 @@ const updatePipes = (pipeReplacementInfo) => (tree, context) => {
     const files = (0, loaders_1.findFilesInTree)(tree.root, (file) => file.endsWith('.html'));
     files.forEach((file) => {
         const matchers = Array.from(file.content.toString().matchAll(pipeRegex)).filter((matcher) => !!pipeReplacementInfo[matcher[1]]);
-        if (matchers.length) {
+        if (matchers.length > 0) {
             const directory = (0, node_path_1.dirname)(file.path);
             const baseFileName = (0, node_path_1.basename)((0, node_path_1.basename)(file.path, '.html'), '.template');
             const componentFile = (0, node_path_1.join)(directory, `${baseFileName}.component.ts`);
@@ -59,9 +59,9 @@ const updatePipes = (pipeReplacementInfo) => (tree, context) => {
             }
             if (standalone) {
                 const componentSourceFile = ts.createSourceFile(componentFile, tree.readText(componentFile), ts.ScriptTarget.ES2020, true);
-                const [ngClass] = componentSourceFile.statements.filter((statement) => ts.isClassDeclaration(statement)
+                const ngClass = componentSourceFile.statements.find((statement) => ts.isClassDeclaration(statement)
                     && (0, component_1.isNgClassComponent)(statement));
-                const [ngDecorator] = ((ngClass && ts.getDecorators(ngClass)) || []).filter(component_1.isNgClassDecorator);
+                const ngDecorator = ((ngClass && ts.getDecorators(ngClass)) || []).find((decorator) => (0, component_1.isNgClassDecorator)(decorator));
                 if (ngDecorator) {
                     applyChanges(pipeReplacementInfo, ngDecorator, matchers, componentFile, file.path, tree, context);
                 }
@@ -69,8 +69,8 @@ const updatePipes = (pipeReplacementInfo) => (tree, context) => {
             else if (tree.exists(moduleFile)) {
                 const moduleSourceFile = ts.createSourceFile(moduleFile, tree.readText(moduleFile), ts.ScriptTarget.ES2020, true);
                 const ngModuleClass = moduleSourceFile.statements.find((statement) => ts.isClassDeclaration(statement)
-                    && !!(ts.getDecorators(statement) || []).find(isNgModuleDecorator));
-                const ngDecorator = ((ngModuleClass && ts.getDecorators(ngModuleClass)) || []).find(isNgModuleDecorator);
+                    && (ts.getDecorators(statement) || []).some((decorator) => isNgModuleDecorator(decorator)));
+                const ngDecorator = ((ngModuleClass && ts.getDecorators(ngModuleClass)) || []).find((decorator) => isNgModuleDecorator(decorator));
                 if (ngDecorator && (0, ast_1.isDecoratorWithArg)(ngDecorator)) {
                     applyChanges(pipeReplacementInfo, ngDecorator, matchers, moduleFile, file.path, tree, context);
                 }

package/src/utility/update-pipes.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-pipes.js","sourceRoot":"","sources":["../../../src/utility/update-pipes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-pipes.js","sourceRoot":"","sources":["../../../src/utility/update-pipes.ts"],"names":[],"mappings":";;;AAAA,yCAImB;AAMnB,iCAAiC;AACjC,+BAGe;AACf,2CAIqB;AACrB,uCAEmB;AAKnB,MAAM,YAAY,GAAG,CACnB,mBAAwC,EACxC,WAA6B,EAC7B,QAA4B,EAC5B,eAAuB,EACvB,YAAoB,EACpB,IAAU,EACV,OAAyB,EACzB,EAAE;IACF,IAAI,EAAE,CAAC,yBAAyB,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,MAAM,WAAW,GAAG,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAA8E,EAAE,CAC3J,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC;eAC1B,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;eAC1B,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS;eAC5B,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CACjD,CAAC;QACF,IAAI,WAAW,EAAE,CAAC;YAChB,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBAC5B,MAAM,kBAAkB,GAAG,IAAI,MAAM,CAAC,MAAM,mBAAmB,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,EAAE,GAAG,CAAC,CAAC;gBAC5F,IAAI,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC;oBACnG,IAAI,mBAAmB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;wBAC7C,IAAI,CAAC,SAAS,CACZ,eAAe,EACf,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,UAAU,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CACxG,CAAC;oBACJ,CAAC;oBACD,IAAI,CAAC,SAAS,CACZ,YAAY,EACZ,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,UAAU,QAAQ,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,mBAAmB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAC7H,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,mBAAmB,QAAQ,iBAAiB,YAAY,GAAG;0BACzD,+BAA+B,eAAe,EAAE;0BAChD,yCAAyC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,CACrF,CAAC;gBACJ,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,SAAuB,EAAE,EAAE,CACtD,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,UAAU,CAAC;OACtC,SAAS,CAAC,UAAU,CAAC,UAAU;OAC/B,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC;OAChD,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,KAAK,UAAU,CAAC;AAEzD;;;GAGG;AACI,MAAM,WAAW,GAAG,CAAC,mBAAwC,EAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IAC/F,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,WAAW,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5F,MAAM,KAAK,GAAG,IAAA,yBAAe,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3E,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CACzB,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAC5C,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACzD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,SAAS,GAAG,IAAA,mBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrC,MAAM,YAAY,GAAG,IAAA,oBAAQ,EAAC,IAAA,oBAAQ,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,CAAC;YACzE,MAAM,aAAa,GAAG,IAAA,gBAAI,EAAC,SAAS,EAAE,GAAG,YAAY,eAAe,CAAC,CAAC;YACtE,MAAM,UAAU,GAAG,IAAA,gBAAI,EAAC,SAAS,EAAE,GAAG,YAAY,YAAY,CAAC,CAAC;YAChE,IAAI,UAAU,GAAG,KAAK,CAAC;YACvB,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC;oBACH,MAAM,IAAI,GAAG,IAAA,gDAAoC,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;oBACvE,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;gBAC/B,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;YACZ,CAAC;YACD,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,mBAAmB,GAAG,EAAE,CAAC,gBAAgB,CAC7C,aAAa,EACb,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAC5B,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;gBACF,MAAM,OAAO,GAAG,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAoC,EAAE,CAClG,EAAE,CAAC,kBAAkB,CAAC,SAAS,CAAC;uBAC7B,IAAA,8BAAkB,EAAC,SAAS,CAAC,CACjC,CAAC;gBACF,MAAM,WAAW,GAAG,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAA,8BAAkB,EAAC,SAAS,CAAC,CAAC,CAAC;gBACtH,IAAI,WAAW,EAAE,CAAC;oBAChB,YAAY,CAAC,mBAAmB,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;gBACpG,CAAC;YACH,CAAC;iBAAM,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;gBACnC,MAAM,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CAC1C,UAAU,EACV,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,EACzB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;gBACF,MAAM,aAAa,GAAG,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAoC,EAAE,CACrG,EAAE,CAAC,kBAAkB,CAAC,SAAS,CAAC;uBAC7B,CAAC,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAC3F,CAAC;gBACF,MAAM,WAAW,GAAG,CAAC,CAAC,aAAa,IAAI,EAAE,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;gBACnI,IAAI,WAAW,IAAI,IAAA,wBAAkB,EAAC,WAAW,CAAC,EAAE,CAAC;oBACnD,YAAY,CAAC,mBAAmB,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;gBACjG,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AApDW,QAAA,WAAW,eAoDtB"}

package/src/utility/wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AA2CvD;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,EAAE,gBA4CnD,CAAC"}
+{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EACV,gBAAgB,EACjB,MAAM,gBAAgB,CAAC;AAgDxB;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,EAAE,gBA8CnD,CAAC"}

package/src/utility/wrapper.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSchematicWithMetricsIfInstalled = void 0;
+const node_fs_1 = require("node:fs");
+const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const inquirer_1 = require("inquirer");
-const node_fs_1 = require("node:fs");
-const path = require("node:path");
-const rule_factories_1 = require("../rule-factories");
+const dependencies_2 = require("../rule-factories/ng-add/dependencies");
 const noopSchematicWrapper = (fn) => fn;
 const PACKAGE_JSON_PATH = 'package.json';
 const setupO3rMetricsInPackageJson = (activated) => (tree) => {
@@ -19,11 +19,10 @@ const setupO3rMetricsInPackageJson = (activated) => (tree) => {
     }
 };
 const setupTelemetry = ({ workingDirectory, runNgAdd, exactO3rVersion }) => (_, context) => {
-    const taskIdsFromContext = (0, rule_factories_1.hasSetupInformation)(context) ? context.setupDependencies.taskIds : undefined;
-    const version = JSON.parse((0, node_fs_1.readFileSync)(path.join(__dirname, '..', '..', 'package.json'), 'utf-8')).version;
-    return (0, rule_factories_1.setupDependencies)({
+    const taskIdsFromContext = (0, dependencies_2.hasSetupInformation)(context) ? context.setupDependencies.taskIds : undefined;
+    const version = JSON.parse((0, node_fs_1.readFileSync)(path.join(__dirname, '..', '..', 'package.json'), 'utf8')).version;
+    return (0, dependencies_2.setupDependencies)({
         dependencies: {
-            // eslint-disable-next-line @typescript-eslint/naming-convention
             '@o3r/telemetry': {
                 inManifest: [{
                         range: `${exactO3rVersion ? '' : '~'}${version}`,
@@ -75,11 +74,13 @@ For more details and instructions on how to change these settings, see https://g
     }
     const subtreeDirectory = context.schematic.description.name === 'typescript-shell' ? opts.directory.split(path.posix.sep).join(path.sep) ?? '' : '';
     const rule = (0, schematics_1.chain)([
-        typeof shouldInstallTelemetry !== 'undefined' ? (0, schematics_1.applyToSubtree)(subtreeDirectory, [setupO3rMetricsInPackageJson(!!shouldInstallTelemetry)]) : (0, schematics_1.noop)(),
+        typeof shouldInstallTelemetry === 'undefined' ? (0, schematics_1.noop)() : (0, schematics_1.applyToSubtree)(subtreeDirectory, [setupO3rMetricsInPackageJson(!!shouldInstallTelemetry)]),
         schematicFn(opts),
-        shouldInstallTelemetry ? (0, schematics_1.applyToSubtree)(subtreeDirectory, [
-            setupTelemetry({ workingDirectory: subtreeDirectory || undefined, runNgAdd: !subtreeDirectory, exactO3rVersion: opts.exactO3rVersion })
-        ]) : (0, schematics_1.noop)(),
+        shouldInstallTelemetry
+            ? (0, schematics_1.applyToSubtree)(subtreeDirectory, [
+                setupTelemetry({ workingDirectory: subtreeDirectory || undefined, runNgAdd: !subtreeDirectory, exactO3rVersion: opts.exactO3rVersion })
+            ])
+            : (0, schematics_1.noop)(),
         typeof shouldInstallTelemetry !== 'undefined' && subtreeDirectory ? (0, schematics_1.applyToSubtree)(subtreeDirectory, [setupO3rMetricsInPackageJson(shouldInstallTelemetry)]) : (0, schematics_1.noop)()
     ]);
     return wrapper(() => rule)(opts);

package/src/utility/wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"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"}