tnx-shared 5.8.1 → 5.8.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/assets/gulpfile.js +39 -39
  2. package/bundles/tnx-shared.umd.js +158 -94
  3. package/bundles/tnx-shared.umd.js.map +1 -1
  4. package/bundles/tnx-shared.umd.min.js +1 -1
  5. package/bundles/tnx-shared.umd.min.js.map +1 -1
  6. package/components/file-explorer/services/file-object.service.d.ts +1 -0
  7. package/components/file-explorer/services/file-object.service.d.ts.map +1 -1
  8. package/components/tn-tinymce/tn-tinymce.component.d.ts.map +1 -1
  9. package/esm2015/components/file-explorer/services/file-object.service.js +12 -2
  10. package/esm2015/components/tn-tinymce/tn-tinymce.component.js +44 -2
  11. package/fesm2015/tnx-shared.js +53 -1
  12. package/fesm2015/tnx-shared.js.map +1 -1
  13. package/package.json +1 -1
  14. package/tnx-shared.metadata.json +1 -1
package/assets/gulpfile.js CHANGED
@@ -206,8 +206,11 @@ task('updateNextVersionService', function (done) {
206
206
  });
207
207
 
208
208
  task('updateDepdendServiceToLatest', function (done) {
209
- const serviceName = argv.serviceName;
209
+ let serviceName = argv.serviceName;
210
210
  try {
211
+ if (!serviceName.startsWith('tnx-')) {
212
+ serviceName = 'tnx-' + serviceName;
213
+ }
211
214
  getCurrentVersion({}, serviceName, (version) => {
212
215
  if (version) {
213
216
  console.log(`latest version of service ${serviceName} is ${version.versionString}`);
@@ -387,12 +390,12 @@ function transformTsConfigJson(input) {
387
390
  buildTsConfigPath(paths, project);
388
391
  });
389
392
 
390
- delete paths[`${getRefPrefix()}template`];
391
- delete paths[`${getRefPrefix()}template/*`];
392
- delete paths[`${getRefPrefix()}template-direct`];
393
- delete paths[`${getRefPrefix()}template-direct/*`];
394
- delete paths[`${getRefPrefix()}template-package`];
395
- delete paths[`${getRefPrefix()}template-package/*`];
393
+ delete paths[`${angularSchemaObj.refPrefix}template`];
394
+ delete paths[`${angularSchemaObj.refPrefix}template/*`];
395
+ delete paths[`${angularSchemaObj.refPrefix}template-direct`];
396
+ delete paths[`${angularSchemaObj.refPrefix}template-direct/*`];
397
+ delete paths[`${angularSchemaObj.refPrefix}template-package`];
398
+ delete paths[`${angularSchemaObj.refPrefix}template-package/*`];
396
399
 
397
400
  return input;
398
401
  }
@@ -400,6 +403,7 @@ function transformTsConfigJson(input) {
400
403
  function transformPackageJson(angularSchema, angularSchemaTemplate, input) {
401
404
  const listEnvironment = angularSchema.environments;
402
405
  const scopeName = angularSchema.scopeName;
406
+ const clientVersion = angularSchema.clientVersion;
403
407
 
404
408
  let scriptDependAll = 'npm run depend-tnx-shared';
405
409
  Object.keys(angularSchema.projectList).filter(x => angularSchema.projectList[x].projectType == 'library').forEach(project => {
@@ -410,7 +414,7 @@ function transformPackageJson(angularSchema, angularSchemaTemplate, input) {
410
414
  }
411
415
 
412
416
  if (prj.projectType == 'library') {
413
- if (prj.refType == 'direct') {
417
+ if (prj.refType != 'package') {
414
418
  // generate package function only for library
415
419
  const nodeMaxOldSpaceSize = angularSchema.nodeMaxOldSpaceSize ? angularSchema.nodeMaxOldSpaceSize : 3072;
416
420
  input.scripts[`build-${project}`] = angularSchemaTemplate.scripts['build-service-template']
@@ -440,16 +444,15 @@ function transformPackageJson(angularSchema, angularSchemaTemplate, input) {
440
444
  }
441
445
  else {
442
446
  input.scripts[`depend-${project}`] = angularSchemaTemplate.scripts[`depend-template`]
443
- .replaceAll('{{serviceName}}', project)
444
- .replaceAll('tnx-tnx-', 'tnx-');
447
+ .replaceAll('{{serviceName}}', project);
445
448
  scriptDependAll += ` && npm run depend-${project}`;
446
449
  }
447
450
  }
448
451
  });
449
452
 
450
453
  // default install latest version tnx-shared
451
- // input.scripts['depend-tnx-shared'] = angularSchemaTemplate.scripts[`depend-template`]
452
- // .replaceAll('{{serviceName}}', 'shared');
454
+ input.scripts['depend-tnx-shared'] = angularSchemaTemplate.scripts[`depend-template`]
455
+ .replaceAll('{{serviceName}}', 'shared');
453
456
  input.scripts['depend-all'] = scriptDependAll;
454
457
  input.scripts['prebuild'] = angularSchemaTemplate.scripts[`prebuild-template`];
455
458
  input.scripts['update-assets-tnx-shared'] = angularSchemaTemplate.scripts['update-assets-tnx-shared-template'];
@@ -505,12 +508,10 @@ function transformPackageJson(angularSchema, angularSchemaTemplate, input) {
505
508
 
506
509
  input.scripts[`deploy-${project}`] = angularSchemaTemplate.scripts['deploy-template']
507
510
  .replaceAll('{{projectName}}', project)
508
- .replaceAll('{{clientVersion}}', angularSchema.projectList[project].clientVersion)
511
+ .replaceAll('{{clientVersion}}', clientVersion)
509
512
  .replaceAll('{{scopeName}}', scopeName)
510
513
  .replaceAll('{{nodeMaxOldSpaceSize}}', nodeMaxOldSpaceSize)
511
514
  .replaceAll('{{baseHref}}', baseHref);
512
- input.scripts[`format-${project}`] = angularSchemaTemplate.scripts['format-template']
513
- .replaceAll('{{projectName}}', project);
514
515
  input.scripts[`build-${project}-ci`] = angularSchemaTemplate.scripts['build-ci-template']
515
516
  .replaceAll('{{projectName}}', project)
516
517
  .replaceAll('{{nodeMaxOldSpaceSize}}', nodeMaxOldSpaceSize);
@@ -679,8 +680,10 @@ function buildTsConfigPath(paths, project) {
679
680
  const prj = getProjectInfo(project);
680
681
  const prefix = getRefPrefix();
681
682
  const refType = prj.refType ? prj.refType : 'package';
682
- if (project == 'tnx-shared' && refType == 'direct') {
683
- paths[`tnx-shared`] = [`${prj.refPath}/src/lib/public-api`];
683
+ if (project == 'tnx-shared') {
684
+ if (refType != 'package') {
685
+ paths[`tnx-shared`] = [`${prj.refPath}/src/lib/public-api`];
686
+ }
684
687
  }
685
688
  else {
686
689
  const pathAlias = `${prefix}${project}`;
@@ -700,9 +703,8 @@ function addProjectToGitIgnore(projectName) {
700
703
  }, '.gitignore');
701
704
  }
702
705
 
703
- function getRefPrefix(projectName = null) {
704
- const prefix = 'tnx-'; // tạm fix luôn vì chưa thấy có trường hợp nào cần tùy biến prefix
705
- return prefix;
706
+ function getRefPrefix() {
707
+ return angularSchemaObj.refPrefix;
706
708
  }
707
709
 
708
710
  function getProjectInfo(projectName) {
@@ -791,37 +793,35 @@ function getNextVersion(currentVersion, nextVersionType) {
791
793
  }
792
794
 
793
795
  function getCurrentVersion(pkgObj, packageName, onGetVersion,) {
794
- let realPackageName;
795
- let packageNameWithoutPrefix;
796
796
  if (!packageName.startsWith('tnx-')) {
797
- realPackageName = 'tnx-' + packageName;
798
- packageNameWithoutPrefix = packageName;
799
- } else {
800
- realPackageName = packageName;
801
-
802
- if (packageName != 'tnx-shared') {
803
- packageNameWithoutPrefix = packageName.replace('tnx-', '');
804
- } else {
805
- packageNameWithoutPrefix = packageName;
806
- }
797
+ packageName = 'tnx-' + packageName;
807
798
  }
808
799
 
809
800
  request({
810
- url: `https://registry.npmjs.org/${realPackageName}`
801
+ url: `https://registry.npmjs.org/${packageName}`
811
802
  }, function (error, response, body) {
812
803
  let versionStr;
813
804
  if (body) {
814
- const bodyObj = JSON.parse(body).versions;
815
- const pkgVersions = Object.keys(bodyObj).filter(x => x.startsWith(angularSchemaObj.projectList[packageNameWithoutPrefix].clientVersion));
816
- if (pkgVersions.length == 0) {
805
+ const bodyParsed = JSON.parse(body);
806
+ if (!bodyParsed.error) {
807
+ const bodyObj = bodyParsed.versions;
808
+ const pkgVersions = Object.keys(bodyObj).filter(x => x.startsWith(angularSchemaObj.clientVersion));
809
+ if (pkgVersions.length == 0) {
810
+ versionStr = `${angularSchemaObj.clientVersion}.0`;
811
+ console.log(`${packageName} duoc phat hanh lan dau, version se la ${versionStr}`);
812
+ }
813
+ else {
814
+ versionStr = pkgVersions[pkgVersions.length - 1];
815
+ }
816
+ }
817
+ else {
817
818
  versionStr = `${angularSchemaObj.clientVersion}.0`;
818
- } else {
819
- versionStr = pkgVersions[pkgVersions.length - 1];
819
+ console.log(`Khong lay duoc thong tin package tren npm, package ${packageName} lay version mac dinh ${versionStr}`);
820
820
  }
821
821
  }
822
822
  else {
823
823
  console.warn('cannot get latest version, get from local instead', body);
824
- versionStr = pkgObj.version;
824
+ versionStr = null;
825
825
  }
826
826
 
827
827
  if (versionStr) {
package/bundles/tnx-shared.umd.js CHANGED
@@ -28436,6 +28436,16 @@
28436
28436
  var url = this.serviceUri + "/UploadWithByteArray";
28437
28437
  return this._http.post(url, formData, { responseType: 'text' }).toPromise();
28438
28438
  };
28439
+ FileObjectService.prototype.UploadExternalImage = function (url) {
28440
+ var options = {
28441
+ headers: new i1$1.HttpHeaders({
28442
+ 'Content-Type': 'application/json-patch+json',
28443
+ }),
28444
+ responseType: 'text',
28445
+ };
28446
+ var apiUrl = this.serviceUri + "/UploadExternalImage";
28447
+ return this._http.post(apiUrl, { url: url }, options).toPromise();
28448
+ };
28439
28449
  return FileObjectService;
28440
28450
  }(BaseService));
28441
28451
  FileObjectService.ɵprov = i0.ɵɵdefineInjectable({ factory: function FileObjectService_Factory() { return new FileObjectService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: FileObjectService, providedIn: "root" });
@@ -60233,6 +60243,7 @@
60233
60243
  '/assets/vendor/tinymce/custom.css'
60234
60244
  ],
60235
60245
  imagetools_toolbar: 'rotateleft rotateright | flipv fliph | editimage imageoptions',
60246
+ contextmenu: 'link image imagetools table',
60236
60247
  language: 'vi_VN',
60237
60248
  statusbar: false,
60238
60249
  relative_urls: false,
@@ -60324,7 +60335,7 @@
60324
60335
  var _this = this;
60325
60336
  return __generator(this, function (_a) {
60326
60337
  return [2 /*return*/, new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
60327
- var images, oldLegacyValue, settings, doc, result, files_2, files_2_1, item, uploadImage, e_1_1;
60338
+ var images, oldLegacyValue, settings, docm, imgTags, imageUploaded, i, src, imageType, base64, imageBlob, file, uploadImage, uploadImage, err_1, err_2, result, doc, result, files_2, files_2_1, item, uploadImage, e_1_1;
60328
60339
  var e_1, _a;
60329
60340
  var _this = this;
60330
60341
  return __generator(this, function (_b) {
@@ -60352,95 +60363,148 @@
60352
60363
  }
60353
60364
  }
60354
60365
  };
60355
- if (!(types.indexOf('text/html') !== -1)) return [3 /*break*/, 1];
60356
- if (pastedData.indexOf('<v:imagedata ') == -1) {
60357
- resolve(pastedData);
60366
+ if (!(types.indexOf('text/html') !== -1)) return [3 /*break*/, 14];
60367
+ if (!(pastedData.indexOf('<v:imagedata ') == -1)) return [3 /*break*/, 12];
60368
+ docm = new DOMParser().parseFromString(pastedData, 'text/html');
60369
+ imgTags = docm.getElementsByTagName('img');
60370
+ imageUploaded = [];
60371
+ i = 0;
60372
+ _b.label = 1;
60373
+ case 1:
60374
+ if (!(i < imgTags.length)) return [3 /*break*/, 11];
60375
+ src = imgTags[i].src;
60376
+ _b.label = 2;
60377
+ case 2:
60378
+ _b.trys.push([2, 9, , 10]);
60379
+ if (!src.startsWith('data:image/')) return [3 /*break*/, 4];
60380
+ imageType = src.substring(5, src.indexOf(';'));
60381
+ base64 = src.substring(src.indexOf('base64,') + 7);
60382
+ imageBlob = this.dataURItoBlob(base64, imageType);
60383
+ file = new File([imageBlob], "paste_" + Date.now() + "_" + i + ".png", { type: imageType });
60384
+ return [4 /*yield*/, this._fileObjectService.uploadWithByteArray(file)];
60385
+ case 3:
60386
+ uploadImage = _b.sent();
60387
+ if (typeof uploadImage == 'string') {
60388
+ imgTags[i].src = this._fileObjectService.getUrlImage(uploadImage);
60389
+ imageUploaded.push(imgTags[i].src);
60358
60390
  }
60359
- else {
60360
- if (types.indexOf('text/rtf') !== -1) {
60361
- doc = new rtf_js.RTFJS.Document(this._commonService.stringToArrayBuffer(pastedRtfData), settings);
60362
- doc.render().then(function (htmlElements) { return __awaiter(_this, void 0, void 0, function () {
60363
- var index, i, imageUploaded, docm, img, p1, index2, p2, indexImg, imageType, base64, imageBlob, srcArr, fileName, file, uploadImage, i_1, result;
60364
- return __generator(this, function (_a) {
60365
- switch (_a.label) {
60366
- case 0:
60367
- index = pastedData.indexOf('<v:imagedata ');
60368
- i = 0;
60369
- imageUploaded = [];
60370
- docm = new DOMParser().parseFromString(pastedData, 'text/html');
60371
- img = docm.getElementsByTagName('img');
60372
- _a.label = 1;
60373
- case 1:
60374
- if (!(index > -1)) return [3 /*break*/, 6];
60375
- p1 = pastedData.substring(0, index);
60376
- index2 = pastedData.indexOf('/>', index);
60377
- if (!(index == -1)) return [3 /*break*/, 2];
60378
- return [3 /*break*/, 6];
60379
- case 2:
60380
- p2 = pastedData.substring(index2 + 2);
60381
- if (!(images.length > i)) return [3 /*break*/, 4];
60382
- indexImg = images[i].indexOf('<img src=');
60383
- if (indexImg !== -1) {
60384
- images[i] = images[i].substring(indexImg + 10, images[i].length - 2);
60385
- }
60386
- imageType = images[i].substring(5, images[i].indexOf(';'));
60387
- base64 = images[i].substring(images[i].indexOf('base64,') + 7);
60388
- imageBlob = this.dataURItoBlob(base64, imageType);
60389
- srcArr = img[i].src.split('/');
60390
- fileName = srcArr[srcArr.length - 1];
60391
- file = new File([imageBlob], fileName, { type: imageType });
60392
- return [4 /*yield*/, this._fileObjectService.uploadWithByteArray(file)];
60393
- case 3:
60394
- uploadImage = _a.sent();
60395
- if (typeof uploadImage == 'string') {
60396
- imageUploaded.push(this._fileObjectService.getUrlImage(uploadImage));
60397
- }
60398
- else {
60399
- this._notifierService.showWarning('Upload file thất bại');
60400
- }
60401
- _a.label = 4;
60402
- case 4:
60403
- pastedData = p1 + '<img src=' + imageUploaded[i] + '/>' + p2;
60404
- index = pastedData.indexOf('<v:imagedata ');
60405
- i++;
60406
- _a.label = 5;
60407
- case 5: return [3 /*break*/, 1];
60408
- case 6:
60409
- docm = new DOMParser().parseFromString(pastedData, 'text/html');
60410
- img = docm.getElementsByTagName('img');
60411
- for (i_1 = 0; i_1 < images.length; i_1++) {
60412
- if (imageUploaded[i_1]) {
60413
- img[i_1].src = imageUploaded[i_1];
60414
- img[i_1].alt = imageUploaded[i_1];
60415
- }
60391
+ return [3 /*break*/, 8];
60392
+ case 4:
60393
+ if (!src.startsWith('http')) return [3 /*break*/, 8];
60394
+ _b.label = 5;
60395
+ case 5:
60396
+ _b.trys.push([5, 7, , 8]);
60397
+ return [4 /*yield*/, this._fileObjectService.UploadExternalImage(src)];
60398
+ case 6:
60399
+ uploadImage = _b.sent();
60400
+ if (typeof uploadImage == 'string') {
60401
+ imgTags[i].src = this._fileObjectService.getUrlImage(uploadImage);
60402
+ imageUploaded.push(imgTags[i].src);
60403
+ }
60404
+ return [3 /*break*/, 8];
60405
+ case 7:
60406
+ err_1 = _b.sent();
60407
+ console.error('Skip external image:', err_1);
60408
+ imageUploaded.push(src);
60409
+ return [3 /*break*/, 8];
60410
+ case 8: return [3 /*break*/, 10];
60411
+ case 9:
60412
+ err_2 = _b.sent();
60413
+ console.error('Paste image error:', err_2);
60414
+ this._notifierService.showWarning('Upload ảnh khi dán nội dung thất bại');
60415
+ return [3 /*break*/, 10];
60416
+ case 10:
60417
+ i++;
60418
+ return [3 /*break*/, 1];
60419
+ case 11:
60420
+ result = new XMLSerializer().serializeToString(docm);
60421
+ resolve(result);
60422
+ return [3 /*break*/, 13];
60423
+ case 12:
60424
+ if (types.indexOf('text/rtf') !== -1) {
60425
+ doc = new rtf_js.RTFJS.Document(this._commonService.stringToArrayBuffer(pastedRtfData), settings);
60426
+ doc.render().then(function (htmlElements) { return __awaiter(_this, void 0, void 0, function () {
60427
+ var index, i, imageUploaded, docm, img, p1, index2, p2, indexImg, imageType, base64, imageBlob, srcArr, fileName, file, uploadImage, i_1, result;
60428
+ return __generator(this, function (_a) {
60429
+ switch (_a.label) {
60430
+ case 0:
60431
+ index = pastedData.indexOf('<v:imagedata ');
60432
+ i = 0;
60433
+ imageUploaded = [];
60434
+ docm = new DOMParser().parseFromString(pastedData, 'text/html');
60435
+ img = docm.getElementsByTagName('img');
60436
+ _a.label = 1;
60437
+ case 1:
60438
+ if (!(index > -1)) return [3 /*break*/, 6];
60439
+ p1 = pastedData.substring(0, index);
60440
+ index2 = pastedData.indexOf('/>', index);
60441
+ if (!(index == -1)) return [3 /*break*/, 2];
60442
+ return [3 /*break*/, 6];
60443
+ case 2:
60444
+ p2 = pastedData.substring(index2 + 2);
60445
+ if (!(images.length > i)) return [3 /*break*/, 4];
60446
+ indexImg = images[i].indexOf('<img src=');
60447
+ if (indexImg !== -1) {
60448
+ images[i] = images[i].substring(indexImg + 10, images[i].length - 2);
60449
+ }
60450
+ imageType = images[i].substring(5, images[i].indexOf(';'));
60451
+ base64 = images[i].substring(images[i].indexOf('base64,') + 7);
60452
+ imageBlob = this.dataURItoBlob(base64, imageType);
60453
+ srcArr = img[i].src.split('/');
60454
+ fileName = srcArr[srcArr.length - 1];
60455
+ file = new File([imageBlob], fileName, { type: imageType });
60456
+ return [4 /*yield*/, this._fileObjectService.uploadWithByteArray(file)];
60457
+ case 3:
60458
+ uploadImage = _a.sent();
60459
+ if (typeof uploadImage == 'string') {
60460
+ imageUploaded.push(this._fileObjectService.getUrlImage(uploadImage));
60461
+ }
60462
+ else {
60463
+ this._notifierService.showWarning('Upload file thất bại');
60464
+ }
60465
+ _a.label = 4;
60466
+ case 4:
60467
+ pastedData = p1 + '<img src=' + imageUploaded[i] + '/>' + p2;
60468
+ index = pastedData.indexOf('<v:imagedata ');
60469
+ i++;
60470
+ _a.label = 5;
60471
+ case 5: return [3 /*break*/, 1];
60472
+ case 6:
60473
+ docm = new DOMParser().parseFromString(pastedData, 'text/html');
60474
+ img = docm.getElementsByTagName('img');
60475
+ for (i_1 = 0; i_1 < images.length; i_1++) {
60476
+ if (imageUploaded[i_1]) {
60477
+ img[i_1].src = imageUploaded[i_1];
60478
+ img[i_1].alt = imageUploaded[i_1];
60416
60479
  }
60417
- result = '';
60418
- result = new XMLSerializer().serializeToString(docm);
60419
- resolve(result);
60420
- return [2 /*return*/];
60421
- }
60422
- });
60423
- }); }).catch(function (err) {
60424
- console.error(err);
60425
- resolve(null);
60480
+ }
60481
+ result = '';
60482
+ result = new XMLSerializer().serializeToString(docm);
60483
+ resolve(result);
60484
+ return [2 /*return*/];
60485
+ }
60426
60486
  });
60427
- }
60487
+ }); }).catch(function (err) {
60488
+ console.error(err);
60489
+ resolve(null);
60490
+ });
60428
60491
  }
60429
- return [3 /*break*/, 11];
60430
- case 1:
60431
- if (!(types.indexOf('Files') !== -1)) return [3 /*break*/, 10];
60492
+ _b.label = 13;
60493
+ case 13: return [3 /*break*/, 24];
60494
+ case 14:
60495
+ if (!(types.indexOf('Files') !== -1)) return [3 /*break*/, 23];
60432
60496
  result = '';
60433
- if (!(files.length > 0)) return [3 /*break*/, 9];
60434
- _b.label = 2;
60435
- case 2:
60436
- _b.trys.push([2, 7, 8, 9]);
60497
+ if (!(files.length > 0)) return [3 /*break*/, 22];
60498
+ _b.label = 15;
60499
+ case 15:
60500
+ _b.trys.push([15, 20, 21, 22]);
60437
60501
  files_2 = __values(files), files_2_1 = files_2.next();
60438
- _b.label = 3;
60439
- case 3:
60440
- if (!!files_2_1.done) return [3 /*break*/, 6];
60502
+ _b.label = 16;
60503
+ case 16:
60504
+ if (!!files_2_1.done) return [3 /*break*/, 19];
60441
60505
  item = files_2_1.value;
60442
60506
  return [4 /*yield*/, this._fileObjectService.uploadWithByteArray(item)];
60443
- case 4:
60507
+ case 17:
60444
60508
  uploadImage = _b.sent();
60445
60509
  if (typeof uploadImage == 'string') {
60446
60510
  result += '<img src=' + this._fileObjectService.getUrlImage(uploadImage) + '/>';
@@ -60448,28 +60512,28 @@
60448
60512
  else {
60449
60513
  this._notifierService.showWarning('Upload file thất bại');
60450
60514
  }
60451
- _b.label = 5;
60452
- case 5:
60515
+ _b.label = 18;
60516
+ case 18:
60453
60517
  files_2_1 = files_2.next();
60454
- return [3 /*break*/, 3];
60455
- case 6: return [3 /*break*/, 9];
60456
- case 7:
60518
+ return [3 /*break*/, 16];
60519
+ case 19: return [3 /*break*/, 22];
60520
+ case 20:
60457
60521
  e_1_1 = _b.sent();
60458
60522
  e_1 = { error: e_1_1 };
60459
- return [3 /*break*/, 9];
60460
- case 8:
60523
+ return [3 /*break*/, 22];
60524
+ case 21:
60461
60525
  try {
60462
60526
  if (files_2_1 && !files_2_1.done && (_a = files_2.return)) _a.call(files_2);
60463
60527
  }
60464
60528
  finally { if (e_1) throw e_1.error; }
60465
60529
  return [7 /*endfinally*/];
60466
- case 9:
60530
+ case 22:
60467
60531
  resolve(result);
60468
- return [3 /*break*/, 11];
60469
- case 10:
60532
+ return [3 /*break*/, 24];
60533
+ case 23:
60470
60534
  resolve(null);
60471
- _b.label = 11;
60472
- case 11: return [2 /*return*/];
60535
+ _b.label = 24;
60536
+ case 24: return [2 /*return*/];
60473
60537
  }
60474
60538
  });
60475
60539
  }); })];