♻️ Refactor dts and prepare scripts

cli.go

@@ -31,21 +31,19 @@ func SetupCliApp() (cli.App, error) {
  Name: "dts",
  Usage: "Will emit .d.ts files and bundle them",
  },
- // &cli.BoolFlag{
- // Name: "sourcemap",
- // Usage: "Will emit source maps",
- // },
- // &cli.StringFlag{
- // Name: "dist",
- // Usage: "Set output directory",
- // Value: "dist",
- // },
  },
  Action: func(c *cli.Context) error {
 
  return commands.HandleBuildCommand(c.Args().First(), c.Bool("dts"))
  },
  },
+ {
+ Name: "dts",
+ Usage: "Emit .d.ts files for package",
+ Action: func(c *cli.Context) error {
+ return commands.RunDts()
+ },
+ },
  {
  Name: "prettier",
  Usage: "Will run pretty-quick",

internal/commands/build.go

@@ -1,9 +1,7 @@
 package commands
 
 import (
- "errors"
  "fmt"
- "internal/types"
  "internal/utils"
  "os"
  "sync"
@@ -13,35 +11,6 @@ import (
 
 var buildWg sync.WaitGroup
 
-func emitDts(cwd string, name string) error {
- if _, err := os.Stat(types.BUNDLE_DTS_PATH); errors.Is(err, os.ErrNotExist) {
-
- fmt.Println("[WARN] You can only use --dts flag if you have installed tsdev as a dependency")
- buildWg.Done()
- return nil
- }
- utils.ExecWithOutput(cwd, "tsc", "--outDir", "dist/src/")
- return bundleDts(cwd, name)
-}
-
-func bundleDts(cwd string, name string) error {
-
- if _, err := os.Stat(types.BUNDLE_DTS_PATH); errors.Is(err, os.ErrNotExist) {
-
- if _, err := os.Stat(types.BUNDLE_BACKUP_DTS_PATH); errors.Is(err, os.ErrNotExist) {
- fmt.Println("[WARN] You can only use --dts flag if you have installed tsdev as a dependency")
- return errors.New("cannot find bundle-dts path")
- }
- utils.ExecWithOutput(cwd, "node", types.BUNDLE_BACKUP_DTS_PATH, "--name", name, "--main", "dist/src/index.d.ts", "--out", "../index.d.ts")
- buildWg.Done()
- return nil
- }
-
- utils.ExecWithOutput(cwd, "node", types.BUNDLE_DTS_PATH, "--name", name, "--main", "dist/src/index.d.ts", "--out", "../index.d.ts")
- buildWg.Done()
- return nil
-}
-
 func buildCJS(entryPoint string, cwd string) {
  result := api.Build(api.BuildOptions{
  EntryPoints: []string{entryPoint},
@@ -117,7 +86,7 @@ func HandleBuildCommand(entryPoint string, dts bool) error {
  buildWg.Add(1)
  name, err := utils.GetName()
  utils.CheckErr(err)
- go emitDts(cwd, name)
+ go EmitDts(cwd, name)
  }
  buildWg.Wait()
 

internal/commands/create.go

@@ -127,6 +127,27 @@ func cloneTemplate(name string) error {
 // Will generate package json
 func generatePackageJson(name string) {
 
+ var prepareScript string
+
+ switch projectConfig.PackageManager {
+ case types.Pnpm:
+ {
+ prepareScript = "pnpm build && pnpm dts"
+ }
+ case types.Yarn:
+ {
+ prepareScript = "yarn build && yarn dts"
+ }
+ case types.Npm:
+ {
+ prepareScript = "npm run build && npm run dts"
+ }
+ default:
+ {
+ prepareScript = "npm run build && npm run dts"
+ }
+ }
+
  // Default package json
  packageJson := types.PackageJSON{
  Name: name,
@@ -136,7 +157,7 @@ func generatePackageJson(name string) {
  Typings: "dist/index.d.ts",
  Module: "dist/index.es.js",
  Files: []string{"dist"},
- Scripts: map[string]string{"start": "tsdev start", "build": "tsdev build", "dev": "tsdev dev", "lint": "tsdev lint"},
+ Scripts: map[string]string{"start": "tsdev start", "build": "tsdev build", "dev": "tsdev dev", "lint": "tsdev lint", "dts": "tsdev dts", "prepare": prepareScript},
  DevDependencies: map[string]string{"typescript": "latest", "husky": "latest", "prettier": "latest", "prettier-config-standard": "latest", "@cryogenicplanet/tsdev": "latest"},
  Husky: map[string]map[string]string{"hooks": {"pre-commit": "tsdev prettier", "pre-push": "tsdev lint"}},
  Engines: map[string]string{"node": ">12"},

internal/commands/dts.go

@@ -0,0 +1,69 @@
+package commands
+
+import (
+ "errors"
+ "fmt"
+ "internal/types"
+ "internal/utils"
+ "os"
+)
+
+func EmitDts(cwd string, name string) error {
+
+ packageJson, err := utils.ReadPackageJson(cwd + "/package.json")
+
+ if err != nil {
+ fmt.Println("Could not read package.json", cwd+"./package.json")
+ buildWg.Done()
+ return err
+ }
+
+ if _, err := os.Stat(types.BUNDLE_DTS_PATH); errors.Is(err, os.ErrNotExist) {
+
+ if _, err := os.Stat(types.BUNDLE_BACKUP_DTS_PATH); errors.Is(err, os.ErrNotExist) {
+ fmt.Println("[WARN] You can only use --dts flag if you have installed tsdev as a dependency. Error:", err)
+ buildWg.Done()
+ return errors.New("cannot find bundle-dts path")
+ }
+ }
+ fmt.Println("Package manager is ", packageJson.TSDEV.PackageManager)
+ err = utils.ExecWithOutput(cwd, utils.GetPackageManager(packageJson.TSDEV.PackageManager), "tsc", "--outDir", "dist/src/")
+ if err != nil {
+ buildWg.Done()
+ return err
+ }
+ return bundleDts(cwd, name)
+}
+
+func bundleDts(cwd string, name string) error {
+
+ if _, err := os.Stat(types.BUNDLE_DTS_PATH); errors.Is(err, os.ErrNotExist) {
+
+ if _, err := os.Stat("./" + types.BUNDLE_BACKUP_DTS_PATH); errors.Is(err, os.ErrNotExist) {
+ fmt.Println("[WARN] You can only use --dts flag if you have installed tsdev as a dependency. Error:", err)
+ return errors.New("cannot find bundle-dts path")
+ }
+ utils.ExecWithOutput(cwd, "node", types.BUNDLE_BACKUP_DTS_PATH, "--name", name, "--main", "dist/src/index.d.ts", "--out", "../index.d.ts")
+ buildWg.Done()
+ return nil
+ }
+
+ utils.ExecWithOutput(cwd, "node", types.BUNDLE_DTS_PATH, "--name", name, "--main", "dist/src/index.d.ts", "--out", "../index.d.ts")
+ buildWg.Done()
+ return nil
+}
+
+func RunDts() error {
+
+ cwd, err := os.Getwd()
+
+ utils.CheckErr(err)
+ name, err := utils.GetName()
+ utils.CheckErr(err)
+ buildWg.Add(1)
+
+ go EmitDts(cwd, name)
+
+ buildWg.Wait()
+ return nil
+}

internal/utils/packageManger.go

@@ -0,0 +1,25 @@
+package utils
+
+import "internal/types"
+
+func GetPackageManager(packageManger types.PackageManagerType) string {
+
+ switch packageManger {
+ case types.Pnpm:
+ {
+ return "pnpm"
+ }
+ case types.Yarn:
+ {
+ return "yarn"
+ }
+ case types.Npm:
+ {
+ return "npm"
+ }
+ default:
+ {
+ return "npm"
+ }
+ }
+}