♻️ Fix pathing on lint, prettier and dts-bundle

CryogenicPlanet · Dec 12, 2021 · 19576db · 19576db
1 parent b49456e
commit 19576db
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 9 deletions.
diff --git a/internal/commands/build.go b/internal/commands/build.go
@@ -13,20 +13,33 @@ import (
 
 var buildWg sync.WaitGroup
 
-func emitDts(cwd string, name string) {
+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
+ return nil
  }
  utils.ExecWithOutput(cwd, "tsc", "--outDir", "dist/src/")
- bundleDts(cwd, name)
+ return bundleDts(cwd, name)
 }
 
-func bundleDts(cwd string, name string) {
+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) {

diff --git a/internal/commands/lint.go b/internal/commands/lint.go
@@ -18,7 +18,18 @@ func HandleLintCommand(fix bool) error {
 
  if _, err := os.Stat(types.ESLINT_PATH); errors.Is(err, os.ErrNotExist) {
 
- return fmt.Errorf("cannot use lint without installing tsdev as a dependency")
+ if _, err := os.Stat(types.ESLINT_BACKUP_PATH); errors.Is(err, os.ErrNotExist) {
+
+ return fmt.Errorf("cannot use lint without installing tsdev as a dependency")
+
+ }
+
+ if fix {
+ utils.ExecWithOutput(cwd, "node", types.ESLINT_BACKUP_PATH, "--config", types.ESLINT_CONFIG_PATH, "src/*", "--fix")
+ } else {
+ utils.ExecWithOutput(cwd, "node", types.ESLINT_BACKUP_PATH, "--config", types.ESLINT_CONFIG_PATH, "src/*")
+ }
+ return nil
  }
 
  if fix {

diff --git a/internal/commands/prettier.go b/internal/commands/prettier.go
@@ -12,7 +12,16 @@ func HandlePrettierCommand() error {
 
  if _, err := os.Stat(types.PRETTY_QUICK_PATH); errors.Is(err, os.ErrNotExist) {
 
- return fmt.Errorf("cannot use prettier without installing tsdev as a dependency")
+ if _, err := os.Stat(types.PRETTY_BACKUP_QUICK_PATH); errors.Is(err, os.ErrNotExist) {
+
+ return fmt.Errorf("cannot use prettier without installing tsdev as a dependency")
+ }
+
+ cwd, err := os.Getwd()
+
+ utils.CheckErr(err)
+
+ return utils.ExecWithOutput(cwd, "node", types.PRETTY_BACKUP_QUICK_PATH, "--staged")
  }
 
  cwd, err := os.Getwd()

diff --git a/internal/types/consts.go b/internal/types/consts.go
@@ -2,10 +2,16 @@ package types
 
 const PACKAGE_NAME = "@cryogenicplanet/tsdev"
 
-const BUNDLE_DTS_PATH = "node_modules/" + PACKAGE_NAME + "/node_modules/dts-bundle/lib/dts-bundle.js"
+const BUNDLE_DTS_PATH = "node_modules/" + PACKAGE_NAME + "/" + BUNDLE_BACKUP_DTS_PATH
+
+const BUNDLE_BACKUP_DTS_PATH = "node_modules/dts-bundle/lib/dts-bundle.js"
 
 const ESLINT_CONFIG_PATH = "node_modules/" + PACKAGE_NAME + "/dist/.eslintrc"
 
-const ESLINT_PATH = "node_modules/" + PACKAGE_NAME + "/node_modules/eslint/bin/eslint.js"
+const ESLINT_PATH = "node_modules/" + PACKAGE_NAME + "/" + ESLINT_BACKUP_PATH
+
+const ESLINT_BACKUP_PATH = "node_modules/eslint/bin/eslint.js"
+
+const PRETTY_QUICK_PATH = "node_modules/" + PACKAGE_NAME + "/" + PRETTY_BACKUP_QUICK_PATH
 
-const PRETTY_QUICK_PATH = "node_modules/" + PACKAGE_NAME + "/node_modules/pretty-quick/bin/pretty-quick.js"
+const PRETTY_BACKUP_QUICK_PATH = "node_modules/pretty-quick/bin/pretty-quick.js"