feat(builder): set sourceRoot and declarationDir on package tsconfig.json files

- throw error when detecting circular dependencies between packages
- fix unpublish command

Author: DanielSchaffer

builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dandi/builder",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "scripts": {
     "build": "tsc --outDir dist",
     "postbuild": "cp package.json dist/builder/"

builder/src/builder-project.ts

@@ -340,6 +340,10 @@ export class BuilderProject implements BuilderConfig, BuilderProjectOptions {
       }, info.buildTsConfig.include)
     }
     info.buildTsConfig.exclude = ['node_modules', '**/*.spec.ts']
+    info.buildTsConfig.compilerOptions = {
+      sourceRoot: '../../',
+      declarationDir: relative(info.path, info.outPath),
+    }
     await this.util.writeJson(info.buildTsConfigPath, info.buildTsConfig)
 
     return info

builder/src/builder.ts

@@ -64,6 +64,7 @@ export class Builder {
       license: this.project.mainPkg.license,
       module: 'index.js',
       main: 'index.js',
+      types: 'index.d.ts',
     })
 
     // replace versions for configured scopes
@@ -88,7 +89,12 @@ export class Builder {
     await this.copyProjectFile(info, this.project.licenseFile)
   }
 
-  private async copyPackageFile(info: PackageInfo, packageFileName: string, skipIfNotExists = false): Promise<void> {
+  private async copyPackageFile(
+    info: PackageInfo,
+    packageFileName: string,
+    skipIfNotExists = false,
+    relativeTargetPath?: string,
+  ): Promise<void> {
     try {
       const sourcePath = resolve(info.path, packageFileName)
       if (!(await pathExists(sourcePath))) {
@@ -97,7 +103,8 @@ export class Builder {
         }
         throw new Error(`${sourcePath} does not exist`)
       }
-      await copy(sourcePath, resolve(info.outPath, packageFileName))
+      const targetPath = relativeTargetPath ? resolve(info.outPath, relativeTargetPath) : info.outPath
+      await copy(sourcePath, resolve(targetPath, packageFileName))
     } catch (err) {
       this.logger.error('Error copying package file', info.name, packageFileName, err)
       throw err
@@ -118,7 +125,7 @@ export class Builder {
       return
     }
     try {
-      await Promise.all(info.manifest.map(this.copyPackageFile.bind(this, info)))
+      await Promise.all(info.manifest.map((filePath) => this.copyPackageFile(info, filePath, false)))
     } catch (err) {
       this.logger.error('Error copying manifest files', info.name)
       throw err

builder/src/publisher.ts

@@ -38,7 +38,9 @@ export class Publisher {
 
     if (state.remaining.length) {
       const remainingNames = state.remaining.map((info) => info.fullName)
-      throw new Error(`Unable to publish packages due to possible circular dependencies: ${remainingNames.join(', ')}`)
+      throw new Error(
+        `Unable to publish packages due to possible circular dependencies: ${remainingNames.join(', ')}`,
+      )
     }
   }
 
@@ -54,7 +56,8 @@ export class Publisher {
         if (registry) {
           unpublishArgs.push('--registry', registry)
         }
-        return this.util.spawn('yarn', unpublishArgs)
+        // yarn does not have an 'unpublish' command
+        return this.util.spawn('npm', unpublishArgs)
       }),
     )
   }
@@ -88,7 +91,8 @@ export class Publisher {
 
   private findClearedPackages(state: PublishState): PackageInfo[] {
     return state.remaining.filter(
-      (info) => !info.projectDependencies.length || info.projectDependencies.every((dep) => state.published.has(dep)),
+      (info) =>
+        !info.projectDependencies.length || info.projectDependencies.every((dep) => state.published.has(dep)),
     )
   }
 

builder/src/ts-config.ts

@@ -1,8 +1,11 @@
 export interface TsConfigCompilerOptions {
   composite?: boolean
   baseUrl?: string
-  paths: { [path: string]: string[] }
+  paths?: { [path: string]: string[] }
+  declarationDir?: string
+  rootDir?: string
   outDir?: string
+  sourceRoot?: string
 }
 
 export interface TsConfigProjectReference {