refactor: type consolidation #590
Conversation
| @@ -0,0 +1,170 @@ | |||
| /* | |||
There was a problem hiding this comment.
this is completely independent from the e2e nut so I split it out (can run parallel)
| @@ -128,6 +124,7 @@ describe('Integration tests for @salesforce/packaging library', () => { | |||
| const projectFile = JSON.parse(dxPjsonData) as ProjectJson; | |||
| expect(projectFile).to.have.property('packageDirectories').with.length(1); | |||
| expect(projectFile.packageDirectories[0]).to.include.keys(['package', 'versionName', 'versionNumber']); | |||
| assert(isPackagingDirectory(projectFile.packageDirectories[0])); | |||
| expect(projectFile.packageDirectories[0].package).to.equal(pkgName); | |||
There was a problem hiding this comment.
these all presume packageDirectories[0] is the flavor that has the full packaging info. asserting that via the typeguard makes everything downstream of that assertion type-aware
src/package/packageVersionCreate.ts
Outdated
| @@ -649,16 +650,19 @@ export class PackageVersionCreate { | |||
| if (!packageName) throw messages.createError('errorMissingPackage', [this.options.packageId]); | |||
| } | |||
| packageObject = this.project.findPackage( | |||
| (namedPackageDir) => namedPackageDir.package === packageName || namedPackageDir.name === packageName | |||
| (namedPackageDir) => | |||
| (isPackagingDirectory(namedPackageDir) && namedPackageDir.package === packageName) || | |||
There was a problem hiding this comment.
I don't think this logic matches, should it be
isPackagingDirectory(namedPackageDir) &&(namedPackageDir.package === packageName || namedPackageDir.name === packageName)?
| @@ -172,3 +136,32 @@ export class Package1Version implements IPackageVersion1GP { | |||
| return (await this.connection.tooling.query<PackagingSObjects.MetadataPackageVersion>(query)).records; | |||
| } | |||
| } | |||
|
|
|||
| const packageUploadPolling = async ( | |||
There was a problem hiding this comment.
I believe this is only applicable to 1GP packages, and why it was kept under the Package1Version class. I think keeping that clarity to the consumer is good
There was a problem hiding this comment.
I'm not following. it's not exported, so there shouldn't be any consumers outside the package1Version module, right?
uses types for sfProject, PackageDir etc from sfdx-core
refactor some un-bundleable geLogger stuff
othr basic TS cleanup (remove assertions, simplify types)