@simplysm/sd-cli 7.0.75 → 7.0.80
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/.eslintrc.cjs +3 -0
- package/dist/bin/sd-cli.mjs +38 -3
- package/dist/build-tool/SdCliCordova.mjs +50 -41
- package/dist/build-tool/SdCliNgCacheCompilerHost.d.ts +1 -0
- package/dist/build-tool/SdCliNgCacheCompilerHost.mjs +11 -4
- package/dist/build-tool/SdCliPackageLinter.mjs +9 -5
- package/dist/builder/SdCliClientBuilder.d.ts +1 -0
- package/dist/builder/SdCliClientBuilder.mjs +44 -37
- package/dist/builder/SdCliJsLibBuilder.mjs +3 -3
- package/dist/builder/SdCliServerBuilder.d.ts +0 -1
- package/dist/builder/SdCliServerBuilder.mjs +13 -39
- package/dist/builder/SdCliTsLibBuilder.d.ts +1 -0
- package/dist/builder/SdCliTsLibBuilder.mjs +18 -6
- package/dist/commons.d.ts +2 -4
- package/dist/entry-points/SdCliFileCrypto.d.ts +7 -0
- package/dist/entry-points/SdCliFileCrypto.mjs +72 -0
- package/dist/entry-points/SdCliLocalUpdate.mjs +3 -3
- package/dist/entry-points/SdCliPrepare.mjs +1 -1
- package/dist/entry-points/SdCliWorkspace.mjs +2 -2
- package/dist/index.d.ts +1 -0
- package/dist/index.mjs +2 -1
- package/dist/ng-tools/SdCliNgModuleGenerator.mjs +1 -4
- package/dist/ng-tools/babel/SdCliBbFileMetadata.d.ts +1 -1
- package/dist/ng-tools/babel/SdCliBbFileMetadata.mjs +4 -4
- package/dist/ng-tools/babel/TSdCliBbNgMetadata.mjs +6 -6
- package/dist/utils/SdCliBuildResultUtil.mjs +4 -1
- package/package.json +6 -6
- package/src/bin/sd-cli.ts +53 -3
- package/src/build-tool/SdCliCordova.ts +60 -42
- package/src/build-tool/SdCliNgCacheCompilerHost.ts +19 -11
- package/src/build-tool/SdCliPackageLinter.ts +8 -4
- package/src/builder/SdCliClientBuilder.ts +41 -32
- package/src/builder/SdCliJsLibBuilder.ts +2 -2
- package/src/builder/SdCliServerBuilder.ts +9 -36
- package/src/builder/SdCliTsLibBuilder.ts +21 -5
- package/src/commons.ts +2 -2
- package/src/entry-points/SdCliFileCrypto.ts +87 -0
- package/src/entry-points/SdCliLocalUpdate.ts +2 -2
- package/src/entry-points/SdCliPrepare.ts +1 -1
- package/src/entry-points/SdCliWorkspace.ts +1 -1
- package/src/index.ts +1 -0
- package/src/ng-tools/SdCliNgModuleGenerator.ts +1 -4
- package/src/ng-tools/babel/SdCliBbFileMetadata.ts +5 -5
- package/src/ng-tools/babel/TSdCliBbNgMetadata.ts +5 -5
- package/src/utils/SdCliBuildResultUtil.ts +4 -0
|
@@ -449,9 +449,9 @@ export class SdCliBbFileMetadata {
|
|
|
449
449
|
}
|
|
450
450
|
}
|
|
451
451
|
});
|
|
452
|
-
if (result === undefined) {
|
|
453
|
-
|
|
454
|
-
}
|
|
452
|
+
// if (result === undefined) {
|
|
453
|
+
// throw new NeverEntryError(this.filePath + "," + className);
|
|
454
|
+
// }
|
|
455
455
|
this._getNgDecoArgCache.set(className, result);
|
|
456
456
|
return result;
|
|
457
457
|
}
|
|
@@ -479,4 +479,4 @@ export class SdCliBbFileMetadata {
|
|
|
479
479
|
throw new NeverEntryError();
|
|
480
480
|
}
|
|
481
481
|
}
|
|
482
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliBbFileMetadata.js","sourceRoot":"","sources":["../../../src/ng-tools/babel/SdCliBbFileMetadata.ts"],"names":[],"mappings":"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"}
|
|
482
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SdCliBbFileMetadata.js","sourceRoot":"","sources":["../../../src/ng-tools/babel/SdCliBbFileMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EACjB,sBAAsB,EACtB,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,0BAA0B,EAC1B,wBAAwB,EACxB,iBAAiB,EACjB,qBAAqB,EACrB,qBAAqB,EACrB,YAAY,EACZ,mBAAmB,EACnB,wBAAwB,EACxB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,qBAAqB,EAIrB,YAAY,EACb,MAAM,cAAc,CAAC;AACtB,OAAO,WAA4B,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,EACrB,uBAAuB,EACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE3D,MAAM,OAAO,mBAAmB;IAI9B,YAAmC,QAAgB;QAAhB,aAAQ,GAAR,QAAQ,CAAQ;QAmIlC,8BAAyB,GAAG,IAAI,GAAG,EAA4B,CAAC;QAmGhE,6BAAwB,GAAG,IAAI,GAAG,EAA4B,CAAC;QAuK/D,uBAAkB,GAAG,IAAI,GAAG,EAA6C,CAAC;QA5YzF,IAAI,YAAgC,CAAC;QACrC,KAAK,MAAM,GAAG,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;YAC7C,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE;gBAC/E,YAAY,GAAG,QAAQ,GAAG,GAAG,CAAC;gBAC9B,MAAM;aACP;SACF;QACD,IAAI,YAAY,KAAK,SAAS,EAAE;YAC9B,MAAM,WAAW,CAAC,KAAK,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;SACrD;QAED,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAClD,IAAI,CAAC,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;QACpE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;IACxC,CAAC;IAID,IAAW,OAAO;QAChB,IAAI,IAAI,CAAC,aAAa;YAAE,OAAO,IAAI,CAAC,aAAa,CAAC;QAElD,MAAM,MAAM,GAAyD,EAAE,CAAC;QACxE,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;YACnC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBAAE,SAAS;YAE5C,IAAI,wBAAwB,CAAC,OAAO,CAAC,EAAE;gBACrC,IAAI,OAAO,CAAC,WAAW,EAAE;oBACvB,IAAI,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;wBAC9C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE;4BACnD,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gCACzB,MAAM,CAAC,IAAI,CAAC;oCACV,YAAY,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI;oCAC1B,MAAM,EAAE,IAAI,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC;iCAChD,CAAC,CAAC;6BACJ;iCACI;gCACH,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;6BAC5E;yBACF;qBACF;yBACI,IAAI,kBAAkB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;wBAChD,MAAM,CAAC,IAAI,CAAC;4BACV,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI;4BACzC,MAAM,EAAE,IAAI,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC;yBAC5D,CAAC,CAAC;qBACJ;yBACI,IAAI,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;wBACnD,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE;4BAC1B,MAAM,CAAC,IAAI,CAAC;gCACV,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI;gCACzC,MAAM,EAAE,IAAI,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC;6BAC/D,CAAC,CAAC;yBACJ;6BACI;4BACH,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;yBAC5E;qBACF;yBACI;wBACH,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;qBAC5E;iBACF;qBACI;oBACH,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE;wBAC1C,IAAI,iBAAiB,CAAC,SAAS,CAAC,EAAE;4BAChC,MAAM,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;4BAC5F,IAAI,YAAY,KAAK,SAAS,EAAE;gCAC9B,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;6BAC5E;4BAED,IAAI,OAAO,CAAC,MAAM,EAAE;gCAClB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oCACtC,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oCACvF,MAAM,CAAC,IAAI,CAAC;wCACV,YAAY;wCACZ,MAAM,EAAE;4CACN,QAAQ,EAAE,cAAc;4CACxB,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI;4CAC1B,iBAAiB,EAAE,mBAAmB;yCACvC;qCACF,CAAC,CAAC;iCACJ;qCACI;oCACH,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;oCACxC,MAAM,CAAC,IAAI,CAAC;wCACV,YAAY;wCACZ,MAAM,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,iBAAiB,EAAE,mBAAmB,EAAE;qCAC3F,CAAC,CAAC;iCACJ;6BACF;iCACI;gCACH,MAAM,CAAC,IAAI,CAAC;oCACV,YAAY;oCACZ,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC;iCACvD,CAAC,CAAC;6BACJ;yBACF;6BACI;4BACH,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;yBAC5E;qBACF;iBACF;aACF;iBACI,IAAI,0BAA0B,CAAC,OAAO,CAAC,EAAE;gBAC5C,MAAM,CAAC,IAAI,CAAC;oBACV,YAAY,EAAE,SAAS;oBACvB,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC;iBACjD,CAAC,CAAC;aACJ;iBACI;gBACH,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACtC,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBACvF,MAAM,CAAC,IAAI,CAAC;wBACV,YAAY,EAAE,GAAG;wBACjB,MAAM,EAAE;4BACN,QAAQ,EAAE,cAAc;4BACxB,IAAI,EAAE,GAAG;4BACT,iBAAiB,EAAE,mBAAmB;yBACvC;qBACF,CAAC,CAAC;iBACJ;qBACI;oBACH,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAC5E;aACF;SACF;QAED,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;QAC5B,OAAO,MAAM,CAAC;IAChB,CAAC;IAIM,mBAAmB,CAAC,IAAY;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAEtC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;YACnC,IAAI,wBAAwB,CAAC,OAAO,CAAC,EAAE;gBACrC,IAAI,OAAO,CAAC,WAAW,EAAE;oBACvB,IAAI,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;wBAC9C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE;4BACnD,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gCACzB,IAAI,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,EAAE;oCACzB,MAAM,MAAM,GAAG,IAAI,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;oCACvD,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oCACjD,OAAO,MAAM,CAAC;iCACf;6BACF;iCACI;gCACH,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;6BAC5E;yBACF;qBACF;yBACI,IAAI,kBAAkB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;wBAChD,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,EAAE;4BACxC,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;4BACnE,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;4BACjD,OAAO,MAAM,CAAC;yBACf;qBACF;yBACI,IAAI,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;wBACnD,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE;4BAC1B,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,EAAE;gCACxC,MAAM,MAAM,GAAG,IAAI,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;gCACtE,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gCACjD,OAAO,MAAM,CAAC;6BACf;yBACF;6BACI;4BACH,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;yBAC5E;qBACF;yBACI;wBACH,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;qBAC5E;iBACF;qBACI;oBACH,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE;wBAC1C,IAAI,iBAAiB,CAAC,SAAS,CAAC,EAAE;4BAChC,MAAM,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;4BAC5F,IAAI,YAAY,KAAK,SAAS,EAAE;gCAC9B,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;6BAC5E;iCACI,IAAI,YAAY,KAAK,IAAI,EAAE;gCAC9B,IAAI,OAAO,CAAC,MAAM,EAAE;oCAClB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;wCACtC,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wCACvF,MAAM,MAAM,GAAG;4CACb,QAAQ,EAAE,cAAc;4CACxB,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI;4CAC1B,iBAAiB,EAAE,mBAA4B;yCAChD,CAAC;wCACF,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;wCACjD,OAAO,MAAM,CAAC;qCACf;yCACI;wCACH,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;wCACxC,MAAM,MAAM,GAAG;4CACb,UAAU;4CACV,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI;4CAC1B,iBAAiB,EAAE,mBAA4B;yCAChD,CAAC;wCACF,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;wCACjD,OAAO,MAAM,CAAC;qCACf;iCACF;qCACI;oCACH,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oCAC9D,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;oCACjD,OAAO,MAAM,CAAC;iCACf;6BACF;yBACF;qBACF;iBACF;aACF;iBACI,IAAI,0BAA0B,CAAC,OAAO,CAAC,IAAI,IAAI,KAAK,SAAS,EAAE;gBAClE,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;gBACxD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oBACzB,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAC5E;gBACD,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBACjD,OAAO,MAAM,CAAC;aACf;SACF;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAIO,mBAAmB,CAAC,SAAiB;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;QAEtC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;YACnC,IAAI,kBAAkB,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,EAAE,CAAC,IAAI,KAAK,SAAS,EAAE;gBAChE,OAAO,IAAI,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aAChD;iBACI,IAAI,wBAAwB,CAAC,OAAO,CAAC,EAAE;gBAC1C,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE;oBAC1C,IAAI,iBAAiB,CAAC,SAAS,CAAC,EAAE;wBAChC,MAAM,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;wBAC5F,IAAI,YAAY,KAAK,SAAS,EAAE;4BAC9B,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;yBAC5E;6BACI,IAAI,YAAY,KAAK,SAAS,EAAE;4BACnC,IAAI,OAAO,CAAC,MAAM,EAAE;gCAClB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oCACtC,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oCACvF,MAAM,MAAM,GAAG;wCACb,QAAQ,EAAE,cAAc;wCACxB,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI;wCAC1B,iBAAiB,EAAE,mBAA4B;qCAChD,CAAC;oCACF,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;oCACrD,OAAO,MAAM,CAAC;iCACf;qCACI;oCACH,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;oCACxC,MAAM,MAAM,GAAG;wCACb,UAAU;wCACV,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,IAAI;wCAC1B,iBAAiB,EAAE,mBAA4B;qCAChD,CAAC;oCACF,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;oCACrD,OAAO,MAAM,CAAC;iCACf;6BACF;yBACF;qBACF;iBACF;aACF;YACD;;;;;;;eAOG;iBACE,IAAI,mBAAmB,CAAC,OAAO,CAAC,EAAE;gBACrC,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE;oBAC1C,IAAI,iBAAiB,CAAC,SAAS,CAAC,EAAE;wBAChC,MAAM,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;wBACtF,IAAI,YAAY,KAAK,SAAS,EAAE;4BAC9B,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;yBAC5E;6BACI,IAAI,YAAY,KAAK,SAAS,EAAE;4BACnC,IAAI,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;gCACpC,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oCACtC,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oCACvF,MAAM,MAAM,GAAG;wCACb,QAAQ,EAAE,cAAc;wCACxB,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI;wCAC7B,iBAAiB,EAAE,mBAA4B;qCAChD,CAAC;oCACF,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;oCACrD,OAAO,MAAM,CAAC;iCACf;qCACI;oCACH,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;oCACxC,MAAM,MAAM,GAAG;wCACb,UAAU;wCACV,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI;wCAC7B,iBAAiB,EAAE,mBAA4B;qCAChD,CAAC;oCACF,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;oCACrD,OAAO,MAAM,CAAC;iCACf;6BACF;iCACI;gCACH,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;6BAC5E;yBACF;qBACF;yBACI,IAAI,wBAAwB,CAAC,SAAS,CAAC,EAAE;wBAC5C,IAAI,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;4BACtC,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gCACtC,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gCACvF,MAAM,MAAM,GAAG;oCACb,QAAQ,EAAE,cAAc;oCACxB,IAAI,EAAE,SAAS;oCACf,iBAAiB,EAAE,mBAA4B;iCAChD,CAAC;gCACF,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gCACrD,OAAO,MAAM,CAAC;6BACf;iCACI;gCACH,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;gCACxC,MAAM,MAAM,GAAG;oCACb,UAAU;oCACV,IAAI,EAAE,SAAS;oCACf,iBAAiB,EAAE,mBAA4B;iCAChD,CAAC;gCACF,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gCACrD,OAAO,MAAM,CAAC;6BACf;yBACF;qBACF;iBACF;aACF;iBACI,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE;gBACvC,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,YAAY,EAAE;oBACvC,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;wBACzB,IAAI,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,SAAS,EAAE;4BAC9B,MAAM,MAAM,GAAG,IAAI,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;4BACvD,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;4BACrD,OAAO,MAAM,CAAC;yBACf;qBACF;yBACI;wBACH,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;qBAC5E;iBACF;aACF;iBACI,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE;gBACvC,IAAI,OAAO,CAAC,EAAE,EAAE;oBACd,IAAI,OAAO,CAAC,EAAE,CAAC,IAAI,KAAK,SAAS,EAAE;wBACjC,MAAM,MAAM,GAAG,IAAI,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;wBAC1D,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;wBACrD,OAAO,MAAM,CAAC;qBACf;iBACF;qBACI;oBACH,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBAC5E;aACF;SACF;QAED,MAAM,WAAW,CAAC,KAAK,CAAC,IAAI,SAAS,wBAAwB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChF,CAAC;IAEM,cAAc,CAAC,OAA+D;QACnF,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC/C;aACI,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE;YACpC,OAAO,IAAI,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChD;aACI,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE;YACnC,OAAO,IAAI,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAChD;aACI,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE;YACpC,OAAO,IAAI,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACjD;aACI,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE;YACjC,OAAO,OAAO,CAAC,KAAK,CAAC;SACtB;aACI,IAAI,eAAe,CAAC,OAAO,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SAC9C;QAED,MAAM,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7E,CAAC;IAIM,YAAY,CAAC,SAAiB;QACnC,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAC1C,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;SAChD;QAED,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;YAChC,gCAAgC;YAChC,IACE,qBAAqB,CAAC,IAAI,CAAC;gBAC3B,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC;gBACjC,CACE,CACE,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;oBAC1C,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC;oBAC7C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,0BAA0B,CACpE;oBACD,CACE,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;wBACpC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,KAAK,wBAAwB,CACzD,CACF;gBACD,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAChD;gBACA,MAAM,OAAO,GAAG,IAAI,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9E,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;gBACjD,IACE,WAAW,YAAY,oBAAoB;oBAC3C,WAAW,CAAC,IAAI,KAAK,SAAS,EAC9B;oBACA,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;oBACjD,IACE,KAAK,YAAY,oBAAoB;wBACrC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,qBAAqB,EAC/C;wBACA,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;wBACjD,IACE,IAAI,YAAY,oBAAoB;4BACpC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,qBAAqB,EAC9C;4BACA,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;4BACtD,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;yBACtB;qBACF;yBACI;wBACH,MAAM,IAAI,eAAe,EAAE,CAAC;qBAC7B;iBACF;aACF;SACF;QAED,6BAA6B;QAC7B,IAAI,MAAyC,CAAC;QAC9C,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9B,IACE,gBAAgB,CAAC,IAAI,CAAC;gBACtB,CACE,CACE,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC;oBAC/B,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;oBAClC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,mBAAmB,CAClD;oBACD,CACE,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC;wBACzB,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,kBAAkB,CACxC,CACF;gBACD,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS;gBACpC,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EACpC;gBACA,MAAM,KAAK,GAAG,IAAI,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChE,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,qBAAqB,EAAE;oBACnD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;oBACjD,IACE,IAAI,YAAY,oBAAoB;wBACpC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,qBAAqB,EAC9C;wBACA,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;qBACxB;iBACF;qBACI;oBACH,MAAM,IAAI,eAAe,EAAE,CAAC;iBAC7B;aACF;QACH,CAAC,CAAC,CAAC;QAEH,8BAA8B;QAC9B,gEAAgE;QAChE,IAAI;QAEJ,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,kBAAkB,CAAC,SAAiB,EAAE,QAAgB,EAAE,QAAgB;QAC7E,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,EAAE;YAChC,IACE,qBAAqB,CAAC,IAAI,CAAC;gBAC3B,sBAAsB,CAAC,IAAI,CAAC,UAAU,CAAC;gBACvC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBACxC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;gBACzC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS;gBAC9C,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,EAC3C;gBACA,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE;oBACnD,IACE,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;wBACvC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;wBAC1C,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EACtD;wBACA,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;wBACvF,OAAO,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;qBAC1C;yBACI;wBACH,MAAM,IAAI,eAAe,EAAE,CAAC;qBAC7B;iBACF;aACF;SACF;QAED,MAAM,IAAI,eAAe,EAAE,CAAC;IAC9B,CAAC;CACF"}
|
|
@@ -13,12 +13,12 @@ export class SdCliBbNgModuleMetadata {
|
|
|
13
13
|
providers: []
|
|
14
14
|
};
|
|
15
15
|
const argObjMeta = this._fileMeta.getNgDecoArg(this._className);
|
|
16
|
-
const expVal = argObjMeta
|
|
16
|
+
const expVal = argObjMeta?.getPropValue("exports") ?? this._fileMeta.getNgDecoPropValue(this._className, "ɵmod", "exports");
|
|
17
17
|
if (expVal !== undefined) {
|
|
18
18
|
const expMetas = this._getExportAndProviderMetas(expVal);
|
|
19
19
|
result.exports.push(...expMetas);
|
|
20
20
|
}
|
|
21
|
-
const provVal = argObjMeta
|
|
21
|
+
const provVal = argObjMeta?.getPropValue("providers") ?? this._fileMeta.getNgDecoPropValue(this._className, "ɵmod", "providers");
|
|
22
22
|
if (provVal !== undefined) {
|
|
23
23
|
const provMetas = this._getExportAndProviderMetas(provVal);
|
|
24
24
|
result.providers.push(...provMetas);
|
|
@@ -117,7 +117,7 @@ export class SdCliBbNgDirectiveMetadata {
|
|
|
117
117
|
if (this._selectorCache !== undefined)
|
|
118
118
|
return this._selectorCache;
|
|
119
119
|
const argObjMeta = this._fileMeta.getNgDecoArg(this._className);
|
|
120
|
-
const val = argObjMeta
|
|
120
|
+
const val = argObjMeta?.getPropValue("selector") ?? this._fileMeta.getNgDecoPropValue(this._className, "ɵdir", "selector");
|
|
121
121
|
if (typeof val === "string") {
|
|
122
122
|
this._selectorCache = val;
|
|
123
123
|
return this._selectorCache;
|
|
@@ -136,7 +136,7 @@ export class SdCliBbNgComponentMetadata {
|
|
|
136
136
|
if (this._selectorCache !== undefined)
|
|
137
137
|
return this._selectorCache;
|
|
138
138
|
const argObjMeta = this._fileMeta.getNgDecoArg(this._className);
|
|
139
|
-
const val = argObjMeta
|
|
139
|
+
const val = argObjMeta?.getPropValue("selector") ?? this._fileMeta.getNgDecoPropValue(this._className, "ɵcmp", "selector");
|
|
140
140
|
if (typeof val === "string") {
|
|
141
141
|
this._selectorCache = val;
|
|
142
142
|
return this._selectorCache;
|
|
@@ -155,7 +155,7 @@ export class SdCliBbNgPipeMetadata {
|
|
|
155
155
|
if (this._pipeNameCache !== undefined)
|
|
156
156
|
return this._pipeNameCache;
|
|
157
157
|
const argObjMeta = this._fileMeta.getNgDecoArg(this._className);
|
|
158
|
-
const val = argObjMeta
|
|
158
|
+
const val = argObjMeta?.getPropValue("name") ?? this._fileMeta.getNgDecoPropValue(this._className, "ɵpipe", "name");
|
|
159
159
|
if (typeof val === "string") {
|
|
160
160
|
this._pipeNameCache = val;
|
|
161
161
|
return val;
|
|
@@ -197,4 +197,4 @@ class SdCliNgMetadataUtil {
|
|
|
197
197
|
}
|
|
198
198
|
}
|
|
199
199
|
*/
|
|
200
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
200
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVFNkQ2xpQmJOZ01ldGFkYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL25nLXRvb2xzL2JhYmVsL1RTZENsaUJiTmdNZXRhZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFM0QsT0FBTyxFQUFFLG9CQUFvQixFQUFFLHVCQUF1QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFVdkYsTUFBTSxPQUFPLHVCQUF1QjtJQUNsQyxZQUFvQyxTQUE4QixFQUM5QixVQUFrQjtRQURsQixjQUFTLEdBQVQsU0FBUyxDQUFxQjtRQUM5QixlQUFVLEdBQVYsVUFBVSxDQUFRO0lBQ3RELENBQUM7SUFJRCxJQUFXLEdBQUc7UUFDWixJQUFJLElBQUksQ0FBQyxTQUFTO1lBQUUsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDO1FBRTFDLE1BQU0sTUFBTSxHQUF3QjtZQUNsQyxPQUFPLEVBQUUsRUFBRTtZQUNYLFNBQVMsRUFBRSxFQUFFO1NBQ2QsQ0FBQztRQUVGLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUVoRSxNQUFNLE1BQU0sR0FBRyxVQUFVLEVBQUUsWUFBWSxDQUFDLFNBQVMsQ0FBQyxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsa0JBQWtCLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDNUgsSUFBSSxNQUFNLEtBQUssU0FBUyxFQUFFO1lBQ3hCLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUN6RCxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxHQUFHLFFBQVEsQ0FBQyxDQUFDO1NBQ2xDO1FBRUQsTUFBTSxPQUFPLEdBQUcsVUFBVSxFQUFFLFlBQVks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
|
|
@@ -46,6 +46,9 @@ export class SdCliBuildResultUtil {
|
|
|
46
46
|
};
|
|
47
47
|
}
|
|
48
48
|
static getMessage(result) {
|
|
49
|
+
if (result.code === "ESLintError") {
|
|
50
|
+
return result.message;
|
|
51
|
+
}
|
|
49
52
|
let str = "";
|
|
50
53
|
if (result.filePath !== undefined) {
|
|
51
54
|
str += `${result.filePath}(${result.line ?? 0}, ${result.char ?? 0}): `;
|
|
@@ -57,4 +60,4 @@ export class SdCliBuildResultUtil {
|
|
|
57
60
|
return str;
|
|
58
61
|
}
|
|
59
62
|
}
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2RDbGlCdWlsZFJlc3VsdFV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvU2RDbGlCdWlsZFJlc3VsdFV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVCLE9BQU8sRUFBRSxNQUFNLElBQUksQ0FBQztBQUNwQixPQUFPLElBQUksTUFBTSxNQUFNLENBQUM7QUFJeEIsTUFBTSxPQUFPLG9CQUFvQjtJQUN4QixNQUFNLENBQUMsaUJBQWlCLENBQUMsSUFBbUI7UUFDakQsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsS0FBSyxFQUFFLENBQUMsa0JBQWtCLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxPQUFPO1lBQ3RFLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxLQUFLLEVBQUUsQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLFNBQVM7Z0JBQzNELENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDaEIsSUFBSSxDQUFDLFFBQVE7WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUVoQyxNQUFNLElBQUksR0FBRyxLQUFLLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUM5QixNQUFNLE9BQU8sR0FBRyxFQUFFLENBQUMsNEJBQTRCLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUM7UUFHMUUsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDMUUsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsS0FBSyxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyw2QkFBNkIs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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.80",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"repository": {
|
|
@@ -52,11 +52,11 @@
|
|
|
52
52
|
"jsdom": "^19.0.0",
|
|
53
53
|
"cordova": "^11.0.0",
|
|
54
54
|
"jszip": "^3.7.1",
|
|
55
|
-
"@simplysm/sd-core-common": "7.0.
|
|
56
|
-
"@simplysm/sd-core-node": "7.0.
|
|
57
|
-
"@simplysm/sd-service-common": "7.0.
|
|
58
|
-
"@simplysm/sd-service-server": "7.0.
|
|
59
|
-
"@simplysm/sd-storage": "7.0.
|
|
55
|
+
"@simplysm/sd-core-common": "7.0.80",
|
|
56
|
+
"@simplysm/sd-core-node": "7.0.80",
|
|
57
|
+
"@simplysm/sd-service-common": "7.0.80",
|
|
58
|
+
"@simplysm/sd-service-server": "7.0.80",
|
|
59
|
+
"@simplysm/sd-storage": "7.0.80"
|
|
60
60
|
},
|
|
61
61
|
"devDependencies": {
|
|
62
62
|
"@types/semver": "^7.3.9",
|
package/src/bin/sd-cli.ts
CHANGED
|
@@ -5,11 +5,10 @@ import { hideBin } from "yargs/helpers";
|
|
|
5
5
|
import { Logger, LoggerSeverity } from "@simplysm/sd-core-node";
|
|
6
6
|
import { SdCliWorkspace } from "../entry-points/SdCliWorkspace";
|
|
7
7
|
import { SdCliLocalUpdate } from "../entry-points/SdCliLocalUpdate";
|
|
8
|
-
// import sourceMapSupport from "source-map-support";
|
|
9
8
|
import { SdCliNpm } from "../entry-points/SdCliNpm";
|
|
10
9
|
import { SdCliPrepare } from "../entry-points/SdCliPrepare";
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
import { SdCliFileCrypto } from "../entry-points/SdCliFileCrypto";
|
|
11
|
+
import { SdCliCordova } from "../build-tool/SdCliCordova";
|
|
13
12
|
|
|
14
13
|
Error.stackTraceLimit = Infinity;
|
|
15
14
|
|
|
@@ -66,6 +65,26 @@ const argv = yargs(hideBin(process.argv))
|
|
|
66
65
|
}
|
|
67
66
|
})
|
|
68
67
|
)
|
|
68
|
+
.command(
|
|
69
|
+
"run-device <cordovaPath> <platform> <url>",
|
|
70
|
+
"변경감지중인 플랫폼을 디바이스에 앱 형태로 띄웁니다.",
|
|
71
|
+
(cmd) => cmd
|
|
72
|
+
.positional("cordovaPath", {
|
|
73
|
+
type: "string",
|
|
74
|
+
describe: "CORDOVA 프로젝트 경로",
|
|
75
|
+
demandOption: true
|
|
76
|
+
})
|
|
77
|
+
.positional("platform", {
|
|
78
|
+
type: "string",
|
|
79
|
+
describe: "빌드 플랫폼(android,...)",
|
|
80
|
+
demandOption: true
|
|
81
|
+
})
|
|
82
|
+
.positional("url", {
|
|
83
|
+
type: "string",
|
|
84
|
+
describe: "Webview로 오픈할 URL",
|
|
85
|
+
demandOption: true
|
|
86
|
+
})
|
|
87
|
+
)
|
|
69
88
|
.command(
|
|
70
89
|
"build",
|
|
71
90
|
"프로젝트의 각 패키지에 대한 빌드를 수행합니다.",
|
|
@@ -113,6 +132,24 @@ const argv = yargs(hideBin(process.argv))
|
|
|
113
132
|
}
|
|
114
133
|
})
|
|
115
134
|
)
|
|
135
|
+
.command(
|
|
136
|
+
"enc-file <file>",
|
|
137
|
+
"파일을 암호화 합니다.",
|
|
138
|
+
(cmd) => cmd.version(false)
|
|
139
|
+
.positional("file", {
|
|
140
|
+
type: "string",
|
|
141
|
+
describe: "암호화할 파일명"
|
|
142
|
+
})
|
|
143
|
+
)
|
|
144
|
+
.command(
|
|
145
|
+
"dec-file <file>",
|
|
146
|
+
"파일을 복호화 합니다.",
|
|
147
|
+
(cmd) => cmd.version(false)
|
|
148
|
+
.positional("file", {
|
|
149
|
+
type: "string",
|
|
150
|
+
describe: "암호화된 파일명"
|
|
151
|
+
})
|
|
152
|
+
)
|
|
116
153
|
.parseSync();
|
|
117
154
|
|
|
118
155
|
if (argv.debug) {
|
|
@@ -155,6 +192,13 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
|
|
|
155
192
|
pkgs: argv.packages ?? []
|
|
156
193
|
});
|
|
157
194
|
}
|
|
195
|
+
else if (argv._[0] === "run-device") {
|
|
196
|
+
await SdCliCordova.runWebviewOnDeviceAsync(
|
|
197
|
+
argv.cordovaPath,
|
|
198
|
+
argv.platform as "browser" | "ios" | "android" | "electron",
|
|
199
|
+
argv.url
|
|
200
|
+
);
|
|
201
|
+
}
|
|
158
202
|
else if (argv._[0] === "build") {
|
|
159
203
|
await new SdCliWorkspace(process.cwd())
|
|
160
204
|
.buildAsync({
|
|
@@ -176,6 +220,12 @@ const logger = Logger.get(["simplysm", "sd-cli", "bin", "sd-cli"]);
|
|
|
176
220
|
process.exit(0);
|
|
177
221
|
}
|
|
178
222
|
}
|
|
223
|
+
else if (argv._[0] === "enc-file") {
|
|
224
|
+
await new SdCliFileCrypto().encryptAsync(argv.file!);
|
|
225
|
+
}
|
|
226
|
+
else if (argv._[0] === "dec-file") {
|
|
227
|
+
await new SdCliFileCrypto().decryptAsync(argv.file!);
|
|
228
|
+
}
|
|
179
229
|
else {
|
|
180
230
|
throw new Error(`명령어가 잘못 되었습니다.\n\t${argv._[0]}\n`);
|
|
181
231
|
}
|
|
@@ -74,14 +74,6 @@ export class SdCliCordova {
|
|
|
74
74
|
await FsUtil.copyAsync(path.resolve(this._rootPath, this._config.icon), path.resolve(this.cordovaPath, "res", "icon", "icon.png"));
|
|
75
75
|
}
|
|
76
76
|
|
|
77
|
-
// ANDROID GRADLE 오류 강제 수정
|
|
78
|
-
// if (this._config.targets.includes("android")) {
|
|
79
|
-
// const gradleFilePath = path.resolve(this._cordovaPath, "platforms/android/app/build.gradle");
|
|
80
|
-
// let gradleFileContent = await FsUtil.readFileAsync(gradleFilePath);
|
|
81
|
-
// gradleFileContent = gradleFileContent.replace(/lintOptions {/g, "lintOptions {\r\n checkReleaseBuilds false;");
|
|
82
|
-
// await FsUtil.writeFileAsync(gradleFilePath, gradleFileContent);
|
|
83
|
-
// }
|
|
84
|
-
|
|
85
77
|
// CONFIG
|
|
86
78
|
const configFilePath = path.resolve(this.cordovaPath, "config.xml");
|
|
87
79
|
let configFileContent = await FsUtil.readFileAsync(configFilePath);
|
|
@@ -95,26 +87,38 @@ export class SdCliCordova {
|
|
|
95
87
|
}
|
|
96
88
|
|
|
97
89
|
// CONFIG: ANDROID usesCleartextTraffic 설정
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
90
|
+
if (this._config.platforms.includes("android")) {
|
|
91
|
+
if (!configFileContent.includes("xmlns:android=\"http://schemas.android.com/apk/res/android\"")) {
|
|
92
|
+
configFileContent = configFileContent.replace(
|
|
93
|
+
"xmlns=\"http://www.w3.org/ns/widgets\"",
|
|
94
|
+
`xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android"`
|
|
95
|
+
);
|
|
96
|
+
}
|
|
97
|
+
if (!configFileContent.includes("application android:usesCleartextTraffic=\"true\" />")) {
|
|
98
|
+
if (configFileContent.includes("<platform name=\"android\">")) {
|
|
99
|
+
configFileContent = configFileContent.replace("<platform name=\"android\">", `<platform name="android">
|
|
100
|
+
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
|
|
101
|
+
<application android:usesCleartextTraffic="true" />
|
|
102
|
+
</edit-config>`);
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
configFileContent = configFileContent.replace("<content src=\"index.html\" />", `<content src="index.html" />
|
|
106
|
+
<platform name="android">
|
|
107
|
+
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
|
|
108
|
+
<application android:usesCleartextTraffic="true" />
|
|
109
|
+
</edit-config>
|
|
110
|
+
</platform>`);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
112
114
|
|
|
113
115
|
// CONFIG: 파일쓰기
|
|
114
116
|
await FsUtil.writeFileAsync(configFilePath, configFileContent);
|
|
115
117
|
}
|
|
116
118
|
|
|
117
119
|
public async buildAsync(outPath: string): Promise<void> {
|
|
120
|
+
const packageType = this._config.buildOption?.bundle ? "bundle" : "apk";
|
|
121
|
+
|
|
118
122
|
// ANDROID 서명 처리
|
|
119
123
|
if (this._config.buildOption?.sign?.android) {
|
|
120
124
|
await FsUtil.copyAsync(
|
|
@@ -130,7 +134,8 @@ export class SdCliCordova {
|
|
|
130
134
|
storePassword: this._config.buildOption.sign.android.storePassword,
|
|
131
135
|
alias: this._config.buildOption.sign.android.alias,
|
|
132
136
|
password: this._config.buildOption.sign.android.password,
|
|
133
|
-
keystoreType: this._config.buildOption.sign.android.keystoreType
|
|
137
|
+
keystoreType: this._config.buildOption.sign.android.keystoreType,
|
|
138
|
+
packageType
|
|
134
139
|
}
|
|
135
140
|
}
|
|
136
141
|
}
|
|
@@ -145,7 +150,6 @@ export class SdCliCordova {
|
|
|
145
150
|
configFileContent = configFileContent.replace(/ {4}<allow-navigation href="[^"]*" \/>\n/g, "");
|
|
146
151
|
|
|
147
152
|
// CONFIG: 접근허용 등록
|
|
148
|
-
// configFileContent = configFileContent.replace("</widget>", ` <allow-navigation href="file://data/user/*" />\n</widget>`);
|
|
149
153
|
configFileContent = configFileContent.replace("</widget>", ` <allow-navigation href="*://*/*" />\n</widget>`);
|
|
150
154
|
|
|
151
155
|
// CONFIG: 파일쓰기
|
|
@@ -153,7 +157,6 @@ export class SdCliCordova {
|
|
|
153
157
|
|
|
154
158
|
// 실행
|
|
155
159
|
const buildType = this._config.buildOption?.debug ? "debug" : "release";
|
|
156
|
-
const packageType = this._config.buildOption?.bundle ? "bundle" : "apk";
|
|
157
160
|
for (const platform of this.platforms) {
|
|
158
161
|
await this._execAsync(`${this._binPath} build ${platform} --${buildType} --packageType=${packageType}`, this.cordovaPath);
|
|
159
162
|
}
|
|
@@ -175,27 +178,44 @@ export class SdCliCordova {
|
|
|
175
178
|
path.resolve(targetOutPath, latestDistApkFileName)
|
|
176
179
|
);
|
|
177
180
|
}
|
|
181
|
+
else if (platform === "electron") {
|
|
182
|
+
const targetOutPath = path.resolve(outPath, platform);
|
|
183
|
+
const outFileName = `${this._config.appName} Setup ${this._npmConfig.version}.exe`;
|
|
184
|
+
const distFileName = outFileName;
|
|
185
|
+
const latestDistFileName = `${this._config.appName} Setup latest.exe`;
|
|
186
|
+
await FsUtil.mkdirsAsync(targetOutPath);
|
|
187
|
+
await FsUtil.copyAsync(
|
|
188
|
+
path.resolve(this.cordovaPath, "platforms/electron/build/", outFileName),
|
|
189
|
+
path.resolve(targetOutPath, distFileName)
|
|
190
|
+
);
|
|
191
|
+
await FsUtil.copyAsync(
|
|
192
|
+
path.resolve(this.cordovaPath, "platforms/electron/build/", outFileName),
|
|
193
|
+
path.resolve(targetOutPath, latestDistFileName)
|
|
194
|
+
);
|
|
195
|
+
}
|
|
178
196
|
else {
|
|
179
197
|
throw new NotImplementError();
|
|
180
198
|
}
|
|
181
199
|
}
|
|
182
200
|
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
const
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
201
|
+
if (this.platforms.includes("android")) {
|
|
202
|
+
// 자동업데이트를 위한 zip 파일 쓰기
|
|
203
|
+
const zip = new JSZip();
|
|
204
|
+
const resultFiles = await FsUtil.globAsync(path.resolve(this.cordovaPath, "www", "**/*"), {
|
|
205
|
+
dot: true,
|
|
206
|
+
nodir: true
|
|
207
|
+
});
|
|
208
|
+
for (const resultFile of resultFiles) {
|
|
209
|
+
const contentBuffer = await FsUtil.readFileBufferAsync(resultFile);
|
|
210
|
+
const relativePath = path.relative(path.resolve(this.cordovaPath, "www"), resultFile);
|
|
211
|
+
zip.file("/" + relativePath, contentBuffer);
|
|
212
|
+
}
|
|
194
213
|
|
|
195
|
-
|
|
196
|
-
|
|
214
|
+
const zipFileName = path.basename(`${this._config.appName}-v${this._npmConfig.version}.zip`);
|
|
215
|
+
const resultBuffer = await zip.generateAsync({ type: "nodebuffer" });
|
|
197
216
|
|
|
198
|
-
|
|
217
|
+
await FsUtil.writeFileAsync(path.resolve(outPath, "updates/", zipFileName), resultBuffer);
|
|
218
|
+
}
|
|
199
219
|
}
|
|
200
220
|
|
|
201
221
|
public static async runWebviewOnDeviceAsync(cordovaPath: string, platform: TSdCliCordovaPlatform, url: string): Promise<void> {
|
|
@@ -211,14 +231,12 @@ export class SdCliCordova {
|
|
|
211
231
|
configFileContent = configFileContent.replace(/ {4}<allow-navigation href="[^"]*" \/>\n/g, "");
|
|
212
232
|
|
|
213
233
|
// CONFIG: 접근허용 등록
|
|
214
|
-
// configFileContent = configFileContent.replace("</widget>", ` <allow-navigation href="${url}" />\n</widget>`);
|
|
215
|
-
// configFileContent = configFileContent.replace("</widget>", ` <allow-navigation href="${url}/*" />\n</widget>`);
|
|
216
234
|
configFileContent = configFileContent.replace("</widget>", ` <allow-navigation href="*://*/*" />\n</widget>`);
|
|
217
235
|
|
|
218
236
|
// CONFIG: 파일쓰기
|
|
219
237
|
await FsUtil.writeFileAsync(configFilePath, configFileContent);
|
|
220
238
|
|
|
221
239
|
const binPath = path.resolve(process.cwd(), "node_modules/.bin/cordova.cmd");
|
|
222
|
-
await SdProcess.spawnAsync(`${binPath} run ${platform} --device`, { cwd: cordovaPath });
|
|
240
|
+
await SdProcess.spawnAsync(`${binPath} run ${platform} --device`, { cwd: cordovaPath }, true);
|
|
223
241
|
}
|
|
224
242
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
2
|
import { PathUtil } from "@simplysm/sd-core-node";
|
|
3
3
|
import sass from "sass";
|
|
4
|
-
import { pathToFileURL, URL } from "url";
|
|
4
|
+
import { fileURLToPath, pathToFileURL, URL } from "url";
|
|
5
5
|
|
|
6
6
|
export class SdCliNgCacheCompilerHost {
|
|
7
7
|
public static wrap(compilerHost: ts.CompilerHost,
|
|
@@ -23,17 +23,24 @@ export class SdCliNgCacheCompilerHost {
|
|
|
23
23
|
|
|
24
24
|
const cache = sourceFileCache.getOrCreate(PathUtil.posix(context.containingFile), {});
|
|
25
25
|
if (cache.styleContent === undefined) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
return new URL(url.substring(1), pathToFileURL("node_modules"));
|
|
33
|
-
}
|
|
26
|
+
const scssResult = await sass.compileStringAsync(data, {
|
|
27
|
+
url: new URL((context.containingFile as string) + ".sd.scss"),
|
|
28
|
+
importer: {
|
|
29
|
+
findFileUrl: (url) => {
|
|
30
|
+
if (!url.startsWith("~")) return pathToFileURL(url);
|
|
31
|
+
return new URL(url.substring(1), pathToFileURL("node_modules"));
|
|
34
32
|
}
|
|
35
|
-
}
|
|
36
|
-
)
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
cache.styleContent = scssResult.css.toString();
|
|
37
|
+
|
|
38
|
+
const deps = scssResult.loadedUrls.slice(1).map((item) => PathUtil.posix(fileURLToPath(item.href)));
|
|
39
|
+
for (const dep of deps) {
|
|
40
|
+
const depCache = sourceFileCache.getOrCreate(dep, {});
|
|
41
|
+
depCache.importerSet = depCache.importerSet ?? new Set<string>();
|
|
42
|
+
depCache.importerSet.add(PathUtil.posix(context.containingFile));
|
|
43
|
+
}
|
|
37
44
|
}
|
|
38
45
|
return { content: cache.styleContent };
|
|
39
46
|
};
|
|
@@ -47,4 +54,5 @@ interface IFileCache {
|
|
|
47
54
|
sourceFile?: ts.SourceFile;
|
|
48
55
|
content?: string;
|
|
49
56
|
styleContent?: string;
|
|
57
|
+
importerSet?: Set<string>;
|
|
50
58
|
}
|
|
@@ -20,15 +20,18 @@ export class SdCliPackageLinter {
|
|
|
20
20
|
{
|
|
21
21
|
files: ["*.ts"],
|
|
22
22
|
parserOptions: {
|
|
23
|
-
programs: [program],
|
|
23
|
+
/*programs: [program],
|
|
24
24
|
tsconfigRootDir: null,
|
|
25
|
-
project: null
|
|
25
|
+
project: null*/
|
|
26
|
+
tsconfigRootDir: this._rootPath,
|
|
27
|
+
project: "tsconfig-build.json"
|
|
26
28
|
},
|
|
27
29
|
settings: {
|
|
28
30
|
"import/resolver": {
|
|
29
31
|
"typescript": {
|
|
30
|
-
programs: [program],
|
|
31
|
-
project: null
|
|
32
|
+
/*programs: [program],
|
|
33
|
+
project: null*/
|
|
34
|
+
project: path.resolve(this._rootPath, "tsconfig-build.json")
|
|
32
35
|
}
|
|
33
36
|
}
|
|
34
37
|
}
|
|
@@ -41,6 +44,7 @@ export class SdCliPackageLinter {
|
|
|
41
44
|
const lintFilePaths = await filePaths
|
|
42
45
|
.filterAsync(async (filePath) => (
|
|
43
46
|
!filePath.endsWith(".d.ts") &&
|
|
47
|
+
/\.[cm]?[tj]sx?$/.test(filePath) &&
|
|
44
48
|
!(await linter.isPathIgnored(filePath))
|
|
45
49
|
));
|
|
46
50
|
for (const lintFilePath of lintFilePaths) {
|