@jcoreio/toolchain 1.0.0-beta.2 → 1.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",
@@ -36,7 +36,8 @@
     "prettier": "^2.5.1",
     "resolve-bin": "^1.0.0",
     "semantic-release": "^21.0.5",
-    "toposort": "^2.0.2"
+    "toposort": "^2.0.2",
+    "zod": "^3.21.4"
   },
   "peerDependencies": {
     "eslint": "^8.0.0"

package/scripts/bootstrap/installGitHooks.cjs

@@ -4,6 +4,9 @@ const execa = require('../../util/execa.cjs')
 const Path = require('path')
 const dedent = require('dedent-js')
 const { findGitDir } = require('../../util/findUps.cjs')
+const fs = require('fs-extra')
+
+const githooksDir = Path.resolve(__dirname, '..', '..', 'githooks')
 
 async function installGitHooks() {
   const gitDir = findGitDir()
@@ -15,13 +18,16 @@ async function installGitHooks() {
       after you run \`git init\`, try \`pnpm exec install-git-hooks\`.
     `)
   } else {
+    // chmod in case pnpm doesn't preserve mode of hooks scripts
+    await Promise.all(
+      (
+        await fs.readdir(githooksDir)
+      ).map((hook) => fs.chmod(Path.join(githooksDir, hook), 0o755))
+    )
     await execa('git', [
       'config',
       'core.hooksPath',
-      Path.relative(
-        Path.dirname(gitDir),
-        Path.resolve(__dirname, '..', '..', 'githooks')
-      ),
+      Path.relative(Path.dirname(gitDir), githooksDir),
     ])
     // eslint-disable-next-line no-console
     console.log('successfully installed git hooks!')

package/util/configSchema.cjs

@@ -0,0 +1,7 @@
+const z = require('zod')
+
+module.exports = z.object({
+  cjsBabelEnv: z.record(z.unknown()).optional(),
+  esmBabelEnv: z.record(z.unknown()).optional(),
+  esWrapper: z.boolean().optional(),
+})

package/util/findUps.cjs

@@ -3,6 +3,7 @@ const Path = require('path')
 const fs = require('fs-extra')
 const once = require('./once.cjs')
 const { name } = require('../package.json')
+const configSchema = require('./configSchema.cjs')
 
 const findGitDir = once(function findGitDir(
   cwd = process.env.INIT_CWD || process.cwd()
@@ -39,6 +40,22 @@ try {
 } catch (error) {
   // ignore
 }
-exports.toolchainConfig = toolchainConfigFile
-  ? require(toolchainConfigFile)
-  : {}
+
+let toolchainConfig
+try {
+  toolchainConfig = configSchema.parse(
+    toolchainConfigFile ? require(toolchainConfigFile) : packageJson[name] || {}
+  )
+} catch (error) {
+  const toolchainConfigLocation = toolchainConfigFile
+    ? Path.relative(cwd, toolchainConfigFile)
+    : `packageJson[${JSON.stringify(name)}]`
+
+  // eslint-disable-next-line no-console
+  console.error(`invalid ${toolchainConfigLocation}`)
+  // eslint-disable-next-line no-console
+  console.error(error.message)
+  process.exit(1)
+}
+
+exports.toolchainConfig = toolchainConfig

package/util/replaceRanges.cjs

@@ -0,0 +1,18 @@
+module.exports = function replaceRanges(source, replacements) {
+  replacements.sort((a, b) => a.start - b.start)
+
+  const parts = []
+  let end = 0
+  for (const r of replacements) {
+    if (r.start > end) {
+      parts.push(source.substring(end, r.start))
+    }
+    parts.push(r.value)
+    end = r.end
+  }
+  if (end < source.length) {
+    parts.push(source.substring(end))
+  }
+
+  return parts.join('')
+}