Skip to content

revert commit that added deasync dependancy #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 11, 2022
Merged

revert commit that added deasync dependancy #591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d48f706
Revert "Implement readFileSync for ZipTreeContainer (#583)"
gbockus-sf Mar 11, 2022
8418e19
chore: adding types for SDR
gbockus-sf Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions METADATA_SUPPORT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,18 +484,24 @@ v55 introduces the following new types. Here's their current level of support
|Metadata Type|Support|Notes|
|:---|:---|:---|
|AssessmentQuestion|❌|Not supported, but support could be added|
|AssessmentQuestionSet|❌|Not supported, but support could be added|
|BotTemplate|❌|Not supported, but support could be added|
|ConvReasonReportSegment|❌|Not supported, but support could be added|
|ConvReasonReportDefinition|❌|Not supported, but support could be added|
|ConvReasonReportSegmentDef|❌|Not supported, but support could be added|
|CustomAddressFieldSettings|✅||
|DecisionMatrixDefinition|❌|Not supported, but support could be added|
|DecisionMatrixDefinitionVersion|❌|Not supported, but support could be added|
|Experience|undefined|undefined|
|ExperienceMetadataResource|undefined|undefined|
|ExperienceSpace|undefined|undefined|
|ExpressionSetDefinition|❌|Not supported, but support could be added|
|ExpressionSetDefinitionVersion|❌|Not supported, but support could be added|
|ExternalDataSrcDescriptor|❌|Not supported, but support could be added|
|ExternalDataTranField|❌|Not supported, but support could be added|
|ExternalDataTranObject|❌|Not supported, but support could be added|
|FavoriteTransferDestination|❌|Not supported, but support could be added|
|IndustriesAutomotiveSettings|✅||
|InvLatePymntRiskCalcSettings|✅||
|MarketingAppExtAction|❌|Not supported, but support could be added|
|PaymentsManagementEnabledSettings|✅||
|RegisteredExternalService|❌|Not supported, but support could be added|
|StreamingAppDataConnector|❌|Not supported, but support could be added|
Expand Down
2 changes: 0 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"@salesforce/kit": "^1.5.32",
"@salesforce/ts-types": "^1.4.2",
"archiver": "^5.3.0",
"deasync": "^0.1.24",
"fast-xml-parser": "^3.17.4",
"graceful-fs": "^4.2.8",
"ignore": "^5.1.8",
Expand All @@ -42,7 +41,6 @@
"@salesforce/prettier-config": "^0.0.2",
"@salesforce/ts-sinon": "^1.1.2",
"@types/archiver": "^5.1.1",
"@types/deasync": "^0.1.2",
"@types/deep-equal-in-any-order": "^1.0.1",
"@types/jsforce": "^1.9.38",
"@types/mime": "2.0.3",
Expand Down
19 changes: 2 additions & 17 deletions src/resolve/treeContainers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { join, dirname, basename, normalize, sep } from 'path';
import { Readable } from 'stream';
import { statSync, existsSync, readdirSync, createReadStream, readFileSync } from 'graceful-fs';
import * as unzipper from 'unzipper';
import deasync = require('deasync');
import { baseName, parseMetadataXml } from '../utils';
import { LibraryError } from '../errors';
import { SourcePath } from '../common';
Expand Down Expand Up @@ -167,23 +166,9 @@ export class ZipTreeContainer extends TreeContainer {
throw new LibraryError('error_expected_file_path', fsPath);
}

// eslint-disable-next-line @typescript-eslint/no-unused-vars
public readFileSync(fsPath: string): Buffer {
let done = false;
let dataBuffer: Buffer;
this.readFile(fsPath)
.then((buffer) => {
dataBuffer = buffer;
done = true;
})
.catch((error) => {
done = true;
throw error;
});

deasync.loopWhile(() => {
return !done;
});
return dataBuffer;
throw new Error('Method not implemented');
}

public stream(fsPath: string): Readable {
Expand Down
15 changes: 2 additions & 13 deletions test/resolve/treeContainers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,19 +229,8 @@ describe('Tree Containers', () => {
});

describe('readFileSync', () => {
it('should syncrounsly read contents of zip entry into buffer.', () => {
const path = join(filesRoot, 'test.txt');
const contents = tree.readFileSync(path).toString();
expect(contents).to.equal('test text');
});

it('should throw a library error if readFile throws', () => {
assert.throws(
// eslint-disable-next-line @typescript-eslint/no-misused-promises
() => tree.readFileSync(filesRoot),
LibraryError,
nls.localize('error_expected_file_path', filesRoot)
);
it('should throw an error because it is not implemented yet', () => {
assert.throws(() => tree.readFileSync(join(filesRoot, 'test.txt')), Error, 'Method not implemented');
});
});

Expand Down
30 changes: 0 additions & 30 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,11 +784,6 @@
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==

"@types/deasync@^0.1.2":
version "0.1.2"
resolved "https://registry.yarnpkg.com/@types/deasync/-/deasync-0.1.2.tgz#a64b68d6ebc145d0a5fe004a53e8e0f4e6d2ec7e"
integrity sha512-sCBFlGCEmZMPS06wdnQELcYzyUYio2K1Hp6g0fjJSKP1jkGKQpIdjRNUQAvdSCCJCWxIMCkX2CL7pi4BCm8Ydg==

"@types/deep-equal-in-any-order@^1.0.1":
version "1.0.1"
resolved "https://registry.npmjs.org/@types/deep-equal-in-any-order/-/deep-equal-in-any-order-1.0.1.tgz#0559d855797a5034e187f248b23a4490e5444f2e"
Expand Down Expand Up @@ -1372,13 +1367,6 @@ binary@~0.3.0:
buffers "~0.1.1"
chainsaw "~0.1.0"

bindings@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
dependencies:
file-uri-to-path "1.0.0"

bl@^4.0.3:
version "4.0.3"
resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
Expand Down Expand Up @@ -2060,14 +2048,6 @@ dayjs@^1.8.16:
resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.36.tgz#be36e248467afabf8f5a86bae0de0cdceecced50"
integrity sha512-3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw==

deasync@^0.1.24:
version "0.1.24"
resolved "https://registry.yarnpkg.com/deasync/-/deasync-0.1.24.tgz#6ecc9c6ff9eba64a4f4572ae3c4db77fed09268a"
integrity sha512-i98vg42xNfRZCymummMAN0rIcQ1gZFinSe3btvPIvy6JFTaeHcumeKybRo2HTv86nasfmT0nEgAn2ggLZhOCVA==
dependencies:
bindings "^1.5.0"
node-addon-api "^1.7.1"

debug@4.3.1:
version "4.3.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
Expand Down Expand Up @@ -2800,11 +2780,6 @@ file-entry-cache@^6.0.1:
dependencies:
flat-cache "^3.0.4"

file-uri-to-path@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==

fill-range@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
Expand Down Expand Up @@ -4777,11 +4752,6 @@ nise@^4.1.0:
just-extend "^4.0.2"
path-to-regexp "^1.7.0"

node-addon-api@^1.7.1:
version "1.7.2"
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==

node-preload@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/node-preload/-/node-preload-0.2.1.tgz#c03043bb327f417a18fee7ab7ee57b408a144301"
Expand Down